Lib_ZF - Version 1.11.1.0

Version Notes

1.11.1.0

Download this release

Release Info

Developer Magento Core Team
Extension Lib_ZF
Version 1.11.1.0
Comparing to
See all releases


Code changes from version 1.10.8.0 to 1.11.1.0

Files changed (652) hide show
  1. lib/Zend/Acl.php +118 -48
  2. lib/Zend/Amf/Adobe/Introspector.php +7 -2
  3. lib/Zend/Amf/Parse/Amf0/Deserializer.php +1 -1
  4. lib/Zend/Amf/Parse/Amf0/Serializer.php +1 -1
  5. lib/Zend/Amf/Parse/Amf3/Deserializer.php +1 -1
  6. lib/Zend/Amf/Parse/Amf3/Serializer.php +1 -1
  7. lib/Zend/Amf/Parse/Serializer.php +1 -1
  8. lib/Zend/Amf/Response.php +1 -1
  9. lib/Zend/Amf/Response/Http.php +4 -3
  10. lib/Zend/Amf/Server.php +9 -6
  11. lib/Zend/Amf/Util/BinaryStream.php +1 -1
  12. lib/Zend/Application.php +9 -1
  13. lib/Zend/Application/Bootstrap/Bootstrap.php +1 -1
  14. lib/Zend/Application/Bootstrap/BootstrapAbstract.php +2 -2
  15. lib/Zend/Application/Resource/Cachemanager.php +1 -1
  16. lib/Zend/Application/Resource/Db.php +33 -1
  17. lib/Zend/Application/Resource/Dojo.php +1 -1
  18. lib/Zend/Application/Resource/Exception.php +1 -1
  19. lib/Zend/Application/Resource/Frontcontroller.php +8 -2
  20. lib/Zend/Application/Resource/Layout.php +1 -1
  21. lib/Zend/Application/Resource/Locale.php +1 -1
  22. lib/Zend/Application/Resource/Log.php +1 -1
  23. lib/Zend/Application/Resource/Mail.php +1 -1
  24. lib/Zend/Application/Resource/Modules.php +1 -1
  25. lib/Zend/Application/Resource/Multidb.php +40 -1
  26. lib/Zend/Application/Resource/Navigation.php +5 -1
  27. lib/Zend/Application/Resource/ResourceAbstract.php +6 -4
  28. lib/Zend/Application/Resource/Router.php +1 -1
  29. lib/Zend/Application/Resource/Session.php +1 -1
  30. lib/Zend/Application/Resource/Translate.php +22 -2
  31. lib/Zend/Application/Resource/Useragent.php +72 -0
  32. lib/Zend/Application/Resource/View.php +8 -2
  33. lib/Zend/Auth/Adapter/DbTable.php +1 -1
  34. lib/Zend/Auth/Adapter/Digest.php +24 -2
  35. lib/Zend/Auth/Adapter/Http.php +25 -3
  36. lib/Zend/Auth/Adapter/Ldap.php +1 -1
  37. lib/Zend/Barcode/Exception.php +4 -4
  38. lib/Zend/Barcode/Object/Code128.php +391 -0
  39. lib/Zend/Barcode/Object/Code39.php +12 -1
  40. lib/Zend/Barcode/Object/Ean13.php +13 -12
  41. lib/Zend/Barcode/Object/Ean8.php +3 -2
  42. lib/Zend/Barcode/Object/ObjectAbstract.php +39 -3
  43. lib/Zend/Barcode/Object/Upca.php +2 -1
  44. lib/Zend/Barcode/Object/Upce.php +2 -1
  45. lib/Zend/Barcode/Renderer/Image.php +3 -3
  46. lib/Zend/Barcode/Renderer/Pdf.php +2 -2
  47. lib/Zend/Barcode/Renderer/RendererAbstract.php +8 -8
  48. lib/Zend/Barcode/Renderer/Svg.php +382 -0
  49. lib/Zend/Cache.php +9 -9
  50. lib/Zend/Cache/Backend.php +1 -1
  51. lib/Zend/Cache/Backend/BlackHole.php +1 -1
  52. lib/Zend/Cache/Backend/File.php +1 -1
  53. lib/Zend/Cache/Backend/Libmemcached.php +484 -0
  54. lib/Zend/Cache/Backend/Memcached.php +1 -1
  55. lib/Zend/Cache/Backend/Static.php +21 -28
  56. lib/Zend/Cache/Backend/Test.php +3 -2
  57. lib/Zend/Cache/Backend/TwoLevels.php +1 -1
  58. lib/Zend/Cache/Backend/Xcache.php +7 -2
  59. lib/Zend/Cache/Core.php +1 -1
  60. lib/Zend/Cache/Frontend/Capture.php +2 -1
  61. lib/Zend/Cache/Frontend/Class.php +11 -6
  62. lib/Zend/Cache/Frontend/File.php +20 -11
  63. lib/Zend/Cache/Frontend/Function.php +1 -1
  64. lib/Zend/Cache/Manager.php +1 -1
  65. lib/Zend/Captcha/Image.php +1 -1
  66. lib/Zend/Captcha/Word.php +24 -2
  67. lib/Zend/Cloud/AbstractFactory.php +67 -0
  68. lib/Zend/Cloud/DocumentService/Adapter.php +155 -0
  69. lib/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php +130 -0
  70. lib/Zend/Cloud/DocumentService/Adapter/SimpleDb.php +468 -0
  71. lib/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php +175 -0
  72. lib/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php +628 -0
  73. lib/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php +171 -0
  74. lib/Zend/Cloud/DocumentService/Document.php +248 -0
  75. lib/Zend/Cloud/DocumentService/DocumentSet.php +68 -0
  76. lib/Zend/Cloud/DocumentService/Exception.php +38 -0
  77. lib/Zend/Cloud/DocumentService/Factory.php +77 -0
  78. lib/Zend/Cloud/DocumentService/Query.php +191 -0
  79. lib/Zend/Cloud/DocumentService/QueryAdapter.php +102 -0
  80. lib/Zend/Cloud/Exception.php +53 -0
  81. lib/Zend/Cloud/OperationNotAvailableException.php +34 -0
  82. lib/Zend/Cloud/QueueService/Adapter.php +146 -0
  83. lib/Zend/Cloud/QueueService/Adapter/AbstractAdapter.php +92 -0
  84. lib/Zend/Cloud/QueueService/Adapter/Sqs.php +278 -0
  85. lib/Zend/Cloud/QueueService/Adapter/WindowsAzure.php +343 -0
  86. lib/Zend/Cloud/QueueService/Adapter/ZendQueue.php +301 -0
  87. lib/Zend/Cloud/QueueService/Exception.php +37 -0
  88. lib/Zend/Cloud/QueueService/Factory.php +71 -0
  89. lib/Zend/Cloud/QueueService/Message.php +60 -0
  90. lib/Zend/Cloud/QueueService/MessageSet.php +68 -0
  91. lib/Zend/Cloud/StorageService/Adapter.php +145 -0
  92. lib/Zend/Cloud/StorageService/Adapter/FileSystem.php +267 -0
  93. lib/Zend/Cloud/StorageService/Adapter/Nirvanix.php +399 -0
  94. lib/Zend/Cloud/StorageService/Adapter/S3.php +327 -0
  95. lib/Zend/Cloud/StorageService/Adapter/WindowsAzure.php +443 -0
  96. lib/Zend/Cloud/StorageService/Exception.php +38 -0
  97. lib/Zend/Cloud/StorageService/Factory.php +70 -0
  98. lib/Zend/CodeGenerator/Php/Class.php +1 -1
  99. lib/Zend/CodeGenerator/Php/Parameter.php +1 -1
  100. lib/Zend/CodeGenerator/Php/Property/DefaultValue.php +3 -1
  101. lib/Zend/Config/Json.php +240 -0
  102. lib/Zend/Config/Writer/Ini.php +1 -1
  103. lib/Zend/Config/Writer/Json.php +106 -0
  104. lib/Zend/Config/Writer/Yaml.php +144 -0
  105. lib/Zend/Config/Yaml.php +382 -0
  106. lib/Zend/Console/Getopt.php +1 -1
  107. lib/Zend/Controller/Action.php +1 -1
  108. lib/Zend/Controller/Action/Helper/Cache.php +2 -2
  109. lib/Zend/Controller/Action/Helper/Redirector.php +6 -3
  110. lib/Zend/Controller/Dispatcher/Standard.php +1 -1
  111. lib/Zend/Controller/Request/Http.php +16 -5
  112. lib/Zend/Controller/Response/Abstract.php +1 -1
  113. lib/Zend/Controller/Router/Rewrite.php +3 -3
  114. lib/Zend/Controller/Router/Route/Chain.php +6 -2
  115. lib/Zend/Controller/Router/Route/Static.php +4 -2
  116. lib/Zend/Crypt.php +3 -2
  117. lib/Zend/Crypt/DiffieHellman.php +3 -3
  118. lib/Zend/Crypt/Math/BigInteger.php +4 -4
  119. lib/Zend/Crypt/Math/BigInteger/Bcmath.php +1 -1
  120. lib/Zend/Crypt/Math/BigInteger/Gmp.php +2 -2
  121. lib/Zend/Crypt/Rsa.php +25 -10
  122. lib/Zend/Crypt/Rsa/Exception.php +36 -0
  123. lib/Zend/Crypt/Rsa/Key/Private.php +2 -2
  124. lib/Zend/Currency.php +12 -8
  125. lib/Zend/Currency/CurrencyInterface.php +1 -1
  126. lib/Zend/Date.php +3 -2
  127. lib/Zend/Date/DateObject.php +35 -4
  128. lib/Zend/Db.php +6 -14
  129. lib/Zend/Db/Adapter/Abstract.php +34 -8
  130. lib/Zend/Db/Adapter/Db2.php +10 -2
  131. lib/Zend/Db/Adapter/Oracle.php +1 -41
  132. lib/Zend/Db/Adapter/Pdo/Pgsql.php +1 -1
  133. lib/Zend/Db/Adapter/Sqlsrv.php +27 -22
  134. lib/Zend/Db/Adapter/Sqlsrv/Exception.php +1 -1
  135. lib/Zend/Db/Profiler/Query.php +15 -1
  136. lib/Zend/Db/Select.php +13 -13
  137. lib/Zend/Db/Statement/Exception.php +1 -1
  138. lib/Zend/Db/Statement/Pdo/Oci.php +1 -1
  139. lib/Zend/Db/Statement/Sqlsrv.php +31 -2
  140. lib/Zend/Db/Table/Abstract.php +1 -1
  141. lib/Zend/Db/Table/Row/Abstract.php +1 -1
  142. lib/Zend/Db/Table/Rowset/Abstract.php +30 -19
  143. lib/Zend/Dojo/BuildLayer.php +1 -1
  144. lib/Zend/Dojo/Form/Decorator/DijitElement.php +1 -1
  145. lib/Zend/Dojo/Form/Element/DijitMulti.php +1 -1
  146. lib/Zend/Dojo/View/Helper/Dojo/Container.php +9 -3
  147. lib/Zend/Dom/Query.php +77 -10
  148. lib/Zend/Dom/Query/Css2Xpath.php +1 -1
  149. lib/Zend/Exception.php +1 -0
  150. lib/Zend/Feed/Pubsubhubbub.php +1 -0
  151. lib/Zend/Feed/Pubsubhubbub/CallbackAbstract.php +2 -1
  152. lib/Zend/Feed/Pubsubhubbub/CallbackInterface.php +1 -0
  153. lib/Zend/Feed/Pubsubhubbub/Exception.php +1 -0
  154. lib/Zend/Feed/Pubsubhubbub/HttpResponse.php +1 -0
  155. lib/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php +2 -1
  156. lib/Zend/Feed/Pubsubhubbub/Model/Subscription.php +1 -0
  157. lib/Zend/Feed/Pubsubhubbub/Model/SubscriptionInterface.php +1 -0
  158. lib/Zend/Feed/Pubsubhubbub/Publisher.php +4 -3
  159. lib/Zend/Feed/Pubsubhubbub/Subscriber.php +8 -4
  160. lib/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php +8 -6
  161. lib/Zend/Feed/Reader.php +3 -3
  162. lib/Zend/Feed/Reader/Collection.php +1 -1
  163. lib/Zend/Feed/Reader/Collection/Category.php +1 -1
  164. lib/Zend/Feed/Reader/Entry/Rss.php +1 -1
  165. lib/Zend/Feed/Reader/Extension/Atom/Entry.php +2 -2
  166. lib/Zend/Feed/Reader/Extension/Atom/Feed.php +26 -2
  167. lib/Zend/Feed/Reader/Extension/Content/Entry.php +1 -1
  168. lib/Zend/Feed/Reader/Extension/EntryAbstract.php +2 -2
  169. lib/Zend/Feed/Reader/Feed/Atom.php +2 -2
  170. lib/Zend/Feed/Reader/Feed/Atom/Source.php +1 -1
  171. lib/Zend/Feed/Reader/Feed/Rss.php +7 -7
  172. lib/Zend/Feed/Reader/FeedAbstract.php +1 -1
  173. lib/Zend/Feed/Reader/FeedSet.php +2 -2
  174. lib/Zend/Feed/Writer/Deleted.php +2 -2
  175. lib/Zend/Feed/Writer/Entry.php +3 -3
  176. lib/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php +1 -1
  177. lib/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php +1 -1
  178. lib/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php +1 -1
  179. lib/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php +1 -1
  180. lib/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php +3 -3
  181. lib/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php +3 -3
  182. lib/Zend/Feed/Writer/Extension/RendererAbstract.php +1 -0
  183. lib/Zend/Feed/Writer/Extension/RendererInterface.php +1 -0
  184. lib/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php +2 -2
  185. lib/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php +4 -4
  186. lib/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php +1 -1
  187. lib/Zend/Feed/Writer/Feed.php +1 -1
  188. lib/Zend/Feed/Writer/Feed/FeedAbstract.php +35 -4
  189. lib/Zend/Feed/Writer/Renderer/Entry/Atom.php +1 -1
  190. lib/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php +1 -1
  191. lib/Zend/Feed/Writer/Renderer/Entry/Rss.php +1 -1
  192. lib/Zend/Feed/Writer/Renderer/Feed/Atom.php +2 -1
  193. lib/Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php +20 -1
  194. lib/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php +1 -1
  195. lib/Zend/Feed/Writer/Renderer/Feed/Rss.php +1 -1
  196. lib/Zend/Feed/Writer/Source.php +1 -1
  197. lib/Zend/File/Transfer.php +1 -1
  198. lib/Zend/File/Transfer/Adapter/Abstract.php +1 -1
  199. lib/Zend/File/Transfer/Adapter/Http.php +1 -1
  200. lib/Zend/Filter.php +1 -1
  201. lib/Zend/Filter/Boolean.php +2 -2
  202. lib/Zend/Filter/Compress/Rar.php +3 -3
  203. lib/Zend/Filter/Encrypt/Mcrypt.php +63 -11
  204. lib/Zend/Filter/Encrypt/Openssl.php +153 -14
  205. lib/Zend/Filter/HtmlEntities.php +1 -1
  206. lib/Zend/Filter/Inflector.php +1 -1
  207. lib/Zend/Filter/Input.php +1 -1
  208. lib/Zend/Filter/PregReplace.php +1 -1
  209. lib/Zend/Filter/StringToLower.php +5 -1
  210. lib/Zend/Filter/StringToUpper.php +5 -1
  211. lib/Zend/Filter/StringTrim.php +6 -6
  212. lib/Zend/Filter/StripTags.php +9 -2
  213. lib/Zend/Filter/Word/CamelCaseToSeparator.php +1 -1
  214. lib/Zend/Form.php +32 -5
  215. lib/Zend/Form/Decorator/Abstract.php +1 -1
  216. lib/Zend/Form/Decorator/DtDdWrapper.php +1 -1
  217. lib/Zend/Form/Decorator/Fieldset.php +2 -2
  218. lib/Zend/Form/Decorator/FormErrors.php +1 -1
  219. lib/Zend/Form/Decorator/HtmlTag.php +7 -2
  220. lib/Zend/Form/Decorator/Label.php +2 -2
  221. lib/Zend/Form/Decorator/ViewScript.php +51 -3
  222. lib/Zend/Form/DisplayGroup.php +43 -1
  223. lib/Zend/Form/Element.php +9 -6
  224. lib/Zend/Form/Element/Captcha.php +2 -2
  225. lib/Zend/Form/Element/File.php +1 -1
  226. lib/Zend/Form/Element/Image.php +1 -1
  227. lib/Zend/Form/Element/Multi.php +1 -1
  228. lib/Zend/Form/Element/Radio.php +1 -1
  229. lib/Zend/Form/Element/Submit.php +1 -1
  230. lib/Zend/Form/SubForm.php +1 -1
  231. lib/Zend/Gdata/App.php +4 -3
  232. lib/Zend/Gdata/App/Base.php +3 -3
  233. lib/Zend/Gdata/App/Feed.php +2 -2
  234. lib/Zend/Gdata/Gapps.php +1 -1
  235. lib/Zend/Http/Client.php +19 -15
  236. lib/Zend/Http/Client/Adapter/Curl.php +1 -1
  237. lib/Zend/Http/Client/Adapter/Proxy.php +1 -1
  238. lib/Zend/Http/Client/Adapter/Socket.php +1 -1
  239. lib/Zend/Http/Client/Adapter/Stream.php +1 -1
  240. lib/Zend/Http/Cookie.php +3 -3
  241. lib/Zend/Http/CookieJar.php +8 -6
  242. lib/Zend/Http/Response.php +1 -1
  243. lib/Zend/Http/Response/Stream.php +1 -1
  244. lib/Zend/Http/UserAgent.php +847 -0
  245. lib/Zend/Http/UserAgent/AbstractDevice.php +974 -0
  246. lib/Zend/Http/UserAgent/Bot.php +128 -0
  247. lib/Zend/Http/UserAgent/Checker.php +76 -0
  248. lib/Zend/Http/UserAgent/Console.php +67 -0
  249. lib/Zend/Http/UserAgent/Desktop.php +56 -0
  250. lib/Zend/Http/UserAgent/Device.php +200 -0
  251. lib/Zend/Http/UserAgent/Email.php +65 -0
  252. lib/Zend/Http/UserAgent/Exception.php +36 -0
  253. lib/Zend/Http/UserAgent/Features/Adapter.php +39 -0
  254. lib/Zend/Http/UserAgent/Features/Adapter/DeviceAtlas.php +78 -0
  255. lib/Zend/Http/UserAgent/Features/Adapter/TeraWurfl.php +102 -0
  256. lib/Zend/Http/UserAgent/Features/Adapter/WurflApi.php +103 -0
  257. lib/Zend/Http/UserAgent/Features/Exception.php +36 -0
  258. lib/Zend/Http/UserAgent/Feed.php +81 -0
  259. lib/Zend/Http/UserAgent/Mobile.php +534 -0
  260. lib/Zend/Http/UserAgent/Offline.php +70 -0
  261. lib/Zend/Http/UserAgent/Probe.php +81 -0
  262. lib/Zend/Http/UserAgent/Spam.php +79 -0
  263. lib/Zend/Http/UserAgent/Storage.php +65 -0
  264. lib/Zend/Http/UserAgent/Storage/Exception.php +37 -0
  265. lib/Zend/Http/UserAgent/Storage/NonPersistent.php +97 -0
  266. lib/Zend/Http/UserAgent/Storage/Session.php +166 -0
  267. lib/Zend/Http/UserAgent/Text.php +132 -0
  268. lib/Zend/Http/UserAgent/Validator.php +73 -0
  269. lib/Zend/InfoCard/Xml/Security.php +25 -3
  270. lib/Zend/Json.php +1 -1
  271. lib/Zend/Json/Decoder.php +1 -1
  272. lib/Zend/Json/Encoder.php +1 -1
  273. lib/Zend/Json/Server.php +1 -1
  274. lib/Zend/Ldap.php +22 -11
  275. lib/Zend/Ldap/Attribute.php +41 -47
  276. lib/Zend/Ldap/Converter.php +326 -1
  277. lib/Zend/Ldap/Converter/Exception.php +35 -0
  278. lib/Zend/Ldap/Dn.php +3 -3
  279. lib/Zend/Ldap/Exception.php +1 -2
  280. lib/Zend/Ldap/Filter.php +3 -3
  281. lib/Zend/Ldap/Ldif/Encoder.php +1 -1
  282. lib/Zend/Ldap/Node.php +4 -4
  283. lib/Zend/Loader.php +1 -1
  284. lib/Zend/Loader/Autoloader.php +2 -2
  285. lib/Zend/Loader/Autoloader/Interface.php +10 -1
  286. lib/Zend/Loader/PluginLoader.php +1 -1
  287. lib/Zend/Log.php +152 -8
  288. lib/Zend/Log/FactoryInterface.php +2 -2
  289. lib/Zend/Log/Filter/Abstract.php +3 -3
  290. lib/Zend/Log/Filter/Message.php +2 -2
  291. lib/Zend/Log/Filter/Priority.php +3 -3
  292. lib/Zend/Log/Filter/Suppress.php +4 -4
  293. lib/Zend/Log/Writer/Abstract.php +4 -2
  294. lib/Zend/Log/Writer/Db.php +2 -2
  295. lib/Zend/Log/Writer/Firebug.php +3 -2
  296. lib/Zend/Log/Writer/Mail.php +128 -8
  297. lib/Zend/Log/Writer/Syslog.php +8 -3
  298. lib/Zend/Log/Writer/ZendMonitor.php +22 -3
  299. lib/Zend/Mail.php +33 -17
  300. lib/Zend/Mail/Protocol/Abstract.php +27 -4
  301. lib/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php +1 -1
  302. lib/Zend/Mail/Protocol/Smtp/Auth/Plain.php +1 -1
  303. lib/Zend/Mail/Transport/File.php +134 -0
  304. lib/Zend/Mail/Transport/Sendmail.php +1 -1
  305. lib/Zend/Mail/Transport/Smtp.php +2 -2
  306. lib/Zend/Markup/Parser/Bbcode.php +1 -1
  307. lib/Zend/Markup/Renderer/Html.php +1 -1
  308. lib/Zend/Markup/Renderer/Html/Img.php +1 -1
  309. lib/Zend/Markup/Renderer/Html/Url.php +1 -1
  310. lib/Zend/Markup/Renderer/RendererAbstract.php +1 -1
  311. lib/Zend/Measure/Abstract.php +1 -1
  312. lib/Zend/Memory.php +1 -1
  313. lib/Zend/Navigation/Page.php +27 -1
  314. lib/Zend/Oauth.php +1 -1
  315. lib/Zend/Oauth/Client.php +11 -8
  316. lib/Zend/Oauth/Config.php +3 -3
  317. lib/Zend/Oauth/Consumer.php +18 -12
  318. lib/Zend/Oauth/Exception.php +1 -0
  319. lib/Zend/Oauth/Http.php +6 -6
  320. lib/Zend/Oauth/Http/RequestToken.php +2 -2
  321. lib/Zend/Oauth/Http/Utility.php +2 -2
  322. lib/Zend/Oauth/Signature/Plaintext.php +2 -2
  323. lib/Zend/Oauth/Signature/SignatureAbstract.php +2 -2
  324. lib/Zend/Oauth/Token.php +4 -4
  325. lib/Zend/Oauth/Token/AuthorizedRequest.php +3 -3
  326. lib/Zend/OpenId.php +1 -1
  327. lib/Zend/OpenId/Consumer/Storage/File.php +7 -3
  328. lib/Zend/OpenId/Provider.php +25 -3
  329. lib/Zend/Paginator.php +37 -4
  330. lib/Zend/Paginator/Adapter/Interface.php +2 -9
  331. lib/Zend/Paginator/Adapter/Null.php +1 -1
  332. lib/Zend/Paginator/AdapterAggregate.php +1 -1
  333. lib/Zend/Paginator/SerializableLimitIterator.php +2 -1
  334. lib/Zend/Pdf.php +8 -2
  335. lib/Zend/Pdf/Action.php +1 -1
  336. lib/Zend/Pdf/Annotation/Markup.php +1 -0
  337. lib/Zend/Pdf/Canvas.php +182 -0
  338. lib/Zend/Pdf/Canvas/Abstract.php +1214 -0
  339. lib/Zend/Pdf/Canvas/Interface.php +493 -0
  340. lib/Zend/Pdf/Element.php +19 -1
  341. lib/Zend/Pdf/Element/Array.php +34 -1
  342. lib/Zend/Pdf/Element/Dictionary.php +48 -1
  343. lib/Zend/Pdf/Element/Object.php +35 -1
  344. lib/Zend/Pdf/Element/Object/Stream.php +78 -47
  345. lib/Zend/Pdf/Element/Reference.php +27 -1
  346. lib/Zend/Pdf/Element/Stream.php +14 -1
  347. lib/Zend/Pdf/Element/String.php +1 -1
  348. lib/Zend/Pdf/ElementFactory.php +11 -1
  349. lib/Zend/Pdf/ElementFactory/Interface.php +8 -1
  350. lib/Zend/Pdf/ElementFactory/Proxy.php +11 -1
  351. lib/Zend/Pdf/FileParser/Image/Png.php +1 -1
  352. lib/Zend/Pdf/Filter/Ascii85.php +1 -1
  353. lib/Zend/Pdf/Filter/RunLength.php +1 -0
  354. lib/Zend/Pdf/Outline/Loaded.php +6 -8
  355. lib/Zend/Pdf/Page.php +238 -1246
  356. lib/Zend/Pdf/Parser.php +12 -4
  357. lib/Zend/Pdf/Resource.php +68 -4
  358. lib/Zend/Pdf/Resource/ContentStream.php +114 -0
  359. lib/Zend/Pdf/Resource/Extractor.php +86 -0
  360. lib/Zend/Pdf/Resource/Font/Extracted.php +1 -1
  361. lib/Zend/Pdf/Resource/GraphicsState.php +109 -0
  362. lib/Zend/Pdf/Resource/Image.php +1 -5
  363. lib/Zend/Pdf/Resource/Image/Jpeg.php +19 -8
  364. lib/Zend/Pdf/Resource/Image/Png.php +11 -5
  365. lib/Zend/Pdf/Resource/Unified.php +38 -0
  366. lib/Zend/Pdf/StringParser.php +1 -1
  367. lib/Zend/Pdf/Style.php +1 -2
  368. lib/Zend/Queue/Adapter/Db/queue_sqlite.sql +1 -0
  369. lib/Zend/Queue/Adapter/Db/sqlsrv.sql +44 -0
  370. lib/Zend/Queue/Stomp/Frame.php +5 -5
  371. lib/Zend/Reflection/File.php +1 -1
  372. lib/Zend/Rest/Route.php +13 -1
  373. lib/Zend/Search/Lucene.php +4 -2
  374. lib/Zend/Search/Lucene/Document/Html.php +2 -2
  375. lib/Zend/Search/Lucene/Index/SegmentInfo.php +2 -2
  376. lib/Zend/Search/Lucene/Index/TermsStream/Interface.php +2 -2
  377. lib/Zend/Search/Lucene/MultiSearcher.php +3 -3
  378. lib/Zend/Search/Lucene/Search/Query/Range.php +2 -2
  379. lib/Zend/Search/Lucene/Search/QueryParser.php +1 -1
  380. lib/Zend/Search/Lucene/Storage/File/Filesystem.php +13 -2
  381. lib/Zend/Search/Lucene/TermStreamsPriorityQueue.php +5 -9
  382. lib/Zend/Serializer.php +1 -1
  383. lib/Zend/Serializer/Adapter/AdapterAbstract.php +1 -1
  384. lib/Zend/Serializer/Adapter/AdapterInterface.php +1 -1
  385. lib/Zend/Serializer/Adapter/Amf0.php +1 -1
  386. lib/Zend/Serializer/Adapter/Amf3.php +1 -1
  387. lib/Zend/Serializer/Adapter/Igbinary.php +1 -1
  388. lib/Zend/Serializer/Adapter/Json.php +1 -1
  389. lib/Zend/Serializer/Adapter/PhpCode.php +1 -1
  390. lib/Zend/Serializer/Adapter/PhpSerialize.php +1 -1
  391. lib/Zend/Serializer/Adapter/PythonPickle.php +2 -2
  392. lib/Zend/Serializer/Adapter/Wddx.php +1 -1
  393. lib/Zend/Serializer/Exception.php +1 -1
  394. lib/Zend/Server/Reflection/Function/Abstract.php +15 -3
  395. lib/Zend/Service/Amazon/Authentication.php +82 -0
  396. lib/Zend/Service/Amazon/Authentication/Exception.php +37 -0
  397. lib/Zend/Service/Amazon/Authentication/S3.php +112 -0
  398. lib/Zend/Service/Amazon/Authentication/V1.php +108 -0
  399. lib/Zend/Service/Amazon/Authentication/V2.php +138 -0
  400. lib/Zend/Service/Amazon/Ec2/Ebs.php +1 -1
  401. lib/Zend/Service/Amazon/Ec2/Instance.php +1 -1
  402. lib/Zend/Service/Amazon/Item.php +1 -1
  403. lib/Zend/Service/Amazon/Offer.php +1 -1
  404. lib/Zend/Service/Amazon/S3.php +60 -5
  405. lib/Zend/Service/Amazon/S3/Stream.php +1 -1
  406. lib/Zend/Service/Amazon/SimpleDb.php +580 -0
  407. lib/Zend/Service/Amazon/SimpleDb/Attribute.php +108 -0
  408. lib/Zend/Service/Amazon/SimpleDb/Exception.php +66 -0
  409. lib/Zend/Service/Amazon/SimpleDb/Page.php +97 -0
  410. lib/Zend/Service/Amazon/SimpleDb/Response.php +190 -0
  411. lib/Zend/Service/Amazon/Sqs.php +28 -7
  412. lib/Zend/Service/DeveloperGarden/Client/ClientAbstract.php +2 -2
  413. lib/Zend/Service/DeveloperGarden/Client/Soap.php +2 -2
  414. lib/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php +2 -2
  415. lib/Zend/Service/DeveloperGarden/Request/SendSms/SendSmsAbstract.php +1 -1
  416. lib/Zend/Service/DeveloperGarden/Response/SecurityTokenServer/SecurityTokenResponse.php +2 -2
  417. lib/Zend/Service/Ebay/Abstract.php +309 -0
  418. lib/Zend/Service/Ebay/Exception.php +37 -0
  419. lib/Zend/Service/Ebay/Finding.php +421 -0
  420. lib/Zend/Service/Ebay/Finding/Abstract.php +169 -0
  421. lib/Zend/Service/Ebay/Finding/Aspect.php +68 -0
  422. lib/Zend/Service/Ebay/Finding/Aspect/Histogram/Container.php +106 -0
  423. lib/Zend/Service/Ebay/Finding/Aspect/Histogram/Value.php +56 -0
  424. lib/Zend/Service/Ebay/Finding/Aspect/Histogram/Value/Set.php +57 -0
  425. lib/Zend/Service/Ebay/Finding/Aspect/Set.php +57 -0
  426. lib/Zend/Service/Ebay/Finding/Category.php +73 -0
  427. lib/Zend/Service/Ebay/Finding/Category/Histogram.php +77 -0
  428. lib/Zend/Service/Ebay/Finding/Category/Histogram/Container.php +66 -0
  429. lib/Zend/Service/Ebay/Finding/Category/Histogram/Set.php +57 -0
  430. lib/Zend/Service/Ebay/Finding/Error/Data.php +158 -0
  431. lib/Zend/Service/Ebay/Finding/Error/Data/Set.php +57 -0
  432. lib/Zend/Service/Ebay/Finding/Error/Message.php +60 -0
  433. lib/Zend/Service/Ebay/Finding/Exception.php +37 -0
  434. lib/Zend/Service/Ebay/Finding/ListingInfo.php +211 -0
  435. lib/Zend/Service/Ebay/Finding/PaginationOutput.php +115 -0
  436. lib/Zend/Service/Ebay/Finding/Response/Abstract.php +185 -0
  437. lib/Zend/Service/Ebay/Finding/Response/Histograms.php +86 -0
  438. lib/Zend/Service/Ebay/Finding/Response/Items.php +249 -0
  439. lib/Zend/Service/Ebay/Finding/Response/Keywords.php +78 -0
  440. lib/Zend/Service/Ebay/Finding/Search/Item.php +394 -0
  441. lib/Zend/Service/Ebay/Finding/Search/Item/Set.php +57 -0
  442. lib/Zend/Service/Ebay/Finding/Search/Result.php +63 -0
  443. lib/Zend/Service/Ebay/Finding/SellerInfo.php +144 -0
  444. lib/Zend/Service/Ebay/Finding/SellingStatus.php +130 -0
  445. lib/Zend/Service/Ebay/Finding/Set/Abstract.php +128 -0
  446. lib/Zend/Service/Ebay/Finding/ShippingInfo.php +126 -0
  447. lib/Zend/Service/Ebay/Finding/Storefront.php +73 -0
  448. lib/Zend/Service/Flickr.php +1 -1
  449. lib/Zend/Service/LiveDocx.php +2 -2
  450. lib/Zend/Service/LiveDocx/Exception.php +1 -1
  451. lib/Zend/Service/LiveDocx/MailMerge.php +184 -24
  452. lib/Zend/Service/ShortUrl/AbstractShortener.php +83 -0
  453. lib/Zend/Service/ShortUrl/Exception.php +32 -0
  454. lib/Zend/Service/ShortUrl/IsGd.php +96 -0
  455. lib/Zend/Service/ShortUrl/JdemCz.php +84 -0
  456. lib/Zend/Service/ShortUrl/MetamarkNet.php +85 -0
  457. lib/Zend/Service/ShortUrl/Shortener.php +45 -0
  458. lib/Zend/Service/ShortUrl/TinyUrlCom.php +100 -0
  459. lib/Zend/Service/Twitter.php +12 -4
  460. lib/Zend/Service/WindowsAzure/Credentials/CredentialsAbstract.php +1 -1
  461. lib/Zend/Service/WindowsAzure/Credentials/SharedAccessSignature.php +1 -1
  462. lib/Zend/Service/WindowsAzure/Credentials/SharedKey.php +3 -3
  463. lib/Zend/Service/WindowsAzure/Credentials/SharedKeyLite.php +1 -1
  464. lib/Zend/Service/WindowsAzure/Diagnostics/Manager.php +3 -3
  465. lib/Zend/Service/WindowsAzure/Exception.php +1 -1
  466. lib/Zend/Service/WindowsAzure/RetryPolicy/Exception.php +1 -1
  467. lib/Zend/Service/WindowsAzure/RetryPolicy/NoRetry.php +1 -1
  468. lib/Zend/Service/WindowsAzure/RetryPolicy/RetryN.php +1 -1
  469. lib/Zend/Service/WindowsAzure/RetryPolicy/RetryPolicyAbstract.php +1 -1
  470. lib/Zend/Service/WindowsAzure/SessionHandler.php +1 -1
  471. lib/Zend/Service/WindowsAzure/Storage.php +18 -8
  472. lib/Zend/Service/WindowsAzure/Storage/Batch.php +3 -3
  473. lib/Zend/Service/WindowsAzure/Storage/BatchStorageAbstract.php +3 -3
  474. lib/Zend/Service/WindowsAzure/Storage/Blob.php +38 -38
  475. lib/Zend/Service/WindowsAzure/Storage/Blob/Stream.php +4 -4
  476. lib/Zend/Service/WindowsAzure/Storage/BlobContainer.php +1 -1
  477. lib/Zend/Service/WindowsAzure/Storage/BlobInstance.php +1 -1
  478. lib/Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php +2 -2
  479. lib/Zend/Service/WindowsAzure/Storage/Queue.php +13 -13
  480. lib/Zend/Service/WindowsAzure/Storage/QueueInstance.php +1 -1
  481. lib/Zend/Service/WindowsAzure/Storage/QueueMessage.php +1 -1
  482. lib/Zend/Service/WindowsAzure/Storage/SignedIdentifier.php +1 -1
  483. lib/Zend/Service/WindowsAzure/Storage/Table.php +21 -12
  484. lib/Zend/Service/WindowsAzure/Storage/TableEntity.php +9 -4
  485. lib/Zend/Service/WindowsAzure/Storage/TableEntityQuery.php +6 -6
  486. lib/Zend/Service/WindowsAzure/Storage/TableInstance.php +1 -1
  487. lib/Zend/Session.php +1 -1
  488. lib/Zend/Soap/AutoDiscover.php +50 -4
  489. lib/Zend/Soap/Client.php +17 -9
  490. lib/Zend/Soap/Server.php +3 -1
  491. lib/Zend/Soap/Wsdl.php +10 -4
  492. lib/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php +3 -4
  493. lib/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php +10 -2
  494. lib/Zend/Test/PHPUnit/Constraint/DomQuery.php +19 -1
  495. lib/Zend/Test/PHPUnit/ControllerTestCase.php +28 -1
  496. lib/Zend/Text/MultiByte.php +1 -1
  497. lib/Zend/TimeSync/Ntp.php +1 -1
  498. lib/Zend/Tool/Framework/Client/Abstract.php +2 -2
  499. lib/Zend/Tool/Framework/Client/Console.php +8 -8
  500. lib/Zend/Tool/Framework/Client/Console/ArgumentParser.php +1 -1
  501. lib/Zend/Tool/Framework/Client/Manifest.php +1 -1
  502. lib/Zend/Tool/Framework/Loader/BasicLoader.php +1 -1
  503. lib/Zend/Tool/Framework/Loader/IncludePathLoader.php +1 -1
  504. lib/Zend/Tool/Framework/Loader/Interface.php +4 -4
  505. lib/Zend/Tool/Framework/Metadata/Attributable.php +1 -0
  506. lib/Zend/Tool/Framework/Metadata/Basic.php +2 -2
  507. lib/Zend/Tool/Framework/Provider/Initializable.php +31 -0
  508. lib/Zend/Tool/Framework/Provider/Repository.php +15 -5
  509. lib/Zend/Tool/Framework/Provider/Signature.php +5 -2
  510. lib/Zend/Tool/Framework/System/Provider/Config.php +14 -2
  511. lib/Zend/Tool/Framework/System/Provider/Version.php +1 -1
  512. lib/Zend/Tool/Project/Context/Filesystem/File.php +1 -1
  513. lib/Zend/Tool/Project/Context/System/ProjectProfileFile.php +1 -1
  514. lib/Zend/Tool/Project/Context/System/ProjectProvidersDirectory.php +10 -20
  515. lib/Zend/Tool/Project/Context/Zf/AbstractClassFile.php +6 -6
  516. lib/Zend/Tool/Project/Context/Zf/ApplicationConfigFile.php +1 -1
  517. lib/Zend/Tool/Project/Context/Zf/ApplicationDirectory.php +1 -1
  518. lib/Zend/Tool/Project/Context/Zf/ControllerFile.php +6 -6
  519. lib/Zend/Tool/Project/Context/Zf/DbTableFile.php +1 -1
  520. lib/Zend/Tool/Project/Context/Zf/FormFile.php +13 -8
  521. lib/Zend/Tool/Project/Context/Zf/HtaccessFile.php +1 -1
  522. lib/Zend/Tool/Project/Context/Zf/LayoutScriptFile.php +1 -1
  523. lib/Zend/Tool/Project/Context/Zf/LayoutScriptsDirectory.php +1 -1
  524. lib/Zend/Tool/Project/Context/Zf/ViewControllerScriptsDirectory.php +18 -2
  525. lib/Zend/Tool/Project/Context/Zf/ViewScriptFile.php +18 -2
  526. lib/Zend/Tool/Project/Context/Zf/ZfStandardLibraryDirectory.php +1 -1
  527. lib/Zend/Tool/Project/Profile.php +1 -1
  528. lib/Zend/Tool/Project/Profile/FileParser/Xml.php +1 -1
  529. lib/Zend/Tool/Project/Profile/Resource/Container.php +1 -1
  530. lib/Zend/Tool/Project/Provider/Abstract.php +64 -26
  531. lib/Zend/Tool/Project/Provider/Action.php +1 -1
  532. lib/Zend/Tool/Project/Provider/Application.php +1 -1
  533. lib/Zend/Tool/Project/Provider/Controller.php +1 -1
  534. lib/Zend/Tool/Project/Provider/DbAdapter.php +1 -1
  535. lib/Zend/Tool/Project/Provider/DbTable.php +1 -1
  536. lib/Zend/Tool/Project/Provider/Form.php +25 -1
  537. lib/Zend/Tool/Project/Provider/Layout.php +1 -1
  538. lib/Zend/Tool/Project/Provider/Manifest.php +1 -1
  539. lib/Zend/Tool/Project/Provider/Model.php +1 -1
  540. lib/Zend/Tool/Project/Provider/Module.php +9 -4
  541. lib/Zend/Tool/Project/Provider/Project.php +1 -1
  542. lib/Zend/Translate.php +1 -1
  543. lib/Zend/Translate/Adapter.php +6 -4
  544. lib/Zend/Translate/Adapter/Csv.php +1 -1
  545. lib/Zend/Translate/Adapter/Gettext.php +1 -1
  546. lib/Zend/Translate/Adapter/Tmx.php +1 -1
  547. lib/Zend/Translate/Plural.php +1 -1
  548. lib/Zend/Uri.php +7 -2
  549. lib/Zend/Uri/Http.php +2 -2
  550. lib/Zend/Validate.php +1 -1
  551. lib/Zend/Validate/Abstract.php +1 -1
  552. lib/Zend/Validate/Alnum.php +2 -2
  553. lib/Zend/Validate/Alpha.php +2 -2
  554. lib/Zend/Validate/Barcode.php +2 -2
  555. lib/Zend/Validate/Barcode/AdapterAbstract.php +1 -1
  556. lib/Zend/Validate/Barcode/AdapterInterface.php +1 -1
  557. lib/Zend/Validate/Barcode/Code25.php +1 -1
  558. lib/Zend/Validate/Barcode/Code25interleaved.php +1 -1
  559. lib/Zend/Validate/Barcode/Code39.php +1 -1
  560. lib/Zend/Validate/Barcode/Code39ext.php +1 -1
  561. lib/Zend/Validate/Barcode/Code93.php +1 -1
  562. lib/Zend/Validate/Barcode/Code93ext.php +1 -1
  563. lib/Zend/Validate/Barcode/Ean12.php +1 -1
  564. lib/Zend/Validate/Barcode/Ean14.php +1 -1
  565. lib/Zend/Validate/Barcode/Ean18.php +1 -1
  566. lib/Zend/Validate/Barcode/Ean2.php +1 -1
  567. lib/Zend/Validate/Barcode/Ean5.php +1 -1
  568. lib/Zend/Validate/Barcode/Ean8.php +1 -1
  569. lib/Zend/Validate/Barcode/Gtin12.php +1 -1
  570. lib/Zend/Validate/Barcode/Gtin13.php +1 -1
  571. lib/Zend/Validate/Barcode/Gtin14.php +1 -1
  572. lib/Zend/Validate/Barcode/Identcode.php +1 -1
  573. lib/Zend/Validate/Barcode/Intelligentmail.php +1 -1
  574. lib/Zend/Validate/Barcode/Issn.php +1 -1
  575. lib/Zend/Validate/Barcode/Itf14.php +1 -1
  576. lib/Zend/Validate/Barcode/Leitcode.php +1 -1
  577. lib/Zend/Validate/Barcode/Planet.php +1 -1
  578. lib/Zend/Validate/Barcode/Postnet.php +1 -1
  579. lib/Zend/Validate/Barcode/Royalmail.php +1 -1
  580. lib/Zend/Validate/Barcode/Sscc.php +1 -1
  581. lib/Zend/Validate/Barcode/Upce.php +1 -1
  582. lib/Zend/Validate/Callback.php +2 -2
  583. lib/Zend/Validate/CreditCard.php +5 -5
  584. lib/Zend/Validate/Date.php +2 -2
  585. lib/Zend/Validate/Db/Abstract.php +82 -29
  586. lib/Zend/Validate/Digits.php +3 -3
  587. lib/Zend/Validate/EmailAddress.php +3 -3
  588. lib/Zend/Validate/File/Count.php +1 -1
  589. lib/Zend/Validate/File/Crc32.php +2 -2
  590. lib/Zend/Validate/File/ExcludeExtension.php +2 -2
  591. lib/Zend/Validate/File/ExcludeMimeType.php +1 -1
  592. lib/Zend/Validate/File/Exists.php +1 -1
  593. lib/Zend/Validate/File/Extension.php +2 -2
  594. lib/Zend/Validate/File/FilesSize.php +1 -1
  595. lib/Zend/Validate/File/Hash.php +2 -2
  596. lib/Zend/Validate/File/ImageSize.php +2 -2
  597. lib/Zend/Validate/File/IsCompressed.php +3 -3
  598. lib/Zend/Validate/File/IsImage.php +2 -2
  599. lib/Zend/Validate/File/Md5.php +2 -2
  600. lib/Zend/Validate/File/MimeType.php +3 -3
  601. lib/Zend/Validate/File/NotExists.php +1 -1
  602. lib/Zend/Validate/File/Sha1.php +2 -2
  603. lib/Zend/Validate/File/Size.php +2 -2
  604. lib/Zend/Validate/File/Upload.php +1 -1
  605. lib/Zend/Validate/File/WordCount.php +2 -2
  606. lib/Zend/Validate/Float.php +2 -2
  607. lib/Zend/Validate/GreaterThan.php +1 -1
  608. lib/Zend/Validate/Hex.php +2 -2
  609. lib/Zend/Validate/Hostname.php +28 -12
  610. lib/Zend/Validate/Iban.php +1 -1
  611. lib/Zend/Validate/Identical.php +1 -1
  612. lib/Zend/Validate/InArray.php +1 -1
  613. lib/Zend/Validate/Int.php +2 -2
  614. lib/Zend/Validate/Interface.php +2 -2
  615. lib/Zend/Validate/Ip.php +2 -2
  616. lib/Zend/Validate/Isbn.php +2 -2
  617. lib/Zend/Validate/NotEmpty.php +2 -2
  618. lib/Zend/Validate/PostCode.php +2 -2
  619. lib/Zend/Validate/Regex.php +2 -2
  620. lib/Zend/Validate/Sitemap/Changefreq.php +2 -2
  621. lib/Zend/Validate/Sitemap/Lastmod.php +2 -2
  622. lib/Zend/Validate/Sitemap/Loc.php +2 -2
  623. lib/Zend/Validate/Sitemap/Priority.php +2 -2
  624. lib/Zend/Validate/StringLength.php +2 -2
  625. lib/Zend/Version.php +31 -3
  626. lib/Zend/View/Abstract.php +1 -1
  627. lib/Zend/View/Helper/Currency.php +1 -1
  628. lib/Zend/View/Helper/FormButton.php +1 -1
  629. lib/Zend/View/Helper/FormElement.php +1 -1
  630. lib/Zend/View/Helper/FormLabel.php +1 -1
  631. lib/Zend/View/Helper/FormSubmit.php +7 -4
  632. lib/Zend/View/Helper/Gravatar.php +363 -0
  633. lib/Zend/View/Helper/HeadLink.php +2 -2
  634. lib/Zend/View/Helper/HeadScript.php +1 -1
  635. lib/Zend/View/Helper/HeadTitle.php +6 -5
  636. lib/Zend/View/Helper/Json.php +2 -2
  637. lib/Zend/View/Helper/ServerUrl.php +9 -5
  638. lib/Zend/View/Helper/TinySrc.php +317 -0
  639. lib/Zend/View/Helper/UserAgent.php +76 -0
  640. lib/Zend/Wildfire/Channel/HttpHeaders.php +6 -2
  641. lib/Zend/Wildfire/Plugin/FirePhp.php +19 -3
  642. lib/Zend/XmlRpc/Generator/DomDocument.php +1 -1
  643. lib/Zend/XmlRpc/Generator/GeneratorAbstract.php +1 -1
  644. lib/Zend/XmlRpc/Generator/XmlWriter.php +1 -1
  645. lib/Zend/XmlRpc/Response.php +4 -1
  646. lib/Zend/XmlRpc/Value.php +1 -1
  647. lib/Zend/XmlRpc/Value/Array.php +1 -1
  648. lib/Zend/XmlRpc/Value/BigInteger.php +1 -1
  649. lib/Zend/XmlRpc/Value/Double.php +1 -1
  650. lib/Zend/XmlRpc/Value/Scalar.php +1 -1
  651. lib/Zend/XmlRpc/Value/Struct.php +1 -1
  652. package.xml +6 -6
lib/Zend/Acl.php CHANGED
@@ -16,7 +16,7 @@
16
* @package Zend_Acl
17
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
18
* @license http://framework.zend.com/license/new-bsd New BSD License
19
- * @version $Id: Acl.php 22456 2010-06-18 22:41:37Z ralph $
20
*/
21
22
@@ -632,22 +632,30 @@ class Zend_Acl
632
unset($rolesTemp);
633
634
// ensure that all specified Resources exist; normalize input to array of Resource objects or null
635
- if (!is_array($resources)) {
636
- $resources = array($resources);
637
- } else if (0 === count($resources)) {
638
- $resources = array(null);
639
- }
640
- $resourcesTemp = $resources;
641
- $resources = array();
642
- foreach ($resourcesTemp as $resource) {
643
- if (null !== $resource) {
644
- $resources[] = $this->get($resource);
645
- } else {
646
- $resources[] = null;
647
}
648
}
649
- unset($resourcesTemp);
650
-
651
// normalize privileges to array
652
if (null === $privileges) {
653
$privileges = array();
@@ -659,15 +667,32 @@ class Zend_Acl
659
660
// add to the rules
661
case self::OP_ADD:
662
- foreach ($resources as $resource) {
663
foreach ($roles as $role) {
664
- $rules =& $this->_getRules($resource, $role, true);
665
if (0 === count($privileges)) {
666
$rules['allPrivileges']['type'] = $type;
667
$rules['allPrivileges']['assert'] = $assert;
668
- if (!isset($rules['byPrivilegeId'])) {
669
- $rules['byPrivilegeId'] = array();
670
- }
671
} else {
672
foreach ($privileges as $privilege) {
673
$rules['byPrivilegeId'][$privilege]['type'] = $type;
@@ -680,37 +705,81 @@ class Zend_Acl
680
681
// remove from the rules
682
case self::OP_REMOVE:
683
- foreach ($resources as $resource) {
684
- foreach ($roles as $role) {
685
- $rules =& $this->_getRules($resource, $role);
686
- if (null === $rules) {
687
- continue;
688
- }
689
- if (0 === count($privileges)) {
690
- if (null === $resource && null === $role) {
691
- if ($type === $rules['allPrivileges']['type']) {
692
- $rules = array(
693
- 'allPrivileges' => array(
694
- 'type' => self::TYPE_DENY,
695
- 'assert' => null
696
- ),
697
- 'byPrivilegeId' => array()
698
- );
699
- }
700
continue;
701
}
702
-
703
- if (isset($rules['allPrivileges']['type']) &&
704
- $type === $rules['allPrivileges']['type'])
705
- {
706
- unset($rules['allPrivileges']);
707
- }
708
- } else {
709
- foreach ($privileges as $privilege) {
710
- if (isset($rules['byPrivilegeId'][$privilege]) &&
711
- $type === $rules['byPrivilegeId'][$privilege]['type'])
712
{
713
- unset($rules['byPrivilegeId'][$privilege]);
714
}
715
}
716
}
@@ -1129,6 +1198,7 @@ class Zend_Acl
1129
return $nullRef;
1130
}
1131
$visitor['byRoleId'][$roleId]['byPrivilegeId'] = array();
1132
}
1133
return $visitor['byRoleId'][$roleId];
1134
}
16
* @package Zend_Acl
17
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
18
* @license http://framework.zend.com/license/new-bsd New BSD License
19
+ * @version $Id: Acl.php 23358 2010-11-18 16:19:31Z ralph $
20
*/
21
22
632
unset($rolesTemp);
633
634
// ensure that all specified Resources exist; normalize input to array of Resource objects or null
635
+ if ($resources !== null) {
636
+ if (!is_array($resources)) {
637
+ $resources = array($resources);
638
+ } else if (0 === count($resources)) {
639
+ $resources = array(null);
640
+ }
641
+ $resourcesTemp = $resources;
642
+ $resources = array();
643
+ foreach ($resourcesTemp as $resource) {
644
+ if (null !== $resource) {
645
+ $resources[] = $this->get($resource);
646
+ } else {
647
+ $resources[] = null;
648
+ }
649
}
650
+ unset($resourcesTemp, $resource);
651
+ } else {
652
+ $allResources = array(); // this might be used later if resource iteration is required
653
+ foreach ($this->_resources as $rTarget) {
654
+ $allResources[] = $rTarget['instance'];
655
+ }
656
+ unset($rTarget);
657
}
658
+
659
// normalize privileges to array
660
if (null === $privileges) {
661
$privileges = array();
667
668
// add to the rules
669
case self::OP_ADD:
670
+ if ($resources !== null) {
671
+ // this block will iterate the provided resources
672
+ foreach ($resources as $resource) {
673
+ foreach ($roles as $role) {
674
+ $rules =& $this->_getRules($resource, $role, true);
675
+ if (0 === count($privileges)) {
676
+ $rules['allPrivileges']['type'] = $type;
677
+ $rules['allPrivileges']['assert'] = $assert;
678
+ if (!isset($rules['byPrivilegeId'])) {
679
+ $rules['byPrivilegeId'] = array();
680
+ }
681
+ } else {
682
+ foreach ($privileges as $privilege) {
683
+ $rules['byPrivilegeId'][$privilege]['type'] = $type;
684
+ $rules['byPrivilegeId'][$privilege]['assert'] = $assert;
685
+ }
686
+ }
687
+ }
688
+ }
689
+ } else {
690
+ // this block will apply to all resources in a global rule
691
foreach ($roles as $role) {
692
+ $rules =& $this->_getRules(null, $role, true);
693
if (0 === count($privileges)) {
694
$rules['allPrivileges']['type'] = $type;
695
$rules['allPrivileges']['assert'] = $assert;
696
} else {
697
foreach ($privileges as $privilege) {
698
$rules['byPrivilegeId'][$privilege]['type'] = $type;
705
706
// remove from the rules
707
case self::OP_REMOVE:
708
+ if ($resources !== null) {
709
+ // this block will iterate the provided resources
710
+ foreach ($resources as $resource) {
711
+ foreach ($roles as $role) {
712
+ $rules =& $this->_getRules($resource, $role);
713
+ if (null === $rules) {
714
continue;
715
}
716
+ if (0 === count($privileges)) {
717
+ if (null === $resource && null === $role) {
718
+ if ($type === $rules['allPrivileges']['type']) {
719
+ $rules = array(
720
+ 'allPrivileges' => array(
721
+ 'type' => self::TYPE_DENY,
722
+ 'assert' => null
723
+ ),
724
+ 'byPrivilegeId' => array()
725
+ );
726
+ }
727
+ continue;
728
+ }
729
+
730
+ if (isset($rules['allPrivileges']['type']) &&
731
+ $type === $rules['allPrivileges']['type'])
732
{
733
+ unset($rules['allPrivileges']);
734
+ }
735
+ } else {
736
+ foreach ($privileges as $privilege) {
737
+ if (isset($rules['byPrivilegeId'][$privilege]) &&
738
+ $type === $rules['byPrivilegeId'][$privilege]['type'])
739
+ {
740
+ unset($rules['byPrivilegeId'][$privilege]);
741
+ }
742
+ }
743
+ }
744
+ }
745
+ }
746
+ } else {
747
+ // this block will apply to all resources in a global rule
748
+ foreach ($roles as $role) {
749
+ /**
750
+ * since null (all resources) was passed to this setRule() call, we need
751
+ * clean up all the rules for the global allResources, as well as the indivually
752
+ * set resources (per privilege as well)
753
+ */
754
+ foreach (array_merge(array(null), $allResources) as $resource) {
755
+ $rules =& $this->_getRules($resource, $role, true);
756
+ if (null === $rules) {
757
+ continue;
758
+ }
759
+ if (0 === count($privileges)) {
760
+ if (null === $role) {
761
+ if ($type === $rules['allPrivileges']['type']) {
762
+ $rules = array(
763
+ 'allPrivileges' => array(
764
+ 'type' => self::TYPE_DENY,
765
+ 'assert' => null
766
+ ),
767
+ 'byPrivilegeId' => array()
768
+ );
769
+ }
770
+ continue;
771
+ }
772
+
773
+ if (isset($rules['allPrivileges']['type']) && $type === $rules['allPrivileges']['type']) {
774
+ unset($rules['allPrivileges']);
775
+ }
776
+ } else {
777
+ foreach ($privileges as $privilege) {
778
+ if (isset($rules['byPrivilegeId'][$privilege]) &&
779
+ $type === $rules['byPrivilegeId'][$privilege]['type'])
780
+ {
781
+ unset($rules['byPrivilegeId'][$privilege]);
782
+ }
783
}
784
}
785
}
1198
return $nullRef;
1199
}
1200
$visitor['byRoleId'][$roleId]['byPrivilegeId'] = array();
1201
+ $visitor['byRoleId'][$roleId]['allPrivileges'] = array('type' => null, 'assert' => null);
1202
}
1203
return $visitor['byRoleId'][$roleId];
1204
}
lib/Zend/Amf/Adobe/Introspector.php CHANGED
@@ -16,7 +16,7 @@
16
* @package Zend_Amf
17
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
18
* @license http://framework.zend.com/license/new-bsd New BSD License
19
- * @version $Id: Introspector.php 20096 2010-01-06 02:05:09Z bkarwin $
20
*/
21
22
/** @see Zend_Amf_Parse_TypeLoader */
@@ -283,7 +283,12 @@ class Zend_Amf_Adobe_Introspector
283
return 'Unknown';
284
}
285
286
- if (in_array($typename, array('int', 'integer', 'bool', 'boolean', 'float', 'string', 'object', 'Unknown', 'stdClass', 'array'))) {
287
return $typename;
288
}
289
16
* @package Zend_Amf
17
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
18
* @license http://framework.zend.com/license/new-bsd New BSD License
19
+ * @version $Id: Introspector.php 23316 2010-11-10 16:37:40Z matthew $
20
*/
21
22
/** @see Zend_Amf_Parse_TypeLoader */
283
return 'Unknown';
284
}
285
286
+ // Arrays
287
+ if ('array' == $typename) {
288
+ return 'Unknown[]';
289
+ }
290
+
291
+ if (in_array($typename, array('int', 'integer', 'bool', 'boolean', 'float', 'string', 'object', 'Unknown', 'stdClass'))) {
292
return $typename;
293
}
294
lib/Zend/Amf/Parse/Amf0/Deserializer.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Parse_Amf0
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Deserializer.php 21210 2010-02-27 10:37:39Z yoshida@zend.co.jp $
21
*/
22
23
/** Zend_Amf_Constants */
17
* @subpackage Parse_Amf0
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Deserializer.php 21209 2010-02-27 10:37:15Z yoshida@zend.co.jp $
21
*/
22
23
/** Zend_Amf_Constants */
lib/Zend/Amf/Parse/Amf0/Serializer.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Parse_Amf0
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Serializer.php 21969 2010-04-22 03:54:59Z matthew $
21
*/
22
23
/** Zend_Amf_Constants */
17
* @subpackage Parse_Amf0
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Serializer.php 21968 2010-04-22 03:53:34Z matthew $
21
*/
22
23
/** Zend_Amf_Constants */
lib/Zend/Amf/Parse/Amf3/Deserializer.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Parse_Amf3
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Deserializer.php 21969 2010-04-22 03:54:59Z matthew $
21
*/
22
23
/** Zend_Amf_Parse_Deserializer */
17
* @subpackage Parse_Amf3
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Deserializer.php 21968 2010-04-22 03:53:34Z matthew $
21
*/
22
23
/** Zend_Amf_Parse_Deserializer */
lib/Zend/Amf/Parse/Amf3/Serializer.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Parse_Amf3
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Serializer.php 21969 2010-04-22 03:54:59Z matthew $
21
*/
22
23
/** Zend_Amf_Constants */
17
* @subpackage Parse_Amf3
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Serializer.php 22101 2010-05-04 20:07:13Z matthew $
21
*/
22
23
/** Zend_Amf_Constants */
lib/Zend/Amf/Parse/Serializer.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Parse
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Serializer.php 21969 2010-04-22 03:54:59Z matthew $
21
*/
22
23
/**
17
* @subpackage Parse
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Serializer.php 21968 2010-04-22 03:53:34Z matthew $
21
*/
22
23
/**
lib/Zend/Amf/Response.php CHANGED
@@ -16,7 +16,7 @@
16
* @package Zend_Amf
17
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
18
* @license http://framework.zend.com/license/new-bsd New BSD License
19
- * @version $Id: Response.php 21969 2010-04-22 03:54:59Z matthew $
20
*/
21
22
/** @see Zend_Amf_Constants */
16
* @package Zend_Amf
17
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
18
* @license http://framework.zend.com/license/new-bsd New BSD License
19
+ * @version $Id: Response.php 21968 2010-04-22 03:53:34Z matthew $
20
*/
21
22
/** @see Zend_Amf_Constants */
lib/Zend/Amf/Response/Http.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Response
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $
21
*/
22
23
/** Zend_Amf_Response */
@@ -41,8 +41,9 @@ class Zend_Amf_Response_Http extends Zend_Amf_Response
41
public function getResponse()
42
{
43
if (!headers_sent()) {
44
- header('Cache-Control: cache, must-revalidate');
45
- header('Pragma: public');
46
header('Content-Type: application/x-amf');
47
}
48
return parent::getResponse();
17
* @subpackage Response
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Http.php 22096 2010-05-04 15:37:23Z wadearnold $
21
*/
22
23
/** Zend_Amf_Response */
41
public function getResponse()
42
{
43
if (!headers_sent()) {
44
+ header('Cache-Control: no-cache, must-revalidate');
45
+ header('Expires: Thu, 19 Nov 1981 08:52:00 GMT');
46
+ header('Pragma: no-cache');
47
header('Content-Type: application/x-amf');
48
}
49
return parent::getResponse();
lib/Zend/Amf/Server.php CHANGED
@@ -16,7 +16,7 @@
16
* @package Zend_Amf
17
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
18
* @license http://framework.zend.com/license/new-bsd New BSD License
19
- * @version $Id: Server.php 21210 2010-02-27 10:37:39Z yoshida@zend.co.jp $
20
*/
21
22
/** @see Zend_Server_Interface */
@@ -108,7 +108,7 @@ class Zend_Amf_Server implements Zend_Server_Interface
108
protected $_session = false;
109
110
/**
111
- * Namespace allows all AMF calls to not clobber other php session variables
112
* @var Zend_Session_NameSpace default session namespace zend_amf
113
*/
114
protected $_sesionNamespace = 'zend_amf';
@@ -300,12 +300,12 @@ class Zend_Amf_Server implements Zend_Server_Interface
300
$source = $mapped;
301
}
302
}
303
- $qualifiedName = empty($source) ? $method : $source.".".$method;
304
305
if (!isset($this->_table[$qualifiedName])) {
306
// if source is null a method that was not defined was called.
307
if ($source) {
308
- $className = str_replace(".", "_", $source);
309
if(class_exists($className, false) && !isset($this->_classAllowed[$className])) {
310
#require_once 'Zend/Amf/Server/Exception.php';
311
throw new Zend_Amf_Server_Exception('Can not call "' . $className . '" - use setClass()');
@@ -318,7 +318,10 @@ class Zend_Amf_Server implements Zend_Server_Interface
318
}
319
// Add the new loaded class to the server.
320
$this->setClass($className, $source);
321
- } else {
322
#require_once 'Zend/Amf/Server/Exception.php';
323
throw new Zend_Amf_Server_Exception('Method "' . $method . '" does not exist');
324
}
@@ -607,7 +610,7 @@ class Zend_Amf_Server implements Zend_Server_Interface
607
public function handle($request = null)
608
{
609
// Check if request was passed otherwise get it from the server
610
- if (is_null($request) || !$request instanceof Zend_Amf_Request) {
611
$request = $this->getRequest();
612
} else {
613
$this->setRequest($request);
16
* @package Zend_Amf
17
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
18
* @license http://framework.zend.com/license/new-bsd New BSD License
19
+ * @version $Id: Server.php 23256 2010-10-26 12:51:54Z alexander $
20
*/
21
22
/** @see Zend_Server_Interface */
108
protected $_session = false;
109
110
/**
111
+ * Namespace allows all AMF calls to not clobber other PHP session variables
112
* @var Zend_Session_NameSpace default session namespace zend_amf
113
*/
114
protected $_sesionNamespace = 'zend_amf';
300
$source = $mapped;
301
}
302
}
303
+ $qualifiedName = empty($source) ? $method : $source . '.' . $method;
304
305
if (!isset($this->_table[$qualifiedName])) {
306
// if source is null a method that was not defined was called.
307
if ($source) {
308
+ $className = str_replace('.', '_', $source);
309
if(class_exists($className, false) && !isset($this->_classAllowed[$className])) {
310
#require_once 'Zend/Amf/Server/Exception.php';
311
throw new Zend_Amf_Server_Exception('Can not call "' . $className . '" - use setClass()');
318
}
319
// Add the new loaded class to the server.
320
$this->setClass($className, $source);
321
+ }
322
+
323
+ if (!isset($this->_table[$qualifiedName])) {
324
+ // Source is null or doesn't contain specified method
325
#require_once 'Zend/Amf/Server/Exception.php';
326
throw new Zend_Amf_Server_Exception('Method "' . $method . '" does not exist');
327
}
610
public function handle($request = null)
611
{
612
// Check if request was passed otherwise get it from the server
613
+ if ($request === null || !$request instanceof Zend_Amf_Request) {
614
$request = $this->getRequest();
615
} else {
616
$this->setRequest($request);
lib/Zend/Amf/Util/BinaryStream.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Util
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: BinaryStream.php 21210 2010-02-27 10:37:39Z yoshida@zend.co.jp $
21
*/
22
23
/**
17
* @subpackage Util
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: BinaryStream.php 22101 2010-05-04 20:07:13Z matthew $
21
*/
22
23
/**
lib/Zend/Application.php CHANGED
@@ -16,7 +16,7 @@
16
* @package Zend_Application
17
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
18
* @license http://framework.zend.com/license/new-bsd New BSD License
19
- * @version $Id: Application.php 20096 2010-01-06 02:05:09Z bkarwin $
20
*/
21
22
/**
@@ -387,6 +387,14 @@ class Zend_Application
387
$config = new Zend_Config_Xml($file, $environment);
388
break;
389
390
case 'php':
391
case 'inc':
392
$config = include $file;
16
* @package Zend_Application
17
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
18
* @license http://framework.zend.com/license/new-bsd New BSD License
19
+ * @version $Id: Application.php 23163 2010-10-19 16:30:26Z matthew $
20
*/
21
22
/**
387
$config = new Zend_Config_Xml($file, $environment);
388
break;
389
390
+ case 'json':
391
+ $config = new Zend_Config_Json($file, $environment);
392
+ break;
393
+
394
+ case 'yaml':
395
+ $config = new Zend_Config_Yaml($file, $environment);
396
+ break;
397
+
398
case 'php':
399
case 'inc':
400
$config = include $file;
lib/Zend/Application/Bootstrap/Bootstrap.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Bootstrap
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Bootstrap.php 20886 2010-02-03 19:36:06Z matthew $
21
*/
22
23
/**
17
* @subpackage Bootstrap
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Bootstrap.php 20885 2010-02-03 19:33:59Z matthew $
21
*/
22
23
/**
lib/Zend/Application/Bootstrap/BootstrapAbstract.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Bootstrap
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: BootstrapAbstract.php 22665 2010-07-25 00:40:37Z ramon $
21
*/
22
23
/**
@@ -95,7 +95,7 @@ abstract class Zend_Application_Bootstrap_BootstrapAbstract
95
*
96
* @param Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application
97
* @return void
98
- * @throws Zend_Application_Bootstrap_Exception When invalid applicaiton is provided
99
*/
100
public function __construct($application)
101
{
17
* @subpackage Bootstrap
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: BootstrapAbstract.php 23278 2010-10-30 12:50:21Z ramon $
21
*/
22
23
/**
95
*
96
* @param Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application
97
* @return void
98
+ * @throws Zend_Application_Bootstrap_Exception When invalid application is provided
99
*/
100
public function __construct($application)
101
{
lib/Zend/Application/Resource/Cachemanager.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id$
21
*/
22
23
#require_once 'Zend/Application/Resource/ResourceAbstract.php';
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Cachemanager.php 20785 2010-01-31 09:43:03Z mikaelkael $
21
*/
22
23
#require_once 'Zend/Application/Resource/ResourceAbstract.php';
lib/Zend/Application/Resource/Db.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Db.php 20816 2010-02-01 21:13:54Z freak $
21
*/
22
23
/**
@@ -158,4 +158,36 @@ class Zend_Application_Resource_Db extends Zend_Application_Resource_ResourceAbs
158
return $db;
159
}
160
}
161
}
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Db.php 22544 2010-07-10 15:01:37Z freak $
21
*/
22
23
/**
158
return $db;
159
}
160
}
161
+
162
+ /**
163
+ * Set the default metadata cache
164
+ *
165
+ * @param string|Zend_Cache_Core $cache
166
+ * @return Zend_Application_Resource_Db
167
+ */
168
+ public function setDefaultMetadataCache($cache)
169
+ {
170
+ $metadataCache = null;
171
+
172
+ if (is_string($cache)) {
173
+ $bootstrap = $this->getBootstrap();
174
+ if ($bootstrap instanceof Zend_Application_Bootstrap_ResourceBootstrapper
175
+ && $bootstrap->hasPluginResource('CacheManager')
176
+ ) {
177
+ $cacheManager = $bootstrap->bootstrap('CacheManager')
178
+ ->getResource('CacheManager');
179
+ if (null !== $cacheManager && $cacheManager->hasCache($cache)) {
180
+ $metadataCache = $cacheManager->getCache($cache);
181
+ }
182
+ }
183
+ } else if ($cache instanceof Zend_Cache_Core) {
184
+ $metadataCache = $cache;
185
+ }
186
+
187
+ if ($metadataCache instanceof Zend_Cache_Core) {
188
+ Zend_Db_Table::setDefaultMetadataCache($metadataCache);
189
+ }
190
+
191
+ return $this;
192
+ }
193
}
lib/Zend/Application/Resource/Dojo.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Layout.php 17687 2009-08-20 12:55:34Z thomas $
21
*/
22
23
/**
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Dojo.php 21318 2010-03-04 13:20:01Z freak $
21
*/
22
23
/**
lib/Zend/Application/Resource/Exception.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Exception.php 22610 2010-07-17 08:49:08Z torio $
21
*/
22
23
/**
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Exception.php 22609 2010-07-17 08:47:59Z torio $
21
*/
22
23
/**
lib/Zend/Application/Resource/Frontcontroller.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Frontcontroller.php 20886 2010-02-03 19:36:06Z matthew $
21
*/
22
23
/**
@@ -68,7 +68,13 @@ class Zend_Application_Resource_Frontcontroller extends Zend_Application_Resourc
68
break;
69
70
case 'moduledirectory':
71
- $front->addModuleDirectory($value);
72
break;
73
74
case 'defaultcontrollername':
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Frontcontroller.php 23378 2010-11-18 21:48:27Z bittarman $
21
*/
22
23
/**
68
break;
69
70
case 'moduledirectory':
71
+ if (is_string($value)) {
72
+ $front->addModuleDirectory($value);
73
+ } elseif (is_array($value)) {
74
+ foreach($value as $moduleDir) {
75
+ $front->addModuleDirectory($moduleDir);
76
+ }
77
+ }
78
break;
79
80
case 'defaultcontrollername':
lib/Zend/Application/Resource/Layout.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Layout.php 20816 2010-02-01 21:13:54Z freak $
21
*/
22
23
/**
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Layout.php 20814 2010-02-01 20:13:08Z freak $
21
*/
22
23
/**
lib/Zend/Application/Resource/Locale.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Locale.php 20816 2010-02-01 21:13:54Z freak $
21
*/
22
23
/**
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Locale.php 20814 2010-02-01 20:13:08Z freak $
21
*/
22
23
/**
lib/Zend/Application/Resource/Log.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id$
21
*/
22
23
/**
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Log.php 20814 2010-02-01 20:13:08Z freak $
21
*/
22
23
/**
lib/Zend/Application/Resource/Mail.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Db.php 17687 2009-08-20 12:55:34Z thomas $
21
*/
22
23
/**
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Mail.php 21015 2010-02-11 01:56:02Z freak $
21
*/
22
23
/**
lib/Zend/Application/Resource/Modules.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Modules.php 20816 2010-02-01 21:13:54Z freak $
21
*/
22
23
/**
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Modules.php 20814 2010-02-01 20:13:08Z freak $
21
*/
22
23
/**
lib/Zend/Application/Resource/Multidb.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id$
21
*/
22
23
#require_once 'Zend/Application/Resource/ResourceAbstract.php';
@@ -32,6 +32,8 @@
32
*
33
* Example configuration:
34
* <pre>
35
* resources.multidb.db1.adapter = "pdo_mysql"
36
* resources.multidb.db1.host = "localhost"
37
* resources.multidb.db1.username = "webuser"
@@ -77,6 +79,11 @@ class Zend_Application_Resource_Multidb extends Zend_Application_Resource_Resour
77
{
78
$options = $this->getOptions();
79
80
foreach ($options as $id => $params) {
81
$adapter = $params['adapter'];
82
$default = (int) (
@@ -168,4 +175,36 @@ class Zend_Application_Resource_Multidb extends Zend_Application_Resource_Resour
168
Zend_Db_Table::setDefaultAdapter($adapter);
169
$this->_defaultDb = $adapter;
170
}
171
}
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Multidb.php 22546 2010-07-10 15:18:12Z freak $
21
*/
22
23
#require_once 'Zend/Application/Resource/ResourceAbstract.php';
32
*
33
* Example configuration:
34
* <pre>
35
+ * resources.multidb.defaultMetadataCache = "database"
36
+ *
37
* resources.multidb.db1.adapter = "pdo_mysql"
38
* resources.multidb.db1.host = "localhost"
39
* resources.multidb.db1.username = "webuser"
79
{
80
$options = $this->getOptions();
81
82
+ if (isset($options['defaultMetadataCache'])) {
83
+ $this->_setDefaultMetadataCache($options['defaultMetadataCache']);
84
+ unset($options['defaultMetadataCache']);
85
+ }
86
+
87
foreach ($options as $id => $params) {
88
$adapter = $params['adapter'];
89
$default = (int) (
175
Zend_Db_Table::setDefaultAdapter($adapter);
176
$this->_defaultDb = $adapter;
177
}
178
+
179
+ /**
180
+ * Set the default metadata cache
181
+ *
182
+ * @param string|Zend_Cache_Core $cache
183
+ * @return Zend_Application_Resource_Multidb
184
+ */
185
+ protected function _setDefaultMetadataCache($cache)
186
+ {
187
+ $metadataCache = null;
188
+
189
+ if (is_string($cache)) {
190
+ $bootstrap = $this->getBootstrap();
191
+ if ($bootstrap instanceof Zend_Application_Bootstrap_ResourceBootstrapper &&
192
+ $bootstrap->hasPluginResource('CacheManager')
193
+ ) {
194
+ $cacheManager = $bootstrap->bootstrap('CacheManager')
195
+ ->getResource('CacheManager');
196
+ if (null !== $cacheManager && $cacheManager->hasCache($cache)) {
197
+ $metadataCache = $cacheManager->getCache($cache);
198
+ }
199
+ }
200
+ } else if ($cache instanceof Zend_Cache_Core) {
201
+ $metadataCache = $cache;
202
+ }
203
+
204
+ if ($metadataCache instanceof Zend_Cache_Core) {
205
+ Zend_Db_Table::setDefaultMetadataCache($metadataCache);
206
+ }
207
+
208
+ return $this;
209
+ }
210
}
lib/Zend/Application/Resource/Navigation.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Navigation.php 20816 2010-02-01 21:13:54Z freak $
21
*/
22
23
/**
@@ -58,6 +58,10 @@ class Zend_Application_Resource_Navigation
58
$options = $this->getOptions();
59
$pages = isset($options['pages']) ? $options['pages'] : array();
60
$this->_container = new Zend_Navigation($pages);
61
}
62
63
$this->store();
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Navigation.php 22882 2010-08-22 14:00:16Z freak $
21
*/
22
23
/**
58
$options = $this->getOptions();
59
$pages = isset($options['pages']) ? $options['pages'] : array();
60
$this->_container = new Zend_Navigation($pages);
61
+
62
+ if(isset($options['defaultPageType'])) {
63
+ Zend_Navigation_Page::setDefaultPageType($options['defaultPageType']);
64
+ }
65
}
66
67
$this->store();
lib/Zend/Application/Resource/ResourceAbstract.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: ResourceAbstract.php 20096 2010-01-06 02:05:09Z bkarwin $
21
*/
22
23
/**
@@ -83,6 +83,11 @@ abstract class Zend_Application_Resource_ResourceAbstract implements Zend_Applic
83
*/
84
public function setOptions(array $options)
85
{
86
foreach ($options as $key => $value) {
87
if (in_array(strtolower($key), $this->_skipOptions)) {
88
continue;
@@ -92,9 +97,6 @@ abstract class Zend_Application_Resource_ResourceAbstract implements Zend_Applic
92
if (method_exists($this, $method)) {
93
$this->$method($value);
94
}
95
- if ('bootstrap' === $key) {
96
- unset($options[$key]);
97
- }
98
}
99
100
$this->_options = $this->mergeOptions($this->_options, $options);
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: ResourceAbstract.php 23384 2010-11-19 00:00:29Z ramon $
21
*/
22
23
/**
83
*/
84
public function setOptions(array $options)
85
{
86
+ if (array_key_exists('bootstrap', $options)) {
87
+ $this->setBootstrap($options['bootstrap']);
88
+ unset($options['bootstrap']);
89
+ }
90
+
91
foreach ($options as $key => $value) {
92
if (in_array(strtolower($key), $this->_skipOptions)) {
93
continue;
97
if (method_exists($this, $method)) {
98
$this->$method($value);
99
}
100
}
101
102
$this->_options = $this->mergeOptions($this->_options, $options);
lib/Zend/Application/Resource/Router.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Router.php 20816 2010-02-01 21:13:54Z freak $
21
*/
22
23
/**
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Router.php 20814 2010-02-01 20:13:08Z freak $
21
*/
22
23
/**
lib/Zend/Application/Resource/Session.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Session.php 20816 2010-02-01 21:13:54Z freak $
21
*/
22
23
/**
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Session.php 20814 2010-02-01 20:13:08Z freak $
21
*/
22
23
/**
lib/Zend/Application/Resource/Translate.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Translate.php 21770 2010-04-05 20:16:08Z thomas $
21
*/
22
23
/**
@@ -67,9 +67,14 @@ class Zend_Application_Resource_Translate extends Zend_Application_Resource_Reso
67
if (null === $this->_translate) {
68
$options = $this->getOptions();
69
70
- if (!isset($options['data'])) {
71
#require_once 'Zend/Application/Resource/Exception.php';
72
throw new Zend_Application_Resource_Exception('No translation source data provided.');
73
}
74
75
if (empty($options['adapter'])) {
@@ -87,6 +92,21 @@ class Zend_Application_Resource_Translate extends Zend_Application_Resource_Reso
87
}
88
}
89
90
$key = (isset($options['registry_key']) && !is_numeric($options['registry_key']))
91
? $options['registry_key']
92
: self::DEFAULT_REGISTRY_KEY;
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Translate.php 22968 2010-09-18 19:50:02Z intiilapa $
21
*/
22
23
/**
67
if (null === $this->_translate) {
68
$options = $this->getOptions();
69
70
+ if (!isset($options['content']) && !isset($options['data'])) {
71
#require_once 'Zend/Application/Resource/Exception.php';
72
throw new Zend_Application_Resource_Exception('No translation source data provided.');
73
+ } else if (array_key_exists('content', $options) && array_key_exists('data', $options)) {
74
+ #require_once 'Zend/Application/Resource/Exception.php';
75
+ throw new Zend_Application_Resource_Exception(
76
+ 'Conflict on translation source data: choose only one key between content and data.'
77
+ );
78
}
79
80
if (empty($options['adapter'])) {
92
}
93
}
94
95
+ if (!empty($options['cache']) && is_string($options['cache'])) {
96
+ $bootstrap = $this->getBootstrap();
97
+ if ($bootstrap instanceof Zend_Application_Bootstrap_ResourceBootstrapper &&
98
+ $bootstrap->hasPluginResource('CacheManager')
99
+ ) {
100
+ $cacheManager = $bootstrap->bootstrap('CacheManager')
101
+ ->getResource('CacheManager');
102
+ if (null !== $cacheManager &&
103
+ $cacheManager->hasCache($options['cache'])
104
+ ) {
105
+ $options['cache'] = $cacheManager->getCache($options['cache']);
106
+ }
107
+ }
108
+ }
109
+
110
$key = (isset($options['registry_key']) && !is_numeric($options['registry_key']))
111
? $options['registry_key']
112
: self::DEFAULT_REGISTRY_KEY;
lib/Zend/Application/Resource/Useragent.php ADDED
@@ -0,0 +1,72 @@
1
+ <?php
2
+ /**
3
+ * Zend Framework
4
+ *
5
+ * LICENSE
6
+ *
7
+ * This source file is subject to the new BSD license that is bundled
8
+ * with this package in the file LICENSE.txt.
9
+ * It is also available through the world-wide-web at this URL:
10
+ * http://framework.zend.com/license/new-bsd
11
+ * If you did not receive a copy of the license and are unable to
12
+ * obtain it through the world-wide-web, please send an email
13
+ * to license@zend.com so we can send you a copy immediately.
14
+ *
15
+ * @category Zend
16
+ * @package Zend_Application
17
+ * @subpackage Resource
18
+ * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
+ * @license http://framework.zend.com/license/new-bsd New BSD License
20
+ */
21
+
22
+ /**
23
+ * @category Zend
24
+ * @package Zend_Application
25
+ * @subpackage Resource
26
+ * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
27
+ * @license http://framework.zend.com/license/new-bsd New BSD License
28
+ */
29
+ class Zend_Application_Resource_UserAgent extends Zend_Application_Resource_ResourceAbstract
30
+ {
31
+ /**
32
+ * @var Zend_Http_UserAgent
33
+ */
34
+ protected $_userAgent;
35
+
36
+ /**
37
+ * Intialize resource
38
+ *
39
+ * @return Zend_Http_UserAgent
40
+ */
41
+ public function init()
42
+ {
43
+ $userAgent = $this->getUserAgent();
44
+
45
+ // Optionally seed the UserAgent view helper
46
+ $bootstrap = $this->getBootstrap();
47
+ if ($bootstrap->hasResource('view') || $bootstrap->hasPluginResource('view')) {
48
+ $bootstrap->bootstrap('view');
49
+ $view = $bootstrap->getResource('view');
50
+ if (null !== $view) {
51
+ $view->userAgent($userAgent);
52
+ }
53
+ }
54
+
55
+ return $userAgent;
56
+ }
57
+
58
+ /**
59
+ * Get UserAgent instance
60
+ *
61
+ * @return Zend_Http_UserAgent
62
+ */
63
+ public function getUserAgent()
64
+ {
65
+ if (null === $this->_userAgent) {
66
+ $options = $this->getOptions();
67
+ $this->_userAgent = new Zend_Http_UserAgent($options);
68
+ }
69
+
70
+ return $this->_userAgent;
71
+ }
72
+ }
lib/Zend/Application/Resource/View.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: View.php 20816 2010-02-01 21:13:54Z freak $
21
*/
22
23
/**
@@ -69,8 +69,14 @@ class Zend_Application_Resource_View extends Zend_Application_Resource_ResourceA
69
$options = $this->getOptions();
70
$this->_view = new Zend_View($options);
71
72
- if(isset($options['doctype'])) {
73
$this->_view->doctype()->setDoctype(strtoupper($options['doctype']));
74
}
75
}
76
return $this->_view;
17
* @subpackage Resource
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: View.php 22965 2010-09-18 17:45:51Z intiilapa $
21
*/
22
23
/**
69
$options = $this->getOptions();
70
$this->_view = new Zend_View($options);
71
72
+ if (isset($options['doctype'])) {
73
$this->_view->doctype()->setDoctype(strtoupper($options['doctype']));
74
+ if (isset($options['charset']) && $this->_view->doctype()->isHtml5()) {
75
+ $this->_view->headMeta()->setCharset($options['charset']);
76
+ }
77
+ }
78
+ if (isset($options['contentType'])) {
79
+ $this->_view->headMeta()->appendHttpEquiv('Content-Type', $options['contentType']);
80
}
81
}
82
return $this->_view;
lib/Zend/Auth/Adapter/DbTable.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Adapter
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: DbTable.php 22614 2010-07-17 13:46:07Z dragonbe $
21
*/
22
23
17
* @subpackage Adapter
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: DbTable.php 22613 2010-07-17 13:43:22Z dragonbe $
21
*/
22
23
lib/Zend/Auth/Adapter/Digest.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Adapter
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Digest.php 20096 2010-01-06 02:05:09Z bkarwin $
21
*/
22
23
@@ -213,7 +213,7 @@ class Zend_Auth_Adapter_Digest implements Zend_Auth_Adapter_Interface
213
214
while ($line = trim(fgets($fileHandle))) {
215
if (substr($line, 0, $idLength) === $id) {
216
- if (substr($line, -32) === md5("$this->_username:$this->_realm:$this->_password")) {
217
$result['code'] = Zend_Auth_Result::SUCCESS;
218
} else {
219
$result['code'] = Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID;
@@ -227,4 +227,26 @@ class Zend_Auth_Adapter_Digest implements Zend_Auth_Adapter_Interface
227
$result['messages'][] = "Username '$this->_username' and realm '$this->_realm' combination not found";
228
return new Zend_Auth_Result($result['code'], $result['identity'], $result['messages']);
229
}
230
}
17
* @subpackage Adapter
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Digest.php 23088 2010-10-11 19:53:24Z padraic $
21
*/
22
23
213
214
while ($line = trim(fgets($fileHandle))) {
215
if (substr($line, 0, $idLength) === $id) {
216
+ if ($this->_secureStringCompare(substr($line, -32), md5("$this->_username:$this->_realm:$this->_password"))) {
217
$result['code'] = Zend_Auth_Result::SUCCESS;
218
} else {
219
$result['code'] = Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID;
227
$result['messages'][] = "Username '$this->_username' and realm '$this->_realm' combination not found";
228
return new Zend_Auth_Result($result['code'], $result['identity'], $result['messages']);
229
}
230
+
231
+ /**
232
+ * Securely compare two strings for equality while avoided C level memcmp()
233
+ * optimisations capable of leaking timing information useful to an attacker
234
+ * attempting to iteratively guess the unknown string (e.g. password) being
235
+ * compared against.
236
+ *
237
+ * @param string $a
238
+ * @param string $b
239
+ * @return bool
240
+ */
241
+ protected function _secureStringCompare($a, $b)
242
+ {
243
+ if (strlen($a) !== strlen($b)) {
244
+ return false;
245
+ }
246
+ $result = 0;
247
+ for ($i = 0; $i < strlen($a); $i++) {
248
+ $result |= ord($a[$i]) ^ ord($b[$i]);
249
+ }
250
+ return $result == 0;
251
+ }
252
}
lib/Zend/Auth/Adapter/Http.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Zend_Auth_Adapter_Http
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Http.php 20096 2010-01-06 02:05:09Z bkarwin $
21
*/
22
23
@@ -538,7 +538,7 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface
538
}
539
540
$password = $this->_basicResolver->resolve($creds[0], $this->_realm);
541
- if ($password && $password == $creds[1]) {
542
$identity = array('username'=>$creds[0], 'realm'=>$this->_realm);
543
return new Zend_Auth_Result(Zend_Auth_Result::SUCCESS, $identity);
544
} else {
@@ -640,7 +640,7 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface
640
641
// If our digest matches the client's let them in, otherwise return
642
// a 401 code and exit to prevent access to the protected resource.
643
- if ($digest == $data['response']) {
644
$identity = array('username'=>$data['username'], 'realm'=>$data['realm']);
645
return new Zend_Auth_Result(Zend_Auth_Result::SUCCESS, $identity);
646
} else {
@@ -844,4 +844,26 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface
844
845
return $data;
846
}
847
}
17
* @subpackage Zend_Auth_Adapter_Http
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Http.php 23088 2010-10-11 19:53:24Z padraic $
21
*/
22
23
538
}
539
540
$password = $this->_basicResolver->resolve($creds[0], $this->_realm);
541
+ if ($password && $this->_secureStringCompare($password, $creds[1])) {
542
$identity = array('username'=>$creds[0], 'realm'=>$this->_realm);
543
return new Zend_Auth_Result(Zend_Auth_Result::SUCCESS, $identity);
544
} else {
640
641
// If our digest matches the client's let them in, otherwise return
642
// a 401 code and exit to prevent access to the protected resource.
643
+ if ($this->_secureStringCompare($digest, $data['response'])) {
644
$identity = array('username'=>$data['username'], 'realm'=>$data['realm']);
645
return new Zend_Auth_Result(Zend_Auth_Result::SUCCESS, $identity);
646
} else {
844
845
return $data;
846
}
847
+
848
+ /**
849
+ * Securely compare two strings for equality while avoided C level memcmp()
850
+ * optimisations capable of leaking timing information useful to an attacker
851
+ * attempting to iteratively guess the unknown string (e.g. password) being
852
+ * compared against.
853
+ *
854
+ * @param string $a
855
+ * @param string $b
856
+ * @return bool
857
+ */
858
+ protected function _secureStringCompare($a, $b)
859
+ {
860
+ if (strlen($a) !== strlen($b)) {
861
+ return false;
862
+ }
863
+ $result = 0;
864
+ for ($i = 0; $i < strlen($a); $i++) {
865
+ $result |= ord($a[$i]) ^ ord($b[$i]);
866
+ }
867
+ return $result == 0;
868
+ }
869
}
lib/Zend/Auth/Adapter/Ldap.php CHANGED
@@ -17,7 +17,7 @@
17
* @subpackage Zend_Auth_Adapter
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
- * @version $Id: Ldap.php 21320 2010-03-04 16:05:09Z sgehrig $
21
*/
22
23
/**
17
* @subpackage Zend_Auth_Adapter
18
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
19
* @license http://framework.zend.com/license/new-bsd New BSD License
20
+ * @version $Id: Ldap.php 21319 2010-03-04 16:02:16Z sgehrig $
21
*/
22
23
/**
lib/Zend/Barcode/Exception.php CHANGED
@@ -16,7 +16,7 @@
16
* @package Zend_Barcode
17
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
18
* @license http://framework.zend.com/license/new-bsd New BSD License
19
- * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $
20
*/
21
/**
22
* Zend_Exception
@@ -41,8 +41,8 @@ class Zend_Barcode_Exception extends Zend_Exception
41
42
/**
43
* Set renderable flag
44
- *
45
- * @param bool $flag
46
* @return Zend_Barcode_Exception
47
*/
48
public function setIsRenderable($flag)
@@ -53,7 +53,7 @@ class Zend_Barcode_Exception extends Zend_Exception
53
54
/**
55
* Retrieve renderable flag
56
- *
57
* @return bool
58
*/
59
public function isRenderable()
16
* @package Zend_Barcode
17
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
18
* @license http://framework.zend.com/license/new-bsd New BSD License
19
+ * @version $Id: Exception.php 22999 2010-09-23 19:43:14Z mikaelkael $
20
*/
21
/**
22
* Zend_Exception
41
42
/**
43
* Set renderable flag
44
+ *
45
+ * @param bool $flag
46
* @return Zend_Barcode_Exception
47
*/
48
public function setIsRenderable($flag)
53
54
/**
55
* Retrieve renderable flag
56
+ *
57
* @return bool
58
*/
59
public function isRenderable()
lib/Zend/Barcode/Object/Code128.php ADDED
@@ -0,0 +1,391 @@