From 30cb74c99aca81b91e5d6e363903afb2b8e19000 Mon Sep 17 00:00:00 2001 From: vchernikovplesk Date: Tue, 6 Jun 2023 15:55:20 +0300 Subject: [PATCH 1/2] BUGFIX PT-11343 --- library/Zend/Mail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/Zend/Mail.php b/library/Zend/Mail.php index 5a6b57fa58..87a259a9d3 100644 --- a/library/Zend/Mail.php +++ b/library/Zend/Mail.php @@ -1248,7 +1248,7 @@ protected function _filterOther($data) "\t" => '', ); - return strtr($data, $rule); + return trim(strtr(strval($name), $rule)); } /** From 68949bbebee63e8b3bf9c38f4b4fdb95f807d583 Mon Sep 17 00:00:00 2001 From: vchernikovplesk Date: Tue, 6 Jun 2023 13:50:06 +0000 Subject: [PATCH 2/2] BUGFIX PT-11343 --- library/Zend/Acl.php | 36 +-- library/Zend/Acl/Assert/Interface.php | 6 +- library/Zend/Acl/Exception.php | 2 +- library/Zend/Acl/Resource.php | 2 +- library/Zend/Acl/Role.php | 2 +- library/Zend/Acl/Role/Registry.php | 12 +- library/Zend/Acl/Role/Registry/Exception.php | 2 +- .../Zend/Application/Bootstrap/Bootstrap.php | 2 +- .../Bootstrap/BootstrapAbstract.php | 4 +- .../Zend/Application/Bootstrap/Exception.php | 2 +- library/Zend/Application/Exception.php | 2 +- .../Zend/Application/Module/Autoloader.php | 2 +- library/Zend/Application/Module/Bootstrap.php | 2 +- .../Application/Resource/Cachemanager.php | 2 +- library/Zend/Application/Resource/Db.php | 2 +- library/Zend/Application/Resource/Dojo.php | 2 +- .../Zend/Application/Resource/Exception.php | 2 +- .../Application/Resource/Frontcontroller.php | 6 +- library/Zend/Application/Resource/Layout.php | 2 +- library/Zend/Application/Resource/Locale.php | 2 +- library/Zend/Application/Resource/Log.php | 2 +- library/Zend/Application/Resource/Mail.php | 2 +- library/Zend/Application/Resource/Modules.php | 2 +- library/Zend/Application/Resource/Multidb.php | 4 +- .../Zend/Application/Resource/Navigation.php | 2 +- .../Application/Resource/ResourceAbstract.php | 2 +- library/Zend/Application/Resource/Router.php | 2 +- library/Zend/Application/Resource/Session.php | 2 +- .../Zend/Application/Resource/Translate.php | 8 +- library/Zend/Application/Resource/View.php | 2 +- library/Zend/Auth.php | 2 +- library/Zend/Auth/Adapter/DbTable.php | 14 +- library/Zend/Auth/Adapter/Digest.php | 6 +- library/Zend/Auth/Adapter/Exception.php | 2 +- library/Zend/Auth/Adapter/Http.php | 30 +-- .../Auth/Adapter/Http/Resolver/Exception.php | 2 +- .../Zend/Auth/Adapter/Http/Resolver/File.php | 14 +- library/Zend/Auth/Adapter/Interface.php | 2 +- library/Zend/Auth/Adapter/Ldap.php | 10 +- library/Zend/Auth/Adapter/OpenId.php | 4 +- library/Zend/Auth/Exception.php | 2 +- library/Zend/Auth/Storage/Exception.php | 2 +- library/Zend/Auth/Storage/NonPersistent.php | 2 +- library/Zend/Auth/Storage/Session.php | 4 +- library/Zend/Barcode.php | 18 +- library/Zend/Cache.php | 12 +- library/Zend/Cache/Backend.php | 6 +- library/Zend/Cache/Backend/Apc.php | 4 +- library/Zend/Cache/Backend/BlackHole.php | 4 +- .../Zend/Cache/Backend/ExtendedInterface.php | 2 +- library/Zend/Cache/Backend/File.php | 4 +- library/Zend/Cache/Backend/Libmemcached.php | 4 +- library/Zend/Cache/Backend/Memcached.php | 4 +- library/Zend/Cache/Backend/Sqlite.php | 4 +- library/Zend/Cache/Backend/Static.php | 4 +- library/Zend/Cache/Backend/Test.php | 4 +- library/Zend/Cache/Backend/TwoLevels.php | 4 +- library/Zend/Cache/Backend/WinCache.php | 4 +- library/Zend/Cache/Backend/Xcache.php | 4 +- library/Zend/Cache/Backend/ZendPlatform.php | 4 +- library/Zend/Cache/Backend/ZendServer.php | 4 +- .../Zend/Cache/Backend/ZendServer/Disk.php | 4 +- .../Zend/Cache/Backend/ZendServer/ShMem.php | 4 +- library/Zend/Cache/Core.php | 6 +- library/Zend/Cache/Exception.php | 2 +- library/Zend/Cache/Frontend/Capture.php | 2 +- library/Zend/Cache/Frontend/Class.php | 2 +- library/Zend/Cache/Frontend/File.php | 2 +- library/Zend/Cache/Frontend/Function.php | 2 +- library/Zend/Cache/Frontend/Output.php | 2 +- library/Zend/Cache/Frontend/Page.php | 2 +- library/Zend/Cache/Manager.php | 8 +- library/Zend/Config.php | 6 +- library/Zend/Config/Exception.php | 2 +- library/Zend/Config/Ini.php | 16 +- library/Zend/Config/Json.php | 18 +- library/Zend/Config/Writer/Array.php | 2 +- library/Zend/Config/Writer/FileAbstract.php | 8 +- library/Zend/Config/Writer/Ini.php | 4 +- library/Zend/Config/Writer/Json.php | 4 +- library/Zend/Config/Writer/Xml.php | 6 +- library/Zend/Config/Writer/Yaml.php | 6 +- library/Zend/Config/Xml.php | 28 +-- library/Zend/Config/Yaml.php | 18 +- library/Zend/Console/Getopt.php | 26 +-- library/Zend/Console/Getopt/Exception.php | 2 +- library/Zend/Controller/Action.php | 18 +- library/Zend/Controller/Action/Exception.php | 2 +- .../Controller/Action/Helper/Abstract.php | 2 +- .../Controller/Action/Helper/ActionStack.php | 10 +- .../Controller/Action/Helper/AjaxContext.php | 2 +- .../Action/Helper/AutoComplete/Abstract.php | 6 +- .../Action/Helper/AutoCompleteDojo.php | 8 +- .../Helper/AutoCompleteScriptaculous.php | 4 +- .../Zend/Controller/Action/Helper/Cache.php | 6 +- .../Action/Helper/ContextSwitch.php | 34 +-- .../Action/Helper/FlashMessenger.php | 4 +- .../Zend/Controller/Action/Helper/Json.php | 6 +- .../Controller/Action/Helper/Redirector.php | 6 +- library/Zend/Controller/Action/Helper/Url.php | 2 +- .../Controller/Action/Helper/ViewRenderer.php | 16 +- .../Zend/Controller/Action/HelperBroker.php | 16 +- .../Action/HelperBroker/PriorityStack.php | 6 +- .../Zend/Controller/Dispatcher/Abstract.php | 10 +- .../Zend/Controller/Dispatcher/Exception.php | 2 +- .../Zend/Controller/Dispatcher/Interface.php | 4 +- .../Zend/Controller/Dispatcher/Standard.php | 16 +- library/Zend/Controller/Exception.php | 2 +- library/Zend/Controller/Front.php | 34 +-- .../Zend/Controller/Plugin/ActionStack.php | 6 +- library/Zend/Controller/Plugin/Broker.php | 8 +- .../Zend/Controller/Plugin/ErrorHandler.php | 2 +- library/Zend/Controller/Plugin/PutHandler.php | 4 +- library/Zend/Controller/Request/Apache404.php | 4 +- library/Zend/Controller/Request/Exception.php | 2 +- library/Zend/Controller/Request/Http.php | 14 +- .../Zend/Controller/Request/HttpTestCase.php | 4 +- library/Zend/Controller/Request/Simple.php | 2 +- library/Zend/Controller/Response/Abstract.php | 12 +- library/Zend/Controller/Response/Cli.php | 2 +- .../Zend/Controller/Response/Exception.php | 2 +- library/Zend/Controller/Response/Http.php | 2 +- .../Zend/Controller/Response/HttpTestCase.php | 2 +- library/Zend/Controller/Router/Abstract.php | 4 +- library/Zend/Controller/Router/Exception.php | 2 +- library/Zend/Controller/Router/Rewrite.php | 26 +-- library/Zend/Controller/Router/Route.php | 6 +- .../Zend/Controller/Router/Route/Abstract.php | 4 +- .../Zend/Controller/Router/Route/Chain.php | 2 +- .../Zend/Controller/Router/Route/Hostname.php | 6 +- .../Controller/Router/Route/Interface.php | 2 +- .../Zend/Controller/Router/Route/Module.php | 2 +- .../Zend/Controller/Router/Route/Regex.php | 6 +- .../Zend/Controller/Router/Route/Static.php | 2 +- library/Zend/Crypt.php | 2 +- library/Zend/Crypt/DiffieHellman.php | 20 +- .../Zend/Crypt/DiffieHellman/Exception.php | 2 +- library/Zend/Crypt/Exception.php | 2 +- library/Zend/Crypt/Hmac.php | 8 +- library/Zend/Crypt/Hmac/Exception.php | 2 +- library/Zend/Crypt/Math.php | 8 +- library/Zend/Crypt/Math/BigInteger.php | 12 +- library/Zend/Crypt/Math/BigInteger/Bcmath.php | 2 +- .../Zend/Crypt/Math/BigInteger/Exception.php | 2 +- library/Zend/Crypt/Math/BigInteger/Gmp.php | 2 +- library/Zend/Crypt/Math/Exception.php | 2 +- library/Zend/Crypt/Rsa.php | 8 +- library/Zend/Crypt/Rsa/Exception.php | 2 +- library/Zend/Crypt/Rsa/Key.php | 2 +- library/Zend/Crypt/Rsa/Key/Private.php | 6 +- library/Zend/Crypt/Rsa/Key/Public.php | 4 +- library/Zend/Currency.php | 36 +-- library/Zend/Currency/Exception.php | 2 +- library/Zend/Date.php | 212 +++++++++--------- library/Zend/Date/Cities.php | 2 +- library/Zend/Date/DateObject.php | 4 +- library/Zend/Date/Exception.php | 2 +- library/Zend/Db.php | 8 +- library/Zend/Db/Adapter/Abstract.php | 26 +-- library/Zend/Db/Adapter/Db2.php | 26 +-- library/Zend/Db/Adapter/Db2/Exception.php | 2 +- library/Zend/Db/Adapter/Exception.php | 2 +- library/Zend/Db/Adapter/Mysqli.php | 26 +-- library/Zend/Db/Adapter/Mysqli/Exception.php | 2 +- library/Zend/Db/Adapter/Oracle.php | 24 +- library/Zend/Db/Adapter/Oracle/Exception.php | 2 +- library/Zend/Db/Adapter/Pdo/Abstract.php | 22 +- library/Zend/Db/Adapter/Pdo/Ibm.php | 12 +- library/Zend/Db/Adapter/Pdo/Ibm/Db2.php | 8 +- library/Zend/Db/Adapter/Pdo/Ibm/Ids.php | 8 +- library/Zend/Db/Adapter/Pdo/Mssql.php | 6 +- library/Zend/Db/Adapter/Pdo/Mysql.php | 6 +- library/Zend/Db/Adapter/Pdo/Oci.php | 6 +- library/Zend/Db/Adapter/Pdo/Pgsql.php | 6 +- library/Zend/Db/Adapter/Pdo/Sqlite.php | 12 +- library/Zend/Db/Adapter/Sqlsrv.php | 34 +-- library/Zend/Db/Adapter/Sqlsrv/Exception.php | 2 +- library/Zend/Db/Exception.php | 2 +- library/Zend/Db/Profiler.php | 8 +- library/Zend/Db/Profiler/Exception.php | 2 +- library/Zend/Db/Profiler/Firebug.php | 6 +- library/Zend/Db/Select.php | 28 +-- library/Zend/Db/Select/Exception.php | 2 +- library/Zend/Db/Statement.php | 14 +- library/Zend/Db/Statement/Db2.php | 12 +- library/Zend/Db/Statement/Db2/Exception.php | 2 +- library/Zend/Db/Statement/Exception.php | 2 +- library/Zend/Db/Statement/Mysqli.php | 12 +- .../Zend/Db/Statement/Mysqli/Exception.php | 2 +- library/Zend/Db/Statement/Oracle.php | 32 +-- .../Zend/Db/Statement/Oracle/Exception.php | 2 +- library/Zend/Db/Statement/Pdo.php | 40 ++-- library/Zend/Db/Statement/Pdo/Ibm.php | 4 +- library/Zend/Db/Statement/Pdo/Oci.php | 2 +- library/Zend/Db/Statement/Sqlsrv.php | 20 +- .../Zend/Db/Statement/Sqlsrv/Exception.php | 2 +- library/Zend/Db/Table.php | 4 +- library/Zend/Db/Table/Abstract.php | 50 ++--- library/Zend/Db/Table/Exception.php | 2 +- library/Zend/Db/Table/Row.php | 2 +- library/Zend/Db/Table/Row/Abstract.php | 48 ++-- library/Zend/Db/Table/Row/Exception.php | 2 +- library/Zend/Db/Table/Rowset.php | 2 +- library/Zend/Db/Table/Rowset/Abstract.php | 10 +- library/Zend/Db/Table/Rowset/Exception.php | 2 +- library/Zend/Db/Table/Select.php | 6 +- library/Zend/Db/Table/Select/Exception.php | 2 +- library/Zend/Dom/Exception.php | 2 +- library/Zend/Dom/Query.php | 14 +- library/Zend/EventManager/Event.php | 4 +- library/Zend/EventManager/EventCollection.php | 2 +- library/Zend/EventManager/EventManager.php | 22 +- .../Exception/InvalidArgumentException.php | 4 +- library/Zend/EventManager/Filter.php | 2 +- .../EventManager/Filter/FilterIterator.php | 4 +- library/Zend/EventManager/FilterChain.php | 8 +- .../Zend/EventManager/GlobalEventManager.php | 4 +- .../SharedEventCollectionAware.php | 2 +- .../Zend/EventManager/SharedEventManager.php | 4 +- .../Zend/EventManager/StaticEventManager.php | 6 +- library/Zend/Feed.php | 28 +-- library/Zend/Feed/Abstract.php | 12 +- library/Zend/Feed/Atom.php | 8 +- library/Zend/Feed/Builder.php | 16 +- library/Zend/Feed/Builder/Entry.php | 4 +- library/Zend/Feed/Builder/Exception.php | 2 +- library/Zend/Feed/Builder/Header.php | 26 +-- library/Zend/Feed/Builder/Header/Itunes.php | 14 +- library/Zend/Feed/Element.php | 2 +- library/Zend/Feed/Entry/Abstract.php | 10 +- library/Zend/Feed/Entry/Atom.php | 20 +- library/Zend/Feed/Entry/Rss.php | 2 +- library/Zend/Feed/Exception.php | 2 +- library/Zend/Feed/Pubsubhubbub.php | 12 +- .../Feed/Pubsubhubbub/CallbackAbstract.php | 12 +- library/Zend/Feed/Pubsubhubbub/Exception.php | 2 +- .../Zend/Feed/Pubsubhubbub/HttpResponse.php | 6 +- .../Feed/Pubsubhubbub/Model/ModelAbstract.php | 4 +- .../Feed/Pubsubhubbub/Model/Subscription.php | 12 +- library/Zend/Feed/Pubsubhubbub/Publisher.php | 22 +- library/Zend/Feed/Pubsubhubbub/Subscriber.php | 34 +-- .../Feed/Pubsubhubbub/Subscriber/Callback.php | 6 +- library/Zend/Feed/Reader.php | 48 ++-- .../Zend/Feed/Reader/Collection/Author.php | 2 +- .../Zend/Feed/Reader/Collection/Category.php | 2 +- library/Zend/Feed/Reader/Entry/Atom.php | 8 +- library/Zend/Feed/Reader/Entry/Rss.php | 24 +- library/Zend/Feed/Reader/EntryAbstract.php | 2 +- .../Zend/Feed/Reader/Extension/Atom/Entry.php | 12 +- .../Zend/Feed/Reader/Extension/Atom/Feed.php | 8 +- .../Feed/Reader/Extension/Content/Entry.php | 4 +- .../Extension/CreativeCommons/Entry.php | 4 +- .../Reader/Extension/CreativeCommons/Feed.php | 2 +- .../Reader/Extension/DublinCore/Entry.php | 6 +- .../Feed/Reader/Extension/DublinCore/Feed.php | 6 +- .../Feed/Reader/Extension/FeedAbstract.php | 6 +- .../Feed/Reader/Extension/Podcast/Entry.php | 4 +- .../Feed/Reader/Extension/Podcast/Feed.php | 2 +- .../Feed/Reader/Extension/Slash/Entry.php | 4 +- .../Reader/Extension/Syndication/Feed.php | 4 +- .../Feed/Reader/Extension/Thread/Entry.php | 2 +- .../Reader/Extension/WellFormedWeb/Entry.php | 4 +- library/Zend/Feed/Reader/Feed/Atom.php | 4 +- library/Zend/Feed/Reader/Feed/Atom/Source.php | 2 +- library/Zend/Feed/Reader/Feed/Rss.php | 14 +- library/Zend/Feed/Reader/FeedAbstract.php | 6 +- library/Zend/Feed/Reader/FeedSet.php | 4 +- library/Zend/Feed/Rss.php | 8 +- library/Zend/Feed/Writer.php | 4 +- library/Zend/Feed/Writer/Deleted.php | 14 +- library/Zend/Feed/Writer/Entry.php | 54 ++--- .../Exception/InvalidMethodException.php | 2 +- .../Writer/Extension/Atom/Renderer/Feed.php | 2 +- .../Extension/Content/Renderer/Entry.php | 2 +- .../Extension/DublinCore/Renderer/Entry.php | 2 +- .../Extension/DublinCore/Renderer/Feed.php | 2 +- .../Feed/Writer/Extension/ITunes/Entry.php | 20 +- .../Feed/Writer/Extension/ITunes/Feed.php | 36 +-- .../Extension/ITunes/Renderer/Entry.php | 2 +- .../Writer/Extension/ITunes/Renderer/Feed.php | 2 +- .../Writer/Extension/RendererAbstract.php | 2 +- .../Writer/Extension/Slash/Renderer/Entry.php | 2 +- .../Extension/Threading/Renderer/Entry.php | 2 +- .../WellFormedWeb/Renderer/Entry.php | 2 +- library/Zend/Feed/Writer/Feed.php | 22 +- .../Zend/Feed/Writer/Feed/FeedAbstract.php | 76 +++---- .../Zend/Feed/Writer/Renderer/Entry/Atom.php | 16 +- .../Writer/Renderer/Entry/Atom/Deleted.php | 2 +- .../Zend/Feed/Writer/Renderer/Entry/Rss.php | 12 +- .../Zend/Feed/Writer/Renderer/Feed/Atom.php | 14 +- .../Renderer/Feed/Atom/AtomAbstract.php | 18 +- .../Feed/Writer/Renderer/Feed/Atom/Source.php | 2 +- .../Zend/Feed/Writer/Renderer/Feed/Rss.php | 26 +-- .../Feed/Writer/Renderer/RendererAbstract.php | 6 +- library/Zend/Feed/Writer/Source.php | 2 +- library/Zend/File/ClassFileLocator.php | 2 +- library/Zend/File/Transfer.php | 6 +- .../Zend/File/Transfer/Adapter/Abstract.php | 46 ++-- library/Zend/File/Transfer/Adapter/Http.php | 14 +- library/Zend/File/Transfer/Exception.php | 2 +- library/Zend/Filter.php | 6 +- library/Zend/Filter/Alnum.php | 4 +- library/Zend/Filter/Alpha.php | 4 +- library/Zend/Filter/BaseName.php | 2 +- library/Zend/Filter/Boolean.php | 12 +- library/Zend/Filter/Callback.php | 6 +- library/Zend/Filter/Compress.php | 10 +- library/Zend/Filter/Compress/Bz2.php | 14 +- .../Zend/Filter/Compress/CompressAbstract.php | 2 +- library/Zend/Filter/Compress/Gz.php | 16 +- library/Zend/Filter/Compress/Lzf.php | 8 +- library/Zend/Filter/Compress/Rar.php | 18 +- library/Zend/Filter/Compress/Tar.php | 22 +- library/Zend/Filter/Compress/Zip.php | 24 +- library/Zend/Filter/Decompress.php | 2 +- library/Zend/Filter/Decrypt.php | 2 +- library/Zend/Filter/Digits.php | 2 +- library/Zend/Filter/Dir.php | 2 +- library/Zend/Filter/Encrypt.php | 8 +- library/Zend/Filter/Encrypt/Mcrypt.php | 26 +-- library/Zend/Filter/Encrypt/Openssl.php | 24 +- library/Zend/Filter/Exception.php | 2 +- library/Zend/Filter/File/Decrypt.php | 10 +- library/Zend/Filter/File/Encrypt.php | 10 +- library/Zend/Filter/File/LowerCase.php | 10 +- library/Zend/Filter/File/Rename.php | 10 +- library/Zend/Filter/File/UpperCase.php | 10 +- library/Zend/Filter/HtmlEntities.php | 6 +- library/Zend/Filter/Inflector.php | 8 +- library/Zend/Filter/Input.php | 26 +-- library/Zend/Filter/Int.php | 2 +- library/Zend/Filter/LocalizedToNormalized.php | 4 +- library/Zend/Filter/NormalizedToLocalized.php | 6 +- library/Zend/Filter/Null.php | 4 +- library/Zend/Filter/PregReplace.php | 4 +- library/Zend/Filter/RealPath.php | 2 +- library/Zend/Filter/StringToLower.php | 6 +- library/Zend/Filter/StringToUpper.php | 6 +- library/Zend/Filter/StringTrim.php | 2 +- library/Zend/Filter/StripNewlines.php | 2 +- library/Zend/Filter/StripTags.php | 2 +- library/Zend/Filter/Word/CamelCaseToDash.php | 2 +- .../Zend/Filter/Word/CamelCaseToSeparator.php | 2 +- .../Filter/Word/CamelCaseToUnderscore.php | 2 +- library/Zend/Filter/Word/DashToCamelCase.php | 2 +- library/Zend/Filter/Word/DashToSeparator.php | 2 +- library/Zend/Filter/Word/DashToUnderscore.php | 2 +- .../Zend/Filter/Word/Separator/Abstract.php | 4 +- .../Zend/Filter/Word/SeparatorToCamelCase.php | 2 +- library/Zend/Filter/Word/SeparatorToDash.php | 2 +- .../Zend/Filter/Word/SeparatorToSeparator.php | 4 +- .../Filter/Word/UnderscoreToCamelCase.php | 2 +- library/Zend/Filter/Word/UnderscoreToDash.php | 2 +- .../Filter/Word/UnderscoreToSeparator.php | 2 +- library/Zend/Form.php | 54 ++--- library/Zend/Form/Decorator/Abstract.php | 6 +- library/Zend/Form/Decorator/Callback.php | 4 +- library/Zend/Form/Decorator/Captcha.php | 2 +- .../Zend/Form/Decorator/Captcha/ReCaptcha.php | 2 +- library/Zend/Form/Decorator/Captcha/Word.php | 2 +- library/Zend/Form/Decorator/Description.php | 4 +- library/Zend/Form/Decorator/DtDdWrapper.php | 2 +- library/Zend/Form/Decorator/Errors.php | 2 +- library/Zend/Form/Decorator/Exception.php | 2 +- library/Zend/Form/Decorator/Fieldset.php | 2 +- library/Zend/Form/Decorator/File.php | 6 +- library/Zend/Form/Decorator/Form.php | 2 +- library/Zend/Form/Decorator/FormElements.php | 2 +- library/Zend/Form/Decorator/FormErrors.php | 2 +- library/Zend/Form/Decorator/HtmlTag.php | 8 +- library/Zend/Form/Decorator/Image.php | 4 +- library/Zend/Form/Decorator/Label.php | 10 +- .../Zend/Form/Decorator/PrepareElements.php | 2 +- library/Zend/Form/Decorator/Tooltip.php | 2 +- library/Zend/Form/Decorator/ViewHelper.php | 4 +- library/Zend/Form/Decorator/ViewScript.php | 4 +- library/Zend/Form/DisplayGroup.php | 20 +- library/Zend/Form/Element.php | 50 ++--- library/Zend/Form/Element/Button.php | 2 +- library/Zend/Form/Element/Captcha.php | 6 +- library/Zend/Form/Element/Checkbox.php | 2 +- library/Zend/Form/Element/Exception.php | 2 +- library/Zend/Form/Element/File.php | 10 +- library/Zend/Form/Element/Hash.php | 4 +- library/Zend/Form/Element/Hidden.php | 2 +- library/Zend/Form/Element/Image.php | 2 +- library/Zend/Form/Element/Multi.php | 2 +- library/Zend/Form/Element/MultiCheckbox.php | 2 +- library/Zend/Form/Element/Multiselect.php | 2 +- library/Zend/Form/Element/Note.php | 2 +- library/Zend/Form/Element/Password.php | 2 +- library/Zend/Form/Element/Radio.php | 2 +- library/Zend/Form/Element/Reset.php | 2 +- library/Zend/Form/Element/Select.php | 2 +- library/Zend/Form/Element/Submit.php | 2 +- library/Zend/Form/Element/Text.php | 2 +- library/Zend/Form/Element/Textarea.php | 2 +- library/Zend/Form/Element/Xhtml.php | 2 +- library/Zend/Form/Exception.php | 2 +- library/Zend/Form/SubForm.php | 2 +- library/Zend/Gdata.php | 6 +- library/Zend/Gdata/Analytics.php | 14 +- library/Zend/Gdata/Analytics/AccountEntry.php | 10 +- library/Zend/Gdata/Analytics/AccountFeed.php | 2 +- library/Zend/Gdata/Analytics/AccountQuery.php | 2 +- library/Zend/Gdata/Analytics/DataEntry.php | 2 +- library/Zend/Gdata/Analytics/DataFeed.php | 6 +- library/Zend/Gdata/Analytics/DataQuery.php | 2 +- .../Gdata/Analytics/Extension/Dimension.php | 2 +- .../Zend/Gdata/Analytics/Extension/Goal.php | 2 +- .../Zend/Gdata/Analytics/Extension/Metric.php | 2 +- .../Gdata/Analytics/Extension/Property.php | 2 +- .../Gdata/Analytics/Extension/TableId.php | 2 +- library/Zend/Gdata/App.php | 54 ++--- library/Zend/Gdata/App/AuthException.php | 2 +- .../Zend/Gdata/App/BadMethodCallException.php | 2 +- library/Zend/Gdata/App/Base.php | 16 +- library/Zend/Gdata/App/BaseMediaSource.php | 8 +- .../Gdata/App/CaptchaRequiredException.php | 2 +- library/Zend/Gdata/App/Entry.php | 14 +- library/Zend/Gdata/App/Exception.php | 2 +- library/Zend/Gdata/App/Extension.php | 2 +- library/Zend/Gdata/App/Extension/Author.php | 2 +- library/Zend/Gdata/App/Extension/Category.php | 2 +- library/Zend/Gdata/App/Extension/Content.php | 2 +- .../Zend/Gdata/App/Extension/Contributor.php | 2 +- library/Zend/Gdata/App/Extension/Control.php | 4 +- library/Zend/Gdata/App/Extension/Draft.php | 2 +- library/Zend/Gdata/App/Extension/Edited.php | 2 +- library/Zend/Gdata/App/Extension/Element.php | 2 +- library/Zend/Gdata/App/Extension/Email.php | 2 +- .../Zend/Gdata/App/Extension/Generator.php | 2 +- library/Zend/Gdata/App/Extension/Icon.php | 2 +- library/Zend/Gdata/App/Extension/Id.php | 2 +- library/Zend/Gdata/App/Extension/Link.php | 2 +- library/Zend/Gdata/App/Extension/Logo.php | 2 +- library/Zend/Gdata/App/Extension/Name.php | 2 +- library/Zend/Gdata/App/Extension/Person.php | 8 +- .../Zend/Gdata/App/Extension/Published.php | 2 +- library/Zend/Gdata/App/Extension/Rights.php | 2 +- library/Zend/Gdata/App/Extension/Source.php | 4 +- library/Zend/Gdata/App/Extension/Subtitle.php | 2 +- library/Zend/Gdata/App/Extension/Summary.php | 2 +- library/Zend/Gdata/App/Extension/Text.php | 2 +- library/Zend/Gdata/App/Extension/Title.php | 2 +- library/Zend/Gdata/App/Extension/Updated.php | 2 +- library/Zend/Gdata/App/Extension/Uri.php | 2 +- library/Zend/Gdata/App/Feed.php | 8 +- library/Zend/Gdata/App/FeedEntryParent.php | 24 +- library/Zend/Gdata/App/FeedSourceParent.php | 12 +- library/Zend/Gdata/App/HttpException.php | 4 +- library/Zend/Gdata/App/IOException.php | 2 +- .../Gdata/App/InvalidArgumentException.php | 2 +- .../App/LoggingHttpClientAdapterSocket.php | 2 +- library/Zend/Gdata/App/MediaEntry.php | 8 +- library/Zend/Gdata/App/MediaFileSource.php | 6 +- library/Zend/Gdata/App/Util.php | 6 +- library/Zend/Gdata/App/VersionException.php | 2 +- library/Zend/Gdata/AuthSub.php | 14 +- library/Zend/Gdata/Books.php | 12 +- library/Zend/Gdata/Books/CollectionEntry.php | 2 +- library/Zend/Gdata/Books/CollectionFeed.php | 2 +- .../Gdata/Books/Extension/AnnotationLink.php | 2 +- .../Gdata/Books/Extension/BooksCategory.php | 2 +- .../Zend/Gdata/Books/Extension/BooksLink.php | 2 +- .../Gdata/Books/Extension/Embeddability.php | 2 +- .../Zend/Gdata/Books/Extension/InfoLink.php | 2 +- .../Gdata/Books/Extension/PreviewLink.php | 2 +- library/Zend/Gdata/Books/Extension/Review.php | 2 +- .../Gdata/Books/Extension/ThumbnailLink.php | 2 +- .../Gdata/Books/Extension/Viewability.php | 2 +- library/Zend/Gdata/Books/VolumeEntry.php | 32 +-- library/Zend/Gdata/Books/VolumeFeed.php | 2 +- library/Zend/Gdata/Books/VolumeQuery.php | 4 +- library/Zend/Gdata/Calendar.php | 14 +- library/Zend/Gdata/Calendar/EventEntry.php | 12 +- library/Zend/Gdata/Calendar/EventFeed.php | 4 +- library/Zend/Gdata/Calendar/EventQuery.php | 12 +- .../Gdata/Calendar/Extension/AccessLevel.php | 2 +- .../Zend/Gdata/Calendar/Extension/Color.php | 2 +- .../Zend/Gdata/Calendar/Extension/Hidden.php | 4 +- .../Zend/Gdata/Calendar/Extension/Link.php | 4 +- .../Gdata/Calendar/Extension/QuickAdd.php | 2 +- .../Gdata/Calendar/Extension/Selected.php | 4 +- .../Extension/SendEventNotifications.php | 2 +- .../Gdata/Calendar/Extension/Timezone.php | 2 +- .../Gdata/Calendar/Extension/WebContent.php | 2 +- library/Zend/Gdata/Calendar/ListEntry.php | 16 +- library/Zend/Gdata/Calendar/ListFeed.php | 4 +- library/Zend/Gdata/ClientLogin.php | 16 +- library/Zend/Gdata/Docs.php | 12 +- library/Zend/Gdata/Docs/DocumentListEntry.php | 2 +- library/Zend/Gdata/Docs/DocumentListFeed.php | 2 +- library/Zend/Gdata/Docs/Query.php | 6 +- library/Zend/Gdata/DublinCore.php | 2 +- .../Gdata/DublinCore/Extension/Creator.php | 2 +- .../Zend/Gdata/DublinCore/Extension/Date.php | 2 +- .../DublinCore/Extension/Description.php | 2 +- .../Gdata/DublinCore/Extension/Format.php | 2 +- .../Gdata/DublinCore/Extension/Identifier.php | 2 +- .../Gdata/DublinCore/Extension/Language.php | 2 +- .../Gdata/DublinCore/Extension/Publisher.php | 2 +- .../Gdata/DublinCore/Extension/Rights.php | 2 +- .../Gdata/DublinCore/Extension/Subject.php | 2 +- .../Zend/Gdata/DublinCore/Extension/Title.php | 2 +- library/Zend/Gdata/Entry.php | 6 +- library/Zend/Gdata/Exif.php | 2 +- library/Zend/Gdata/Exif/Entry.php | 6 +- .../Zend/Gdata/Exif/Extension/Distance.php | 4 +- .../Zend/Gdata/Exif/Extension/Exposure.php | 4 +- library/Zend/Gdata/Exif/Extension/FStop.php | 4 +- library/Zend/Gdata/Exif/Extension/Flash.php | 4 +- .../Zend/Gdata/Exif/Extension/FocalLength.php | 4 +- .../Gdata/Exif/Extension/ImageUniqueId.php | 4 +- library/Zend/Gdata/Exif/Extension/Iso.php | 4 +- library/Zend/Gdata/Exif/Extension/Make.php | 4 +- library/Zend/Gdata/Exif/Extension/Model.php | 4 +- library/Zend/Gdata/Exif/Extension/Tags.php | 24 +- library/Zend/Gdata/Exif/Extension/Time.php | 4 +- library/Zend/Gdata/Exif/Feed.php | 6 +- library/Zend/Gdata/Extension.php | 2 +- .../Zend/Gdata/Extension/AttendeeStatus.php | 2 +- library/Zend/Gdata/Extension/AttendeeType.php | 2 +- library/Zend/Gdata/Extension/Comments.php | 4 +- library/Zend/Gdata/Extension/EntryLink.php | 4 +- library/Zend/Gdata/Extension/EventStatus.php | 2 +- .../Zend/Gdata/Extension/ExtendedProperty.php | 2 +- library/Zend/Gdata/Extension/FeedLink.php | 4 +- .../Extension/OpenSearchItemsPerPage.php | 2 +- .../Gdata/Extension/OpenSearchStartIndex.php | 2 +- .../Extension/OpenSearchTotalResults.php | 2 +- .../Zend/Gdata/Extension/OriginalEvent.php | 6 +- library/Zend/Gdata/Extension/Rating.php | 2 +- library/Zend/Gdata/Extension/Recurrence.php | 2 +- .../Gdata/Extension/RecurrenceException.php | 6 +- library/Zend/Gdata/Extension/Reminder.php | 2 +- library/Zend/Gdata/Extension/Transparency.php | 2 +- library/Zend/Gdata/Extension/Visibility.php | 2 +- library/Zend/Gdata/Extension/When.php | 4 +- library/Zend/Gdata/Extension/Where.php | 4 +- library/Zend/Gdata/Extension/Who.php | 8 +- library/Zend/Gdata/Feed.php | 14 +- library/Zend/Gdata/Gapps.php | 52 ++--- library/Zend/Gdata/Gapps/EmailListEntry.php | 6 +- library/Zend/Gdata/Gapps/EmailListFeed.php | 4 +- library/Zend/Gdata/Gapps/EmailListQuery.php | 2 +- .../Gdata/Gapps/EmailListRecipientEntry.php | 4 +- .../Gdata/Gapps/EmailListRecipientFeed.php | 4 +- .../Gdata/Gapps/EmailListRecipientQuery.php | 4 +- library/Zend/Gdata/Gapps/Error.php | 2 +- .../Zend/Gdata/Gapps/Extension/EmailList.php | 4 +- library/Zend/Gdata/Gapps/Extension/Login.php | 28 +-- library/Zend/Gdata/Gapps/Extension/Name.php | 4 +- .../Zend/Gdata/Gapps/Extension/Nickname.php | 4 +- .../Zend/Gdata/Gapps/Extension/Property.php | 4 +- library/Zend/Gdata/Gapps/Extension/Quota.php | 4 +- library/Zend/Gdata/Gapps/GroupEntry.php | 4 +- library/Zend/Gdata/Gapps/GroupFeed.php | 4 +- library/Zend/Gdata/Gapps/GroupQuery.php | 2 +- library/Zend/Gdata/Gapps/MemberEntry.php | 4 +- library/Zend/Gdata/Gapps/MemberFeed.php | 4 +- library/Zend/Gdata/Gapps/MemberQuery.php | 4 +- library/Zend/Gdata/Gapps/NicknameEntry.php | 6 +- library/Zend/Gdata/Gapps/NicknameFeed.php | 4 +- library/Zend/Gdata/Gapps/NicknameQuery.php | 2 +- library/Zend/Gdata/Gapps/OwnerEntry.php | 4 +- library/Zend/Gdata/Gapps/OwnerFeed.php | 4 +- library/Zend/Gdata/Gapps/OwnerQuery.php | 4 +- library/Zend/Gdata/Gapps/Query.php | 6 +- library/Zend/Gdata/Gapps/ServiceException.php | 14 +- library/Zend/Gdata/Gapps/UserEntry.php | 10 +- library/Zend/Gdata/Gapps/UserFeed.php | 4 +- library/Zend/Gdata/Gapps/UserQuery.php | 2 +- library/Zend/Gdata/Gbase.php | 4 +- library/Zend/Gdata/Gbase/Entry.php | 4 +- .../Gdata/Gbase/Extension/BaseAttribute.php | 2 +- library/Zend/Gdata/Gbase/Feed.php | 4 +- library/Zend/Gdata/Gbase/ItemEntry.php | 2 +- library/Zend/Gdata/Gbase/ItemFeed.php | 2 +- library/Zend/Gdata/Gbase/ItemQuery.php | 4 +- library/Zend/Gdata/Gbase/Query.php | 4 +- library/Zend/Gdata/Gbase/SnippetEntry.php | 2 +- library/Zend/Gdata/Gbase/SnippetFeed.php | 4 +- library/Zend/Gdata/Gbase/SnippetQuery.php | 2 +- library/Zend/Gdata/Geo.php | 2 +- library/Zend/Gdata/Geo/Entry.php | 6 +- .../Zend/Gdata/Geo/Extension/GeoRssWhere.php | 6 +- library/Zend/Gdata/Geo/Extension/GmlPoint.php | 6 +- library/Zend/Gdata/Geo/Extension/GmlPos.php | 4 +- library/Zend/Gdata/Geo/Feed.php | 6 +- library/Zend/Gdata/Health.php | 4 +- library/Zend/Gdata/Health/Extension/Ccr.php | 4 +- library/Zend/Gdata/Health/ProfileEntry.php | 4 +- library/Zend/Gdata/Health/ProfileFeed.php | 4 +- .../Zend/Gdata/Health/ProfileListEntry.php | 4 +- library/Zend/Gdata/Health/ProfileListFeed.php | 4 +- library/Zend/Gdata/Health/Query.php | 4 +- .../Zend/Gdata/HttpAdapterStreamingProxy.php | 12 +- .../Zend/Gdata/HttpAdapterStreamingSocket.php | 10 +- library/Zend/Gdata/HttpClient.php | 8 +- library/Zend/Gdata/Kind/EventEntry.php | 28 +-- library/Zend/Gdata/Media.php | 2 +- library/Zend/Gdata/Media/Entry.php | 6 +- .../Gdata/Media/Extension/MediaCategory.php | 2 +- .../Gdata/Media/Extension/MediaContent.php | 2 +- .../Gdata/Media/Extension/MediaCopyright.php | 2 +- .../Gdata/Media/Extension/MediaCredit.php | 2 +- .../Media/Extension/MediaDescription.php | 2 +- .../Zend/Gdata/Media/Extension/MediaGroup.php | 30 +-- .../Zend/Gdata/Media/Extension/MediaHash.php | 2 +- .../Gdata/Media/Extension/MediaKeywords.php | 2 +- .../Gdata/Media/Extension/MediaPlayer.php | 2 +- .../Gdata/Media/Extension/MediaRating.php | 2 +- .../Media/Extension/MediaRestriction.php | 2 +- .../Zend/Gdata/Media/Extension/MediaText.php | 2 +- .../Gdata/Media/Extension/MediaThumbnail.php | 2 +- .../Zend/Gdata/Media/Extension/MediaTitle.php | 2 +- library/Zend/Gdata/Media/Feed.php | 6 +- library/Zend/Gdata/MediaMimeStream.php | 6 +- library/Zend/Gdata/Photos.php | 26 +-- library/Zend/Gdata/Photos/AlbumEntry.php | 26 +-- library/Zend/Gdata/Photos/AlbumFeed.php | 8 +- library/Zend/Gdata/Photos/AlbumQuery.php | 6 +- library/Zend/Gdata/Photos/CommentEntry.php | 10 +- .../Zend/Gdata/Photos/Extension/Access.php | 4 +- .../Zend/Gdata/Photos/Extension/AlbumId.php | 4 +- .../Zend/Gdata/Photos/Extension/BytesUsed.php | 4 +- .../Zend/Gdata/Photos/Extension/Checksum.php | 4 +- .../Zend/Gdata/Photos/Extension/Client.php | 4 +- .../Gdata/Photos/Extension/CommentCount.php | 4 +- .../Photos/Extension/CommentingEnabled.php | 4 +- .../Zend/Gdata/Photos/Extension/Height.php | 4 +- library/Zend/Gdata/Photos/Extension/Id.php | 4 +- .../Zend/Gdata/Photos/Extension/Location.php | 4 +- .../Photos/Extension/MaxPhotosPerAlbum.php | 4 +- library/Zend/Gdata/Photos/Extension/Name.php | 4 +- .../Zend/Gdata/Photos/Extension/Nickname.php | 4 +- .../Zend/Gdata/Photos/Extension/NumPhotos.php | 4 +- .../Photos/Extension/NumPhotosRemaining.php | 4 +- .../Zend/Gdata/Photos/Extension/PhotoId.php | 4 +- .../Zend/Gdata/Photos/Extension/Position.php | 4 +- .../Gdata/Photos/Extension/QuotaCurrent.php | 4 +- .../Gdata/Photos/Extension/QuotaLimit.php | 4 +- .../Zend/Gdata/Photos/Extension/Rotation.php | 4 +- library/Zend/Gdata/Photos/Extension/Size.php | 4 +- .../Zend/Gdata/Photos/Extension/Thumbnail.php | 4 +- .../Zend/Gdata/Photos/Extension/Timestamp.php | 4 +- library/Zend/Gdata/Photos/Extension/User.php | 4 +- .../Zend/Gdata/Photos/Extension/Version.php | 4 +- .../Zend/Gdata/Photos/Extension/Weight.php | 4 +- library/Zend/Gdata/Photos/Extension/Width.php | 4 +- library/Zend/Gdata/Photos/PhotoEntry.php | 32 +-- library/Zend/Gdata/Photos/PhotoFeed.php | 8 +- library/Zend/Gdata/Photos/PhotoQuery.php | 4 +- library/Zend/Gdata/Photos/TagEntry.php | 6 +- library/Zend/Gdata/Photos/UserEntry.php | 18 +- library/Zend/Gdata/Photos/UserFeed.php | 16 +- library/Zend/Gdata/Photos/UserQuery.php | 8 +- library/Zend/Gdata/Query.php | 6 +- library/Zend/Gdata/Spreadsheets.php | 24 +- library/Zend/Gdata/Spreadsheets/CellEntry.php | 4 +- library/Zend/Gdata/Spreadsheets/CellFeed.php | 6 +- library/Zend/Gdata/Spreadsheets/CellQuery.php | 12 +- .../Zend/Gdata/Spreadsheets/DocumentQuery.php | 12 +- .../Gdata/Spreadsheets/Extension/Cell.php | 4 +- .../Gdata/Spreadsheets/Extension/ColCount.php | 4 +- .../Gdata/Spreadsheets/Extension/Custom.php | 4 +- .../Gdata/Spreadsheets/Extension/RowCount.php | 4 +- library/Zend/Gdata/Spreadsheets/ListEntry.php | 8 +- library/Zend/Gdata/Spreadsheets/ListFeed.php | 2 +- library/Zend/Gdata/Spreadsheets/ListQuery.php | 12 +- .../Gdata/Spreadsheets/SpreadsheetEntry.php | 2 +- .../Gdata/Spreadsheets/SpreadsheetFeed.php | 2 +- .../Gdata/Spreadsheets/WorksheetEntry.php | 6 +- .../Zend/Gdata/Spreadsheets/WorksheetFeed.php | 2 +- library/Zend/Gdata/YouTube.php | 40 ++-- library/Zend/Gdata/YouTube/ActivityEntry.php | 8 +- library/Zend/Gdata/YouTube/ActivityFeed.php | 4 +- library/Zend/Gdata/YouTube/CommentEntry.php | 2 +- library/Zend/Gdata/YouTube/CommentFeed.php | 4 +- library/Zend/Gdata/YouTube/ContactEntry.php | 4 +- library/Zend/Gdata/YouTube/ContactFeed.php | 4 +- .../Zend/Gdata/YouTube/Extension/AboutMe.php | 2 +- library/Zend/Gdata/YouTube/Extension/Age.php | 2 +- .../Zend/Gdata/YouTube/Extension/Books.php | 2 +- .../Zend/Gdata/YouTube/Extension/Company.php | 2 +- .../Zend/Gdata/YouTube/Extension/Control.php | 4 +- .../Gdata/YouTube/Extension/CountHint.php | 2 +- .../Gdata/YouTube/Extension/Description.php | 2 +- .../Zend/Gdata/YouTube/Extension/Duration.php | 2 +- .../Gdata/YouTube/Extension/FirstName.php | 2 +- .../Zend/Gdata/YouTube/Extension/Gender.php | 2 +- .../Zend/Gdata/YouTube/Extension/Hobbies.php | 2 +- .../Zend/Gdata/YouTube/Extension/Hometown.php | 2 +- .../Zend/Gdata/YouTube/Extension/LastName.php | 2 +- library/Zend/Gdata/YouTube/Extension/Link.php | 4 +- .../Zend/Gdata/YouTube/Extension/Location.php | 2 +- .../Gdata/YouTube/Extension/MediaContent.php | 2 +- .../Gdata/YouTube/Extension/MediaCredit.php | 2 +- .../Gdata/YouTube/Extension/MediaGroup.php | 16 +- .../Gdata/YouTube/Extension/MediaRating.php | 2 +- .../Zend/Gdata/YouTube/Extension/Movies.php | 2 +- .../Zend/Gdata/YouTube/Extension/Music.php | 2 +- .../Zend/Gdata/YouTube/Extension/NoEmbed.php | 2 +- .../Gdata/YouTube/Extension/Occupation.php | 2 +- .../Gdata/YouTube/Extension/PlaylistId.php | 2 +- .../Gdata/YouTube/Extension/PlaylistTitle.php | 2 +- .../Zend/Gdata/YouTube/Extension/Position.php | 2 +- .../Zend/Gdata/YouTube/Extension/Private.php | 2 +- .../Gdata/YouTube/Extension/QueryString.php | 2 +- library/Zend/Gdata/YouTube/Extension/Racy.php | 2 +- .../Zend/Gdata/YouTube/Extension/Recorded.php | 2 +- .../Gdata/YouTube/Extension/Relationship.php | 2 +- .../Gdata/YouTube/Extension/ReleaseDate.php | 2 +- .../Zend/Gdata/YouTube/Extension/School.php | 2 +- .../Zend/Gdata/YouTube/Extension/State.php | 2 +- .../Gdata/YouTube/Extension/Statistics.php | 2 +- .../Zend/Gdata/YouTube/Extension/Status.php | 2 +- .../Zend/Gdata/YouTube/Extension/Token.php | 2 +- .../Zend/Gdata/YouTube/Extension/Uploaded.php | 2 +- .../Zend/Gdata/YouTube/Extension/Username.php | 2 +- .../Zend/Gdata/YouTube/Extension/VideoId.php | 2 +- library/Zend/Gdata/YouTube/InboxEntry.php | 14 +- library/Zend/Gdata/YouTube/InboxFeed.php | 4 +- library/Zend/Gdata/YouTube/MediaEntry.php | 6 +- .../Zend/Gdata/YouTube/PlaylistListEntry.php | 16 +- .../Zend/Gdata/YouTube/PlaylistListFeed.php | 4 +- .../Zend/Gdata/YouTube/PlaylistVideoEntry.php | 4 +- .../Zend/Gdata/YouTube/PlaylistVideoFeed.php | 4 +- .../Zend/Gdata/YouTube/SubscriptionEntry.php | 30 +-- .../Zend/Gdata/YouTube/SubscriptionFeed.php | 4 +- .../Zend/Gdata/YouTube/UserProfileEntry.php | 58 ++--- library/Zend/Gdata/YouTube/VideoEntry.php | 36 +-- library/Zend/Gdata/YouTube/VideoFeed.php | 4 +- library/Zend/Gdata/YouTube/VideoQuery.php | 30 +-- library/Zend/Http/Client.php | 50 ++--- library/Zend/Http/Client/Adapter/Curl.php | 26 +-- .../Zend/Http/Client/Adapter/Exception.php | 2 +- library/Zend/Http/Client/Adapter/Proxy.php | 20 +- library/Zend/Http/Client/Adapter/Socket.php | 32 +-- library/Zend/Http/Client/Adapter/Test.php | 12 +- library/Zend/Http/Client/Exception.php | 2 +- library/Zend/Http/Cookie.php | 20 +- library/Zend/Http/CookieJar.php | 16 +- library/Zend/Http/Exception.php | 2 +- .../Exception/InvalidArgumentException.php | 2 +- .../Header/Exception/RuntimeException.php | 2 +- library/Zend/Http/Header/HeaderValue.php | 2 +- library/Zend/Http/Header/SetCookie.php | 6 +- library/Zend/Http/Response.php | 16 +- library/Zend/Http/UserAgent.php | 26 +-- .../Zend/Http/UserAgent/AbstractDevice.php | 8 +- library/Zend/Http/UserAgent/Bot.php | 2 +- library/Zend/Http/UserAgent/Checker.php | 2 +- library/Zend/Http/UserAgent/Console.php | 2 +- library/Zend/Http/UserAgent/Desktop.php | 2 +- library/Zend/Http/UserAgent/Email.php | 2 +- library/Zend/Http/UserAgent/Exception.php | 2 +- .../UserAgent/Features/Adapter/Browscap.php | 4 +- .../Features/Adapter/DeviceAtlas.php | 10 +- .../UserAgent/Features/Adapter/TeraWurfl.php | 8 +- .../Http/UserAgent/Features/Exception.php | 2 +- library/Zend/Http/UserAgent/Feed.php | 2 +- library/Zend/Http/UserAgent/Mobile.php | 2 +- library/Zend/Http/UserAgent/Offline.php | 2 +- library/Zend/Http/UserAgent/Probe.php | 2 +- library/Zend/Http/UserAgent/Spam.php | 2 +- .../Zend/Http/UserAgent/Storage/Exception.php | 2 +- .../Http/UserAgent/Storage/NonPersistent.php | 2 +- .../Zend/Http/UserAgent/Storage/Session.php | 6 +- library/Zend/Http/UserAgent/Text.php | 2 +- library/Zend/Http/UserAgent/Validator.php | 2 +- library/Zend/Json.php | 18 +- library/Zend/Json/Decoder.php | 22 +- library/Zend/Json/Encoder.php | 4 +- library/Zend/Json/Exception.php | 2 +- library/Zend/Json/Server.php | 24 +- library/Zend/Json/Server/Cache.php | 2 +- library/Zend/Json/Server/Error.php | 2 +- library/Zend/Json/Server/Exception.php | 2 +- library/Zend/Json/Server/Request.php | 4 +- library/Zend/Json/Server/Request/Http.php | 2 +- library/Zend/Json/Server/Response.php | 2 +- library/Zend/Json/Server/Response/Http.php | 2 +- library/Zend/Json/Server/Smd.php | 14 +- library/Zend/Json/Server/Smd/Service.php | 20 +- library/Zend/Layout.php | 20 +- .../Controller/Action/Helper/Layout.php | 10 +- .../Zend/Layout/Controller/Plugin/Layout.php | 2 +- library/Zend/Layout/Exception.php | 2 +- library/Zend/Ldap.php | 76 +++---- library/Zend/Ldap/Attribute.php | 2 +- .../Zend/Ldap/Collection/Iterator/Default.php | 8 +- library/Zend/Ldap/Converter/Exception.php | 2 +- library/Zend/Ldap/Dn.php | 18 +- library/Zend/Ldap/Exception.php | 2 +- library/Zend/Ldap/Filter.php | 8 +- library/Zend/Ldap/Filter/Abstract.php | 10 +- library/Zend/Ldap/Filter/And.php | 2 +- library/Zend/Ldap/Filter/Exception.php | 2 +- library/Zend/Ldap/Filter/Logical.php | 6 +- library/Zend/Ldap/Filter/Mask.php | 2 +- library/Zend/Ldap/Filter/Not.php | 2 +- library/Zend/Ldap/Filter/Or.php | 2 +- library/Zend/Ldap/Filter/String.php | 2 +- library/Zend/Ldap/Node.php | 30 +-- library/Zend/Ldap/Node/Abstract.php | 4 +- library/Zend/Ldap/Node/ChildrenIterator.php | 2 +- library/Zend/Ldap/Node/Collection.php | 4 +- library/Zend/Ldap/Node/RootDse.php | 10 +- .../Ldap/Node/RootDse/ActiveDirectory.php | 4 +- library/Zend/Ldap/Node/RootDse/OpenLdap.php | 2 +- library/Zend/Ldap/Node/RootDse/eDirectory.php | 2 +- library/Zend/Ldap/Node/Schema.php | 6 +- .../Zend/Ldap/Node/Schema/ActiveDirectory.php | 6 +- .../Schema/AttributeType/ActiveDirectory.php | 4 +- .../Node/Schema/AttributeType/OpenLdap.php | 4 +- .../Schema/ObjectClass/ActiveDirectory.php | 4 +- .../Ldap/Node/Schema/ObjectClass/OpenLdap.php | 4 +- library/Zend/Ldap/Node/Schema/OpenLdap.php | 6 +- library/Zend/Loader/Autoloader/Resource.php | 26 +-- library/Zend/Loader/AutoloaderFactory.php | 14 +- library/Zend/Loader/ClassMapAutoloader.php | 10 +- library/Zend/Loader/Exception.php | 2 +- .../Exception/InvalidArgumentException.php | 2 +- library/Zend/Loader/PluginLoader.php | 18 +- .../Zend/Loader/PluginLoader/Exception.php | 2 +- library/Zend/Loader/StandardAutoloader.php | 10 +- library/Zend/Locale.php | 32 +-- library/Zend/Locale/Data.php | 16 +- library/Zend/Locale/Exception.php | 2 +- library/Zend/Locale/Format.php | 42 ++-- library/Zend/Locale/Math.php | 2 +- library/Zend/Locale/Math/Exception.php | 2 +- library/Zend/Locale/Math/PhpMath.php | 16 +- library/Zend/Log.php | 34 +-- library/Zend/Log/Exception.php | 2 +- library/Zend/Log/Filter/Abstract.php | 6 +- library/Zend/Log/Filter/Message.php | 4 +- library/Zend/Log/Filter/Priority.php | 4 +- library/Zend/Log/Filter/Suppress.php | 2 +- library/Zend/Log/Formatter/Abstract.php | 4 +- library/Zend/Log/Formatter/Firebug.php | 2 +- library/Zend/Log/Formatter/Simple.php | 4 +- library/Zend/Log/Formatter/Xml.php | 2 +- library/Zend/Log/Writer/Abstract.php | 6 +- library/Zend/Log/Writer/Db.php | 6 +- library/Zend/Log/Writer/Firebug.php | 8 +- library/Zend/Log/Writer/Mail.php | 8 +- library/Zend/Log/Writer/Mock.php | 2 +- library/Zend/Log/Writer/Null.php | 2 +- library/Zend/Log/Writer/Stream.php | 12 +- library/Zend/Log/Writer/Syslog.php | 8 +- library/Zend/Log/Writer/ZendMonitor.php | 2 +- library/Zend/Mail.php | 36 +-- library/Zend/Mail/Exception.php | 2 +- library/Zend/Mail/Header/HeaderName.php | 2 +- library/Zend/Mail/Header/HeaderValue.php | 2 +- library/Zend/Mail/Message.php | 6 +- library/Zend/Mail/Message/File.php | 4 +- library/Zend/Mail/Part.php | 26 +-- library/Zend/Mail/Part/File.php | 14 +- library/Zend/Mail/Protocol/Abstract.php | 22 +- library/Zend/Mail/Protocol/Exception.php | 2 +- library/Zend/Mail/Protocol/Imap.php | 16 +- library/Zend/Mail/Protocol/Pop3.php | 12 +- library/Zend/Mail/Protocol/Smtp.php | 20 +- .../Zend/Mail/Protocol/Smtp/Auth/Crammd5.php | 2 +- .../Zend/Mail/Protocol/Smtp/Auth/Login.php | 2 +- .../Zend/Mail/Protocol/Smtp/Auth/Plain.php | 2 +- library/Zend/Mail/Storage/Abstract.php | 4 +- library/Zend/Mail/Storage/Exception.php | 2 +- library/Zend/Mail/Storage/Folder.php | 2 +- library/Zend/Mail/Storage/Folder/Maildir.php | 20 +- library/Zend/Mail/Storage/Folder/Mbox.php | 18 +- library/Zend/Mail/Storage/Imap.php | 52 ++--- library/Zend/Mail/Storage/Maildir.php | 26 +-- library/Zend/Mail/Storage/Mbox.php | 22 +- library/Zend/Mail/Storage/Pop3.php | 14 +- .../Zend/Mail/Storage/Writable/Maildir.php | 70 +++--- library/Zend/Mail/Transport/Abstract.php | 10 +- library/Zend/Mail/Transport/Exception.php | 2 +- library/Zend/Mail/Transport/File.php | 6 +- library/Zend/Mail/Transport/Sendmail.php | 12 +- library/Zend/Mail/Transport/Smtp.php | 10 +- library/Zend/Markup.php | 2 +- library/Zend/Markup/Exception.php | 2 +- library/Zend/Markup/Parser/Bbcode.php | 8 +- library/Zend/Markup/Parser/Exception.php | 2 +- library/Zend/Markup/Renderer/Exception.php | 2 +- library/Zend/Markup/Renderer/Html.php | 8 +- library/Zend/Markup/Renderer/Html/Code.php | 2 +- .../Markup/Renderer/Html/HtmlAbstract.php | 2 +- library/Zend/Markup/Renderer/Html/Img.php | 4 +- library/Zend/Markup/Renderer/Html/List.php | 2 +- library/Zend/Markup/Renderer/Html/Url.php | 4 +- .../Zend/Markup/Renderer/RendererAbstract.php | 14 +- library/Zend/Markup/Token.php | 2 +- library/Zend/Markup/TokenList.php | 2 +- library/Zend/Memory.php | 12 +- library/Zend/Memory/AccessController.php | 2 +- library/Zend/Memory/Container.php | 2 +- library/Zend/Memory/Container/Locked.php | 2 +- library/Zend/Memory/Container/Movable.php | 8 +- library/Zend/Memory/Exception.php | 2 +- library/Zend/Memory/Manager.php | 8 +- library/Zend/Mime/Decode.php | 2 +- library/Zend/Mime/Exception.php | 2 +- library/Zend/Mime/Message.php | 6 +- library/Zend/Mime/Part.php | 8 +- library/Zend/Navigation.php | 4 +- library/Zend/Navigation/Container.php | 12 +- library/Zend/Navigation/Exception.php | 2 +- library/Zend/Navigation/Page.php | 52 ++--- library/Zend/Navigation/Page/Mvc.php | 18 +- library/Zend/Navigation/Page/Uri.php | 4 +- library/Zend/Oauth.php | 2 +- library/Zend/Oauth/Client.php | 14 +- library/Zend/Oauth/Config.php | 24 +- library/Zend/Oauth/Consumer.php | 22 +- library/Zend/Oauth/Exception.php | 2 +- library/Zend/Oauth/Http.php | 10 +- library/Zend/Oauth/Http/AccessToken.php | 4 +- library/Zend/Oauth/Http/RequestToken.php | 4 +- library/Zend/Oauth/Http/UserAuthorization.php | 4 +- library/Zend/Oauth/Http/Utility.php | 6 +- library/Zend/Oauth/Signature/Hmac.php | 4 +- library/Zend/Oauth/Signature/Plaintext.php | 2 +- library/Zend/Oauth/Signature/Rsa.php | 4 +- .../Oauth/Signature/SignatureAbstract.php | 4 +- library/Zend/Oauth/Token.php | 2 +- library/Zend/Oauth/Token/Access.php | 12 +- .../Zend/Oauth/Token/AuthorizedRequest.php | 2 +- library/Zend/Oauth/Token/Request.php | 2 +- library/Zend/OpenId.php | 16 +- library/Zend/OpenId/Consumer.php | 14 +- library/Zend/OpenId/Consumer/Storage/File.php | 10 +- library/Zend/OpenId/Exception.php | 2 +- library/Zend/OpenId/Extension/Sreg.php | 2 +- library/Zend/OpenId/Provider.php | 8 +- library/Zend/OpenId/Provider/Storage/File.php | 2 +- library/Zend/OpenId/Provider/User/Session.php | 4 +- library/Zend/Paginator.php | 18 +- library/Zend/Paginator/Adapter/Array.php | 2 +- library/Zend/Paginator/Adapter/DbSelect.php | 10 +- .../Zend/Paginator/Adapter/DbTableSelect.php | 2 +- library/Zend/Paginator/Adapter/Iterator.php | 6 +- library/Zend/Paginator/Adapter/Null.php | 2 +- library/Zend/Paginator/Exception.php | 2 +- library/Zend/Paginator/ScrollingStyle/All.php | 2 +- .../Zend/Paginator/ScrollingStyle/Elastic.php | 2 +- .../Zend/Paginator/ScrollingStyle/Jumping.php | 2 +- .../Zend/Paginator/ScrollingStyle/Sliding.php | 2 +- library/Zend/Pdf.php | 100 ++++----- library/Zend/ProgressBar.php | 4 +- library/Zend/ProgressBar/Adapter/Console.php | 14 +- .../Zend/ProgressBar/Adapter/Exception.php | 2 +- library/Zend/ProgressBar/Adapter/JsPull.php | 4 +- library/Zend/ProgressBar/Adapter/JsPush.php | 4 +- library/Zend/ProgressBar/Exception.php | 2 +- library/Zend/Queue.php | 18 +- library/Zend/Queue/Adapter/Activemq.php | 24 +- .../Zend/Queue/Adapter/AdapterAbstract.php | 8 +- library/Zend/Queue/Adapter/Array.php | 10 +- library/Zend/Queue/Adapter/Db.php | 40 ++-- library/Zend/Queue/Adapter/Db/Message.php | 2 +- library/Zend/Queue/Adapter/Db/Queue.php | 2 +- library/Zend/Queue/Adapter/Memcacheq.php | 20 +- library/Zend/Queue/Adapter/Null.php | 18 +- .../Zend/Queue/Adapter/PlatformJobQueue.php | 42 ++-- library/Zend/Queue/Exception.php | 2 +- library/Zend/Queue/Message.php | 8 +- library/Zend/Queue/Message/Iterator.php | 4 +- library/Zend/Queue/Message/PlatformJob.php | 6 +- library/Zend/Queue/Stomp/Client.php | 2 +- .../Zend/Queue/Stomp/Client/Connection.php | 14 +- library/Zend/Queue/Stomp/Frame.php | 18 +- library/Zend/Reflection/Class.php | 24 +- library/Zend/Reflection/Docblock.php | 8 +- library/Zend/Reflection/Docblock/Tag.php | 6 +- .../Zend/Reflection/Docblock/Tag/Param.php | 6 +- .../Zend/Reflection/Docblock/Tag/Return.php | 6 +- library/Zend/Reflection/Exception.php | 2 +- library/Zend/Reflection/Extension.php | 8 +- library/Zend/Reflection/File.php | 20 +- library/Zend/Reflection/Function.php | 10 +- library/Zend/Reflection/Method.php | 14 +- library/Zend/Reflection/Parameter.php | 6 +- library/Zend/Reflection/Property.php | 4 +- library/Zend/Registry.php | 10 +- library/Zend/Rest/Client.php | 8 +- library/Zend/Rest/Client/Exception.php | 2 +- library/Zend/Rest/Client/Result.php | 4 +- library/Zend/Rest/Client/Result/Exception.php | 2 +- library/Zend/Rest/Controller.php | 2 +- library/Zend/Rest/Exception.php | 2 +- library/Zend/Rest/Route.php | 8 +- library/Zend/Rest/Server.php | 18 +- library/Zend/Rest/Server/Exception.php | 2 +- library/Zend/Serializer.php | 6 +- .../Serializer/Adapter/AdapterAbstract.php | 4 +- library/Zend/Serializer/Adapter/Amf0.php | 14 +- library/Zend/Serializer/Adapter/Amf3.php | 14 +- library/Zend/Serializer/Adapter/Igbinary.php | 8 +- library/Zend/Serializer/Adapter/Json.php | 10 +- library/Zend/Serializer/Adapter/PhpCode.php | 4 +- .../Zend/Serializer/Adapter/PhpSerialize.php | 6 +- .../Zend/Serializer/Adapter/PythonPickle.php | 30 +-- library/Zend/Serializer/Adapter/Wddx.php | 12 +- library/Zend/Serializer/Exception.php | 2 +- library/Zend/Server/Abstract.php | 14 +- library/Zend/Server/Cache.php | 4 +- library/Zend/Server/Definition.php | 8 +- library/Zend/Server/Exception.php | 2 +- library/Zend/Server/Method/Callback.php | 2 +- library/Zend/Server/Method/Definition.php | 10 +- library/Zend/Server/Method/Prototype.php | 2 +- library/Zend/Server/Reflection.php | 12 +- library/Zend/Server/Reflection/Class.php | 6 +- library/Zend/Server/Reflection/Exception.php | 2 +- library/Zend/Server/Reflection/Function.php | 2 +- .../Server/Reflection/Function/Abstract.php | 16 +- library/Zend/Server/Reflection/Method.php | 2 +- library/Zend/Server/Reflection/Parameter.php | 6 +- library/Zend/Server/Reflection/Prototype.php | 8 +- .../Zend/Server/Reflection/ReturnValue.php | 4 +- library/Zend/Session.php | 32 +-- library/Zend/Session/Abstract.php | 6 +- library/Zend/Session/Exception.php | 2 +- library/Zend/Session/Namespace.php | 36 +-- library/Zend/Session/SaveHandler/DbTable.php | 24 +- .../Zend/Session/SaveHandler/Exception.php | 2 +- library/Zend/Session/Validator/Abstract.php | 2 +- library/Zend/Session/Validator/Exception.php | 2 +- .../Zend/Session/Validator/HttpUserAgent.php | 2 +- library/Zend/Soap/AutoDiscover.php | 28 +-- library/Zend/Soap/AutoDiscover/Exception.php | 2 +- library/Zend/Soap/Client.php | 38 ++-- library/Zend/Soap/Client/DotNet.php | 4 +- library/Zend/Soap/Client/Exception.php | 2 +- library/Zend/Soap/Client/Local.php | 4 +- library/Zend/Soap/Server.php | 46 ++-- library/Zend/Soap/Server/Exception.php | 2 +- library/Zend/Soap/Wsdl.php | 18 +- library/Zend/Soap/Wsdl/Exception.php | 2 +- library/Zend/Soap/Wsdl/Strategy/Abstract.php | 2 +- library/Zend/Soap/Wsdl/Strategy/AnyType.php | 2 +- .../Soap/Wsdl/Strategy/ArrayOfTypeComplex.php | 6 +- .../Wsdl/Strategy/ArrayOfTypeSequence.php | 2 +- library/Zend/Soap/Wsdl/Strategy/Composite.php | 10 +- .../Soap/Wsdl/Strategy/DefaultComplexType.php | 4 +- library/Zend/Stdlib/CallbackHandler.php | 8 +- .../Exception/InvalidCallbackException.php | 2 +- library/Zend/Stdlib/PriorityQueue.php | 2 +- library/Zend/Tag/Cloud.php | 14 +- .../Zend/Tag/Cloud/Decorator/Exception.php | 2 +- .../Zend/Tag/Cloud/Decorator/HtmlCloud.php | 2 +- library/Zend/Tag/Cloud/Decorator/HtmlTag.php | 12 +- library/Zend/Tag/Cloud/Exception.php | 2 +- library/Zend/Tag/Exception.php | 2 +- library/Zend/Tag/Item.php | 12 +- library/Zend/Tag/ItemList.php | 6 +- library/Zend/Test/DbAdapter.php | 6 +- library/Zend/Test/DbStatement.php | 4 +- .../Test/PHPUnit/Constraint/DomQuery34.php | 12 +- .../Test/PHPUnit/Constraint/DomQuery37.php | 12 +- .../Test/PHPUnit/Constraint/DomQuery41.php | 12 +- .../Test/PHPUnit/Constraint/Redirect34.php | 10 +- .../Test/PHPUnit/Constraint/Redirect37.php | 10 +- .../Test/PHPUnit/Constraint/Redirect41.php | 10 +- .../PHPUnit/Constraint/ResponseHeader34.php | 16 +- .../PHPUnit/Constraint/ResponseHeader37.php | 16 +- .../PHPUnit/Constraint/ResponseHeader41.php | 16 +- .../Zend/Test/PHPUnit/ControllerTestCase.php | 88 ++++---- .../Zend/Test/PHPUnit/DatabaseTestCase.php | 10 +- library/Zend/Test/PHPUnit/Db/Connection.php | 4 +- .../Zend/Test/PHPUnit/Db/DataSet/DbRowset.php | 4 +- .../Zend/Test/PHPUnit/Db/DataSet/DbTable.php | 2 +- .../PHPUnit/Db/DataSet/DbTableDataSet.php | 2 +- .../Test/PHPUnit/Db/DataSet/QueryDataSet.php | 6 +- .../Test/PHPUnit/Db/DataSet/QueryTable.php | 2 +- library/Zend/Test/PHPUnit/Db/Exception.php | 2 +- .../Zend/Test/PHPUnit/Db/Metadata/Generic.php | 2 +- .../Test/PHPUnit/Db/Operation/DeleteAll.php | 4 +- .../Zend/Test/PHPUnit/Db/Operation/Insert.php | 4 +- .../Test/PHPUnit/Db/Operation/Truncate.php | 6 +- library/Zend/Test/PHPUnit/Db/SimpleTester.php | 6 +- library/Zend/Text/Exception.php | 2 +- library/Zend/Text/Figlet.php | 10 +- library/Zend/Text/Figlet/Exception.php | 2 +- library/Zend/Text/Table.php | 18 +- library/Zend/Text/Table/Column.php | 14 +- library/Zend/Text/Table/Decorator/Ascii.php | 2 +- library/Zend/Text/Table/Decorator/Unicode.php | 2 +- library/Zend/Text/Table/Exception.php | 2 +- library/Zend/Text/Table/Row.php | 8 +- library/Zend/TimeSync.php | 16 +- library/Zend/TimeSync/Exception.php | 2 +- library/Zend/TimeSync/Ntp.php | 2 +- library/Zend/TimeSync/Sntp.php | 2 +- library/Zend/Translate.php | 8 +- library/Zend/Translate/Adapter.php | 18 +- library/Zend/Translate/Adapter/Array.php | 6 +- library/Zend/Translate/Adapter/Csv.php | 6 +- library/Zend/Translate/Adapter/Gettext.php | 10 +- library/Zend/Translate/Adapter/Ini.php | 6 +- library/Zend/Translate/Adapter/Qt.php | 14 +- library/Zend/Translate/Adapter/Tbx.php | 14 +- library/Zend/Translate/Adapter/Tmx.php | 14 +- library/Zend/Translate/Adapter/Xliff.php | 14 +- library/Zend/Translate/Adapter/XmlTm.php | 14 +- library/Zend/Translate/Exception.php | 2 +- library/Zend/Translate/Plural.php | 2 +- library/Zend/Uri.php | 12 +- library/Zend/Uri/Exception.php | 2 +- library/Zend/Uri/Http.php | 40 ++-- library/Zend/Validate.php | 14 +- library/Zend/Validate/Abstract.php | 12 +- library/Zend/Validate/Alnum.php | 4 +- library/Zend/Validate/Alpha.php | 4 +- library/Zend/Validate/Barcode.php | 10 +- .../Zend/Validate/Barcode/AdapterAbstract.php | 2 +- library/Zend/Validate/Barcode/Code25.php | 2 +- .../Validate/Barcode/Code25interleaved.php | 2 +- library/Zend/Validate/Barcode/Code39.php | 2 +- library/Zend/Validate/Barcode/Code39ext.php | 2 +- library/Zend/Validate/Barcode/Code93.php | 2 +- library/Zend/Validate/Barcode/Code93ext.php | 2 +- library/Zend/Validate/Barcode/Ean12.php | 2 +- library/Zend/Validate/Barcode/Ean13.php | 2 +- library/Zend/Validate/Barcode/Ean14.php | 2 +- library/Zend/Validate/Barcode/Ean18.php | 2 +- library/Zend/Validate/Barcode/Ean2.php | 2 +- library/Zend/Validate/Barcode/Ean5.php | 2 +- library/Zend/Validate/Barcode/Ean8.php | 2 +- library/Zend/Validate/Barcode/Gtin12.php | 2 +- library/Zend/Validate/Barcode/Gtin13.php | 2 +- library/Zend/Validate/Barcode/Gtin14.php | 2 +- library/Zend/Validate/Barcode/Identcode.php | 2 +- .../Zend/Validate/Barcode/Intelligentmail.php | 2 +- library/Zend/Validate/Barcode/Issn.php | 2 +- library/Zend/Validate/Barcode/Itf14.php | 2 +- library/Zend/Validate/Barcode/Leitcode.php | 2 +- library/Zend/Validate/Barcode/Planet.php | 2 +- library/Zend/Validate/Barcode/Postnet.php | 2 +- library/Zend/Validate/Barcode/Royalmail.php | 2 +- library/Zend/Validate/Barcode/Sscc.php | 2 +- library/Zend/Validate/Barcode/Upca.php | 2 +- library/Zend/Validate/Barcode/Upce.php | 2 +- library/Zend/Validate/Between.php | 4 +- library/Zend/Validate/Callback.php | 6 +- library/Zend/Validate/Ccnum.php | 4 +- library/Zend/Validate/CreditCard.php | 6 +- library/Zend/Validate/Date.php | 10 +- library/Zend/Validate/Db/Abstract.php | 10 +- library/Zend/Validate/Db/NoRecordExists.php | 2 +- library/Zend/Validate/Db/RecordExists.php | 2 +- library/Zend/Validate/Digits.php | 4 +- library/Zend/Validate/EmailAddress.php | 6 +- library/Zend/Validate/Exception.php | 2 +- library/Zend/Validate/File/Count.php | 12 +- library/Zend/Validate/File/Crc32.php | 6 +- .../Zend/Validate/File/ExcludeExtension.php | 4 +- .../Zend/Validate/File/ExcludeMimeType.php | 4 +- library/Zend/Validate/File/Exists.php | 6 +- library/Zend/Validate/File/Extension.php | 4 +- library/Zend/Validate/File/FilesSize.php | 6 +- library/Zend/Validate/File/Hash.php | 10 +- library/Zend/Validate/File/ImageSize.php | 14 +- library/Zend/Validate/File/IsCompressed.php | 2 +- library/Zend/Validate/File/IsImage.php | 2 +- library/Zend/Validate/File/Md5.php | 6 +- library/Zend/Validate/File/MimeType.php | 16 +- library/Zend/Validate/File/NotExists.php | 2 +- library/Zend/Validate/File/Sha1.php | 6 +- library/Zend/Validate/File/Size.php | 14 +- library/Zend/Validate/File/Upload.php | 4 +- library/Zend/Validate/File/WordCount.php | 4 +- library/Zend/Validate/Float.php | 8 +- library/Zend/Validate/GreaterThan.php | 4 +- library/Zend/Validate/Hex.php | 2 +- library/Zend/Validate/Hostname.php | 4 +- library/Zend/Validate/Iban.php | 8 +- library/Zend/Validate/Identical.php | 2 +- library/Zend/Validate/InArray.php | 4 +- library/Zend/Validate/Int.php | 8 +- library/Zend/Validate/Ip.php | 4 +- library/Zend/Validate/Isbn.php | 8 +- library/Zend/Validate/Ldap/Dn.php | 2 +- library/Zend/Validate/LessThan.php | 4 +- library/Zend/Validate/NotEmpty.php | 4 +- library/Zend/Validate/PostCode.php | 16 +- library/Zend/Validate/Regex.php | 6 +- library/Zend/Validate/Sitemap/Changefreq.php | 2 +- library/Zend/Validate/Sitemap/Lastmod.php | 2 +- library/Zend/Validate/Sitemap/Loc.php | 4 +- library/Zend/Validate/Sitemap/Priority.php | 2 +- library/Zend/Validate/StringLength.php | 8 +- library/Zend/View.php | 4 +- library/Zend/View/Abstract.php | 28 +-- library/Zend/View/Exception.php | 2 +- library/Zend/View/Helper/Abstract.php | 2 +- library/Zend/View/Helper/Action.php | 6 +- library/Zend/View/Helper/BaseUrl.php | 4 +- library/Zend/View/Helper/Currency.php | 8 +- library/Zend/View/Helper/DeclareVars.php | 2 +- library/Zend/View/Helper/Doctype.php | 6 +- library/Zend/View/Helper/Fieldset.php | 2 +- library/Zend/View/Helper/Form.php | 2 +- library/Zend/View/Helper/FormButton.php | 2 +- library/Zend/View/Helper/FormCheckbox.php | 2 +- library/Zend/View/Helper/FormElement.php | 4 +- library/Zend/View/Helper/FormErrors.php | 2 +- library/Zend/View/Helper/FormFile.php | 2 +- library/Zend/View/Helper/FormHidden.php | 2 +- library/Zend/View/Helper/FormImage.php | 2 +- library/Zend/View/Helper/FormLabel.php | 2 +- .../Zend/View/Helper/FormMultiCheckbox.php | 2 +- library/Zend/View/Helper/FormNote.php | 2 +- library/Zend/View/Helper/FormPassword.php | 2 +- library/Zend/View/Helper/FormRadio.php | 4 +- library/Zend/View/Helper/FormReset.php | 2 +- library/Zend/View/Helper/FormSelect.php | 2 +- library/Zend/View/Helper/FormSubmit.php | 2 +- library/Zend/View/Helper/FormText.php | 2 +- library/Zend/View/Helper/FormTextarea.php | 2 +- library/Zend/View/Helper/Gravatar.php | 4 +- library/Zend/View/Helper/HeadLink.php | 14 +- library/Zend/View/Helper/HeadMeta.php | 20 +- library/Zend/View/Helper/HeadScript.php | 16 +- library/Zend/View/Helper/HeadStyle.php | 14 +- library/Zend/View/Helper/HeadTitle.php | 8 +- library/Zend/View/Helper/HtmlElement.php | 4 +- library/Zend/View/Helper/HtmlFlash.php | 2 +- library/Zend/View/Helper/HtmlList.php | 4 +- library/Zend/View/Helper/HtmlObject.php | 2 +- library/Zend/View/Helper/HtmlPage.php | 2 +- library/Zend/View/Helper/HtmlQuicktime.php | 2 +- library/Zend/View/Helper/InlineScript.php | 2 +- library/Zend/View/Helper/Json.php | 8 +- library/Zend/View/Helper/Layout.php | 4 +- library/Zend/View/Helper/Navigation.php | 4 +- .../View/Helper/Navigation/Breadcrumbs.php | 6 +- .../View/Helper/Navigation/HelperAbstract.php | 14 +- library/Zend/View/Helper/Navigation/Links.php | 6 +- library/Zend/View/Helper/Navigation/Menu.php | 6 +- .../Zend/View/Helper/Navigation/Sitemap.php | 18 +- .../Zend/View/Helper/PaginationControl.php | 6 +- library/Zend/View/Helper/Partial.php | 6 +- .../Zend/View/Helper/Partial/Exception.php | 2 +- library/Zend/View/Helper/PartialLoop.php | 4 +- library/Zend/View/Helper/Placeholder.php | 4 +- .../View/Helper/Placeholder/Container.php | 2 +- .../Helper/Placeholder/Container/Abstract.php | 2 +- .../Placeholder/Container/Exception.php | 2 +- .../Placeholder/Container/Standalone.php | 6 +- .../Zend/View/Helper/Placeholder/Registry.php | 10 +- .../Helper/Placeholder/Registry/Exception.php | 2 +- .../Zend/View/Helper/RenderToPlaceholder.php | 2 +- library/Zend/View/Helper/Translate.php | 12 +- library/Zend/View/Helper/Url.php | 2 +- library/Zend/View/Helper/UserAgent.php | 4 +- library/Zend/Wildfire/Channel/HttpHeaders.php | 26 +-- library/Zend/Wildfire/Exception.php | 2 +- library/Zend/Wildfire/Plugin/FirePhp.php | 30 +-- .../Wildfire/Plugin/FirePhp/TableMessage.php | 10 +- library/Zend/Wildfire/Protocol/JsonStream.php | 10 +- library/Zend/Xml/Exception.php | 2 +- library/Zend/Xml/Security.php | 4 +- library/Zend/XmlRpc/Client.php | 18 +- library/Zend/XmlRpc/Client/Exception.php | 2 +- library/Zend/XmlRpc/Client/FaultException.php | 2 +- library/Zend/XmlRpc/Client/HttpException.php | 2 +- .../XmlRpc/Client/IntrospectException.php | 2 +- .../XmlRpc/Client/ServerIntrospection.php | 8 +- library/Zend/XmlRpc/Exception.php | 2 +- library/Zend/XmlRpc/Fault.php | 12 +- library/Zend/XmlRpc/Generator/DomDocument.php | 2 +- library/Zend/XmlRpc/Generator/XmlWriter.php | 2 +- library/Zend/XmlRpc/Request.php | 8 +- library/Zend/XmlRpc/Request/Http.php | 4 +- library/Zend/XmlRpc/Request/Stdin.php | 2 +- library/Zend/XmlRpc/Response.php | 10 +- library/Zend/XmlRpc/Response/Http.php | 2 +- library/Zend/XmlRpc/Server.php | 58 ++--- library/Zend/XmlRpc/Server/Cache.php | 2 +- library/Zend/XmlRpc/Server/Exception.php | 2 +- library/Zend/XmlRpc/Server/Fault.php | 2 +- library/Zend/XmlRpc/Server/System.php | 4 +- library/Zend/XmlRpc/Value.php | 70 +++--- library/Zend/XmlRpc/Value/Array.php | 2 +- library/Zend/XmlRpc/Value/Base64.php | 2 +- library/Zend/XmlRpc/Value/BigInteger.php | 4 +- library/Zend/XmlRpc/Value/Boolean.php | 2 +- library/Zend/XmlRpc/Value/Collection.php | 2 +- library/Zend/XmlRpc/Value/DateTime.php | 4 +- library/Zend/XmlRpc/Value/Double.php | 2 +- library/Zend/XmlRpc/Value/Exception.php | 2 +- library/Zend/XmlRpc/Value/Integer.php | 4 +- library/Zend/XmlRpc/Value/Nil.php | 2 +- library/Zend/XmlRpc/Value/Scalar.php | 2 +- library/Zend/XmlRpc/Value/String.php | 2 +- library/Zend/XmlRpc/Value/Struct.php | 2 +- 1303 files changed, 4877 insertions(+), 4877 deletions(-) diff --git a/library/Zend/Acl.php b/library/Zend/Acl.php index a5d169f56a..c68ee56c93 100644 --- a/library/Zend/Acl.php +++ b/library/Zend/Acl.php @@ -23,31 +23,31 @@ /** * @see Zend_Acl_Resource_Interface */ -require_once 'Zend/Acl/Resource/Interface.php'; +;// require_once 'Zend/Acl/Resource/Interface.php'; /** * @see Zend_Acl_Role_Registry */ -require_once 'Zend/Acl/Role/Registry.php'; +;// require_once 'Zend/Acl/Role/Registry.php'; /** * @see Zend_Acl_Assert_Interface */ -require_once 'Zend/Acl/Assert/Interface.php'; +;// require_once 'Zend/Acl/Assert/Interface.php'; /** * @see Zend_Acl_Role */ -require_once 'Zend/Acl/Role.php'; +;// require_once 'Zend/Acl/Role.php'; /** * @see Zend_Acl_Resource */ -require_once 'Zend/Acl/Resource.php'; +;// require_once 'Zend/Acl/Resource.php'; /** @@ -152,7 +152,7 @@ public function addRole($role, $parents = null) } if (!$role instanceof Zend_Acl_Role_Interface) { - require_once 'Zend/Acl/Exception.php'; + ;// require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception('addRole() expects $role to be of type Zend_Acl_Role_Interface'); } @@ -287,14 +287,14 @@ public function addResource($resource, $parent = null) } if (!$resource instanceof Zend_Acl_Resource_Interface) { - require_once 'Zend/Acl/Exception.php'; + ;// require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception('addResource() expects $resource to be of type Zend_Acl_Resource_Interface'); } $resourceId = $resource->getResourceId(); if ($this->has($resourceId)) { - require_once 'Zend/Acl/Exception.php'; + ;// require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception("Resource id '$resourceId' already exists in the ACL"); } @@ -309,7 +309,7 @@ public function addResource($resource, $parent = null) } $resourceParent = $this->get($resourceParentId); } catch (Zend_Acl_Exception $e) { - require_once 'Zend/Acl/Exception.php'; + ;// require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception("Parent Resource id '$resourceParentId' does not exist", 0, $e); } $this->_resources[$resourceParentId]['children'][$resourceId] = $resource; @@ -361,7 +361,7 @@ public function get($resource) } if (!$this->has($resource)) { - require_once 'Zend/Acl/Exception.php'; + ;// require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception("Resource '$resourceId' not found"); } @@ -408,7 +408,7 @@ public function inherits($resource, $inherit, $onlyParent = false) $resourceId = $this->get($resource)->getResourceId(); $inheritId = $this->get($inherit)->getResourceId(); } catch (Zend_Acl_Exception $e) { - require_once 'Zend/Acl/Exception.php'; + ;// require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception($e->getMessage(), $e->getCode(), $e); } @@ -447,7 +447,7 @@ public function remove($resource) try { $resourceId = $this->get($resource)->getResourceId(); } catch (Zend_Acl_Exception $e) { - require_once 'Zend/Acl/Exception.php'; + ;// require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception($e->getMessage(), $e->getCode(), $e); } @@ -609,7 +609,7 @@ public function setRule($operation, $type, $roles = null, $resources = null, $pr // ensure that the rule type is valid; normalize input to uppercase $type = strtoupper($type); if (self::TYPE_ALLOW !== $type && self::TYPE_DENY !== $type) { - require_once 'Zend/Acl/Exception.php'; + ;// require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception("Unsupported rule type; must be either '" . self::TYPE_ALLOW . "' or '" . self::TYPE_DENY . "'"); } @@ -788,7 +788,7 @@ public function setRule($operation, $type, $roles = null, $resources = null, $pr break; default: - require_once 'Zend/Acl/Exception.php'; + ;// require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception("Unsupported operation; must be either '" . self::OP_ADD . "' or '" . self::OP_REMOVE . "'"); } @@ -966,7 +966,7 @@ protected function _roleDFSVisitAllPrivileges(Zend_Acl_Role_Interface $role, Zen /** * @see Zend_Acl_Exception */ - require_once 'Zend/Acl/Exception.php'; + ;// require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception('$dfs parameter may not be null'); } @@ -1009,7 +1009,7 @@ protected function _roleDFSOnePrivilege(Zend_Acl_Role_Interface $role, Zend_Acl_ /** * @see Zend_Acl_Exception */ - require_once 'Zend/Acl/Exception.php'; + ;// require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception('$privilege parameter may not be null'); } @@ -1055,7 +1055,7 @@ protected function _roleDFSVisitOnePrivilege(Zend_Acl_Role_Interface $role, Zend /** * @see Zend_Acl_Exception */ - require_once 'Zend/Acl/Exception.php'; + ;// require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception('$privilege parameter may not be null'); } @@ -1063,7 +1063,7 @@ protected function _roleDFSVisitOnePrivilege(Zend_Acl_Role_Interface $role, Zend /** * @see Zend_Acl_Exception */ - require_once 'Zend/Acl/Exception.php'; + ;// require_once 'Zend/Acl/Exception.php'; throw new Zend_Acl_Exception('$dfs parameter may not be null'); } diff --git a/library/Zend/Acl/Assert/Interface.php b/library/Zend/Acl/Assert/Interface.php index e3d02565fc..2c89185a58 100644 --- a/library/Zend/Acl/Assert/Interface.php +++ b/library/Zend/Acl/Assert/Interface.php @@ -23,19 +23,19 @@ /** * @see Zend_Acl */ -require_once 'Zend/Acl.php'; +;// require_once 'Zend/Acl.php'; /** * @see Zend_Acl_Role_Interface */ -require_once 'Zend/Acl/Role/Interface.php'; +;// require_once 'Zend/Acl/Role/Interface.php'; /** * @see Zend_Acl_Resource_Interface */ -require_once 'Zend/Acl/Resource/Interface.php'; +;// require_once 'Zend/Acl/Resource/Interface.php'; /** diff --git a/library/Zend/Acl/Exception.php b/library/Zend/Acl/Exception.php index 0a19832fb8..e125b2a1b9 100644 --- a/library/Zend/Acl/Exception.php +++ b/library/Zend/Acl/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** diff --git a/library/Zend/Acl/Resource.php b/library/Zend/Acl/Resource.php index 1d40d4d05f..af00f15728 100644 --- a/library/Zend/Acl/Resource.php +++ b/library/Zend/Acl/Resource.php @@ -23,7 +23,7 @@ /** * @see Zend_Acl_Resource_Interface */ -require_once 'Zend/Acl/Resource/Interface.php'; +;// require_once 'Zend/Acl/Resource/Interface.php'; /** diff --git a/library/Zend/Acl/Role.php b/library/Zend/Acl/Role.php index b36f519ebc..1ff29cb314 100644 --- a/library/Zend/Acl/Role.php +++ b/library/Zend/Acl/Role.php @@ -23,7 +23,7 @@ /** * @see Zend_Acl_Role_Interface */ -require_once 'Zend/Acl/Role/Interface.php'; +;// require_once 'Zend/Acl/Role/Interface.php'; /** diff --git a/library/Zend/Acl/Role/Registry.php b/library/Zend/Acl/Role/Registry.php index d9d57f3379..178231a1d1 100644 --- a/library/Zend/Acl/Role/Registry.php +++ b/library/Zend/Acl/Role/Registry.php @@ -23,7 +23,7 @@ /** * @see Zend_Acl_Role_Interface */ -require_once 'Zend/Acl/Role/Interface.php'; +;// require_once 'Zend/Acl/Role/Interface.php'; /** @@ -68,7 +68,7 @@ public function add(Zend_Acl_Role_Interface $role, $parents = null) /** * @see Zend_Acl_Role_Registry_Exception */ - require_once 'Zend/Acl/Role/Registry/Exception.php'; + ;// require_once 'Zend/Acl/Role/Registry/Exception.php'; throw new Zend_Acl_Role_Registry_Exception("Role id '$roleId' already exists in the registry"); } @@ -81,7 +81,7 @@ public function add(Zend_Acl_Role_Interface $role, $parents = null) /** * @see Zend_Acl_Role_Registry_Exception */ - require_once 'Zend/Acl/Role/Registry/Exception.php'; + ;// require_once 'Zend/Acl/Role/Registry/Exception.php'; foreach ($parents as $parent) { try { if ($parent instanceof Zend_Acl_Role_Interface) { @@ -128,7 +128,7 @@ public function get($role) /** * @see Zend_Acl_Role_Registry_Exception */ - require_once 'Zend/Acl/Role/Registry/Exception.php'; + ;// require_once 'Zend/Acl/Role/Registry/Exception.php'; throw new Zend_Acl_Role_Registry_Exception("Role '$roleId' not found"); } @@ -195,7 +195,7 @@ public function inherits($role, $inherit, $onlyParents = false) /** * @see Zend_Acl_Role_Registry_Exception */ - require_once 'Zend/Acl/Role/Registry/Exception.php'; + ;// require_once 'Zend/Acl/Role/Registry/Exception.php'; try { $roleId = $this->get($role)->getRoleId(); $inheritId = $this->get($inherit)->getRoleId(); @@ -232,7 +232,7 @@ public function remove($role) /** * @see Zend_Acl_Role_Registry_Exception */ - require_once 'Zend/Acl/Role/Registry/Exception.php'; + ;// require_once 'Zend/Acl/Role/Registry/Exception.php'; try { $roleId = $this->get($role)->getRoleId(); } catch (Zend_Acl_Role_Registry_Exception $e) { diff --git a/library/Zend/Acl/Role/Registry/Exception.php b/library/Zend/Acl/Role/Registry/Exception.php index a2e906a98a..9e112c6cba 100644 --- a/library/Zend/Acl/Role/Registry/Exception.php +++ b/library/Zend/Acl/Role/Registry/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Acl_Exception */ -require_once 'Zend/Acl/Exception.php'; +;// require_once 'Zend/Acl/Exception.php'; /** diff --git a/library/Zend/Application/Bootstrap/Bootstrap.php b/library/Zend/Application/Bootstrap/Bootstrap.php index 5acb3a3de3..53b36b9bdb 100644 --- a/library/Zend/Application/Bootstrap/Bootstrap.php +++ b/library/Zend/Application/Bootstrap/Bootstrap.php @@ -23,7 +23,7 @@ /** * @see Zend_Application_Bootstrap_BootstrapAbstract */ -require_once 'Zend/Application/Bootstrap/BootstrapAbstract.php'; +;// require_once 'Zend/Application/Bootstrap/BootstrapAbstract.php'; /** * Concrete base class for bootstrap classes diff --git a/library/Zend/Application/Bootstrap/BootstrapAbstract.php b/library/Zend/Application/Bootstrap/BootstrapAbstract.php index 3663d617ea..9ddd557460 100644 --- a/library/Zend/Application/Bootstrap/BootstrapAbstract.php +++ b/library/Zend/Application/Bootstrap/BootstrapAbstract.php @@ -23,12 +23,12 @@ /** * @see Zend_Application_Bootstrap_Bootstrapper */ -require_once 'Zend/Application/Bootstrap/Bootstrapper.php'; +;// require_once 'Zend/Application/Bootstrap/Bootstrapper.php'; /** * @see Zend_Application_Bootstrap_ResourceBootstrapper */ -require_once 'Zend/Application/Bootstrap/ResourceBootstrapper.php'; +;// require_once 'Zend/Application/Bootstrap/ResourceBootstrapper.php'; /** * Abstract base class for bootstrap classes diff --git a/library/Zend/Application/Bootstrap/Exception.php b/library/Zend/Application/Bootstrap/Exception.php index a36e9dc584..9079050ed2 100644 --- a/library/Zend/Application/Bootstrap/Exception.php +++ b/library/Zend/Application/Bootstrap/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Application_Exception */ -require_once 'Zend/Application/Exception.php'; +;// require_once 'Zend/Application/Exception.php'; /** * Exception class for Zend_Application diff --git a/library/Zend/Application/Exception.php b/library/Zend/Application/Exception.php index fd9ff21208..7357b9f689 100644 --- a/library/Zend/Application/Exception.php +++ b/library/Zend/Application/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * Exception class for Zend_Application diff --git a/library/Zend/Application/Module/Autoloader.php b/library/Zend/Application/Module/Autoloader.php index 0ba2f5a871..d01212f3e7 100644 --- a/library/Zend/Application/Module/Autoloader.php +++ b/library/Zend/Application/Module/Autoloader.php @@ -21,7 +21,7 @@ */ /** @see Zend_Loader_Autoloader_Resource */ -require_once 'Zend/Loader/Autoloader/Resource.php'; +;// require_once 'Zend/Loader/Autoloader/Resource.php'; /** * Resource loader for application module classes diff --git a/library/Zend/Application/Module/Bootstrap.php b/library/Zend/Application/Module/Bootstrap.php index 1373891cc4..035eeb7b91 100644 --- a/library/Zend/Application/Module/Bootstrap.php +++ b/library/Zend/Application/Module/Bootstrap.php @@ -23,7 +23,7 @@ /** * @see Zend_Application_Bootstrap_Bootstrap */ -require_once 'Zend/Application/Bootstrap/Bootstrap.php'; +;// require_once 'Zend/Application/Bootstrap/Bootstrap.php'; /** * Base bootstrap class for modules diff --git a/library/Zend/Application/Resource/Cachemanager.php b/library/Zend/Application/Resource/Cachemanager.php index 772387bf53..80eea177dd 100644 --- a/library/Zend/Application/Resource/Cachemanager.php +++ b/library/Zend/Application/Resource/Cachemanager.php @@ -20,7 +20,7 @@ * @version $Id$ */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; +;// require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** * Cache Manager resource diff --git a/library/Zend/Application/Resource/Db.php b/library/Zend/Application/Resource/Db.php index 4c7c720e5c..a4cb9b0e4c 100644 --- a/library/Zend/Application/Resource/Db.php +++ b/library/Zend/Application/Resource/Db.php @@ -23,7 +23,7 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; +;// require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** * Resource for creating database adapter diff --git a/library/Zend/Application/Resource/Dojo.php b/library/Zend/Application/Resource/Dojo.php index 80439c45db..7b7212a4dc 100644 --- a/library/Zend/Application/Resource/Dojo.php +++ b/library/Zend/Application/Resource/Dojo.php @@ -23,7 +23,7 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; +;// require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** diff --git a/library/Zend/Application/Resource/Exception.php b/library/Zend/Application/Resource/Exception.php index 7fd77860a6..86779ce6f7 100644 --- a/library/Zend/Application/Resource/Exception.php +++ b/library/Zend/Application/Resource/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Application_Exception */ -require_once 'Zend/Application/Exception.php'; +;// require_once 'Zend/Application/Exception.php'; /** * Exception class for Zend_Application diff --git a/library/Zend/Application/Resource/Frontcontroller.php b/library/Zend/Application/Resource/Frontcontroller.php index 73b2dfa49b..5af9ec80ce 100644 --- a/library/Zend/Application/Resource/Frontcontroller.php +++ b/library/Zend/Application/Resource/Frontcontroller.php @@ -23,7 +23,7 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; +;// require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** @@ -137,7 +137,7 @@ public function init() case 'dispatcher': if (!isset($value['class'])) { - require_once 'Zend/Application/Exception.php'; + ;// require_once 'Zend/Application/Exception.php'; throw new Zend_Application_Exception('You must specify both '); } if (!isset($value['params'])) { @@ -146,7 +146,7 @@ public function init() $dispatchClass = $value['class']; if (!class_exists($dispatchClass)) { - require_once 'Zend/Application/Exception.php'; + ;// require_once 'Zend/Application/Exception.php'; throw new Zend_Application_Exception('Dispatcher class not found!'); } $front->setDispatcher(new $dispatchClass((array)$value['params'])); diff --git a/library/Zend/Application/Resource/Layout.php b/library/Zend/Application/Resource/Layout.php index 7c2d2d8537..05aeec1330 100644 --- a/library/Zend/Application/Resource/Layout.php +++ b/library/Zend/Application/Resource/Layout.php @@ -23,7 +23,7 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; +;// require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** diff --git a/library/Zend/Application/Resource/Locale.php b/library/Zend/Application/Resource/Locale.php index 5f12ed4d1c..99079494e1 100644 --- a/library/Zend/Application/Resource/Locale.php +++ b/library/Zend/Application/Resource/Locale.php @@ -23,7 +23,7 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; +;// require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** diff --git a/library/Zend/Application/Resource/Log.php b/library/Zend/Application/Resource/Log.php index ab473a4c04..eb2527d799 100644 --- a/library/Zend/Application/Resource/Log.php +++ b/library/Zend/Application/Resource/Log.php @@ -23,7 +23,7 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; +;// require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** diff --git a/library/Zend/Application/Resource/Mail.php b/library/Zend/Application/Resource/Mail.php index fc9036a81f..29b92c9e93 100644 --- a/library/Zend/Application/Resource/Mail.php +++ b/library/Zend/Application/Resource/Mail.php @@ -23,7 +23,7 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; +;// require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** * Resource for setting up Mail Transport and default From & ReplyTo addresses diff --git a/library/Zend/Application/Resource/Modules.php b/library/Zend/Application/Resource/Modules.php index 6106cfcad1..83a9b57538 100644 --- a/library/Zend/Application/Resource/Modules.php +++ b/library/Zend/Application/Resource/Modules.php @@ -23,7 +23,7 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; +;// require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** diff --git a/library/Zend/Application/Resource/Multidb.php b/library/Zend/Application/Resource/Multidb.php index a7a8c30d48..e86fc65fac 100644 --- a/library/Zend/Application/Resource/Multidb.php +++ b/library/Zend/Application/Resource/Multidb.php @@ -20,9 +20,9 @@ * @version $Id$ */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; +;// require_once 'Zend/Application/Resource/ResourceAbstract.php'; -require_once 'Zend/Db/Table.php'; +;// require_once 'Zend/Db/Table.php'; /** */ diff --git a/library/Zend/Application/Resource/Navigation.php b/library/Zend/Application/Resource/Navigation.php index 3fd1909579..01307ee58f 100644 --- a/library/Zend/Application/Resource/Navigation.php +++ b/library/Zend/Application/Resource/Navigation.php @@ -23,7 +23,7 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; +;// require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** diff --git a/library/Zend/Application/Resource/ResourceAbstract.php b/library/Zend/Application/Resource/ResourceAbstract.php index 1f400eb9fb..43d78e1039 100644 --- a/library/Zend/Application/Resource/ResourceAbstract.php +++ b/library/Zend/Application/Resource/ResourceAbstract.php @@ -23,7 +23,7 @@ /** * @see Zend_Application_Resource_Resource */ -require_once 'Zend/Application/Resource/Resource.php'; +;// require_once 'Zend/Application/Resource/Resource.php'; /** * Abstract class for bootstrap resources diff --git a/library/Zend/Application/Resource/Router.php b/library/Zend/Application/Resource/Router.php index 5b2868eadf..1ad0df8582 100644 --- a/library/Zend/Application/Resource/Router.php +++ b/library/Zend/Application/Resource/Router.php @@ -23,7 +23,7 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; +;// require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** diff --git a/library/Zend/Application/Resource/Session.php b/library/Zend/Application/Resource/Session.php index 9519fc7a42..a6bb07c2d8 100644 --- a/library/Zend/Application/Resource/Session.php +++ b/library/Zend/Application/Resource/Session.php @@ -23,7 +23,7 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; +;// require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** diff --git a/library/Zend/Application/Resource/Translate.php b/library/Zend/Application/Resource/Translate.php index 5d9fc23d3c..0716a4d90b 100644 --- a/library/Zend/Application/Resource/Translate.php +++ b/library/Zend/Application/Resource/Translate.php @@ -23,7 +23,7 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; +;// require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** @@ -68,10 +68,10 @@ public function getTranslate() $options = $this->getOptions(); if (!isset($options['content']) && !isset($options['data'])) { - require_once 'Zend/Application/Resource/Exception.php'; + ;// require_once 'Zend/Application/Resource/Exception.php'; throw new Zend_Application_Resource_Exception('No translation source data provided.'); } else if (array_key_exists('content', $options) && array_key_exists('data', $options)) { - require_once 'Zend/Application/Resource/Exception.php'; + ;// require_once 'Zend/Application/Resource/Exception.php'; throw new Zend_Application_Resource_Exception( 'Conflict on translation source data: choose only one key between content and data.' ); @@ -121,7 +121,7 @@ public function getTranslate() if (Zend_Registry::isRegistered($key)) { $translate = Zend_Registry::get($key); if (!$translate instanceof Zend_Translate) { - require_once 'Zend/Application/Resource/Exception.php'; + ;// require_once 'Zend/Application/Resource/Exception.php'; throw new Zend_Application_Resource_Exception( $key . ' already registered in registry but is ' diff --git a/library/Zend/Application/Resource/View.php b/library/Zend/Application/Resource/View.php index 0b9fd6ca94..2e464664a7 100644 --- a/library/Zend/Application/Resource/View.php +++ b/library/Zend/Application/Resource/View.php @@ -23,7 +23,7 @@ /** * @see Zend_Application_Resource_ResourceAbstract */ -require_once 'Zend/Application/Resource/ResourceAbstract.php'; +;// require_once 'Zend/Application/Resource/ResourceAbstract.php'; /** diff --git a/library/Zend/Auth.php b/library/Zend/Auth.php index 0b4b00ffb4..86cbd5da62 100644 --- a/library/Zend/Auth.php +++ b/library/Zend/Auth.php @@ -87,7 +87,7 @@ public function getStorage() /** * @see Zend_Auth_Storage_Session */ - require_once 'Zend/Auth/Storage/Session.php'; + ;// require_once 'Zend/Auth/Storage/Session.php'; $this->setStorage(new Zend_Auth_Storage_Session()); } diff --git a/library/Zend/Auth/Adapter/DbTable.php b/library/Zend/Auth/Adapter/DbTable.php index 7dfd7bbdd6..4ce9f9e551 100644 --- a/library/Zend/Auth/Adapter/DbTable.php +++ b/library/Zend/Auth/Adapter/DbTable.php @@ -24,17 +24,17 @@ /** * @see Zend_Auth_Adapter_Interface */ -require_once 'Zend/Auth/Adapter/Interface.php'; +;// require_once 'Zend/Auth/Adapter/Interface.php'; /** * @see Zend_Db_Adapter_Abstract */ -require_once 'Zend/Db/Adapter/Abstract.php'; +;// require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Auth_Result */ -require_once 'Zend/Auth/Result.php'; +;// require_once 'Zend/Auth/Result.php'; /** @@ -170,10 +170,10 @@ protected function _setDbAdapter(Zend_Db_Adapter_Abstract $zendDb = null) * If no adapter is specified, fetch default database adapter. */ if(null === $this->_zendDb) { - require_once 'Zend/Db/Table/Abstract.php'; + ;// require_once 'Zend/Db/Table/Abstract.php'; $this->_zendDb = Zend_Db_Table_Abstract::getDefaultAdapter(); if (null === $this->_zendDb) { - require_once 'Zend/Auth/Adapter/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('No database adapter present'); } } @@ -414,7 +414,7 @@ protected function _authenticateSetup() /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception($exception); } @@ -485,7 +485,7 @@ protected function _authenticateQuerySelect(Zend_Db_Select $dbSelect) /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('The supplied parameters to Zend_Auth_Adapter_DbTable failed to ' . 'produce a valid sql statement, please check table and column names ' . 'for validity.', 0, $e); diff --git a/library/Zend/Auth/Adapter/Digest.php b/library/Zend/Auth/Adapter/Digest.php index f52b651e7a..569ce8ca43 100644 --- a/library/Zend/Auth/Adapter/Digest.php +++ b/library/Zend/Auth/Adapter/Digest.php @@ -24,7 +24,7 @@ /** * @see Zend_Auth_Adapter_Interface */ -require_once 'Zend/Auth/Adapter/Interface.php'; +;// require_once 'Zend/Auth/Adapter/Interface.php'; /** @@ -185,7 +185,7 @@ public function authenticate() /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception("Option '$optionRequired' must be set before authentication"); } } @@ -194,7 +194,7 @@ public function authenticate() /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception("Cannot open '$this->_filename' for reading"); } diff --git a/library/Zend/Auth/Adapter/Exception.php b/library/Zend/Auth/Adapter/Exception.php index 0321649306..97af692b41 100644 --- a/library/Zend/Auth/Adapter/Exception.php +++ b/library/Zend/Auth/Adapter/Exception.php @@ -24,7 +24,7 @@ /** * Zend_Auth_Exception */ -require_once 'Zend/Auth/Exception.php'; +;// require_once 'Zend/Auth/Exception.php'; /** diff --git a/library/Zend/Auth/Adapter/Http.php b/library/Zend/Auth/Adapter/Http.php index 8b320d69d4..625e9d4b11 100644 --- a/library/Zend/Auth/Adapter/Http.php +++ b/library/Zend/Auth/Adapter/Http.php @@ -24,7 +24,7 @@ /** * @see Zend_Auth_Adapter_Interface */ -require_once 'Zend/Auth/Adapter/Interface.php'; +;// require_once 'Zend/Auth/Adapter/Interface.php'; /** @@ -170,7 +170,7 @@ public function __construct(array $config) /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception(__CLASS__ . ' requires the \'hash\' extension'); } @@ -183,7 +183,7 @@ public function __construct(array $config) /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('Config key \'accept_schemes\' is required'); } @@ -193,7 +193,7 @@ public function __construct(array $config) /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('No supported schemes given in \'accept_schemes\'. Valid values: ' . implode(', ', $this->_supportedSchemes)); } @@ -207,7 +207,7 @@ public function __construct(array $config) /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('Config key \'realm\' is required, and must contain only printable ' . 'characters, excluding quotation marks and colons'); } else { @@ -221,7 +221,7 @@ public function __construct(array $config) /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('Config key \'digest_domains\' is required, and must contain ' . 'only printable characters, excluding quotation marks'); } else { @@ -233,7 +233,7 @@ public function __construct(array $config) /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('Config key \'nonce_timeout\' is required, and must be an ' . 'integer'); } else { @@ -367,7 +367,7 @@ public function authenticate() /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('Request and Response objects must be set before calling ' . 'authenticate()'); } @@ -414,7 +414,7 @@ public function authenticate() /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('Unsupported authentication scheme'); } @@ -501,14 +501,14 @@ protected function _basicAuth($header) /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('The value of the client Authorization header is required'); } if (empty($this->_basicResolver)) { /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('A basicResolver object must be set before doing Basic ' . 'authentication'); } @@ -520,7 +520,7 @@ protected function _basicAuth($header) /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('Unable to base64_decode Authorization header value'); } @@ -558,14 +558,14 @@ protected function _digestAuth($header) /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('The value of the client Authorization header is required'); } if (empty($this->_digestResolver)) { /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('A digestResolver object must be set before doing Digest authentication'); } @@ -624,7 +624,7 @@ protected function _digestAuth($header) /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('Client requested an unsupported qop option'); } // Using hash() should make parameterizing the hash algorithm diff --git a/library/Zend/Auth/Adapter/Http/Resolver/Exception.php b/library/Zend/Auth/Adapter/Http/Resolver/Exception.php index e7e2a4e826..80e530d508 100644 --- a/library/Zend/Auth/Adapter/Http/Resolver/Exception.php +++ b/library/Zend/Auth/Adapter/Http/Resolver/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Auth_Exception */ -require_once 'Zend/Auth/Exception.php'; +;// require_once 'Zend/Auth/Exception.php'; /** diff --git a/library/Zend/Auth/Adapter/Http/Resolver/File.php b/library/Zend/Auth/Adapter/Http/Resolver/File.php index 8f8b64ce30..7f21689d99 100644 --- a/library/Zend/Auth/Adapter/Http/Resolver/File.php +++ b/library/Zend/Auth/Adapter/Http/Resolver/File.php @@ -24,7 +24,7 @@ /** * @see Zend_Auth_Adapter_Http_Resolver_Interface */ -require_once 'Zend/Auth/Adapter/Http/Resolver/Interface.php'; +;// require_once 'Zend/Auth/Adapter/Http/Resolver/Interface.php'; /** @@ -70,7 +70,7 @@ public function setFile($path) /** * @see Zend_Auth_Adapter_Http_Resolver_Exception */ - require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; throw new Zend_Auth_Adapter_Http_Resolver_Exception('Path not readable: ' . $path); } $this->_file = $path; @@ -115,13 +115,13 @@ public function resolve($username, $realm) /** * @see Zend_Auth_Adapter_Http_Resolver_Exception */ - require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; throw new Zend_Auth_Adapter_Http_Resolver_Exception('Username is required'); } else if (!ctype_print($username) || strpos($username, ':') !== false) { /** * @see Zend_Auth_Adapter_Http_Resolver_Exception */ - require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; throw new Zend_Auth_Adapter_Http_Resolver_Exception('Username must consist only of printable characters, ' . 'excluding the colon'); } @@ -129,13 +129,13 @@ public function resolve($username, $realm) /** * @see Zend_Auth_Adapter_Http_Resolver_Exception */ - require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; throw new Zend_Auth_Adapter_Http_Resolver_Exception('Realm is required'); } else if (!ctype_print($realm) || strpos($realm, ':') !== false) { /** * @see Zend_Auth_Adapter_Http_Resolver_Exception */ - require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; throw new Zend_Auth_Adapter_Http_Resolver_Exception('Realm must consist only of printable characters, ' . 'excluding the colon.'); } @@ -146,7 +146,7 @@ public function resolve($username, $realm) /** * @see Zend_Auth_Adapter_Http_Resolver_Exception */ - require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; throw new Zend_Auth_Adapter_Http_Resolver_Exception('Unable to open password file: ' . $this->_file); } diff --git a/library/Zend/Auth/Adapter/Interface.php b/library/Zend/Auth/Adapter/Interface.php index 4a9d50a0a5..33b66f8ecb 100644 --- a/library/Zend/Auth/Adapter/Interface.php +++ b/library/Zend/Auth/Adapter/Interface.php @@ -24,7 +24,7 @@ /** * @see Zend_Auth_Result */ -require_once 'Zend/Auth/Result.php'; +;// require_once 'Zend/Auth/Result.php'; /** diff --git a/library/Zend/Auth/Adapter/Ldap.php b/library/Zend/Auth/Adapter/Ldap.php index 1e8ea055ae..0bb6f89a41 100644 --- a/library/Zend/Auth/Adapter/Ldap.php +++ b/library/Zend/Auth/Adapter/Ldap.php @@ -23,7 +23,7 @@ /** * @see Zend_Auth_Adapter_Interface */ -require_once 'Zend/Auth/Adapter/Interface.php'; +;// require_once 'Zend/Auth/Adapter/Interface.php'; /** * @category Zend @@ -198,7 +198,7 @@ public function getLdap() /** * @see Zend_Ldap */ - require_once 'Zend/Ldap.php'; + ;// require_once 'Zend/Ldap.php'; $this->_ldap = new Zend_Ldap(); } @@ -246,7 +246,7 @@ public function authenticate() /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; $messages = array(); $messages[0] = ''; // reserved @@ -284,7 +284,7 @@ public function authenticate() /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + ;// require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('Adapter options array not an array'); } $adapterOptions = $this->_prepareOptions($ldap, $options); @@ -455,7 +455,7 @@ protected function _checkGroupMembership(Zend_Ldap $ldap, $canonicalName, $dn, a /** * @see Zend_Ldap_Filter */ - require_once 'Zend/Ldap/Filter.php'; + ;// require_once 'Zend/Ldap/Filter.php'; $groupName = Zend_Ldap_Filter::equals($adapterOptions['groupAttr'], $adapterOptions['group']); $membership = Zend_Ldap_Filter::equals($adapterOptions['memberAttr'], $user); $group = Zend_Ldap_Filter::andFilter($groupName, $membership); diff --git a/library/Zend/Auth/Adapter/OpenId.php b/library/Zend/Auth/Adapter/OpenId.php index 6be6f0ac6b..56ab14d82e 100644 --- a/library/Zend/Auth/Adapter/OpenId.php +++ b/library/Zend/Auth/Adapter/OpenId.php @@ -24,13 +24,13 @@ /** * @see Zend_Auth_Adapter_Interface */ -require_once 'Zend/Auth/Adapter/Interface.php'; +;// require_once 'Zend/Auth/Adapter/Interface.php'; /** * @see Zend_OpenId_Consumer */ -require_once 'Zend/OpenId/Consumer.php'; +;// require_once 'Zend/OpenId/Consumer.php'; /** diff --git a/library/Zend/Auth/Exception.php b/library/Zend/Auth/Exception.php index 8cdc41bbf9..8d2200826c 100644 --- a/library/Zend/Auth/Exception.php +++ b/library/Zend/Auth/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** diff --git a/library/Zend/Auth/Storage/Exception.php b/library/Zend/Auth/Storage/Exception.php index 542b6708a7..486a0574cc 100644 --- a/library/Zend/Auth/Storage/Exception.php +++ b/library/Zend/Auth/Storage/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Auth_Exception */ -require_once 'Zend/Auth/Exception.php'; +;// require_once 'Zend/Auth/Exception.php'; /** diff --git a/library/Zend/Auth/Storage/NonPersistent.php b/library/Zend/Auth/Storage/NonPersistent.php index 6cdf0c7de4..9eac2fa31f 100644 --- a/library/Zend/Auth/Storage/NonPersistent.php +++ b/library/Zend/Auth/Storage/NonPersistent.php @@ -24,7 +24,7 @@ /** * @see Zend_Auth_Storage_Interface */ -require_once 'Zend/Auth/Storage/Interface.php'; +;// require_once 'Zend/Auth/Storage/Interface.php'; /** diff --git a/library/Zend/Auth/Storage/Session.php b/library/Zend/Auth/Storage/Session.php index c3680f6faf..5ca72610a1 100644 --- a/library/Zend/Auth/Storage/Session.php +++ b/library/Zend/Auth/Storage/Session.php @@ -24,13 +24,13 @@ /** * @see Zend_Auth_Storage_Interface */ -require_once 'Zend/Auth/Storage/Interface.php'; +;// require_once 'Zend/Auth/Storage/Interface.php'; /** * @see Zend_Session */ -require_once 'Zend/Session.php'; +;// require_once 'Zend/Session.php'; /** diff --git a/library/Zend/Barcode.php b/library/Zend/Barcode.php index 6f7c386bc9..55a565d514 100644 --- a/library/Zend/Barcode.php +++ b/library/Zend/Barcode.php @@ -139,7 +139,7 @@ public static function makeBarcode($barcode, $barcodeConfig = array()) /** * @see Zend_Barcode_Exception */ - require_once 'Zend/Barcode/Exception.php'; + ;// require_once 'Zend/Barcode/Exception.php'; throw new Zend_Barcode_Exception( 'Barcode parameters must be in an array or a Zend_Config object' ); @@ -152,7 +152,7 @@ public static function makeBarcode($barcode, $barcodeConfig = array()) /** * @see Zend_Barcode_Exception */ - require_once 'Zend/Barcode/Exception.php'; + ;// require_once 'Zend/Barcode/Exception.php'; throw new Zend_Barcode_Exception( 'Barcode name must be specified in a string' ); @@ -175,7 +175,7 @@ public static function makeBarcode($barcode, $barcodeConfig = array()) * if the specified class cannot be loaded. */ if (!class_exists($barcodeName)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($barcodeName); } @@ -192,7 +192,7 @@ public static function makeBarcode($barcode, $barcodeConfig = array()) /** * @see Zend_Barcode_Exception */ - require_once 'Zend/Barcode/Exception.php'; + ;// require_once 'Zend/Barcode/Exception.php'; throw new Zend_Barcode_Exception( "Barcode class '$barcodeName' does not extend Zend_Barcode_Object_ObjectAbstract" ); @@ -236,7 +236,7 @@ public static function makeRenderer($renderer = 'image', $rendererConfig = array /** * @see Zend_Barcode_Exception */ - require_once 'Zend/Barcode/Exception.php'; + ;// require_once 'Zend/Barcode/Exception.php'; $e = new Zend_Barcode_Exception( 'Barcode parameters must be in an array or a Zend_Config object' ); @@ -251,7 +251,7 @@ public static function makeRenderer($renderer = 'image', $rendererConfig = array /** * @see Zend_Barcode_Exception */ - require_once 'Zend/Barcode/Exception.php'; + ;// require_once 'Zend/Barcode/Exception.php'; $e = new Zend_Barcode_Exception( 'Renderer name must be specified in a string' ); @@ -277,7 +277,7 @@ public static function makeRenderer($renderer = 'image', $rendererConfig = array * if the specified class cannot be loaded. */ if (!class_exists($rendererName)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($rendererName); } @@ -294,7 +294,7 @@ public static function makeRenderer($renderer = 'image', $rendererConfig = array /** * @see Zend_Barcode_Exception */ - require_once 'Zend/Barcode/Exception.php'; + ;// require_once 'Zend/Barcode/Exception.php'; $e = new Zend_Barcode_Exception( "Renderer class '$rendererName' does not extend Zend_Barcode_Renderer_RendererAbstract" ); @@ -346,7 +346,7 @@ public static function draw( */ public static function setBarcodeFont($font) { - require_once 'Zend/Barcode/Object/ObjectAbstract.php'; + ;// require_once 'Zend/Barcode/Object/ObjectAbstract.php'; Zend_Barcode_Object_ObjectAbstract::setBarcodeFont($font); } } diff --git a/library/Zend/Cache.php b/library/Zend/Cache.php index dc818f30e5..8a4b215442 100644 --- a/library/Zend/Cache.php +++ b/library/Zend/Cache.php @@ -84,7 +84,7 @@ abstract class Zend_Cache * @param array $backendOptions associative array of options for the corresponding backend constructor * @param boolean $customFrontendNaming if true, the frontend argument is used as a complete class name ; if false, the frontend argument is used as the end of "Zend_Cache_Frontend_[...]" class name * @param boolean $customBackendNaming if true, the backend argument is used as a complete class name ; if false, the backend argument is used as the end of "Zend_Cache_Backend_[...]" class name - * @param boolean $autoload if true, there will no require_once for backend and frontend (useful only for custom backends/frontends) + * @param boolean $autoload if true, there will no ;// require_once for backend and frontend (useful only for custom backends/frontends) * @throws Zend_Cache_Exception * @return Zend_Cache_Core|Zend_Cache_Frontend */ @@ -130,7 +130,7 @@ public static function _makeBackend($backend, $backendOptions, $customBackendNam // we use a standard backend $backendClass = 'Zend_Cache_Backend_' . $backend; // security controls are explicit - require_once str_replace('_', DIRECTORY_SEPARATOR, $backendClass) . '.php'; + ;// require_once str_replace('_', DIRECTORY_SEPARATOR, $backendClass) . '.php'; } else { // we use a custom backend if (!preg_match('~^[\w\\\\]+$~D', $backend)) { @@ -147,7 +147,7 @@ public static function _makeBackend($backend, $backendOptions, $customBackendNam if (!(self::_isReadable($file))) { self::throwException("file $file not found in include_path"); } - require_once $file; + ;// require_once $file; } } return new $backendClass($backendOptions); @@ -172,7 +172,7 @@ public static function _makeFrontend($frontend, $frontendOptions = array(), $cus // For perfs reasons, with frontend == 'Core', we can interact with the Core itself $frontendClass = 'Zend_Cache_' . ($frontend != 'Core' ? 'Frontend_' : '') . $frontend; // security controls are explicit - require_once str_replace('_', DIRECTORY_SEPARATOR, $frontendClass) . '.php'; + ;// require_once str_replace('_', DIRECTORY_SEPARATOR, $frontendClass) . '.php'; } else { // we use a custom frontend if (!preg_match('~^[\w\\\\]+$~D', $frontend)) { @@ -189,7 +189,7 @@ public static function _makeFrontend($frontend, $frontendOptions = array(), $cus if (!(self::_isReadable($file))) { self::throwException("file $file not found in include_path"); } - require_once $file; + ;// require_once $file; } } return new $frontendClass($frontendOptions); @@ -205,7 +205,7 @@ public static function _makeFrontend($frontend, $frontendOptions = array(), $cus public static function throwException($msg, Exception $e = null) { // For perfs reasons, we use this dynamic inclusion - require_once 'Zend/Cache/Exception.php'; + ;// require_once 'Zend/Cache/Exception.php'; throw new Zend_Cache_Exception($msg, 0, $e); } diff --git a/library/Zend/Cache/Backend.php b/library/Zend/Cache/Backend.php index 3d99e0939c..55f9b147c3 100644 --- a/library/Zend/Cache/Backend.php +++ b/library/Zend/Cache/Backend.php @@ -255,9 +255,9 @@ protected function _loggerSanity() } // Create a default logger to the standard output stream - require_once 'Zend/Log.php'; - require_once 'Zend/Log/Writer/Stream.php'; - require_once 'Zend/Log/Filter/Priority.php'; + ;// require_once 'Zend/Log.php'; + ;// require_once 'Zend/Log/Writer/Stream.php'; + ;// require_once 'Zend/Log/Filter/Priority.php'; $logger = new Zend_Log(new Zend_Log_Writer_Stream('php://output')); $logger->addFilter(new Zend_Log_Filter_Priority(Zend_Log::WARN, '<=')); $this->_directives['logger'] = $logger; diff --git a/library/Zend/Cache/Backend/Apc.php b/library/Zend/Cache/Backend/Apc.php index 5a09becdcf..ccf65fee2b 100644 --- a/library/Zend/Cache/Backend/Apc.php +++ b/library/Zend/Cache/Backend/Apc.php @@ -24,12 +24,12 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; +;// require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +;// require_once 'Zend/Cache/Backend.php'; /** diff --git a/library/Zend/Cache/Backend/BlackHole.php b/library/Zend/Cache/Backend/BlackHole.php index 0fe1c9d052..6d4a15097e 100644 --- a/library/Zend/Cache/Backend/BlackHole.php +++ b/library/Zend/Cache/Backend/BlackHole.php @@ -23,12 +23,12 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; +;// require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +;// require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache diff --git a/library/Zend/Cache/Backend/ExtendedInterface.php b/library/Zend/Cache/Backend/ExtendedInterface.php index 0dd8bdf414..24cb30afa4 100644 --- a/library/Zend/Cache/Backend/ExtendedInterface.php +++ b/library/Zend/Cache/Backend/ExtendedInterface.php @@ -23,7 +23,7 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; +;// require_once 'Zend/Cache/Backend/Interface.php'; /** * @package Zend_Cache diff --git a/library/Zend/Cache/Backend/File.php b/library/Zend/Cache/Backend/File.php index 4e395da017..b1044d824b 100644 --- a/library/Zend/Cache/Backend/File.php +++ b/library/Zend/Cache/Backend/File.php @@ -23,12 +23,12 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; +;// require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +;// require_once 'Zend/Cache/Backend.php'; /** diff --git a/library/Zend/Cache/Backend/Libmemcached.php b/library/Zend/Cache/Backend/Libmemcached.php index 623e75776c..6ab6d5fa75 100644 --- a/library/Zend/Cache/Backend/Libmemcached.php +++ b/library/Zend/Cache/Backend/Libmemcached.php @@ -24,12 +24,12 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; +;// require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +;// require_once 'Zend/Cache/Backend.php'; /** diff --git a/library/Zend/Cache/Backend/Memcached.php b/library/Zend/Cache/Backend/Memcached.php index 9cb9916dd8..bafc582328 100644 --- a/library/Zend/Cache/Backend/Memcached.php +++ b/library/Zend/Cache/Backend/Memcached.php @@ -24,12 +24,12 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; +;// require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +;// require_once 'Zend/Cache/Backend.php'; /** diff --git a/library/Zend/Cache/Backend/Sqlite.php b/library/Zend/Cache/Backend/Sqlite.php index 3e8ac8276b..0a1e90f206 100644 --- a/library/Zend/Cache/Backend/Sqlite.php +++ b/library/Zend/Cache/Backend/Sqlite.php @@ -24,12 +24,12 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; +;// require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +;// require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache diff --git a/library/Zend/Cache/Backend/Static.php b/library/Zend/Cache/Backend/Static.php index 9e3c99036f..e86c2d490e 100644 --- a/library/Zend/Cache/Backend/Static.php +++ b/library/Zend/Cache/Backend/Static.php @@ -23,12 +23,12 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; +;// require_once 'Zend/Cache/Backend/Interface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +;// require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache diff --git a/library/Zend/Cache/Backend/Test.php b/library/Zend/Cache/Backend/Test.php index d94e973441..477169f864 100644 --- a/library/Zend/Cache/Backend/Test.php +++ b/library/Zend/Cache/Backend/Test.php @@ -24,12 +24,12 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; +;// require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +;// require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache diff --git a/library/Zend/Cache/Backend/TwoLevels.php b/library/Zend/Cache/Backend/TwoLevels.php index 135ff6ad8d..69d0516f43 100644 --- a/library/Zend/Cache/Backend/TwoLevels.php +++ b/library/Zend/Cache/Backend/TwoLevels.php @@ -24,12 +24,12 @@ /** * @see Zend_Cache_Backend_ExtendedInterface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; +;// require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +;// require_once 'Zend/Cache/Backend.php'; /** diff --git a/library/Zend/Cache/Backend/WinCache.php b/library/Zend/Cache/Backend/WinCache.php index 06843fa39a..a1ce16526b 100644 --- a/library/Zend/Cache/Backend/WinCache.php +++ b/library/Zend/Cache/Backend/WinCache.php @@ -24,12 +24,12 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; +;// require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +;// require_once 'Zend/Cache/Backend.php'; /** diff --git a/library/Zend/Cache/Backend/Xcache.php b/library/Zend/Cache/Backend/Xcache.php index 4bc077fc92..08c14a4f57 100644 --- a/library/Zend/Cache/Backend/Xcache.php +++ b/library/Zend/Cache/Backend/Xcache.php @@ -24,12 +24,12 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; +;// require_once 'Zend/Cache/Backend/Interface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +;// require_once 'Zend/Cache/Backend.php'; /** diff --git a/library/Zend/Cache/Backend/ZendPlatform.php b/library/Zend/Cache/Backend/ZendPlatform.php index 31e9a7a22a..8c86a550f6 100644 --- a/library/Zend/Cache/Backend/ZendPlatform.php +++ b/library/Zend/Cache/Backend/ZendPlatform.php @@ -23,12 +23,12 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend.php'; +;// require_once 'Zend/Cache/Backend.php'; /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; +;// require_once 'Zend/Cache/Backend/Interface.php'; /** diff --git a/library/Zend/Cache/Backend/ZendServer.php b/library/Zend/Cache/Backend/ZendServer.php index ededaf5a9b..262892b60e 100755 --- a/library/Zend/Cache/Backend/ZendServer.php +++ b/library/Zend/Cache/Backend/ZendServer.php @@ -22,10 +22,10 @@ /** @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; +;// require_once 'Zend/Cache/Backend/Interface.php'; /** @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +;// require_once 'Zend/Cache/Backend.php'; /** diff --git a/library/Zend/Cache/Backend/ZendServer/Disk.php b/library/Zend/Cache/Backend/ZendServer/Disk.php index 54914fefff..30b430a5e3 100755 --- a/library/Zend/Cache/Backend/ZendServer/Disk.php +++ b/library/Zend/Cache/Backend/ZendServer/Disk.php @@ -22,10 +22,10 @@ /** @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; +;// require_once 'Zend/Cache/Backend/Interface.php'; /** @see Zend_Cache_Backend_ZendServer */ -require_once 'Zend/Cache/Backend/ZendServer.php'; +;// require_once 'Zend/Cache/Backend/ZendServer.php'; /** diff --git a/library/Zend/Cache/Backend/ZendServer/ShMem.php b/library/Zend/Cache/Backend/ZendServer/ShMem.php index 83086dcd4e..912077c9a8 100755 --- a/library/Zend/Cache/Backend/ZendServer/ShMem.php +++ b/library/Zend/Cache/Backend/ZendServer/ShMem.php @@ -22,10 +22,10 @@ /** @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; +;// require_once 'Zend/Cache/Backend/Interface.php'; /** @see Zend_Cache_Backend_ZendServer */ -require_once 'Zend/Cache/Backend/ZendServer.php'; +;// require_once 'Zend/Cache/Backend/ZendServer.php'; /** diff --git a/library/Zend/Cache/Core.php b/library/Zend/Cache/Core.php index 685d5d52b6..f7c7340ec8 100644 --- a/library/Zend/Cache/Core.php +++ b/library/Zend/Cache/Core.php @@ -719,9 +719,9 @@ protected function _loggerSanity() } // Create a default logger to the standard output stream - require_once 'Zend/Log.php'; - require_once 'Zend/Log/Writer/Stream.php'; - require_once 'Zend/Log/Filter/Priority.php'; + ;// require_once 'Zend/Log.php'; + ;// require_once 'Zend/Log/Writer/Stream.php'; + ;// require_once 'Zend/Log/Filter/Priority.php'; $logger = new Zend_Log(new Zend_Log_Writer_Stream('php://output')); $logger->addFilter(new Zend_Log_Filter_Priority(Zend_Log::WARN, '<=')); $this->_options['logger'] = $logger; diff --git a/library/Zend/Cache/Exception.php b/library/Zend/Cache/Exception.php index ee53b20671..2e4dc36eec 100644 --- a/library/Zend/Cache/Exception.php +++ b/library/Zend/Cache/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @package Zend_Cache diff --git a/library/Zend/Cache/Frontend/Capture.php b/library/Zend/Cache/Frontend/Capture.php index 32ecc237ee..6439802f13 100644 --- a/library/Zend/Cache/Frontend/Capture.php +++ b/library/Zend/Cache/Frontend/Capture.php @@ -24,7 +24,7 @@ /** * @see Zend_Cache_Core */ -require_once 'Zend/Cache/Core.php'; +;// require_once 'Zend/Cache/Core.php'; /** diff --git a/library/Zend/Cache/Frontend/Class.php b/library/Zend/Cache/Frontend/Class.php index 4740402ac7..7159a666d9 100644 --- a/library/Zend/Cache/Frontend/Class.php +++ b/library/Zend/Cache/Frontend/Class.php @@ -23,7 +23,7 @@ /** * @see Zend_Cache_Core */ -require_once 'Zend/Cache/Core.php'; +;// require_once 'Zend/Cache/Core.php'; /** diff --git a/library/Zend/Cache/Frontend/File.php b/library/Zend/Cache/Frontend/File.php index e5017c631c..ef65cef8bd 100644 --- a/library/Zend/Cache/Frontend/File.php +++ b/library/Zend/Cache/Frontend/File.php @@ -24,7 +24,7 @@ /** * @see Zend_Cache_Core */ -require_once 'Zend/Cache/Core.php'; +;// require_once 'Zend/Cache/Core.php'; /** diff --git a/library/Zend/Cache/Frontend/Function.php b/library/Zend/Cache/Frontend/Function.php index 8af521bda6..fb7b66e6d0 100644 --- a/library/Zend/Cache/Frontend/Function.php +++ b/library/Zend/Cache/Frontend/Function.php @@ -24,7 +24,7 @@ /** * @see Zend_Cache_Core */ -require_once 'Zend/Cache/Core.php'; +;// require_once 'Zend/Cache/Core.php'; /** diff --git a/library/Zend/Cache/Frontend/Output.php b/library/Zend/Cache/Frontend/Output.php index 99a8a64c9d..bad2a6e031 100644 --- a/library/Zend/Cache/Frontend/Output.php +++ b/library/Zend/Cache/Frontend/Output.php @@ -24,7 +24,7 @@ /** * @see Zend_Cache_Core */ -require_once 'Zend/Cache/Core.php'; +;// require_once 'Zend/Cache/Core.php'; /** diff --git a/library/Zend/Cache/Frontend/Page.php b/library/Zend/Cache/Frontend/Page.php index cc253d559c..bd3644eed8 100644 --- a/library/Zend/Cache/Frontend/Page.php +++ b/library/Zend/Cache/Frontend/Page.php @@ -24,7 +24,7 @@ /** * @see Zend_Cache_Core */ -require_once 'Zend/Cache/Core.php'; +;// require_once 'Zend/Cache/Core.php'; /** diff --git a/library/Zend/Cache/Manager.php b/library/Zend/Cache/Manager.php index 330ea954e8..4ea784a929 100644 --- a/library/Zend/Cache/Manager.php +++ b/library/Zend/Cache/Manager.php @@ -20,10 +20,10 @@ */ /** @see Zend_Cache_Exception */ -require_once 'Zend/Cache/Exception.php'; +;// require_once 'Zend/Cache/Exception.php'; /** @see Zend_Cache */ -require_once 'Zend/Cache.php'; +;// require_once 'Zend/Cache.php'; /** * @category Zend @@ -206,7 +206,7 @@ public function setCacheTemplate($name, $options) if ($options instanceof Zend_Config) { $options = $options->toArray(); } elseif (!is_array($options)) { - require_once 'Zend/Cache/Exception.php'; + ;// require_once 'Zend/Cache/Exception.php'; throw new Zend_Cache_Exception('Options passed must be in' . ' an associative array or instance of Zend_Config'); } @@ -256,7 +256,7 @@ public function setTemplateOptions($name, $options) if ($options instanceof Zend_Config) { $options = $options->toArray(); } elseif (!is_array($options)) { - require_once 'Zend/Cache/Exception.php'; + ;// require_once 'Zend/Cache/Exception.php'; throw new Zend_Cache_Exception('Options passed must be in' . ' an associative array or instance of Zend_Config'); } diff --git a/library/Zend/Config.php b/library/Zend/Config.php index 8bd8c2a9f7..473e938c6e 100644 --- a/library/Zend/Config.php +++ b/library/Zend/Config.php @@ -165,7 +165,7 @@ public function __set($name, $value) $this->_count = count($this->_data); } else { /** @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Zend_Config is read only'); } } @@ -234,7 +234,7 @@ public function __unset($name) $this->_skipNextIteration = true; } else { /** @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Zend_Config is read only'); } @@ -427,7 +427,7 @@ protected function _assertValidExtend($extendingSection, $extendedSection) while (array_key_exists($extendedSectionCurrent, $this->_extends)) { if ($this->_extends[$extendedSectionCurrent] == $extendingSection) { /** @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Illegal circular inheritance detected'); } $extendedSectionCurrent = $this->_extends[$extendedSectionCurrent]; diff --git a/library/Zend/Config/Exception.php b/library/Zend/Config/Exception.php index 253b334682..9ee0d98986 100644 --- a/library/Zend/Config/Exception.php +++ b/library/Zend/Config/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/Zend/Config/Ini.php b/library/Zend/Config/Ini.php index b2fae01b43..512fa471f5 100644 --- a/library/Zend/Config/Ini.php +++ b/library/Zend/Config/Ini.php @@ -23,7 +23,7 @@ /** * @see Zend_Config */ -require_once 'Zend/Config.php'; +;// require_once 'Zend/Config.php'; /** @@ -104,7 +104,7 @@ public function __construct($filename, $section = null, $options = false) /** * @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Filename is not set'); } @@ -147,7 +147,7 @@ public function __construct($filename, $section = null, $options = false) /** * @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Section '$sectionName' cannot be found in $filename"); } $dataArray = $this->_arrayMergeRecursive($this->_processSection($iniArray, $sectionName), $dataArray); @@ -178,7 +178,7 @@ protected function _parseIniFile($filename) /** * @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception($this->_loadFileErrorStr); } @@ -219,7 +219,7 @@ protected function _loadIniFile($filename) /** * @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Section '$thisSection' may not extend multiple sections in $filename"); } } @@ -254,7 +254,7 @@ protected function _processSection($iniArray, $section, $config = array()) /** * @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Parent section '$section' cannot be found"); } } else { @@ -290,7 +290,7 @@ protected function _processKey($config, $key, $value) /** * @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Cannot create sub-key for '{$pieces[0]}' as key already exists"); } $config[$pieces[0]] = $this->_processKey($config[$pieces[0]], $pieces[1], $value); @@ -298,7 +298,7 @@ protected function _processKey($config, $key, $value) /** * @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Invalid key '$key'"); } } else { diff --git a/library/Zend/Config/Json.php b/library/Zend/Config/Json.php index 2c31fdc014..711e21eaf1 100755 --- a/library/Zend/Config/Json.php +++ b/library/Zend/Config/Json.php @@ -22,12 +22,12 @@ /** * @see Zend_Config */ -require_once 'Zend/Config.php'; +;// require_once 'Zend/Config.php'; /** * @see Zend_Json */ -require_once 'Zend/Json.php'; +;// require_once 'Zend/Json.php'; /** * JSON Adapter for Zend_Config @@ -82,7 +82,7 @@ class Zend_Config_Json extends Zend_Config public function __construct($json, $section = null, $options = false) { if (empty($json)) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Filename is not set'); } @@ -118,7 +118,7 @@ public function __construct($json, $section = null, $options = false) // Check if there was a error while loading file if ($this->_loadFileErrorStr !== null) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception($this->_loadFileErrorStr); } @@ -132,7 +132,7 @@ public function __construct($json, $section = null, $options = false) $config = Zend_Json::decode($json); } catch (Zend_Json_Exception $e) { // decode failed - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Error parsing JSON data"); } @@ -147,7 +147,7 @@ public function __construct($json, $section = null, $options = false) $dataArray = array(); foreach ($section as $sectionName) { if (!isset($config[$sectionName])) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception(sprintf('Section "%s" cannot be found', $sectionName)); } @@ -157,7 +157,7 @@ public function __construct($json, $section = null, $options = false) parent::__construct($dataArray, $allowModifications); } else { if (!isset($config[$section])) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception(sprintf('Section "%s" cannot be found', $section)); } @@ -186,7 +186,7 @@ public function __construct($json, $section = null, $options = false) protected function _processExtends(array $data, $section, array $config = array()) { if (!isset($data[$section])) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception(sprintf('Section "%s" cannot be found', $section)); } @@ -194,7 +194,7 @@ protected function _processExtends(array $data, $section, array $config = array( if (is_array($thisSection) && isset($thisSection[self::EXTENDS_NAME])) { if (is_array($thisSection[self::EXTENDS_NAME])) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Invalid extends clause: must be a string; array received'); } $this->_assertValidExtend($section, $thisSection[self::EXTENDS_NAME]); diff --git a/library/Zend/Config/Writer/Array.php b/library/Zend/Config/Writer/Array.php index 50c260e0cf..14b14d34c7 100644 --- a/library/Zend/Config/Writer/Array.php +++ b/library/Zend/Config/Writer/Array.php @@ -22,7 +22,7 @@ /** * @see Zend_Config_Writer */ -require_once 'Zend/Config/Writer/FileAbstract.php'; +;// require_once 'Zend/Config/Writer/FileAbstract.php'; /** * @category Zend diff --git a/library/Zend/Config/Writer/FileAbstract.php b/library/Zend/Config/Writer/FileAbstract.php index a1da83b96b..3167e432d5 100644 --- a/library/Zend/Config/Writer/FileAbstract.php +++ b/library/Zend/Config/Writer/FileAbstract.php @@ -19,7 +19,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once "Zend/Config/Writer.php"; +;// require_once "Zend/Config/Writer.php"; /** * Abstract File Writer @@ -95,12 +95,12 @@ public function write($filename = null, Zend_Config $config = null, $exclusiveLo } if ($this->_filename === null) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('No filename was set'); } if ($this->_config === null) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('No config was set'); } @@ -115,7 +115,7 @@ public function write($filename = null, Zend_Config $config = null, $exclusiveLo $result = @file_put_contents($this->_filename, $configString, $flags); if ($result === false) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Could not write to file "' . $this->_filename . '"'); } } diff --git a/library/Zend/Config/Writer/Ini.php b/library/Zend/Config/Writer/Ini.php index 55bef62d03..d21975b869 100644 --- a/library/Zend/Config/Writer/Ini.php +++ b/library/Zend/Config/Writer/Ini.php @@ -22,7 +22,7 @@ /** * @see Zend_Config_Writer */ -require_once 'Zend/Config/Writer/FileAbstract.php'; +;// require_once 'Zend/Config/Writer/FileAbstract.php'; /** * @category Zend @@ -157,7 +157,7 @@ protected function _prepareValue($value) return '"' . $value . '"'; } else { /** @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Value can not contain double quotes "'); } } diff --git a/library/Zend/Config/Writer/Json.php b/library/Zend/Config/Writer/Json.php index 25da4a9038..c99c93f899 100755 --- a/library/Zend/Config/Writer/Json.php +++ b/library/Zend/Config/Writer/Json.php @@ -22,12 +22,12 @@ /** * @see Zend_Config_Writer */ -require_once 'Zend/Config/Writer/FileAbstract.php'; +;// require_once 'Zend/Config/Writer/FileAbstract.php'; /** * @see Zend_Config_Json */ -require_once 'Zend/Config/Json.php'; +;// require_once 'Zend/Config/Json.php'; /** * @category Zend diff --git a/library/Zend/Config/Writer/Xml.php b/library/Zend/Config/Writer/Xml.php index c73564b219..327631f0b1 100644 --- a/library/Zend/Config/Writer/Xml.php +++ b/library/Zend/Config/Writer/Xml.php @@ -22,12 +22,12 @@ /** * @see Zend_Config_Writer */ -require_once 'Zend/Config/Writer/FileAbstract.php'; +;// require_once 'Zend/Config/Writer/FileAbstract.php'; /** * @see Zend_Config_Xml */ -require_once 'Zend/Config/Xml.php'; +;// require_once 'Zend/Config/Xml.php'; /** * @category Zend @@ -101,7 +101,7 @@ protected function _addBranch(Zend_Config $config, SimpleXMLElement $xml, Simple $branchType = 'string'; } } else if ($branchType !== (is_numeric($key) ? 'numeric' : 'string')) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Mixing of string and numeric keys is not allowed'); } diff --git a/library/Zend/Config/Writer/Yaml.php b/library/Zend/Config/Writer/Yaml.php index 4d2b1fed44..58335f9cd0 100755 --- a/library/Zend/Config/Writer/Yaml.php +++ b/library/Zend/Config/Writer/Yaml.php @@ -22,12 +22,12 @@ /** * @see Zend_Config_Writer */ -require_once 'Zend/Config/Writer/FileAbstract.php'; +;// require_once 'Zend/Config/Writer/FileAbstract.php'; /** * @see Zend_Config_Yaml */ -require_once 'Zend/Config/Yaml.php'; +;// require_once 'Zend/Config/Yaml.php'; /** * @category Zend @@ -63,7 +63,7 @@ public function getYamlEncoder() public function setYamlEncoder($yamlEncoder) { if (!is_callable($yamlEncoder)) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Invalid parameter to setYamlEncoder - must be callable'); } diff --git a/library/Zend/Config/Xml.php b/library/Zend/Config/Xml.php index 4425a8b705..118a348b35 100644 --- a/library/Zend/Config/Xml.php +++ b/library/Zend/Config/Xml.php @@ -22,13 +22,13 @@ /** * @see Zend_Config */ -require_once 'Zend/Config.php'; +;// require_once 'Zend/Config.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** @see Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; +;// require_once 'Zend/Xml/Exception.php'; /** * XML Adapter for Zend_Config @@ -84,7 +84,7 @@ class Zend_Config_Xml extends Zend_Config public function __construct($xml, $section = null, $options = false) { if (empty($xml)) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Filename is not set'); } @@ -106,13 +106,13 @@ public function __construct($xml, $section = null, $options = false) } else { try { if (!$config = Zend_Xml_Security::scanFile($xml)) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception( "Error failed to load $xml file" ); } } catch (Zend_Xml_Exception $e) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception( $e->getMessage() ); @@ -122,7 +122,7 @@ public function __construct($xml, $section = null, $options = false) restore_error_handler(); // Check if there was a error while loading file if ($this->_loadFileErrorStr !== null) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception($this->_loadFileErrorStr); } @@ -137,7 +137,7 @@ public function __construct($xml, $section = null, $options = false) $dataArray = array(); foreach ($section as $sectionName) { if (!isset($config->$sectionName)) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Section '$sectionName' cannot be found in $xml"); } @@ -147,7 +147,7 @@ public function __construct($xml, $section = null, $options = false) parent::__construct($dataArray, $allowModifications); } else { if (!isset($config->$section)) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Section '$section' cannot be found in $xml"); } @@ -176,7 +176,7 @@ public function __construct($xml, $section = null, $options = false) protected function _processExtends(SimpleXMLElement $element, $section, array $config = array()) { if (!isset($element->$section)) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Section '$section' cannot be found"); } @@ -233,7 +233,7 @@ protected function _toArray(SimpleXMLElement $xmlObject) // Search for local 'const' nodes and replace them if (count($xmlObject->children(self::XML_NAMESPACE)) > 0) { if (count($xmlObject->children()) > 0) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("A node with a 'const' childnode may not have any other children"); } @@ -252,14 +252,14 @@ protected function _toArray(SimpleXMLElement $xmlObject) switch ($node->localName) { case 'const': if (!$node->hasAttributeNS(self::XML_NAMESPACE, 'name')) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Misssing 'name' attribute in 'const' node"); } $constantName = $node->getAttributeNS(self::XML_NAMESPACE, 'name'); if (!defined($constantName)) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Constant with name '$constantName' was not defined"); } @@ -269,7 +269,7 @@ protected function _toArray(SimpleXMLElement $xmlObject) break; default: - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Unknown node with name '$node->localName' found"); } } diff --git a/library/Zend/Config/Yaml.php b/library/Zend/Config/Yaml.php index 0d107033eb..3f98c847e2 100755 --- a/library/Zend/Config/Yaml.php +++ b/library/Zend/Config/Yaml.php @@ -22,7 +22,7 @@ /** * @see Zend_Config */ -require_once 'Zend/Config.php'; +;// require_once 'Zend/Config.php'; /** * YAML Adapter for Zend_Config @@ -99,7 +99,7 @@ public function getYamlDecoder() public function setYamlDecoder($yamlDecoder) { if (!is_callable($yamlDecoder)) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Invalid parameter to setYamlDecoder() - must be callable'); } @@ -131,7 +131,7 @@ public function setYamlDecoder($yamlDecoder) public function __construct($yaml, $section = null, $options = false) { if (empty($yaml)) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Filename is not set'); } @@ -171,7 +171,7 @@ public function __construct($yaml, $section = null, $options = false) // Check if there was a error while loading file if ($this->_loadFileErrorStr !== null) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception($this->_loadFileErrorStr); } @@ -186,7 +186,7 @@ public function __construct($yaml, $section = null, $options = false) if (null === $config) { // decode failed - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Error parsing YAML data"); } @@ -200,7 +200,7 @@ public function __construct($yaml, $section = null, $options = false) $dataArray = array(); foreach ($section as $sectionName) { if (!isset($config[$sectionName])) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception(sprintf( 'Section "%s" cannot be found', implode(' ', (array)$section) @@ -212,7 +212,7 @@ public function __construct($yaml, $section = null, $options = false) parent::__construct($dataArray, $allowModifications); } else { if (!isset($config[$section])) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception(sprintf( 'Section "%s" cannot be found', implode(' ', (array)$section) @@ -243,7 +243,7 @@ public function __construct($yaml, $section = null, $options = false) protected function _processExtends(array $data, $section, array $config = array()) { if (!isset($data[$section])) { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception(sprintf('Section "%s" cannot be found', $section)); } @@ -341,7 +341,7 @@ protected static function _decodeYaml($currentIndent, &$lines) $config[] = self::_decodeYaml($currentIndent + 1, $lines); } } else { - require_once 'Zend/Config/Exception.php'; + ;// require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception(sprintf( 'Error parsing YAML at line %d - unsupported syntax: "%s"', $lineno, $line diff --git a/library/Zend/Console/Getopt.php b/library/Zend/Console/Getopt.php index 6db7778346..383e1fdb75 100644 --- a/library/Zend/Console/Getopt.php +++ b/library/Zend/Console/Getopt.php @@ -242,7 +242,7 @@ class Zend_Console_Getopt public function __construct($rules, $argv = null, $getoptConfig = array()) { if (!isset($_SERVER['argv'])) { - require_once 'Zend/Console/Getopt/Exception.php'; + ;// require_once 'Zend/Console/Getopt/Exception.php'; if (ini_get('register_argc_argv') == false) { throw new Zend_Console_Getopt_Exception( "argv is not available, because ini option 'register_argc_argv' is set Off" @@ -350,7 +350,7 @@ public function __unset($key) public function addArguments($argv) { if(!is_array($argv)) { - require_once 'Zend/Console/Getopt/Exception.php'; + ;// require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( "Parameter #1 to addArguments should be an array"); } @@ -370,7 +370,7 @@ public function addArguments($argv) public function setArguments($argv) { if(!is_array($argv)) { - require_once 'Zend/Console/Getopt/Exception.php'; + ;// require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( "Parameter #1 to setArguments should be an array"); } @@ -505,7 +505,7 @@ public function toJson() /** * @see Zend_Json */ - require_once 'Zend/Json.php'; + ;// require_once 'Zend/Json.php'; $json = Zend_Json::encode($j); return $json; @@ -655,7 +655,7 @@ public function setAliases($aliasMap) $flag = $this->_ruleMap[$flag]; if (isset($this->_rules[$alias]) || isset($this->_ruleMap[$alias])) { $o = (strlen($alias) == 1 ? '-' : '--') . $alias; - require_once 'Zend/Console/Getopt/Exception.php'; + ;// require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( "Option \"$o\" is being defined more than once."); } @@ -743,7 +743,7 @@ public function checkRequiredArguments() $defined = $defined === true ? true : array_key_exists($alias, $this->_options); } if ($defined === false) { - require_once 'Zend/Console/Getopt/Exception.php'; + ;// require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( 'Option "$alias" requires a parameter.', $this->getUsageMessage() @@ -803,7 +803,7 @@ protected function _parseSingleOption($flag, &$argv) $flag = strtolower($flag); } if (!isset($this->_ruleMap[$flag])) { - require_once 'Zend/Console/Getopt/Exception.php'; + ;// require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( "Option \"$flag\" is not recognized.", $this->getUsageMessage()); @@ -815,7 +815,7 @@ protected function _parseSingleOption($flag, &$argv) $param = array_shift($argv); $this->_checkParameterType($realFlag, $param); } else { - require_once 'Zend/Console/Getopt/Exception.php'; + ;// require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( "Option \"$flag\" requires a parameter.", $this->getUsageMessage()); @@ -854,7 +854,7 @@ protected function _checkParameterType($flag, $param) switch ($type) { case 'word': if (preg_match('/\W/', $param)) { - require_once 'Zend/Console/Getopt/Exception.php'; + ;// require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( "Option \"$flag\" requires a single-word parameter, but was given \"$param\".", $this->getUsageMessage()); @@ -862,7 +862,7 @@ protected function _checkParameterType($flag, $param) break; case 'integer': if (preg_match('/\D/', $param)) { - require_once 'Zend/Console/Getopt/Exception.php'; + ;// require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( "Option \"$flag\" requires an integer parameter, but was given \"$param\".", $this->getUsageMessage()); @@ -939,13 +939,13 @@ protected function _addRulesModeZend($rules) $mainFlag = $flags[0]; foreach ($flags as $flag) { if (empty($flag)) { - require_once 'Zend/Console/Getopt/Exception.php'; + ;// require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( "Blank flag not allowed in rule \"$ruleCode\"."); } if (strlen($flag) == 1) { if (isset($this->_ruleMap[$flag])) { - require_once 'Zend/Console/Getopt/Exception.php'; + ;// require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( "Option \"-$flag\" is being defined more than once."); } @@ -953,7 +953,7 @@ protected function _addRulesModeZend($rules) $rule['alias'][] = $flag; } else { if (isset($this->_rules[$flag]) || isset($this->_ruleMap[$flag])) { - require_once 'Zend/Console/Getopt/Exception.php'; + ;// require_once 'Zend/Console/Getopt/Exception.php'; throw new Zend_Console_Getopt_Exception( "Option \"--$flag\" is being defined more than once."); } diff --git a/library/Zend/Console/Getopt/Exception.php b/library/Zend/Console/Getopt/Exception.php index e52580f953..270ef53745 100644 --- a/library/Zend/Console/Getopt/Exception.php +++ b/library/Zend/Console/Getopt/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Console_Getopt_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** diff --git a/library/Zend/Controller/Action.php b/library/Zend/Controller/Action.php index 9508e74711..d4da2d7b5f 100644 --- a/library/Zend/Controller/Action.php +++ b/library/Zend/Controller/Action.php @@ -22,17 +22,17 @@ /** * @see Zend_Controller_Action_HelperBroker */ -require_once 'Zend/Controller/Action/HelperBroker.php'; +;// require_once 'Zend/Controller/Action/HelperBroker.php'; /** * @see Zend_Controller_Action_Interface */ -require_once 'Zend/Controller/Action/Interface.php'; +;// require_once 'Zend/Controller/Action/Interface.php'; /** * @see Zend_Controller_Front */ -require_once 'Zend/Controller/Front.php'; +;// require_once 'Zend/Controller/Front.php'; /** * @category Zend @@ -166,7 +166,7 @@ public function initView() return $this->view; } - require_once 'Zend/View/Interface.php'; + ;// require_once 'Zend/View/Interface.php'; if (isset($this->view) && ($this->view instanceof Zend_View_Interface)) { return $this->view; } @@ -179,11 +179,11 @@ public function initView() } $baseDir = dirname($dirs[$module]) . DIRECTORY_SEPARATOR . 'views'; if (!file_exists($baseDir) || !is_dir($baseDir)) { - require_once 'Zend/Controller/Exception.php'; + ;// require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Missing base view directory ("' . $baseDir . '")'); } - require_once 'Zend/View.php'; + ;// require_once 'Zend/View.php'; $this->view = new Zend_View(array('basePath' => $baseDir)); return $this->view; @@ -274,7 +274,7 @@ public function getViewScript($action = null, $noController = null) if (null === $action) { $action = $request->getActionName(); } elseif (!is_string($action)) { - require_once 'Zend/Controller/Exception.php'; + ;// require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Invalid action specifier for view render'); } @@ -431,7 +431,7 @@ public function getFrontController() } // Throw exception in all other cases - require_once 'Zend/Controller/Exception.php'; + ;// require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Front controller class has not been loaded'); } @@ -479,7 +479,7 @@ public function postDispatch() */ public function __call($methodName, $args) { - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; if ('Action' == substr($methodName, -6)) { $action = substr($methodName, 0, strlen($methodName) - 6); throw new Zend_Controller_Action_Exception(sprintf('Action "%s" does not exist and was not trapped in __call()', $action), 404); diff --git a/library/Zend/Controller/Action/Exception.php b/library/Zend/Controller/Action/Exception.php index 4cd9ce2a74..ac42a6ec48 100644 --- a/library/Zend/Controller/Action/Exception.php +++ b/library/Zend/Controller/Action/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Controller_Exception */ -require_once 'Zend/Controller/Exception.php'; +;// require_once 'Zend/Controller/Exception.php'; /** diff --git a/library/Zend/Controller/Action/Helper/Abstract.php b/library/Zend/Controller/Action/Helper/Abstract.php index ed039b8ead..d442d5e0a3 100644 --- a/library/Zend/Controller/Action/Helper/Abstract.php +++ b/library/Zend/Controller/Action/Helper/Abstract.php @@ -23,7 +23,7 @@ /** * @see Zend_Controller_Action */ -require_once 'Zend/Controller/Action.php'; +;// require_once 'Zend/Controller/Action.php'; /** * @category Zend diff --git a/library/Zend/Controller/Action/Helper/ActionStack.php b/library/Zend/Controller/Action/Helper/ActionStack.php index e22e8b8e7e..a705f8821a 100644 --- a/library/Zend/Controller/Action/Helper/ActionStack.php +++ b/library/Zend/Controller/Action/Helper/ActionStack.php @@ -23,7 +23,7 @@ /** * @see Zend_Controller_Action_Helper_Abstract */ -require_once 'Zend/Controller/Action/Helper/Abstract.php'; +;// require_once 'Zend/Controller/Action/Helper/Abstract.php'; /** * Add to action stack @@ -56,7 +56,7 @@ public function __construct() /** * @see Zend_Controller_Plugin_ActionStack */ - require_once 'Zend/Controller/Plugin/ActionStack.php'; + ;// require_once 'Zend/Controller/Plugin/ActionStack.php'; $this->_actionStack = new Zend_Controller_Plugin_ActionStack(); $front->registerPlugin($this->_actionStack, 97); } else { @@ -94,7 +94,7 @@ public function actionToStack($action, $controller = null, $module = null, array /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('ActionStack requires either a request object or minimally a string action'); } @@ -104,7 +104,7 @@ public function actionToStack($action, $controller = null, $module = null, array /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Request object not set yet'); } @@ -114,7 +114,7 @@ public function actionToStack($action, $controller = null, $module = null, array /** * @see Zend_Controller_Request_Simple */ - require_once 'Zend/Controller/Request/Simple.php'; + ;// require_once 'Zend/Controller/Request/Simple.php'; $newRequest = new Zend_Controller_Request_Simple($action, $controller, $module, $params); return $this->pushStack($newRequest); diff --git a/library/Zend/Controller/Action/Helper/AjaxContext.php b/library/Zend/Controller/Action/Helper/AjaxContext.php index dd4ca426d6..1c9bfae0b9 100644 --- a/library/Zend/Controller/Action/Helper/AjaxContext.php +++ b/library/Zend/Controller/Action/Helper/AjaxContext.php @@ -23,7 +23,7 @@ /** * @see Zend_Controller_Action_Helper_ContextSwitch */ -require_once 'Zend/Controller/Action/Helper/ContextSwitch.php'; +;// require_once 'Zend/Controller/Action/Helper/ContextSwitch.php'; /** * Simplify AJAX context switching based on requested format diff --git a/library/Zend/Controller/Action/Helper/AutoComplete/Abstract.php b/library/Zend/Controller/Action/Helper/AutoComplete/Abstract.php index 707545434b..de5a89743b 100644 --- a/library/Zend/Controller/Action/Helper/AutoComplete/Abstract.php +++ b/library/Zend/Controller/Action/Helper/AutoComplete/Abstract.php @@ -23,7 +23,7 @@ /** * @see Zend_Controller_Action_Helper_Abstract */ -require_once 'Zend/Controller/Action/Helper/Abstract.php'; +;// require_once 'Zend/Controller/Action/Helper/Abstract.php'; /** * Create and send autocompletion lists @@ -71,7 +71,7 @@ public function disableLayouts() /** * @see Zend_Layout */ - require_once 'Zend/Layout.php'; + ;// require_once 'Zend/Layout.php'; if (null !== ($layout = Zend_Layout::getMvcInstance())) { $layout->disableLayout(); } @@ -98,7 +98,7 @@ public function encodeJson($data, $keepLayouts = false) /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Invalid data passed for autocompletion'); } diff --git a/library/Zend/Controller/Action/Helper/AutoCompleteDojo.php b/library/Zend/Controller/Action/Helper/AutoCompleteDojo.php index 9027f0f8e6..d9c5a37650 100644 --- a/library/Zend/Controller/Action/Helper/AutoCompleteDojo.php +++ b/library/Zend/Controller/Action/Helper/AutoCompleteDojo.php @@ -23,7 +23,7 @@ /** * @see Zend_Controller_Action_Helper_AutoComplete_Abstract */ -require_once 'Zend/Controller/Action/Helper/AutoComplete/Abstract.php'; +;// require_once 'Zend/Controller/Action/Helper/AutoComplete/Abstract.php'; /** * Create and send Dojo-compatible autocompletion lists @@ -60,7 +60,7 @@ public function validateData($data) public function prepareAutoCompletion($data, $keepLayouts = false) { if (!$data instanceof Zend_Dojo_Data) { - require_once 'Zend/Dojo/Data.php'; + ;// require_once 'Zend/Dojo/Data.php'; $items = array(); foreach ($data as $key => $value) { $items[] = array('label' => $value, 'name' => $value); @@ -69,10 +69,10 @@ public function prepareAutoCompletion($data, $keepLayouts = false) } if (!$keepLayouts) { - require_once 'Zend/Controller/Action/HelperBroker.php'; + ;// require_once 'Zend/Controller/Action/HelperBroker.php'; Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer')->setNoRender(true); - require_once 'Zend/Layout.php'; + ;// require_once 'Zend/Layout.php'; $layout = Zend_Layout::getMvcInstance(); if ($layout instanceof Zend_Layout) { $layout->disableLayout(); diff --git a/library/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php b/library/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php index 098aed8b10..f9e78b7719 100644 --- a/library/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php +++ b/library/Zend/Controller/Action/Helper/AutoCompleteScriptaculous.php @@ -23,7 +23,7 @@ /** * @see Zend_Controller_Action_Helper_AutoComplete_Abstract */ -require_once 'Zend/Controller/Action/Helper/AutoComplete/Abstract.php'; +;// require_once 'Zend/Controller/Action/Helper/AutoComplete/Abstract.php'; /** * Create and send Scriptaculous-compatible autocompletion lists @@ -66,7 +66,7 @@ public function prepareAutoCompletion($data, $keepLayouts = false) /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Invalid data passed for autocompletion'); } diff --git a/library/Zend/Controller/Action/Helper/Cache.php b/library/Zend/Controller/Action/Helper/Cache.php index 61c089ff59..b6ff57919b 100644 --- a/library/Zend/Controller/Action/Helper/Cache.php +++ b/library/Zend/Controller/Action/Helper/Cache.php @@ -22,17 +22,17 @@ /** * @see Zend_Controller_Action_Helper_Abstract */ -require_once 'Zend/Controller/Action/Helper/Abstract.php'; +;// require_once 'Zend/Controller/Action/Helper/Abstract.php'; /** * @see Zend_Controller_Action_Exception */ -require_once 'Zend/Controller/Action/Exception.php'; +;// require_once 'Zend/Controller/Action/Exception.php'; /** * @see Zend_Cache_Manager */ -require_once 'Zend/Cache/Manager.php'; +;// require_once 'Zend/Cache/Manager.php'; /** * @category Zend diff --git a/library/Zend/Controller/Action/Helper/ContextSwitch.php b/library/Zend/Controller/Action/Helper/ContextSwitch.php index fe9114bc6e..c3f5c42277 100644 --- a/library/Zend/Controller/Action/Helper/ContextSwitch.php +++ b/library/Zend/Controller/Action/Helper/ContextSwitch.php @@ -23,7 +23,7 @@ /** * @see Zend_Controller_Action_Helper_Abstract */ -require_once 'Zend/Controller/Action/Helper/Abstract.php'; +;// require_once 'Zend/Controller/Action/Helper/Abstract.php'; /** * Simplify context switching based on requested format @@ -288,7 +288,7 @@ public function initContext($format = null) /** * @see Zend_Layout */ - require_once 'Zend/Layout.php'; + ;// require_once 'Zend/Layout.php'; $layout = Zend_Layout::getMvcInstance(); if (null !== $layout) { $layout->disableLayout(); @@ -306,7 +306,7 @@ public function initContext($format = null) /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf('Invalid context callback registered for context "%s"', $context)); } } @@ -395,7 +395,7 @@ protected function _setSuffix(array $spec) /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Invalid suffix information provided in config'); case ($count < 2): $suffix = array_shift($suffixInfo); @@ -441,7 +441,7 @@ public function setSuffix($context, $suffix, $prependViewRendererSuffix = true) /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf('Cannot set suffix; invalid context type "%s"', $context)); } @@ -487,7 +487,7 @@ public function getSuffix($type) /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf('Cannot retrieve suffix; invalid context type "%s"', $type)); } @@ -528,7 +528,7 @@ public function hasContext($context, $throwException = false) /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf('Context "%s" does not exist', $context)); } @@ -556,7 +556,7 @@ public function addHeader($context, $header, $content) /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf('Cannot add "%s" header to context "%s": already exists', $header, $context)); } @@ -725,7 +725,7 @@ protected function _validateTrigger($trigger) /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf('Invalid trigger "%s"', $trigger)); } @@ -751,7 +751,7 @@ public function setCallback($context, $trigger, $callback) /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Invalid callback specified'); } } @@ -898,7 +898,7 @@ public function setDefaultContext($type) /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf('Cannot set default context; invalid context type "%s"', $type)); } @@ -952,7 +952,7 @@ public function addContext($context, array $spec) /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf('Cannot add context "%s"; already exists', $context)); } $context = (string) $context; @@ -1090,7 +1090,7 @@ public function postDispatch() /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf('Invalid postDispatch context callback registered for context "%s"', $context)); } } @@ -1117,11 +1117,11 @@ public function postJsonContext() * @see Zend_Json */ if(method_exists($view, 'getVars')) { - require_once 'Zend/Json.php'; + ;// require_once 'Zend/Json.php'; $vars = Zend_Json::encode($view->getVars()); $this->getResponse()->setBody($vars); } else { - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('View does not implement the getVars() method needed to encode the view into JSON'); } } @@ -1254,7 +1254,7 @@ public function hasActionContext($action, $context) /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception("Invalid contexts found for controller"); } @@ -1272,7 +1272,7 @@ public function hasActionContext($action, $context) /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf("Invalid contexts found for action '%s'", $action)); } diff --git a/library/Zend/Controller/Action/Helper/FlashMessenger.php b/library/Zend/Controller/Action/Helper/FlashMessenger.php index 776d974595..c18eef962e 100644 --- a/library/Zend/Controller/Action/Helper/FlashMessenger.php +++ b/library/Zend/Controller/Action/Helper/FlashMessenger.php @@ -22,12 +22,12 @@ /** * @see Zend_Session */ -require_once 'Zend/Session.php'; +;// require_once 'Zend/Session.php'; /** * @see Zend_Controller_Action_Helper_Abstract */ -require_once 'Zend/Controller/Action/Helper/Abstract.php'; +;// require_once 'Zend/Controller/Action/Helper/Abstract.php'; /** * Flash Messenger - implement session-based messages diff --git a/library/Zend/Controller/Action/Helper/Json.php b/library/Zend/Controller/Action/Helper/Json.php index 86a8b113c1..0a7063da4f 100644 --- a/library/Zend/Controller/Action/Helper/Json.php +++ b/library/Zend/Controller/Action/Helper/Json.php @@ -23,7 +23,7 @@ /** * @see Zend_Controller_Action_Helper_Abstract */ -require_once 'Zend/Controller/Action/Helper/Abstract.php'; +;// require_once 'Zend/Controller/Action/Helper/Abstract.php'; /** * Simplify AJAX context switching based on requested format @@ -68,7 +68,7 @@ public function encodeJson($data, $keepLayouts = false, $encodeData = true) /** * @see Zend_View_Helper_Json */ - require_once 'Zend/View/Helper/Json.php'; + ;// require_once 'Zend/View/Helper/Json.php'; $jsonHelper = new Zend_View_Helper_Json(); $data = $jsonHelper->json($data, $keepLayouts, $encodeData); @@ -76,7 +76,7 @@ public function encodeJson($data, $keepLayouts = false, $encodeData = true) /** * @see Zend_Controller_Action_HelperBroker */ - require_once 'Zend/Controller/Action/HelperBroker.php'; + ;// require_once 'Zend/Controller/Action/HelperBroker.php'; Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer')->setNoRender(true); } diff --git a/library/Zend/Controller/Action/Helper/Redirector.php b/library/Zend/Controller/Action/Helper/Redirector.php index 8c81646224..67861e6f55 100644 --- a/library/Zend/Controller/Action/Helper/Redirector.php +++ b/library/Zend/Controller/Action/Helper/Redirector.php @@ -23,7 +23,7 @@ /** * @see Zend_Controller_Action_Helper_Abstract */ -require_once 'Zend/Controller/Action/Helper/Abstract.php'; +;// require_once 'Zend/Controller/Action/Helper/Abstract.php'; /** * @category Zend @@ -92,7 +92,7 @@ protected function _checkCode($code) { $code = (int)$code; if ((300 > $code) || (307 < $code) || (304 == $code) || (306 == $code)) { - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Invalid redirect HTTP status code (' . $code . ')'); } @@ -528,7 +528,7 @@ public function __call($method, $args) return call_user_func_array(array($this, 'gotoSimpleAndExit'), $args); } - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception(sprintf('Invalid method "%s" called on redirector', $method)); } } diff --git a/library/Zend/Controller/Action/Helper/Url.php b/library/Zend/Controller/Action/Helper/Url.php index 7b8c69ac12..81a28b7289 100644 --- a/library/Zend/Controller/Action/Helper/Url.php +++ b/library/Zend/Controller/Action/Helper/Url.php @@ -23,7 +23,7 @@ /** * @see Zend_Controller_Action_Helper_Abstract */ -require_once 'Zend/Controller/Action/Helper/Abstract.php'; +;// require_once 'Zend/Controller/Action/Helper/Abstract.php'; /** * Helper for creating URLs for redirects and other tasks diff --git a/library/Zend/Controller/Action/Helper/ViewRenderer.php b/library/Zend/Controller/Action/Helper/ViewRenderer.php index a66c12a466..fb2c012b2a 100644 --- a/library/Zend/Controller/Action/Helper/ViewRenderer.php +++ b/library/Zend/Controller/Action/Helper/ViewRenderer.php @@ -23,12 +23,12 @@ /** * @see Zend_Controller_Action_Helper_Abstract */ -require_once 'Zend/Controller/Action/Helper/Abstract.php'; +;// require_once 'Zend/Controller/Action/Helper/Abstract.php'; /** * @see Zend_View */ -require_once 'Zend/View.php'; +;// require_once 'Zend/View.php'; /** * View script integration @@ -245,7 +245,7 @@ public function getModuleDirectory() /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('ViewRenderer cannot locate module directory for module "' . $module . '"'); } $this->_moduleDir = dirname($moduleDir); @@ -263,15 +263,15 @@ public function getInflector() /** * @see Zend_Filter_Inflector */ - require_once 'Zend/Filter/Inflector.php'; + ;// require_once 'Zend/Filter/Inflector.php'; /** * @see Zend_Filter_PregReplace */ - require_once 'Zend/Filter/PregReplace.php'; + ;// require_once 'Zend/Filter/PregReplace.php'; /** * @see Zend_Filter_Word_UnderscoreToSeparator */ - require_once 'Zend/Filter/Word/UnderscoreToSeparator.php'; + ;// require_once 'Zend/Filter/Word/UnderscoreToSeparator.php'; $this->_inflector = new Zend_Filter_Inflector(); $this->_inflector->setStaticRuleReference('moduleDir', $this->_moduleDir) // moduleDir must be specified before the less specific 'module' ->addRules(array( @@ -471,7 +471,7 @@ public function initView($path = null, $prefix = null, array $options = array()) /** * @see Zend_Controller_Action_Exception */ - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('ViewRenderer initialization failed: retrieved view base path is empty'); } } @@ -846,7 +846,7 @@ protected function _translateSpec(array $vars = array()) $module = $dispatcher->formatModuleName($request->getModuleName()); // Format controller name - require_once 'Zend/Filter/Word/CamelCaseToDash.php'; + ;// require_once 'Zend/Filter/Word/CamelCaseToDash.php'; $filter = new Zend_Filter_Word_CamelCaseToDash(); $controller = $filter->filter($request->getControllerName()); $controller = $dispatcher->formatControllerName($controller); diff --git a/library/Zend/Controller/Action/HelperBroker.php b/library/Zend/Controller/Action/HelperBroker.php index f911c7035e..c4ae0209f5 100644 --- a/library/Zend/Controller/Action/HelperBroker.php +++ b/library/Zend/Controller/Action/HelperBroker.php @@ -23,12 +23,12 @@ /** * @see Zend_Controller_Action_HelperBroker_PriorityStack */ -require_once 'Zend/Controller/Action/HelperBroker/PriorityStack.php'; +;// require_once 'Zend/Controller/Action/HelperBroker/PriorityStack.php'; /** * @see Zend_Loader */ -require_once 'Zend/Loader.php'; +;// require_once 'Zend/Loader.php'; /** * @category Zend @@ -67,7 +67,7 @@ class Zend_Controller_Action_HelperBroker public static function setPluginLoader($loader) { if ((null !== $loader) && (!$loader instanceof Zend_Loader_PluginLoader_Interface)) { - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Invalid plugin loader provided to HelperBroker'); } self::$_pluginLoader = $loader; @@ -81,7 +81,7 @@ public static function setPluginLoader($loader) public static function getPluginLoader() { if (null === self::$_pluginLoader) { - require_once 'Zend/Loader/PluginLoader.php'; + ;// require_once 'Zend/Loader/PluginLoader.php'; self::$_pluginLoader = new Zend_Loader_PluginLoader(array( 'Zend_Controller_Action_Helper' => 'Zend/Controller/Action/Helper/', )); @@ -179,7 +179,7 @@ public static function getExistingHelper($name) $stack = self::getStack(); if (!isset($stack->{$name})) { - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Action helper "' . $name . '" has not been registered with the helper broker'); } @@ -322,7 +322,7 @@ public function __call($method, $args) { $helper = $this->getHelper($method); if (!method_exists($helper, 'direct')) { - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Helper "' . $method . '" does not support overloading via direct()'); } return call_user_func_array(array($helper, 'direct'), $args); @@ -365,14 +365,14 @@ protected static function _loadHelper($name) try { $class = self::getPluginLoader()->load($name); } catch (Zend_Loader_PluginLoader_Exception $e) { - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Action Helper by name ' . $name . ' not found', 0, $e); } $helper = new $class(); if (!$helper instanceof Zend_Controller_Action_Helper_Abstract) { - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('Helper name ' . $name . ' -> class ' . $class . ' is not of type Zend_Controller_Action_Helper_Abstract'); } diff --git a/library/Zend/Controller/Action/HelperBroker/PriorityStack.php b/library/Zend/Controller/Action/HelperBroker/PriorityStack.php index fd88ca868f..7977ebed75 100644 --- a/library/Zend/Controller/Action/HelperBroker/PriorityStack.php +++ b/library/Zend/Controller/Action/HelperBroker/PriorityStack.php @@ -117,7 +117,7 @@ public function offsetExists($priorityOrHelperName): bool public function offsetGet($priorityOrHelperName): Zend_Controller_Action_HelperBroker_PriorityStack { if (!$this->offsetExists($priorityOrHelperName)) { - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('A helper with priority ' . $priorityOrHelperName . ' does not exist.'); } @@ -141,7 +141,7 @@ public function offsetSet($priority, $helper) $priority = (int) $priority; if (!$helper instanceof Zend_Controller_Action_Helper_Abstract) { - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('$helper must extend Zend_Controller_Action_Helper_Abstract.'); } @@ -177,7 +177,7 @@ public function offsetSet($priority, $helper) public function offsetUnset($priorityOrHelperName) { if (!$this->offsetExists($priorityOrHelperName)) { - require_once 'Zend/Controller/Action/Exception.php'; + ;// require_once 'Zend/Controller/Action/Exception.php'; throw new Zend_Controller_Action_Exception('A helper with priority or name ' . $priorityOrHelperName . ' does not exist.'); } diff --git a/library/Zend/Controller/Dispatcher/Abstract.php b/library/Zend/Controller/Dispatcher/Abstract.php index 2bfe1be2be..3b6757ea91 100644 --- a/library/Zend/Controller/Dispatcher/Abstract.php +++ b/library/Zend/Controller/Dispatcher/Abstract.php @@ -21,7 +21,7 @@ */ /** Zend_Controller_Dispatcher_Interface */ -require_once 'Zend/Controller/Dispatcher/Interface.php'; +;// require_once 'Zend/Controller/Dispatcher/Interface.php'; /** * @category Zend @@ -144,14 +144,14 @@ public function _verifyDelimiter($spec) } if (!$allStrings) { - require_once 'Zend/Controller/Dispatcher/Exception.php'; + ;// require_once 'Zend/Controller/Dispatcher/Exception.php'; throw new Zend_Controller_Dispatcher_Exception('Word delimiter array must contain only strings'); } return $spec; } - require_once 'Zend/Controller/Dispatcher/Exception.php'; + ;// require_once 'Zend/Controller/Dispatcher/Exception.php'; throw new Zend_Controller_Dispatcher_Exception('Invalid word delimiter'); } @@ -206,7 +206,7 @@ public function getPathDelimiter() public function setPathDelimiter($spec) { if (!is_string($spec)) { - require_once 'Zend/Controller/Dispatcher/Exception.php'; + ;// require_once 'Zend/Controller/Dispatcher/Exception.php'; throw new Zend_Controller_Dispatcher_Exception('Invalid path delimiter'); } $this->_pathDelimiter = $spec; @@ -253,7 +253,7 @@ protected function _formatName($unformatted, $isAction = false) public function getFrontController() { if (null === $this->_frontController) { - require_once 'Zend/Controller/Front.php'; + ;// require_once 'Zend/Controller/Front.php'; $this->_frontController = Zend_Controller_Front::getInstance(); } diff --git a/library/Zend/Controller/Dispatcher/Exception.php b/library/Zend/Controller/Dispatcher/Exception.php index 4240444966..d8091c172d 100644 --- a/library/Zend/Controller/Dispatcher/Exception.php +++ b/library/Zend/Controller/Dispatcher/Exception.php @@ -22,7 +22,7 @@ /** Zend_Controller_Exception */ -require_once 'Zend/Controller/Exception.php'; +;// require_once 'Zend/Controller/Exception.php'; /** diff --git a/library/Zend/Controller/Dispatcher/Interface.php b/library/Zend/Controller/Dispatcher/Interface.php index bdc977cf65..d7fc6ac774 100644 --- a/library/Zend/Controller/Dispatcher/Interface.php +++ b/library/Zend/Controller/Dispatcher/Interface.php @@ -23,12 +23,12 @@ /** * Zend_Controller_Request_Abstract */ -require_once 'Zend/Controller/Request/Abstract.php'; +;// require_once 'Zend/Controller/Request/Abstract.php'; /** * Zend_Controller_Response_Abstract */ -require_once 'Zend/Controller/Response/Abstract.php'; +;// require_once 'Zend/Controller/Response/Abstract.php'; /** * @package Zend_Controller diff --git a/library/Zend/Controller/Dispatcher/Standard.php b/library/Zend/Controller/Dispatcher/Standard.php index 492056e42a..f78bedf4b8 100644 --- a/library/Zend/Controller/Dispatcher/Standard.php +++ b/library/Zend/Controller/Dispatcher/Standard.php @@ -21,10 +21,10 @@ */ /** Zend_Loader */ -require_once 'Zend/Loader.php'; +;// require_once 'Zend/Loader.php'; /** Zend_Controller_Dispatcher_Abstract */ -require_once 'Zend/Controller/Dispatcher/Abstract.php'; +;// require_once 'Zend/Controller/Dispatcher/Abstract.php'; /** * @category Zend @@ -102,7 +102,7 @@ public function setControllerDirectory($directory, $module = null) $this->addControllerDirectory($path, $module); } } else { - require_once 'Zend/Controller/Exception.php'; + ;// require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Controller directory spec must be either a string or an array'); } @@ -244,7 +244,7 @@ public function dispatch(Zend_Controller_Request_Abstract $request, Zend_Control if (!$this->isDispatchable($request)) { $controller = $request->getControllerName(); if (!$this->getParam('useDefaultControllerAlways') && !empty($controller)) { - require_once 'Zend/Controller/Dispatcher/Exception.php'; + ;// require_once 'Zend/Controller/Dispatcher/Exception.php'; throw new Zend_Controller_Dispatcher_Exception('Invalid controller specified (' . $request->getControllerName() . ')'); } @@ -281,7 +281,7 @@ public function dispatch(Zend_Controller_Request_Abstract $request, Zend_Control $controller = new $moduleClassName($request, $this->getResponse(), $this->getParams()); if (!($controller instanceof Zend_Controller_Action_Interface) && !($controller instanceof Zend_Controller_Action)) { - require_once 'Zend/Controller/Dispatcher/Exception.php'; + ;// require_once 'Zend/Controller/Dispatcher/Exception.php'; throw new Zend_Controller_Dispatcher_Exception( 'Controller "' . $moduleClassName . '" is not an instance of Zend_Controller_Action_Interface' ); @@ -356,12 +356,12 @@ public function loadClass($className) if (Zend_Loader::isReadable($loadFile)) { include_once $loadFile; } else { - require_once 'Zend/Controller/Dispatcher/Exception.php'; + ;// require_once 'Zend/Controller/Dispatcher/Exception.php'; throw new Zend_Controller_Dispatcher_Exception('Cannot load controller class "' . $className . '" from file "' . $loadFile . "'"); } if (!class_exists($finalClass, false)) { - require_once 'Zend/Controller/Dispatcher/Exception.php'; + ;// require_once 'Zend/Controller/Dispatcher/Exception.php'; throw new Zend_Controller_Dispatcher_Exception('Invalid controller class ("' . $finalClass . '")'); } @@ -400,7 +400,7 @@ public function getControllerClass(Zend_Controller_Request_Abstract $request) $this->_curModule = $this->_defaultModule; $this->_curDirectory = $controllerDirs[$this->_defaultModule]; } else { - require_once 'Zend/Controller/Exception.php'; + ;// require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('No default module defined for this application'); } diff --git a/library/Zend/Controller/Exception.php b/library/Zend/Controller/Exception.php index b36853c425..502cd57dd0 100644 --- a/library/Zend/Controller/Exception.php +++ b/library/Zend/Controller/Exception.php @@ -21,7 +21,7 @@ /** Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** diff --git a/library/Zend/Controller/Front.php b/library/Zend/Controller/Front.php index 3ca4c78b1d..26ca2f22d3 100644 --- a/library/Zend/Controller/Front.php +++ b/library/Zend/Controller/Front.php @@ -21,13 +21,13 @@ /** Zend_Loader */ -require_once 'Zend/Loader.php'; +;// require_once 'Zend/Loader.php'; /** Zend_Controller_Action_HelperBroker */ -require_once 'Zend/Controller/Action/HelperBroker.php'; +;// require_once 'Zend/Controller/Action/HelperBroker.php'; /** Zend_Controller_Plugin_Broker */ -require_once 'Zend/Controller/Plugin/Broker.php'; +;// require_once 'Zend/Controller/Plugin/Broker.php'; /** * @category Zend @@ -288,7 +288,7 @@ public function addModuleDirectory($path) try{ $dir = new DirectoryIterator($path); } catch(Exception $e) { - require_once 'Zend/Controller/Exception.php'; + ;// require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception("Directory $path not readable", 0, $e); } foreach ($dir as $file) { @@ -444,13 +444,13 @@ public function setRequest($request) { if (is_string($request)) { if (!class_exists($request)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($request); } $request = new $request(); } if (!$request instanceof Zend_Controller_Request_Abstract) { - require_once 'Zend/Controller/Exception.php'; + ;// require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Invalid request class'); } @@ -486,14 +486,14 @@ public function setRouter($router) { if (is_string($router)) { if (!class_exists($router)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($router); } $router = new $router(); } if (!$router instanceof Zend_Controller_Router_Interface) { - require_once 'Zend/Controller/Exception.php'; + ;// require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Invalid router class'); } @@ -513,7 +513,7 @@ public function setRouter($router) public function getRouter() { if (null == $this->_router) { - require_once 'Zend/Controller/Router/Rewrite.php'; + ;// require_once 'Zend/Controller/Router/Rewrite.php'; $this->setRouter(new Zend_Controller_Router_Rewrite()); } @@ -543,7 +543,7 @@ public function getRouter() public function setBaseUrl($base = null) { if (!is_string($base) && (null !== $base)) { - require_once 'Zend/Controller/Exception.php'; + ;// require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Rewrite base must be a string'); } @@ -596,7 +596,7 @@ public function getDispatcher() * Instantiate the default dispatcher if one was not set. */ if (!$this->_dispatcher instanceof Zend_Controller_Dispatcher_Interface) { - require_once 'Zend/Controller/Dispatcher/Standard.php'; + ;// require_once 'Zend/Controller/Dispatcher/Standard.php'; $this->_dispatcher = new Zend_Controller_Dispatcher_Standard(); } return $this->_dispatcher; @@ -618,13 +618,13 @@ public function setResponse($response) { if (is_string($response)) { if (!class_exists($response)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($response); } $response = new $response(); } if (!$response instanceof Zend_Controller_Response_Abstract) { - require_once 'Zend/Controller/Exception.php'; + ;// require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Invalid response class'); } @@ -836,12 +836,12 @@ public function dispatch(Zend_Controller_Request_Abstract $request = null, Zend_ { if (!$this->getParam('noErrorHandler') && !$this->_plugins->hasPlugin('Zend_Controller_Plugin_ErrorHandler')) { // Register with stack index of 100 - require_once 'Zend/Controller/Plugin/ErrorHandler.php'; + ;// require_once 'Zend/Controller/Plugin/ErrorHandler.php'; $this->_plugins->registerPlugin(new Zend_Controller_Plugin_ErrorHandler(), 100); } if (!$this->getParam('noViewRenderer') && !Zend_Controller_Action_HelperBroker::hasHelper('viewRenderer')) { - require_once 'Zend/Controller/Action/Helper/ViewRenderer.php'; + ;// require_once 'Zend/Controller/Action/Helper/ViewRenderer.php'; Zend_Controller_Action_HelperBroker::getStack()->offsetSet(-80, new Zend_Controller_Action_Helper_ViewRenderer()); } @@ -851,7 +851,7 @@ public function dispatch(Zend_Controller_Request_Abstract $request = null, Zend_ if (null !== $request) { $this->setRequest($request); } elseif ((null === $request) && (null === ($request = $this->getRequest()))) { - require_once 'Zend/Controller/Request/Http.php'; + ;// require_once 'Zend/Controller/Request/Http.php'; $request = new Zend_Controller_Request_Http(); $this->setRequest($request); } @@ -871,7 +871,7 @@ public function dispatch(Zend_Controller_Request_Abstract $request = null, Zend_ if (null !== $response) { $this->setResponse($response); } elseif ((null === $this->_response) && (null === ($this->_response = $this->getResponse()))) { - require_once 'Zend/Controller/Response/Http.php'; + ;// require_once 'Zend/Controller/Response/Http.php'; $response = new Zend_Controller_Response_Http(); $this->setResponse($response); } diff --git a/library/Zend/Controller/Plugin/ActionStack.php b/library/Zend/Controller/Plugin/ActionStack.php index 12c62de112..34d98fffa4 100644 --- a/library/Zend/Controller/Plugin/ActionStack.php +++ b/library/Zend/Controller/Plugin/ActionStack.php @@ -20,10 +20,10 @@ */ /** Zend_Controller_Plugin_Abstract */ -require_once 'Zend/Controller/Plugin/Abstract.php'; +;// require_once 'Zend/Controller/Plugin/Abstract.php'; /** Zend_Registry */ -require_once 'Zend/Registry.php'; +;// require_once 'Zend/Registry.php'; /** * Manage a stack of actions @@ -209,7 +209,7 @@ public function popStack() $this->_saveStack($stack); if (!$next instanceof Zend_Controller_Request_Abstract) { - require_once 'Zend/Controller/Exception.php'; + ;// require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('ArrayStack should only contain request objects'); } $action = $next->getActionName(); diff --git a/library/Zend/Controller/Plugin/Broker.php b/library/Zend/Controller/Plugin/Broker.php index 1214583eb3..f154283829 100644 --- a/library/Zend/Controller/Plugin/Broker.php +++ b/library/Zend/Controller/Plugin/Broker.php @@ -21,7 +21,7 @@ */ /** Zend_Controller_Plugin_Abstract */ -require_once 'Zend/Controller/Plugin/Abstract.php'; +;// require_once 'Zend/Controller/Plugin/Abstract.php'; /** * @category Zend @@ -51,7 +51,7 @@ class Zend_Controller_Plugin_Broker extends Zend_Controller_Plugin_Abstract public function registerPlugin(Zend_Controller_Plugin_Abstract $plugin, $stackIndex = null) { if (false !== array_search($plugin, $this->_plugins, true)) { - require_once 'Zend/Controller/Exception.php'; + ;// require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Plugin already registered'); } @@ -59,7 +59,7 @@ public function registerPlugin(Zend_Controller_Plugin_Abstract $plugin, $stackIn if ($stackIndex) { if (isset($this->_plugins[$stackIndex])) { - require_once 'Zend/Controller/Exception.php'; + ;// require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Plugin with stackIndex "' . $stackIndex . '" already registered'); } $this->_plugins[$stackIndex] = $plugin; @@ -97,7 +97,7 @@ public function unregisterPlugin($plugin) // Given a plugin object, find it in the array $key = array_search($plugin, $this->_plugins, true); if (false === $key) { - require_once 'Zend/Controller/Exception.php'; + ;// require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Plugin never registered.'); } unset($this->_plugins[$key]); diff --git a/library/Zend/Controller/Plugin/ErrorHandler.php b/library/Zend/Controller/Plugin/ErrorHandler.php index 42da1633c6..65a37500c0 100644 --- a/library/Zend/Controller/Plugin/ErrorHandler.php +++ b/library/Zend/Controller/Plugin/ErrorHandler.php @@ -20,7 +20,7 @@ */ /** Zend_Controller_Plugin_Abstract */ -require_once 'Zend/Controller/Plugin/Abstract.php'; +;// require_once 'Zend/Controller/Plugin/Abstract.php'; /** * Handle exceptions that bubble up based on missing controllers, actions, or diff --git a/library/Zend/Controller/Plugin/PutHandler.php b/library/Zend/Controller/Plugin/PutHandler.php index 3b5f57b910..6d221f1a64 100644 --- a/library/Zend/Controller/Plugin/PutHandler.php +++ b/library/Zend/Controller/Plugin/PutHandler.php @@ -23,12 +23,12 @@ /** * @see Zend_Controller_Plugin_Abstract */ -require_once 'Zend/Controller/Plugin/Abstract.php'; +;// require_once 'Zend/Controller/Plugin/Abstract.php'; /** * @see Zend_Controller_Request_Http */ -require_once 'Zend/Controller/Request/Http.php'; +;// require_once 'Zend/Controller/Request/Http.php'; /** * Plugin to digest PUT request body and make params available just like POST diff --git a/library/Zend/Controller/Request/Apache404.php b/library/Zend/Controller/Request/Apache404.php index 3c4dd7ac48..2eb2b8a9de 100644 --- a/library/Zend/Controller/Request/Apache404.php +++ b/library/Zend/Controller/Request/Apache404.php @@ -20,10 +20,10 @@ */ /** Zend_Controller_Request_Http */ -require_once 'Zend/Controller/Request/Http.php'; +;// require_once 'Zend/Controller/Request/Http.php'; /** Zend_Uri */ -require_once 'Zend/Uri.php'; +;// require_once 'Zend/Uri.php'; /** * Zend_Controller_Request_Apache404 diff --git a/library/Zend/Controller/Request/Exception.php b/library/Zend/Controller/Request/Exception.php index a7e3629fda..0b4f958f90 100644 --- a/library/Zend/Controller/Request/Exception.php +++ b/library/Zend/Controller/Request/Exception.php @@ -22,7 +22,7 @@ /** Zend_Controller_Exception */ -require_once 'Zend/Controller/Exception.php'; +;// require_once 'Zend/Controller/Exception.php'; /** diff --git a/library/Zend/Controller/Request/Http.php b/library/Zend/Controller/Request/Http.php index 9a48504890..6d7c9ba69e 100644 --- a/library/Zend/Controller/Request/Http.php +++ b/library/Zend/Controller/Request/Http.php @@ -20,10 +20,10 @@ */ /** @see Zend_Controller_Request_Abstract */ -require_once 'Zend/Controller/Request/Abstract.php'; +;// require_once 'Zend/Controller/Request/Abstract.php'; /** @see Zend_Uri */ -require_once 'Zend/Uri.php'; +;// require_once 'Zend/Uri.php'; /** * Zend_Controller_Request_Http @@ -121,7 +121,7 @@ public function __construct($uri = null) $this->setRequestUri($path); } else { - require_once 'Zend/Controller/Request/Exception.php'; + ;// require_once 'Zend/Controller/Request/Exception.php'; throw new Zend_Controller_Request_Exception('Invalid URI provided to constructor'); } } else { @@ -186,7 +186,7 @@ public function get($key) */ public function __set($key, $value) { - require_once 'Zend/Controller/Request/Exception.php'; + ;// require_once 'Zend/Controller/Request/Exception.php'; throw new Zend_Controller_Request_Exception('Setting values in superglobals not allowed; please use setParam()'); } @@ -249,7 +249,7 @@ public function has($key) public function setQuery($spec, $value = null) { if ((null === $value) && !is_array($spec)) { - require_once 'Zend/Controller/Exception.php'; + ;// require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Invalid value passed to setQuery(); must be either array of values or key/value pair'); } if ((null === $value) && is_array($spec)) { @@ -291,7 +291,7 @@ public function getQuery($key = null, $default = null) public function setPost($spec, $value = null) { if ((null === $value) && !is_array($spec)) { - require_once 'Zend/Controller/Exception.php'; + ;// require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Invalid value passed to setPost(); must be either array of values or key/value pair'); } if ((null === $value) && is_array($spec)) { @@ -992,7 +992,7 @@ public function getRawBody() public function getHeader($header) { if (empty($header)) { - require_once 'Zend/Controller/Request/Exception.php'; + ;// require_once 'Zend/Controller/Request/Exception.php'; throw new Zend_Controller_Request_Exception('An HTTP header name is required'); } diff --git a/library/Zend/Controller/Request/HttpTestCase.php b/library/Zend/Controller/Request/HttpTestCase.php index 58b9bd3936..b584a826bc 100644 --- a/library/Zend/Controller/Request/HttpTestCase.php +++ b/library/Zend/Controller/Request/HttpTestCase.php @@ -22,7 +22,7 @@ /** * @see Zend_Controller_Request_Http */ -require_once 'Zend/Controller/Request/Http.php'; +;// require_once 'Zend/Controller/Request/Http.php'; /** * Zend_Controller_Request_HttpTestCase @@ -170,7 +170,7 @@ public function setMethod($type) { $type = strtoupper(trim((string) $type)); if (!in_array($type, $this->_validMethodTypes)) { - require_once 'Zend/Controller/Exception.php'; + ;// require_once 'Zend/Controller/Exception.php'; throw new Zend_Controller_Exception('Invalid request method specified'); } $this->_method = $type; diff --git a/library/Zend/Controller/Request/Simple.php b/library/Zend/Controller/Request/Simple.php index 74e4b0c4a1..e53f9d560e 100644 --- a/library/Zend/Controller/Request/Simple.php +++ b/library/Zend/Controller/Request/Simple.php @@ -21,7 +21,7 @@ */ /** Zend_Controller_Request_Abstract */ -require_once 'Zend/Controller/Request/Abstract.php'; +;// require_once 'Zend/Controller/Request/Abstract.php'; /** * @category Zend diff --git a/library/Zend/Controller/Response/Abstract.php b/library/Zend/Controller/Response/Abstract.php index 9fcc22693e..0792a14fa1 100644 --- a/library/Zend/Controller/Response/Abstract.php +++ b/library/Zend/Controller/Response/Abstract.php @@ -284,7 +284,7 @@ public function clearAllHeaders() public function setHttpResponseCode($code) { if (!is_int($code) || (100 > $code) || (599 < $code)) { - require_once 'Zend/Controller/Response/Exception.php'; + ;// require_once 'Zend/Controller/Response/Exception.php'; throw new Zend_Controller_Response_Exception('Invalid HTTP response code'); } @@ -319,7 +319,7 @@ public function canSendHeaders($throw = false) { $ok = headers_sent($file, $line); if ($ok && $throw && $this->headersSentThrowsException) { - require_once 'Zend/Controller/Response/Exception.php'; + ;// require_once 'Zend/Controller/Response/Exception.php'; throw new Zend_Controller_Response_Exception('Cannot send headers; headers already sent in ' . $file . ', line ' . $line); } @@ -485,7 +485,7 @@ public function getBody($spec = false) public function append($name, $content) { if (!is_string($name)) { - require_once 'Zend/Controller/Response/Exception.php'; + ;// require_once 'Zend/Controller/Response/Exception.php'; throw new Zend_Controller_Response_Exception('Invalid body segment key ("' . gettype($name) . '")'); } @@ -509,7 +509,7 @@ public function append($name, $content) public function prepend($name, $content) { if (!is_string($name)) { - require_once 'Zend/Controller/Response/Exception.php'; + ;// require_once 'Zend/Controller/Response/Exception.php'; throw new Zend_Controller_Response_Exception('Invalid body segment key ("' . gettype($name) . '")'); } @@ -536,12 +536,12 @@ public function prepend($name, $content) public function insert($name, $content, $parent = null, $before = false) { if (!is_string($name)) { - require_once 'Zend/Controller/Response/Exception.php'; + ;// require_once 'Zend/Controller/Response/Exception.php'; throw new Zend_Controller_Response_Exception('Invalid body segment key ("' . gettype($name) . '")'); } if ((null !== $parent) && !is_string($parent)) { - require_once 'Zend/Controller/Response/Exception.php'; + ;// require_once 'Zend/Controller/Response/Exception.php'; throw new Zend_Controller_Response_Exception('Invalid body segment parent key ("' . gettype($parent) . '")'); } diff --git a/library/Zend/Controller/Response/Cli.php b/library/Zend/Controller/Response/Cli.php index ed141659fa..8bf514db58 100644 --- a/library/Zend/Controller/Response/Cli.php +++ b/library/Zend/Controller/Response/Cli.php @@ -21,7 +21,7 @@ /** Zend_Controller_Response_Abstract */ -require_once 'Zend/Controller/Response/Abstract.php'; +;// require_once 'Zend/Controller/Response/Abstract.php'; /** diff --git a/library/Zend/Controller/Response/Exception.php b/library/Zend/Controller/Response/Exception.php index 9829fb66bc..18e3fae6ea 100644 --- a/library/Zend/Controller/Response/Exception.php +++ b/library/Zend/Controller/Response/Exception.php @@ -22,7 +22,7 @@ /** Zend_Controller_Exception */ -require_once 'Zend/Controller/Exception.php'; +;// require_once 'Zend/Controller/Exception.php'; /** diff --git a/library/Zend/Controller/Response/Http.php b/library/Zend/Controller/Response/Http.php index a70a5bb8f5..f1b0657f67 100644 --- a/library/Zend/Controller/Response/Http.php +++ b/library/Zend/Controller/Response/Http.php @@ -21,7 +21,7 @@ /** Zend_Controller_Response_Abstract */ -require_once 'Zend/Controller/Response/Abstract.php'; +;// require_once 'Zend/Controller/Response/Abstract.php'; /** diff --git a/library/Zend/Controller/Response/HttpTestCase.php b/library/Zend/Controller/Response/HttpTestCase.php index 768dbfd311..90f21f53df 100644 --- a/library/Zend/Controller/Response/HttpTestCase.php +++ b/library/Zend/Controller/Response/HttpTestCase.php @@ -22,7 +22,7 @@ /** * @see Zend_Controller_Response_Http */ -require_once 'Zend/Controller/Response/Http.php'; +;// require_once 'Zend/Controller/Response/Http.php'; /** * Zend_Controller_Response_HttpTestCase diff --git a/library/Zend/Controller/Router/Abstract.php b/library/Zend/Controller/Router/Abstract.php index 71ed9473de..5c5d06f10d 100644 --- a/library/Zend/Controller/Router/Abstract.php +++ b/library/Zend/Controller/Router/Abstract.php @@ -21,7 +21,7 @@ */ /** Zend_Controller_Router_Interface */ -require_once 'Zend/Controller/Router/Interface.php'; +;// require_once 'Zend/Controller/Router/Interface.php'; /** * Simple first implementation of a router, to be replaced @@ -157,7 +157,7 @@ public function getFrontController() return $this->_frontController; } - require_once 'Zend/Controller/Front.php'; + ;// require_once 'Zend/Controller/Front.php'; $this->_frontController = Zend_Controller_Front::getInstance(); return $this->_frontController; diff --git a/library/Zend/Controller/Router/Exception.php b/library/Zend/Controller/Router/Exception.php index 2d03633306..f03d9261a4 100644 --- a/library/Zend/Controller/Router/Exception.php +++ b/library/Zend/Controller/Router/Exception.php @@ -21,7 +21,7 @@ */ /** Zend_Controller_Exception */ -require_once 'Zend/Controller/Exception.php'; +;// require_once 'Zend/Controller/Exception.php'; /** * @package Zend_Controller diff --git a/library/Zend/Controller/Router/Rewrite.php b/library/Zend/Controller/Router/Rewrite.php index 07cf615452..a333b83751 100644 --- a/library/Zend/Controller/Router/Rewrite.php +++ b/library/Zend/Controller/Router/Rewrite.php @@ -21,10 +21,10 @@ */ /** Zend_Controller_Router_Abstract */ -require_once 'Zend/Controller/Router/Abstract.php'; +;// require_once 'Zend/Controller/Router/Abstract.php'; /** Zend_Controller_Router_Route */ -require_once 'Zend/Controller/Router/Route.php'; +;// require_once 'Zend/Controller/Router/Route.php'; /** * Ruby routing based Router. @@ -92,7 +92,7 @@ public function addDefaultRoutes() $dispatcher = $this->getFrontController()->getDispatcher(); $request = $this->getFrontController()->getRequest(); - require_once 'Zend/Controller/Router/Route/Module.php'; + ;// require_once 'Zend/Controller/Router/Route/Module.php'; $compat = new Zend_Controller_Router_Route_Module(array(), $dispatcher, $request); $this->_routes = array('default' => $compat) + $this->_routes; @@ -164,7 +164,7 @@ public function addConfig(Zend_Config $config, $section = null) { if ($section !== null) { if ($config->{$section} === null) { - require_once 'Zend/Controller/Router/Exception.php'; + ;// require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception("No route configuration in section '{$section}'"); } @@ -176,7 +176,7 @@ public function addConfig(Zend_Config $config, $section = null) if ($route instanceof Zend_Controller_Router_Route_Chain) { if (!isset($info->chain)) { - require_once 'Zend/Controller/Router/Exception.php'; + ;// require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception("No chain defined"); } @@ -212,7 +212,7 @@ protected function _getRouteFromConfig(Zend_Config $info) { $class = (isset($info->type)) ? $info->type : 'Zend_Controller_Router_Route'; if (!class_exists($class)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($class); } @@ -279,7 +279,7 @@ protected function _addChainRoutesFromConfig( public function removeRoute($name) { if (!isset($this->_routes[$name])) { - require_once 'Zend/Controller/Router/Exception.php'; + ;// require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception("Route $name is not defined"); } @@ -321,7 +321,7 @@ public function hasRoute($name) public function getRoute($name) { if (!isset($this->_routes[$name])) { - require_once 'Zend/Controller/Router/Exception.php'; + ;// require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception("Route $name is not defined"); } @@ -337,7 +337,7 @@ public function getRoute($name) public function getCurrentRoute() { if (!isset($this->_currentRoute)) { - require_once 'Zend/Controller/Router/Exception.php'; + ;// require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception("Current route is not defined"); } @@ -353,7 +353,7 @@ public function getCurrentRoute() public function getCurrentRouteName() { if (!isset($this->_currentRoute)) { - require_once 'Zend/Controller/Router/Exception.php'; + ;// require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception("Current route is not defined"); } @@ -381,7 +381,7 @@ public function getRoutes() public function route(Zend_Controller_Request_Abstract $request) { if (!$request instanceof Zend_Controller_Request_Http) { - require_once 'Zend/Controller/Router/Exception.php'; + ;// require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception( 'Zend_Controller_Router_Rewrite requires a Zend_Controller_Request_Http-based request object' ); @@ -416,7 +416,7 @@ public function route(Zend_Controller_Request_Abstract $request) } if (!$routeMatched) { - require_once 'Zend/Controller/Router/Exception.php'; + ;// require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception('No route matched the request', 404); } @@ -469,7 +469,7 @@ protected function _setRequestParams($request, $params) public function assemble($userParams, $name = null, $reset = false, $encode = true) { if (!is_array($userParams)) { - require_once 'Zend/Controller/Router/Exception.php'; + ;// require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception('userParams must be an array'); } diff --git a/library/Zend/Controller/Router/Route.php b/library/Zend/Controller/Router/Route.php index e4a56838a7..2133e557e7 100644 --- a/library/Zend/Controller/Router/Route.php +++ b/library/Zend/Controller/Router/Route.php @@ -21,7 +21,7 @@ */ /** Zend_Controller_Router_Route_Abstract */ -require_once 'Zend/Controller/Router/Route/Abstract.php'; +;// require_once 'Zend/Controller/Router/Route/Abstract.php'; /** * Route @@ -381,7 +381,7 @@ public function assemble($data = array(), $reset = false, $encode = false, $part } elseif (array_key_exists($name, $this->_defaults)) { $value = $this->_defaults[$name]; } else { - require_once 'Zend/Controller/Router/Exception.php'; + ;// require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception($name . ' is not specified'); } @@ -539,7 +539,7 @@ public function getTranslator() } } - require_once 'Zend/Controller/Router/Exception.php'; + ;// require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception('Could not find a translator'); } diff --git a/library/Zend/Controller/Router/Route/Abstract.php b/library/Zend/Controller/Router/Route/Abstract.php index 2f6dc84807..35222c1649 100644 --- a/library/Zend/Controller/Router/Route/Abstract.php +++ b/library/Zend/Controller/Router/Route/Abstract.php @@ -23,7 +23,7 @@ /** * @see Zend_Controller_Router_Route_Interface */ -require_once 'Zend/Controller/Router/Route/Interface.php'; +;// require_once 'Zend/Controller/Router/Route/Interface.php'; /** * Abstract Route @@ -111,7 +111,7 @@ public function isAbstract($flag = null) */ public function chain(Zend_Controller_Router_Route_Abstract $route, $separator = '/') { - require_once 'Zend/Controller/Router/Route/Chain.php'; + ;// require_once 'Zend/Controller/Router/Route/Chain.php'; $chain = new Zend_Controller_Router_Route_Chain(); $chain->chain($this)->chain($route, $separator); diff --git a/library/Zend/Controller/Router/Route/Chain.php b/library/Zend/Controller/Router/Route/Chain.php index ee2c6c0163..adb7e837dd 100644 --- a/library/Zend/Controller/Router/Route/Chain.php +++ b/library/Zend/Controller/Router/Route/Chain.php @@ -21,7 +21,7 @@ */ /** Zend_Controller_Router_Route_Abstract */ -require_once 'Zend/Controller/Router/Route/Abstract.php'; +;// require_once 'Zend/Controller/Router/Route/Abstract.php'; /** * Chain route is used for managing route chaining. diff --git a/library/Zend/Controller/Router/Route/Hostname.php b/library/Zend/Controller/Router/Route/Hostname.php index 2d33c61811..a1a1e258d6 100644 --- a/library/Zend/Controller/Router/Route/Hostname.php +++ b/library/Zend/Controller/Router/Route/Hostname.php @@ -21,7 +21,7 @@ */ /** Zend_Controller_Router_Route_Abstract */ -require_once 'Zend/Controller/Router/Route/Abstract.php'; +;// require_once 'Zend/Controller/Router/Route/Abstract.php'; /** * Hostname Route @@ -134,7 +134,7 @@ public function setRequest(Zend_Controller_Request_Abstract $request = null) public function getRequest() { if ($this->_request === null) { - require_once 'Zend/Controller/Front.php'; + ;// require_once 'Zend/Controller/Front.php'; $this->_request = Zend_Controller_Front::getInstance()->getRequest(); } @@ -303,7 +303,7 @@ public function assemble($data = array(), $reset = false, $encode = false, $part } elseif (isset($this->_defaults[$name])) { $host[$key] = $this->_defaults[$name]; } else { - require_once 'Zend/Controller/Router/Exception.php'; + ;// require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception($name . ' is not specified'); } } else { diff --git a/library/Zend/Controller/Router/Route/Interface.php b/library/Zend/Controller/Router/Route/Interface.php index 6e82990f55..5d1c11adf8 100644 --- a/library/Zend/Controller/Router/Route/Interface.php +++ b/library/Zend/Controller/Router/Route/Interface.php @@ -21,7 +21,7 @@ */ /** Zend_Config */ -require_once 'Zend/Config.php'; +;// require_once 'Zend/Config.php'; /** * @package Zend_Controller diff --git a/library/Zend/Controller/Router/Route/Module.php b/library/Zend/Controller/Router/Route/Module.php index 81ec48de13..30cee48992 100644 --- a/library/Zend/Controller/Router/Route/Module.php +++ b/library/Zend/Controller/Router/Route/Module.php @@ -21,7 +21,7 @@ */ /** Zend_Controller_Router_Route_Abstract */ -require_once 'Zend/Controller/Router/Route/Abstract.php'; +;// require_once 'Zend/Controller/Router/Route/Abstract.php'; /** * Module Route diff --git a/library/Zend/Controller/Router/Route/Regex.php b/library/Zend/Controller/Router/Route/Regex.php index e012357d7b..38d9f4897b 100644 --- a/library/Zend/Controller/Router/Route/Regex.php +++ b/library/Zend/Controller/Router/Route/Regex.php @@ -21,7 +21,7 @@ */ /** Zend_Controller_Router_Route_Abstract */ -require_once 'Zend/Controller/Router/Route/Abstract.php'; +;// require_once 'Zend/Controller/Router/Route/Abstract.php'; /** * Regex Route @@ -215,7 +215,7 @@ protected function _getMappedValues($values, $reversed = false, $preserve = fals public function assemble($data = array(), $reset = false, $encode = false, $partial = false) { if ($this->_reverse === null) { - require_once 'Zend/Controller/Router/Exception.php'; + ;// require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception('Cannot assemble. Reversed route is not specified.'); } @@ -249,7 +249,7 @@ public function assemble($data = array(), $reset = false, $encode = false, $part $return = @vsprintf($this->_reverse, $mergedData); if ($return === false) { - require_once 'Zend/Controller/Router/Exception.php'; + ;// require_once 'Zend/Controller/Router/Exception.php'; throw new Zend_Controller_Router_Exception('Cannot assemble. Too few arguments?'); } diff --git a/library/Zend/Controller/Router/Route/Static.php b/library/Zend/Controller/Router/Route/Static.php index 4acd9f572e..138a9fb57e 100644 --- a/library/Zend/Controller/Router/Route/Static.php +++ b/library/Zend/Controller/Router/Route/Static.php @@ -21,7 +21,7 @@ */ /** Zend_Controller_Router_Route_Abstract */ -require_once 'Zend/Controller/Router/Route/Abstract.php'; +;// require_once 'Zend/Controller/Router/Route/Abstract.php'; /** * StaticRoute is used for managing static URIs. diff --git a/library/Zend/Crypt.php b/library/Zend/Crypt.php index 0ceeac71e3..313f6bd461 100644 --- a/library/Zend/Crypt.php +++ b/library/Zend/Crypt.php @@ -120,7 +120,7 @@ protected static function _detectHashSupport($algorithm) /** * @see Zend_Crypt_Exception */ - require_once 'Zend/Crypt/Exception.php'; + ;// require_once 'Zend/Crypt/Exception.php'; throw new Zend_Crypt_Exception('\'' . $algorithm . '\' is not supported by any available extension or native function'); } diff --git a/library/Zend/Crypt/DiffieHellman.php b/library/Zend/Crypt/DiffieHellman.php index b14411e172..042a8eab5e 100644 --- a/library/Zend/Crypt/DiffieHellman.php +++ b/library/Zend/Crypt/DiffieHellman.php @@ -154,7 +154,7 @@ public function setPublicKey($number, $type = self::NUMBER) $number = $this->_math->fromBinary($number); } if (!preg_match("/^\d+$/", $number)) { - require_once('Zend/Crypt/DiffieHellman/Exception.php'); + ;// require_once('Zend/Crypt/DiffieHellman/Exception.php'); throw new Zend_Crypt_DiffieHellman_Exception('invalid parameter; not a positive natural number'); } $this->_publicKey = (string) $number; @@ -172,7 +172,7 @@ public function setPublicKey($number, $type = self::NUMBER) public function getPublicKey($type = self::NUMBER) { if ($this->_publicKey === null) { - require_once 'Zend/Crypt/DiffieHellman/Exception.php'; + ;// require_once 'Zend/Crypt/DiffieHellman/Exception.php'; throw new Zend_Crypt_DiffieHellman_Exception('A public key has not yet been generated using a prior call to generateKeys()'); } if ($type == self::BINARY) { @@ -206,7 +206,7 @@ public function computeSecretKey($publicKey, $type = self::NUMBER, $output = sel $publicKey = $this->_math->fromBinary($publicKey); } if (!preg_match("/^\d+$/", $publicKey)) { - require_once('Zend/Crypt/DiffieHellman/Exception.php'); + ;// require_once('Zend/Crypt/DiffieHellman/Exception.php'); throw new Zend_Crypt_DiffieHellman_Exception('invalid parameter; not a positive natural number'); } if (function_exists('openssl_dh_compute_key') && self::$useOpenssl !== false) { @@ -227,7 +227,7 @@ public function computeSecretKey($publicKey, $type = self::NUMBER, $output = sel public function getSharedSecretKey($type = self::NUMBER) { if (!isset($this->_secretKey)) { - require_once('Zend/Crypt/DiffieHellman/Exception.php'); + ;// require_once('Zend/Crypt/DiffieHellman/Exception.php'); throw new Zend_Crypt_DiffieHellman_Exception('A secret key has not yet been computed; call computeSecretKey()'); } if ($type == self::BINARY) { @@ -248,7 +248,7 @@ public function getSharedSecretKey($type = self::NUMBER) public function setPrime($number) { if (!preg_match("/^\d+$/", $number) || $number < 11) { - require_once('Zend/Crypt/DiffieHellman/Exception.php'); + ;// require_once('Zend/Crypt/DiffieHellman/Exception.php'); throw new Zend_Crypt_DiffieHellman_Exception('invalid parameter; not a positive natural number or too small: should be a large natural number prime'); } $this->_prime = (string) $number; @@ -264,7 +264,7 @@ public function setPrime($number) public function getPrime() { if (!isset($this->_prime)) { - require_once('Zend/Crypt/DiffieHellman/Exception.php'); + ;// require_once('Zend/Crypt/DiffieHellman/Exception.php'); throw new Zend_Crypt_DiffieHellman_Exception('No prime number has been set'); } return $this->_prime; @@ -280,7 +280,7 @@ public function getPrime() public function setGenerator($number) { if (!preg_match("/^\d+$/", $number) || $number < 2) { - require_once('Zend/Crypt/DiffieHellman/Exception.php'); + ;// require_once('Zend/Crypt/DiffieHellman/Exception.php'); throw new Zend_Crypt_DiffieHellman_Exception('invalid parameter; not a positive natural number greater than 1'); } $this->_generator = (string) $number; @@ -296,7 +296,7 @@ public function setGenerator($number) public function getGenerator() { if (!isset($this->_generator)) { - require_once('Zend/Crypt/DiffieHellman/Exception.php'); + ;// require_once('Zend/Crypt/DiffieHellman/Exception.php'); throw new Zend_Crypt_DiffieHellman_Exception('No generator number has been set'); } return $this->_generator; @@ -316,7 +316,7 @@ public function setPrivateKey($number, $type = self::NUMBER) $number = $this->_math->fromBinary($number); } if (!preg_match("/^\d+$/", $number)) { - require_once('Zend/Crypt/DiffieHellman/Exception.php'); + ;// require_once('Zend/Crypt/DiffieHellman/Exception.php'); throw new Zend_Crypt_DiffieHellman_Exception('invalid parameter; not a positive natural number'); } $this->_privateKey = (string) $number; @@ -366,7 +366,7 @@ public function setBigIntegerMath($extension = null) /** * @see Zend_Crypt_Math */ - require_once 'Zend/Crypt/Math.php'; + ;// require_once 'Zend/Crypt/Math.php'; $this->_math = new Zend_Crypt_Math($extension); } diff --git a/library/Zend/Crypt/DiffieHellman/Exception.php b/library/Zend/Crypt/DiffieHellman/Exception.php index 9afa43d671..0074ef623e 100644 --- a/library/Zend/Crypt/DiffieHellman/Exception.php +++ b/library/Zend/Crypt/DiffieHellman/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Crypt_Exception */ -require_once 'Zend/Crypt/Exception.php'; +;// require_once 'Zend/Crypt/Exception.php'; /** * @category Zend diff --git a/library/Zend/Crypt/Exception.php b/library/Zend/Crypt/Exception.php index 790f450fe1..223b16cc92 100644 --- a/library/Zend/Crypt/Exception.php +++ b/library/Zend/Crypt/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/Zend/Crypt/Hmac.php b/library/Zend/Crypt/Hmac.php index b11eb4d749..c732880478 100644 --- a/library/Zend/Crypt/Hmac.php +++ b/library/Zend/Crypt/Hmac.php @@ -23,7 +23,7 @@ /** * @see Zend_Crypt */ -require_once 'Zend/Crypt.php'; +;// require_once 'Zend/Crypt.php'; /** * PHP implementation of the RFC 2104 Hash based Message Authentication Code @@ -92,7 +92,7 @@ public static function compute($key, $hash, $data, $output = self::STRING) { // set the key if (!isset($key) || empty($key)) { - require_once 'Zend/Crypt/Hmac/Exception.php'; + ;// require_once 'Zend/Crypt/Hmac/Exception.php'; throw new Zend_Crypt_Hmac_Exception('provided key is null or empty'); } self::$_key = $key; @@ -114,7 +114,7 @@ public static function compute($key, $hash, $data, $output = self::STRING) protected static function _setHashAlgorithm($hash) { if (!isset($hash) || empty($hash)) { - require_once 'Zend/Crypt/Hmac/Exception.php'; + ;// require_once 'Zend/Crypt/Hmac/Exception.php'; throw new Zend_Crypt_Hmac_Exception('provided hash string is null or empty'); } @@ -130,7 +130,7 @@ protected static function _setHashAlgorithm($hash) } if ($hashSupported === false) { - require_once 'Zend/Crypt/Hmac/Exception.php'; + ;// require_once 'Zend/Crypt/Hmac/Exception.php'; throw new Zend_Crypt_Hmac_Exception('hash algorithm provided is not supported on this PHP installation; please enable the hash or mhash extensions'); } self::$_hashAlgorithm = $hash; diff --git a/library/Zend/Crypt/Hmac/Exception.php b/library/Zend/Crypt/Hmac/Exception.php index 36acda37e7..c41842569f 100644 --- a/library/Zend/Crypt/Hmac/Exception.php +++ b/library/Zend/Crypt/Hmac/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Crypt_Exception */ -require_once 'Zend/Crypt/Exception.php'; +;// require_once 'Zend/Crypt/Exception.php'; /** * @category Zend diff --git a/library/Zend/Crypt/Math.php b/library/Zend/Crypt/Math.php index b1c65e6067..53a9a1bd2e 100644 --- a/library/Zend/Crypt/Math.php +++ b/library/Zend/Crypt/Math.php @@ -23,7 +23,7 @@ /** * @see Zend_Crypt_Math_BigInteger */ -require_once 'Zend/Crypt/Math/BigInteger.php'; +;// require_once 'Zend/Crypt/Math/BigInteger.php'; /** * @category Zend @@ -96,7 +96,7 @@ public static function randBytes($length, $strong = false) } } if (true === $strong) { - require_once 'Zend/Crypt/Exception.php'; + ;// require_once 'Zend/Crypt/Exception.php'; throw new Zend_Crypt_Exception( 'This PHP environment doesn\'t support secure random number generation. ' . 'Please consider installing the OpenSSL and/or Mcrypt extensions' @@ -120,7 +120,7 @@ public static function randBytes($length, $strong = false) public static function randInteger($min, $max, $strong = false) { if ($min > $max) { - require_once 'Zend/Crypt/Exception.php'; + ;// require_once 'Zend/Crypt/Exception.php'; throw new Zend_Crypt_Exception( 'The min parameter must be lower than max parameter' ); @@ -129,7 +129,7 @@ public static function randInteger($min, $max, $strong = false) if ($range == 0) { return $max; } elseif ($range > PHP_INT_MAX || is_float($range)) { - require_once 'Zend/Crypt/Exception.php'; + ;// require_once 'Zend/Crypt/Exception.php'; throw new Zend_Crypt_Exception( 'The supplied range is too great to generate' ); diff --git a/library/Zend/Crypt/Math/BigInteger.php b/library/Zend/Crypt/Math/BigInteger.php index e066f60851..2a1733175f 100644 --- a/library/Zend/Crypt/Math/BigInteger.php +++ b/library/Zend/Crypt/Math/BigInteger.php @@ -62,7 +62,7 @@ class Zend_Crypt_Math_BigInteger public function __construct($extension = null) { if ($extension !== null && !in_array($extension, array('bcmath', 'gmp', 'bigint'))) { - require_once('Zend/Crypt/Math/BigInteger/Exception.php'); + ;// require_once('Zend/Crypt/Math/BigInteger/Exception.php'); throw new Zend_Crypt_Math_BigInteger_Exception('Invalid extension type; please use one of bcmath, gmp or bigint'); } $this->_loadAdapter($extension); @@ -79,7 +79,7 @@ public function __construct($extension = null) public function __call($methodName, $args) { if(!method_exists($this->_math, $methodName)) { - require_once 'Zend/Crypt/Math/BigInteger/Exception.php'; + ;// require_once 'Zend/Crypt/Math/BigInteger/Exception.php'; throw new Zend_Crypt_Math_BigInteger_Exception('invalid method call: ' . get_class($this->_math) . '::' . $methodName . '() does not exist'); } return call_user_func_array(array($this->_math, $methodName), $args); @@ -101,16 +101,16 @@ protected function _loadAdapter($extension = null) } } if($extension == 'gmp' && extension_loaded('gmp')) { - require_once 'Zend/Crypt/Math/BigInteger/Gmp.php'; + ;// require_once 'Zend/Crypt/Math/BigInteger/Gmp.php'; $this->_math = new Zend_Crypt_Math_BigInteger_Gmp(); //} elseif($extension == 'bigint' && extension_loaded('big_int')) { - // require_once 'Zend/Crypt_Math/BigInteger/Bigint.php'; + // ;// require_once 'Zend/Crypt_Math/BigInteger/Bigint.php'; // $this->_math = new Zend_Crypt_Math_BigInteger_Bigint(); } elseif ($extension == 'bcmath' && extension_loaded('bcmath')) { - require_once 'Zend/Crypt/Math/BigInteger/Bcmath.php'; + ;// require_once 'Zend/Crypt/Math/BigInteger/Bcmath.php'; $this->_math = new Zend_Crypt_Math_BigInteger_Bcmath(); } else { - require_once 'Zend/Crypt/Math/BigInteger/Exception.php'; + ;// require_once 'Zend/Crypt/Math/BigInteger/Exception.php'; throw new Zend_Crypt_Math_BigInteger_Exception($extension . ' big integer precision math support not detected'); } } diff --git a/library/Zend/Crypt/Math/BigInteger/Bcmath.php b/library/Zend/Crypt/Math/BigInteger/Bcmath.php index 40154b6fbb..094a0dae18 100644 --- a/library/Zend/Crypt/Math/BigInteger/Bcmath.php +++ b/library/Zend/Crypt/Math/BigInteger/Bcmath.php @@ -23,7 +23,7 @@ /** * @see Zend_Crypt_Math_BigInteger_Interface */ -require_once 'Zend/Crypt/Math/BigInteger/Interface.php'; +;// require_once 'Zend/Crypt/Math/BigInteger/Interface.php'; /** * Support for arbitrary precision mathematics in PHP. diff --git a/library/Zend/Crypt/Math/BigInteger/Exception.php b/library/Zend/Crypt/Math/BigInteger/Exception.php index d5ee2e6ddf..fab40317d3 100644 --- a/library/Zend/Crypt/Math/BigInteger/Exception.php +++ b/library/Zend/Crypt/Math/BigInteger/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Crypt_Math_Exception */ -require_once 'Zend/Crypt/Math/Exception.php'; +;// require_once 'Zend/Crypt/Math/Exception.php'; /** * @category Zend diff --git a/library/Zend/Crypt/Math/BigInteger/Gmp.php b/library/Zend/Crypt/Math/BigInteger/Gmp.php index 4246796724..87d0ce5980 100644 --- a/library/Zend/Crypt/Math/BigInteger/Gmp.php +++ b/library/Zend/Crypt/Math/BigInteger/Gmp.php @@ -23,7 +23,7 @@ /** * @see Zend_Crypt_Math_BigInteger_Interface */ -require_once 'Zend/Crypt/Math/BigInteger/Interface.php'; +;// require_once 'Zend/Crypt/Math/BigInteger/Interface.php'; /** * Support for arbitrary precision mathematics in PHP. diff --git a/library/Zend/Crypt/Math/Exception.php b/library/Zend/Crypt/Math/Exception.php index 297aa35ea4..8514068059 100644 --- a/library/Zend/Crypt/Math/Exception.php +++ b/library/Zend/Crypt/Math/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Crypt_Exception */ -require_once 'Zend/Crypt/Exception.php'; +;// require_once 'Zend/Crypt/Exception.php'; /** * @category Zend diff --git a/library/Zend/Crypt/Rsa.php b/library/Zend/Crypt/Rsa.php index 84e6e76848..d3a65bd378 100644 --- a/library/Zend/Crypt/Rsa.php +++ b/library/Zend/Crypt/Rsa.php @@ -23,12 +23,12 @@ /** * @see Zend_Crypt_Rsa_Key_Private */ -require_once 'Zend/Crypt/Rsa/Key/Private.php'; +;// require_once 'Zend/Crypt/Rsa/Key/Private.php'; /** * @see Zend_Crypt_Rsa_Key_Public */ -require_once 'Zend/Crypt/Rsa/Key/Public.php'; +;// require_once 'Zend/Crypt/Rsa/Key/Public.php'; /** * @category Zend @@ -70,7 +70,7 @@ class Zend_Crypt_Rsa public function __construct(array $options = null) { if (!extension_loaded('openssl')) { - require_once 'Zend/Crypt/Rsa/Exception.php'; + ;// require_once 'Zend/Crypt/Rsa/Exception.php'; throw new Zend_Crypt_Rsa_Exception('Zend_Crypt_Rsa requires openssl extension to be loaded.'); } @@ -223,7 +223,7 @@ public function generateKeys(array $configargs = null) $publicKey = null; $resource = openssl_pkey_new($config); if (!$resource) { - require_once 'Zend/Crypt/Rsa/Exception.php'; + ;// require_once 'Zend/Crypt/Rsa/Exception.php'; throw new Zend_Crypt_Rsa_Exception('Failed to generate a new private key'); } // above fails on PHP 5.3 diff --git a/library/Zend/Crypt/Rsa/Exception.php b/library/Zend/Crypt/Rsa/Exception.php index f1cf65e86a..d15a692136 100644 --- a/library/Zend/Crypt/Rsa/Exception.php +++ b/library/Zend/Crypt/Rsa/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Crypt_Exception */ -require_once 'Zend/Crypt/Exception.php'; +;// require_once 'Zend/Crypt/Exception.php'; /** * @category Zend diff --git a/library/Zend/Crypt/Rsa/Key.php b/library/Zend/Crypt/Rsa/Key.php index e35ee1d96d..9c2d9e465e 100644 --- a/library/Zend/Crypt/Rsa/Key.php +++ b/library/Zend/Crypt/Rsa/Key.php @@ -71,7 +71,7 @@ public function toString() /** * @see Zend_Crypt_Exception */ - require_once 'Zend/Crypt/Exception.php'; + ;// require_once 'Zend/Crypt/Exception.php'; throw new Zend_Crypt_Exception('No public key string representation is available'); } diff --git a/library/Zend/Crypt/Rsa/Key/Private.php b/library/Zend/Crypt/Rsa/Key/Private.php index 98b2e026c2..db8b1b0830 100644 --- a/library/Zend/Crypt/Rsa/Key/Private.php +++ b/library/Zend/Crypt/Rsa/Key/Private.php @@ -23,7 +23,7 @@ /** * @see Zend_Crypt_Rsa_Key */ -require_once 'Zend/Crypt/Rsa/Key.php'; +;// require_once 'Zend/Crypt/Rsa/Key.php'; /** * @category Zend @@ -53,7 +53,7 @@ protected function _parse($passPhrase) /** * @see Zend_Crypt_Exception */ - require_once 'Zend/Crypt/Exception.php'; + ;// require_once 'Zend/Crypt/Exception.php'; throw new Zend_Crypt_Exception('Unable to load private key'); } $this->_opensslKeyResource = $result; @@ -66,7 +66,7 @@ public function getPublicKey() /** * @see Zend_Crypt_Rsa_Key_Public */ - require_once 'Zend/Crypt/Rsa/Key/Public.php'; + ;// require_once 'Zend/Crypt/Rsa/Key/Public.php'; $this->_publicKey = new Zend_Crypt_Rsa_Key_Public($this->_details['key']); } return $this->_publicKey; diff --git a/library/Zend/Crypt/Rsa/Key/Public.php b/library/Zend/Crypt/Rsa/Key/Public.php index 9694342d17..610348f8f6 100644 --- a/library/Zend/Crypt/Rsa/Key/Public.php +++ b/library/Zend/Crypt/Rsa/Key/Public.php @@ -23,7 +23,7 @@ /** * @see Zend_Crypt_Rsa_Key */ -require_once 'Zend/Crypt/Rsa/Key.php'; +;// require_once 'Zend/Crypt/Rsa/Key.php'; /** * @category Zend @@ -57,7 +57,7 @@ protected function _parse($string) /** * @see Zend_Crypt_Exception */ - require_once 'Zend/Crypt/Exception.php'; + ;// require_once 'Zend/Crypt/Exception.php'; throw new Zend_Crypt_Exception('Unable to load public key'); } //openssl_pkey_export($result, $public); diff --git a/library/Zend/Currency.php b/library/Zend/Currency.php index 9abc8b1998..444a85a7a1 100644 --- a/library/Zend/Currency.php +++ b/library/Zend/Currency.php @@ -22,9 +22,9 @@ /** * include needed classes */ -require_once 'Zend/Locale.php'; -require_once 'Zend/Locale/Data.php'; -require_once 'Zend/Locale/Format.php'; +;// require_once 'Zend/Locale.php'; +;// require_once 'Zend/Locale/Data.php'; +;// require_once 'Zend/Locale/Format.php'; /** * Class for handling currency notations @@ -120,7 +120,7 @@ public function __construct($options = null, $locale = null) } if (($this->_options['currency'] === null) and ($this->_options['name'] === null)) { - require_once 'Zend/Currency/Exception.php'; + ;// require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception("Currency '$options' not found"); } @@ -162,7 +162,7 @@ public function toCurrency($value = null, array $options = array()) // Validate the passed number if (!(isset($value)) or (is_numeric($value) === false)) { - require_once 'Zend/Currency/Exception.php'; + ;// require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception("Value '$value' has to be numeric"); } @@ -315,7 +315,7 @@ private function _checkParams($currency = null, $locale = null) if ((Zend_Locale::isLocale($locale, true, false)) and (strlen($locale) > 4)) { $country = substr($locale, (strpos($locale, '_') + 1)); } else { - require_once 'Zend/Currency/Exception.php'; + ;// require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception("No region found within the locale '" . (string) $locale . "'"); } @@ -436,7 +436,7 @@ public function getRegionList($currency = null) } if (empty($currency) === true) { - require_once 'Zend/Currency/Exception.php'; + ;// require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception('No currency defined'); } @@ -551,17 +551,17 @@ public static function clearCache($tag = null) */ public function setLocale($locale = null) { - require_once 'Zend/Locale.php'; + ;// require_once 'Zend/Locale.php'; try { $locale = Zend_Locale::findLocale($locale); if (strlen($locale) > 4) { $this->_options['locale'] = $locale; } else { - require_once 'Zend/Currency/Exception.php'; + ;// require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception("No region found within the locale '" . (string) $locale . "'"); } } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Currency/Exception.php'; + ;// require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception($e->getMessage()); } @@ -768,7 +768,7 @@ protected function _exchangeCurrency($value, $currency) if ($currency !== $this->getShortName()) { $service = $this->getService(); if (!($service instanceof Zend_Currency_CurrencyInterface)) { - require_once 'Zend/Currency/Exception.php'; + ;// require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception('No exchange service applied'); } @@ -798,7 +798,7 @@ public function getService() public function setService($service) { if (is_string($service)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; if (!class_exists($service)) { $file = str_replace('_', DIRECTORY_SEPARATOR, $service) . '.php'; if (Zend_Loader::isReadable($file)) { @@ -810,7 +810,7 @@ public function setService($service) } if (!($service instanceof Zend_Currency_CurrencyInterface)) { - require_once 'Zend/Currency/Exception.php'; + ;// require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception('A currency service must implement Zend_Currency_CurrencyInterface'); } @@ -847,7 +847,7 @@ protected function _checkOptions(array $options = array()) switch($name) { case 'position': if (($value !== self::STANDARD) and ($value !== self::RIGHT) and ($value !== self::LEFT)) { - require_once 'Zend/Currency/Exception.php'; + ;// require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception("Unknown position '" . $value . "'"); } @@ -856,7 +856,7 @@ protected function _checkOptions(array $options = array()) case 'format': if ((empty($value) === false) and (Zend_Locale::isLocale($value, null, false) === false)) { if (!is_string($value) || (strpos($value, '0') === false)) { - require_once 'Zend/Currency/Exception.php'; + ;// require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception("'" . ((gettype($value) === 'object') ? get_class($value) : $value) . "' is no format token"); @@ -867,7 +867,7 @@ protected function _checkOptions(array $options = array()) case 'display': if (is_numeric($value) and ($value !== self::NO_SYMBOL) and ($value !== self::USE_SYMBOL) and ($value !== self::USE_SHORTNAME) and ($value !== self::USE_NAME)) { - require_once 'Zend/Currency/Exception.php'; + ;// require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception("Unknown display '$value'"); } break; @@ -878,7 +878,7 @@ protected function _checkOptions(array $options = array()) } if (($value < -1) or ($value > 30)) { - require_once 'Zend/Currency/Exception.php'; + ;// require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception("'$value' precision has to be between -1 and 30."); } break; @@ -887,7 +887,7 @@ protected function _checkOptions(array $options = array()) try { Zend_Locale_Format::convertNumerals(0, $options['script']); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Currency/Exception.php'; + ;// require_once 'Zend/Currency/Exception.php'; throw new Zend_Currency_Exception($e->getMessage()); } break; diff --git a/library/Zend/Currency/Exception.php b/library/Zend/Currency/Exception.php index 9fa965b755..edfebeb76e 100644 --- a/library/Zend/Currency/Exception.php +++ b/library/Zend/Currency/Exception.php @@ -22,7 +22,7 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * Exception class for Zend_Currency diff --git a/library/Zend/Date.php b/library/Zend/Date.php index 48bc906f9b..db3aa02609 100644 --- a/library/Zend/Date.php +++ b/library/Zend/Date.php @@ -22,10 +22,10 @@ /** * Include needed Date classes */ -require_once 'Zend/Date/DateObject.php'; -require_once 'Zend/Locale.php'; -require_once 'Zend/Locale/Format.php'; -require_once 'Zend/Locale/Math.php'; +;// require_once 'Zend/Date/DateObject.php'; +;// require_once 'Zend/Locale.php'; +;// require_once 'Zend/Locale/Format.php'; +;// require_once 'Zend/Locale/Math.php'; /** * @category Zend @@ -248,19 +248,19 @@ public static function setOptions(array $options = array()) switch($name) { case 'format_type' : if ((strtolower($value) != 'php') && (strtolower($value) != 'iso')) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("Unknown format type ($value) for dates, only 'iso' and 'php' supported", 0, null, $value); } break; case 'fix_dst' : if (!is_bool($value)) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("'fix_dst' has to be boolean", 0, null, $value); } break; case 'extend_month' : if (!is_bool($value)) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("'extend_month' has to be boolean", 0, null, $value); } break; @@ -269,7 +269,7 @@ public static function setOptions(array $options = array()) parent::$_cache = null; } else { if (!$value instanceof Zend_Cache_Core) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("Instance of Zend_Cache expected"); } @@ -283,7 +283,7 @@ public static function setOptions(array $options = array()) parent::$_defaultOffset = 0; } else { if (!$value instanceof Zend_TimeSync_Protocol) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("Instance of Zend_TimeSync expected"); } @@ -295,7 +295,7 @@ public static function setOptions(array $options = array()) self::$_options[$name] = $value; } else { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("Unknown option: $name = $value"); } } @@ -334,7 +334,7 @@ private function _timestamp($calc, $stamp) if (isset($stamp['timestamp']) === true) { $stamp = $stamp['timestamp']; } else { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('no timestamp given in array'); } } @@ -1030,7 +1030,7 @@ private function _getDigitFromName($name) return 12; default: - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('Month ($name) is not a known month'); } } @@ -1288,7 +1288,7 @@ private function _assign($calc, $date, $comp = 0, $dst = false) private function _calculate($calc, $date, $part, $locale) { if ($date === null) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('parameter $date must be set, null is not allowed'); } @@ -1407,7 +1407,7 @@ private function _calculate($calc, $date, $part, $locale) } break; default: - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("datepart for part ($part) not found in array"); break; } @@ -1451,7 +1451,7 @@ private function _calculate($calc, $date, $part, $locale) $this->mktime(0, 0, 0, 1, 1 + intval($day), 1970, true), $hour); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, day expected", 0, null, $date); break; @@ -1475,7 +1475,7 @@ private function _calculate($calc, $date, $part, $locale) } // Weekday not found - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date); break; @@ -1485,7 +1485,7 @@ private function _calculate($calc, $date, $part, $locale) $this->mktime(0, 0, 0, 1, 1 + intval($day), 1970, true), $hour); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, day expected", 0, null, $date); break; @@ -1509,7 +1509,7 @@ private function _calculate($calc, $date, $part, $locale) } // Weekday not found - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date); break; @@ -1521,12 +1521,12 @@ private function _calculate($calc, $date, $part, $locale) } // Weekday not found - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date); break; case self::DAY_SUFFIX: - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('day suffix not supported', 0, null, $date); break; @@ -1538,7 +1538,7 @@ private function _calculate($calc, $date, $part, $locale) } // Weekday not found - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date); break; @@ -1554,7 +1554,7 @@ private function _calculate($calc, $date, $part, $locale) $this->mktime(0, 0, 0, $month, $day, $year, true), $hour); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, day expected", 0, null, $date); break; @@ -1577,7 +1577,7 @@ private function _calculate($calc, $date, $part, $locale) } // Weekday not found - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date); break; @@ -1600,7 +1600,7 @@ private function _calculate($calc, $date, $part, $locale) } // Weekday not found - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date); break; @@ -1612,7 +1612,7 @@ private function _calculate($calc, $date, $part, $locale) parent::mktime(0, 0, 0, 1, 1 + ($week * 7), 1970, true), $hour); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, week expected", 0, null, $date); break; @@ -1656,7 +1656,7 @@ private function _calculate($calc, $date, $part, $locale) } // Monthname not found - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, month expected", 0, null, $date); break; @@ -1686,7 +1686,7 @@ private function _calculate($calc, $date, $part, $locale) $this->mktime(0, 0, 0, $month, $day, $year, true), $hour); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, month expected", 0, null, $date); break; @@ -1729,7 +1729,7 @@ private function _calculate($calc, $date, $part, $locale) } // Monthname not found - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, month expected", 0, null, $date); break; @@ -1760,12 +1760,12 @@ private function _calculate($calc, $date, $part, $locale) $this->mktime(0, 0, 0, $month, $day, $year, true), $hour); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, month expected", 0, null, $date); break; case self::MONTH_DAYS: - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('month days not supported', 0, null, $date); break; @@ -1808,13 +1808,13 @@ private function _calculate($calc, $date, $part, $locale) } // Monthname not found - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, month expected", 0, null, $date); break; // year formats case self::LEAPYEAR: - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('leap year not supported', 0, null, $date); break; @@ -1832,7 +1832,7 @@ private function _calculate($calc, $date, $part, $locale) $this->mktime(0, 0, 0, $month, $day, $year, true), false); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, year expected", 0, null, $date); break; @@ -1850,7 +1850,7 @@ private function _calculate($calc, $date, $part, $locale) $this->mktime(0, 0, 0, $month, $day, $year, true), false); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, year expected", 0, null, $date); break; @@ -1872,7 +1872,7 @@ private function _calculate($calc, $date, $part, $locale) $this->mktime(0, 0, 0, $month, $day, $year, true), false); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, year expected", 0, null, $date); break; @@ -1894,13 +1894,13 @@ private function _calculate($calc, $date, $part, $locale) $this->mktime(0, 0, 0, $month, $day, $year, true), false); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, year expected", 0, null, $date); break; // time formats case self::MERIDIEM: - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('meridiem not supported', 0, null, $date); break; @@ -1916,7 +1916,7 @@ private function _calculate($calc, $date, $part, $locale) $this->mktime($hour, $minute, $second, 1, 1, 1970, true), false); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, swatchstamp expected", 0, null, $date); break; @@ -1926,7 +1926,7 @@ private function _calculate($calc, $date, $part, $locale) $this->mktime($hour, 0, 0, 1, 1, 1970, true), false); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, hour expected", 0, null, $date); break; @@ -1936,7 +1936,7 @@ private function _calculate($calc, $date, $part, $locale) $this->mktime($hour, 0, 0, 1, 1, 1970, true), false); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, hour expected", 0, null, $date); break; @@ -1946,7 +1946,7 @@ private function _calculate($calc, $date, $part, $locale) $this->mktime($hour, 0, 0, 1, 1, 1970, true), false); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, hour expected", 0, null, $date); break; @@ -1956,7 +1956,7 @@ private function _calculate($calc, $date, $part, $locale) $this->mktime($hour, 0, 0, 1, 1, 1970, true), false); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, hour expected", 0, null, $date); break; @@ -1966,7 +1966,7 @@ private function _calculate($calc, $date, $part, $locale) $this->mktime(0, $minute, 0, 1, 1, 1970, true), false); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, minute expected", 0, null, $date); break; @@ -1976,7 +1976,7 @@ private function _calculate($calc, $date, $part, $locale) $this->mktime(0, 0, $second, 1, 1, 1970, true), false); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, second expected", 0, null, $date); break; @@ -1997,7 +1997,7 @@ private function _calculate($calc, $date, $part, $locale) return $this->compareMillisecond($date); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, milliseconds expected", 0, null, $date); break; @@ -2007,7 +2007,7 @@ private function _calculate($calc, $date, $part, $locale) $this->mktime(0, $minute, 0, 1, 1, 1970, true), false); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, minute expected", 0, null, $date); break; @@ -2017,7 +2017,7 @@ private function _calculate($calc, $date, $part, $locale) $this->mktime(0, 0, $second, 1, 1, 1970, true), false); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, second expected", 0, null, $date); break; @@ -2026,18 +2026,18 @@ private function _calculate($calc, $date, $part, $locale) case self::TIMEZONE_NAME: case self::TIMEZONE: case self::TIMEZONE_SECS: - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('timezone not supported', 0, null, $date); break; case self::DAYLIGHT: - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('daylight not supported', 0, null, $date); break; case self::GMT_DIFF: case self::GMT_DIFF_SEP: - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('gmtdiff not supported', 0, null, $date); break; @@ -2080,7 +2080,7 @@ private function _calculate($calc, $date, $part, $locale) preg_match('/[T,\s]{0,1}(\d{2})(\d{2})/', $tmpdate, $timematch); } if (empty($datematch) and empty($timematch)) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("unsupported ISO8601 format ($date)", 0, null, $date); } if (!empty($timematch)) { @@ -2124,7 +2124,7 @@ private function _calculate($calc, $date, $part, $locale) . '{1}\d{4}|\w{1,20})$/', $date, $match); if (!$result) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("no RFC 2822 format ($date)", 0, null, $date); } @@ -2147,7 +2147,7 @@ private function _calculate($calc, $date, $part, $locale) return $this->_assign($calc, $date, $this->getUnixTimestamp()); } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, timestamp expected", 0, null, $date); break; @@ -2155,7 +2155,7 @@ private function _calculate($calc, $date, $part, $locale) // break intentionally omitted case self::ERA: case self::ERA_NAME: - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('era not supported', 0, null, $date); break; @@ -2175,7 +2175,7 @@ private function _calculate($calc, $date, $part, $locale) return $this->_assign($calc, $this->mktime(0, 0, 0, 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime(0, 0, 0, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2196,7 +2196,7 @@ private function _calculate($calc, $date, $part, $locale) return $this->_assign($calc, $this->mktime(0, 0, 0, 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime(0, 0, 0, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2217,7 +2217,7 @@ private function _calculate($calc, $date, $part, $locale) return $this->_assign($calc, $this->mktime(0, 0, 0, 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime(0, 0, 0, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2238,7 +2238,7 @@ private function _calculate($calc, $date, $part, $locale) return $this->_assign($calc, $this->mktime(0, 0, 0, 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime(0, 0, 0, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2261,7 +2261,7 @@ private function _calculate($calc, $date, $part, $locale) return $this->_assign($calc, $this->mktime(0, 0, 0, 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime(0, 0, 0, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2277,7 +2277,7 @@ private function _calculate($calc, $date, $part, $locale) return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], $month, $day, $year, true), $this->mktime($hour, $minute, $second, $month, $day, $year, true), false); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2299,7 +2299,7 @@ private function _calculate($calc, $date, $part, $locale) return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], $month, $day, $year, true), $this->mktime($hour, $minute, $second, $month, $day, $year, true), false); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2316,7 +2316,7 @@ private function _calculate($calc, $date, $part, $locale) return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], $month, $day, $year, true), $this->mktime($hour, $minute, $second, $month, $day, $year, true), false); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2333,7 +2333,7 @@ private function _calculate($calc, $date, $part, $locale) return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], $month, $day, $year, true), $this->mktime($hour, $minute, $second, $month, $day, $year, true), false); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2355,7 +2355,7 @@ private function _calculate($calc, $date, $part, $locale) return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], $month, $day, $year, true), $this->mktime($hour, $minute, $second, $month, $day, $year, true), false); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2374,7 +2374,7 @@ private function _calculate($calc, $date, $part, $locale) return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime($hour, $minute, $second, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2400,7 +2400,7 @@ private function _calculate($calc, $date, $part, $locale) return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime($hour, $minute, $second, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2421,7 +2421,7 @@ private function _calculate($calc, $date, $part, $locale) return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime($hour, $minute, $second, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2441,7 +2441,7 @@ private function _calculate($calc, $date, $part, $locale) return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime($hour, $minute, $second, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2469,7 +2469,7 @@ private function _calculate($calc, $date, $part, $locale) return $this->_assign($calc, $this->mktime($parsed['hour'], $parsed['minute'], $parsed['second'], 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime($hour, $minute, $second, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2479,7 +2479,7 @@ private function _calculate($calc, $date, $part, $locale) case self::RFC_3339: $result = preg_match('/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})\d{0,4}([+-]{1}\d{2}:\d{2}|Z)$/', $date, $match); if (!$result) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, ATOM format expected", 0, null, $date); } @@ -2498,7 +2498,7 @@ private function _calculate($calc, $date, $part, $locale) case self::COOKIE: $result = preg_match("/^\w{6,9},\s(\d{2})-(\w{3})-(\d{2})\s(\d{2}):(\d{2}):(\d{2})\s.{3,20}$/", $date, $match); if (!$result) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, COOKIE format expected", 0, null, $date); } $matchStartPos = iconv_strpos($match[0], ' ', 0, 'UTF-8') + 1; @@ -2527,7 +2527,7 @@ private function _calculate($calc, $date, $part, $locale) // new RFC 822 format, identical to RFC 1036 standard $result = preg_match('/^\w{0,3},{0,1}\s{0,1}(\d{1,2})\s(\w{3})\s(\d{2})\s(\d{2}):(\d{2}):{0,1}(\d{0,2})\s([+-]{1}\d{4}|\w{1,20})$/', $date, $match); if (!$result) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, RFC 822 date format expected", 0, null, $date); } @@ -2549,7 +2549,7 @@ private function _calculate($calc, $date, $part, $locale) case self::RFC_850: $result = preg_match('/^\w{6,9},\s(\d{2})-(\w{3})-(\d{2})\s(\d{2}):(\d{2}):(\d{2})\s.{3,21}$/', $date, $match); if (!$result) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, RFC 850 date format expected", 0, null, $date); } @@ -2571,7 +2571,7 @@ private function _calculate($calc, $date, $part, $locale) case self::RFC_1123: $result = preg_match('/^\w{0,3},{0,1}\s{0,1}(\d{1,2})\s(\w{3})\s(\d{2,4})\s(\d{2}):(\d{2}):{0,1}(\d{0,2})\s([+-]{1}\d{4}|\w{1,20})$/', $date, $match); if (!$result) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, RFC 1123 date format expected", 0, null, $date); } @@ -2592,7 +2592,7 @@ private function _calculate($calc, $date, $part, $locale) case self::RSS: $result = preg_match('/^\w{3},\s(\d{2})\s(\w{3})\s(\d{2,4})\s(\d{1,2}):(\d{2}):(\d{2})\s.{1,21}$/', $date, $match); if (!$result) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, RSS date format expected", 0, null, $date); } @@ -2614,7 +2614,7 @@ private function _calculate($calc, $date, $part, $locale) case self::W3C: $result = preg_match('/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})[+-]{1}\d{2}:\d{2}$/', $date, $match); if (!$result) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid date ($date) operand, W3C date format expected", 0, null, $date); } @@ -2671,7 +2671,7 @@ private function _calculate($calc, $date, $part, $locale) false), $this->getUnixTimestamp(), false); } catch (Zend_Locale_Exception $e) { if (!is_numeric($date)) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } } @@ -2781,7 +2781,7 @@ public function getTime($locale = null) private function _time($calc, $time, $format, $locale) { if ($time === null) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('parameter $time must be set, null is not allowed'); } @@ -2794,7 +2794,7 @@ private function _time($calc, $time, $format, $locale) (isset($time['second']) === true)) { $parsed = $time; } else { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("no hour, minute or second given in array"); } } else { @@ -2808,7 +2808,7 @@ private function _time($calc, $time, $format, $locale) $parsed = Zend_Locale_Format::getTime($time, array('date_format' => $format, 'locale' => $locale, 'format_type' => 'iso')); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e); } } @@ -2943,7 +2943,7 @@ public function getDate($locale = null) private function _date($calc, $date, $format, $locale) { if ($date === null) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('parameter $date must be set, null is not allowed'); } @@ -2956,7 +2956,7 @@ private function _date($calc, $date, $format, $locale) (isset($date['day']) === true)) { $parsed = $date; } else { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("no day,month or year given in array"); } } else { @@ -2973,7 +2973,7 @@ private function _date($calc, $date, $format, $locale) $parsed['year'] = self::getFullYear($parsed['year']); } } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e); } } @@ -3257,15 +3257,15 @@ public function compareArpa($date, $locale = null) private function _checkLocation($location) { if (!isset($location['longitude']) or !isset($location['latitude'])) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('Location must include \'longitude\' and \'latitude\'', 0, null, $location); } if (($location['longitude'] > 180) or ($location['longitude'] < -180)) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('Longitude must be between -180 and 180', 0, null, $location); } if (($location['latitude'] > 90) or ($location['latitude'] < -90)) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('Latitude must be between -90 and 90', 0, null, $location); } @@ -3387,13 +3387,13 @@ public static function checkLeapYear($year) if (isset($year['year']) === true) { $year = $year['year']; } else { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("no year given in array"); } } if (!is_numeric($year)) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("year ($year) has to be integer for checkLeapYear()", 0, null, $year); } @@ -3519,7 +3519,7 @@ private function _calcdetail($calc, $date, $type, $locale) private function _calcvalue($calc, $value, $type, $parameter, $locale) { if ($value === null) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("parameter $type must be set, null is not allowed"); } @@ -3531,7 +3531,7 @@ private function _calcvalue($calc, $value, $type, $parameter, $locale) // extract value from object $value = $value->toString($parameter, 'iso', $locale); } else if (!is_array($value) && !is_numeric($value) && ($type != 'iso') && ($type != 'arpa')) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid $type ($value) operand", 0, null, $value); } @@ -3666,7 +3666,7 @@ public function getMonth($locale = null) private function _month($calc, $month, $locale) { if ($month === null) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('parameter $month must be set, null is not allowed'); } @@ -3684,7 +3684,7 @@ private function _month($calc, $month, $locale) if (isset($month['month']) === true) { $month = $month['month']; } else { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("no month given in array"); } } else { @@ -3711,7 +3711,7 @@ private function _month($calc, $month, $locale) } } if ($found == 0) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("unknown month name ($month)", 0, null, $month); } } @@ -3821,7 +3821,7 @@ public function getDay($locale = null) private function _day($calc, $day, $locale) { if ($day === null) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('parameter $day must be set, null is not allowed'); } @@ -3840,7 +3840,7 @@ private function _day($calc, $day, $locale) $day = $day['day']; $type = self::WEEKDAY; } else { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("no day given in array"); } } else { @@ -3971,7 +3971,7 @@ public function getWeekday($locale = null) private function _weekday($calc, $weekday, $locale) { if ($weekday === null) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('parameter $weekday must be set, null is not allowed'); } @@ -3990,7 +3990,7 @@ private function _weekday($calc, $weekday, $locale) $weekday = $weekday['weekday']; $type = self::WEEKDAY; } else { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("no weekday given in array"); } } else { @@ -4450,7 +4450,7 @@ public function getFractionalPrecision() public function setFractionalPrecision($precision) { if (!intval($precision) or ($precision < 0) or ($precision > 9)) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("precision ($precision) must be a positive integer less than 10", 0, null, $precision); } @@ -4491,7 +4491,7 @@ public function setMilliSecond($milli = null, $precision = null) $milli = intval($milli); $precision = 6; } else if (!is_numeric($milli)) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid milli second ($milli) operand", 0, null, $milli); } @@ -4500,7 +4500,7 @@ public function setMilliSecond($milli = null, $precision = null) } if (!is_int($precision) || $precision < 1 || $precision > 9) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("precision ($precision) must be a positive integer less than 10", 0, null, $precision); } @@ -4523,7 +4523,7 @@ public function addMilliSecond($milli = null, $precision = null) list($milli, $time) = explode(" ", microtime()); $milli = intval($milli); } else if (!is_numeric($milli)) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid milli second ($milli) operand", 0, null, $milli); } @@ -4536,7 +4536,7 @@ public function addMilliSecond($milli = null, $precision = null) } if (!is_int($precision) || $precision < 1 || $precision > 9) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception( "precision ($precision) must be a positive integer less than 10", 0, null, $precision ); @@ -4602,19 +4602,19 @@ public function compareMilliSecond($milli = null, $precision = null) list($milli, $time) = explode(" ", microtime()); $milli = intval($milli); } else if (is_numeric($milli) === false) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("invalid milli second ($milli) operand", 0, null, $milli); } if ($precision === null) { $precision = strlen($milli); } else if (!is_int($precision) || $precision < 1 || $precision > 9) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("precision ($precision) must be a positive integer less than 10", 0, null, $precision); } if ($precision === 0) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('precision is 0'); } @@ -4731,7 +4731,7 @@ public function setLocale($locale = null) try { $this->_locale = Zend_Locale::findLocale($locale); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception($e->getMessage(), 0, $e); } diff --git a/library/Zend/Date/Cities.php b/library/Zend/Date/Cities.php index 6934d690e0..4db03a00cc 100644 --- a/library/Zend/Date/Cities.php +++ b/library/Zend/Date/Cities.php @@ -306,7 +306,7 @@ public static function City($city, $horizon = false) return $return; } } - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('unknown city'); } diff --git a/library/Zend/Date/DateObject.php b/library/Zend/Date/DateObject.php index 0ec9fce9fc..0a94545219 100644 --- a/library/Zend/Date/DateObject.php +++ b/library/Zend/Date/DateObject.php @@ -85,7 +85,7 @@ protected function setUnixTimestamp($timestamp = null) } else if ($timestamp === null) { $this->_unixTimestamp = time(); } else { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception('\'' . $timestamp . '\' is not a valid UNIX timestamp', 0, null, $timestamp); } @@ -1021,7 +1021,7 @@ public function setTimezone($zone = null) // throw an error on false input, but only if the new date extension is available if (function_exists('timezone_open')) { if (!@timezone_open($zone)) { - require_once 'Zend/Date/Exception.php'; + ;// require_once 'Zend/Date/Exception.php'; throw new Zend_Date_Exception("timezone ($zone) is not a known timezone", 0, null, $zone); } } diff --git a/library/Zend/Date/Exception.php b/library/Zend/Date/Exception.php index f4573b38ce..c21bb22e7c 100644 --- a/library/Zend/Date/Exception.php +++ b/library/Zend/Date/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** diff --git a/library/Zend/Db.php b/library/Zend/Db.php index 40f26dbae1..2bc678c9cf 100644 --- a/library/Zend/Db.php +++ b/library/Zend/Db.php @@ -224,7 +224,7 @@ public static function factory($adapter, $config = array()) /** * @see Zend_Db_Exception */ - require_once 'Zend/Db/Exception.php'; + ;// require_once 'Zend/Db/Exception.php'; throw new Zend_Db_Exception('Adapter parameters must be in an array or a Zend_Config object'); } @@ -235,7 +235,7 @@ public static function factory($adapter, $config = array()) /** * @see Zend_Db_Exception */ - require_once 'Zend/Db/Exception.php'; + ;// require_once 'Zend/Db/Exception.php'; throw new Zend_Db_Exception('Adapter name must be specified in a string'); } @@ -259,7 +259,7 @@ public static function factory($adapter, $config = array()) * if the specified class cannot be loaded. */ if (!class_exists($adapterName)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($adapterName); } @@ -276,7 +276,7 @@ public static function factory($adapter, $config = array()) /** * @see Zend_Db_Exception */ - require_once 'Zend/Db/Exception.php'; + ;// require_once 'Zend/Db/Exception.php'; throw new Zend_Db_Exception("Adapter class '$adapterName' does not extend Zend_Db_Adapter_Abstract"); } diff --git a/library/Zend/Db/Adapter/Abstract.php b/library/Zend/Db/Adapter/Abstract.php index 9f857c6a54..11e3d324c3 100644 --- a/library/Zend/Db/Adapter/Abstract.php +++ b/library/Zend/Db/Adapter/Abstract.php @@ -24,12 +24,12 @@ /** * @see Zend_Db */ -require_once 'Zend/Db.php'; +;// require_once 'Zend/Db.php'; /** * @see Zend_Db_Select */ -require_once 'Zend/Db/Select.php'; +;// require_once 'Zend/Db/Select.php'; /** * Class for connecting to SQL databases and performing common operations. @@ -176,7 +176,7 @@ public function __construct($config) /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception('Adapter parameters must be in an array or a Zend_Config object'); } } @@ -232,7 +232,7 @@ public function __construct($config) break; default: /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception('Case must be one of the following constants: ' . 'Zend_Db::CASE_NATURAL, Zend_Db::CASE_LOWER, Zend_Db::CASE_UPPER'); } @@ -284,7 +284,7 @@ protected function _checkRequiredOptions(array $config) // we need at least a dbname if (! array_key_exists('dbname', $config)) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'dbname' that names the database instance"); } @@ -292,7 +292,7 @@ protected function _checkRequiredOptions(array $config) /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'password' for login credentials"); } @@ -300,7 +300,7 @@ protected function _checkRequiredOptions(array $config) /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'username' for login credentials"); } } @@ -370,7 +370,7 @@ public function setProfiler($profiler) /** * @see Zend_Db_Profiler_Exception */ - require_once 'Zend/Db/Profiler/Exception.php'; + ;// require_once 'Zend/Db/Profiler/Exception.php'; throw new Zend_Db_Profiler_Exception('Profiler argument must be an instance of either Zend_Db_Profiler' . ' or Zend_Config when provided as an object'); } @@ -392,7 +392,7 @@ public function setProfiler($profiler) if ($profilerInstance === null) { if (!class_exists($profilerClass)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($profilerClass); } $profilerInstance = new $profilerClass(); @@ -400,7 +400,7 @@ public function setProfiler($profiler) if (!$profilerInstance instanceof Zend_Db_Profiler) { /** @see Zend_Db_Profiler_Exception */ - require_once 'Zend/Db/Profiler/Exception.php'; + ;// require_once 'Zend/Db/Profiler/Exception.php'; throw new Zend_Db_Profiler_Exception('Class ' . get_class($profilerInstance) . ' does not extend ' . 'Zend_Db_Profiler'); } @@ -556,7 +556,7 @@ public function insert($table, array $bind) $i++; } else { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception(get_class($this) ." doesn't support positional or named binding"); } } @@ -610,7 +610,7 @@ public function update($table, array $bind, $where = '') $i++; } else { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception(get_class($this) ." doesn't support positional or named binding"); } } @@ -1120,7 +1120,7 @@ public function __sleep() { if ($this->_allowSerialization == false) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception( get_class($this) . ' is not allowed to be serialized' ); diff --git a/library/Zend/Db/Adapter/Db2.php b/library/Zend/Db/Adapter/Db2.php index dac2b1b7b9..58c3cd3023 100644 --- a/library/Zend/Db/Adapter/Db2.php +++ b/library/Zend/Db/Adapter/Db2.php @@ -24,17 +24,17 @@ /** * @see Zend_Db */ -require_once 'Zend/Db.php'; +;// require_once 'Zend/Db.php'; /** * @see Zend_Db_Adapter_Abstract */ -require_once 'Zend/Db/Adapter/Abstract.php'; +;// require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Db_Statement_Db2 */ -require_once 'Zend/Db/Statement/Db2.php'; +;// require_once 'Zend/Db/Statement/Db2.php'; /** @@ -127,7 +127,7 @@ protected function _connect() /** * @see Zend_Db_Adapter_Db2_Exception */ - require_once 'Zend/Db/Adapter/Db2/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception('The IBM DB2 extension is required for this adapter but the extension is not loaded'); } @@ -192,7 +192,7 @@ protected function _connect() /** * @see Zend_Db_Adapter_Db2_Exception */ - require_once 'Zend/Db/Adapter/Db2/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception(db2_conn_errormsg(), db2_conn_error()); } } @@ -232,7 +232,7 @@ public function prepare($sql) $this->_connect(); $stmtClass = $this->_defaultStmtClass; if (!class_exists($stmtClass)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($stmtClass); } $stmt = new $stmtClass($this, $sql); @@ -266,7 +266,7 @@ public function _setExecuteMode($mode) /** * @see Zend_Db_Adapter_Db2_Exception */ - require_once 'Zend/Db/Adapter/Db2/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception("execution mode not supported"); break; } @@ -591,7 +591,7 @@ protected function _commit() /** * @see Zend_Db_Adapter_Db2_Exception */ - require_once 'Zend/Db/Adapter/Db2/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception( db2_conn_errormsg($this->_connection), db2_conn_error($this->_connection)); @@ -611,7 +611,7 @@ protected function _rollBack() /** * @see Zend_Db_Adapter_Db2_Exception */ - require_once 'Zend/Db/Adapter/Db2/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception( db2_conn_errormsg($this->_connection), db2_conn_error($this->_connection)); @@ -639,14 +639,14 @@ public function setFetchMode($mode) /** * @see Zend_Db_Adapter_Db2_Exception */ - require_once 'Zend/Db/Adapter/Db2/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception('FETCH_BOUND is not supported yet'); break; default: /** * @see Zend_Db_Adapter_Db2_Exception */ - require_once 'Zend/Db/Adapter/Db2/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception("Invalid fetch mode '$mode' specified"); break; } @@ -667,7 +667,7 @@ public function limit($sql, $count, $offset = 0) /** * @see Zend_Db_Adapter_Db2_Exception */ - require_once 'Zend/Db/Adapter/Db2/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception("LIMIT argument count=$count is not valid"); } @@ -676,7 +676,7 @@ public function limit($sql, $count, $offset = 0) /** * @see Zend_Db_Adapter_Db2_Exception */ - require_once 'Zend/Db/Adapter/Db2/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/library/Zend/Db/Adapter/Db2/Exception.php b/library/Zend/Db/Adapter/Db2/Exception.php index a033a321b1..6ada91729f 100644 --- a/library/Zend/Db/Adapter/Db2/Exception.php +++ b/library/Zend/Db/Adapter/Db2/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Adapter_Exception */ -require_once 'Zend/Db/Adapter/Exception.php'; +;// require_once 'Zend/Db/Adapter/Exception.php'; /** * Zend_Db_Adapter_Db2_Exception diff --git a/library/Zend/Db/Adapter/Exception.php b/library/Zend/Db/Adapter/Exception.php index 420dc55479..2aa9d83e7f 100644 --- a/library/Zend/Db/Adapter/Exception.php +++ b/library/Zend/Db/Adapter/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Exception */ -require_once 'Zend/Db/Exception.php'; +;// require_once 'Zend/Db/Exception.php'; /** * @category Zend diff --git a/library/Zend/Db/Adapter/Mysqli.php b/library/Zend/Db/Adapter/Mysqli.php index b939ab9359..328e0f91d0 100644 --- a/library/Zend/Db/Adapter/Mysqli.php +++ b/library/Zend/Db/Adapter/Mysqli.php @@ -24,22 +24,22 @@ /** * @see Zend_Db_Adapter_Abstract */ -require_once 'Zend/Db/Adapter/Abstract.php'; +;// require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Db_Profiler */ -require_once 'Zend/Db/Profiler.php'; +;// require_once 'Zend/Db/Profiler.php'; /** * @see Zend_Db_Select */ -require_once 'Zend/Db/Select.php'; +;// require_once 'Zend/Db/Select.php'; /** * @see Zend_Db_Statement_Mysqli */ -require_once 'Zend/Db/Statement/Mysqli.php'; +;// require_once 'Zend/Db/Statement/Mysqli.php'; /** @@ -140,7 +140,7 @@ public function listTables() /** * @see Zend_Db_Adapter_Mysqli_Exception */ - require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; throw new Zend_Db_Adapter_Mysqli_Exception($this->getConnection()->error); } return $result; @@ -200,7 +200,7 @@ public function describeTable($tableName, $schemaName = null) /** * @see Zend_Db_Adapter_Mysqli_Exception */ - require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; throw new Zend_Db_Adapter_Mysqli_Exception($this->getConnection()->error); } @@ -287,7 +287,7 @@ protected function _connect() /** * @see Zend_Db_Adapter_Mysqli_Exception */ - require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; throw new Zend_Db_Adapter_Mysqli_Exception('The Mysqli extension is required for this adapter but the extension is not loaded'); } @@ -336,7 +336,7 @@ protected function _connect() /** * @see Zend_Db_Adapter_Mysqli_Exception */ - require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; throw new Zend_Db_Adapter_Mysqli_Exception(mysqli_connect_error()); } @@ -382,7 +382,7 @@ public function prepare($sql) } $stmtClass = $this->_defaultStmtClass; if (!class_exists($stmtClass)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($stmtClass); } $stmt = new $stmtClass($this, $sql); @@ -474,14 +474,14 @@ public function setFetchMode($mode) /** * @see Zend_Db_Adapter_Mysqli_Exception */ - require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; throw new Zend_Db_Adapter_Mysqli_Exception('FETCH_BOUND is not supported yet'); break; default: /** * @see Zend_Db_Adapter_Mysqli_Exception */ - require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; throw new Zend_Db_Adapter_Mysqli_Exception("Invalid fetch mode '$mode' specified"); } } @@ -501,7 +501,7 @@ public function limit($sql, $count, $offset = 0) /** * @see Zend_Db_Adapter_Mysqli_Exception */ - require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; throw new Zend_Db_Adapter_Mysqli_Exception("LIMIT argument count=$count is not valid"); } @@ -510,7 +510,7 @@ public function limit($sql, $count, $offset = 0) /** * @see Zend_Db_Adapter_Mysqli_Exception */ - require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; throw new Zend_Db_Adapter_Mysqli_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/library/Zend/Db/Adapter/Mysqli/Exception.php b/library/Zend/Db/Adapter/Mysqli/Exception.php index 818f5050ad..266a1d49f2 100644 --- a/library/Zend/Db/Adapter/Mysqli/Exception.php +++ b/library/Zend/Db/Adapter/Mysqli/Exception.php @@ -24,7 +24,7 @@ /** * Zend */ -require_once 'Zend/Db/Adapter/Exception.php'; +;// require_once 'Zend/Db/Adapter/Exception.php'; /** * Zend_Db_Adapter_Mysqli_Exception diff --git a/library/Zend/Db/Adapter/Oracle.php b/library/Zend/Db/Adapter/Oracle.php index a03968a3ff..3ff44110eb 100644 --- a/library/Zend/Db/Adapter/Oracle.php +++ b/library/Zend/Db/Adapter/Oracle.php @@ -23,12 +23,12 @@ /** * @see Zend_Db_Adapter_Abstract */ -require_once 'Zend/Db/Adapter/Abstract.php'; +;// require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Db_Statement_Oracle */ -require_once 'Zend/Db/Statement/Oracle.php'; +;// require_once 'Zend/Db/Statement/Oracle.php'; /** * @category Zend @@ -115,7 +115,7 @@ protected function _connect() /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Adapter/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception('The OCI8 extension is required for this adapter but the extension is not loaded'); } @@ -134,7 +134,7 @@ protected function _connect() /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Adapter/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception(oci_error()); } } @@ -206,7 +206,7 @@ public function prepare($sql) $this->_connect(); $stmtClass = $this->_defaultStmtClass; if (!class_exists($stmtClass)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($stmtClass); } $stmt = new $stmtClass($this, $sql); @@ -468,7 +468,7 @@ protected function _commit() /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Adapter/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception(oci_error($this->_connection)); } $this->_setExecuteMode(OCI_COMMIT_ON_SUCCESS); @@ -486,7 +486,7 @@ protected function _rollBack() /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Adapter/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception(oci_error($this->_connection)); } $this->_setExecuteMode(OCI_COMMIT_ON_SUCCESS); @@ -514,14 +514,14 @@ public function setFetchMode($mode) /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Adapter/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception('FETCH_BOUND is not supported yet'); break; default: /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Adapter/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception("Invalid fetch mode '$mode' specified"); break; } @@ -543,7 +543,7 @@ public function limit($sql, $count, $offset = 0) /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Adapter/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception("LIMIT argument count=$count is not valid"); } @@ -552,7 +552,7 @@ public function limit($sql, $count, $offset = 0) /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Adapter/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception("LIMIT argument offset=$offset is not valid"); } @@ -589,7 +589,7 @@ private function _setExecuteMode($mode) /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Adapter/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception("Invalid execution mode '$mode' specified"); break; } diff --git a/library/Zend/Db/Adapter/Oracle/Exception.php b/library/Zend/Db/Adapter/Oracle/Exception.php index bf19dd8096..b5a7278434 100644 --- a/library/Zend/Db/Adapter/Oracle/Exception.php +++ b/library/Zend/Db/Adapter/Oracle/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Adapter_Exception */ -require_once 'Zend/Db/Adapter/Exception.php'; +;// require_once 'Zend/Db/Adapter/Exception.php'; /** * Zend_Db_Adapter_Oracle_Exception diff --git a/library/Zend/Db/Adapter/Pdo/Abstract.php b/library/Zend/Db/Adapter/Pdo/Abstract.php index 7fbbbe1146..1ab05c744d 100644 --- a/library/Zend/Db/Adapter/Pdo/Abstract.php +++ b/library/Zend/Db/Adapter/Pdo/Abstract.php @@ -24,13 +24,13 @@ /** * @see Zend_Db_Adapter_Abstract */ -require_once 'Zend/Db/Adapter/Abstract.php'; +;// require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Db_Statement_Pdo */ -require_once 'Zend/Db/Statement/Pdo.php'; +;// require_once 'Zend/Db/Statement/Pdo.php'; /** @@ -99,7 +99,7 @@ protected function _connect() /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception('The PDO extension is required for this adapter but the extension is not loaded'); } @@ -108,7 +108,7 @@ protected function _connect() /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception('The ' . $this->_pdoType . ' driver is not currently installed'); } @@ -140,7 +140,7 @@ protected function _connect() /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception($e->getMessage(), $e->getCode(), $e); } @@ -178,7 +178,7 @@ public function prepare($sql) $this->_connect(); $stmtClass = $this->_defaultStmtClass; if (!class_exists($stmtClass)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($stmtClass); } $stmt = new $stmtClass($this, $sql); @@ -240,7 +240,7 @@ public function query($sql, $bind = array()) /** * @see Zend_Db_Statement_Exception */ - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -267,7 +267,7 @@ public function exec($sql) /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception($errorInfo[2]); } @@ -276,7 +276,7 @@ public function exec($sql) /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -340,7 +340,7 @@ public function setFetchMode($mode) /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception('The PDO extension is required for this adapter but the extension is not loaded'); } switch ($mode) { @@ -356,7 +356,7 @@ public function setFetchMode($mode) /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Invalid fetch mode '$mode' specified"); break; } diff --git a/library/Zend/Db/Adapter/Pdo/Ibm.php b/library/Zend/Db/Adapter/Pdo/Ibm.php index 1bfb05b399..7e84c43e54 100644 --- a/library/Zend/Db/Adapter/Pdo/Ibm.php +++ b/library/Zend/Db/Adapter/Pdo/Ibm.php @@ -22,16 +22,16 @@ /** @see Zend_Db_Adapter_Pdo_Abstract */ -require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; +;// require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; /** @see Zend_Db_Abstract_Pdo_Ibm_Db2 */ -require_once 'Zend/Db/Adapter/Pdo/Ibm/Db2.php'; +;// require_once 'Zend/Db/Adapter/Pdo/Ibm/Db2.php'; /** @see Zend_Db_Abstract_Pdo_Ibm_Ids */ -require_once 'Zend/Db/Adapter/Pdo/Ibm/Ids.php'; +;// require_once 'Zend/Db/Adapter/Pdo/Ibm/Ids.php'; /** @see Zend_Db_Statement_Pdo_Ibm */ -require_once 'Zend/Db/Statement/Pdo/Ibm.php'; +;// require_once 'Zend/Db/Statement/Pdo/Ibm.php'; /** @@ -131,7 +131,7 @@ public function _connect() } } catch (PDOException $e) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; $error = strpos($e->getMessage(), 'driver does not support that attribute'); if ($error) { throw new Zend_Db_Adapter_Exception("PDO_IBM driver extension is downlevel. Please use driver release version 1.2.1 or later", 0, $e); @@ -178,7 +178,7 @@ protected function _checkRequiredOptions(array $config) if (array_key_exists('host', $this->_config) && !array_key_exists('port', $config)) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration must have a key for 'port' when 'host' is specified"); } } diff --git a/library/Zend/Db/Adapter/Pdo/Ibm/Db2.php b/library/Zend/Db/Adapter/Pdo/Ibm/Db2.php index a58746d69c..5be53a0e1b 100644 --- a/library/Zend/Db/Adapter/Pdo/Ibm/Db2.php +++ b/library/Zend/Db/Adapter/Pdo/Ibm/Db2.php @@ -22,10 +22,10 @@ /** @see Zend_Db_Adapter_Pdo_Ibm */ -require_once 'Zend/Db/Adapter/Pdo/Ibm.php'; +;// require_once 'Zend/Db/Adapter/Pdo/Ibm.php'; /** @see Zend_Db_Statement_Pdo_Ibm */ -require_once 'Zend/Db/Statement/Pdo/Ibm.php'; +;// require_once 'Zend/Db/Statement/Pdo/Ibm.php'; /** @@ -168,13 +168,13 @@ public function limit($sql, $count, $offset = 0) $count = intval($count); if ($count < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } else { $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/library/Zend/Db/Adapter/Pdo/Ibm/Ids.php b/library/Zend/Db/Adapter/Pdo/Ibm/Ids.php index 4d4b689f0a..b18576431e 100644 --- a/library/Zend/Db/Adapter/Pdo/Ibm/Ids.php +++ b/library/Zend/Db/Adapter/Pdo/Ibm/Ids.php @@ -22,10 +22,10 @@ /** @see Zend_Db_Adapter_Pdo_Ibm */ -require_once 'Zend/Db/Adapter/Pdo/Ibm.php'; +;// require_once 'Zend/Db/Adapter/Pdo/Ibm.php'; /** @see Zend_Db_Statement_Pdo_Ibm */ -require_once 'Zend/Db/Statement/Pdo/Ibm.php'; +;// require_once 'Zend/Db/Statement/Pdo/Ibm.php'; /** @@ -250,7 +250,7 @@ public function limit($sql, $count, $offset = 0) $count = intval($count); if ($count < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } else if ($count == 0) { $limit_sql = str_ireplace("SELECT", "SELECT * FROM (SELECT", $sql); @@ -259,7 +259,7 @@ public function limit($sql, $count, $offset = 0) $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } if ($offset == 0) { diff --git a/library/Zend/Db/Adapter/Pdo/Mssql.php b/library/Zend/Db/Adapter/Pdo/Mssql.php index 04f4aeb3c5..63b34f6422 100644 --- a/library/Zend/Db/Adapter/Pdo/Mssql.php +++ b/library/Zend/Db/Adapter/Pdo/Mssql.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Adapter_Pdo_Abstract */ -require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; +;// require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; /** @@ -319,14 +319,14 @@ public function limit($sql, $count, $offset = 0) $count = intval($count); if ($count <= 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/library/Zend/Db/Adapter/Pdo/Mysql.php b/library/Zend/Db/Adapter/Pdo/Mysql.php index 03b8a08dec..a232b8ac56 100644 --- a/library/Zend/Db/Adapter/Pdo/Mysql.php +++ b/library/Zend/Db/Adapter/Pdo/Mysql.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Adapter_Pdo_Abstract */ -require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; +;// require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; /** @@ -250,14 +250,14 @@ public function limit($sql, $count, $offset = 0) $count = intval($count); if ($count <= 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/library/Zend/Db/Adapter/Pdo/Oci.php b/library/Zend/Db/Adapter/Pdo/Oci.php index 893e1dc6cd..e45e3f0fc8 100644 --- a/library/Zend/Db/Adapter/Pdo/Oci.php +++ b/library/Zend/Db/Adapter/Pdo/Oci.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Adapter_Pdo_Abstract */ -require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; +;// require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; /** @@ -347,14 +347,14 @@ public function limit($sql, $count, $offset = 0) $count = intval($count); if ($count <= 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/library/Zend/Db/Adapter/Pdo/Pgsql.php b/library/Zend/Db/Adapter/Pdo/Pgsql.php index abd5e637b0..8106569dce 100644 --- a/library/Zend/Db/Adapter/Pdo/Pgsql.php +++ b/library/Zend/Db/Adapter/Pdo/Pgsql.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Adapter_Pdo_Abstract */ -require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; +;// require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; /** @@ -249,7 +249,7 @@ public function limit($sql, $count, $offset = 0) /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } @@ -258,7 +258,7 @@ public function limit($sql, $count, $offset = 0) /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/library/Zend/Db/Adapter/Pdo/Sqlite.php b/library/Zend/Db/Adapter/Pdo/Sqlite.php index 04acccacc3..c8d4cbcf95 100644 --- a/library/Zend/Db/Adapter/Pdo/Sqlite.php +++ b/library/Zend/Db/Adapter/Pdo/Sqlite.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Adapter_Pdo_Abstract */ -require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; +;// require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; /** @@ -106,7 +106,7 @@ protected function _checkRequiredOptions(array $config) // we need at least a dbname if (! array_key_exists('dbname', $config)) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'dbname' that names the database instance"); } } @@ -140,7 +140,7 @@ protected function _connect() if ($retval === false) { $error = $this->_connection->errorInfo(); /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception($error[2]); } @@ -148,7 +148,7 @@ protected function _connect() if ($retval === false) { $error = $this->_connection->errorInfo(); /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception($error[2]); } } @@ -275,14 +275,14 @@ public function limit($sql, $count, $offset = 0) $count = intval($count); if ($count <= 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/library/Zend/Db/Adapter/Sqlsrv.php b/library/Zend/Db/Adapter/Sqlsrv.php index 4d84b76bc1..d58efe76ae 100644 --- a/library/Zend/Db/Adapter/Sqlsrv.php +++ b/library/Zend/Db/Adapter/Sqlsrv.php @@ -23,12 +23,12 @@ /** * @see Zend_Db_Adapter_Abstract */ -require_once 'Zend/Db/Adapter/Abstract.php'; +;// require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Db_Statement_Sqlsrv */ -require_once 'Zend/Db/Statement/Sqlsrv.php'; +;// require_once 'Zend/Db/Statement/Sqlsrv.php'; /** * @category Zend @@ -121,7 +121,7 @@ protected function _connect() /** * @see Zend_Db_Adapter_Sqlsrv_Exception */ - require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception('The Sqlsrv extension is required for this adapter but the extension is not loaded'); } @@ -164,7 +164,7 @@ protected function _connect() /** * @see Zend_Db_Adapter_Sqlsrv_Exception */ - require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception(sqlsrv_errors()); } } @@ -181,7 +181,7 @@ protected function _checkRequiredOptions(array $config) // we need at least a dbname if (! array_key_exists('dbname', $config)) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'dbname' that names the database instance"); } @@ -189,7 +189,7 @@ protected function _checkRequiredOptions(array $config) /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'password' for login credentials. If Windows Authentication is desired, both keys 'username' and 'password' should be ommited from config."); } @@ -198,7 +198,7 @@ protected function _checkRequiredOptions(array $config) /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'username' for login credentials. If Windows Authentication is desired, both keys 'username' and 'password' should be ommited from config."); } @@ -239,12 +239,12 @@ public function setTransactionIsolationLevel($level = null) $sql = "SERIALIZABLE"; break; default: - require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception("Invalid transaction isolation level mode '$level' specified"); } if (!sqlsrv_query($this->_connection, "SET TRANSACTION ISOLATION LEVEL $sql;")) { - require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception("Transaction cannot be changed to '$level'"); } @@ -291,7 +291,7 @@ public function prepare($sql) /** * @see Zend_Loader */ - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($stmtClass); } @@ -527,7 +527,7 @@ public function describeTable($tableName, $schemaName = null) protected function _beginTransaction() { if (!sqlsrv_begin_transaction($this->_connection)) { - require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception(sqlsrv_errors()); } } @@ -541,7 +541,7 @@ protected function _beginTransaction() protected function _commit() { if (!sqlsrv_commit($this->_connection)) { - require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception(sqlsrv_errors()); } } @@ -555,7 +555,7 @@ protected function _commit() protected function _rollBack() { if (!sqlsrv_rollback($this->_connection)) { - require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception(sqlsrv_errors()); } } @@ -579,11 +579,11 @@ public function setFetchMode($mode) $this->_fetchMode = $mode; break; case Zend_Db::FETCH_BOUND: // bound to PHP variable - require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception('FETCH_BOUND is not supported yet'); break; default: - require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Sqlsrv/Exception.php'; throw new Zend_Db_Adapter_Sqlsrv_Exception("Invalid fetch mode '$mode' specified"); break; } @@ -602,14 +602,14 @@ public function limit($sql, $count, $offset = 0) { $count = intval($count); if ($count <= 0) { - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + ;// require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/library/Zend/Db/Adapter/Sqlsrv/Exception.php b/library/Zend/Db/Adapter/Sqlsrv/Exception.php index 16bc5ee917..20a5167a3f 100644 --- a/library/Zend/Db/Adapter/Sqlsrv/Exception.php +++ b/library/Zend/Db/Adapter/Sqlsrv/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Adapter_Exception */ -require_once 'Zend/Db/Adapter/Exception.php'; +;// require_once 'Zend/Db/Adapter/Exception.php'; /** * Zend_Db_Adapter_Sqlsrv_Exception diff --git a/library/Zend/Db/Exception.php b/library/Zend/Db/Exception.php index 741b52ea24..f1d8bf9948 100644 --- a/library/Zend/Db/Exception.php +++ b/library/Zend/Db/Exception.php @@ -22,7 +22,7 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/Zend/Db/Profiler.php b/library/Zend/Db/Profiler.php index b5114bc32f..ba9a339e43 100644 --- a/library/Zend/Db/Profiler.php +++ b/library/Zend/Db/Profiler.php @@ -280,7 +280,7 @@ public function queryStart($queryText, $queryType = null) /** * @see Zend_Db_Profiler_Query */ - require_once 'Zend/Db/Profiler/Query.php'; + ;// require_once 'Zend/Db/Profiler/Query.php'; $this->_queryProfiles[] = new Zend_Db_Profiler_Query($queryText, $queryType); end($this->_queryProfiles); @@ -308,7 +308,7 @@ public function queryEnd($queryId) /** * @see Zend_Db_Profiler_Exception */ - require_once 'Zend/Db/Profiler/Exception.php'; + ;// require_once 'Zend/Db/Profiler/Exception.php'; throw new Zend_Db_Profiler_Exception("Profiler has no query with handle '$queryId'."); } @@ -319,7 +319,7 @@ public function queryEnd($queryId) /** * @see Zend_Db_Profiler_Exception */ - require_once 'Zend/Db/Profiler/Exception.php'; + ;// require_once 'Zend/Db/Profiler/Exception.php'; throw new Zend_Db_Profiler_Exception("Query with profiler handle '$queryId' has already ended."); } @@ -361,7 +361,7 @@ public function getQueryProfile($queryId) /** * @see Zend_Db_Profiler_Exception */ - require_once 'Zend/Db/Profiler/Exception.php'; + ;// require_once 'Zend/Db/Profiler/Exception.php'; throw new Zend_Db_Profiler_Exception("Query handle '$queryId' not found in profiler log."); } diff --git a/library/Zend/Db/Profiler/Exception.php b/library/Zend/Db/Profiler/Exception.php index 9f715f3fea..327a1f6d56 100644 --- a/library/Zend/Db/Profiler/Exception.php +++ b/library/Zend/Db/Profiler/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Exception */ -require_once 'Zend/Db/Exception.php'; +;// require_once 'Zend/Db/Exception.php'; /** diff --git a/library/Zend/Db/Profiler/Firebug.php b/library/Zend/Db/Profiler/Firebug.php index 5d543f32a5..4fdbbb62a8 100644 --- a/library/Zend/Db/Profiler/Firebug.php +++ b/library/Zend/Db/Profiler/Firebug.php @@ -21,13 +21,13 @@ */ /** Zend_Db_Profiler */ -require_once 'Zend/Db/Profiler.php'; +;// require_once 'Zend/Db/Profiler.php'; /** Zend_Wildfire_Plugin_FirePhp */ -require_once 'Zend/Wildfire/Plugin/FirePhp.php'; +;// require_once 'Zend/Wildfire/Plugin/FirePhp.php'; /** Zend_Wildfire_Plugin_FirePhp_TableMessage */ -require_once 'Zend/Wildfire/Plugin/FirePhp/TableMessage.php'; +;// require_once 'Zend/Wildfire/Plugin/FirePhp/TableMessage.php'; /** * Writes DB events as log messages to the Firebug Console via FirePHP. diff --git a/library/Zend/Db/Select.php b/library/Zend/Db/Select.php index 55616a507c..beb5cb1e9d 100644 --- a/library/Zend/Db/Select.php +++ b/library/Zend/Db/Select.php @@ -24,12 +24,12 @@ /** * @see Zend_Db_Adapter_Abstract */ -require_once 'Zend/Db/Adapter/Abstract.php'; +;// require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Db_Expr */ -require_once 'Zend/Db/Expr.php'; +;// require_once 'Zend/Db/Expr.php'; /** @@ -253,7 +253,7 @@ public function columns($cols = '*', $correlationName = null) /** * @see Zend_Db_Select_Exception */ - require_once 'Zend/Db/Select/Exception.php'; + ;// require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("No table has been specified for the FROM clause"); } @@ -282,14 +282,14 @@ public function columns($cols = '*', $correlationName = null) public function union($select = array(), $type = self::SQL_UNION) { if (!is_array($select)) { - require_once 'Zend/Db/Select/Exception.php'; + ;// require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception( "union() only accepts an array of Zend_Db_Select instances of sql query strings." ); } if (!in_array($type, self::$_unionTypes)) { - require_once 'Zend/Db/Select/Exception.php'; + ;// require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Invalid union type '{$type}'"); } @@ -666,7 +666,7 @@ public function getPart($part) { $part = strtolower($part); if (!array_key_exists($part, $this->_parts)) { - require_once 'Zend/Db/Select/Exception.php'; + ;// require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Invalid Select part '$part'"); } return $this->_parts[$part]; @@ -759,12 +759,12 @@ protected function _join($type, $name, $cond, $cols, $schema = null) /** * @see Zend_Db_Select_Exception */ - require_once 'Zend/Db/Select/Exception.php'; + ;// require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Invalid join type '$type'"); } if (count($this->_parts[self::UNION])) { - require_once 'Zend/Db/Select/Exception.php'; + ;// require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Invalid use of table with " . self::SQL_UNION); } @@ -806,7 +806,7 @@ protected function _join($type, $name, $cond, $cols, $schema = null) /** * @see Zend_Db_Select_Exception */ - require_once 'Zend/Db/Select/Exception.php'; + ;// require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("You cannot define a correlation name '$correlationName' more than once"); } @@ -875,7 +875,7 @@ protected function _join($type, $name, $cond, $cols, $schema = null) public function _joinUsing($type, $name, $cond, $cols = '*', $schema = null) { if (empty($this->_parts[self::FROM])) { - require_once 'Zend/Db/Select/Exception.php'; + ;// require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("You can only perform a joinUsing after specifying a FROM table"); } @@ -999,7 +999,7 @@ protected function _tableCols($correlationName, $cols, $afterCorrelationName = n protected function _where($condition, $value = null, $type = null, $bool = true) { if (count($this->_parts[self::UNION])) { - require_once 'Zend/Db/Select/Exception.php'; + ;// require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Invalid use of where clause with " . self::SQL_UNION); } @@ -1321,11 +1321,11 @@ public function __call($method, array $args) if ($type) { $type .= ' join'; if (!in_array($type, self::$_joinTypes)) { - require_once 'Zend/Db/Select/Exception.php'; + ;// require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Unrecognized method '$method()'"); } if (in_array($type, array(self::CROSS_JOIN, self::NATURAL_JOIN))) { - require_once 'Zend/Db/Select/Exception.php'; + ;// require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Cannot perform a joinUsing with method '$method()'"); } } else { @@ -1335,7 +1335,7 @@ public function __call($method, array $args) return call_user_func_array(array($this, '_joinUsing'), $args); } - require_once 'Zend/Db/Select/Exception.php'; + ;// require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Unrecognized method '$method()'"); } diff --git a/library/Zend/Db/Select/Exception.php b/library/Zend/Db/Select/Exception.php index b86463ec93..a1df370ec3 100644 --- a/library/Zend/Db/Select/Exception.php +++ b/library/Zend/Db/Select/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Exception */ -require_once 'Zend/Db/Exception.php'; +;// require_once 'Zend/Db/Exception.php'; /** * @category Zend diff --git a/library/Zend/Db/Statement.php b/library/Zend/Db/Statement.php index 48b5e13c71..61810fc7a2 100644 --- a/library/Zend/Db/Statement.php +++ b/library/Zend/Db/Statement.php @@ -23,12 +23,12 @@ /** * @see Zend_Db */ -require_once 'Zend/Db.php'; +;// require_once 'Zend/Db.php'; /** * @see Zend_Db_Statement_Interface */ -require_once 'Zend/Db/Statement/Interface.php'; +;// require_once 'Zend/Db/Statement/Interface.php'; /** * Abstract class to emulate a PDOStatement for native database adapters. @@ -148,7 +148,7 @@ protected function _parseParameters($sql) /** * @see Zend_Db_Statement_Exception */ - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception("Invalid bind-variable position '$val'"); } } else if ($val[0] == ':') { @@ -156,7 +156,7 @@ protected function _parseParameters($sql) /** * @see Zend_Db_Statement_Exception */ - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception("Invalid bind-variable name '$val'"); } } @@ -244,7 +244,7 @@ public function bindParam($parameter, &$variable, $type = null, $length = null, /** * @see Zend_Db_Statement_Exception */ - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception('Invalid bind-variable position'); } @@ -266,7 +266,7 @@ public function bindParam($parameter, &$variable, $type = null, $length = null, /** * @see Zend_Db_Statement_Exception */ - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception("Invalid bind-variable position '$parameter'"); } @@ -436,7 +436,7 @@ public function setFetchMode($mode) /** * @see Zend_Db_Statement_Exception */ - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception('invalid fetch mode'); break; } diff --git a/library/Zend/Db/Statement/Db2.php b/library/Zend/Db/Statement/Db2.php index c23a9f3a95..fc8c1f33d5 100644 --- a/library/Zend/Db/Statement/Db2.php +++ b/library/Zend/Db/Statement/Db2.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Statement */ -require_once 'Zend/Db/Statement.php'; +;// require_once 'Zend/Db/Statement.php'; /** * Extends for DB2 native adapter. @@ -65,7 +65,7 @@ public function _prepare($sql) /** * @see Zend_Db_Statement_Db2_Exception */ - require_once 'Zend/Db/Statement/Db2/Exception.php'; + ;// require_once 'Zend/Db/Statement/Db2/Exception.php'; throw new Zend_Db_Statement_Db2_Exception( db2_stmt_errormsg(), db2_stmt_error() @@ -100,7 +100,7 @@ public function _bindParam($parameter, &$variable, $type = null, $length = null, /** * @see Zend_Db_Statement_Db2_Exception */ - require_once 'Zend/Db/Statement/Db2/Exception.php'; + ;// require_once 'Zend/Db/Statement/Db2/Exception.php'; throw new Zend_Db_Statement_Db2_Exception( db2_stmt_errormsg(), db2_stmt_error() @@ -208,7 +208,7 @@ public function _execute(array $params = null) /** * @see Zend_Db_Statement_Db2_Exception */ - require_once 'Zend/Db/Statement/Db2/Exception.php'; + ;// require_once 'Zend/Db/Statement/Db2/Exception.php'; throw new Zend_Db_Statement_Db2_Exception( db2_stmt_errormsg(), db2_stmt_error()); @@ -272,7 +272,7 @@ public function fetch($style = null, $cursor = null, $offset = null) /** * @see Zend_Db_Statement_Db2_Exception */ - require_once 'Zend/Db/Statement/Db2/Exception.php'; + ;// require_once 'Zend/Db/Statement/Db2/Exception.php'; throw new Zend_Db_Statement_Db2_Exception("Invalid fetch mode '$style' specified"); break; } @@ -306,7 +306,7 @@ public function nextRowset() /** * @see Zend_Db_Statement_Db2_Exception */ - require_once 'Zend/Db/Statement/Db2/Exception.php'; + ;// require_once 'Zend/Db/Statement/Db2/Exception.php'; throw new Zend_Db_Statement_Db2_Exception(__FUNCTION__ . '() is not implemented'); } diff --git a/library/Zend/Db/Statement/Db2/Exception.php b/library/Zend/Db/Statement/Db2/Exception.php index ec6b28ccbf..7746ade0f9 100644 --- a/library/Zend/Db/Statement/Db2/Exception.php +++ b/library/Zend/Db/Statement/Db2/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Statement_Exception */ -require_once 'Zend/Db/Statement/Exception.php'; +;// require_once 'Zend/Db/Statement/Exception.php'; /** * @package Zend_Db diff --git a/library/Zend/Db/Statement/Exception.php b/library/Zend/Db/Statement/Exception.php index 764fd253a0..10d3a99f5a 100644 --- a/library/Zend/Db/Statement/Exception.php +++ b/library/Zend/Db/Statement/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Exception */ -require_once 'Zend/Db/Exception.php'; +;// require_once 'Zend/Db/Exception.php'; /** * Zend_Db_Statement_Exception diff --git a/library/Zend/Db/Statement/Mysqli.php b/library/Zend/Db/Statement/Mysqli.php index fecd67f92d..5c0af0f272 100644 --- a/library/Zend/Db/Statement/Mysqli.php +++ b/library/Zend/Db/Statement/Mysqli.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Statement */ -require_once 'Zend/Db/Statement.php'; +;// require_once 'Zend/Db/Statement.php'; /** @@ -73,7 +73,7 @@ public function _prepare($sql) /** * @see Zend_Db_Statement_Mysqli_Exception */ - require_once 'Zend/Db/Statement/Mysqli/Exception.php'; + ;// require_once 'Zend/Db/Statement/Mysqli/Exception.php'; throw new Zend_Db_Statement_Mysqli_Exception("Mysqli prepare error: " . $mysqli->error, $mysqli->errno); } } @@ -210,7 +210,7 @@ public function _execute(array $params = null) /** * @see Zend_Db_Statement_Mysqli_Exception */ - require_once 'Zend/Db/Statement/Mysqli/Exception.php'; + ;// require_once 'Zend/Db/Statement/Mysqli/Exception.php'; throw new Zend_Db_Statement_Mysqli_Exception("Mysqli statement execute error : " . $this->_stmt->error, $this->_stmt->errno); } @@ -222,7 +222,7 @@ public function _execute(array $params = null) /** * @see Zend_Db_Statement_Mysqli_Exception */ - require_once 'Zend/Db/Statement/Mysqli/Exception.php'; + ;// require_once 'Zend/Db/Statement/Mysqli/Exception.php'; throw new Zend_Db_Statement_Mysqli_Exception("Mysqli statement metadata error: " . $this->_stmt->error, $this->_stmt->errno); } } @@ -319,7 +319,7 @@ public function fetch($style = null, $cursor = null, $offset = null) /** * @see Zend_Db_Statement_Mysqli_Exception */ - require_once 'Zend/Db/Statement/Mysqli/Exception.php'; + ;// require_once 'Zend/Db/Statement/Mysqli/Exception.php'; throw new Zend_Db_Statement_Mysqli_Exception("Invalid fetch mode '$style' specified"); break; } @@ -339,7 +339,7 @@ public function nextRowset() /** * @see Zend_Db_Statement_Mysqli_Exception */ - require_once 'Zend/Db/Statement/Mysqli/Exception.php'; + ;// require_once 'Zend/Db/Statement/Mysqli/Exception.php'; throw new Zend_Db_Statement_Mysqli_Exception(__FUNCTION__.'() is not implemented'); } diff --git a/library/Zend/Db/Statement/Mysqli/Exception.php b/library/Zend/Db/Statement/Mysqli/Exception.php index 2bfc24ff37..7eae6250ce 100644 --- a/library/Zend/Db/Statement/Mysqli/Exception.php +++ b/library/Zend/Db/Statement/Mysqli/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Statement_Exception */ -require_once 'Zend/Db/Statement/Exception.php'; +;// require_once 'Zend/Db/Statement/Exception.php'; /** * @package Zend_Db diff --git a/library/Zend/Db/Statement/Oracle.php b/library/Zend/Db/Statement/Oracle.php index a157a8a439..6ced169d19 100644 --- a/library/Zend/Db/Statement/Oracle.php +++ b/library/Zend/Db/Statement/Oracle.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Statement */ -require_once 'Zend/Db/Statement.php'; +;// require_once 'Zend/Db/Statement.php'; /** * Extends for Oracle. @@ -92,7 +92,7 @@ protected function _prepare($sql) /** * @see Zend_Db_Statement_Oracle_Exception */ - require_once 'Zend/Db/Statement/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception(oci_error($connection)); } } @@ -125,7 +125,7 @@ protected function _bindParam($parameter, &$variable, $type = null, $length = nu /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Statement/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception(oci_error($this->_stmt)); } @@ -249,7 +249,7 @@ public function _execute(array $params = null) /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Statement/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception(oci_error($this->_stmt)); } } @@ -259,7 +259,7 @@ public function _execute(array $params = null) /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Statement/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception(oci_error($this->_stmt)); } @@ -323,7 +323,7 @@ public function fetch($style = null, $cursor = null, $offset = null) /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Statement/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception( array( 'code' => 'HYC00', @@ -337,7 +337,7 @@ public function fetch($style = null, $cursor = null, $offset = null) /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Statement/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception($error); } @@ -374,7 +374,7 @@ public function fetchAll($style = null, $col = 0) /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Statement/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception( array( 'code' => 'HYC00', @@ -402,7 +402,7 @@ public function fetchAll($style = null, $col = 0) /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Statement/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception( array( 'code' => 'HYC00', @@ -419,7 +419,7 @@ public function fetchAll($style = null, $col = 0) /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Statement/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception($error); } if (!$rows) { @@ -442,7 +442,7 @@ public function fetchAll($style = null, $col = 0) /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Statement/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception($error); } } @@ -472,7 +472,7 @@ public function fetchColumn($col = 0) /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Statement/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception($error); } @@ -481,7 +481,7 @@ public function fetchColumn($col = 0) /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Statement/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception(oci_error($this->_stmt)); } @@ -516,7 +516,7 @@ public function fetchObject($class = 'stdClass', array $config = array()) /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Statement/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception($error); } @@ -538,7 +538,7 @@ public function nextRowset() /** * @see Zend_Db_Statement_Oracle_Exception */ - require_once 'Zend/Db/Statement/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception( array( 'code' => 'HYC00', @@ -567,7 +567,7 @@ public function rowCount() /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Statement/Oracle/Exception.php'; + ;// require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception(oci_error($this->_stmt)); } diff --git a/library/Zend/Db/Statement/Oracle/Exception.php b/library/Zend/Db/Statement/Oracle/Exception.php index a7a2a43bf3..4f18ad2ae2 100644 --- a/library/Zend/Db/Statement/Oracle/Exception.php +++ b/library/Zend/Db/Statement/Oracle/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Statement_Exception */ -require_once 'Zend/Db/Statement/Exception.php'; +;// require_once 'Zend/Db/Statement/Exception.php'; /** * @category Zend diff --git a/library/Zend/Db/Statement/Pdo.php b/library/Zend/Db/Statement/Pdo.php index ef7d16ec5a..3e41bf018f 100644 --- a/library/Zend/Db/Statement/Pdo.php +++ b/library/Zend/Db/Statement/Pdo.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Statement */ -require_once 'Zend/Db/Statement.php'; +;// require_once 'Zend/Db/Statement.php'; /** * Proxy class to wrap a PDOStatement object. @@ -57,7 +57,7 @@ protected function _prepare($sql) try { $this->_stmt = $this->_adapter->getConnection()->prepare($sql); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -81,7 +81,7 @@ public function bindColumn($column, &$param, $type = null) return $this->_stmt->bindColumn($column, $param, $type); } } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -113,7 +113,7 @@ protected function _bindParam($parameter, &$variable, $type = null, $length = nu } return $this->_stmt->bindParam($parameter, $variable, $type, $length, $options); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -142,7 +142,7 @@ public function bindValue($parameter, $value, $type = null) return $this->_stmt->bindValue($parameter, $value, $type); } } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -158,7 +158,7 @@ public function closeCursor() try { return $this->_stmt->closeCursor(); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -175,7 +175,7 @@ public function columnCount() try { return $this->_stmt->columnCount(); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -192,7 +192,7 @@ public function errorCode() try { return $this->_stmt->errorCode(); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -209,7 +209,7 @@ public function errorInfo() try { return $this->_stmt->errorInfo(); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -230,7 +230,7 @@ public function _execute(array $params = null) return $this->_stmt->execute(); } } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; $message = sprintf('%s, query was: %s', $e->getMessage(), $this->_stmt->queryString); throw new Zend_Db_Statement_Exception($message, (int) $e->getCode(), $e); } @@ -257,7 +257,7 @@ public function fetch($style = null, $cursor = null, $offset = null) $offset ?? 0 ); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -295,7 +295,7 @@ public function fetchAll($style = null, $col = null) return $this->_stmt->fetchAll($style); } } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -312,7 +312,7 @@ public function fetchColumn($col = 0) try { return $this->_stmt->fetchColumn($col); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -330,7 +330,7 @@ public function fetchObject($class = 'stdClass', array $config = array()) try { return $this->_stmt->fetchObject($class, $config); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -347,7 +347,7 @@ public function getAttribute($key) try { return $this->_stmt->getAttribute($key); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -364,7 +364,7 @@ public function getColumnMeta($column) try { return $this->_stmt->getColumnMeta($column); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -382,7 +382,7 @@ public function nextRowset() try { return $this->_stmt->nextRowset(); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -400,7 +400,7 @@ public function rowCount() try { return $this->_stmt->rowCount(); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -418,7 +418,7 @@ public function setAttribute($key, $val) try { return $this->_stmt->setAttribute($key, $val); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -436,7 +436,7 @@ public function setFetchMode($mode) try { return $this->_stmt->setFetchMode($mode); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } diff --git a/library/Zend/Db/Statement/Pdo/Ibm.php b/library/Zend/Db/Statement/Pdo/Ibm.php index 43aeb1f0cb..fba7a02721 100644 --- a/library/Zend/Db/Statement/Pdo/Ibm.php +++ b/library/Zend/Db/Statement/Pdo/Ibm.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Statement_Pdo */ -require_once 'Zend/Db/Statement/Pdo.php'; +;// require_once 'Zend/Db/Statement/Pdo.php'; /** * Proxy class to wrap a PDOStatement object for IBM Databases. @@ -86,7 +86,7 @@ public function _bindParam($parameter, &$variable, $type = null, $length = null, return $this->_stmt->bindParam($parameter, $variable, $type, $length, $options); } } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + ;// require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } diff --git a/library/Zend/Db/Statement/Pdo/Oci.php b/library/Zend/Db/Statement/Pdo/Oci.php index e8856652f8..07e27df444 100644 --- a/library/Zend/Db/Statement/Pdo/Oci.php +++ b/library/Zend/Db/Statement/Pdo/Oci.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Statement_Pdo */ -require_once 'Zend/Db/Statement/Pdo.php'; +;// require_once 'Zend/Db/Statement/Pdo.php'; /** * Proxy class to wrap a PDOStatement object for IBM Databases. diff --git a/library/Zend/Db/Statement/Sqlsrv.php b/library/Zend/Db/Statement/Sqlsrv.php index 041986e7bd..f80d53ad89 100644 --- a/library/Zend/Db/Statement/Sqlsrv.php +++ b/library/Zend/Db/Statement/Sqlsrv.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Statement */ -require_once 'Zend/Db/Statement.php'; +;// require_once 'Zend/Db/Statement.php'; /** * Extends for Microsoft SQL Server Driver for PHP @@ -66,7 +66,7 @@ protected function _prepare($sql) $this->_stmt = sqlsrv_prepare($connection, $sql); if (!$this->_stmt) { - require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; + ;// require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors()); } @@ -202,7 +202,7 @@ public function _execute(array $params = null) $this->_stmt = sqlsrv_query($connection, $this->_originalSQL, $params); if (!$this->_stmt) { - require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; + ;// require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors()); } @@ -233,7 +233,7 @@ public function fetch($style = null, $cursor = null, $offset = null) $values = sqlsrv_fetch_array($this->_stmt, SQLSRV_FETCH_ASSOC); if (!$values && (null !== $error = sqlsrv_errors())) { - require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; + ;// require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception($error); } @@ -270,7 +270,7 @@ public function fetch($style = null, $cursor = null, $offset = null) $row = $this->_fetchBound($row); break; default: - require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; + ;// require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception("Invalid fetch mode '$style' specified"); break; } @@ -293,7 +293,7 @@ public function fetchColumn($col = 0) if (!sqlsrv_fetch($this->_stmt)) { if (null !== $error = sqlsrv_errors()) { - require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; + ;// require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception($error); } @@ -303,7 +303,7 @@ public function fetchColumn($col = 0) $data = sqlsrv_get_field($this->_stmt, $col); //0-based if ($data === false) { - require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; + ;// require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors()); } @@ -327,7 +327,7 @@ public function fetchObject($class = 'stdClass', array $config = array()) $obj = sqlsrv_fetch_object($this->_stmt); if ($error = sqlsrv_errors()) { - require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; + ;// require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception($error); } @@ -373,7 +373,7 @@ public function getColumnMeta($column) public function nextRowset() { if (sqlsrv_next_result($this->_stmt) === false) { - require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; + ;// require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors()); } @@ -405,7 +405,7 @@ public function rowCount() // Strict check is necessary; 0 is a valid return value if ($num_rows === false) { - require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; + ;// require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors()); } diff --git a/library/Zend/Db/Statement/Sqlsrv/Exception.php b/library/Zend/Db/Statement/Sqlsrv/Exception.php index 5a7482d77b..a98cb1ca9d 100644 --- a/library/Zend/Db/Statement/Sqlsrv/Exception.php +++ b/library/Zend/Db/Statement/Sqlsrv/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Statement_Exception */ -require_once 'Zend/Db/Statement/Exception.php'; +;// require_once 'Zend/Db/Statement/Exception.php'; /** * @package Zend_Db diff --git a/library/Zend/Db/Table.php b/library/Zend/Db/Table.php index 6f676439de..49db9f0da1 100644 --- a/library/Zend/Db/Table.php +++ b/library/Zend/Db/Table.php @@ -23,12 +23,12 @@ /** * @see Zend_Db_Table_Abstract */ -require_once 'Zend/Db/Table/Abstract.php'; +;// require_once 'Zend/Db/Table/Abstract.php'; /** * @see Zend_Db_Table_Definition */ -require_once 'Zend/Db/Table/Definition.php'; +;// require_once 'Zend/Db/Table/Definition.php'; /** * Class for SQL table interface. diff --git a/library/Zend/Db/Table/Abstract.php b/library/Zend/Db/Table/Abstract.php index 7134973e1f..32092a4f67 100644 --- a/library/Zend/Db/Table/Abstract.php +++ b/library/Zend/Db/Table/Abstract.php @@ -23,17 +23,17 @@ /** * @see Zend_Db_Adapter_Abstract */ -require_once 'Zend/Db/Adapter/Abstract.php'; +;// require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Db_Adapter_Abstract */ -require_once 'Zend/Db/Select.php'; +;// require_once 'Zend/Db/Select.php'; /** * @see Zend_Db */ -require_once 'Zend/Db.php'; +;// require_once 'Zend/Db.php'; /** * Class for SQL table interface. @@ -467,11 +467,11 @@ public function getReference($tableClassname, $ruleKey = null) $refMap = $this->_getReferenceMapNormalized(); if ($ruleKey !== null) { if (!isset($refMap[$ruleKey])) { - require_once "Zend/Db/Table/Exception.php"; + ;// require_once "Zend/Db/Table/Exception.php"; throw new Zend_Db_Table_Exception("No reference rule \"$ruleKey\" from table $thisClass to table $tableClassname"); } if ($refMap[$ruleKey][self::REF_TABLE_CLASS] != $tableClassname) { - require_once "Zend/Db/Table/Exception.php"; + ;// require_once "Zend/Db/Table/Exception.php"; throw new Zend_Db_Table_Exception("Reference rule \"$ruleKey\" does not reference table $tableClassname"); } return $refMap[$ruleKey]; @@ -481,7 +481,7 @@ public function getReference($tableClassname, $ruleKey = null) return $reference; } } - require_once "Zend/Db/Table/Exception.php"; + ;// require_once "Zend/Db/Table/Exception.php"; throw new Zend_Db_Table_Exception("No reference from table $thisClass to table $tableClassname"); } @@ -604,11 +604,11 @@ protected static function _setupAdapter($db) return null; } if (is_string($db)) { - require_once 'Zend/Registry.php'; + ;// require_once 'Zend/Registry.php'; $db = Zend_Registry::get($db); } if (!$db instanceof Zend_Db_Adapter_Abstract) { - require_once 'Zend/Db/Table/Exception.php'; + ;// require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception('Argument must be of type Zend_Db_Adapter_Abstract, or a Registry key where a Zend_Db_Adapter_Abstract object is stored'); } return $db; @@ -699,11 +699,11 @@ protected static function _setupMetadataCache($metadataCache) return null; } if (is_string($metadataCache)) { - require_once 'Zend/Registry.php'; + ;// require_once 'Zend/Registry.php'; $metadataCache = Zend_Registry::get($metadataCache); } if (!$metadataCache instanceof Zend_Cache_Core) { - require_once 'Zend/Db/Table/Exception.php'; + ;// require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception('Argument must be of type Zend_Cache_Core, or a Registry key where a Zend_Cache_Core object is stored'); } return $metadataCache; @@ -752,7 +752,7 @@ protected function _setupDatabaseAdapter() if (! $this->_db) { $this->_db = self::getDefaultAdapter(); if (!$this->_db instanceof Zend_Db_Adapter_Abstract) { - require_once 'Zend/Db/Table/Exception.php'; + ;// require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception('No adapter found for ' . get_class($this)); } } @@ -885,7 +885,7 @@ protected function _setupPrimaryKey() // if no primary key was specified and none was found in the metadata // then throw an exception. if (empty($this->_primary)) { - require_once 'Zend/Db/Table/Exception.php'; + ;// require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception("A table must have a primary key, but none was found for table '{$this->_name}'"); } } else if (!is_array($this->_primary)) { @@ -897,7 +897,7 @@ protected function _setupPrimaryKey() $cols = $this->_getCols(); if (! array_intersect((array) $this->_primary, $cols) == (array) $this->_primary) { - require_once 'Zend/Db/Table/Exception.php'; + ;// require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception("Primary key column(s) (" . implode(',', (array) $this->_primary) . ") are not columns in this table (" @@ -1000,7 +1000,7 @@ public function info($key = null) } if (!array_key_exists($key, $info)) { - require_once 'Zend/Db/Table/Exception.php'; + ;// require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception('There is no table information for the key "' . $key . '"'); } @@ -1015,7 +1015,7 @@ public function info($key = null) */ public function select($withFromPart = self::SELECT_WITHOUT_FROM_PART) { - require_once 'Zend/Db/Table/Select.php'; + ;// require_once 'Zend/Db/Table/Select.php'; $select = new Zend_Db_Table_Select($this); if ($withFromPart == self::SELECT_WITH_FROM_PART) { $select->from($this->info(self::NAME), Zend_Db_Table_Select::SQL_WILDCARD, $this->info(self::SCHEMA)); @@ -1112,7 +1112,7 @@ public function isIdentity($column) /** * @see Zend_Db_Table_Exception */ - require_once 'Zend/Db/Table/Exception.php'; + ;// require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception('Column "' . $column . '" not found in table.'); } @@ -1292,12 +1292,12 @@ public function find() $keyNames = array_values((array) $this->_primary); if (count($args) < count($keyNames)) { - require_once 'Zend/Db/Table/Exception.php'; + ;// require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception("Too few columns for the primary key"); } if (count($args) > count($keyNames)) { - require_once 'Zend/Db/Table/Exception.php'; + ;// require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception("Too many columns for the primary key"); } @@ -1316,7 +1316,7 @@ public function find() if ($numberTerms == 0) { $numberTerms = $keyValuesCount; } else if ($keyValuesCount != $numberTerms) { - require_once 'Zend/Db/Table/Exception.php'; + ;// require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception("Missing value(s) for the primary key"); } $keyValues = array_values($keyValues); @@ -1350,7 +1350,7 @@ public function find() if ($whereClause == null) { $rowsetClass = $this->getRowsetClass(); if (!class_exists($rowsetClass)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($rowsetClass); } return new $rowsetClass(array('table' => $this, 'rowClass' => $this->getRowClass(), 'stored' => true)); @@ -1403,7 +1403,7 @@ public function fetchAll($where = null, $order = null, $count = null, $offset = $rowsetClass = $this->getRowsetClass(); if (!class_exists($rowsetClass)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($rowsetClass); } return new $rowsetClass($data); @@ -1453,7 +1453,7 @@ public function fetchRow($where = null, $order = null, $offset = null) $rowClass = $this->getRowClass(); if (!class_exists($rowClass)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($rowClass); } return new $rowClass($data); @@ -1516,7 +1516,7 @@ public function createRow(array $data = array(), $defaultSource = null) $rowClass = $this->getRowClass(); if (!class_exists($rowClass)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($rowClass); } $row = new $rowClass($config); @@ -1602,10 +1602,10 @@ public static function getTableFromString($tableName, Zend_Db_Table_Abstract $re // assume the tableName is the class name if (!class_exists($tableName)) { try { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($tableName); } catch (Zend_Exception $e) { - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception($e->getMessage(), $e->getCode(), $e); } } diff --git a/library/Zend/Db/Table/Exception.php b/library/Zend/Db/Table/Exception.php index cd74fa6bf2..b6062c3d0e 100644 --- a/library/Zend/Db/Table/Exception.php +++ b/library/Zend/Db/Table/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Exception */ -require_once 'Zend/Db/Exception.php'; +;// require_once 'Zend/Db/Exception.php'; /** * @category Zend diff --git a/library/Zend/Db/Table/Row.php b/library/Zend/Db/Table/Row.php index 91ccd3bdeb..466c79d445 100644 --- a/library/Zend/Db/Table/Row.php +++ b/library/Zend/Db/Table/Row.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Table_Row_Abstract */ -require_once 'Zend/Db/Table/Row/Abstract.php'; +;// require_once 'Zend/Db/Table/Row/Abstract.php'; /** diff --git a/library/Zend/Db/Table/Row/Abstract.php b/library/Zend/Db/Table/Row/Abstract.php index e276f90fcb..a35e1d0ba1 100644 --- a/library/Zend/Db/Table/Row/Abstract.php +++ b/library/Zend/Db/Table/Row/Abstract.php @@ -23,7 +23,7 @@ /** * @see Zend_Db */ -require_once 'Zend/Db.php'; +;// require_once 'Zend/Db.php'; /** * @category Zend @@ -122,7 +122,7 @@ public function __construct(array $config = array()) if (isset($config['data'])) { if (!is_array($config['data'])) { - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('Data must be an array'); } $this->_data = $config['data']; @@ -157,7 +157,7 @@ public function __construct(array $config = array()) protected function _transformColumn($columnName) { if (!is_string($columnName)) { - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('Specified column is not a string'); } // Perform no transformation by default @@ -175,7 +175,7 @@ public function __get($columnName) { $columnName = $this->_transformColumn($columnName); if (!array_key_exists($columnName, $this->_data)) { - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Specified column \"$columnName\" is not in the row"); } return $this->_data[$columnName]; @@ -193,7 +193,7 @@ public function __set($columnName, $value) { $columnName = $this->_transformColumn($columnName); if (!array_key_exists($columnName, $this->_data)) { - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Specified column \"$columnName\" is not in the row"); } $this->_data[$columnName] = $value; @@ -211,11 +211,11 @@ public function __unset($columnName) { $columnName = $this->_transformColumn($columnName); if (!array_key_exists($columnName, $this->_data)) { - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Specified column \"$columnName\" is not in the row"); } if ($this->isConnected() && in_array($columnName, $this->_table->info('primary'))) { - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Specified column \"$columnName\" is a primary key and should not be unset"); } unset($this->_data[$columnName]); @@ -343,7 +343,7 @@ public function setTable(Zend_Db_Table_Abstract $table = null) $tableClass = get_class($table); if (! $table instanceof $this->_tableClass) { - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("The specified Table is of class $tableClass, expecting class to be instance of $this->_tableClass"); } @@ -353,13 +353,13 @@ public function setTable(Zend_Db_Table_Abstract $table = null) $info = $this->_table->info(); if ($info['cols'] != array_keys($this->_data)) { - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('The specified Table does not have the same columns as the Row'); } if (! array_intersect((array) $this->_primary, $info['primary']) == (array) $this->_primary) { - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("The specified Table '$tableClass' does not have the same primary key as the Row"); } @@ -452,7 +452,7 @@ protected function _doInsert() * A read-only row cannot be saved. */ if ($this->_readOnly === true) { - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('This row has been marked read-only'); } @@ -510,7 +510,7 @@ protected function _doUpdate() * A read-only row cannot be saved. */ if ($this->_readOnly === true) { - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('This row has been marked read-only'); } @@ -599,7 +599,7 @@ public function delete() * A read-only row cannot be deleted. */ if ($this->_readOnly === true) { - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('This row has been marked read-only'); } @@ -693,7 +693,7 @@ public function refresh() protected function _getTable() { if (!$this->_connected) { - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('Cannot save a Row unless it is connected'); } return $this->_table; @@ -708,7 +708,7 @@ protected function _getTable() protected function _getPrimaryKey($useDirty = true) { if (!is_array($this->_primary)) { - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("The primary key must be set as an array"); } @@ -719,7 +719,7 @@ protected function _getPrimaryKey($useDirty = true) $array = array_intersect_key($this->_cleanData, $primary); } if (count($primary) != count($array)) { - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("The specified Table '$this->_tableClass' does not have the same primary key as the Row"); } return $array; @@ -772,7 +772,7 @@ protected function _refresh() $row = $this->_getTable()->fetchRow($where); if (null === $row) { - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception('Cannot refresh row as parent is missing'); } @@ -889,7 +889,7 @@ public function findDependentRowset($dependentTable, $ruleKey = null, Zend_Db_Ta if ($type == 'object') { $type = get_class($dependentTable); } - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Dependent table must be a Zend_Db_Table_Abstract, but it is $type"); } @@ -945,7 +945,7 @@ public function findParentRow($parentTable, $ruleKey = null, Zend_Db_Table_Selec if ($type == 'object') { $type = get_class($parentTable); } - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Parent table must be a Zend_Db_Table_Abstract, but it is $type"); } @@ -1013,7 +1013,7 @@ public function findManyToManyRowset($matchTable, $intersectionTable, $callerRef if ($type == 'object') { $type = get_class($intersectionTable); } - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Intersection table must be a Zend_Db_Table_Abstract, but it is $type"); } @@ -1033,7 +1033,7 @@ public function findManyToManyRowset($matchTable, $intersectionTable, $callerRef if ($type == 'object') { $type = get_class($matchTable); } - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Match table must be a Zend_Db_Table_Abstract, but it is $type"); } @@ -1097,10 +1097,10 @@ public function findManyToManyRowset($matchTable, $intersectionTable, $callerRef $rowsetClass = $matchTable->getRowsetClass(); if (!class_exists($rowsetClass)) { try { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($rowsetClass); } catch (Zend_Exception $e) { - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -1166,7 +1166,7 @@ public function __call($method, array $args) return $this->findDependentRowset($class, $ruleKey1, $select); } - require_once 'Zend/Db/Table/Row/Exception.php'; + ;// require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception("Unrecognized method '$method()'"); } diff --git a/library/Zend/Db/Table/Row/Exception.php b/library/Zend/Db/Table/Row/Exception.php index e6a4b28677..b86792d7b3 100644 --- a/library/Zend/Db/Table/Row/Exception.php +++ b/library/Zend/Db/Table/Row/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Table_Exception */ -require_once 'Zend/Db/Table/Exception.php'; +;// require_once 'Zend/Db/Table/Exception.php'; /** * @category Zend diff --git a/library/Zend/Db/Table/Rowset.php b/library/Zend/Db/Table/Rowset.php index a7f67a4d2e..83f587ecaf 100644 --- a/library/Zend/Db/Table/Rowset.php +++ b/library/Zend/Db/Table/Rowset.php @@ -25,7 +25,7 @@ /** * @see Zend_Db_Table_Rowset_Abstract */ -require_once 'Zend/Db/Table/Rowset/Abstract.php'; +;// require_once 'Zend/Db/Table/Rowset/Abstract.php'; /** diff --git a/library/Zend/Db/Table/Rowset/Abstract.php b/library/Zend/Db/Table/Rowset/Abstract.php index acffb65608..3602f662b9 100644 --- a/library/Zend/Db/Table/Rowset/Abstract.php +++ b/library/Zend/Db/Table/Rowset/Abstract.php @@ -112,7 +112,7 @@ public function __construct(array $config) $this->_rowClass = $config['rowClass']; } if (!class_exists($this->_rowClass)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($this->_rowClass); } if (isset($config['data'])) { @@ -312,7 +312,7 @@ public function seek($position) { $position = (int) $position; if ($position < 0 || $position >= $this->_count) { - require_once 'Zend/Db/Table/Rowset/Exception.php'; + ;// require_once 'Zend/Db/Table/Rowset/Exception.php'; throw new Zend_Db_Table_Rowset_Exception("Illegal index $position"); } $this->_pointer = $position; @@ -342,7 +342,7 @@ public function offsetGet($offset): Zend_Db_Table_Row_Abstract { $offset = (int) $offset; if ($offset < 0 || $offset >= $this->_count) { - require_once 'Zend/Db/Table/Rowset/Exception.php'; + ;// require_once 'Zend/Db/Table/Rowset/Exception.php'; throw new Zend_Db_Table_Rowset_Exception("Illegal index $offset"); } $this->_pointer = $offset; @@ -384,7 +384,7 @@ public function getRow($position, $seek = false) try { $row = $this->_loadAndReturnRow($position); } catch (Zend_Db_Table_Rowset_Exception $e) { - require_once 'Zend/Db/Table/Rowset/Exception.php'; + ;// require_once 'Zend/Db/Table/Rowset/Exception.php'; throw new Zend_Db_Table_Rowset_Exception('No row could be found at position ' . (int) $position, 0, $e); } @@ -415,7 +415,7 @@ public function toArray() protected function _loadAndReturnRow($position) { if (!isset($this->_data[$position])) { - require_once 'Zend/Db/Table/Rowset/Exception.php'; + ;// require_once 'Zend/Db/Table/Rowset/Exception.php'; throw new Zend_Db_Table_Rowset_Exception("Data for provided position does not exist"); } diff --git a/library/Zend/Db/Table/Rowset/Exception.php b/library/Zend/Db/Table/Rowset/Exception.php index 71dd5868ec..b14d1fc0cf 100644 --- a/library/Zend/Db/Table/Rowset/Exception.php +++ b/library/Zend/Db/Table/Rowset/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Table_Exception */ -require_once 'Zend/Db/Table/Exception.php'; +;// require_once 'Zend/Db/Table/Exception.php'; /** * @category Zend diff --git a/library/Zend/Db/Table/Select.php b/library/Zend/Db/Table/Select.php index c352836c99..132394fdbf 100644 --- a/library/Zend/Db/Table/Select.php +++ b/library/Zend/Db/Table/Select.php @@ -25,13 +25,13 @@ /** * @see Zend_Db_Select */ -require_once 'Zend/Db/Select.php'; +;// require_once 'Zend/Db/Select.php'; /** * @see Zend_Db_Table_Abstract */ -require_once 'Zend/Db/Table/Abstract.php'; +;// require_once 'Zend/Db/Table/Abstract.php'; /** @@ -211,7 +211,7 @@ public function assemble() // Check each column to ensure it only references the primary table if ($column) { if (!isset($from[$table]) || $from[$table]['tableName'] != $primary) { - require_once 'Zend/Db/Table/Select/Exception.php'; + ;// require_once 'Zend/Db/Table/Select/Exception.php'; throw new Zend_Db_Table_Select_Exception('Select query cannot join with another table'); } } diff --git a/library/Zend/Db/Table/Select/Exception.php b/library/Zend/Db/Table/Select/Exception.php index a8222845be..c1b4c35a0b 100644 --- a/library/Zend/Db/Table/Select/Exception.php +++ b/library/Zend/Db/Table/Select/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Exception */ -require_once 'Zend/Db/Select/Exception.php'; +;// require_once 'Zend/Db/Select/Exception.php'; /** * @category Zend diff --git a/library/Zend/Dom/Exception.php b/library/Zend/Dom/Exception.php index 9407822673..e489e84eec 100644 --- a/library/Zend/Dom/Exception.php +++ b/library/Zend/Dom/Exception.php @@ -20,7 +20,7 @@ */ /** Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * Zend_Dom Exceptions diff --git a/library/Zend/Dom/Query.php b/library/Zend/Dom/Query.php index 3f87cca176..d1767ffbff 100644 --- a/library/Zend/Dom/Query.php +++ b/library/Zend/Dom/Query.php @@ -22,18 +22,18 @@ /** * @see Zend_Dom_Query_Css2Xpath */ -require_once 'Zend/Dom/Query/Css2Xpath.php'; +;// require_once 'Zend/Dom/Query/Css2Xpath.php'; /** * @see Zend_Dom_Query_Result */ -require_once 'Zend/Dom/Query/Result.php'; +;// require_once 'Zend/Dom/Query/Result.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** @see Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; +;// require_once 'Zend/Xml/Exception.php'; /** * Query DOM structures based on CSS selectors and/or XPath @@ -266,7 +266,7 @@ public function query($query) public function queryXpath($xpathQuery, $query = null) { if (null === ($document = $this->getDocument())) { - require_once 'Zend/Dom/Exception.php'; + ;// require_once 'Zend/Dom/Exception.php'; throw new Zend_Dom_Exception('Cannot query; no document registered'); } @@ -288,7 +288,7 @@ public function queryXpath($xpathQuery, $query = null) $domDoc = Zend_Xml_Security::scan($document, $domDoc); $success = ($domDoc !== false); } catch (Zend_Xml_Exception $e) { - require_once 'Zend/Dom/Exception.php'; + ;// require_once 'Zend/Dom/Exception.php'; throw new Zend_Dom_Exception( $e->getMessage() ); @@ -308,7 +308,7 @@ public function queryXpath($xpathQuery, $query = null) libxml_use_internal_errors(false); if (!$success) { - require_once 'Zend/Dom/Exception.php'; + ;// require_once 'Zend/Dom/Exception.php'; throw new Zend_Dom_Exception(sprintf('Error parsing document (type == %s)', $type)); } diff --git a/library/Zend/EventManager/Event.php b/library/Zend/EventManager/Event.php index a69d019408..eef78ac1fe 100644 --- a/library/Zend/EventManager/Event.php +++ b/library/Zend/EventManager/Event.php @@ -18,7 +18,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/EventManager/EventDescription.php'; +;// require_once 'Zend/EventManager/EventDescription.php'; /** * Representation of an event @@ -111,7 +111,7 @@ public function getTarget() public function setParams($params) { if (!is_array($params) && !is_object($params)) { - require_once 'Zend/EventManager/Exception/InvalidArgumentException.php'; + ;// require_once 'Zend/EventManager/Exception/InvalidArgumentException.php'; throw new Zend_EventManager_Exception_InvalidArgumentException(sprintf( 'Event parameters must be an array or object; received "%s"', (is_object($params) ? get_class($params) : gettype($params)) diff --git a/library/Zend/EventManager/EventCollection.php b/library/Zend/EventManager/EventCollection.php index 7318425ea3..fab2193cd0 100644 --- a/library/Zend/EventManager/EventCollection.php +++ b/library/Zend/EventManager/EventCollection.php @@ -18,7 +18,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Stdlib/CallbackHandler.php'; +;// require_once 'Zend/Stdlib/CallbackHandler.php'; /** * Interface for messengers diff --git a/library/Zend/EventManager/EventManager.php b/library/Zend/EventManager/EventManager.php index 732b7a2618..36a60a1c96 100644 --- a/library/Zend/EventManager/EventManager.php +++ b/library/Zend/EventManager/EventManager.php @@ -18,13 +18,13 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/EventManager/Event.php'; -require_once 'Zend/EventManager/EventCollection.php'; -require_once 'Zend/EventManager/ResponseCollection.php'; -require_once 'Zend/EventManager/SharedEventCollectionAware.php'; -require_once 'Zend/EventManager/StaticEventManager.php'; -require_once 'Zend/Stdlib/CallbackHandler.php'; -require_once 'Zend/Stdlib/PriorityQueue.php'; +;// require_once 'Zend/EventManager/Event.php'; +;// require_once 'Zend/EventManager/EventCollection.php'; +;// require_once 'Zend/EventManager/ResponseCollection.php'; +;// require_once 'Zend/EventManager/SharedEventCollectionAware.php'; +;// require_once 'Zend/EventManager/StaticEventManager.php'; +;// require_once 'Zend/Stdlib/CallbackHandler.php'; +;// require_once 'Zend/Stdlib/PriorityQueue.php'; /** * Event manager: notification system @@ -201,7 +201,7 @@ public function trigger($event, $target = null, $argv = array(), $callback = nul } if ($callback && !is_callable($callback)) { - require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; + ;// require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; throw new Zend_Stdlib_Exception_InvalidCallbackException('Invalid callback provided'); } @@ -243,7 +243,7 @@ public function triggerUntil($event, $target, $argv = null, $callback = null) } if (!is_callable($callback)) { - require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; + ;// require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; throw new Zend_Stdlib_Exception_InvalidCallbackException('Invalid callback provided'); } @@ -278,7 +278,7 @@ public function attach($event, $callback = null, $priority = 1) // Null callback is invalid if (null === $callback) { - require_once 'Zend/EventManager/Exception/InvalidArgumentException.php'; + ;// require_once 'Zend/EventManager/Exception/InvalidArgumentException.php'; throw new Zend_EventManager_Exception_InvalidArgumentException(sprintf( '%s: expects a callback; none provided', __METHOD__ @@ -337,7 +337,7 @@ public function detach($listener) } if (!$listener instanceof Zend_Stdlib_CallbackHandler) { - require_once 'Zend/EventManager/Exception/InvalidArgumentException.php'; + ;// require_once 'Zend/EventManager/Exception/InvalidArgumentException.php'; throw new Zend_EventManager_Exception_InvalidArgumentException(sprintf( '%s: expected a Zend_EventManager_ListenerAggregate or Zend_Stdlib_CallbackHandler; received "%s"', __METHOD__, diff --git a/library/Zend/EventManager/Exception/InvalidArgumentException.php b/library/Zend/EventManager/Exception/InvalidArgumentException.php index 793d893ba6..348cf421f2 100644 --- a/library/Zend/EventManager/Exception/InvalidArgumentException.php +++ b/library/Zend/EventManager/Exception/InvalidArgumentException.php @@ -21,12 +21,12 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @see Zend_EventManager_Exception */ -require_once 'Zend/EventManager/Exception.php'; +;// require_once 'Zend/EventManager/Exception.php'; /** * Invalid argument exception diff --git a/library/Zend/EventManager/Filter.php b/library/Zend/EventManager/Filter.php index fc932e8056..dd077af8c7 100644 --- a/library/Zend/EventManager/Filter.php +++ b/library/Zend/EventManager/Filter.php @@ -18,7 +18,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Stdlib/CallbackHandler.php'; +;// require_once 'Zend/Stdlib/CallbackHandler.php'; /** * Interface for intercepting filter chains diff --git a/library/Zend/EventManager/Filter/FilterIterator.php b/library/Zend/EventManager/Filter/FilterIterator.php index dbbe711873..e3a873b273 100644 --- a/library/Zend/EventManager/Filter/FilterIterator.php +++ b/library/Zend/EventManager/Filter/FilterIterator.php @@ -18,8 +18,8 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Stdlib/CallbackHandler.php'; -require_once 'Zend/Stdlib/SplPriorityQueue.php'; +;// require_once 'Zend/Stdlib/CallbackHandler.php'; +;// require_once 'Zend/Stdlib/SplPriorityQueue.php'; /** * Specialized priority queue implementation for use with an intercepting diff --git a/library/Zend/EventManager/FilterChain.php b/library/Zend/EventManager/FilterChain.php index 8aa8741e43..8148a4f1b7 100644 --- a/library/Zend/EventManager/FilterChain.php +++ b/library/Zend/EventManager/FilterChain.php @@ -18,9 +18,9 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/EventManager/Filter.php'; -require_once 'Zend/EventManager/Filter/FilterIterator.php'; -require_once 'Zend/Stdlib/CallbackHandler.php'; +;// require_once 'Zend/EventManager/Filter.php'; +;// require_once 'Zend/EventManager/Filter/FilterIterator.php'; +;// require_once 'Zend/Stdlib/CallbackHandler.php'; /** * FilterChain: intercepting filter manager @@ -85,7 +85,7 @@ public function run($context, array $argv = array()) public function attach($callback, $priority = 1) { if (empty($callback)) { - require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; + ;// require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; throw new Zend_Stdlib_Exception_InvalidCallbackException('No callback provided'); } $filter = new Zend_Stdlib_CallbackHandler($callback, array('priority' => $priority)); diff --git a/library/Zend/EventManager/GlobalEventManager.php b/library/Zend/EventManager/GlobalEventManager.php index 19e5f24d4e..3744a541fc 100644 --- a/library/Zend/EventManager/GlobalEventManager.php +++ b/library/Zend/EventManager/GlobalEventManager.php @@ -18,8 +18,8 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Stdlib/CallbackHandler.php'; -require_once 'Zend/Stdlib/PriorityQueue.php'; +;// require_once 'Zend/Stdlib/CallbackHandler.php'; +;// require_once 'Zend/Stdlib/PriorityQueue.php'; /** * Event manager: notification system diff --git a/library/Zend/EventManager/SharedEventCollectionAware.php b/library/Zend/EventManager/SharedEventCollectionAware.php index 1bcdc87478..db57b3471b 100644 --- a/library/Zend/EventManager/SharedEventCollectionAware.php +++ b/library/Zend/EventManager/SharedEventCollectionAware.php @@ -19,7 +19,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/EventManager/SharedEventCollection.php'; +;// require_once 'Zend/EventManager/SharedEventCollection.php'; /** * Interface to automate setter injection for a SharedEventCollection instance diff --git a/library/Zend/EventManager/SharedEventManager.php b/library/Zend/EventManager/SharedEventManager.php index be232351b3..6773885fec 100644 --- a/library/Zend/EventManager/SharedEventManager.php +++ b/library/Zend/EventManager/SharedEventManager.php @@ -18,8 +18,8 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/EventManager/EventManager.php'; -require_once 'Zend/EventManager/SharedEventCollection.php'; +;// require_once 'Zend/EventManager/EventManager.php'; +;// require_once 'Zend/EventManager/SharedEventCollection.php'; /** * Shared/contextual EventManager diff --git a/library/Zend/EventManager/StaticEventManager.php b/library/Zend/EventManager/StaticEventManager.php index eaa6dbec12..c041a3328d 100644 --- a/library/Zend/EventManager/StaticEventManager.php +++ b/library/Zend/EventManager/StaticEventManager.php @@ -18,9 +18,9 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/EventManager/EventManager.php'; -require_once 'Zend/EventManager/SharedEventManager.php'; -require_once 'Zend/Stdlib/CallbackHandler.php'; +;// require_once 'Zend/EventManager/EventManager.php'; +;// require_once 'Zend/EventManager/SharedEventManager.php'; +;// require_once 'Zend/Stdlib/CallbackHandler.php'; /** * Static version of EventManager diff --git a/library/Zend/Feed.php b/library/Zend/Feed.php index 25c0a02566..2f3088038f 100644 --- a/library/Zend/Feed.php +++ b/library/Zend/Feed.php @@ -21,7 +21,7 @@ */ /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** * Feed utility class @@ -86,7 +86,7 @@ public static function getHttpClient() /** * @see Zend_Http_Client */ - require_once 'Zend/Http/Client.php'; + ;// require_once 'Zend/Http/Client.php'; self::$_httpClient = new Zend_Http_Client(); } @@ -175,7 +175,7 @@ public static function import($uri) /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus()); } $feed = $response->getBody(); @@ -193,7 +193,7 @@ public static function import($uri) public static function importString($string) { if (trim($string) == '') { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Document/string being imported' . ' is an Empty string or comes from an empty HTTP response'); } @@ -214,7 +214,7 @@ public static function importString($string) /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception($errormsg); } @@ -224,7 +224,7 @@ public static function importString($string) /** * @see Zend_Feed_Atom */ - require_once 'Zend/Feed/Atom.php'; + ;// require_once 'Zend/Feed/Atom.php'; // return a newly created Zend_Feed_Atom object return new Zend_Feed_Atom(null, $string); } @@ -234,7 +234,7 @@ public static function importString($string) /** * @see Zend_Feed_Rss */ - require_once 'Zend/Feed/Rss.php'; + ;// require_once 'Zend/Feed/Rss.php'; // return a newly created Zend_Feed_Rss object return new Zend_Feed_Rss(null, $string); } @@ -243,7 +243,7 @@ public static function importString($string) /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid or unsupported feed format'); } @@ -262,7 +262,7 @@ public static function importFile($filename) /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = error_get_last()['message'] ?? 'Unknown error'; throw new Zend_Feed_Exception("File could not be loaded: $message"); } @@ -290,7 +290,7 @@ public static function findFeeds($uri) /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception("Failed to access $uri, got response code " . $response->getStatus()); } $contents = $response->getBody(); @@ -302,7 +302,7 @@ public static function findFeeds($uri) /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = error_get_last()['message'] ?? 'Unknown error'; throw new Zend_Feed_Exception("Internal error: $message"); } @@ -377,14 +377,14 @@ public static function importArray(array $data, $format = 'atom') { $obj = 'Zend_Feed_' . ucfirst(strtolower($format)); if (!class_exists($obj)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($obj); } /** * @see Zend_Feed_Builder */ - require_once 'Zend/Feed/Builder.php'; + ;// require_once 'Zend/Feed/Builder.php'; return new $obj(null, null, new Zend_Feed_Builder($data)); } @@ -399,7 +399,7 @@ public static function importBuilder(Zend_Feed_Builder_Interface $builder, $form { $obj = 'Zend_Feed_' . ucfirst(strtolower($format)); if (!class_exists($obj)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($obj); } return new $obj(null, null, $builder); diff --git a/library/Zend/Feed/Abstract.php b/library/Zend/Feed/Abstract.php index 594ce8a4e2..814cad2f38 100644 --- a/library/Zend/Feed/Abstract.php +++ b/library/Zend/Feed/Abstract.php @@ -24,10 +24,10 @@ /** * @see Zend_Feed_Element */ -require_once 'Zend/Feed/Element.php'; +;// require_once 'Zend/Feed/Element.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** * The Zend_Feed_Abstract class is an abstract class representing feeds. @@ -82,7 +82,7 @@ public function __construct($uri = null, $string = null, Zend_Feed_Builder_Inter /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus() . '; request: ' . $client->getLastRequest() . "\nresponse: " . $response->asString()); } $this->_element = $this->_importFeedFromString($response->getBody()); @@ -128,7 +128,7 @@ public function __wakeup() /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception("DOMDocument cannot parse XML: $message"); } @@ -270,7 +270,7 @@ abstract public function send(); protected function _importFeedFromString($feed) { if (trim($feed) == '') { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Remote feed being imported' . ' is an Empty string or comes from an empty HTTP response'); } @@ -291,7 +291,7 @@ protected function _importFeedFromString($feed) /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception($errormsg); } diff --git a/library/Zend/Feed/Atom.php b/library/Zend/Feed/Atom.php index 2ee08cef6a..e0a91ad666 100644 --- a/library/Zend/Feed/Atom.php +++ b/library/Zend/Feed/Atom.php @@ -24,12 +24,12 @@ /** * @see Zend_Feed_Abstract */ -require_once 'Zend/Feed/Abstract.php'; +;// require_once 'Zend/Feed/Abstract.php'; /** * @see Zend_Feed_Entry_Atom */ -require_once 'Zend/Feed/Entry/Atom.php'; +;// require_once 'Zend/Feed/Entry/Atom.php'; /** @@ -92,7 +92,7 @@ public function __wakeup() /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('No root or <' . $this->_entryElementName . '> element found, cannot parse feed.'); } @@ -379,7 +379,7 @@ public function send() /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Cannot send ATOM because headers have already been sent.'); } diff --git a/library/Zend/Feed/Builder.php b/library/Zend/Feed/Builder.php index f35dc7f1fc..c531ebecc8 100644 --- a/library/Zend/Feed/Builder.php +++ b/library/Zend/Feed/Builder.php @@ -24,17 +24,17 @@ /** * @see Zend_Feed_Builder_Interface */ -require_once 'Zend/Feed/Builder/Interface.php'; +;// require_once 'Zend/Feed/Builder/Interface.php'; /** * @see Zend_Feed_Builder_Header */ -require_once 'Zend/Feed/Builder/Header.php'; +;// require_once 'Zend/Feed/Builder/Header.php'; /** * @see Zend_Feed_Builder_Entry */ -require_once 'Zend/Feed/Builder/Entry.php'; +;// require_once 'Zend/Feed/Builder/Entry.php'; /** @@ -220,7 +220,7 @@ protected function _createHeader(array $data) /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("$mandatory key is missing"); } } @@ -268,7 +268,7 @@ protected function _createHeader(array $data) /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("you have to define $mandatory property of your cloud"); } } @@ -282,7 +282,7 @@ protected function _createHeader(array $data) /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("you have to define $mandatory property of your textInput"); } } @@ -349,7 +349,7 @@ protected function _createEntries(array $data) /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("$mandatory key is missing"); } } @@ -379,7 +379,7 @@ protected function _createEntries(array $data) /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("$mandatory key of source property is missing"); } } diff --git a/library/Zend/Feed/Builder/Entry.php b/library/Zend/Feed/Builder/Entry.php index d911cf6658..5a85832ce2 100644 --- a/library/Zend/Feed/Builder/Entry.php +++ b/library/Zend/Feed/Builder/Entry.php @@ -224,7 +224,7 @@ public function addCategory(array $category) /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("you have to define the name of the category"); } @@ -263,7 +263,7 @@ public function setEnclosures(array $enclosures) /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("you have to supply an url for your enclosure"); } $type = isset($enclosure['type']) ? $enclosure['type'] : ''; diff --git a/library/Zend/Feed/Builder/Exception.php b/library/Zend/Feed/Builder/Exception.php index 00213c9c89..9bf944d861 100644 --- a/library/Zend/Feed/Builder/Exception.php +++ b/library/Zend/Feed/Builder/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Feed_Exception */ -require_once 'Zend/Feed/Exception.php'; +;// require_once 'Zend/Feed/Exception.php'; /** diff --git a/library/Zend/Feed/Builder/Header.php b/library/Zend/Feed/Builder/Header.php index 7ff4d9b9ba..db985e35d8 100644 --- a/library/Zend/Feed/Builder/Header.php +++ b/library/Zend/Feed/Builder/Header.php @@ -23,12 +23,12 @@ /** * @see Zend_Feed_Builder_Header_Itunes */ -require_once 'Zend/Feed/Builder/Header/Itunes.php'; +;// require_once 'Zend/Feed/Builder/Header/Itunes.php'; /** * @see Zend_Uri */ -require_once 'Zend/Uri.php'; +;// require_once 'Zend/Uri.php'; /** @@ -172,13 +172,13 @@ public function setEmail($email) /** * @see Zend_Validate_EmailAddress */ - require_once 'Zend/Validate/EmailAddress.php'; + ;// require_once 'Zend/Validate/EmailAddress.php'; $validate = new Zend_Validate_EmailAddress(); if (!$validate->isValid($email)) { /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("you have to set a valid email address into the email property"); } $this->offsetSet('email', $email); @@ -246,13 +246,13 @@ public function setWebmaster($webmaster) /** * @see Zend_Validate_EmailAddress */ - require_once 'Zend/Validate/EmailAddress.php'; + ;// require_once 'Zend/Validate/EmailAddress.php'; $validate = new Zend_Validate_EmailAddress(); if (!$validate->isValid($webmaster)) { /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("you have to set a valid email address into the webmaster property"); } $this->offsetSet('webmaster', $webmaster); @@ -272,13 +272,13 @@ public function setTtl($ttl) /** * @see Zend_Validate_Int */ - require_once 'Zend/Validate/Int.php'; + ;// require_once 'Zend/Validate/Int.php'; $validate = new Zend_Validate_Int(); if (!$validate->isValid($ttl)) { /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("you have to set an integer value to the ttl property"); } $this->offsetSet('ttl', $ttl); @@ -317,7 +317,7 @@ public function setCloud($uri, $procedure, $protocol) /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception('Passed parameter is not a valid HTTP URI'); } if (!$uri->getPort()) { @@ -362,7 +362,7 @@ public function setSkipHours(array $hours) /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("you can not have more than 24 rows in the skipHours property"); } foreach ($hours as $hour) { @@ -370,7 +370,7 @@ public function setSkipHours(array $hours) /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("$hour has te be between 0 and 23"); } } @@ -392,7 +392,7 @@ public function setSkipDays(array $days) /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("you can not have more than 7 days in the skipDays property"); } $valid = array('monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday'); @@ -401,7 +401,7 @@ public function setSkipDays(array $days) /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("$day is not a valid day"); } } diff --git a/library/Zend/Feed/Builder/Header/Itunes.php b/library/Zend/Feed/Builder/Header/Itunes.php index 52d6566ae8..c86e4d87d8 100644 --- a/library/Zend/Feed/Builder/Header/Itunes.php +++ b/library/Zend/Feed/Builder/Header/Itunes.php @@ -66,14 +66,14 @@ public function setCategories(array $categories) /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("you have to set at least one itunes category"); } if ($nb > 3) { /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("you have to set at most three itunes categories"); } foreach ($categories as $i => $category) { @@ -81,7 +81,7 @@ public function setCategories(array $categories) /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("you have to set the main category (category #$i)"); } } @@ -115,13 +115,13 @@ public function setOwner($name = '', $email = '') /** * @see Zend_Validate_EmailAddress */ - require_once 'Zend/Validate/EmailAddress.php'; + ;// require_once 'Zend/Validate/EmailAddress.php'; $validate = new Zend_Validate_EmailAddress(); if (!$validate->isValid($email)) { /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("you have to set a valid email address into the itunes owner's email property"); } } @@ -182,7 +182,7 @@ public function setBlock($block) /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("you have to set yes or no to the itunes block property"); } $this->offsetSet('block', $block); @@ -203,7 +203,7 @@ public function setExplicit($explicit) /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + ;// require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("you have to set yes, no or clean to the itunes explicit property"); } $this->offsetSet('explicit', $explicit); diff --git a/library/Zend/Feed/Element.php b/library/Zend/Feed/Element.php index 741efa98e1..cd73aee745 100644 --- a/library/Zend/Feed/Element.php +++ b/library/Zend/Feed/Element.php @@ -242,7 +242,7 @@ public function __set($var, $val) /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Cannot set the value of multiple tags simultaneously.'); } else { $nodes[0]->nodeValue = $val; diff --git a/library/Zend/Feed/Entry/Abstract.php b/library/Zend/Feed/Entry/Abstract.php index 38dc4277b6..f148f3fce0 100644 --- a/library/Zend/Feed/Entry/Abstract.php +++ b/library/Zend/Feed/Entry/Abstract.php @@ -24,15 +24,15 @@ /** * @see Zend_Feed */ -require_once 'Zend/Feed.php'; +;// require_once 'Zend/Feed.php'; /** * @see Zend_Feed_Element */ -require_once 'Zend/Feed/Element.php'; +;// require_once 'Zend/Feed/Element.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** * Zend_Feed_Entry_Abstract represents a single entry in an Atom or RSS @@ -97,7 +97,7 @@ public function __construct($uri = null, $element = null) /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception("DOMDocument cannot parse XML: $message"); } @@ -106,7 +106,7 @@ public function __construct($uri = null, $element = null) /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('No root <' . $this->_rootElement . '> element found, cannot parse feed.'); } } else { diff --git a/library/Zend/Feed/Entry/Atom.php b/library/Zend/Feed/Entry/Atom.php index 9aba1c0845..c1a42da1b1 100644 --- a/library/Zend/Feed/Entry/Atom.php +++ b/library/Zend/Feed/Entry/Atom.php @@ -24,10 +24,10 @@ /** * @see Zend_Feed_Entry_Abstract */ -require_once 'Zend/Feed/Entry/Abstract.php'; +;// require_once 'Zend/Feed/Entry/Abstract.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** * Concrete class for working with Atom entries. @@ -81,7 +81,7 @@ public function delete() /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Cannot delete entry; no link rel="edit" is present.'); } @@ -109,7 +109,7 @@ public function delete() /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception("Expected response code 2xx, got $httpStatus"); } } while (true); @@ -146,7 +146,7 @@ public function save($postUri = null) /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Cannot edit entry; no link rel="edit" is present.'); } @@ -166,7 +166,7 @@ public function save($postUri = null) /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Expected response code 200, got ' . $response->getStatus()); } } else { @@ -174,7 +174,7 @@ public function save($postUri = null) /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('PostURI must be specified to save new entries.'); } $client = Zend_Feed::getHttpClient(); @@ -187,7 +187,7 @@ public function save($postUri = null) /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Expected response code 201, got ' . $response->getStatus()); } @@ -211,7 +211,7 @@ public function save($postUri = null) /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('XML cannot be parsed: ' . $message); } @@ -220,7 +220,7 @@ public function save($postUri = null) /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('No root element found in server response:' . "\n\n" . $client->responseBody); } diff --git a/library/Zend/Feed/Entry/Rss.php b/library/Zend/Feed/Entry/Rss.php index bc955eb4d8..a81b23318d 100644 --- a/library/Zend/Feed/Entry/Rss.php +++ b/library/Zend/Feed/Entry/Rss.php @@ -24,7 +24,7 @@ /** * @see Zend_Feed_Entry_Abstract */ -require_once 'Zend/Feed/Entry/Abstract.php'; +;// require_once 'Zend/Feed/Entry/Abstract.php'; /** diff --git a/library/Zend/Feed/Exception.php b/library/Zend/Feed/Exception.php index 473e4c833e..d72e6edc94 100644 --- a/library/Zend/Feed/Exception.php +++ b/library/Zend/Feed/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** diff --git a/library/Zend/Feed/Pubsubhubbub.php b/library/Zend/Feed/Pubsubhubbub.php index 6485630ef0..7797175c82 100644 --- a/library/Zend/Feed/Pubsubhubbub.php +++ b/library/Zend/Feed/Pubsubhubbub.php @@ -22,27 +22,27 @@ /** * @see Zend_Http_Client */ -require_once 'Zend/Http/Client.php'; +;// require_once 'Zend/Http/Client.php'; /** * @see Zend_Uri */ -require_once 'Zend/Uri.php'; +;// require_once 'Zend/Uri.php'; /** * @see Zend_Version */ -require_once 'Zend/Version.php'; +;// require_once 'Zend/Version.php'; /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +;// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_Feed_Abstract */ -require_once 'Zend/Feed/Abstract.php'; +;// require_once 'Zend/Feed/Abstract.php'; /** * @category Zend @@ -90,7 +90,7 @@ public static function detectHubs($source) } elseif (is_object($source) && $source instanceof Zend_Feed_Abstract) { $feed = Zend_Feed_Reader::importFeed($source); } else { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('The source parameter was' . ' invalid, i.e. not a URL string or an instance of type' . ' Zend_Feed_Reader_FeedAbstract or Zend_Feed_Abstract'); diff --git a/library/Zend/Feed/Pubsubhubbub/CallbackAbstract.php b/library/Zend/Feed/Pubsubhubbub/CallbackAbstract.php index 0dc7262f0d..106dab0c9d 100644 --- a/library/Zend/Feed/Pubsubhubbub/CallbackAbstract.php +++ b/library/Zend/Feed/Pubsubhubbub/CallbackAbstract.php @@ -23,12 +23,12 @@ /** * @see Zend_Feed_Pubsubhubbub_CallbackInterface */ -require_once 'Zend/Feed/Pubsubhubbub/CallbackInterface.php'; +;// require_once 'Zend/Feed/Pubsubhubbub/CallbackInterface.php'; /** * @see Zend_Feed_Pubsubhubbub_HttpResponse */ -require_once 'Zend/Feed/Pubsubhubbub/HttpResponse.php'; +;// require_once 'Zend/Feed/Pubsubhubbub/HttpResponse.php'; /** * @category Zend @@ -91,7 +91,7 @@ public function setConfig($config) if ($config instanceof Zend_Config) { $config = $config->toArray(); } elseif (!is_array($config)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Array or Zend_Config object' . 'expected, got ' . gettype($config)); } @@ -139,7 +139,7 @@ public function setStorage(Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface $s public function getStorage() { if ($this->_storage === null) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('No storage object has been' . ' set that subclasses Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface'); } @@ -161,7 +161,7 @@ public function setHttpResponse($httpResponse) || (!$httpResponse instanceof Zend_Feed_Pubsubhubbub_HttpResponse && !$httpResponse instanceof Zend_Controller_Response_Http) ) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('HTTP Response object must' . ' implement one of Zend_Feed_Pubsubhubbub_HttpResponse or' . ' Zend_Controller_Response_Http'); @@ -198,7 +198,7 @@ public function setSubscriberCount($count) { $count = intval($count); if ($count <= 0) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Subscriber count must be' . ' greater than zero'); } diff --git a/library/Zend/Feed/Pubsubhubbub/Exception.php b/library/Zend/Feed/Pubsubhubbub/Exception.php index ed68249a22..244a30e23c 100644 --- a/library/Zend/Feed/Pubsubhubbub/Exception.php +++ b/library/Zend/Feed/Pubsubhubbub/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/Zend/Feed/Pubsubhubbub/HttpResponse.php b/library/Zend/Feed/Pubsubhubbub/HttpResponse.php index 10c8dbd354..78d30e69da 100644 --- a/library/Zend/Feed/Pubsubhubbub/HttpResponse.php +++ b/library/Zend/Feed/Pubsubhubbub/HttpResponse.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Pubsubhubbub */ -require_once 'Zend/Feed/Pubsubhubbub.php'; +;// require_once 'Zend/Feed/Pubsubhubbub.php'; /** * @category Zend @@ -162,7 +162,7 @@ public function canSendHeaders($throw = false) { $ok = headers_sent($file, $line); if ($ok && $throw) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Cannot send headers; headers already sent in ' . $file . ', line ' . $line); } return !$ok; @@ -178,7 +178,7 @@ public function canSendHeaders($throw = false) public function setHttpResponseCode($code) { if (!is_int($code) || (100 > $code) || (599 < $code)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid HTTP response' . ' code:' . $code); } diff --git a/library/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php b/library/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php index 265ecc5adf..d46c3c066f 100644 --- a/library/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php +++ b/library/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php @@ -21,13 +21,13 @@ /** @see Zend_Db_Table */ -require_once 'Zend/Db/Table.php'; +;// require_once 'Zend/Db/Table.php'; /** * @see Zend_Registry * Seems to fix the file not being included by Zend_Db_Table... */ -require_once 'Zend/Registry.php'; +;// require_once 'Zend/Registry.php'; /** * @category Zend diff --git a/library/Zend/Feed/Pubsubhubbub/Model/Subscription.php b/library/Zend/Feed/Pubsubhubbub/Model/Subscription.php index 74c59798d5..f61ccb6573 100644 --- a/library/Zend/Feed/Pubsubhubbub/Model/Subscription.php +++ b/library/Zend/Feed/Pubsubhubbub/Model/Subscription.php @@ -21,13 +21,13 @@ */ /** @see Zend_Feed_Pubsubhubbub_Model_ModelAbstract */ -require_once 'Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php'; +;// require_once 'Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php'; /** @see Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface */ -require_once 'Zend/Feed/Pubsubhubbub/Model/SubscriptionInterface.php'; +;// require_once 'Zend/Feed/Pubsubhubbub/Model/SubscriptionInterface.php'; /** @see Zend_Date */ -require_once 'Zend/Date.php'; +;// require_once 'Zend/Date.php'; /** * @category Zend @@ -52,7 +52,7 @@ class Zend_Feed_Pubsubhubbub_Model_Subscription public function setSubscription(array $data) { if (!isset($data['id'])) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception( 'ID must be set before attempting a save' ); @@ -87,7 +87,7 @@ public function setSubscription(array $data) public function getSubscription($key) { if (empty($key) || !is_string($key)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "key"' .' of "' . $key . '" must be a non-empty string'); } @@ -109,7 +109,7 @@ public function getSubscription($key) public function hasSubscription($key) { if (empty($key) || !is_string($key)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "key"' .' of "' . $key . '" must be a non-empty string'); } diff --git a/library/Zend/Feed/Pubsubhubbub/Publisher.php b/library/Zend/Feed/Pubsubhubbub/Publisher.php index 89378bdd5e..6e068abcb1 100644 --- a/library/Zend/Feed/Pubsubhubbub/Publisher.php +++ b/library/Zend/Feed/Pubsubhubbub/Publisher.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Pubsubhubbub */ -require_once 'Zend/Feed/Pubsubhubbub.php'; +;// require_once 'Zend/Feed/Pubsubhubbub.php'; /** * @category Zend @@ -91,7 +91,7 @@ public function setConfig($config) if ($config instanceof Zend_Config) { $config = $config->toArray(); } elseif (!is_array($config)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Array or Zend_Config object' . 'expected, got ' . gettype($config)); } @@ -117,7 +117,7 @@ public function setConfig($config) public function addHubUrl($url) { if (empty($url) || !is_string($url) || !Zend_Uri::check($url)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "url"' .' of "' . $url . '" must be a non-empty string and a valid' .'URL'); @@ -177,7 +177,7 @@ public function getHubUrls() public function addUpdatedTopicUrl($url) { if (empty($url) || !is_string($url) || !Zend_Uri::check($url)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "url"' .' of "' . $url . '" must be a non-empty string and a valid' .'URL'); @@ -237,7 +237,7 @@ public function getUpdatedTopicUrls() public function notifyHub($url) { if (empty($url) || !is_string($url) || !Zend_Uri::check($url)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "url"' .' of "' . $url . '" must be a non-empty string and a valid' .'URL'); @@ -246,7 +246,7 @@ public function notifyHub($url) $client->setUri($url); $response = $client->request(); if ($response->getStatus() !== 204) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Notification to Hub Server ' . 'at "' . $url . '" appears to have failed with a status code of "' . $response->getStatus() . '" and message "' @@ -270,7 +270,7 @@ public function notifyAll() $client = $this->_getHttpClient(); $hubs = $this->getHubUrls(); if (empty($hubs)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('No Hub Server URLs' . ' have been set so no notifcations can be sent'); } @@ -302,7 +302,7 @@ public function setParameter($name, $value = null) return $this; } if (empty($name) || !is_string($name)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "name"' .' of "' . $name . '" must be a non-empty string'); } @@ -311,7 +311,7 @@ public function setParameter($name, $value = null) return $this; } if (empty($value) || (!is_string($value) && $value !== null)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "value"' .' of "' . $value . '" must be a non-empty string'); } @@ -343,7 +343,7 @@ public function setParameters(array $parameters) public function removeParameter($name) { if (empty($name) || !is_string($name)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "name"' .' of "' . $name . '" must be a non-empty string'); } @@ -407,7 +407,7 @@ protected function _getHttpClient() $params[] = 'hub.mode=publish'; $topics = $this->getUpdatedTopicUrls(); if (empty($topics)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('No updated topic URLs' . ' have been set'); } diff --git a/library/Zend/Feed/Pubsubhubbub/Subscriber.php b/library/Zend/Feed/Pubsubhubbub/Subscriber.php index da1f688831..4e7c718791 100644 --- a/library/Zend/Feed/Pubsubhubbub/Subscriber.php +++ b/library/Zend/Feed/Pubsubhubbub/Subscriber.php @@ -22,12 +22,12 @@ /** * @see Zend_Feed_Pubsubhubbub */ -require_once 'Zend/Feed/Pubsubhubbub.php'; +;// require_once 'Zend/Feed/Pubsubhubbub.php'; /** * @see Zend_Date */ -require_once 'Zend/Date.php'; +;// require_once 'Zend/Date.php'; /** * @category Zend @@ -167,7 +167,7 @@ public function setConfig($config) if ($config instanceof Zend_Config) { $config = $config->toArray(); } elseif (!is_array($config)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Array or Zend_Config object' . ' expected, got ' . gettype($config)); } @@ -214,7 +214,7 @@ public function setConfig($config) public function setTopicUrl($url) { if (empty($url) || !is_string($url) || !Zend_Uri::check($url)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "url"' .' of "' . $url . '" must be a non-empty string and a valid' .' URL'); @@ -233,7 +233,7 @@ public function setTopicUrl($url) public function getTopicUrl() { if (empty($this->_topicUrl)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('A valid Topic (RSS or Atom' . ' feed) URL MUST be set before attempting any operation'); } @@ -251,7 +251,7 @@ public function setLeaseSeconds($seconds) { $seconds = intval($seconds); if ($seconds <= 0) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Expected lease seconds' . ' must be an integer greater than zero'); } @@ -280,7 +280,7 @@ public function getLeaseSeconds() public function setCallbackUrl($url) { if (empty($url) || !is_string($url) || !Zend_Uri::check($url)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "url"' . ' of "' . $url . '" must be a non-empty string and a valid' . ' URL'); @@ -299,7 +299,7 @@ public function setCallbackUrl($url) public function getCallbackUrl() { if (empty($this->_callbackUrl)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('A valid Callback URL MUST be' . ' set before attempting any operation'); } @@ -322,7 +322,7 @@ public function setPreferredVerificationMode($mode) { if ($mode !== Zend_Feed_Pubsubhubbub::VERIFICATION_MODE_SYNC && $mode !== Zend_Feed_Pubsubhubbub::VERIFICATION_MODE_ASYNC) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid preferred' . ' mode specified: "' . $mode . '" but should be one of' . ' Zend_Feed_Pubsubhubbub::VERIFICATION_MODE_SYNC or' @@ -352,7 +352,7 @@ public function getPreferredVerificationMode() public function addHubUrl($url) { if (empty($url) || !is_string($url) || !Zend_Uri::check($url)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "url"' . ' of "' . $url . '" must be a non-empty string and a valid' . ' URL'); @@ -413,7 +413,7 @@ public function getHubUrls() public function addAuthentication($url, array $authentication) { if (empty($url) || !is_string($url) || !Zend_Uri::check($url)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "url"' . ' of "' . $url . '" must be a non-empty string and a valid' . ' URL'); @@ -473,7 +473,7 @@ public function setParameter($name, $value = null) return $this; } if (empty($name) || !is_string($name)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "name"' . ' of "' . $name . '" must be a non-empty string'); } @@ -482,7 +482,7 @@ public function setParameter($name, $value = null) return $this; } if (empty($value) || (!is_string($value) && $value !== null)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "value"' . ' of "' . $value . '" must be a non-empty string'); } @@ -515,7 +515,7 @@ public function setParameters(array $parameters) public function removeParameter($name) { if (empty($name) || !is_string($name)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "name"' . ' of "' . $name . '" must be a non-empty string'); } @@ -559,7 +559,7 @@ public function setStorage(Zend_Feed_Pubsubhubbub_Model_SubscriptionInterface $s public function getStorage() { if ($this->_storage === null) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('No storage vehicle ' . 'has been set.'); } @@ -635,7 +635,7 @@ protected function _doRequest($mode) $client = $this->_getHttpClient(); $hubs = $this->getHubUrls(); if (empty($hubs)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('No Hub Server URLs' . ' have been set so no subscriptions can be attempted'); } @@ -701,7 +701,7 @@ protected function _getHttpClient() protected function _getRequestParameters($hubUrl, $mode) { if (!in_array($mode, array('subscribe', 'unsubscribe'))) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + ;// require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid mode specified: "' . $mode . '" which should have been "subscribe" or "unsubscribe"'); } diff --git a/library/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php b/library/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php index 42c0559f80..4a3502fb0c 100644 --- a/library/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php +++ b/library/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php @@ -22,17 +22,17 @@ /** * @see Zend_Feed_Pubsubhubbub */ -require_once 'Zend/Feed/Pubsubhubbub.php'; +;// require_once 'Zend/Feed/Pubsubhubbub.php'; /** * @see Zend_Feed_Pubsubhubbub */ -require_once 'Zend/Feed/Pubsubhubbub/CallbackAbstract.php'; +;// require_once 'Zend/Feed/Pubsubhubbub/CallbackAbstract.php'; /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +;// require_once 'Zend/Feed/Reader.php'; /** * @category Zend diff --git a/library/Zend/Feed/Reader.php b/library/Zend/Feed/Reader.php index be1dfb34ac..30ffe30685 100644 --- a/library/Zend/Feed/Reader.php +++ b/library/Zend/Feed/Reader.php @@ -22,28 +22,28 @@ /** * @see Zend_Feed */ -require_once 'Zend/Feed.php'; +;// require_once 'Zend/Feed.php'; /** * @see Zend_Feed_Reader_Feed_Rss */ -require_once 'Zend/Feed/Reader/Feed/Rss.php'; +;// require_once 'Zend/Feed/Reader/Feed/Rss.php'; /** * @see Zend_Feed_Reader_Feed_Atom */ -require_once 'Zend/Feed/Reader/Feed/Atom.php'; +;// require_once 'Zend/Feed/Reader/Feed/Atom.php'; /** * @see Zend_Feed_Reader_FeedSet */ -require_once 'Zend/Feed/Reader/FeedSet.php'; +;// require_once 'Zend/Feed/Reader/FeedSet.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** @see Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; +;// require_once 'Zend/Xml/Exception.php'; /** * @category Zend @@ -173,7 +173,7 @@ public static function getHttpClient() /** * @see Zend_Http_Client */ - require_once 'Zend/Http/Client.php'; + ;// require_once 'Zend/Http/Client.php'; self::$_httpClient = new Zend_Http_Client(); } @@ -257,7 +257,7 @@ public static function import($uri, $etag = null, $lastModified = null) } $response = $client->request('GET'); if ($response->getStatus() !== 200 && $response->getStatus() !== 304) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus()); } if ($response->getStatus() == 304) { @@ -273,7 +273,7 @@ public static function import($uri, $etag = null, $lastModified = null) } } if (empty($responseXml)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Feed failed to load, got empty response body'); } return self::importString($responseXml); @@ -284,25 +284,25 @@ public static function import($uri, $etag = null, $lastModified = null) } $response = $client->request('GET'); if ($response->getStatus() !== 200) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus()); } $responseXml = $response->getBody(); $cache->save($responseXml, $cacheId); if (empty($responseXml)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Feed failed to load, got empty response body'); } return self::importString($responseXml); } else { $response = $client->request('GET'); if ($response->getStatus() !== 200) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus()); } $responseXml = $response->getBody(); if (empty($responseXml)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Feed failed to load, got empty response body'); } $reader = self::importString($responseXml); @@ -343,7 +343,7 @@ public static function importString($string) try { $dom = Zend_Xml_Security::scan($string, $dom); } catch (Zend_Xml_Exception $e) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception( $e->getMessage() ); @@ -357,7 +357,7 @@ public static function importString($string) $errormsg = "DOMDocument cannot parse XML: Please check the XML document's validity"; } - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception($errormsg); } @@ -372,7 +372,7 @@ public static function importString($string) } elseif (substr($type, 0, 4) == 'atom') { $reader = new Zend_Feed_Reader_Feed_Atom($dom, $type); } else { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('The URI used does not point to a ' . 'valid Atom, RSS or RDF feed that Zend_Feed_Reader can parse.'); } @@ -393,7 +393,7 @@ public static function importFile($filename) /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = error_get_last()['message'] ?? 'Unknown error'; throw new Zend_Feed_Exception("File could not be loaded: $message"); } @@ -410,7 +410,7 @@ public static function findFeedLinks($uri) /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception("Failed to access $uri, got response code " . $response->getStatus()); } $responseHtml = $response->getBody(); @@ -433,7 +433,7 @@ public static function findFeedLinks($uri) $errormsg = "DOMDocument cannot parse HTML: Please check the XML document's validity"; } - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception($errormsg); } $feedSet = new Zend_Feed_Reader_FeedSet; @@ -464,7 +464,7 @@ public static function detectType($feed, $specOnly = false) try { $dom = Zend_Xml_Security::scan($feed, $dom); } catch (Zend_Xml_Exception $e) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception( $e->getMessage() ); @@ -481,11 +481,11 @@ public static function detectType($feed, $specOnly = false) $message = '(error message not available)'; } } - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception("DOMDocument cannot parse XML: $message"); } } else { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid object/scalar provided: must' . ' be of type Zend_Feed_Reader_FeedInterface, DomDocument or string'); } @@ -588,7 +588,7 @@ public static function setPluginLoader(Zend_Loader_PluginLoader_Interface $loade public static function getPluginLoader() { if (!isset(self::$_pluginLoader)) { - require_once 'Zend/Loader/PluginLoader.php'; + ;// require_once 'Zend/Loader/PluginLoader.php'; self::$_pluginLoader = new Zend_Loader_PluginLoader(array( 'Zend_Feed_Reader_Extension_' => 'Zend/Feed/Reader/Extension/', )); @@ -658,7 +658,7 @@ public static function registerExtension($name) if (!self::getPluginLoader()->isLoaded($feedName) && !self::getPluginLoader()->isLoaded($entryName) ) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Could not load extension: ' . $name . 'using Plugin Loader. Check prefix paths are configured and extension exists.'); } diff --git a/library/Zend/Feed/Reader/Collection/Author.php b/library/Zend/Feed/Reader/Collection/Author.php index fa03df3b76..b14f7a6dbc 100644 --- a/library/Zend/Feed/Reader/Collection/Author.php +++ b/library/Zend/Feed/Reader/Collection/Author.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Reader_Collection_CollectionAbstract */ -require_once 'Zend/Feed/Reader/Collection/CollectionAbstract.php'; +;// require_once 'Zend/Feed/Reader/Collection/CollectionAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Reader/Collection/Category.php b/library/Zend/Feed/Reader/Collection/Category.php index 2ee9b3d512..7025109b4c 100644 --- a/library/Zend/Feed/Reader/Collection/Category.php +++ b/library/Zend/Feed/Reader/Collection/Category.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Reader_Collection_CollectionAbstract */ -require_once 'Zend/Feed/Reader/Collection/CollectionAbstract.php'; +;// require_once 'Zend/Feed/Reader/Collection/CollectionAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Reader/Entry/Atom.php b/library/Zend/Feed/Reader/Entry/Atom.php index e94d797077..01cfd0993b 100644 --- a/library/Zend/Feed/Reader/Entry/Atom.php +++ b/library/Zend/Feed/Reader/Entry/Atom.php @@ -22,22 +22,22 @@ /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +;// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_Feed_Reader_EntryInterface */ -require_once 'Zend/Feed/Reader/EntryInterface.php'; +;// require_once 'Zend/Feed/Reader/EntryInterface.php'; /** * @see Zend_Feed_Reader_EntryAbstract */ -require_once 'Zend/Feed/Reader/EntryAbstract.php'; +;// require_once 'Zend/Feed/Reader/EntryAbstract.php'; /** * @see Zend_Feed_Reader_Extension_Atom_Entry */ -require_once 'Zend/Feed/Reader/Extension/Atom/Entry.php'; +;// require_once 'Zend/Feed/Reader/Extension/Atom/Entry.php'; /** * @category Zend diff --git a/library/Zend/Feed/Reader/Entry/Rss.php b/library/Zend/Feed/Reader/Entry/Rss.php index 52eaa3d206..bb69774305 100644 --- a/library/Zend/Feed/Reader/Entry/Rss.php +++ b/library/Zend/Feed/Reader/Entry/Rss.php @@ -22,57 +22,57 @@ /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +;// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_Feed_Reader_EntryInterface */ -require_once 'Zend/Feed/Reader/EntryInterface.php'; +;// require_once 'Zend/Feed/Reader/EntryInterface.php'; /** * @see Zend_Feed_Reader_EntryAbstract */ -require_once 'Zend/Feed/Reader/EntryAbstract.php'; +;// require_once 'Zend/Feed/Reader/EntryAbstract.php'; /** * @see Zend_Feed_Reader_Extension_DublinCore_Entry */ -require_once 'Zend/Feed/Reader/Extension/DublinCore/Entry.php'; +;// require_once 'Zend/Feed/Reader/Extension/DublinCore/Entry.php'; /** * @see Zend_Feed_Reader_Extension_Content_Entry */ -require_once 'Zend/Feed/Reader/Extension/Content/Entry.php'; +;// require_once 'Zend/Feed/Reader/Extension/Content/Entry.php'; /** * @see Zend_Feed_Reader_Extension_Atom_Entry */ -require_once 'Zend/Feed/Reader/Extension/Atom/Entry.php'; +;// require_once 'Zend/Feed/Reader/Extension/Atom/Entry.php'; /** * @see Zend_Feed_Reader_Extension_WellformedWeb_Entry */ -require_once 'Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php'; +;// require_once 'Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php'; /** * @see Zend_Feed_Reader_Extension_Slash_Entry */ -require_once 'Zend/Feed/Reader/Extension/Slash/Entry.php'; +;// require_once 'Zend/Feed/Reader/Extension/Slash/Entry.php'; /** * @see Zend_Feed_Reader_Extension_Thread_Entry */ -require_once 'Zend/Feed/Reader/Extension/Thread/Entry.php'; +;// require_once 'Zend/Feed/Reader/Extension/Thread/Entry.php'; /** * @see Zend_Date */ -require_once 'Zend/Date.php'; +;// require_once 'Zend/Date.php'; /** * @see Zend_Feed_Reader_Collection_Category */ -require_once 'Zend/Feed/Reader/Collection/Category.php'; +;// require_once 'Zend/Feed/Reader/Collection/Category.php'; /** * @category Zend @@ -278,7 +278,7 @@ public function getDateModified() break; } catch (Zend_Date_Exception $e) { if ($standard == Zend_Date::DATES) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception( 'Could not load date due to unrecognised' .' format (should follow RFC 822 or 2822):' diff --git a/library/Zend/Feed/Reader/EntryAbstract.php b/library/Zend/Feed/Reader/EntryAbstract.php index a55e0953ef..bd26256c4e 100644 --- a/library/Zend/Feed/Reader/EntryAbstract.php +++ b/library/Zend/Feed/Reader/EntryAbstract.php @@ -213,7 +213,7 @@ public function __call($method, $args) return call_user_func_array(array($extension, $method), $args); } } - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception( 'Method: ' . $method . 'does not exist and could not be located on a registered Extension' diff --git a/library/Zend/Feed/Reader/Extension/Atom/Entry.php b/library/Zend/Feed/Reader/Extension/Atom/Entry.php index d97c49f3b6..2aa58635ad 100644 --- a/library/Zend/Feed/Reader/Extension/Atom/Entry.php +++ b/library/Zend/Feed/Reader/Extension/Atom/Entry.php @@ -22,32 +22,32 @@ /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +;// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_Feed_Reader_Extension_EntryAbstract */ -require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; +;// require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; /** * @see Zend_Date */ -require_once 'Zend/Date.php'; +;// require_once 'Zend/Date.php'; /** * @see Zend_Uri */ -require_once 'Zend/Uri.php'; +;// require_once 'Zend/Uri.php'; /** * @see Zend_Feed_Reader_Collection_Category */ -require_once 'Zend/Feed/Reader/Collection/Category.php'; +;// require_once 'Zend/Feed/Reader/Collection/Category.php'; /** * @see Zend_Feed_Reader_Feed_Atom_Source */ -require_once 'Zend/Feed/Reader/Feed/Atom/Source.php'; +;// require_once 'Zend/Feed/Reader/Feed/Atom/Source.php'; /** * @category Zend diff --git a/library/Zend/Feed/Reader/Extension/Atom/Feed.php b/library/Zend/Feed/Reader/Extension/Atom/Feed.php index 240a76d091..e6c7e9ce7a 100644 --- a/library/Zend/Feed/Reader/Extension/Atom/Feed.php +++ b/library/Zend/Feed/Reader/Extension/Atom/Feed.php @@ -22,22 +22,22 @@ /** * @see Zend_Feed_Reader_Extension_FeedAbstract */ -require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php'; +;// require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php'; /** * @see Zend_Date */ -require_once 'Zend/Date.php'; +;// require_once 'Zend/Date.php'; /** * @see Zend_Uri */ -require_once 'Zend/Uri.php'; +;// require_once 'Zend/Uri.php'; /** * @see Zend_Feed_Reader_Collection_Author */ -require_once 'Zend/Feed/Reader/Collection/Author.php'; +;// require_once 'Zend/Feed/Reader/Collection/Author.php'; /** * @category Zend diff --git a/library/Zend/Feed/Reader/Extension/Content/Entry.php b/library/Zend/Feed/Reader/Extension/Content/Entry.php index b3bd497ed2..64514e392b 100644 --- a/library/Zend/Feed/Reader/Extension/Content/Entry.php +++ b/library/Zend/Feed/Reader/Extension/Content/Entry.php @@ -22,12 +22,12 @@ /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +;// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_Feed_Reader_Entry_EntryAbstract */ -require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; +;// require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php b/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php index 1962202597..d19a63d19d 100644 --- a/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php +++ b/library/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php @@ -22,12 +22,12 @@ /** * @see Zend_Feed_Reader_Extension_EntryAbstract */ -require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; +;// require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; /** * @see Zend_Feed_Reader_Extension_CreativeCommons_Feed */ -require_once 'Zend/Feed/Reader/Extension/CreativeCommons/Feed.php'; +;// require_once 'Zend/Feed/Reader/Extension/CreativeCommons/Feed.php'; /** * @category Zend diff --git a/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php b/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php index dc42486c97..2cb592ae41 100644 --- a/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php +++ b/library/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Reader_Extension_FeedAbstract */ -require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php'; +;// require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php b/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php index 35f94e77ca..5800743ad9 100644 --- a/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php +++ b/library/Zend/Feed/Reader/Extension/DublinCore/Entry.php @@ -22,17 +22,17 @@ /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +;// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_Feed_Reader_Extension_EntryAbstract */ -require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; +;// require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; /** * @see Zend_Date */ -require_once 'Zend/Date.php'; +;// require_once 'Zend/Date.php'; /** * @category Zend diff --git a/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php b/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php index 168235fc27..af643fe0c1 100644 --- a/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php +++ b/library/Zend/Feed/Reader/Extension/DublinCore/Feed.php @@ -22,17 +22,17 @@ /** * @see Zend_Feed_Reader_Extension_FeedAbstract */ -require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php'; +;// require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php'; /** * @see Zend_Date */ -require_once 'Zend/Date.php'; +;// require_once 'Zend/Date.php'; /** * @see Zend_Feed_Reader_Collection_Author */ -require_once 'Zend/Feed/Reader/Collection/Author.php'; +;// require_once 'Zend/Feed/Reader/Collection/Author.php'; /** * @category Zend diff --git a/library/Zend/Feed/Reader/Extension/FeedAbstract.php b/library/Zend/Feed/Reader/Extension/FeedAbstract.php index 93b0b579e2..c98fdc4786 100644 --- a/library/Zend/Feed/Reader/Extension/FeedAbstract.php +++ b/library/Zend/Feed/Reader/Extension/FeedAbstract.php @@ -22,18 +22,18 @@ /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +;// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_Feed_Reader_Entry_Atom */ -require_once 'Zend/Feed/Reader/Entry/Atom.php'; +;// require_once 'Zend/Feed/Reader/Entry/Atom.php'; /** * @see Zend_Feed_Reader_Entry_Rss */ -require_once 'Zend/Feed/Reader/Entry/Rss.php'; +;// require_once 'Zend/Feed/Reader/Entry/Rss.php'; /** * @category Zend diff --git a/library/Zend/Feed/Reader/Extension/Podcast/Entry.php b/library/Zend/Feed/Reader/Extension/Podcast/Entry.php index 46df21adf2..77e8bd3ea8 100644 --- a/library/Zend/Feed/Reader/Extension/Podcast/Entry.php +++ b/library/Zend/Feed/Reader/Extension/Podcast/Entry.php @@ -22,12 +22,12 @@ /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +;// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_Feed_Reader_Extension_EntryAbstract */ -require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; +;// require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Reader/Extension/Podcast/Feed.php b/library/Zend/Feed/Reader/Extension/Podcast/Feed.php index 0cffab413d..f556ef89eb 100644 --- a/library/Zend/Feed/Reader/Extension/Podcast/Feed.php +++ b/library/Zend/Feed/Reader/Extension/Podcast/Feed.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Reader_Extension_FeedAbstract */ -require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php'; +;// require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Reader/Extension/Slash/Entry.php b/library/Zend/Feed/Reader/Extension/Slash/Entry.php index 866f72a306..009682bfa7 100644 --- a/library/Zend/Feed/Reader/Extension/Slash/Entry.php +++ b/library/Zend/Feed/Reader/Extension/Slash/Entry.php @@ -22,12 +22,12 @@ /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +;// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_Feed_Reader_Extension_EntryAbstract */ -require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; +;// require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Reader/Extension/Syndication/Feed.php b/library/Zend/Feed/Reader/Extension/Syndication/Feed.php index a12091a5c7..ede107def1 100644 --- a/library/Zend/Feed/Reader/Extension/Syndication/Feed.php +++ b/library/Zend/Feed/Reader/Extension/Syndication/Feed.php @@ -22,9 +22,9 @@ /** * @see Zend_Feed_Reader_Extension_FeedAbstract */ -require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php'; +;// require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php'; -require_once 'Zend/Date.php'; +;// require_once 'Zend/Date.php'; /** * @category Zend diff --git a/library/Zend/Feed/Reader/Extension/Thread/Entry.php b/library/Zend/Feed/Reader/Extension/Thread/Entry.php index 3fed89ef11..9f320d2c13 100644 --- a/library/Zend/Feed/Reader/Extension/Thread/Entry.php +++ b/library/Zend/Feed/Reader/Extension/Thread/Entry.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Reader_Extension_EntryAbstract */ -require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; +;// require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php b/library/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php index 8c893fdc80..ded0a34de2 100644 --- a/library/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php +++ b/library/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php @@ -22,12 +22,12 @@ /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +;// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_Feed_Reader_Extension_EntryAbstract */ -require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; +;// require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Reader/Feed/Atom.php b/library/Zend/Feed/Reader/Feed/Atom.php index 839cdca6fc..0cdfbb617f 100644 --- a/library/Zend/Feed/Reader/Feed/Atom.php +++ b/library/Zend/Feed/Reader/Feed/Atom.php @@ -22,12 +22,12 @@ /** * @see Zend_Feed_Reader_FeedAbstract */ -require_once 'Zend/Feed/Reader/FeedAbstract.php'; +;// require_once 'Zend/Feed/Reader/FeedAbstract.php'; /** * @see Zend_Feed_Reader_Extension_Atom_Feed */ -require_once 'Zend/Feed/Reader/Extension/Atom/Feed.php'; +;// require_once 'Zend/Feed/Reader/Extension/Atom/Feed.php'; /** * @category Zend diff --git a/library/Zend/Feed/Reader/Feed/Atom/Source.php b/library/Zend/Feed/Reader/Feed/Atom/Source.php index 1e67a3c809..82bfb8c7d7 100644 --- a/library/Zend/Feed/Reader/Feed/Atom/Source.php +++ b/library/Zend/Feed/Reader/Feed/Atom/Source.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Reader_Feed_Atom */ -require_once 'Zend/Feed/Reader/Feed/Atom.php'; +;// require_once 'Zend/Feed/Reader/Feed/Atom.php'; /** * @category Zend diff --git a/library/Zend/Feed/Reader/Feed/Rss.php b/library/Zend/Feed/Reader/Feed/Rss.php index ab176246f0..cc7cc0f739 100644 --- a/library/Zend/Feed/Reader/Feed/Rss.php +++ b/library/Zend/Feed/Reader/Feed/Rss.php @@ -22,27 +22,27 @@ /** * @see Zend_Feed_Reader_FeedAbstract */ -require_once 'Zend/Feed/Reader/FeedAbstract.php'; +;// require_once 'Zend/Feed/Reader/FeedAbstract.php'; /** * @see Zend_feed_Reader_Extension_Atom_Feed */ -require_once 'Zend/Feed/Reader/Extension/Atom/Feed.php'; +;// require_once 'Zend/Feed/Reader/Extension/Atom/Feed.php'; /** * @see Zend_Feed_Reader_Extension_DublinCore_Feed */ -require_once 'Zend/Feed/Reader/Extension/DublinCore/Feed.php'; +;// require_once 'Zend/Feed/Reader/Extension/DublinCore/Feed.php'; /** * @see Zend_Date */ -require_once 'Zend/Date.php'; +;// require_once 'Zend/Date.php'; /** * @see Zend_Feed_Reader_Collection_Author */ -require_once 'Zend/Feed/Reader/Collection/Author.php'; +;// require_once 'Zend/Feed/Reader/Collection/Author.php'; /** * @category Zend @@ -239,7 +239,7 @@ public function getDateModified() break; } catch (Zend_Date_Exception $e) { if ($standard == Zend_Date::DATES) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception( 'Could not load date due to unrecognised' .' format (should follow RFC 822 or 2822):' @@ -301,7 +301,7 @@ public function getLastBuildDate() break; } catch (Zend_Date_Exception $e) { if ($standard == Zend_Date::DATES) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception( 'Could not load date due to unrecognised' .' format (should follow RFC 822 or 2822):' diff --git a/library/Zend/Feed/Reader/FeedAbstract.php b/library/Zend/Feed/Reader/FeedAbstract.php index b1e5fb0d35..40bd74bedb 100644 --- a/library/Zend/Feed/Reader/FeedAbstract.php +++ b/library/Zend/Feed/Reader/FeedAbstract.php @@ -22,12 +22,12 @@ /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +;// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_feed_Reader_FeedInterface */ -require_once 'Zend/Feed/Reader/FeedInterface.php'; +;// require_once 'Zend/Feed/Reader/FeedInterface.php'; /** * @category Zend @@ -273,7 +273,7 @@ public function __call($method, $args) return call_user_func_array(array($extension, $method), $args); } } - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Method: ' . $method . 'does not exist and could not be located on a registered Extension'); } diff --git a/library/Zend/Feed/Reader/FeedSet.php b/library/Zend/Feed/Reader/FeedSet.php index b6fe689399..8dec4f9c42 100644 --- a/library/Zend/Feed/Reader/FeedSet.php +++ b/library/Zend/Feed/Reader/FeedSet.php @@ -22,12 +22,12 @@ /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +;// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_Uri */ -require_once 'Zend/Uri.php'; +;// require_once 'Zend/Uri.php'; /** * @category Zend diff --git a/library/Zend/Feed/Rss.php b/library/Zend/Feed/Rss.php index 5035d35d77..76b5dcff5c 100644 --- a/library/Zend/Feed/Rss.php +++ b/library/Zend/Feed/Rss.php @@ -24,12 +24,12 @@ /** * @see Zend_Feed_Abstract */ -require_once 'Zend/Feed/Abstract.php'; +;// require_once 'Zend/Feed/Abstract.php'; /** * @see Zend_Feed_Entry_Rss */ -require_once 'Zend/Feed/Entry/Rss.php'; +;// require_once 'Zend/Feed/Entry/Rss.php'; /** @@ -90,7 +90,7 @@ public function __wakeup() /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('No root element found, cannot parse channel.'); } @@ -518,7 +518,7 @@ public function send() /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Cannot send RSS because headers have already been sent.'); } diff --git a/library/Zend/Feed/Writer.php b/library/Zend/Feed/Writer.php index 8eced7af38..ebce1415b7 100644 --- a/library/Zend/Feed/Writer.php +++ b/library/Zend/Feed/Writer.php @@ -100,7 +100,7 @@ public static function setPluginLoader(Zend_Loader_PluginLoader_Interface $loade public static function getPluginLoader() { if (!isset(self::$_pluginLoader)) { - require_once 'Zend/Loader/PluginLoader.php'; + ;// require_once 'Zend/Loader/PluginLoader.php'; self::$_pluginLoader = new Zend_Loader_PluginLoader(array( 'Zend_Feed_Writer_Extension_' => 'Zend/Feed/Writer/Extension/', )); @@ -187,7 +187,7 @@ public static function registerExtension($name) && !self::getPluginLoader()->isLoaded($feedRendererName) && !self::getPluginLoader()->isLoaded($entryRendererName) ) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Could not load extension: ' . $name . 'using Plugin Loader. Check prefix paths are configured and extension exists.'); } diff --git a/library/Zend/Feed/Writer/Deleted.php b/library/Zend/Feed/Writer/Deleted.php index 77cf8c3a18..c2336f8c39 100644 --- a/library/Zend/Feed/Writer/Deleted.php +++ b/library/Zend/Feed/Writer/Deleted.php @@ -19,7 +19,7 @@ * @version $Id$ */ -require_once 'Zend/Feed/Writer/Feed/FeedAbstract.php'; +;// require_once 'Zend/Feed/Writer/Feed/FeedAbstract.php'; /** * @category Zend @@ -53,7 +53,7 @@ class Zend_Feed_Writer_Deleted public function setEncoding($encoding) { if (empty($encoding) || !is_string($encoding)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string'); } $this->_data['encoding'] = $encoding; @@ -109,7 +109,7 @@ public function getType() public function setReference($reference) { if (empty($reference) || !is_string($reference)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: reference must be a non-empty string'); } $this->_data['reference'] = $reference; @@ -133,7 +133,7 @@ public function setWhen($date = null) } elseif (ctype_digit((string)$date)) { $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP); } else { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid Zend_Date object or UNIX Timestamp passed as parameter'); } $this->_data['when'] = $zdate; @@ -154,13 +154,13 @@ public function setBy(array $by) || empty($by['name']) || !is_string($by['name']) ) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: author array must include a "name" key with a non-empty string value'); } $author['name'] = $by['name']; if (isset($by['email'])) { if (empty($by['email']) || !is_string($by['email'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "email" array value must be a non-empty string'); } $author['email'] = $by['email']; @@ -170,7 +170,7 @@ public function setBy(array $by) || !is_string($by['uri']) || !Zend_Uri::check($by['uri']) ) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "uri" array value must be a non-empty string and valid URI/IRI'); } $author['uri'] = $by['uri']; diff --git a/library/Zend/Feed/Writer/Entry.php b/library/Zend/Feed/Writer/Entry.php index f364e0bbe0..9a7048df68 100644 --- a/library/Zend/Feed/Writer/Entry.php +++ b/library/Zend/Feed/Writer/Entry.php @@ -22,14 +22,14 @@ /** * @see Zend_Date */ -require_once 'Zend/Date.php'; +;// require_once 'Zend/Date.php'; /** * @see Zend_Date */ -require_once 'Zend/Uri.php'; +;// require_once 'Zend/Uri.php'; -require_once 'Zend/Feed/Writer/Source.php'; +;// require_once 'Zend/Feed/Writer/Source.php'; /** * @category Zend @@ -88,13 +88,13 @@ public function addAuthor($name, $email = null, $uri = null) || empty($name['name']) || !is_string($name['name']) ) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: author array must include a "name" key with a non-empty string value'); } $author['name'] = $name['name']; if (isset($name['email'])) { if (empty($name['email']) || !is_string($name['email'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "email" array value must be a non-empty string'); } $author['email'] = $name['email']; @@ -104,7 +104,7 @@ public function addAuthor($name, $email = null, $uri = null) || !is_string($name['uri']) || !Zend_Uri::check($name['uri']) ) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "uri" array value must be a non-empty string and valid URI/IRI'); } $author['uri'] = $name['uri']; @@ -115,20 +115,20 @@ public function addAuthor($name, $email = null, $uri = null) */ } else { if (empty($name) || !is_string($name)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "name" must be a non-empty string value'); } $author['name'] = $name; if (isset($email)) { if (empty($email) || !is_string($email)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "email" value must be a non-empty string'); } $author['email'] = $email; } if (isset($uri)) { if (empty($uri) || !is_string($uri) || !Zend_Uri::check($uri)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "uri" value must be a non-empty string and valid URI/IRI'); } $author['uri'] = $uri; @@ -157,7 +157,7 @@ public function addAuthors(array $authors) public function setEncoding($encoding) { if (empty($encoding) || !is_string($encoding)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string'); } $this->_data['encoding'] = $encoding; @@ -184,7 +184,7 @@ public function getEncoding() public function setCopyright($copyright) { if (empty($copyright) || !is_string($copyright)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string'); } $this->_data['copyright'] = $copyright; @@ -198,7 +198,7 @@ public function setCopyright($copyright) public function setContent($content) { if (empty($content) || !is_string($content)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string'); } $this->_data['content'] = $content; @@ -219,7 +219,7 @@ public function setDateCreated($date = null) } elseif (ctype_digit((string)$date)) { $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP); } else { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid Zend_Date object or UNIX Timestamp passed as parameter'); } $this->_data['dateCreated'] = $zdate; @@ -240,7 +240,7 @@ public function setDateModified($date = null) } elseif (ctype_digit((string)$date)) { $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP); } else { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid Zend_Date object or UNIX Timestamp passed as parameter'); } $this->_data['dateModified'] = $zdate; @@ -254,7 +254,7 @@ public function setDateModified($date = null) public function setDescription($description) { if (empty($description) || !is_string($description)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string'); } $this->_data['description'] = $description; @@ -268,7 +268,7 @@ public function setDescription($description) public function setId($id) { if (empty($id) || !is_string($id)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string'); } $this->_data['id'] = $id; @@ -282,7 +282,7 @@ public function setId($id) public function setLink($link) { if (empty($link) || !is_string($link) || !Zend_Uri::check($link)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string and valid URI/IRI'); } $this->_data['link'] = $link; @@ -296,7 +296,7 @@ public function setLink($link) public function setCommentCount($count) { if ( !is_numeric($count) || (int) $count < 0) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "count" must be a non-empty integer number'); } $this->_data['commentCount'] = (int) $count; @@ -310,7 +310,7 @@ public function setCommentCount($count) public function setCommentLink($link) { if (empty($link) || !is_string($link) || !Zend_Uri::check($link)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "link" must be a non-empty string and valid URI/IRI'); } $this->_data['commentLink'] = $link; @@ -324,11 +324,11 @@ public function setCommentLink($link) public function setCommentFeedLink(array $link) { if (!isset($link['uri']) || !is_string($link['uri']) || !Zend_Uri::check($link['uri'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "link" must be a non-empty string and valid URI/IRI'); } if (!isset($link['type']) || !in_array($link['type'], array('atom', 'rss', 'rdf'))) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "type" must be one' . ' of "atom", "rss" or "rdf"'); } @@ -360,7 +360,7 @@ public function setCommentFeedLinks(array $links) public function setTitle($title) { if (empty($title) || !is_string($title)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string'); } $this->_data['title'] = $title; @@ -545,7 +545,7 @@ public function getCommentFeedLinks() public function addCategory(array $category) { if (!isset($category['term'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Each category must be an array and ' . 'contain at least a "term" element containing the machine ' . ' readable category name'); @@ -555,7 +555,7 @@ public function addCategory(array $category) || !is_string($category['scheme']) || !Zend_Uri::check($category['scheme']) ) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('The Atom scheme or RSS domain of' . ' a category must be a valid URI'); } @@ -602,11 +602,11 @@ public function getCategories() public function setEnclosure(array $enclosure) { if (!isset($enclosure['uri'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Enclosure "uri" is not set'); } if (!Zend_Uri::check($enclosure['uri'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Enclosure "uri" is not a valid URI/IRI'); } $this->_data['enclosure'] = $enclosure; @@ -699,7 +699,7 @@ public function __call($method, $args) } catch (Zend_Feed_Writer_Exception_InvalidMethodException $e) { } } - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Method: ' . $method . ' does not exist and could not be located on a registered Extension'); } diff --git a/library/Zend/Feed/Writer/Exception/InvalidMethodException.php b/library/Zend/Feed/Writer/Exception/InvalidMethodException.php index e0c1f5db81..dbc95663fd 100644 --- a/library/Zend/Feed/Writer/Exception/InvalidMethodException.php +++ b/library/Zend/Feed/Writer/Exception/InvalidMethodException.php @@ -24,7 +24,7 @@ /** * @see Zend_Feed_Exception */ -require_once 'Zend/Feed/Exception.php'; +;// require_once 'Zend/Feed/Exception.php'; /** diff --git a/library/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php b/library/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php index f9e0e2b70b..6235e18c24 100644 --- a/library/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php +++ b/library/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ -require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; +;// require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php b/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php index 3776d04603..e49a8774df 100644 --- a/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php +++ b/library/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ -require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; +;// require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php b/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php index d3dbf34a0c..961887b8f5 100644 --- a/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php +++ b/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ -require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; +;// require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php b/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php index ac7377b912..782d4d65bb 100644 --- a/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php +++ b/library/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ -require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; +;// require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Writer/Extension/ITunes/Entry.php b/library/Zend/Feed/Writer/Extension/ITunes/Entry.php index 8f31597bd8..cba6de19e1 100644 --- a/library/Zend/Feed/Writer/Extension/ITunes/Entry.php +++ b/library/Zend/Feed/Writer/Extension/ITunes/Entry.php @@ -72,12 +72,12 @@ public function getEncoding() public function setItunesBlock($value) { if (!ctype_alpha($value) && strlen($value) > 0) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "block" may only' . ' contain alphabetic characters'); } if (iconv_strlen($value, $this->getEncoding()) > 255) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "block" may only' . ' contain a maximum of 255 characters'); } @@ -107,7 +107,7 @@ public function addItunesAuthors(array $values) public function addItunesAuthor($value) { if (iconv_strlen($value, $this->getEncoding()) > 255) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: any "author" may only' . ' contain a maximum of 255 characters each'); } @@ -131,7 +131,7 @@ public function setItunesDuration($value) && !preg_match("/^\d+:[0-5]{1}[0-9]{1}$/", $value) && !preg_match("/^\d+:[0-5]{1}[0-9]{1}:[0-5]{1}[0-9]{1}$/", $value) ) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "duration" may only' . ' be of a specified [[HH:]MM:]SS format'); } @@ -148,7 +148,7 @@ public function setItunesDuration($value) public function setItunesExplicit($value) { if (!in_array($value, array('yes','no','clean'))) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "explicit" may only' . ' be one of "yes", "no" or "clean"'); } @@ -165,13 +165,13 @@ public function setItunesExplicit($value) public function setItunesKeywords(array $value) { if (count($value) > 12) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "keywords" may only' . ' contain a maximum of 12 terms'); } $concat = implode(',', $value); if (iconv_strlen($concat, $this->getEncoding()) > 255) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "keywords" may only' . ' have a concatenated length of 255 chars where terms are delimited' . ' by a comma'); @@ -189,7 +189,7 @@ public function setItunesKeywords(array $value) public function setItunesSubtitle($value) { if (iconv_strlen($value, $this->getEncoding()) > 255) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "subtitle" may only' . ' contain a maximum of 255 characters'); } @@ -206,7 +206,7 @@ public function setItunesSubtitle($value) public function setItunesSummary($value) { if (iconv_strlen($value, $this->getEncoding()) > 4000) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "summary" may only' . ' contain a maximum of 4000 characters'); } @@ -227,7 +227,7 @@ public function __call($method, array $params) if (!method_exists($this, 'setItunes' . ucfirst($point)) && !method_exists($this, 'addItunes' . ucfirst($point)) ) { - require_once 'Zend/Feed/Writer/Exception/InvalidMethodException.php'; + ;// require_once 'Zend/Feed/Writer/Exception/InvalidMethodException.php'; throw new Zend_Feed_Writer_Exception_InvalidMethodException( 'invalid method: ' . $method ); diff --git a/library/Zend/Feed/Writer/Extension/ITunes/Feed.php b/library/Zend/Feed/Writer/Extension/ITunes/Feed.php index f3a733de70..8fe4ee3e3f 100644 --- a/library/Zend/Feed/Writer/Extension/ITunes/Feed.php +++ b/library/Zend/Feed/Writer/Extension/ITunes/Feed.php @@ -72,12 +72,12 @@ public function getEncoding() public function setItunesBlock($value) { if (!ctype_alpha($value) && strlen($value) > 0) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "block" may only' . ' contain alphabetic characters'); } if (iconv_strlen($value, $this->getEncoding()) > 255) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "block" may only' . ' contain a maximum of 255 characters'); } @@ -108,7 +108,7 @@ public function addItunesAuthors(array $values) public function addItunesAuthor($value) { if (iconv_strlen($value, $this->getEncoding()) > 255) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: any "author" may only' . ' contain a maximum of 255 characters each'); } @@ -133,21 +133,21 @@ public function setItunesCategories(array $values) foreach ($values as $key=>$value) { if (!is_array($value)) { if (iconv_strlen($value, $this->getEncoding()) > 255) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: any "category" may only' . ' contain a maximum of 255 characters each'); } $this->_data['categories'][] = $value; } else { if (iconv_strlen($key, $this->getEncoding()) > 255) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: any "category" may only' . ' contain a maximum of 255 characters each'); } $this->_data['categories'][$key] = array(); foreach ($value as $val) { if (iconv_strlen($val, $this->getEncoding()) > 255) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: any "category" may only' . ' contain a maximum of 255 characters each'); } @@ -167,12 +167,12 @@ public function setItunesCategories(array $values) public function setItunesImage($value) { if (!Zend_Uri::check($value)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "image" may only' . ' be a valid URI/IRI'); } if (!in_array(substr($value, -3), array('jpg','png'))) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "image" may only' . ' use file extension "jpg" or "png" which must be the last three' . ' characters of the URI (i.e. no query string or fragment)'); @@ -194,7 +194,7 @@ public function setItunesDuration($value) && !preg_match("/^\d+:[0-5]{1}[0-9]{1}$/", $value) && !preg_match("/^\d+:[0-5]{1}[0-9]{1}:[0-5]{1}[0-9]{1}$/", $value) ) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "duration" may only' . ' be of a specified [[HH:]MM:]SS format'); } @@ -211,7 +211,7 @@ public function setItunesDuration($value) public function setItunesExplicit($value) { if (!in_array($value, array('yes','no','clean'))) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "explicit" may only' . ' be one of "yes", "no" or "clean"'); } @@ -228,13 +228,13 @@ public function setItunesExplicit($value) public function setItunesKeywords(array $value) { if (count($value) > 12) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "keywords" may only' . ' contain a maximum of 12 terms'); } $concat = implode(',', $value); if (iconv_strlen($concat, $this->getEncoding()) > 255) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "keywords" may only' . ' have a concatenated length of 255 chars where terms are delimited' . ' by a comma'); @@ -252,7 +252,7 @@ public function setItunesKeywords(array $value) public function setItunesNewFeedUrl($value) { if (!Zend_Uri::check($value)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "newFeedUrl" may only' . ' be a valid URI/IRI'); } @@ -283,14 +283,14 @@ public function addItunesOwners(array $values) public function addItunesOwner(array $value) { if (!isset($value['name']) || !isset($value['email'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: any "owner" must' . ' be an array containing keys "name" and "email"'); } if (iconv_strlen($value['name'], $this->getEncoding()) > 255 || iconv_strlen($value['email'], $this->getEncoding()) > 255 ) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: any "owner" may only' . ' contain a maximum of 255 characters each for "name" and "email"'); } @@ -310,7 +310,7 @@ public function addItunesOwner(array $value) public function setItunesSubtitle($value) { if (iconv_strlen($value, $this->getEncoding()) > 255) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "subtitle" may only' . ' contain a maximum of 255 characters'); } @@ -327,7 +327,7 @@ public function setItunesSubtitle($value) public function setItunesSummary($value) { if (iconv_strlen($value, $this->getEncoding()) > 4000) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "summary" may only' . ' contain a maximum of 4000 characters'); } @@ -348,7 +348,7 @@ public function __call($method, array $params) if (!method_exists($this, 'setItunes' . ucfirst($point)) && !method_exists($this, 'addItunes' . ucfirst($point)) ) { - require_once 'Zend/Feed/Writer/Exception/InvalidMethodException.php'; + ;// require_once 'Zend/Feed/Writer/Exception/InvalidMethodException.php'; throw new Zend_Feed_Writer_Exception_InvalidMethodException( 'invalid method: ' . $method ); diff --git a/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php b/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php index 473f680a92..881532d652 100644 --- a/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php +++ b/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ -require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; +;// require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php b/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php index 071bfffa47..17afa88da9 100644 --- a/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php +++ b/library/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ -require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; +;// require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Writer/Extension/RendererAbstract.php b/library/Zend/Feed/Writer/Extension/RendererAbstract.php index 7440835817..019e4e868e 100644 --- a/library/Zend/Feed/Writer/Extension/RendererAbstract.php +++ b/library/Zend/Feed/Writer/Extension/RendererAbstract.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Extension_RendererInterface */ -require_once 'Zend/Feed/Writer/Extension/RendererInterface.php'; +;// require_once 'Zend/Feed/Writer/Extension/RendererInterface.php'; /** * @category Zend diff --git a/library/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php b/library/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php index 2002b38647..84757c9cfa 100644 --- a/library/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php +++ b/library/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ -require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; +;// require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php b/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php index 002550fe09..4f762ff873 100644 --- a/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php +++ b/library/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ -require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; +;// require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php b/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php index ff22092417..3f335ab228 100644 --- a/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php +++ b/library/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ -require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; +;// require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Writer/Feed.php b/library/Zend/Feed/Writer/Feed.php index b76bc8d9ac..53898c62fb 100644 --- a/library/Zend/Feed/Writer/Feed.php +++ b/library/Zend/Feed/Writer/Feed.php @@ -22,39 +22,39 @@ /** * @see Zend_Date */ -require_once 'Zend/Date.php'; +;// require_once 'Zend/Date.php'; /** * @see Zend_Date */ -require_once 'Zend/Uri.php'; +;// require_once 'Zend/Uri.php'; /** * @see Zend_Feed_Writer */ -require_once 'Zend/Feed/Writer.php'; +;// require_once 'Zend/Feed/Writer.php'; /** * @see Zend_Feed_Writer_Entry */ -require_once 'Zend/Feed/Writer/Entry.php'; +;// require_once 'Zend/Feed/Writer/Entry.php'; /** * @see Zend_Feed_Writer_Deleted */ -require_once 'Zend/Feed/Writer/Deleted.php'; +;// require_once 'Zend/Feed/Writer/Deleted.php'; /** * @see Zend_Feed_Writer_Renderer_Feed_Atom */ -require_once 'Zend/Feed/Writer/Renderer/Feed/Atom.php'; +;// require_once 'Zend/Feed/Writer/Renderer/Feed/Atom.php'; /** * @see Zend_Feed_Writer_Renderer_Feed_Rss */ -require_once 'Zend/Feed/Writer/Renderer/Feed/Rss.php'; +;// require_once 'Zend/Feed/Writer/Renderer/Feed/Rss.php'; -require_once 'Zend/Feed/Writer/Feed/FeedAbstract.php'; +;// require_once 'Zend/Feed/Writer/Feed/FeedAbstract.php'; /** * @category Zend @@ -147,7 +147,7 @@ public function removeEntry($index) if (isset($this->_entries[$index])) { unset($this->_entries[$index]); } - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Undefined index: ' . $index . '. Entry does not exist.'); } @@ -162,7 +162,7 @@ public function getEntry($index = 0) if (isset($this->_entries[$index])) { return $this->_entries[$index]; } - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Undefined index: ' . $index . '. Entry does not exist.'); } @@ -267,7 +267,7 @@ public function export($type, $ignoreExceptions = false) $this->setType(strtolower($type)); $type = ucfirst($this->getType()); if ($type !== 'Rss' && $type !== 'Atom') { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid feed type specified: ' . $type . '.' . ' Should be one of "rss" or "atom".'); } diff --git a/library/Zend/Feed/Writer/Feed/FeedAbstract.php b/library/Zend/Feed/Writer/Feed/FeedAbstract.php index 2cdc9e3b3a..4a29de119e 100644 --- a/library/Zend/Feed/Writer/Feed/FeedAbstract.php +++ b/library/Zend/Feed/Writer/Feed/FeedAbstract.php @@ -22,34 +22,34 @@ /** * @see Zend_Date */ -require_once 'Zend/Date.php'; +;// require_once 'Zend/Date.php'; /** * @see Zend_Date */ -require_once 'Zend/Uri.php'; +;// require_once 'Zend/Uri.php'; /** * @see Zend_Feed_Writer */ -require_once 'Zend/Feed/Writer.php'; +;// require_once 'Zend/Feed/Writer.php'; /** * @see Zend_Feed_Writer_Entry */ -require_once 'Zend/Feed/Writer/Entry.php'; +;// require_once 'Zend/Feed/Writer/Entry.php'; /** * @see Zend_Feed_Writer_Renderer_Feed_Atom */ -require_once 'Zend/Feed/Writer/Renderer/Feed/Atom.php'; +;// require_once 'Zend/Feed/Writer/Renderer/Feed/Atom.php'; /** * @see Zend_Feed_Writer_Renderer_Feed_Rss */ -require_once 'Zend/Feed/Writer/Renderer/Feed/Rss.php'; +;// require_once 'Zend/Feed/Writer/Renderer/Feed/Rss.php'; -require_once 'Zend/Validate/EmailAddress.php'; +;// require_once 'Zend/Validate/EmailAddress.php'; /** @@ -98,40 +98,40 @@ public function addAuthor($name, $email = null, $uri = null) $author = array(); if (is_array($name)) { if (!array_key_exists('name', $name) || empty($name['name']) || !is_string($name['name'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: author array must include a "name" key with a non-empty string value'); } $author['name'] = $name['name']; if (isset($name['email'])) { if (empty($name['email']) || !is_string($name['email'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "email" array value must be a non-empty string'); } $author['email'] = $name['email']; } if (isset($name['uri'])) { if (empty($name['uri']) || !is_string($name['uri']) || !Zend_Uri::check($name['uri'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "uri" array value must be a non-empty string and valid URI/IRI'); } $author['uri'] = $name['uri']; } } else { if (empty($name) || !is_string($name)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "name" must be a non-empty string value'); } $author['name'] = $name; if (isset($email)) { if (empty($email) || !is_string($email)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "email" value must be a non-empty string'); } $author['email'] = $email; } if (isset($uri)) { if (empty($uri) || !is_string($uri) || !Zend_Uri::check($uri)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "uri" value must be a non-empty string and valid URI/IRI'); } $author['uri'] = $uri; @@ -160,7 +160,7 @@ public function addAuthors(array $authors) public function setCopyright($copyright) { if (empty($copyright) || !is_string($copyright)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string'); } $this->_data['copyright'] = $copyright; @@ -181,7 +181,7 @@ public function setDateCreated($date = null) } elseif (ctype_digit((string)$date)) { $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP); } else { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid Zend_Date object or UNIX Timestamp passed as parameter'); } $this->_data['dateCreated'] = $zdate; @@ -202,7 +202,7 @@ public function setDateModified($date = null) } elseif (ctype_digit((string)$date)) { $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP); } else { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid Zend_Date object or UNIX Timestamp passed as parameter'); } $this->_data['dateModified'] = $zdate; @@ -223,7 +223,7 @@ public function setLastBuildDate($date = null) } elseif (ctype_digit((string)$date)) { $zdate = new Zend_Date($date, Zend_Date::TIMESTAMP); } else { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid Zend_Date object or UNIX Timestamp passed as parameter'); } $this->_data['lastBuildDate'] = $zdate; @@ -237,7 +237,7 @@ public function setLastBuildDate($date = null) public function setDescription($description) { if (empty($description) || !is_string($description)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string'); } $this->_data['description'] = $description; @@ -253,40 +253,40 @@ public function setGenerator($name, $version = null, $uri = null) if (is_array($name)) { $data = $name; if (empty($data['name']) || !is_string($data['name'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "name" must be a non-empty string'); } $generator = array('name' => $data['name']); if (isset($data['version'])) { if (empty($data['version']) || !is_string($data['version'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "version" must be a non-empty string'); } $generator['version'] = $data['version']; } if (isset($data['uri'])) { if (empty($data['uri']) || !is_string($data['uri']) || !Zend_Uri::check($data['uri'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "uri" must be a non-empty string and a valid URI/IRI'); } $generator['uri'] = $data['uri']; } } else { if (empty($name) || !is_string($name)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "name" must be a non-empty string'); } $generator = array('name' => $name); if (isset($version)) { if (empty($version) || !is_string($version)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "version" must be a non-empty string'); } $generator['version'] = $version; } if (isset($uri)) { if (empty($uri) || !is_string($uri) || !Zend_Uri::check($uri)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "uri" must be a non-empty string and a valid URI/IRI'); } $generator['uri'] = $uri; @@ -305,7 +305,7 @@ public function setId($id) if ((empty($id) || !is_string($id) || !Zend_Uri::check($id)) && !preg_match("#^urn:[a-zA-Z0-9][a-zA-Z0-9\-]{1,31}:([a-zA-Z0-9\(\)\+\,\.\:\=\@\;\$\_\!\*\-]|%[0-9a-fA-F]{2})*#", $id) && !$this->_validateTagUri($id)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string and valid URI/IRI'); } $this->_data['id'] = $id; @@ -355,7 +355,7 @@ public function setImage(array $data) { if (empty($data['uri']) || !is_string($data['uri']) || !Zend_Uri::check($data['uri'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: parameter \'uri\'' . ' must be a non-empty string and valid URI/IRI'); } @@ -373,7 +373,7 @@ public function setIcon(array $data) { if (empty($data['uri']) || !is_string($data['uri']) || !Zend_Uri::check($data['uri'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: parameter \'uri\'' . ' must be a non-empty string and valid URI/IRI'); } @@ -388,7 +388,7 @@ public function setIcon(array $data) public function setLanguage($language) { if (empty($language) || !is_string($language)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string'); } $this->_data['language'] = $language; @@ -402,7 +402,7 @@ public function setLanguage($language) public function setLink($link) { if (empty($link) || !is_string($link) || !Zend_Uri::check($link)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string and valid URI/IRI'); } $this->_data['link'] = $link; @@ -416,11 +416,11 @@ public function setLink($link) public function setFeedLink($link, $type) { if (empty($link) || !is_string($link) || !Zend_Uri::check($link)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "link"" must be a non-empty string and valid URI/IRI'); } if (!in_array(strtolower($type), array('rss', 'rdf', 'atom'))) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "type"; You must declare the type of feed the link points to, i.e. RSS, RDF or Atom'); } $this->_data['feedLinks'][strtolower($type)] = $link; @@ -434,7 +434,7 @@ public function setFeedLink($link, $type) public function setTitle($title) { if (empty($title) || !is_string($title)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string'); } $this->_data['title'] = $title; @@ -448,7 +448,7 @@ public function setTitle($title) public function setEncoding($encoding) { if (empty($encoding) || !is_string($encoding)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string'); } $this->_data['encoding'] = $encoding; @@ -462,7 +462,7 @@ public function setEncoding($encoding) public function setBaseUrl($url) { if (empty($url) || !is_string($url) || !Zend_Uri::check($url)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "url" array value' . ' must be a non-empty string and valid URI/IRI'); } @@ -477,7 +477,7 @@ public function setBaseUrl($url) public function addHub($url) { if (empty($url) || !is_string($url) || !Zend_Uri::check($url)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "url" array value' . ' must be a non-empty string and valid URI/IRI'); } @@ -507,7 +507,7 @@ public function addHubs(array $urls) public function addCategory(array $category) { if (!isset($category['term'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Each category must be an array and ' . 'contain at least a "term" element containing the machine ' . ' readable category name'); @@ -517,7 +517,7 @@ public function addCategory(array $category) || !is_string($category['scheme']) || !Zend_Uri::check($category['scheme']) ) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('The Atom scheme or RSS domain of' . ' a category must be a valid URI'); } @@ -849,7 +849,7 @@ public function __call($method, $args) } catch (Zend_Feed_Writer_Exception_InvalidMethodException $e) { } } - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Method: ' . $method . ' does not exist and could not be located on a registered Extension'); } diff --git a/library/Zend/Feed/Writer/Renderer/Entry/Atom.php b/library/Zend/Feed/Writer/Renderer/Entry/Atom.php index 02c2289608..5172ed2d6b 100644 --- a/library/Zend/Feed/Writer/Renderer/Entry/Atom.php +++ b/library/Zend/Feed/Writer/Renderer/Entry/Atom.php @@ -22,12 +22,12 @@ /** * @see Zend_Feed_Writer_Renderer_RendererAbstract */ -require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php'; +;// require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php'; -require_once 'Zend/Feed/Writer/Renderer/Feed/Atom/Source.php'; +;// require_once 'Zend/Feed/Writer/Renderer/Feed/Atom/Source.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** * @category Zend @@ -94,7 +94,7 @@ public function render() protected function _setTitle(DOMDocument $dom, DOMElement $root) { if(!$this->getDataContainer()->getTitle()) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = 'Atom 1.0 entry elements MUST contain exactly one' . ' atom:title element but a title has not been set'; $exception = new Zend_Feed_Exception($message); @@ -143,7 +143,7 @@ protected function _setDescription(DOMDocument $dom, DOMElement $root) protected function _setDateModified(DOMDocument $dom, DOMElement $root) { if(!$this->getDataContainer()->getDateModified()) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = 'Atom 1.0 entry elements MUST contain exactly one' . ' atom:updated element but a modification date has not been set'; $exception = new Zend_Feed_Exception($message); @@ -270,7 +270,7 @@ protected function _setId(DOMDocument $dom, DOMElement $root) { if(!$this->getDataContainer()->getId() && !$this->getDataContainer()->getLink()) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = 'Atom 1.0 entry elements MUST contain exactly one ' . 'atom:id element, or as an alternative, we can use the same ' . 'value as atom:link however neither a suitable link nor an ' @@ -292,7 +292,7 @@ protected function _setId(DOMDocument $dom, DOMElement $root) !preg_match("#^urn:[a-zA-Z0-9][a-zA-Z0-9\-]{1,31}:([a-zA-Z0-9\(\)\+\,\.\:\=\@\;\$\_\!\*\-]|%[0-9a-fA-F]{2})*#", $this->getDataContainer()->getId() ) && !$this->_validateTagUri($this->getDataContainer()->getId())) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Atom 1.0 IDs must be a valid URI/IRI'); } $id = $dom->createElement('id'); @@ -344,7 +344,7 @@ protected function _setContent(DOMDocument $dom, DOMElement $root) { $content = $this->getDataContainer()->getContent(); if (!$content && !$this->getDataContainer()->getLink()) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = 'Atom 1.0 entry elements MUST contain exactly one ' . 'atom:content element, or as an alternative, at least one link ' . 'with a rel attribute of "alternate" to indicate an alternate ' diff --git a/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php b/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php index 6063d04449..f5d365b73b 100644 --- a/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php +++ b/library/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Renderer_RendererAbstract */ -require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php'; +;// require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Writer/Renderer/Entry/Rss.php b/library/Zend/Feed/Writer/Renderer/Entry/Rss.php index a26db5b1f0..dfb4004011 100644 --- a/library/Zend/Feed/Writer/Renderer/Entry/Rss.php +++ b/library/Zend/Feed/Writer/Renderer/Entry/Rss.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Renderer_RendererAbstract */ -require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php'; +;// require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php'; /** * @category Zend @@ -89,7 +89,7 @@ protected function _setTitle(DOMDocument $dom, DOMElement $root) { if(!$this->getDataContainer()->getDescription() && !$this->getDataContainer()->getTitle()) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = 'RSS 2.0 entry elements SHOULD contain exactly one' . ' title element but a title has not been set. In addition, there' . ' is no description as required in the absence of a title.'; @@ -118,7 +118,7 @@ protected function _setDescription(DOMDocument $dom, DOMElement $root) { if(!$this->getDataContainer()->getDescription() && !$this->getDataContainer()->getTitle()) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = 'RSS 2.0 entry elements SHOULD contain exactly one' . ' description element but a description has not been set. In' . ' addition, there is no title element as required in the absence' @@ -219,7 +219,7 @@ protected function _setEnclosure(DOMDocument $dom, DOMElement $root) return; } if (!isset($data['type'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $exception = new Zend_Feed_Exception('Enclosure "type" is not set'); if (!$this->_ignoreExceptions) { throw $exception; @@ -229,7 +229,7 @@ protected function _setEnclosure(DOMDocument $dom, DOMElement $root) } } if (!isset($data['length'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $exception = new Zend_Feed_Exception('Enclosure "length" is not set'); if (!$this->_ignoreExceptions) { throw $exception; @@ -239,7 +239,7 @@ protected function _setEnclosure(DOMDocument $dom, DOMElement $root) } } if (isset($data['length']) && (int) $data['length'] <= 0) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $exception = new Zend_Feed_Exception('Enclosure "length" must be an integer' . ' indicating the content\'s length in bytes'); if (!$this->_ignoreExceptions) { diff --git a/library/Zend/Feed/Writer/Renderer/Feed/Atom.php b/library/Zend/Feed/Writer/Renderer/Feed/Atom.php index a91c71455c..d56ebba280 100644 --- a/library/Zend/Feed/Writer/Renderer/Feed/Atom.php +++ b/library/Zend/Feed/Writer/Renderer/Feed/Atom.php @@ -20,24 +20,24 @@ */ /** @see Zend_Feed_Writer_Feed */ -require_once 'Zend/Feed/Writer/Feed.php'; +;// require_once 'Zend/Feed/Writer/Feed.php'; /** @see Zend_Version */ -require_once 'Zend/Version.php'; +;// require_once 'Zend/Version.php'; /** @see Zend_Feed_Writer_Renderer_RendererInterface */ -require_once 'Zend/Feed/Writer/Renderer/RendererInterface.php'; +;// require_once 'Zend/Feed/Writer/Renderer/RendererInterface.php'; /** @see Zend_Feed_Writer_Renderer_Entry_Atom */ -require_once 'Zend/Feed/Writer/Renderer/Entry/Atom.php'; +;// require_once 'Zend/Feed/Writer/Renderer/Entry/Atom.php'; /** @see Zend_Feed_Writer_Renderer_Entry_Atom_Deleted */ -require_once 'Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php'; +;// require_once 'Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php'; /** @see Zend_Feed_Writer_Renderer_RendererAbstract */ -require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php'; +;// require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php'; -require_once 'Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php'; +;// require_once 'Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php b/library/Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php index 0f8ccc110f..c008e19b6d 100644 --- a/library/Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php +++ b/library/Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php @@ -20,19 +20,19 @@ */ /** @see Zend_Feed_Writer_Feed */ -require_once 'Zend/Feed/Writer/Feed.php'; +;// require_once 'Zend/Feed/Writer/Feed.php'; /** @see Zend_Version */ -require_once 'Zend/Version.php'; +;// require_once 'Zend/Version.php'; /** @see Zend_Feed_Writer_Renderer_RendererInterface */ -require_once 'Zend/Feed/Writer/Renderer/RendererInterface.php'; +;// require_once 'Zend/Feed/Writer/Renderer/RendererInterface.php'; /** @see Zend_Feed_Writer_Renderer_Entry_Atom */ -require_once 'Zend/Feed/Writer/Renderer/Entry/Atom.php'; +;// require_once 'Zend/Feed/Writer/Renderer/Entry/Atom.php'; /** @see Zend_Feed_Writer_Renderer_RendererAbstract */ -require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php'; +;// require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php'; /** * @category Zend @@ -79,7 +79,7 @@ protected function _setLanguage(DOMDocument $dom, DOMElement $root) protected function _setTitle(DOMDocument $dom, DOMElement $root) { if(!$this->getDataContainer()->getTitle()) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = 'Atom 1.0 feed elements MUST contain exactly one' . ' atom:title element but a title has not been set'; $exception = new Zend_Feed_Exception($message); @@ -127,7 +127,7 @@ protected function _setDescription(DOMDocument $dom, DOMElement $root) protected function _setDateModified(DOMDocument $dom, DOMElement $root) { if(!$this->getDataContainer()->getDateModified()) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = 'Atom 1.0 feed elements MUST contain exactly one' . ' atom:updated element but a modification date has not been set'; $exception = new Zend_Feed_Exception($message); @@ -204,7 +204,7 @@ protected function _setFeedLinks(DOMDocument $dom, DOMElement $root) { $flinks = $this->getDataContainer()->getFeedLinks(); if(!$flinks || !array_key_exists('atom', $flinks)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = 'Atom 1.0 feed elements SHOULD contain one atom:link ' . 'element with a rel attribute value of "self". This is the ' . 'preferred URI for retrieving Atom Feed Documents representing ' @@ -279,7 +279,7 @@ protected function _setId(DOMDocument $dom, DOMElement $root) { if(!$this->getDataContainer()->getId() && !$this->getDataContainer()->getLink()) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = 'Atom 1.0 feed elements MUST contain exactly one ' . 'atom:id element, or as an alternative, we can use the same ' . 'value as atom:link however neither a suitable link nor an ' diff --git a/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php b/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php index eed591a12a..8a6f2e2fb9 100644 --- a/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php +++ b/library/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php @@ -19,7 +19,7 @@ * @version $Id$ */ -require_once 'Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php'; +;// require_once 'Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php'; /** * @category Zend diff --git a/library/Zend/Feed/Writer/Renderer/Feed/Rss.php b/library/Zend/Feed/Writer/Renderer/Feed/Rss.php index 973154cb72..4c466aa7b3 100644 --- a/library/Zend/Feed/Writer/Renderer/Feed/Rss.php +++ b/library/Zend/Feed/Writer/Renderer/Feed/Rss.php @@ -20,19 +20,19 @@ */ /** @see Zend_Feed_Writer_Feed */ -require_once 'Zend/Feed/Writer/Feed.php'; +;// require_once 'Zend/Feed/Writer/Feed.php'; /** @see Zend_Version */ -require_once 'Zend/Version.php'; +;// require_once 'Zend/Version.php'; /** @see Zend_Feed_Writer_Renderer_RendererInterface */ -require_once 'Zend/Feed/Writer/Renderer/RendererInterface.php'; +;// require_once 'Zend/Feed/Writer/Renderer/RendererInterface.php'; /** @see Zend_Feed_Writer_Renderer_Entry_Rss */ -require_once 'Zend/Feed/Writer/Renderer/Entry/Rss.php'; +;// require_once 'Zend/Feed/Writer/Renderer/Entry/Rss.php'; /** @see Zend_Feed_Writer_Renderer_RendererAbstract */ -require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php'; +;// require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php'; /** * @category Zend @@ -146,7 +146,7 @@ protected function _setLanguage(DOMDocument $dom, DOMElement $root) protected function _setTitle(DOMDocument $dom, DOMElement $root) { if(!$this->getDataContainer()->getTitle()) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = 'RSS 2.0 feed elements MUST contain exactly one' . ' title element but a title has not been set'; $exception = new Zend_Feed_Exception($message); @@ -174,7 +174,7 @@ protected function _setTitle(DOMDocument $dom, DOMElement $root) protected function _setDescription(DOMDocument $dom, DOMElement $root) { if(!$this->getDataContainer()->getDescription()) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = 'RSS 2.0 feed elements MUST contain exactly one' . ' description element but one has not been set'; $exception = new Zend_Feed_Exception($message); @@ -251,7 +251,7 @@ protected function _setLink(DOMDocument $dom, DOMElement $root) { $value = $this->getDataContainer()->getLink(); if(!$value) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = 'RSS 2.0 feed elements MUST contain exactly one' . ' link element but one has not been set'; $exception = new Zend_Feed_Exception($message); @@ -330,7 +330,7 @@ protected function _setImage(DOMDocument $dom, DOMElement $root) } if (!isset($image['title']) || empty($image['title']) || !is_string($image['title'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = 'RSS 2.0 feed images must include a title'; $exception = new Zend_Feed_Exception($message); if (!$this->_ignoreExceptions) { @@ -342,7 +342,7 @@ protected function _setImage(DOMDocument $dom, DOMElement $root) } if (empty($image['link']) || !is_string($image['link']) || !Zend_Uri::check($image['link'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = 'Invalid parameter: parameter \'link\'' . ' must be a non-empty string and valid URI/IRI'; $exception = new Zend_Feed_Exception($message); @@ -369,7 +369,7 @@ protected function _setImage(DOMDocument $dom, DOMElement $root) $img->appendChild($link); if (isset($image['height'])) { if (!ctype_digit((string) $image['height']) || $image['height'] > 400) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = 'Invalid parameter: parameter \'height\'' . ' must be an integer not exceeding 400'; $exception = new Zend_Feed_Exception($message); @@ -387,7 +387,7 @@ protected function _setImage(DOMDocument $dom, DOMElement $root) } if (isset($image['width'])) { if (!ctype_digit((string) $image['width']) || $image['width'] > 144) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = 'Invalid parameter: parameter \'width\'' . ' must be an integer not exceeding 144'; $exception = new Zend_Feed_Exception($message); @@ -405,7 +405,7 @@ protected function _setImage(DOMDocument $dom, DOMElement $root) } if (isset($image['description'])) { if (empty($image['description']) || !is_string($image['description'])) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; $message = 'Invalid parameter: parameter \'description\'' . ' must be a non-empty string'; $exception = new Zend_Feed_Exception($message); diff --git a/library/Zend/Feed/Writer/Renderer/RendererAbstract.php b/library/Zend/Feed/Writer/Renderer/RendererAbstract.php index 05a61bfdc1..aaffca7b62 100644 --- a/library/Zend/Feed/Writer/Renderer/RendererAbstract.php +++ b/library/Zend/Feed/Writer/Renderer/RendererAbstract.php @@ -20,10 +20,10 @@ */ /** @see Zend_Feed_Writer */ -require_once 'Zend/Feed/Writer.php'; +;// require_once 'Zend/Feed/Writer.php'; /** @see Zend_Version */ -require_once 'Zend/Version.php'; +;// require_once 'Zend/Version.php'; /** * @category Zend @@ -163,7 +163,7 @@ public function getEncoding() public function ignoreExceptions($bool = true) { if (!is_bool($bool)) { - require_once 'Zend/Feed/Exception.php'; + ;// require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: $bool. Should be TRUE or FALSE (defaults to TRUE if null)'); } $this->_ignoreExceptions = $bool; diff --git a/library/Zend/Feed/Writer/Source.php b/library/Zend/Feed/Writer/Source.php index 30c07ee514..9ed38f3e0a 100644 --- a/library/Zend/Feed/Writer/Source.php +++ b/library/Zend/Feed/Writer/Source.php @@ -19,7 +19,7 @@ * @version $Id$ */ -require_once 'Zend/Feed/Writer/Feed/FeedAbstract.php'; +;// require_once 'Zend/Feed/Writer/Feed/FeedAbstract.php'; /** * @category Zend diff --git a/library/Zend/File/ClassFileLocator.php b/library/Zend/File/ClassFileLocator.php index ff491ca03b..69db3828e1 100644 --- a/library/Zend/File/ClassFileLocator.php +++ b/library/Zend/File/ClassFileLocator.php @@ -18,7 +18,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/File/PhpClassFile.php'; +;// require_once 'Zend/File/PhpClassFile.php'; /** * Locate files containing PHP classes, interfaces, or abstracts diff --git a/library/Zend/File/Transfer.php b/library/Zend/File/Transfer.php index 28e15271a6..94d52fb79c 100644 --- a/library/Zend/File/Transfer.php +++ b/library/Zend/File/Transfer.php @@ -22,7 +22,7 @@ /** * @see Zend_Loader */ -require_once 'Zend/Loader.php'; +;// require_once 'Zend/Loader.php'; /** * Base class for all protocols supporting file transfers @@ -75,7 +75,7 @@ public function setAdapter($adapter, $direction = false, $options = array()) $direction = (integer) $direction; $this->_adapter[$direction] = new $adapter($options); if (!$this->_adapter[$direction] instanceof Zend_File_Transfer_Adapter_Abstract) { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception("Adapter " . $adapter . " does not extend Zend_File_Transfer_Adapter_Abstract"); } @@ -119,7 +119,7 @@ public function __call($method, array $options) return call_user_func_array(array($this->_adapter[$direction], $method), $options); } - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception("Unknown method '" . $method . "' called!"); } } diff --git a/library/Zend/File/Transfer/Adapter/Abstract.php b/library/Zend/File/Transfer/Adapter/Abstract.php index c0a8affbbb..93acb643bb 100644 --- a/library/Zend/File/Transfer/Adapter/Abstract.php +++ b/library/Zend/File/Transfer/Adapter/Abstract.php @@ -171,7 +171,7 @@ abstract public function isFiltered($files = null); */ public static function getProgress() { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Method must be implemented within the adapter'); } @@ -192,7 +192,7 @@ public function setPluginLoader(Zend_Loader_PluginLoader_Interface $loader, $typ $this->_loaders[$type] = $loader; return $this; default: - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception(sprintf('Invalid type "%s" provided to setPluginLoader()', $type)); } } @@ -221,7 +221,7 @@ public function getPluginLoader($type) 'Zend_' . $prefixSegment . '_File' => 'Zend/' . $pathSegment . '/File', ); - require_once 'Zend/Loader/PluginLoader.php'; + ;// require_once 'Zend/Loader/PluginLoader.php'; $this->_loaders[$type] = new Zend_Loader_PluginLoader($paths); } else { $loader = $this->_loaders[$type]; @@ -232,7 +232,7 @@ public function getPluginLoader($type) } return $this->_loaders[$type]; default: - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type)); } } @@ -274,7 +274,7 @@ public function addPrefixPath($prefix, $path, $type = null) } return $this; default: - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type)); } } @@ -347,7 +347,7 @@ public function addValidator($validator, $breakChainOnFailure = false, $options unset($options['messages']); } } else { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Invalid validator provided to addValidator; must be string or Zend_Validate_Interface'); } @@ -429,7 +429,7 @@ public function addValidators(array $validators, $files = null) } } } else { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Invalid validator passed to addValidators()'); } } @@ -579,7 +579,7 @@ public function setOptions($options = array(), $files = null) { break; default: - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception("Unknown option: $name = $value"); } } @@ -755,7 +755,7 @@ public function addFilter($filter, $options = null, $files = null) $class = $this->getPluginLoader(self::FILTER)->load($filter); $filter = new $class($options); } else { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Invalid filter specified'); } @@ -930,7 +930,7 @@ public function clearFilters() */ public function getFile() { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Method not implemented'); } @@ -987,7 +987,7 @@ public function getFileInfo($file = null) */ public function addFile($file, $validator = null, $filter = null) { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Method not implemented'); } @@ -999,7 +999,7 @@ public function addFile($file, $validator = null, $filter = null) */ public function getType() { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Method not implemented'); } @@ -1014,7 +1014,7 @@ public function getType() */ public function addType($type, $validator = null, $filter = null) { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Method not implemented'); } @@ -1032,14 +1032,14 @@ public function setDestination($destination, $files = null) $orig = $files; $destination = rtrim($destination, "/\\"); if (!is_dir($destination)) { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception( 'The given destination is not a directory or does not exist' ); } if (!$this->_isPathWriteable($destination)) { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception( 'The given destination is not writable' ); @@ -1079,7 +1079,7 @@ public function getDestination($files = null) if (isset($this->_files[$orig]['destination'])) { $destinations[$orig] = $this->_files[$orig]['destination']; } else { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception(sprintf('The file transfer adapter can not find "%s"', $orig)); } } @@ -1119,7 +1119,7 @@ public function setTranslator($translator = null) } elseif ($translator instanceof Zend_Translate) { $this->_translator = $translator->getAdapter(); } else { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Invalid translator specified'); } @@ -1173,7 +1173,7 @@ public function translatorIsDisabled() public function getHash($hash = 'crc32', $files = null) { if (!in_array($hash, hash_algos())) { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Unknown hash algorithm'); } @@ -1185,7 +1185,7 @@ public function getHash($hash = 'crc32', $files = null) } else if (file_exists($value['tmp_name'])) { $result[$key] = hash_file($hash, $value['tmp_name']); } else if (empty($value['options']['ignoreNoFile'])) { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception("The file '{$value['name']}' does not exist"); } } @@ -1216,7 +1216,7 @@ public function getFileSize($files = null) $result[$key] = $value['size']; } } else if (empty($value['options']['ignoreNoFile'])) { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception("The file '{$value['name']}' does not exist"); } else { continue; @@ -1265,7 +1265,7 @@ public function getMimeType($files = null) if (file_exists($value['name']) || file_exists($value['tmp_name'])) { $result[$key] = $value['type']; } else if (empty($value['options']['ignoreNoFile'])) { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception("The file '{$value['name']}' does not exist"); } else { continue; @@ -1416,7 +1416,7 @@ protected function _getTmpDir() $this->_tmpDir = realpath(dirname($tempFile)); unlink($tempFile); } else { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Could not determine a temporary directory'); } } @@ -1500,7 +1500,7 @@ protected function _getFiles($files, $names = false, $noexception = false) return array(); } - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception(sprintf('The file transfer adapter can not find "%s"', $find)); } diff --git a/library/Zend/File/Transfer/Adapter/Http.php b/library/Zend/File/Transfer/Adapter/Http.php index 2265e4ff1a..570ad94006 100644 --- a/library/Zend/File/Transfer/Adapter/Http.php +++ b/library/Zend/File/Transfer/Adapter/Http.php @@ -22,7 +22,7 @@ /** * @see Zend_File_Transfer_Adapter_Abstract */ -require_once 'Zend/File/Transfer/Adapter/Abstract.php'; +;// require_once 'Zend/File/Transfer/Adapter/Abstract.php'; /** * File transfer adapter class for the HTTP protocol @@ -45,7 +45,7 @@ class Zend_File_Transfer_Adapter_Http extends Zend_File_Transfer_Adapter_Abstrac public function __construct($options = array()) { if (ini_get('file_uploads') == false) { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('File uploads are not allowed in your php config!'); } @@ -105,7 +105,7 @@ public function clearValidators() */ public function send($options = null) { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Method not implemented'); } @@ -228,7 +228,7 @@ public function receive($files = null) */ public function isSent($files = null) { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Method not implemented'); } @@ -307,7 +307,7 @@ public function isUploaded($files = null) public static function getProgress($id = null) { if (!function_exists('apc_fetch') and !function_exists('uploadprogress_get_info')) { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Neither APC nor uploadprogress extension installed'); } @@ -385,12 +385,12 @@ public static function getProgress($id = null) if (isset($adapter) && isset($status['id'])) { if ($adapter instanceof Zend_ProgressBar_Adapter) { - require_once 'Zend/ProgressBar.php'; + ;// require_once 'Zend/ProgressBar.php'; $adapter = new Zend_ProgressBar($adapter, 0, $status['total'], $session); } if (!($adapter instanceof Zend_ProgressBar)) { - require_once 'Zend/File/Transfer/Exception.php'; + ;// require_once 'Zend/File/Transfer/Exception.php'; throw new Zend_File_Transfer_Exception('Unknown Adapter given'); } diff --git a/library/Zend/File/Transfer/Exception.php b/library/Zend/File/Transfer/Exception.php index 39b01ee4a1..984f8131dd 100644 --- a/library/Zend/File/Transfer/Exception.php +++ b/library/Zend/File/Transfer/Exception.php @@ -22,7 +22,7 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * Exception class for Zend_File_Transfer diff --git a/library/Zend/Filter.php b/library/Zend/Filter.php index 1256ff9bd6..f032e62b7f 100644 --- a/library/Zend/Filter.php +++ b/library/Zend/Filter.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** * @category Zend @@ -206,7 +206,7 @@ public static function get($value, $classBaseName, array $args = array(), $names */ public static function filterStatic($value, $classBaseName, array $args = array(), $namespaces = array()) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; $namespaces = array_merge((array) $namespaces, self::$_defaultNamespaces, array('Zend_Filter')); foreach ($namespaces as $namespace) { $className = $namespace . '_' . ucfirst($classBaseName); @@ -233,7 +233,7 @@ public static function filterStatic($value, $classBaseName, array $args = array( return $object->filter($value); } } - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Filter class not found from basename '$classBaseName'"); } } diff --git a/library/Zend/Filter/Alnum.php b/library/Zend/Filter/Alnum.php index 7455dafe45..5e044bea54 100644 --- a/library/Zend/Filter/Alnum.php +++ b/library/Zend/Filter/Alnum.php @@ -22,11 +22,11 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** * @see Zend_Locale */ -require_once 'Zend/Locale.php'; +;// require_once 'Zend/Locale.php'; /** * @category Zend diff --git a/library/Zend/Filter/Alpha.php b/library/Zend/Filter/Alpha.php index 7374da1665..1c9d537465 100644 --- a/library/Zend/Filter/Alpha.php +++ b/library/Zend/Filter/Alpha.php @@ -22,11 +22,11 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** * @see Zend_Locale */ -require_once 'Zend/Locale.php'; +;// require_once 'Zend/Locale.php'; /** * @category Zend diff --git a/library/Zend/Filter/BaseName.php b/library/Zend/Filter/BaseName.php index 8d6a6da560..44f28c5460 100644 --- a/library/Zend/Filter/BaseName.php +++ b/library/Zend/Filter/BaseName.php @@ -24,7 +24,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** diff --git a/library/Zend/Filter/Boolean.php b/library/Zend/Filter/Boolean.php index 165ee6dee8..2d2133a018 100644 --- a/library/Zend/Filter/Boolean.php +++ b/library/Zend/Filter/Boolean.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** * @category Zend @@ -154,7 +154,7 @@ public function setType($type = null) } if (!is_int($type) || ($type < 0) || ($type > self::ALL)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Unknown type'); } @@ -186,14 +186,14 @@ public function setLocale($locale = null) } elseif ($locale instanceof Zend_Locale) { $locale = array($locale->toString()); } elseif (!is_array($locale)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Locale has to be string, array or an instance of Zend_Locale'); } - require_once 'Zend/Locale.php'; + ;// require_once 'Zend/Locale.php'; foreach ($locale as $single) { if (!Zend_Locale::isLocale($single)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Unknown locale '$single'"); } } @@ -244,7 +244,7 @@ public function filter($value) if ($type >= self::YES) { $type -= self::YES; if (is_string($value)) { - require_once 'Zend/Locale.php'; + ;// require_once 'Zend/Locale.php'; $locales = $this->getLocale(); foreach ($locales as $locale) { if ($this->_getLocalizedQuestion($value, false, $locale) === false) { diff --git a/library/Zend/Filter/Callback.php b/library/Zend/Filter/Callback.php index f7961ea511..6367497e0e 100644 --- a/library/Zend/Filter/Callback.php +++ b/library/Zend/Filter/Callback.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** * @category Zend @@ -67,7 +67,7 @@ public function __construct($options) } if (!array_key_exists('callback', $options)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Missing callback to use'); } @@ -96,7 +96,7 @@ public function getCallback() public function setCallback($callback, $options = null) { if (!is_callable($callback)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Callback can not be accessed'); } diff --git a/library/Zend/Filter/Compress.php b/library/Zend/Filter/Compress.php index e9361f7a43..8bb41f1592 100644 --- a/library/Zend/Filter/Compress.php +++ b/library/Zend/Filter/Compress.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** * Compresses a given string @@ -97,7 +97,7 @@ public function getAdapter() $adapter = $this->_adapter; $options = $this->getAdapterOptions(); if (!class_exists($adapter)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; if (Zend_Loader::isReadable('Zend/Filter/Compress/' . ucfirst($adapter) . '.php')) { $adapter = 'Zend_Filter_Compress_' . ucfirst($adapter); } @@ -106,7 +106,7 @@ public function getAdapter() $this->_adapter = new $adapter($options); if (!$this->_adapter instanceof Zend_Filter_Compress_CompressInterface) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Compression adapter '" . $adapter . "' does not implement Zend_Filter_Compress_CompressInterface"); } return $this->_adapter; @@ -135,7 +135,7 @@ public function setAdapter($adapter) return $this; } if (!is_string($adapter)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Invalid adapter provided; must be string or instance of Zend_Filter_Compress_CompressInterface'); } $this->_adapter = $adapter; @@ -175,7 +175,7 @@ public function __call($method, $options) { $adapter = $this->getAdapter(); if (!method_exists($adapter, $method)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Unknown method '{$method}'"); } diff --git a/library/Zend/Filter/Compress/Bz2.php b/library/Zend/Filter/Compress/Bz2.php index 6bd4451f7b..bdcecb54c1 100644 --- a/library/Zend/Filter/Compress/Bz2.php +++ b/library/Zend/Filter/Compress/Bz2.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Compress_CompressAbstract */ -require_once 'Zend/Filter/Compress/CompressAbstract.php'; +;// require_once 'Zend/Filter/Compress/CompressAbstract.php'; /** * Compression adapter for Bz2 @@ -56,7 +56,7 @@ class Zend_Filter_Compress_Bz2 extends Zend_Filter_Compress_CompressAbstract public function __construct($options = null) { if (!extension_loaded('bz2')) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('This filter needs the bz2 extension'); } parent::__construct($options); @@ -81,7 +81,7 @@ public function getBlocksize() public function setBlocksize($blocksize) { if (($blocksize < 0) || ($blocksize > 9)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Blocksize must be between 0 and 9'); } @@ -123,7 +123,7 @@ public function compress($content) if (!empty($archive)) { $file = bzopen($archive, 'w'); if (!$file) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Error opening the archive '" . $archive . "'"); } @@ -135,7 +135,7 @@ public function compress($content) } if (is_int($compressed)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Error during compression'); } @@ -158,7 +158,7 @@ public function decompress($content) if (@file_exists($archive)) { $file = bzopen($archive, 'r'); if (!$file) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Error opening the archive '" . $content . "'"); } @@ -169,7 +169,7 @@ public function decompress($content) } if (is_int($compressed)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Error during decompression'); } diff --git a/library/Zend/Filter/Compress/CompressAbstract.php b/library/Zend/Filter/Compress/CompressAbstract.php index 2b20ac6f07..83db31558a 100644 --- a/library/Zend/Filter/Compress/CompressAbstract.php +++ b/library/Zend/Filter/Compress/CompressAbstract.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Compress_CompressInterface */ -require_once 'Zend/Filter/Compress/CompressInterface.php'; +;// require_once 'Zend/Filter/Compress/CompressInterface.php'; /** * Abstract compression adapter diff --git a/library/Zend/Filter/Compress/Gz.php b/library/Zend/Filter/Compress/Gz.php index 819795c5c9..ff3fb433fe 100644 --- a/library/Zend/Filter/Compress/Gz.php +++ b/library/Zend/Filter/Compress/Gz.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Compress_CompressAbstract */ -require_once 'Zend/Filter/Compress/CompressAbstract.php'; +;// require_once 'Zend/Filter/Compress/CompressAbstract.php'; /** * Compression adapter for Gzip (ZLib) @@ -58,7 +58,7 @@ class Zend_Filter_Compress_Gz extends Zend_Filter_Compress_CompressAbstract public function __construct($options = null) { if (!extension_loaded('zlib')) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('This filter needs the zlib extension'); } parent::__construct($options); @@ -83,7 +83,7 @@ public function getLevel() public function setLevel($level) { if (($level < 0) || ($level > 9)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Level must be between 0 and 9'); } @@ -109,7 +109,7 @@ public function getMode() public function setMode($mode) { if (($mode != 'compress') && ($mode != 'deflate')) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Given compression mode not supported'); } @@ -151,7 +151,7 @@ public function compress($content) if (!empty($archive)) { $file = gzopen($archive, 'w' . $this->getLevel()); if (!$file) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Error opening the archive '" . $this->_options['archive'] . "'"); } @@ -165,7 +165,7 @@ public function compress($content) } if (!$compressed) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Error during compression'); } @@ -189,7 +189,7 @@ public function decompress($content) if (@file_exists($archive)) { $handler = fopen($archive, "rb"); if (!$handler) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Error opening the archive '" . $archive . "'"); } @@ -209,7 +209,7 @@ public function decompress($content) } if (!$compressed) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Error during compression'); } diff --git a/library/Zend/Filter/Compress/Lzf.php b/library/Zend/Filter/Compress/Lzf.php index 33115105a0..4a68a8362f 100644 --- a/library/Zend/Filter/Compress/Lzf.php +++ b/library/Zend/Filter/Compress/Lzf.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Compress_CompressInterface */ -require_once 'Zend/Filter/Compress/CompressInterface.php'; +;// require_once 'Zend/Filter/Compress/CompressInterface.php'; /** * Compression adapter for Lzf @@ -40,7 +40,7 @@ class Zend_Filter_Compress_Lzf implements Zend_Filter_Compress_CompressInterface public function __construct() { if (!extension_loaded('lzf')) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('This filter needs the lzf extension'); } } @@ -55,7 +55,7 @@ public function compress($content) { $compressed = lzf_compress($content); if (!$compressed) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Error during compression'); } @@ -72,7 +72,7 @@ public function decompress($content) { $compressed = lzf_decompress($content); if (!$compressed) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Error during compression'); } diff --git a/library/Zend/Filter/Compress/Rar.php b/library/Zend/Filter/Compress/Rar.php index 934cd03162..f6e2aa4e16 100644 --- a/library/Zend/Filter/Compress/Rar.php +++ b/library/Zend/Filter/Compress/Rar.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Compress_CompressAbstract */ -require_once 'Zend/Filter/Compress/CompressAbstract.php'; +;// require_once 'Zend/Filter/Compress/CompressAbstract.php'; /** * Compression adapter for Rar @@ -60,7 +60,7 @@ class Zend_Filter_Compress_Rar extends Zend_Filter_Compress_CompressAbstract public function __construct($options = null) { if (!extension_loaded('rar')) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('This filter needs the rar extension'); } parent::__construct($options); @@ -85,7 +85,7 @@ public function getCallback() public function setCallback($callback) { if (!is_callable($callback)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Callback can not be accessed'); } @@ -158,7 +158,7 @@ public function getTarget() public function setTarget($target) { if (!file_exists(dirname($target))) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("The directory '$target' does not exist"); } @@ -177,7 +177,7 @@ public function compress($content) { $callback = $this->getCallback(); if ($callback === null) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('No compression callback available'); } @@ -186,7 +186,7 @@ public function compress($content) $result = call_user_func($callback, $options, $content); if ($result !== true) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Error compressing the RAR Archive'); } @@ -205,7 +205,7 @@ public function decompress($content) if (file_exists($content)) { $archive = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, realpath($content)); } elseif (empty($archive) || !file_exists($archive)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('RAR Archive not found'); } @@ -217,7 +217,7 @@ public function decompress($content) } if (!$archive) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Error opening the RAR Archive"); } @@ -228,7 +228,7 @@ public function decompress($content) $filelist = rar_list($archive); if (!$filelist) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Error reading the RAR Archive"); } diff --git a/library/Zend/Filter/Compress/Tar.php b/library/Zend/Filter/Compress/Tar.php index d2ce0d89a9..174706e4c0 100644 --- a/library/Zend/Filter/Compress/Tar.php +++ b/library/Zend/Filter/Compress/Tar.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Compress_CompressAbstract */ -require_once 'Zend/Filter/Compress/CompressAbstract.php'; +;// require_once 'Zend/Filter/Compress/CompressAbstract.php'; /** * Compression adapter for Tar @@ -57,11 +57,11 @@ class Zend_Filter_Compress_Tar extends Zend_Filter_Compress_CompressAbstract public function __construct($options = null) { if (!class_exists('Archive_Tar')) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; try { Zend_Loader::loadClass('Archive_Tar'); } catch (Zend_Exception $e) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('This filter needs PEARs Archive_Tar', 0, $e); } } @@ -112,7 +112,7 @@ public function getTarget() public function setTarget($target) { if (!file_exists(dirname($target))) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("The directory '$target' does not exist"); } @@ -139,17 +139,17 @@ public function setMode($mode) { $mode = ucfirst(strtolower($mode)); if (($mode != 'Bz2') && ($mode != 'Gz')) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("The mode '$mode' is unknown"); } if (($mode == 'Bz2') && (!extension_loaded('bz2'))) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('This mode needs the bz2 extension'); } if (($mode == 'Gz') && (!extension_loaded('zlib'))) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('This mode needs the zlib extension'); } } @@ -171,7 +171,7 @@ public function compress($content) $result = file_put_contents($file, $content); if ($result === false) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Error creating the temporary file'); } @@ -195,7 +195,7 @@ public function compress($content) $result = $archive->create($content); if ($result === false) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Error creating the Tar archive'); } @@ -214,7 +214,7 @@ public function decompress($content) if (file_exists($content)) { $archive = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, realpath($content)); } elseif (empty($archive) || !file_exists($archive)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Tar Archive not found'); } @@ -226,7 +226,7 @@ public function decompress($content) $result = $archive->extract($target); if ($result === false) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Error while extracting the Tar archive'); } diff --git a/library/Zend/Filter/Compress/Zip.php b/library/Zend/Filter/Compress/Zip.php index 9c71a88444..b42e2df127 100644 --- a/library/Zend/Filter/Compress/Zip.php +++ b/library/Zend/Filter/Compress/Zip.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Compress_CompressAbstract */ -require_once 'Zend/Filter/Compress/CompressAbstract.php'; +;// require_once 'Zend/Filter/Compress/CompressAbstract.php'; /** * Compression adapter for zip @@ -57,7 +57,7 @@ class Zend_Filter_Compress_Zip extends Zend_Filter_Compress_CompressAbstract public function __construct($options = null) { if (!extension_loaded('zip')) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('This filter needs the zip extension'); } parent::__construct($options); @@ -106,7 +106,7 @@ public function getTarget() public function setTarget($target) { if (!file_exists(dirname($target))) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("The directory '$target' does not exist"); } @@ -127,7 +127,7 @@ public function compress($content) $res = $zip->open($this->getArchive(), ZipArchive::CREATE | ZipArchive::OVERWRITE); if ($res !== true) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception($this->_errorString($res)); } @@ -163,7 +163,7 @@ public function compress($content) foreach ($files as $file) { $zip->addFile($current . $file, $local . $file); if ($res !== true) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception($this->_errorString($res)); } } @@ -171,7 +171,7 @@ public function compress($content) } else { $res = $zip->addFile($content, $basename); if ($res !== true) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception($this->_errorString($res)); } } @@ -185,7 +185,7 @@ public function compress($content) $res = $zip->addFromString($file, $content); if ($res !== true) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception($this->_errorString($res)); } } @@ -206,7 +206,7 @@ public function decompress($content) if (file_exists($content)) { $archive = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, realpath($content)); } elseif (empty($archive) || !file_exists($archive)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('ZIP Archive not found'); } @@ -224,12 +224,12 @@ public function decompress($content) } if (empty($target) || !is_dir($target)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('No target for ZIP decompression set'); } if ($res !== true) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception($this->_errorString($res)); } @@ -242,7 +242,7 @@ public function decompress($content) (substr($currName, 0, 4) == './..') ) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Upward directory traversal was detected inside ' . $archive . ' please use PHP 5.2.8 or greater to take advantage of path resolution features of ' . 'the zip extension in this decompress() method.' @@ -253,7 +253,7 @@ public function decompress($content) $res = @$zip->extractTo($target); if ($res !== true) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception($this->_errorString($res)); } diff --git a/library/Zend/Filter/Decompress.php b/library/Zend/Filter/Decompress.php index 02e9a8e5d4..1226fb9e4d 100644 --- a/library/Zend/Filter/Decompress.php +++ b/library/Zend/Filter/Decompress.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Compress */ -require_once 'Zend/Filter/Compress.php'; +;// require_once 'Zend/Filter/Compress.php'; /** * Decompresses a given string diff --git a/library/Zend/Filter/Decrypt.php b/library/Zend/Filter/Decrypt.php index 844d95b86f..52e6703afe 100644 --- a/library/Zend/Filter/Decrypt.php +++ b/library/Zend/Filter/Decrypt.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Encrypt */ -require_once 'Zend/Filter/Encrypt.php'; +;// require_once 'Zend/Filter/Encrypt.php'; /** * Decrypts a given string diff --git a/library/Zend/Filter/Digits.php b/library/Zend/Filter/Digits.php index 01c3ed5a73..8ff2a27a1d 100644 --- a/library/Zend/Filter/Digits.php +++ b/library/Zend/Filter/Digits.php @@ -24,7 +24,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** diff --git a/library/Zend/Filter/Dir.php b/library/Zend/Filter/Dir.php index 487b03b4ae..74945437be 100644 --- a/library/Zend/Filter/Dir.php +++ b/library/Zend/Filter/Dir.php @@ -24,7 +24,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** diff --git a/library/Zend/Filter/Encrypt.php b/library/Zend/Filter/Encrypt.php index 881c9489f7..7fcc9a1da4 100644 --- a/library/Zend/Filter/Encrypt.php +++ b/library/Zend/Filter/Encrypt.php @@ -22,12 +22,12 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** * @see Zend_Loader */ -require_once 'Zend/Loader.php'; +;// require_once 'Zend/Loader.php'; /** * Encrypts a given string @@ -99,7 +99,7 @@ public function setAdapter($options = null) $this->_adapter = new $adapter($options); if (!$this->_adapter instanceof Zend_Filter_Encrypt_Interface) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Encoding adapter '" . $adapter . "' does not implement Zend_Filter_Encrypt_Interface"); } @@ -116,7 +116,7 @@ public function __call($method, $options) { $part = substr($method, 0, 3); if ((($part != 'get') and ($part != 'set')) or !method_exists($this->_adapter, $method)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Unknown method '{$method}'"); } diff --git a/library/Zend/Filter/Encrypt/Mcrypt.php b/library/Zend/Filter/Encrypt/Mcrypt.php index a1cc3a73e4..729e161688 100644 --- a/library/Zend/Filter/Encrypt/Mcrypt.php +++ b/library/Zend/Filter/Encrypt/Mcrypt.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Encrypt_Interface */ -require_once 'Zend/Filter/Encrypt/Interface.php'; +;// require_once 'Zend/Filter/Encrypt/Interface.php'; /** * Encryption adapter for mcrypt @@ -71,7 +71,7 @@ class Zend_Filter_Encrypt_Mcrypt implements Zend_Filter_Encrypt_Interface public function __construct($options) { if (!extension_loaded('mcrypt')) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('This filter needs the mcrypt extension'); } @@ -80,7 +80,7 @@ public function __construct($options) } elseif (is_string($options)) { $options = array('key' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Invalid options argument provided to filter'); } @@ -115,25 +115,25 @@ public function setEncryption($options) } if (!is_array($options)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Invalid options argument provided to filter'); } $options = $options + $this->getEncryption(); $algorithms = mcrypt_list_algorithms($options['algorithm_directory']); if (!in_array($options['algorithm'], $algorithms)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("The algorithm '{$options['algorithm']}' is not supported"); } $modes = mcrypt_list_modes($options['mode_directory']); if (!in_array($options['mode'], $modes)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("The mode '{$options['mode']}' is not supported"); } if (!mcrypt_module_self_test($options['algorithm'], $options['algorithm_directory'])) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('The given algorithm can not be used due an internal mcrypt problem'); } @@ -182,7 +182,7 @@ public function setVector($vector = null) } $vector = mcrypt_create_iv($size, $method); } else if (strlen($vector) != $size) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('The given vector has a wrong size for the set algorithm'); } @@ -230,7 +230,7 @@ public function encrypt($value) { // compress prior to encryption if (!empty($this->_compression)) { - require_once 'Zend/Filter/Compress.php'; + ;// require_once 'Zend/Filter/Compress.php'; $compress = new Zend_Filter_Compress($this->_compression); $value = $compress->filter($value); } @@ -262,7 +262,7 @@ public function decrypt($value) // decompress after decryption if (!empty($this->_compression)) { - require_once 'Zend/Filter/Decompress.php'; + ;// require_once 'Zend/Filter/Decompress.php'; $decompress = new Zend_Filter_Decompress($this->_compression); $decrypted = $decompress->filter($decrypted); } @@ -295,7 +295,7 @@ protected function _openCipher() $this->_encryption['mode_directory']); if ($cipher === false) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Mcrypt can not be opened with your settings'); } @@ -332,13 +332,13 @@ protected function _initCipher($cipher) $keysize = mcrypt_enc_get_key_size($cipher); $key = substr(md5($key), 0, $keysize); } else if (!in_array(strlen($key), $keysizes)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('The given key has a wrong size for the set algorithm'); } $result = mcrypt_generic_init($cipher, $key, $this->_encryption['vector']); if ($result < 0) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Mcrypt could not be initialize with the given setting'); } diff --git a/library/Zend/Filter/Encrypt/Openssl.php b/library/Zend/Filter/Encrypt/Openssl.php index 7d1f70bd0a..8241d0ce35 100644 --- a/library/Zend/Filter/Encrypt/Openssl.php +++ b/library/Zend/Filter/Encrypt/Openssl.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Encrypt_Interface */ -require_once 'Zend/Filter/Encrypt/Interface.php'; +;// require_once 'Zend/Filter/Encrypt/Interface.php'; /** * Encryption adapter for openssl @@ -84,7 +84,7 @@ class Zend_Filter_Encrypt_Openssl implements Zend_Filter_Encrypt_Interface public function __construct($options = array()) { if (!extension_loaded('openssl')) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('This filter needs the openssl extension'); } @@ -123,7 +123,7 @@ public function __construct($options = array()) protected function _setKeys($keys) { if (!is_array($keys)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Invalid options argument provided to filter'); } @@ -141,7 +141,7 @@ protected function _setKeys($keys) case 'public': $test = openssl_pkey_get_public($cert); if ($test === false) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Public key '{$cert}' not valid"); } @@ -151,7 +151,7 @@ protected function _setKeys($keys) case 'private': $test = openssl_pkey_get_private($cert, $this->_passphrase); if ($test === false) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Private key '{$cert}' not valid"); } @@ -357,7 +357,7 @@ public function encrypt($value) $encryptedkeys = array(); if (count($this->_keys['public']) == 0) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Openssl can not encrypt without public keys'); } @@ -379,7 +379,7 @@ public function encrypt($value) // compress prior to encryption if (!empty($this->_compression)) { - require_once 'Zend/Filter/Compress.php'; + ;// require_once 'Zend/Filter/Compress.php'; $compress = new Zend_Filter_Compress($this->_compression); $value = $compress->filter($value); } @@ -390,7 +390,7 @@ public function encrypt($value) } if ($crypt === false) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Openssl was not able to encrypt your content with the given options'); } @@ -424,12 +424,12 @@ public function decrypt($value) $envelope = current($this->getEnvelopeKey()); if (count($this->_keys['private']) !== 1) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Please give a private key for decryption with Openssl'); } if (!$this->_package && empty($envelope)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Please give a envelope key for decryption with Openssl'); } @@ -466,13 +466,13 @@ public function decrypt($value) openssl_free_key($keys); if ($crypt === false) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Openssl was not able to decrypt you content with the given options'); } // decompress after decryption if (!empty($this->_compression)) { - require_once 'Zend/Filter/Decompress.php'; + ;// require_once 'Zend/Filter/Decompress.php'; $decompress = new Zend_Filter_Decompress($this->_compression); $decrypted = $decompress->filter($decrypted); } diff --git a/library/Zend/Filter/Exception.php b/library/Zend/Filter/Exception.php index 5763b2456e..9ad0cf0617 100644 --- a/library/Zend/Filter/Exception.php +++ b/library/Zend/Filter/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** diff --git a/library/Zend/Filter/File/Decrypt.php b/library/Zend/Filter/File/Decrypt.php index 9e167d90ec..b841d0f844 100644 --- a/library/Zend/Filter/File/Decrypt.php +++ b/library/Zend/Filter/File/Decrypt.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Decrypt */ -require_once 'Zend/Filter/Decrypt.php'; +;// require_once 'Zend/Filter/Decrypt.php'; /** * Decrypts a given file and stores the decrypted file content @@ -74,7 +74,7 @@ public function setFilename($filename = null) public function filter($value) { if (!file_exists($value)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("File '$value' not found"); } @@ -83,13 +83,13 @@ public function filter($value) } if (file_exists($this->_filename) and !is_writable($this->_filename)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("File '{$this->_filename}' is not writable"); } $content = file_get_contents($value); if (!$content) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Problem while reading file '$value'"); } @@ -97,7 +97,7 @@ public function filter($value) $result = file_put_contents($this->_filename, $decrypted); if (!$result) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Problem while writing file '{$this->_filename}'"); } diff --git a/library/Zend/Filter/File/Encrypt.php b/library/Zend/Filter/File/Encrypt.php index 23c71b4b0a..2e591c1db2 100644 --- a/library/Zend/Filter/File/Encrypt.php +++ b/library/Zend/Filter/File/Encrypt.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Encrypt */ -require_once 'Zend/Filter/Encrypt.php'; +;// require_once 'Zend/Filter/Encrypt.php'; /** * Encrypts a given file and stores the encrypted file content @@ -74,7 +74,7 @@ public function setFilename($filename = null) public function filter($value) { if (!file_exists($value)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("File '$value' not found"); } @@ -83,13 +83,13 @@ public function filter($value) } if (file_exists($this->_filename) and !is_writable($this->_filename)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("File '{$this->_filename}' is not writable"); } $content = file_get_contents($value); if (!$content) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Problem while reading file '$value'"); } @@ -97,7 +97,7 @@ public function filter($value) $result = file_put_contents($this->_filename, $encrypted); if (!$result) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Problem while writing file '{$this->_filename}'"); } diff --git a/library/Zend/Filter/File/LowerCase.php b/library/Zend/Filter/File/LowerCase.php index dd34321dea..3a231a48cc 100644 --- a/library/Zend/Filter/File/LowerCase.php +++ b/library/Zend/Filter/File/LowerCase.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_StringToLower */ -require_once 'Zend/Filter/StringToLower.php'; +;// require_once 'Zend/Filter/StringToLower.php'; /** * @category Zend @@ -56,18 +56,18 @@ public function __construct($options = null) public function filter($value) { if (!file_exists($value)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("File '$value' not found"); } if (!is_writable($value)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("File '$value' is not writable"); } $content = file_get_contents($value); if (!$content) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Problem while reading file '$value'"); } @@ -75,7 +75,7 @@ public function filter($value) $result = file_put_contents($value, $content); if (!$result) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Problem while writing file '$value'"); } diff --git a/library/Zend/Filter/File/Rename.php b/library/Zend/Filter/File/Rename.php index b70acbe301..83a8d12275 100644 --- a/library/Zend/Filter/File/Rename.php +++ b/library/Zend/Filter/File/Rename.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** * @category Zend @@ -58,7 +58,7 @@ public function __construct($options) } elseif (is_string($options)) { $options = array('target' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Invalid options argument provided to filter'); } @@ -122,7 +122,7 @@ public function addFile($options) if (is_string($options)) { $options = array('target' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception ('Invalid options to rename filter provided'); } @@ -160,7 +160,7 @@ public function getNewName($value, $source = false) } if (file_exists($file['target'])) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception(sprintf("File '%s' could not be renamed. It already exists.", $value)); } @@ -194,7 +194,7 @@ public function filter($value) return $file['target']; } - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception(sprintf("File '%s' could not be renamed. An error occured while processing the file.", $value)); } diff --git a/library/Zend/Filter/File/UpperCase.php b/library/Zend/Filter/File/UpperCase.php index e65453e0fd..be66ffd534 100644 --- a/library/Zend/Filter/File/UpperCase.php +++ b/library/Zend/Filter/File/UpperCase.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_StringToUpper */ -require_once 'Zend/Filter/StringToUpper.php'; +;// require_once 'Zend/Filter/StringToUpper.php'; /** * @category Zend @@ -56,18 +56,18 @@ public function __construct($options = null) public function filter($value) { if (!file_exists($value)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("File '$value' not found"); } if (!is_writable($value)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("File '$value' is not writable"); } $content = file_get_contents($value); if (!$content) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Problem while reading file '$value'"); } @@ -75,7 +75,7 @@ public function filter($value) $result = file_put_contents($value, $content); if (!$result) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Problem while writing file '$value'"); } diff --git a/library/Zend/Filter/HtmlEntities.php b/library/Zend/Filter/HtmlEntities.php index 0c1dfecb95..0a257b4be1 100644 --- a/library/Zend/Filter/HtmlEntities.php +++ b/library/Zend/Filter/HtmlEntities.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** * @category Zend @@ -200,14 +200,14 @@ public function filter($value) $filtered = htmlentities((string) $value, $this->getQuoteStyle(), $this->getEncoding(), $this->getDoubleQuote()); if (strlen((string) $value) && !strlen($filtered)) { if (!function_exists('iconv')) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Encoding mismatch has resulted in htmlentities errors'); } $enc = $this->getEncoding(); $value = iconv('', $enc . '//IGNORE', (string) $value); $filtered = htmlentities($value, $this->getQuoteStyle(), $enc, $this->getDoubleQuote()); if (!strlen($filtered)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Encoding mismatch has resulted in htmlentities errors'); } } diff --git a/library/Zend/Filter/Inflector.php b/library/Zend/Filter/Inflector.php index 00eea7d64b..ca45dfaa2c 100644 --- a/library/Zend/Filter/Inflector.php +++ b/library/Zend/Filter/Inflector.php @@ -23,12 +23,12 @@ * @see Zend_Filter * @see Zend_Filter_Interface */ -require_once 'Zend/Filter.php'; +;// require_once 'Zend/Filter.php'; /** * @see Zend_Loader_PluginLoader */ -require_once 'Zend/Loader/PluginLoader.php'; +;// require_once 'Zend/Loader/PluginLoader.php'; /** * Filter chain for string inflection @@ -483,7 +483,7 @@ public function filter($source) $inflectedTarget = preg_replace(array_keys($processedParts), array_values($processedParts), $this->_target); if ($this->_throwTargetExceptionsOn && (preg_match('#(?='.$pregQuotedTargetReplacementIdentifier.'[A-Za-z]{1})#', $inflectedTarget) == true)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('A replacement identifier ' . $this->_targetReplacementIdentifier . ' was found inside the inflected target, perhaps a rule was not satisfied with a target source? Unsatisfied inflected target: ' . $inflectedTarget); } @@ -518,7 +518,7 @@ protected function _getRule($rule) $className = $this->getPluginLoader()->load($rule); $ruleObject = new $className(); if (!$ruleObject instanceof Zend_Filter_Interface) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('No class named ' . $rule . ' implementing Zend_Filter_Interface could be found'); } diff --git a/library/Zend/Filter/Input.php b/library/Zend/Filter/Input.php index c3229fa6fb..c793e598bc 100644 --- a/library/Zend/Filter/Input.php +++ b/library/Zend/Filter/Input.php @@ -22,17 +22,17 @@ /** * @see Zend_Loader */ -require_once 'Zend/Loader.php'; +;// require_once 'Zend/Loader.php'; /** * @see Zend_Filter */ -require_once 'Zend/Filter.php'; +;// require_once 'Zend/Filter.php'; /** * @see Zend_Validate */ -require_once 'Zend/Validate.php'; +;// require_once 'Zend/Validate.php'; /** * @category Zend @@ -242,7 +242,7 @@ public function setPluginLoader(Zend_Loader_PluginLoader_Interface $loader, $typ $this->_loaders[$type] = $loader; return $this; default: - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception(sprintf('Invalid type "%s" provided to setPluginLoader()', $type)); } @@ -277,11 +277,11 @@ public function getPluginLoader($type) $pathSegment = 'Zend/Validate/'; break; default: - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type)); } - require_once 'Zend/Loader/PluginLoader.php'; + ;// require_once 'Zend/Loader/PluginLoader.php'; $this->_loaders[$type] = new Zend_Loader_PluginLoader( array($prefixSegment => $pathSegment) ); @@ -464,11 +464,11 @@ public function process() { $this->_process(); if ($this->hasInvalid()) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Input has invalid fields"); } if ($this->hasMissing()) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Input has missing fields"); } @@ -507,7 +507,7 @@ public function setDefaultEscapeFilter($escapeFilter) $escapeFilter = $this->_getFilter($escapeFilter); } if (!$escapeFilter instanceof Zend_Filter_Interface) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Escape filter specified does not implement Zend_Filter_Interface'); } $this->_defaultEscapeFilter = $escapeFilter; @@ -561,7 +561,7 @@ public function setOptions(array $options) $this->_defaults[$option] = $value; break; default: - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Unknown option '$option'"); break; } @@ -583,7 +583,7 @@ public function setTranslator($translator = null) } elseif ($translator instanceof Zend_Translate) { $this->_translator = $translator->getAdapter(); } else { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid translator specified'); } @@ -602,7 +602,7 @@ public function getTranslator() } if ($this->_translator === null) { - require_once 'Zend/Registry.php'; + ;// require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Translate')) { $translator = Zend_Registry::get('Zend_Translate'); if ($translator instanceof Zend_Translate_Adapter) { @@ -1193,7 +1193,7 @@ protected function _getFilterOrValidator($type, $classBaseName) $class = new ReflectionClass($className); if (!$class->implementsInterface($interfaceName)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("Class '$className' based on basename '$classBaseName' must implement the '$interfaceName' interface"); } diff --git a/library/Zend/Filter/Int.php b/library/Zend/Filter/Int.php index ee20702559..b1fde1877a 100644 --- a/library/Zend/Filter/Int.php +++ b/library/Zend/Filter/Int.php @@ -24,7 +24,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** diff --git a/library/Zend/Filter/LocalizedToNormalized.php b/library/Zend/Filter/LocalizedToNormalized.php index 8e83321542..36087882cf 100644 --- a/library/Zend/Filter/LocalizedToNormalized.php +++ b/library/Zend/Filter/LocalizedToNormalized.php @@ -22,12 +22,12 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** * @see Zend_Loader */ -require_once 'Zend/Locale/Format.php'; +;// require_once 'Zend/Locale/Format.php'; /** * Normalizes given localized input diff --git a/library/Zend/Filter/NormalizedToLocalized.php b/library/Zend/Filter/NormalizedToLocalized.php index 60dbb9e065..5792d6927c 100644 --- a/library/Zend/Filter/NormalizedToLocalized.php +++ b/library/Zend/Filter/NormalizedToLocalized.php @@ -22,12 +22,12 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** * @see Zend_Loader */ -require_once 'Zend/Locale/Format.php'; +;// require_once 'Zend/Locale/Format.php'; /** * Localizes given normalized input @@ -97,7 +97,7 @@ public function setOptions(array $options = null) public function filter($value) { if (is_array($value)) { - require_once 'Zend/Date.php'; + ;// require_once 'Zend/Date.php'; $date = new Zend_Date($value, $this->_options['locale']); return $date->toString($this->_options['date_format']); } else if ($this->_options['precision'] === 0) { diff --git a/library/Zend/Filter/Null.php b/library/Zend/Filter/Null.php index c798800416..ae44434d4c 100644 --- a/library/Zend/Filter/Null.php +++ b/library/Zend/Filter/Null.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** * @category Zend @@ -117,7 +117,7 @@ public function setType($type = null) } if (!is_int($type) || ($type < 0) || ($type > self::ALL)) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('Unknown type'); } diff --git a/library/Zend/Filter/PregReplace.php b/library/Zend/Filter/PregReplace.php index 7100c3717d..58cc10d48f 100644 --- a/library/Zend/Filter/PregReplace.php +++ b/library/Zend/Filter/PregReplace.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** * @category Zend @@ -164,7 +164,7 @@ public function getReplacement() public function filter($value) { if ($this->_matchPattern == null) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception(get_class($this) . ' does not have a valid MatchPattern set.'); } diff --git a/library/Zend/Filter/RealPath.php b/library/Zend/Filter/RealPath.php index 00881de5f5..424ccccaea 100644 --- a/library/Zend/Filter/RealPath.php +++ b/library/Zend/Filter/RealPath.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** * @category Zend diff --git a/library/Zend/Filter/StringToLower.php b/library/Zend/Filter/StringToLower.php index b208cfe77a..9ec5551a66 100644 --- a/library/Zend/Filter/StringToLower.php +++ b/library/Zend/Filter/StringToLower.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** * @category Zend @@ -87,13 +87,13 @@ public function setEncoding($encoding = null) { if ($encoding !== null) { if (!function_exists('mb_strtolower')) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('mbstring is required for this feature'); } $encoding = (string) $encoding; if (!in_array(strtolower($encoding), array_map('strtolower', mb_list_encodings()))) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("The given encoding '$encoding' is not supported by mbstring"); } } diff --git a/library/Zend/Filter/StringToUpper.php b/library/Zend/Filter/StringToUpper.php index 8fe362055f..9517bd4ee3 100644 --- a/library/Zend/Filter/StringToUpper.php +++ b/library/Zend/Filter/StringToUpper.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** * @category Zend @@ -87,13 +87,13 @@ public function setEncoding($encoding = null) { if ($encoding !== null) { if (!function_exists('mb_strtoupper')) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('mbstring is required for this feature'); } $encoding = (string) $encoding; if (!in_array(strtolower($encoding), array_map('strtolower', mb_list_encodings()))) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception("The given encoding '$encoding' is not supported by mbstring"); } } diff --git a/library/Zend/Filter/StringTrim.php b/library/Zend/Filter/StringTrim.php index 4f86d89e2c..eca87b1101 100644 --- a/library/Zend/Filter/StringTrim.php +++ b/library/Zend/Filter/StringTrim.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** * @category Zend diff --git a/library/Zend/Filter/StripNewlines.php b/library/Zend/Filter/StripNewlines.php index 667c6aae24..e4e93e0f95 100644 --- a/library/Zend/Filter/StripNewlines.php +++ b/library/Zend/Filter/StripNewlines.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** * @category Zend diff --git a/library/Zend/Filter/StripTags.php b/library/Zend/Filter/StripTags.php index e1e1935e60..5d2277a330 100644 --- a/library/Zend/Filter/StripTags.php +++ b/library/Zend/Filter/StripTags.php @@ -23,7 +23,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Interface.php'; +;// require_once 'Zend/Filter/Interface.php'; /** diff --git a/library/Zend/Filter/Word/CamelCaseToDash.php b/library/Zend/Filter/Word/CamelCaseToDash.php index d77fe4867e..3d0c681528 100644 --- a/library/Zend/Filter/Word/CamelCaseToDash.php +++ b/library/Zend/Filter/Word/CamelCaseToDash.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Word/CamelCaseToSeparator.php'; +;// require_once 'Zend/Filter/Word/CamelCaseToSeparator.php'; /** * @category Zend diff --git a/library/Zend/Filter/Word/CamelCaseToSeparator.php b/library/Zend/Filter/Word/CamelCaseToSeparator.php index bea4b6612c..8f1b7353df 100644 --- a/library/Zend/Filter/Word/CamelCaseToSeparator.php +++ b/library/Zend/Filter/Word/CamelCaseToSeparator.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_PregReplace */ -require_once 'Zend/Filter/Word/Separator/Abstract.php'; +;// require_once 'Zend/Filter/Word/Separator/Abstract.php'; /** * @category Zend diff --git a/library/Zend/Filter/Word/CamelCaseToUnderscore.php b/library/Zend/Filter/Word/CamelCaseToUnderscore.php index bb5dc5ad67..5fa68f0af9 100644 --- a/library/Zend/Filter/Word/CamelCaseToUnderscore.php +++ b/library/Zend/Filter/Word/CamelCaseToUnderscore.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_CamelCaseToSeparator */ -require_once 'Zend/Filter/Word/CamelCaseToSeparator.php'; +;// require_once 'Zend/Filter/Word/CamelCaseToSeparator.php'; /** * @category Zend diff --git a/library/Zend/Filter/Word/DashToCamelCase.php b/library/Zend/Filter/Word/DashToCamelCase.php index d4874c5adf..b7a39c8aac 100644 --- a/library/Zend/Filter/Word/DashToCamelCase.php +++ b/library/Zend/Filter/Word/DashToCamelCase.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Word/SeparatorToCamelCase.php'; +;// require_once 'Zend/Filter/Word/SeparatorToCamelCase.php'; /** * @category Zend diff --git a/library/Zend/Filter/Word/DashToSeparator.php b/library/Zend/Filter/Word/DashToSeparator.php index 8a5b0ec7da..9e18e03c2e 100644 --- a/library/Zend/Filter/Word/DashToSeparator.php +++ b/library/Zend/Filter/Word/DashToSeparator.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_PregReplace */ -require_once 'Zend/Filter/Word/Separator/Abstract.php'; +;// require_once 'Zend/Filter/Word/Separator/Abstract.php'; /** * @category Zend diff --git a/library/Zend/Filter/Word/DashToUnderscore.php b/library/Zend/Filter/Word/DashToUnderscore.php index 7103ae753a..08a2cf5661 100644 --- a/library/Zend/Filter/Word/DashToUnderscore.php +++ b/library/Zend/Filter/Word/DashToUnderscore.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_PregReplace */ -require_once 'Zend/Filter/Word/SeparatorToSeparator.php'; +;// require_once 'Zend/Filter/Word/SeparatorToSeparator.php'; /** * @category Zend diff --git a/library/Zend/Filter/Word/Separator/Abstract.php b/library/Zend/Filter/Word/Separator/Abstract.php index 3b95aba67b..40ebd3548b 100644 --- a/library/Zend/Filter/Word/Separator/Abstract.php +++ b/library/Zend/Filter/Word/Separator/Abstract.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_PregReplace */ -require_once 'Zend/Filter/PregReplace.php'; +;// require_once 'Zend/Filter/PregReplace.php'; /** * @category Zend @@ -56,7 +56,7 @@ public function __construct($separator = ' ') public function setSeparator($separator) { if ($separator == null) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('"' . $separator . '" is not a valid separator.'); } $this->_separator = $separator; diff --git a/library/Zend/Filter/Word/SeparatorToCamelCase.php b/library/Zend/Filter/Word/SeparatorToCamelCase.php index ae6f003c0c..b99e2e7a52 100644 --- a/library/Zend/Filter/Word/SeparatorToCamelCase.php +++ b/library/Zend/Filter/Word/SeparatorToCamelCase.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_PregReplace */ -require_once 'Zend/Filter/Word/Separator/Abstract.php'; +;// require_once 'Zend/Filter/Word/Separator/Abstract.php'; /** * @category Zend diff --git a/library/Zend/Filter/Word/SeparatorToDash.php b/library/Zend/Filter/Word/SeparatorToDash.php index d4ed9a84b9..39716daf31 100644 --- a/library/Zend/Filter/Word/SeparatorToDash.php +++ b/library/Zend/Filter/Word/SeparatorToDash.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_SeperatorToSeparator */ -require_once 'Zend/Filter/Word/SeparatorToSeparator.php'; +;// require_once 'Zend/Filter/Word/SeparatorToSeparator.php'; /** * @category Zend diff --git a/library/Zend/Filter/Word/SeparatorToSeparator.php b/library/Zend/Filter/Word/SeparatorToSeparator.php index 148a137227..bed500ce6a 100644 --- a/library/Zend/Filter/Word/SeparatorToSeparator.php +++ b/library/Zend/Filter/Word/SeparatorToSeparator.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_PregReplace */ -require_once 'Zend/Filter/PregReplace.php'; +;// require_once 'Zend/Filter/PregReplace.php'; /** * @category Zend @@ -117,7 +117,7 @@ public function filter($value) protected function _separatorToSeparatorFilter($value) { if ($this->_searchSeparator == null) { - require_once 'Zend/Filter/Exception.php'; + ;// require_once 'Zend/Filter/Exception.php'; throw new Zend_Filter_Exception('You must provide a search separator for this filter to work.'); } diff --git a/library/Zend/Filter/Word/UnderscoreToCamelCase.php b/library/Zend/Filter/Word/UnderscoreToCamelCase.php index 2974c6b382..600fa28ccc 100644 --- a/library/Zend/Filter/Word/UnderscoreToCamelCase.php +++ b/library/Zend/Filter/Word/UnderscoreToCamelCase.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_Interface */ -require_once 'Zend/Filter/Word/SeparatorToCamelCase.php'; +;// require_once 'Zend/Filter/Word/SeparatorToCamelCase.php'; /** * @category Zend diff --git a/library/Zend/Filter/Word/UnderscoreToDash.php b/library/Zend/Filter/Word/UnderscoreToDash.php index e8bbe7f781..7798cd2384 100644 --- a/library/Zend/Filter/Word/UnderscoreToDash.php +++ b/library/Zend/Filter/Word/UnderscoreToDash.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_PregReplace */ -require_once 'Zend/Filter/Word/SeparatorToSeparator.php'; +;// require_once 'Zend/Filter/Word/SeparatorToSeparator.php'; /** * @category Zend diff --git a/library/Zend/Filter/Word/UnderscoreToSeparator.php b/library/Zend/Filter/Word/UnderscoreToSeparator.php index a01531584f..cf7e9c298d 100644 --- a/library/Zend/Filter/Word/UnderscoreToSeparator.php +++ b/library/Zend/Filter/Word/UnderscoreToSeparator.php @@ -22,7 +22,7 @@ /** * @see Zend_Filter_PregReplace */ -require_once 'Zend/Filter/Word/SeparatorToSeparator.php'; +;// require_once 'Zend/Filter/Word/SeparatorToSeparator.php'; /** * @category Zend diff --git a/library/Zend/Form.php b/library/Zend/Form.php index 8632821e25..acdbc93ddf 100644 --- a/library/Zend/Form.php +++ b/library/Zend/Form.php @@ -19,7 +19,7 @@ */ /** @see Zend_Validate_Interface */ -require_once 'Zend/Validate/Interface.php'; +;// require_once 'Zend/Validate/Interface.php'; /** * Zend_Form @@ -424,7 +424,7 @@ public function setPluginLoader(Zend_Loader_PluginLoader_Interface $loader, $typ $this->_loaders[$type] = $loader; return $this; default: - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Invalid type "%s" provided to setPluginLoader()', $type)); } } @@ -457,11 +457,11 @@ public function getPluginLoader($type = null) $pathSegment = 'Form/Element'; break; default: - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type)); } - require_once 'Zend/Loader/PluginLoader.php'; + ;// require_once 'Zend/Loader/PluginLoader.php'; $this->_loaders[$type] = new Zend_Loader_PluginLoader( array('Zend_' . $prefixSegment . '_' => 'Zend/' . $pathSegment . '/') ); @@ -515,7 +515,7 @@ public function addPrefixPath($prefix, $path, $type = null) } return $this; default: - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type)); } } @@ -794,7 +794,7 @@ public function setMethod($method) { $method = strtolower($method); if (!in_array($method, $this->_methods)) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('"%s" is an invalid form method', $method)); } $this->setAttrib('method', $method); @@ -868,7 +868,7 @@ public function setName($name) { $name = $this->filterName($name); if ('' === (string)$name) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid name provided; must contain only valid variable characters and be non-empty'); } @@ -1034,7 +1034,7 @@ public function addElement($element, $name = null, $options = null) { if (is_string($element)) { if (null === $name) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception( 'Elements specified by string must have an accompanying name' ); @@ -1061,7 +1061,7 @@ public function addElement($element, $name = null, $options = null) $this->_elements[$name] = $element; $this->_elements[$name]->addPrefixPaths($prefixPaths); } else { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception( 'Element must be specified by string or Zend_Form_Element instance' ); @@ -1091,12 +1091,12 @@ public function addElement($element, $name = null, $options = null) public function createElement($type, $name, $options = null) { if (!is_string($type)) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Element type must be a string indicating type'); } if (!is_string($name)) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Element name must be a string'); } @@ -1839,7 +1839,7 @@ public function addDisplayGroup(array $elements, $name, $options = null) } } if (empty($group)) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('No valid elements specified for display group'); } @@ -1867,7 +1867,7 @@ public function addDisplayGroup(array $elements, $name, $options = null) } if (!class_exists($class)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($class); } $this->_displayGroups[$name] = new $class( @@ -1898,7 +1898,7 @@ protected function _addDisplayGroupObject(Zend_Form_DisplayGroup $group, $name = if (null === $name) { $name = $group->getName(); if ('' === (string)$name) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid display group added; requires name'); } } @@ -2267,7 +2267,7 @@ protected function _array_replace_recursive(array $into) public function isValid($data) { if (!is_array($data)) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(__METHOD__ . ' expects an array'); } $translator = $this->getTranslator(); @@ -2382,7 +2382,7 @@ public function isValidPartial(array $data) */ public function processAjax(array $data) { - require_once 'Zend/Json.php'; + ;// require_once 'Zend/Json.php'; if ($this->isValidPartial($data)) { return Zend_Json::encode(true); } @@ -2689,7 +2689,7 @@ public function setView(Zend_View_Interface $view = null) public function getView() { if (null === $this->_view) { - require_once 'Zend/Controller/Action/HelperBroker.php'; + ;// require_once 'Zend/Controller/Action/HelperBroker.php'; $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer'); $this->setView($viewRenderer->view); } @@ -2739,7 +2739,7 @@ public function addDecorator($decorator, $options = null) break; } if (is_numeric($name)) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid alias provided to addDecorator; must be alphanumeric string'); } if (is_string($spec)) { @@ -2751,7 +2751,7 @@ public function addDecorator($decorator, $options = null) $decorator = $spec; } } else { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid decorator provided to addDecorator; must be string or Zend_Form_Decorator_Interface'); } @@ -2800,7 +2800,7 @@ public function addDecorators(array $decorators) } } } else { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid decorator passed to addDecorators()'); } } @@ -3036,7 +3036,7 @@ public function setTranslator($translator = null) } elseif ($translator instanceof Zend_Translate) { $this->_translator = $translator->getAdapter(); } else { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid translator specified'); } @@ -3059,7 +3059,7 @@ public static function setDefaultTranslator($translator = null) } elseif ($translator instanceof Zend_Translate) { self::$_translatorDefault = $translator->getAdapter(); } else { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid translator specified'); } } @@ -3100,7 +3100,7 @@ public function hasTranslator() public static function getDefaultTranslator() { if (null === self::$_translatorDefault) { - require_once 'Zend/Registry.php'; + ;// require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Translate')) { $translator = Zend_Registry::get('Zend_Translate'); if ($translator instanceof Zend_Translate_Adapter) { @@ -3185,7 +3185,7 @@ public function __set($name, $value) return; } - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; if (is_object($value)) { $type = get_class($value); } else { @@ -3256,11 +3256,11 @@ public function __call($method, $args) return $decorator->render($seed); } - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Decorator by name %s does not exist', $decoratorName)); } - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Method %s does not exist', $method)); } @@ -3285,7 +3285,7 @@ public function current(): Zend_Form_Element|Zend_Form_DisplayGroup|Zend_Form } elseif (isset($this->_displayGroups[$key])) { return $this->getDisplayGroup($key); } else { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Corruption detected in form; invalid key ("%s") found in internal iterator', (string) $key)); } } diff --git a/library/Zend/Form/Decorator/Abstract.php b/library/Zend/Form/Decorator/Abstract.php index c03a2b3672..bac16eab93 100644 --- a/library/Zend/Form/Decorator/Abstract.php +++ b/library/Zend/Form/Decorator/Abstract.php @@ -19,7 +19,7 @@ */ /** Zend_Form_Decorator_Interface */ -require_once 'Zend/Form/Decorator/Interface.php'; +;// require_once 'Zend/Form/Decorator/Interface.php'; /** * Zend_Form_Decorator_Abstract @@ -179,7 +179,7 @@ public function setElement($element) && (!$element instanceof Zend_Form) && (!$element instanceof Zend_Form_DisplayGroup)) { - require_once 'Zend/Form/Decorator/Exception.php'; + ;// require_once 'Zend/Form/Decorator/Exception.php'; throw new Zend_Form_Decorator_Exception('Invalid element type passed to decorator'); } @@ -248,7 +248,7 @@ public function getSeparator() */ public function render($content) { - require_once 'Zend/Form/Decorator/Exception.php'; + ;// require_once 'Zend/Form/Decorator/Exception.php'; throw new Zend_Form_Decorator_Exception('render() not implemented'); } } diff --git a/library/Zend/Form/Decorator/Callback.php b/library/Zend/Form/Decorator/Callback.php index 73dfc27da6..66b5564008 100644 --- a/library/Zend/Form/Decorator/Callback.php +++ b/library/Zend/Form/Decorator/Callback.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; +;// require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_Callback @@ -66,7 +66,7 @@ class Zend_Form_Decorator_Callback extends Zend_Form_Decorator_Abstract public function setCallback($callback) { if (!is_callable($callback)) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid callback provided to callback decorator'); } $this->_callback = $callback; diff --git a/library/Zend/Form/Decorator/Captcha.php b/library/Zend/Form/Decorator/Captcha.php index b2bf609ab3..931fd26e44 100644 --- a/library/Zend/Form/Decorator/Captcha.php +++ b/library/Zend/Form/Decorator/Captcha.php @@ -20,7 +20,7 @@ */ /** @see Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; +;// require_once 'Zend/Form/Decorator/Abstract.php'; /** * Captcha generic decorator diff --git a/library/Zend/Form/Decorator/Captcha/ReCaptcha.php b/library/Zend/Form/Decorator/Captcha/ReCaptcha.php index c89fb25a49..48f0338474 100644 --- a/library/Zend/Form/Decorator/Captcha/ReCaptcha.php +++ b/library/Zend/Form/Decorator/Captcha/ReCaptcha.php @@ -20,7 +20,7 @@ */ /** @see Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; +;// require_once 'Zend/Form/Decorator/Abstract.php'; /** * ReCaptcha-based captcha decorator diff --git a/library/Zend/Form/Decorator/Captcha/Word.php b/library/Zend/Form/Decorator/Captcha/Word.php index 9bff8dc66b..e66d3c8219 100644 --- a/library/Zend/Form/Decorator/Captcha/Word.php +++ b/library/Zend/Form/Decorator/Captcha/Word.php @@ -20,7 +20,7 @@ */ /** @see Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; +;// require_once 'Zend/Form/Decorator/Abstract.php'; /** * Word-based captcha decorator diff --git a/library/Zend/Form/Decorator/Description.php b/library/Zend/Form/Decorator/Description.php index d2f0b23a24..49fb01d784 100644 --- a/library/Zend/Form/Decorator/Description.php +++ b/library/Zend/Form/Decorator/Description.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; +;// require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_Description @@ -182,7 +182,7 @@ public function render($content) } if (!empty($tag)) { - require_once 'Zend/Form/Decorator/HtmlTag.php'; + ;// require_once 'Zend/Form/Decorator/HtmlTag.php'; $options['tag'] = $tag; $decorator = new Zend_Form_Decorator_HtmlTag($options); $description = $decorator->render($description); diff --git a/library/Zend/Form/Decorator/DtDdWrapper.php b/library/Zend/Form/Decorator/DtDdWrapper.php index 334971633d..9bbe8a3ab3 100644 --- a/library/Zend/Form/Decorator/DtDdWrapper.php +++ b/library/Zend/Form/Decorator/DtDdWrapper.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; +;// require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_DtDdWrapper diff --git a/library/Zend/Form/Decorator/Errors.php b/library/Zend/Form/Decorator/Errors.php index 0a907d8c8e..c8fc340237 100644 --- a/library/Zend/Form/Decorator/Errors.php +++ b/library/Zend/Form/Decorator/Errors.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; +;// require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_Errors diff --git a/library/Zend/Form/Decorator/Exception.php b/library/Zend/Form/Decorator/Exception.php index 1e67d846c7..2948e84157 100644 --- a/library/Zend/Form/Decorator/Exception.php +++ b/library/Zend/Form/Decorator/Exception.php @@ -21,7 +21,7 @@ */ /** Zend_Form_Exception */ -require_once 'Zend/Form/Exception.php'; +;// require_once 'Zend/Form/Exception.php'; /** * Exception for Zend_Form component. diff --git a/library/Zend/Form/Decorator/Fieldset.php b/library/Zend/Form/Decorator/Fieldset.php index 2b132dac7e..97806840ba 100644 --- a/library/Zend/Form/Decorator/Fieldset.php +++ b/library/Zend/Form/Decorator/Fieldset.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; +;// require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_Fieldset diff --git a/library/Zend/Form/Decorator/File.php b/library/Zend/Form/Decorator/File.php index 2343ec1e9f..8f7a7e8e92 100644 --- a/library/Zend/Form/Decorator/File.php +++ b/library/Zend/Form/Decorator/File.php @@ -20,13 +20,13 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; +;// require_once 'Zend/Form/Decorator/Abstract.php'; /** Zend_Form_Decorator_Marker_File_Interface */ -require_once 'Zend/Form/Decorator/Marker/File/Interface.php'; +;// require_once 'Zend/Form/Decorator/Marker/File/Interface.php'; /** Zend_File_Transfer_Adapter_Http */ -require_once 'Zend/File/Transfer/Adapter/Http.php'; +;// require_once 'Zend/File/Transfer/Adapter/Http.php'; /** * Zend_Form_Decorator_File diff --git a/library/Zend/Form/Decorator/Form.php b/library/Zend/Form/Decorator/Form.php index 11b82b815f..ff64f9fceb 100644 --- a/library/Zend/Form/Decorator/Form.php +++ b/library/Zend/Form/Decorator/Form.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; +;// require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_Form diff --git a/library/Zend/Form/Decorator/FormElements.php b/library/Zend/Form/Decorator/FormElements.php index 956d10102f..9237f793e1 100644 --- a/library/Zend/Form/Decorator/FormElements.php +++ b/library/Zend/Form/Decorator/FormElements.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; +;// require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_FormElements diff --git a/library/Zend/Form/Decorator/FormErrors.php b/library/Zend/Form/Decorator/FormErrors.php index 29ca94e729..e81c4481ef 100644 --- a/library/Zend/Form/Decorator/FormErrors.php +++ b/library/Zend/Form/Decorator/FormErrors.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; +;// require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_FormErrors diff --git a/library/Zend/Form/Decorator/HtmlTag.php b/library/Zend/Form/Decorator/HtmlTag.php index 3245af0977..ef355ae8ae 100644 --- a/library/Zend/Form/Decorator/HtmlTag.php +++ b/library/Zend/Form/Decorator/HtmlTag.php @@ -22,7 +22,7 @@ /** * @see Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; +;// require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_Element_HtmlTag @@ -109,9 +109,9 @@ protected function _htmlAttribs(array $attribs) public function normalizeTag($tag) { if (!isset($this->_tagFilter)) { - require_once 'Zend/Filter.php'; - require_once 'Zend/Filter/Alnum.php'; - require_once 'Zend/Filter/StringToLower.php'; + ;// require_once 'Zend/Filter.php'; + ;// require_once 'Zend/Filter/Alnum.php'; + ;// require_once 'Zend/Filter/StringToLower.php'; $this->_tagFilter = new Zend_Filter(); $this->_tagFilter->addFilter(new Zend_Filter_Alnum()) ->addFilter(new Zend_Filter_StringToLower()); diff --git a/library/Zend/Form/Decorator/Image.php b/library/Zend/Form/Decorator/Image.php index cfad799997..0eacf18255 100644 --- a/library/Zend/Form/Decorator/Image.php +++ b/library/Zend/Form/Decorator/Image.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; +;// require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_Image @@ -137,7 +137,7 @@ public function render($content) $image = $view->formImage($name, $element->getImageValue(), $attribs); if (null !== $tag) { - require_once 'Zend/Form/Decorator/HtmlTag.php'; + ;// require_once 'Zend/Form/Decorator/HtmlTag.php'; $decorator = new Zend_Form_Decorator_HtmlTag(); $decorator->setOptions(array('tag' => $tag)); $image = $decorator->render($image); diff --git a/library/Zend/Form/Decorator/Label.php b/library/Zend/Form/Decorator/Label.php index e6062be393..db3367d660 100644 --- a/library/Zend/Form/Decorator/Label.php +++ b/library/Zend/Form/Decorator/Label.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; +;// require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_Label @@ -260,14 +260,14 @@ public function __call($method, $args) $key = 'optional' . $position; break; default: - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Invalid method "%s" called in Label decorator, and detected as type %s', $method, $type)); } switch ($head) { case 'set': if (0 === count($args)) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Method "%s" requires at least one argument; none provided', $method)); } $value = array_shift($args); @@ -286,7 +286,7 @@ public function __call($method, $args) } } - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Invalid method "%s" called in Label decorator', $method)); } @@ -432,7 +432,7 @@ public function render($content) } if (null !== $tag) { - require_once 'Zend/Form/Decorator/HtmlTag.php'; + ;// require_once 'Zend/Form/Decorator/HtmlTag.php'; $decorator = new Zend_Form_Decorator_HtmlTag(); if (null !== $this->_tagClass) { $decorator->setOptions(array('tag' => $tag, diff --git a/library/Zend/Form/Decorator/PrepareElements.php b/library/Zend/Form/Decorator/PrepareElements.php index 002e4f6c33..e59df54938 100644 --- a/library/Zend/Form/Decorator/PrepareElements.php +++ b/library/Zend/Form/Decorator/PrepareElements.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Decorator_FormElements */ -require_once 'Zend/Form/Decorator/FormElements.php'; +;// require_once 'Zend/Form/Decorator/FormElements.php'; /** * Zend_Form_Decorator_PrepareElements diff --git a/library/Zend/Form/Decorator/Tooltip.php b/library/Zend/Form/Decorator/Tooltip.php index 1dc7dbca30..f6bb47ef7e 100644 --- a/library/Zend/Form/Decorator/Tooltip.php +++ b/library/Zend/Form/Decorator/Tooltip.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; +;// require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_Tooltip diff --git a/library/Zend/Form/Decorator/ViewHelper.php b/library/Zend/Form/Decorator/ViewHelper.php index 6f79886952..4686b0aeae 100644 --- a/library/Zend/Form/Decorator/ViewHelper.php +++ b/library/Zend/Form/Decorator/ViewHelper.php @@ -19,7 +19,7 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; +;// require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_ViewHelper @@ -223,7 +223,7 @@ public function render($content) $view = $element->getView(); if (null === $view) { - require_once 'Zend/Form/Decorator/Exception.php'; + ;// require_once 'Zend/Form/Decorator/Exception.php'; throw new Zend_Form_Decorator_Exception('ViewHelper decorator cannot render without a registered view object'); } diff --git a/library/Zend/Form/Decorator/ViewScript.php b/library/Zend/Form/Decorator/ViewScript.php index f735872d15..c8ef8d87f7 100644 --- a/library/Zend/Form/Decorator/ViewScript.php +++ b/library/Zend/Form/Decorator/ViewScript.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Decorator_Abstract */ -require_once 'Zend/Form/Decorator/Abstract.php'; +;// require_once 'Zend/Form/Decorator/Abstract.php'; /** * Zend_Form_Decorator_ViewScript @@ -158,7 +158,7 @@ public function render($content) $viewScript = $this->getViewScript(); if (empty($viewScript)) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('No view script registered with ViewScript decorator'); } diff --git a/library/Zend/Form/DisplayGroup.php b/library/Zend/Form/DisplayGroup.php index bb82460eff..cd456b70db 100644 --- a/library/Zend/Form/DisplayGroup.php +++ b/library/Zend/Form/DisplayGroup.php @@ -332,7 +332,7 @@ public function setName($name) { $name = $this->filtername($name); if (('0' !== $name) && empty($name)) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid name provided; must contain only valid variable characters and be non-empty'); } @@ -488,7 +488,7 @@ public function addElements(array $elements) { foreach ($elements as $element) { if (!$element instanceof Zend_Form_Element) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('elements passed via array to addElements() must be Zend_Form_Elements only'); } $this->addElement($element); @@ -716,7 +716,7 @@ public function addDecorator($decorator, $options = null) break; } if (is_numeric($name)) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid alias provided to addDecorator; must be alphanumeric string'); } if (is_string($spec)) { @@ -728,7 +728,7 @@ public function addDecorator($decorator, $options = null) $decorator = $spec; } } else { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid decorator provided to addDecorator; must be string or Zend_Form_Decorator_Interface'); } @@ -776,7 +776,7 @@ public function addDecorators(array $decorators) } } } else { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid decorator passed to addDecorators()'); } } @@ -896,7 +896,7 @@ public function setView(Zend_View_Interface $view = null) public function getView() { if (null === $this->_view) { - require_once 'Zend/Controller/Action/HelperBroker.php'; + ;// require_once 'Zend/Controller/Action/HelperBroker.php'; $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer'); $this->setView($viewRenderer->view); } @@ -951,7 +951,7 @@ public function setTranslator($translator = null) } elseif ($translator instanceof Zend_Translate) { $this->_translator = $translator->getAdapter(); } else { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid translator specified'); } return $this; @@ -969,7 +969,7 @@ public function getTranslator() } if (null === $this->_translator) { - require_once 'Zend/Form.php'; + ;// require_once 'Zend/Form.php'; return Zend_Form::getDefaultTranslator(); } @@ -1031,11 +1031,11 @@ public function __call($method, $args) return $decorator->render($seed); } - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Decorator by name %s does not exist', $decoratorName)); } - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Method %s does not exist', $method)); } diff --git a/library/Zend/Form/Element.php b/library/Zend/Form/Element.php index 9277b92d44..bc7396fd30 100644 --- a/library/Zend/Form/Element.php +++ b/library/Zend/Form/Element.php @@ -19,16 +19,16 @@ */ /** @see Zend_Filter */ -require_once 'Zend/Filter.php'; +;// require_once 'Zend/Filter.php'; /** @see Zend_Form */ -require_once 'Zend/Form.php'; +;// require_once 'Zend/Form.php'; /** @see Zend_Validate_Interface */ -require_once 'Zend/Validate/Interface.php'; +;// require_once 'Zend/Validate/Interface.php'; /** @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * Zend_Form_Element @@ -264,7 +264,7 @@ public function __construct($spec, $options = null) } if (null === $this->getName()) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Zend_Form_Element requires each element to have a name'); } @@ -418,7 +418,7 @@ public function setTranslator($translator = null) } elseif ($translator instanceof Zend_Translate) { $this->_translator = $translator->getAdapter(); } else { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid translator specified'); } return $this; @@ -501,7 +501,7 @@ public function setName($name) { $name = $this->filterName($name); if ('' === $name) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid name provided; must contain only valid variable characters and be non-empty'); } @@ -860,7 +860,7 @@ public function setAttrib($name, $value) { $name = (string) $name; if ('_' == $name[0]) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Invalid attribute "%s"; must not contain a leading underscore', $name)); } @@ -955,7 +955,7 @@ public function getConcatJustValuesInErrorMessage() public function __get($key) { if ('_' == $key[0]) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Cannot retrieve value for protected/private property "%s"', $key)); } @@ -1004,11 +1004,11 @@ public function __call($method, $args) return $decorator->render($seed); } - require_once 'Zend/Form/Element/Exception.php'; + ;// require_once 'Zend/Form/Element/Exception.php'; throw new Zend_Form_Element_Exception(sprintf('Decorator by name %s does not exist', $decoratorName)); } - require_once 'Zend/Form/Element/Exception.php'; + ;// require_once 'Zend/Form/Element/Exception.php'; throw new Zend_Form_Element_Exception(sprintf('Method %s does not exist', $method)); } @@ -1032,7 +1032,7 @@ public function setPluginLoader(Zend_Loader_PluginLoader_Interface $loader, $typ $this->_loaders[$type] = $loader; return $this; default: - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Invalid type "%s" provided to setPluginLoader()', $type)); } } @@ -1061,14 +1061,14 @@ public function getPluginLoader($type) $pathSegment = 'Form/Decorator'; } if (!isset($this->_loaders[$type])) { - require_once 'Zend/Loader/PluginLoader.php'; + ;// require_once 'Zend/Loader/PluginLoader.php'; $this->_loaders[$type] = new Zend_Loader_PluginLoader( array('Zend_' . $prefixSegment . '_' => 'Zend/' . $pathSegment . '/') ); } return $this->_loaders[$type]; default: - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type)); } } @@ -1111,7 +1111,7 @@ public function addPrefixPath($prefix, $path, $type = null) } return $this; default: - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Invalid type "%s" provided to getPluginLoader()', $type)); } } @@ -1187,7 +1187,7 @@ public function addValidator($validator, $breakChainOnFailure = false, $options 'options' => $options, ); } else { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid validator provided to addValidator; must be string or Zend_Validate_Interface'); } @@ -1239,7 +1239,7 @@ public function addValidators(array $validators) } } } else { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid validator passed to addValidators()'); } } @@ -1661,7 +1661,7 @@ public function addFilter($filter, $options = array()) ); $this->_filters[$name] = $filter; } else { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid filter provided to addFilter; must be string or Zend_Filter_Interface'); } @@ -1706,7 +1706,7 @@ public function addFilters(array $filters) } } } else { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid filter passed to addFilters()'); } } @@ -1838,7 +1838,7 @@ public function setView(Zend_View_Interface $view = null) public function getView() { if (null === $this->_view) { - require_once 'Zend/Controller/Action/HelperBroker.php'; + ;// require_once 'Zend/Controller/Action/HelperBroker.php'; $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer'); $this->setView($viewRenderer->view); } @@ -1886,7 +1886,7 @@ public function addDecorator($decorator, $options = null) break; } if (is_numeric($name)) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid alias provided to addDecorator; must be alphanumeric string'); } if (is_string($spec)) { @@ -1898,7 +1898,7 @@ public function addDecorator($decorator, $options = null) $decorator = $spec; } } else { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid decorator provided to addDecorator; must be string or Zend_Form_Decorator_Interface'); } @@ -1946,7 +1946,7 @@ public function addDecorators(array $decorators) } } } else { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception('Invalid decorator passed to addDecorators()'); } } @@ -2104,7 +2104,7 @@ protected function _loadFilter(array $filter) $name = $this->getPluginLoader(self::FILTER)->load($filter['filter']); if (array_key_exists($name, $this->_filters)) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Filter instance already exists for filter "%s"', $origName)); } @@ -2153,7 +2153,7 @@ protected function _loadValidator(array $validator) $name = $this->getPluginLoader(self::VALIDATE)->load($validator['validator']); if (array_key_exists($name, $this->_validators)) { - require_once 'Zend/Form/Exception.php'; + ;// require_once 'Zend/Form/Exception.php'; throw new Zend_Form_Exception(sprintf('Validator instance already exists for validator "%s"', $origName)); } diff --git a/library/Zend/Form/Element/Button.php b/library/Zend/Form/Element/Button.php index 2ac45c3e96..c64b7e4f1d 100644 --- a/library/Zend/Form/Element/Button.php +++ b/library/Zend/Form/Element/Button.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Element_Submit */ -require_once 'Zend/Form/Element/Submit.php'; +;// require_once 'Zend/Form/Element/Submit.php'; /** * Button form element diff --git a/library/Zend/Form/Element/Captcha.php b/library/Zend/Form/Element/Captcha.php index d18ba8403f..525a316241 100644 --- a/library/Zend/Form/Element/Captcha.php +++ b/library/Zend/Form/Element/Captcha.php @@ -21,10 +21,10 @@ */ /** @see Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; +;// require_once 'Zend/Form/Element/Xhtml.php'; /** @see Zend_Captcha_Adapter */ -require_once 'Zend/Captcha/Adapter.php'; +;// require_once 'Zend/Captcha/Adapter.php'; /** * Generic captcha element @@ -204,7 +204,7 @@ public function getPluginLoader($type) $type = strtoupper($type); if ($type == self::CAPTCHA) { if (!isset($this->_loaders[$type])) { - require_once 'Zend/Loader/PluginLoader.php'; + ;// require_once 'Zend/Loader/PluginLoader.php'; $this->_loaders[$type] = new Zend_Loader_PluginLoader( array('Zend_Captcha' => 'Zend/Captcha/') ); diff --git a/library/Zend/Form/Element/Checkbox.php b/library/Zend/Form/Element/Checkbox.php index b6057fa3a2..518c07e741 100644 --- a/library/Zend/Form/Element/Checkbox.php +++ b/library/Zend/Form/Element/Checkbox.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; +;// require_once 'Zend/Form/Element/Xhtml.php'; /** * Checkbox form element diff --git a/library/Zend/Form/Element/Exception.php b/library/Zend/Form/Element/Exception.php index 106995fd1d..c605b58d08 100644 --- a/library/Zend/Form/Element/Exception.php +++ b/library/Zend/Form/Element/Exception.php @@ -21,7 +21,7 @@ */ /** Zend_Form_Exception */ -require_once 'Zend/Form/Exception.php'; +;// require_once 'Zend/Form/Exception.php'; /** * Exception for Zend_Form component. diff --git a/library/Zend/Form/Element/File.php b/library/Zend/Form/Element/File.php index 0f3e162d89..170184c636 100644 --- a/library/Zend/Form/Element/File.php +++ b/library/Zend/Form/Element/File.php @@ -19,7 +19,7 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; +;// require_once 'Zend/Form/Element/Xhtml.php'; /** * Zend_Form_Element @@ -129,7 +129,7 @@ public function getPluginLoader($type) } if (!array_key_exists($type, $this->_loaders)) { - require_once 'Zend/Loader/PluginLoader.php'; + ;// require_once 'Zend/Loader/PluginLoader.php'; $loader = new Zend_Loader_PluginLoader(array( 'Zend_File_Transfer_Adapter' => 'Zend/File/Transfer/Adapter/', )); @@ -184,7 +184,7 @@ public function setTransferAdapter($adapter) $class = $loader->load($adapter); $this->_adapter = new $class; } else { - require_once 'Zend/Form/Element/Exception.php'; + ;// require_once 'Zend/Form/Element/Exception.php'; throw new Zend_Form_Element_Exception('Invalid adapter specified'); } @@ -756,7 +756,7 @@ public function getTranslator() $translator = $this->getTransferAdapter()->getTranslator(); if (null === $translator) { - require_once 'Zend/Form.php'; + ;// require_once 'Zend/Form.php'; return Zend_Form::getDefaultTranslator(); } @@ -874,7 +874,7 @@ public function render(Zend_View_Interface $view = null) } if (!$marker) { - require_once 'Zend/Form/Element/Exception.php'; + ;// require_once 'Zend/Form/Element/Exception.php'; throw new Zend_Form_Element_Exception('No file decorator found... unable to render file element'); } diff --git a/library/Zend/Form/Element/Hash.php b/library/Zend/Form/Element/Hash.php index 30423fe512..20458212a7 100644 --- a/library/Zend/Form/Element/Hash.php +++ b/library/Zend/Form/Element/Hash.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; +;// require_once 'Zend/Form/Element/Xhtml.php'; /** * CSRF form protection @@ -105,7 +105,7 @@ public function setSession($session) public function getSession() { if (null === $this->_session) { - require_once 'Zend/Session/Namespace.php'; + ;// require_once 'Zend/Session/Namespace.php'; $this->_session = new Zend_Session_Namespace($this->getSessionName()); } return $this->_session; diff --git a/library/Zend/Form/Element/Hidden.php b/library/Zend/Form/Element/Hidden.php index 48c069c582..edee1d9451 100644 --- a/library/Zend/Form/Element/Hidden.php +++ b/library/Zend/Form/Element/Hidden.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; +;// require_once 'Zend/Form/Element/Xhtml.php'; /** * Hidden form element diff --git a/library/Zend/Form/Element/Image.php b/library/Zend/Form/Element/Image.php index 1c94335815..1ea120bcc8 100644 --- a/library/Zend/Form/Element/Image.php +++ b/library/Zend/Form/Element/Image.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; +;// require_once 'Zend/Form/Element/Xhtml.php'; /** * Image form element diff --git a/library/Zend/Form/Element/Multi.php b/library/Zend/Form/Element/Multi.php index 9fb9511528..e30b438e55 100644 --- a/library/Zend/Form/Element/Multi.php +++ b/library/Zend/Form/Element/Multi.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; +;// require_once 'Zend/Form/Element/Xhtml.php'; /** * Base class for multi-option form elements diff --git a/library/Zend/Form/Element/MultiCheckbox.php b/library/Zend/Form/Element/MultiCheckbox.php index d8b1ae1daa..a74cb7137f 100644 --- a/library/Zend/Form/Element/MultiCheckbox.php +++ b/library/Zend/Form/Element/MultiCheckbox.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Element_Multi */ -require_once 'Zend/Form/Element/Multi.php'; +;// require_once 'Zend/Form/Element/Multi.php'; /** * MultiCheckbox form element diff --git a/library/Zend/Form/Element/Multiselect.php b/library/Zend/Form/Element/Multiselect.php index 9f63f2b14e..052e213b95 100644 --- a/library/Zend/Form/Element/Multiselect.php +++ b/library/Zend/Form/Element/Multiselect.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Element_Select */ -require_once 'Zend/Form/Element/Select.php'; +;// require_once 'Zend/Form/Element/Select.php'; /** * Multiselect form element diff --git a/library/Zend/Form/Element/Note.php b/library/Zend/Form/Element/Note.php index 7cb7ddbd22..42d9df9260 100644 --- a/library/Zend/Form/Element/Note.php +++ b/library/Zend/Form/Element/Note.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; +;// require_once 'Zend/Form/Element/Xhtml.php'; /** * Element to show an HTML note diff --git a/library/Zend/Form/Element/Password.php b/library/Zend/Form/Element/Password.php index edacaa3586..67681f0295 100644 --- a/library/Zend/Form/Element/Password.php +++ b/library/Zend/Form/Element/Password.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; +;// require_once 'Zend/Form/Element/Xhtml.php'; /** * Password form element diff --git a/library/Zend/Form/Element/Radio.php b/library/Zend/Form/Element/Radio.php index a64941ee58..30f698d38a 100644 --- a/library/Zend/Form/Element/Radio.php +++ b/library/Zend/Form/Element/Radio.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Element_Multi */ -require_once 'Zend/Form/Element/Multi.php'; +;// require_once 'Zend/Form/Element/Multi.php'; /** * Radio form element diff --git a/library/Zend/Form/Element/Reset.php b/library/Zend/Form/Element/Reset.php index 51786735a9..3ae346635e 100644 --- a/library/Zend/Form/Element/Reset.php +++ b/library/Zend/Form/Element/Reset.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Element_Submit */ -require_once 'Zend/Form/Element/Submit.php'; +;// require_once 'Zend/Form/Element/Submit.php'; /** * Reset form element diff --git a/library/Zend/Form/Element/Select.php b/library/Zend/Form/Element/Select.php index 05895d3b2a..e27ce9e3b7 100644 --- a/library/Zend/Form/Element/Select.php +++ b/library/Zend/Form/Element/Select.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Element_Multi */ -require_once 'Zend/Form/Element/Multi.php'; +;// require_once 'Zend/Form/Element/Multi.php'; /** * Select.php form element diff --git a/library/Zend/Form/Element/Submit.php b/library/Zend/Form/Element/Submit.php index 9198e3a5ba..e9a2f57c16 100644 --- a/library/Zend/Form/Element/Submit.php +++ b/library/Zend/Form/Element/Submit.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; +;// require_once 'Zend/Form/Element/Xhtml.php'; /** * Submit form element diff --git a/library/Zend/Form/Element/Text.php b/library/Zend/Form/Element/Text.php index 9fd56e331f..9ce4943adb 100644 --- a/library/Zend/Form/Element/Text.php +++ b/library/Zend/Form/Element/Text.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; +;// require_once 'Zend/Form/Element/Xhtml.php'; /** * Text form element diff --git a/library/Zend/Form/Element/Textarea.php b/library/Zend/Form/Element/Textarea.php index c5984cf872..073d0519f1 100644 --- a/library/Zend/Form/Element/Textarea.php +++ b/library/Zend/Form/Element/Textarea.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Element_Xhtml */ -require_once 'Zend/Form/Element/Xhtml.php'; +;// require_once 'Zend/Form/Element/Xhtml.php'; /** * Textarea form element diff --git a/library/Zend/Form/Element/Xhtml.php b/library/Zend/Form/Element/Xhtml.php index c76e46af89..1b0522865b 100644 --- a/library/Zend/Form/Element/Xhtml.php +++ b/library/Zend/Form/Element/Xhtml.php @@ -20,7 +20,7 @@ */ /** Zend_Form_Element */ -require_once 'Zend/Form/Element.php'; +;// require_once 'Zend/Form/Element.php'; /** * Base element for XHTML elements diff --git a/library/Zend/Form/Exception.php b/library/Zend/Form/Exception.php index 678cdd7df9..b137b89f08 100644 --- a/library/Zend/Form/Exception.php +++ b/library/Zend/Form/Exception.php @@ -20,7 +20,7 @@ */ /** Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * Exception for Zend_Form component. diff --git a/library/Zend/Form/SubForm.php b/library/Zend/Form/SubForm.php index 78b0242d43..d7906c6293 100644 --- a/library/Zend/Form/SubForm.php +++ b/library/Zend/Form/SubForm.php @@ -19,7 +19,7 @@ */ /** Zend_Form */ -require_once 'Zend/Form.php'; +;// require_once 'Zend/Form.php'; /** * Zend_Form_SubForm diff --git a/library/Zend/Gdata.php b/library/Zend/Gdata.php index 7ffabc9063..c3f2e677de 100644 --- a/library/Zend/Gdata.php +++ b/library/Zend/Gdata.php @@ -24,7 +24,7 @@ /** * Zend_Gdata_App */ -require_once 'Zend/Gdata/App.php'; +;// require_once 'Zend/Gdata/App.php'; /** * Provides functionality to interact with Google data APIs @@ -154,7 +154,7 @@ public function getFeed($location, $className='Zend_Gdata_Feed') } elseif ($location instanceof Zend_Gdata_Query) { $uri = $location->getQueryUrl(); } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'You must specify the location as either a string URI ' . 'or a child of Zend_Gdata_Query'); @@ -179,7 +179,7 @@ public function getEntry($location, $className='Zend_Gdata_Entry') } elseif ($location instanceof Zend_Gdata_Query) { $uri = $location->getQueryUrl(); } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'You must specify the location as either a string URI ' . 'or a child of Zend_Gdata_Query'); diff --git a/library/Zend/Gdata/Analytics.php b/library/Zend/Gdata/Analytics.php index bbc74ea80d..409fe4acbf 100644 --- a/library/Zend/Gdata/Analytics.php +++ b/library/Zend/Gdata/Analytics.php @@ -23,37 +23,37 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; +;// require_once 'Zend/Gdata.php'; /** * @see Zend_Gdata_Analytics_AccountEntry */ -require_once 'Zend/Gdata/Analytics/AccountEntry.php'; +;// require_once 'Zend/Gdata/Analytics/AccountEntry.php'; /** * @see Zend_Gdata_Analytics_AccountFeed */ -require_once 'Zend/Gdata/Analytics/AccountFeed.php'; +;// require_once 'Zend/Gdata/Analytics/AccountFeed.php'; /** * @see Zend_Gdata_Analytics_DataEntry */ -require_once 'Zend/Gdata/Analytics/DataEntry.php'; +;// require_once 'Zend/Gdata/Analytics/DataEntry.php'; /** * @see Zend_Gdata_Analytics_DataFeed */ -require_once 'Zend/Gdata/Analytics/DataFeed.php'; +;// require_once 'Zend/Gdata/Analytics/DataFeed.php'; /** * @see Zend_Gdata_Analytics_DataQuery */ -require_once 'Zend/Gdata/Analytics/DataQuery.php'; +;// require_once 'Zend/Gdata/Analytics/DataQuery.php'; /** * @see Zend_Gdata_Analytics_AccountQuery */ -require_once 'Zend/Gdata/Analytics/AccountQuery.php'; +;// require_once 'Zend/Gdata/Analytics/AccountQuery.php'; /** * @category Zend diff --git a/library/Zend/Gdata/Analytics/AccountEntry.php b/library/Zend/Gdata/Analytics/AccountEntry.php index 4896c6e205..db0f27ee53 100644 --- a/library/Zend/Gdata/Analytics/AccountEntry.php +++ b/library/Zend/Gdata/Analytics/AccountEntry.php @@ -23,27 +23,27 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Analytics_Extension_Dimension */ -require_once 'Zend/Gdata/Analytics/Extension/Dimension.php'; +;// require_once 'Zend/Gdata/Analytics/Extension/Dimension.php'; /** * @see Zend_Gdata_Analytics_Extension_Metric */ -require_once 'Zend/Gdata/Analytics/Extension/Metric.php'; +;// require_once 'Zend/Gdata/Analytics/Extension/Metric.php'; /** * @see Zend_Gdata_Analytics_Extension_Property */ -require_once 'Zend/Gdata/Analytics/Extension/Property.php'; +;// require_once 'Zend/Gdata/Analytics/Extension/Property.php'; /** * @see Zend_Gdata_Analytics_Extension_TableId */ -require_once 'Zend/Gdata/Analytics/Extension/TableId.php'; +;// require_once 'Zend/Gdata/Analytics/Extension/TableId.php'; /** * @category Zend diff --git a/library/Zend/Gdata/Analytics/AccountFeed.php b/library/Zend/Gdata/Analytics/AccountFeed.php index c4f44e8c0f..866edad210 100644 --- a/library/Zend/Gdata/Analytics/AccountFeed.php +++ b/library/Zend/Gdata/Analytics/AccountFeed.php @@ -23,7 +23,7 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @category Zend diff --git a/library/Zend/Gdata/Analytics/AccountQuery.php b/library/Zend/Gdata/Analytics/AccountQuery.php index 2f2f14f727..e6ea72d47e 100644 --- a/library/Zend/Gdata/Analytics/AccountQuery.php +++ b/library/Zend/Gdata/Analytics/AccountQuery.php @@ -23,7 +23,7 @@ /** * @see Zend_Gdata_Query */ -require_once 'Zend/Gdata/Query.php'; +;// require_once 'Zend/Gdata/Query.php'; /** * @category Zend diff --git a/library/Zend/Gdata/Analytics/DataEntry.php b/library/Zend/Gdata/Analytics/DataEntry.php index db6fad8978..264f830c47 100644 --- a/library/Zend/Gdata/Analytics/DataEntry.php +++ b/library/Zend/Gdata/Analytics/DataEntry.php @@ -23,7 +23,7 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @category Zend diff --git a/library/Zend/Gdata/Analytics/DataFeed.php b/library/Zend/Gdata/Analytics/DataFeed.php index 44db7e3af3..d9edab3ee7 100644 --- a/library/Zend/Gdata/Analytics/DataFeed.php +++ b/library/Zend/Gdata/Analytics/DataFeed.php @@ -23,17 +23,17 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Analytics */ -require_once 'Zend/Gdata/Analytics.php'; +;// require_once 'Zend/Gdata/Analytics.php'; /** * @see Zend_Gdata_Geo_Entry */ -require_once 'Zend/Gdata/Analytics/DataEntry.php'; +;// require_once 'Zend/Gdata/Analytics/DataEntry.php'; /** * @category Zend diff --git a/library/Zend/Gdata/Analytics/DataQuery.php b/library/Zend/Gdata/Analytics/DataQuery.php index 237c306e39..d66020377b 100644 --- a/library/Zend/Gdata/Analytics/DataQuery.php +++ b/library/Zend/Gdata/Analytics/DataQuery.php @@ -23,7 +23,7 @@ /** * @see Zend_Gdata_Query */ -require_once 'Zend/Gdata/Query.php'; +;// require_once 'Zend/Gdata/Query.php'; /** * @category Zend diff --git a/library/Zend/Gdata/Analytics/Extension/Dimension.php b/library/Zend/Gdata/Analytics/Extension/Dimension.php index 294adb5202..53ea5023bf 100644 --- a/library/Zend/Gdata/Analytics/Extension/Dimension.php +++ b/library/Zend/Gdata/Analytics/Extension/Dimension.php @@ -23,7 +23,7 @@ /** * @see Zend_Gdata_Extension_Metric */ -require_once 'Zend/Gdata/Analytics/Extension/Metric.php'; +;// require_once 'Zend/Gdata/Analytics/Extension/Metric.php'; /** * @category Zend diff --git a/library/Zend/Gdata/Analytics/Extension/Goal.php b/library/Zend/Gdata/Analytics/Extension/Goal.php index a37b0ecc47..1e182b3078 100644 --- a/library/Zend/Gdata/Analytics/Extension/Goal.php +++ b/library/Zend/Gdata/Analytics/Extension/Goal.php @@ -23,7 +23,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @category Zend diff --git a/library/Zend/Gdata/Analytics/Extension/Metric.php b/library/Zend/Gdata/Analytics/Extension/Metric.php index ea041292e1..ba26e0fb29 100644 --- a/library/Zend/Gdata/Analytics/Extension/Metric.php +++ b/library/Zend/Gdata/Analytics/Extension/Metric.php @@ -23,7 +23,7 @@ /** * @see Zend_Gdata_Extension_Property */ -require_once 'Zend/Gdata/Analytics/Extension/Property.php'; +;// require_once 'Zend/Gdata/Analytics/Extension/Property.php'; /** * @category Zend diff --git a/library/Zend/Gdata/Analytics/Extension/Property.php b/library/Zend/Gdata/Analytics/Extension/Property.php index 7dd48d6f23..a6c2a630f8 100644 --- a/library/Zend/Gdata/Analytics/Extension/Property.php +++ b/library/Zend/Gdata/Analytics/Extension/Property.php @@ -23,7 +23,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @category Zend diff --git a/library/Zend/Gdata/Analytics/Extension/TableId.php b/library/Zend/Gdata/Analytics/Extension/TableId.php index 852fa589fe..74c5d51c14 100644 --- a/library/Zend/Gdata/Analytics/Extension/TableId.php +++ b/library/Zend/Gdata/Analytics/Extension/TableId.php @@ -23,7 +23,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @category Zend diff --git a/library/Zend/Gdata/App.php b/library/Zend/Gdata/App.php index f66f8288da..0e594702b0 100644 --- a/library/Zend/Gdata/App.php +++ b/library/Zend/Gdata/App.php @@ -24,30 +24,30 @@ /** * Zend_Gdata_Feed */ -require_once 'Zend/Gdata/App/Feed.php'; +;// require_once 'Zend/Gdata/App/Feed.php'; /** * Zend_Gdata_Http_Client */ -require_once 'Zend/Http/Client.php'; +;// require_once 'Zend/Http/Client.php'; /** * Zend_Version */ -require_once 'Zend/Version.php'; +;// require_once 'Zend/Version.php'; /** * Zend_Gdata_App_MediaSource */ -require_once 'Zend/Gdata/App/MediaSource.php'; +;// require_once 'Zend/Gdata/App/MediaSource.php'; /** * Zend_Uri/Http */ -require_once 'Zend/Uri/Http.php'; +;// require_once 'Zend/Uri/Http.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** * Provides Atom Publishing Protocol (APP) functionality. This class and all @@ -252,7 +252,7 @@ public function setHttpClient($client, $client = new Zend_Http_Client(); } if (!$client instanceof Zend_Http_Client) { - require_once 'Zend/Gdata/App/HttpException.php'; + ;// require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException( 'Argument is not an instance of Zend_Http_Client.'); } @@ -339,7 +339,7 @@ public static function getHttpMethodOverride() public static function setGzipEnabled($enabled = false) { if ($enabled && !function_exists('gzinflate')) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'You cannot enable gzipped responses if the zlib module ' . 'is not enabled in your PHP installation.'); @@ -416,7 +416,7 @@ public static function getMaxRedirects() public function setMajorProtocolVersion($value) { if (!($value >= 1)) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); + ;// require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException( 'Major protocol version must be >= 1'); } @@ -446,7 +446,7 @@ public function getMajorProtocolVersion() public function setMinorProtocolVersion($value) { if (!($value >= 0)) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); + ;// require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException( 'Minor protocol version must be >= 0'); } @@ -597,7 +597,7 @@ public function prepareRequest($method, public function performHttpRequest($method, $url, $headers = null, $body = null, $contentType = null, $remainingRedirects = null) { - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; if ($remainingRedirects === null) { $remainingRedirects = self::getMaxRedirects(); } @@ -616,13 +616,13 @@ public function performHttpRequest($method, $url, $headers = null, // check the overridden method if (($method == 'POST' || $method == 'PUT') && $body === null && $headers['x-http-method-override'] != 'DELETE') { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'You must specify the data to post as either a ' . 'string or a child of Zend_Gdata_App_Entry'); } if ($url === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'You must specify an URI to which to post.'); } @@ -648,7 +648,7 @@ public function performHttpRequest($method, $url, $headers = null, // Set the params for the new request to be performed $this->_httpClient->setHeaders($headers); - require_once 'Zend/Uri/Http.php'; + ;// require_once 'Zend/Uri/Http.php'; $uri = Zend_Uri_Http::fromString($url); preg_match("/^(.*?)(\?.*)?$/", $url, $matches); $this->_httpClient->setUri($matches[1]); @@ -670,10 +670,10 @@ public function performHttpRequest($method, $url, $headers = null, $oldHttpAdapter = $this->_httpClient->getAdapter(); if ($oldHttpAdapter instanceof Zend_Http_Client_Adapter_Proxy) { - require_once 'Zend/Gdata/HttpAdapterStreamingProxy.php'; + ;// require_once 'Zend/Gdata/HttpAdapterStreamingProxy.php'; $newAdapter = new Zend_Gdata_HttpAdapterStreamingProxy(); } else { - require_once 'Zend/Gdata/HttpAdapterStreamingSocket.php'; + ;// require_once 'Zend/Gdata/HttpAdapterStreamingSocket.php'; $newAdapter = new Zend_Gdata_HttpAdapterStreamingSocket(); } $this->_httpClient->setAdapter($newAdapter); @@ -692,7 +692,7 @@ public function performHttpRequest($method, $url, $headers = null, if ($usingMimeStream) { $this->_httpClient->setAdapter($oldHttpAdapter); } - require_once 'Zend/Gdata/App/HttpException.php'; + ;// require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException($e->getMessage(), $e); } if ($response->isRedirect() && $response->getStatus() != '304') { @@ -702,13 +702,13 @@ public function performHttpRequest($method, $url, $headers = null, $method, $newUrl, $headers, $body, $contentType, $remainingRedirects); } else { - require_once 'Zend/Gdata/App/HttpException.php'; + ;// require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException( 'Number of redirects exceeds maximum', null, $response); } } if (!$response->isSuccessful()) { - require_once 'Zend/Gdata/App/HttpException.php'; + ;// require_once 'Zend/Gdata/App/HttpException.php'; $exceptionMessage = 'Expected response code 200, got ' . $response->getStatus(); if (self::getVerboseExceptionMessages()) { @@ -818,7 +818,7 @@ public static function importString($string, $minorProtocolVersion = null) { if (!class_exists($className, false)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; @Zend_Loader::loadClass($className); } @@ -827,7 +827,7 @@ public static function importString($string, $doc = @Zend_Xml_Security::scan($string, $doc); if (!$doc) { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; $message = error_get_last()['message'] ?? 'Unknown error'; throw new Zend_Gdata_App_Exception( "DOMDocument cannot parse XML: $message"); @@ -856,7 +856,7 @@ public static function importFile($filename, { $feed = @file_get_contents($filename, $useIncludePath); if ($feed === false) { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; $message = error_get_last()['message'] ?? 'Unknown error'; throw new Zend_Gdata_App_Exception( "File could not be loaded: $message"); @@ -974,7 +974,7 @@ public function insertEntry($data, $uri, $className='Zend_Gdata_App_Entry', $extraHeaders = array()) { if (!class_exists($className, false)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; @Zend_Loader::loadClass($className); } @@ -1015,7 +1015,7 @@ public function updateEntry($data, $uri = null, $className = null, } if (!class_exists($className, false)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; @Zend_Loader::loadClass($className); } @@ -1054,7 +1054,7 @@ public function __call($method, $args) // Autoloading disabled on next line for compatibility // with magic factories. See ZF-6660. if (!class_exists($name . '_' . $class, false)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; @Zend_Loader::loadClass($name . '_' . $class); } $foundClassName = $name . '_' . $class; @@ -1080,12 +1080,12 @@ public function __call($method, $args) } return $instance; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( "Unable to find '{$class}' in registered packages"); } } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception("No such method {$method}"); } } diff --git a/library/Zend/Gdata/App/AuthException.php b/library/Zend/Gdata/App/AuthException.php index c98215d0af..b54d9366fb 100644 --- a/library/Zend/Gdata/App/AuthException.php +++ b/library/Zend/Gdata/App/AuthException.php @@ -23,7 +23,7 @@ /** * @see Zend_Gdata_App_Exception */ -require_once 'Zend/Gdata/App/Exception.php'; +;// require_once 'Zend/Gdata/App/Exception.php'; /** * Gdata exceptions diff --git a/library/Zend/Gdata/App/BadMethodCallException.php b/library/Zend/Gdata/App/BadMethodCallException.php index 2591681066..9dff091eb6 100644 --- a/library/Zend/Gdata/App/BadMethodCallException.php +++ b/library/Zend/Gdata/App/BadMethodCallException.php @@ -24,7 +24,7 @@ /** * Zend_Gdata_App_Exception */ -require_once 'Zend/Gdata/App/Exception.php'; +;// require_once 'Zend/Gdata/App/Exception.php'; /** * Gdata APP exceptions diff --git a/library/Zend/Gdata/App/Base.php b/library/Zend/Gdata/App/Base.php index 1d2b3de9d5..d96bf0e791 100644 --- a/library/Zend/Gdata/App/Base.php +++ b/library/Zend/Gdata/App/Base.php @@ -24,10 +24,10 @@ /** * @see Zend_Gdata_App_Util */ -require_once 'Zend/Gdata/App/Util.php'; +;// require_once 'Zend/Gdata/App/Util.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** * Abstract class for all XML elements @@ -305,18 +305,18 @@ public function transferFromXML($xml) $doc = new DOMDocument(); $doc = @Zend_Xml_Security::scan($xml, $doc); if (!$doc) { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; $message = error_get_last()['message'] ?? 'Unknown error'; throw new Zend_Gdata_App_Exception("DOMDocument cannot parse XML: $message"); } $element = $doc->getElementsByTagName($this->_rootElement)->item(0); if (!$element) { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('No root <' . $this->_rootElement . '> element'); } $this->transferFromDOM($element); } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('XML passed to transferFromXML cannot be null'); } } @@ -482,7 +482,7 @@ public function __get($name) } else if (property_exists($this, "_{$name}")) { return $this->{'_' . $name}; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Property ' . $name . ' does not exist'); } @@ -508,7 +508,7 @@ public function __set($name, $val) } else if (isset($this->{'_' . $name}) || ($this->{'_' . $name} === null)) { $this->{'_' . $name} = $val; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Property ' . $name . ' does not exist'); } @@ -524,7 +524,7 @@ public function __isset($name) $rc = new ReflectionClass(get_class($this)); $privName = '_' . $name; if (!($rc->hasProperty($privName))) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Property ' . $name . ' does not exist'); } else { diff --git a/library/Zend/Gdata/App/BaseMediaSource.php b/library/Zend/Gdata/App/BaseMediaSource.php index e015ed0225..096d0ca36b 100644 --- a/library/Zend/Gdata/App/BaseMediaSource.php +++ b/library/Zend/Gdata/App/BaseMediaSource.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_MediaSource */ -require_once 'Zend/Gdata/App/MediaSource.php'; +;// require_once 'Zend/Gdata/App/MediaSource.php'; /** * Concrete class to use a file handle as an attachment within a MediaEntry. @@ -116,7 +116,7 @@ public function __get($name) } else if (property_exists($this, "_{$name}")) { return $this->{'_' . $name}; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Property ' . $name . ' does not exist'); } @@ -140,7 +140,7 @@ public function __set($name, $val) } else if (isset($this->{'_' . $name}) || ($this->{'_' . $name} === null)) { $this->{'_' . $name} = $val; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Property ' . $name . ' does not exist'); } @@ -156,7 +156,7 @@ public function __isset($name) $rc = new ReflectionClass(get_class($this)); $privName = '_' . $name; if (!($rc->hasProperty($privName))) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Property ' . $name . ' does not exist'); } else { diff --git a/library/Zend/Gdata/App/CaptchaRequiredException.php b/library/Zend/Gdata/App/CaptchaRequiredException.php index c91e506a99..5e7cfe0b56 100644 --- a/library/Zend/Gdata/App/CaptchaRequiredException.php +++ b/library/Zend/Gdata/App/CaptchaRequiredException.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_CaptchaRequiredException */ -require_once 'Zend/Gdata/App/AuthException.php'; +;// require_once 'Zend/Gdata/App/AuthException.php'; /** * Gdata exceptions diff --git a/library/Zend/Gdata/App/Entry.php b/library/Zend/Gdata/App/Entry.php index db8cb251ce..60d29dcec0 100644 --- a/library/Zend/Gdata/App/Entry.php +++ b/library/Zend/Gdata/App/Entry.php @@ -24,37 +24,37 @@ /** * @see Zend_Gdata_App_FeedEntryParent */ -require_once 'Zend/Gdata/App/FeedEntryParent.php'; +;// require_once 'Zend/Gdata/App/FeedEntryParent.php'; /** * @see Zend_Gdata_App_Extension_Content */ -require_once 'Zend/Gdata/App/Extension/Content.php'; +;// require_once 'Zend/Gdata/App/Extension/Content.php'; /** * @see Zend_Gdata_App_Extension_Edited */ -require_once 'Zend/Gdata/App/Extension/Edited.php'; +;// require_once 'Zend/Gdata/App/Extension/Edited.php'; /** * @see Zend_Gdata_App_Extension_Published */ -require_once 'Zend/Gdata/App/Extension/Published.php'; +;// require_once 'Zend/Gdata/App/Extension/Published.php'; /** * @see Zend_Gdata_App_Extension_Source */ -require_once 'Zend/Gdata/App/Extension/Source.php'; +;// require_once 'Zend/Gdata/App/Extension/Source.php'; /** * @see Zend_Gdata_App_Extension_Summary */ -require_once 'Zend/Gdata/App/Extension/Summary.php'; +;// require_once 'Zend/Gdata/App/Extension/Summary.php'; /** * @see Zend_Gdata_App_Extension_Control */ -require_once 'Zend/Gdata/App/Extension/Control.php'; +;// require_once 'Zend/Gdata/App/Extension/Control.php'; /** * Concrete class for working with Atom entries. diff --git a/library/Zend/Gdata/App/Exception.php b/library/Zend/Gdata/App/Exception.php index 733fb4035a..4df701ac32 100644 --- a/library/Zend/Gdata/App/Exception.php +++ b/library/Zend/Gdata/App/Exception.php @@ -25,7 +25,7 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * Gdata App exceptions diff --git a/library/Zend/Gdata/App/Extension.php b/library/Zend/Gdata/App/Extension.php index 6d26f3da4a..e1d38c97cf 100644 --- a/library/Zend/Gdata/App/Extension.php +++ b/library/Zend/Gdata/App/Extension.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Base */ -require_once 'Zend/Gdata/App/Base.php'; +;// require_once 'Zend/Gdata/App/Base.php'; /** * Gdata App extensions diff --git a/library/Zend/Gdata/App/Extension/Author.php b/library/Zend/Gdata/App/Extension/Author.php index 74944c1e4e..3042135927 100644 --- a/library/Zend/Gdata/App/Extension/Author.php +++ b/library/Zend/Gdata/App/Extension/Author.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension/Person.php'; +;// require_once 'Zend/Gdata/App/Extension/Person.php'; /** * Represents the atom:author element diff --git a/library/Zend/Gdata/App/Extension/Category.php b/library/Zend/Gdata/App/Extension/Category.php index 5d60b467c3..8422c7fedc 100644 --- a/library/Zend/Gdata/App/Extension/Category.php +++ b/library/Zend/Gdata/App/Extension/Category.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the atom:category element diff --git a/library/Zend/Gdata/App/Extension/Content.php b/library/Zend/Gdata/App/Extension/Content.php index 11cbbe9c95..4b23f6b241 100644 --- a/library/Zend/Gdata/App/Extension/Content.php +++ b/library/Zend/Gdata/App/Extension/Content.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension_Text */ -require_once 'Zend/Gdata/App/Extension/Text.php'; +;// require_once 'Zend/Gdata/App/Extension/Text.php'; /** * Represents the atom:content element diff --git a/library/Zend/Gdata/App/Extension/Contributor.php b/library/Zend/Gdata/App/Extension/Contributor.php index 3ec1864634..553592fc05 100644 --- a/library/Zend/Gdata/App/Extension/Contributor.php +++ b/library/Zend/Gdata/App/Extension/Contributor.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension/Person.php'; +;// require_once 'Zend/Gdata/App/Extension/Person.php'; /** * Represents the atom:contributor element diff --git a/library/Zend/Gdata/App/Extension/Control.php b/library/Zend/Gdata/App/Extension/Control.php index aa76544c40..552fb091be 100644 --- a/library/Zend/Gdata/App/Extension/Control.php +++ b/library/Zend/Gdata/App/Extension/Control.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * @see Zend_Gdata_App_Extension_Draft */ -require_once 'Zend/Gdata/App/Extension/Draft.php'; +;// require_once 'Zend/Gdata/App/Extension/Draft.php'; /** * Represents the app:control element diff --git a/library/Zend/Gdata/App/Extension/Draft.php b/library/Zend/Gdata/App/Extension/Draft.php index db5ada334f..e699d30c08 100644 --- a/library/Zend/Gdata/App/Extension/Draft.php +++ b/library/Zend/Gdata/App/Extension/Draft.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the app:draft element diff --git a/library/Zend/Gdata/App/Extension/Edited.php b/library/Zend/Gdata/App/Extension/Edited.php index 7f07e652e7..1f65075056 100644 --- a/library/Zend/Gdata/App/Extension/Edited.php +++ b/library/Zend/Gdata/App/Extension/Edited.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the app:edited element diff --git a/library/Zend/Gdata/App/Extension/Element.php b/library/Zend/Gdata/App/Extension/Element.php index 57ab5fc246..f159de4f3a 100644 --- a/library/Zend/Gdata/App/Extension/Element.php +++ b/library/Zend/Gdata/App/Extension/Element.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Class that represents elements which were not handled by other parsing diff --git a/library/Zend/Gdata/App/Extension/Email.php b/library/Zend/Gdata/App/Extension/Email.php index 475b949f3d..43b0d8dcc3 100644 --- a/library/Zend/Gdata/App/Extension/Email.php +++ b/library/Zend/Gdata/App/Extension/Email.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the atom:email element diff --git a/library/Zend/Gdata/App/Extension/Generator.php b/library/Zend/Gdata/App/Extension/Generator.php index 363af0d6bd..2e808f32d8 100644 --- a/library/Zend/Gdata/App/Extension/Generator.php +++ b/library/Zend/Gdata/App/Extension/Generator.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the atom:generator element diff --git a/library/Zend/Gdata/App/Extension/Icon.php b/library/Zend/Gdata/App/Extension/Icon.php index 984a692e26..e714241b99 100644 --- a/library/Zend/Gdata/App/Extension/Icon.php +++ b/library/Zend/Gdata/App/Extension/Icon.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the atom:icon element diff --git a/library/Zend/Gdata/App/Extension/Id.php b/library/Zend/Gdata/App/Extension/Id.php index 5ba05b471d..d8e98295a0 100644 --- a/library/Zend/Gdata/App/Extension/Id.php +++ b/library/Zend/Gdata/App/Extension/Id.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the atom:id element diff --git a/library/Zend/Gdata/App/Extension/Link.php b/library/Zend/Gdata/App/Extension/Link.php index 5f7587fc27..9f161bf5c9 100644 --- a/library/Zend/Gdata/App/Extension/Link.php +++ b/library/Zend/Gdata/App/Extension/Link.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Data model for representing an atom:link element diff --git a/library/Zend/Gdata/App/Extension/Logo.php b/library/Zend/Gdata/App/Extension/Logo.php index 1f78fbe303..48c88cda61 100644 --- a/library/Zend/Gdata/App/Extension/Logo.php +++ b/library/Zend/Gdata/App/Extension/Logo.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the atom:logo element diff --git a/library/Zend/Gdata/App/Extension/Name.php b/library/Zend/Gdata/App/Extension/Name.php index 67214d0ef2..9c3fa6fa48 100644 --- a/library/Zend/Gdata/App/Extension/Name.php +++ b/library/Zend/Gdata/App/Extension/Name.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the atom:name element diff --git a/library/Zend/Gdata/App/Extension/Person.php b/library/Zend/Gdata/App/Extension/Person.php index e2bf7dd87c..a5a74899cd 100644 --- a/library/Zend/Gdata/App/Extension/Person.php +++ b/library/Zend/Gdata/App/Extension/Person.php @@ -24,22 +24,22 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * @see Zend_Gdata_App_Extension_Name */ -require_once 'Zend/Gdata/App/Extension/Name.php'; +;// require_once 'Zend/Gdata/App/Extension/Name.php'; /** * @see Zend_Gdata_App_Extension_Email */ -require_once 'Zend/Gdata/App/Extension/Email.php'; +;// require_once 'Zend/Gdata/App/Extension/Email.php'; /** * @see Zend_Gdata_App_Extension_Uri */ -require_once 'Zend/Gdata/App/Extension/Uri.php'; +;// require_once 'Zend/Gdata/App/Extension/Uri.php'; /** * Base class for people (currently used by atom:author, atom:contributor) diff --git a/library/Zend/Gdata/App/Extension/Published.php b/library/Zend/Gdata/App/Extension/Published.php index f7b3e12148..67cb402cd8 100644 --- a/library/Zend/Gdata/App/Extension/Published.php +++ b/library/Zend/Gdata/App/Extension/Published.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the atom:published element diff --git a/library/Zend/Gdata/App/Extension/Rights.php b/library/Zend/Gdata/App/Extension/Rights.php index 82f8833c9e..f7c2da4a27 100644 --- a/library/Zend/Gdata/App/Extension/Rights.php +++ b/library/Zend/Gdata/App/Extension/Rights.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension_Text */ -require_once 'Zend/Gdata/App/Extension/Text.php'; +;// require_once 'Zend/Gdata/App/Extension/Text.php'; /** * Represents the atom:rights element diff --git a/library/Zend/Gdata/App/Extension/Source.php b/library/Zend/Gdata/App/Extension/Source.php index 52d598d9ce..d591ed817f 100644 --- a/library/Zend/Gdata/App/Extension/Source.php +++ b/library/Zend/Gdata/App/Extension/Source.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_App_Entry */ -require_once 'Zend/Gdata/App/Entry.php'; +;// require_once 'Zend/Gdata/App/Entry.php'; /** * @see Zend_Gdata_App_FeedSourceParent */ -require_once 'Zend/Gdata/App/FeedSourceParent.php'; +;// require_once 'Zend/Gdata/App/FeedSourceParent.php'; /** * @category Zend diff --git a/library/Zend/Gdata/App/Extension/Subtitle.php b/library/Zend/Gdata/App/Extension/Subtitle.php index 59e9dad40e..678f4d015a 100644 --- a/library/Zend/Gdata/App/Extension/Subtitle.php +++ b/library/Zend/Gdata/App/Extension/Subtitle.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension_Text */ -require_once 'Zend/Gdata/App/Extension/Text.php'; +;// require_once 'Zend/Gdata/App/Extension/Text.php'; /** * Represents the atom:subtitle element diff --git a/library/Zend/Gdata/App/Extension/Summary.php b/library/Zend/Gdata/App/Extension/Summary.php index 8333688c37..5b6236a8f5 100644 --- a/library/Zend/Gdata/App/Extension/Summary.php +++ b/library/Zend/Gdata/App/Extension/Summary.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension_Text */ -require_once 'Zend/Gdata/App/Extension/Text.php'; +;// require_once 'Zend/Gdata/App/Extension/Text.php'; /** * Represents the atom:summary element diff --git a/library/Zend/Gdata/App/Extension/Text.php b/library/Zend/Gdata/App/Extension/Text.php index 7ddaa2d749..15a0755d2f 100644 --- a/library/Zend/Gdata/App/Extension/Text.php +++ b/library/Zend/Gdata/App/Extension/Text.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Abstract class for data models that require only text and type-- such as: diff --git a/library/Zend/Gdata/App/Extension/Title.php b/library/Zend/Gdata/App/Extension/Title.php index 51b64b92ea..a1ac9e2055 100644 --- a/library/Zend/Gdata/App/Extension/Title.php +++ b/library/Zend/Gdata/App/Extension/Title.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension_Text */ -require_once 'Zend/Gdata/App/Extension/Text.php'; +;// require_once 'Zend/Gdata/App/Extension/Text.php'; /** * Represents the atom:title element diff --git a/library/Zend/Gdata/App/Extension/Updated.php b/library/Zend/Gdata/App/Extension/Updated.php index 72db6684d4..e68b6f8af2 100644 --- a/library/Zend/Gdata/App/Extension/Updated.php +++ b/library/Zend/Gdata/App/Extension/Updated.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the atom:updated element diff --git a/library/Zend/Gdata/App/Extension/Uri.php b/library/Zend/Gdata/App/Extension/Uri.php index 5f61243d80..788b4c1ba9 100644 --- a/library/Zend/Gdata/App/Extension/Uri.php +++ b/library/Zend/Gdata/App/Extension/Uri.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the atom:uri element diff --git a/library/Zend/Gdata/App/Feed.php b/library/Zend/Gdata/App/Feed.php index ecd6da6b30..1468ef6650 100755 --- a/library/Zend/Gdata/App/Feed.php +++ b/library/Zend/Gdata/App/Feed.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_App_Entry */ -require_once 'Zend/Gdata/App/Entry.php'; +;// require_once 'Zend/Gdata/App/Entry.php'; /** * @see Zend_Gdata_App_FeedSourceParent */ -require_once 'Zend/Gdata/App/FeedSourceParent.php'; +;// require_once 'Zend/Gdata/App/FeedSourceParent.php'; /** * Atom feed class @@ -282,7 +282,7 @@ public function getNextFeed() { $nextLink = $this->getNextLink(); if (!$nextLink) { - require_once 'Zend/Gdata/App/HttpException.php'; + ;// require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_Exception('No link to next set ' . 'of results found.'); } @@ -303,7 +303,7 @@ public function getPreviousFeed() { $previousLink = $this->getPreviousLink(); if (!$previousLink) { - require_once 'Zend/Gdata/App/HttpException.php'; + ;// require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_Exception('No link to previous set ' . 'of results found.'); } diff --git a/library/Zend/Gdata/App/FeedEntryParent.php b/library/Zend/Gdata/App/FeedEntryParent.php index 89c6fcc150..7c21e64b23 100755 --- a/library/Zend/Gdata/App/FeedEntryParent.php +++ b/library/Zend/Gdata/App/FeedEntryParent.php @@ -24,52 +24,52 @@ /** * @see Zend_Gdata_App_Extension_Element */ -require_once 'Zend/Gdata/App/Extension/Element.php'; +;// require_once 'Zend/Gdata/App/Extension/Element.php'; /** * @see Zend_Gdata_App_Extension_Author */ -require_once 'Zend/Gdata/App/Extension/Author.php'; +;// require_once 'Zend/Gdata/App/Extension/Author.php'; /** * @see Zend_Gdata_App_Extension_Category */ -require_once 'Zend/Gdata/App/Extension/Category.php'; +;// require_once 'Zend/Gdata/App/Extension/Category.php'; /** * @see Zend_Gdata_App_Extension_Contributor */ -require_once 'Zend/Gdata/App/Extension/Contributor.php'; +;// require_once 'Zend/Gdata/App/Extension/Contributor.php'; /** * @see Zend_Gdata_App_Extension_Id */ -require_once 'Zend/Gdata/App/Extension/Id.php'; +;// require_once 'Zend/Gdata/App/Extension/Id.php'; /** * @see Zend_Gdata_App_Extension_Link */ -require_once 'Zend/Gdata/App/Extension/Link.php'; +;// require_once 'Zend/Gdata/App/Extension/Link.php'; /** * @see Zend_Gdata_App_Extension_Rights */ -require_once 'Zend/Gdata/App/Extension/Rights.php'; +;// require_once 'Zend/Gdata/App/Extension/Rights.php'; /** * @see Zend_Gdata_App_Extension_Title */ -require_once 'Zend/Gdata/App/Extension/Title.php'; +;// require_once 'Zend/Gdata/App/Extension/Title.php'; /** * @see Zend_Gdata_App_Extension_Updated */ -require_once 'Zend/Gdata/App/Extension/Updated.php'; +;// require_once 'Zend/Gdata/App/Extension/Updated.php'; /** * Zend_Version */ -require_once 'Zend/Version.php'; +;// require_once 'Zend/Version.php'; /** * Abstract class for common functionality in entries and feeds @@ -593,7 +593,7 @@ public function getEtag() { public function setMajorProtocolVersion($value) { if (!($value >= 1) && ($value !== null)) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); + ;// require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException( 'Major protocol version must be >= 1'); } @@ -623,7 +623,7 @@ public function getMajorProtocolVersion() public function setMinorProtocolVersion($value) { if (!($value >= 0)) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); + ;// require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException( 'Minor protocol version must be >= 0 or null'); } diff --git a/library/Zend/Gdata/App/FeedSourceParent.php b/library/Zend/Gdata/App/FeedSourceParent.php index 9bdbbad769..b6c4359d31 100644 --- a/library/Zend/Gdata/App/FeedSourceParent.php +++ b/library/Zend/Gdata/App/FeedSourceParent.php @@ -24,32 +24,32 @@ /** * @see Zend_Gdata_App_Entry */ -require_once 'Zend/Gdata/App/Entry.php'; +;// require_once 'Zend/Gdata/App/Entry.php'; /** * @see Zend_Gdata_App_FeedSourceParent */ -require_once 'Zend/Gdata/App/FeedEntryParent.php'; +;// require_once 'Zend/Gdata/App/FeedEntryParent.php'; /** * @see Zend_Gdata_App_Extension_Generator */ -require_once 'Zend/Gdata/App/Extension/Generator.php'; +;// require_once 'Zend/Gdata/App/Extension/Generator.php'; /** * @see Zend_Gdata_App_Extension_Icon */ -require_once 'Zend/Gdata/App/Extension/Icon.php'; +;// require_once 'Zend/Gdata/App/Extension/Icon.php'; /** * @see Zend_Gdata_App_Extension_Logo */ -require_once 'Zend/Gdata/App/Extension/Logo.php'; +;// require_once 'Zend/Gdata/App/Extension/Logo.php'; /** * @see Zend_Gdata_App_Extension_Subtitle */ -require_once 'Zend/Gdata/App/Extension/Subtitle.php'; +;// require_once 'Zend/Gdata/App/Extension/Subtitle.php'; /** * Atom feed class diff --git a/library/Zend/Gdata/App/HttpException.php b/library/Zend/Gdata/App/HttpException.php index ccd4a89d9f..f66cc49ab5 100644 --- a/library/Zend/Gdata/App/HttpException.php +++ b/library/Zend/Gdata/App/HttpException.php @@ -24,12 +24,12 @@ /** * Zend_Gdata_App_Exception */ -require_once 'Zend/Gdata/App/Exception.php'; +;// require_once 'Zend/Gdata/App/Exception.php'; /** * Zend_Http_Client_Exception */ -require_once 'Zend/Http/Client/Exception.php'; +;// require_once 'Zend/Http/Client/Exception.php'; /** * Gdata exceptions diff --git a/library/Zend/Gdata/App/IOException.php b/library/Zend/Gdata/App/IOException.php index 472f9739c2..45b4f95f54 100644 --- a/library/Zend/Gdata/App/IOException.php +++ b/library/Zend/Gdata/App/IOException.php @@ -25,7 +25,7 @@ /** * Zend_Gdata_App_Exception */ -require_once 'Zend/Gdata/App/Exception.php'; +;// require_once 'Zend/Gdata/App/Exception.php'; /** * Gdata App IO exceptions. diff --git a/library/Zend/Gdata/App/InvalidArgumentException.php b/library/Zend/Gdata/App/InvalidArgumentException.php index 5db8d3c8f4..5f39ff4dc1 100644 --- a/library/Zend/Gdata/App/InvalidArgumentException.php +++ b/library/Zend/Gdata/App/InvalidArgumentException.php @@ -24,7 +24,7 @@ /** * Zend_Gdata_App_Exception */ -require_once 'Zend/Gdata/App/Exception.php'; +;// require_once 'Zend/Gdata/App/Exception.php'; /** * Gdata exceptions diff --git a/library/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php b/library/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php index 91a7afceca..4969d8e945 100644 --- a/library/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php +++ b/library/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php @@ -24,7 +24,7 @@ /** * @see Zend_Http_Client_Adapter_Socket */ -require_once 'Zend/Http/Client/Adapter/Socket.php'; +;// require_once 'Zend/Http/Client/Adapter/Socket.php'; /** * Overrides the traditional socket-based adapter class for Zend_Http_Client to diff --git a/library/Zend/Gdata/App/MediaEntry.php b/library/Zend/Gdata/App/MediaEntry.php index 183d3c6386..b2a5a4cd16 100644 --- a/library/Zend/Gdata/App/MediaEntry.php +++ b/library/Zend/Gdata/App/MediaEntry.php @@ -24,17 +24,17 @@ /** * @see Zend_Gdata_App_Entry */ -require_once 'Zend/Gdata/App/Entry.php'; +;// require_once 'Zend/Gdata/App/Entry.php'; /** * @see Zend_Gdata_App_MediaSource */ -require_once 'Zend/Gdata/App/MediaSource.php'; +;// require_once 'Zend/Gdata/App/MediaSource.php'; /** * @see Zend_Gdata_MediaMimeStream */ -require_once 'Zend/Gdata/MediaMimeStream.php'; +;// require_once 'Zend/Gdata/MediaMimeStream.php'; /** * Concrete class for working with Atom entries containing multi-part data. @@ -109,7 +109,7 @@ public function setMediaSource($value) if ($value instanceof Zend_Gdata_App_MediaSource) { $this->_mediaSource = $value; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'You must specify the media data as a class that conforms to Zend_Gdata_App_MediaSource.'); } diff --git a/library/Zend/Gdata/App/MediaFileSource.php b/library/Zend/Gdata/App/MediaFileSource.php index 57f5f219a1..34bc2f232c 100644 --- a/library/Zend/Gdata/App/MediaFileSource.php +++ b/library/Zend/Gdata/App/MediaFileSource.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_MediaData */ -require_once 'Zend/Gdata/App/BaseMediaSource.php'; +;// require_once 'Zend/Gdata/App/BaseMediaSource.php'; /** * Concrete class to use a file handle as an attachment within a MediaEntry. @@ -76,14 +76,14 @@ public function encode() $fileHandle = fopen($this->getFilename(), 'r', true); $result = fread($fileHandle, filesize($this->getFilename())); if ($result === false) { - require_once 'Zend/Gdata/App/IOException.php'; + ;// require_once 'Zend/Gdata/App/IOException.php'; throw new Zend_Gdata_App_IOException("Error reading file - " . $this->getFilename() . '. Read failed.'); } fclose($fileHandle); return $result; } else { - require_once 'Zend/Gdata/App/IOException.php'; + ;// require_once 'Zend/Gdata/App/IOException.php'; throw new Zend_Gdata_App_IOException("Error reading file - " . $this->getFilename() . '. File is not readable.'); } diff --git a/library/Zend/Gdata/App/Util.php b/library/Zend/Gdata/App/Util.php index 556490c847..bcdfa69cf9 100644 --- a/library/Zend/Gdata/App/Util.php +++ b/library/Zend/Gdata/App/Util.php @@ -53,7 +53,7 @@ public static function formatTimestamp($timestamp) } else { $ts = strtotime($timestamp); if ($ts === false) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException("Invalid timestamp: $timestamp."); } return date('Y-m-d\TH:i:s', $ts); @@ -77,7 +77,7 @@ public static function findGreatestBoundedValue($maximumKey, $collection) // Sanity check: Make sure that the collection isn't empty if (sizeof($collection) == 0) { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception("Empty namespace collection encountered."); } @@ -102,7 +102,7 @@ public static function findGreatestBoundedValue($maximumKey, $collection) // Guard: A namespace wasn't found. Either none were registered, or // the current protcol version is lower than the maximum namespace. if (!$found) { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception("Namespace compatible with current protocol not found."); } diff --git a/library/Zend/Gdata/App/VersionException.php b/library/Zend/Gdata/App/VersionException.php index c35181e3b5..2ff2693bcc 100644 --- a/library/Zend/Gdata/App/VersionException.php +++ b/library/Zend/Gdata/App/VersionException.php @@ -24,7 +24,7 @@ /** * Zend_Gdata_App_Exception */ -require_once 'Zend/Gdata/App/Exception.php'; +;// require_once 'Zend/Gdata/App/Exception.php'; /** * Gdata APP exceptions diff --git a/library/Zend/Gdata/AuthSub.php b/library/Zend/Gdata/AuthSub.php index 3958706ccc..1a6c37f47c 100644 --- a/library/Zend/Gdata/AuthSub.php +++ b/library/Zend/Gdata/AuthSub.php @@ -24,12 +24,12 @@ /** * Zend_Gdata_HttpClient */ -require_once 'Zend/Gdata/HttpClient.php'; +;// require_once 'Zend/Gdata/HttpClient.php'; /** * Zend_Version */ -require_once 'Zend/Version.php'; +;// require_once 'Zend/Version.php'; /** * Wrapper around Zend_Http_Client to facilitate Google's "Account Authentication @@ -118,7 +118,7 @@ public static function getAuthSubSessionToken( try { $response = $client->request('GET'); } catch (Zend_Http_Client_Exception $e) { - require_once 'Zend/Gdata/App/HttpException.php'; + ;// require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException($e->getMessage(), $e); } @@ -134,7 +134,7 @@ public static function getAuthSubSessionToken( } return $goog_resp['Token']; } else { - require_once 'Zend/Gdata/App/AuthException.php'; + ;// require_once 'Zend/Gdata/App/AuthException.php'; throw new Zend_Gdata_App_AuthException( 'Token upgrade failed. Reason: ' . $response->getBody()); } @@ -170,7 +170,7 @@ public static function AuthSubRevokeToken($token, $client = null, $response = $client->request('GET'); } catch (Zend_Http_Client_Exception $e) { ob_end_clean(); - require_once 'Zend/Gdata/App/HttpException.php'; + ;// require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException($e->getMessage(), $e); } ob_end_clean(); @@ -212,7 +212,7 @@ public static function getAuthSubTokenInfo( $response = $client->request('GET'); } catch (Zend_Http_Client_Exception $e) { ob_end_clean(); - require_once 'Zend/Gdata/App/HttpException.php'; + ;// require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException($e->getMessage(), $e); } ob_end_clean(); @@ -232,7 +232,7 @@ public static function getHttpClient($token, $client = null) $client = new Zend_Gdata_HttpClient(); } if (!$client instanceof Zend_Gdata_HttpClient) { - require_once 'Zend/Gdata/App/HttpException.php'; + ;// require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException('Client is not an instance of Zend_Gdata_HttpClient.'); } $useragent = 'Zend_Framework_Gdata/' . Zend_Version::VERSION; diff --git a/library/Zend/Gdata/Books.php b/library/Zend/Gdata/Books.php index 48c5bb867c..bc48b9cb31 100755 --- a/library/Zend/Gdata/Books.php +++ b/library/Zend/Gdata/Books.php @@ -24,32 +24,32 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; +;// require_once 'Zend/Gdata.php'; /** * @see Zend_Gdata_DublinCore */ -require_once 'Zend/Gdata/DublinCore.php'; +;// require_once 'Zend/Gdata/DublinCore.php'; /** * @see Zend_Gdata_Books_CollectionEntry */ -require_once 'Zend/Gdata/Books/CollectionEntry.php'; +;// require_once 'Zend/Gdata/Books/CollectionEntry.php'; /** * @see Zend_Gdata_Books_CollectionFeed */ -require_once 'Zend/Gdata/Books/CollectionFeed.php'; +;// require_once 'Zend/Gdata/Books/CollectionFeed.php'; /** * @see Zend_Gdata_Books_VolumeEntry */ -require_once 'Zend/Gdata/Books/VolumeEntry.php'; +;// require_once 'Zend/Gdata/Books/VolumeEntry.php'; /** * @see Zend_Gdata_Books_VolumeFeed */ -require_once 'Zend/Gdata/Books/VolumeFeed.php'; +;// require_once 'Zend/Gdata/Books/VolumeFeed.php'; /** * Service class for interacting with the Books service diff --git a/library/Zend/Gdata/Books/CollectionEntry.php b/library/Zend/Gdata/Books/CollectionEntry.php index 04e0eb88d9..9ab160435c 100644 --- a/library/Zend/Gdata/Books/CollectionEntry.php +++ b/library/Zend/Gdata/Books/CollectionEntry.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * Describes an entry in a feed of collections diff --git a/library/Zend/Gdata/Books/CollectionFeed.php b/library/Zend/Gdata/Books/CollectionFeed.php index 63cb1d3898..949f4b5b8a 100644 --- a/library/Zend/Gdata/Books/CollectionFeed.php +++ b/library/Zend/Gdata/Books/CollectionFeed.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * Describes a Book Search collection feed diff --git a/library/Zend/Gdata/Books/Extension/AnnotationLink.php b/library/Zend/Gdata/Books/Extension/AnnotationLink.php index 2c8b1ae1f1..0b5895fa95 100644 --- a/library/Zend/Gdata/Books/Extension/AnnotationLink.php +++ b/library/Zend/Gdata/Books/Extension/AnnotationLink.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Books_Extension_BooksLink */ -require_once 'Zend/Gdata/Books/Extension/BooksLink.php'; +;// require_once 'Zend/Gdata/Books/Extension/BooksLink.php'; /** * Describes an annotation link diff --git a/library/Zend/Gdata/Books/Extension/BooksCategory.php b/library/Zend/Gdata/Books/Extension/BooksCategory.php index 897454820b..9aa85adaa0 100644 --- a/library/Zend/Gdata/Books/Extension/BooksCategory.php +++ b/library/Zend/Gdata/Books/Extension/BooksCategory.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension_Category */ -require_once 'Zend/Gdata/App/Extension/Category.php'; +;// require_once 'Zend/Gdata/App/Extension/Category.php'; /** * Describes a books category diff --git a/library/Zend/Gdata/Books/Extension/BooksLink.php b/library/Zend/Gdata/Books/Extension/BooksLink.php index 114d614fe2..e16169cd78 100644 --- a/library/Zend/Gdata/Books/Extension/BooksLink.php +++ b/library/Zend/Gdata/Books/Extension/BooksLink.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension_Link */ -require_once 'Zend/Gdata/App/Extension/Link.php'; +;// require_once 'Zend/Gdata/App/Extension/Link.php'; /** * Extends the base Link class with Books extensions diff --git a/library/Zend/Gdata/Books/Extension/Embeddability.php b/library/Zend/Gdata/Books/Extension/Embeddability.php index 573531cde1..d8f8c48bf0 100644 --- a/library/Zend/Gdata/Books/Extension/Embeddability.php +++ b/library/Zend/Gdata/Books/Extension/Embeddability.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Describes an embeddability diff --git a/library/Zend/Gdata/Books/Extension/InfoLink.php b/library/Zend/Gdata/Books/Extension/InfoLink.php index 4216872781..0d63e2fb01 100644 --- a/library/Zend/Gdata/Books/Extension/InfoLink.php +++ b/library/Zend/Gdata/Books/Extension/InfoLink.php @@ -23,7 +23,7 @@ /** * @see Zend_Gdata_Books_Extension_BooksLink */ -require_once 'Zend/Gdata/Books/Extension/BooksLink.php'; +;// require_once 'Zend/Gdata/Books/Extension/BooksLink.php'; /** * Describes an info link diff --git a/library/Zend/Gdata/Books/Extension/PreviewLink.php b/library/Zend/Gdata/Books/Extension/PreviewLink.php index bece515ba5..22925f525d 100644 --- a/library/Zend/Gdata/Books/Extension/PreviewLink.php +++ b/library/Zend/Gdata/Books/Extension/PreviewLink.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Books_Extension_BooksLink */ -require_once 'Zend/Gdata/Books/Extension/BooksLink.php'; +;// require_once 'Zend/Gdata/Books/Extension/BooksLink.php'; /** * Describes a preview link diff --git a/library/Zend/Gdata/Books/Extension/Review.php b/library/Zend/Gdata/Books/Extension/Review.php index a942a1db42..7b98f4c5e3 100644 --- a/library/Zend/Gdata/Books/Extension/Review.php +++ b/library/Zend/Gdata/Books/Extension/Review.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * User-provided review diff --git a/library/Zend/Gdata/Books/Extension/ThumbnailLink.php b/library/Zend/Gdata/Books/Extension/ThumbnailLink.php index 9bf76849ee..53466e7711 100644 --- a/library/Zend/Gdata/Books/Extension/ThumbnailLink.php +++ b/library/Zend/Gdata/Books/Extension/ThumbnailLink.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Books_Extension_BooksLink */ -require_once 'Zend/Gdata/Books/Extension/BooksLink.php'; +;// require_once 'Zend/Gdata/Books/Extension/BooksLink.php'; /** * Describes a thumbnail link diff --git a/library/Zend/Gdata/Books/Extension/Viewability.php b/library/Zend/Gdata/Books/Extension/Viewability.php index fd83b47d38..687a52e21a 100644 --- a/library/Zend/Gdata/Books/Extension/Viewability.php +++ b/library/Zend/Gdata/Books/Extension/Viewability.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Describes a viewability diff --git a/library/Zend/Gdata/Books/VolumeEntry.php b/library/Zend/Gdata/Books/VolumeEntry.php index 1ac15ffc54..075e0b2f37 100644 --- a/library/Zend/Gdata/Books/VolumeEntry.php +++ b/library/Zend/Gdata/Books/VolumeEntry.php @@ -24,77 +24,77 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension_Comments */ -require_once 'Zend/Gdata/Extension/Comments.php'; +;// require_once 'Zend/Gdata/Extension/Comments.php'; /** * @see Zend_Gdata_DublinCore_Extension_Creator */ -require_once 'Zend/Gdata/DublinCore/Extension/Creator.php'; +;// require_once 'Zend/Gdata/DublinCore/Extension/Creator.php'; /** * @see Zend_Gdata_DublinCore_Extension_Date */ -require_once 'Zend/Gdata/DublinCore/Extension/Date.php'; +;// require_once 'Zend/Gdata/DublinCore/Extension/Date.php'; /** * @see Zend_Gdata_DublinCore_Extension_Description */ -require_once 'Zend/Gdata/DublinCore/Extension/Description.php'; +;// require_once 'Zend/Gdata/DublinCore/Extension/Description.php'; /** * @see Zend_Gdata_Books_Extension_Embeddability */ -require_once 'Zend/Gdata/Books/Extension/Embeddability.php'; +;// require_once 'Zend/Gdata/Books/Extension/Embeddability.php'; /** * @see Zend_Gdata_DublinCore_Extension_Format */ -require_once 'Zend/Gdata/DublinCore/Extension/Format.php'; +;// require_once 'Zend/Gdata/DublinCore/Extension/Format.php'; /** * @see Zend_Gdata_DublinCore_Extension_Identifier */ -require_once 'Zend/Gdata/DublinCore/Extension/Identifier.php'; +;// require_once 'Zend/Gdata/DublinCore/Extension/Identifier.php'; /** * @see Zend_Gdata_DublinCore_Extension_Language */ -require_once 'Zend/Gdata/DublinCore/Extension/Language.php'; +;// require_once 'Zend/Gdata/DublinCore/Extension/Language.php'; /** * @see Zend_Gdata_DublinCore_Extension_Publisher */ -require_once 'Zend/Gdata/DublinCore/Extension/Publisher.php'; +;// require_once 'Zend/Gdata/DublinCore/Extension/Publisher.php'; /** * @see Zend_Gdata_Extension_Rating */ -require_once 'Zend/Gdata/Extension/Rating.php'; +;// require_once 'Zend/Gdata/Extension/Rating.php'; /** * @see Zend_Gdata_Books_Extension_Review */ -require_once 'Zend/Gdata/Books/Extension/Review.php'; +;// require_once 'Zend/Gdata/Books/Extension/Review.php'; /** * @see Zend_Gdata_DublinCore_Extension_Subject */ -require_once 'Zend/Gdata/DublinCore/Extension/Subject.php'; +;// require_once 'Zend/Gdata/DublinCore/Extension/Subject.php'; /** * @see Zend_Gdata_DublinCore_Extension_Title */ -require_once 'Zend/Gdata/DublinCore/Extension/Title.php'; +;// require_once 'Zend/Gdata/DublinCore/Extension/Title.php'; /** * @see Zend_Gdata_Books_Extension_Viewability */ -require_once 'Zend/Gdata/Books/Extension/Viewability.php'; +;// require_once 'Zend/Gdata/Books/Extension/Viewability.php'; /** * Describes an entry in a feed of Book Search volumes @@ -637,7 +637,7 @@ public function getVolumeId() $fullId = $this->getId()->getText(); $position = strrpos($fullId, '/'); if ($position === false) { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('Slash not found in atom:id'); } else { return substr($fullId, strrpos($fullId,'/') + 1); diff --git a/library/Zend/Gdata/Books/VolumeFeed.php b/library/Zend/Gdata/Books/VolumeFeed.php index feb2e7c106..c941333b9c 100644 --- a/library/Zend/Gdata/Books/VolumeFeed.php +++ b/library/Zend/Gdata/Books/VolumeFeed.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * Describes a Book Search volume feed diff --git a/library/Zend/Gdata/Books/VolumeQuery.php b/library/Zend/Gdata/Books/VolumeQuery.php index 37853f37c5..90a5edeef3 100755 --- a/library/Zend/Gdata/Books/VolumeQuery.php +++ b/library/Zend/Gdata/Books/VolumeQuery.php @@ -24,12 +24,12 @@ /** * Zend_Gdata_Books */ -require_once('Zend/Gdata/Books.php'); +;// require_once('Zend/Gdata/Books.php'); /** * Zend_Gdata_Query */ -require_once('Zend/Gdata/Query.php'); +;// require_once('Zend/Gdata/Query.php'); /** * Assists in constructing queries for Books volumes diff --git a/library/Zend/Gdata/Calendar.php b/library/Zend/Gdata/Calendar.php index 6169d9ca5f..2d4b915bd1 100644 --- a/library/Zend/Gdata/Calendar.php +++ b/library/Zend/Gdata/Calendar.php @@ -24,27 +24,27 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; +;// require_once 'Zend/Gdata.php'; /** * @see Zend_Gdata_Calendar_EventFeed */ -require_once 'Zend/Gdata/Calendar/EventFeed.php'; +;// require_once 'Zend/Gdata/Calendar/EventFeed.php'; /** * @see Zend_Gdata_Calendar_EventEntry */ -require_once 'Zend/Gdata/Calendar/EventEntry.php'; +;// require_once 'Zend/Gdata/Calendar/EventEntry.php'; /** * @see Zend_Gdata_Calendar_ListFeed */ -require_once 'Zend/Gdata/Calendar/ListFeed.php'; +;// require_once 'Zend/Gdata/Calendar/ListFeed.php'; /** * @see Zend_Gdata_Calendar_ListEntry */ -require_once 'Zend/Gdata/Calendar/ListEntry.php'; +;// require_once 'Zend/Gdata/Calendar/ListEntry.php'; /** * Service class for interacting with the Google Calendar data API @@ -115,7 +115,7 @@ public function getCalendarEventFeed($location = null) public function getCalendarEventEntry($location = null) { if ($location == null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -146,7 +146,7 @@ public function getCalendarListFeed() public function getCalendarListEntry($location = null) { if ($location == null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { diff --git a/library/Zend/Gdata/Calendar/EventEntry.php b/library/Zend/Gdata/Calendar/EventEntry.php index f3b9e186c8..9be4439a6c 100644 --- a/library/Zend/Gdata/Calendar/EventEntry.php +++ b/library/Zend/Gdata/Calendar/EventEntry.php @@ -24,32 +24,32 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Kind_EventEntry */ -require_once 'Zend/Gdata/Kind/EventEntry.php'; +;// require_once 'Zend/Gdata/Kind/EventEntry.php'; /** * @see Zend_Gdata_Calendar_Extension_SendEventNotifications */ -require_once 'Zend/Gdata/Calendar/Extension/SendEventNotifications.php'; +;// require_once 'Zend/Gdata/Calendar/Extension/SendEventNotifications.php'; /** * @see Zend_Gdata_Calendar_Extension_Timezone */ -require_once 'Zend/Gdata/Calendar/Extension/Timezone.php'; +;// require_once 'Zend/Gdata/Calendar/Extension/Timezone.php'; /** * @see Zend_Gdata_Calendar_Extension_Link */ -require_once 'Zend/Gdata/Calendar/Extension/Link.php'; +;// require_once 'Zend/Gdata/Calendar/Extension/Link.php'; /** * @see Zend_Gdata_Calendar_Extension_QuickAdd */ -require_once 'Zend/Gdata/Calendar/Extension/QuickAdd.php'; +;// require_once 'Zend/Gdata/Calendar/Extension/QuickAdd.php'; /** * Data model class for a Google Calendar Event Entry diff --git a/library/Zend/Gdata/Calendar/EventFeed.php b/library/Zend/Gdata/Calendar/EventFeed.php index 9e30f9549a..2859a21a98 100644 --- a/library/Zend/Gdata/Calendar/EventFeed.php +++ b/library/Zend/Gdata/Calendar/EventFeed.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Extension_Timezone */ -require_once 'Zend/Gdata/Calendar/Extension/Timezone.php'; +;// require_once 'Zend/Gdata/Calendar/Extension/Timezone.php'; /** * Data model for a Google Calendar feed of events diff --git a/library/Zend/Gdata/Calendar/EventQuery.php b/library/Zend/Gdata/Calendar/EventQuery.php index 6e986be97c..21360c2743 100644 --- a/library/Zend/Gdata/Calendar/EventQuery.php +++ b/library/Zend/Gdata/Calendar/EventQuery.php @@ -24,12 +24,12 @@ /** * Zend_Gdata_App_util */ -require_once('Zend/Gdata/App/Util.php'); +;// require_once('Zend/Gdata/App/Util.php'); /** * Zend_Gdata_Query */ -require_once('Zend/Gdata/Query.php'); +;// require_once('Zend/Gdata/Query.php'); /** * Assists in constructing queries for Google Calendar events @@ -377,7 +377,7 @@ public function getSingleEvents() return false; break; default: - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( 'Invalid query param value for futureevents: ' . $value . ' It must be a boolean.'); @@ -399,7 +399,7 @@ public function setSingleEvents($value) } elseif ($value == 'true' | $value == 'false') { $this->_params['singleevents'] = $value; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( 'Invalid query param value for futureevents: ' . $value . ' It must be a boolean.'); @@ -425,7 +425,7 @@ public function getFutureEvents() return false; break; default: - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( 'Invalid query param value for futureevents: ' . $value . ' It must be a boolean.'); @@ -448,7 +448,7 @@ public function setFutureEvents($value) } elseif ($value == 'true' | $value == 'false') { $this->_params['futureevents'] = $value; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( 'Invalid query param value for futureevents: ' . $value . ' It must be a boolean.'); diff --git a/library/Zend/Gdata/Calendar/Extension/AccessLevel.php b/library/Zend/Gdata/Calendar/Extension/AccessLevel.php index 3478132fa0..bf43ce4e9a 100644 --- a/library/Zend/Gdata/Calendar/Extension/AccessLevel.php +++ b/library/Zend/Gdata/Calendar/Extension/AccessLevel.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the gCal:accessLevel element used by the Calendar data API diff --git a/library/Zend/Gdata/Calendar/Extension/Color.php b/library/Zend/Gdata/Calendar/Extension/Color.php index bbdf0a5467..bbf8ba6038 100644 --- a/library/Zend/Gdata/Calendar/Extension/Color.php +++ b/library/Zend/Gdata/Calendar/Extension/Color.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the gCal:color element used by the Calendar data API diff --git a/library/Zend/Gdata/Calendar/Extension/Hidden.php b/library/Zend/Gdata/Calendar/Extension/Hidden.php index 376091b6f4..5387b0b22b 100644 --- a/library/Zend/Gdata/Calendar/Extension/Hidden.php +++ b/library/Zend/Gdata/Calendar/Extension/Hidden.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the gCal:hidden element used by the Calendar data API @@ -90,7 +90,7 @@ protected function takeAttributeFromDOM($attribute) $this->_value = false; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for gCal:selected#value."); } break; diff --git a/library/Zend/Gdata/Calendar/Extension/Link.php b/library/Zend/Gdata/Calendar/Extension/Link.php index b9d597b53c..78f1611e0f 100644 --- a/library/Zend/Gdata/Calendar/Extension/Link.php +++ b/library/Zend/Gdata/Calendar/Extension/Link.php @@ -23,12 +23,12 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/App/Extension/Link.php'; +;// require_once 'Zend/Gdata/App/Extension/Link.php'; /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Calendar/Extension/WebContent.php'; +;// require_once 'Zend/Gdata/Calendar/Extension/WebContent.php'; /** diff --git a/library/Zend/Gdata/Calendar/Extension/QuickAdd.php b/library/Zend/Gdata/Calendar/Extension/QuickAdd.php index b63df0b43d..961cd82cc5 100644 --- a/library/Zend/Gdata/Calendar/Extension/QuickAdd.php +++ b/library/Zend/Gdata/Calendar/Extension/QuickAdd.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the gCal:quickAdd element used by the Calendar data API diff --git a/library/Zend/Gdata/Calendar/Extension/Selected.php b/library/Zend/Gdata/Calendar/Extension/Selected.php index f65b447a1d..982ade22f4 100644 --- a/library/Zend/Gdata/Calendar/Extension/Selected.php +++ b/library/Zend/Gdata/Calendar/Extension/Selected.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the gCal:selected element used by the Calendar data API @@ -90,7 +90,7 @@ protected function takeAttributeFromDOM($attribute) $this->_value = false; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for gCal:selected#value."); } break; diff --git a/library/Zend/Gdata/Calendar/Extension/SendEventNotifications.php b/library/Zend/Gdata/Calendar/Extension/SendEventNotifications.php index aa41fec0c1..45dec2d3f0 100644 --- a/library/Zend/Gdata/Calendar/Extension/SendEventNotifications.php +++ b/library/Zend/Gdata/Calendar/Extension/SendEventNotifications.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Data model class to represent an entry's sendEventNotifications diff --git a/library/Zend/Gdata/Calendar/Extension/Timezone.php b/library/Zend/Gdata/Calendar/Extension/Timezone.php index 39a9a54919..d9386ad7b6 100644 --- a/library/Zend/Gdata/Calendar/Extension/Timezone.php +++ b/library/Zend/Gdata/Calendar/Extension/Timezone.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the gCal:timezone element used by the Calendar data API diff --git a/library/Zend/Gdata/Calendar/Extension/WebContent.php b/library/Zend/Gdata/Calendar/Extension/WebContent.php index df50192dc0..d39ab523cd 100644 --- a/library/Zend/Gdata/Calendar/Extension/WebContent.php +++ b/library/Zend/Gdata/Calendar/Extension/WebContent.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the gCal:webContent element used by the Calendar data API diff --git a/library/Zend/Gdata/Calendar/ListEntry.php b/library/Zend/Gdata/Calendar/ListEntry.php index 1e232a97fa..919cda616a 100644 --- a/library/Zend/Gdata/Calendar/ListEntry.php +++ b/library/Zend/Gdata/Calendar/ListEntry.php @@ -24,43 +24,43 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Calendar_Extension_AccessLevel */ -require_once 'Zend/Gdata/Calendar/Extension/AccessLevel.php'; +;// require_once 'Zend/Gdata/Calendar/Extension/AccessLevel.php'; /** * @see Zend_Calendar_Extension_Color */ -require_once 'Zend/Gdata/Calendar/Extension/Color.php'; +;// require_once 'Zend/Gdata/Calendar/Extension/Color.php'; /** * @see Zend_Calendar_Extension_Hidden */ -require_once 'Zend/Gdata/Calendar/Extension/Hidden.php'; +;// require_once 'Zend/Gdata/Calendar/Extension/Hidden.php'; /** * @see Zend_Calendar_Extension_Selected */ -require_once 'Zend/Gdata/Calendar/Extension/Selected.php'; +;// require_once 'Zend/Gdata/Calendar/Extension/Selected.php'; /** * @see Zend_Gdata_Extension_EventStatus */ -require_once 'Zend/Gdata/Extension/EventStatus.php'; +;// require_once 'Zend/Gdata/Extension/EventStatus.php'; /** * @see Zend_Gdata_Extension_Visibility */ -require_once 'Zend/Gdata/Extension/Visibility.php'; +;// require_once 'Zend/Gdata/Extension/Visibility.php'; /** * @see Zend_Extension_Where */ -require_once 'Zend/Gdata/Extension/Where.php'; +;// require_once 'Zend/Gdata/Extension/Where.php'; /** * Represents a Calendar entry in the Calendar data API meta feed of a user's diff --git a/library/Zend/Gdata/Calendar/ListFeed.php b/library/Zend/Gdata/Calendar/ListFeed.php index 26f7243f36..f7ccbb6f5f 100644 --- a/library/Zend/Gdata/Calendar/ListFeed.php +++ b/library/Zend/Gdata/Calendar/ListFeed.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Extension_Timezone */ -require_once 'Zend/Gdata/Calendar/Extension/Timezone.php'; +;// require_once 'Zend/Gdata/Calendar/Extension/Timezone.php'; /** * Represents the meta-feed list of calendars diff --git a/library/Zend/Gdata/ClientLogin.php b/library/Zend/Gdata/ClientLogin.php index 2e8d9bffe7..48fbe1cf7d 100644 --- a/library/Zend/Gdata/ClientLogin.php +++ b/library/Zend/Gdata/ClientLogin.php @@ -24,12 +24,12 @@ /** * Zend_Gdata_HttpClient */ -require_once 'Zend/Gdata/HttpClient.php'; +;// require_once 'Zend/Gdata/HttpClient.php'; /** * Zend_Version */ -require_once 'Zend/Version.php'; +;// require_once 'Zend/Version.php'; /** * Class to facilitate Google's "Account Authentication @@ -87,7 +87,7 @@ public static function getHttpClient($email, $password, $service = 'xapi', $accountType = 'HOSTED_OR_GOOGLE') { if (! ($email && $password)) { - require_once 'Zend/Gdata/App/AuthException.php'; + ;// require_once 'Zend/Gdata/App/AuthException.php'; throw new Zend_Gdata_App_AuthException( 'Please set your Google credentials before trying to ' . 'authenticate'); @@ -97,7 +97,7 @@ public static function getHttpClient($email, $password, $service = 'xapi', $client = new Zend_Gdata_HttpClient(); } if (!$client instanceof Zend_Http_Client) { - require_once 'Zend/Gdata/App/HttpException.php'; + ;// require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException( 'Client is not an instance of Zend_Http_Client.'); } @@ -123,7 +123,7 @@ public static function getHttpClient($email, $password, $service = 'xapi', (string) $loginCaptcha); } else { - require_once 'Zend/Gdata/App/AuthException.php'; + ;// require_once 'Zend/Gdata/App/AuthException.php'; throw new Zend_Gdata_App_AuthException( 'Please provide both a token ID and a user\'s response ' . 'to the CAPTCHA challenge.'); @@ -137,7 +137,7 @@ public static function getHttpClient($email, $password, $service = 'xapi', try { $response = $client->request('POST'); } catch (Zend_Http_Client_Exception $e) { - require_once 'Zend/Gdata/App/HttpException.php'; + ;// require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException($e->getMessage(), $e); } ob_end_clean(); @@ -166,12 +166,12 @@ public static function getHttpClient($email, $password, $service = 'xapi', // Check if the server asked for a CAPTCHA if (array_key_exists('Error', $goog_resp) && $goog_resp['Error'] == 'CaptchaRequired') { - require_once 'Zend/Gdata/App/CaptchaRequiredException.php'; + ;// require_once 'Zend/Gdata/App/CaptchaRequiredException.php'; throw new Zend_Gdata_App_CaptchaRequiredException( $goog_resp['CaptchaToken'], $goog_resp['CaptchaUrl']); } else { - require_once 'Zend/Gdata/App/AuthException.php'; + ;// require_once 'Zend/Gdata/App/AuthException.php'; throw new Zend_Gdata_App_AuthException('Authentication with Google failed. Reason: ' . (isset($goog_resp['Error']) ? $goog_resp['Error'] : 'Unspecified.')); } diff --git a/library/Zend/Gdata/Docs.php b/library/Zend/Gdata/Docs.php index ec056c863a..9132008d16 100755 --- a/library/Zend/Gdata/Docs.php +++ b/library/Zend/Gdata/Docs.php @@ -24,27 +24,27 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; +;// require_once 'Zend/Gdata.php'; /** * @see Zend_Gdata_Docs_DocumentListFeed */ -require_once 'Zend/Gdata/Docs/DocumentListFeed.php'; +;// require_once 'Zend/Gdata/Docs/DocumentListFeed.php'; /** * @see Zend_Gdata_Docs_DocumentListEntry */ -require_once 'Zend/Gdata/Docs/DocumentListEntry.php'; +;// require_once 'Zend/Gdata/Docs/DocumentListEntry.php'; /** * @see Zend_Gdata_App_Extension_Category */ -require_once 'Zend/Gdata/App/Extension/Category.php'; +;// require_once 'Zend/Gdata/App/Extension/Category.php'; /** * @see Zend_Gdata_App_Extension_Title */ -require_once 'Zend/Gdata/App/Extension/Title.php'; +;// require_once 'Zend/Gdata/App/Extension/Title.php'; /** * Service class for interacting with the Google Document List data API @@ -148,7 +148,7 @@ public function getDocumentListFeed($location = null) public function getDocumentListEntry($location = null) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null' ); diff --git a/library/Zend/Gdata/Docs/DocumentListEntry.php b/library/Zend/Gdata/Docs/DocumentListEntry.php index 6cf7dd5d0b..d90f3fc8cd 100755 --- a/library/Zend/Gdata/Docs/DocumentListEntry.php +++ b/library/Zend/Gdata/Docs/DocumentListEntry.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_EntryAtom */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * Represents a Documents List entry in the Documents List data API meta feed diff --git a/library/Zend/Gdata/Docs/DocumentListFeed.php b/library/Zend/Gdata/Docs/DocumentListFeed.php index 2604449bad..111a5185c4 100755 --- a/library/Zend/Gdata/Docs/DocumentListFeed.php +++ b/library/Zend/Gdata/Docs/DocumentListFeed.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** diff --git a/library/Zend/Gdata/Docs/Query.php b/library/Zend/Gdata/Docs/Query.php index 8d32d55683..7b742f1cb5 100755 --- a/library/Zend/Gdata/Docs/Query.php +++ b/library/Zend/Gdata/Docs/Query.php @@ -24,7 +24,7 @@ /** * Zend_Gdata_Query */ -require_once('Zend/Gdata/Query.php'); +;// require_once('Zend/Gdata/Query.php'); /** * Assists in constructing queries for Google Document List documents @@ -202,7 +202,7 @@ public function getQueryUrl() if ($this->_visibility !== null) { $uri .= '/' . $this->_visibility; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( 'A visibility must be provided for cell queries.'); } @@ -210,7 +210,7 @@ public function getQueryUrl() if ($this->_projection !== null) { $uri .= '/' . $this->_projection; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( 'A projection must be provided for cell queries.'); } diff --git a/library/Zend/Gdata/DublinCore.php b/library/Zend/Gdata/DublinCore.php index edeb5454d1..e56b85cc4a 100755 --- a/library/Zend/Gdata/DublinCore.php +++ b/library/Zend/Gdata/DublinCore.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; +;// require_once 'Zend/Gdata.php'; /** * Service class for interacting with the services which use the diff --git a/library/Zend/Gdata/DublinCore/Extension/Creator.php b/library/Zend/Gdata/DublinCore/Extension/Creator.php index 3d8a3ca736..cfed010ef1 100644 --- a/library/Zend/Gdata/DublinCore/Extension/Creator.php +++ b/library/Zend/Gdata/DublinCore/Extension/Creator.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Entity primarily responsible for making the resource diff --git a/library/Zend/Gdata/DublinCore/Extension/Date.php b/library/Zend/Gdata/DublinCore/Extension/Date.php index 7e931f5501..a66f8f2913 100644 --- a/library/Zend/Gdata/DublinCore/Extension/Date.php +++ b/library/Zend/Gdata/DublinCore/Extension/Date.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Point or period of time associated with an event in the lifecycle of the diff --git a/library/Zend/Gdata/DublinCore/Extension/Description.php b/library/Zend/Gdata/DublinCore/Extension/Description.php index 6e2108cadb..34a921b3ef 100644 --- a/library/Zend/Gdata/DublinCore/Extension/Description.php +++ b/library/Zend/Gdata/DublinCore/Extension/Description.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Account of the resource diff --git a/library/Zend/Gdata/DublinCore/Extension/Format.php b/library/Zend/Gdata/DublinCore/Extension/Format.php index dd825affc2..f4115a7642 100644 --- a/library/Zend/Gdata/DublinCore/Extension/Format.php +++ b/library/Zend/Gdata/DublinCore/Extension/Format.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * File format, physical medium, or dimensions of the resource diff --git a/library/Zend/Gdata/DublinCore/Extension/Identifier.php b/library/Zend/Gdata/DublinCore/Extension/Identifier.php index bf83f643f8..6d44593c69 100644 --- a/library/Zend/Gdata/DublinCore/Extension/Identifier.php +++ b/library/Zend/Gdata/DublinCore/Extension/Identifier.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * An unambiguous reference to the resource within a given context diff --git a/library/Zend/Gdata/DublinCore/Extension/Language.php b/library/Zend/Gdata/DublinCore/Extension/Language.php index b9ff20e4aa..0036eec042 100644 --- a/library/Zend/Gdata/DublinCore/Extension/Language.php +++ b/library/Zend/Gdata/DublinCore/Extension/Language.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Language of the resource diff --git a/library/Zend/Gdata/DublinCore/Extension/Publisher.php b/library/Zend/Gdata/DublinCore/Extension/Publisher.php index bf0f5c37f2..5a9f429a4d 100644 --- a/library/Zend/Gdata/DublinCore/Extension/Publisher.php +++ b/library/Zend/Gdata/DublinCore/Extension/Publisher.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Entity responsible for making the resource available diff --git a/library/Zend/Gdata/DublinCore/Extension/Rights.php b/library/Zend/Gdata/DublinCore/Extension/Rights.php index e1982e3877..05269de946 100644 --- a/library/Zend/Gdata/DublinCore/Extension/Rights.php +++ b/library/Zend/Gdata/DublinCore/Extension/Rights.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Information about rights held in and over the resource diff --git a/library/Zend/Gdata/DublinCore/Extension/Subject.php b/library/Zend/Gdata/DublinCore/Extension/Subject.php index e019a17674..44822700f0 100644 --- a/library/Zend/Gdata/DublinCore/Extension/Subject.php +++ b/library/Zend/Gdata/DublinCore/Extension/Subject.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Topic of the resource diff --git a/library/Zend/Gdata/DublinCore/Extension/Title.php b/library/Zend/Gdata/DublinCore/Extension/Title.php index 37892ceea9..e8903ca525 100644 --- a/library/Zend/Gdata/DublinCore/Extension/Title.php +++ b/library/Zend/Gdata/DublinCore/Extension/Title.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Name given to the resource diff --git a/library/Zend/Gdata/Entry.php b/library/Zend/Gdata/Entry.php index 6a7eae3568..57666c51e5 100644 --- a/library/Zend/Gdata/Entry.php +++ b/library/Zend/Gdata/Entry.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; +;// require_once 'Zend/Gdata.php'; /** * @see Zend_Gdata_App_MediaEntry */ -require_once 'Zend/Gdata/App/MediaEntry.php'; +;// require_once 'Zend/Gdata/App/MediaEntry.php'; /** * Represents the Gdata flavor of an Atom entry @@ -119,7 +119,7 @@ protected function takeAttributeFromDOM($attribute) $this->_etag = $etag; } elseif ($this->_etag != $etag) { - require_once('Zend/Gdata/App/IOException.php'); + ;// require_once('Zend/Gdata/App/IOException.php'); throw new Zend_Gdata_App_IOException("ETag mismatch"); } break; diff --git a/library/Zend/Gdata/Exif.php b/library/Zend/Gdata/Exif.php index 9d82d70698..5f61008e33 100755 --- a/library/Zend/Gdata/Exif.php +++ b/library/Zend/Gdata/Exif.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; +;// require_once 'Zend/Gdata.php'; /** * Service class for interacting with the services which use the EXIF extensions diff --git a/library/Zend/Gdata/Exif/Entry.php b/library/Zend/Gdata/Exif/Entry.php index 1ecdb67e6d..ede883581b 100755 --- a/library/Zend/Gdata/Exif/Entry.php +++ b/library/Zend/Gdata/Exif/Entry.php @@ -24,17 +24,17 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; +;// require_once 'Zend/Gdata/Exif.php'; /** * @see Zend_Gdata_Exif_Extension_Tags */ -require_once 'Zend/Gdata/Exif/Extension/Tags.php'; +;// require_once 'Zend/Gdata/Exif/Extension/Tags.php'; /** * An Atom entry containing EXIF metadata. diff --git a/library/Zend/Gdata/Exif/Extension/Distance.php b/library/Zend/Gdata/Exif/Extension/Distance.php index 564887640f..6edd174e25 100755 --- a/library/Zend/Gdata/Exif/Extension/Distance.php +++ b/library/Zend/Gdata/Exif/Extension/Distance.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; +;// require_once 'Zend/Gdata/Exif.php'; /** * Represents the exif:distance element used by the Gdata Exif extensions. diff --git a/library/Zend/Gdata/Exif/Extension/Exposure.php b/library/Zend/Gdata/Exif/Extension/Exposure.php index 59465e9bbf..8167a71e6c 100755 --- a/library/Zend/Gdata/Exif/Extension/Exposure.php +++ b/library/Zend/Gdata/Exif/Extension/Exposure.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; +;// require_once 'Zend/Gdata/Exif.php'; /** * Represents the exif:exposure element used by the Gdata Exif extensions. diff --git a/library/Zend/Gdata/Exif/Extension/FStop.php b/library/Zend/Gdata/Exif/Extension/FStop.php index 4d6dbe45e6..b0b96f1742 100755 --- a/library/Zend/Gdata/Exif/Extension/FStop.php +++ b/library/Zend/Gdata/Exif/Extension/FStop.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; +;// require_once 'Zend/Gdata/Exif.php'; /** * Represents the exif:fStop element used by the Gdata Exif extensions. diff --git a/library/Zend/Gdata/Exif/Extension/Flash.php b/library/Zend/Gdata/Exif/Extension/Flash.php index 5b635bf492..7f2c8776c3 100755 --- a/library/Zend/Gdata/Exif/Extension/Flash.php +++ b/library/Zend/Gdata/Exif/Extension/Flash.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; +;// require_once 'Zend/Gdata/Exif.php'; /** * Represents the exif:flash element used by the Gdata Exif extensions. diff --git a/library/Zend/Gdata/Exif/Extension/FocalLength.php b/library/Zend/Gdata/Exif/Extension/FocalLength.php index ae7c19f880..1bb0fb74a8 100755 --- a/library/Zend/Gdata/Exif/Extension/FocalLength.php +++ b/library/Zend/Gdata/Exif/Extension/FocalLength.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; +;// require_once 'Zend/Gdata/Exif.php'; /** * Represents the exif:focalLength element used by the Gdata Exif extensions. diff --git a/library/Zend/Gdata/Exif/Extension/ImageUniqueId.php b/library/Zend/Gdata/Exif/Extension/ImageUniqueId.php index 5963d453a9..68c239a2ae 100755 --- a/library/Zend/Gdata/Exif/Extension/ImageUniqueId.php +++ b/library/Zend/Gdata/Exif/Extension/ImageUniqueId.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; +;// require_once 'Zend/Gdata/Exif.php'; /** * Represents the exif:imageUniqueId element used by the Gdata Exif extensions. diff --git a/library/Zend/Gdata/Exif/Extension/Iso.php b/library/Zend/Gdata/Exif/Extension/Iso.php index 112f096497..c10c552393 100755 --- a/library/Zend/Gdata/Exif/Extension/Iso.php +++ b/library/Zend/Gdata/Exif/Extension/Iso.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; +;// require_once 'Zend/Gdata/Exif.php'; /** * Represents the exif:iso element used by the Gdata Exif extensions. diff --git a/library/Zend/Gdata/Exif/Extension/Make.php b/library/Zend/Gdata/Exif/Extension/Make.php index 6f61d6a25d..787e3d2ab7 100755 --- a/library/Zend/Gdata/Exif/Extension/Make.php +++ b/library/Zend/Gdata/Exif/Extension/Make.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; +;// require_once 'Zend/Gdata/Exif.php'; /** * Represents the exif:make element used by the Gdata Exif extensions. diff --git a/library/Zend/Gdata/Exif/Extension/Model.php b/library/Zend/Gdata/Exif/Extension/Model.php index 67b674c25e..6b83d4be77 100755 --- a/library/Zend/Gdata/Exif/Extension/Model.php +++ b/library/Zend/Gdata/Exif/Extension/Model.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; +;// require_once 'Zend/Gdata/Exif.php'; /** * Represents the exif:model element used by the Gdata Exif extensions. diff --git a/library/Zend/Gdata/Exif/Extension/Tags.php b/library/Zend/Gdata/Exif/Extension/Tags.php index 23c4ec9742..e9969b8345 100755 --- a/library/Zend/Gdata/Exif/Extension/Tags.php +++ b/library/Zend/Gdata/Exif/Extension/Tags.php @@ -24,62 +24,62 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; +;// require_once 'Zend/Gdata/Exif.php'; /** * @see Zend_Gdata_Exif_Extension_Distance */ -require_once 'Zend/Gdata/Exif/Extension/Distance.php'; +;// require_once 'Zend/Gdata/Exif/Extension/Distance.php'; /** * @see Zend_Gdata_Exif_Extension_Exposure */ -require_once 'Zend/Gdata/Exif/Extension/Exposure.php'; +;// require_once 'Zend/Gdata/Exif/Extension/Exposure.php'; /** * @see Zend_Gdata_Exif_Extension_Flash */ -require_once 'Zend/Gdata/Exif/Extension/Flash.php'; +;// require_once 'Zend/Gdata/Exif/Extension/Flash.php'; /** * @see Zend_Gdata_Exif_Extension_FocalLength */ -require_once 'Zend/Gdata/Exif/Extension/FocalLength.php'; +;// require_once 'Zend/Gdata/Exif/Extension/FocalLength.php'; /** * @see Zend_Gdata_Exif_Extension_FStop */ -require_once 'Zend/Gdata/Exif/Extension/FStop.php'; +;// require_once 'Zend/Gdata/Exif/Extension/FStop.php'; /** * @see Zend_Gdata_Exif_Extension_ImageUniqueId */ -require_once 'Zend/Gdata/Exif/Extension/ImageUniqueId.php'; +;// require_once 'Zend/Gdata/Exif/Extension/ImageUniqueId.php'; /** * @see Zend_Gdata_Exif_Extension_Iso */ -require_once 'Zend/Gdata/Exif/Extension/Iso.php'; +;// require_once 'Zend/Gdata/Exif/Extension/Iso.php'; /** * @see Zend_Gdata_Exif_Extension_Make */ -require_once 'Zend/Gdata/Exif/Extension/Make.php'; +;// require_once 'Zend/Gdata/Exif/Extension/Make.php'; /** * @see Zend_Gdata_Exif_Extension_Model */ -require_once 'Zend/Gdata/Exif/Extension/Model.php'; +;// require_once 'Zend/Gdata/Exif/Extension/Model.php'; /** * @see Zend_Gdata_Exif_Extension_Time */ -require_once 'Zend/Gdata/Exif/Extension/Time.php'; +;// require_once 'Zend/Gdata/Exif/Extension/Time.php'; /** * Represents the exif:tags element used by the Gdata Exif extensions. diff --git a/library/Zend/Gdata/Exif/Extension/Time.php b/library/Zend/Gdata/Exif/Extension/Time.php index 1f9afbec1e..ebf80760e1 100755 --- a/library/Zend/Gdata/Exif/Extension/Time.php +++ b/library/Zend/Gdata/Exif/Extension/Time.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; +;// require_once 'Zend/Gdata/Exif.php'; /** * Represents the exif:time element used by the Gdata Exif extensions. diff --git a/library/Zend/Gdata/Exif/Feed.php b/library/Zend/Gdata/Exif/Feed.php index e2b7ebb27d..ff8d91c87a 100755 --- a/library/Zend/Gdata/Exif/Feed.php +++ b/library/Zend/Gdata/Exif/Feed.php @@ -24,17 +24,17 @@ /** * @see Zend_Gdata_eed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Exif */ -require_once 'Zend/Gdata/Exif.php'; +;// require_once 'Zend/Gdata/Exif.php'; /** * @see Zend_Gdata_Exif_Entry */ -require_once 'Zend/Gdata/Exif/Entry.php'; +;// require_once 'Zend/Gdata/Exif/Entry.php'; /** * Feed for Gdata EXIF data entries. diff --git a/library/Zend/Gdata/Extension.php b/library/Zend/Gdata/Extension.php index ad40db9e39..dd631c4fee 100644 --- a/library/Zend/Gdata/Extension.php +++ b/library/Zend/Gdata/Extension.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents a Gdata extension diff --git a/library/Zend/Gdata/Extension/AttendeeStatus.php b/library/Zend/Gdata/Extension/AttendeeStatus.php index 79b955898b..87905caa56 100644 --- a/library/Zend/Gdata/Extension/AttendeeStatus.php +++ b/library/Zend/Gdata/Extension/AttendeeStatus.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Data model class to represent an attendee's status (gd:attendeeStatus) diff --git a/library/Zend/Gdata/Extension/AttendeeType.php b/library/Zend/Gdata/Extension/AttendeeType.php index eae4266e4d..8f029e3b54 100644 --- a/library/Zend/Gdata/Extension/AttendeeType.php +++ b/library/Zend/Gdata/Extension/AttendeeType.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Data model class to represent an attendee's type (gd:attendeeType) diff --git a/library/Zend/Gdata/Extension/Comments.php b/library/Zend/Gdata/Extension/Comments.php index b47d22cb79..6e27b2c5eb 100644 --- a/library/Zend/Gdata/Extension/Comments.php +++ b/library/Zend/Gdata/Extension/Comments.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Extension_FeedLink */ -require_once 'Zend/Gdata/Extension/FeedLink.php'; +;// require_once 'Zend/Gdata/Extension/FeedLink.php'; /** * Represents the gd:comments element diff --git a/library/Zend/Gdata/Extension/EntryLink.php b/library/Zend/Gdata/Extension/EntryLink.php index 6fb784f505..4f8a6f3268 100644 --- a/library/Zend/Gdata/Extension/EntryLink.php +++ b/library/Zend/Gdata/Extension/EntryLink.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * Represents the gd:entryLink element diff --git a/library/Zend/Gdata/Extension/EventStatus.php b/library/Zend/Gdata/Extension/EventStatus.php index 1dedacbe61..140e91dcd6 100644 --- a/library/Zend/Gdata/Extension/EventStatus.php +++ b/library/Zend/Gdata/Extension/EventStatus.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the gd:eventStatus element diff --git a/library/Zend/Gdata/Extension/ExtendedProperty.php b/library/Zend/Gdata/Extension/ExtendedProperty.php index 1fe5770955..8978d5deb5 100644 --- a/library/Zend/Gdata/Extension/ExtendedProperty.php +++ b/library/Zend/Gdata/Extension/ExtendedProperty.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Data model for gd:extendedProperty element, used by some Gdata diff --git a/library/Zend/Gdata/Extension/FeedLink.php b/library/Zend/Gdata/Extension/FeedLink.php index 2bed52b202..bfeb5c148a 100644 --- a/library/Zend/Gdata/Extension/FeedLink.php +++ b/library/Zend/Gdata/Extension/FeedLink.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * Represents the gd:feedLink element diff --git a/library/Zend/Gdata/Extension/OpenSearchItemsPerPage.php b/library/Zend/Gdata/Extension/OpenSearchItemsPerPage.php index 7f5ce586fb..2c91b8a84e 100644 --- a/library/Zend/Gdata/Extension/OpenSearchItemsPerPage.php +++ b/library/Zend/Gdata/Extension/OpenSearchItemsPerPage.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the openSearch:itemsPerPage element diff --git a/library/Zend/Gdata/Extension/OpenSearchStartIndex.php b/library/Zend/Gdata/Extension/OpenSearchStartIndex.php index 60dc07dc13..19bdd3b96b 100644 --- a/library/Zend/Gdata/Extension/OpenSearchStartIndex.php +++ b/library/Zend/Gdata/Extension/OpenSearchStartIndex.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the openSeach:startIndex element diff --git a/library/Zend/Gdata/Extension/OpenSearchTotalResults.php b/library/Zend/Gdata/Extension/OpenSearchTotalResults.php index c0c31f4f95..74e6fc98bd 100644 --- a/library/Zend/Gdata/Extension/OpenSearchTotalResults.php +++ b/library/Zend/Gdata/Extension/OpenSearchTotalResults.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the openSearch:totalResults element diff --git a/library/Zend/Gdata/Extension/OriginalEvent.php b/library/Zend/Gdata/Extension/OriginalEvent.php index 21cc586679..a2da2b0818 100644 --- a/library/Zend/Gdata/Extension/OriginalEvent.php +++ b/library/Zend/Gdata/Extension/OriginalEvent.php @@ -24,17 +24,17 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_When */ -require_once 'Zend/Gdata/Extension/When.php'; +;// require_once 'Zend/Gdata/Extension/When.php'; /** * Represents the gd:originalEvent element diff --git a/library/Zend/Gdata/Extension/Rating.php b/library/Zend/Gdata/Extension/Rating.php index 9301296e69..da897960cb 100644 --- a/library/Zend/Gdata/Extension/Rating.php +++ b/library/Zend/Gdata/Extension/Rating.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Implements the gd:rating element diff --git a/library/Zend/Gdata/Extension/Recurrence.php b/library/Zend/Gdata/Extension/Recurrence.php index 097fc4314a..f10c834eda 100644 --- a/library/Zend/Gdata/Extension/Recurrence.php +++ b/library/Zend/Gdata/Extension/Recurrence.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the gd:recurrence element diff --git a/library/Zend/Gdata/Extension/RecurrenceException.php b/library/Zend/Gdata/Extension/RecurrenceException.php index 8bd3bbf9c8..64fca42afb 100644 --- a/library/Zend/Gdata/Extension/RecurrenceException.php +++ b/library/Zend/Gdata/Extension/RecurrenceException.php @@ -24,17 +24,17 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Extension_EntryLink */ -require_once 'Zend/Gdata/Extension/EntryLink.php'; +;// require_once 'Zend/Gdata/Extension/EntryLink.php'; /** * @see Zend_Gdata_Extension_OriginalEvent */ -require_once 'Zend/Gdata/Extension/OriginalEvent.php'; +;// require_once 'Zend/Gdata/Extension/OriginalEvent.php'; /** * Data model class to represent an entry's recurrenceException diff --git a/library/Zend/Gdata/Extension/Reminder.php b/library/Zend/Gdata/Extension/Reminder.php index bdb7e64500..d4b4460d9b 100644 --- a/library/Zend/Gdata/Extension/Reminder.php +++ b/library/Zend/Gdata/Extension/Reminder.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Implements the gd:reminder element used to set/retrieve notifications diff --git a/library/Zend/Gdata/Extension/Transparency.php b/library/Zend/Gdata/Extension/Transparency.php index a3dc8cc7ee..ff8686c55f 100644 --- a/library/Zend/Gdata/Extension/Transparency.php +++ b/library/Zend/Gdata/Extension/Transparency.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Data model class to represent an entry's transparency diff --git a/library/Zend/Gdata/Extension/Visibility.php b/library/Zend/Gdata/Extension/Visibility.php index 4bacb3c589..fa805a7661 100644 --- a/library/Zend/Gdata/Extension/Visibility.php +++ b/library/Zend/Gdata/Extension/Visibility.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Data model class to represent an entry's visibility diff --git a/library/Zend/Gdata/Extension/When.php b/library/Zend/Gdata/Extension/When.php index ba545f0c9b..7d46614981 100644 --- a/library/Zend/Gdata/Extension/When.php +++ b/library/Zend/Gdata/Extension/When.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Extension_Reminder */ -require_once 'Zend/Gdata/Extension/Reminder.php'; +;// require_once 'Zend/Gdata/Extension/Reminder.php'; /** * Represents the gd:when element diff --git a/library/Zend/Gdata/Extension/Where.php b/library/Zend/Gdata/Extension/Where.php index 1b6d40d42b..8c5a4967db 100644 --- a/library/Zend/Gdata/Extension/Where.php +++ b/library/Zend/Gdata/Extension/Where.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Extension_EntryLink */ -require_once 'Zend/Gdata/Extension/EntryLink.php'; +;// require_once 'Zend/Gdata/Extension/EntryLink.php'; /** * Data model class to represent a location (gd:where element) diff --git a/library/Zend/Gdata/Extension/Who.php b/library/Zend/Gdata/Extension/Who.php index 23aef6108d..9d1cce11e0 100644 --- a/library/Zend/Gdata/Extension/Who.php +++ b/library/Zend/Gdata/Extension/Who.php @@ -24,22 +24,22 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Extension_AttendeeStatus */ -require_once 'Zend/Gdata/Extension/AttendeeStatus.php'; +;// require_once 'Zend/Gdata/Extension/AttendeeStatus.php'; /** * @see Zend_Gdata_Extension_AttendeeType */ -require_once 'Zend/Gdata/Extension/AttendeeType.php'; +;// require_once 'Zend/Gdata/Extension/AttendeeType.php'; /** * @see Zend_Gdata_Extension_EntryLink */ -require_once 'Zend/Gdata/Extension/EntryLink.php'; +;// require_once 'Zend/Gdata/Extension/EntryLink.php'; /** * Data model class to represent a participant diff --git a/library/Zend/Gdata/Feed.php b/library/Zend/Gdata/Feed.php index 5274e4374e..e0438f71ee 100644 --- a/library/Zend/Gdata/Feed.php +++ b/library/Zend/Gdata/Feed.php @@ -24,32 +24,32 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; +;// require_once 'Zend/Gdata.php'; /** * @see Zend_Gdata_App_Feed */ -require_once 'Zend/Gdata/App/Feed.php'; +;// require_once 'Zend/Gdata/App/Feed.php'; /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension_OpenSearchTotalResults */ -require_once 'Zend/Gdata/Extension/OpenSearchTotalResults.php'; +;// require_once 'Zend/Gdata/Extension/OpenSearchTotalResults.php'; /** * @see Zend_Gdata_Extension_OpenSearchStartIndex */ -require_once 'Zend/Gdata/Extension/OpenSearchStartIndex.php'; +;// require_once 'Zend/Gdata/Extension/OpenSearchStartIndex.php'; /** * @see Zend_Gdata_Extension_OpenSearchItemsPerPage */ -require_once 'Zend/Gdata/Extension/OpenSearchItemsPerPage.php'; +;// require_once 'Zend/Gdata/Extension/OpenSearchItemsPerPage.php'; /** * The Gdata flavor of an Atom Feed @@ -172,7 +172,7 @@ protected function takeAttributeFromDOM($attribute) $this->_etag = $etag; } elseif ($this->_etag != $etag) { - require_once('Zend/Gdata/App/IOException.php'); + ;// require_once('Zend/Gdata/App/IOException.php'); throw new Zend_Gdata_App_IOException("ETag mismatch"); } break; diff --git a/library/Zend/Gdata/Gapps.php b/library/Zend/Gdata/Gapps.php index 5875c42d62..a63917d19e 100644 --- a/library/Zend/Gdata/Gapps.php +++ b/library/Zend/Gdata/Gapps.php @@ -24,42 +24,42 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; +;// require_once 'Zend/Gdata.php'; /** * @see Zend_Gdata_Gapps_UserFeed */ -require_once 'Zend/Gdata/Gapps/UserFeed.php'; +;// require_once 'Zend/Gdata/Gapps/UserFeed.php'; /** * @see Zend_Gdata_Gapps_NicknameFeed */ -require_once 'Zend/Gdata/Gapps/NicknameFeed.php'; +;// require_once 'Zend/Gdata/Gapps/NicknameFeed.php'; /** * @see Zend_Gdata_Gapps_GroupFeed */ -require_once 'Zend/Gdata/Gapps/GroupFeed.php'; +;// require_once 'Zend/Gdata/Gapps/GroupFeed.php'; /** * @see Zend_Gdata_Gapps_MemberFeed */ -require_once 'Zend/Gdata/Gapps/MemberFeed.php'; +;// require_once 'Zend/Gdata/Gapps/MemberFeed.php'; /** * @see Zend_Gdata_Gapps_OwnerFeed */ -require_once 'Zend/Gdata/Gapps/OwnerFeed.php'; +;// require_once 'Zend/Gdata/Gapps/OwnerFeed.php'; /** * @see Zend_Gdata_Gapps_EmailListFeed */ -require_once 'Zend/Gdata/Gapps/EmailListFeed.php'; +;// require_once 'Zend/Gdata/Gapps/EmailListFeed.php'; /** * @see Zend_Gdata_Gapps_EmailListRecipientFeed */ -require_once 'Zend/Gdata/Gapps/EmailListRecipientFeed.php'; +;// require_once 'Zend/Gdata/Gapps/EmailListRecipientFeed.php'; /** @@ -159,7 +159,7 @@ public static function throwServiceExceptionIfDetected($e) { // completes. (See ZF-5949) $response = $e->getResponse(); if (!$response) { - require_once('Zend/Gdata/App/IOException.php'); + ;// require_once('Zend/Gdata/App/IOException.php'); throw new Zend_Gdata_App_IOException('No HTTP response received (possible connection failure)'); } @@ -167,7 +167,7 @@ public static function throwServiceExceptionIfDetected($e) { // Check to see if there is an AppsForYourDomainErrors // datastructure in the response. If so, convert it to // an exception and throw it. - require_once 'Zend/Gdata/Gapps/ServiceException.php'; + ;// require_once 'Zend/Gdata/Gapps/ServiceException.php'; $error = new Zend_Gdata_Gapps_ServiceException(); $error->importFromString($response->getBody()); throw $error; @@ -341,7 +341,7 @@ public function getBaseUrl($domain = null) } else if ($this->_domain !== null) { return self::APPS_BASE_FEED_URI . '/' . $this->_domain; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Domain must be specified.'); } @@ -429,7 +429,7 @@ public function getGroupFeed($location = null) public function getMemberFeed($location = null) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -454,7 +454,7 @@ public function getMemberFeed($location = null) public function getOwnerFeed($location = null) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -501,7 +501,7 @@ public function getEmailListFeed($location = null) public function getEmailListRecipientFeed($location) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -524,7 +524,7 @@ public function getEmailListRecipientFeed($location) public function getUserEntry($location) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -547,7 +547,7 @@ public function getUserEntry($location) public function getNicknameEntry($location) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -570,7 +570,7 @@ public function getNicknameEntry($location) public function getGroupEntry($location = null) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -593,7 +593,7 @@ public function getGroupEntry($location = null) public function getMemberEntry($location = null) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -616,7 +616,7 @@ public function getMemberEntry($location = null) public function getOwnerEntry($location = null) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -639,7 +639,7 @@ public function getOwnerEntry($location = null) public function getEmailListEntry($location) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -662,7 +662,7 @@ public function getEmailListEntry($location) public function getEmailListRecipientEntry($location) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Query) { @@ -757,7 +757,7 @@ public function insertGroup($group, $uri = null) public function insertMember($member, $uri = null) { if ($uri === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'URI must not be null'); } @@ -781,7 +781,7 @@ public function insertMember($member, $uri = null) public function insertOwner($owner, $uri = null) { if ($uri === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'URI must not be null'); } @@ -829,7 +829,7 @@ public function insertEmailList($emailList, $uri = null) public function insertEmailListRecipient($recipient, $uri = null) { if ($uri === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'URI must not be null'); } elseif ($uri instanceof Zend_Gdata_Gapps_EmailListEntry) { @@ -862,7 +862,7 @@ public function __call($method, $args) { // Autoloading disabled on next line for compatibility // with magic factories. See ZF-6660. if (!class_exists($name . '_' . $class, false)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; @Zend_Loader::loadClass($name . '_' . $class); } $foundClassName = $name . '_' . $class; @@ -877,7 +877,7 @@ public function __call($method, $args) { $args = array_merge(array($this->getDomain()), $args); return $reflectionObj->newInstanceArgs($args); } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( "Unable to find '{$class}' in registered packages"); } diff --git a/library/Zend/Gdata/Gapps/EmailListEntry.php b/library/Zend/Gdata/Gapps/EmailListEntry.php index d5078db213..1fa409bc4f 100644 --- a/library/Zend/Gdata/Gapps/EmailListEntry.php +++ b/library/Zend/Gdata/Gapps/EmailListEntry.php @@ -24,17 +24,17 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension_FeedLink */ -require_once 'Zend/Gdata/Extension/FeedLink.php'; +;// require_once 'Zend/Gdata/Extension/FeedLink.php'; /** * @see Zend_Gdata_Gapps_Extension_EmailList */ -require_once 'Zend/Gdata/Gapps/Extension/EmailList.php'; +;// require_once 'Zend/Gdata/Gapps/Extension/EmailList.php'; /** * Data model class for a Google Apps Email List Entry. diff --git a/library/Zend/Gdata/Gapps/EmailListFeed.php b/library/Zend/Gdata/Gapps/EmailListFeed.php index f7fcef5f93..42daa431a4 100644 --- a/library/Zend/Gdata/Gapps/EmailListFeed.php +++ b/library/Zend/Gdata/Gapps/EmailListFeed.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Gapps_EmailListEntry */ -require_once 'Zend/Gdata/Gapps/EmailListEntry.php'; +;// require_once 'Zend/Gdata/Gapps/EmailListEntry.php'; /** * Data model for a collection of Google Apps email list entries, usually diff --git a/library/Zend/Gdata/Gapps/EmailListQuery.php b/library/Zend/Gdata/Gapps/EmailListQuery.php index a57a0c7ddc..6e3b31ccac 100644 --- a/library/Zend/Gdata/Gapps/EmailListQuery.php +++ b/library/Zend/Gdata/Gapps/EmailListQuery.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Gapps_Query */ -require_once('Zend/Gdata/Gapps/Query.php'); +;// require_once('Zend/Gdata/Gapps/Query.php'); /** * Assists in constructing queries for Google Apps email list entries. diff --git a/library/Zend/Gdata/Gapps/EmailListRecipientEntry.php b/library/Zend/Gdata/Gapps/EmailListRecipientEntry.php index 40c70380a4..545c69835d 100644 --- a/library/Zend/Gdata/Gapps/EmailListRecipientEntry.php +++ b/library/Zend/Gdata/Gapps/EmailListRecipientEntry.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension_Who */ -require_once 'Zend/Gdata/Extension/Who.php'; +;// require_once 'Zend/Gdata/Extension/Who.php'; /** * Data model class for a Google Apps Email List Recipient Entry. diff --git a/library/Zend/Gdata/Gapps/EmailListRecipientFeed.php b/library/Zend/Gdata/Gapps/EmailListRecipientFeed.php index 8f3c88d9a3..a181080ab1 100644 --- a/library/Zend/Gdata/Gapps/EmailListRecipientFeed.php +++ b/library/Zend/Gdata/Gapps/EmailListRecipientFeed.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Gapps_EmailListRecipientEntry */ -require_once 'Zend/Gdata/Gapps/EmailListRecipientEntry.php'; +;// require_once 'Zend/Gdata/Gapps/EmailListRecipientEntry.php'; /** * Data model for a collection of Google Apps email list recipient entries, diff --git a/library/Zend/Gdata/Gapps/EmailListRecipientQuery.php b/library/Zend/Gdata/Gapps/EmailListRecipientQuery.php index 3e482eb5b5..a3182c5806 100644 --- a/library/Zend/Gdata/Gapps/EmailListRecipientQuery.php +++ b/library/Zend/Gdata/Gapps/EmailListRecipientQuery.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Gapps_Query */ -require_once('Zend/Gdata/Gapps/Query.php'); +;// require_once('Zend/Gdata/Gapps/Query.php'); /** * Assists in constructing queries for Google Apps email list recipient @@ -141,7 +141,7 @@ public function getQueryUrl() if ($this->_emailListName !== null) { $uri .= '/' . $this->_emailListName; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'EmailListName must not be null'); } diff --git a/library/Zend/Gdata/Gapps/Error.php b/library/Zend/Gdata/Gapps/Error.php index ba031c4d5b..8ede86ca32 100644 --- a/library/Zend/Gdata/Gapps/Error.php +++ b/library/Zend/Gdata/Gapps/Error.php @@ -25,7 +25,7 @@ /** * Zend_Gdata_App_Base */ -require_once 'Zend/Gdata/App/Base.php'; +;// require_once 'Zend/Gdata/App/Base.php'; /** * Gdata Gapps Error class. This class is used to represent errors returned diff --git a/library/Zend/Gdata/Gapps/Extension/EmailList.php b/library/Zend/Gdata/Gapps/Extension/EmailList.php index 6abc634592..c6540fd13f 100644 --- a/library/Zend/Gdata/Gapps/Extension/EmailList.php +++ b/library/Zend/Gdata/Gapps/Extension/EmailList.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Gapps */ -require_once 'Zend/Gdata/Gapps.php'; +;// require_once 'Zend/Gdata/Gapps.php'; /** * Represents the apps:emailList element used by the Apps data API. This diff --git a/library/Zend/Gdata/Gapps/Extension/Login.php b/library/Zend/Gdata/Gapps/Extension/Login.php index c95a05dec9..da04e66a83 100644 --- a/library/Zend/Gdata/Gapps/Extension/Login.php +++ b/library/Zend/Gdata/Gapps/Extension/Login.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Gapps */ -require_once 'Zend/Gdata/Gapps.php'; +;// require_once 'Zend/Gdata/Gapps.php'; /** * Represents the apps:login element used by the Apps data API. This @@ -209,7 +209,7 @@ protected function takeAttributeFromDOM($attribute) $this->_admin = false; } else { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); + ;// require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for apps:login#admin."); } break; @@ -221,7 +221,7 @@ protected function takeAttributeFromDOM($attribute) $this->_agreedToTerms = false; } else { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); + ;// require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for apps:login#agreedToTerms."); } break; @@ -233,7 +233,7 @@ protected function takeAttributeFromDOM($attribute) $this->_suspended = false; } else { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); + ;// require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for apps:login#suspended."); } break; @@ -245,7 +245,7 @@ protected function takeAttributeFromDOM($attribute) $this->_changePasswordAtNextLogin = false; } else { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); + ;// require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException("Expected 'true' or 'false' for apps:login#changePasswordAtNextLogin."); } break; @@ -342,7 +342,7 @@ public function setHashFunctionName($value) public function getAdmin() { if (!(is_bool($this->_admin))) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); + ;// require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for admin.'); } return $this->_admin; @@ -359,7 +359,7 @@ public function getAdmin() public function setAdmin($value) { if (!(is_bool($value))) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); + ;// require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for $value.'); } $this->_admin = $value; @@ -376,7 +376,7 @@ public function setAdmin($value) public function getAgreedToTerms() { if (!(is_bool($this->_agreedToTerms))) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); + ;// require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for agreedToTerms.'); } return $this->_agreedToTerms; @@ -393,7 +393,7 @@ public function getAgreedToTerms() public function setAgreedToTerms($value) { if (!(is_bool($value))) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); + ;// require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for $value.'); } $this->_agreedToTerms = $value; @@ -410,7 +410,7 @@ public function setAgreedToTerms($value) public function getSuspended() { if (!(is_bool($this->_suspended))) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); + ;// require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for suspended.'); } return $this->_suspended; @@ -427,7 +427,7 @@ public function getSuspended() public function setSuspended($value) { if (!(is_bool($value))) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); + ;// require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for $value.'); } $this->_suspended = $value; @@ -444,7 +444,7 @@ public function setSuspended($value) public function getChangePasswordAtNextLogin() { if (!(is_bool($this->_changePasswordAtNextLogin))) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); + ;// require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for changePasswordAtNextLogin.'); } return $this->_changePasswordAtNextLogin; @@ -462,7 +462,7 @@ public function getChangePasswordAtNextLogin() public function setChangePasswordAtNextLogin($value) { if (!(is_bool($value))) { - require_once('Zend/Gdata/App/InvalidArgumentException.php'); + ;// require_once('Zend/Gdata/App/InvalidArgumentException.php'); throw new Zend_Gdata_App_InvalidArgumentException('Expected boolean for $value.'); } $this->_changePasswordAtNextLogin = $value; diff --git a/library/Zend/Gdata/Gapps/Extension/Name.php b/library/Zend/Gdata/Gapps/Extension/Name.php index b0589d0dfc..521c693f20 100644 --- a/library/Zend/Gdata/Gapps/Extension/Name.php +++ b/library/Zend/Gdata/Gapps/Extension/Name.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Gapps */ -require_once 'Zend/Gdata/Gapps.php'; +;// require_once 'Zend/Gdata/Gapps.php'; /** * Represents the apps:name element used by the Apps data API. This is used diff --git a/library/Zend/Gdata/Gapps/Extension/Nickname.php b/library/Zend/Gdata/Gapps/Extension/Nickname.php index dd86fdaa3e..727c496fca 100644 --- a/library/Zend/Gdata/Gapps/Extension/Nickname.php +++ b/library/Zend/Gdata/Gapps/Extension/Nickname.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Gapps */ -require_once 'Zend/Gdata/Gapps.php'; +;// require_once 'Zend/Gdata/Gapps.php'; /** * Represents the apps:nickname element used by the Apps data API. This diff --git a/library/Zend/Gdata/Gapps/Extension/Property.php b/library/Zend/Gdata/Gapps/Extension/Property.php index c89ae8c81d..ff4e278452 100644 --- a/library/Zend/Gdata/Gapps/Extension/Property.php +++ b/library/Zend/Gdata/Gapps/Extension/Property.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Gapps */ -require_once 'Zend/Gdata/Gapps.php'; +;// require_once 'Zend/Gdata/Gapps.php'; /** * Represents the apps:Property element used by the Apps data API. diff --git a/library/Zend/Gdata/Gapps/Extension/Quota.php b/library/Zend/Gdata/Gapps/Extension/Quota.php index c5243a5c27..c99100ba3d 100644 --- a/library/Zend/Gdata/Gapps/Extension/Quota.php +++ b/library/Zend/Gdata/Gapps/Extension/Quota.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Gapps */ -require_once 'Zend/Gdata/Gapps.php'; +;// require_once 'Zend/Gdata/Gapps.php'; /** * Represents the apps:quota element used by the Apps data API. This is diff --git a/library/Zend/Gdata/Gapps/GroupEntry.php b/library/Zend/Gdata/Gapps/GroupEntry.php index 7dadd9a18a..4415c2fc8f 100644 --- a/library/Zend/Gdata/Gapps/GroupEntry.php +++ b/library/Zend/Gdata/Gapps/GroupEntry.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Gapps_Extension_Property */ -require_once 'Zend/Gdata/Gapps/Extension/Property.php'; +;// require_once 'Zend/Gdata/Gapps/Extension/Property.php'; /** * Data model class for a Google Apps Group Entry. diff --git a/library/Zend/Gdata/Gapps/GroupFeed.php b/library/Zend/Gdata/Gapps/GroupFeed.php index 78269a1a44..21ac237248 100644 --- a/library/Zend/Gdata/Gapps/GroupFeed.php +++ b/library/Zend/Gdata/Gapps/GroupFeed.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Gapps_GroupEntry */ -require_once 'Zend/Gdata/Gapps/GroupEntry.php'; +;// require_once 'Zend/Gdata/Gapps/GroupEntry.php'; /** * Data model for a collection of Google Apps group entries, usually diff --git a/library/Zend/Gdata/Gapps/GroupQuery.php b/library/Zend/Gdata/Gapps/GroupQuery.php index 90b4dcccbe..20555aa548 100644 --- a/library/Zend/Gdata/Gapps/GroupQuery.php +++ b/library/Zend/Gdata/Gapps/GroupQuery.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Gapps_Query */ -require_once('Zend/Gdata/Gapps/Query.php'); +;// require_once('Zend/Gdata/Gapps/Query.php'); /** * Assists in constructing queries for Google Apps group entries. diff --git a/library/Zend/Gdata/Gapps/MemberEntry.php b/library/Zend/Gdata/Gapps/MemberEntry.php index 8b7862295b..6e2e643672 100644 --- a/library/Zend/Gdata/Gapps/MemberEntry.php +++ b/library/Zend/Gdata/Gapps/MemberEntry.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Gapps_Extension_Property */ -require_once 'Zend/Gdata/Gapps/Extension/Property.php'; +;// require_once 'Zend/Gdata/Gapps/Extension/Property.php'; /** * Data model class for a Google Apps Member Entry. diff --git a/library/Zend/Gdata/Gapps/MemberFeed.php b/library/Zend/Gdata/Gapps/MemberFeed.php index 4250693e53..1ca47ba6b1 100644 --- a/library/Zend/Gdata/Gapps/MemberFeed.php +++ b/library/Zend/Gdata/Gapps/MemberFeed.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Gapps_MemberEntry */ -require_once 'Zend/Gdata/Gapps/MemberEntry.php'; +;// require_once 'Zend/Gdata/Gapps/MemberEntry.php'; /** * Data model for a collection of Google Apps member entries, usually diff --git a/library/Zend/Gdata/Gapps/MemberQuery.php b/library/Zend/Gdata/Gapps/MemberQuery.php index 008baa129e..45fc3f6465 100644 --- a/library/Zend/Gdata/Gapps/MemberQuery.php +++ b/library/Zend/Gdata/Gapps/MemberQuery.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Gapps_Query */ -require_once('Zend/Gdata/Gapps/Query.php'); +;// require_once('Zend/Gdata/Gapps/Query.php'); /** * Assists in constructing queries for Google Apps member entries. @@ -177,7 +177,7 @@ public function getQueryUrl() if ($this->_groupId !== null) { $uri .= '/' . $this->_groupId; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'groupId must not be null'); } diff --git a/library/Zend/Gdata/Gapps/NicknameEntry.php b/library/Zend/Gdata/Gapps/NicknameEntry.php index deb278ded6..d8a5a59788 100644 --- a/library/Zend/Gdata/Gapps/NicknameEntry.php +++ b/library/Zend/Gdata/Gapps/NicknameEntry.php @@ -24,17 +24,17 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Gapps_Extension_Login */ -require_once 'Zend/Gdata/Gapps/Extension/Login.php'; +;// require_once 'Zend/Gdata/Gapps/Extension/Login.php'; /** * @see Zend_Gdata_Gapps_Extension_Nickname */ -require_once 'Zend/Gdata/Gapps/Extension/Nickname.php'; +;// require_once 'Zend/Gdata/Gapps/Extension/Nickname.php'; /** * Data model class for a Google Apps Nickname Entry. diff --git a/library/Zend/Gdata/Gapps/NicknameFeed.php b/library/Zend/Gdata/Gapps/NicknameFeed.php index 11e2104f58..ba18851896 100644 --- a/library/Zend/Gdata/Gapps/NicknameFeed.php +++ b/library/Zend/Gdata/Gapps/NicknameFeed.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Gapps_NicknameEntry */ -require_once 'Zend/Gdata/Gapps/NicknameEntry.php'; +;// require_once 'Zend/Gdata/Gapps/NicknameEntry.php'; /** * Data model for a collection of Google Apps nickname entries, usually diff --git a/library/Zend/Gdata/Gapps/NicknameQuery.php b/library/Zend/Gdata/Gapps/NicknameQuery.php index be14ae82c5..de0735a7be 100644 --- a/library/Zend/Gdata/Gapps/NicknameQuery.php +++ b/library/Zend/Gdata/Gapps/NicknameQuery.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Gapps_Query */ -require_once('Zend/Gdata/Gapps/Query.php'); +;// require_once('Zend/Gdata/Gapps/Query.php'); /** * Assists in constructing queries for Google Apps nickname entries. diff --git a/library/Zend/Gdata/Gapps/OwnerEntry.php b/library/Zend/Gdata/Gapps/OwnerEntry.php index 82391adfc5..d560c69083 100644 --- a/library/Zend/Gdata/Gapps/OwnerEntry.php +++ b/library/Zend/Gdata/Gapps/OwnerEntry.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Gapps_Extension_Property */ -require_once 'Zend/Gdata/Gapps/Extension/Property.php'; +;// require_once 'Zend/Gdata/Gapps/Extension/Property.php'; /** * Data model class for a Google Apps Owner Entry. diff --git a/library/Zend/Gdata/Gapps/OwnerFeed.php b/library/Zend/Gdata/Gapps/OwnerFeed.php index 1230f9d802..e43700f510 100644 --- a/library/Zend/Gdata/Gapps/OwnerFeed.php +++ b/library/Zend/Gdata/Gapps/OwnerFeed.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Gapps_OwnerEntry */ -require_once 'Zend/Gdata/Gapps/OwnerEntry.php'; +;// require_once 'Zend/Gdata/Gapps/OwnerEntry.php'; /** * Data model for a collection of Google Apps owner entries, usually diff --git a/library/Zend/Gdata/Gapps/OwnerQuery.php b/library/Zend/Gdata/Gapps/OwnerQuery.php index 4674bba67b..34315287c8 100644 --- a/library/Zend/Gdata/Gapps/OwnerQuery.php +++ b/library/Zend/Gdata/Gapps/OwnerQuery.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Gapps_Query */ -require_once('Zend/Gdata/Gapps/Query.php'); +;// require_once('Zend/Gdata/Gapps/Query.php'); /** * Assists in constructing queries for Google Apps owner entries. @@ -129,7 +129,7 @@ public function getQueryUrl() if ($this->_groupId !== null) { $uri .= '/' . $this->_groupId; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'groupId must not be null'); } diff --git a/library/Zend/Gdata/Gapps/Query.php b/library/Zend/Gdata/Gapps/Query.php index 1ed266f83a..469a0a036d 100644 --- a/library/Zend/Gdata/Gapps/Query.php +++ b/library/Zend/Gdata/Gapps/Query.php @@ -24,12 +24,12 @@ /** * Zend_Gdata_Query */ -require_once('Zend/Gdata/Query.php'); +;// require_once('Zend/Gdata/Query.php'); /** * Zend_Gdata_Gapps */ -require_once('Zend/Gdata/Gapps.php'); +;// require_once('Zend/Gdata/Gapps.php'); /** * Assists in constructing queries for Google Apps entries. This class @@ -114,7 +114,7 @@ public function getBaseUrl($domain = null) return Zend_Gdata_Gapps::APPS_BASE_FEED_URI . '/' . $this->_domain; } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Domain must be specified.'); } diff --git a/library/Zend/Gdata/Gapps/ServiceException.php b/library/Zend/Gdata/Gapps/ServiceException.php index 7aa0c1945e..8e80da1851 100644 --- a/library/Zend/Gdata/Gapps/ServiceException.php +++ b/library/Zend/Gdata/Gapps/ServiceException.php @@ -25,15 +25,15 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * Zend_Gdata_Gapps_Error */ -require_once 'Zend/Gdata/Gapps/Error.php'; +;// require_once 'Zend/Gdata/Gapps/Error.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** * Gdata Gapps Exception class. This is thrown when an @@ -86,7 +86,7 @@ public function addError($error) { // Make sure that we don't try to index an error that doesn't // contain an index value. if ($error->getErrorCode() == null) { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception("Error encountered without corresponding error code."); } @@ -161,7 +161,7 @@ public function importFromString($string) { $doc = @Zend_Xml_Security::scan($string, $doc); if (!$doc) { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; $message = error_get_last()['message'] ?? 'Unknown error'; throw new Zend_Gdata_App_Exception("DOMDocument cannot parse XML: $message"); } @@ -170,7 +170,7 @@ public function importFromString($string) { // If it isn't, something has gone horribly wrong. $rootElement = $doc->getElementsByTagName($this->_rootElement)->item(0); if (!$rootElement) { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('No root <' . $this->_rootElement . '> element found, cannot parse feed.'); } @@ -183,7 +183,7 @@ public function importFromString($string) { } return $this; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('XML passed to transferFromXML cannot be null'); } diff --git a/library/Zend/Gdata/Gapps/UserEntry.php b/library/Zend/Gdata/Gapps/UserEntry.php index ca718f9b1e..2780080cdc 100644 --- a/library/Zend/Gdata/Gapps/UserEntry.php +++ b/library/Zend/Gdata/Gapps/UserEntry.php @@ -24,27 +24,27 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension_FeedLink */ -require_once 'Zend/Gdata/Extension/FeedLink.php'; +;// require_once 'Zend/Gdata/Extension/FeedLink.php'; /** * @see Zend_Gdata_Gapps_Extension_Login */ -require_once 'Zend/Gdata/Gapps/Extension/Login.php'; +;// require_once 'Zend/Gdata/Gapps/Extension/Login.php'; /** * @see Zend_Gdata_Gapps_Extension_Name */ -require_once 'Zend/Gdata/Gapps/Extension/Name.php'; +;// require_once 'Zend/Gdata/Gapps/Extension/Name.php'; /** * @see Zend_Gdata_Gapps_Extension_Quota */ -require_once 'Zend/Gdata/Gapps/Extension/Quota.php'; +;// require_once 'Zend/Gdata/Gapps/Extension/Quota.php'; /** * Data model class for a Google Apps User Entry. diff --git a/library/Zend/Gdata/Gapps/UserFeed.php b/library/Zend/Gdata/Gapps/UserFeed.php index 8ea63ea455..299788090a 100644 --- a/library/Zend/Gdata/Gapps/UserFeed.php +++ b/library/Zend/Gdata/Gapps/UserFeed.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Gapps_UserEntry */ -require_once 'Zend/Gdata/Gapps/UserEntry.php'; +;// require_once 'Zend/Gdata/Gapps/UserEntry.php'; /** * Data model for a collection of Google Apps user entries, usually diff --git a/library/Zend/Gdata/Gapps/UserQuery.php b/library/Zend/Gdata/Gapps/UserQuery.php index a488594729..3dd8e0e565 100644 --- a/library/Zend/Gdata/Gapps/UserQuery.php +++ b/library/Zend/Gdata/Gapps/UserQuery.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Gapps_Query */ -require_once('Zend/Gdata/Gapps/Query.php'); +;// require_once('Zend/Gdata/Gapps/Query.php'); /** * Assists in constructing queries for Google Apps user entries. diff --git a/library/Zend/Gdata/Gbase.php b/library/Zend/Gdata/Gbase.php index 3b5b8643bb..f307eee5e9 100644 --- a/library/Zend/Gdata/Gbase.php +++ b/library/Zend/Gdata/Gbase.php @@ -24,12 +24,12 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; +;// require_once 'Zend/Gdata.php'; /** * Service class for interacting with the Google Base data API diff --git a/library/Zend/Gdata/Gbase/Entry.php b/library/Zend/Gdata/Gbase/Entry.php index 856be4698f..927842fef0 100644 --- a/library/Zend/Gdata/Gbase/Entry.php +++ b/library/Zend/Gdata/Gbase/Entry.php @@ -24,12 +24,12 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * Base class for working with Google Base entries. diff --git a/library/Zend/Gdata/Gbase/Extension/BaseAttribute.php b/library/Zend/Gdata/Gbase/Extension/BaseAttribute.php index c91f8ff42b..da0aba6998 100644 --- a/library/Zend/Gdata/Gbase/Extension/BaseAttribute.php +++ b/library/Zend/Gdata/Gbase/Extension/BaseAttribute.php @@ -23,7 +23,7 @@ /** * @see Zend_Gdata_App_Extension_Element */ -require_once 'Zend/Gdata/App/Extension/Element.php'; +;// require_once 'Zend/Gdata/App/Extension/Element.php'; /** * Concrete class for working with ItemType elements. diff --git a/library/Zend/Gdata/Gbase/Feed.php b/library/Zend/Gdata/Gbase/Feed.php index a5a39f9658..64074cf44f 100644 --- a/library/Zend/Gdata/Gbase/Feed.php +++ b/library/Zend/Gdata/Gbase/Feed.php @@ -24,12 +24,12 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * Base class for the Google Base Feed diff --git a/library/Zend/Gdata/Gbase/ItemEntry.php b/library/Zend/Gdata/Gbase/ItemEntry.php index a0be22bccc..673b2e1c89 100644 --- a/library/Zend/Gdata/Gbase/ItemEntry.php +++ b/library/Zend/Gdata/Gbase/ItemEntry.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Gbase_Entry */ -require_once 'Zend/Gdata/Gbase/Entry.php'; +;// require_once 'Zend/Gdata/Gbase/Entry.php'; /** * Concrete class for working with Item entries. diff --git a/library/Zend/Gdata/Gbase/ItemFeed.php b/library/Zend/Gdata/Gbase/ItemFeed.php index 620f1b09a9..8aa3e74f6f 100644 --- a/library/Zend/Gdata/Gbase/ItemFeed.php +++ b/library/Zend/Gdata/Gbase/ItemFeed.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Gbase_Feed */ -require_once 'Zend/Gdata/Gbase/Feed.php'; +;// require_once 'Zend/Gdata/Gbase/Feed.php'; /** * Represents the Google Base Customer Items Feed diff --git a/library/Zend/Gdata/Gbase/ItemQuery.php b/library/Zend/Gdata/Gbase/ItemQuery.php index 424cf10274..5e71b66ad1 100644 --- a/library/Zend/Gdata/Gbase/ItemQuery.php +++ b/library/Zend/Gdata/Gbase/ItemQuery.php @@ -24,12 +24,12 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Gbase_Query */ -require_once 'Zend/Gdata/Gbase/Query.php'; +;// require_once 'Zend/Gdata/Gbase/Query.php'; /** diff --git a/library/Zend/Gdata/Gbase/Query.php b/library/Zend/Gdata/Gbase/Query.php index 0a0b517c66..2e89eb751b 100644 --- a/library/Zend/Gdata/Gbase/Query.php +++ b/library/Zend/Gdata/Gbase/Query.php @@ -24,12 +24,12 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Query */ -require_once 'Zend/Gdata/Query.php'; +;// require_once 'Zend/Gdata/Query.php'; /** * Assists in constructing queries for Google Base diff --git a/library/Zend/Gdata/Gbase/SnippetEntry.php b/library/Zend/Gdata/Gbase/SnippetEntry.php index 0270a2d72f..4ab436cff4 100644 --- a/library/Zend/Gdata/Gbase/SnippetEntry.php +++ b/library/Zend/Gdata/Gbase/SnippetEntry.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Gbase_Entry */ -require_once 'Zend/Gdata/Gbase/Entry.php'; +;// require_once 'Zend/Gdata/Gbase/Entry.php'; /** * Concrete class for working with Snippet entries. diff --git a/library/Zend/Gdata/Gbase/SnippetFeed.php b/library/Zend/Gdata/Gbase/SnippetFeed.php index c4ef199cae..32d8a88dd1 100644 --- a/library/Zend/Gdata/Gbase/SnippetFeed.php +++ b/library/Zend/Gdata/Gbase/SnippetFeed.php @@ -24,12 +24,12 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * Represents the Google Base Snippets Feed diff --git a/library/Zend/Gdata/Gbase/SnippetQuery.php b/library/Zend/Gdata/Gbase/SnippetQuery.php index 216ce069e0..b825b20e3c 100644 --- a/library/Zend/Gdata/Gbase/SnippetQuery.php +++ b/library/Zend/Gdata/Gbase/SnippetQuery.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Gbase_Query */ -require_once 'Zend/Gdata/Gbase/Query.php'; +;// require_once 'Zend/Gdata/Gbase/Query.php'; /** * Assists in constructing queries for Google Base Snippets Feed diff --git a/library/Zend/Gdata/Geo.php b/library/Zend/Gdata/Geo.php index 85e4876deb..d09fab0374 100755 --- a/library/Zend/Gdata/Geo.php +++ b/library/Zend/Gdata/Geo.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; +;// require_once 'Zend/Gdata.php'; /** * Service class for interacting with the services which use the diff --git a/library/Zend/Gdata/Geo/Entry.php b/library/Zend/Gdata/Geo/Entry.php index c31c79d451..3918ceb5ba 100755 --- a/library/Zend/Gdata/Geo/Entry.php +++ b/library/Zend/Gdata/Geo/Entry.php @@ -24,17 +24,17 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Geo */ -require_once 'Zend/Gdata/Geo.php'; +;// require_once 'Zend/Gdata/Geo.php'; /** * @see Zend_Gdata_Geo_Extension_GeoRssWhere */ -require_once 'Zend/Gdata/Geo/Extension/GeoRssWhere.php'; +;// require_once 'Zend/Gdata/Geo/Extension/GeoRssWhere.php'; /** * An Atom entry containing Geograpic data. diff --git a/library/Zend/Gdata/Geo/Extension/GeoRssWhere.php b/library/Zend/Gdata/Geo/Extension/GeoRssWhere.php index dd5e9472d7..f1d6237469 100755 --- a/library/Zend/Gdata/Geo/Extension/GeoRssWhere.php +++ b/library/Zend/Gdata/Geo/Extension/GeoRssWhere.php @@ -24,17 +24,17 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Geo */ -require_once 'Zend/Gdata/Geo.php'; +;// require_once 'Zend/Gdata/Geo.php'; /** * @see Zend_Gdata_Geo_Extension_GmlPoint */ -require_once 'Zend/Gdata/Geo/Extension/GmlPoint.php'; +;// require_once 'Zend/Gdata/Geo/Extension/GmlPoint.php'; /** diff --git a/library/Zend/Gdata/Geo/Extension/GmlPoint.php b/library/Zend/Gdata/Geo/Extension/GmlPoint.php index c29bb8afd9..47f1e1883b 100755 --- a/library/Zend/Gdata/Geo/Extension/GmlPoint.php +++ b/library/Zend/Gdata/Geo/Extension/GmlPoint.php @@ -24,17 +24,17 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Geo */ -require_once 'Zend/Gdata/Geo.php'; +;// require_once 'Zend/Gdata/Geo.php'; /** * @see Zend_Gdata_Geo_Extension_GmlPos */ -require_once 'Zend/Gdata/Geo/Extension/GmlPos.php'; +;// require_once 'Zend/Gdata/Geo/Extension/GmlPos.php'; /** diff --git a/library/Zend/Gdata/Geo/Extension/GmlPos.php b/library/Zend/Gdata/Geo/Extension/GmlPos.php index c062b2e25d..0a8232cc89 100755 --- a/library/Zend/Gdata/Geo/Extension/GmlPos.php +++ b/library/Zend/Gdata/Geo/Extension/GmlPos.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Geo */ -require_once 'Zend/Gdata/Geo.php'; +;// require_once 'Zend/Gdata/Geo.php'; /** * Represents the gml:pos element used by the Gdata Geo extensions. diff --git a/library/Zend/Gdata/Geo/Feed.php b/library/Zend/Gdata/Geo/Feed.php index de545925a0..33817edd44 100755 --- a/library/Zend/Gdata/Geo/Feed.php +++ b/library/Zend/Gdata/Geo/Feed.php @@ -24,17 +24,17 @@ /** * @see Zend_Gdata_eed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Geo */ -require_once 'Zend/Gdata/Geo.php'; +;// require_once 'Zend/Gdata/Geo.php'; /** * @see Zend_Gdata_Geo_Entry */ -require_once 'Zend/Gdata/Geo/Entry.php'; +;// require_once 'Zend/Gdata/Geo/Entry.php'; /** * Feed for Gdata Geographic data entries. diff --git a/library/Zend/Gdata/Health.php b/library/Zend/Gdata/Health.php index d930efd45f..6ad15cfd19 100755 --- a/library/Zend/Gdata/Health.php +++ b/library/Zend/Gdata/Health.php @@ -24,12 +24,12 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; +;// require_once 'Zend/Gdata.php'; /** * Service class for interacting with the Google Health Data API diff --git a/library/Zend/Gdata/Health/Extension/Ccr.php b/library/Zend/Gdata/Health/Extension/Ccr.php index 296af6ad56..0a968613a5 100755 --- a/library/Zend/Gdata/Health/Extension/Ccr.php +++ b/library/Zend/Gdata/Health/Extension/Ccr.php @@ -23,12 +23,12 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_App_Extension_Element */ -require_once 'Zend/Gdata/App/Extension/Element.php'; +;// require_once 'Zend/Gdata/App/Extension/Element.php'; /** * Concrete class for working with CCR elements. diff --git a/library/Zend/Gdata/Health/ProfileEntry.php b/library/Zend/Gdata/Health/ProfileEntry.php index c883030bb1..ede11facf4 100755 --- a/library/Zend/Gdata/Health/ProfileEntry.php +++ b/library/Zend/Gdata/Health/ProfileEntry.php @@ -24,12 +24,12 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * Concrete class for working with Health profile entries. diff --git a/library/Zend/Gdata/Health/ProfileFeed.php b/library/Zend/Gdata/Health/ProfileFeed.php index 0ba13b342a..a39f873642 100755 --- a/library/Zend/Gdata/Health/ProfileFeed.php +++ b/library/Zend/Gdata/Health/ProfileFeed.php @@ -24,12 +24,12 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * Represents a Google Health user's Profile Feed diff --git a/library/Zend/Gdata/Health/ProfileListEntry.php b/library/Zend/Gdata/Health/ProfileListEntry.php index b31277d78f..769994d931 100755 --- a/library/Zend/Gdata/Health/ProfileListEntry.php +++ b/library/Zend/Gdata/Health/ProfileListEntry.php @@ -24,12 +24,12 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * Concrete class for working with Health profile list entries. diff --git a/library/Zend/Gdata/Health/ProfileListFeed.php b/library/Zend/Gdata/Health/ProfileListFeed.php index 3d5be64965..8e55f191a6 100755 --- a/library/Zend/Gdata/Health/ProfileListFeed.php +++ b/library/Zend/Gdata/Health/ProfileListFeed.php @@ -24,12 +24,12 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * Represents a Google Health user's Profile List Feed diff --git a/library/Zend/Gdata/Health/Query.php b/library/Zend/Gdata/Health/Query.php index 70df397e9f..650ce849d3 100755 --- a/library/Zend/Gdata/Health/Query.php +++ b/library/Zend/Gdata/Health/Query.php @@ -24,12 +24,12 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @see Zend_Gdata_Query */ -require_once('Zend/Gdata/Query.php'); +;// require_once('Zend/Gdata/Query.php'); /** * Assists in constructing queries for Google Health diff --git a/library/Zend/Gdata/HttpAdapterStreamingProxy.php b/library/Zend/Gdata/HttpAdapterStreamingProxy.php index aa2efeb54c..db4ed65fa3 100644 --- a/library/Zend/Gdata/HttpAdapterStreamingProxy.php +++ b/library/Zend/Gdata/HttpAdapterStreamingProxy.php @@ -24,7 +24,7 @@ /** * @see Zend_Http_Client_Adapter_Proxy */ -require_once 'Zend/Http/Client/Adapter/Proxy.php'; +;// require_once 'Zend/Http/Client/Adapter/Proxy.php'; /** * Extends the proxy HTTP adapter to handle streams instead of discrete body @@ -59,13 +59,13 @@ public function write($method, $uri, $http_ver = '1.1', $headers = array(), $bod { // If no proxy is set, throw an error if (! $this->config['proxy_host']) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('No proxy host set!'); } // Make sure we're properly connected if (! $this->socket) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Trying to write but we are not connected'); } @@ -74,7 +74,7 @@ public function write($method, $uri, $http_ver = '1.1', $headers = array(), $bod $port = $this->config['proxy_port']; if ($this->connected_to[0] != $host || $this->connected_to[1] != $port) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Trying to write but we are connected to the wrong proxy ' . 'server'); @@ -109,7 +109,7 @@ public function write($method, $uri, $http_ver = '1.1', $headers = array(), $bod // Send the request headers if (! @fwrite($this->socket, $request)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Error writing request to proxy server'); } @@ -118,7 +118,7 @@ public function write($method, $uri, $http_ver = '1.1', $headers = array(), $bod $chunk = $body->read(self::CHUNK_SIZE); while ($chunk !== false) { if (!@fwrite($this->socket, $chunk)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Error writing request to server' ); diff --git a/library/Zend/Gdata/HttpAdapterStreamingSocket.php b/library/Zend/Gdata/HttpAdapterStreamingSocket.php index b7a09cded6..b219e24030 100644 --- a/library/Zend/Gdata/HttpAdapterStreamingSocket.php +++ b/library/Zend/Gdata/HttpAdapterStreamingSocket.php @@ -24,7 +24,7 @@ /** * @see Zend_Http_Client_Adapter_Socket */ -require_once 'Zend/Http/Client/Adapter/Socket.php'; +;// require_once 'Zend/Http/Client/Adapter/Socket.php'; /** * Extends the default HTTP adapter to handle streams instead of discrete body @@ -61,7 +61,7 @@ public function write($method, $uri, $http_ver = '1.1', $headers = array(), { // Make sure we're properly connected if (! $this->socket) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Trying to write but we are not connected'); } @@ -69,7 +69,7 @@ public function write($method, $uri, $http_ver = '1.1', $headers = array(), $host = $uri->getHost(); $host = (strtolower($uri->getScheme()) == 'https' ? $this->config['ssltransport'] : 'tcp') . '://' . $host; if ($this->connected_to[0] != $host || $this->connected_to[1] != $uri->getPort()) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Trying to write but we are connected to the wrong host'); } @@ -89,7 +89,7 @@ public function write($method, $uri, $http_ver = '1.1', $headers = array(), // Send the headers over $request .= "\r\n"; if (! @fwrite($this->socket, $request)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Error writing request to server'); } @@ -99,7 +99,7 @@ public function write($method, $uri, $http_ver = '1.1', $headers = array(), $chunk = $body->read(self::CHUNK_SIZE); while ($chunk !== FALSE) { if (! @fwrite($this->socket, $chunk)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Error writing request to server'); } diff --git a/library/Zend/Gdata/HttpClient.php b/library/Zend/Gdata/HttpClient.php index 7591f118b5..f418e0fe3f 100644 --- a/library/Zend/Gdata/HttpClient.php +++ b/library/Zend/Gdata/HttpClient.php @@ -23,7 +23,7 @@ /** * Zend_Http_Client */ -require_once 'Zend/Http/Client.php'; +;// require_once 'Zend/Http/Client.php'; /** * Gdata Http Client object. @@ -98,7 +98,7 @@ public function setAuthSubPrivateKeyFile($file, $passphrase = null, $useIncludePath = false) { $fp = @fopen($file, "r", $useIncludePath); if (!$fp) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException('Failed to open private key file for AuthSub.'); } @@ -124,7 +124,7 @@ public function setAuthSubPrivateKeyFile($file, $passphrase = null, */ public function setAuthSubPrivateKey($key, $passphrase = null) { if ($key != null && !function_exists('openssl_pkey_get_private')) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'You cannot enable secure AuthSub if the openssl module ' . 'is not enabled in your PHP installation.'); @@ -218,7 +218,7 @@ public function filterHttpRequest($method, $url, $headers = array(), $body = nul $signSuccess = openssl_sign($dataToSign, $signature, $pKeyId, OPENSSL_ALGO_SHA1); if (!$signSuccess) { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( 'openssl_signing failure - returned false'); } diff --git a/library/Zend/Gdata/Kind/EventEntry.php b/library/Zend/Gdata/Kind/EventEntry.php index ce9461a773..dc44f93de1 100644 --- a/library/Zend/Gdata/Kind/EventEntry.php +++ b/library/Zend/Gdata/Kind/EventEntry.php @@ -23,67 +23,67 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * @see Zend_Gdata_Extension_Where */ -require_once 'Zend/Gdata/Extension/Where.php'; +;// require_once 'Zend/Gdata/Extension/Where.php'; /** * @see Zend_Gdata_Extension_When */ -require_once 'Zend/Gdata/Extension/When.php'; +;// require_once 'Zend/Gdata/Extension/When.php'; /** * @see Zend_Gdata_Extension_Who */ -require_once 'Zend/Gdata/Extension/Who.php'; +;// require_once 'Zend/Gdata/Extension/Who.php'; /** * @see Zend_Gdata_Extension_Recurrence */ -require_once 'Zend/Gdata/Extension/Recurrence.php'; +;// require_once 'Zend/Gdata/Extension/Recurrence.php'; /** * @see Zend_Gdata_Extension_EventStatus */ -require_once 'Zend/Gdata/Extension/EventStatus.php'; +;// require_once 'Zend/Gdata/Extension/EventStatus.php'; /** * @see Zend_Gdata_Extension_Comments */ -require_once 'Zend/Gdata/Extension/Comments.php'; +;// require_once 'Zend/Gdata/Extension/Comments.php'; /** * @see Zend_Gdata_Extension_Transparency */ -require_once 'Zend/Gdata/Extension/Transparency.php'; +;// require_once 'Zend/Gdata/Extension/Transparency.php'; /** * @see Zend_Gdata_Extension_Visibility */ -require_once 'Zend/Gdata/Extension/Visibility.php'; +;// require_once 'Zend/Gdata/Extension/Visibility.php'; /** * @see Zend_Gdata_Extension_ExtendedProperty */ -require_once 'Zend/Gdata/Extension/ExtendedProperty.php'; +;// require_once 'Zend/Gdata/Extension/ExtendedProperty.php'; /** * @see Zend_Gdata_Extension_OriginalEvent */ -require_once 'Zend/Gdata/Extension/OriginalEvent.php'; +;// require_once 'Zend/Gdata/Extension/OriginalEvent.php'; /** * @see Zend_Gdata_Extension_EntryLink */ -require_once 'Zend/Gdata/Extension/EntryLink.php'; +;// require_once 'Zend/Gdata/Extension/EntryLink.php'; /** * Data model for the Gdata Event "Kind". Google Calendar has a separate @@ -210,7 +210,7 @@ protected function takeChildFromDOM($child) $this->_visibility = $visiblity; break; case $this->lookupNamespace('gd') . ':' . 'recurrenceException'; - require_once 'Zend/Gdata/Extension/RecurrenceException.php'; + ;// require_once 'Zend/Gdata/Extension/RecurrenceException.php'; $recurrenceException = new Zend_Gdata_Extension_RecurrenceException(); $recurrenceException ->transferFromDOM($child); $this->_recurrenceException[] = $recurrenceException; diff --git a/library/Zend/Gdata/Media.php b/library/Zend/Gdata/Media.php index 2d09325e07..636a6fa4eb 100755 --- a/library/Zend/Gdata/Media.php +++ b/library/Zend/Gdata/Media.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; +;// require_once 'Zend/Gdata.php'; /** * Service class for interacting with the services which use the media extensions diff --git a/library/Zend/Gdata/Media/Entry.php b/library/Zend/Gdata/Media/Entry.php index 5fa1225596..e744e65b8e 100755 --- a/library/Zend/Gdata/Media/Entry.php +++ b/library/Zend/Gdata/Media/Entry.php @@ -24,17 +24,17 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Media */ -require_once 'Zend/Gdata/Media.php'; +;// require_once 'Zend/Gdata/Media.php'; /** * @see Zend_Gdata_Media_Extension_MediaGroup */ -require_once 'Zend/Gdata/Media/Extension/MediaGroup.php'; +;// require_once 'Zend/Gdata/Media/Extension/MediaGroup.php'; /** * Represents the Gdata flavor of an Atom entry diff --git a/library/Zend/Gdata/Media/Extension/MediaCategory.php b/library/Zend/Gdata/Media/Extension/MediaCategory.php index e76e5af7e2..d4f1d224ab 100755 --- a/library/Zend/Gdata/Media/Extension/MediaCategory.php +++ b/library/Zend/Gdata/Media/Extension/MediaCategory.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:category element diff --git a/library/Zend/Gdata/Media/Extension/MediaContent.php b/library/Zend/Gdata/Media/Extension/MediaContent.php index f3dc0a2ffe..aaa44d2b5a 100755 --- a/library/Zend/Gdata/Media/Extension/MediaContent.php +++ b/library/Zend/Gdata/Media/Extension/MediaContent.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the media:content element of Media RSS. diff --git a/library/Zend/Gdata/Media/Extension/MediaCopyright.php b/library/Zend/Gdata/Media/Extension/MediaCopyright.php index 0148eebe51..dff69f8085 100755 --- a/library/Zend/Gdata/Media/Extension/MediaCopyright.php +++ b/library/Zend/Gdata/Media/Extension/MediaCopyright.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:copyright element diff --git a/library/Zend/Gdata/Media/Extension/MediaCredit.php b/library/Zend/Gdata/Media/Extension/MediaCredit.php index e929cc445a..c8390d4fd8 100755 --- a/library/Zend/Gdata/Media/Extension/MediaCredit.php +++ b/library/Zend/Gdata/Media/Extension/MediaCredit.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:credit element diff --git a/library/Zend/Gdata/Media/Extension/MediaDescription.php b/library/Zend/Gdata/Media/Extension/MediaDescription.php index 7b9c0336d8..463e7cd4b6 100755 --- a/library/Zend/Gdata/Media/Extension/MediaDescription.php +++ b/library/Zend/Gdata/Media/Extension/MediaDescription.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:description element diff --git a/library/Zend/Gdata/Media/Extension/MediaGroup.php b/library/Zend/Gdata/Media/Extension/MediaGroup.php index 7735aa5631..5100ffab93 100755 --- a/library/Zend/Gdata/Media/Extension/MediaGroup.php +++ b/library/Zend/Gdata/Media/Extension/MediaGroup.php @@ -24,77 +24,77 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Media_Extension_MediaContent */ -require_once 'Zend/Gdata/Media/Extension/MediaContent.php'; +;// require_once 'Zend/Gdata/Media/Extension/MediaContent.php'; /** * @see Zend_Gdata_Media_Extension_MediaCategory */ -require_once 'Zend/Gdata/Media/Extension/MediaCategory.php'; +;// require_once 'Zend/Gdata/Media/Extension/MediaCategory.php'; /** * @see Zend_Gdata_Media_Extension_MediaCopyright */ -require_once 'Zend/Gdata/Media/Extension/MediaCopyright.php'; +;// require_once 'Zend/Gdata/Media/Extension/MediaCopyright.php'; /** * @see Zend_Gdata_Media_Extension_MediaCredit */ -require_once 'Zend/Gdata/Media/Extension/MediaCredit.php'; +;// require_once 'Zend/Gdata/Media/Extension/MediaCredit.php'; /** * @see Zend_Gdata_Media_Extension_MediaDescription */ -require_once 'Zend/Gdata/Media/Extension/MediaDescription.php'; +;// require_once 'Zend/Gdata/Media/Extension/MediaDescription.php'; /** * @see Zend_Gdata_Media_Extension_MediaHash */ -require_once 'Zend/Gdata/Media/Extension/MediaHash.php'; +;// require_once 'Zend/Gdata/Media/Extension/MediaHash.php'; /** * @see Zend_Gdata_Media_Extension_MediaKeywords */ -require_once 'Zend/Gdata/Media/Extension/MediaKeywords.php'; +;// require_once 'Zend/Gdata/Media/Extension/MediaKeywords.php'; /** * @see Zend_Gdata_Media_Extension_MediaPlayer */ -require_once 'Zend/Gdata/Media/Extension/MediaPlayer.php'; +;// require_once 'Zend/Gdata/Media/Extension/MediaPlayer.php'; /** * @see Zend_Gdata_Media_Extension_MediaRating */ -require_once 'Zend/Gdata/Media/Extension/MediaRating.php'; +;// require_once 'Zend/Gdata/Media/Extension/MediaRating.php'; /** * @see Zend_Gdata_Media_Extension_MediaRestriction */ -require_once 'Zend/Gdata/Media/Extension/MediaRestriction.php'; +;// require_once 'Zend/Gdata/Media/Extension/MediaRestriction.php'; /** * @see Zend_Gdata_Media_Extension_MediaText */ -require_once 'Zend/Gdata/Media/Extension/MediaText.php'; +;// require_once 'Zend/Gdata/Media/Extension/MediaText.php'; /** * @see Zend_Gdata_Media_Extension_MediaThumbnail */ -require_once 'Zend/Gdata/Media/Extension/MediaThumbnail.php'; +;// require_once 'Zend/Gdata/Media/Extension/MediaThumbnail.php'; /** * @see Zend_Gdata_Media_Extension_MediaTitle */ -require_once 'Zend/Gdata/Media/Extension/MediaTitle.php'; +;// require_once 'Zend/Gdata/Media/Extension/MediaTitle.php'; /** diff --git a/library/Zend/Gdata/Media/Extension/MediaHash.php b/library/Zend/Gdata/Media/Extension/MediaHash.php index b891fbc11a..200a3631e1 100755 --- a/library/Zend/Gdata/Media/Extension/MediaHash.php +++ b/library/Zend/Gdata/Media/Extension/MediaHash.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:hash element diff --git a/library/Zend/Gdata/Media/Extension/MediaKeywords.php b/library/Zend/Gdata/Media/Extension/MediaKeywords.php index ede48046ce..df2433c982 100755 --- a/library/Zend/Gdata/Media/Extension/MediaKeywords.php +++ b/library/Zend/Gdata/Media/Extension/MediaKeywords.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:keywords element diff --git a/library/Zend/Gdata/Media/Extension/MediaPlayer.php b/library/Zend/Gdata/Media/Extension/MediaPlayer.php index 2602c1b032..e6cdbb39c4 100755 --- a/library/Zend/Gdata/Media/Extension/MediaPlayer.php +++ b/library/Zend/Gdata/Media/Extension/MediaPlayer.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:player element diff --git a/library/Zend/Gdata/Media/Extension/MediaRating.php b/library/Zend/Gdata/Media/Extension/MediaRating.php index 877e18033b..4f023c38ed 100755 --- a/library/Zend/Gdata/Media/Extension/MediaRating.php +++ b/library/Zend/Gdata/Media/Extension/MediaRating.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:rating element diff --git a/library/Zend/Gdata/Media/Extension/MediaRestriction.php b/library/Zend/Gdata/Media/Extension/MediaRestriction.php index 27277ce1b9..b9fa8646a6 100755 --- a/library/Zend/Gdata/Media/Extension/MediaRestriction.php +++ b/library/Zend/Gdata/Media/Extension/MediaRestriction.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:restriction element diff --git a/library/Zend/Gdata/Media/Extension/MediaText.php b/library/Zend/Gdata/Media/Extension/MediaText.php index e58be4c876..fc78c558a6 100755 --- a/library/Zend/Gdata/Media/Extension/MediaText.php +++ b/library/Zend/Gdata/Media/Extension/MediaText.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:text element diff --git a/library/Zend/Gdata/Media/Extension/MediaThumbnail.php b/library/Zend/Gdata/Media/Extension/MediaThumbnail.php index 1f7588cd15..9e33446a78 100755 --- a/library/Zend/Gdata/Media/Extension/MediaThumbnail.php +++ b/library/Zend/Gdata/Media/Extension/MediaThumbnail.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:thumbnail element diff --git a/library/Zend/Gdata/Media/Extension/MediaTitle.php b/library/Zend/Gdata/Media/Extension/MediaTitle.php index 79dee0890a..c5eb8a9bcc 100755 --- a/library/Zend/Gdata/Media/Extension/MediaTitle.php +++ b/library/Zend/Gdata/Media/Extension/MediaTitle.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the media:title element in MediaRSS diff --git a/library/Zend/Gdata/Media/Feed.php b/library/Zend/Gdata/Media/Feed.php index 858aa8cdc5..b149778db0 100755 --- a/library/Zend/Gdata/Media/Feed.php +++ b/library/Zend/Gdata/Media/Feed.php @@ -24,17 +24,17 @@ /** * @see Zend_Gdata_eed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Media */ -require_once 'Zend/Gdata/Media.php'; +;// require_once 'Zend/Gdata/Media.php'; /** * @see Zend_Gdata_Media_Entry */ -require_once 'Zend/Gdata/Media/Entry.php'; +;// require_once 'Zend/Gdata/Media/Entry.php'; /** * The Gdata flavor of an Atom Feed with media support diff --git a/library/Zend/Gdata/MediaMimeStream.php b/library/Zend/Gdata/MediaMimeStream.php index 8973e7e0b8..4a81e10bc8 100644 --- a/library/Zend/Gdata/MediaMimeStream.php +++ b/library/Zend/Gdata/MediaMimeStream.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_MimeFile */ -require_once 'Zend/Gdata/MimeFile.php'; +;// require_once 'Zend/Gdata/MimeFile.php'; /** * @see Zend_Gdata_MimeBodyString */ -require_once 'Zend/Gdata/MimeBodyString.php'; +;// require_once 'Zend/Gdata/MimeBodyString.php'; /** @@ -92,7 +92,7 @@ public function __construct($xmlString = null, $filePath = null, $fileContentType = null) { if (!file_exists($filePath) || !is_readable($filePath)) { - require_once 'Zend/Gdata/App/IOException.php'; + ;// require_once 'Zend/Gdata/App/IOException.php'; throw new Zend_Gdata_App_IOException('File to be uploaded at ' . $filePath . ' does not exist or is not readable.'); } diff --git a/library/Zend/Gdata/Photos.php b/library/Zend/Gdata/Photos.php index d052b7c0c3..761c3c6273 100755 --- a/library/Zend/Gdata/Photos.php +++ b/library/Zend/Gdata/Photos.php @@ -24,22 +24,22 @@ /** * @see Zend_Gdata */ -require_once 'Zend/Gdata.php'; +;// require_once 'Zend/Gdata.php'; /** * @see Zend_Gdata_Photos_UserFeed */ -require_once 'Zend/Gdata/Photos/UserFeed.php'; +;// require_once 'Zend/Gdata/Photos/UserFeed.php'; /** * @see Zend_Gdata_Photos_AlbumFeed */ -require_once 'Zend/Gdata/Photos/AlbumFeed.php'; +;// require_once 'Zend/Gdata/Photos/AlbumFeed.php'; /** * @see Zend_Gdata_Photos_PhotoFeed */ -require_once 'Zend/Gdata/Photos/PhotoFeed.php'; +;// require_once 'Zend/Gdata/Photos/PhotoFeed.php'; /** * Service class for interacting with the Google Photos Data API. @@ -187,7 +187,7 @@ public function getUserFeed($userName = null, $location = null) public function getAlbumFeed($location = null) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Photos_UserQuery) { @@ -240,7 +240,7 @@ public function getPhotoFeed($location = null) public function getUserEntry($location) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Photos_UserQuery) { @@ -265,7 +265,7 @@ public function getUserEntry($location) public function getAlbumEntry($location) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Photos_UserQuery) { @@ -290,7 +290,7 @@ public function getAlbumEntry($location) public function getPhotoEntry($location) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Photos_UserQuery) { @@ -315,7 +315,7 @@ public function getPhotoEntry($location) public function getTagEntry($location) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Photos_UserQuery) { @@ -340,7 +340,7 @@ public function getTagEntry($location) public function getCommentEntry($location) { if ($location === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Location must not be null'); } else if ($location instanceof Zend_Gdata_Photos_UserQuery) { @@ -396,7 +396,7 @@ public function insertPhotoEntry($photo, $uri = null) $uri = $uri->getLink(self::FEED_LINK_PATH)->href; } if ($uri === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'URI must not be null'); } @@ -422,7 +422,7 @@ public function insertTagEntry($tag, $uri = null) $uri = $uri->getLink(self::FEED_LINK_PATH)->href; } if ($uri === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'URI must not be null'); } @@ -449,7 +449,7 @@ public function insertCommentEntry($comment, $uri = null) $uri = $uri->getLink(self::FEED_LINK_PATH)->href; } if ($uri === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'URI must not be null'); } diff --git a/library/Zend/Gdata/Photos/AlbumEntry.php b/library/Zend/Gdata/Photos/AlbumEntry.php index 0e2243c147..497daf63b9 100755 --- a/library/Zend/Gdata/Photos/AlbumEntry.php +++ b/library/Zend/Gdata/Photos/AlbumEntry.php @@ -24,67 +24,67 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Photos_Extension_Access */ -require_once 'Zend/Gdata/Photos/Extension/Access.php'; +;// require_once 'Zend/Gdata/Photos/Extension/Access.php'; /** * @see Zend_Gdata_Photos_Extension_BytesUsed */ -require_once 'Zend/Gdata/Photos/Extension/BytesUsed.php'; +;// require_once 'Zend/Gdata/Photos/Extension/BytesUsed.php'; /** * @see Zend_Gdata_Photos_Extension_Location */ -require_once 'Zend/Gdata/Photos/Extension/Location.php'; +;// require_once 'Zend/Gdata/Photos/Extension/Location.php'; /** * @see Zend_Gdata_Photos_Extension_Name */ -require_once 'Zend/Gdata/Photos/Extension/Name.php'; +;// require_once 'Zend/Gdata/Photos/Extension/Name.php'; /** * @see Zend_Gdata_Photos_Extension_NumPhotos */ -require_once 'Zend/Gdata/Photos/Extension/NumPhotos.php'; +;// require_once 'Zend/Gdata/Photos/Extension/NumPhotos.php'; /** * @see Zend_Gdata_Photos_Extension_NumPhotosRemaining */ -require_once 'Zend/Gdata/Photos/Extension/NumPhotosRemaining.php'; +;// require_once 'Zend/Gdata/Photos/Extension/NumPhotosRemaining.php'; /** * @see Zend_Gdata_Photos_Extension_CommentCount */ -require_once 'Zend/Gdata/Photos/Extension/CommentCount.php'; +;// require_once 'Zend/Gdata/Photos/Extension/CommentCount.php'; /** * @see Zend_Gdata_Photos_Extension_CommentingEnabled */ -require_once 'Zend/Gdata/Photos/Extension/CommentingEnabled.php'; +;// require_once 'Zend/Gdata/Photos/Extension/CommentingEnabled.php'; /** * @see Zend_Gdata_Photos_Extension_Id */ -require_once 'Zend/Gdata/Photos/Extension/Id.php'; +;// require_once 'Zend/Gdata/Photos/Extension/Id.php'; /** * @see Zend_Gdata_Geo_Extension_GeoRssWhere */ -require_once 'Zend/Gdata/Geo/Extension/GeoRssWhere.php'; +;// require_once 'Zend/Gdata/Geo/Extension/GeoRssWhere.php'; /** * @see Zend_Gdata_Media_Extension_MediaGroup */ -require_once 'Zend/Gdata/Media/Extension/MediaGroup.php'; +;// require_once 'Zend/Gdata/Media/Extension/MediaGroup.php'; /** * @see Zend_Gdata_App_Extension_Category */ -require_once 'Zend/Gdata/App/Extension/Category.php'; +;// require_once 'Zend/Gdata/App/Extension/Category.php'; /** * Data model class for a Photo Album Entry. diff --git a/library/Zend/Gdata/Photos/AlbumFeed.php b/library/Zend/Gdata/Photos/AlbumFeed.php index 0addc7a949..86f4c90d6c 100755 --- a/library/Zend/Gdata/Photos/AlbumFeed.php +++ b/library/Zend/Gdata/Photos/AlbumFeed.php @@ -24,17 +24,17 @@ /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Photos_AlbumEntry */ -require_once 'Zend/Gdata/Photos/AlbumEntry.php'; +;// require_once 'Zend/Gdata/Photos/AlbumEntry.php'; /** * Data model for a collection of album entries, usually @@ -238,7 +238,7 @@ protected function takeChildFromDOM($child) $entryClassName = $this->_entryKindClassMapping[$category->term]; break; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('Entry is missing kind declaration.'); } } diff --git a/library/Zend/Gdata/Photos/AlbumQuery.php b/library/Zend/Gdata/Photos/AlbumQuery.php index 7452569c87..42feec28ed 100755 --- a/library/Zend/Gdata/Photos/AlbumQuery.php +++ b/library/Zend/Gdata/Photos/AlbumQuery.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Photos_UserQuery */ -require_once('Zend/Gdata/Photos/UserQuery.php'); +;// require_once('Zend/Gdata/Photos/UserQuery.php'); /** * Assists in constructing album queries for various entries. @@ -134,11 +134,11 @@ public function getQueryUrl($incomingUri = '') } elseif ($this->getAlbumName() === null && $this->getAlbumId() !== null) { $uri .= '/albumid/' . $this->getAlbumId(); } elseif ($this->getAlbumName() !== null && $this->getAlbumId() !== null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'AlbumName and AlbumId cannot both be non-null'); } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'AlbumName and AlbumId cannot both be null'); } diff --git a/library/Zend/Gdata/Photos/CommentEntry.php b/library/Zend/Gdata/Photos/CommentEntry.php index 8eb68f7060..c12fa41e37 100755 --- a/library/Zend/Gdata/Photos/CommentEntry.php +++ b/library/Zend/Gdata/Photos/CommentEntry.php @@ -24,27 +24,27 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Photos_Extension_Id */ -require_once 'Zend/Gdata/Photos/Extension/Id.php'; +;// require_once 'Zend/Gdata/Photos/Extension/Id.php'; /** * @see Zend_Gdata_Photos_Extension_PhotoId */ -require_once 'Zend/Gdata/Photos/Extension/PhotoId.php'; +;// require_once 'Zend/Gdata/Photos/Extension/PhotoId.php'; /** * @see Zend_Gdata_Photos_Extension_Weight */ -require_once 'Zend/Gdata/Photos/Extension/Weight.php'; +;// require_once 'Zend/Gdata/Photos/Extension/Weight.php'; /** * @see Zend_Gdata_App_Extension_Category */ -require_once 'Zend/Gdata/App/Extension/Category.php'; +;// require_once 'Zend/Gdata/App/Extension/Category.php'; /** * Data model class for a Comment Entry. diff --git a/library/Zend/Gdata/Photos/Extension/Access.php b/library/Zend/Gdata/Photos/Extension/Access.php index 9ee7fda4a8..8448491532 100755 --- a/library/Zend/Gdata/Photos/Extension/Access.php +++ b/library/Zend/Gdata/Photos/Extension/Access.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:access element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/AlbumId.php b/library/Zend/Gdata/Photos/Extension/AlbumId.php index 9bc4c81fe9..73cb89e8e6 100755 --- a/library/Zend/Gdata/Photos/Extension/AlbumId.php +++ b/library/Zend/Gdata/Photos/Extension/AlbumId.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:albumid element used by the API. This diff --git a/library/Zend/Gdata/Photos/Extension/BytesUsed.php b/library/Zend/Gdata/Photos/Extension/BytesUsed.php index 7eb3bf96a4..be613f4a13 100755 --- a/library/Zend/Gdata/Photos/Extension/BytesUsed.php +++ b/library/Zend/Gdata/Photos/Extension/BytesUsed.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:bytesUsed element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/Checksum.php b/library/Zend/Gdata/Photos/Extension/Checksum.php index bc370d19bc..5c23d86e7c 100755 --- a/library/Zend/Gdata/Photos/Extension/Checksum.php +++ b/library/Zend/Gdata/Photos/Extension/Checksum.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:checksum element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/Client.php b/library/Zend/Gdata/Photos/Extension/Client.php index 40eca3bb67..598f7275cf 100755 --- a/library/Zend/Gdata/Photos/Extension/Client.php +++ b/library/Zend/Gdata/Photos/Extension/Client.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:client element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/CommentCount.php b/library/Zend/Gdata/Photos/Extension/CommentCount.php index 05dd76b95d..803fd45d36 100755 --- a/library/Zend/Gdata/Photos/Extension/CommentCount.php +++ b/library/Zend/Gdata/Photos/Extension/CommentCount.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:commentCount element used by the API. This diff --git a/library/Zend/Gdata/Photos/Extension/CommentingEnabled.php b/library/Zend/Gdata/Photos/Extension/CommentingEnabled.php index e955a838b0..4f17d3429e 100755 --- a/library/Zend/Gdata/Photos/Extension/CommentingEnabled.php +++ b/library/Zend/Gdata/Photos/Extension/CommentingEnabled.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:commentingEnabled element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/Height.php b/library/Zend/Gdata/Photos/Extension/Height.php index 2f8260359d..c4ecb73d87 100755 --- a/library/Zend/Gdata/Photos/Extension/Height.php +++ b/library/Zend/Gdata/Photos/Extension/Height.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:height element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/Id.php b/library/Zend/Gdata/Photos/Extension/Id.php index ae9288a9e5..6aae145f9e 100755 --- a/library/Zend/Gdata/Photos/Extension/Id.php +++ b/library/Zend/Gdata/Photos/Extension/Id.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:id element used by the API. This class diff --git a/library/Zend/Gdata/Photos/Extension/Location.php b/library/Zend/Gdata/Photos/Extension/Location.php index 9a635a20fc..e82c54d2ee 100755 --- a/library/Zend/Gdata/Photos/Extension/Location.php +++ b/library/Zend/Gdata/Photos/Extension/Location.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:location element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php b/library/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php index 25f3e20739..f2ee501c69 100755 --- a/library/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php +++ b/library/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:maxPhotosPerAlbum element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/Name.php b/library/Zend/Gdata/Photos/Extension/Name.php index 07563617b4..5e412329aa 100755 --- a/library/Zend/Gdata/Photos/Extension/Name.php +++ b/library/Zend/Gdata/Photos/Extension/Name.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:name element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/Nickname.php b/library/Zend/Gdata/Photos/Extension/Nickname.php index 907d8c7876..8ddf91c7c1 100755 --- a/library/Zend/Gdata/Photos/Extension/Nickname.php +++ b/library/Zend/Gdata/Photos/Extension/Nickname.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:nickname element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/NumPhotos.php b/library/Zend/Gdata/Photos/Extension/NumPhotos.php index 29f3642969..e4a0685f19 100755 --- a/library/Zend/Gdata/Photos/Extension/NumPhotos.php +++ b/library/Zend/Gdata/Photos/Extension/NumPhotos.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:numphotos element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php b/library/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php index 3aad7822db..daba40dd90 100755 --- a/library/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php +++ b/library/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:numphotosremaining element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/PhotoId.php b/library/Zend/Gdata/Photos/Extension/PhotoId.php index 42c2a48ceb..91d32a58c8 100755 --- a/library/Zend/Gdata/Photos/Extension/PhotoId.php +++ b/library/Zend/Gdata/Photos/Extension/PhotoId.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:id element used by the Picasa API. diff --git a/library/Zend/Gdata/Photos/Extension/Position.php b/library/Zend/Gdata/Photos/Extension/Position.php index 29f9957bca..a465cfcc67 100755 --- a/library/Zend/Gdata/Photos/Extension/Position.php +++ b/library/Zend/Gdata/Photos/Extension/Position.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:position element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/QuotaCurrent.php b/library/Zend/Gdata/Photos/Extension/QuotaCurrent.php index 2efb2fd807..c4f5f10ba2 100755 --- a/library/Zend/Gdata/Photos/Extension/QuotaCurrent.php +++ b/library/Zend/Gdata/Photos/Extension/QuotaCurrent.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:quotaCurrent element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/QuotaLimit.php b/library/Zend/Gdata/Photos/Extension/QuotaLimit.php index b0c03d8026..c31bec0a6b 100755 --- a/library/Zend/Gdata/Photos/Extension/QuotaLimit.php +++ b/library/Zend/Gdata/Photos/Extension/QuotaLimit.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:quotaLimit element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/Rotation.php b/library/Zend/Gdata/Photos/Extension/Rotation.php index f45a458c99..00c5adb97f 100755 --- a/library/Zend/Gdata/Photos/Extension/Rotation.php +++ b/library/Zend/Gdata/Photos/Extension/Rotation.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:rotation element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/Size.php b/library/Zend/Gdata/Photos/Extension/Size.php index 1dc5bee557..384dd7826e 100755 --- a/library/Zend/Gdata/Photos/Extension/Size.php +++ b/library/Zend/Gdata/Photos/Extension/Size.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:size element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/Thumbnail.php b/library/Zend/Gdata/Photos/Extension/Thumbnail.php index eb4de6d8b5..f4114063e5 100755 --- a/library/Zend/Gdata/Photos/Extension/Thumbnail.php +++ b/library/Zend/Gdata/Photos/Extension/Thumbnail.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:thumbnail element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/Timestamp.php b/library/Zend/Gdata/Photos/Extension/Timestamp.php index 1385a54b50..acf2491c59 100755 --- a/library/Zend/Gdata/Photos/Extension/Timestamp.php +++ b/library/Zend/Gdata/Photos/Extension/Timestamp.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:timestamp element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/User.php b/library/Zend/Gdata/Photos/Extension/User.php index df38de8e56..b44e320ab5 100755 --- a/library/Zend/Gdata/Photos/Extension/User.php +++ b/library/Zend/Gdata/Photos/Extension/User.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:user element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/Version.php b/library/Zend/Gdata/Photos/Extension/Version.php index 2f75d566d7..9893d69624 100755 --- a/library/Zend/Gdata/Photos/Extension/Version.php +++ b/library/Zend/Gdata/Photos/Extension/Version.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:version element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/Weight.php b/library/Zend/Gdata/Photos/Extension/Weight.php index 7d0f48a004..051c7d9a25 100755 --- a/library/Zend/Gdata/Photos/Extension/Weight.php +++ b/library/Zend/Gdata/Photos/Extension/Weight.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:weight element used by the API. diff --git a/library/Zend/Gdata/Photos/Extension/Width.php b/library/Zend/Gdata/Photos/Extension/Width.php index 8b83ec689f..2ab730822e 100755 --- a/library/Zend/Gdata/Photos/Extension/Width.php +++ b/library/Zend/Gdata/Photos/Extension/Width.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * Represents the gphoto:width element used by the API. diff --git a/library/Zend/Gdata/Photos/PhotoEntry.php b/library/Zend/Gdata/Photos/PhotoEntry.php index 9ce381c762..3713e037ba 100755 --- a/library/Zend/Gdata/Photos/PhotoEntry.php +++ b/library/Zend/Gdata/Photos/PhotoEntry.php @@ -24,82 +24,82 @@ /** * @see Zend_Gdata_MediaEntry */ -require_once 'Zend/Gdata/Media/Entry.php'; +;// require_once 'Zend/Gdata/Media/Entry.php'; /** * @see Zend_Gdata_Photos_Extension_PhotoId */ -require_once 'Zend/Gdata/Photos/Extension/PhotoId.php'; +;// require_once 'Zend/Gdata/Photos/Extension/PhotoId.php'; /** * @see Zend_Gdata_Photos_Extension_Version */ -require_once 'Zend/Gdata/Photos/Extension/Version.php'; +;// require_once 'Zend/Gdata/Photos/Extension/Version.php'; /** * @see Zend_Gdata_Photos_Extension_AlbumId */ -require_once 'Zend/Gdata/Photos/Extension/AlbumId.php'; +;// require_once 'Zend/Gdata/Photos/Extension/AlbumId.php'; /** * @see Zend_Gdata_Photos_Extension_Id */ -require_once 'Zend/Gdata/Photos/Extension/Id.php'; +;// require_once 'Zend/Gdata/Photos/Extension/Id.php'; /** * @see Zend_Gdata_Photos_Extension_Width */ -require_once 'Zend/Gdata/Photos/Extension/Width.php'; +;// require_once 'Zend/Gdata/Photos/Extension/Width.php'; /** * @see Zend_Gdata_Photos_Extension_Height */ -require_once 'Zend/Gdata/Photos/Extension/Height.php'; +;// require_once 'Zend/Gdata/Photos/Extension/Height.php'; /** * @see Zend_Gdata_Photos_Extension_Size */ -require_once 'Zend/Gdata/Photos/Extension/Size.php'; +;// require_once 'Zend/Gdata/Photos/Extension/Size.php'; /** * @see Zend_Gdata_Photos_Extension_Client */ -require_once 'Zend/Gdata/Photos/Extension/Client.php'; +;// require_once 'Zend/Gdata/Photos/Extension/Client.php'; /** * @see Zend_Gdata_Photos_Extension_Checksum */ -require_once 'Zend/Gdata/Photos/Extension/Checksum.php'; +;// require_once 'Zend/Gdata/Photos/Extension/Checksum.php'; /** * @see Zend_Gdata_Photos_Extension_Timestamp */ -require_once 'Zend/Gdata/Photos/Extension/Timestamp.php'; +;// require_once 'Zend/Gdata/Photos/Extension/Timestamp.php'; /** * @see Zend_Gdata_Photos_Extension_CommentingEnabled */ -require_once 'Zend/Gdata/Photos/Extension/CommentingEnabled.php'; +;// require_once 'Zend/Gdata/Photos/Extension/CommentingEnabled.php'; /** * @see Zend_Gdata_Photos_Extension_CommentCount */ -require_once 'Zend/Gdata/Photos/Extension/CommentCount.php'; +;// require_once 'Zend/Gdata/Photos/Extension/CommentCount.php'; /** * @see Zend_Gdata_Exif_Extension_Tags */ -require_once 'Zend/Gdata/Exif/Extension/Tags.php'; +;// require_once 'Zend/Gdata/Exif/Extension/Tags.php'; /** * @see Zend_Gdata_Geo_Extension_GeoRssWhere */ -require_once 'Zend/Gdata/Geo/Extension/GeoRssWhere.php'; +;// require_once 'Zend/Gdata/Geo/Extension/GeoRssWhere.php'; /** * @see Zend_Gdata_App_Extension_Category */ -require_once 'Zend/Gdata/App/Extension/Category.php'; +;// require_once 'Zend/Gdata/App/Extension/Category.php'; /** * Data model class for a Comment Entry. diff --git a/library/Zend/Gdata/Photos/PhotoFeed.php b/library/Zend/Gdata/Photos/PhotoFeed.php index d2795c53d4..5f4e1a5735 100755 --- a/library/Zend/Gdata/Photos/PhotoFeed.php +++ b/library/Zend/Gdata/Photos/PhotoFeed.php @@ -24,17 +24,17 @@ /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Photos_PhotoEntry */ -require_once 'Zend/Gdata/Photos/PhotoEntry.php'; +;// require_once 'Zend/Gdata/Photos/PhotoEntry.php'; /** * Data model for a collection of photo entries, usually @@ -265,7 +265,7 @@ protected function takeChildFromDOM($child) $entryClassName = $this->_entryKindClassMapping[$category->term]; break; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('Entry is missing kind declaration.'); } } diff --git a/library/Zend/Gdata/Photos/PhotoQuery.php b/library/Zend/Gdata/Photos/PhotoQuery.php index 1690f24780..6ceb398df3 100755 --- a/library/Zend/Gdata/Photos/PhotoQuery.php +++ b/library/Zend/Gdata/Photos/PhotoQuery.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Gapps_Picasa_AlbumQuery */ -require_once('Zend/Gdata/Photos/AlbumQuery.php'); +;// require_once('Zend/Gdata/Photos/AlbumQuery.php'); /** * Assists in constructing queries for comment/tag entries. @@ -87,7 +87,7 @@ public function getQueryUrl($incomingUri = '') if ($this->getPhotoId() !== null) { $uri .= '/photoid/' . $this->getPhotoId(); } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'PhotoId cannot be null'); } diff --git a/library/Zend/Gdata/Photos/TagEntry.php b/library/Zend/Gdata/Photos/TagEntry.php index 378a6d3586..49e72fd23b 100755 --- a/library/Zend/Gdata/Photos/TagEntry.php +++ b/library/Zend/Gdata/Photos/TagEntry.php @@ -24,17 +24,17 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Photos_Extension_Weight */ -require_once 'Zend/Gdata/Photos/Extension/Weight.php'; +;// require_once 'Zend/Gdata/Photos/Extension/Weight.php'; /** * @see Zend_Gdata_App_Extension_Category */ -require_once 'Zend/Gdata/App/Extension/Category.php'; +;// require_once 'Zend/Gdata/App/Extension/Category.php'; /** * Data model class for a Tag Entry. diff --git a/library/Zend/Gdata/Photos/UserEntry.php b/library/Zend/Gdata/Photos/UserEntry.php index 00b5fc1816..39cc1a76cf 100755 --- a/library/Zend/Gdata/Photos/UserEntry.php +++ b/library/Zend/Gdata/Photos/UserEntry.php @@ -24,47 +24,47 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Gapps */ -require_once 'Zend/Gdata/Gapps.php'; +;// require_once 'Zend/Gdata/Gapps.php'; /** * @see Zend_Gdata_Photos_Extension_Nickname */ -require_once 'Zend/Gdata/Photos/Extension/Nickname.php'; +;// require_once 'Zend/Gdata/Photos/Extension/Nickname.php'; /** * @see Zend_Gdata_Photos_Extension_Thumbnail */ -require_once 'Zend/Gdata/Photos/Extension/Thumbnail.php'; +;// require_once 'Zend/Gdata/Photos/Extension/Thumbnail.php'; /** * @see Zend_Gdata_Photos_Extension_QuotaCurrent */ -require_once 'Zend/Gdata/Photos/Extension/QuotaCurrent.php'; +;// require_once 'Zend/Gdata/Photos/Extension/QuotaCurrent.php'; /** * @see Zend_Gdata_Photos_Extension_QuotaLimit */ -require_once 'Zend/Gdata/Photos/Extension/QuotaLimit.php'; +;// require_once 'Zend/Gdata/Photos/Extension/QuotaLimit.php'; /** * @see Zend_Gdata_Photos_Extension_MaxPhotosPerAlbum */ -require_once 'Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php'; +;// require_once 'Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php'; /** * @see Zend_Gdata_Photos_Extension_User */ -require_once 'Zend/Gdata/Photos/Extension/User.php'; +;// require_once 'Zend/Gdata/Photos/Extension/User.php'; /** * @see Zend_Gdata_App_Extension_Category */ -require_once 'Zend/Gdata/App/Extension/Category.php'; +;// require_once 'Zend/Gdata/App/Extension/Category.php'; /** * Data model class for a User Entry. diff --git a/library/Zend/Gdata/Photos/UserFeed.php b/library/Zend/Gdata/Photos/UserFeed.php index 9f5b86231d..122622f479 100755 --- a/library/Zend/Gdata/Photos/UserFeed.php +++ b/library/Zend/Gdata/Photos/UserFeed.php @@ -24,37 +24,37 @@ /** * @see Zend_Gdata_Photos */ -require_once 'Zend/Gdata/Photos.php'; +;// require_once 'Zend/Gdata/Photos.php'; /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Photos_UserEntry */ -require_once 'Zend/Gdata/Photos/UserEntry.php'; +;// require_once 'Zend/Gdata/Photos/UserEntry.php'; /** * @see Zend_Gdata_Photos_AlbumEntry */ -require_once 'Zend/Gdata/Photos/AlbumEntry.php'; +;// require_once 'Zend/Gdata/Photos/AlbumEntry.php'; /** * @see Zend_Gdata_Photos_PhotoEntry */ -require_once 'Zend/Gdata/Photos/PhotoEntry.php'; +;// require_once 'Zend/Gdata/Photos/PhotoEntry.php'; /** * @see Zend_Gdata_Photos_TagEntry */ -require_once 'Zend/Gdata/Photos/TagEntry.php'; +;// require_once 'Zend/Gdata/Photos/TagEntry.php'; /** * @see Zend_Gdata_Photos_CommentEntry */ -require_once 'Zend/Gdata/Photos/CommentEntry.php'; +;// require_once 'Zend/Gdata/Photos/CommentEntry.php'; /** * Data model for a collection of entries for a specific user, usually @@ -144,7 +144,7 @@ protected function takeChildFromDOM($child) $entryClassName = $this->_entryKindClassMapping[$category->term]; break; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('Entry is missing kind declaration.'); } } diff --git a/library/Zend/Gdata/Photos/UserQuery.php b/library/Zend/Gdata/Photos/UserQuery.php index 02cf231a7c..1a4f0149fc 100755 --- a/library/Zend/Gdata/Photos/UserQuery.php +++ b/library/Zend/Gdata/Photos/UserQuery.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Gapps_Query */ -require_once('Zend/Gdata/Gapps/Query.php'); +;// require_once('Zend/Gdata/Gapps/Query.php'); /** * Assists in constructing queries for user entries. @@ -325,7 +325,7 @@ public function getQueryUrl($incomingUri = null) if ($this->getType() !== null) { $uri .= '/' . $this->getType(); } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Type must be feed or entry, not null'); } @@ -333,7 +333,7 @@ public function getQueryUrl($incomingUri = null) if ($this->getProjection() !== null) { $uri .= '/' . $this->getProjection(); } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Projection must not be null'); } @@ -342,7 +342,7 @@ public function getQueryUrl($incomingUri = null) $uri .= '/user/' . $this->getUser(); } else { // Should never occur due to setter behavior - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'User must not be null'); } diff --git a/library/Zend/Gdata/Query.php b/library/Zend/Gdata/Query.php index fae21af6bd..d3b94bf4d1 100644 --- a/library/Zend/Gdata/Query.php +++ b/library/Zend/Gdata/Query.php @@ -24,7 +24,7 @@ /** * Zend_Gdata_App_Util */ -require_once 'Zend/Gdata/App/Util.php'; +;// require_once 'Zend/Gdata/App/Util.php'; /** * Provides a mechanism to build a query URL for Gdata services. @@ -399,7 +399,7 @@ public function __get($name) if (method_exists($this, $method)) { return call_user_func(array(&$this, $method)); } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('Property ' . $name . ' does not exist'); } } @@ -410,7 +410,7 @@ public function __set($name, $val) if (method_exists($this, $method)) { return call_user_func(array(&$this, $method), $val); } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('Property ' . $name . ' does not exist'); } } diff --git a/library/Zend/Gdata/Spreadsheets.php b/library/Zend/Gdata/Spreadsheets.php index 8887b01ae2..633bc1373a 100644 --- a/library/Zend/Gdata/Spreadsheets.php +++ b/library/Zend/Gdata/Spreadsheets.php @@ -24,62 +24,62 @@ /** * Zend_Gdata */ -require_once('Zend/Gdata.php'); +;// require_once('Zend/Gdata.php'); /** * Zend_Gdata_Spreadsheets_SpreadsheetFeed */ -require_once('Zend/Gdata/Spreadsheets/SpreadsheetFeed.php'); +;// require_once('Zend/Gdata/Spreadsheets/SpreadsheetFeed.php'); /** * Zend_Gdata_Spreadsheets_WorksheetFeed */ -require_once('Zend/Gdata/Spreadsheets/WorksheetFeed.php'); +;// require_once('Zend/Gdata/Spreadsheets/WorksheetFeed.php'); /** * Zend_Gdata_Spreadsheets_CellFeed */ -require_once('Zend/Gdata/Spreadsheets/CellFeed.php'); +;// require_once('Zend/Gdata/Spreadsheets/CellFeed.php'); /** * Zend_Gdata_Spreadsheets_ListFeed */ -require_once('Zend/Gdata/Spreadsheets/ListFeed.php'); +;// require_once('Zend/Gdata/Spreadsheets/ListFeed.php'); /** * Zend_Gdata_Spreadsheets_SpreadsheetEntry */ -require_once('Zend/Gdata/Spreadsheets/SpreadsheetEntry.php'); +;// require_once('Zend/Gdata/Spreadsheets/SpreadsheetEntry.php'); /** * Zend_Gdata_Spreadsheets_WorksheetEntry */ -require_once('Zend/Gdata/Spreadsheets/WorksheetEntry.php'); +;// require_once('Zend/Gdata/Spreadsheets/WorksheetEntry.php'); /** * Zend_Gdata_Spreadsheets_CellEntry */ -require_once('Zend/Gdata/Spreadsheets/CellEntry.php'); +;// require_once('Zend/Gdata/Spreadsheets/CellEntry.php'); /** * Zend_Gdata_Spreadsheets_ListEntry */ -require_once('Zend/Gdata/Spreadsheets/ListEntry.php'); +;// require_once('Zend/Gdata/Spreadsheets/ListEntry.php'); /** * Zend_Gdata_Spreadsheets_DocumentQuery */ -require_once('Zend/Gdata/Spreadsheets/DocumentQuery.php'); +;// require_once('Zend/Gdata/Spreadsheets/DocumentQuery.php'); /** * Zend_Gdata_Spreadsheets_ListQuery */ -require_once('Zend/Gdata/Spreadsheets/ListQuery.php'); +;// require_once('Zend/Gdata/Spreadsheets/ListQuery.php'); /** * Zend_Gdata_Spreadsheets_CellQuery */ -require_once('Zend/Gdata/Spreadsheets/CellQuery.php'); +;// require_once('Zend/Gdata/Spreadsheets/CellQuery.php'); /** * Gdata Spreadsheets diff --git a/library/Zend/Gdata/Spreadsheets/CellEntry.php b/library/Zend/Gdata/Spreadsheets/CellEntry.php index 3f56d2c757..de7515e4d0 100644 --- a/library/Zend/Gdata/Spreadsheets/CellEntry.php +++ b/library/Zend/Gdata/Spreadsheets/CellEntry.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Spreadsheets_Extension_Cell */ -require_once 'Zend/Gdata/Spreadsheets/Extension/Cell.php'; +;// require_once 'Zend/Gdata/Spreadsheets/Extension/Cell.php'; /** * Concrete class for working with Cell entries. diff --git a/library/Zend/Gdata/Spreadsheets/CellFeed.php b/library/Zend/Gdata/Spreadsheets/CellFeed.php index 2029fff601..6b36f386a0 100644 --- a/library/Zend/Gdata/Spreadsheets/CellFeed.php +++ b/library/Zend/Gdata/Spreadsheets/CellFeed.php @@ -24,17 +24,17 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_Spreadsheets_Extension_RowCount */ -require_once 'Zend/Gdata/Spreadsheets/Extension/RowCount.php'; +;// require_once 'Zend/Gdata/Spreadsheets/Extension/RowCount.php'; /** * @see Zend_Gdata_Spreadsheets_Extension_ColCount */ -require_once 'Zend/Gdata/Spreadsheets/Extension/ColCount.php'; +;// require_once 'Zend/Gdata/Spreadsheets/Extension/ColCount.php'; /** * diff --git a/library/Zend/Gdata/Spreadsheets/CellQuery.php b/library/Zend/Gdata/Spreadsheets/CellQuery.php index 17790f9d32..a0ed9577a2 100644 --- a/library/Zend/Gdata/Spreadsheets/CellQuery.php +++ b/library/Zend/Gdata/Spreadsheets/CellQuery.php @@ -24,12 +24,12 @@ /** * Zend_Gdata_App_util */ -require_once('Zend/Gdata/App/Util.php'); +;// require_once('Zend/Gdata/App/Util.php'); /** * Zend_Gdata_Query */ -require_once('Zend/Gdata/Query.php'); +;// require_once('Zend/Gdata/Query.php'); /** * Assists in constructing queries for Google Spreadsheets cells @@ -368,28 +368,28 @@ public function getQueryUrl() if ($this->_spreadsheetKey != null) { $uri .= '/'.$this->_spreadsheetKey; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A spreadsheet key must be provided for cell queries.'); } if ($this->_worksheetId != null) { $uri .= '/'.$this->_worksheetId; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A worksheet id must be provided for cell queries.'); } if ($this->_visibility != null) { $uri .= '/'.$this->_visibility; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A visibility must be provided for cell queries.'); } if ($this->_projection != null) { $uri .= '/'.$this->_projection; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A projection must be provided for cell queries.'); } diff --git a/library/Zend/Gdata/Spreadsheets/DocumentQuery.php b/library/Zend/Gdata/Spreadsheets/DocumentQuery.php index d5e879d68e..1cadd1c2fa 100644 --- a/library/Zend/Gdata/Spreadsheets/DocumentQuery.php +++ b/library/Zend/Gdata/Spreadsheets/DocumentQuery.php @@ -24,12 +24,12 @@ /** * Zend_Gdata_App_util */ -require_once('Zend/Gdata/App/Util.php'); +;// require_once('Zend/Gdata/App/Util.php'); /** * Zend_Gdata_Query */ -require_once('Zend/Gdata/Query.php'); +;// require_once('Zend/Gdata/Query.php'); /** * Assists in constructing queries for Google Spreadsheets documents @@ -224,14 +224,14 @@ private function appendVisibilityProjection() if ($this->_visibility != null) { $uri .= '/'.$this->_visibility; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A visibility must be provided for document queries.'); } if ($this->_projection != null) { $uri .= '/'.$this->_projection; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A projection must be provided for document queries.'); } @@ -250,7 +250,7 @@ public function getQueryUrl() if ($this->_documentType != null) { $uri .= '/'.$this->_documentType; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A document type must be provided for document queries.'); } @@ -263,7 +263,7 @@ public function getQueryUrl() if ($this->_spreadsheetKey != null) { $uri .= '/'.$this->_spreadsheetKey; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A spreadsheet key must be provided for worksheet document queries.'); } $uri .= $this->appendVisibilityProjection(); diff --git a/library/Zend/Gdata/Spreadsheets/Extension/Cell.php b/library/Zend/Gdata/Spreadsheets/Extension/Cell.php index 142f7af09a..b5715dfb81 100644 --- a/library/Zend/Gdata/Spreadsheets/Extension/Cell.php +++ b/library/Zend/Gdata/Spreadsheets/Extension/Cell.php @@ -23,12 +23,12 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** diff --git a/library/Zend/Gdata/Spreadsheets/Extension/ColCount.php b/library/Zend/Gdata/Spreadsheets/Extension/ColCount.php index c0546ffd54..71c4042104 100644 --- a/library/Zend/Gdata/Spreadsheets/Extension/ColCount.php +++ b/library/Zend/Gdata/Spreadsheets/Extension/ColCount.php @@ -23,12 +23,12 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** diff --git a/library/Zend/Gdata/Spreadsheets/Extension/Custom.php b/library/Zend/Gdata/Spreadsheets/Extension/Custom.php index a02754fbe5..de9d148c10 100644 --- a/library/Zend/Gdata/Spreadsheets/Extension/Custom.php +++ b/library/Zend/Gdata/Spreadsheets/Extension/Custom.php @@ -23,12 +23,12 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** diff --git a/library/Zend/Gdata/Spreadsheets/Extension/RowCount.php b/library/Zend/Gdata/Spreadsheets/Extension/RowCount.php index d7b533864c..ed7d705b2c 100644 --- a/library/Zend/Gdata/Spreadsheets/Extension/RowCount.php +++ b/library/Zend/Gdata/Spreadsheets/Extension/RowCount.php @@ -23,12 +23,12 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** diff --git a/library/Zend/Gdata/Spreadsheets/ListEntry.php b/library/Zend/Gdata/Spreadsheets/ListEntry.php index 3f950c1aa7..8e659b5ac6 100644 --- a/library/Zend/Gdata/Spreadsheets/ListEntry.php +++ b/library/Zend/Gdata/Spreadsheets/ListEntry.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Spreadsheets_Extension_Custom */ -require_once 'Zend/Gdata/Spreadsheets/Extension/Custom.php'; +;// require_once 'Zend/Gdata/Spreadsheets/Extension/Custom.php'; /** * Concrete class for working with List entries. @@ -175,7 +175,7 @@ public function removeCustom($index) $key = array_search($element, $this->_customByName); unset($this->_customByName[$key]); } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Element does not exist.'); } @@ -198,7 +198,7 @@ public function removeCustomByName($name) $key = array_search($element, $this->_custom); unset($this->_custom[$key]); } else { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Element does not exist.'); } diff --git a/library/Zend/Gdata/Spreadsheets/ListFeed.php b/library/Zend/Gdata/Spreadsheets/ListFeed.php index 8ffd179687..ccddcdf145 100644 --- a/library/Zend/Gdata/Spreadsheets/ListFeed.php +++ b/library/Zend/Gdata/Spreadsheets/ListFeed.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * diff --git a/library/Zend/Gdata/Spreadsheets/ListQuery.php b/library/Zend/Gdata/Spreadsheets/ListQuery.php index 3a6156b291..8ae7856318 100644 --- a/library/Zend/Gdata/Spreadsheets/ListQuery.php +++ b/library/Zend/Gdata/Spreadsheets/ListQuery.php @@ -24,12 +24,12 @@ /** * Zend_Gdata_App_util */ -require_once('Zend/Gdata/App/Util.php'); +;// require_once('Zend/Gdata/App/Util.php'); /** * Zend_Gdata_Query */ -require_once('Zend/Gdata/Query.php'); +;// require_once('Zend/Gdata/Query.php'); /** * Assists in constructing queries for Google Spreadsheets lists @@ -260,28 +260,28 @@ public function getQueryUrl() if ($this->_spreadsheetKey != null) { $uri .= '/'.$this->_spreadsheetKey; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A spreadsheet key must be provided for list queries.'); } if ($this->_worksheetId != null) { $uri .= '/'.$this->_worksheetId; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A worksheet id must be provided for list queries.'); } if ($this->_visibility != null) { $uri .= '/'.$this->_visibility; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A visibility must be provided for list queries.'); } if ($this->_projection != null) { $uri .= '/'.$this->_projection; } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A projection must be provided for list queries.'); } diff --git a/library/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php b/library/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php index 1b35f3db1b..7054f442ad 100644 --- a/library/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php +++ b/library/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * Concrete class for working with Atom entries. diff --git a/library/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php b/library/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php index 69470a6633..2a5f6f7a6b 100644 --- a/library/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php +++ b/library/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * diff --git a/library/Zend/Gdata/Spreadsheets/WorksheetEntry.php b/library/Zend/Gdata/Spreadsheets/WorksheetEntry.php index 79b0da8214..9b1d0dee07 100644 --- a/library/Zend/Gdata/Spreadsheets/WorksheetEntry.php +++ b/library/Zend/Gdata/Spreadsheets/WorksheetEntry.php @@ -24,17 +24,17 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Spreadsheets_Extension_RowCount */ -require_once 'Zend/Gdata/Spreadsheets/Extension/RowCount.php'; +;// require_once 'Zend/Gdata/Spreadsheets/Extension/RowCount.php'; /** * @see Zend_Gdata_Spreadsheets_Extension_ColCount */ -require_once 'Zend/Gdata/Spreadsheets/Extension/ColCount.php'; +;// require_once 'Zend/Gdata/Spreadsheets/Extension/ColCount.php'; /** * Concrete class for working with Worksheet entries. diff --git a/library/Zend/Gdata/Spreadsheets/WorksheetFeed.php b/library/Zend/Gdata/Spreadsheets/WorksheetFeed.php index a0b87db40d..51a3efd547 100644 --- a/library/Zend/Gdata/Spreadsheets/WorksheetFeed.php +++ b/library/Zend/Gdata/Spreadsheets/WorksheetFeed.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * diff --git a/library/Zend/Gdata/YouTube.php b/library/Zend/Gdata/YouTube.php index 0871ad8d07..40507879e6 100644 --- a/library/Zend/Gdata/YouTube.php +++ b/library/Zend/Gdata/YouTube.php @@ -24,55 +24,55 @@ /** * @see Zend_Gdata_Media */ -require_once 'Zend/Gdata/Media.php'; +;// require_once 'Zend/Gdata/Media.php'; /** * @see Zend_Gdata_YouTube_VideoEntry */ -require_once 'Zend/Gdata/YouTube/VideoEntry.php'; +;// require_once 'Zend/Gdata/YouTube/VideoEntry.php'; /** * @see Zend_Gdata_YouTube_VideoFeed */ -require_once 'Zend/Gdata/YouTube/VideoFeed.php'; +;// require_once 'Zend/Gdata/YouTube/VideoFeed.php'; /** * @see Zend_Gdata_YouTube_CommentFeed */ -require_once 'Zend/Gdata/YouTube/CommentFeed.php'; +;// require_once 'Zend/Gdata/YouTube/CommentFeed.php'; /** * @see Zend_Gdata_YouTube_PlaylistListFeed */ -require_once 'Zend/Gdata/YouTube/PlaylistListFeed.php'; +;// require_once 'Zend/Gdata/YouTube/PlaylistListFeed.php'; /** * @see Zend_Gdata_YouTube_SubscriptionFeed */ -require_once 'Zend/Gdata/YouTube/SubscriptionFeed.php'; +;// require_once 'Zend/Gdata/YouTube/SubscriptionFeed.php'; /** * @see Zend_Gdata_YouTube_ContactFeed */ -require_once 'Zend/Gdata/YouTube/ContactFeed.php'; +;// require_once 'Zend/Gdata/YouTube/ContactFeed.php'; /** * @see Zend_Gdata_YouTube_PlaylistVideoFeed */ -require_once 'Zend/Gdata/YouTube/PlaylistVideoFeed.php'; +;// require_once 'Zend/Gdata/YouTube/PlaylistVideoFeed.php'; /** * @see Zend_Gdata_YouTube_ActivityFeed */ -require_once 'Zend/Gdata/YouTube/ActivityFeed.php'; +;// require_once 'Zend/Gdata/YouTube/ActivityFeed.php'; /** * @see Zend_Gdata_YouTube_InboxFeed */ -require_once 'Zend/Gdata/YouTube/InboxFeed.php'; +;// require_once 'Zend/Gdata/YouTube/InboxFeed.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** * Service class for interacting with the YouTube Data API. @@ -229,7 +229,7 @@ public function setHttpClient($client, $client = new Zend_Http_Client(); } if (!$client instanceof Zend_Http_Client) { - require_once 'Zend/Gdata/App/HttpException.php'; + ;// require_once 'Zend/Gdata/App/HttpException.php'; throw new Zend_Gdata_App_HttpException( 'Argument is not an instance of Zend_Http_Client.'); } @@ -656,7 +656,7 @@ public static function parseFormUploadTokenResponse($response) $doc = @Zend_Xml_Security::scan($response, $doc); if (!$doc) { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; $message = error_get_last()['message'] ?? 'Unknown error'; throw new Zend_Gdata_App_Exception( "Zend_Gdata_YouTube::parseFormUploadTokenResponse - " . @@ -683,7 +683,7 @@ public static function parseFormUploadTokenResponse($response) if ($tokenText != null && $urlText != null) { return array('token' => $tokenText, 'url' => $urlText); } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( 'Form upload token not found in response'); } @@ -705,7 +705,7 @@ public function getFormUploadToken($videoEntry, $response = $this->post($videoEntry, $url); return self::parseFormUploadTokenResponse($response->getBody()); } else { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( 'Url must be provided as a string URL'); } @@ -723,7 +723,7 @@ public function getFormUploadToken($videoEntry, public function getActivityForUser($username) { if ($this->getMajorProtocolVersion() == 1) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('User activity feeds ' . 'are not available in API version 1.'); } @@ -734,7 +734,7 @@ public function getActivityForUser($username) } else { if (count(explode(',', $username)) > self::ACTIVITY_FEED_MAX_USERS) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Activity feed can only retrieve for activity for up to ' . self::ACTIVITY_FEED_MAX_USERS . ' users per request'); @@ -754,7 +754,7 @@ public function getActivityForUser($username) public function getFriendActivityForCurrentUser() { if (!$this->isAuthenticated()) { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('You must be authenticated to ' . 'use the getFriendActivityForCurrentUser function in Zend_' . 'Gdata_YouTube.'); @@ -772,7 +772,7 @@ public function getFriendActivityForCurrentUser() public function getInboxFeedForCurrentUser() { if (!$this->isAuthenticated()) { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('You must be authenticated to ' . 'use the getInboxFeedForCurrentUser function in Zend_' . 'Gdata_YouTube.'); @@ -802,7 +802,7 @@ public function sendVideoMessage($body, $videoEntry, $videoId, $recipientUserName) { if (!$videoId && !$videoEntry) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Expecting either a valid videoID or a videoEntry object in ' . 'Zend_Gdata_YouTube->sendVideoMessage().'); diff --git a/library/Zend/Gdata/YouTube/ActivityEntry.php b/library/Zend/Gdata/YouTube/ActivityEntry.php index 997e4847f0..331fadc5de 100644 --- a/library/Zend/Gdata/YouTube/ActivityEntry.php +++ b/library/Zend/Gdata/YouTube/ActivityEntry.php @@ -24,22 +24,22 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_YouTube_Extension_VideoId */ -require_once 'Zend/Gdata/YouTube/Extension/VideoId.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/VideoId.php'; /** * @see Zend_Gdata_YouTube_Extension_Username */ -require_once 'Zend/Gdata/YouTube/Extension/Username.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Username.php'; /** * @see Zend_Gdata_YouTube_Extension_Rating */ -require_once 'Zend/Gdata/Extension/Rating.php'; +;// require_once 'Zend/Gdata/Extension/Rating.php'; /** * A concrete class for working with YouTube user activity entries. diff --git a/library/Zend/Gdata/YouTube/ActivityFeed.php b/library/Zend/Gdata/YouTube/ActivityFeed.php index 9fd092e37a..3fe80ffedc 100644 --- a/library/Zend/Gdata/YouTube/ActivityFeed.php +++ b/library/Zend/Gdata/YouTube/ActivityFeed.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_YouTube_ActivityEntry */ -require_once 'Zend/Gdata/YouTube/ActivityEntry.php'; +;// require_once 'Zend/Gdata/YouTube/ActivityEntry.php'; /** * A feed of user activity entries for YouTube diff --git a/library/Zend/Gdata/YouTube/CommentEntry.php b/library/Zend/Gdata/YouTube/CommentEntry.php index fe3c9506be..d5a5c98855 100644 --- a/library/Zend/Gdata/YouTube/CommentEntry.php +++ b/library/Zend/Gdata/YouTube/CommentEntry.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Media_Feed */ -require_once 'Zend/Gdata/Media/Feed.php'; +;// require_once 'Zend/Gdata/Media/Feed.php'; /** * The YouTube comments flavor of an Atom Entry diff --git a/library/Zend/Gdata/YouTube/CommentFeed.php b/library/Zend/Gdata/YouTube/CommentFeed.php index d50a4ef93f..bca1dc7e95 100644 --- a/library/Zend/Gdata/YouTube/CommentFeed.php +++ b/library/Zend/Gdata/YouTube/CommentFeed.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_feed */ -require_once 'Zend/Gdata/Feed.php'; +;// require_once 'Zend/Gdata/Feed.php'; /** * @see Zend_Gdata_YouTube_CommentEntry */ -require_once 'Zend/Gdata/YouTube/CommentEntry.php'; +;// require_once 'Zend/Gdata/YouTube/CommentEntry.php'; /** * The YouTube comments flavor of an Atom Feed diff --git a/library/Zend/Gdata/YouTube/ContactEntry.php b/library/Zend/Gdata/YouTube/ContactEntry.php index 1428344e2b..aa6ed04c33 100644 --- a/library/Zend/Gdata/YouTube/ContactEntry.php +++ b/library/Zend/Gdata/YouTube/ContactEntry.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_YouTube_UserProfileEntry */ -require_once 'Zend/Gdata/YouTube/UserProfileEntry.php'; +;// require_once 'Zend/Gdata/YouTube/UserProfileEntry.php'; /** * @see Zend_Gdata_YouTube_Extension_Status */ -require_once 'Zend/Gdata/YouTube/Extension/Status.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Status.php'; /** * The YouTube contacts flavor of an Atom Entry with media support diff --git a/library/Zend/Gdata/YouTube/ContactFeed.php b/library/Zend/Gdata/YouTube/ContactFeed.php index b4a1d8b02c..38fc7daa51 100644 --- a/library/Zend/Gdata/YouTube/ContactFeed.php +++ b/library/Zend/Gdata/YouTube/ContactFeed.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Media_Feed */ -require_once 'Zend/Gdata/Media/Feed.php'; +;// require_once 'Zend/Gdata/Media/Feed.php'; /** * @see Zend_Gdata_YouTube_ContactEntry */ -require_once 'Zend/Gdata/YouTube/ContactEntry.php'; +;// require_once 'Zend/Gdata/YouTube/ContactEntry.php'; /** * The YouTube contacts flavor of an Atom Feed with media support diff --git a/library/Zend/Gdata/YouTube/Extension/AboutMe.php b/library/Zend/Gdata/YouTube/Extension/AboutMe.php index 28ffe46f55..6413ad7bed 100644 --- a/library/Zend/Gdata/YouTube/Extension/AboutMe.php +++ b/library/Zend/Gdata/YouTube/Extension/AboutMe.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:aboutMe element diff --git a/library/Zend/Gdata/YouTube/Extension/Age.php b/library/Zend/Gdata/YouTube/Extension/Age.php index 23ffc4a515..2ce7c88bc9 100644 --- a/library/Zend/Gdata/YouTube/Extension/Age.php +++ b/library/Zend/Gdata/YouTube/Extension/Age.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:age element diff --git a/library/Zend/Gdata/YouTube/Extension/Books.php b/library/Zend/Gdata/YouTube/Extension/Books.php index 881e854953..07113b43e9 100644 --- a/library/Zend/Gdata/YouTube/Extension/Books.php +++ b/library/Zend/Gdata/YouTube/Extension/Books.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:books element diff --git a/library/Zend/Gdata/YouTube/Extension/Company.php b/library/Zend/Gdata/YouTube/Extension/Company.php index cf52f1ddf4..10719e9c96 100644 --- a/library/Zend/Gdata/YouTube/Extension/Company.php +++ b/library/Zend/Gdata/YouTube/Extension/Company.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:company element diff --git a/library/Zend/Gdata/YouTube/Extension/Control.php b/library/Zend/Gdata/YouTube/Extension/Control.php index 5c6321843a..5df4753239 100755 --- a/library/Zend/Gdata/YouTube/Extension/Control.php +++ b/library/Zend/Gdata/YouTube/Extension/Control.php @@ -23,12 +23,12 @@ /** * @see Zend_Gdata_App_Extension_Control */ -require_once 'Zend/Gdata/App/Extension/Control.php'; +;// require_once 'Zend/Gdata/App/Extension/Control.php'; /** * @see Zend_Gdata_YouTube_Extension_State */ -require_once 'Zend/Gdata/YouTube/Extension/State.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/State.php'; /** diff --git a/library/Zend/Gdata/YouTube/Extension/CountHint.php b/library/Zend/Gdata/YouTube/Extension/CountHint.php index 23d243d4f9..1902bee1bd 100755 --- a/library/Zend/Gdata/YouTube/Extension/CountHint.php +++ b/library/Zend/Gdata/YouTube/Extension/CountHint.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:countHint element diff --git a/library/Zend/Gdata/YouTube/Extension/Description.php b/library/Zend/Gdata/YouTube/Extension/Description.php index 6f67db17b0..b0c798c7c4 100644 --- a/library/Zend/Gdata/YouTube/Extension/Description.php +++ b/library/Zend/Gdata/YouTube/Extension/Description.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:description element diff --git a/library/Zend/Gdata/YouTube/Extension/Duration.php b/library/Zend/Gdata/YouTube/Extension/Duration.php index 62804005f5..0298bf8054 100644 --- a/library/Zend/Gdata/YouTube/Extension/Duration.php +++ b/library/Zend/Gdata/YouTube/Extension/Duration.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:duration element used by the YouTube data API diff --git a/library/Zend/Gdata/YouTube/Extension/FirstName.php b/library/Zend/Gdata/YouTube/Extension/FirstName.php index 1decc020c1..0191e2bbbf 100644 --- a/library/Zend/Gdata/YouTube/Extension/FirstName.php +++ b/library/Zend/Gdata/YouTube/Extension/FirstName.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:firstName element diff --git a/library/Zend/Gdata/YouTube/Extension/Gender.php b/library/Zend/Gdata/YouTube/Extension/Gender.php index 49abf54875..d6fe5d32ee 100644 --- a/library/Zend/Gdata/YouTube/Extension/Gender.php +++ b/library/Zend/Gdata/YouTube/Extension/Gender.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:gender element diff --git a/library/Zend/Gdata/YouTube/Extension/Hobbies.php b/library/Zend/Gdata/YouTube/Extension/Hobbies.php index 77bb9e55e8..2268855f4d 100644 --- a/library/Zend/Gdata/YouTube/Extension/Hobbies.php +++ b/library/Zend/Gdata/YouTube/Extension/Hobbies.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:hobbies element diff --git a/library/Zend/Gdata/YouTube/Extension/Hometown.php b/library/Zend/Gdata/YouTube/Extension/Hometown.php index f7394bb0a3..0234e0d9d1 100644 --- a/library/Zend/Gdata/YouTube/Extension/Hometown.php +++ b/library/Zend/Gdata/YouTube/Extension/Hometown.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:hometown element diff --git a/library/Zend/Gdata/YouTube/Extension/LastName.php b/library/Zend/Gdata/YouTube/Extension/LastName.php index bbc355d7fa..375a397ff7 100644 --- a/library/Zend/Gdata/YouTube/Extension/LastName.php +++ b/library/Zend/Gdata/YouTube/Extension/LastName.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:lastName element diff --git a/library/Zend/Gdata/YouTube/Extension/Link.php b/library/Zend/Gdata/YouTube/Extension/Link.php index 9f6a60a634..b715f5a83a 100755 --- a/library/Zend/Gdata/YouTube/Extension/Link.php +++ b/library/Zend/Gdata/YouTube/Extension/Link.php @@ -23,12 +23,12 @@ /** * @see Zend_Gdata_App_Extension_Link */ -require_once 'Zend/Gdata/App/Extension/Link.php'; +;// require_once 'Zend/Gdata/App/Extension/Link.php'; /** * @see Zend_Gdata_YouTube_Extension_Token */ -require_once 'Zend/Gdata/YouTube/Extension/Token.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Token.php'; /** diff --git a/library/Zend/Gdata/YouTube/Extension/Location.php b/library/Zend/Gdata/YouTube/Extension/Location.php index 20be0d0a90..a81179495a 100644 --- a/library/Zend/Gdata/YouTube/Extension/Location.php +++ b/library/Zend/Gdata/YouTube/Extension/Location.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:location element diff --git a/library/Zend/Gdata/YouTube/Extension/MediaContent.php b/library/Zend/Gdata/YouTube/Extension/MediaContent.php index 0984f2e7a0..d33da38984 100755 --- a/library/Zend/Gdata/YouTube/Extension/MediaContent.php +++ b/library/Zend/Gdata/YouTube/Extension/MediaContent.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Media_Extension_MediaContent */ -require_once 'Zend/Gdata/Media/Extension/MediaContent.php'; +;// require_once 'Zend/Gdata/Media/Extension/MediaContent.php'; /** * Represents the media:content element of Media RSS. diff --git a/library/Zend/Gdata/YouTube/Extension/MediaCredit.php b/library/Zend/Gdata/YouTube/Extension/MediaCredit.php index 618783946a..e8a9afed90 100644 --- a/library/Zend/Gdata/YouTube/Extension/MediaCredit.php +++ b/library/Zend/Gdata/YouTube/Extension/MediaCredit.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_App_Extension */ -require_once 'Zend/Gdata/App/Extension.php'; +;// require_once 'Zend/Gdata/App/Extension.php'; /** * Represents the YouTube specific media:credit element diff --git a/library/Zend/Gdata/YouTube/Extension/MediaGroup.php b/library/Zend/Gdata/YouTube/Extension/MediaGroup.php index 65e573a0aa..4560a78972 100755 --- a/library/Zend/Gdata/YouTube/Extension/MediaGroup.php +++ b/library/Zend/Gdata/YouTube/Extension/MediaGroup.php @@ -24,42 +24,42 @@ /** * @see Zend_Gdata_Media_Extension_MediaGroup */ -require_once 'Zend/Gdata/Media/Extension/MediaGroup.php'; +;// require_once 'Zend/Gdata/Media/Extension/MediaGroup.php'; /** * @see Zend_Gdata_YouTube_Extension_MediaContent */ -require_once 'Zend/Gdata/YouTube/Extension/MediaContent.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/MediaContent.php'; /** * @see Zend_Gdata_YouTube_Extension_Duration */ -require_once 'Zend/Gdata/YouTube/Extension/Duration.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Duration.php'; /** * @see Zend_Gdata_YouTube_Extension_MediaRating */ -require_once 'Zend/Gdata/YouTube/Extension/MediaRating.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/MediaRating.php'; /** * @see Zend_Gdata_YouTube_Extension_MediaCredit */ -require_once 'Zend/Gdata/YouTube/Extension/MediaCredit.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/MediaCredit.php'; /** * @see Zend_Gdata_YouTube_Extension_Private */ -require_once 'Zend/Gdata/YouTube/Extension/Private.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Private.php'; /** * @see Zend_Gdata_YouTube_Extension_VideoId */ -require_once 'Zend/Gdata/YouTube/Extension/VideoId.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/VideoId.php'; /** * @see Zend_Gdata_YouTube_Extension_Uploaded */ -require_once 'Zend/Gdata/YouTube/Extension/Uploaded.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Uploaded.php'; /** * This class represents the media:group element of Media RSS. diff --git a/library/Zend/Gdata/YouTube/Extension/MediaRating.php b/library/Zend/Gdata/YouTube/Extension/MediaRating.php index 62f1dffd12..b2653caf94 100755 --- a/library/Zend/Gdata/YouTube/Extension/MediaRating.php +++ b/library/Zend/Gdata/YouTube/Extension/MediaRating.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the media:rating element specific to YouTube. diff --git a/library/Zend/Gdata/YouTube/Extension/Movies.php b/library/Zend/Gdata/YouTube/Extension/Movies.php index 7d42eea3cc..a268ba13a4 100644 --- a/library/Zend/Gdata/YouTube/Extension/Movies.php +++ b/library/Zend/Gdata/YouTube/Extension/Movies.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:movies element diff --git a/library/Zend/Gdata/YouTube/Extension/Music.php b/library/Zend/Gdata/YouTube/Extension/Music.php index 0b29883d43..616da5eff8 100644 --- a/library/Zend/Gdata/YouTube/Extension/Music.php +++ b/library/Zend/Gdata/YouTube/Extension/Music.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:music element diff --git a/library/Zend/Gdata/YouTube/Extension/NoEmbed.php b/library/Zend/Gdata/YouTube/Extension/NoEmbed.php index d7d0ea2a6e..23fcc1bd93 100644 --- a/library/Zend/Gdata/YouTube/Extension/NoEmbed.php +++ b/library/Zend/Gdata/YouTube/Extension/NoEmbed.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:noembed element used by the YouTube data API diff --git a/library/Zend/Gdata/YouTube/Extension/Occupation.php b/library/Zend/Gdata/YouTube/Extension/Occupation.php index 1d4678423b..131ab85842 100644 --- a/library/Zend/Gdata/YouTube/Extension/Occupation.php +++ b/library/Zend/Gdata/YouTube/Extension/Occupation.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:occupation element diff --git a/library/Zend/Gdata/YouTube/Extension/PlaylistId.php b/library/Zend/Gdata/YouTube/Extension/PlaylistId.php index cf8e0b2acb..67b472b9db 100644 --- a/library/Zend/Gdata/YouTube/Extension/PlaylistId.php +++ b/library/Zend/Gdata/YouTube/Extension/PlaylistId.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:playlistId element diff --git a/library/Zend/Gdata/YouTube/Extension/PlaylistTitle.php b/library/Zend/Gdata/YouTube/Extension/PlaylistTitle.php index da224f5df7..922dcf0e14 100644 --- a/library/Zend/Gdata/YouTube/Extension/PlaylistTitle.php +++ b/library/Zend/Gdata/YouTube/Extension/PlaylistTitle.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:playlistTitle element diff --git a/library/Zend/Gdata/YouTube/Extension/Position.php b/library/Zend/Gdata/YouTube/Extension/Position.php index bd5345ac96..2c17f45e87 100644 --- a/library/Zend/Gdata/YouTube/Extension/Position.php +++ b/library/Zend/Gdata/YouTube/Extension/Position.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Data model class to represent a playlist item's position in the list (yt:position) diff --git a/library/Zend/Gdata/YouTube/Extension/Private.php b/library/Zend/Gdata/YouTube/Extension/Private.php index ddca1ee104..7acf8aadc8 100755 --- a/library/Zend/Gdata/YouTube/Extension/Private.php +++ b/library/Zend/Gdata/YouTube/Extension/Private.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:private element used by the YouTube data API diff --git a/library/Zend/Gdata/YouTube/Extension/QueryString.php b/library/Zend/Gdata/YouTube/Extension/QueryString.php index e99c5b96c0..829c7b22ee 100644 --- a/library/Zend/Gdata/YouTube/Extension/QueryString.php +++ b/library/Zend/Gdata/YouTube/Extension/QueryString.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:queryString element diff --git a/library/Zend/Gdata/YouTube/Extension/Racy.php b/library/Zend/Gdata/YouTube/Extension/Racy.php index 0bfc11c40a..a468fcf733 100644 --- a/library/Zend/Gdata/YouTube/Extension/Racy.php +++ b/library/Zend/Gdata/YouTube/Extension/Racy.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:racy element used by the YouTube data API diff --git a/library/Zend/Gdata/YouTube/Extension/Recorded.php b/library/Zend/Gdata/YouTube/Extension/Recorded.php index 161c8e2e81..48b3b1d90a 100644 --- a/library/Zend/Gdata/YouTube/Extension/Recorded.php +++ b/library/Zend/Gdata/YouTube/Extension/Recorded.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:recorded element diff --git a/library/Zend/Gdata/YouTube/Extension/Relationship.php b/library/Zend/Gdata/YouTube/Extension/Relationship.php index e40b401e97..a678ecec49 100644 --- a/library/Zend/Gdata/YouTube/Extension/Relationship.php +++ b/library/Zend/Gdata/YouTube/Extension/Relationship.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:relationship element diff --git a/library/Zend/Gdata/YouTube/Extension/ReleaseDate.php b/library/Zend/Gdata/YouTube/Extension/ReleaseDate.php index 7f92ef30de..f0ae248347 100644 --- a/library/Zend/Gdata/YouTube/Extension/ReleaseDate.php +++ b/library/Zend/Gdata/YouTube/Extension/ReleaseDate.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:releaseDate element diff --git a/library/Zend/Gdata/YouTube/Extension/School.php b/library/Zend/Gdata/YouTube/Extension/School.php index d1bd2ed317..e8374312d9 100644 --- a/library/Zend/Gdata/YouTube/Extension/School.php +++ b/library/Zend/Gdata/YouTube/Extension/School.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:school element diff --git a/library/Zend/Gdata/YouTube/Extension/State.php b/library/Zend/Gdata/YouTube/Extension/State.php index 88aff30e69..c255c6db2a 100644 --- a/library/Zend/Gdata/YouTube/Extension/State.php +++ b/library/Zend/Gdata/YouTube/Extension/State.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:state element used by the YouTube data API diff --git a/library/Zend/Gdata/YouTube/Extension/Statistics.php b/library/Zend/Gdata/YouTube/Extension/Statistics.php index e0bac50526..fb5704dc62 100644 --- a/library/Zend/Gdata/YouTube/Extension/Statistics.php +++ b/library/Zend/Gdata/YouTube/Extension/Statistics.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:statistics element used by the YouTube data API diff --git a/library/Zend/Gdata/YouTube/Extension/Status.php b/library/Zend/Gdata/YouTube/Extension/Status.php index e0d422f9e2..7abeee608b 100644 --- a/library/Zend/Gdata/YouTube/Extension/Status.php +++ b/library/Zend/Gdata/YouTube/Extension/Status.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:status element diff --git a/library/Zend/Gdata/YouTube/Extension/Token.php b/library/Zend/Gdata/YouTube/Extension/Token.php index 86230aea27..377230b436 100755 --- a/library/Zend/Gdata/YouTube/Extension/Token.php +++ b/library/Zend/Gdata/YouTube/Extension/Token.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:token element used by the YouTube data API diff --git a/library/Zend/Gdata/YouTube/Extension/Uploaded.php b/library/Zend/Gdata/YouTube/Extension/Uploaded.php index f8545119b6..3f83ba1ac7 100644 --- a/library/Zend/Gdata/YouTube/Extension/Uploaded.php +++ b/library/Zend/Gdata/YouTube/Extension/Uploaded.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:uploaded element diff --git a/library/Zend/Gdata/YouTube/Extension/Username.php b/library/Zend/Gdata/YouTube/Extension/Username.php index 3341059784..5980561791 100644 --- a/library/Zend/Gdata/YouTube/Extension/Username.php +++ b/library/Zend/Gdata/YouTube/Extension/Username.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:username element diff --git a/library/Zend/Gdata/YouTube/Extension/VideoId.php b/library/Zend/Gdata/YouTube/Extension/VideoId.php index 7f61d13a24..1123b3f7db 100644 --- a/library/Zend/Gdata/YouTube/Extension/VideoId.php +++ b/library/Zend/Gdata/YouTube/Extension/VideoId.php @@ -24,7 +24,7 @@ /** * @see Zend_Gdata_Extension */ -require_once 'Zend/Gdata/Extension.php'; +;// require_once 'Zend/Gdata/Extension.php'; /** * Represents the yt:videoid element diff --git a/library/Zend/Gdata/YouTube/InboxEntry.php b/library/Zend/Gdata/YouTube/InboxEntry.php index b627352067..ec73db2162 100644 --- a/library/Zend/Gdata/YouTube/InboxEntry.php +++ b/library/Zend/Gdata/YouTube/InboxEntry.php @@ -24,27 +24,27 @@ /** * @see Zend_Gdata_Media_Entry */ -require_once 'Zend/Gdata/Media/Entry.php'; +;// require_once 'Zend/Gdata/Media/Entry.php'; /** * @see Zend_Gdata_Extension_Rating */ -require_once 'Zend/Gdata/Extension/Rating.php'; +;// require_once 'Zend/Gdata/Extension/Rating.php'; /** * @see Zend_Gdata_Extension_Comments */ -require_once 'Zend/Gdata/Extension/Comments.php'; +;// require_once 'Zend/Gdata/Extension/Comments.php'; /** * @see Zend_Gdata_YouTube_Extension_Statistics */ -require_once 'Zend/Gdata/YouTube/Extension/Statistics.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Statistics.php'; /** * @see Zend_Gdata_YouTube_Extension_Description */ -require_once 'Zend/Gdata/YouTube/Extension/Description.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Description.php'; /** @@ -179,7 +179,7 @@ protected function takeChildFromDOM($child) public function getDescription() { if ($this->getMajorProtocolVersion() == 2) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The getDescription ' . ' method is only supported in version 1 of the YouTube ' . 'API.'); @@ -199,7 +199,7 @@ public function getDescription() public function setDescription($description = null) { if ($this->getMajorProtocolVersion() == 2) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The setDescription ' . ' method is only supported in version 1 of the YouTube ' . 'API.'); diff --git a/library/Zend/Gdata/YouTube/InboxFeed.php b/library/Zend/Gdata/YouTube/InboxFeed.php index a1b957798e..d999570870 100644 --- a/library/Zend/Gdata/YouTube/InboxFeed.php +++ b/library/Zend/Gdata/YouTube/InboxFeed.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Media_Feed */ -require_once 'Zend/Gdata/Media/Feed.php'; +;// require_once 'Zend/Gdata/Media/Feed.php'; /** * @see Zend_Gdata_YouTube_InboxEntry */ -require_once 'Zend/Gdata/YouTube/InboxEntry.php'; +;// require_once 'Zend/Gdata/YouTube/InboxEntry.php'; /** * The YouTube inbox feed list flavor of an Atom Feed with media support diff --git a/library/Zend/Gdata/YouTube/MediaEntry.php b/library/Zend/Gdata/YouTube/MediaEntry.php index ef918877f2..1a30bc2790 100755 --- a/library/Zend/Gdata/YouTube/MediaEntry.php +++ b/library/Zend/Gdata/YouTube/MediaEntry.php @@ -24,17 +24,17 @@ /** * @see Zend_Gdata_Media */ -require_once 'Zend/Gdata/Media.php'; +;// require_once 'Zend/Gdata/Media.php'; /** * @see Zend_Gdata_Media_Entry */ -require_once 'Zend/Gdata/Media/Entry.php'; +;// require_once 'Zend/Gdata/Media/Entry.php'; /** * @see Zend_Gdata_YouTube_Extension_MediaGroup */ -require_once 'Zend/Gdata/YouTube/Extension/MediaGroup.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/MediaGroup.php'; /** * Represents the YouTube flavor of a Gdata Media Entry diff --git a/library/Zend/Gdata/YouTube/PlaylistListEntry.php b/library/Zend/Gdata/YouTube/PlaylistListEntry.php index b8d8b71689..8b05a1162a 100644 --- a/library/Zend/Gdata/YouTube/PlaylistListEntry.php +++ b/library/Zend/Gdata/YouTube/PlaylistListEntry.php @@ -24,32 +24,32 @@ /** * @see Zend_Gdata_YouTube */ -require_once 'Zend/Gdata/YouTube.php'; +;// require_once 'Zend/Gdata/YouTube.php'; /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension_FeedLink */ -require_once 'Zend/Gdata/Extension/FeedLink.php'; +;// require_once 'Zend/Gdata/Extension/FeedLink.php'; /** * @see Zend_Gdata_YouTube_Extension_Description */ -require_once 'Zend/Gdata/YouTube/Extension/Description.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Description.php'; /** * @see Zend_Gdata_YouTube_Extension_PlaylistId */ -require_once 'Zend/Gdata/YouTube/Extension/PlaylistId.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/PlaylistId.php'; /** * @see Zend_Gdata_YouTube_Extension_CountHint */ -require_once 'Zend/Gdata/YouTube/Extension/CountHint.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/CountHint.php'; /** * Represents the YouTube video playlist flavor of an Atom entry @@ -218,7 +218,7 @@ public function getCountHint() { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The yt:countHint ' . 'element is not supported in versions earlier than 2.'); } else { @@ -236,7 +236,7 @@ public function getPlaylistId() { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The yt:playlistId ' . 'element is not supported in versions earlier than 2.'); } else { diff --git a/library/Zend/Gdata/YouTube/PlaylistListFeed.php b/library/Zend/Gdata/YouTube/PlaylistListFeed.php index 4cfbcdb0b1..6f7b96995c 100644 --- a/library/Zend/Gdata/YouTube/PlaylistListFeed.php +++ b/library/Zend/Gdata/YouTube/PlaylistListFeed.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Media_Feed */ -require_once 'Zend/Gdata/Media/Feed.php'; +;// require_once 'Zend/Gdata/Media/Feed.php'; /** * @see Zend_Gdata_YouTube_PlaylistListEntry */ -require_once 'Zend/Gdata/YouTube/PlaylistListEntry.php'; +;// require_once 'Zend/Gdata/YouTube/PlaylistListEntry.php'; /** * The YouTube video playlist flavor of an Atom Feed with media support diff --git a/library/Zend/Gdata/YouTube/PlaylistVideoEntry.php b/library/Zend/Gdata/YouTube/PlaylistVideoEntry.php index 89459a18b0..0fa507fb07 100644 --- a/library/Zend/Gdata/YouTube/PlaylistVideoEntry.php +++ b/library/Zend/Gdata/YouTube/PlaylistVideoEntry.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_YouTube_VideoEntry */ -require_once 'Zend/Gdata/YouTube/VideoEntry.php'; +;// require_once 'Zend/Gdata/YouTube/VideoEntry.php'; /** * @see Zend_Gdata_YouTube_Extension_Position */ -require_once 'Zend/Gdata/YouTube/Extension/Position.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Position.php'; /** * Represents the YouTube video playlist flavor of an Atom entry diff --git a/library/Zend/Gdata/YouTube/PlaylistVideoFeed.php b/library/Zend/Gdata/YouTube/PlaylistVideoFeed.php index ea0bc2ce08..f65d62de3b 100644 --- a/library/Zend/Gdata/YouTube/PlaylistVideoFeed.php +++ b/library/Zend/Gdata/YouTube/PlaylistVideoFeed.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Media_Feed */ -require_once 'Zend/Gdata/Media/Feed.php'; +;// require_once 'Zend/Gdata/Media/Feed.php'; /** * @see Zend_Gdata_YouTube_PlaylistVideoEntry */ -require_once 'Zend/Gdata/YouTube/PlaylistVideoEntry.php'; +;// require_once 'Zend/Gdata/YouTube/PlaylistVideoEntry.php'; /** * The YouTube video playlist flavor of an Atom Feed with media support diff --git a/library/Zend/Gdata/YouTube/SubscriptionEntry.php b/library/Zend/Gdata/YouTube/SubscriptionEntry.php index c0e0509e91..2a37779dbd 100644 --- a/library/Zend/Gdata/YouTube/SubscriptionEntry.php +++ b/library/Zend/Gdata/YouTube/SubscriptionEntry.php @@ -24,47 +24,47 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension_FeedLink */ -require_once 'Zend/Gdata/Extension/FeedLink.php'; +;// require_once 'Zend/Gdata/Extension/FeedLink.php'; /** * @see Zend_Gdata_YouTube_Extension_Description */ -require_once 'Zend/Gdata/YouTube/Extension/Description.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Description.php'; /** * @see Zend_Gdata_YouTube_Extension_PlaylistTitle */ -require_once 'Zend/Gdata/YouTube/Extension/PlaylistTitle.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/PlaylistTitle.php'; /** * @see Zend_Gdata_YouTube_Extension_PlaylistId */ -require_once 'Zend/Gdata/YouTube/Extension/PlaylistId.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/PlaylistId.php'; /** * @see Zend_Gdata_Media_Extension_MediaThumbnail */ -require_once 'Zend/Gdata/Media/Extension/MediaThumbnail.php'; +;// require_once 'Zend/Gdata/Media/Extension/MediaThumbnail.php'; /** * @see Zend_Gdata_YouTube_Extension_Username */ -require_once 'Zend/Gdata/YouTube/Extension/Username.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Username.php'; /** * @see Zend_Gdata_YouTube_Extension_CountHint */ -require_once 'Zend/Gdata/YouTube/Extension/CountHint.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/CountHint.php'; /** * @see Zend_Gdata_YouTube_Extension_QueryString */ -require_once 'Zend/Gdata/YouTube/Extension/QueryString.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/QueryString.php'; /** * Represents the YouTube video subscription flavor of an Atom entry @@ -287,7 +287,7 @@ public function getPlaylistId() { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The getPlaylistId ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -308,7 +308,7 @@ public function setPlaylistId($id = null) { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The setPlaylistTitle ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -351,7 +351,7 @@ public function getPlaylistTitle() { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The getPlaylistTitle ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -372,7 +372,7 @@ public function setPlaylistTitle($title = null) { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The setPlaylistTitle ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -392,7 +392,7 @@ public function getCountHint() { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The getCountHint ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -411,7 +411,7 @@ public function getMediaThumbnail() { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The getMediaThumbnail ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); diff --git a/library/Zend/Gdata/YouTube/SubscriptionFeed.php b/library/Zend/Gdata/YouTube/SubscriptionFeed.php index ce627de71a..012c4c2a5a 100644 --- a/library/Zend/Gdata/YouTube/SubscriptionFeed.php +++ b/library/Zend/Gdata/YouTube/SubscriptionFeed.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Media_Feed */ -require_once 'Zend/Gdata/Media/Feed.php'; +;// require_once 'Zend/Gdata/Media/Feed.php'; /** * @see Zend_Gdata_YouTube_SubscriptionEntry */ -require_once 'Zend/Gdata/YouTube/SubscriptionEntry.php'; +;// require_once 'Zend/Gdata/YouTube/SubscriptionEntry.php'; /** * The YouTube video subscription list flavor of an Atom Feed with media support diff --git a/library/Zend/Gdata/YouTube/UserProfileEntry.php b/library/Zend/Gdata/YouTube/UserProfileEntry.php index 197e9eb40b..8fd099a997 100644 --- a/library/Zend/Gdata/YouTube/UserProfileEntry.php +++ b/library/Zend/Gdata/YouTube/UserProfileEntry.php @@ -24,107 +24,107 @@ /** * @see Zend_Gdata_Entry */ -require_once 'Zend/Gdata/Entry.php'; +;// require_once 'Zend/Gdata/Entry.php'; /** * @see Zend_Gdata_Extension_FeedLink */ -require_once 'Zend/Gdata/Extension/FeedLink.php'; +;// require_once 'Zend/Gdata/Extension/FeedLink.php'; /** * @see Zend_Gdata_YouTube_Extension_Description */ -require_once 'Zend/Gdata/YouTube/Extension/Description.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Description.php'; /** * @see Zend_Gdata_YouTube_Extension_AboutMe */ -require_once 'Zend/Gdata/YouTube/Extension/AboutMe.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/AboutMe.php'; /** * @see Zend_Gdata_YouTube_Extension_Age */ -require_once 'Zend/Gdata/YouTube/Extension/Age.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Age.php'; /** * @see Zend_Gdata_YouTube_Extension_Username */ -require_once 'Zend/Gdata/YouTube/Extension/Username.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Username.php'; /** * @see Zend_Gdata_YouTube_Extension_Books */ -require_once 'Zend/Gdata/YouTube/Extension/Books.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Books.php'; /** * @see Zend_Gdata_YouTube_Extension_Company */ -require_once 'Zend/Gdata/YouTube/Extension/Company.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Company.php'; /** * @see Zend_Gdata_YouTube_Extension_Hobbies */ -require_once 'Zend/Gdata/YouTube/Extension/Hobbies.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Hobbies.php'; /** * @see Zend_Gdata_YouTube_Extension_Hometown */ -require_once 'Zend/Gdata/YouTube/Extension/Hometown.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Hometown.php'; /** * @see Zend_Gdata_YouTube_Extension_Location */ -require_once 'Zend/Gdata/YouTube/Extension/Location.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Location.php'; /** * @see Zend_Gdata_YouTube_Extension_Movies */ -require_once 'Zend/Gdata/YouTube/Extension/Movies.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Movies.php'; /** * @see Zend_Gdata_YouTube_Extension_Music */ -require_once 'Zend/Gdata/YouTube/Extension/Music.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Music.php'; /** * @see Zend_Gdata_YouTube_Extension_Occupation */ -require_once 'Zend/Gdata/YouTube/Extension/Occupation.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Occupation.php'; /** * @see Zend_Gdata_YouTube_Extension_School */ -require_once 'Zend/Gdata/YouTube/Extension/School.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/School.php'; /** * @see Zend_Gdata_YouTube_Extension_Gender */ -require_once 'Zend/Gdata/YouTube/Extension/Gender.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Gender.php'; /** * @see Zend_Gdata_YouTube_Extension_Relationship */ -require_once 'Zend/Gdata/YouTube/Extension/Relationship.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Relationship.php'; /** * @see Zend_Gdata_YouTube_Extension_FirstName */ -require_once 'Zend/Gdata/YouTube/Extension/FirstName.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/FirstName.php'; /** * @see Zend_Gdata_YouTube_Extension_LastName */ -require_once 'Zend/Gdata/YouTube/Extension/LastName.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/LastName.php'; /** * @see Zend_Gdata_YouTube_Extension_Statistics */ -require_once 'Zend/Gdata/YouTube/Extension/Statistics.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Statistics.php'; /** * @see Zend_Gdata_Media_Extension_MediaThumbnail */ -require_once 'Zend/Gdata/Media/Extension/MediaThumbnail.php'; +;// require_once 'Zend/Gdata/Media/Extension/MediaThumbnail.php'; /** * Represents the YouTube video playlist flavor of an Atom entry @@ -499,7 +499,7 @@ public function setAboutMe($aboutMe = null) { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The setAboutMe ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -519,7 +519,7 @@ public function getAboutMe() { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The getAboutMe ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -539,7 +539,7 @@ public function setFirstName($firstName = null) { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The setFirstName ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -559,7 +559,7 @@ public function getFirstName() { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The getFirstName ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -579,7 +579,7 @@ public function setLastName($lastName = null) { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The setLastName ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -599,7 +599,7 @@ public function getLastName() { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The getLastName ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -618,7 +618,7 @@ public function getStatistics() { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The getStatistics ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); @@ -637,7 +637,7 @@ public function getThumbnail() { if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException('The getThumbnail ' . ' method is only supported as of version 2 of the YouTube ' . 'API.'); diff --git a/library/Zend/Gdata/YouTube/VideoEntry.php b/library/Zend/Gdata/YouTube/VideoEntry.php index 8e431c4540..28c46fb257 100644 --- a/library/Zend/Gdata/YouTube/VideoEntry.php +++ b/library/Zend/Gdata/YouTube/VideoEntry.php @@ -24,67 +24,67 @@ /** * @see Zend_Gdata_Extension_Comments */ -require_once 'Zend/Gdata/Extension/Comments.php'; +;// require_once 'Zend/Gdata/Extension/Comments.php'; /** * @see Zend_Gdata_Extension_FeedLink */ -require_once 'Zend/Gdata/Extension/FeedLink.php'; +;// require_once 'Zend/Gdata/Extension/FeedLink.php'; /** * @see Zend_Gdata_YouTube_MediaEntry */ -require_once 'Zend/Gdata/YouTube/MediaEntry.php'; +;// require_once 'Zend/Gdata/YouTube/MediaEntry.php'; /** * @see Zend_Gdata_YouTube_Extension_MediaGroup */ -require_once 'Zend/Gdata/YouTube/Extension/MediaGroup.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/MediaGroup.php'; /** * @see Zend_Gdata_YouTube_Extension_NoEmbed */ -require_once 'Zend/Gdata/YouTube/Extension/NoEmbed.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/NoEmbed.php'; /** * @see Zend_Gdata_YouTube_Extension_Statistics */ -require_once 'Zend/Gdata/YouTube/Extension/Statistics.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Statistics.php'; /** * @see Zend_Gdata_YouTube_Extension_Link */ -require_once 'Zend/Gdata/YouTube/Extension/Link.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Link.php'; /** * @see Zend_Gdata_YouTube_Extension_Racy */ -require_once 'Zend/Gdata/YouTube/Extension/Racy.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Racy.php'; /** * @see Zend_Gdata_Extension_Rating */ -require_once 'Zend/Gdata/Extension/Rating.php'; +;// require_once 'Zend/Gdata/Extension/Rating.php'; /** * @see Zend_Gdata_Geo_Extension_GeoRssWhere */ -require_once 'Zend/Gdata/Geo/Extension/GeoRssWhere.php'; +;// require_once 'Zend/Gdata/Geo/Extension/GeoRssWhere.php'; /** * @see Zend_Gdata_YouTube_Extension_Control */ -require_once 'Zend/Gdata/YouTube/Extension/Control.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Control.php'; /** * @see Zend_Gdata_YouTube_Extension_Recorded */ -require_once 'Zend/Gdata/YouTube/Extension/Recorded.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Recorded.php'; /** * @see Zend_Gdata_YouTube_Extension_Location */ -require_once 'Zend/Gdata/YouTube/Extension/Location.php'; +;// require_once 'Zend/Gdata/YouTube/Extension/Location.php'; /** * Represents the YouTube video flavor of an Atom entry @@ -427,7 +427,7 @@ public function getStatistics() public function setRacy($racy = null) { if ($this->getMajorProtocolVersion() == 2) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException( 'Calling getRacy() on a YouTube VideoEntry is deprecated ' . 'as of version 2 of the API.'); @@ -446,7 +446,7 @@ public function setRacy($racy = null) public function getRacy() { if ($this->getMajorProtocolVersion() == 2) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException( 'Calling getRacy() on a YouTube VideoEntry is deprecated ' . 'as of version 2 of the API.'); @@ -580,7 +580,7 @@ public function getVideoId() $fullId = $this->getId()->getText(); $position = strrpos($fullId, '/'); if ($position === false) { - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception( 'Slash not found in atom:id of ' . $fullId); } else { @@ -1062,12 +1062,12 @@ public function ensureMediaGroupIsNotNull() public function setVideoRating($ratingValue) { if ($ratingValue < 1 || $ratingValue > 5) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Rating for video entry must be between 1 and 5 inclusive.'); } - require_once 'Zend/Gdata/Extension/Rating.php'; + ;// require_once 'Zend/Gdata/Extension/Rating.php'; $rating = new Zend_Gdata_Extension_Rating(null, 1, 5, null, $ratingValue); $this->setRating($rating); diff --git a/library/Zend/Gdata/YouTube/VideoFeed.php b/library/Zend/Gdata/YouTube/VideoFeed.php index 7e5ffcd1b4..32cd5d90c7 100644 --- a/library/Zend/Gdata/YouTube/VideoFeed.php +++ b/library/Zend/Gdata/YouTube/VideoFeed.php @@ -24,12 +24,12 @@ /** * @see Zend_Gdata_Media_Feed */ -require_once 'Zend/Gdata/Media/Feed.php'; +;// require_once 'Zend/Gdata/Media/Feed.php'; /** * @see Zend_Gdata_YouTube_VideoEntry */ -require_once 'Zend/Gdata/YouTube/VideoEntry.php'; +;// require_once 'Zend/Gdata/YouTube/VideoEntry.php'; /** * The YouTube video flavor of an Atom Feed with media support diff --git a/library/Zend/Gdata/YouTube/VideoQuery.php b/library/Zend/Gdata/YouTube/VideoQuery.php index 10b4d97264..1152774cc0 100644 --- a/library/Zend/Gdata/YouTube/VideoQuery.php +++ b/library/Zend/Gdata/YouTube/VideoQuery.php @@ -24,12 +24,12 @@ /** * Zend_Gdata_YouTube */ -require_once('Zend/Gdata/YouTube.php'); +;// require_once('Zend/Gdata/YouTube.php'); /** * Zend_Gdata_Query */ -require_once('Zend/Gdata/Query.php'); +;// require_once('Zend/Gdata/Query.php'); /** * Assists in constructing queries for YouTube videos @@ -77,7 +77,7 @@ public function setFeedType($feedType, $videoId = null, $entry = null) break; case 'related': if ($videoId === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Video ID must be set for feed of type: ' . $feedType); } else { @@ -87,7 +87,7 @@ public function setFeedType($feedType, $videoId = null, $entry = null) break; case 'responses': if ($videoId === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_Exception( 'Video ID must be set for feed of type: ' . $feedType); } else { @@ -97,7 +97,7 @@ public function setFeedType($feedType, $videoId = null, $entry = null) break; case 'comments': if ($videoId === null) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_Exception( 'Video ID must be set for feed of type: ' . $feedType); } else { @@ -109,7 +109,7 @@ public function setFeedType($feedType, $videoId = null, $entry = null) } break; default: - require_once 'Zend/Gdata/App/Exception.php'; + ;// require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('Unknown feed type'); break; } @@ -130,7 +130,7 @@ public function setLocation($value) default: $parameters = explode(',', $value); if (count($parameters) != 2) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'You must provide 2 coordinates to the location ' . 'URL parameter'); @@ -143,7 +143,7 @@ public function setLocation($value) $temp = substr($temp, 0, -1); } if (!is_numeric($temp)) { - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Value provided to location parameter must' . ' be in the form of two coordinates'); @@ -224,7 +224,7 @@ public function setTime($value = null) case null: unset($this->_params['time']); default: - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Unknown time value'); break; @@ -250,7 +250,7 @@ public function setUploader($value = null) unset($this->_params['uploader']); break; default: - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'Unknown value for uploader'); } @@ -348,7 +348,7 @@ public function setSafeSearch($value) case null: unset($this->_params['safeSearch']); default: - require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + ;// require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'The safeSearch parameter only supports the values '. '\'none\', \'moderate\' or \'strict\'.'); @@ -464,7 +464,7 @@ public function getQueryString($majorProtocolVersion = null, switch($name) { case 'location-radius': if ($majorProtocolVersion == 1) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException("The $name " . "parameter is only supported in version 2."); } @@ -472,7 +472,7 @@ public function getQueryString($majorProtocolVersion = null, case 'racy': if ($majorProtocolVersion == 2) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException("The $name " . "parameter is not supported in version 2. " . "Please use 'safeSearch'."); @@ -481,7 +481,7 @@ public function getQueryString($majorProtocolVersion = null, case 'safeSearch': if ($majorProtocolVersion == 1) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException("The $name " . "parameter is only supported in version 2. " . "Please use 'racy'."); @@ -490,7 +490,7 @@ public function getQueryString($majorProtocolVersion = null, case 'uploader': if ($majorProtocolVersion == 1) { - require_once 'Zend/Gdata/App/VersionException.php'; + ;// require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException("The $name " . "parameter is only supported in version 2."); } diff --git a/library/Zend/Http/Client.php b/library/Zend/Http/Client.php index 87d37388d1..0e079f4b99 100644 --- a/library/Zend/Http/Client.php +++ b/library/Zend/Http/Client.php @@ -24,36 +24,36 @@ /** * @see Zend_Loader */ -require_once 'Zend/Loader.php'; +;// require_once 'Zend/Loader.php'; /** * @see Zend_Uri */ -require_once 'Zend/Uri.php'; +;// require_once 'Zend/Uri.php'; /** * @see Zend_Http_Client_Adapter_Interface */ -require_once 'Zend/Http/Client/Adapter/Interface.php'; +;// require_once 'Zend/Http/Client/Adapter/Interface.php'; /** * @see Zend_Http_Header_HeaderValue */ -require_once 'Zend/Http/Header/HeaderValue.php'; +;// require_once 'Zend/Http/Header/HeaderValue.php'; /** * @see Zend_Http_Response */ -require_once 'Zend/Http/Response.php'; +;// require_once 'Zend/Http/Response.php'; /** * @see Zend_Http_Response_Stream */ -require_once 'Zend/Http/Response/Stream.php'; +;// require_once 'Zend/Http/Response/Stream.php'; /** * Zend_Http_Client is an implementation of an HTTP client in PHP. The client @@ -316,7 +316,7 @@ public function setUri($uri) if (!$uri instanceof Zend_Uri_Http) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception('Passed parameter is not a valid HTTP URI.'); } @@ -364,7 +364,7 @@ public function setConfig($config = array()) } elseif (! is_array($config)) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception('Array or Zend_Config object expected, got ' . gettype($config)); } @@ -394,7 +394,7 @@ public function setConfig($config = array()) public function setMethod($method = self::GET) { if (! preg_match('/^[^\x00-\x1f\x7f-\xff\(\)<>@,;:\\\\"\/\[\]\?={}\s]+$/', $method)) { - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("'{$method}' is not a valid HTTP request method."); } @@ -453,7 +453,7 @@ public function setHeaders($name, $value = null) // Make sure the name is valid if we are in strict mode if ($this->config['strict'] && (! preg_match('/^[a-zA-Z0-9-]+$/', $name))) { - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("{$name} is not a valid HTTP header name"); } @@ -617,7 +617,7 @@ public function setAuth($user, $password = '', $type = self::AUTH_BASIC) // Check we got a proper authentication type if (! defined('self::AUTH_' . strtoupper($type))) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("Invalid or not supported authentication type: '$type'"); } @@ -653,7 +653,7 @@ public function setCookieJar($cookiejar = true) $this->cookiejar = null; } else { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception('Invalid parameter type passed as CookieJar'); } @@ -717,7 +717,7 @@ public function setCookie($cookie, $value = null) if (preg_match("/[=,; \t\r\n\013\014]/", $cookie)) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("Cookie name cannot contain these characters: =,; \t\r\n\013\014 ({$cookie})"); } @@ -757,7 +757,7 @@ public function setFileUpload($filename, $formname, $data = null, $ctype = null) if ($data === null) { if (($data = @file_get_contents($filename)) === false) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("Unable to read file '{$filename}' for upload"); } @@ -929,7 +929,7 @@ public function setAdapter($adapter) Zend_Loader::loadClass($adapter); } catch (Zend_Exception $e) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("Unable to load adapter '$adapter': {$e->getMessage()}", 0, $e); } @@ -938,7 +938,7 @@ public function setAdapter($adapter) if (! $adapter instanceof Zend_Http_Client_Adapter_Interface) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception('Passed adapter is not a HTTP connection adapter'); } @@ -1001,7 +1001,7 @@ protected function _openTempStream() if ($this->adapter instanceof Zend_Http_Client_Adapter_Interface) { $this->adapter->close(); } - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("Could not open temp file {$this->_stream_name}"); } @@ -1019,7 +1019,7 @@ public function request($method = null) { if (! $this->uri instanceof Zend_Uri_Http) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception('No valid URI has been passed to the client'); } @@ -1066,7 +1066,7 @@ public function request($method = null) // check that adapter supports streaming before using it if(is_resource($body) && !($this->adapter instanceof Zend_Http_Client_Adapter_Stream)) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception('Adapter does not support streaming'); } @@ -1080,7 +1080,7 @@ public function request($method = null) $this->adapter->setOutputStream($stream); } else { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception('Adapter does not support streaming'); } } @@ -1091,7 +1091,7 @@ public function request($method = null) $response = $this->adapter->read(); if (! $response) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception('Unable to read response, or response is empty'); } @@ -1348,7 +1348,7 @@ protected function _prepareBody() } /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("Cannot handle content type '{$this->enctype}' automatically." . " Please use Zend_Http_Client::setRawData to send this kind of content."); break; @@ -1510,7 +1510,7 @@ public static function encodeAuthHeader($user, $password, $type = self::AUTH_BAS // In basic authentication, the user name cannot contain ":" if (strpos($user, ':') !== false) { /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("The user name cannot contain ':' in 'Basic' HTTP authentication"); } @@ -1525,7 +1525,7 @@ public static function encodeAuthHeader($user, $password, $type = self::AUTH_BAS default: /** @see Zend_Http_Client_Exception */ - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("Not a supported HTTP authentication type: '$type'"); } @@ -1600,7 +1600,7 @@ protected function _validateHeaderValue($value, $recurse = true) } if (! is_string($value) && (! is_object($value) || ! method_exists($value, '__toString'))) { - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception('Invalid header value detected'); } diff --git a/library/Zend/Http/Client/Adapter/Curl.php b/library/Zend/Http/Client/Adapter/Curl.php index cd26f8bb86..a17ee30b15 100644 --- a/library/Zend/Http/Client/Adapter/Curl.php +++ b/library/Zend/Http/Client/Adapter/Curl.php @@ -24,16 +24,16 @@ /** * @see Zend_Uri_Http */ -require_once 'Zend/Uri/Http.php'; +;// require_once 'Zend/Uri/Http.php'; /** * @see Zend_Http_Client_Adapter_Interface */ -require_once 'Zend/Http/Client/Adapter/Interface.php'; +;// require_once 'Zend/Http/Client/Adapter/Interface.php'; /** * @see Zend_Http_Client_Adapter_Stream */ -require_once 'Zend/Http/Client/Adapter/Stream.php'; +;// require_once 'Zend/Http/Client/Adapter/Stream.php'; /** * An adapter class for Zend_Http_Client based on the curl extension. @@ -100,7 +100,7 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac public function __construct() { if (!extension_loaded('curl')) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('cURL extension has to be loaded to use this Zend_Http_Client adapter.'); } $this->_invalidOverwritableCurlOptions = array( @@ -135,7 +135,7 @@ public function setConfig($config = array()) $config = $config->toArray(); } elseif (! is_array($config)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Array or Zend_Config object expected, got ' . gettype($config) ); @@ -247,7 +247,7 @@ public function connect($host, $port = 80, $secure = false) if (!$this->_curl) { $this->close(); - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Unable to Connect to ' . $host . ':' . $port); } @@ -280,12 +280,12 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $bo { // Make sure we're properly connected if (!$this->_curl) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception("Trying to write but we are not connected"); } if ($this->_connected_to[0] != $uri->getHost() || $this->_connected_to[1] != $uri->getPort()) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception("Trying to write but we are connected to the wrong host"); } @@ -322,7 +322,7 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $bo } if (!isset($this->_config['curloptions'][CURLOPT_INFILESIZE])) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception("Cannot set a file-handle for cURL option CURLOPT_INFILE without also setting its size in CURLOPT_INFILESIZE."); } @@ -364,12 +364,12 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $bo default: // For now, through an exception for unsupported request methods - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception("Method currently not supported"); } if(is_resource($body) && $curlMethod != CURLOPT_PUT) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception("Streaming requests are allowed only with PUT"); } @@ -432,7 +432,7 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $bo foreach ((array)$this->_config['curloptions'] as $k => $v) { if (!in_array($k, $this->_invalidOverwritableCurlOptions)) { if (curl_setopt($this->_curl, $k, $v) == false) { - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception(sprintf("Unknown or erroreous cURL option '%s' set", $k)); } } @@ -451,7 +451,7 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $bo $request .= $body; if (empty($this->_response)) { - require_once 'Zend/Http/Client/Exception.php'; + ;// require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("Error in cURL request: " . curl_error($this->_curl)); } diff --git a/library/Zend/Http/Client/Adapter/Exception.php b/library/Zend/Http/Client/Adapter/Exception.php index ebdea9aa21..8b1d596a1b 100644 --- a/library/Zend/Http/Client/Adapter/Exception.php +++ b/library/Zend/Http/Client/Adapter/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Http_Client_Exception */ -require_once 'Zend/Http/Client/Exception.php'; +;// require_once 'Zend/Http/Client/Exception.php'; /** * @category Zend diff --git a/library/Zend/Http/Client/Adapter/Proxy.php b/library/Zend/Http/Client/Adapter/Proxy.php index 090e570cba..b80020160d 100644 --- a/library/Zend/Http/Client/Adapter/Proxy.php +++ b/library/Zend/Http/Client/Adapter/Proxy.php @@ -24,15 +24,15 @@ /** * @see Zend_Uri_Http */ -require_once 'Zend/Uri/Http.php'; +;// require_once 'Zend/Uri/Http.php'; /** * @see Zend_Http_Client */ -require_once 'Zend/Http/Client.php'; +;// require_once 'Zend/Http/Client.php'; /** * @see Zend_Http_Client_Adapter_Socket */ -require_once 'Zend/Http/Client/Adapter/Socket.php'; +;// require_once 'Zend/Http/Client/Adapter/Socket.php'; /** * HTTP Proxy-supporting Zend_Http_Client adapter class, based on the default @@ -135,7 +135,7 @@ public function write( // Make sure we're properly connected if (!$this->socket) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Trying to write but we are not connected' ); @@ -147,7 +147,7 @@ public function write( if ($this->connected_to[0] != "tcp://$host" || $this->connected_to[1] != $port ) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Trying to write but we are connected to the wrong proxy server' ); @@ -211,7 +211,7 @@ public function write( // Send the request if (!@fwrite($this->socket, $request)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Error writing request to proxy server' ); @@ -219,7 +219,7 @@ public function write( if(is_resource($body)) { if(stream_copy_to_stream($body, $this->socket) == 0) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Error writing request to server' ); @@ -267,7 +267,7 @@ protected function connectHandshake( // Send the request if (!@fwrite($this->socket, $request)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Error writing request to proxy server' ); @@ -288,7 +288,7 @@ protected function connectHandshake( // Check that the response from the proxy is 200 if (Zend_Http_Response::extractCode($response) != 200) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Unable to connect to HTTPS proxy. Server response: ' . $response ); @@ -312,7 +312,7 @@ protected function connectHandshake( } if (!$success) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Unable to connect to HTTPS server through proxy: could not ' . 'negotiate secure connection.' diff --git a/library/Zend/Http/Client/Adapter/Socket.php b/library/Zend/Http/Client/Adapter/Socket.php index 6ae1b1ff46..87c294b44e 100644 --- a/library/Zend/Http/Client/Adapter/Socket.php +++ b/library/Zend/Http/Client/Adapter/Socket.php @@ -24,15 +24,15 @@ /** * @see Zend_Uri_Http */ -require_once 'Zend/Uri/Http.php'; +;// require_once 'Zend/Uri/Http.php'; /** * @see Zend_Http_Client_Adapter_Interface */ -require_once 'Zend/Http/Client/Adapter/Interface.php'; +;// require_once 'Zend/Http/Client/Adapter/Interface.php'; /** * @see Zend_Http_Client_Adapter_Stream */ -require_once 'Zend/Http/Client/Adapter/Stream.php'; +;// require_once 'Zend/Http/Client/Adapter/Stream.php'; /** * A sockets based (stream_socket_client) adapter class for Zend_Http_Client. Can be used @@ -113,7 +113,7 @@ public function setConfig($config = array()) $config = $config->toArray(); } elseif (! is_array($config)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Array or Zend_Config object expected, got ' . gettype($config) ); @@ -157,7 +157,7 @@ public function setStreamContext($context) } else { // Invalid parameter - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( "Expecting either a stream context resource or array, got " . gettype($context) ); @@ -206,14 +206,14 @@ public function connect($host, $port = 80, $secure = false) if ($this->config['sslcert'] !== null) { if (! stream_context_set_option($context, 'ssl', 'local_cert', $this->config['sslcert'])) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Unable to set sslcert option'); } } if ($this->config['sslpassphrase'] !== null) { if (! stream_context_set_option($context, 'ssl', 'passphrase', $this->config['sslpassphrase'])) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Unable to set sslpassphrase option'); } } @@ -231,14 +231,14 @@ public function connect($host, $port = 80, $secure = false) if (! $this->socket) { $this->close(); - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Unable to Connect to ' . $host . ':' . $port . '. Error #' . $errno . ': ' . $errstr); } // Set the stream timeout if (! stream_set_timeout($this->socket, (int) $this->config['timeout'])) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Unable to set the connection timeout'); } @@ -261,14 +261,14 @@ public function write($method, $uri, $http_ver = '1.1', $headers = array(), $bod { // Make sure we're properly connected if (! $this->socket) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Trying to write but we are not connected'); } $host = $uri->getHost(); $host = (strtolower($uri->getScheme()) == 'https' ? $this->config['ssltransport'] : 'tcp') . '://' . $host; if ($this->connected_to[0] != $host || $this->connected_to[1] != $uri->getPort()) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Trying to write but we are connected to the wrong host'); } @@ -293,13 +293,13 @@ public function write($method, $uri, $http_ver = '1.1', $headers = array(), $bod // Send the request if (! @fwrite($this->socket, $request)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Error writing request to server'); } if(is_resource($body)) { if(stream_copy_to_stream($body, $this->socket) == 0) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Error writing request to server'); } } @@ -365,7 +365,7 @@ public function read() $chunksize = trim($line); if (! ctype_xdigit($chunksize)) { $this->close(); - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Invalid chunk size "' . $chunksize . '" unable to read chunked body'); } @@ -404,7 +404,7 @@ public function read() } while ($chunksize > 0); } else { $this->close(); - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Cannot handle "' . $headers['transfer-encoding'] . '" transfer encoding'); } @@ -507,7 +507,7 @@ protected function _checkSocketReadTimeout() $timedout = $info['timed_out']; if ($timedout) { $this->close(); - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( "Read timed out after {$this->config['timeout']} seconds", Zend_Http_Client_Adapter_Exception::READ_TIMEOUT diff --git a/library/Zend/Http/Client/Adapter/Test.php b/library/Zend/Http/Client/Adapter/Test.php index fc70b8af1f..419e961ccf 100644 --- a/library/Zend/Http/Client/Adapter/Test.php +++ b/library/Zend/Http/Client/Adapter/Test.php @@ -23,15 +23,15 @@ /** * @see Zend_Uri_Http */ -require_once 'Zend/Uri/Http.php'; +;// require_once 'Zend/Uri/Http.php'; /** * @see Zend_Http_Response */ -require_once 'Zend/Http/Response.php'; +;// require_once 'Zend/Http/Response.php'; /** * @see Zend_Http_Client_Adapter_Interface */ -require_once 'Zend/Http/Client/Adapter/Interface.php'; +;// require_once 'Zend/Http/Client/Adapter/Interface.php'; /** * A testing-purposes adapter. @@ -109,7 +109,7 @@ public function setConfig($config = array()) $config = $config->toArray(); } elseif (! is_array($config)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Array or Zend_Config object expected, got ' . gettype($config) ); @@ -134,7 +134,7 @@ public function connect($host, $port = 80, $secure = false) { if ($this->_nextRequestWillFail) { $this->_nextRequestWillFail = false; - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Request failed'); } } @@ -229,7 +229,7 @@ public function addResponse($response) public function setResponseIndex($index) { if ($index < 0 || $index >= count($this->responses)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + ;// require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Index out of range of response buffer size'); } diff --git a/library/Zend/Http/Client/Exception.php b/library/Zend/Http/Client/Exception.php index 8aa959edeb..e53b9fc12f 100644 --- a/library/Zend/Http/Client/Exception.php +++ b/library/Zend/Http/Client/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Http_Exception */ -require_once 'Zend/Http/Exception.php'; +;// require_once 'Zend/Http/Exception.php'; /** * @category Zend diff --git a/library/Zend/Http/Cookie.php b/library/Zend/Http/Cookie.php index d4400c2e26..8d5950c8a2 100644 --- a/library/Zend/Http/Cookie.php +++ b/library/Zend/Http/Cookie.php @@ -24,7 +24,7 @@ /** * @see Zend_Uri_Http */ -require_once 'Zend/Uri/Http.php'; +;// require_once 'Zend/Uri/Http.php'; /** @@ -110,17 +110,17 @@ class Zend_Http_Cookie public function __construct($name, $value, $domain, $expires = null, $path = null, $secure = false) { if (preg_match("/[=,; \t\r\n\013\014]/", $name)) { - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("Cookie name cannot contain these characters: =,; \\t\\r\\n\\013\\014 ({$name})"); } if (! $this->name = (string) $name) { - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception('Cookies must have a name'); } if (! $this->domain = (string) $domain) { - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception('Cookies must have a domain'); } @@ -234,7 +234,7 @@ public function match($uri, $matchSessionCookies = true, $now = null) // Make sure we have a valid Zend_Uri_Http object if (! ($uri->valid() && ($uri->getScheme() == 'http' || $uri->getScheme() =='https'))) { - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception('Passed URI is not a valid HTTP or HTTPS URI'); } @@ -334,7 +334,7 @@ public static function fromString($cookieStr, $refUri = null, $encodeValue = tru * * @see Zend_Date */ - require_once 'Zend/Date.php'; + ;// require_once 'Zend/Date.php'; $expireDate = new Zend_Date($v); $expires = $expireDate->getTimestamp(); @@ -377,12 +377,12 @@ public static function fromString($cookieStr, $refUri = null, $encodeValue = tru public static function matchCookieDomain($cookieDomain, $host) { if (! $cookieDomain) { - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("\$cookieDomain is expected to be a cookie domain"); } if (! $host) { - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("\$host is expected to be a host name"); } @@ -410,12 +410,12 @@ public static function matchCookieDomain($cookieDomain, $host) public static function matchCookiePath($cookiePath, $path) { if (! $cookiePath) { - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("\$cookiePath is expected to be a cookie path"); } if (! $path) { - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("\$path is expected to be a host name"); } diff --git a/library/Zend/Http/CookieJar.php b/library/Zend/Http/CookieJar.php index 96462f1b86..93a5f385a2 100644 --- a/library/Zend/Http/CookieJar.php +++ b/library/Zend/Http/CookieJar.php @@ -23,15 +23,15 @@ /** * @see Zend_Uri */ -require_once "Zend/Uri.php"; +;// require_once "Zend/Uri.php"; /** * @see Zend_Http_Cookie */ -require_once "Zend/Http/Cookie.php"; +;// require_once "Zend/Http/Cookie.php"; /** * @see Zend_Http_Response */ -require_once "Zend/Http/Response.php"; +;// require_once "Zend/Http/Response.php"; /** * A Zend_Http_CookieJar object is designed to contain and maintain HTTP cookies, and should @@ -139,7 +139,7 @@ public function addCookie($cookie, $ref_uri = null, $encodeValue = true) $this->cookies[$domain][$path][$cookie->getName()] = $cookie; $this->_rawCookies[] = $cookie; } else { - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception('Supplient argument is not a valid cookie string or object'); } } @@ -155,7 +155,7 @@ public function addCookie($cookie, $ref_uri = null, $encodeValue = true) public function addCookiesFromResponse($response, $ref_uri, $encodeValue = true) { if (! $response instanceof Zend_Http_Response) { - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception('$response is expected to be a Response object, ' . gettype($response) . ' was passed'); } @@ -202,7 +202,7 @@ public function getMatchingCookies($uri, $matchSessionCookies = true, { if (is_string($uri)) $uri = Zend_Uri::factory($uri); if (! $uri instanceof Zend_Uri_Http) { - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("Invalid URI string or object passed"); } @@ -241,7 +241,7 @@ public function getCookie($uri, $cookie_name, $ret_as = self::COOKIE_OBJECT) } if (! $uri instanceof Zend_Uri_Http) { - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception('Invalid URI specified'); } @@ -268,7 +268,7 @@ public function getCookie($uri, $cookie_name, $ret_as = self::COOKIE_OBJECT) break; default: - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("Invalid value passed for \$ret_as: {$ret_as}"); break; } diff --git a/library/Zend/Http/Exception.php b/library/Zend/Http/Exception.php index 0ca3457360..f29cc92a95 100644 --- a/library/Zend/Http/Exception.php +++ b/library/Zend/Http/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/Zend/Http/Header/Exception/InvalidArgumentException.php b/library/Zend/Http/Header/Exception/InvalidArgumentException.php index 9520a65acc..cb32604aa5 100644 --- a/library/Zend/Http/Header/Exception/InvalidArgumentException.php +++ b/library/Zend/Http/Header/Exception/InvalidArgumentException.php @@ -23,7 +23,7 @@ /** * @see Zend_Http_Exception */ -require_once 'Zend/Http/Exception.php'; +;// require_once 'Zend/Http/Exception.php'; /** * @category Zend diff --git a/library/Zend/Http/Header/Exception/RuntimeException.php b/library/Zend/Http/Header/Exception/RuntimeException.php index a716fae0e2..9edd9be1b5 100644 --- a/library/Zend/Http/Header/Exception/RuntimeException.php +++ b/library/Zend/Http/Header/Exception/RuntimeException.php @@ -23,7 +23,7 @@ /** * @see Zend_Http_Exception */ -require_once 'Zend/Http/Exception.php'; +;// require_once 'Zend/Http/Exception.php'; /** * @category Zend diff --git a/library/Zend/Http/Header/HeaderValue.php b/library/Zend/Http/Header/HeaderValue.php index ca252267f1..317fbd31d1 100644 --- a/library/Zend/Http/Header/HeaderValue.php +++ b/library/Zend/Http/Header/HeaderValue.php @@ -120,7 +120,7 @@ public static function isValid($value) public static function assertValid($value) { if (! self::isValid($value)) { - require_once 'Zend/Http/Header/Exception/InvalidArgumentException.php'; + ;// require_once 'Zend/Http/Header/Exception/InvalidArgumentException.php'; throw new Zend_Http_Header_Exception_InvalidArgumentException('Invalid header value'); } } diff --git a/library/Zend/Http/Header/SetCookie.php b/library/Zend/Http/Header/SetCookie.php index 9cf7837167..0c80dbe2cf 100644 --- a/library/Zend/Http/Header/SetCookie.php +++ b/library/Zend/Http/Header/SetCookie.php @@ -24,17 +24,17 @@ /** * @see Zend_Http_Header_Exception_InvalidArgumentException */ -require_once "Zend/Http/Header/Exception/InvalidArgumentException.php"; +;// require_once "Zend/Http/Header/Exception/InvalidArgumentException.php"; /** * @see Zend_Http_Header_Exception_RuntimeException */ -require_once "Zend/Http/Header/Exception/RuntimeException.php"; +;// require_once "Zend/Http/Header/Exception/RuntimeException.php"; /** * @see Zend_Http_Header_HeaderValue */ -require_once "Zend/Http/Header/HeaderValue.php"; +;// require_once "Zend/Http/Header/HeaderValue.php"; /** * Zend_Http_Client is an implementation of an HTTP client in PHP. The client diff --git a/library/Zend/Http/Response.php b/library/Zend/Http/Response.php index 3e6c8ebdaa..8612879433 100644 --- a/library/Zend/Http/Response.php +++ b/library/Zend/Http/Response.php @@ -24,7 +24,7 @@ /** * @see Zend_Http_Header_HeaderValue */ -require_once 'Zend/Http/Header/HeaderValue.php'; +;// require_once 'Zend/Http/Header/HeaderValue.php'; /** * Zend_Http_Response represents an HTTP 1.0 / 1.1 response message. It @@ -157,7 +157,7 @@ public function __construct($code, array $headers, $body = null, $version = '1.1 { // Make sure the response code is valid and set it if (self::responseCodeAsText($code) === null) { - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("{$code} is not a valid HTTP response code"); } @@ -167,7 +167,7 @@ public function __construct($code, array $headers, $body = null, $version = '1.1 if (is_int($name)) { $header = explode(":", $value, 2); if (count($header) != 2) { - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("'{$value}' is not a valid HTTP header"); } @@ -183,7 +183,7 @@ public function __construct($code, array $headers, $body = null, $version = '1.1 // Set the HTTP version if (! preg_match('|^\d+(?:\.\d+)?$|', $version)) { - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("Invalid HTTP response version: $version"); } @@ -568,7 +568,7 @@ public static function extractHeaders($response_str) } // Anything else is an error condition - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception('Invalid header line detected'); } @@ -611,7 +611,7 @@ public static function decodeChunkedBody($body) while (trim($body)) { if (! preg_match("/^([\da-fA-F]+)[^\r\n]*\r\n/sm", $body, $m)) { - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("Error parsing body - doesn't seem to be a chunked message"); } @@ -639,7 +639,7 @@ public static function decodeChunkedBody($body) public static function decodeGzip($body) { if (! function_exists('gzinflate')) { - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception( 'zlib extension is required in order to decode "gzip" encoding' ); @@ -659,7 +659,7 @@ public static function decodeGzip($body) public static function decodeDeflate($body) { if (! function_exists('gzuncompress')) { - require_once 'Zend/Http/Exception.php'; + ;// require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception( 'zlib extension is required in order to decode "deflate" encoding' ); diff --git a/library/Zend/Http/UserAgent.php b/library/Zend/Http/UserAgent.php index 5f7226fd9d..73100cc6ac 100644 --- a/library/Zend/Http/UserAgent.php +++ b/library/Zend/Http/UserAgent.php @@ -224,7 +224,7 @@ public function setOptions($options) && !$options instanceof ArrayAccess && !$options instanceof Traversable ) { - require_once 'Zend/Http/UserAgent/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception(sprintf( 'Invalid argument; expected array, Zend_Config object, or object implementing ArrayAccess and Traversable; received %s', (is_object($options) ? get_class($options) : gettype($options)) @@ -323,7 +323,7 @@ protected function _getUserAgentDevice($browserType) if (is_array($deviceConfig) && isset($deviceConfig['classname'])) { $device = (string) $deviceConfig['classname']; if (!class_exists($device)) { - require_once 'Zend/Http/UserAgent/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception(sprintf( 'Invalid classname "%s" provided in device configuration for browser type "%s"', $device, @@ -450,7 +450,7 @@ public function getStorage($browser = null) public function setStorage(Zend_Http_UserAgent_Storage $storage) { if ($this->_immutable) { - require_once 'Zend/Http/UserAgent/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception( 'The User-Agent device object has already been retrieved; the storage object is now immutable' ); @@ -508,7 +508,7 @@ public function setConfig($config = array()) // Verify that Config parameters are in an array. if (!is_array($config) && !$config instanceof Traversable) { - require_once 'Zend/Http/UserAgent/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception(sprintf( 'Config parameters must be in an array or a Traversable object; received "%s"', (is_object($config) ? get_class($config) : gettype($config)) @@ -589,7 +589,7 @@ public function getBrowserType() public function setBrowserType($browserType) { if ($this->_immutable) { - require_once 'Zend/Http/UserAgent/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception( 'The User-Agent device object has already been retrieved; the browser type is now immutable' ); @@ -631,14 +631,14 @@ public function getServer() public function setServer($server) { if ($this->_immutable) { - require_once 'Zend/Http/UserAgent/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception( 'The User-Agent device object has already been retrieved; the server array is now immutable' ); } if (!is_array($server) && !$server instanceof Traversable) { - require_once 'Zend/Http/UserAgent/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception(sprintf( 'Expected an array or object implementing Traversable; received %s', (is_object($server) ? get_class($server) : gettype($server)) @@ -692,7 +692,7 @@ public function getServerValue($key) public function setServerValue($key, $value) { if ($this->_immutable) { - require_once 'Zend/Http/UserAgent/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception( 'The User-Agent device object has already been retrieved; the server array is now immutable' ); @@ -717,19 +717,19 @@ public function setPluginLoader($type, $loader) if (is_string($loader)) { if (!class_exists($loader)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($loader); } $loader = new $loader(); } elseif (!is_object($loader)) { - require_once 'Zend/Http/UserAgent/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception(sprintf( 'Expected a plugin loader class or object; received %s', gettype($loader) )); } if (!$loader instanceof Zend_Loader_PluginLoader) { - require_once 'Zend/Http/UserAgent/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception(sprintf( 'Expected an object extending Zend_Loader_PluginLoader; received %s', get_class($loader) @@ -763,7 +763,7 @@ public function getPluginLoader($type) { $type = $this->_validateLoaderType($type); if (!isset($this->_loaders[$type])) { - require_once 'Zend/Loader/PluginLoader.php'; + ;// require_once 'Zend/Loader/PluginLoader.php'; $this->setPluginLoader($type, new Zend_Loader_PluginLoader()); } return $this->_loaders[$type]; @@ -785,7 +785,7 @@ protected function _validateLoaderType($type) if (!in_array($type, $this->_loaderTypes)) { $types = implode(', ', $this->_loaderTypes); - require_once 'Zend/Http/UserAgent/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception(sprintf( 'Expected one of "%s" for plugin loader type; received "%s"', $types, diff --git a/library/Zend/Http/UserAgent/AbstractDevice.php b/library/Zend/Http/UserAgent/AbstractDevice.php index 75d057f1cf..9ec5e88219 100644 --- a/library/Zend/Http/UserAgent/AbstractDevice.php +++ b/library/Zend/Http/UserAgent/AbstractDevice.php @@ -19,7 +19,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/Device.php'; +;// require_once 'Zend/Http/UserAgent/Device.php'; /** * Abstract Class to define a browser device. @@ -771,7 +771,7 @@ protected function _loadFeaturesAdapter() $config = $config[$browserType]['features']; if (empty($config['classname'])) { - require_once 'Zend/Http/UserAgent/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception('The ' . $this->getType() . ' features adapter must have a "classname" config parameter defined'); } @@ -780,12 +780,12 @@ protected function _loadFeaturesAdapter() if (isset($config['path'])) { $path = $config['path']; } else { - require_once 'Zend/Http/UserAgent/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception('The ' . $this->getType() . ' features adapter must have a "path" config parameter defined'); } if (false === include_once ($path)) { - require_once 'Zend/Http/UserAgent/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Exception.php'; throw new Zend_Http_UserAgent_Exception('The ' . $this->getType() . ' features adapter path that does not exist'); } } diff --git a/library/Zend/Http/UserAgent/Bot.php b/library/Zend/Http/UserAgent/Bot.php index ad0c8dc1ed..2a5907f16f 100644 --- a/library/Zend/Http/UserAgent/Bot.php +++ b/library/Zend/Http/UserAgent/Bot.php @@ -18,7 +18,7 @@ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/AbstractDevice.php'; +;// require_once 'Zend/Http/UserAgent/AbstractDevice.php'; /** * Bot browser type matcher diff --git a/library/Zend/Http/UserAgent/Checker.php b/library/Zend/Http/UserAgent/Checker.php index aba65d475b..07dc5399ff 100644 --- a/library/Zend/Http/UserAgent/Checker.php +++ b/library/Zend/Http/UserAgent/Checker.php @@ -18,7 +18,7 @@ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/Desktop.php'; +;// require_once 'Zend/Http/UserAgent/Desktop.php'; /** * Checker browser type matcher diff --git a/library/Zend/Http/UserAgent/Console.php b/library/Zend/Http/UserAgent/Console.php index 9ce93e6616..afff2ea52c 100644 --- a/library/Zend/Http/UserAgent/Console.php +++ b/library/Zend/Http/UserAgent/Console.php @@ -19,7 +19,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/Desktop.php'; +;// require_once 'Zend/Http/UserAgent/Desktop.php'; /** * Console browser type matcher diff --git a/library/Zend/Http/UserAgent/Desktop.php b/library/Zend/Http/UserAgent/Desktop.php index 363f351c1e..9c9fcb034a 100644 --- a/library/Zend/Http/UserAgent/Desktop.php +++ b/library/Zend/Http/UserAgent/Desktop.php @@ -19,7 +19,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/AbstractDevice.php'; +;// require_once 'Zend/Http/UserAgent/AbstractDevice.php'; /** * Desktop browser type matcher diff --git a/library/Zend/Http/UserAgent/Email.php b/library/Zend/Http/UserAgent/Email.php index 34d1949535..cde9ebb98c 100644 --- a/library/Zend/Http/UserAgent/Email.php +++ b/library/Zend/Http/UserAgent/Email.php @@ -19,7 +19,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/Desktop.php'; +;// require_once 'Zend/Http/UserAgent/Desktop.php'; /** * Email browser type matcher diff --git a/library/Zend/Http/UserAgent/Exception.php b/library/Zend/Http/UserAgent/Exception.php index 76276d1917..c153bbafe9 100644 --- a/library/Zend/Http/UserAgent/Exception.php +++ b/library/Zend/Http/UserAgent/Exception.php @@ -22,7 +22,7 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/Zend/Http/UserAgent/Features/Adapter/Browscap.php b/library/Zend/Http/UserAgent/Features/Adapter/Browscap.php index a045942397..4ce5037cab 100644 --- a/library/Zend/Http/UserAgent/Features/Adapter/Browscap.php +++ b/library/Zend/Http/UserAgent/Features/Adapter/Browscap.php @@ -22,7 +22,7 @@ /** * Zend_Http_UserAgent_Features_Adapter_Interface */ -require_once 'Zend/Http/UserAgent/Features/Adapter.php'; +;// require_once 'Zend/Http/UserAgent/Features/Adapter.php'; /** * Features adapter utilizing PHP's native browscap support @@ -49,7 +49,7 @@ public function __construct() { $browscap = ini_get('browscap'); if (empty($browscap) || !file_exists($browscap)) { - require_once 'Zend/Http/UserAgent/Features/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Features/Exception.php'; throw new Zend_Http_UserAgent_Features_Exception(sprintf( '%s requires a browscap entry in php.ini pointing to a valid browscap.ini; none present', __CLASS__ diff --git a/library/Zend/Http/UserAgent/Features/Adapter/DeviceAtlas.php b/library/Zend/Http/UserAgent/Features/Adapter/DeviceAtlas.php index 26cb0e97e7..50caeab1b9 100644 --- a/library/Zend/Http/UserAgent/Features/Adapter/DeviceAtlas.php +++ b/library/Zend/Http/UserAgent/Features/Adapter/DeviceAtlas.php @@ -22,7 +22,7 @@ /** * Zend_Http_UserAgent_Features_Adapter_Interface */ -require_once 'Zend/Http/UserAgent/Features/Adapter.php'; +;// require_once 'Zend/Http/UserAgent/Features/Adapter.php'; /** * Features adapter build with the Tera Wurfl Api @@ -46,7 +46,7 @@ public static function getFromRequest($request, array $config) { if (!class_exists('Mobi_Mtld_DA_Api')) { if (!isset($config['deviceatlas'])) { - require_once 'Zend/Http/UserAgent/Features/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Features/Exception.php'; throw new Zend_Http_UserAgent_Features_Exception('"DeviceAtlas" configuration is not defined'); } } @@ -55,16 +55,16 @@ public static function getFromRequest($request, array $config) if (!class_exists('Mobi_Mtld_DA_Api')) { if (empty($config['deviceatlas_lib_dir'])) { - require_once 'Zend/Http/UserAgent/Features/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Features/Exception.php'; throw new Zend_Http_UserAgent_Features_Exception('The "deviceatlas_lib_dir" parameter is not defined'); } // Include the Device Atlas file from the specified lib_dir - require_once ($config['deviceatlas_lib_dir'] . '/Mobi/Mtld/DA/Api.php'); + ;// require_once ($config['deviceatlas_lib_dir'] . '/Mobi/Mtld/DA/Api.php'); } if (empty($config['deviceatlas_data'])) { - require_once 'Zend/Http/UserAgent/Features/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Features/Exception.php'; throw new Zend_Http_UserAgent_Features_Exception('The "deviceatlas_data" parameter is not defined'); } diff --git a/library/Zend/Http/UserAgent/Features/Adapter/TeraWurfl.php b/library/Zend/Http/UserAgent/Features/Adapter/TeraWurfl.php index b23dc29d71..2c0d733bad 100644 --- a/library/Zend/Http/UserAgent/Features/Adapter/TeraWurfl.php +++ b/library/Zend/Http/UserAgent/Features/Adapter/TeraWurfl.php @@ -22,7 +22,7 @@ /** * Zend_Http_UserAgent_Features_Adapter_Interface */ -require_once 'Zend/Http/UserAgent/Features/Adapter.php'; +;// require_once 'Zend/Http/UserAgent/Features/Adapter.php'; /** * Features adapter build with the Tera Wurfl Api @@ -50,7 +50,7 @@ public static function getFromRequest($request, array $config) // if (!isset($config['terawurfl'])) { // No configuration - require_once 'Zend/Http/UserAgent/Features/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Features/Exception.php'; throw new Zend_Http_UserAgent_Features_Exception('"TeraWurfl" configuration is not defined'); } @@ -58,12 +58,12 @@ public static function getFromRequest($request, array $config) if (empty($config['terawurfl_lib_dir'])) { // No lib_dir given - require_once 'Zend/Http/UserAgent/Features/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Features/Exception.php'; throw new Zend_Http_UserAgent_Features_Exception('The "terawurfl_lib_dir" parameter is not defined'); } // Include the Tera-WURFL file - require_once ($config['terawurfl_lib_dir'] . '/TeraWurfl.php'); + ;// require_once ($config['terawurfl_lib_dir'] . '/TeraWurfl.php'); } diff --git a/library/Zend/Http/UserAgent/Features/Exception.php b/library/Zend/Http/UserAgent/Features/Exception.php index 0b47f1f0b7..f117244aa4 100644 --- a/library/Zend/Http/UserAgent/Features/Exception.php +++ b/library/Zend/Http/UserAgent/Features/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Browser_Exception */ -require_once 'Zend/Http/UserAgent/Exception.php'; +;// require_once 'Zend/Http/UserAgent/Exception.php'; /** * @category Zend diff --git a/library/Zend/Http/UserAgent/Feed.php b/library/Zend/Http/UserAgent/Feed.php index 41d7c741f3..b2488159bb 100644 --- a/library/Zend/Http/UserAgent/Feed.php +++ b/library/Zend/Http/UserAgent/Feed.php @@ -19,7 +19,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/AbstractDevice.php'; +;// require_once 'Zend/Http/UserAgent/AbstractDevice.php'; /** * Feed browser type matcher diff --git a/library/Zend/Http/UserAgent/Mobile.php b/library/Zend/Http/UserAgent/Mobile.php index 3450552db2..919d7becbf 100644 --- a/library/Zend/Http/UserAgent/Mobile.php +++ b/library/Zend/Http/UserAgent/Mobile.php @@ -19,7 +19,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/AbstractDevice.php'; +;// require_once 'Zend/Http/UserAgent/AbstractDevice.php'; /** * Mobile browser type matcher diff --git a/library/Zend/Http/UserAgent/Offline.php b/library/Zend/Http/UserAgent/Offline.php index 97eee11a93..b9d5c18628 100644 --- a/library/Zend/Http/UserAgent/Offline.php +++ b/library/Zend/Http/UserAgent/Offline.php @@ -19,7 +19,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/Desktop.php'; +;// require_once 'Zend/Http/UserAgent/Desktop.php'; /** * Offline browser type matcher diff --git a/library/Zend/Http/UserAgent/Probe.php b/library/Zend/Http/UserAgent/Probe.php index 9b83bc5e0f..2a034e79f7 100644 --- a/library/Zend/Http/UserAgent/Probe.php +++ b/library/Zend/Http/UserAgent/Probe.php @@ -19,7 +19,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/AbstractDevice.php'; +;// require_once 'Zend/Http/UserAgent/AbstractDevice.php'; /** * Probe browser type matcher diff --git a/library/Zend/Http/UserAgent/Spam.php b/library/Zend/Http/UserAgent/Spam.php index 5d29be54e8..65377570cc 100644 --- a/library/Zend/Http/UserAgent/Spam.php +++ b/library/Zend/Http/UserAgent/Spam.php @@ -19,7 +19,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/AbstractDevice.php'; +;// require_once 'Zend/Http/UserAgent/AbstractDevice.php'; /** * Spam browser type matcher diff --git a/library/Zend/Http/UserAgent/Storage/Exception.php b/library/Zend/Http/UserAgent/Storage/Exception.php index 484ea66f37..84c77de232 100644 --- a/library/Zend/Http/UserAgent/Storage/Exception.php +++ b/library/Zend/Http/UserAgent/Storage/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Http_UserAgent_Exception */ -require_once 'Zend/Http/UserAgent/Exception.php'; +;// require_once 'Zend/Http/UserAgent/Exception.php'; /** diff --git a/library/Zend/Http/UserAgent/Storage/NonPersistent.php b/library/Zend/Http/UserAgent/Storage/NonPersistent.php index 5e02c5e206..5d88816100 100644 --- a/library/Zend/Http/UserAgent/Storage/NonPersistent.php +++ b/library/Zend/Http/UserAgent/Storage/NonPersistent.php @@ -24,7 +24,7 @@ /** * @see Zend_Http_UserAgent_Storage_Interface */ -require_once 'Zend/Http/UserAgent/Storage.php'; +;// require_once 'Zend/Http/UserAgent/Storage.php'; /** diff --git a/library/Zend/Http/UserAgent/Storage/Session.php b/library/Zend/Http/UserAgent/Storage/Session.php index 9a26360831..e8dfc032b3 100644 --- a/library/Zend/Http/UserAgent/Storage/Session.php +++ b/library/Zend/Http/UserAgent/Storage/Session.php @@ -22,12 +22,12 @@ /** * @see Zend_Http_UserAgent_Storage */ -require_once 'Zend/Http/UserAgent/Storage.php'; +;// require_once 'Zend/Http/UserAgent/Storage.php'; /** * @see Zend_Session_Namespace */ -require_once 'Zend/Session/Namespace.php'; +;// require_once 'Zend/Session/Namespace.php'; /** * @package Zend_Http @@ -87,7 +87,7 @@ public function __construct($options = null) $options = (array) $options; } if (null !== $options && !is_array($options)) { - require_once 'Zend/Http/UserAgent/Storage/Exception.php'; + ;// require_once 'Zend/Http/UserAgent/Storage/Exception.php'; throw new Zend_Http_UserAgent_Storage_Exception(sprintf( 'Expected array or object options; "%s" provided', gettype($options) diff --git a/library/Zend/Http/UserAgent/Text.php b/library/Zend/Http/UserAgent/Text.php index c308b25a6a..bd2ba622c0 100644 --- a/library/Zend/Http/UserAgent/Text.php +++ b/library/Zend/Http/UserAgent/Text.php @@ -19,7 +19,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/AbstractDevice.php'; +;// require_once 'Zend/Http/UserAgent/AbstractDevice.php'; /** * Text browser type matcher diff --git a/library/Zend/Http/UserAgent/Validator.php b/library/Zend/Http/UserAgent/Validator.php index a75daccc63..af2b8692b1 100644 --- a/library/Zend/Http/UserAgent/Validator.php +++ b/library/Zend/Http/UserAgent/Validator.php @@ -19,7 +19,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Http/UserAgent/Desktop.php'; +;// require_once 'Zend/Http/UserAgent/Desktop.php'; /** * Validator browser type matcher diff --git a/library/Zend/Json.php b/library/Zend/Json.php index ad72eb5303..6f2faac64b 100644 --- a/library/Zend/Json.php +++ b/library/Zend/Json.php @@ -24,10 +24,10 @@ * * @see Zend_Json_Expr */ -require_once 'Zend/Json/Expr.php'; +;// require_once 'Zend/Json/Expr.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** * Class for encoding to and decoding from JSON. @@ -82,12 +82,12 @@ public static function decode($encodedValue, $objectDecodeType = Zend_Json::TYPE if (strtolower($encodedValue) === 'null') { return null; } elseif ($decode === null) { - require_once 'Zend/Json/Exception.php'; + ;// require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception('Decoding failed'); } // php >= 5.3 } elseif (($jsonLastErr = json_last_error()) != JSON_ERROR_NONE) { - require_once 'Zend/Json/Exception.php'; + ;// require_once 'Zend/Json/Exception.php'; switch ($jsonLastErr) { case JSON_ERROR_DEPTH: throw new Zend_Json_Exception('Decoding failed: Maximum stack depth exceeded'); @@ -103,7 +103,7 @@ public static function decode($encodedValue, $objectDecodeType = Zend_Json::TYPE return $decode; } - require_once 'Zend/Json/Decoder.php'; + ;// require_once 'Zend/Json/Decoder.php'; return Zend_Json_Decoder::decode($encodedValue, $objectDecodeType); } @@ -145,7 +145,7 @@ public static function encode($valueToEncode, $cycleCheck = false, $options = ar /** * @see Zend_Json_Encoder */ - require_once "Zend/Json/Encoder.php"; + ;// require_once "Zend/Json/Encoder.php"; $valueToEncode = self::_recursiveJsonExprFinder($valueToEncode, $javascriptExpressions); } @@ -153,7 +153,7 @@ public static function encode($valueToEncode, $cycleCheck = false, $options = ar if (function_exists('json_encode') && self::$useBuiltinEncoderDecoder !== true) { $encodedResult = json_encode($valueToEncode); } else { - require_once 'Zend/Json/Encoder.php'; + ;// require_once 'Zend/Json/Encoder.php'; $encodedResult = Zend_Json_Encoder::encode($valueToEncode, $cycleCheck, $options); } @@ -265,7 +265,7 @@ protected static function _processXml($simpleXmlElementObject, $ignoreXmlAttribu // Keep an eye on how deeply we are involved in recursion. if ($recursionDepth > self::$maxRecursionDepthAllowed) { // XML tree is too deep. Exit now by throwing an exception. - require_once 'Zend/Json/Exception.php'; + ;// require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception( "Function _processXml exceeded the allowed recursion depth of " . self::$maxRecursionDepthAllowed); @@ -349,7 +349,7 @@ public static function fromXml($xmlStringContents, $ignoreXmlAttributes=true) // If it is not a valid XML content, throw an exception. if ($simpleXmlElementObject == null) { - require_once 'Zend/Json/Exception.php'; + ;// require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception('Function fromXml was called with an invalid XML formatted string.'); } // End of if ($simpleXmlElementObject == null) diff --git a/library/Zend/Json/Decoder.php b/library/Zend/Json/Decoder.php index 6cc569c478..a0eda5c919 100644 --- a/library/Zend/Json/Decoder.php +++ b/library/Zend/Json/Decoder.php @@ -22,7 +22,7 @@ /** * @see Zend_Json */ -require_once 'Zend/Json.php'; +;// require_once 'Zend/Json.php'; /** * Decode JSON encoded string to PHP variable constructs @@ -144,10 +144,10 @@ protected function __construct($source, $decodeType) public static function decode($source = null, $objectDecodeType = Zend_Json::TYPE_ARRAY) { if (null === $source) { - require_once 'Zend/Json/Exception.php'; + ;// require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception('Must specify JSON encoded source for decoding'); } elseif (!is_string($source)) { - require_once 'Zend/Json/Exception.php'; + ;// require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception('Can only decode JSON encoded strings'); } @@ -203,7 +203,7 @@ protected function _decodeObject() while ($tok && $tok != self::RBRACE) { if ($tok != self::DATUM || ! is_string($this->_tokenValue)) { - require_once 'Zend/Json/Exception.php'; + ;// require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception('Missing key in object encoding: ' . $this->_source); } @@ -211,7 +211,7 @@ protected function _decodeObject() $tok = $this->_getNextToken(); if ($tok != self::COLON) { - require_once 'Zend/Json/Exception.php'; + ;// require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception('Missing ":" in object encoding: ' . $this->_source); } @@ -224,7 +224,7 @@ protected function _decodeObject() } if ($tok != self::COMMA) { - require_once 'Zend/Json/Exception.php'; + ;// require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception('Missing "," in object encoding: ' . $this->_source); } @@ -274,7 +274,7 @@ protected function _decodeArray() } if ($tok != self::COMMA) { - require_once 'Zend/Json/Exception.php'; + ;// require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception('Missing "," in array encoding: ' . $this->_source); } @@ -388,7 +388,7 @@ protected function _getNextToken() $result .= '\''; break; default: - require_once 'Zend/Json/Exception.php'; + ;// require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception("Illegal escape " . "sequence '" . $chr . "'"); } @@ -440,7 +440,7 @@ protected function _getNextToken() if (is_numeric($datum)) { if (preg_match('/^0\d+$/', $datum)) { - require_once 'Zend/Json/Exception.php'; + ;// require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception("Octal notation not supported by JSON (value: $datum)"); } else { $val = intval($datum); @@ -448,7 +448,7 @@ protected function _getNextToken() $this->_tokenValue = ($val == $fVal ? $val : $fVal); } } else { - require_once 'Zend/Json/Exception.php'; + ;// require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception("Illegal number format: $datum"); } @@ -456,7 +456,7 @@ protected function _getNextToken() $this->_offset = $start + strlen($datum); } } else { - require_once 'Zend/Json/Exception.php'; + ;// require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception('Illegal Token'); } diff --git a/library/Zend/Json/Encoder.php b/library/Zend/Json/Encoder.php index 9013b285c3..6549642d5f 100644 --- a/library/Zend/Json/Encoder.php +++ b/library/Zend/Json/Encoder.php @@ -122,7 +122,7 @@ protected function _encodeObject(&$value) return '"* RECURSION (' . get_class($value) . ') *"'; } else { - require_once 'Zend/Json/Exception.php'; + ;// require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception( 'Cycles not supported in JSON encoding, cycle introduced by ' . 'class "' . get_class($value) . '"' @@ -406,7 +406,7 @@ public static function encodeClass($className, $package = '') { $cls = new ReflectionClass($className); if (! $cls->isInstantiable()) { - require_once 'Zend/Json/Exception.php'; + ;// require_once 'Zend/Json/Exception.php'; throw new Zend_Json_Exception("$className must be instantiable"); } diff --git a/library/Zend/Json/Exception.php b/library/Zend/Json/Exception.php index 03c60e310a..aa63ad6510 100644 --- a/library/Zend/Json/Exception.php +++ b/library/Zend/Json/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** diff --git a/library/Zend/Json/Server.php b/library/Zend/Json/Server.php index 589eb5d707..eb8cb3f46a 100644 --- a/library/Zend/Json/Server.php +++ b/library/Zend/Json/Server.php @@ -22,7 +22,7 @@ /** * @see Zend_Server_Abstract */ -require_once 'Zend/Server/Abstract.php'; +;// require_once 'Zend/Server/Abstract.php'; /** * @category Zend @@ -89,12 +89,12 @@ class Zend_Json_Server extends Zend_Server_Abstract public function addFunction($function, $namespace = '') { if (!is_string($function) && (!is_array($function) || (2 > count($function)))) { - require_once 'Zend/Json/Server/Exception.php'; + ;// require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('Unable to attach function; invalid'); } if (!is_callable($function)) { - require_once 'Zend/Json/Server/Exception.php'; + ;// require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('Unable to attach function; does not exist'); } @@ -104,7 +104,7 @@ public function addFunction($function, $namespace = '') $argv = array_slice($argv, 2); } - require_once 'Zend/Server/Reflection.php'; + ;// require_once 'Zend/Server/Reflection.php'; if (is_string($function)) { $method = Zend_Server_Reflection::reflectFunction($function, $argv, $namespace); } else { @@ -147,7 +147,7 @@ public function setClass($class, $namespace = '', $argv = null) $argv = array_slice($argv, 3); } - require_once 'Zend/Server/Reflection.php'; + ;// require_once 'Zend/Server/Reflection.php'; $reflection = Zend_Server_Reflection::reflectClass($class, $argv, $namespace); foreach ($reflection->getMethods() as $method) { @@ -166,7 +166,7 @@ public function setClass($class, $namespace = '', $argv = null) */ public function fault($fault = null, $code = 404, $data = null) { - require_once 'Zend/Json/Server/Error.php'; + ;// require_once 'Zend/Json/Server/Error.php'; $error = new Zend_Json_Server_Error($fault, $code, $data); $this->getResponse()->setError($error); return $error; @@ -181,7 +181,7 @@ public function fault($fault = null, $code = 404, $data = null) public function handle($request = false) { if ((false !== $request) && (!$request instanceof Zend_Json_Server_Request)) { - require_once 'Zend/Json/Server/Exception.php'; + ;// require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('Invalid request type provided; cannot handle'); } elseif ($request) { $this->setRequest($request); @@ -212,7 +212,7 @@ public function handle($request = false) public function loadFunctions($definition) { if (!is_array($definition) && (!$definition instanceof Zend_Server_Definition)) { - require_once 'Zend/Json/Server/Exception.php'; + ;// require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('Invalid definition provided to loadFunctions()'); } @@ -246,7 +246,7 @@ public function setRequest(Zend_Json_Server_Request $request) public function getRequest() { if (null === ($request = $this->_request)) { - require_once 'Zend/Json/Server/Request/Http.php'; + ;// require_once 'Zend/Json/Server/Request/Http.php'; $this->setRequest(new Zend_Json_Server_Request_Http()); } return $this->_request; @@ -272,7 +272,7 @@ public function setResponse(Zend_Json_Server_Response $response) public function getResponse() { if (null === ($response = $this->_response)) { - require_once 'Zend/Json/Server/Response/Http.php'; + ;// require_once 'Zend/Json/Server/Response/Http.php'; $this->setResponse(new Zend_Json_Server_Response_Http()); } return $this->_response; @@ -332,7 +332,7 @@ public function __call($method, $args) public function getServiceMap() { if (null === $this->_serviceMap) { - require_once 'Zend/Json/Server/Smd.php'; + ;// require_once 'Zend/Json/Server/Smd.php'; $this->_serviceMap = new Zend_Json_Server_Smd(); } return $this->_serviceMap; @@ -479,7 +479,7 @@ protected function _getSmdMethods() { if (null === $this->_smdMethods) { $this->_smdMethods = array(); - require_once 'Zend/Json/Server/Smd.php'; + ;// require_once 'Zend/Json/Server/Smd.php'; $methods = get_class_methods('Zend_Json_Server_Smd'); foreach ($methods as $key => $method) { if (!preg_match('/^(set|get)/', $method)) { diff --git a/library/Zend/Json/Server/Cache.php b/library/Zend/Json/Server/Cache.php index bb86870a4e..5131a19fa9 100644 --- a/library/Zend/Json/Server/Cache.php +++ b/library/Zend/Json/Server/Cache.php @@ -21,7 +21,7 @@ */ /** Zend_Server_Cache */ -require_once 'Zend/Server/Cache.php'; +;// require_once 'Zend/Server/Cache.php'; /** * Zend_Json_Server_Cache: cache Zend_Json_Server server definition and SMD diff --git a/library/Zend/Json/Server/Error.php b/library/Zend/Json/Server/Error.php index 838e56a20f..ae72afa3e1 100644 --- a/library/Zend/Json/Server/Error.php +++ b/library/Zend/Json/Server/Error.php @@ -181,7 +181,7 @@ public function toArray() */ public function toJson() { - require_once 'Zend/Json.php'; + ;// require_once 'Zend/Json.php'; return Zend_Json::encode($this->toArray()); } diff --git a/library/Zend/Json/Server/Exception.php b/library/Zend/Json/Server/Exception.php index b847e50146..fad9b5bae4 100644 --- a/library/Zend/Json/Server/Exception.php +++ b/library/Zend/Json/Server/Exception.php @@ -20,7 +20,7 @@ */ /** Zend_Json_Exception */ -require_once 'Zend/Json/Exception.php'; +;// require_once 'Zend/Json/Exception.php'; /** * Zend_Json_Server exceptions diff --git a/library/Zend/Json/Server/Request.php b/library/Zend/Json/Server/Request.php index 72983e4897..706a937eb4 100644 --- a/library/Zend/Json/Server/Request.php +++ b/library/Zend/Json/Server/Request.php @@ -247,7 +247,7 @@ public function getVersion() */ public function loadJson($json) { - require_once 'Zend/Json.php'; + ;// require_once 'Zend/Json.php'; $options = Zend_Json::decode($json); $this->setOptions($options); } @@ -273,7 +273,7 @@ public function toJson() $jsonArray['jsonrpc'] = '2.0'; } - require_once 'Zend/Json.php'; + ;// require_once 'Zend/Json.php'; return Zend_Json::encode($jsonArray); } diff --git a/library/Zend/Json/Server/Request/Http.php b/library/Zend/Json/Server/Request/Http.php index c817ea818f..38edc81b77 100644 --- a/library/Zend/Json/Server/Request/Http.php +++ b/library/Zend/Json/Server/Request/Http.php @@ -22,7 +22,7 @@ /** * @see Zend_Json_Server_Request */ -require_once 'Zend/Json/Server/Request.php'; +;// require_once 'Zend/Json/Server/Request.php'; /** * @category Zend diff --git a/library/Zend/Json/Server/Response.php b/library/Zend/Json/Server/Response.php index c5c6c7e36c..ec7ce2bbfc 100644 --- a/library/Zend/Json/Server/Response.php +++ b/library/Zend/Json/Server/Response.php @@ -188,7 +188,7 @@ public function toJson() $response['jsonrpc'] = $version; } - require_once 'Zend/Json.php'; + ;// require_once 'Zend/Json.php'; return Zend_Json::encode($response); } diff --git a/library/Zend/Json/Server/Response/Http.php b/library/Zend/Json/Server/Response/Http.php index 6f38cd5f93..5134fc07cf 100644 --- a/library/Zend/Json/Server/Response/Http.php +++ b/library/Zend/Json/Server/Response/Http.php @@ -22,7 +22,7 @@ /** * @see Zend_Json_Server_Response */ -require_once 'Zend/Json/Server/Response.php'; +;// require_once 'Zend/Json/Server/Response.php'; /** * @category Zend diff --git a/library/Zend/Json/Server/Smd.php b/library/Zend/Json/Server/Smd.php index ba650af224..6b29fc5077 100644 --- a/library/Zend/Json/Server/Smd.php +++ b/library/Zend/Json/Server/Smd.php @@ -129,7 +129,7 @@ public function setOptions(array $options) public function setTransport($transport) { if (!in_array($transport, $this->_transportTypes)) { - require_once 'Zend/Json/Server/Exception.php'; + ;// require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception(sprintf('Invalid transport "%s" specified', $transport)); } $this->_transport = $transport; @@ -155,7 +155,7 @@ public function getTransport() public function setEnvelope($envelopeType) { if (!in_array($envelopeType, $this->_envelopeTypes)) { - require_once 'Zend/Json/Server/Exception.php'; + ;// require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception(sprintf('Invalid envelope type "%s"', $envelopeType)); } $this->_envelope = $envelopeType; @@ -182,7 +182,7 @@ public function getEnvelope() public function setContentType($type) { if (!preg_match($this->_contentTypeRegex, $type)) { - require_once 'Zend/Json/Server/Exception.php'; + ;// require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception(sprintf('Invalid content type "%s" specified', $type)); } $this->_contentType = $type; @@ -295,7 +295,7 @@ public function isDojoCompatible() */ public function addService($service) { - require_once 'Zend/Json/Server/Smd/Service.php'; + ;// require_once 'Zend/Json/Server/Smd/Service.php'; if ($service instanceof Zend_Json_Server_Smd_Service) { $name = $service->getName(); @@ -303,12 +303,12 @@ public function addService($service) $service = new Zend_Json_Server_Smd_Service($service); $name = $service->getName(); } else { - require_once 'Zend/Json/Server/Exception.php'; + ;// require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('Invalid service passed to addService()'); } if (array_key_exists($name, $this->_services)) { - require_once 'Zend/Json/Server/Exception.php'; + ;// require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('Attempt to register a service already registered detected'); } $this->_services[$name] = $service; @@ -463,7 +463,7 @@ public function toDojoArray() */ public function toJson() { - require_once 'Zend/Json.php'; + ;// require_once 'Zend/Json.php'; return Zend_Json::encode($this->toArray()); } diff --git a/library/Zend/Json/Server/Smd/Service.php b/library/Zend/Json/Server/Smd/Service.php index 64c31463a1..eb5dc56e27 100644 --- a/library/Zend/Json/Server/Smd/Service.php +++ b/library/Zend/Json/Server/Smd/Service.php @@ -21,7 +21,7 @@ /** * @see Zend_Json_Server_Smd */ -require_once 'Zend/Json/Server/Smd.php'; +;// require_once 'Zend/Json/Server/Smd.php'; /** * Create Service Mapping Description for a method @@ -130,7 +130,7 @@ public function __construct($spec) } if (null == $this->getName()) { - require_once 'Zend/Json/Server/Exception.php'; + ;// require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('SMD service description requires a name; none provided'); } } @@ -167,7 +167,7 @@ public function setName($name) { $name = (string) $name; if (!preg_match($this->_nameRegex, $name)) { - require_once 'Zend/Json/Server/Exception.php'; + ;// require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception(sprintf('Invalid name "%s" provided for service; must follow PHP method naming conventions', $name)); } $this->_name = $name; @@ -195,7 +195,7 @@ public function getName() public function setTransport($transport) { if (!in_array($transport, $this->_transportTypes)) { - require_once 'Zend/Json/Server/Exception.php'; + ;// require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception(sprintf('Invalid transport "%s"; please select one of (%s)', $transport, implode(', ', $this->_transportTypes))); } @@ -244,7 +244,7 @@ public function getTarget() public function setEnvelope($envelopeType) { if (!in_array($envelopeType, $this->_envelopeTypes)) { - require_once 'Zend/Json/Server/Exception.php'; + ;// require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception(sprintf('Invalid envelope type "%s"; please specify one of (%s)', $envelopeType, implode(', ', $this->_envelopeTypes))); } @@ -279,7 +279,7 @@ public function addParam($type, array $options = array(), $order = null) $type[$key] = $this->_validateParamType($paramType); } } else { - require_once 'Zend/Json/Server/Exception.php'; + ;// require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('Invalid param type provided'); } @@ -383,7 +383,7 @@ public function setReturn($type) $type[$key] = $this->_validateParamType($returnType, true); } } else { - require_once 'Zend/Json/Server/Exception.php'; + ;// require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('Invalid param type provided ("' . gettype($type) .'")'); } $this->_return = $type; @@ -430,7 +430,7 @@ public function toJson() { $service = array($this->getName() => $this->toArray()); - require_once 'Zend/Json.php'; + ;// require_once 'Zend/Json.php'; return Zend_Json::encode($service); } @@ -454,7 +454,7 @@ public function __toString() protected function _validateParamType($type, $isReturn = false) { if (!is_string($type)) { - require_once 'Zend/Json/Server/Exception.php'; + ;// require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('Invalid param type provided ("' . $type .'")'); } @@ -464,7 +464,7 @@ protected function _validateParamType($type, $isReturn = false) $paramType = $this->_paramMap[$type]; if (!$isReturn && ('null' == $paramType)) { - require_once 'Zend/Json/Server/Exception.php'; + ;// require_once 'Zend/Json/Server/Exception.php'; throw new Zend_Json_Server_Exception('Invalid param type provided ("' . $type . '")'); } diff --git a/library/Zend/Layout.php b/library/Zend/Layout.php index fa8ab81a6e..df402bf7db 100644 --- a/library/Zend/Layout.php +++ b/library/Zend/Layout.php @@ -149,7 +149,7 @@ public function __construct($options = null, $initMvc = false) } elseif ($options instanceof Zend_Config) { $this->setConfig($options); } else { - require_once 'Zend/Layout/Exception.php'; + ;// require_once 'Zend/Layout/Exception.php'; throw new Zend_Layout_Exception('Invalid option provided to constructor'); } } @@ -232,7 +232,7 @@ public function setOptions($options) if ($options instanceof Zend_Config) { $options = $options->toArray(); } elseif (!is_array($options)) { - require_once 'Zend/Layout/Exception.php'; + ;// require_once 'Zend/Layout/Exception.php'; throw new Zend_Layout_Exception('setOptions() expects either an array or a Zend_Config object'); } @@ -263,11 +263,11 @@ protected function _initMvc() protected function _initPlugin() { $pluginClass = $this->getPluginClass(); - require_once 'Zend/Controller/Front.php'; + ;// require_once 'Zend/Controller/Front.php'; $front = Zend_Controller_Front::getInstance(); if (!$front->hasPlugin($pluginClass)) { if (!class_exists($pluginClass)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($pluginClass); } $front->registerPlugin( @@ -286,10 +286,10 @@ protected function _initPlugin() protected function _initHelper() { $helperClass = $this->getHelperClass(); - require_once 'Zend/Controller/Action/HelperBroker.php'; + ;// require_once 'Zend/Controller/Action/HelperBroker.php'; if (!Zend_Controller_Action_HelperBroker::hasHelper('layout')) { if (!class_exists($helperClass)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($helperClass); } Zend_Controller_Action_HelperBroker::getStack()->offsetSet(-90, new $helperClass($this)); @@ -316,7 +316,7 @@ public function setConfig(Zend_Config $config) protected function _initVarContainer() { if (null === $this->_container) { - require_once 'Zend/View/Helper/Placeholder/Registry.php'; + ;// require_once 'Zend/View/Helper/Placeholder/Registry.php'; $this->_container = Zend_View_Helper_Placeholder_Registry::getRegistry()->getContainer(__CLASS__); } @@ -563,7 +563,7 @@ public function setPluginClass($pluginClass) public function getView() { if (null === $this->_view) { - require_once 'Zend/Controller/Action/HelperBroker.php'; + ;// require_once 'Zend/Controller/Action/HelperBroker.php'; $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer'); if (null === $viewRenderer->view) { $viewRenderer->initView(); @@ -637,7 +637,7 @@ public function setInflector(Zend_Filter_Inflector $inflector) public function getInflector() { if (null === $this->_inflector) { - require_once 'Zend/Filter/Inflector.php'; + ;// require_once 'Zend/Filter/Inflector.php'; $inflector = new Zend_Filter_Inflector(); $inflector->setTargetReference($this->_inflectorTarget) ->addRules(array(':script' => array('Word_CamelCaseToDash', 'StringToLower'))) @@ -754,7 +754,7 @@ public function assign($spec, $value = null) return $this; } - require_once 'Zend/Layout/Exception.php'; + ;// require_once 'Zend/Layout/Exception.php'; throw new Zend_Layout_Exception('Invalid values passed to assign()'); } diff --git a/library/Zend/Layout/Controller/Action/Helper/Layout.php b/library/Zend/Layout/Controller/Action/Helper/Layout.php index b0b70f1913..e647ac3000 100644 --- a/library/Zend/Layout/Controller/Action/Helper/Layout.php +++ b/library/Zend/Layout/Controller/Action/Helper/Layout.php @@ -21,7 +21,7 @@ */ /** Zend_Controller_Action_Helper_Abstract */ -require_once 'Zend/Controller/Action/Helper/Abstract.php'; +;// require_once 'Zend/Controller/Action/Helper/Abstract.php'; /** * Helper for interacting with Zend_Layout objects @@ -64,7 +64,7 @@ public function __construct(Zend_Layout $layout = null) /** * @see Zend_Layout */ - require_once 'Zend/Layout.php'; + ;// require_once 'Zend/Layout.php'; $layout = Zend_Layout::getMvcInstance(); } @@ -94,7 +94,7 @@ public function getFrontController() /** * @see Zend_Controller_Front */ - require_once 'Zend/Controller/Front.php'; + ;// require_once 'Zend/Controller/Front.php'; $this->_frontController = Zend_Controller_Front::getInstance(); } @@ -112,7 +112,7 @@ public function getLayoutInstance() /** * @see Zend_Layout */ - require_once 'Zend/Layout.php'; + ;// require_once 'Zend/Layout.php'; if (null === ($this->_layout = Zend_Layout::getMvcInstance())) { $this->_layout = new Zend_Layout(); } @@ -180,7 +180,7 @@ public function __call($method, $args) return call_user_func_array(array($layout, $method), $args); } - require_once 'Zend/Layout/Exception.php'; + ;// require_once 'Zend/Layout/Exception.php'; throw new Zend_Layout_Exception(sprintf("Invalid method '%s' called on layout action helper", $method)); } } diff --git a/library/Zend/Layout/Controller/Plugin/Layout.php b/library/Zend/Layout/Controller/Plugin/Layout.php index a8bd274951..86c63048d1 100644 --- a/library/Zend/Layout/Controller/Plugin/Layout.php +++ b/library/Zend/Layout/Controller/Plugin/Layout.php @@ -20,7 +20,7 @@ */ /** Zend_Controller_Plugin_Abstract */ -require_once 'Zend/Controller/Plugin/Abstract.php'; +;// require_once 'Zend/Controller/Plugin/Abstract.php'; /** * Render layouts diff --git a/library/Zend/Layout/Exception.php b/library/Zend/Layout/Exception.php index aa2418168c..54f449a11e 100644 --- a/library/Zend/Layout/Exception.php +++ b/library/Zend/Layout/Exception.php @@ -21,7 +21,7 @@ /** Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** diff --git a/library/Zend/Ldap.php b/library/Zend/Ldap.php index 3a3b6e3c72..4319960426 100644 --- a/library/Zend/Ldap.php +++ b/library/Zend/Ldap.php @@ -91,7 +91,7 @@ public static function filterEscape($str) /** * @see Zend_Ldap_Filter_Abstract */ - require_once 'Zend/Ldap/Filter/Abstract.php'; + ;// require_once 'Zend/Ldap/Filter/Abstract.php'; return Zend_Ldap_Filter_Abstract::escapeValue($str); } @@ -108,7 +108,7 @@ public static function explodeDn($dn, array &$keys = null, array &$vals = null) /** * @see Zend_Ldap_Dn */ - require_once 'Zend/Ldap/Dn.php'; + ;// require_once 'Zend/Ldap/Dn.php'; return Zend_Ldap_Dn::checkDn($dn, $keys, $vals); } @@ -125,7 +125,7 @@ public function __construct($options = array()) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, 'LDAP extension not loaded', Zend_Ldap_Exception::LDAP_X_EXTENSION_NOT_LOADED); } @@ -166,7 +166,7 @@ public function getLastErrorCode() /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; /* For some reason draft-ietf-ldapext-ldap-c-api-xx.txt error * codes in OpenLDAP are negative values from -1 to -17. */ @@ -314,7 +314,7 @@ public function setOptions($options) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, "Unknown Zend_Ldap option: $key"); } $this->_options = $permittedOptions; @@ -480,7 +480,7 @@ protected function _getAccountFilter($acctname) /** * @see Zend_Ldap_Filter_Abstract */ - require_once 'Zend/Ldap/Filter/Abstract.php'; + ;// require_once 'Zend/Ldap/Filter/Abstract.php'; $this->_splitName($acctname, $dname, $aname); $accountFilterFormat = $this->_getAccountFilterFormat(); $aname = Zend_Ldap_Filter_Abstract::escapeValue($aname); @@ -532,7 +532,7 @@ protected function _getAccountDn($acctname) /** * @see Zend_Ldap_Dn */ - require_once 'Zend/Ldap/Dn.php'; + ;// require_once 'Zend/Ldap/Dn.php'; if (Zend_Ldap_Dn::checkDn($acctname)) return $acctname; $acctname = $this->getCanonicalAccountName($acctname, Zend_Ldap::ACCTNAME_FORM_USERNAME); $acct = $this->_getAccount($acctname, array('dn')); @@ -576,7 +576,7 @@ public function getCanonicalAccountName($acctname, $form = 0) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, "Binding domain is not an authority for user: $acctname", Zend_Ldap_Exception::LDAP_X_DOMAIN_MISMATCH); @@ -586,7 +586,7 @@ public function getCanonicalAccountName($acctname, $form = 0) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, "Invalid account name syntax: $acctname"); } @@ -611,7 +611,7 @@ public function getCanonicalAccountName($acctname, $form = 0) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, 'Option required: accountDomainNameShort'); } return "$accountDomainNameShort\\$uname"; @@ -621,7 +621,7 @@ public function getCanonicalAccountName($acctname, $form = 0) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, 'Option required: accountDomainName'); } return "$uname@$accountDomainName"; @@ -629,7 +629,7 @@ public function getCanonicalAccountName($acctname, $form = 0) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, "Unknown canonical name form: $form"); } } @@ -646,7 +646,7 @@ protected function _getAccount($acctname, array $attrs = null) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, 'Base DN not set'); } @@ -655,7 +655,7 @@ protected function _getAccount($acctname, array $attrs = null) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, 'Invalid account filter'); } @@ -673,14 +673,14 @@ protected function _getAccount($acctname, array $attrs = null) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; $code = Zend_Ldap_Exception::LDAP_NO_SUCH_OBJECT; $str = "No object found for: $accountFilter"; } else { /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; $code = Zend_Ldap_Exception::LDAP_OPERATIONS_ERROR; $str = "Unexpected result count ($count) for: $accountFilter"; } @@ -688,7 +688,7 @@ protected function _getAccount($acctname, array $attrs = null) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception($this, $str, $code); } @@ -744,7 +744,7 @@ public function connect($host = null, $port = null, $useSsl = null, $useStartTls /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, 'A host parameter is required'); } @@ -792,7 +792,7 @@ public function connect($host = null, $port = null, $useSsl = null, $useStartTls /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; $zle = new Zend_Ldap_Exception($this, "$host:$port"); $this->disconnect(); throw $zle; @@ -800,7 +800,7 @@ public function connect($host = null, $port = null, $useSsl = null, $useStartTls /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, "Failed to connect to LDAP server: $host:$port"); } @@ -835,7 +835,7 @@ public function bind($username = null, $password = null) /** * @see Zend_Ldap_Dn */ - require_once 'Zend/Ldap/Dn.php'; + ;// require_once 'Zend/Ldap/Dn.php'; if (!Zend_Ldap_Dn::checkDn($username)) { if ($this->_getBindRequiresDn()) { /* moreCreds stops an infinite loop if _getUsername does not @@ -860,7 +860,7 @@ public function bind($username = null, $password = null) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, 'Binding requires username in DN form'); } } else { @@ -878,7 +878,7 @@ public function bind($username = null, $password = null) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; $zle = new Zend_Ldap_Exception(null, 'Empty password not allowed - see allowEmptyPassword option.'); } else { @@ -891,7 +891,7 @@ public function bind($username = null, $password = null) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; switch ($this->getLastErrorCode()) { case Zend_Ldap_Exception::LDAP_SERVER_DOWN: /* If the error is related to establishing a connection rather than binding, @@ -987,7 +987,7 @@ public function search($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB, /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception($this, 'searching: ' . $filter); } if ($sort !== null && is_string($sort)) { @@ -996,7 +996,7 @@ public function search($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB, /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception($this, 'sorting: ' . $sort); } } @@ -1004,7 +1004,7 @@ public function search($filter, $basedn = null, $scope = self::SEARCH_SCOPE_SUB, /** * Zend_Ldap_Collection_Iterator_Default */ - require_once 'Zend/Ldap/Collection/Iterator/Default.php'; + ;// require_once 'Zend/Ldap/Collection/Iterator/Default.php'; $iterator = new Zend_Ldap_Collection_Iterator_Default($this, $search); return $this->_createCollection($iterator, $collectionClass); } @@ -1023,7 +1023,7 @@ protected function _createCollection(Zend_Ldap_Collection_Iterator_Default $iter /** * Zend_Ldap_Collection */ - require_once 'Zend/Ldap/Collection.php'; + ;// require_once 'Zend/Ldap/Collection.php'; return new Zend_Ldap_Collection($iterator); } else { $collectionClass = (string)$collectionClass; @@ -1031,7 +1031,7 @@ protected function _createCollection(Zend_Ldap_Collection_Iterator_Default $iter /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, "Class '$collectionClass' can not be found"); } @@ -1039,7 +1039,7 @@ protected function _createCollection(Zend_Ldap_Collection_Iterator_Default $iter /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, "Class '$collectionClass' must subclass 'Zend_Ldap_Collection'"); } @@ -1243,7 +1243,7 @@ public function add($dn, array $entry) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception($this, 'adding: ' . $dn->toString()); } return $this; @@ -1286,7 +1286,7 @@ public function update($dn, array $entry) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception($this, 'updating: ' . $dn->toString()); } } @@ -1340,7 +1340,7 @@ public function delete($dn, $recursively = false) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception($this, 'deleting: ' . $dn); } return $this; @@ -1370,7 +1370,7 @@ protected function _getChildrenDns($parentDn) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception($this, 'getting dn'); } $children[] = $childDn; @@ -1461,7 +1461,7 @@ public function rename($from, $to, $recursively = false, $alwaysEmulate = false) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception($this, 'renaming ' . $from . ' to ' . $to); } else if (!$this->exists($to)) $emulate = true; @@ -1545,7 +1545,7 @@ public function getNode($dn) /** * Zend_Ldap_Node */ - require_once 'Zend/Ldap/Node.php'; + ;// require_once 'Zend/Ldap/Node.php'; return Zend_Ldap_Node::fromLdap($dn, $this); } @@ -1572,7 +1572,7 @@ public function getRootDse() /** * @see Zend_Ldap_Node_Schema */ - require_once 'Zend/Ldap/Node/RootDse.php'; + ;// require_once 'Zend/Ldap/Node/RootDse.php'; $this->_rootDse = Zend_Ldap_Node_RootDse::create($this); } return $this->_rootDse; @@ -1590,7 +1590,7 @@ public function getSchema() /** * @see Zend_Ldap_Node_Schema */ - require_once 'Zend/Ldap/Node/Schema.php'; + ;// require_once 'Zend/Ldap/Node/Schema.php'; $this->_schema = Zend_Ldap_Node_Schema::create($this); } return $this->_schema; diff --git a/library/Zend/Ldap/Attribute.php b/library/Zend/Ldap/Attribute.php index 4fbb134b55..5d12015546 100644 --- a/library/Zend/Ldap/Attribute.php +++ b/library/Zend/Ldap/Attribute.php @@ -22,7 +22,7 @@ /** * @see Zend_Ldap_Converter */ -require_once 'Zend/Ldap/Converter.php'; +;// require_once 'Zend/Ldap/Converter.php'; /** * Zend_Ldap_Attribute is a collection of LDAP attribute related functions. diff --git a/library/Zend/Ldap/Collection/Iterator/Default.php b/library/Zend/Ldap/Collection/Iterator/Default.php index d67bbd0289..e7db1208b7 100644 --- a/library/Zend/Ldap/Collection/Iterator/Default.php +++ b/library/Zend/Ldap/Collection/Iterator/Default.php @@ -85,7 +85,7 @@ public function __construct(Zend_Ldap $ldap, $resultId) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception($this->_ldap, 'counting entries'); } } @@ -243,7 +243,7 @@ public function key(): string|null $currentDn = @ldap_get_dn($this->_ldap->getResource(), $this->_current); if ($currentDn === false) { /** @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception($this->_ldap, 'getting dn'); } return $currentDn; @@ -263,7 +263,7 @@ public function next(): void if (is_resource($this->_current) && $this->_itemCount > 0) { $this->_current = @ldap_next_entry($this->_ldap->getResource(), $this->_current); /** @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; if ($this->_current === false) { $msg = $this->_ldap->getLastError($code); if ($code === Zend_Ldap_Exception::LDAP_SIZELIMIT_EXCEEDED) { @@ -289,7 +289,7 @@ public function rewind(): void if (is_resource($this->_resultId)) { $this->_current = @ldap_first_entry($this->_ldap->getResource(), $this->_resultId); /** @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; if ($this->_current === false && $this->_ldap->getLastErrorCode() > Zend_Ldap_Exception::LDAP_SUCCESS) { throw new Zend_Ldap_Exception($this->_ldap, 'getting first entry'); diff --git a/library/Zend/Ldap/Converter/Exception.php b/library/Zend/Ldap/Converter/Exception.php index e90f633f64..cf8ca27583 100644 --- a/library/Zend/Ldap/Converter/Exception.php +++ b/library/Zend/Ldap/Converter/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/Zend/Ldap/Dn.php b/library/Zend/Ldap/Dn.php index 4e235787d1..1f86d363e7 100644 --- a/library/Zend/Ldap/Dn.php +++ b/library/Zend/Ldap/Dn.php @@ -72,7 +72,7 @@ public static function factory($dn, $caseFold = null) /** * Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, 'Invalid argument type for $dn'); } } @@ -160,7 +160,7 @@ public function getParentDn($levelUp = 1) /** * Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, 'Cannot retrieve parent DN with given $levelUp'); } $newDn = array_slice($this->_dn, $levelUp); @@ -284,14 +284,14 @@ protected function _assertIndex($index) /** * Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, 'Parameter $index must be an integer'); } if ($index < 0 || $index >= count($this->_dn)) { /** * Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, 'Parameter $index out of bounds'); } return true; @@ -310,7 +310,7 @@ protected static function _assertRdn(array $value) /** * Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, 'RDN Array is malformed: it must have at least one item'); } @@ -319,7 +319,7 @@ protected static function _assertRdn(array $value) /** * Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, 'RDN Array is malformed: it must use string keys'); } } @@ -511,7 +511,7 @@ public static function escapeValue($values = array()) /** * @see Zend_Ldap_Converter */ - require_once 'Zend/Ldap/Converter.php'; + ;// require_once 'Zend/Ldap/Converter.php'; if (!is_array($values)) $values = array($values); foreach ($values as $key => $val) { @@ -553,7 +553,7 @@ public static function unescapeValue($values = array()) /** * @see Zend_Ldap_Converter */ - require_once 'Zend/Ldap/Converter.php'; + ;// require_once 'Zend/Ldap/Converter.php'; if (!is_array($values)) $values = array($values); foreach ($values as $key => $val) { @@ -593,7 +593,7 @@ public static function explodeDn($dn, array &$keys = null, array &$vals = null, /** * Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, 'DN is malformed'); } $ret = array(); diff --git a/library/Zend/Ldap/Exception.php b/library/Zend/Ldap/Exception.php index 4d6aaeec5d..f428c95ae7 100644 --- a/library/Zend/Ldap/Exception.php +++ b/library/Zend/Ldap/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/Zend/Ldap/Filter.php b/library/Zend/Ldap/Filter.php index 6cc39fc26f..78a2b7a5f8 100644 --- a/library/Zend/Ldap/Filter.php +++ b/library/Zend/Ldap/Filter.php @@ -23,7 +23,7 @@ /** * @see Zend_Ldap_Filter_String */ -require_once 'Zend/Ldap/Filter/String.php'; +;// require_once 'Zend/Ldap/Filter/String.php'; /** * Zend_Ldap_Filter. @@ -195,7 +195,7 @@ public static function mask($mask, $value) /** * Zend_Ldap_Filter_Mask */ - require_once 'Zend/Ldap/Filter/Mask.php'; + ;// require_once 'Zend/Ldap/Filter/Mask.php'; return new Zend_Ldap_Filter_Mask($mask, $value); } @@ -210,7 +210,7 @@ public static function andFilter($filter) /** * Zend_Ldap_Filter_And */ - require_once 'Zend/Ldap/Filter/And.php'; + ;// require_once 'Zend/Ldap/Filter/And.php'; return new Zend_Ldap_Filter_And(func_get_args()); } @@ -225,7 +225,7 @@ public static function orFilter($filter) /** * Zend_Ldap_Filter_Or */ - require_once 'Zend/Ldap/Filter/Or.php'; + ;// require_once 'Zend/Ldap/Filter/Or.php'; return new Zend_Ldap_Filter_Or(func_get_args()); } diff --git a/library/Zend/Ldap/Filter/Abstract.php b/library/Zend/Ldap/Filter/Abstract.php index 674850a0b1..be615ebfa6 100644 --- a/library/Zend/Ldap/Filter/Abstract.php +++ b/library/Zend/Ldap/Filter/Abstract.php @@ -59,7 +59,7 @@ public function negate() /** * Zend_Ldap_Filter_Not */ - require_once 'Zend/Ldap/Filter/Not.php'; + ;// require_once 'Zend/Ldap/Filter/Not.php'; return new Zend_Ldap_Filter_Not($this); } @@ -74,7 +74,7 @@ public function addAnd($filter) /** * Zend_Ldap_Filter_And */ - require_once 'Zend/Ldap/Filter/And.php'; + ;// require_once 'Zend/Ldap/Filter/And.php'; $fa = func_get_args(); $args = array_merge(array($this), $fa); return new Zend_Ldap_Filter_And($args); @@ -91,7 +91,7 @@ public function addOr($filter) /** * Zend_Ldap_Filter_Or */ - require_once 'Zend/Ldap/Filter/Or.php'; + ;// require_once 'Zend/Ldap/Filter/Or.php'; $fa = func_get_args(); $args = array_merge(array($this), $fa); return new Zend_Ldap_Filter_Or($args); @@ -115,7 +115,7 @@ public static function escapeValue($values = array()) /** * @see Zend_Ldap_Converter */ - require_once 'Zend/Ldap/Converter.php'; + ;// require_once 'Zend/Ldap/Converter.php'; if (!is_array($values)) $values = array($values); foreach ($values as $key => $val) { @@ -145,7 +145,7 @@ public static function unescapeValue($values = array()) /** * @see Zend_Ldap_Converter */ - require_once 'Zend/Ldap/Converter.php'; + ;// require_once 'Zend/Ldap/Converter.php'; if (!is_array($values)) $values = array($values); foreach ($values as $key => $value) { diff --git a/library/Zend/Ldap/Filter/And.php b/library/Zend/Ldap/Filter/And.php index 7f019c62a9..40f01d4710 100644 --- a/library/Zend/Ldap/Filter/And.php +++ b/library/Zend/Ldap/Filter/And.php @@ -23,7 +23,7 @@ /** * @see Zend_Ldap_Filter_Logical */ -require_once 'Zend/Ldap/Filter/Logical.php'; +;// require_once 'Zend/Ldap/Filter/Logical.php'; /** * Zend_Ldap_Filter_And provides an 'and' filter. diff --git a/library/Zend/Ldap/Filter/Exception.php b/library/Zend/Ldap/Filter/Exception.php index dfeef22891..51dbb51510 100644 --- a/library/Zend/Ldap/Filter/Exception.php +++ b/library/Zend/Ldap/Filter/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/Zend/Ldap/Filter/Logical.php b/library/Zend/Ldap/Filter/Logical.php index 7c57f10004..aeb2964dbc 100644 --- a/library/Zend/Ldap/Filter/Logical.php +++ b/library/Zend/Ldap/Filter/Logical.php @@ -23,11 +23,11 @@ /** * @see Zend_Ldap_Filter_Abstract */ -require_once 'Zend/Ldap/Filter/Abstract.php'; +;// require_once 'Zend/Ldap/Filter/Abstract.php'; /** * @see Zend_Ldap_Filter_String */ -require_once 'Zend/Ldap/Filter/String.php'; +;// require_once 'Zend/Ldap/Filter/String.php'; /** * Zend_Ldap_Filter_Logical provides a base implementation for a grouping filter. @@ -71,7 +71,7 @@ protected function __construct(array $subfilters, $symbol) /** * @see Zend_Ldap_Filter_Exception */ - require_once 'Zend/Ldap/Filter/Exception.php'; + ;// require_once 'Zend/Ldap/Filter/Exception.php'; throw new Zend_Ldap_Filter_Exception('Only strings or Zend_Ldap_Filter_Abstract allowed.'); } } diff --git a/library/Zend/Ldap/Filter/Mask.php b/library/Zend/Ldap/Filter/Mask.php index 6846bdbc20..3f8fcef156 100644 --- a/library/Zend/Ldap/Filter/Mask.php +++ b/library/Zend/Ldap/Filter/Mask.php @@ -23,7 +23,7 @@ /** * @see Zend_Ldap_Filter_String */ -require_once 'Zend/Ldap/Filter/String.php'; +;// require_once 'Zend/Ldap/Filter/String.php'; /** diff --git a/library/Zend/Ldap/Filter/Not.php b/library/Zend/Ldap/Filter/Not.php index 030d280a22..0967e2e5cf 100644 --- a/library/Zend/Ldap/Filter/Not.php +++ b/library/Zend/Ldap/Filter/Not.php @@ -23,7 +23,7 @@ /** * @see Zend_Ldap_Filter_Abstract */ -require_once 'Zend/Ldap/Filter/Abstract.php'; +;// require_once 'Zend/Ldap/Filter/Abstract.php'; /** * Zend_Ldap_Filter_Not provides a negation filter. diff --git a/library/Zend/Ldap/Filter/Or.php b/library/Zend/Ldap/Filter/Or.php index 292f5d6644..77323f1834 100644 --- a/library/Zend/Ldap/Filter/Or.php +++ b/library/Zend/Ldap/Filter/Or.php @@ -23,7 +23,7 @@ /** * @see Zend_Ldap_Filter_Logical */ -require_once 'Zend/Ldap/Filter/Logical.php'; +;// require_once 'Zend/Ldap/Filter/Logical.php'; /** * Zend_Ldap_Filter_Or provides an 'or' filter. diff --git a/library/Zend/Ldap/Filter/String.php b/library/Zend/Ldap/Filter/String.php index 2f9e254865..90ba673127 100644 --- a/library/Zend/Ldap/Filter/String.php +++ b/library/Zend/Ldap/Filter/String.php @@ -23,7 +23,7 @@ /** * @see Zend_Ldap_Filter_Abstract */ -require_once 'Zend/Ldap/Filter/Abstract.php'; +;// require_once 'Zend/Ldap/Filter/Abstract.php'; /** * Zend_Ldap_Filter_String provides a simple custom string filter. diff --git a/library/Zend/Ldap/Node.php b/library/Zend/Ldap/Node.php index 243512122c..1af897254f 100644 --- a/library/Zend/Ldap/Node.php +++ b/library/Zend/Ldap/Node.php @@ -23,11 +23,11 @@ /** * @see Zend_Ldap */ -require_once 'Zend/Ldap.php'; +;// require_once 'Zend/Ldap.php'; /** * @see Zend_Ldap_Node_Abstract */ -require_once 'Zend/Ldap/Node/Abstract.php'; +;// require_once 'Zend/Ldap/Node/Abstract.php'; /** * Zend_Ldap_Node provides an object oriented view into a LDAP node. @@ -140,7 +140,7 @@ public function getLdap() /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, 'No LDAP connection specified.', Zend_Ldap_Exception::LDAP_OTHER); } else return $this->_ldap; @@ -162,7 +162,7 @@ public function attachLdap(Zend_Ldap $ldap) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, 'LDAP connection is not responsible for given node.', Zend_Ldap_Exception::LDAP_OTHER); } @@ -246,7 +246,7 @@ public static function create($dn, array $objectClass = array()) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, '$dn is of a wrong data type.'); } $new = new self($dn, array(), false, null); @@ -273,7 +273,7 @@ public static function fromLdap($dn, Zend_Ldap $ldap) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, '$dn is of a wrong data type.'); } $data = $ldap->getEntry($dn, array('*', '+'), true); @@ -298,7 +298,7 @@ public static function fromArray(array $data, $fromDataSource = false) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, '\'dn\' key is missing in array.'); } if (is_string($data['dn']) || is_array($data['dn'])) { @@ -309,7 +309,7 @@ public static function fromArray(array $data, $fromDataSource = false) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, '\'dn\' key is of a wrong data type.'); } $fromDataSource = ($fromDataSource === true) ? true : false; @@ -429,7 +429,7 @@ public function update(Zend_Ldap $ldap = null) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, 'No LDAP connection available'); } @@ -590,7 +590,7 @@ public function toLdif(array $options = array()) /** * Zend_Ldap_Ldif_Encoder */ - require_once 'Zend/Ldap/Ldif/Encoder.php'; + ;// require_once 'Zend/Ldap/Ldif/Encoder.php'; return Zend_Ldap_Ldif_Encoder::encode($attributes, $options); } @@ -813,20 +813,20 @@ protected function _assertChangeableAttribute($name) /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, 'DN cannot be changed.'); } else if (array_key_exists($name, $rdn)) { /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, 'Cannot change attribute because it\'s part of the RDN'); } else if (in_array($name, self::$_systemAttributes)) { /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + ;// require_once 'Zend/Ldap/Exception.php'; throw new Zend_Ldap_Exception(null, 'Cannot change attribute because it\'s read-only'); } else return true; @@ -949,7 +949,7 @@ public function searchSubtree($filter, $scope = Zend_Ldap::SEARCH_SCOPE_SUB, $so /** * @see Zend_Ldap_Node_Collection */ - require_once 'Zend/Ldap/Node/Collection.php'; + ;// require_once 'Zend/Ldap/Node/Collection.php'; return $this->getLdap()->search($filter, $this->_getDn(), $scope, array('*', '+'), $sort, 'Zend_Ldap_Node_Collection'); } @@ -1042,7 +1042,7 @@ public function getChildren(): Zend_Ldap_Node_ChildrenIterator /** * @see Zend_Ldap_Node_ChildrenIterator */ - require_once 'Zend/Ldap/Node/ChildrenIterator.php'; + ;// require_once 'Zend/Ldap/Node/ChildrenIterator.php'; return new Zend_Ldap_Node_ChildrenIterator($this->_children); } diff --git a/library/Zend/Ldap/Node/Abstract.php b/library/Zend/Ldap/Node/Abstract.php index 6c80b19623..96e46031b3 100644 --- a/library/Zend/Ldap/Node/Abstract.php +++ b/library/Zend/Ldap/Node/Abstract.php @@ -23,11 +23,11 @@ /** * @see Zend_Ldap_Attribute */ -require_once 'Zend/Ldap/Attribute.php'; +;// require_once 'Zend/Ldap/Attribute.php'; /** * @see Zend_Ldap_Dn */ -require_once 'Zend/Ldap/Dn.php'; +;// require_once 'Zend/Ldap/Dn.php'; /** * Zend_Ldap_Node_Abstract provides a bas eimplementation for LDAP nodes diff --git a/library/Zend/Ldap/Node/ChildrenIterator.php b/library/Zend/Ldap/Node/ChildrenIterator.php index 0dbab3216c..5a5c50d497 100644 --- a/library/Zend/Ldap/Node/ChildrenIterator.php +++ b/library/Zend/Ldap/Node/ChildrenIterator.php @@ -23,7 +23,7 @@ /** * @see Zend_Ldap_Node */ -require_once 'Zend/Ldap/Node.php'; +;// require_once 'Zend/Ldap/Node.php'; /** * Zend_Ldap_Node_ChildrenIterator provides an iterator to a collection of children nodes. diff --git a/library/Zend/Ldap/Node/Collection.php b/library/Zend/Ldap/Node/Collection.php index 42fa1236c7..06a7facb4f 100644 --- a/library/Zend/Ldap/Node/Collection.php +++ b/library/Zend/Ldap/Node/Collection.php @@ -23,7 +23,7 @@ /** * @see Zend_Ldap_Collection */ -require_once 'Zend/Ldap/Collection.php'; +;// require_once 'Zend/Ldap/Collection.php'; /** @@ -48,7 +48,7 @@ protected function _createEntry(array $data) /** * @see Zend_Ldap_Node */ - require_once 'Zend/Ldap/Node.php'; + ;// require_once 'Zend/Ldap/Node.php'; $node = Zend_Ldap_Node::fromArray($data, true); $node->attachLdap($this->_iterator->getLdap()); return $node; diff --git a/library/Zend/Ldap/Node/RootDse.php b/library/Zend/Ldap/Node/RootDse.php index f70682e94a..75ef1c9b6b 100644 --- a/library/Zend/Ldap/Node/RootDse.php +++ b/library/Zend/Ldap/Node/RootDse.php @@ -23,7 +23,7 @@ /** * @see Zend_Ldap_Node_Abstract */ -require_once 'Zend/Ldap/Node/Abstract.php'; +;// require_once 'Zend/Ldap/Node/Abstract.php'; /** * Zend_Ldap_Node_RootDse provides a simple data-container for the RootDSE node. @@ -56,20 +56,20 @@ public static function create(Zend_Ldap $ldap) /** * @see Zend_Ldap_Node_RootDse_ActiveDirectory */ - require_once 'Zend/Ldap/Node/RootDse/ActiveDirectory.php'; + ;// require_once 'Zend/Ldap/Node/RootDse/ActiveDirectory.php'; return new Zend_Ldap_Node_RootDse_ActiveDirectory($dn, $data); } else if (isset($data['dsaname'])) { /** * @see Zend_Ldap_Node_RootDse_ActiveDirectory */ - require_once 'Zend/Ldap/Node/RootDse/eDirectory.php'; + ;// require_once 'Zend/Ldap/Node/RootDse/eDirectory.php'; return new Zend_Ldap_Node_RootDse_eDirectory($dn, $data); } else if (isset($data['structuralobjectclass']) && $data['structuralobjectclass'][0] === 'OpenLDAProotDSE') { /** * @see Zend_Ldap_Node_RootDse_OpenLdap */ - require_once 'Zend/Ldap/Node/RootDse/OpenLdap.php'; + ;// require_once 'Zend/Ldap/Node/RootDse/OpenLdap.php'; return new Zend_Ldap_Node_RootDse_OpenLdap($dn, $data); } else { return new self($dn, $data); @@ -152,7 +152,7 @@ public function getSchemaDn() /** * @see Zend_Ldap_Dn */ - require_once 'Zend/Ldap/Dn.php'; + ;// require_once 'Zend/Ldap/Dn.php'; return Zend_Ldap_Dn::fromString($schemaDn); } } diff --git a/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php b/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php index 20681122ce..7cf3201a9d 100644 --- a/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php +++ b/library/Zend/Ldap/Node/RootDse/ActiveDirectory.php @@ -23,7 +23,7 @@ /** * @see Zend_Ldap_Node_RootDse */ -require_once 'Zend/Ldap/Node/RootDse.php'; +;// require_once 'Zend/Ldap/Node/RootDse.php'; /** * Zend_Ldap_Node_RootDse provides a simple data-container for the RootDSE node of @@ -241,7 +241,7 @@ public function getSchemaDn() /** * @see Zend_Ldap_Dn */ - require_once 'Zend/Ldap/Dn.php'; + ;// require_once 'Zend/Ldap/Dn.php'; return Zend_Ldap_Dn::fromString($schemaDn); } } diff --git a/library/Zend/Ldap/Node/RootDse/OpenLdap.php b/library/Zend/Ldap/Node/RootDse/OpenLdap.php index 90d89d97ea..e639f94a77 100644 --- a/library/Zend/Ldap/Node/RootDse/OpenLdap.php +++ b/library/Zend/Ldap/Node/RootDse/OpenLdap.php @@ -23,7 +23,7 @@ /** * @see Zend_Ldap_Node_RootDse */ -require_once 'Zend/Ldap/Node/RootDse.php'; +;// require_once 'Zend/Ldap/Node/RootDse.php'; /** * Zend_Ldap_Node_RootDse provides a simple data-container for the RootDSE node of diff --git a/library/Zend/Ldap/Node/RootDse/eDirectory.php b/library/Zend/Ldap/Node/RootDse/eDirectory.php index 59ba5945da..0852cc9a6e 100644 --- a/library/Zend/Ldap/Node/RootDse/eDirectory.php +++ b/library/Zend/Ldap/Node/RootDse/eDirectory.php @@ -23,7 +23,7 @@ /** * @see Zend_Ldap_Node_RootDse */ -require_once 'Zend/Ldap/Node/RootDse.php'; +;// require_once 'Zend/Ldap/Node/RootDse.php'; /** * Zend_Ldap_Node_RootDse provides a simple data-container for the RootDSE node of diff --git a/library/Zend/Ldap/Node/Schema.php b/library/Zend/Ldap/Node/Schema.php index 6ac8d4fe61..a890de7c00 100644 --- a/library/Zend/Ldap/Node/Schema.php +++ b/library/Zend/Ldap/Node/Schema.php @@ -23,7 +23,7 @@ /** * @see Zend_Ldap_Node_Abstract */ -require_once 'Zend/Ldap/Node/Abstract.php'; +;// require_once 'Zend/Ldap/Node/Abstract.php'; /** * Zend_Ldap_Node_Schema provides a simple data-container for the Schema node. @@ -57,13 +57,13 @@ public static function create(Zend_Ldap $ldap) /** * @see Zend_Ldap_Node_Schema_ActiveDirectory */ - require_once 'Zend/Ldap/Node/Schema/ActiveDirectory.php'; + ;// require_once 'Zend/Ldap/Node/Schema/ActiveDirectory.php'; return new Zend_Ldap_Node_Schema_ActiveDirectory($dn, $data, $ldap); case Zend_Ldap_Node_RootDse::SERVER_TYPE_OPENLDAP: /** * @see Zend_Ldap_Node_RootDse_ActiveDirectory */ - require_once 'Zend/Ldap/Node/Schema/OpenLdap.php'; + ;// require_once 'Zend/Ldap/Node/Schema/OpenLdap.php'; return new Zend_Ldap_Node_Schema_OpenLdap($dn, $data, $ldap); case Zend_Ldap_Node_RootDse::SERVER_TYPE_EDIRECTORY: default: diff --git a/library/Zend/Ldap/Node/Schema/ActiveDirectory.php b/library/Zend/Ldap/Node/Schema/ActiveDirectory.php index 7fd71c50af..9443ecf095 100644 --- a/library/Zend/Ldap/Node/Schema/ActiveDirectory.php +++ b/library/Zend/Ldap/Node/Schema/ActiveDirectory.php @@ -23,15 +23,15 @@ /** * @see Zend_Ldap_Node_Schema */ -require_once 'Zend/Ldap/Node/Schema.php'; +;// require_once 'Zend/Ldap/Node/Schema.php'; /** * @see Zend_Ldap_Node_Schema_AttributeType_ActiveDirectory */ -require_once 'Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php'; +;// require_once 'Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php'; /** * @see Zend_Ldap_Node_Schema_ObjectClass_ActiveDirectory */ -require_once 'Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php'; +;// require_once 'Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php'; /** * Zend_Ldap_Node_Schema_ActiveDirectory provides a simple data-container for the Schema node of diff --git a/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php b/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php index 60fffd3c0f..3ab7b4a900 100644 --- a/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php +++ b/library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php @@ -23,11 +23,11 @@ /** * @see Zend_Ldap_Node_Schema_Item */ -require_once 'Zend/Ldap/Node/Schema/Item.php'; +;// require_once 'Zend/Ldap/Node/Schema/Item.php'; /** * @see Zend_Ldap_Node_Schema_AttributeType_Interface */ -require_once 'Zend/Ldap/Node/Schema/AttributeType/Interface.php'; +;// require_once 'Zend/Ldap/Node/Schema/AttributeType/Interface.php'; /** * Zend_Ldap_Node_Schema_AttributeType_ActiveDirectory provides access to the attribute type diff --git a/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php b/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php index 3b2e0321e2..8dd4448e14 100644 --- a/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php +++ b/library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php @@ -23,11 +23,11 @@ /** * @see Zend_Ldap_Node_Schema_Item */ -require_once 'Zend/Ldap/Node/Schema/Item.php'; +;// require_once 'Zend/Ldap/Node/Schema/Item.php'; /** * @see Zend_Ldap_Node_Schema_AttributeType_Interface */ -require_once 'Zend/Ldap/Node/Schema/AttributeType/Interface.php'; +;// require_once 'Zend/Ldap/Node/Schema/AttributeType/Interface.php'; /** * Zend_Ldap_Node_Schema_AttributeType_OpenLdap provides access to the attribute type diff --git a/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php b/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php index ad77205a85..a3c4064374 100644 --- a/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php +++ b/library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php @@ -23,11 +23,11 @@ /** * @see Zend_Ldap_Node_Schema_Item */ -require_once 'Zend/Ldap/Node/Schema/Item.php'; +;// require_once 'Zend/Ldap/Node/Schema/Item.php'; /** * @see Zend_Ldap_Node_Schema_ObjectClass_Interface */ -require_once 'Zend/Ldap/Node/Schema/ObjectClass/Interface.php'; +;// require_once 'Zend/Ldap/Node/Schema/ObjectClass/Interface.php'; /** * Zend_Ldap_Node_Schema_ObjectClass_ActiveDirectory provides access to the objectClass diff --git a/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php b/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php index 747f8d5e0e..94e8d05d3b 100644 --- a/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php +++ b/library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php @@ -23,11 +23,11 @@ /** * @see Zend_Ldap_Node_Schema_Item */ -require_once 'Zend/Ldap/Node/Schema/Item.php'; +;// require_once 'Zend/Ldap/Node/Schema/Item.php'; /** * @see Zend_Ldap_Node_Schema_ObjectClass_Interface */ -require_once 'Zend/Ldap/Node/Schema/ObjectClass/Interface.php'; +;// require_once 'Zend/Ldap/Node/Schema/ObjectClass/Interface.php'; /** * Zend_Ldap_Node_Schema_ObjectClass_OpenLdap provides access to the objectClass diff --git a/library/Zend/Ldap/Node/Schema/OpenLdap.php b/library/Zend/Ldap/Node/Schema/OpenLdap.php index 6e20812fe6..12a4a78dbd 100644 --- a/library/Zend/Ldap/Node/Schema/OpenLdap.php +++ b/library/Zend/Ldap/Node/Schema/OpenLdap.php @@ -23,15 +23,15 @@ /** * @see Zend_Ldap_Node_Schema */ -require_once 'Zend/Ldap/Node/Schema.php'; +;// require_once 'Zend/Ldap/Node/Schema.php'; /** * @see Zend_Ldap_Node_Schema_AttributeType_OpenLdap */ -require_once 'Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php'; +;// require_once 'Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php'; /** * @see Zend_Ldap_Node_Schema_ObjectClass_OpenLdap */ -require_once 'Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php'; +;// require_once 'Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php'; /** * Zend_Ldap_Node_Schema_OpenLdap provides a simple data-container for the Schema node of diff --git a/library/Zend/Loader/Autoloader/Resource.php b/library/Zend/Loader/Autoloader/Resource.php index b9279c257c..99de61eebe 100644 --- a/library/Zend/Loader/Autoloader/Resource.php +++ b/library/Zend/Loader/Autoloader/Resource.php @@ -21,7 +21,7 @@ */ /** Zend_Loader_Autoloader_Interface */ -require_once 'Zend/Loader/Autoloader/Interface.php'; +;// require_once 'Zend/Loader/Autoloader/Interface.php'; /** * Resource loader @@ -71,7 +71,7 @@ public function __construct($options) $options = $options->toArray(); } if (!is_array($options)) { - require_once 'Zend/Loader/Exception.php'; + ;// require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('Options must be passed to resource loader constructor'); } @@ -81,14 +81,14 @@ public function __construct($options) if ((null === $namespace) || (null === $this->getBasePath()) ) { - require_once 'Zend/Loader/Exception.php'; + ;// require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('Resource loader requires both a namespace and a base path for initialization'); } if (!empty($namespace)) { $namespace .= '_'; } - require_once 'Zend/Loader/Autoloader.php'; + ;// require_once 'Zend/Loader/Autoloader.php'; Zend_Loader_Autoloader::getInstance()->unshiftAutoloader($this, $namespace); } @@ -117,18 +117,18 @@ public function __call($method, $args) if ('get' == substr($method, 0, 3)) { $type = strtolower(substr($method, 3)); if (!$this->hasResourceType($type)) { - require_once 'Zend/Loader/Exception.php'; + ;// require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception("Invalid resource type $type; cannot load resource"); } if (empty($args)) { - require_once 'Zend/Loader/Exception.php'; + ;// require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception("Cannot load resources; no resource specified"); } $resource = array_shift($args); return $this->load($resource, $type); } - require_once 'Zend/Loader/Exception.php'; + ;// require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception("Method '$method' is not supported"); } @@ -284,7 +284,7 @@ public function addResourceType($type, $path, $namespace = null) $type = strtolower($type); if (!isset($this->_resourceTypes[$type])) { if (null === $namespace) { - require_once 'Zend/Loader/Exception.php'; + ;// require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('Initial definition of a resource type must include a namespace'); } $namespaceTopLevel = $this->getNamespace(); @@ -294,7 +294,7 @@ public function addResourceType($type, $path, $namespace = null) ); } if (!is_string($path)) { - require_once 'Zend/Loader/Exception.php'; + ;// require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('Invalid path specification provided; must be string'); } $this->_resourceTypes[$type]['path'] = $this->getBasePath() . '/' . rtrim($path, '\/'); @@ -334,11 +334,11 @@ public function addResourceTypes(array $types) { foreach ($types as $type => $spec) { if (!is_array($spec)) { - require_once 'Zend/Loader/Exception.php'; + ;// require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('addResourceTypes() expects an array of arrays'); } if (!isset($spec['path'])) { - require_once 'Zend/Loader/Exception.php'; + ;// require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('addResourceTypes() expects each array to include a paths element'); } $paths = $spec['path']; @@ -454,12 +454,12 @@ public function load($resource, $type = null) if (null === $type) { $type = $this->getDefaultResourceType(); if (empty($type)) { - require_once 'Zend/Loader/Exception.php'; + ;// require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('No resource type specified'); } } if (!$this->hasResourceType($type)) { - require_once 'Zend/Loader/Exception.php'; + ;// require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('Invalid resource type specified'); } $namespace = $this->_resourceTypes[$type]['namespace']; diff --git a/library/Zend/Loader/AutoloaderFactory.php b/library/Zend/Loader/AutoloaderFactory.php index 9fc2836525..4f7d8dc873 100644 --- a/library/Zend/Loader/AutoloaderFactory.php +++ b/library/Zend/Loader/AutoloaderFactory.php @@ -18,7 +18,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once dirname(__FILE__) . '/SplAutoloader.php'; +;// require_once dirname(__FILE__) . '/SplAutoloader.php'; if (class_exists('Zend_Loader_AutoloaderFactory')) return; @@ -82,7 +82,7 @@ public static function factory($options = null) } if (!is_array($options) && !($options instanceof Traversable)) { - require_once 'Exception/InvalidArgumentException.php'; + ;// require_once 'Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException( 'Options provided must be an array or Traversable' ); @@ -98,14 +98,14 @@ public static function factory($options = null) strrchr(self::CLASS_MAP_AUTOLOADER, '_'), 1 ); - require_once dirname(__FILE__) . "/$classMapLoader.php"; + ;// require_once dirname(__FILE__) . "/$classMapLoader.php"; } } // Autoload with standard autoloader $autoloader = self::getStandardAutoloader(); if (!class_exists($class) && !$autoloader->autoload($class)) { - require_once 'Exception/InvalidArgumentException.php'; + ;// require_once 'Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException(sprintf( 'Autoloader class "%s" not loaded', $class @@ -116,7 +116,7 @@ public static function factory($options = null) // additionally instanceof is also broken for this use case if (version_compare(PHP_VERSION, '5.3.7', '>=')) { if (!is_subclass_of($class, 'Zend_Loader_SplAutoloader')) { - require_once 'Exception/InvalidArgumentException.php'; + ;// require_once 'Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException(sprintf( 'Autoloader class %s must implement Zend\\Loader\\SplAutoloader', $class @@ -159,7 +159,7 @@ public static function getRegisteredAutoloaders() public static function getRegisteredAutoloader($class) { if (!isset(self::$loaders[$class])) { - require_once 'Exception/InvalidArgumentException.php'; + ;// require_once 'Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException(sprintf('Autoloader class "%s" not loaded', $class)); } return self::$loaders[$class]; @@ -216,7 +216,7 @@ protected static function getStandardAutoloader() $stdAutoloader = substr(strrchr(self::STANDARD_AUTOLOADER, '_'), 1); if (!class_exists(self::STANDARD_AUTOLOADER)) { - require_once dirname(__FILE__) . "/$stdAutoloader.php"; + ;// require_once dirname(__FILE__) . "/$stdAutoloader.php"; } $loader = new Zend_Loader_StandardAutoloader(); self::$standardAutoloader = $loader; diff --git a/library/Zend/Loader/ClassMapAutoloader.php b/library/Zend/Loader/ClassMapAutoloader.php index 177c2f5ad7..6a76c320cc 100644 --- a/library/Zend/Loader/ClassMapAutoloader.php +++ b/library/Zend/Loader/ClassMapAutoloader.php @@ -19,7 +19,7 @@ */ // Grab SplAutoloader interface -require_once dirname(__FILE__) . '/SplAutoloader.php'; +;// require_once dirname(__FILE__) . '/SplAutoloader.php'; /** * Class-map autoloader @@ -95,7 +95,7 @@ public function registerAutoloadMap($map) } if (!is_array($map)) { - require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; + ;// require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException('Map file provided does not return a map'); } @@ -117,7 +117,7 @@ public function registerAutoloadMap($map) public function registerAutoloadMaps($locations) { if (!is_array($locations) && !($locations instanceof Traversable)) { - require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; + ;// require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException('Map list must be an array or implement Traversable'); } foreach ($locations as $location) { @@ -145,7 +145,7 @@ public function getAutoloadMap() public function autoload($class) { if (isset($this->map[$class])) { - require_once $this->map[$class]; + ;// require_once $this->map[$class]; } } @@ -177,7 +177,7 @@ public function register() protected function loadMapFromFile($location) { if (!file_exists($location)) { - require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; + ;// require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException('Map file provided does not exist'); } diff --git a/library/Zend/Loader/Exception.php b/library/Zend/Loader/Exception.php index 9b5c77f489..45d0fd5332 100644 --- a/library/Zend/Loader/Exception.php +++ b/library/Zend/Loader/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/Zend/Loader/Exception/InvalidArgumentException.php b/library/Zend/Loader/Exception/InvalidArgumentException.php index 6cfc221957..bdec5af4d4 100644 --- a/library/Zend/Loader/Exception/InvalidArgumentException.php +++ b/library/Zend/Loader/Exception/InvalidArgumentException.php @@ -19,7 +19,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once dirname(__FILE__) . '/../Exception.php'; +;// require_once dirname(__FILE__) . '/../Exception.php'; /** * @category Zend diff --git a/library/Zend/Loader/PluginLoader.php b/library/Zend/Loader/PluginLoader.php index 118684302d..4d4dbfc764 100644 --- a/library/Zend/Loader/PluginLoader.php +++ b/library/Zend/Loader/PluginLoader.php @@ -21,10 +21,10 @@ */ /** Zend_Loader_PluginLoader_Interface */ -require_once 'Zend/Loader/PluginLoader/Interface.php'; +;// require_once 'Zend/Loader/PluginLoader/Interface.php'; /** Zend_Loader */ -require_once 'Zend/Loader.php'; +;// require_once 'Zend/Loader.php'; /** * Generic plugin class loader @@ -153,7 +153,7 @@ protected function _formatPrefix($prefix) public function addPrefixPath($prefix, $path) { if (!is_string($prefix) || !is_string($path)) { - require_once 'Zend/Loader/PluginLoader/Exception.php'; + ;// require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception('Zend_Loader_PluginLoader::addPrefixPath() method only takes strings for prefix and path.'); } @@ -258,14 +258,14 @@ public function removePrefixPath($prefix, $path = null) } if (!isset($registry[$prefix])) { - require_once 'Zend/Loader/PluginLoader/Exception.php'; + ;// require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception('Prefix ' . $prefix . ' was not found in the PluginLoader.'); } if ($path != null) { $pos = array_search($path, $registry[$prefix]); if (false === $pos) { - require_once 'Zend/Loader/PluginLoader/Exception.php'; + ;// require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception('Prefix ' . $prefix . ' / Path ' . $path . ' was not found in the PluginLoader.'); } unset($registry[$prefix][$pos]); @@ -420,7 +420,7 @@ public function load($name, $throwExceptions = true) foreach ($registry as $prefix => $paths) { $message .= "\n$prefix: " . implode(PATH_SEPARATOR, $paths); } - require_once 'Zend/Loader/PluginLoader/Exception.php'; + ;// require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception($message); } @@ -457,15 +457,15 @@ public static function setIncludeFileCache($file) } if (!file_exists($file) && !file_exists(dirname($file))) { - require_once 'Zend/Loader/PluginLoader/Exception.php'; + ;// require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception('Specified file does not exist and/or directory does not exist (' . $file . ')'); } if (file_exists($file) && !is_writable($file)) { - require_once 'Zend/Loader/PluginLoader/Exception.php'; + ;// require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception('Specified file is not writeable (' . $file . ')'); } if (!file_exists($file) && file_exists(dirname($file)) && !is_writable(dirname($file))) { - require_once 'Zend/Loader/PluginLoader/Exception.php'; + ;// require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception('Specified file is not writeable (' . $file . ')'); } diff --git a/library/Zend/Loader/PluginLoader/Exception.php b/library/Zend/Loader/PluginLoader/Exception.php index ea76629d59..9a3c9e5f71 100644 --- a/library/Zend/Loader/PluginLoader/Exception.php +++ b/library/Zend/Loader/PluginLoader/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Loader_Exception */ -require_once 'Zend/Loader/Exception.php'; +;// require_once 'Zend/Loader/Exception.php'; /** * Plugin class loader exceptions diff --git a/library/Zend/Loader/StandardAutoloader.php b/library/Zend/Loader/StandardAutoloader.php index 867fbd9223..fb9862353e 100644 --- a/library/Zend/Loader/StandardAutoloader.php +++ b/library/Zend/Loader/StandardAutoloader.php @@ -19,7 +19,7 @@ */ // Grab SplAutoloader interface -require_once dirname(__FILE__) . '/SplAutoloader.php'; +;// require_once dirname(__FILE__) . '/SplAutoloader.php'; /** * PSR-0 compliant autoloader @@ -98,7 +98,7 @@ public function __construct($options = null) public function setOptions($options) { if (!is_array($options) && !($options instanceof Traversable)) { - require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; + ;// require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException('Options must be either an array or Traversable'); } @@ -174,7 +174,7 @@ public function registerNamespace($namespace, $directory) public function registerNamespaces($namespaces) { if (!is_array($namespaces) && !$namespaces instanceof Traversable) { - require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; + ;// require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException('Namespace pairs must be either an array or Traversable'); } @@ -207,7 +207,7 @@ public function registerPrefix($prefix, $directory) public function registerPrefixes($prefixes) { if (!is_array($prefixes) && !$prefixes instanceof Traversable) { - require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; + ;// require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException('Prefix pairs must be either an array or Traversable'); } @@ -306,7 +306,7 @@ protected function transformClassNameToFilename($class, $directory) protected function loadClass($class, $type) { if (!in_array($type, array(self::LOAD_NS, self::LOAD_PREFIX, self::ACT_AS_FALLBACK))) { - require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; + ;// require_once dirname(__FILE__) . '/Exception/InvalidArgumentException.php'; throw new Zend_Loader_Exception_InvalidArgumentException(); } diff --git a/library/Zend/Locale.php b/library/Zend/Locale.php index f2618a779b..985519d6b5 100644 --- a/library/Zend/Locale.php +++ b/library/Zend/Locale.php @@ -1188,12 +1188,12 @@ public static function setDefault($locale, $quality = 1) { if (($locale === 'auto') or ($locale === 'root') or ($locale === 'default') or ($locale === 'environment') or ($locale === 'browser')) { - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception('Only full qualified locales can be used as default!'); } if (($quality < 0.1) or ($quality > 100)) { - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Quality must be between 0.1 and 100"); } @@ -1209,7 +1209,7 @@ public static function setDefault($locale, $quality = 1) if (isset(self::$_localeData[$elocale[0]]) === true) { self::$_default = array($elocale[0] => $quality); } else { - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unknown locale '" . (string) $locale . "' can not be set as default!"); } } @@ -1232,7 +1232,7 @@ public static function getEnvironment() return self::$_environment; } - require_once 'Zend/Locale/Data/Translation.php'; + ;// require_once 'Zend/Locale/Data/Translation.php'; $language = setlocale(LC_ALL, 0); $languages = explode(';', $language); @@ -1461,7 +1461,7 @@ public function equals(Zend_Locale $object) */ public static function getTranslationList($path = null, $locale = null, $value = null) { - require_once 'Zend/Locale/Data.php'; + ;// require_once 'Zend/Locale/Data.php'; $locale = self::findLocale($locale); $result = Zend_Locale_Data::getList($locale, $path, $value); if (empty($result) === true) { @@ -1535,7 +1535,7 @@ public static function getTerritoryTranslationList($locale = null) */ public static function getTranslation($value = null, $path = null, $locale = null) { - require_once 'Zend/Locale/Data.php'; + ;// require_once 'Zend/Locale/Data.php'; $locale = self::findLocale($locale); $result = Zend_Locale_Data::getContent($locale, $path, $value); if (empty($result) === true && '0' !== $result) { @@ -1610,7 +1610,7 @@ public static function getTerritoryTranslation($value, $locale = null) */ public static function getQuestion($locale = null) { - require_once 'Zend/Locale/Data.php'; + ;// require_once 'Zend/Locale/Data.php'; $locale = self::findLocale($locale); $quest = Zend_Locale_Data::getList($locale, 'question'); $yes = explode(':', $quest['yes']); @@ -1740,7 +1740,7 @@ public static function isLocale($locale, $strict = false, $compatible = true) public static function findLocale($locale = null) { if ($locale === null) { - require_once 'Zend/Registry.php'; + ;// require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Locale')) { $locale = Zend_Registry::get('Zend_Locale'); } @@ -1755,7 +1755,7 @@ public static function findLocale($locale = null) $locale = Zend_Locale::getLocaleToTerritory($locale); if (empty($locale)) { - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("The locale '$locale' is no known locale"); } } else { @@ -1807,7 +1807,7 @@ public static function getLocaleList() */ public static function getCache() { - require_once 'Zend/Locale/Data.php'; + ;// require_once 'Zend/Locale/Data.php'; return Zend_Locale_Data::getCache(); } @@ -1819,7 +1819,7 @@ public static function getCache() */ public static function setCache(Zend_Cache_Core $cache) { - require_once 'Zend/Locale/Data.php'; + ;// require_once 'Zend/Locale/Data.php'; Zend_Locale_Data::setCache($cache); } @@ -1830,7 +1830,7 @@ public static function setCache(Zend_Cache_Core $cache) */ public static function hasCache() { - require_once 'Zend/Locale/Data.php'; + ;// require_once 'Zend/Locale/Data.php'; return Zend_Locale_Data::hasCache(); } @@ -1841,7 +1841,7 @@ public static function hasCache() */ public static function removeCache() { - require_once 'Zend/Locale/Data.php'; + ;// require_once 'Zend/Locale/Data.php'; Zend_Locale_Data::removeCache(); } @@ -1853,7 +1853,7 @@ public static function removeCache() */ public static function clearCache($tag = null) { - require_once 'Zend/Locale/Data.php'; + ;// require_once 'Zend/Locale/Data.php'; Zend_Locale_Data::clearCache($tag); } @@ -1865,7 +1865,7 @@ public static function clearCache($tag = null) */ public static function disableCache($flag) { - require_once 'Zend/Locale/Data.php'; + ;// require_once 'Zend/Locale/Data.php'; Zend_Locale_Data::disableCache($flag); } @@ -1918,7 +1918,7 @@ private static function _prepareLocale($locale, $strict = false) // This can only happen when someone extends Zend_Locale and erases the default if ($locale === null) { - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception('Autodetection of Locale has been failed!'); } diff --git a/library/Zend/Locale/Data.php b/library/Zend/Locale/Data.php index 395f5d5013..b37904e583 100644 --- a/library/Zend/Locale/Data.php +++ b/library/Zend/Locale/Data.php @@ -23,10 +23,10 @@ /** * include needed classes */ -require_once 'Zend/Locale.php'; +;// require_once 'Zend/Locale.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** * Locale data reader, handles the CLDR @@ -153,7 +153,7 @@ private static function _findRoute($locale, $path, $attribute, $value, &$temp) if (empty(self::$_ldml[(string) $locale])) { $filename = dirname(__FILE__) . '/Data/' . $locale . '.xml'; if (!file_exists($filename)) { - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Missing locale file '$filename' for '$locale' locale."); } @@ -295,7 +295,7 @@ private static function _checkLocale($locale) } if (!(Zend_Locale::isLocale((string) $locale, null, false))) { - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Locale (" . (string) $locale . ") is a unknown locale"); } @@ -320,7 +320,7 @@ public static function getList($locale, $path, $value = false) $locale = self::_checkLocale($locale); if (!isset(self::$_cache) && !self::$_cacheDisabled) { - require_once 'Zend/Cache.php'; + ;// require_once 'Zend/Cache.php'; self::$_cache = Zend_Cache::factory( 'Core', 'File', @@ -940,7 +940,7 @@ public static function getList($locale, $path, $value = false) break; default : - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unknown list ($path) for parsing locale data."); break; } @@ -970,7 +970,7 @@ public static function getContent($locale, $path, $value = false) $locale = self::_checkLocale($locale); if (!isset(self::$_cache) && !self::$_cacheDisabled) { - require_once 'Zend/Cache.php'; + ;// require_once 'Zend/Cache.php'; self::$_cache = Zend_Cache::factory( 'Core', 'File', @@ -1490,7 +1490,7 @@ public static function getContent($locale, $path, $value = false) break; default : - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unknown detail ($path) for parsing locale data."); break; } diff --git a/library/Zend/Locale/Exception.php b/library/Zend/Locale/Exception.php index a6e869aea6..ddd42d94ef 100644 --- a/library/Zend/Locale/Exception.php +++ b/library/Zend/Locale/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** diff --git a/library/Zend/Locale/Format.php b/library/Zend/Locale/Format.php index 517dcbb415..86a8c6771e 100644 --- a/library/Zend/Locale/Format.php +++ b/library/Zend/Locale/Format.php @@ -23,7 +23,7 @@ /** * include needed classes */ -require_once 'Zend/Locale/Data.php'; +;// require_once 'Zend/Locale/Data.php'; /** * @category Zend @@ -98,7 +98,7 @@ private static function _checkOptions(array $options = array()) } $options['number_format'] = Zend_Locale_Data::getContent($locale, 'decimalnumber'); } else if ((gettype($value) !== 'string') and ($value !== NULL)) { - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; $stringValue = (string)(is_array($value) ? implode(' ', $value) : $value); throw new Zend_Locale_Exception("Unknown number format type '" . gettype($value) . "'. " . "Format '$stringValue' must be a valid number format string."); @@ -113,7 +113,7 @@ private static function _checkOptions(array $options = array()) } $options['date_format'] = Zend_Locale_Format::getDateFormat($locale); } else if ((gettype($value) !== 'string') and ($value !== NULL)) { - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; $stringValue = (string)(is_array($value) ? implode(' ', $value) : $value); throw new Zend_Locale_Exception("Unknown dateformat type '" . gettype($value) . "'. " . "Format '$stringValue' must be a valid ISO or PHP date format string."); @@ -127,7 +127,7 @@ private static function _checkOptions(array $options = array()) case 'format_type' : if (($value != 'php') && ($value != 'iso')) { - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unknown date format type '$value'. Only 'iso' and 'php'" . " are supported."); } @@ -135,7 +135,7 @@ private static function _checkOptions(array $options = array()) case 'fix_date' : if (($value !== true) && ($value !== false)) { - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Enabling correction of dates must be either true or false" . "(fix_date='$value')."); } @@ -163,13 +163,13 @@ private static function _checkOptions(array $options = array()) } if (($value < -1) || ($value > 30)) { - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("'$value' precision is not a whole number less than 30."); } break; default: - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unknown option: '$name' = '$value'"); break; @@ -204,7 +204,7 @@ public static function convertNumerals($input, $from, $to = null) $from = strtolower($from); $source = Zend_Locale_Data::getContent('en', 'numberingsystem', $from); if (empty($source)) { - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unknown script '$from'. Use 'Latn' for digits 0,1,2,3,4,5,6,7,8,9."); } @@ -212,7 +212,7 @@ public static function convertNumerals($input, $from, $to = null) $to = strtolower($to); $target = Zend_Locale_Data::getContent('en', 'numberingsystem', $to); if (empty($target)) { - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unknown script '$to'. Use 'Latn' for digits 0,1,2,3,4,5,6,7,8,9."); } } else { @@ -251,7 +251,7 @@ public static function getNumber($input, array $options = array()) } if (!self::isNumber($input, $options)) { - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception('No localized value in ' . $input . ' found, or the given number does not match the localized format'); } @@ -300,7 +300,7 @@ public static function getNumber($input, array $options = array()) public static function toNumber($value, array $options = array()) { // load class within method for speed - require_once 'Zend/Locale/Math.php'; + ;// require_once 'Zend/Locale/Math.php'; $value = Zend_Locale_Math::floatalize($value); $value = Zend_Locale_Math::normalize($value); @@ -346,7 +346,7 @@ public static function toNumber($value, array $options = array()) if (iconv_strpos($format, '0') === false) { self::_setEncoding($oenc); - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception('Wrong format... missing 0'); } @@ -889,7 +889,7 @@ private static function _parseDate($date, $options) if (empty($parse)) { self::_setEncoding($oenc); - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unknown date format, neither date nor time in '" . $format . "' found"); } ksort($parse); @@ -909,7 +909,7 @@ private static function _parseDate($date, $options) if (count($splitted[0]) == 0) { self::_setEncoding($oenc); - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("No date part in '$date' found."); } if (count($splitted[0]) == 1) { @@ -1015,7 +1015,7 @@ private static function _parseDate($date, $options) (isset($result['year']) and (iconv_strpos($date, $result['year']) === false)))) { if ($options['fix_date'] !== true) { self::_setEncoding($oenc); - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unable to parse date '$date' using '" . $format . "' (false month, $position, $month)"); } @@ -1031,7 +1031,7 @@ private static function _parseDate($date, $options) if ($result['day'] > 31) { if ($options['fix_date'] !== true) { self::_setEncoding($oenc); - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unable to parse date '$date' using '" . $format . "' (d <> y)"); } @@ -1047,7 +1047,7 @@ private static function _parseDate($date, $options) if ($result['month'] > 31) { if ($options['fix_date'] !== true) { self::_setEncoding($oenc); - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unable to parse date '$date' using '" . $format . "' (M <> y)"); } @@ -1063,7 +1063,7 @@ private static function _parseDate($date, $options) if ($result['month'] > 12) { if ($options['fix_date'] !== true || $result['month'] > 31) { self::_setEncoding($oenc); - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("Unable to parse date '$date' using '" . $format . "' (M <> d)"); } @@ -1131,7 +1131,7 @@ public static function getDateFormat($locale = null) { $format = Zend_Locale_Data::getContent($locale, 'date'); if (empty($format)) { - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("failed to receive data from locale $locale"); } @@ -1231,7 +1231,7 @@ public static function getTimeFormat($locale = null) { $format = Zend_Locale_Data::getContent($locale, 'time'); if (empty($format)) { - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("failed to receive data from locale $locale"); } return $format; @@ -1270,7 +1270,7 @@ public static function getDateTimeFormat($locale = null) { $format = Zend_Locale_Data::getContent($locale, 'datetime'); if (empty($format)) { - require_once 'Zend/Locale/Exception.php'; + ;// require_once 'Zend/Locale/Exception.php'; throw new Zend_Locale_Exception("failed to receive data from locale $locale"); } return $format; diff --git a/library/Zend/Locale/Math.php b/library/Zend/Locale/Math.php index 91e1905d8a..68f4b8e4b2 100644 --- a/library/Zend/Locale/Math.php +++ b/library/Zend/Locale/Math.php @@ -350,6 +350,6 @@ public static function Comp($op1, $op2, $scale = null) if (!extension_loaded('bcmath') || (defined('TESTS_ZEND_LOCALE_BCMATH_ENABLED') && !TESTS_ZEND_LOCALE_BCMATH_ENABLED) ) { - require_once 'Zend/Locale/Math/PhpMath.php'; + ;// require_once 'Zend/Locale/Math/PhpMath.php'; Zend_Locale_Math_PhpMath::disable(); } diff --git a/library/Zend/Locale/Math/Exception.php b/library/Zend/Locale/Math/Exception.php index e065b18962..d87ea97ba8 100644 --- a/library/Zend/Locale/Math/Exception.php +++ b/library/Zend/Locale/Math/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Exception */ -require_once 'Zend/Locale/Exception.php'; +;// require_once 'Zend/Locale/Exception.php'; /** diff --git a/library/Zend/Locale/Math/PhpMath.php b/library/Zend/Locale/Math/PhpMath.php index c06f20d1f7..be9fad0b4d 100644 --- a/library/Zend/Locale/Math/PhpMath.php +++ b/library/Zend/Locale/Math/PhpMath.php @@ -70,7 +70,7 @@ public static function Add($op1, $op2, $scale = null) $op2 = self::normalize($op2); $result = $op1 + $op2; if (is_infinite($result) or (abs($result - $op2 - $op1) > $precision)) { - require_once 'Zend/Locale/Math/Exception.php'; + ;// require_once 'Zend/Locale/Math/Exception.php'; throw new Zend_Locale_Math_Exception("addition overflow: $op1 + $op2 != $result", $op1, $op2, $result); } @@ -93,7 +93,7 @@ public static function Sub($op1, $op2, $scale = null) $op2 = self::normalize($op2); $result = $op1 - $op2; if (is_infinite($result) or (abs($result + $op2 - $op1) > $precision)) { - require_once 'Zend/Locale/Math/Exception.php'; + ;// require_once 'Zend/Locale/Math/Exception.php'; throw new Zend_Locale_Math_Exception("subtraction overflow: $op1 - $op2 != $result", $op1, $op2, $result); } @@ -115,7 +115,7 @@ public static function Pow($op1, $op2, $scale = null) $result = pow($op1, $op2); if (is_infinite($result) or is_nan($result)) { - require_once 'Zend/Locale/Math/Exception.php'; + ;// require_once 'Zend/Locale/Math/Exception.php'; throw new Zend_Locale_Math_Exception("power overflow: $op1 ^ $op2", $op1, $op2, $result); } @@ -135,7 +135,7 @@ public static function Mul($op1, $op2, $scale = null) $op2 = self::normalize($op2); $result = $op1 * $op2; if (is_infinite($result) or is_nan($result)) { - require_once 'Zend/Locale/Math/Exception.php'; + ;// require_once 'Zend/Locale/Math/Exception.php'; throw new Zend_Locale_Math_Exception("multiplication overflow: $op1 * $op2 != $result", $op1, $op2, $result); } @@ -149,7 +149,7 @@ public static function Div($op1, $op2, $scale = null) } if (empty($op2)) { - require_once 'Zend/Locale/Math/Exception.php'; + ;// require_once 'Zend/Locale/Math/Exception.php'; throw new Zend_Locale_Math_Exception("can not divide by zero", $op1, $op2, null); } if (empty($op1)) { @@ -159,7 +159,7 @@ public static function Div($op1, $op2, $scale = null) $op2 = self::normalize($op2); $result = $op1 / $op2; if (is_infinite($result) or is_nan($result)) { - require_once 'Zend/Locale/Math/Exception.php'; + ;// require_once 'Zend/Locale/Math/Exception.php'; throw new Zend_Locale_Math_Exception("division overflow: $op1 / $op2 != $result", $op1, $op2, $result); } @@ -199,7 +199,7 @@ public static function Mod($op1, $op2) } $result = $op1 % $op2; if (is_nan($result) or (($op1 - $result) % $op2 != 0)) { - require_once 'Zend/Locale/Math/Exception.php'; + ;// require_once 'Zend/Locale/Math/Exception.php'; throw new Zend_Locale_Math_Exception("modulus calculation error: $op1 % $op2 != $result", $op1, $op2, $result); } @@ -235,7 +235,7 @@ public static function Comp($op1, $op2, $scale = null) public static function Scale($scale) { if ($scale > 9) { - require_once 'Zend/Locale/Math/Exception.php'; + ;// require_once 'Zend/Locale/Math/Exception.php'; throw new Zend_Locale_Math_Exception("can not scale to precision $scale", $scale, null, null); } self::$defaultScale = $scale; diff --git a/library/Zend/Log.php b/library/Zend/Log.php index 133feca981..a263a68d99 100644 --- a/library/Zend/Log.php +++ b/library/Zend/Log.php @@ -142,7 +142,7 @@ static public function factory($config = array()) if (!is_array($config) || empty($config)) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Configuration must be an array or instance of Zend_Config'); } @@ -157,7 +157,7 @@ static public function factory($config = array()) if (!$log instanceof Zend_Log) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Passed className does not belong to a descendant of Zend_Log'); } @@ -196,7 +196,7 @@ protected function _constructWriterFromConfig($config) ? get_class($writer) : 'The specified writer'; /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception("{$writerName} does not extend Zend_Log_Writer_Abstract!"); } @@ -229,7 +229,7 @@ protected function _constructFilterFromConfig($config) ? get_class($filter) : 'The specified filter'; /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception("{$filterName} does not implement Zend_Log_Filter_Interface"); } @@ -252,7 +252,7 @@ protected function _constructFormatterFromConfig($config) ? get_class($formatter) : 'The specified formatter'; /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception($formatterName . ' does not implement Zend_Log_Formatter_Interface'); } @@ -275,7 +275,7 @@ protected function _constructFromConfig($type, $config, $namespace) } if (!is_array($config) || empty($config)) { - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception( 'Configuration must be an array or instance of Zend_Config' ); @@ -284,13 +284,13 @@ protected function _constructFromConfig($type, $config, $namespace) $params = isset($config[ $type .'Params' ]) ? $config[ $type .'Params' ] : array(); $className = $this->getClassName($config, $type, $namespace); if (!class_exists($className)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($className); } $reflection = new ReflectionClass($className); if (!$reflection->implementsInterface('Zend_Log_FactoryInterface')) { - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception( $className . ' does not implement Zend_Log_FactoryInterface and can not be constructed from config.' ); @@ -311,7 +311,7 @@ protected function _constructFromConfig($type, $config, $namespace) protected function getClassName($config, $type, $defaultNamespace) { if (!isset($config[$type . 'Name'])) { - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception("Specify {$type}Name in the configuration array"); } @@ -385,7 +385,7 @@ public function __call($method, $params) switch (count($params)) { case 0: /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Missing log message'); case 1: $message = array_shift($params); @@ -399,7 +399,7 @@ public function __call($method, $params) $this->log($message, $priority, $extras); } else { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Bad log priority'); } } @@ -418,13 +418,13 @@ public function log($message, $priority, $extras = null) // sanity checks if (empty($this->_writers)) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('No writers were added'); } if (! isset($this->_priorities[$priority])) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Bad log priority'); } @@ -481,7 +481,7 @@ public function addPriority($name, $priority) if (isset($this->_priorities[$priority]) || false !== array_search($name, $this->_priorities)) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Existing priorities cannot be overwritten'); } @@ -502,7 +502,7 @@ public function addFilter($filter) { if (is_int($filter)) { /** @see Zend_Log_Filter_Priority */ - require_once 'Zend/Log/Filter/Priority.php'; + ;// require_once 'Zend/Log/Filter/Priority.php'; $filter = new Zend_Log_Filter_Priority($filter); } elseif ($filter instanceof Zend_Config || is_array($filter)) { @@ -510,7 +510,7 @@ public function addFilter($filter) } elseif(! $filter instanceof Zend_Log_Filter_Interface) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Invalid filter provided'); } @@ -534,7 +534,7 @@ public function addWriter($writer) if (!$writer instanceof Zend_Log_Writer_Abstract) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception( 'Writer must be an instance of Zend_Log_Writer_Abstract' . ' or you should pass a configuration array' diff --git a/library/Zend/Log/Exception.php b/library/Zend/Log/Exception.php index d52a501c1c..d9c80c0131 100644 --- a/library/Zend/Log/Exception.php +++ b/library/Zend/Log/Exception.php @@ -20,7 +20,7 @@ */ /** Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/Zend/Log/Filter/Abstract.php b/library/Zend/Log/Filter/Abstract.php index dafd731d8b..dfe064456b 100644 --- a/library/Zend/Log/Filter/Abstract.php +++ b/library/Zend/Log/Filter/Abstract.php @@ -21,10 +21,10 @@ */ /** @see Zend_Log_Filter_Interface */ -require_once 'Zend/Log/Filter/Interface.php'; +;// require_once 'Zend/Log/Filter/Interface.php'; /** @see Zend_Log_FactoryInterface */ -require_once 'Zend/Log/FactoryInterface.php'; +;// require_once 'Zend/Log/FactoryInterface.php'; /** * @category Zend @@ -51,7 +51,7 @@ static protected function _parseConfig($config) } if (!is_array($config)) { - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Configuration must be an array or instance of Zend_Config'); } diff --git a/library/Zend/Log/Filter/Message.php b/library/Zend/Log/Filter/Message.php index eff0c99da8..c8c61fcefd 100644 --- a/library/Zend/Log/Filter/Message.php +++ b/library/Zend/Log/Filter/Message.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Filter_Abstract */ -require_once 'Zend/Log/Filter/Abstract.php'; +;// require_once 'Zend/Log/Filter/Abstract.php'; /** * @category Zend @@ -48,7 +48,7 @@ class Zend_Log_Filter_Message extends Zend_Log_Filter_Abstract public function __construct($regexp) { if (@preg_match($regexp, '') === false) { - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception("Invalid regular expression '$regexp'"); } $this->_regexp = $regexp; diff --git a/library/Zend/Log/Filter/Priority.php b/library/Zend/Log/Filter/Priority.php index d86f5d60fe..9a74b6b5d5 100644 --- a/library/Zend/Log/Filter/Priority.php +++ b/library/Zend/Log/Filter/Priority.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Filter_Abstract */ -require_once 'Zend/Log/Filter/Abstract.php'; +;// require_once 'Zend/Log/Filter/Abstract.php'; /** * @category Zend @@ -55,7 +55,7 @@ class Zend_Log_Filter_Priority extends Zend_Log_Filter_Abstract public function __construct($priority, $operator = null) { if (! is_int($priority)) { - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Priority must be an integer'); } diff --git a/library/Zend/Log/Filter/Suppress.php b/library/Zend/Log/Filter/Suppress.php index a4f1356863..bcd080eb66 100644 --- a/library/Zend/Log/Filter/Suppress.php +++ b/library/Zend/Log/Filter/Suppress.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Filter_Interface */ -require_once 'Zend/Log/Filter/Abstract.php'; +;// require_once 'Zend/Log/Filter/Abstract.php'; /** * @category Zend diff --git a/library/Zend/Log/Formatter/Abstract.php b/library/Zend/Log/Formatter/Abstract.php index f0403f1621..c890d91a1c 100644 --- a/library/Zend/Log/Formatter/Abstract.php +++ b/library/Zend/Log/Formatter/Abstract.php @@ -21,10 +21,10 @@ */ /** @see Zend_Log_Formatter_Interface */ -require_once 'Zend/Log/Formatter/Interface.php'; +;// require_once 'Zend/Log/Formatter/Interface.php'; /** @see Zend_Log_FactoryInterface */ -require_once 'Zend/Log/FactoryInterface.php'; +;// require_once 'Zend/Log/FactoryInterface.php'; /** * @category Zend diff --git a/library/Zend/Log/Formatter/Firebug.php b/library/Zend/Log/Formatter/Firebug.php index 434843a1a2..fa7e17648f 100644 --- a/library/Zend/Log/Formatter/Firebug.php +++ b/library/Zend/Log/Formatter/Firebug.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Formatter_Abstract */ -require_once 'Zend/Log/Formatter/Abstract.php'; +;// require_once 'Zend/Log/Formatter/Abstract.php'; /** * @category Zend diff --git a/library/Zend/Log/Formatter/Simple.php b/library/Zend/Log/Formatter/Simple.php index 965fa762a0..90006b3a76 100644 --- a/library/Zend/Log/Formatter/Simple.php +++ b/library/Zend/Log/Formatter/Simple.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Formatter_Abstract */ -require_once 'Zend/Log/Formatter/Abstract.php'; +;// require_once 'Zend/Log/Formatter/Abstract.php'; /** * @category Zend @@ -54,7 +54,7 @@ public function __construct($format = null) } if (!is_string($format)) { - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Format must be a string'); } diff --git a/library/Zend/Log/Formatter/Xml.php b/library/Zend/Log/Formatter/Xml.php index 71c47d336f..c7965f54da 100644 --- a/library/Zend/Log/Formatter/Xml.php +++ b/library/Zend/Log/Formatter/Xml.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Formatter_Abstract */ -require_once 'Zend/Log/Formatter/Abstract.php'; +;// require_once 'Zend/Log/Formatter/Abstract.php'; /** * @category Zend diff --git a/library/Zend/Log/Writer/Abstract.php b/library/Zend/Log/Writer/Abstract.php index 47c45ba8b8..818db30b96 100644 --- a/library/Zend/Log/Writer/Abstract.php +++ b/library/Zend/Log/Writer/Abstract.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Filter_Priority */ -require_once 'Zend/Log/Filter/Priority.php'; +;// require_once 'Zend/Log/Filter/Priority.php'; /** * @category Zend @@ -61,7 +61,7 @@ public function addFilter($filter) if (!$filter instanceof Zend_Log_Filter_Interface) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Invalid filter provided'); } @@ -130,7 +130,7 @@ static protected function _parseConfig($config) } if (!is_array($config)) { - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception( 'Configuration must be an array or instance of Zend_Config' ); diff --git a/library/Zend/Log/Writer/Db.php b/library/Zend/Log/Writer/Db.php index 8dcaf9c61f..21300194a0 100644 --- a/library/Zend/Log/Writer/Db.php +++ b/library/Zend/Log/Writer/Db.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +;// require_once 'Zend/Log/Writer/Abstract.php'; /** * @category Zend @@ -103,7 +103,7 @@ static public function factory($config) */ public function setFormatter(Zend_Log_Formatter_Interface $formatter) { - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception(get_class($this) . ' does not support formatting'); } @@ -127,7 +127,7 @@ public function shutdown() protected function _write($event) { if ($this->_db === null) { - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Database adapter is null'); } diff --git a/library/Zend/Log/Writer/Firebug.php b/library/Zend/Log/Writer/Firebug.php index b25310dd0a..27d53cd016 100644 --- a/library/Zend/Log/Writer/Firebug.php +++ b/library/Zend/Log/Writer/Firebug.php @@ -21,16 +21,16 @@ */ /** Zend_Log */ -require_once 'Zend/Log.php'; +;// require_once 'Zend/Log.php'; /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +;// require_once 'Zend/Log/Writer/Abstract.php'; /** Zend_Log_Formatter_Firebug */ -require_once 'Zend/Log/Formatter/Firebug.php'; +;// require_once 'Zend/Log/Formatter/Firebug.php'; /** Zend_Wildfire_Plugin_FirePhp */ -require_once 'Zend/Wildfire/Plugin/FirePhp.php'; +;// require_once 'Zend/Wildfire/Plugin/FirePhp.php'; /** * Writes log messages to the Firebug Console via FirePHP. diff --git a/library/Zend/Log/Writer/Mail.php b/library/Zend/Log/Writer/Mail.php index 931dfe97bc..1ef2d9d94a 100644 --- a/library/Zend/Log/Writer/Mail.php +++ b/library/Zend/Log/Writer/Mail.php @@ -21,13 +21,13 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +;// require_once 'Zend/Log/Writer/Abstract.php'; /** Zend_Log_Exception */ -require_once 'Zend/Log/Exception.php'; +;// require_once 'Zend/Log/Exception.php'; /** Zend_Log_Formatter_Simple*/ -require_once 'Zend/Log/Formatter/Simple.php'; +;// require_once 'Zend/Log/Formatter/Simple.php'; /** * Class used for writing log messages to email via Zend_Mail. @@ -172,7 +172,7 @@ public function setLayout($layout) } if (!$layout instanceof Zend_Layout) { - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Mail must be an instance of Zend_Layout or an array'); } $this->_layout = $layout; diff --git a/library/Zend/Log/Writer/Mock.php b/library/Zend/Log/Writer/Mock.php index d8674bd85f..29aff0d368 100644 --- a/library/Zend/Log/Writer/Mock.php +++ b/library/Zend/Log/Writer/Mock.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +;// require_once 'Zend/Log/Writer/Abstract.php'; /** * @category Zend diff --git a/library/Zend/Log/Writer/Null.php b/library/Zend/Log/Writer/Null.php index f07bb7b6cd..5a353d59e9 100644 --- a/library/Zend/Log/Writer/Null.php +++ b/library/Zend/Log/Writer/Null.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +;// require_once 'Zend/Log/Writer/Abstract.php'; /** * @category Zend diff --git a/library/Zend/Log/Writer/Stream.php b/library/Zend/Log/Writer/Stream.php index e3664d99c6..a76e8fdba3 100644 --- a/library/Zend/Log/Writer/Stream.php +++ b/library/Zend/Log/Writer/Stream.php @@ -21,10 +21,10 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +;// require_once 'Zend/Log/Writer/Abstract.php'; /** Zend_Log_Formatter_Simple */ -require_once 'Zend/Log/Formatter/Simple.php'; +;// require_once 'Zend/Log/Formatter/Simple.php'; /** * @category Zend @@ -60,12 +60,12 @@ public function __construct($streamOrUrl, $mode = null) if (is_resource($streamOrUrl)) { if (get_resource_type($streamOrUrl) != 'stream') { - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Resource is not a stream'); } if ($mode != 'a') { - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Mode cannot be changed on existing streams'); } @@ -76,7 +76,7 @@ public function __construct($streamOrUrl, $mode = null) } if (! $this->_stream = @fopen($streamOrUrl, $mode, false)) { - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; $msg = "\"$streamOrUrl\" cannot be opened with mode \"$mode\""; throw new Zend_Log_Exception($msg); } @@ -131,7 +131,7 @@ protected function _write($event) $line = $this->_formatter->format($event); if (false === @fwrite($this->_stream, $line)) { - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception("Unable to write to stream"); } } diff --git a/library/Zend/Log/Writer/Syslog.php b/library/Zend/Log/Writer/Syslog.php index 66dfeaabf9..f0bc13fda1 100644 --- a/library/Zend/Log/Writer/Syslog.php +++ b/library/Zend/Log/Writer/Syslog.php @@ -21,10 +21,10 @@ */ /** Zend_Log */ -require_once 'Zend/Log.php'; +;// require_once 'Zend/Log.php'; /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +;// require_once 'Zend/Log/Writer/Abstract.php'; /** * Writes log messages to syslog @@ -195,14 +195,14 @@ public function setFacility($facility) } if (!in_array($facility, $this->_validFacilities)) { - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Invalid log facility provided; please see http://php.net/openlog for a list of valid facility values'); } if ('WIN' == strtoupper(substr(PHP_OS, 0, 3)) && ($facility !== LOG_USER) ) { - require_once 'Zend/Log/Exception.php'; + ;// require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Only LOG_USER is a valid log facility on Windows'); } diff --git a/library/Zend/Log/Writer/ZendMonitor.php b/library/Zend/Log/Writer/ZendMonitor.php index 0713a89225..1c120b0be5 100644 --- a/library/Zend/Log/Writer/ZendMonitor.php +++ b/library/Zend/Log/Writer/ZendMonitor.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +;// require_once 'Zend/Log/Writer/Abstract.php'; /** * @category Zend diff --git a/library/Zend/Mail.php b/library/Zend/Mail.php index 87a259a9d3..08f50dfa23 100644 --- a/library/Zend/Mail.php +++ b/library/Zend/Mail.php @@ -23,22 +23,22 @@ /** * @see Zend_Mail_Transport_Abstract */ -require_once 'Zend/Mail/Transport/Abstract.php'; +;// require_once 'Zend/Mail/Transport/Abstract.php'; /** * @see Zend_Mime */ -require_once 'Zend/Mime.php'; +;// require_once 'Zend/Mime.php'; /** * @see Zend_Mime_Message */ -require_once 'Zend/Mime/Message.php'; +;// require_once 'Zend/Mime/Message.php'; /** * @see Zend_Mime_Part */ -require_once 'Zend/Mime/Part.php'; +;// require_once 'Zend/Mime/Part.php'; /** @@ -248,7 +248,7 @@ public function setType($type) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Invalid content type "' . $type . '"'); } @@ -342,7 +342,7 @@ public function setHeaderEncoding($encoding) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Invalid encoding "' . $encoding . '"'); } $this->_headerEncoding = $encoding; @@ -676,7 +676,7 @@ public function setFrom($email, $name = null) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('From Header set twice'); } @@ -702,7 +702,7 @@ public function setReplyTo($email, $name = null) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Reply-To Header set twice'); } @@ -800,7 +800,7 @@ public static function clearDefaultFrom() public function setFromToDefaultFrom() { $from = self::getDefaultFrom(); if($from === null) { - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception( 'No default From Address set to use'); } @@ -850,7 +850,7 @@ public static function clearDefaultReplyTo() public function setReplyToFromDefault() { $replyTo = self::getDefaultReplyTo(); if($replyTo === null) { - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception( 'No default Reply-To Address set to use'); } @@ -877,7 +877,7 @@ public function setReturnPath($email) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Return-Path Header set twice'); } return $this; @@ -929,7 +929,7 @@ public function setSubject($subject) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Subject set twice'); } return $this; @@ -978,7 +978,7 @@ public function setDate($date = null) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('String representations of Date Header must be ' . 'strtotime()-compatible'); } @@ -989,7 +989,7 @@ public function setDate($date = null) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception(__METHOD__ . ' only accepts UNIX timestamps, Zend_Date objects, ' . ' and strtotime()-compatible strings'); } @@ -999,7 +999,7 @@ public function setDate($date = null) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Date Header set twice'); } return $this; @@ -1055,7 +1055,7 @@ public function setMessageId($id = true) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Message-ID set twice'); } @@ -1139,7 +1139,7 @@ public function addHeader($name, $value, $append = false) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Cannot set standard header from addHeader()'); } @@ -1172,7 +1172,7 @@ public function send($transport = null) { if ($transport === null) { if (! self::$_defaultTransport instanceof Zend_Mail_Transport_Abstract) { - require_once 'Zend/Mail/Transport/Sendmail.php'; + ;// require_once 'Zend/Mail/Transport/Sendmail.php'; $transport = new Zend_Mail_Transport_Sendmail(); } else { $transport = self::$_defaultTransport; diff --git a/library/Zend/Mail/Exception.php b/library/Zend/Mail/Exception.php index 4632a5820d..050d36a821 100644 --- a/library/Zend/Mail/Exception.php +++ b/library/Zend/Mail/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** diff --git a/library/Zend/Mail/Header/HeaderName.php b/library/Zend/Mail/Header/HeaderName.php index 36df45c2ab..16de588288 100644 --- a/library/Zend/Mail/Header/HeaderName.php +++ b/library/Zend/Mail/Header/HeaderName.php @@ -85,7 +85,7 @@ public static function isValid($name) public static function assertValid($name) { if (! self::isValid($name)) { - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Invalid header name detected'); } } diff --git a/library/Zend/Mail/Header/HeaderValue.php b/library/Zend/Mail/Header/HeaderValue.php index d75d59fa11..e6baf0551c 100644 --- a/library/Zend/Mail/Header/HeaderValue.php +++ b/library/Zend/Mail/Header/HeaderValue.php @@ -129,7 +129,7 @@ public static function isValid($value) public static function assertValid($value) { if (! self::isValid($value)) { - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Invalid header value detected'); } } diff --git a/library/Zend/Mail/Message.php b/library/Zend/Mail/Message.php index 9d3c8bc522..e9affed555 100644 --- a/library/Zend/Mail/Message.php +++ b/library/Zend/Mail/Message.php @@ -23,12 +23,12 @@ /** * Zend_Mail_Part */ -require_once 'Zend/Mail/Part.php'; +;// require_once 'Zend/Mail/Part.php'; /** * Zend_Mail_Message_Interface */ -require_once 'Zend/Mail/Message/Interface.php'; +;// require_once 'Zend/Mail/Message/Interface.php'; /** * @category Zend @@ -63,7 +63,7 @@ public function __construct(array $params) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('could not open file'); } } else { diff --git a/library/Zend/Mail/Message/File.php b/library/Zend/Mail/Message/File.php index 6f57be6bab..0b8105b6b2 100644 --- a/library/Zend/Mail/Message/File.php +++ b/library/Zend/Mail/Message/File.php @@ -23,12 +23,12 @@ /** * Zend_Mail_Part */ -require_once 'Zend/Mail/Part/File.php'; +;// require_once 'Zend/Mail/Part/File.php'; /** * Zend_Mail_Message_Interface */ -require_once 'Zend/Mail/Message/Interface.php'; +;// require_once 'Zend/Mail/Message/Interface.php'; /** * @category Zend diff --git a/library/Zend/Mail/Part.php b/library/Zend/Mail/Part.php index 3775ed1b95..e73482cd83 100644 --- a/library/Zend/Mail/Part.php +++ b/library/Zend/Mail/Part.php @@ -23,22 +23,22 @@ /** * @see Zend_Mime_Decode */ -require_once 'Zend/Mime/Decode.php'; +;// require_once 'Zend/Mime/Decode.php'; /** * @see Zend_Mail_Header_HeaderName */ -require_once 'Zend/Mail/Header/HeaderName.php'; +;// require_once 'Zend/Mail/Header/HeaderName.php'; /** * @see Zend_Mail_Header_HeaderValue */ -require_once 'Zend/Mail/Header/HeaderValue.php'; +;// require_once 'Zend/Mail/Header/HeaderValue.php'; /** * @see Zend_Mail_Part_Interface */ -require_once 'Zend/Mail/Part/Interface.php'; +;// require_once 'Zend/Mail/Part/Interface.php'; /** @@ -124,14 +124,14 @@ public function __construct(array $params) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('handler is not a valid mail handler'); } if (!isset($params['id'])) { /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('need a message id with a handler'); } @@ -174,14 +174,14 @@ public function setPartClass($class) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception("Class '{$class}' does not exist"); } if ( !is_subclass_of($class, 'Zend_Mail_Part_Interface') ) { /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception("Class '{$class}' must implement Zend_Mail_Part_Interface"); } @@ -236,7 +236,7 @@ public function getContent() /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('no content'); } } @@ -276,7 +276,7 @@ protected function _cacheContent() /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('no boundary found in content type to split message'); } $parts = Zend_Mime_Decode::splitMessageStruct($this->_content, $boundary); @@ -307,7 +307,7 @@ public function getPart($num) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('part not found'); } @@ -322,7 +322,7 @@ public function getPart($num) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('part not found'); } @@ -404,7 +404,7 @@ public function getHeader($name, $format = null) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception("no Header with Name $name or $lowerName found"); } } diff --git a/library/Zend/Mail/Part/File.php b/library/Zend/Mail/Part/File.php index 8c1c99b41c..ea45ea9d63 100644 --- a/library/Zend/Mail/Part/File.php +++ b/library/Zend/Mail/Part/File.php @@ -23,12 +23,12 @@ /** * @see Zend_Mime_Decode */ -require_once 'Zend/Mime/Decode.php'; +;// require_once 'Zend/Mime/Decode.php'; /** * @see Zend_Mail_Part */ -require_once 'Zend/Mail/Part.php'; +;// require_once 'Zend/Mail/Part.php'; /** @@ -60,7 +60,7 @@ public function __construct(array $params) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('no file given in params'); } @@ -73,7 +73,7 @@ public function __construct(array $params) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('could not open file'); } if (isset($params['startPos'])) { @@ -103,7 +103,7 @@ public function __construct(array $params) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('no boundary found in content type to split message'); } @@ -119,7 +119,7 @@ public function __construct(array $params) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('error reading file'); } @@ -188,7 +188,7 @@ public function getPart($num) /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + ;// require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('part not found'); } diff --git a/library/Zend/Mail/Protocol/Abstract.php b/library/Zend/Mail/Protocol/Abstract.php index ef90b09688..393c3edc93 100644 --- a/library/Zend/Mail/Protocol/Abstract.php +++ b/library/Zend/Mail/Protocol/Abstract.php @@ -25,13 +25,13 @@ /** * @see Zend_Validate */ -require_once 'Zend/Validate.php'; +;// require_once 'Zend/Validate.php'; /** * @see Zend_Validate_Hostname */ -require_once 'Zend/Validate/Hostname.php'; +;// require_once 'Zend/Validate/Hostname.php'; /** @@ -141,7 +141,7 @@ public function __construct($host = '127.0.0.1', $port = null) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception(join(', ', $this->_validHost->getMessages())); } @@ -273,7 +273,7 @@ protected function _connect($remote) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception($errorStr); } @@ -281,7 +281,7 @@ protected function _connect($remote) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('Could not set stream timeout'); } @@ -315,7 +315,7 @@ protected function _send($request) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('No connection has been established to ' . $this->_host); } @@ -330,7 +330,7 @@ protected function _send($request) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('Could not send request to ' . $this->_host); } @@ -351,7 +351,7 @@ protected function _receive($timeout = null) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('No connection has been established to ' . $this->_host); } @@ -373,7 +373,7 @@ protected function _receive($timeout = null) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception($this->_host . ' has timed out'); } @@ -381,7 +381,7 @@ protected function _receive($timeout = null) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('Could not read from ' . $this->_host); } @@ -427,7 +427,7 @@ protected function _expect($code, $timeout = null) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception($errMsg, $cmd); } diff --git a/library/Zend/Mail/Protocol/Exception.php b/library/Zend/Mail/Protocol/Exception.php index d78fca4d63..61060fb4ca 100644 --- a/library/Zend/Mail/Protocol/Exception.php +++ b/library/Zend/Mail/Protocol/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Mail/Exception.php'; +;// require_once 'Zend/Mail/Exception.php'; /** diff --git a/library/Zend/Mail/Protocol/Imap.php b/library/Zend/Mail/Protocol/Imap.php index d4af4fe32b..737e592a98 100644 --- a/library/Zend/Mail/Protocol/Imap.php +++ b/library/Zend/Mail/Protocol/Imap.php @@ -96,7 +96,7 @@ public function connect($host, $port = null, $ssl = false) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot connect to host; error = ' . $errstr . ' (errno = ' . $errno . ' )'); } @@ -105,7 +105,7 @@ public function connect($host, $port = null, $ssl = false) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('host doesn\'t allow connection'); } @@ -116,7 +116,7 @@ public function connect($host, $port = null, $ssl = false) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot enable TLS'); } } @@ -135,7 +135,7 @@ protected function _nextLine() /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot read - connection closed?'); } @@ -348,14 +348,14 @@ public function sendRequest($command, $tokens = array(), &$tag = null) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot write - connection closed?'); } if (!$this->_assumedNextLine('+ ')) { /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot send literal string'); } $line = $token[1]; @@ -368,7 +368,7 @@ public function sendRequest($command, $tokens = array(), &$tag = null) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot write - connection closed?'); } } @@ -629,7 +629,7 @@ public function fetch($items, $from, $to = null) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('the single id was not found in response'); } diff --git a/library/Zend/Mail/Protocol/Pop3.php b/library/Zend/Mail/Protocol/Pop3.php index 9a76228792..2f2cf77870 100644 --- a/library/Zend/Mail/Protocol/Pop3.php +++ b/library/Zend/Mail/Protocol/Pop3.php @@ -105,7 +105,7 @@ public function connect($host, $port = null, $ssl = false) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot connect to host; error = ' . $errstr . ' (errno = ' . $errno . ' )'); } @@ -127,7 +127,7 @@ public function connect($host, $port = null, $ssl = false) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot enable TLS'); } } @@ -150,7 +150,7 @@ public function sendRequest($request) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('send failed - connection closed?'); } } @@ -170,7 +170,7 @@ public function readResponse($multiline = false) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('read failed - connection closed?'); } @@ -186,7 +186,7 @@ public function readResponse($multiline = false) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('last request failed'); } @@ -385,7 +385,7 @@ public function top($msgno, $lines = 0, $fallback = false) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('top not supported and no fallback wanted'); } } diff --git a/library/Zend/Mail/Protocol/Smtp.php b/library/Zend/Mail/Protocol/Smtp.php index 9dd3568b25..246fe3e8fa 100644 --- a/library/Zend/Mail/Protocol/Smtp.php +++ b/library/Zend/Mail/Protocol/Smtp.php @@ -25,13 +25,13 @@ /** * @see Zend_Mime */ -require_once 'Zend/Mime.php'; +;// require_once 'Zend/Mime.php'; /** * @see Zend_Mail_Protocol_Abstract */ -require_once 'Zend/Mail/Protocol/Abstract.php'; +;// require_once 'Zend/Mail/Protocol/Abstract.php'; /** @@ -140,7 +140,7 @@ public function __construct($host = '127.0.0.1', $port = null, array $config = a /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception($config['ssl'] . ' is unsupported SSL type'); break; } @@ -182,7 +182,7 @@ public function helo($host = '127.0.0.1') /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('Cannot issue HELO to existing session'); } @@ -191,7 +191,7 @@ public function helo($host = '127.0.0.1') /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception(join(', ', $this->_validHost->getMessages())); } @@ -207,7 +207,7 @@ public function helo($host = '127.0.0.1') /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('Unable to connect via TLS'); } $this->_ehlo($host); @@ -253,7 +253,7 @@ public function mail($from) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('A valid session has not been started'); } @@ -280,7 +280,7 @@ public function rcpt($to) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('No sender reverse path has been supplied'); } @@ -305,7 +305,7 @@ public function data($data) /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('No recipient forward path has been supplied'); } @@ -403,7 +403,7 @@ public function auth() /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + ;// require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('Already authenticated for this session'); } } diff --git a/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php b/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php index ea9ad7f305..82c006b953 100644 --- a/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php +++ b/library/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php @@ -24,7 +24,7 @@ /** * @see Zend_Mail_Protocol_Smtp */ -require_once 'Zend/Mail/Protocol/Smtp.php'; +;// require_once 'Zend/Mail/Protocol/Smtp.php'; /** diff --git a/library/Zend/Mail/Protocol/Smtp/Auth/Login.php b/library/Zend/Mail/Protocol/Smtp/Auth/Login.php index 68d32ef6e4..d64b26e1b9 100644 --- a/library/Zend/Mail/Protocol/Smtp/Auth/Login.php +++ b/library/Zend/Mail/Protocol/Smtp/Auth/Login.php @@ -24,7 +24,7 @@ /** * @see Zend_Mail_Protocol_Smtp */ -require_once 'Zend/Mail/Protocol/Smtp.php'; +;// require_once 'Zend/Mail/Protocol/Smtp.php'; /** diff --git a/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php b/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php index 45059df7da..63467669ba 100644 --- a/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php +++ b/library/Zend/Mail/Protocol/Smtp/Auth/Plain.php @@ -24,7 +24,7 @@ /** * @see Zend_Mail_Protocol_Smtp */ -require_once 'Zend/Mail/Protocol/Smtp.php'; +;// require_once 'Zend/Mail/Protocol/Smtp.php'; /** diff --git a/library/Zend/Mail/Storage/Abstract.php b/library/Zend/Mail/Storage/Abstract.php index f4f5381d29..49838555d1 100644 --- a/library/Zend/Mail/Storage/Abstract.php +++ b/library/Zend/Mail/Storage/Abstract.php @@ -82,7 +82,7 @@ public function __get($var) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception($var . ' not found'); } @@ -264,7 +264,7 @@ public function offsetSet($id, $value): void /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot write mail messages via array access'); } diff --git a/library/Zend/Mail/Storage/Exception.php b/library/Zend/Mail/Storage/Exception.php index 38a0ed97e7..4e41345b5d 100644 --- a/library/Zend/Mail/Storage/Exception.php +++ b/library/Zend/Mail/Storage/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Mail_Exception */ -require_once 'Zend/Mail/Exception.php'; +;// require_once 'Zend/Mail/Exception.php'; /** diff --git a/library/Zend/Mail/Storage/Folder.php b/library/Zend/Mail/Storage/Folder.php index 7cbc3dbf96..1f9ae5dde6 100644 --- a/library/Zend/Mail/Storage/Folder.php +++ b/library/Zend/Mail/Storage/Folder.php @@ -154,7 +154,7 @@ public function __get($name) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("no subfolder named $name"); } diff --git a/library/Zend/Mail/Storage/Folder/Maildir.php b/library/Zend/Mail/Storage/Folder/Maildir.php index e3b7c34698..404266f2cf 100644 --- a/library/Zend/Mail/Storage/Folder/Maildir.php +++ b/library/Zend/Mail/Storage/Folder/Maildir.php @@ -24,17 +24,17 @@ /** * @see Zend_Mail_Storage_Folder */ -require_once 'Zend/Mail/Storage/Folder.php'; +;// require_once 'Zend/Mail/Storage/Folder.php'; /** * @see Zend_Mail_Storage_Folder_Interface */ -require_once 'Zend/Mail/Storage/Folder/Interface.php'; +;// require_once 'Zend/Mail/Storage/Folder/Interface.php'; /** * @see Zend_Mail_Storage_Maildir */ -require_once 'Zend/Mail/Storage/Maildir.php'; +;// require_once 'Zend/Mail/Storage/Maildir.php'; /** @@ -90,7 +90,7 @@ public function __construct($params) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('no valid dirname given in params'); } @@ -123,7 +123,7 @@ protected function _buildFolderTree() /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("can't read folders in maildir"); } $dirs = array(); @@ -152,7 +152,7 @@ protected function _buildFolderTree() /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('error while reading maildir'); } array_push($stack, $parent); @@ -171,7 +171,7 @@ protected function _buildFolderTree() /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('error while reading maildir'); } } @@ -208,7 +208,7 @@ public function getFolders($rootFolder = null) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("folder $rootFolder not found"); } return $currentFolder; @@ -238,7 +238,7 @@ public function selectFolder($globalName) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("{$this->_currentFolder} is not selectable", 0, $e); } // seems like file has vanished; rebuilding folder tree - but it's still an exception @@ -246,7 +246,7 @@ public function selectFolder($globalName) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('seems like the maildir has vanished, I\'ve rebuild the ' . 'folder tree, search for an other folder and try again', 0, $e); } diff --git a/library/Zend/Mail/Storage/Folder/Mbox.php b/library/Zend/Mail/Storage/Folder/Mbox.php index ad9429dc33..21f3037931 100644 --- a/library/Zend/Mail/Storage/Folder/Mbox.php +++ b/library/Zend/Mail/Storage/Folder/Mbox.php @@ -24,17 +24,17 @@ /** * @see Zend_Mail_Storage_Folder */ -require_once 'Zend/Mail/Storage/Folder.php'; +;// require_once 'Zend/Mail/Storage/Folder.php'; /** * @see Zend_Mail_Storage_Folder_Interface */ -require_once 'Zend/Mail/Storage/Folder/Interface.php'; +;// require_once 'Zend/Mail/Storage/Folder/Interface.php'; /** * @see Zend_Mail_Storage_Mbox */ -require_once 'Zend/Mail/Storage/Mbox.php'; +;// require_once 'Zend/Mail/Storage/Mbox.php'; /** @@ -86,7 +86,7 @@ public function __construct($params) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('use Zend_Mail_Storage_Mbox for a single file'); } @@ -94,7 +94,7 @@ public function __construct($params) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('no valid dirname given in params'); } @@ -130,7 +130,7 @@ protected function _buildFolderTree($currentDir, $parentFolder = null, $parentGl /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("can't read dir $currentDir"); } while (($entry = readdir($dh)) !== false) { @@ -182,7 +182,7 @@ public function getFolders($rootFolder = null) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("folder $rootFolder not found"); } return $currentFolder; @@ -212,7 +212,7 @@ public function selectFolder($globalName) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("{$this->_currentFolder} is not selectable", 0, $e); } // seems like file has vanished; rebuilding folder tree - but it's still an exception @@ -220,7 +220,7 @@ public function selectFolder($globalName) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('seems like the mbox file has vanished, I\'ve rebuild the ' . 'folder tree, search for an other folder and try again', 0, $e); } diff --git a/library/Zend/Mail/Storage/Imap.php b/library/Zend/Mail/Storage/Imap.php index 422ce53e73..d5f93846b9 100644 --- a/library/Zend/Mail/Storage/Imap.php +++ b/library/Zend/Mail/Storage/Imap.php @@ -24,37 +24,37 @@ /** * @see Zend_Mail_Storage_Abstract */ -require_once 'Zend/Mail/Storage/Abstract.php'; +;// require_once 'Zend/Mail/Storage/Abstract.php'; /** * @see Zend_Mail_Protocol_Imap */ -require_once 'Zend/Mail/Protocol/Imap.php'; +;// require_once 'Zend/Mail/Protocol/Imap.php'; /** * @see Zend_Mail_Storage_Writable_Interface */ -require_once 'Zend/Mail/Storage/Writable/Interface.php'; +;// require_once 'Zend/Mail/Storage/Writable/Interface.php'; /** * @see Zend_Mail_Storage_Folder_Interface */ -require_once 'Zend/Mail/Storage/Folder/Interface.php'; +;// require_once 'Zend/Mail/Storage/Folder/Interface.php'; /** * @see Zend_Mail_Storage_Folder */ -require_once 'Zend/Mail/Storage/Folder.php'; +;// require_once 'Zend/Mail/Storage/Folder.php'; /** * @see Zend_Mail_Message */ -require_once 'Zend/Mail/Message.php'; +;// require_once 'Zend/Mail/Message.php'; /** * @see Zend_Mail_Storage */ -require_once 'Zend/Mail/Storage.php'; +;// require_once 'Zend/Mail/Storage.php'; /** * @category Zend @@ -118,7 +118,7 @@ public function countMessages($flags = null) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('No selected folder to count'); } @@ -191,7 +191,7 @@ public function getRawHeader($id, $part = null, $topLines = 0) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -215,7 +215,7 @@ public function getRawContent($id, $part = null) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -252,7 +252,7 @@ public function __construct($params) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot select INBOX, is this a valid transport?', 0, $e); } return; @@ -262,7 +262,7 @@ public function __construct($params) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('need at least user in params'); } @@ -277,7 +277,7 @@ public function __construct($params) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot login, user or password wrong'); } $this->selectFolder(isset($params->folder) ? $params->folder : 'INBOX'); @@ -307,7 +307,7 @@ public function noop() /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('could not do nothing'); } } @@ -327,7 +327,7 @@ public function removeMessage($id) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot set deleted flag'); } // TODO: expunge here or at close? we can handle an error here better and are more fail safe @@ -335,7 +335,7 @@ public function removeMessage($id) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('message marked as deleted, but could not expunge'); } } @@ -381,7 +381,7 @@ public function getNumberByUniqueId($id) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('unique id not found'); } @@ -401,7 +401,7 @@ public function getFolders($rootFolder = null) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('folder not found'); } @@ -439,7 +439,7 @@ public function getFolders($rootFolder = null) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('error while constructing folder tree'); } } @@ -465,7 +465,7 @@ public function selectFolder($globalName) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot change folder, maybe it does not exist'); } } @@ -508,7 +508,7 @@ public function createFolder($name, $parentFolder = null) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot create folder'); } } @@ -530,7 +530,7 @@ public function removeFolder($name) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot delete folder'); } } @@ -555,7 +555,7 @@ public function renameFolder($oldName, $newName) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot rename folder'); } } @@ -584,7 +584,7 @@ public function appendMessage($message, $folder = null, $flags = null) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot create message, please check if the folder exists and your flags'); } } @@ -603,7 +603,7 @@ public function copyMessage($id, $folder) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot copy message, does the folder exist?'); } } @@ -638,7 +638,7 @@ public function setFlags($id, $flags) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot set flags, have you tried to set the recent flag or special chars?'); } } diff --git a/library/Zend/Mail/Storage/Maildir.php b/library/Zend/Mail/Storage/Maildir.php index 76708e8564..0694646ac4 100644 --- a/library/Zend/Mail/Storage/Maildir.php +++ b/library/Zend/Mail/Storage/Maildir.php @@ -24,17 +24,17 @@ /** * @see Zend_Mail_Storage_Abstract */ -require_once 'Zend/Mail/Storage/Abstract.php'; +;// require_once 'Zend/Mail/Storage/Abstract.php'; /** * @see Zend_Mail_Message_File */ -require_once 'Zend/Mail/Message/File.php'; +;// require_once 'Zend/Mail/Message/File.php'; /** * @see Zend_Mail_Storage */ -require_once 'Zend/Mail/Storage.php'; +;// require_once 'Zend/Mail/Storage.php'; /** @@ -122,7 +122,7 @@ protected function _getFileData($id, $field = null) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('id does not exist'); } @@ -134,7 +134,7 @@ protected function _getFileData($id, $field = null) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('field does not exist'); } @@ -200,7 +200,7 @@ public function getRawHeader($id, $part = null, $topLines = 0) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -234,7 +234,7 @@ public function getRawContent($id, $part = null) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -270,7 +270,7 @@ public function __construct($params) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('no valid dirname given in params'); } @@ -278,7 +278,7 @@ public function __construct($params) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('invalid maildir given'); } @@ -322,7 +322,7 @@ protected function _openMaildir($dirname) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot open maildir'); } $this->_getMaildirFiles($dh, $dirname . '/cur/'); @@ -336,7 +336,7 @@ protected function _openMaildir($dirname) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot read recent mails in maildir'); } } @@ -422,7 +422,7 @@ public function removeMessage($id) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('maildir is (currently) read-only'); } @@ -469,7 +469,7 @@ public function getNumberByUniqueId($id) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('unique id not found'); } } diff --git a/library/Zend/Mail/Storage/Mbox.php b/library/Zend/Mail/Storage/Mbox.php index ddcc0fca68..2a90b6dfda 100644 --- a/library/Zend/Mail/Storage/Mbox.php +++ b/library/Zend/Mail/Storage/Mbox.php @@ -25,17 +25,17 @@ * @see Zend_Loader * May be used in constructor, but commented out for now */ -// require_once 'Zend/Loader.php'; +// ;// require_once 'Zend/Loader.php'; /** * @see Zend_Mail_Storage_Abstract */ -require_once 'Zend/Mail/Storage/Abstract.php'; +;// require_once 'Zend/Mail/Storage/Abstract.php'; /** * @see Zend_Mail_Message_File */ -require_once 'Zend/Mail/Message/File.php'; +;// require_once 'Zend/Mail/Message/File.php'; /** @@ -124,7 +124,7 @@ protected function _getPos($id) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('id does not exist'); } @@ -180,7 +180,7 @@ public function getRawHeader($id, $part = null, $topLines = 0) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } $messagePos = $this->_getPos($id); @@ -204,7 +204,7 @@ public function getRawContent($id, $part = null) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } $messagePos = $this->_getPos($id); @@ -229,7 +229,7 @@ public function __construct($params) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('no valid filename given in params'); } @@ -290,7 +290,7 @@ protected function _openMboxFile($filename) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot open mbox file'); } $this->_filename = $filename; @@ -301,7 +301,7 @@ protected function _openMboxFile($filename) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('file is not a valid mbox format'); } @@ -362,7 +362,7 @@ public function removeMessage($id) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('mbox is read-only'); } @@ -438,7 +438,7 @@ public function __wakeup() /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot open mbox file'); } } diff --git a/library/Zend/Mail/Storage/Pop3.php b/library/Zend/Mail/Storage/Pop3.php index 234b546c4b..40f9466c7d 100644 --- a/library/Zend/Mail/Storage/Pop3.php +++ b/library/Zend/Mail/Storage/Pop3.php @@ -24,17 +24,17 @@ /** * @see Zend_Mail_Storage_Abstract */ -require_once 'Zend/Mail/Storage/Abstract.php'; +;// require_once 'Zend/Mail/Storage/Abstract.php'; /** * @see Zend_Mail_Protocol_Pop3 */ -require_once 'Zend/Mail/Protocol/Pop3.php'; +;// require_once 'Zend/Mail/Protocol/Pop3.php'; /** * @see Zend_Mail_Message */ -require_once 'Zend/Mail/Message.php'; +;// require_once 'Zend/Mail/Message.php'; /** @@ -112,7 +112,7 @@ public function getRawHeader($id, $part = null, $topLines = 0) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -135,7 +135,7 @@ public function getRawContent($id, $part = null) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -177,7 +177,7 @@ public function __construct($params) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('need at least user in params'); } @@ -279,7 +279,7 @@ public function getNumberByUniqueId($id) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('unique id not found'); } diff --git a/library/Zend/Mail/Storage/Writable/Maildir.php b/library/Zend/Mail/Storage/Writable/Maildir.php index 2c3ec53ddf..80eaab0625 100644 --- a/library/Zend/Mail/Storage/Writable/Maildir.php +++ b/library/Zend/Mail/Storage/Writable/Maildir.php @@ -24,12 +24,12 @@ /** * @see Zend_Mail_Storage_Folder_Maildir */ -require_once 'Zend/Mail/Storage/Folder/Maildir.php'; +;// require_once 'Zend/Mail/Storage/Folder/Maildir.php'; /** * @see Zend_Mail_Storage_Writable_Interface */ -require_once 'Zend/Mail/Storage/Writable/Interface.php'; +;// require_once 'Zend/Mail/Storage/Writable/Interface.php'; /** @@ -66,7 +66,7 @@ public static function initMaildir($dir) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('maildir must be a directory if already exists'); } } else { @@ -74,7 +74,7 @@ public static function initMaildir($dir) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; $dir = dirname($dir); if (!file_exists($dir)) { throw new Zend_Mail_Storage_Exception("parent $dir not found"); @@ -93,7 +93,7 @@ public static function initMaildir($dir) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('could not create subdir ' . $subdir); } } @@ -154,7 +154,7 @@ public function createFolder($name, $parentFolder = null) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('folder already exists'); } @@ -162,7 +162,7 @@ public function createFolder($name, $parentFolder = null) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('invalid name - folder parts may not be empty'); } @@ -178,7 +178,7 @@ public function createFolder($name, $parentFolder = null) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('invalid name - no directory seprator allowed in folder name'); } @@ -199,7 +199,7 @@ public function createFolder($name, $parentFolder = null) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('error while creating new folder, may be created incompletly'); } @@ -241,7 +241,7 @@ public function removeFolder($name) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('delete children first'); } @@ -249,7 +249,7 @@ public function removeFolder($name) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('wont delete INBOX'); } @@ -257,7 +257,7 @@ public function removeFolder($name) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('wont delete selected folder'); } @@ -271,7 +271,7 @@ public function removeFolder($name) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("error opening $subdir"); } while (($entry = readdir($dh)) !== false) { @@ -282,7 +282,7 @@ public function removeFolder($name) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("error cleaning $subdir"); } } @@ -292,7 +292,7 @@ public function removeFolder($name) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("error removing $subdir"); } } @@ -304,7 +304,7 @@ public function removeFolder($name) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("error removing maindir"); } @@ -345,7 +345,7 @@ public function renameFolder($oldName, $newName) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('new folder cannot be a child of old folder'); } @@ -356,7 +356,7 @@ public function renameFolder($oldName, $newName) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('wont rename INBOX'); } @@ -364,7 +364,7 @@ public function renameFolder($oldName, $newName) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('wont rename selected folder'); } @@ -387,7 +387,7 @@ public function renameFolder($oldName, $newName) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('error while moving ' . $subdir); } } @@ -442,7 +442,7 @@ protected function _createTmpFile($folder = 'INBOX') /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('problems creating tmp dir'); } } @@ -464,7 +464,7 @@ protected function _createTmpFile($folder = 'INBOX') /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('could not open temp file'); } break; @@ -476,7 +476,7 @@ protected function _createTmpFile($folder = 'INBOX') /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("tried $max_tries unique ids for a temp file, but all were taken" . ' - giving up'); } @@ -500,7 +500,7 @@ protected function _getInfoString(&$flags) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('recent flag may not be set'); } @@ -520,7 +520,7 @@ protected function _getInfoString(&$flags) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('unknown flag(s): ' . $wanted_flags); } @@ -545,7 +545,7 @@ public function appendMessage($message, $folder = null, $flags = null, $recent = /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('storage is over quota!'); } @@ -587,7 +587,7 @@ public function appendMessage($message, $folder = null, $flags = null, $recent = /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; $exception = new Zend_Mail_Storage_Exception('cannot link message file to final dir'); } @unlink($temp_file['filename']); @@ -618,7 +618,7 @@ public function copyMessage($id, $folder) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('storage is over quota!'); } @@ -656,13 +656,13 @@ public function copyMessage($id, $folder) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; $exception = new Zend_Mail_Storage_Exception('cannot copy message file'); } else if (!link($temp_file['filename'], $new_file)) { /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; $exception = new Zend_Mail_Storage_Exception('cannot link message file to final dir'); } @unlink($temp_file['filename']); @@ -701,7 +701,7 @@ public function moveMessage($id, $folder) { /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('target is current folder'); } @@ -734,7 +734,7 @@ public function moveMessage($id, $folder) { /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; $exception = new Zend_Mail_Storage_Exception('cannot move message file'); } @unlink($temp_file['filename']); @@ -770,7 +770,7 @@ public function setFlags($id, $flags) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot rename file'); } @@ -799,7 +799,7 @@ public function removeMessage($id) /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot remove message'); } unset($this->_files[$id - 1]); @@ -839,7 +839,7 @@ public function getQuota($fromStorage = false) { /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + ;// require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot open maildirsize'); } $definition = fgets($fh); diff --git a/library/Zend/Mail/Transport/Abstract.php b/library/Zend/Mail/Transport/Abstract.php index f5eb181ff4..33a53caf2b 100644 --- a/library/Zend/Mail/Transport/Abstract.php +++ b/library/Zend/Mail/Transport/Abstract.php @@ -24,7 +24,7 @@ /** * @see Zend_Mime */ -require_once 'Zend/Mime.php'; +;// require_once 'Zend/Mime.php'; /** @@ -184,7 +184,7 @@ protected function _prepareHeaders($headers) /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; + ;// require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('Missing Zend_Mail object in _mail property'); } @@ -213,7 +213,7 @@ protected function _prepareHeaders($headers) /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; + ;// require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Exception('At least one mail header line is too long'); } } @@ -280,7 +280,7 @@ protected function _buildBody() /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; + ;// require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('No body specified'); } @@ -319,7 +319,7 @@ public function send(Zend_Mail $mail) /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; + ;// require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('Empty mail cannot be sent'); } diff --git a/library/Zend/Mail/Transport/Exception.php b/library/Zend/Mail/Transport/Exception.php index 42733da882..049762ba0b 100644 --- a/library/Zend/Mail/Transport/Exception.php +++ b/library/Zend/Mail/Transport/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Mail_Exception */ -require_once 'Zend/Mail/Exception.php'; +;// require_once 'Zend/Mail/Exception.php'; /** diff --git a/library/Zend/Mail/Transport/File.php b/library/Zend/Mail/Transport/File.php index 2ca97627ad..a3d95f54dd 100644 --- a/library/Zend/Mail/Transport/File.php +++ b/library/Zend/Mail/Transport/File.php @@ -23,7 +23,7 @@ /** * @see Zend_Mail_Transport_Abstract */ -require_once 'Zend/Mail/Transport/Abstract.php'; +;// require_once 'Zend/Mail/Transport/Abstract.php'; /** @@ -106,7 +106,7 @@ protected function _sendMail() $file = $this->_path . DIRECTORY_SEPARATOR . call_user_func($this->_callback, $this); if (!is_writable(dirname($file))) { - require_once 'Zend/Mail/Transport/Exception.php'; + ;// require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception(sprintf( 'Target directory "%s" does not exist or is not writable', dirname($file) @@ -116,7 +116,7 @@ protected function _sendMail() $email = $this->header . $this->EOL . $this->body; if (!file_put_contents($file, $email)) { - require_once 'Zend/Mail/Transport/Exception.php'; + ;// require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('Unable to send mail'); } } diff --git a/library/Zend/Mail/Transport/Sendmail.php b/library/Zend/Mail/Transport/Sendmail.php index 28bf3b9813..2e4d3a238c 100644 --- a/library/Zend/Mail/Transport/Sendmail.php +++ b/library/Zend/Mail/Transport/Sendmail.php @@ -24,7 +24,7 @@ /** * @see Zend_Mail_Transport_Abstract */ -require_once 'Zend/Mail/Transport/Abstract.php'; +;// require_once 'Zend/Mail/Transport/Abstract.php'; /** @@ -113,7 +113,7 @@ public function _sendMail() * Exception is thrown here because * $parameters is a public property */ - require_once 'Zend/Mail/Transport/Exception.php'; + ;// require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception( 'Parameters were set but are not a string' ); @@ -133,7 +133,7 @@ public function _sendMail() /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; + ;// require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('Unable to send mail. ' . $this->_errstr); } } @@ -157,7 +157,7 @@ protected function _prepareHeaders($headers) /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; + ;// require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('_prepareHeaders requires a registered Zend_Mail object'); } @@ -169,7 +169,7 @@ protected function _prepareHeaders($headers) /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; + ;// require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('Missing To addresses'); } } else { @@ -178,7 +178,7 @@ protected function _prepareHeaders($headers) /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; + ;// require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('Missing To header'); } diff --git a/library/Zend/Mail/Transport/Smtp.php b/library/Zend/Mail/Transport/Smtp.php index 2afe681eba..ba3b60e29b 100644 --- a/library/Zend/Mail/Transport/Smtp.php +++ b/library/Zend/Mail/Transport/Smtp.php @@ -24,17 +24,17 @@ /** * @see Zend_Mime */ -require_once 'Zend/Mime.php'; +;// require_once 'Zend/Mime.php'; /** * @see Zend_Mail_Protocol_Smtp */ -require_once 'Zend/Mail/Protocol/Smtp.php'; +;// require_once 'Zend/Mail/Protocol/Smtp.php'; /** * @see Zend_Mail_Transport_Abstract */ -require_once 'Zend/Mail/Transport/Abstract.php'; +;// require_once 'Zend/Mail/Transport/Abstract.php'; /** @@ -192,7 +192,7 @@ public function _sendMail() $connectionClass .= '_Auth_' . ucwords($this->_auth); } if (!class_exists($connectionClass)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($connectionClass); } $this->setConnection(new $connectionClass($this->_host, $this->_port, $this->_config)); @@ -231,7 +231,7 @@ protected function _prepareHeaders($headers) /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; + ;// require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('_prepareHeaders requires a registered Zend_Mail object'); } diff --git a/library/Zend/Markup.php b/library/Zend/Markup.php index 3662f52a05..8de0131d47 100644 --- a/library/Zend/Markup.php +++ b/library/Zend/Markup.php @@ -22,7 +22,7 @@ /** * @see Zend_Loader_PluginLoader */ -require_once 'Zend/Loader/PluginLoader.php'; +;// require_once 'Zend/Loader/PluginLoader.php'; /** * @category Zend diff --git a/library/Zend/Markup/Exception.php b/library/Zend/Markup/Exception.php index 23b32e604e..49ef1ccd94 100644 --- a/library/Zend/Markup/Exception.php +++ b/library/Zend/Markup/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * Exception class for Zend_Markup diff --git a/library/Zend/Markup/Parser/Bbcode.php b/library/Zend/Markup/Parser/Bbcode.php index f0d04cece5..e095eeff38 100644 --- a/library/Zend/Markup/Parser/Bbcode.php +++ b/library/Zend/Markup/Parser/Bbcode.php @@ -23,12 +23,12 @@ /** * @see Zend_Markup_TokenList */ -require_once 'Zend/Markup/TokenList.php'; +;// require_once 'Zend/Markup/TokenList.php'; /** * @see Zend_Markup_Parser_ParserInterface */ -require_once 'Zend/Markup/Parser/ParserInterface.php'; +;// require_once 'Zend/Markup/Parser/ParserInterface.php'; /** * @category Zend @@ -159,7 +159,7 @@ public function parse($value) /** * @see Zend_Markup_Parser_Exception */ - require_once 'Zend/Markup/Parser/Exception.php'; + ;// require_once 'Zend/Markup/Parser/Exception.php'; throw new Zend_Markup_Parser_Exception('Value to parse should be a string.'); } @@ -167,7 +167,7 @@ public function parse($value) /** * @see Zend_Markup_Parser_Exception */ - require_once 'Zend/Markup/Parser/Exception.php'; + ;// require_once 'Zend/Markup/Parser/Exception.php'; throw new Zend_Markup_Parser_Exception('Value to parse cannot be left empty.'); } diff --git a/library/Zend/Markup/Parser/Exception.php b/library/Zend/Markup/Parser/Exception.php index cacb9612a8..594d9e7e4e 100644 --- a/library/Zend/Markup/Parser/Exception.php +++ b/library/Zend/Markup/Parser/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Markup_Exception */ -require_once 'Zend/Markup/Exception.php'; +;// require_once 'Zend/Markup/Exception.php'; /** * Exception class for Zend_Markup_Parser diff --git a/library/Zend/Markup/Renderer/Exception.php b/library/Zend/Markup/Renderer/Exception.php index a8af2393b6..6500e3483a 100644 --- a/library/Zend/Markup/Renderer/Exception.php +++ b/library/Zend/Markup/Renderer/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Markup_Exception */ -require_once 'Zend/Markup/Exception.php'; +;// require_once 'Zend/Markup/Exception.php'; /** * Exception class for Zend_Markup_Renderer diff --git a/library/Zend/Markup/Renderer/Html.php b/library/Zend/Markup/Renderer/Html.php index 09eb456ea5..07c9dcca4d 100644 --- a/library/Zend/Markup/Renderer/Html.php +++ b/library/Zend/Markup/Renderer/Html.php @@ -23,19 +23,19 @@ /** * @see Zend_Filter_HtmlEntities */ -require_once 'Zend/Filter/HtmlEntities.php'; +;// require_once 'Zend/Filter/HtmlEntities.php'; /** * @see Zend_Filter_PregReplace */ -require_once 'Zend/Filter/PregReplace.php'; +;// require_once 'Zend/Filter/PregReplace.php'; /** * @see Zend_Filter_Callback */ -require_once 'Zend/Filter/Callback.php'; +;// require_once 'Zend/Filter/Callback.php'; /** * @see Zend_Markup_Renderer_RendererAbstract */ -require_once 'Zend/Markup/Renderer/RendererAbstract.php'; +;// require_once 'Zend/Markup/Renderer/RendererAbstract.php'; /** * HTML renderer diff --git a/library/Zend/Markup/Renderer/Html/Code.php b/library/Zend/Markup/Renderer/Html/Code.php index a841aaf207..9371b632e8 100644 --- a/library/Zend/Markup/Renderer/Html/Code.php +++ b/library/Zend/Markup/Renderer/Html/Code.php @@ -23,7 +23,7 @@ /** * @see Zend_Markup_Renderer_Html_HtmlAbstract */ -require_once 'Zend/Markup/Renderer/Html/HtmlAbstract.php'; +;// require_once 'Zend/Markup/Renderer/Html/HtmlAbstract.php'; /** * Tag interface diff --git a/library/Zend/Markup/Renderer/Html/HtmlAbstract.php b/library/Zend/Markup/Renderer/Html/HtmlAbstract.php index 4ff62a9217..71bd503630 100644 --- a/library/Zend/Markup/Renderer/Html/HtmlAbstract.php +++ b/library/Zend/Markup/Renderer/Html/HtmlAbstract.php @@ -23,7 +23,7 @@ /** * @see Zend_Markup_Renderer_TokenConverterInterface */ -require_once 'Zend/Markup/Renderer/TokenConverterInterface.php'; +;// require_once 'Zend/Markup/Renderer/TokenConverterInterface.php'; /** * Tag interface diff --git a/library/Zend/Markup/Renderer/Html/Img.php b/library/Zend/Markup/Renderer/Html/Img.php index 95ef925065..e344d84de9 100644 --- a/library/Zend/Markup/Renderer/Html/Img.php +++ b/library/Zend/Markup/Renderer/Html/Img.php @@ -23,11 +23,11 @@ /** * @see Zend_Markup_Renderer_Html */ -require_once 'Zend/Markup/Renderer/Html.php'; +;// require_once 'Zend/Markup/Renderer/Html.php'; /** * @see Zend_Markup_Renderer_Html_HtmlAbstract */ -require_once 'Zend/Markup/Renderer/Html/HtmlAbstract.php'; +;// require_once 'Zend/Markup/Renderer/Html/HtmlAbstract.php'; /** * Tag interface diff --git a/library/Zend/Markup/Renderer/Html/List.php b/library/Zend/Markup/Renderer/Html/List.php index 3c3a245ac7..7d8d3043b7 100644 --- a/library/Zend/Markup/Renderer/Html/List.php +++ b/library/Zend/Markup/Renderer/Html/List.php @@ -23,7 +23,7 @@ /** * @see Zend_Markup_Renderer_Html_HtmlAbstract */ -require_once 'Zend/Markup/Renderer/Html/HtmlAbstract.php'; +;// require_once 'Zend/Markup/Renderer/Html/HtmlAbstract.php'; /** * Tag interface diff --git a/library/Zend/Markup/Renderer/Html/Url.php b/library/Zend/Markup/Renderer/Html/Url.php index 82389cbfeb..2c93d3b4d9 100644 --- a/library/Zend/Markup/Renderer/Html/Url.php +++ b/library/Zend/Markup/Renderer/Html/Url.php @@ -23,11 +23,11 @@ /** * @see Zend_Markup_Renderer_Html */ -require_once 'Zend/Markup/Renderer/Html.php'; +;// require_once 'Zend/Markup/Renderer/Html.php'; /** * @see Zend_Markup_Renderer_Html_HtmlAbstract */ -require_once 'Zend/Markup/Renderer/Html/HtmlAbstract.php'; +;// require_once 'Zend/Markup/Renderer/Html/HtmlAbstract.php'; /** * Tag interface diff --git a/library/Zend/Markup/Renderer/RendererAbstract.php b/library/Zend/Markup/Renderer/RendererAbstract.php index 5226f797f1..dc831411ab 100644 --- a/library/Zend/Markup/Renderer/RendererAbstract.php +++ b/library/Zend/Markup/Renderer/RendererAbstract.php @@ -23,15 +23,15 @@ /** * @see Zend_config */ -require_once 'Zend/Config.php'; +;// require_once 'Zend/Config.php'; /** * @see Zend_Filter */ -require_once 'Zend/Filter.php'; +;// require_once 'Zend/Filter.php'; /** * @see Zend_Markup_Renderer_TokenConverterInterface */ -require_once 'Zend/Markup/Renderer/TokenConverterInterface.php'; +;// require_once 'Zend/Markup/Renderer/TokenConverterInterface.php'; /** * Defines the basic rendering functionality @@ -205,7 +205,7 @@ public static function getEncoding() public function addMarkup($name, $type, array $options) { if (!isset($options['group']) && ($type ^ self::TYPE_ALIAS)) { - require_once 'Zend/Markup/Renderer/Exception.php'; + ;// require_once 'Zend/Markup/Renderer/Exception.php'; throw new Zend_Markup_Renderer_Exception("There is no render group defined."); } @@ -227,7 +227,7 @@ public function addMarkup($name, $type, array $options) // add a callback tag if (isset($options['callback'])) { if (!($options['callback'] instanceof Zend_Markup_Renderer_TokenConverterInterface)) { - require_once 'Zend/Markup/Renderer/Exception.php'; + ;// require_once 'Zend/Markup/Renderer/Exception.php'; throw new Zend_Markup_Renderer_Exception("Not a valid tag callback."); } if (method_exists($options['callback'], 'setRenderer')) { @@ -244,7 +244,7 @@ public function addMarkup($name, $type, array $options) } elseif ($type & self::TYPE_ALIAS) { // add an alias if (empty($options['name'])) { - require_once 'Zend/Markup/Renderer/Exception.php'; + ;// require_once 'Zend/Markup/Renderer/Exception.php'; throw new Zend_Markup_Renderer_Exception( 'No alias was provided but tag was defined as such'); } @@ -424,7 +424,7 @@ protected function _execute(Zend_Markup_Token $token) $markup['callback'] = new $class; if (!($markup['callback'] instanceof Zend_Markup_Renderer_TokenConverterInterface)) { - require_once 'Zend/Markup/Renderer/Exception.php'; + ;// require_once 'Zend/Markup/Renderer/Exception.php'; throw new Zend_Markup_Renderer_Exception("Callback for tag '$name' found, but it isn't valid."); } diff --git a/library/Zend/Markup/Token.php b/library/Zend/Markup/Token.php index d5418abb91..8079d22324 100644 --- a/library/Zend/Markup/Token.php +++ b/library/Zend/Markup/Token.php @@ -23,7 +23,7 @@ /** * @see Zend_Markup_TokenList */ -require_once 'Zend/Markup/TokenList.php'; +;// require_once 'Zend/Markup/TokenList.php'; /** * @category Zend diff --git a/library/Zend/Markup/TokenList.php b/library/Zend/Markup/TokenList.php index 52119d5fc7..63fd9ef4fd 100644 --- a/library/Zend/Markup/TokenList.php +++ b/library/Zend/Markup/TokenList.php @@ -22,7 +22,7 @@ /** * @see Zend_Markup_Token */ -require_once 'Zend/Markup/Token.php'; +;// require_once 'Zend/Markup/Token.php'; /** * @category Zend diff --git a/library/Zend/Memory.php b/library/Zend/Memory.php index 39c1e10ac3..0bd5c270cd 100644 --- a/library/Zend/Memory.php +++ b/library/Zend/Memory.php @@ -20,16 +20,16 @@ */ /** Zend_Memory_Exception */ -require_once 'Zend/Memory/Manager.php'; +;// require_once 'Zend/Memory/Manager.php'; /** Zend_Memory_Value */ -require_once 'Zend/Memory/Value.php'; +;// require_once 'Zend/Memory/Value.php'; /** Zend_Memory_Container */ -require_once 'Zend/Memory/Container.php'; +;// require_once 'Zend/Memory/Container.php'; /** Zend_Memory_Exception */ -require_once 'Zend/Cache.php'; +;// require_once 'Zend/Cache.php'; /** * @category Zend @@ -65,7 +65,7 @@ public static function factory($backend, $backendOptions = array()) } if (!$backendIsFound) { - require_once 'Zend/Memory/Exception.php'; + ;// require_once 'Zend/Memory/Exception.php'; throw new Zend_Memory_Exception("Incorrect backend ($backend)"); } @@ -73,7 +73,7 @@ public static function factory($backend, $backendOptions = array()) // For perfs reasons, we do not use the Zend_Loader::loadClass() method // (security controls are explicit) - require_once str_replace('_', DIRECTORY_SEPARATOR, $backendClass) . '.php'; + ;// require_once str_replace('_', DIRECTORY_SEPARATOR, $backendClass) . '.php'; $backendObject = new $backendClass($backendOptions); diff --git a/library/Zend/Memory/AccessController.php b/library/Zend/Memory/AccessController.php index 1c33c4d7d5..0faf16118f 100644 --- a/library/Zend/Memory/AccessController.php +++ b/library/Zend/Memory/AccessController.php @@ -22,7 +22,7 @@ /** * Zend_Memory_Container_Interface */ -require_once 'Zend/Memory/Container/Interface.php'; +;// require_once 'Zend/Memory/Container/Interface.php'; /** * Memory object container access controller. diff --git a/library/Zend/Memory/Container.php b/library/Zend/Memory/Container.php index e4773f5db1..4c8760564d 100644 --- a/library/Zend/Memory/Container.php +++ b/library/Zend/Memory/Container.php @@ -20,7 +20,7 @@ */ /** Zend_Memory_Container_Interface */ -require_once 'Zend/Memory/Container/Interface.php'; +;// require_once 'Zend/Memory/Container/Interface.php'; /** * Memory value container diff --git a/library/Zend/Memory/Container/Locked.php b/library/Zend/Memory/Container/Locked.php index 60832d33c0..96e250d0f8 100644 --- a/library/Zend/Memory/Container/Locked.php +++ b/library/Zend/Memory/Container/Locked.php @@ -20,7 +20,7 @@ */ /** Zend_Memory_Container */ -require_once 'Zend/Memory/Container.php'; +;// require_once 'Zend/Memory/Container.php'; /** * Memory value container diff --git a/library/Zend/Memory/Container/Movable.php b/library/Zend/Memory/Container/Movable.php index 48bf30dace..780ae8542d 100644 --- a/library/Zend/Memory/Container/Movable.php +++ b/library/Zend/Memory/Container/Movable.php @@ -20,10 +20,10 @@ */ /** Zend_Memory_Container */ -require_once 'Zend/Memory/Container.php'; +;// require_once 'Zend/Memory/Container.php'; /** Zend_Memory_Value */ -require_once 'Zend/Memory/Value.php'; +;// require_once 'Zend/Memory/Value.php'; /** * Memory value container @@ -135,7 +135,7 @@ public function isLocked() public function __get($property) { if ($property != 'value') { - require_once 'Zend/Memory/Exception.php'; + ;// require_once 'Zend/Memory/Exception.php'; throw new Zend_Memory_Exception('Unknown property: Zend_Memory_container::$' . $property); } @@ -157,7 +157,7 @@ public function __get($property) public function __set($property, $value) { if ($property != 'value') { - require_once 'Zend/Memory/Exception.php'; + ;// require_once 'Zend/Memory/Exception.php'; throw new Zend_Memory_Exception('Unknown property: Zend_Memory_container::$' . $property); } diff --git a/library/Zend/Memory/Exception.php b/library/Zend/Memory/Exception.php index 4306a8ad8f..ffe0d2deee 100644 --- a/library/Zend/Memory/Exception.php +++ b/library/Zend/Memory/Exception.php @@ -21,7 +21,7 @@ /** Zend_Controller_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** diff --git a/library/Zend/Memory/Manager.php b/library/Zend/Memory/Manager.php index ece4380a0a..022ad89615 100644 --- a/library/Zend/Memory/Manager.php +++ b/library/Zend/Memory/Manager.php @@ -20,13 +20,13 @@ */ /** Zend_Memory_Container_Movable */ -require_once 'Zend/Memory/Container/Movable.php'; +;// require_once 'Zend/Memory/Container/Movable.php'; /** Zend_Memory_Container_Locked */ -require_once 'Zend/Memory/Container/Locked.php'; +;// require_once 'Zend/Memory/Container/Locked.php'; /** Zend_Memory_AccessController */ -require_once 'Zend/Memory/AccessController.php'; +;// require_once 'Zend/Memory/AccessController.php'; /** @@ -407,7 +407,7 @@ private function _swapCheck() } } - require_once 'Zend/Memory/Exception.php'; + ;// require_once 'Zend/Memory/Exception.php'; throw new Zend_Memory_Exception('Memory manager can\'t get enough space.'); } diff --git a/library/Zend/Mime/Decode.php b/library/Zend/Mime/Decode.php index caf03e1e16..b077225dd6 100644 --- a/library/Zend/Mime/Decode.php +++ b/library/Zend/Mime/Decode.php @@ -22,7 +22,7 @@ /** * @see Zend_Mime */ -require_once 'Zend/Mime.php'; +;// require_once 'Zend/Mime.php'; /** * @category Zend diff --git a/library/Zend/Mime/Exception.php b/library/Zend/Mime/Exception.php index 69ca97553f..1447381b39 100644 --- a/library/Zend/Mime/Exception.php +++ b/library/Zend/Mime/Exception.php @@ -22,7 +22,7 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/Zend/Mime/Message.php b/library/Zend/Mime/Message.php index 71e383c266..86451226f2 100644 --- a/library/Zend/Mime/Message.php +++ b/library/Zend/Mime/Message.php @@ -22,12 +22,12 @@ /** * Zend_Mime */ -require_once 'Zend/Mime.php'; +;// require_once 'Zend/Mime.php'; /** * Zend_Mime_Part */ -require_once 'Zend/Mime/Part.php'; +;// require_once 'Zend/Mime/Part.php'; /** * @category Zend @@ -258,7 +258,7 @@ public static function createFromMessage( $message, $boundary, $EOL = Zend_Mime::LINEEND ) { - require_once 'Zend/Mime/Decode.php'; + ;// require_once 'Zend/Mime/Decode.php'; $parts = Zend_Mime_Decode::splitMessageStruct($message, $boundary, $EOL); $res = new self(); diff --git a/library/Zend/Mime/Part.php b/library/Zend/Mime/Part.php index c28e95cf44..75eb5e8778 100644 --- a/library/Zend/Mime/Part.php +++ b/library/Zend/Mime/Part.php @@ -22,7 +22,7 @@ /** * Zend_Mime */ -require_once 'Zend/Mime.php'; +;// require_once 'Zend/Mime.php'; /** * Class representing a MIME part. @@ -161,7 +161,7 @@ public function isStream() public function getEncodedStream() { if (!$this->_isStream) { - require_once 'Zend/Mime/Exception.php'; + ;// require_once 'Zend/Mime/Exception.php'; throw new Zend_Mime_Exception( 'Attempt to get a stream from a string part' ); @@ -180,7 +180,7 @@ public function getEncodedStream() ) ); if (!is_resource($filter)) { - require_once 'Zend/Mime/Exception.php'; + ;// require_once 'Zend/Mime/Exception.php'; throw new Zend_Mime_Exception( 'Failed to append quoted-printable filter' ); @@ -198,7 +198,7 @@ public function getEncodedStream() ) ); if (!is_resource($filter)) { - require_once 'Zend/Mime/Exception.php'; + ;// require_once 'Zend/Mime/Exception.php'; throw new Zend_Mime_Exception( 'Failed to append base64 filter' ); diff --git a/library/Zend/Navigation.php b/library/Zend/Navigation.php index 0c7f7c5781..8b12c89e22 100644 --- a/library/Zend/Navigation.php +++ b/library/Zend/Navigation.php @@ -22,7 +22,7 @@ /** * @see Zend_Navigation_Container */ -require_once 'Zend/Navigation/Container.php'; +;// require_once 'Zend/Navigation/Container.php'; /** * A simple container class for {@link Zend_Navigation_Page} pages @@ -45,7 +45,7 @@ public function __construct($pages = null) if (is_array($pages) || $pages instanceof Zend_Config) { $this->addPages($pages); } elseif (null !== $pages) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $pages must be an array, an ' . 'instance of Zend_Config, or null'); diff --git a/library/Zend/Navigation/Container.php b/library/Zend/Navigation/Container.php index 2fbd8b8a2b..b93323e8b7 100644 --- a/library/Zend/Navigation/Container.php +++ b/library/Zend/Navigation/Container.php @@ -107,16 +107,16 @@ public function notifyOrderUpdated() public function addPage($page) { if ($page === $this) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'A page cannot have itself as a parent'); } if (is_array($page) || $page instanceof Zend_Config) { - require_once 'Zend/Navigation/Page.php'; + ;// require_once 'Zend/Navigation/Page.php'; $page = Zend_Navigation_Page::factory($page); } elseif (!$page instanceof Zend_Navigation_Page) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $page must be an instance of ' . 'Zend_Navigation_Page or Zend_Config, or an array'); @@ -161,7 +161,7 @@ public function addPages($pages) } if (!is_array($pages)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $pages must be an array, an ' . 'instance of Zend_Config or an instance of ' . @@ -471,7 +471,7 @@ public function __call($method, $arguments) return $this->{$match[1]}($match[2], $arguments[0], !empty($arguments[1])); } - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( sprintf( 'Bad method call: Unknown method %s::%s', @@ -518,7 +518,7 @@ public function current(): Zend_Navigation_Page if (isset($this->_pages[$hash])) { return $this->_pages[$hash]; } else { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Corruption detected in container; ' . 'invalid key found in internal iterator'); diff --git a/library/Zend/Navigation/Exception.php b/library/Zend/Navigation/Exception.php index 81be80311e..b8d88e69bc 100644 --- a/library/Zend/Navigation/Exception.php +++ b/library/Zend/Navigation/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * Navigation exception diff --git a/library/Zend/Navigation/Page.php b/library/Zend/Navigation/Page.php index c3a799800f..943bf5dd49 100644 --- a/library/Zend/Navigation/Page.php +++ b/library/Zend/Navigation/Page.php @@ -22,7 +22,7 @@ /** * @see Zend_Navigation_Container */ -require_once 'Zend/Navigation/Container.php'; +;// require_once 'Zend/Navigation/Container.php'; /** * Base class for Zend_Navigation_Page pages @@ -214,7 +214,7 @@ public static function factory($options) } if (!is_array($options)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $options must be an array or Zend_Config'); } @@ -237,13 +237,13 @@ public static function factory($options) } if (!class_exists($type)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; @Zend_Loader::loadClass($type); } $page = new $type($options); if (!$page instanceof Zend_Navigation_Page) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception(sprintf( 'Invalid argument: Detected type "%s", which ' . 'is not an instance of Zend_Navigation_Page', @@ -259,13 +259,13 @@ public static function factory($options) isset($options['params']); if ($hasMvc) { - require_once 'Zend/Navigation/Page/Mvc.php'; + ;// require_once 'Zend/Navigation/Page/Mvc.php'; return new Zend_Navigation_Page_Mvc($options); } elseif ($hasUri) { - require_once 'Zend/Navigation/Page/Uri.php'; + ;// require_once 'Zend/Navigation/Page/Uri.php'; return new Zend_Navigation_Page_Uri($options); } else { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; $message = 'Invalid argument: Unable to determine class to instantiate'; if (isset($options['label'])) { @@ -349,7 +349,7 @@ public function setOptions(array $options) public function setLabel($label) { if (null !== $label && !is_string($label)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $label must be a string or null'); } @@ -378,7 +378,7 @@ public function getLabel() public function setFragment($fragment) { if (null !== $fragment && !is_string($fragment)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $fragment must be a string or null'); } @@ -408,7 +408,7 @@ public function getFragment() public function setId($id = null) { if (null !== $id && !is_string($id) && !is_numeric($id)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $id must be a string, number or null'); } @@ -439,7 +439,7 @@ public function getId() public function setClass($class = null) { if (null !== $class && !is_string($class)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $class must be a string or null'); } @@ -469,7 +469,7 @@ public function getClass() public function setTitle($title = null) { if (null !== $title && !is_string($title)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $title must be a non-empty string'); } @@ -499,7 +499,7 @@ public function getTitle() public function setTarget($target = null) { if (null !== $target && !is_string($target)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $target must be a string or null'); } @@ -532,7 +532,7 @@ public function setAccesskey($character = null) if (null !== $character && (!is_string($character) || 1 != strlen($character))) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $character must be a single character or null' ); @@ -574,7 +574,7 @@ public function setRel($relations = null) } if (!is_array($relations)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $relations must be an ' . 'array or an instance of Zend_Config'); @@ -637,7 +637,7 @@ public function setRev($relations = null) } if (!is_array($relations)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $relations must be an ' . 'array or an instance of Zend_Config'); @@ -690,14 +690,14 @@ public function getRev($relation = null) public function setCustomHtmlAttrib($name, $value) { if (!is_string($name)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $name must be a string' ); } if (null !== $value && !is_string($value)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $value must be a string or null' ); @@ -722,7 +722,7 @@ public function setCustomHtmlAttrib($name, $value) public function getCustomHtmlAttrib($name) { if (!is_string($name)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $name must be a string' ); @@ -768,7 +768,7 @@ public function getCustomHtmlAttribs() public function removeCustomHtmlAttrib($name) { if (!is_string($name)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $name must be a string' ); @@ -810,7 +810,7 @@ public function setOrder($order = null) } if (null !== $order && !is_int($order)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $order must be an integer or null, ' . 'or a string that casts to an integer'); @@ -855,7 +855,7 @@ public function setResource($resource = null) $resource instanceof Zend_Acl_Resource_Interface) { $this->_resource = $resource; } else { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $resource must be null, a string, ' . ' or an instance of Zend_Acl_Resource_Interface'); @@ -1008,7 +1008,7 @@ public function getVisible($recursive = false) public function setParent(Zend_Navigation_Container $parent = null) { if ($parent === $this) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'A page cannot have itself as a parent'); } @@ -1058,7 +1058,7 @@ public function getParent() public function set($property, $value) { if (!is_string($property) || empty($property)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $property must be a non-empty string'); } @@ -1089,7 +1089,7 @@ public function set($property, $value) public function get($property) { if (!is_string($property) || empty($property)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $property must be a non-empty string'); } @@ -1171,7 +1171,7 @@ public function __unset($name) { $method = 'set' . self::_normalizePropertyName($name); if (method_exists($this, $method)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception(sprintf( 'Unsetting native property "%s" is not allowed', $name)); diff --git a/library/Zend/Navigation/Page/Mvc.php b/library/Zend/Navigation/Page/Mvc.php index 4c55f378c0..6e631da211 100644 --- a/library/Zend/Navigation/Page/Mvc.php +++ b/library/Zend/Navigation/Page/Mvc.php @@ -23,19 +23,19 @@ /** * @see Zend_Navigation_Page */ -require_once 'Zend/Navigation/Page.php'; +;// require_once 'Zend/Navigation/Page.php'; /** * @see Zend_Controller_Action_HelperBroker */ -require_once 'Zend/Controller/Action/HelperBroker.php'; +;// require_once 'Zend/Controller/Action/HelperBroker.php'; /** * Used to check if page is active * * @see Zend_Controller_Front */ -require_once 'Zend/Controller/Front.php'; +;// require_once 'Zend/Controller/Front.php'; /** * Represents a page that is defined using module, controller, action, route @@ -263,7 +263,7 @@ public function getHref() $scheme = $this->getScheme(); if (null !== $scheme) { if (null === self::$_schemeHelper) { - require_once 'Zend/View/Helper/ServerUrl.php'; + ;// require_once 'Zend/View/Helper/ServerUrl.php'; self::$_schemeHelper = new Zend_View_Helper_ServerUrl(); } @@ -291,7 +291,7 @@ public function getHref() public function setAction($action) { if (null !== $action && !is_string($action)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $action must be a string or null' ); @@ -327,7 +327,7 @@ public function getAction() public function setController($controller) { if (null !== $controller && !is_string($controller)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $controller must be a string or null' ); @@ -363,7 +363,7 @@ public function getController() public function setModule($module) { if (null !== $module && !is_string($module)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $module must be a string or null' ); @@ -529,7 +529,7 @@ public function getParam($name) public function setRoute($route) { if (null !== $route && (!is_string($route) || strlen($route) < 1)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $route must be a non-empty string or null' ); @@ -622,7 +622,7 @@ public function getEncodeUrl() public function setScheme($scheme) { if (null !== $scheme && !is_string($scheme)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $scheme must be a string or null' ); diff --git a/library/Zend/Navigation/Page/Uri.php b/library/Zend/Navigation/Page/Uri.php index 130b0d4d1a..23fa840a2e 100644 --- a/library/Zend/Navigation/Page/Uri.php +++ b/library/Zend/Navigation/Page/Uri.php @@ -23,7 +23,7 @@ /** * @see Zend_Navigation_Page_Abstract */ -require_once 'Zend/Navigation/Page.php'; +;// require_once 'Zend/Navigation/Page.php'; /** * Represents a page that is defined by specifying a URI @@ -53,7 +53,7 @@ class Zend_Navigation_Page_Uri extends Zend_Navigation_Page public function setUri($uri) { if (null !== $uri && !is_string($uri)) { - require_once 'Zend/Navigation/Exception.php'; + ;// require_once 'Zend/Navigation/Exception.php'; throw new Zend_Navigation_Exception( 'Invalid argument: $uri must be a string or null'); } diff --git a/library/Zend/Oauth.php b/library/Zend/Oauth.php index 77fa13d1fd..08e159fb03 100644 --- a/library/Zend/Oauth.php +++ b/library/Zend/Oauth.php @@ -20,7 +20,7 @@ */ /** Zend_Http_Client */ -require_once 'Zend/Http/Client.php'; +;// require_once 'Zend/Http/Client.php'; /** * @category Zend diff --git a/library/Zend/Oauth/Client.php b/library/Zend/Oauth/Client.php index 03b794dc84..c31537020b 100644 --- a/library/Zend/Oauth/Client.php +++ b/library/Zend/Oauth/Client.php @@ -20,16 +20,16 @@ */ /** Zend_Oauth */ -require_once 'Zend/Oauth.php'; +;// require_once 'Zend/Oauth.php'; /** Zend_Http_Client */ -require_once 'Zend/Http/Client.php'; +;// require_once 'Zend/Http/Client.php'; /** Zend_Oauth_Http_Utility */ -require_once 'Zend/Oauth/Http/Utility.php'; +;// require_once 'Zend/Oauth/Http/Utility.php'; /** Zend_Oauth_Config */ -require_once 'Zend/Oauth/Config.php'; +;// require_once 'Zend/Oauth/Config.php'; /** * @category Zend @@ -248,7 +248,7 @@ public function prepareOauth() $this->setHeaders('Authorization', $oauthHeaderValue); } elseif ($requestScheme == Zend_Oauth::REQUEST_SCHEME_POSTBODY) { if ($requestMethod == self::GET) { - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( 'The client is configured to' . ' pass OAuth parameters through a POST body but request method' @@ -285,7 +285,7 @@ public function prepareOauth() $this->getUri()->setQuery($query); $this->paramsGet = array(); } else { - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception('Invalid request scheme: ' . $requestScheme); } } @@ -321,7 +321,7 @@ protected function _getSignableParametersAsQueryString() public function __call($method, array $args) { if (!method_exists($this->_config, $method)) { - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception('Method does not exist: ' . $method); } return call_user_func_array(array($this->_config,$method), $args); diff --git a/library/Zend/Oauth/Config.php b/library/Zend/Oauth/Config.php index 61ab53cf56..2739cc7716 100644 --- a/library/Zend/Oauth/Config.php +++ b/library/Zend/Oauth/Config.php @@ -20,13 +20,13 @@ */ /** Zend_Oauth */ -require_once 'Zend/Oauth.php'; +;// require_once 'Zend/Oauth.php'; /** Zend_Uri */ -require_once 'Zend/Uri.php'; +;// require_once 'Zend/Uri.php'; /** Zend_Oauth_Config_Interface */ -require_once 'Zend/Oauth/Config/ConfigInterface.php'; +;// require_once 'Zend/Oauth/Config/ConfigInterface.php'; /** * @category Zend @@ -297,7 +297,7 @@ public function setSignatureMethod($method) 'HMAC-SHA1', 'HMAC-SHA256', 'RSA-SHA1', 'PLAINTEXT' )) ) { - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception('Unsupported signature method: ' . $method . '. Supported are HMAC-SHA1, RSA-SHA1, PLAINTEXT and HMAC-SHA256'); @@ -332,7 +332,7 @@ public function setRequestScheme($scheme) Zend_Oauth::REQUEST_SCHEME_QUERYSTRING, )) ) { - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( '\'' . $scheme . '\' is an unsupported request scheme' ); @@ -340,7 +340,7 @@ public function setRequestScheme($scheme) if ($scheme == Zend_Oauth::REQUEST_SCHEME_POSTBODY && $this->getRequestMethod() == Zend_Oauth::GET ) { - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( 'Cannot set POSTBODY request method if HTTP method set to GET' ); @@ -391,7 +391,7 @@ public function getVersion() public function setCallbackUrl($url) { if (!Zend_Uri::check($url) && $url !== 'oob') { - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( '\'' . $url . '\' is not a valid URI' ); @@ -420,7 +420,7 @@ public function getCallbackUrl() public function setSiteUrl($url) { if (!Zend_Uri::check($url)) { - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( '\'' . $url . '\' is not a valid URI' ); @@ -449,7 +449,7 @@ public function getSiteUrl() public function setRequestTokenUrl($url) { if (!Zend_Uri::check($url)) { - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( '\'' . $url . '\' is not a valid URI' ); @@ -484,7 +484,7 @@ public function getRequestTokenUrl() public function setAccessTokenUrl($url) { if (!Zend_Uri::check($url)) { - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( '\'' . $url . '\' is not a valid URI' ); @@ -531,7 +531,7 @@ public function setUserAuthorizationUrl($url) public function setAuthorizeUrl($url) { if (!Zend_Uri::check($url)) { - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( '\'' . $url . '\' is not a valid URI' ); @@ -584,7 +584,7 @@ public function setRequestMethod($method) Zend_Oauth::OPTIONS, )) ) { - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception('Invalid method: ' . $method); } $this->_requestMethod = $method; diff --git a/library/Zend/Oauth/Consumer.php b/library/Zend/Oauth/Consumer.php index 5f5f32ffb4..c426e9313c 100644 --- a/library/Zend/Oauth/Consumer.php +++ b/library/Zend/Oauth/Consumer.php @@ -20,25 +20,25 @@ */ /** Zend_Oauth */ -require_once 'Zend/Oauth.php'; +;// require_once 'Zend/Oauth.php'; /** Zend_Uri */ -require_once 'Zend/Uri.php'; +;// require_once 'Zend/Uri.php'; /** Zend_Oauth_Http_RequestToken */ -require_once 'Zend/Oauth/Http/RequestToken.php'; +;// require_once 'Zend/Oauth/Http/RequestToken.php'; /** Zend_Oauth_Http_UserAuthorization */ -require_once 'Zend/Oauth/Http/UserAuthorization.php'; +;// require_once 'Zend/Oauth/Http/UserAuthorization.php'; /** Zend_Oauth_Http_AccessToken */ -require_once 'Zend/Oauth/Http/AccessToken.php'; +;// require_once 'Zend/Oauth/Http/AccessToken.php'; /** Zend_Oauth_Token_AuthorizedRequest */ -require_once 'Zend/Oauth/Token/AuthorizedRequest.php'; +;// require_once 'Zend/Oauth/Token/AuthorizedRequest.php'; /** Zend_Oauth_Config */ -require_once 'Zend/Oauth/Config.php'; +;// require_once 'Zend/Oauth/Config.php'; /** * @category Zend @@ -189,7 +189,7 @@ public function getAccessToken( ) { $authorizedToken = new Zend_Oauth_Token_AuthorizedRequest($queryData); if (!$authorizedToken->isValid()) { - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( 'Response from Service Provider is not a valid authorized request token'); } @@ -211,14 +211,14 @@ public function getAccessToken( } if (isset($token)) { if ($authorizedToken->getToken() !== $token->getToken()) { - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( 'Authorized token from Service Provider does not match' . ' supplied Request Token details' ); } } else { - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception('Request token must be passed to method'); } $this->_requestToken = $token; @@ -271,7 +271,7 @@ public function getToken() public function __call($method, array $args) { if (!method_exists($this->_config, $method)) { - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception('Method does not exist: '.$method); } return call_user_func_array(array($this->_config,$method), $args); diff --git a/library/Zend/Oauth/Exception.php b/library/Zend/Oauth/Exception.php index ae76b488b2..791d680ba6 100644 --- a/library/Zend/Oauth/Exception.php +++ b/library/Zend/Oauth/Exception.php @@ -22,7 +22,7 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/Zend/Oauth/Http.php b/library/Zend/Oauth/Http.php index 6cf79ac4f1..0c00c40a3e 100644 --- a/library/Zend/Oauth/Http.php +++ b/library/Zend/Oauth/Http.php @@ -20,10 +20,10 @@ */ /** Zend_Oauth_Http_Utility */ -require_once 'Zend/Oauth/Http/Utility.php'; +;// require_once 'Zend/Oauth/Http/Utility.php'; /** Zend_Uri_Http */ -require_once 'Zend/Uri/Http.php'; +;// require_once 'Zend/Uri/Http.php'; /** * @category Zend @@ -105,7 +105,7 @@ public function __construct( public function setMethod($method) { if (!in_array($method, array(Zend_Oauth::POST, Zend_Oauth::GET))) { - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception('invalid HTTP method: ' . $method); } $this->_preferredRequestMethod = $method; @@ -174,7 +174,7 @@ public function startRequestCycle(array $params) try { $response = $this->_attemptRequest($params); } catch (Zend_Http_Client_Exception $e) { - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception('Error in HTTP request', null, $e); } if ($response !== null) { @@ -230,7 +230,7 @@ protected function _assessRequestAttempt(Zend_Http_Response $response = null) $this->_preferredRequestScheme = Zend_Oauth::REQUEST_SCHEME_QUERYSTRING; break; default: - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( 'Could not retrieve a valid Token response from Token URL:' . ($response !== null diff --git a/library/Zend/Oauth/Http/AccessToken.php b/library/Zend/Oauth/Http/AccessToken.php index 8efd0f16b1..a8a56f2cd9 100644 --- a/library/Zend/Oauth/Http/AccessToken.php +++ b/library/Zend/Oauth/Http/AccessToken.php @@ -20,10 +20,10 @@ */ /** Zend_Oauth_Http */ -require_once 'Zend/Oauth/Http.php'; +;// require_once 'Zend/Oauth/Http.php'; /** Zend_Oauth_Token_Access */ -require_once 'Zend/Oauth/Token/Access.php'; +;// require_once 'Zend/Oauth/Token/Access.php'; /** * @category Zend diff --git a/library/Zend/Oauth/Http/RequestToken.php b/library/Zend/Oauth/Http/RequestToken.php index 44ae2da7a1..afcb72e9ee 100644 --- a/library/Zend/Oauth/Http/RequestToken.php +++ b/library/Zend/Oauth/Http/RequestToken.php @@ -20,10 +20,10 @@ */ /** Zend_Oauth_Http */ -require_once 'Zend/Oauth/Http.php'; +;// require_once 'Zend/Oauth/Http.php'; /** Zend_Oauth_Token_Request */ -require_once 'Zend/Oauth/Token/Request.php'; +;// require_once 'Zend/Oauth/Token/Request.php'; /** * @category Zend diff --git a/library/Zend/Oauth/Http/UserAuthorization.php b/library/Zend/Oauth/Http/UserAuthorization.php index 8582bac056..ef5eb52b4a 100644 --- a/library/Zend/Oauth/Http/UserAuthorization.php +++ b/library/Zend/Oauth/Http/UserAuthorization.php @@ -20,10 +20,10 @@ */ /** Zend_Oauth_Http */ -require_once 'Zend/Oauth/Http.php'; +;// require_once 'Zend/Oauth/Http.php'; /** Zend_Uri_Http */ -require_once 'Zend/Uri/Http.php'; +;// require_once 'Zend/Uri/Http.php'; /** * @category Zend diff --git a/library/Zend/Oauth/Http/Utility.php b/library/Zend/Oauth/Http/Utility.php index 3c063744b7..84f5357973 100644 --- a/library/Zend/Oauth/Http/Utility.php +++ b/library/Zend/Oauth/Http/Utility.php @@ -20,10 +20,10 @@ */ /** Zend_Oauth */ -require_once 'Zend/Oauth.php'; +;// require_once 'Zend/Oauth.php'; /** Zend_Oauth_Http */ -require_once 'Zend/Oauth/Http.php'; +;// require_once 'Zend/Oauth/Http.php'; /** * @category Zend @@ -154,7 +154,7 @@ public function sign( $className = 'Zend_Oauth_Signature_' . ucfirst(strtolower($signatureMethod)); } - require_once str_replace('_', '/', $className) . '.php'; + ;// require_once str_replace('_', '/', $className) . '.php'; $signatureObject = new $className($consumerSecret, $tokenSecret, $hashAlgo); return $signatureObject->sign($params, $method, $url); } diff --git a/library/Zend/Oauth/Signature/Hmac.php b/library/Zend/Oauth/Signature/Hmac.php index b93cc5891f..46c693cec5 100644 --- a/library/Zend/Oauth/Signature/Hmac.php +++ b/library/Zend/Oauth/Signature/Hmac.php @@ -20,10 +20,10 @@ */ /** Zend_Oauth_Signature_SignatureAbstract */ -require_once 'Zend/Oauth/Signature/SignatureAbstract.php'; +;// require_once 'Zend/Oauth/Signature/SignatureAbstract.php'; /** Zend_Crypt_Hmac */ -require_once 'Zend/Crypt/Hmac.php'; +;// require_once 'Zend/Crypt/Hmac.php'; /** * @category Zend diff --git a/library/Zend/Oauth/Signature/Plaintext.php b/library/Zend/Oauth/Signature/Plaintext.php index e39b676770..76d4571b2d 100644 --- a/library/Zend/Oauth/Signature/Plaintext.php +++ b/library/Zend/Oauth/Signature/Plaintext.php @@ -20,7 +20,7 @@ */ /** Zend_Oauth_Signature_SignatureAbstract */ -require_once 'Zend/Oauth/Signature/SignatureAbstract.php'; +;// require_once 'Zend/Oauth/Signature/SignatureAbstract.php'; /** * @category Zend diff --git a/library/Zend/Oauth/Signature/Rsa.php b/library/Zend/Oauth/Signature/Rsa.php index c79d4a3e79..8fbbc5aed5 100644 --- a/library/Zend/Oauth/Signature/Rsa.php +++ b/library/Zend/Oauth/Signature/Rsa.php @@ -20,10 +20,10 @@ */ /** Zend_Oauth_Signature_SignatureAbstract */ -require_once 'Zend/Oauth/Signature/SignatureAbstract.php'; +;// require_once 'Zend/Oauth/Signature/SignatureAbstract.php'; /** Zend_Crypt_Rsa */ -require_once 'Zend/Crypt/Rsa.php'; +;// require_once 'Zend/Crypt/Rsa.php'; /** * @category Zend diff --git a/library/Zend/Oauth/Signature/SignatureAbstract.php b/library/Zend/Oauth/Signature/SignatureAbstract.php index 688f4606ce..4f3a01f7d9 100644 --- a/library/Zend/Oauth/Signature/SignatureAbstract.php +++ b/library/Zend/Oauth/Signature/SignatureAbstract.php @@ -20,10 +20,10 @@ */ /** Zend_Oauth_Http_Utility */ -require_once 'Zend/Oauth/Http/Utility.php'; +;// require_once 'Zend/Oauth/Http/Utility.php'; /** Zend_Uri_Http */ -require_once 'Zend/Uri/Http.php'; +;// require_once 'Zend/Uri/Http.php'; /** * @category Zend diff --git a/library/Zend/Oauth/Token.php b/library/Zend/Oauth/Token.php index 08f23e5c12..3cfc9e991a 100644 --- a/library/Zend/Oauth/Token.php +++ b/library/Zend/Oauth/Token.php @@ -20,7 +20,7 @@ */ /** Zend_Oauth_Http_Utility */ -require_once 'Zend/Oauth/Http/Utility.php'; +;// require_once 'Zend/Oauth/Http/Utility.php'; /** * @category Zend diff --git a/library/Zend/Oauth/Token/Access.php b/library/Zend/Oauth/Token/Access.php index b31100651d..76f8960e96 100644 --- a/library/Zend/Oauth/Token/Access.php +++ b/library/Zend/Oauth/Token/Access.php @@ -20,16 +20,16 @@ */ /** Zend_Oauth_Token */ -require_once 'Zend/Oauth/Token.php'; +;// require_once 'Zend/Oauth/Token.php'; /** Zend_Oauth_Http */ -require_once 'Zend/Oauth/Http.php'; +;// require_once 'Zend/Oauth/Http.php'; /** Zend_Uri_Http */ -require_once 'Zend/Uri/Http.php'; +;// require_once 'Zend/Uri/Http.php'; /** Zend_Oauth_Client */ -require_once 'Zend/Oauth/Client.php'; +;// require_once 'Zend/Oauth/Client.php'; /** * @category Zend @@ -52,7 +52,7 @@ public function toHeader( $url, Zend_Oauth_Config_ConfigInterface $config, array $customParams = null, $realm = null ) { if (!Zend_Uri::check($url)) { - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( '\'' . $url . '\' is not a valid URI' ); @@ -72,7 +72,7 @@ public function toHeader( public function toQueryString($url, Zend_Oauth_Config_ConfigInterface $config, array $params = null) { if (!Zend_Uri::check($url)) { - require_once 'Zend/Oauth/Exception.php'; + ;// require_once 'Zend/Oauth/Exception.php'; throw new Zend_Oauth_Exception( '\'' . $url . '\' is not a valid URI' ); diff --git a/library/Zend/Oauth/Token/AuthorizedRequest.php b/library/Zend/Oauth/Token/AuthorizedRequest.php index 9ae2bbb032..c1e2c920d0 100644 --- a/library/Zend/Oauth/Token/AuthorizedRequest.php +++ b/library/Zend/Oauth/Token/AuthorizedRequest.php @@ -20,7 +20,7 @@ */ /** Zend_Oauth_Token */ -require_once 'Zend/Oauth/Token.php'; +;// require_once 'Zend/Oauth/Token.php'; /** * @category Zend diff --git a/library/Zend/Oauth/Token/Request.php b/library/Zend/Oauth/Token/Request.php index 6697bff6cf..61bda50d6a 100644 --- a/library/Zend/Oauth/Token/Request.php +++ b/library/Zend/Oauth/Token/Request.php @@ -20,7 +20,7 @@ */ /** Zend_Oauth_Token */ -require_once 'Zend/Oauth/Token.php'; +;// require_once 'Zend/Oauth/Token.php'; /** * @category Zend diff --git a/library/Zend/OpenId.php b/library/Zend/OpenId.php index ce59ffcf73..6065f5e618 100644 --- a/library/Zend/OpenId.php +++ b/library/Zend/OpenId.php @@ -23,7 +23,7 @@ /** * @see Zend_Controller_Response_Abstract */ -require_once "Zend/Controller/Response/Abstract.php"; +;// require_once "Zend/Controller/Response/Abstract.php"; /** * Static class that contains common utility functions for @@ -430,7 +430,7 @@ static public function redirect($url, $params = null, $url = Zend_OpenId::absoluteUrl($url); $body = ""; if (null === $response) { - require_once "Zend/Controller/Response/Http.php"; + ;// require_once "Zend/Controller/Response/Http.php"; $response = new Zend_Controller_Response_Http(); } @@ -507,7 +507,7 @@ static public function digest($func, $data) return mhash(MHASH_SHA256 , $data); } } - require_once "Zend/OpenId/Exception.php"; + ;// require_once "Zend/OpenId/Exception.php"; throw new Zend_OpenId_Exception( 'Unsupported digest algorithm "' . $func . '".', Zend_OpenId_Exception::UNSUPPORTED_DIGEST); @@ -526,7 +526,7 @@ static public function digest($func, $data) */ static public function hashHmac($macFunc, $data, $secret) { -// require_once "Zend/Crypt/Hmac.php"; +// ;// require_once "Zend/Crypt/Hmac.php"; // return Zend_Crypt_Hmac::compute($secret, $macFunc, $data, Zend_Crypt_Hmac::BINARY); if (function_exists('hash_hmac')) { return hash_hmac($macFunc, $data, $secret, true); @@ -563,7 +563,7 @@ static protected function binToBigNum($bin) } return $bn; } - require_once "Zend/OpenId/Exception.php"; + ;// require_once "Zend/OpenId/Exception.php"; throw new Zend_OpenId_Exception( 'The system doesn\'t have proper big integer extension', Zend_OpenId_Exception::UNSUPPORTED_LONG_MATH); @@ -592,7 +592,7 @@ static protected function bigNumToBin($bn) if ($cmp == 0) { return "\0"; } else if ($cmp < 0) { - require_once "Zend/OpenId/Exception.php"; + ;// require_once "Zend/OpenId/Exception.php"; throw new Zend_OpenId_Exception( 'Big integer arithmetic error', Zend_OpenId_Exception::ERROR_LONG_MATH); @@ -607,7 +607,7 @@ static protected function bigNumToBin($bn) } return $bin; } - require_once "Zend/OpenId/Exception.php"; + ;// require_once "Zend/OpenId/Exception.php"; throw new Zend_OpenId_Exception( 'The system doesn\'t have proper big integer extension', Zend_OpenId_Exception::UNSUPPORTED_LONG_MATH); @@ -710,7 +710,7 @@ static public function computeDhSecret($pub_key, $dh) $bn_secret = bcpowmod($bn_pub_key, $dh['priv_key'], $dh['p']); return self::bigNumToBin($bn_secret); } - require_once "Zend/OpenId/Exception.php"; + ;// require_once "Zend/OpenId/Exception.php"; throw new Zend_OpenId_Exception( 'The system doesn\'t have proper big integer extension', Zend_OpenId_Exception::UNSUPPORTED_LONG_MATH); diff --git a/library/Zend/OpenId/Consumer.php b/library/Zend/OpenId/Consumer.php index f9d11f56ca..d8667cb04c 100644 --- a/library/Zend/OpenId/Consumer.php +++ b/library/Zend/OpenId/Consumer.php @@ -24,22 +24,22 @@ /** * @see Zend_OpenId */ -require_once "Zend/OpenId.php"; +;// require_once "Zend/OpenId.php"; /** * @see Zend_OpenId_Extension */ -require_once "Zend/OpenId/Extension.php"; +;// require_once "Zend/OpenId/Extension.php"; /** * @see Zend_OpenId_Consumer_Storage */ -require_once "Zend/OpenId/Consumer/Storage.php"; +;// require_once "Zend/OpenId/Consumer/Storage.php"; /** * @see Zend_Http_Client */ -require_once 'Zend/Http/Client.php'; +;// require_once 'Zend/Http/Client.php'; /** * OpenID consumer implementation @@ -115,7 +115,7 @@ public function __construct(Zend_OpenId_Consumer_Storage $storage = null, $dumbMode = false) { if ($storage === null) { - require_once "Zend/OpenId/Consumer/Storage/File.php"; + ;// require_once "Zend/OpenId/Consumer/Storage/File.php"; $this->_storage = new Zend_OpenId_Consumer_Storage_File(); } else { $this->_storage = $storage; @@ -221,7 +221,7 @@ public function verify($params, &$identity = "", $extensions = null) $identity = $_SESSION["zend_openid"]["claimed_id"]; } } else { - require_once "Zend/Session/Namespace.php"; + ;// require_once "Zend/Session/Namespace.php"; $this->_session = new Zend_Session_Namespace("zend_openid"); if ($this->_session->identity === $identity) { $identity = $this->_session->claimed_id; @@ -906,7 +906,7 @@ protected function _checkId($immediate, $id, $returnTo=null, $root=null, "identity" => $id, "claimed_id" => $claimedId); } else { - require_once "Zend/Session/Namespace.php"; + ;// require_once "Zend/Session/Namespace.php"; $this->_session = new Zend_Session_Namespace("zend_openid"); $this->_session->identity = $id; $this->_session->claimed_id = $claimedId; diff --git a/library/Zend/OpenId/Consumer/Storage/File.php b/library/Zend/OpenId/Consumer/Storage/File.php index 4219e79c03..d183042891 100644 --- a/library/Zend/OpenId/Consumer/Storage/File.php +++ b/library/Zend/OpenId/Consumer/Storage/File.php @@ -24,7 +24,7 @@ /** * @see Zend_OpenId_Consumer_Storage */ -require_once "Zend/OpenId/Consumer/Storage.php"; +;// require_once "Zend/OpenId/Consumer/Storage.php"; /** * External storage implemmentation using serialized files @@ -73,7 +73,7 @@ public function __construct($dir = null) /** * @see Zend_OpenId_Exception */ - require_once 'Zend/OpenId/Exception.php'; + ;// require_once 'Zend/OpenId/Exception.php'; throw new Zend_OpenId_Exception( 'Cannot access storage directory ' . $dir, Zend_OpenId_Exception::ERROR_STORAGE); @@ -83,7 +83,7 @@ public function __construct($dir = null) /** * @see Zend_OpenId_Exception */ - require_once 'Zend/OpenId/Exception.php'; + ;// require_once 'Zend/OpenId/Exception.php'; throw new Zend_OpenId_Exception( 'Cannot create a lock file in the directory ' . $dir, Zend_OpenId_Exception::ERROR_STORAGE); @@ -93,7 +93,7 @@ public function __construct($dir = null) /** * @see Zend_OpenId_Exception */ - require_once 'Zend/OpenId/Exception.php'; + ;// require_once 'Zend/OpenId/Exception.php'; throw new Zend_OpenId_Exception( 'Cannot create a lock file in the directory ' . $dir, Zend_OpenId_Exception::ERROR_STORAGE); @@ -103,7 +103,7 @@ public function __construct($dir = null) /** * @see Zend_OpenId_Exception */ - require_once 'Zend/OpenId/Exception.php'; + ;// require_once 'Zend/OpenId/Exception.php'; throw new Zend_OpenId_Exception( 'Cannot create a lock file in the directory ' . $dir, Zend_OpenId_Exception::ERROR_STORAGE); diff --git a/library/Zend/OpenId/Exception.php b/library/Zend/OpenId/Exception.php index 8159b650dc..42774c6fd2 100644 --- a/library/Zend/OpenId/Exception.php +++ b/library/Zend/OpenId/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Exception */ -require_once "Zend/Exception.php"; +;// require_once "Zend/Exception.php"; /** * Exception class for Zend_OpenId diff --git a/library/Zend/OpenId/Extension/Sreg.php b/library/Zend/OpenId/Extension/Sreg.php index 2abfbca5e9..03e4f59a5c 100644 --- a/library/Zend/OpenId/Extension/Sreg.php +++ b/library/Zend/OpenId/Extension/Sreg.php @@ -23,7 +23,7 @@ /** * @see Zend_OpenId_Extension */ -require_once "Zend/OpenId/Extension.php"; +;// require_once "Zend/OpenId/Extension.php"; /** * 'Simple Refistration Extension' for Zend_OpenId diff --git a/library/Zend/OpenId/Provider.php b/library/Zend/OpenId/Provider.php index 3971944d0c..9c008cd717 100644 --- a/library/Zend/OpenId/Provider.php +++ b/library/Zend/OpenId/Provider.php @@ -24,12 +24,12 @@ /** * @see Zend_OpenId */ -require_once "Zend/OpenId.php"; +;// require_once "Zend/OpenId.php"; /** * @see Zend_OpenId_Extension */ -require_once "Zend/OpenId/Extension.php"; +;// require_once "Zend/OpenId/Extension.php"; /** * OpenID provider (server) implementation @@ -123,13 +123,13 @@ public function __construct($loginUrl = null, } $this->_trustUrl = $trustUrl; if ($user === null) { - require_once "Zend/OpenId/Provider/User/Session.php"; + ;// require_once "Zend/OpenId/Provider/User/Session.php"; $this->_user = new Zend_OpenId_Provider_User_Session(); } else { $this->_user = $user; } if ($storage === null) { - require_once "Zend/OpenId/Provider/Storage/File.php"; + ;// require_once "Zend/OpenId/Provider/Storage/File.php"; $this->_storage = new Zend_OpenId_Provider_Storage_File(); } else { $this->_storage = $storage; diff --git a/library/Zend/OpenId/Provider/Storage/File.php b/library/Zend/OpenId/Provider/Storage/File.php index eff62cc321..874f2f9be8 100644 --- a/library/Zend/OpenId/Provider/Storage/File.php +++ b/library/Zend/OpenId/Provider/Storage/File.php @@ -24,7 +24,7 @@ /** * @see Zend_OpenId_Provider_Storage */ -require_once "Zend/OpenId/Provider/Storage.php"; +;// require_once "Zend/OpenId/Provider/Storage.php"; /** * External storage implemmentation using serialized files diff --git a/library/Zend/OpenId/Provider/User/Session.php b/library/Zend/OpenId/Provider/User/Session.php index af071615c2..409462ef12 100644 --- a/library/Zend/OpenId/Provider/User/Session.php +++ b/library/Zend/OpenId/Provider/User/Session.php @@ -24,12 +24,12 @@ /** * @see Zend_OpenId_Provider_User */ -require_once "Zend/OpenId/Provider/User.php"; +;// require_once "Zend/OpenId/Provider/User.php"; /** * @see Zend_Session_Namespace */ -require_once "Zend/Session/Namespace.php"; +;// require_once "Zend/Session/Namespace.php"; /** * Class to get/store information about logged in user in Web Browser using diff --git a/library/Zend/Paginator.php b/library/Zend/Paginator.php index 5308e9edc0..fc50af6ab3 100644 --- a/library/Zend/Paginator.php +++ b/library/Zend/Paginator.php @@ -22,12 +22,12 @@ /** * @see Zend_Loader_PluginLoader */ -require_once 'Zend/Loader/PluginLoader.php'; +;// require_once 'Zend/Loader/PluginLoader.php'; /** * @see Zend_Json */ -require_once 'Zend/Json.php'; +;// require_once 'Zend/Json.php'; /** * @category Zend @@ -290,7 +290,7 @@ public static function factory($data, $adapter = self::INTERNAL_ADAPTER, /** * @see Zend_Paginator_Exception */ - require_once 'Zend/Paginator/Exception.php'; + ;// require_once 'Zend/Paginator/Exception.php'; throw new Zend_Paginator_Exception('No adapter for type ' . $type); } @@ -456,7 +456,7 @@ public function __construct($adapter) /** * @see Zend_Paginator_Exception */ - require_once 'Zend/Paginator/Exception.php'; + ;// require_once 'Zend/Paginator/Exception.php'; throw new Zend_Paginator_Exception( 'Zend_Paginator only accepts instances of the type ' . @@ -700,7 +700,7 @@ public function getItem($itemNumber, $pageNumber = null) /** * @see Zend_Paginator_Exception */ - require_once 'Zend/Paginator/Exception.php'; + ;// require_once 'Zend/Paginator/Exception.php'; throw new Zend_Paginator_Exception('Page ' . $pageNumber . ' does not exist'); } @@ -715,7 +715,7 @@ public function getItem($itemNumber, $pageNumber = null) /** * @see Zend_Paginator_Exception */ - require_once 'Zend/Paginator/Exception.php'; + ;// require_once 'Zend/Paginator/Exception.php'; throw new Zend_Paginator_Exception('Page ' . $pageNumber . ' does not' . ' contain item number ' . $itemNumber); @@ -916,7 +916,7 @@ public function getView() /** * @see Zend_Controller_Action_HelperBroker */ - require_once 'Zend/Controller/Action/HelperBroker.php'; + ;// require_once 'Zend/Controller/Action/HelperBroker.php'; $viewRenderer = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer'); if ($viewRenderer->view === null) { @@ -1144,7 +1144,7 @@ protected function _loadScrollingStyle($scrollingStyle = null) /** * @see Zend_View_Exception */ - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; throw new Zend_View_Exception('Scrolling style must implement ' . 'Zend_Paginator_ScrollingStyle_Interface'); @@ -1164,7 +1164,7 @@ protected function _loadScrollingStyle($scrollingStyle = null) /** * @see Zend_View_Exception */ - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; throw new Zend_View_Exception('Scrolling style must be a class ' . 'name or object implementing Zend_Paginator_ScrollingStyle_Interface'); diff --git a/library/Zend/Paginator/Adapter/Array.php b/library/Zend/Paginator/Adapter/Array.php index 088e7a2926..63358464ed 100644 --- a/library/Zend/Paginator/Adapter/Array.php +++ b/library/Zend/Paginator/Adapter/Array.php @@ -22,7 +22,7 @@ /** * @see Zend_Paginator_Adapter_Interface */ -require_once 'Zend/Paginator/Adapter/Interface.php'; +;// require_once 'Zend/Paginator/Adapter/Interface.php'; /** * @category Zend diff --git a/library/Zend/Paginator/Adapter/DbSelect.php b/library/Zend/Paginator/Adapter/DbSelect.php index 4554b0f6ca..40d313b50d 100644 --- a/library/Zend/Paginator/Adapter/DbSelect.php +++ b/library/Zend/Paginator/Adapter/DbSelect.php @@ -22,17 +22,17 @@ /** * @see Zend_Paginator_Adapter_Interface */ -require_once 'Zend/Paginator/Adapter/Interface.php'; +;// require_once 'Zend/Paginator/Adapter/Interface.php'; /** * @see Zend_Db */ -require_once 'Zend/Db.php'; +;// require_once 'Zend/Db.php'; /** * @see Zend_Db_Select */ -require_once 'Zend/Db/Select.php'; +;// require_once 'Zend/Db/Select.php'; /** * @category Zend @@ -134,7 +134,7 @@ public function setRowCount($rowCount) /** * @see Zend_Paginator_Exception */ - require_once 'Zend/Paginator/Exception.php'; + ;// require_once 'Zend/Paginator/Exception.php'; throw new Zend_Paginator_Exception('Row count column not found'); } @@ -148,7 +148,7 @@ public function setRowCount($rowCount) /** * @see Zend_Paginator_Exception */ - require_once 'Zend/Paginator/Exception.php'; + ;// require_once 'Zend/Paginator/Exception.php'; throw new Zend_Paginator_Exception('Invalid row count'); } diff --git a/library/Zend/Paginator/Adapter/DbTableSelect.php b/library/Zend/Paginator/Adapter/DbTableSelect.php index 956f780bc8..7ae727d1e9 100644 --- a/library/Zend/Paginator/Adapter/DbTableSelect.php +++ b/library/Zend/Paginator/Adapter/DbTableSelect.php @@ -22,7 +22,7 @@ /** * @see Zend_Paginator_Adapter_DbSelect */ -require_once 'Zend/Paginator/Adapter/DbSelect.php'; +;// require_once 'Zend/Paginator/Adapter/DbSelect.php'; /** * @category Zend diff --git a/library/Zend/Paginator/Adapter/Iterator.php b/library/Zend/Paginator/Adapter/Iterator.php index 8583d7e92a..5b80b34962 100644 --- a/library/Zend/Paginator/Adapter/Iterator.php +++ b/library/Zend/Paginator/Adapter/Iterator.php @@ -22,12 +22,12 @@ /** * @see Zend_Paginator_Adapter_Interface */ -require_once 'Zend/Paginator/Adapter/Interface.php'; +;// require_once 'Zend/Paginator/Adapter/Interface.php'; /** * @see Zend_Paginator_SerializableLimitIterator */ -require_once 'Zend/Paginator/SerializableLimitIterator.php'; +;// require_once 'Zend/Paginator/SerializableLimitIterator.php'; /** * @category Zend @@ -63,7 +63,7 @@ public function __construct(Iterator $iterator) /** * @see Zend_Paginator_Exception */ - require_once 'Zend/Paginator/Exception.php'; + ;// require_once 'Zend/Paginator/Exception.php'; throw new Zend_Paginator_Exception('Iterator must implement Countable'); } diff --git a/library/Zend/Paginator/Adapter/Null.php b/library/Zend/Paginator/Adapter/Null.php index 7f728d5ab2..72f655736c 100644 --- a/library/Zend/Paginator/Adapter/Null.php +++ b/library/Zend/Paginator/Adapter/Null.php @@ -22,7 +22,7 @@ /** * @see Zend_Paginator_Adapter_Interface */ -require_once 'Zend/Paginator/Adapter/Interface.php'; +;// require_once 'Zend/Paginator/Adapter/Interface.php'; /** * @category Zend diff --git a/library/Zend/Paginator/Exception.php b/library/Zend/Paginator/Exception.php index f846692ac5..207d073192 100644 --- a/library/Zend/Paginator/Exception.php +++ b/library/Zend/Paginator/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/Zend/Paginator/ScrollingStyle/All.php b/library/Zend/Paginator/ScrollingStyle/All.php index 9073dc8fcd..e6b5d4e760 100644 --- a/library/Zend/Paginator/ScrollingStyle/All.php +++ b/library/Zend/Paginator/ScrollingStyle/All.php @@ -22,7 +22,7 @@ /** * @see Zend_Paginator_ScrollingStyle_Interface */ -require_once 'Zend/Paginator/ScrollingStyle/Interface.php'; +;// require_once 'Zend/Paginator/ScrollingStyle/Interface.php'; /** * A scrolling style that returns every page in the collection. diff --git a/library/Zend/Paginator/ScrollingStyle/Elastic.php b/library/Zend/Paginator/ScrollingStyle/Elastic.php index 35cf9964ed..d98b6c93d7 100644 --- a/library/Zend/Paginator/ScrollingStyle/Elastic.php +++ b/library/Zend/Paginator/ScrollingStyle/Elastic.php @@ -22,7 +22,7 @@ /** * @see Zend_Paginator_ScrollingStyle_Sliding */ -require_once 'Zend/Paginator/ScrollingStyle/Sliding.php'; +;// require_once 'Zend/Paginator/ScrollingStyle/Sliding.php'; /** * A Google-like scrolling style. Incrementally expands the range to about diff --git a/library/Zend/Paginator/ScrollingStyle/Jumping.php b/library/Zend/Paginator/ScrollingStyle/Jumping.php index 0c47d5b4f5..5468f6074d 100644 --- a/library/Zend/Paginator/ScrollingStyle/Jumping.php +++ b/library/Zend/Paginator/ScrollingStyle/Jumping.php @@ -22,7 +22,7 @@ /** * @see Zend_Paginator_ScrollingStyle_Interface */ -require_once 'Zend/Paginator/ScrollingStyle/Interface.php'; +;// require_once 'Zend/Paginator/ScrollingStyle/Interface.php'; /** * A scrolling style in which the cursor advances to the upper bound diff --git a/library/Zend/Paginator/ScrollingStyle/Sliding.php b/library/Zend/Paginator/ScrollingStyle/Sliding.php index 73c26cb1e7..3ad3e0eef0 100644 --- a/library/Zend/Paginator/ScrollingStyle/Sliding.php +++ b/library/Zend/Paginator/ScrollingStyle/Sliding.php @@ -22,7 +22,7 @@ /** * @see Zend_Paginator_ScrollingStyle_Interface */ -require_once 'Zend/Paginator/ScrollingStyle/Interface.php'; +;// require_once 'Zend/Paginator/ScrollingStyle/Interface.php'; /** * A Yahoo! Search-like scrolling style. The cursor will advance to diff --git a/library/Zend/Pdf.php b/library/Zend/Pdf.php index c700c8db84..455a93d91f 100644 --- a/library/Zend/Pdf.php +++ b/library/Zend/Pdf.php @@ -24,46 +24,46 @@ /** @todo Section should be removed with ZF 2.0 release as obsolete */ /** Zend_Pdf_Page */ -require_once 'Zend/Pdf/Page.php'; +;// require_once 'Zend/Pdf/Page.php'; /** Zend_Pdf_Style */ -require_once 'Zend/Pdf/Style.php'; +;// require_once 'Zend/Pdf/Style.php'; /** Zend_Pdf_Color_GrayScale */ -require_once 'Zend/Pdf/Color/GrayScale.php'; +;// require_once 'Zend/Pdf/Color/GrayScale.php'; /** Zend_Pdf_Color_Rgb */ -require_once 'Zend/Pdf/Color/Rgb.php'; +;// require_once 'Zend/Pdf/Color/Rgb.php'; /** Zend_Pdf_Color_Cmyk */ -require_once 'Zend/Pdf/Color/Cmyk.php'; +;// require_once 'Zend/Pdf/Color/Cmyk.php'; /** Zend_Pdf_Color_Html */ -require_once 'Zend/Pdf/Color/Html.php'; +;// require_once 'Zend/Pdf/Color/Html.php'; /** Zend_Pdf_Image */ -require_once 'Zend/Pdf/Image.php'; +;// require_once 'Zend/Pdf/Image.php'; /** Zend_Pdf_Font */ -require_once 'Zend/Pdf/Font.php'; +;// require_once 'Zend/Pdf/Font.php'; /** Zend_Pdf_Resource_Extractor */ -require_once 'Zend/Pdf/Resource/Extractor.php'; +;// require_once 'Zend/Pdf/Resource/Extractor.php'; /** Zend_Pdf_Canvas */ -require_once 'Zend/Pdf/Canvas.php'; +;// require_once 'Zend/Pdf/Canvas.php'; /** Internally used classes */ -require_once 'Zend/Pdf/Element.php'; -require_once 'Zend/Pdf/Element/Array.php'; -require_once 'Zend/Pdf/Element/String/Binary.php'; -require_once 'Zend/Pdf/Element/Boolean.php'; -require_once 'Zend/Pdf/Element/Dictionary.php'; -require_once 'Zend/Pdf/Element/Name.php'; -require_once 'Zend/Pdf/Element/Null.php'; -require_once 'Zend/Pdf/Element/Numeric.php'; -require_once 'Zend/Pdf/Element/String.php'; +;// require_once 'Zend/Pdf/Element.php'; +;// require_once 'Zend/Pdf/Element/Array.php'; +;// require_once 'Zend/Pdf/Element/String/Binary.php'; +;// require_once 'Zend/Pdf/Element/Boolean.php'; +;// require_once 'Zend/Pdf/Element/Dictionary.php'; +;// require_once 'Zend/Pdf/Element/Name.php'; +;// require_once 'Zend/Pdf/Element/Null.php'; +;// require_once 'Zend/Pdf/Element/Numeric.php'; +;// require_once 'Zend/Pdf/Element/String.php'; /** @@ -236,7 +236,7 @@ class Zend_Pdf static public function getMemoryManager() { if (self::$_memoryManager === null) { - require_once 'Zend/Memory.php'; + ;// require_once 'Zend/Memory.php'; self::$_memoryManager = Zend_Memory::factory('none'); } @@ -291,7 +291,7 @@ public static function load($source = null, $revision = null) public function save($filename, $updateOnly = false) { if (($file = @fopen($filename, $updateOnly ? 'ab':'wb')) === false ) { - require_once 'Zend/Pdf/Exception.php'; + ;// require_once 'Zend/Pdf/Exception.php'; throw new Zend_Pdf_Exception( "Can not open '$filename' file for writing." ); } @@ -321,16 +321,16 @@ public function save($filename, $updateOnly = false) */ public function __construct($source = null, $revision = null, $load = false) { - require_once 'Zend/Pdf/ElementFactory.php'; + ;// require_once 'Zend/Pdf/ElementFactory.php'; $this->_objFactory = Zend_Pdf_ElementFactory::createFactory(1); if ($source !== null) { - require_once 'Zend/Pdf/Parser.php'; + ;// require_once 'Zend/Pdf/Parser.php'; $this->_parser = new Zend_Pdf_Parser($source, $this->_objFactory, $load); $this->_pdfHeaderVersion = $this->_parser->getPDFVersion(); $this->_trailer = $this->_parser->getTrailer(); if ($this->_trailer->Encrypt !== null) { - require_once 'Zend/Pdf/Exception.php'; + ;// require_once 'Zend/Pdf/Exception.php'; throw new Zend_Pdf_Exception('Encrypted document modification is not supported'); } if ($revision !== null) { @@ -390,7 +390,7 @@ public function __construct($source = null, $revision = null, $load = false) $trailerDictionary->Size = new Zend_Pdf_Element_Numeric(0); - require_once 'Zend/Pdf/Trailer/Generator.php'; + ;// require_once 'Zend/Pdf/Trailer/Generator.php'; $this->_trailer = new Zend_Pdf_Trailer_Generator($trailerDictionary); /** @@ -465,7 +465,7 @@ public function rollback($steps) protected function _loadPages(Zend_Pdf_Element_Reference $pages, $attributes = array()) { if ($pages->getType() != Zend_Pdf_Element::TYPE_DICTIONARY) { - require_once 'Zend/Pdf/Exception.php'; + ;// require_once 'Zend/Pdf/Exception.php'; throw new Zend_Pdf_Exception('Wrong argument'); } @@ -497,7 +497,7 @@ protected function _loadPages(Zend_Pdf_Element_Reference $pages, $attributes = a } } - require_once 'Zend/Pdf/Page.php'; + ;// require_once 'Zend/Pdf/Page.php'; $this->pages[] = new Zend_Pdf_Page($child, $this->_objFactory); } } @@ -522,8 +522,8 @@ protected function _loadNamedDestinations(Zend_Pdf_Element_Reference $root, $pdf // PDF version is 1.2+ // Look for Destinations structure at Name dictionary if ($root->Names !== null && $root->Names->Dests !== null) { - require_once 'Zend/Pdf/NameTree.php'; - require_once 'Zend/Pdf/Target.php'; + ;// require_once 'Zend/Pdf/NameTree.php'; + ;// require_once 'Zend/Pdf/Target.php'; foreach (new Zend_Pdf_NameTree($root->Names->Dests) as $name => $destination) { $this->_namedTargets[$name] = Zend_Pdf_Target::load($destination); } @@ -533,11 +533,11 @@ protected function _loadNamedDestinations(Zend_Pdf_Element_Reference $root, $pdf // Look for Destinations sructure at Dest entry of document catalog if ($root->Dests !== null) { if ($root->Dests->getType() != Zend_Pdf_Element::TYPE_DICTIONARY) { - require_once 'Zend/Pdf/Exception.php'; + ;// require_once 'Zend/Pdf/Exception.php'; throw new Zend_Pdf_Exception('Document catalog Dests entry must be a dictionary.'); } - require_once 'Zend/Pdf/Target.php'; + ;// require_once 'Zend/Pdf/Target.php'; foreach ($root->Dests->getKeys() as $destKey) { $this->_namedTargets[$destKey] = Zend_Pdf_Target::load($root->Dests->$destKey); } @@ -558,12 +558,12 @@ protected function _loadOutlines(Zend_Pdf_Element_Reference $root) } if ($root->Outlines->getType() != Zend_Pdf_Element::TYPE_DICTIONARY) { - require_once 'Zend/Pdf/Exception.php'; + ;// require_once 'Zend/Pdf/Exception.php'; throw new Zend_Pdf_Exception('Document catalog Outlines entry must be a dictionary.'); } if ($root->Outlines->Type !== null && $root->Outlines->Type->value != 'Outlines') { - require_once 'Zend/Pdf/Exception.php'; + ;// require_once 'Zend/Pdf/Exception.php'; throw new Zend_Pdf_Exception('Outlines Type entry must be an \'Outlines\' string.'); } @@ -576,7 +576,7 @@ protected function _loadOutlines(Zend_Pdf_Element_Reference $root) while ($outlineDictionary !== null && !$processedDictionaries->contains($outlineDictionary)) { $processedDictionaries->attach($outlineDictionary); - require_once 'Zend/Pdf/Outline/Loaded.php'; + ;// require_once 'Zend/Pdf/Outline/Loaded.php'; $this->outlines[] = new Zend_Pdf_Outline_Loaded($outlineDictionary); $outlineDictionary = $outlineDictionary->Next; @@ -759,13 +759,13 @@ protected function _dumpPages() unset($this->_namedTargets[$name]); } } else { - require_once 'Zend/Pdf/Exception.php'; + ;// require_once 'Zend/Pdf/Exception.php'; throw new Zend_Pdf_Exception('Wrong type of named targed (\'' . get_class($namedTarget) . '\').'); } } // Refresh outlines - require_once 'Zend/Pdf/RecursivelyIteratableObjectsContainer.php'; + ;// require_once 'Zend/Pdf/RecursivelyIteratableObjectsContainer.php'; $iterator = new RecursiveIteratorIterator(new Zend_Pdf_RecursivelyIteratableObjectsContainer($this->outlines), RecursiveIteratorIterator::SELF_FIRST); foreach ($iterator as $outline) { $target = $outline->getTarget(); @@ -783,7 +783,7 @@ protected function _dumpPages() $outline->setTarget(null); } } else { - require_once 'Zend/Pdf/Exception.php'; + ;// require_once 'Zend/Pdf/Exception.php'; throw new Zend_Pdf_Exception('Wrong outline target.'); } } @@ -803,7 +803,7 @@ protected function _dumpPages() $this->setOpenAction(null); } } else { - require_once 'Zend/Pdf/Exception.php'; + ;// require_once 'Zend/Pdf/Exception.php'; throw new Zend_Pdf_Exception('OpenAction has to be either PDF Action or Destination.'); } } @@ -825,7 +825,7 @@ protected function _dumpNamedDestinations() if ($destination instanceof Zend_Pdf_Target) { $destArrayItems[] = $destination->getResource(); } else { - require_once 'Zend/Pdf/Exception.php'; + ;// require_once 'Zend/Pdf/Exception.php'; throw new Zend_Pdf_Exception('PDF named destinations must be a Zend_Pdf_Target object.'); } } @@ -935,7 +935,7 @@ protected function _dumpOutlines() */ public function newPage($param1, $param2 = null) { - require_once 'Zend/Pdf/Page.php'; + ;// require_once 'Zend/Pdf/Page.php'; if ($param2 === null) { return new Zend_Pdf_Page($param1, $this->_objFactory); } else { @@ -993,7 +993,7 @@ public function getJavaScript() public function getOpenAction() { if ($this->_trailer->Root->OpenAction !== null) { - require_once 'Zend/Pdf/Target.php'; + ;// require_once 'Zend/Pdf/Target.php'; return Zend_Pdf_Target::load($this->_trailer->Root->OpenAction); } else { return null; @@ -1063,7 +1063,7 @@ public function setNamedDestination($name, $destination = null) if ($destination !== null && !$destination instanceof Zend_Pdf_Action_GoTo && !$destination instanceof Zend_Pdf_Destination_Explicit) { - require_once 'Zend/Pdf/Exception.php'; + ;// require_once 'Zend/Pdf/Exception.php'; throw new Zend_Pdf_Exception('PDF named destination must refer an explicit destination or a GoTo PDF action.'); } @@ -1139,7 +1139,7 @@ public function resolveDestination(Zend_Pdf_Destination $destination, $refreshPa } if (!$destination instanceof Zend_Pdf_Destination_Explicit) { - require_once 'Zend/Pdf/Exception.php'; + ;// require_once 'Zend/Pdf/Exception.php'; throw new Zend_Pdf_Exception('Named destination target has to be an explicit destination.'); } } @@ -1236,7 +1236,7 @@ public function extractFonts() if (! ($fontDictionary instanceof Zend_Pdf_Element_Reference || $fontDictionary instanceof Zend_Pdf_Element_Object) ) { - require_once 'Zend/Pdf/Exception.php'; + ;// require_once 'Zend/Pdf/Exception.php'; throw new Zend_Pdf_Exception('Font dictionary has to be an indirect object or object reference.'); } @@ -1245,11 +1245,11 @@ public function extractFonts() } $fonts = array(); - require_once 'Zend/Pdf/Exception.php'; + ;// require_once 'Zend/Pdf/Exception.php'; foreach ($fontResourcesUnique as $resourceId => $fontDictionary) { try { // Try to extract font - require_once 'Zend/Pdf/Resource/Font/Extracted.php'; + ;// require_once 'Zend/Pdf/Resource/Font/Extracted.php'; $extractedFont = new Zend_Pdf_Resource_Font_Extracted($fontDictionary); $fonts[$resourceId] = $extractedFont; @@ -1275,7 +1275,7 @@ public function extractFonts() public function extractFont($fontName) { $fontResourcesUnique = array(); - require_once 'Zend/Pdf/Exception.php'; + ;// require_once 'Zend/Pdf/Exception.php'; foreach ($this->pages as $page) { $pageResources = $page->extractResources(); @@ -1291,7 +1291,7 @@ public function extractFont($fontName) if (! ($fontDictionary instanceof Zend_Pdf_Element_Reference || $fontDictionary instanceof Zend_Pdf_Element_Object) ) { - require_once 'Zend/Pdf/Exception.php'; + ;// require_once 'Zend/Pdf/Exception.php'; throw new Zend_Pdf_Exception('Font dictionary has to be an indirect object or object reference.'); } @@ -1309,7 +1309,7 @@ public function extractFont($fontName) try { // Try to extract font - require_once 'Zend/Pdf/Resource/Font/Extracted.php'; + ;// require_once 'Zend/Pdf/Resource/Font/Extracted.php'; return new Zend_Pdf_Resource_Font_Extracted($fontDictionary); } catch (Zend_Pdf_Exception $e) { if ($e->getMessage() != 'Unsupported font type.') { @@ -1362,7 +1362,7 @@ public function render($newSegmentOnly = false, $outputStream = null) break; default: - require_once 'Zend/Pdf/Exception.php'; + ;// require_once 'Zend/Pdf/Exception.php'; throw new Zend_Pdf_Exception('Wrong Trapped document property vale: \'' . $value . '\'. Only true, false and null values are allowed.'); break; } diff --git a/library/Zend/ProgressBar.php b/library/Zend/ProgressBar.php index 405b3e1952..79da8fc1f7 100644 --- a/library/Zend/ProgressBar.php +++ b/library/Zend/ProgressBar.php @@ -89,7 +89,7 @@ public function __construct(Zend_ProgressBar_Adapter $adapter, $min = 0, $max = { // Check min/max values and set them if ($min > $max) { - require_once 'Zend/ProgressBar/Exception.php'; + ;// require_once 'Zend/ProgressBar/Exception.php'; throw new Zend_ProgressBar_Exception('$max must be greater than $min'); } @@ -99,7 +99,7 @@ public function __construct(Zend_ProgressBar_Adapter $adapter, $min = 0, $max = // See if we have to open a session namespace if ($persistenceNamespace !== null) { - require_once 'Zend/Session/Namespace.php'; + ;// require_once 'Zend/Session/Namespace.php'; $this->_persistenceNamespace = new Zend_Session_Namespace($persistenceNamespace); } diff --git a/library/Zend/ProgressBar/Adapter/Console.php b/library/Zend/ProgressBar/Adapter/Console.php index abfc3b0557..4e20fe1aff 100644 --- a/library/Zend/ProgressBar/Adapter/Console.php +++ b/library/Zend/ProgressBar/Adapter/Console.php @@ -20,12 +20,12 @@ /** * @see Zend_ProgressBar_Adapter */ -require_once 'Zend/ProgressBar/Adapter.php'; +;// require_once 'Zend/ProgressBar/Adapter.php'; /** * @see Zend_Text_MultiByte */ -require_once 'Zend/Text/MultiByte.php'; +;// require_once 'Zend/Text/MultiByte.php'; /** * Zend_ProgressBar_Adapter_Console offers a text-based progressbar for console @@ -190,7 +190,7 @@ public function setOutputStream($resource) $stream = @fopen($resource, 'w'); if ($stream === false) { - require_once 'Zend/ProgressBar/Adapter/Exception.php'; + ;// require_once 'Zend/ProgressBar/Adapter/Exception.php'; throw new Zend_ProgressBar_Adapter_Exception('Unable to open stream'); } @@ -269,7 +269,7 @@ public function setElements(array $elements) self::ELEMENT_TEXT); if (count(array_diff($elements, $allowedElements)) > 0) { - require_once 'Zend/ProgressBar/Adapter/Exception.php'; + ;// require_once 'Zend/ProgressBar/Adapter/Exception.php'; throw new Zend_ProgressBar_Adapter_Exception('Invalid element found in $elements array'); } @@ -290,7 +290,7 @@ public function setElements(array $elements) public function setBarLeftChar($char) { if (empty($char)) { - require_once 'Zend/ProgressBar/Adapter/Exception.php'; + ;// require_once 'Zend/ProgressBar/Adapter/Exception.php'; throw new Zend_ProgressBar_Adapter_Exception('Character may not be empty'); } @@ -309,7 +309,7 @@ public function setBarLeftChar($char) public function setBarRightChar($char) { if (empty($char)) { - require_once 'Zend/ProgressBar/Adapter/Exception.php'; + ;// require_once 'Zend/ProgressBar/Adapter/Exception.php'; throw new Zend_ProgressBar_Adapter_Exception('Character may not be empty'); } @@ -370,7 +370,7 @@ public function setFinishAction($action) self::FINISH_ACTION_NONE); if (!in_array($action, $allowedActions)) { - require_once 'Zend/ProgressBar/Adapter/Exception.php'; + ;// require_once 'Zend/ProgressBar/Adapter/Exception.php'; throw new Zend_ProgressBar_Adapter_Exception('Invalid finish action specified'); } diff --git a/library/Zend/ProgressBar/Adapter/Exception.php b/library/Zend/ProgressBar/Adapter/Exception.php index 1b32ffacd6..ce5fe0cc84 100644 --- a/library/Zend/ProgressBar/Adapter/Exception.php +++ b/library/Zend/ProgressBar/Adapter/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_ProgressBar_Exception */ -require_once 'Zend/ProgressBar/Exception.php'; +;// require_once 'Zend/ProgressBar/Exception.php'; /** * Exception class for Zend_ProgressBar_Adapter diff --git a/library/Zend/ProgressBar/Adapter/JsPull.php b/library/Zend/ProgressBar/Adapter/JsPull.php index 62e76fd241..92c016dd02 100644 --- a/library/Zend/ProgressBar/Adapter/JsPull.php +++ b/library/Zend/ProgressBar/Adapter/JsPull.php @@ -20,12 +20,12 @@ /** * @see Zend_Json */ -require_once 'Zend/Json.php'; +;// require_once 'Zend/Json.php'; /** * @see Zend_ProgressBar_Adapter */ -require_once 'Zend/ProgressBar/Adapter.php'; +;// require_once 'Zend/ProgressBar/Adapter.php'; /** * Zend_ProgressBar_Adapter_JsPull offers a simple method for updating a diff --git a/library/Zend/ProgressBar/Adapter/JsPush.php b/library/Zend/ProgressBar/Adapter/JsPush.php index bba55c83c3..86412c398c 100644 --- a/library/Zend/ProgressBar/Adapter/JsPush.php +++ b/library/Zend/ProgressBar/Adapter/JsPush.php @@ -20,12 +20,12 @@ /** * @see Zend_Json */ -require_once 'Zend/Json.php'; +;// require_once 'Zend/Json.php'; /** * @see Zend_ProgressBar_Adapter */ -require_once 'Zend/ProgressBar/Adapter.php'; +;// require_once 'Zend/ProgressBar/Adapter.php'; /** * Zend_ProgressBar_Adapter_JsPush offers a simple method for updating a diff --git a/library/Zend/ProgressBar/Exception.php b/library/Zend/ProgressBar/Exception.php index 74ee75d628..3e66af9cc1 100644 --- a/library/Zend/ProgressBar/Exception.php +++ b/library/Zend/ProgressBar/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * Exception class for Zend_ProgressBar diff --git a/library/Zend/Queue.php b/library/Zend/Queue.php index a4cec77df4..1df2d96197 100644 --- a/library/Zend/Queue.php +++ b/library/Zend/Queue.php @@ -106,7 +106,7 @@ public function __construct($spec, $options = array()) if ((null === $adapter) && (!is_array($options) && (!$options instanceof Zend_Config)) ) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('No valid params passed to constructor'); } @@ -227,7 +227,7 @@ public function setAdapter($adapter) ); if (!class_exists($adapterName)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($adapterName); } @@ -239,7 +239,7 @@ public function setAdapter($adapter) } if (!$adapter instanceof Zend_Queue_Adapter_AdapterInterface) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Adapter class '" . get_class($adapterName) . "' does not implement Zend_Queue_Adapter_AdapterInterface"); } @@ -324,12 +324,12 @@ public function getName() public function createQueue($name, $timeout = null) { if (!is_string($name)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$name is not a string'); } if ((null !== $timeout) && !is_integer($timeout)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$timeout must be an integer'); } @@ -378,7 +378,7 @@ public function deleteQueue() /** * @see Zend_Queue_Adapter_Null */ - require_once('Zend/Queue/Adapter/Null.php'); + ;// require_once('Zend/Queue/Adapter/Null.php'); $this->setAdapter(new Zend_Queue_Adapter_Null($this->getOptions())); return $deleted; @@ -439,12 +439,12 @@ public function count(): int public function receive($maxMessages=null, $timeout=null) { if (($maxMessages !== null) && !is_integer($maxMessages)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$maxMessages must be an integer or null'); } if (($timeout !== null) && !is_integer($timeout)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$timeout must be an integer or null'); } @@ -524,7 +524,7 @@ protected function _setName($name) /** * @see Zend_Queue_Exception */ - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("$name is not a string"); } diff --git a/library/Zend/Queue/Adapter/Activemq.php b/library/Zend/Queue/Adapter/Activemq.php index 5a59987d62..640a19f232 100644 --- a/library/Zend/Queue/Adapter/Activemq.php +++ b/library/Zend/Queue/Adapter/Activemq.php @@ -23,17 +23,17 @@ /** * @see Zend_Queue_Adapter_AdapterAbstract */ -require_once 'Zend/Queue/Adapter/AdapterAbstract.php'; +;// require_once 'Zend/Queue/Adapter/AdapterAbstract.php'; /** * @see Zend_Queue_Adapter_Stomp_Client */ -require_once 'Zend/Queue/Stomp/Client.php'; +;// require_once 'Zend/Queue/Stomp/Client.php'; /** * @see Zend_Queue_Adapter_Stomp_Frame */ -require_once 'Zend/Queue/Stomp/Frame.php'; +;// require_once 'Zend/Queue/Stomp/Frame.php'; /** * Class for using Stomp to talk to an Stomp compliant server @@ -103,7 +103,7 @@ public function __construct($options, Zend_Queue $queue = null) if ((false !== $response) && ($response->getCommand() != 'CONNECTED') ) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Unable to authenticate to '".$options['scheme'].'://'.$options['host'].':'.$options['port']."'"); } } @@ -132,7 +132,7 @@ public function __destruct() */ public function create($name, $timeout=null) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('create() is not supported in ' . get_class($this)); } @@ -145,7 +145,7 @@ public function create($name, $timeout=null) */ public function delete($name) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('delete() is not supported in ' . get_class($this)); } @@ -177,7 +177,7 @@ public function deleteMessage(Zend_Queue_Message $message) */ public function getQueues() { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('getQueues() is not supported in this adapter'); } @@ -253,7 +253,7 @@ public function receive($maxMessages=null, $timeout=null, Zend_Queue $queue=null break; default: $block = print_r($response, true); - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Invalid response received: ' . $block); } } @@ -269,7 +269,7 @@ public function receive($maxMessages=null, $timeout=null, Zend_Queue $queue=null $classname = $queue->getMessageSetClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } return new $classname($options); @@ -309,7 +309,7 @@ public function send($message, Zend_Queue $queue=null) $classname = $queue->getMessageClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } return new $classname($options); @@ -324,7 +324,7 @@ public function send($message, Zend_Queue $queue=null) */ public function count(Zend_Queue $queue=null) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('count() is not supported in this adapter'); } @@ -337,7 +337,7 @@ public function count(Zend_Queue $queue=null) */ public function isExists($name) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('isExists() is not supported in this adapter'); } diff --git a/library/Zend/Queue/Adapter/AdapterAbstract.php b/library/Zend/Queue/Adapter/AdapterAbstract.php index 1e9c73f709..d40ca646ae 100644 --- a/library/Zend/Queue/Adapter/AdapterAbstract.php +++ b/library/Zend/Queue/Adapter/AdapterAbstract.php @@ -23,12 +23,12 @@ /** * @see Zend_Queue */ -require_once 'Zend/Queue.php'; +;// require_once 'Zend/Queue.php'; /** * @see Zend_Queue_Adapter_AdapterInterface */ -require_once 'Zend/Queue/Adapter/AdapterInterface.php'; +;// require_once 'Zend/Queue/Adapter/AdapterInterface.php'; /** * Class for connecting to queues performing common operations. @@ -106,7 +106,7 @@ public function __construct($options, Zend_Queue $queue = null) * Verify that adapter parameters are in an array. */ if (!is_array($options)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Adapter options must be an array or Zend_Config object'); } @@ -121,7 +121,7 @@ public function __construct($options, Zend_Queue $queue = null) // Normalize the options and merge with the defaults if (array_key_exists('options', $options)) { if (!is_array($options['options'])) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Configuration array 'options' must be an array"); } diff --git a/library/Zend/Queue/Adapter/Array.php b/library/Zend/Queue/Adapter/Array.php index 23ea4157d1..65e1559f7d 100644 --- a/library/Zend/Queue/Adapter/Array.php +++ b/library/Zend/Queue/Adapter/Array.php @@ -23,7 +23,7 @@ /** * @see Zend_Queue_Adapter_AdapterAbstract */ -require_once 'Zend/Queue/Adapter/AdapterAbstract.php'; +;// require_once 'Zend/Queue/Adapter/AdapterAbstract.php'; /** * Class for using a standard PHP array as a queue @@ -146,7 +146,7 @@ public function count(Zend_Queue $queue=null) /** * @see Zend_Queue_Exception */ - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Queue does not exist'); } @@ -172,7 +172,7 @@ public function send($message, Zend_Queue $queue=null) } if (!$this->isExists($queue->getName())) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Queue does not exist:' . $queue->getName()); } @@ -196,7 +196,7 @@ public function send($message, Zend_Queue $queue=null) $classname = $queue->getMessageClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } return new $classname($options); @@ -255,7 +255,7 @@ public function receive($maxMessages = null, $timeout = null, Zend_Queue $queue $classname = $queue->getMessageSetClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } return new $classname($options); diff --git a/library/Zend/Queue/Adapter/Db.php b/library/Zend/Queue/Adapter/Db.php index 3658117b34..a15fe47ad6 100644 --- a/library/Zend/Queue/Adapter/Db.php +++ b/library/Zend/Queue/Adapter/Db.php @@ -23,27 +23,27 @@ /** * @see Zend_Queue_Adapter_AdapterAbstract */ -require_once 'Zend/Queue/Adapter/AdapterAbstract.php'; +;// require_once 'Zend/Queue/Adapter/AdapterAbstract.php'; /** * @see Zend_Db_Select */ -require_once 'Zend/Db/Select.php'; +;// require_once 'Zend/Db/Select.php'; /** * @see Zend_Db */ -require_once 'Zend/Db.php'; +;// require_once 'Zend/Db.php'; /** * @see Zend_Queue_Adapter_Db_Queue */ -require_once 'Zend/Queue/Adapter/Db/Queue.php'; +;// require_once 'Zend/Queue/Adapter/Db/Queue.php'; /** * @see Zend_Queue_Adapter_Db_Message */ -require_once 'Zend/Queue/Adapter/Db/Message.php'; +;// require_once 'Zend/Queue/Adapter/Db/Message.php'; /** * Class for using connecting to a Zend_Db-based queuing system @@ -88,7 +88,7 @@ public function __construct($options, Zend_Queue $queue = null) } if (!is_bool($this->_options['options'][Zend_Db_Select::FOR_UPDATE])) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Options array item: Zend_Db_Select::FOR_UPDATE must be boolean'); } @@ -121,27 +121,27 @@ protected function _initDbAdapter() { $options = &$this->_options['driverOptions']; if (!array_key_exists('type', $options)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Configuration array must have a key for 'type' for the database type to use"); } if (!array_key_exists('host', $options)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Configuration array must have a key for 'host' for the host to use"); } if (!array_key_exists('username', $options)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Configuration array must have a key for 'username' for the username to use"); } if (!array_key_exists('password', $options)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Configuration array must have a key for 'password' for the password to use"); } if (!array_key_exists('dbname', $options)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Configuration array must have a key for 'dbname' for the database to use"); } @@ -151,7 +151,7 @@ protected function _initDbAdapter() try { $db = Zend_Db::factory($type, $options); } catch (Zend_Db_Exception $e) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Error connecting to database: ' . $e->getMessage(), $e->getCode(), $e); } @@ -214,7 +214,7 @@ public function create($name, $timeout = null) return true; } } catch (Exception $e) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception($e->getMessage(), $e->getCode(), $e); } @@ -245,7 +245,7 @@ public function delete($name) try { $queue->delete(); } catch (Exception $e) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -334,7 +334,7 @@ public function send($message, Zend_Queue $queue = null) } if (!$this->isExists($queue->getName())) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Queue does not exist:' . $queue->getName()); } @@ -348,7 +348,7 @@ public function send($message, Zend_Queue $queue = null) try { $msg->save(); } catch (Exception $e) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception($e->getMessage(), $e->getCode(), $e); } @@ -359,7 +359,7 @@ public function send($message, Zend_Queue $queue = null) $classname = $queue->getMessageClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } return new $classname($options); @@ -433,7 +433,7 @@ public function receive($maxMessages = null, $timeout = null, Zend_Queue $queue } catch (Exception $e) { $db->rollBack(); - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception($e->getMessage(), $e->getCode(), $e); } @@ -445,7 +445,7 @@ public function receive($maxMessages = null, $timeout = null, Zend_Queue $queue $classname = $queue->getMessageSetClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } return new $classname($options); @@ -525,7 +525,7 @@ protected function getQueueId($name) $queue = $this->_queueTable->fetchRow($query); if ($queue === null) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Queue does not exist: ' . $name); } diff --git a/library/Zend/Queue/Adapter/Db/Message.php b/library/Zend/Queue/Adapter/Db/Message.php index 75da559946..647fb0d302 100644 --- a/library/Zend/Queue/Adapter/Db/Message.php +++ b/library/Zend/Queue/Adapter/Db/Message.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Table_Abstract */ -require_once 'Zend/Db/Table/Abstract.php'; +;// require_once 'Zend/Db/Table/Abstract.php'; /** * @category Zend diff --git a/library/Zend/Queue/Adapter/Db/Queue.php b/library/Zend/Queue/Adapter/Db/Queue.php index 99c33077ec..b93a528dc1 100644 --- a/library/Zend/Queue/Adapter/Db/Queue.php +++ b/library/Zend/Queue/Adapter/Db/Queue.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Table_Abstract */ -require_once 'Zend/Db/Table/Abstract.php'; +;// require_once 'Zend/Db/Table/Abstract.php'; /** * @category Zend diff --git a/library/Zend/Queue/Adapter/Memcacheq.php b/library/Zend/Queue/Adapter/Memcacheq.php index 9b4a0e9444..f8ee12f3bf 100644 --- a/library/Zend/Queue/Adapter/Memcacheq.php +++ b/library/Zend/Queue/Adapter/Memcacheq.php @@ -23,7 +23,7 @@ /** * @see Zend_Queue_Adapter_AdapterAbstract */ -require_once 'Zend/Queue/Adapter/AdapterAbstract.php'; +;// require_once 'Zend/Queue/Adapter/AdapterAbstract.php'; /** * Class for using connecting to a Zend_Cache-based queuing system @@ -74,7 +74,7 @@ class Zend_Queue_Adapter_Memcacheq extends Zend_Queue_Adapter_AdapterAbstract public function __construct($options, Zend_Queue $queue = null) { if (!extension_loaded('memcache')) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Memcache extension does not appear to be loaded'); } @@ -94,7 +94,7 @@ public function __construct($options, Zend_Queue $queue = null) $result = $this->_cache->connect($options['host'], $options['port']); if ($result === false) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Could not connect to MemcacheQ'); } @@ -233,7 +233,7 @@ public function getQueues() */ public function count(Zend_Queue $queue=null) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('count() is not supported in this adapter'); } @@ -256,7 +256,7 @@ public function send($message, Zend_Queue $queue=null) } if (!$this->isExists($queue->getName())) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Queue does not exist:' . $queue->getName()); } @@ -270,7 +270,7 @@ public function send($message, Zend_Queue $queue=null) $result = $this->_cache->set($queue->getName(), $message, 0, 0); if ($result === false) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('failed to insert message into queue:' . $queue->getName()); } @@ -281,7 +281,7 @@ public function send($message, Zend_Queue $queue=null) $classname = $queue->getMessageClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } return new $classname($options); @@ -329,7 +329,7 @@ public function receive($maxMessages=null, $timeout=null, Zend_Queue $queue=null $classname = $queue->getMessageSetClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } return new $classname($options); @@ -347,7 +347,7 @@ public function receive($maxMessages=null, $timeout=null, Zend_Queue $queue=null */ public function deleteMessage(Zend_Queue_Message $message) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('deleteMessage() is not supported in ' . get_class($this)); } @@ -401,7 +401,7 @@ protected function _sendCommand($command, array $terminator, $include_term=false $this->_socket = fsockopen($this->_host, $this->_port, $errno, $errstr, 10); } if ($this->_socket === false) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Could not open a connection to $this->_host:$this->_port errno=$errno : $errstr"); } diff --git a/library/Zend/Queue/Adapter/Null.php b/library/Zend/Queue/Adapter/Null.php index bf24f5be91..5bdd22d054 100644 --- a/library/Zend/Queue/Adapter/Null.php +++ b/library/Zend/Queue/Adapter/Null.php @@ -23,7 +23,7 @@ /** * @see Zend_Queue_Adapter_AdapterAbstract */ -require_once 'Zend/Queue/Adapter/AdapterAbstract.php'; +;// require_once 'Zend/Queue/Adapter/AdapterAbstract.php'; /** * Class testing. No supported functions. Also used to disable a Zend_Queue. @@ -59,7 +59,7 @@ public function __construct($options, Zend_Queue $queue = null) */ public function isExists($name) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this)); } @@ -71,7 +71,7 @@ public function isExists($name) */ public function create($name, $timeout=null) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this)); } @@ -82,7 +82,7 @@ public function create($name, $timeout=null) */ public function delete($name) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this)); } @@ -93,7 +93,7 @@ public function delete($name) */ public function getQueues() { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this)); } @@ -104,7 +104,7 @@ public function getQueues() */ public function count(Zend_Queue $queue=null) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this)); } @@ -119,7 +119,7 @@ public function count(Zend_Queue $queue=null) */ public function send($message, Zend_Queue $queue=null) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this)); } @@ -130,7 +130,7 @@ public function send($message, Zend_Queue $queue=null) */ public function receive($maxMessages=null, $timeout=null, Zend_Queue $queue=null) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this)); } @@ -141,7 +141,7 @@ public function receive($maxMessages=null, $timeout=null, Zend_Queue $queue=null */ public function deleteMessage(Zend_Queue_Message $message) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception(__FUNCTION__ . '() is not supported by ' . get_class($this)); } diff --git a/library/Zend/Queue/Adapter/PlatformJobQueue.php b/library/Zend/Queue/Adapter/PlatformJobQueue.php index 9ed8d2eea5..51c7ba9dfe 100644 --- a/library/Zend/Queue/Adapter/PlatformJobQueue.php +++ b/library/Zend/Queue/Adapter/PlatformJobQueue.php @@ -23,7 +23,7 @@ /** * @see Zend_Queue_Adapter_AdapterAbstract */ -require_once 'Zend/Queue/Adapter/AdapterAbstract.php'; +;// require_once 'Zend/Queue/Adapter/AdapterAbstract.php'; /** * Zend Platform JobQueue adapter @@ -53,34 +53,34 @@ public function __construct($options, Zend_Queue $queue = null) parent::__construct($options, $queue); if (!extension_loaded("jobqueue_client")) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Platform Job Queue extension does not appear to be loaded'); } if (! isset($this->_options['daemonOptions'])) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Job Queue host and password should be provided'); } $options = $this->_options['daemonOptions']; if (!array_key_exists('host', $options)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Platform Job Queue host should be provided'); } if (!array_key_exists('password', $options)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Platform Job Queue password should be provided'); } $this->_zendQueue = new ZendApi_Queue($options['host']); if (!$this->_zendQueue) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Platform Job Queue connection failed'); } if (!$this->_zendQueue->login($options['password'])) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Job Queue login failed'); } @@ -102,7 +102,7 @@ public function __construct($options, Zend_Queue $queue = null) */ public function isExists($name) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('isExists() is not supported in this adapter'); } @@ -116,7 +116,7 @@ public function isExists($name) */ public function create($name, $timeout=null) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('create() is not supported in ' . get_class($this)); } @@ -129,7 +129,7 @@ public function create($name, $timeout=null) */ public function delete($name) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('delete() is not supported in ' . get_class($this)); } @@ -141,7 +141,7 @@ public function delete($name) */ public function getQueues() { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('getQueues() is not supported in this adapter'); } @@ -154,7 +154,7 @@ public function getQueues() public function count(Zend_Queue $queue = null) { if ($queue !== null) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Queue parameter is not supported'); } @@ -176,14 +176,14 @@ public function count(Zend_Queue $queue = null) public function send($message, Zend_Queue $queue = null) { if ($queue !== null) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Queue parameter is not supported'); } // This adapter can work only for this message type $classname = $this->_queue->getMessageClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } @@ -199,7 +199,7 @@ public function send($message, Zend_Queue $queue = null) $jobId = $this->_zendQueue->addJob($platformJob); if (!$jobId) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Failed to add a job to queue: ' . $this->_zendQueue->getLastError()); } @@ -224,7 +224,7 @@ public function receive($maxMessages = null, $timeout = null, Zend_Queue $queue } if ($queue !== null) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Queue shouldn\'t be set'); } @@ -232,7 +232,7 @@ public function receive($maxMessages = null, $timeout = null, Zend_Queue $queue $classname = $this->_queue->getMessageClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } @@ -245,7 +245,7 @@ public function receive($maxMessages = null, $timeout = null, Zend_Queue $queue $classname = $this->_queue->getMessageSetClass(); if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } return new $classname($options); @@ -264,7 +264,7 @@ public function receive($maxMessages = null, $timeout = null, Zend_Queue $queue public function deleteMessage(Zend_Queue_Message $message) { if (get_class($message) != $this->_queue->getMessageClass()) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception( 'Failed to remove job from the queue; only messages of type ' . 'Zend_Queue_Message_PlatformJob may be used' @@ -332,11 +332,11 @@ public function __wakeup() $this->_zendQueue = new ZendApi_Queue($options['host']); if (!$this->_zendQueue) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Platform Job Queue connection failed'); } if (!$this->_zendQueue->login($options['password'])) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Job Queue login failed'); } } diff --git a/library/Zend/Queue/Exception.php b/library/Zend/Queue/Exception.php index cd0cbfa7f8..8dc958a2b5 100644 --- a/library/Zend/Queue/Exception.php +++ b/library/Zend/Queue/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/Zend/Queue/Message.php b/library/Zend/Queue/Message.php index 2201c253c8..a9c72a567b 100644 --- a/library/Zend/Queue/Message.php +++ b/library/Zend/Queue/Message.php @@ -79,7 +79,7 @@ public function __construct(array $options = array()) $result = get_class($options['queue']); } - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception( '$options[\'queue\'] = ' . $result @@ -89,7 +89,7 @@ public function __construct(array $options = array()) } if (isset($options['data'])) { if (!is_array($options['data'])) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Data must be an array'); } $this->_data = $options['data']; @@ -106,7 +106,7 @@ public function __construct(array $options = array()) public function __get($key) { if (!array_key_exists($key, $this->_data)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Specified field \"$key\" is not in the message"); } return $this->_data[$key]; @@ -123,7 +123,7 @@ public function __get($key) public function __set($key, $value) { if (!array_key_exists($key, $this->_data)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Specified field \"$key\" is not in the message"); } $this->_data[$key] = $value; diff --git a/library/Zend/Queue/Message/Iterator.php b/library/Zend/Queue/Message/Iterator.php index 6635a2d8e1..3e45828a81 100644 --- a/library/Zend/Queue/Message/Iterator.php +++ b/library/Zend/Queue/Message/Iterator.php @@ -93,14 +93,14 @@ public function __construct(array $options = array()) } if (!is_array($options['data'])) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('array optionsuration must have $options[\'data\'] = array'); } // load the message class $classname = $this->_messageClass; if (!class_exists($classname)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($classname); } diff --git a/library/Zend/Queue/Message/PlatformJob.php b/library/Zend/Queue/Message/PlatformJob.php index 4d4f6b2157..a9b4b84302 100644 --- a/library/Zend/Queue/Message/PlatformJob.php +++ b/library/Zend/Queue/Message/PlatformJob.php @@ -23,7 +23,7 @@ /** * @see Zend_Queue_Message */ -require_once 'Zend/Queue/Message.php'; +;// require_once 'Zend/Queue/Message.php'; /** * Class for managing Zend Platform JobQueue jobs via Zend_Queue @@ -68,7 +68,7 @@ public function __construct(array $options = array()) { if (isset($options['data'])) { if (!($options['data'] instanceof ZendApi_Job)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Data must be an instance of ZendApi_Job'); } $this->_job = $options['data']; @@ -77,7 +77,7 @@ public function __construct(array $options = array()) parent::__construct($options); if (!isset($options['script'])) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('The script is mandatory data'); } diff --git a/library/Zend/Queue/Stomp/Client.php b/library/Zend/Queue/Stomp/Client.php index 6fe3506229..1b23b0499d 100644 --- a/library/Zend/Queue/Stomp/Client.php +++ b/library/Zend/Queue/Stomp/Client.php @@ -88,7 +88,7 @@ public function __destruct() public function addConnection($scheme, $host, $port, $class = 'Zend_Queue_Stomp_Client_Connection') { if (!class_exists($class)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($class); } diff --git a/library/Zend/Queue/Stomp/Client/Connection.php b/library/Zend/Queue/Stomp/Client/Connection.php index cb76cb03f9..a71e435f06 100644 --- a/library/Zend/Queue/Stomp/Client/Connection.php +++ b/library/Zend/Queue/Stomp/Client/Connection.php @@ -23,7 +23,7 @@ /** * @see Zend_Queue_Stomp_Client_ConnectionInterface */ -require_once 'Zend/Queue/Stomp/Client/ConnectionInterface.php'; +;// require_once 'Zend/Queue/Stomp/Client/ConnectionInterface.php'; /** * The Stomp client interacts with a Stomp server. @@ -72,7 +72,7 @@ public function open($scheme, $host, $port, array $options = array()) if ($this->_socket === false) { // aparently there is some reason that fsockopen will return false // but it normally throws an error. - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception("Unable to connect to $str; error = $errstr ( errno = $errno )"); } @@ -136,7 +136,7 @@ public function close($destructor = false) public function ping() { if (!is_resource($this->_socket)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Not connected to Stomp server'); } return true; @@ -157,7 +157,7 @@ public function write(Zend_Queue_Stomp_FrameInterface $frame) $bytes = fwrite($this->_socket, $output, strlen($output)); if ($bytes === false || $bytes == 0) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('No bytes written'); } @@ -205,7 +205,7 @@ public function read() // check to make sure that the connection is not lost. if ($data === false) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Connection lost'); } @@ -264,14 +264,14 @@ public function createFrame() $class = $this->getFrameClass(); if (!class_exists($class)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($class); } $frame = new $class(); if (!$frame instanceof Zend_Queue_Stomp_FrameInterface) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('Invalid Frame class provided; must implement Zend_Queue_Stomp_FrameInterface'); } diff --git a/library/Zend/Queue/Stomp/Frame.php b/library/Zend/Queue/Stomp/Frame.php index 0b93dd49dd..1bab0cd254 100644 --- a/library/Zend/Queue/Stomp/Frame.php +++ b/library/Zend/Queue/Stomp/Frame.php @@ -23,7 +23,7 @@ /** * @see Zend_Queue_Stomp_FrameInterface */ -require_once 'Zend/Queue/Stomp/FrameInterface.php'; +;// require_once 'Zend/Queue/Stomp/FrameInterface.php'; /** * This class represents a Stomp Frame @@ -105,7 +105,7 @@ public function getAutoContentLength() public function setAutoContentLength($auto) { if (!is_bool($auto)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$auto is not a boolean'); } @@ -151,12 +151,12 @@ public function setHeaders(array $headers) */ public function setHeader($header, $value) { if (!is_string($header)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$header is not a string: ' . print_r($header, true)); } if (!is_scalar($value)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$value is not a string: ' . print_r($value, true)); } @@ -177,7 +177,7 @@ public function setHeader($header, $value) { public function getHeader($header) { if (!is_string($header)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$header is not a string'); } @@ -212,7 +212,7 @@ public function getBody() public function setBody($body) { if (!is_string($body) && $body !== null) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$body is not a string or null'); } @@ -244,7 +244,7 @@ public function getCommand() public function setCommand($command) { if (!is_string($command) && $command !== null) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$command is not a string or null'); } @@ -261,7 +261,7 @@ public function setCommand($command) public function toFrame() { if ($this->getCommand() === false) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('You must set the command'); } @@ -319,7 +319,7 @@ public function __toString() public function fromFrame($frame) { if (!is_string($frame)) { - require_once 'Zend/Queue/Exception.php'; + ;// require_once 'Zend/Queue/Exception.php'; throw new Zend_Queue_Exception('$frame is not a string'); } diff --git a/library/Zend/Reflection/Class.php b/library/Zend/Reflection/Class.php index 22ecd48ffe..fcf914e416 100644 --- a/library/Zend/Reflection/Class.php +++ b/library/Zend/Reflection/Class.php @@ -22,17 +22,17 @@ /** * @see Zend_Reflection_Property */ -require_once 'Zend/Reflection/Property.php'; +;// require_once 'Zend/Reflection/Property.php'; /** * @see Zend_Reflection_Method */ -require_once 'Zend/Reflection/Method.php'; +;// require_once 'Zend/Reflection/Method.php'; /** * Zend_Reflection_Docblock */ -require_once 'Zend/Reflection/Docblock.php'; +;// require_once 'Zend/Reflection/Docblock.php'; /** * @category Zend @@ -51,7 +51,7 @@ public function getDeclaringFile($reflectionClass = 'Zend_Reflection_File') { $instance = new $reflectionClass($this->getFileName()); if (!$instance instanceof Zend_Reflection_File) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_File'); } return $instance; @@ -67,13 +67,13 @@ public function getDeclaringFile($reflectionClass = 'Zend_Reflection_File') public function getDocblock($reflectionClass = 'Zend_Reflection_Docblock') { if ('' == $this->getDocComment()) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception($this->getName() . ' does not have a docblock'); } $instance = new $reflectionClass($this); if (!$instance instanceof Zend_Reflection_Docblock) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Docblock'); } return $instance; @@ -125,7 +125,7 @@ public function getInterfaces($reflectionClass = 'Zend_Reflection_Class'): array while ($phpReflections && ($phpReflection = array_shift($phpReflections))) { $instance = new $reflectionClass($phpReflection->getName()); if (!$instance instanceof Zend_Reflection_Class) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Class'); } $zendReflections[] = $instance; @@ -148,7 +148,7 @@ public function getMethod($name, $reflectionClass = 'Zend_Reflection_Method'): Z $zendReflection = new $reflectionClass($this->getName(), $phpReflection->getName()); if (!$zendReflection instanceof Zend_Reflection_Method) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Method'); } @@ -170,7 +170,7 @@ public function getMethods($filter = -1, $reflectionClass = 'Zend_Reflection_Met while ($phpReflections && ($phpReflection = array_shift($phpReflections))) { $instance = new $reflectionClass($this->getName(), $phpReflection->getName()); if (!$instance instanceof Zend_Reflection_Method) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Method'); } $zendReflections[] = $instance; @@ -192,7 +192,7 @@ public function getParentClass($reflectionClass = 'Zend_Reflection_Class'): Zend if ($phpReflection) { $zendReflection = new $reflectionClass($phpReflection->getName()); if (!$zendReflection instanceof Zend_Reflection_Class) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Class'); } unset($phpReflection); @@ -214,7 +214,7 @@ public function getProperty($name, $reflectionClass = 'Zend_Reflection_Property' $phpReflection = parent::getProperty($name); $zendReflection = new $reflectionClass($this->getName(), $phpReflection->getName()); if (!$zendReflection instanceof Zend_Reflection_Property) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Property'); } unset($phpReflection); @@ -235,7 +235,7 @@ public function getProperties($filter = -1, $reflectionClass = 'Zend_Reflection_ while ($phpReflections && ($phpReflection = array_shift($phpReflections))) { $instance = new $reflectionClass($this->getName(), $phpReflection->getName()); if (!$instance instanceof Zend_Reflection_Property) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Property'); } $zendReflections[] = $instance; diff --git a/library/Zend/Reflection/Docblock.php b/library/Zend/Reflection/Docblock.php index afe434c6b2..7ca3bb2bf7 100644 --- a/library/Zend/Reflection/Docblock.php +++ b/library/Zend/Reflection/Docblock.php @@ -22,7 +22,7 @@ /** * @see Zend_Reflection_Docblock_Tag */ -require_once 'Zend/Reflection/Docblock/Tag.php'; +;// require_once 'Zend/Reflection/Docblock/Tag.php'; /** * @category Zend @@ -115,7 +115,7 @@ public function __construct($commentOrReflector) if ($commentOrReflector instanceof Reflector) { $this->_reflector = $commentOrReflector; if (!method_exists($commentOrReflector, 'getDocComment')) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Reflector must contain method "getDocComment"'); } $docComment = $commentOrReflector->getDocComment(); @@ -128,12 +128,12 @@ public function __construct($commentOrReflector) } elseif (is_string($commentOrReflector)) { $docComment = $commentOrReflector; } else { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception(get_class($this) . ' must have a (string) DocComment or a Reflector in the constructor'); } if ($docComment == '') { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('DocComment cannot be empty'); } diff --git a/library/Zend/Reflection/Docblock/Tag.php b/library/Zend/Reflection/Docblock/Tag.php index 0dd3383ac1..6511584f8f 100644 --- a/library/Zend/Reflection/Docblock/Tag.php +++ b/library/Zend/Reflection/Docblock/Tag.php @@ -20,7 +20,7 @@ */ /** Zend_Loader */ -require_once 'Zend/Loader.php'; +;// require_once 'Zend/Loader.php'; /** * @category Zend @@ -59,7 +59,7 @@ public static function factory($tagDocblockLine) $matches = array(); if (!preg_match('#^@(\w+)(\s|$)#', $tagDocblockLine, $matches)) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('No valid tag name found within provided docblock line.'); } @@ -113,7 +113,7 @@ public function __construct($tagDocblockLine) // find the line if (!preg_match('#^@(\w+)(?:\s+([^\s].*)|$)?#', $tagDocblockLine, $matches)) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Provided docblock line does not contain a valid tag'); } diff --git a/library/Zend/Reflection/Docblock/Tag/Param.php b/library/Zend/Reflection/Docblock/Tag/Param.php index 2682e6b4b9..704c619990 100644 --- a/library/Zend/Reflection/Docblock/Tag/Param.php +++ b/library/Zend/Reflection/Docblock/Tag/Param.php @@ -20,7 +20,7 @@ */ /** Zend_Reflection_Docblock_Tag */ -require_once 'Zend/Reflection/Docblock/Tag.php'; +;// require_once 'Zend/Reflection/Docblock/Tag.php'; /** * @category Zend @@ -50,12 +50,12 @@ public function __construct($tagDocblockLine) $matches = array(); if (!preg_match('#^@(\w+)\s+([^\s]+)(?:\s+(\$\S+))?(?:\s+(.*))?#s', $tagDocblockLine, $matches)) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Provided docblock line is does not contain a valid tag'); } if ($matches[1] != 'param') { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Provided docblock line is does not contain a valid @param tag'); } diff --git a/library/Zend/Reflection/Docblock/Tag/Return.php b/library/Zend/Reflection/Docblock/Tag/Return.php index 3be218d0ac..4645408a33 100644 --- a/library/Zend/Reflection/Docblock/Tag/Return.php +++ b/library/Zend/Reflection/Docblock/Tag/Return.php @@ -20,7 +20,7 @@ */ /** Zend_Reflection_Docblock_Tag */ -require_once 'Zend/Reflection/Docblock/Tag.php'; +;// require_once 'Zend/Reflection/Docblock/Tag.php'; /** * @category Zend @@ -44,12 +44,12 @@ class Zend_Reflection_Docblock_Tag_Return extends Zend_Reflection_Docblock_Tag public function __construct($tagDocblockLine) { if (!preg_match('#^@(\w+)\s+([^\s]+)(?:\s+(.*))?#', $tagDocblockLine, $matches)) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Provided docblock line is does not contain a valid tag'); } if ($matches[1] != 'return') { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Provided docblock line is does not contain a valid @return tag'); } diff --git a/library/Zend/Reflection/Exception.php b/library/Zend/Reflection/Exception.php index e31dc2357b..9c83e99b1c 100644 --- a/library/Zend/Reflection/Exception.php +++ b/library/Zend/Reflection/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/Zend/Reflection/Extension.php b/library/Zend/Reflection/Extension.php index 343f94379b..4abf13a01c 100644 --- a/library/Zend/Reflection/Extension.php +++ b/library/Zend/Reflection/Extension.php @@ -22,12 +22,12 @@ /** * @see Zend_Reflection_Class */ -require_once 'Zend/Reflection/Class.php'; +;// require_once 'Zend/Reflection/Class.php'; /** * @see Zend_Reflection_Function */ -require_once 'Zend/Reflection/Function.php'; +;// require_once 'Zend/Reflection/Function.php'; /** * @category Zend @@ -50,7 +50,7 @@ public function getFunctions($reflectionClass = 'Zend_Reflection_Function'): arr while ($phpReflections && ($phpReflection = array_shift($phpReflections))) { $instance = new $reflectionClass($phpReflection->getName()); if (!$instance instanceof Zend_Reflection_Function) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Function'); } $zendReflections[] = $instance; @@ -73,7 +73,7 @@ public function getClasses($reflectionClass = 'Zend_Reflection_Class'): array while ($phpReflections && ($phpReflection = array_shift($phpReflections))) { $instance = new $reflectionClass($phpReflection->getName()); if (!$instance instanceof Zend_Reflection_Class) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class'); } $zendReflections[] = $instance; diff --git a/library/Zend/Reflection/File.php b/library/Zend/Reflection/File.php index 3e1b21c57d..cd9865fcff 100644 --- a/library/Zend/Reflection/File.php +++ b/library/Zend/Reflection/File.php @@ -22,12 +22,12 @@ /** * @see Zend_Reflection_Class */ -require_once 'Zend/Reflection/Class.php'; +;// require_once 'Zend/Reflection/Class.php'; /** * @see Zend_Reflection_Function */ -require_once 'Zend/Reflection/Function.php'; +;// require_once 'Zend/Reflection/Function.php'; /** * @category Zend @@ -101,7 +101,7 @@ public function __construct($file) } if (!$fileRealpath || !in_array($fileRealpath, get_included_files())) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('File ' . $file . ' must be required before it can be reflected'); } @@ -118,7 +118,7 @@ public function __construct($file) */ public static function findRealpathInIncludePath($fileName) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; $includePaths = Zend_Loader::explodeIncludePath(); while (count($includePaths) > 0) { $filePath = array_shift($includePaths) . DIRECTORY_SEPARATOR . $fileName; @@ -194,7 +194,7 @@ public function getDocblock($reflectionClass = 'Zend_Reflection_Docblock') { $instance = new $reflectionClass($this); if (!$instance instanceof Zend_Reflection_Docblock) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class specified; must extend Zend_Reflection_Docblock'); } return $instance; @@ -212,7 +212,7 @@ public function getClasses($reflectionClass = 'Zend_Reflection_Class') foreach ($this->_classes as $class) { $instance = new $reflectionClass($class); if (!$instance instanceof Zend_Reflection_Class) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class'); } $classes[] = $instance; @@ -232,7 +232,7 @@ public function getFunctions($reflectionClass = 'Zend_Reflection_Function') foreach ($this->_functions as $function) { $instance = new $reflectionClass($function); if (!$instance instanceof Zend_Reflection_Function) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Function'); } $functions[] = $instance; @@ -255,7 +255,7 @@ public function getClass($name = null, $reflectionClass = 'Zend_Reflection_Class $selected = current($this->_classes); $instance = new $reflectionClass($selected); if (!$instance instanceof Zend_Reflection_Class) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class given; must extend Zend_Reflection_Class'); } return $instance; @@ -264,13 +264,13 @@ public function getClass($name = null, $reflectionClass = 'Zend_Reflection_Class if (in_array($name, $this->_classes)) { $instance = new $reflectionClass($name); if (!$instance instanceof Zend_Reflection_Class) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class given; must extend Zend_Reflection_Class'); } return $instance; } - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Class by name ' . $name . ' not found.'); } diff --git a/library/Zend/Reflection/Function.php b/library/Zend/Reflection/Function.php index b4ac99e9de..925c44ed8c 100644 --- a/library/Zend/Reflection/Function.php +++ b/library/Zend/Reflection/Function.php @@ -22,7 +22,7 @@ /** * @see Zend_Reflection_Parameter */ -require_once 'Zend/Reflection/Parameter.php'; +;// require_once 'Zend/Reflection/Parameter.php'; /** * @category Zend @@ -41,12 +41,12 @@ class Zend_Reflection_Function extends ReflectionFunction public function getDocblock($reflectionClass = 'Zend_Reflection_Docblock') { if ('' == ($comment = $this->getDocComment())) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception($this->getName() . ' does not have a docblock'); } $instance = new $reflectionClass($comment); if (!$instance instanceof Zend_Reflection_Docblock) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Docblock'); } return $instance; @@ -100,7 +100,7 @@ public function getParameters($reflectionClass = 'Zend_Reflection_Parameter'): a while ($phpReflections && ($phpReflection = array_shift($phpReflections))) { $instance = new $reflectionClass($this->getName(), $phpReflection->getName()); if (!$instance instanceof Zend_Reflection_Parameter) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Parameter'); } $zendReflections[] = $instance; @@ -119,7 +119,7 @@ public function getReturn() { $docblock = $this->getDocblock(); if (!$docblock->hasTag('return')) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Function does not specify an @return annotation tag; cannot determine return type'); } $tag = $docblock->getTag('return'); diff --git a/library/Zend/Reflection/Method.php b/library/Zend/Reflection/Method.php index 99e551c74c..7c9c793d6e 100644 --- a/library/Zend/Reflection/Method.php +++ b/library/Zend/Reflection/Method.php @@ -22,17 +22,17 @@ /** * @see Zend_Reflection_Class */ -require_once 'Zend/Reflection/Class.php'; +;// require_once 'Zend/Reflection/Class.php'; /** * @see Zend_Reflection_Docblock */ -require_once 'Zend/Reflection/Docblock.php'; +;// require_once 'Zend/Reflection/Docblock.php'; /** * @see Zend_Reflection_Parameter */ -require_once 'Zend/Reflection/Parameter.php'; +;// require_once 'Zend/Reflection/Parameter.php'; /** * @category Zend @@ -51,13 +51,13 @@ class Zend_Reflection_Method extends ReflectionMethod public function getDocblock($reflectionClass = 'Zend_Reflection_Docblock') { if ('' == $this->getDocComment()) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception($this->getName() . ' does not have a docblock'); } $instance = new $reflectionClass($this); if (!$instance instanceof Zend_Reflection_Docblock) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Docblock'); } return $instance; @@ -91,7 +91,7 @@ public function getDeclaringClass($reflectionClass = 'Zend_Reflection_Class'): Z $phpReflection = parent::getDeclaringClass(); $zendReflection = new $reflectionClass($phpReflection->getName()); if (!$zendReflection instanceof Zend_Reflection_Class) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class'); } unset($phpReflection); @@ -111,7 +111,7 @@ public function getParameters($reflectionClass = 'Zend_Reflection_Parameter'): a while ($phpReflections && ($phpReflection = array_shift($phpReflections))) { $instance = new $reflectionClass(array($this->getDeclaringClass()->getName(), $this->getName()), $phpReflection->getName()); if (!$instance instanceof Zend_Reflection_Parameter) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Parameter'); } $zendReflections[] = $instance; diff --git a/library/Zend/Reflection/Parameter.php b/library/Zend/Reflection/Parameter.php index f6b9fe4bc7..009136fafe 100644 --- a/library/Zend/Reflection/Parameter.php +++ b/library/Zend/Reflection/Parameter.php @@ -43,7 +43,7 @@ public function getDeclaringClass($reflectionClass = 'Zend_Reflection_Class'): Z $phpReflection = parent::getDeclaringClass(); $zendReflection = new $reflectionClass($phpReflection->getName()); if (!$zendReflection instanceof Zend_Reflection_Class) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class'); } unset($phpReflection); @@ -65,7 +65,7 @@ public function getClass($reflectionClass = 'Zend_Reflection_Class'): ?Zend_Refl $zendReflection = new $reflectionClass($phpReflection->getName()); if (!$zendReflection instanceof Zend_Reflection_Class) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class'); } unset($phpReflection); @@ -95,7 +95,7 @@ public function getDeclaringFunction($reflectionClass = null): Zend_Reflection_F $zendReflection = new $reflectionClass($phpReflection->getName()); } if (!$zendReflection instanceof $baseClass) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend ' . $baseClass); } unset($phpReflection); diff --git a/library/Zend/Reflection/Property.php b/library/Zend/Reflection/Property.php index 7a330b068a..a1a23adcd4 100644 --- a/library/Zend/Reflection/Property.php +++ b/library/Zend/Reflection/Property.php @@ -38,7 +38,7 @@ public function getDeclaringClass($reflectionClass = 'Zend_Reflection_Class'): Z $phpReflection = parent::getDeclaringClass(); $zendReflection = new $reflectionClass($phpReflection->getName()); if (!$zendReflection instanceof Zend_Reflection_Class) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Class'); } unset($phpReflection); @@ -61,7 +61,7 @@ public function getDocComment($reflectionClass = 'Zend_Reflection_Docblock'): Ze $r = new $reflectionClass($docblock); if (!$r instanceof Zend_Reflection_Docblock) { - require_once 'Zend/Reflection/Exception.php'; + ;// require_once 'Zend/Reflection/Exception.php'; throw new Zend_Reflection_Exception('Invalid reflection class provided; must extend Zend_Reflection_Docblock'); } return $r; diff --git a/library/Zend/Registry.php b/library/Zend/Registry.php index 4a15a4d18f..2a4c266cb7 100644 --- a/library/Zend/Registry.php +++ b/library/Zend/Registry.php @@ -66,7 +66,7 @@ public static function getInstance() public static function setInstance(Zend_Registry $registry) { if (self::$_registry !== null) { - require_once 'Zend/Exception.php'; + ;// require_once 'Zend/Exception.php'; throw new Zend_Exception('Registry is already initialized'); } @@ -97,12 +97,12 @@ protected static function init() public static function setClassName($registryClassName = 'Zend_Registry') { if (self::$_registry !== null) { - require_once 'Zend/Exception.php'; + ;// require_once 'Zend/Exception.php'; throw new Zend_Exception('Registry is already initialized'); } if (!is_string($registryClassName)) { - require_once 'Zend/Exception.php'; + ;// require_once 'Zend/Exception.php'; throw new Zend_Exception("Argument is not a class name"); } @@ -110,7 +110,7 @@ public static function setClassName($registryClassName = 'Zend_Registry') * @see Zend_Loader */ if (!class_exists($registryClassName)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($registryClassName); } @@ -143,7 +143,7 @@ public static function get($index) $instance = self::getInstance(); if (!$instance->offsetExists($index)) { - require_once 'Zend/Exception.php'; + ;// require_once 'Zend/Exception.php'; throw new Zend_Exception("No entry is registered for key '$index'"); } diff --git a/library/Zend/Rest/Client.php b/library/Zend/Rest/Client.php index a96edf310e..adcf6a0dac 100644 --- a/library/Zend/Rest/Client.php +++ b/library/Zend/Rest/Client.php @@ -22,13 +22,13 @@ /** Zend_Service_Abstract */ -require_once 'Zend/Service/Abstract.php'; +;// require_once 'Zend/Service/Abstract.php'; /** Zend_Rest_Client_Result */ -require_once 'Zend/Rest/Client/Result.php'; +;// require_once 'Zend/Rest/Client/Result.php'; /** Zend_Uri */ -require_once 'Zend/Uri.php'; +;// require_once 'Zend/Uri.php'; /** * @category Zend @@ -109,7 +109,7 @@ private function _prepareRest($path) { // Get the URI object and configure it if (!$this->_uri instanceof Zend_Uri_Http) { - require_once 'Zend/Rest/Client/Exception.php'; + ;// require_once 'Zend/Rest/Client/Exception.php'; throw new Zend_Rest_Client_Exception('URI object must be set before performing call'); } diff --git a/library/Zend/Rest/Client/Exception.php b/library/Zend/Rest/Client/Exception.php index b9a3245fe2..78ad4a0157 100644 --- a/library/Zend/Rest/Client/Exception.php +++ b/library/Zend/Rest/Client/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Rest_Exception */ -require_once 'Zend/Rest/Exception.php'; +;// require_once 'Zend/Rest/Exception.php'; /** diff --git a/library/Zend/Rest/Client/Result.php b/library/Zend/Rest/Client/Result.php index 7f362bb320..f83339c8e6 100644 --- a/library/Zend/Rest/Client/Result.php +++ b/library/Zend/Rest/Client/Result.php @@ -20,7 +20,7 @@ * @version $Id$ */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** * @category Zend @@ -59,7 +59,7 @@ public function __construct($data) $message = "REST Response Error: " . $this->_errstr; $this->_errstr = null; } - require_once "Zend/Rest/Client/Result/Exception.php"; + ;// require_once "Zend/Rest/Client/Result/Exception.php"; throw new Zend_Rest_Client_Result_Exception($message); } } diff --git a/library/Zend/Rest/Client/Result/Exception.php b/library/Zend/Rest/Client/Result/Exception.php index a027f496f5..18d707fab8 100644 --- a/library/Zend/Rest/Client/Result/Exception.php +++ b/library/Zend/Rest/Client/Result/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Rest_Client_Exception */ -require_once "Zend/Rest/Client/Exception.php"; +;// require_once "Zend/Rest/Client/Exception.php"; /** * Zend_Rest_Client_Result_Exception diff --git a/library/Zend/Rest/Controller.php b/library/Zend/Rest/Controller.php index e67bed3a20..49f86dbeab 100644 --- a/library/Zend/Rest/Controller.php +++ b/library/Zend/Rest/Controller.php @@ -20,7 +20,7 @@ */ /** Zend_Controller_Action */ -require_once 'Zend/Controller/Action.php'; +;// require_once 'Zend/Controller/Action.php'; /** * An abstract class to guide implementation of action controllers for use with diff --git a/library/Zend/Rest/Exception.php b/library/Zend/Rest/Exception.php index 94403938de..882229c661 100644 --- a/library/Zend/Rest/Exception.php +++ b/library/Zend/Rest/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** diff --git a/library/Zend/Rest/Route.php b/library/Zend/Rest/Route.php index 6e23ac2c7d..19a9ca6e15 100644 --- a/library/Zend/Rest/Route.php +++ b/library/Zend/Rest/Route.php @@ -22,22 +22,22 @@ /** * @see Zend_Controller_Router_Route_Interface */ -require_once 'Zend/Controller/Router/Route/Interface.php'; +;// require_once 'Zend/Controller/Router/Route/Interface.php'; /** * @see Zend_Controller_Router_Route_Module */ -require_once 'Zend/Controller/Router/Route/Module.php'; +;// require_once 'Zend/Controller/Router/Route/Module.php'; /** * @see Zend_Controller_Dispatcher_Interface */ -require_once 'Zend/Controller/Dispatcher/Interface.php'; +;// require_once 'Zend/Controller/Dispatcher/Interface.php'; /** * @see Zend_Controller_Request_Abstract */ -require_once 'Zend/Controller/Request/Abstract.php'; +;// require_once 'Zend/Controller/Request/Abstract.php'; /** * Rest Route diff --git a/library/Zend/Rest/Server.php b/library/Zend/Rest/Server.php index 26f6c50371..b4b9a2ff01 100644 --- a/library/Zend/Rest/Server.php +++ b/library/Zend/Rest/Server.php @@ -23,17 +23,17 @@ /** * @see Zend_Server_Interface */ -require_once 'Zend/Server/Interface.php'; +;// require_once 'Zend/Server/Interface.php'; /** * @see Zend_Server_Reflection */ -require_once 'Zend/Server/Reflection.php'; +;// require_once 'Zend/Server/Reflection.php'; /** * @see Zend_Server_Abstract */ -require_once 'Zend/Server/Abstract.php'; +;// require_once 'Zend/Server/Abstract.php'; /** * @category Zend @@ -228,7 +228,7 @@ public function handle($request = false) $result = false; if (count($callingArgs) < count($funcArgs)) { - require_once 'Zend/Rest/Server/Exception.php'; + ;// require_once 'Zend/Rest/Server/Exception.php'; $result = $this->fault( new Zend_Rest_Server_Exception( 'Invalid Method Call to ' . $this->_method @@ -271,7 +271,7 @@ public function handle($request = false) } } } else { - require_once "Zend/Rest/Server/Exception.php"; + ;// require_once "Zend/Rest/Server/Exception.php"; $result = $this->fault( new Zend_Rest_Server_Exception( "Unknown Method '$this->_method'." @@ -280,7 +280,7 @@ public function handle($request = false) ); } } else { - require_once "Zend/Rest/Server/Exception.php"; + ;// require_once "Zend/Rest/Server/Exception.php"; $result = $this->fault( new Zend_Rest_Server_Exception( "Unknown Method '$this->_method'." @@ -289,7 +289,7 @@ public function handle($request = false) ); } } else { - require_once "Zend/Rest/Server/Exception.php"; + ;// require_once "Zend/Rest/Server/Exception.php"; $result = $this->fault( new Zend_Rest_Server_Exception("No Method Specified."), 404 @@ -574,7 +574,7 @@ public function addFunction($function, $namespace = '') if (is_callable($func) && !in_array($func, self::$magicMethods)) { $this->_functions[$func] = $this->_reflection->reflectFunction($func); } else { - require_once 'Zend/Rest/Server/Exception.php'; + ;// require_once 'Zend/Rest/Server/Exception.php'; throw new Zend_Rest_Server_Exception( "Invalid Method Added to Service." ); @@ -652,7 +652,7 @@ protected function _callObjectMethod($class, array $args) $object = $this->_functions[$this->_method]->getDeclaringClass()->newInstance(); } } catch (Exception $e) { - require_once 'Zend/Rest/Server/Exception.php'; + ;// require_once 'Zend/Rest/Server/Exception.php'; throw new Zend_Rest_Server_Exception( 'Error instantiating class ' . $class . ' to invoke method ' diff --git a/library/Zend/Rest/Server/Exception.php b/library/Zend/Rest/Server/Exception.php index 98517b8e7b..2d2d340313 100644 --- a/library/Zend/Rest/Server/Exception.php +++ b/library/Zend/Rest/Server/Exception.php @@ -24,7 +24,7 @@ /** * Zend_Rest_Exception */ -require_once 'Zend/Rest/Exception.php'; +;// require_once 'Zend/Rest/Exception.php'; /** diff --git a/library/Zend/Serializer.php b/library/Zend/Serializer.php index be7b078e4f..dffcd7be9d 100644 --- a/library/Zend/Serializer.php +++ b/library/Zend/Serializer.php @@ -20,7 +20,7 @@ */ /** @see Zend_Loader_PluginLoader */ -require_once 'Zend/Loader/PluginLoader.php'; +;// require_once 'Zend/Loader/PluginLoader.php'; /** * @category Zend @@ -61,14 +61,14 @@ public static function factory($adapterName, $opts = array()) try { $adapterClass = $adapterLoader->load($adapterName); } catch (Exception $e) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Can\'t load serializer adapter "'.$adapterName.'"', 0, $e); } // ZF-8842: // check that the loaded class implements Zend_Serializer_Adapter_AdapterInterface without execute code if (!in_array('Zend_Serializer_Adapter_AdapterInterface', class_implements($adapterClass))) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('The serializer adapter class "'.$adapterClass.'" must implement Zend_Serializer_Adapter_AdapterInterface'); } diff --git a/library/Zend/Serializer/Adapter/AdapterAbstract.php b/library/Zend/Serializer/Adapter/AdapterAbstract.php index 1901d5bce4..9551c9882a 100644 --- a/library/Zend/Serializer/Adapter/AdapterAbstract.php +++ b/library/Zend/Serializer/Adapter/AdapterAbstract.php @@ -21,7 +21,7 @@ */ /** @see Zend_Serializer_Adapter_AdapterInterface */ -require_once 'Zend/Serializer/Adapter/AdapterInterface.php'; +;// require_once 'Zend/Serializer/Adapter/AdapterInterface.php'; /** * @category Zend @@ -103,7 +103,7 @@ public function getOption($name) { $name = (string) $name; if (!array_key_exists($name, $this->_options)) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Unknown option name "'.$name.'"'); } diff --git a/library/Zend/Serializer/Adapter/Amf0.php b/library/Zend/Serializer/Adapter/Amf0.php index 86423156d6..fca312afcd 100644 --- a/library/Zend/Serializer/Adapter/Amf0.php +++ b/library/Zend/Serializer/Adapter/Amf0.php @@ -21,19 +21,19 @@ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ -require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; +;// require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; /** @see Zend_Amf_Parse_OutputStream */ -require_once 'Zend/Amf/Parse/OutputStream.php'; +;// require_once 'Zend/Amf/Parse/OutputStream.php'; /** @see Zend_Amf_Parse_Amf0_Serializer */ -require_once 'Zend/Amf/Parse/Amf0/Serializer.php'; +;// require_once 'Zend/Amf/Parse/Amf0/Serializer.php'; /** @see Zend_Amf_Parse_InputStream */ -require_once 'Zend/Amf/Parse/InputStream.php'; +;// require_once 'Zend/Amf/Parse/InputStream.php'; /** @see Zend_Amf_Parse_Amf0_Deserializer */ -require_once 'Zend/Amf/Parse/Amf0/Deserializer.php'; +;// require_once 'Zend/Amf/Parse/Amf0/Deserializer.php'; /** * @category Zend @@ -60,7 +60,7 @@ public function serialize($value, array $opts = array()) $serializer->writeTypeMarker($value); return $stream->getStream(); } catch (Exception $e) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Serialization failed by previous error', 0, $e); } } @@ -80,7 +80,7 @@ public function unserialize($value, array $opts = array()) $deserializer = new Zend_Amf_Parse_Amf0_Deserializer($stream); return $deserializer->readTypeMarker(); } catch (Exception $e) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Unserialization failed by previous error', 0, $e); } } diff --git a/library/Zend/Serializer/Adapter/Amf3.php b/library/Zend/Serializer/Adapter/Amf3.php index 0ecfdbc8f9..3b1cf97656 100644 --- a/library/Zend/Serializer/Adapter/Amf3.php +++ b/library/Zend/Serializer/Adapter/Amf3.php @@ -21,19 +21,19 @@ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ -require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; +;// require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; /** @see Zend_Amf_Parse_OutputStream */ -require_once 'Zend/Amf/Parse/OutputStream.php'; +;// require_once 'Zend/Amf/Parse/OutputStream.php'; /** @see Zend_Amf_Parse_Amf3_Serializer */ -require_once 'Zend/Amf/Parse/Amf3/Serializer.php'; +;// require_once 'Zend/Amf/Parse/Amf3/Serializer.php'; /** @see Zend_Amf_Parse_InputStream */ -require_once 'Zend/Amf/Parse/InputStream.php'; +;// require_once 'Zend/Amf/Parse/InputStream.php'; /** @see Zend_Amf_Parse_Amf3_Deserializer */ -require_once 'Zend/Amf/Parse/Amf3/Deserializer.php'; +;// require_once 'Zend/Amf/Parse/Amf3/Deserializer.php'; /** * @category Zend @@ -60,7 +60,7 @@ public function serialize($value, array $opts = array()) $serializer->writeTypeMarker($value); return $stream->getStream(); } catch (Exception $e) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Serialization failed by previous error', 0, $e); } } @@ -80,7 +80,7 @@ public function unserialize($value, array $opts = array()) $deserializer = new Zend_Amf_Parse_Amf3_Deserializer($stream); return $deserializer->readTypeMarker(); } catch (Exception $e) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Unserialization failed by previous error', 0, $e); } } diff --git a/library/Zend/Serializer/Adapter/Igbinary.php b/library/Zend/Serializer/Adapter/Igbinary.php index b13b5a2538..84ff89b158 100644 --- a/library/Zend/Serializer/Adapter/Igbinary.php +++ b/library/Zend/Serializer/Adapter/Igbinary.php @@ -21,7 +21,7 @@ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ -require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; +;// require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; /** * @category Zend @@ -47,7 +47,7 @@ class Zend_Serializer_Adapter_Igbinary extends Zend_Serializer_Adapter_AdapterAb public function __construct($opts = array()) { if (!extension_loaded('igbinary')) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('PHP extension "igbinary" is required for this adapter'); } @@ -71,7 +71,7 @@ public function serialize($value, array $opts = array()) $ret = igbinary_serialize($value); if ($ret === false) { $lastErr = error_get_last(); - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception($lastErr['message']); } return $ret; @@ -90,7 +90,7 @@ public function unserialize($serialized, array $opts = array()) $ret = igbinary_unserialize($serialized); if ($ret === null && $serialized !== self::$_serializedNull) { $lastErr = error_get_last(); - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception($lastErr['message']); } return $ret; diff --git a/library/Zend/Serializer/Adapter/Json.php b/library/Zend/Serializer/Adapter/Json.php index f1c3d06b89..97fd5e5105 100644 --- a/library/Zend/Serializer/Adapter/Json.php +++ b/library/Zend/Serializer/Adapter/Json.php @@ -21,10 +21,10 @@ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ -require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; +;// require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; /** @see Zend_Json */ -require_once 'Zend/Json.php'; +;// require_once 'Zend/Json.php'; /** * @category Zend @@ -59,7 +59,7 @@ public function serialize($value, array $opts = array()) try { return Zend_Json::encode($value, $opts['cycleCheck'], $opts); } catch (Exception $e) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Serialization failed', 0, $e); } } @@ -78,10 +78,10 @@ public function unserialize($json, array $opts = array()) try { $ret = Zend_Json::decode($json, $opts['objectDecodeType']); } catch (Zend_Json_Exception $e) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Invalid json data'); } catch (Exception $e) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Unserialization failed by previous error', 0, $e); } diff --git a/library/Zend/Serializer/Adapter/PhpCode.php b/library/Zend/Serializer/Adapter/PhpCode.php index d070d133b3..cb4cd71f3f 100644 --- a/library/Zend/Serializer/Adapter/PhpCode.php +++ b/library/Zend/Serializer/Adapter/PhpCode.php @@ -21,7 +21,7 @@ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ -require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; +;// require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; /** * @category Zend @@ -59,7 +59,7 @@ public function unserialize($code, array $opts = array()) $eval = @eval('$ret=' . $code . ';'); if ($eval === false) { $lastErr = error_get_last(); - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('eval failed: ' . $lastErr['message']); } return $ret; diff --git a/library/Zend/Serializer/Adapter/PhpSerialize.php b/library/Zend/Serializer/Adapter/PhpSerialize.php index bd4998e872..d8f41e3298 100644 --- a/library/Zend/Serializer/Adapter/PhpSerialize.php +++ b/library/Zend/Serializer/Adapter/PhpSerialize.php @@ -21,7 +21,7 @@ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ -require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; +;// require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; /** * @category Zend @@ -65,7 +65,7 @@ public function serialize($value, array $opts = array()) $ret = serialize($value); if ($ret === false) { $lastErr = error_get_last(); - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception($lastErr['message']); } return $ret; @@ -86,7 +86,7 @@ public function unserialize($serialized, array $opts = array()) $ret = @unserialize($serialized); if ($ret === false && $serialized !== self::$_serializedFalse) { $lastErr = error_get_last(); - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception($lastErr['message']); } return $ret; diff --git a/library/Zend/Serializer/Adapter/PythonPickle.php b/library/Zend/Serializer/Adapter/PythonPickle.php index aae13729f6..a235280984 100644 --- a/library/Zend/Serializer/Adapter/PythonPickle.php +++ b/library/Zend/Serializer/Adapter/PythonPickle.php @@ -21,7 +21,7 @@ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ -require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; +;// require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; /** * @link http://www.python.org @@ -184,7 +184,7 @@ protected function _checkProtocolNumber($number) { $int = (int) $number; if ($int < 0 || $int > 3) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Invalid or unknown protocol version "'.$number.'"'); } return $int; @@ -256,7 +256,7 @@ protected function _write($value) } elseif (is_object($value)) { $this->_writeObject($value); } else { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception( 'PHP-Type "'.gettype($value).'" isn\'t serializable with '.get_class($this) ); @@ -605,7 +605,7 @@ public function unserialize($pickle, array $opts = array()) } if (!count($this->_stack)) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('No data found'); } @@ -749,7 +749,7 @@ protected function _load($op) $this->_loadProto(); break; default: - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Invalid or unknown opcode "'.$op.'"'); } } @@ -766,7 +766,7 @@ protected function _loadPut() $lastStack = count($this->_stack)-1; if (!isset($this->_stack[$lastStack])) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('No stack exist'); } $this->_memo[$id] = & $this->_stack[$lastStack]; @@ -784,7 +784,7 @@ protected function _loadBinPut() $lastStack = count($this->_stack)-1; if (!isset($this->_stack[$lastStack])) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('No stack exist'); } $this->_memo[$id] = & $this->_stack[$lastStack]; @@ -806,7 +806,7 @@ protected function _loadLongBinPut() $lastStack = count($this->_stack)-1; if (!isset($this->_stack[$lastStack])) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('No stack exist'); } $this->_memo[$id] = & $this->_stack[$lastStack]; @@ -823,7 +823,7 @@ protected function _loadGet() $id = (int)$this->_readline(); if (!array_key_exists($id, $this->_memo)) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Get id "' . $id . '" not found in momo'); } $this->_stack[] = & $this->_memo[$id]; @@ -840,7 +840,7 @@ protected function _loadBinGet() $id = ord($this->_read(1)); if (!array_key_exists($id, $this->_memo)) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Get id "' . $id . '" not found in momo'); } $this->_stack[] = & $this->_memo[$id]; @@ -861,7 +861,7 @@ protected function _loadLongBinGet() list(, $id) = unpack('l', $bin); if (!array_key_exists($id, $this->_memo)) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Get id "' . $id . '" not found in momo'); } $this->_stack[] = & $this->_memo[$id]; @@ -1138,7 +1138,7 @@ protected function _hex2Utf8($hex) . chr(0x80 | $uniCode >> 6 & 0x3F) . chr(0x80 | $uniCode & 0x3F); } else { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Unsupported unicode character found "' . dechex($uniCode) . '"'); } @@ -1350,7 +1350,7 @@ protected function _loadProto() { $proto = ord($this->_read(1)); if ($proto < 2 || $proto > 3) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('Invalid protocol version detected'); } $this->_protocol = $proto; @@ -1368,7 +1368,7 @@ protected function _loadProto() protected function _read($len) { if (($this->_pos + $len) > $this->_pickleLen) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('End of data'); } @@ -1392,7 +1392,7 @@ protected function _readline() } if ($eolPos === false) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('No new line found'); } $ret = substr($this->_pickle, $this->_pos, $eolPos-$this->_pos); diff --git a/library/Zend/Serializer/Adapter/Wddx.php b/library/Zend/Serializer/Adapter/Wddx.php index 81902b2248..3592c3d495 100644 --- a/library/Zend/Serializer/Adapter/Wddx.php +++ b/library/Zend/Serializer/Adapter/Wddx.php @@ -21,13 +21,13 @@ */ /** @see Zend_Serializer_Adapter_AdapterAbstract */ -require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; +;// require_once 'Zend/Serializer/Adapter/AdapterAbstract.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** @see Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; +;// require_once 'Zend/Xml/Exception.php'; /** * @link http://www.infoloom.com/gcaconfs/WEB/chicago98/simeonov.HTM @@ -57,7 +57,7 @@ class Zend_Serializer_Adapter_Wddx extends Zend_Serializer_Adapter_AdapterAbstra public function __construct($opts = array()) { if (!extension_loaded('wddx')) { - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception('PHP extension "wddx" is required for this adapter'); } @@ -84,7 +84,7 @@ public function serialize($value, array $opts = array()) if ($wddx === false) { $lastErr = error_get_last(); - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception($lastErr['message']); } return $wddx; @@ -115,7 +115,7 @@ public function unserialize($wddx, array $opts = array()) $errMsg = $e->getMessage(); } - require_once 'Zend/Serializer/Exception.php'; + ;// require_once 'Zend/Serializer/Exception.php'; throw new Zend_Serializer_Exception($errMsg); } diff --git a/library/Zend/Serializer/Exception.php b/library/Zend/Serializer/Exception.php index b9ff7414b9..b308a7e243 100644 --- a/library/Zend/Serializer/Exception.php +++ b/library/Zend/Serializer/Exception.php @@ -20,7 +20,7 @@ */ /** @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/Zend/Server/Abstract.php b/library/Zend/Server/Abstract.php index 3d2d73e8f7..ae3d4212c1 100644 --- a/library/Zend/Server/Abstract.php +++ b/library/Zend/Server/Abstract.php @@ -19,32 +19,32 @@ */ /** Zend_Server_Interface */ -require_once 'Zend/Server/Interface.php'; +;// require_once 'Zend/Server/Interface.php'; /** * Zend_Server_Definition */ -require_once 'Zend/Server/Definition.php'; +;// require_once 'Zend/Server/Definition.php'; /** * Zend_Server_Method_Definition */ -require_once 'Zend/Server/Method/Definition.php'; +;// require_once 'Zend/Server/Method/Definition.php'; /** * Zend_Server_Method_Callback */ -require_once 'Zend/Server/Method/Callback.php'; +;// require_once 'Zend/Server/Method/Callback.php'; /** * Zend_Server_Method_Prototype */ -require_once 'Zend/Server/Method/Prototype.php'; +;// require_once 'Zend/Server/Method/Prototype.php'; /** * Zend_Server_Method_Parameter */ -require_once 'Zend/Server/Method/Parameter.php'; +;// require_once 'Zend/Server/Method/Parameter.php'; /** * Zend_Server_Abstract @@ -162,7 +162,7 @@ protected function _buildSignature(Zend_Server_Reflection_Function_Abstract $ref $method = empty($ns) ? $name : $ns . '.' . $name; if (!$this->_overwriteExistingMethods && $this->_table->hasMethod($method)) { - require_once 'Zend/Server/Exception.php'; + ;// require_once 'Zend/Server/Exception.php'; throw new Zend_Server_Exception('Duplicate method registered: ' . $method); } diff --git a/library/Zend/Server/Cache.php b/library/Zend/Server/Cache.php index 97264dfb09..9d4aa5decc 100644 --- a/library/Zend/Server/Cache.php +++ b/library/Zend/Server/Cache.php @@ -86,8 +86,8 @@ public static function save($filename, Zend_Server_Interface $server) * * * if (!Zend_Server_Cache::get($filename, $server)) { - * require_once 'Some/Service/Class.php'; - * require_once 'Another/Service/Class.php'; + * ;// require_once 'Some/Service/Class.php'; + * ;// require_once 'Another/Service/Class.php'; * * // Attach Some_Service_Class with namespace 'some' * $server->attach('Some_Service_Class', 'some'); diff --git a/library/Zend/Server/Definition.php b/library/Zend/Server/Definition.php index c962ccc5e3..c7418d292e 100644 --- a/library/Zend/Server/Definition.php +++ b/library/Zend/Server/Definition.php @@ -76,10 +76,10 @@ public function setOverwriteExistingMethods($flag) public function addMethod($method, $name = null) { if (is_array($method)) { - require_once 'Zend/Server/Method/Definition.php'; + ;// require_once 'Zend/Server/Method/Definition.php'; $method = new Zend_Server_Method_Definition($method); } elseif (!$method instanceof Zend_Server_Method_Definition) { - require_once 'Zend/Server/Exception.php'; + ;// require_once 'Zend/Server/Exception.php'; throw new Zend_Server_Exception('Invalid method provided'); } @@ -92,12 +92,12 @@ public function addMethod($method, $name = null) $name = $method->getName(); } if (null === $name) { - require_once 'Zend/Server/Exception.php'; + ;// require_once 'Zend/Server/Exception.php'; throw new Zend_Server_Exception('No method name provided'); } if (!$this->_overwriteExistingMethods && array_key_exists($name, $this->_methods)) { - require_once 'Zend/Server/Exception.php'; + ;// require_once 'Zend/Server/Exception.php'; throw new Zend_Server_Exception(sprintf('Method by name of "%s" already exists', $name)); } $this->_methods[$name] = $method; diff --git a/library/Zend/Server/Exception.php b/library/Zend/Server/Exception.php index c0c82542c6..3ca04ded48 100644 --- a/library/Zend/Server/Exception.php +++ b/library/Zend/Server/Exception.php @@ -21,7 +21,7 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * Zend_Server_Reflection exceptions diff --git a/library/Zend/Server/Method/Callback.php b/library/Zend/Server/Method/Callback.php index e9268c3dc7..20af393c1c 100644 --- a/library/Zend/Server/Method/Callback.php +++ b/library/Zend/Server/Method/Callback.php @@ -166,7 +166,7 @@ public function getMethod() public function setType($type) { if (!in_array($type, $this->_types)) { - require_once 'Zend/Server/Exception.php'; + ;// require_once 'Zend/Server/Exception.php'; throw new Zend_Server_Exception('Invalid method callback type passed to ' . __CLASS__ . '::' . __METHOD__); } $this->_type = $type; diff --git a/library/Zend/Server/Method/Definition.php b/library/Zend/Server/Method/Definition.php index 1397fdc564..41a0708f53 100644 --- a/library/Zend/Server/Method/Definition.php +++ b/library/Zend/Server/Method/Definition.php @@ -122,10 +122,10 @@ public function getName() public function setCallback($callback) { if (is_array($callback)) { - require_once 'Zend/Server/Method/Callback.php'; + ;// require_once 'Zend/Server/Method/Callback.php'; $callback = new Zend_Server_Method_Callback($callback); } elseif (!$callback instanceof Zend_Server_Method_Callback) { - require_once 'Zend/Server/Exception.php'; + ;// require_once 'Zend/Server/Exception.php'; throw new Zend_Server_Exception('Invalid method callback provided'); } $this->_callback = $callback; @@ -151,10 +151,10 @@ public function getCallback() public function addPrototype($prototype) { if (is_array($prototype)) { - require_once 'Zend/Server/Method/Prototype.php'; + ;// require_once 'Zend/Server/Method/Prototype.php'; $prototype = new Zend_Server_Method_Prototype($prototype); } elseif (!$prototype instanceof Zend_Server_Method_Prototype) { - require_once 'Zend/Server/Exception.php'; + ;// require_once 'Zend/Server/Exception.php'; throw new Zend_Server_Exception('Invalid method prototype provided'); } $this->_prototypes[] = $prototype; @@ -229,7 +229,7 @@ public function getMethodHelp() public function setObject($object) { if (!is_object($object) && (null !== $object)) { - require_once 'Zend/Server/Exception.php'; + ;// require_once 'Zend/Server/Exception.php'; throw new Zend_Server_Exception('Invalid object passed to ' . __CLASS__ . '::' . __METHOD__); } $this->_object = $object; diff --git a/library/Zend/Server/Method/Prototype.php b/library/Zend/Server/Method/Prototype.php index 7baac3e57d..e2ca394240 100644 --- a/library/Zend/Server/Method/Prototype.php +++ b/library/Zend/Server/Method/Prototype.php @@ -95,7 +95,7 @@ public function addParameter($parameter) $this->_parameterNameMap[$name] = count($this->_parameters) - 1; } } else { - require_once 'Zend/Server/Method/Parameter.php'; + ;// require_once 'Zend/Server/Method/Parameter.php'; $parameter = new Zend_Server_Method_Parameter(array( 'type' => (string) $parameter, )); diff --git a/library/Zend/Server/Reflection.php b/library/Zend/Server/Reflection.php index 39a46dcde2..a44c896c4b 100644 --- a/library/Zend/Server/Reflection.php +++ b/library/Zend/Server/Reflection.php @@ -21,12 +21,12 @@ /** * Zend_Server_Reflection_Function */ -require_once 'Zend/Server/Reflection/Function.php'; +;// require_once 'Zend/Server/Reflection/Function.php'; /** * Zend_Server_Reflection_Class */ -require_once 'Zend/Server/Reflection/Class.php'; +;// require_once 'Zend/Server/Reflection/Class.php'; /** * Reflection for determining method signatures to use with server classes @@ -64,12 +64,12 @@ public static function reflectClass($class, $argv = false, $namespace = '') } elseif (class_exists($class)) { $reflection = new ReflectionClass($class); } else { - require_once 'Zend/Server/Reflection/Exception.php'; + ;// require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid class or object passed to attachClass()'); } if ($argv && !is_array($argv)) { - require_once 'Zend/Server/Reflection/Exception.php'; + ;// require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid argv argument passed to reflectClass'); } @@ -96,13 +96,13 @@ public static function reflectClass($class, $argv = false, $namespace = '') public static function reflectFunction($function, $argv = false, $namespace = '') { if (!is_string($function) || !function_exists($function)) { - require_once 'Zend/Server/Reflection/Exception.php'; + ;// require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid function "' . $function . '" passed to reflectFunction'); } if ($argv && !is_array($argv)) { - require_once 'Zend/Server/Reflection/Exception.php'; + ;// require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid argv argument passed to reflectClass'); } diff --git a/library/Zend/Server/Reflection/Class.php b/library/Zend/Server/Reflection/Class.php index 324784afda..8c734b2138 100644 --- a/library/Zend/Server/Reflection/Class.php +++ b/library/Zend/Server/Reflection/Class.php @@ -21,7 +21,7 @@ /** * Zend_Server_Reflection_Method */ -require_once 'Zend/Server/Reflection/Method.php'; +;// require_once 'Zend/Server/Reflection/Method.php'; /** * Class/Object reflection @@ -105,7 +105,7 @@ public function __call($method, $args) return call_user_func_array(array($this->_reflection, $method), $args); } - require_once 'Zend/Server/Reflection/Exception.php'; + ;// require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid reflection method'); } @@ -176,7 +176,7 @@ public function setNamespace($namespace) } if (!is_string($namespace) || !preg_match('/[a-z0-9_\.]+/i', $namespace)) { - require_once 'Zend/Server/Reflection/Exception.php'; + ;// require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid namespace'); } diff --git a/library/Zend/Server/Reflection/Exception.php b/library/Zend/Server/Reflection/Exception.php index be6c22795d..8f286086a2 100644 --- a/library/Zend/Server/Reflection/Exception.php +++ b/library/Zend/Server/Reflection/Exception.php @@ -21,7 +21,7 @@ /** * @see Zend_Server_Exception */ -require_once 'Zend/Server/Exception.php'; +;// require_once 'Zend/Server/Exception.php'; /** * Zend_Server_Reflection exceptions diff --git a/library/Zend/Server/Reflection/Function.php b/library/Zend/Server/Reflection/Function.php index e01398d3f5..bb820916b0 100644 --- a/library/Zend/Server/Reflection/Function.php +++ b/library/Zend/Server/Reflection/Function.php @@ -21,7 +21,7 @@ /** * Zend_Server_Reflection_Function_Abstract */ -require_once 'Zend/Server/Reflection/Function/Abstract.php'; +;// require_once 'Zend/Server/Reflection/Function/Abstract.php'; /** * Function Reflection diff --git a/library/Zend/Server/Reflection/Function/Abstract.php b/library/Zend/Server/Reflection/Function/Abstract.php index e54e2262d3..025b4281e5 100644 --- a/library/Zend/Server/Reflection/Function/Abstract.php +++ b/library/Zend/Server/Reflection/Function/Abstract.php @@ -21,17 +21,17 @@ /** * Zend_Server_Reflection_Node */ -require_once 'Zend/Server/Reflection/Node.php'; +;// require_once 'Zend/Server/Reflection/Node.php'; /** * Zend_Server_Reflection_Parameter */ -require_once 'Zend/Server/Reflection/Parameter.php'; +;// require_once 'Zend/Server/Reflection/Parameter.php'; /** * Zend_Server_Reflection_Prototype */ -require_once 'Zend/Server/Reflection/Prototype.php'; +;// require_once 'Zend/Server/Reflection/Prototype.php'; /** * Function/Method Reflection @@ -115,7 +115,7 @@ public function __construct(Reflector $r, $namespace = null, $argv = array()) // testing here. if ((!$r instanceof ReflectionFunction) && (!$r instanceof ReflectionMethod)) { - require_once 'Zend/Server/Reflection/Exception.php'; + ;// require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid reflection class'); } $this->_reflection = $r; @@ -346,7 +346,7 @@ protected function _reflect() } if (count($paramTypesTmp) != $paramCount) { - require_once 'Zend/Server/Reflection/Exception.php'; + ;// require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception( 'Variable number of arguments is not supported for services (except optional parameters). ' . 'Number of function arguments in ' . $function->getDeclaringClass()->getName() . '::' @@ -380,7 +380,7 @@ public function __call($method, $args) return call_user_func_array(array($this->_reflection, $method), $args); } - require_once 'Zend/Server/Reflection/Exception.php'; + ;// require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid reflection method ("' .$method. '")'); } @@ -430,7 +430,7 @@ public function setNamespace($namespace) } if (!is_string($namespace) || !preg_match('/[a-z0-9_\.]+/i', $namespace)) { - require_once 'Zend/Server/Reflection/Exception.php'; + ;// require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid namespace'); } @@ -456,7 +456,7 @@ public function getNamespace() public function setDescription($string) { if (!is_string($string)) { - require_once 'Zend/Server/Reflection/Exception.php'; + ;// require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid description'); } diff --git a/library/Zend/Server/Reflection/Method.php b/library/Zend/Server/Reflection/Method.php index bfae11c204..81b6c2e1d5 100644 --- a/library/Zend/Server/Reflection/Method.php +++ b/library/Zend/Server/Reflection/Method.php @@ -21,7 +21,7 @@ /** * Zend_Server_Reflection_Function_Abstract */ -require_once 'Zend/Server/Reflection/Function/Abstract.php'; +;// require_once 'Zend/Server/Reflection/Function/Abstract.php'; /** * Method Reflection diff --git a/library/Zend/Server/Reflection/Parameter.php b/library/Zend/Server/Reflection/Parameter.php index 1bc29eb7a6..f86987c7e8 100644 --- a/library/Zend/Server/Reflection/Parameter.php +++ b/library/Zend/Server/Reflection/Parameter.php @@ -82,7 +82,7 @@ public function __call($method, $args) return call_user_func_array(array($this->_reflection, $method), $args); } - require_once 'Zend/Server/Reflection/Exception.php'; + ;// require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid reflection method'); } @@ -105,7 +105,7 @@ public function getType() public function setType($type) { if (!is_string($type) && (null !== $type)) { - require_once 'Zend/Server/Reflection/Exception.php'; + ;// require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid parameter type'); } @@ -131,7 +131,7 @@ public function getDescription() public function setDescription($description) { if (!is_string($description) && (null !== $description)) { - require_once 'Zend/Server/Reflection/Exception.php'; + ;// require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid parameter description'); } diff --git a/library/Zend/Server/Reflection/Prototype.php b/library/Zend/Server/Reflection/Prototype.php index cacd56ec72..c0feab958d 100644 --- a/library/Zend/Server/Reflection/Prototype.php +++ b/library/Zend/Server/Reflection/Prototype.php @@ -21,12 +21,12 @@ /** * Zend_Server_Reflection_ReturnValue */ -require_once 'Zend/Server/Reflection/ReturnValue.php'; +;// require_once 'Zend/Server/Reflection/ReturnValue.php'; /** * Zend_Server_Reflection_Parameter */ -require_once 'Zend/Server/Reflection/Parameter.php'; +;// require_once 'Zend/Server/Reflection/Parameter.php'; /** * Method/Function prototypes @@ -54,14 +54,14 @@ public function __construct(Zend_Server_Reflection_ReturnValue $return, $params $this->_return = $return; if (!is_array($params) && (null !== $params)) { - require_once 'Zend/Server/Reflection/Exception.php'; + ;// require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid parameters'); } if (is_array($params)) { foreach ($params as $param) { if (!$param instanceof Zend_Server_Reflection_Parameter) { - require_once 'Zend/Server/Reflection/Exception.php'; + ;// require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('One or more params are invalid'); } } diff --git a/library/Zend/Server/Reflection/ReturnValue.php b/library/Zend/Server/Reflection/ReturnValue.php index 6e654b2480..fa45189a5a 100644 --- a/library/Zend/Server/Reflection/ReturnValue.php +++ b/library/Zend/Server/Reflection/ReturnValue.php @@ -75,7 +75,7 @@ public function getType() public function setType($type) { if (!is_string($type) && (null !== $type)) { - require_once 'Zend/Server/Reflection/Exception.php'; + ;// require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid parameter type'); } @@ -101,7 +101,7 @@ public function getDescription() public function setDescription($description) { if (!is_string($description) && (null !== $description)) { - require_once 'Zend/Server/Reflection/Exception.php'; + ;// require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception('Invalid parameter description'); } diff --git a/library/Zend/Session.php b/library/Zend/Session.php index 6378cbf612..1712218255 100644 --- a/library/Zend/Session.php +++ b/library/Zend/Session.php @@ -25,17 +25,17 @@ /** * @see Zend_Session_Abstract */ -require_once 'Zend/Session/Abstract.php'; +;// require_once 'Zend/Session/Abstract.php'; /** * @see Zend_Session_Namespace */ -require_once 'Zend/Session/Namespace.php'; +;// require_once 'Zend/Session/Namespace.php'; /** * @see Zend_Session_SaveHandler_Interface */ -require_once 'Zend/Session/SaveHandler/Interface.php'; +;// require_once 'Zend/Session/SaveHandler/Interface.php'; /** @@ -223,7 +223,7 @@ public static function setOptions(array $userOptions = array()) } else { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("Unknown option: $userOptionName = $userOptionValue"); } } @@ -308,7 +308,7 @@ public static function regenerateId() { if (!self::$_unitTestEnabled && headers_sent($filename, $linenum)) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("You must call " . __CLASS__ . '::' . __FUNCTION__ . "() before any output has been sent to the browser; output started in {$filename}/{$linenum}"); } @@ -429,7 +429,7 @@ public static function start($options = false) } if (self::$_sessionStarted && self::$_destroyed) { - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('The session was explicitly destroyed during this request, attempting to re-start is not allowed.'); } @@ -445,14 +445,14 @@ public static function start($options = false) // In strict mode, do not allow auto-starting Zend_Session, such as via "new Zend_Session_Namespace()" if (self::$_strict && $options === true) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('You must explicitly start the session with Zend_Session::start() when session options are set to strict.'); } $filename = $linenum = null; if (!self::$_unitTestEnabled && headers_sent($filename, $linenum)) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("Session must be started before any output has been sent to the browser;" . " output started in {$filename}/{$linenum}"); } @@ -460,7 +460,7 @@ public static function start($options = false) // See http://www.php.net/manual/en/ref.session.php for explanation if (!self::$_unitTestEnabled && defined('SID')) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('session has already been started by session.auto-start or session_start()'); } @@ -475,7 +475,7 @@ public static function start($options = false) if (!self::$_unitTestEnabled) { if (self::$_throwStartupExceptions) { - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; set_error_handler(array('Zend_Session_Exception', 'handleSessionStartError'), $errorLevel); } @@ -663,20 +663,20 @@ public static function setId($id) { if (!self::$_unitTestEnabled && defined('SID')) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('The session has already been started. The session id must be set first.'); } if (!self::$_unitTestEnabled && headers_sent($filename, $linenum)) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("You must call ".__CLASS__.'::'.__FUNCTION__. "() before any output has been sent to the browser; output started in {$filename}/{$linenum}"); } if (!is_string($id) || $id === '') { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('You must provide a non-empty string as a session identifier.'); } @@ -806,13 +806,13 @@ private static function _processValidators() { foreach ($_SESSION['__ZF']['VALID'] as $validator_name => $valid_data) { if (!class_exists($validator_name)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($validator_name); } $validator = new $validator_name; if ($validator->validate() === false) { /** @see Zend_Session_Validator_Exception */ - require_once 'Zend/Session/Validator/Exception.php'; + ;// require_once 'Zend/Session/Validator/Exception.php'; throw new Zend_Session_Validator_Exception("This session is not valid according to {$validator_name}."); } } @@ -869,7 +869,7 @@ public static function getIterator() { if (parent::$_readable === false) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(parent::_THROW_NOT_READABLE_MSG); } diff --git a/library/Zend/Session/Abstract.php b/library/Zend/Session/Abstract.php index 127905c5e0..a04465391f 100644 --- a/library/Zend/Session/Abstract.php +++ b/library/Zend/Session/Abstract.php @@ -82,7 +82,7 @@ protected static function _namespaceIsset($namespace, $name = null) /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(self::_THROW_NOT_READABLE_MSG); } @@ -108,7 +108,7 @@ protected static function _namespaceUnset($namespace, $name = null) /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(self::_THROW_NOT_WRITABLE_MSG); } @@ -143,7 +143,7 @@ protected static function & _namespaceGet($namespace, $name = null) /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(self::_THROW_NOT_READABLE_MSG); } diff --git a/library/Zend/Session/Exception.php b/library/Zend/Session/Exception.php index d99a6adb7d..7c1839697e 100644 --- a/library/Zend/Session/Exception.php +++ b/library/Zend/Session/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** diff --git a/library/Zend/Session/Namespace.php b/library/Zend/Session/Namespace.php index f94091ba99..74d9359380 100644 --- a/library/Zend/Session/Namespace.php +++ b/library/Zend/Session/Namespace.php @@ -24,13 +24,13 @@ /** * @see Zend_Session */ -require_once 'Zend/Session.php'; +;// require_once 'Zend/Session.php'; /** * @see Zend_Session_Abstract */ -require_once 'Zend/Session/Abstract.php'; +;// require_once 'Zend/Session/Abstract.php'; /** @@ -105,7 +105,7 @@ public function __construct($namespace = 'Default', $singleInstance = false) /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('Session namespace must be a non-empty string.'); } @@ -113,7 +113,7 @@ public function __construct($namespace = 'Default', $singleInstance = false) /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('Session namespace must not start with an underscore.'); } @@ -121,7 +121,7 @@ public function __construct($namespace = 'Default', $singleInstance = false) /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('Session namespace must not start with a number.'); } @@ -129,7 +129,7 @@ public function __construct($namespace = 'Default', $singleInstance = false) /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("A session namespace object already exists for this namespace ('$namespace'), and no additional accessors (session namespace objects) for this namespace are permitted."); } @@ -146,7 +146,7 @@ public function __construct($namespace = 'Default', $singleInstance = false) /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(self::_THROW_NOT_READABLE_MSG); } @@ -280,7 +280,7 @@ public function & __get($name) /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("The '$name' key must be a non-empty string"); } @@ -302,7 +302,7 @@ public function __set($name, $value) /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('This session/namespace has been marked as read-only.'); } @@ -310,7 +310,7 @@ public function __set($name, $value) /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("The '$name' key must be a non-empty string"); } @@ -318,7 +318,7 @@ public function __set($name, $value) /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(parent::_THROW_NOT_WRITABLE_MSG); } @@ -367,7 +367,7 @@ public function applySet($callback) /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('Result must be an array. Got: ' . gettype($result)); } $_SESSION[$this->_namespace] = $result; @@ -387,7 +387,7 @@ public function __isset($name) /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("The '$name' key must be a non-empty string"); } @@ -407,7 +407,7 @@ public function __unset($name) /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("The '$name' key must be a non-empty string"); } @@ -430,7 +430,7 @@ public function setExpirationSeconds($seconds, $variables = null) /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(parent::_THROW_NOT_WRITABLE_MSG); } @@ -438,7 +438,7 @@ public function setExpirationSeconds($seconds, $variables = null) /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('Seconds must be positive.'); } @@ -478,7 +478,7 @@ public function setExpirationHops($hops, $variables = null, $hopCountOnUsageOnly /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(parent::_THROW_NOT_WRITABLE_MSG); } @@ -486,7 +486,7 @@ public function setExpirationHops($hops, $variables = null, $hopCountOnUsageOnly /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + ;// require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('Hops must be positive number.'); } diff --git a/library/Zend/Session/SaveHandler/DbTable.php b/library/Zend/Session/SaveHandler/DbTable.php index e423a18d4c..5656cb177f 100644 --- a/library/Zend/Session/SaveHandler/DbTable.php +++ b/library/Zend/Session/SaveHandler/DbTable.php @@ -23,22 +23,22 @@ /** * @see Zend_Session */ -require_once 'Zend/Session.php'; +;// require_once 'Zend/Session.php'; /** * @see Zend_Db_Table_Abstract */ -require_once 'Zend/Db/Table/Abstract.php'; +;// require_once 'Zend/Db/Table/Abstract.php'; /** * @see Zend_Db_Table_Row_Abstract */ -require_once 'Zend/Db/Table/Row/Abstract.php'; +;// require_once 'Zend/Db/Table/Row/Abstract.php'; /** * @see Zend_Config */ -require_once 'Zend/Config.php'; +;// require_once 'Zend/Config.php'; /** * Zend_Session_SaveHandler_DbTable @@ -168,7 +168,7 @@ public function __construct($config) /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; + ;// require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception( '$config must be an instance of Zend_Config or array of key/value pairs containing ' @@ -232,7 +232,7 @@ public function setLifetime($lifetime, $overrideLifetime = null) /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; + ;// require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception(); } else if (empty($lifetime)) { $this->_lifetime = (int) ini_get('session.gc_maxlifetime'); @@ -420,7 +420,7 @@ protected function _setupTableName() /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; + ;// require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception('session.save_path is a path and not a table name.'); } @@ -452,7 +452,7 @@ protected function _setupPrimaryAssignment() /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; + ;// require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception( "Value for configuration option '" . self::PRIMARY_ASSIGNMENT . "' must have an assignment " @@ -461,7 +461,7 @@ protected function _setupPrimaryAssignment() /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; + ;// require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception( "Value for configuration option '" . self::PRIMARY_ASSIGNMENT . "' must have an assignment " @@ -481,7 +481,7 @@ protected function _checkRequiredColumns() /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; + ;// require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception( "Configuration must define '" . self::MODIFIED_COLUMN . "' which names the " @@ -490,7 +490,7 @@ protected function _checkRequiredColumns() /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; + ;// require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception( "Configuration must define '" . self::LIFETIME_COLUMN . "' which names the " @@ -499,7 +499,7 @@ protected function _checkRequiredColumns() /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; + ;// require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception( "Configuration must define '" . self::DATA_COLUMN . "' which names the " diff --git a/library/Zend/Session/SaveHandler/Exception.php b/library/Zend/Session/SaveHandler/Exception.php index f54ed7e29e..08b8251dae 100644 --- a/library/Zend/Session/SaveHandler/Exception.php +++ b/library/Zend/Session/SaveHandler/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Session_Exception */ -require_once 'Zend/Session/Exception.php'; +;// require_once 'Zend/Session/Exception.php'; /** * Zend_Session_SaveHandler_Exception diff --git a/library/Zend/Session/Validator/Abstract.php b/library/Zend/Session/Validator/Abstract.php index 2afba8154d..ef3a304293 100644 --- a/library/Zend/Session/Validator/Abstract.php +++ b/library/Zend/Session/Validator/Abstract.php @@ -23,7 +23,7 @@ /** * @see Zend_Session_Validator_Interface */ -require_once 'Zend/Session/Validator/Interface.php'; +;// require_once 'Zend/Session/Validator/Interface.php'; /** * Zend_Session_Validator_Abstract diff --git a/library/Zend/Session/Validator/Exception.php b/library/Zend/Session/Validator/Exception.php index c8afe8aff5..773b31dd0c 100644 --- a/library/Zend/Session/Validator/Exception.php +++ b/library/Zend/Session/Validator/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Session_Exception */ -require_once 'Zend/Session/Exception.php'; +;// require_once 'Zend/Session/Exception.php'; /** diff --git a/library/Zend/Session/Validator/HttpUserAgent.php b/library/Zend/Session/Validator/HttpUserAgent.php index 3f594d2c0b..ee3966c049 100644 --- a/library/Zend/Session/Validator/HttpUserAgent.php +++ b/library/Zend/Session/Validator/HttpUserAgent.php @@ -23,7 +23,7 @@ /** * @see Zend_Session_Validator_Abstract */ -require_once 'Zend/Session/Validator/Abstract.php'; +;// require_once 'Zend/Session/Validator/Abstract.php'; /** * Zend_Session_Validator_HttpUserAgent diff --git a/library/Zend/Soap/AutoDiscover.php b/library/Zend/Soap/AutoDiscover.php index f1df112ab7..884e7328d2 100644 --- a/library/Zend/Soap/AutoDiscover.php +++ b/library/Zend/Soap/AutoDiscover.php @@ -23,23 +23,23 @@ /** * @see Zend_Server_Interface */ -require_once 'Zend/Server/Interface.php'; +;// require_once 'Zend/Server/Interface.php'; /** * @see Zend_Soap_Wsdl */ -require_once 'Zend/Soap/Wsdl.php'; +;// require_once 'Zend/Soap/Wsdl.php'; /** * @see Zend_Server_Reflection */ -require_once 'Zend/Server/Reflection.php'; +;// require_once 'Zend/Server/Reflection.php'; /** * @see Zend_Server_Abstract */ -require_once 'Zend/Server/Abstract.php'; +;// require_once 'Zend/Server/Abstract.php'; /** * @see Zend_Uri */ -require_once 'Zend/Uri.php'; +;// require_once 'Zend/Uri.php'; /** * Zend_Soap_AutoDiscover @@ -130,7 +130,7 @@ public function __construct($strategy = true, $uri=null, $wsdlClass=null) public function setUri($uri) { if (!is_string($uri) && !($uri instanceof Zend_Uri)) { - require_once "Zend/Soap/AutoDiscover/Exception.php"; + ;// require_once "Zend/Soap/AutoDiscover/Exception.php"; throw new Zend_Soap_AutoDiscover_Exception("No uri given to Zend_Soap_AutoDiscover::setUri as string or Zend_Uri instance."); } $this->_uri = $uri; @@ -174,7 +174,7 @@ public function getUri() public function setWsdlClass($wsdlClass) { if (!is_string($wsdlClass) && !is_subclass_of($wsdlClass, 'Zend_Soap_Wsdl')) { - require_once "Zend/Soap/AutoDiscover/Exception.php"; + ;// require_once "Zend/Soap/AutoDiscover/Exception.php"; throw new Zend_Soap_AutoDiscover_Exception("No Zend_Soap_Wsdl subclass given to Zend_Soap_AutoDiscover::setWsdlClass as string."); } $this->_wsdlClass = $wsdlClass; @@ -206,7 +206,7 @@ public function getWsdlClass() public function setOperationBodyStyle(array $operationStyle=array()) { if(!isset($operationStyle['use'])) { - require_once "Zend/Soap/AutoDiscover/Exception.php"; + ;// require_once "Zend/Soap/AutoDiscover/Exception.php"; throw new Zend_Soap_AutoDiscover_Exception("Key 'use' is required in Operation soap:body style."); } $this->_operationBodyStyle = $operationStyle; @@ -401,7 +401,7 @@ protected function _addFunctionToWsdl($function, $wsdl, $port, $binding) } } if ($prototype === null) { - require_once "Zend/Soap/AutoDiscover/Exception.php"; + ;// require_once "Zend/Soap/AutoDiscover/Exception.php"; throw new Zend_Soap_AutoDiscover_Exception("No prototypes could be found for the '" . $function->getName() . "' function"); } @@ -501,7 +501,7 @@ protected function _addFunctionToWsdl($function, $wsdl, $port, $binding) */ public function fault($fault = null, $code = null) { - require_once "Zend/Soap/AutoDiscover/Exception.php"; + ;// require_once "Zend/Soap/AutoDiscover/Exception.php"; throw new Zend_Soap_AutoDiscover_Exception("Function has no use in AutoDiscover."); } @@ -533,7 +533,7 @@ public function dump($filename) /** * @see Zend_Soap_AutoDiscover_Exception */ - require_once "Zend/Soap/AutoDiscover/Exception.php"; + ;// require_once "Zend/Soap/AutoDiscover/Exception.php"; throw new Zend_Soap_AutoDiscover_Exception("Cannot dump autodiscovered contents, WSDL file has not been generated yet."); } } @@ -552,7 +552,7 @@ public function toXml() /** * @see Zend_Soap_AutoDiscover_Exception */ - require_once "Zend/Soap/AutoDiscover/Exception.php"; + ;// require_once "Zend/Soap/AutoDiscover/Exception.php"; throw new Zend_Soap_AutoDiscover_Exception("Cannot return autodiscovered contents, WSDL file has not been generated yet."); } } @@ -575,7 +575,7 @@ public function getFunctions() */ public function loadFunctions($definition) { - require_once "Zend/Soap/AutoDiscover/Exception.php"; + ;// require_once "Zend/Soap/AutoDiscover/Exception.php"; throw new Zend_Soap_AutoDiscover_Exception("Function has no use in AutoDiscover."); } @@ -587,7 +587,7 @@ public function loadFunctions($definition) */ public function setPersistence($mode) { - require_once "Zend/Soap/AutoDiscover/Exception.php"; + ;// require_once "Zend/Soap/AutoDiscover/Exception.php"; throw new Zend_Soap_AutoDiscover_Exception("Function has no use in AutoDiscover."); } diff --git a/library/Zend/Soap/AutoDiscover/Exception.php b/library/Zend/Soap/AutoDiscover/Exception.php index 278ff8e1b0..2d3e9ff0fa 100644 --- a/library/Zend/Soap/AutoDiscover/Exception.php +++ b/library/Zend/Soap/AutoDiscover/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Exception */ -require_once "Zend/Exception.php"; +;// require_once "Zend/Exception.php"; /** * @package Zend_Soap diff --git a/library/Zend/Soap/Client.php b/library/Zend/Soap/Client.php index 9a3b754c35..6b8703e43d 100644 --- a/library/Zend/Soap/Client.php +++ b/library/Zend/Soap/Client.php @@ -23,17 +23,17 @@ /** * @see Zend_Soap_Server */ -require_once 'Zend/Soap/Server.php'; +;// require_once 'Zend/Soap/Server.php'; /** * @see Zend_Soap_Client_Local */ -require_once 'Zend/Soap/Client/Local.php'; +;// require_once 'Zend/Soap/Client/Local.php'; /** * @see Zend_Soap_Client_Common */ -require_once 'Zend/Soap/Client/Common.php'; +;// require_once 'Zend/Soap/Client/Common.php'; /** * Zend_Soap_Client @@ -149,7 +149,7 @@ class Zend_Soap_Client public function __construct($wsdl = null, $options = null) { if (!extension_loaded('soap')) { - require_once 'Zend/Soap/Client/Exception.php'; + ;// require_once 'Zend/Soap/Client/Exception.php'; throw new Zend_Soap_Client_Exception('SOAP extension is not loaded.'); } @@ -279,7 +279,7 @@ public function setOptions($options) // break; default: - require_once 'Zend/Soap/Client/Exception.php'; + ;// require_once 'Zend/Soap/Client/Exception.php'; throw new Zend_Soap_Client_Exception('Unknown SOAP client option'); break; } @@ -350,7 +350,7 @@ public function getOptions() public function setSoapVersion($version) { if (!in_array($version, array(SOAP_1_1, SOAP_1_2))) { - require_once 'Zend/Soap/Client/Exception.php'; + ;// require_once 'Zend/Soap/Client/Exception.php'; throw new Zend_Soap_Client_Exception('Invalid soap version specified. Use SOAP_1_1 or SOAP_1_2 constants.'); } $this->_soapVersion = $version; @@ -381,7 +381,7 @@ public function setClassmap(array $classmap) { foreach ($classmap as $type => $class) { if (!class_exists($class)) { - require_once 'Zend/Soap/Client/Exception.php'; + ;// require_once 'Zend/Soap/Client/Exception.php'; throw new Zend_Soap_Client_Exception('Invalid class in class map'); } } @@ -413,7 +413,7 @@ public function getClassmap() public function setEncoding($encoding) { if (!is_string($encoding)) { - require_once 'Zend/Soap/Client/Exception.php'; + ;// require_once 'Zend/Soap/Client/Exception.php'; throw new Zend_Soap_Client_Exception('Invalid encoding specified'); } @@ -445,7 +445,7 @@ public function validateUrn($urn) { $scheme = parse_url($urn, PHP_URL_SCHEME); if ($scheme === false || $scheme === null) { - require_once 'Zend/Soap/Client/Exception.php'; + ;// require_once 'Zend/Soap/Client/Exception.php'; throw new Zend_Soap_Client_Exception('Invalid URN'); } @@ -521,7 +521,7 @@ public function getLocation() public function setStyle($style) { if (!in_array($style, array(SOAP_RPC, SOAP_DOCUMENT))) { - require_once 'Zend/Soap/Client/Exception.php'; + ;// require_once 'Zend/Soap/Client/Exception.php'; throw new Zend_Soap_Client_Exception('Invalid request style specified. Use SOAP_RPC or SOAP_DOCUMENT constants.'); } @@ -552,7 +552,7 @@ public function getStyle() public function setEncodingMethod($use) { if (!in_array($use, array(SOAP_ENCODED, SOAP_LITERAL))) { - require_once 'Zend/Soap/Client/Exception.php'; + ;// require_once 'Zend/Soap/Client/Exception.php'; throw new Zend_Soap_Client_Exception('Invalid message encoding method. Use SOAP_ENCODED or SOAP_LITERAL constants.'); } @@ -723,7 +723,7 @@ public function setProxyPassword($proxyPassword) public function setHttpsCertificate($localCert) { if (!is_readable($localCert)) { - require_once 'Zend/Soap/Client/Exception.php'; + ;// require_once 'Zend/Soap/Client/Exception.php'; throw new Zend_Soap_Client_Exception('Invalid HTTPS client certificate path.'); } @@ -817,7 +817,7 @@ public function setStreamContext($context) /** * @see Zend_Soap_Client_Exception */ - require_once "Zend/Soap/Client/Exception.php"; + ;// require_once "Zend/Soap/Client/Exception.php"; throw new Zend_Soap_Client_Exception( "Invalid stream context resource given." ); @@ -1048,20 +1048,20 @@ protected function _initSoapClientObject() if ($wsdl == null) { if (!isset($options['location'])) { - require_once 'Zend/Soap/Client/Exception.php'; + ;// require_once 'Zend/Soap/Client/Exception.php'; throw new Zend_Soap_Client_Exception('\'location\' parameter is required in non-WSDL mode.'); } if (!isset($options['uri'])) { - require_once 'Zend/Soap/Client/Exception.php'; + ;// require_once 'Zend/Soap/Client/Exception.php'; throw new Zend_Soap_Client_Exception('\'uri\' parameter is required in non-WSDL mode.'); } } else { if (isset($options['use'])) { - require_once 'Zend/Soap/Client/Exception.php'; + ;// require_once 'Zend/Soap/Client/Exception.php'; throw new Zend_Soap_Client_Exception('\'use\' parameter only works in non-WSDL mode.'); } if (isset($options['style'])) { - require_once 'Zend/Soap/Client/Exception.php'; + ;// require_once 'Zend/Soap/Client/Exception.php'; throw new Zend_Soap_Client_Exception('\'style\' parameter only works in non-WSDL mode.'); } } @@ -1174,7 +1174,7 @@ public function __call($name, $arguments) public function getFunctions() { if ($this->getWsdl() == null) { - require_once 'Zend/Soap/Client/Exception.php'; + ;// require_once 'Zend/Soap/Client/Exception.php'; throw new Zend_Soap_Client_Exception('\'getFunctions\' method is available only in WSDL mode.'); } @@ -1198,7 +1198,7 @@ public function getFunctions() public function getTypes() { if ($this->getWsdl() == null) { - require_once 'Zend/Soap/Client/Exception.php'; + ;// require_once 'Zend/Soap/Client/Exception.php'; throw new Zend_Soap_Client_Exception('\'getTypes\' method is available only in WSDL mode.'); } diff --git a/library/Zend/Soap/Client/DotNet.php b/library/Zend/Soap/Client/DotNet.php index d031f4c368..f15651ebb3 100644 --- a/library/Zend/Soap/Client/DotNet.php +++ b/library/Zend/Soap/Client/DotNet.php @@ -21,7 +21,7 @@ */ /** Zend_Soap_Client */ -require_once 'Zend/Soap/Client.php'; +;// require_once 'Zend/Soap/Client.php'; if (extension_loaded('soap')) { @@ -68,7 +68,7 @@ protected function _preProcessArguments($arguments) if (count($arguments) > 1 || (count($arguments) == 1 && !is_array(reset($arguments))) ) { - require_once 'Zend/Soap/Client/Exception.php'; + ;// require_once 'Zend/Soap/Client/Exception.php'; throw new Zend_Soap_Client_Exception('.Net webservice arguments have to be grouped into array: array(\'a\' => $a, \'b\' => $b, ...).'); } diff --git a/library/Zend/Soap/Client/Exception.php b/library/Zend/Soap/Client/Exception.php index 8f6d0c627b..2cadd308c5 100644 --- a/library/Zend/Soap/Client/Exception.php +++ b/library/Zend/Soap/Client/Exception.php @@ -20,7 +20,7 @@ */ /** Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/Zend/Soap/Client/Local.php b/library/Zend/Soap/Client/Local.php index 18a11b2826..1b8aafc209 100644 --- a/library/Zend/Soap/Client/Local.php +++ b/library/Zend/Soap/Client/Local.php @@ -21,10 +21,10 @@ */ /** Zend_Soap_Server */ -require_once 'Zend/Soap/Server.php'; +;// require_once 'Zend/Soap/Server.php'; /** Zend_Soap_Client */ -require_once 'Zend/Soap/Client.php'; +;// require_once 'Zend/Soap/Client.php'; if (extension_loaded('soap')) { diff --git a/library/Zend/Soap/Server.php b/library/Zend/Soap/Server.php index d1421d3ecc..35fd2a8086 100644 --- a/library/Zend/Soap/Server.php +++ b/library/Zend/Soap/Server.php @@ -22,13 +22,13 @@ /** * @see Zend_Server_Interface */ -require_once 'Zend/Server/Interface.php'; +;// require_once 'Zend/Server/Interface.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** @see Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; +;// require_once 'Zend/Xml/Exception.php'; /** * Zend_Soap_Server @@ -172,7 +172,7 @@ class Zend_Soap_Server implements Zend_Server_Interface public function __construct($wsdl = null, array $options = null) { if (!extension_loaded('soap')) { - require_once 'Zend/Soap/Server/Exception.php'; + ;// require_once 'Zend/Soap/Server/Exception.php'; throw new Zend_Soap_Server_Exception('SOAP extension is not loaded.'); } @@ -314,7 +314,7 @@ public function getWsiCompliant() public function setEncoding($encoding) { if (!is_string($encoding)) { - require_once 'Zend/Soap/Server/Exception.php'; + ;// require_once 'Zend/Soap/Server/Exception.php'; throw new Zend_Soap_Server_Exception('Invalid encoding specified'); } @@ -342,7 +342,7 @@ public function getEncoding() public function setSoapVersion($version) { if (!in_array($version, array(SOAP_1_1, SOAP_1_2))) { - require_once 'Zend/Soap/Server/Exception.php'; + ;// require_once 'Zend/Soap/Server/Exception.php'; throw new Zend_Soap_Server_Exception('Invalid soap version specified'); } @@ -371,7 +371,7 @@ public function validateUrn($urn) { $scheme = parse_url($urn, PHP_URL_SCHEME); if ($scheme === false || $scheme === null) { - require_once 'Zend/Soap/Server/Exception.php'; + ;// require_once 'Zend/Soap/Server/Exception.php'; throw new Zend_Soap_Server_Exception('Invalid URN'); } @@ -442,7 +442,7 @@ public function setClassmap($classmap) /** * @see Zend_Soap_Server_Exception */ - require_once 'Zend/Soap/Server/Exception.php'; + ;// require_once 'Zend/Soap/Server/Exception.php'; throw new Zend_Soap_Server_Exception('Classmap must be an array'); } foreach ($classmap as $type => $class) { @@ -450,7 +450,7 @@ public function setClassmap($classmap) /** * @see Zend_Soap_Server_Exception */ - require_once 'Zend/Soap/Server/Exception.php'; + ;// require_once 'Zend/Soap/Server/Exception.php'; throw new Zend_Soap_Server_Exception('Invalid class in class map'); } } @@ -554,7 +554,7 @@ public function addFunction($function, $namespace = '') if (is_string($func) && function_exists($func)) { $this->_functions[] = $func; } else { - require_once 'Zend/Soap/Server/Exception.php'; + ;// require_once 'Zend/Soap/Server/Exception.php'; throw new Zend_Soap_Server_Exception('One or more invalid functions specified in array'); } } @@ -564,7 +564,7 @@ public function addFunction($function, $namespace = '') } elseif ($function == SOAP_FUNCTIONS_ALL) { $this->_functions = SOAP_FUNCTIONS_ALL; } else { - require_once 'Zend/Soap/Server/Exception.php'; + ;// require_once 'Zend/Soap/Server/Exception.php'; throw new Zend_Soap_Server_Exception('Invalid function specified'); } @@ -591,17 +591,17 @@ public function addFunction($function, $namespace = '') public function setClass($class, $namespace = '', $argv = null) { if (isset($this->_class)) { - require_once 'Zend/Soap/Server/Exception.php'; + ;// require_once 'Zend/Soap/Server/Exception.php'; throw new Zend_Soap_Server_Exception('A class has already been registered with this soap server instance'); } if (!is_string($class)) { - require_once 'Zend/Soap/Server/Exception.php'; + ;// require_once 'Zend/Soap/Server/Exception.php'; throw new Zend_Soap_Server_Exception('Invalid class argument (' . gettype($class) . ')'); } if (!class_exists($class)) { - require_once 'Zend/Soap/Server/Exception.php'; + ;// require_once 'Zend/Soap/Server/Exception.php'; throw new Zend_Soap_Server_Exception('Class "' . $class . '" does not exist'); } @@ -626,17 +626,17 @@ public function setClass($class, $namespace = '', $argv = null) public function setObject($object) { if(!is_object($object)) { - require_once 'Zend/Soap/Server/Exception.php'; + ;// require_once 'Zend/Soap/Server/Exception.php'; throw new Zend_Soap_Server_Exception('Invalid object argument ('.gettype($object).')'); } if(isset($this->_object)) { - require_once 'Zend/Soap/Server/Exception.php'; + ;// require_once 'Zend/Soap/Server/Exception.php'; throw new Zend_Soap_Server_Exception('An object has already been registered with this soap server instance'); } if ($this->_wsiCompliant) { - require_once 'Zend/Soap/Server/Proxy.php'; + ;// require_once 'Zend/Soap/Server/Proxy.php'; $this->_object = new Zend_Soap_Server_Proxy($object); } else { $this->_object = $object; @@ -676,7 +676,7 @@ public function getFunctions() */ public function loadFunctions($definition) { - require_once 'Zend/Soap/Server/Exception.php'; + ;// require_once 'Zend/Soap/Server/Exception.php'; throw new Zend_Soap_Server_Exception('Unimplemented'); } @@ -689,7 +689,7 @@ public function loadFunctions($definition) public function setPersistence($mode) { if (!in_array($mode, array(SOAP_PERSISTENCE_SESSION, SOAP_PERSISTENCE_REQUEST))) { - require_once 'Zend/Soap/Server/Exception.php'; + ;// require_once 'Zend/Soap/Server/Exception.php'; throw new Zend_Soap_Server_Exception('Invalid persistence mode specified'); } @@ -738,11 +738,11 @@ protected function _setRequest($request) $dom = new DOMDocument(); try { if(strlen($xml) == 0 || (!$dom = Zend_Xml_Security::scan($xml, $dom))) { - require_once 'Zend/Soap/Server/Exception.php'; + ;// require_once 'Zend/Soap/Server/Exception.php'; throw new Zend_Soap_Server_Exception('Invalid XML'); } } catch (Zend_Xml_Exception $e) { - require_once 'Zend/Soap/Server/Exception.php'; + ;// require_once 'Zend/Soap/Server/Exception.php'; throw new Zend_Soap_Server_Exception( $e->getMessage() ); @@ -821,7 +821,7 @@ protected function _getSoap() $args = $this->_classArgs; array_unshift($args, $this->_class); if ($this->_wsiCompliant) { - require_once 'Zend/Soap/Server/Proxy.php'; + ;// require_once 'Zend/Soap/Server/Proxy.php'; array_unshift($args, 'Zend_Soap_Server_Proxy'); } call_user_func_array(array($server, 'setClass'), $args); @@ -870,7 +870,7 @@ public function handle($request = null) /** * @see Zend_Soap_Server_Exception */ - require_once 'Zend/Soap/Server/Exception.php'; + ;// require_once 'Zend/Soap/Server/Exception.php'; try { $this->_setRequest($request); } catch (Zend_Soap_Server_Exception $e) { diff --git a/library/Zend/Soap/Server/Exception.php b/library/Zend/Soap/Server/Exception.php index 1e8531896a..400853cc62 100644 --- a/library/Zend/Soap/Server/Exception.php +++ b/library/Zend/Soap/Server/Exception.php @@ -21,7 +21,7 @@ /** Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** diff --git a/library/Zend/Soap/Wsdl.php b/library/Zend/Soap/Wsdl.php index afc5f687ca..59b2d0ae5e 100644 --- a/library/Zend/Soap/Wsdl.php +++ b/library/Zend/Soap/Wsdl.php @@ -22,15 +22,15 @@ /** * @see Zend_Soap_Wsdl_Strategy_Interface */ -require_once "Zend/Soap/Wsdl/Strategy/Interface.php"; +;// require_once "Zend/Soap/Wsdl/Strategy/Interface.php"; /** * @see Zend_Soap_Wsdl_Strategy_Abstract */ -require_once "Zend/Soap/Wsdl/Strategy/Abstract.php"; +;// require_once "Zend/Soap/Wsdl/Strategy/Abstract.php"; /** @see Zend_Xml_Security */ -require_once "Zend/Xml/Security.php"; +;// require_once "Zend/Xml/Security.php"; /** * Zend_Soap_Wsdl @@ -101,7 +101,7 @@ public function __construct($name, $uri, $strategy = true) xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/'>"; $this->_dom = new DOMDocument(); if (!$this->_dom = Zend_Xml_Security::scan($wsdl, $this->_dom)) { - require_once 'Zend/Server/Exception.php'; + ;// require_once 'Zend/Server/Exception.php'; throw new Zend_Server_Exception('Unable to create DomDocument'); } $this->_wsdl = $this->_dom->documentElement; @@ -144,16 +144,16 @@ public function setUri($uri) public function setComplexTypeStrategy($strategy) { if($strategy === true) { - require_once "Zend/Soap/Wsdl/Strategy/DefaultComplexType.php"; + ;// require_once "Zend/Soap/Wsdl/Strategy/DefaultComplexType.php"; $strategy = new Zend_Soap_Wsdl_Strategy_DefaultComplexType(); } else if($strategy === false) { - require_once "Zend/Soap/Wsdl/Strategy/AnyType.php"; + ;// require_once "Zend/Soap/Wsdl/Strategy/AnyType.php"; $strategy = new Zend_Soap_Wsdl_Strategy_AnyType(); } else if(is_string($strategy)) { if(class_exists($strategy)) { $strategy = new $strategy(); } else { - require_once "Zend/Soap/Wsdl/Exception.php"; + ;// require_once "Zend/Soap/Wsdl/Exception.php"; throw new Zend_Soap_Wsdl_Exception( sprintf("Strategy with name '%s does not exist.", $strategy )); @@ -161,7 +161,7 @@ public function setComplexTypeStrategy($strategy) } if(!($strategy instanceof Zend_Soap_Wsdl_Strategy_Interface)) { - require_once "Zend/Soap/Wsdl/Exception.php"; + ;// require_once "Zend/Soap/Wsdl/Exception.php"; throw new Zend_Soap_Wsdl_Exception("Set a strategy that is not of type 'Zend_Soap_Wsdl_Strategy_Interface'"); } $this->_strategy = $strategy; @@ -616,7 +616,7 @@ public function addComplexType($type) private function _parseElement($element) { if (!is_array($element)) { - require_once "Zend/Soap/Wsdl/Exception.php"; + ;// require_once "Zend/Soap/Wsdl/Exception.php"; throw new Zend_Soap_Wsdl_Exception("The 'element' parameter needs to be an associative array."); } diff --git a/library/Zend/Soap/Wsdl/Exception.php b/library/Zend/Soap/Wsdl/Exception.php index 029ef73b54..e34009bf06 100644 --- a/library/Zend/Soap/Wsdl/Exception.php +++ b/library/Zend/Soap/Wsdl/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Exception */ -require_once "Zend/Exception.php"; +;// require_once "Zend/Exception.php"; /** * Zend_Soap_Wsdl_Exception diff --git a/library/Zend/Soap/Wsdl/Strategy/Abstract.php b/library/Zend/Soap/Wsdl/Strategy/Abstract.php index 63abdba42b..405f1e33e0 100644 --- a/library/Zend/Soap/Wsdl/Strategy/Abstract.php +++ b/library/Zend/Soap/Wsdl/Strategy/Abstract.php @@ -23,7 +23,7 @@ /** * @see Zend_Soap_Wsdl_Strategy_Interface */ -require_once "Zend/Soap/Wsdl/Strategy/Interface.php"; +;// require_once "Zend/Soap/Wsdl/Strategy/Interface.php"; /** * Abstract class for Zend_Soap_Wsdl_Strategy. diff --git a/library/Zend/Soap/Wsdl/Strategy/AnyType.php b/library/Zend/Soap/Wsdl/Strategy/AnyType.php index bb0e011794..64a3fd13c2 100644 --- a/library/Zend/Soap/Wsdl/Strategy/AnyType.php +++ b/library/Zend/Soap/Wsdl/Strategy/AnyType.php @@ -23,7 +23,7 @@ /** * @see Zend_Soap_Wsdl_Strategy_Interface */ -require_once "Zend/Soap/Wsdl/Strategy/Interface.php"; +;// require_once "Zend/Soap/Wsdl/Strategy/Interface.php"; /** * Zend_Soap_Wsdl_Strategy_AnyType diff --git a/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php b/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php index 3e7d6acbb6..f998e91858 100644 --- a/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php +++ b/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php @@ -23,7 +23,7 @@ /** * @see Zend_Soap_Wsdl_Strategy_DefaultComplexType */ -require_once "Zend/Soap/Wsdl/Strategy/DefaultComplexType.php"; +;// require_once "Zend/Soap/Wsdl/Strategy/DefaultComplexType.php"; /** * Zend_Soap_Wsdl_Strategy_ArrayOfTypeComplex @@ -54,7 +54,7 @@ public function addComplexType($type) $nestingLevel = $this->_getNestedCount($type); if($nestingLevel > 1) { - require_once "Zend/Soap/Wsdl/Exception.php"; + ;// require_once "Zend/Soap/Wsdl/Exception.php"; throw new Zend_Soap_Wsdl_Exception( "ArrayOfTypeComplex cannot return nested ArrayOfObject deeper than ". "one level. Use array object properties to return deep nested data. @@ -64,7 +64,7 @@ public function addComplexType($type) $singularType = $this->_getSingularPhpType($type); if(!class_exists($singularType)) { - require_once "Zend/Soap/Wsdl/Exception.php"; + ;// require_once "Zend/Soap/Wsdl/Exception.php"; throw new Zend_Soap_Wsdl_Exception(sprintf( "Cannot add a complex type %s that is not an object or where ". "class could not be found in 'DefaultComplexType' strategy.", $type diff --git a/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php b/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php index 0c04221a33..f334154aad 100644 --- a/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php +++ b/library/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php @@ -22,7 +22,7 @@ /** * @see Zend_Soap_Wsdl_Strategy_DefaultComplexType */ -require_once "Zend/Soap/Wsdl/Strategy/DefaultComplexType.php"; +;// require_once "Zend/Soap/Wsdl/Strategy/DefaultComplexType.php"; /** * Zend_Soap_Wsdl_Strategy_ArrayOfTypeSequence diff --git a/library/Zend/Soap/Wsdl/Strategy/Composite.php b/library/Zend/Soap/Wsdl/Strategy/Composite.php index eb531bfb05..a21f73dc84 100644 --- a/library/Zend/Soap/Wsdl/Strategy/Composite.php +++ b/library/Zend/Soap/Wsdl/Strategy/Composite.php @@ -23,7 +23,7 @@ /** * @see Zend_Soap_Wsdl_Strategy_Interface */ -require_once "Zend/Soap/Wsdl/Strategy/Interface.php"; +;// require_once "Zend/Soap/Wsdl/Strategy/Interface.php"; /** * Zend_Soap_Wsdl_Strategy_Composite @@ -86,7 +86,7 @@ public function connectTypeToStrategy($type, $strategy) /** * @see Zend_Soap_Wsdl_Exception */ - require_once "Zend/Soap/Wsdl/Exception.php"; + ;// require_once "Zend/Soap/Wsdl/Exception.php"; throw new Zend_Soap_Wsdl_Exception("Invalid type given to Composite Type Map."); } $this->_typeMap[$type] = $strategy; @@ -110,7 +110,7 @@ public function getDefaultStrategy() /** * @see Zend_Soap_Wsdl_Exception */ - require_once "Zend/Soap/Wsdl/Exception.php"; + ;// require_once "Zend/Soap/Wsdl/Exception.php"; throw new Zend_Soap_Wsdl_Exception( "Default Strategy for Complex Types is not a valid strategy object." ); @@ -139,7 +139,7 @@ public function getStrategyOfType($type) /** * @see Zend_Soap_Wsdl_Exception */ - require_once "Zend/Soap/Wsdl/Exception.php"; + ;// require_once "Zend/Soap/Wsdl/Exception.php"; throw new Zend_Soap_Wsdl_Exception( "Strategy for Complex Type '".$type."' is not a valid strategy object." ); @@ -175,7 +175,7 @@ public function addComplexType($type) /** * @see Zend_Soap_Wsdl_Exception */ - require_once "Zend/Soap/Wsdl/Exception.php"; + ;// require_once "Zend/Soap/Wsdl/Exception.php"; throw new Zend_Soap_Wsdl_Exception( "Cannot add complex type '".$type."', no context is set for this composite strategy." ); diff --git a/library/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php b/library/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php index 4bbf2a8f3b..326397f5a8 100644 --- a/library/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php +++ b/library/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php @@ -23,7 +23,7 @@ /** * @see Zend_Soap_Wsdl_Strategy_Abstract */ -require_once "Zend/Soap/Wsdl/Strategy/Abstract.php"; +;// require_once "Zend/Soap/Wsdl/Strategy/Abstract.php"; /** * Zend_Soap_Wsdl_Strategy_DefaultComplexType @@ -45,7 +45,7 @@ class Zend_Soap_Wsdl_Strategy_DefaultComplexType extends Zend_Soap_Wsdl_Strategy public function addComplexType($type) { if(!class_exists($type)) { - require_once "Zend/Soap/Wsdl/Exception.php"; + ;// require_once "Zend/Soap/Wsdl/Exception.php"; throw new Zend_Soap_Wsdl_Exception(sprintf( "Cannot add a complex type %s that is not an object or where ". "class could not be found in 'DefaultComplexType' strategy.", $type diff --git a/library/Zend/Stdlib/CallbackHandler.php b/library/Zend/Stdlib/CallbackHandler.php index a3528174eb..f3a5549780 100644 --- a/library/Zend/Stdlib/CallbackHandler.php +++ b/library/Zend/Stdlib/CallbackHandler.php @@ -96,7 +96,7 @@ protected function registerCallback($callback) $callable = is_callable($callback); restore_error_handler(); if (!$callable || $this->error) { - require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; + ;// require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; throw new Zend_Stdlib_Exception_InvalidCallbackException('Invalid callback provided; not callable'); } @@ -275,7 +275,7 @@ protected function validateStringCallbackFor54($callback) list($class, $method) = explode('::', $callback, 2); if (!class_exists($class)) { - require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; + ;// require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; throw new Zend_Stdlib_Exception_InvalidCallbackException(sprintf( 'Static method call "%s" refers to a class that does not exist', $callback @@ -284,7 +284,7 @@ protected function validateStringCallbackFor54($callback) $r = new ReflectionClass($class); if (!$r->hasMethod($method)) { - require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; + ;// require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; throw new Zend_Stdlib_Exception_InvalidCallbackException(sprintf( 'Static method call "%s" refers to a method that does not exist', $callback @@ -292,7 +292,7 @@ protected function validateStringCallbackFor54($callback) } $m = $r->getMethod($method); if (!$m->isStatic()) { - require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; + ;// require_once 'Zend/Stdlib/Exception/InvalidCallbackException.php'; throw new Zend_Stdlib_Exception_InvalidCallbackException(sprintf( 'Static method call "%s" refers to a method that is not static', $callback diff --git a/library/Zend/Stdlib/Exception/InvalidCallbackException.php b/library/Zend/Stdlib/Exception/InvalidCallbackException.php index d973ecb76f..8a8c47cabd 100644 --- a/library/Zend/Stdlib/Exception/InvalidCallbackException.php +++ b/library/Zend/Stdlib/Exception/InvalidCallbackException.php @@ -18,7 +18,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Stdlib/Exception.php'; +;// require_once 'Zend/Stdlib/Exception.php'; /** * Invalid callback exception diff --git a/library/Zend/Stdlib/PriorityQueue.php b/library/Zend/Stdlib/PriorityQueue.php index b2b67a7337..0d3b8b15da 100644 --- a/library/Zend/Stdlib/PriorityQueue.php +++ b/library/Zend/Stdlib/PriorityQueue.php @@ -18,7 +18,7 @@ * @license http://framework.zend.com/license/new-bsd New BSD License */ -require_once 'Zend/Stdlib/SplPriorityQueue.php'; +;// require_once 'Zend/Stdlib/SplPriorityQueue.php'; /** * Re-usable, serializable priority queue implementation diff --git a/library/Zend/Tag/Cloud.php b/library/Zend/Tag/Cloud.php index 2e788e057f..2e7e92780b 100644 --- a/library/Zend/Tag/Cloud.php +++ b/library/Zend/Tag/Cloud.php @@ -23,7 +23,7 @@ /** * @see Zend_Tag_Item */ -require_once 'Zend/Tag/Item.php'; +;// require_once 'Zend/Tag/Item.php'; /** * @category Zend @@ -150,7 +150,7 @@ public function setTags(array $tags) } else if (is_array($tag)) { $itemList[] = new Zend_Tag_Item($tag); } else { - require_once 'Zend/Tag/Cloud/Exception.php'; + ;// require_once 'Zend/Tag/Cloud/Exception.php'; throw new Zend_Tag_Cloud_Exception('Tag must be an instance of Zend_Tag_Taggable or an array'); } } @@ -172,7 +172,7 @@ public function appendTag($tag) } else if (is_array($tag)) { $tags[] = new Zend_Tag_Item($tag); } else { - require_once 'Zend/Tag/Cloud/Exception.php'; + ;// require_once 'Zend/Tag/Cloud/Exception.php'; throw new Zend_Tag_Cloud_Exception('Tag must be an instance of Zend_Tag_Taggable or an array'); } @@ -201,7 +201,7 @@ public function setItemList(Zend_Tag_ItemList $itemList) public function getItemList() { if (null === $this->_tags) { - require_once 'Zend/Tag/ItemList.php'; + ;// require_once 'Zend/Tag/ItemList.php'; $this->setItemList(new Zend_Tag_ItemList()); } return $this->_tags; @@ -233,7 +233,7 @@ public function setCloudDecorator($decorator) } if (!($decorator instanceof Zend_Tag_Cloud_Decorator_Cloud)) { - require_once 'Zend/Tag/Cloud/Exception.php'; + ;// require_once 'Zend/Tag/Cloud/Exception.php'; throw new Zend_Tag_Cloud_Exception('Decorator is no instance of Zend_Tag_Cloud_Decorator_Cloud'); } @@ -281,7 +281,7 @@ public function setTagDecorator($decorator) } if (!($decorator instanceof Zend_Tag_Cloud_Decorator_Tag)) { - require_once 'Zend/Tag/Cloud/Exception.php'; + ;// require_once 'Zend/Tag/Cloud/Exception.php'; throw new Zend_Tag_Cloud_Exception('Decorator is no instance of Zend_Tag_Cloud_Decorator_Tag'); } @@ -326,7 +326,7 @@ public function getPluginLoader() $prefix = 'Zend_Tag_Cloud_Decorator_'; $pathPrefix = 'Zend/Tag/Cloud/Decorator/'; - require_once 'Zend/Loader/PluginLoader.php'; + ;// require_once 'Zend/Loader/PluginLoader.php'; $this->_pluginLoader = new Zend_Loader_PluginLoader(array($prefix => $pathPrefix)); } diff --git a/library/Zend/Tag/Cloud/Decorator/Exception.php b/library/Zend/Tag/Cloud/Decorator/Exception.php index cd2d8aea77..9880e97fda 100644 --- a/library/Zend/Tag/Cloud/Decorator/Exception.php +++ b/library/Zend/Tag/Cloud/Decorator/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Tag_Cloud_Exception */ -require_once 'Zend/Tag/Cloud/Exception.php'; +;// require_once 'Zend/Tag/Cloud/Exception.php'; /** * Exception class for Zend_Tag_Cloud_Decorator diff --git a/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php b/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php index 917ae1cf03..9aad00887b 100644 --- a/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php +++ b/library/Zend/Tag/Cloud/Decorator/HtmlCloud.php @@ -23,7 +23,7 @@ /** * @see Zend_Tag_Cloud_Decorator_Cloud */ -require_once 'Zend/Tag/Cloud/Decorator/Cloud.php'; +;// require_once 'Zend/Tag/Cloud/Decorator/Cloud.php'; /** * Simple HTML decorator for clouds diff --git a/library/Zend/Tag/Cloud/Decorator/HtmlTag.php b/library/Zend/Tag/Cloud/Decorator/HtmlTag.php index 5bb44d0e8a..abd281ec4a 100644 --- a/library/Zend/Tag/Cloud/Decorator/HtmlTag.php +++ b/library/Zend/Tag/Cloud/Decorator/HtmlTag.php @@ -23,7 +23,7 @@ /** * @see Zend_Tag_Cloud_Decorator_Tag */ -require_once 'Zend/Tag/Cloud/Decorator/Tag.php'; +;// require_once 'Zend/Tag/Cloud/Decorator/Tag.php'; /** * Simple HTML decorator for tags @@ -98,13 +98,13 @@ public function setClassList(array $classList = null) { if (is_array($classList)) { if (count($classList) === 0) { - require_once 'Zend/Tag/Cloud/Decorator/Exception.php'; + ;// require_once 'Zend/Tag/Cloud/Decorator/Exception.php'; throw new Zend_Tag_Cloud_Decorator_Exception('Classlist is empty'); } foreach ($classList as $class) { if (!is_string($class)) { - require_once 'Zend/Tag/Cloud/Decorator/Exception.php'; + ;// require_once 'Zend/Tag/Cloud/Decorator/Exception.php'; throw new Zend_Tag_Cloud_Decorator_Exception('Classlist contains an invalid classname'); } } @@ -158,7 +158,7 @@ public function setEncoding($value) public function setFontSizeUnit($fontSizeUnit) { if (!in_array($fontSizeUnit, $this->_alloweFontSizeUnits)) { - require_once 'Zend/Tag/Cloud/Decorator/Exception.php'; + ;// require_once 'Zend/Tag/Cloud/Decorator/Exception.php'; throw new Zend_Tag_Cloud_Decorator_Exception('Invalid fontsize unit specified'); } @@ -208,7 +208,7 @@ public function getHtmlTags() public function setMaxFontSize($maxFontSize) { if (!is_numeric($maxFontSize)) { - require_once 'Zend/Tag/Cloud/Decorator/Exception.php'; + ;// require_once 'Zend/Tag/Cloud/Decorator/Exception.php'; throw new Zend_Tag_Cloud_Decorator_Exception('Fontsize must be numeric'); } @@ -237,7 +237,7 @@ public function getMaxFontSize() public function setMinFontSize($minFontSize) { if (!is_numeric($minFontSize)) { - require_once 'Zend/Tag/Cloud/Decorator/Exception.php'; + ;// require_once 'Zend/Tag/Cloud/Decorator/Exception.php'; throw new Zend_Tag_Cloud_Decorator_Exception('Fontsize must be numeric'); } diff --git a/library/Zend/Tag/Cloud/Exception.php b/library/Zend/Tag/Cloud/Exception.php index 08fcb40980..ca8a97bfc9 100644 --- a/library/Zend/Tag/Cloud/Exception.php +++ b/library/Zend/Tag/Cloud/Exception.php @@ -22,7 +22,7 @@ /** * Zend_Tag_Exception */ -require_once 'Zend/Tag/Exception.php'; +;// require_once 'Zend/Tag/Exception.php'; /** * Exception class for Zend_Tag_Cloud diff --git a/library/Zend/Tag/Exception.php b/library/Zend/Tag/Exception.php index 52a9fce522..af9e0fac1c 100644 --- a/library/Zend/Tag/Exception.php +++ b/library/Zend/Tag/Exception.php @@ -22,7 +22,7 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * Exception class for Zend_Tag diff --git a/library/Zend/Tag/Item.php b/library/Zend/Tag/Item.php index cb51e4b50f..d49328ead3 100644 --- a/library/Zend/Tag/Item.php +++ b/library/Zend/Tag/Item.php @@ -23,7 +23,7 @@ /** * @see Zend_Tag_Taggable */ -require_once 'Zend/Tag/Taggable.php'; +;// require_once 'Zend/Tag/Taggable.php'; /** * @category Zend @@ -81,19 +81,19 @@ public function __construct($options) } if (!is_array($options)) { - require_once 'Zend/Tag/Exception.php'; + ;// require_once 'Zend/Tag/Exception.php'; throw new Zend_Tag_Exception('Invalid options provided to constructor'); } $this->setOptions($options); if ($this->_title === null) { - require_once 'Zend/Tag/Exception.php'; + ;// require_once 'Zend/Tag/Exception.php'; throw new Zend_Tag_Exception('Title was not set'); } if ($this->_weight === null) { - require_once 'Zend/Tag/Exception.php'; + ;// require_once 'Zend/Tag/Exception.php'; throw new Zend_Tag_Exception('Weight was not set'); } } @@ -140,7 +140,7 @@ public function getTitle() public function setTitle($title) { if (!is_string($title)) { - require_once 'Zend/Tag/Exception.php'; + ;// require_once 'Zend/Tag/Exception.php'; throw new Zend_Tag_Exception('Title must be a string'); } @@ -168,7 +168,7 @@ public function getWeight() public function setWeight($weight) { if (!is_numeric($weight)) { - require_once 'Zend/Tag/Exception.php'; + ;// require_once 'Zend/Tag/Exception.php'; throw new Zend_Tag_Exception('Weight must be numeric'); } diff --git a/library/Zend/Tag/ItemList.php b/library/Zend/Tag/ItemList.php index 856acc8455..315be41c8c 100644 --- a/library/Zend/Tag/ItemList.php +++ b/library/Zend/Tag/ItemList.php @@ -23,7 +23,7 @@ /** * @see Zend_Tag_Taggable */ -require_once 'Zend/Tag/Taggable.php'; +;// require_once 'Zend/Tag/Taggable.php'; /** * @category Zend @@ -61,7 +61,7 @@ public function spreadWeightValues(array $values) { // Don't allow an empty value list if (count($values) === 0) { - require_once 'Zend/Tag/Exception.php'; + ;// require_once 'Zend/Tag/Exception.php'; throw new Zend_Tag_Exception('Value list may not be empty'); } @@ -219,7 +219,7 @@ public function offsetSet($offset, $item): void // We need to make that check here, as the method signature must be // compatible with ArrayAccess::offsetSet() if (!($item instanceof Zend_Tag_Taggable)) { - require_once 'Zend/Tag/Exception.php'; + ;// require_once 'Zend/Tag/Exception.php'; throw new Zend_Tag_Exception('Item must implement Zend_Tag_Taggable'); } diff --git a/library/Zend/Test/DbAdapter.php b/library/Zend/Test/DbAdapter.php index 31198944fd..d053e33ac2 100644 --- a/library/Zend/Test/DbAdapter.php +++ b/library/Zend/Test/DbAdapter.php @@ -23,17 +23,17 @@ /** * @see Zend_Db_Adapter_Abstract */ -require_once "Zend/Db/Adapter/Abstract.php"; +;// require_once "Zend/Db/Adapter/Abstract.php"; /** * @see Zend_Test_DbStatement */ -require_once "Zend/Test/DbStatement.php"; +;// require_once "Zend/Test/DbStatement.php"; /** * @see Zend_Db_Profiler */ -require_once 'Zend/Db/Profiler.php'; +;// require_once 'Zend/Db/Profiler.php'; /** * Testing Database Adapter which acts as a stack for SQL Results diff --git a/library/Zend/Test/DbStatement.php b/library/Zend/Test/DbStatement.php index cf36a8fac6..61ea34cb3d 100644 --- a/library/Zend/Test/DbStatement.php +++ b/library/Zend/Test/DbStatement.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Statement_Interface */ -require_once "Zend/Db/Statement/Interface.php"; +;// require_once "Zend/Db/Statement/Interface.php"; /** * Testing Database Statement that acts as a stack to SQL resultsets. @@ -305,7 +305,7 @@ public function fetchColumn($col = 0) return false; } else { if(count($row) < $col) { - require_once "Zend/Db/Statement/Exception.php"; + ;// require_once "Zend/Db/Statement/Exception.php"; throw new Zend_Db_Statement_Exception( "Column Position '".$col."' is out of bounds." ); diff --git a/library/Zend/Test/PHPUnit/Constraint/DomQuery34.php b/library/Zend/Test/PHPUnit/Constraint/DomQuery34.php index 740f51cbb2..86ea6cb85b 100644 --- a/library/Zend/Test/PHPUnit/Constraint/DomQuery34.php +++ b/library/Zend/Test/PHPUnit/Constraint/DomQuery34.php @@ -21,7 +21,7 @@ */ /** @see Zend_Dom_Query */ -require_once 'Zend/Dom/Query.php'; +;// require_once 'Zend/Dom/Query.php'; /** * Zend_Dom_Query-based PHPUnit Constraint @@ -149,7 +149,7 @@ public function evaluate($other, $assertType = null) } if (!in_array($assertType, $this->_assertTypes)) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__)); } @@ -165,7 +165,7 @@ public function evaluate($other, $assertType = null) switch ($assertType) { case self::ASSERT_CONTENT_CONTAINS: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No content provided against which to match'); } $this->_content = $content = $argv[2]; @@ -174,7 +174,7 @@ public function evaluate($other, $assertType = null) : $this->_matchContent($result, $content); case self::ASSERT_CONTENT_REGEX: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No pattern provided against which to match'); } $this->_content = $content = $argv[2]; @@ -185,7 +185,7 @@ public function evaluate($other, $assertType = null) case self::ASSERT_CONTENT_COUNT_MIN: case self::ASSERT_CONTENT_COUNT_MAX: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No count provided against which to compare'); } $this->_content = $content = $argv[2]; @@ -212,7 +212,7 @@ public function evaluate($other, $assertType = null) */ public function fail($other, $description, $not = false) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; switch ($this->_assertType) { case self::ASSERT_CONTENT_CONTAINS: $failure = 'Failed asserting node denoted by %s CONTAINS content "%s"'; diff --git a/library/Zend/Test/PHPUnit/Constraint/DomQuery37.php b/library/Zend/Test/PHPUnit/Constraint/DomQuery37.php index b5c230ab72..69ef6f60fd 100644 --- a/library/Zend/Test/PHPUnit/Constraint/DomQuery37.php +++ b/library/Zend/Test/PHPUnit/Constraint/DomQuery37.php @@ -21,7 +21,7 @@ */ /** @see Zend_Dom_Query */ -require_once 'Zend/Dom/Query.php'; +;// require_once 'Zend/Dom/Query.php'; /** * Zend_Dom_Query-based PHPUnit Constraint @@ -157,7 +157,7 @@ public function evaluate($content, $assertType = '', $match = FALSE) } if (!in_array($assertType, $this->_assertTypes)) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__)); } @@ -171,7 +171,7 @@ public function evaluate($content, $assertType = '', $match = FALSE) switch ($assertType) { case self::ASSERT_CONTENT_CONTAINS: if (!$match) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No content provided against which to match'); } $this->_content = $match; @@ -180,7 +180,7 @@ public function evaluate($content, $assertType = '', $match = FALSE) : $this->_matchContent($result, $match); case self::ASSERT_CONTENT_REGEX: if (!$match) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No pattern provided against which to match'); } $this->_content = $match; @@ -191,7 +191,7 @@ public function evaluate($content, $assertType = '', $match = FALSE) case self::ASSERT_CONTENT_COUNT_MIN: case self::ASSERT_CONTENT_COUNT_MAX: if ($match === false) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No count provided against which to compare'); } $this->_content = $match; @@ -224,7 +224,7 @@ public function evaluate($content, $assertType = '', $match = FALSE) */ public function fail($other, $description, PHPUnit_Framework_ComparisonFailure $cannot_be_used = NULL) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; switch ($this->_assertType) { case self::ASSERT_CONTENT_CONTAINS: $failure = 'Failed asserting node denoted by %s CONTAINS content "%s"'; diff --git a/library/Zend/Test/PHPUnit/Constraint/DomQuery41.php b/library/Zend/Test/PHPUnit/Constraint/DomQuery41.php index 28cc484b3a..266824d6d4 100644 --- a/library/Zend/Test/PHPUnit/Constraint/DomQuery41.php +++ b/library/Zend/Test/PHPUnit/Constraint/DomQuery41.php @@ -21,7 +21,7 @@ */ /** @see Zend_Dom_Query */ -require_once 'Zend/Dom/Query.php'; +;// require_once 'Zend/Dom/Query.php'; /** * Zend_Dom_Query-based PHPUnit Constraint @@ -157,7 +157,7 @@ public function evaluate($content, $assertType = '', $match = FALSE) } if (!in_array($assertType, $this->_assertTypes)) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__)); } @@ -171,7 +171,7 @@ public function evaluate($content, $assertType = '', $match = FALSE) switch ($assertType) { case self::ASSERT_CONTENT_CONTAINS: if (!$match) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No content provided against which to match'); } $this->_content = $match; @@ -180,7 +180,7 @@ public function evaluate($content, $assertType = '', $match = FALSE) : $this->_matchContent($result, $match); case self::ASSERT_CONTENT_REGEX: if (!$match) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No pattern provided against which to match'); } $this->_content = $match; @@ -191,7 +191,7 @@ public function evaluate($content, $assertType = '', $match = FALSE) case self::ASSERT_CONTENT_COUNT_MIN: case self::ASSERT_CONTENT_COUNT_MAX: if ($match === false) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No count provided against which to compare'); } $this->_content = $match; @@ -226,7 +226,7 @@ public function evaluate($content, $assertType = '', $match = FALSE) */ public function fail($other, $description, \SebastianBergmann\Comparator\ComparisonFailure $cannot_be_used = NULL) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; switch ($this->_assertType) { case self::ASSERT_CONTENT_CONTAINS: $failure = 'Failed asserting node denoted by %s CONTAINS content "%s"'; diff --git a/library/Zend/Test/PHPUnit/Constraint/Redirect34.php b/library/Zend/Test/PHPUnit/Constraint/Redirect34.php index e8d9f8ed9e..10c6f0c2ce 100644 --- a/library/Zend/Test/PHPUnit/Constraint/Redirect34.php +++ b/library/Zend/Test/PHPUnit/Constraint/Redirect34.php @@ -103,7 +103,7 @@ public function setNegate($flag = true) public function evaluate($other, $assertType = null) { if (!$other instanceof Zend_Controller_Response_Abstract) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Redirect constraint assertions require a response object'); } @@ -113,7 +113,7 @@ public function evaluate($other, $assertType = null) } if (!in_array($assertType, $this->_assertTypes)) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__)); } @@ -126,7 +126,7 @@ public function evaluate($other, $assertType = null) switch ($assertType) { case self::ASSERT_REDIRECT_TO: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No redirect URL provided against which to match'); } $this->_match = $match = $argv[2]; @@ -135,7 +135,7 @@ public function evaluate($other, $assertType = null) : $this->_match($response, $match); case self::ASSERT_REDIRECT_REGEX: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No pattern provided against which to match redirect'); } $this->_match = $match = $argv[2]; @@ -166,7 +166,7 @@ public function evaluate($other, $assertType = null) */ public function fail($other, $description, $not = false) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; switch ($this->_assertType) { case self::ASSERT_REDIRECT_TO: $failure = 'Failed asserting response redirects to "%s"'; diff --git a/library/Zend/Test/PHPUnit/Constraint/Redirect37.php b/library/Zend/Test/PHPUnit/Constraint/Redirect37.php index 0494c976f9..e9b7ce7ed5 100644 --- a/library/Zend/Test/PHPUnit/Constraint/Redirect37.php +++ b/library/Zend/Test/PHPUnit/Constraint/Redirect37.php @@ -109,7 +109,7 @@ public function setNegate($flag = true) public function evaluate($other, $assertType = null, $variable = FALSE) { if (!$other instanceof Zend_Controller_Response_Abstract) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Redirect constraint assertions require a response object'); } @@ -119,7 +119,7 @@ public function evaluate($other, $assertType = null, $variable = FALSE) } if (!in_array($assertType, $this->_assertTypes)) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__)); } @@ -132,7 +132,7 @@ public function evaluate($other, $assertType = null, $variable = FALSE) switch ($assertType) { case self::ASSERT_REDIRECT_TO: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No redirect URL provided against which to match'); } $this->_match = $match = $argv[2]; @@ -141,7 +141,7 @@ public function evaluate($other, $assertType = null, $variable = FALSE) : $this->_match($response, $match); case self::ASSERT_REDIRECT_REGEX: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No pattern provided against which to match redirect'); } $this->_match = $match = $argv[2]; @@ -178,7 +178,7 @@ public function evaluate($other, $assertType = null, $variable = FALSE) */ public function fail($other, $description, PHPUnit_Framework_ComparisonFailure $cannot_be_used = NULL) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; switch ($this->_assertType) { case self::ASSERT_REDIRECT_TO: $failure = 'Failed asserting response redirects to "%s"'; diff --git a/library/Zend/Test/PHPUnit/Constraint/Redirect41.php b/library/Zend/Test/PHPUnit/Constraint/Redirect41.php index 6f6e915648..20d472bcf3 100644 --- a/library/Zend/Test/PHPUnit/Constraint/Redirect41.php +++ b/library/Zend/Test/PHPUnit/Constraint/Redirect41.php @@ -109,7 +109,7 @@ public function setNegate($flag = true) public function evaluate($other, $assertType = null, $variable = FALSE) { if (!$other instanceof Zend_Controller_Response_Abstract) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Redirect constraint assertions require a response object'); } @@ -119,7 +119,7 @@ public function evaluate($other, $assertType = null, $variable = FALSE) } if (!in_array($assertType, $this->_assertTypes)) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__)); } @@ -132,7 +132,7 @@ public function evaluate($other, $assertType = null, $variable = FALSE) switch ($assertType) { case self::ASSERT_REDIRECT_TO: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No redirect URL provided against which to match'); } $this->_match = $match = $argv[2]; @@ -141,7 +141,7 @@ public function evaluate($other, $assertType = null, $variable = FALSE) : $this->_match($response, $match); case self::ASSERT_REDIRECT_REGEX: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No pattern provided against which to match redirect'); } $this->_match = $match = $argv[2]; @@ -180,7 +180,7 @@ public function evaluate($other, $assertType = null, $variable = FALSE) */ public function fail($other, $description, \SebastianBergmann\Comparator\ComparisonFailure $cannot_be_used = NULL) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; switch ($this->_assertType) { case self::ASSERT_REDIRECT_TO: $failure = 'Failed asserting response redirects to "%s"'; diff --git a/library/Zend/Test/PHPUnit/Constraint/ResponseHeader34.php b/library/Zend/Test/PHPUnit/Constraint/ResponseHeader34.php index 3d37756d23..fd4e2e2c33 100644 --- a/library/Zend/Test/PHPUnit/Constraint/ResponseHeader34.php +++ b/library/Zend/Test/PHPUnit/Constraint/ResponseHeader34.php @@ -114,7 +114,7 @@ public function setNegate($flag = true) public function evaluate($other, $assertType = null) { if (!$other instanceof Zend_Controller_Response_Abstract) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Header constraint assertions require a response object'); } @@ -124,7 +124,7 @@ public function evaluate($other, $assertType = null) } if (!in_array($assertType, $this->_assertTypes)) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__)); } @@ -137,7 +137,7 @@ public function evaluate($other, $assertType = null) switch ($assertType) { case self::ASSERT_RESPONSE_CODE: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No response code provided against which to match'); } $this->_code = $code = $argv[2]; @@ -146,7 +146,7 @@ public function evaluate($other, $assertType = null) : $this->_code($response, $code); case self::ASSERT_HEADER: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No header provided against which to match'); } $this->_header = $header = $argv[2]; @@ -155,7 +155,7 @@ public function evaluate($other, $assertType = null) : $this->_header($response, $header); case self::ASSERT_HEADER_CONTAINS: if (4 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Both a header name and content to match are required for ' . __FUNCTION__); } $this->_header = $header = $argv[2]; @@ -165,7 +165,7 @@ public function evaluate($other, $assertType = null) : $this->_headerContains($response, $header, $match); case self::ASSERT_HEADER_REGEX: if (4 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Both a header name and content to match are required for ' . __FUNCTION__); } $this->_header = $header = $argv[2]; @@ -174,7 +174,7 @@ public function evaluate($other, $assertType = null) ? $this->_notHeaderRegex($response, $header, $match) : $this->_headerRegex($response, $header, $match); default: - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Invalid assertion type ' . __FUNCTION__); } } @@ -191,7 +191,7 @@ public function evaluate($other, $assertType = null) */ public function fail($other, $description, $not = false) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; switch ($this->_assertType) { case self::ASSERT_RESPONSE_CODE: $failure = 'Failed asserting response code "%s"'; diff --git a/library/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php b/library/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php index ad26f0eb69..dd93ac04b5 100644 --- a/library/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php +++ b/library/Zend/Test/PHPUnit/Constraint/ResponseHeader37.php @@ -122,7 +122,7 @@ public function setNegate($flag = true) public function evaluate($response, $assertType = '', $variable = FALSE) { if (!$response instanceof Zend_Controller_Response_Abstract) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Header constraint assertions require a response object'); } @@ -132,7 +132,7 @@ public function evaluate($response, $assertType = '', $variable = FALSE) } if (!in_array($assertType, $this->_assertTypes)) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__)); } @@ -144,7 +144,7 @@ public function evaluate($response, $assertType = '', $variable = FALSE) switch ($assertType) { case self::ASSERT_RESPONSE_CODE: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No response code provided against which to match'); } $this->_code = $code = $argv[2]; @@ -153,7 +153,7 @@ public function evaluate($response, $assertType = '', $variable = FALSE) : $this->_code($response, $code); case self::ASSERT_HEADER: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No header provided against which to match'); } $this->_header = $header = $argv[2]; @@ -162,7 +162,7 @@ public function evaluate($response, $assertType = '', $variable = FALSE) : $this->_header($response, $header); case self::ASSERT_HEADER_CONTAINS: if (4 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Both a header name and content to match are required for ' . $assertType); } $this->_header = $header = $argv[2]; @@ -172,7 +172,7 @@ public function evaluate($response, $assertType = '', $variable = FALSE) : $this->_headerContains($response, $header, $match); case self::ASSERT_HEADER_REGEX: if (4 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Both a header name and content to match are required for ' . $assertType); } $this->_header = $header = $argv[2]; @@ -181,7 +181,7 @@ public function evaluate($response, $assertType = '', $variable = FALSE) ? $this->_notHeaderRegex($response, $header, $match) : $this->_headerRegex($response, $header, $match); default: - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Invalid assertion type ' . $assertType); } } @@ -204,7 +204,7 @@ public function evaluate($response, $assertType = '', $variable = FALSE) */ public function fail($other, $description, PHPUnit_Framework_ComparisonFailure $cannot_be_used = NULL) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; switch ($this->_assertType) { case self::ASSERT_RESPONSE_CODE: $failure = 'Failed asserting response code "%s"'; diff --git a/library/Zend/Test/PHPUnit/Constraint/ResponseHeader41.php b/library/Zend/Test/PHPUnit/Constraint/ResponseHeader41.php index 7f244d43bf..d94f9d46a8 100644 --- a/library/Zend/Test/PHPUnit/Constraint/ResponseHeader41.php +++ b/library/Zend/Test/PHPUnit/Constraint/ResponseHeader41.php @@ -122,7 +122,7 @@ public function setNegate($flag = true) public function evaluate($response, $assertType = '', $variable = FALSE) { if (!$response instanceof Zend_Controller_Response_Abstract) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Header constraint assertions require a response object'); } @@ -132,7 +132,7 @@ public function evaluate($response, $assertType = '', $variable = FALSE) } if (!in_array($assertType, $this->_assertTypes)) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception(sprintf('Invalid assertion type "%s" provided to %s constraint', $assertType, __CLASS__)); } @@ -144,7 +144,7 @@ public function evaluate($response, $assertType = '', $variable = FALSE) switch ($assertType) { case self::ASSERT_RESPONSE_CODE: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No response code provided against which to match'); } $this->_code = $code = $argv[2]; @@ -153,7 +153,7 @@ public function evaluate($response, $assertType = '', $variable = FALSE) : $this->_code($response, $code); case self::ASSERT_HEADER: if (3 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('No header provided against which to match'); } $this->_header = $header = $argv[2]; @@ -162,7 +162,7 @@ public function evaluate($response, $assertType = '', $variable = FALSE) : $this->_header($response, $header); case self::ASSERT_HEADER_CONTAINS: if (4 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Both a header name and content to match are required for ' . $assertType); } $this->_header = $header = $argv[2]; @@ -172,7 +172,7 @@ public function evaluate($response, $assertType = '', $variable = FALSE) : $this->_headerContains($response, $header, $match); case self::ASSERT_HEADER_REGEX: if (4 > $argc) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Both a header name and content to match are required for ' . $assertType); } $this->_header = $header = $argv[2]; @@ -181,7 +181,7 @@ public function evaluate($response, $assertType = '', $variable = FALSE) ? $this->_notHeaderRegex($response, $header, $match) : $this->_headerRegex($response, $header, $match); default: - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; throw new Zend_Test_PHPUnit_Constraint_Exception('Invalid assertion type ' . $assertType); } } @@ -206,7 +206,7 @@ public function evaluate($response, $assertType = '', $variable = FALSE) */ public function fail($other, $description, \SebastianBergmann\Comparator\ComparisonFailure $cannot_be_used = NULL) { - require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Exception.php'; switch ($this->_assertType) { case self::ASSERT_RESPONSE_CODE: $failure = 'Failed asserting response code "%s"'; diff --git a/library/Zend/Test/PHPUnit/ControllerTestCase.php b/library/Zend/Test/PHPUnit/ControllerTestCase.php index 69976f0d93..75ab729cc3 100644 --- a/library/Zend/Test/PHPUnit/ControllerTestCase.php +++ b/library/Zend/Test/PHPUnit/ControllerTestCase.php @@ -20,19 +20,19 @@ */ /** @see Zend_Controller_Front */ -require_once 'Zend/Controller/Front.php'; +;// require_once 'Zend/Controller/Front.php'; /** @see Zend_Controller_Action_HelperBroker */ -require_once 'Zend/Controller/Action/HelperBroker.php'; +;// require_once 'Zend/Controller/Action/HelperBroker.php'; /** @see Zend_Layout */ -require_once 'Zend/Layout.php'; +;// require_once 'Zend/Layout.php'; /** @see Zend_Session */ -require_once 'Zend/Session.php'; +;// require_once 'Zend/Session.php'; /** @see Zend_Registry */ -require_once 'Zend/Registry.php'; +;// require_once 'Zend/Registry.php'; /** * Functional testing scaffold for MVC applications @@ -87,7 +87,7 @@ abstract class Zend_Test_PHPUnit_ControllerTestCase extends PHPUnit_Framework_Te public function __set($name, $value) { if (in_array($name, array('request', 'response', 'frontController'))) { - require_once 'Zend/Exception.php'; + ;// require_once 'Zend/Exception.php'; throw new Zend_Exception(sprintf('Setting %s object manually is not allowed', $name)); } $this->$name = $value; @@ -144,7 +144,7 @@ final public function bootstrap() } elseif (is_callable($this->bootstrap)) { call_user_func($this->bootstrap); } elseif (is_string($this->bootstrap)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; if (Zend_Loader::isReadable($this->bootstrap)) { include $this->bootstrap; } @@ -275,7 +275,7 @@ public function resetResponse() public function assertQuery($path, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $content = $this->response->outputBody(); if (!$constraint->evaluate($content, __FUNCTION__)) { @@ -292,7 +292,7 @@ public function assertQuery($path, $message = '') public function assertNotQuery($path, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $content = $this->response->outputBody(); if (!$constraint->evaluate($content, __FUNCTION__)) { @@ -310,7 +310,7 @@ public function assertNotQuery($path, $message = '') public function assertQueryContentContains($path, $match, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $content = $this->response->outputBody(); if (!$constraint->evaluate($content, __FUNCTION__, $match)) { @@ -328,7 +328,7 @@ public function assertQueryContentContains($path, $match, $message = '') public function assertNotQueryContentContains($path, $match, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $content = $this->response->outputBody(); if (!$constraint->evaluate($content, __FUNCTION__, $match)) { @@ -346,7 +346,7 @@ public function assertNotQueryContentContains($path, $match, $message = '') public function assertQueryContentRegex($path, $pattern, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $content = $this->response->outputBody(); if (!$constraint->evaluate($content, __FUNCTION__, $pattern)) { @@ -364,7 +364,7 @@ public function assertQueryContentRegex($path, $pattern, $message = '') public function assertNotQueryContentRegex($path, $pattern, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $content = $this->response->outputBody(); if (!$constraint->evaluate($content, __FUNCTION__, $pattern)) { @@ -382,7 +382,7 @@ public function assertNotQueryContentRegex($path, $pattern, $message = '') public function assertQueryCount($path, $count, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $content = $this->response->outputBody(); if (!$constraint->evaluate($content, __FUNCTION__, $count)) { @@ -400,7 +400,7 @@ public function assertQueryCount($path, $count, $message = '') public function assertNotQueryCount($path, $count, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $content = $this->response->outputBody(); if (!$constraint->evaluate($content, __FUNCTION__, $count)) { @@ -418,7 +418,7 @@ public function assertNotQueryCount($path, $count, $message = '') public function assertQueryCountMin($path, $count, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $content = $this->response->outputBody(); if (!$constraint->evaluate($content, __FUNCTION__, $count)) { @@ -436,7 +436,7 @@ public function assertQueryCountMin($path, $count, $message = '') public function assertQueryCountMax($path, $count, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $content = $this->response->outputBody(); if (!$constraint->evaluate($content, __FUNCTION__, $count)) { @@ -463,7 +463,7 @@ public function registerXpathNamespaces($xpathNamespaces) public function assertXpath($path, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $constraint->registerXpathNamespaces($this->_xpathNamespaces); $content = $this->response->outputBody(); @@ -481,7 +481,7 @@ public function assertXpath($path, $message = '') public function assertNotXpath($path, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $constraint->registerXpathNamespaces($this->_xpathNamespaces); $content = $this->response->outputBody(); @@ -500,7 +500,7 @@ public function assertNotXpath($path, $message = '') public function assertXpathContentContains($path, $match, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $constraint->registerXpathNamespaces($this->_xpathNamespaces); $content = $this->response->outputBody(); @@ -519,7 +519,7 @@ public function assertXpathContentContains($path, $match, $message = '') public function assertNotXpathContentContains($path, $match, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $constraint->registerXpathNamespaces($this->_xpathNamespaces); $content = $this->response->outputBody(); @@ -538,7 +538,7 @@ public function assertNotXpathContentContains($path, $match, $message = '') public function assertXpathContentRegex($path, $pattern, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $constraint->registerXpathNamespaces($this->_xpathNamespaces); $content = $this->response->outputBody(); @@ -557,7 +557,7 @@ public function assertXpathContentRegex($path, $pattern, $message = '') public function assertNotXpathContentRegex($path, $pattern, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $constraint->registerXpathNamespaces($this->_xpathNamespaces); $content = $this->response->outputBody(); @@ -576,7 +576,7 @@ public function assertNotXpathContentRegex($path, $pattern, $message = '') public function assertXpathCount($path, $count, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $constraint->registerXpathNamespaces($this->_xpathNamespaces); $content = $this->response->outputBody(); @@ -595,7 +595,7 @@ public function assertXpathCount($path, $count, $message = '') public function assertNotXpathCount($path, $count, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $constraint->registerXpathNamespaces($this->_xpathNamespaces); $content = $this->response->outputBody(); @@ -614,7 +614,7 @@ public function assertNotXpathCount($path, $count, $message = '') public function assertXpathCountMin($path, $count, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $constraint->registerXpathNamespaces($this->_xpathNamespaces); $content = $this->response->outputBody(); @@ -633,7 +633,7 @@ public function assertXpathCountMin($path, $count, $message = '') public function assertXpathCountMax($path, $count, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/DomQuery.php'; $constraint = new Zend_Test_PHPUnit_Constraint_DomQuery($path); $constraint->registerXpathNamespaces($this->_xpathNamespaces); $content = $this->response->outputBody(); @@ -650,7 +650,7 @@ public function assertXpathCountMax($path, $count, $message = '') public function assertRedirect($message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php'; $constraint = new Zend_Test_PHPUnit_Constraint_Redirect(); $response = $this->response; if (!$constraint->evaluate($response, __FUNCTION__)) { @@ -666,7 +666,7 @@ public function assertRedirect($message = '') public function assertNotRedirect($message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php'; $constraint = new Zend_Test_PHPUnit_Constraint_Redirect(); $response = $this->response; if (!$constraint->evaluate($response, __FUNCTION__)) { @@ -683,7 +683,7 @@ public function assertNotRedirect($message = '') public function assertRedirectTo($url, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php'; $constraint = new Zend_Test_PHPUnit_Constraint_Redirect(); $response = $this->response; if (!$constraint->evaluate($response, __FUNCTION__, $url)) { @@ -700,7 +700,7 @@ public function assertRedirectTo($url, $message = '') public function assertNotRedirectTo($url, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php'; $constraint = new Zend_Test_PHPUnit_Constraint_Redirect(); $response = $this->response; if (!$constraint->evaluate($response, __FUNCTION__, $url)) { @@ -717,7 +717,7 @@ public function assertNotRedirectTo($url, $message = '') public function assertRedirectRegex($pattern, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php'; $constraint = new Zend_Test_PHPUnit_Constraint_Redirect(); $response = $this->response; if (!$constraint->evaluate($response, __FUNCTION__, $pattern)) { @@ -734,7 +734,7 @@ public function assertRedirectRegex($pattern, $message = '') public function assertNotRedirectRegex($pattern, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/Redirect.php'; $constraint = new Zend_Test_PHPUnit_Constraint_Redirect(); $response = $this->response; if (!$constraint->evaluate($response, __FUNCTION__, $pattern)) { @@ -751,7 +751,7 @@ public function assertNotRedirectRegex($pattern, $message = '') public function assertResponseCode($code, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader(); $response = $this->response; if (!$constraint->evaluate($response, __FUNCTION__, $code)) { @@ -768,7 +768,7 @@ public function assertResponseCode($code, $message = '') public function assertNotResponseCode($code, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader(); $constraint->setNegate(true); $response = $this->response; @@ -786,7 +786,7 @@ public function assertNotResponseCode($code, $message = '') public function assertHeader($header, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader(); $response = $this->response; if (!$constraint->evaluate($response, __FUNCTION__, $header)) { @@ -803,7 +803,7 @@ public function assertHeader($header, $message = '') public function assertNotHeader($header, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader(); $constraint->setNegate(true); $response = $this->response; @@ -822,7 +822,7 @@ public function assertNotHeader($header, $message = '') public function assertHeaderContains($header, $match, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader(); $response = $this->response; if (!$constraint->evaluate($response, __FUNCTION__, $header, $match)) { @@ -840,7 +840,7 @@ public function assertHeaderContains($header, $match, $message = '') public function assertNotHeaderContains($header, $match, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader(); $constraint->setNegate(true); $response = $this->response; @@ -859,7 +859,7 @@ public function assertNotHeaderContains($header, $match, $message = '') public function assertHeaderRegex($header, $pattern, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader(); $response = $this->response; if (!$constraint->evaluate($response, __FUNCTION__, $header, $pattern)) { @@ -877,7 +877,7 @@ public function assertHeaderRegex($header, $pattern, $message = '') public function assertNotHeaderRegex($header, $pattern, $message = '') { $this->_incrementAssertionCount(); - require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; + ;// require_once 'Zend/Test/PHPUnit/Constraint/ResponseHeader.php'; $constraint = new Zend_Test_PHPUnit_Constraint_ResponseHeader(); $constraint->setNegate(true); $response = $this->response; @@ -1065,7 +1065,7 @@ public function getFrontController() public function getRequest() { if (null === $this->_request) { - require_once 'Zend/Controller/Request/HttpTestCase.php'; + ;// require_once 'Zend/Controller/Request/HttpTestCase.php'; $this->_request = new Zend_Controller_Request_HttpTestCase; } return $this->_request; @@ -1079,7 +1079,7 @@ public function getRequest() public function getResponse() { if (null === $this->_response) { - require_once 'Zend/Controller/Response/HttpTestCase.php'; + ;// require_once 'Zend/Controller/Response/HttpTestCase.php'; $this->_response = new Zend_Controller_Response_HttpTestCase; } return $this->_response; @@ -1093,7 +1093,7 @@ public function getResponse() public function getQuery() { if (null === $this->_query) { - require_once 'Zend/Dom/Query.php'; + ;// require_once 'Zend/Dom/Query.php'; $this->_query = new Zend_Dom_Query; } return $this->_query; diff --git a/library/Zend/Test/PHPUnit/DatabaseTestCase.php b/library/Zend/Test/PHPUnit/DatabaseTestCase.php index 1280309749..aa4d2c68c1 100644 --- a/library/Zend/Test/PHPUnit/DatabaseTestCase.php +++ b/library/Zend/Test/PHPUnit/DatabaseTestCase.php @@ -23,27 +23,27 @@ /** * @see Zend_Test_PHPUnit_Db_Operation_Truncate */ -require_once "Zend/Test/PHPUnit/Db/Operation/Truncate.php"; +;// require_once "Zend/Test/PHPUnit/Db/Operation/Truncate.php"; /** * @see Zend_Test_PHPUnit_Db_Operation_Insert */ -require_once "Zend/Test/PHPUnit/Db/Operation/Insert.php"; +;// require_once "Zend/Test/PHPUnit/Db/Operation/Insert.php"; /** * @see Zend_Test_PHPUnit_Db_DataSet_DbTableDataSet */ -require_once "Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php"; +;// require_once "Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php"; /** * @see Zend_Test_PHPUnit_Db_DataSet_DbTable */ -require_once "Zend/Test/PHPUnit/Db/DataSet/DbTable.php"; +;// require_once "Zend/Test/PHPUnit/Db/DataSet/DbTable.php"; /** * @see Zend_Test_PHPUnit_Db_DataSet_DbRowset */ -require_once "Zend/Test/PHPUnit/Db/DataSet/DbRowset.php"; +;// require_once "Zend/Test/PHPUnit/Db/DataSet/DbRowset.php"; /** * Generic Testcase for Zend Framework related DbUnit Testing with PHPUnit diff --git a/library/Zend/Test/PHPUnit/Db/Connection.php b/library/Zend/Test/PHPUnit/Db/Connection.php index 2b0e5c3c1e..bdaf3b7961 100644 --- a/library/Zend/Test/PHPUnit/Db/Connection.php +++ b/library/Zend/Test/PHPUnit/Db/Connection.php @@ -23,12 +23,12 @@ /** * @see Zend_Test_PHPUnit_Db_DataSet_QueryTable */ -require_once "Zend/Test/PHPUnit/Db/DataSet/QueryTable.php"; +;// require_once "Zend/Test/PHPUnit/Db/DataSet/QueryTable.php"; /** * @see Zend_Test_PHPUnit_Db_Metadata_Generic */ -require_once "Zend/Test/PHPUnit/Db/Metadata/Generic.php"; +;// require_once "Zend/Test/PHPUnit/Db/Metadata/Generic.php"; /** * Generic Abstraction of Zend_Db Connections in the PHPUnit Database Extension context. diff --git a/library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php b/library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php index d8437528d5..1f9b6eef85 100644 --- a/library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php +++ b/library/Zend/Test/PHPUnit/Db/DataSet/DbRowset.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Table_Rowset_Abstract */ -require_once "Zend/Db/Table/Rowset/Abstract.php"; +;// require_once "Zend/Db/Table/Rowset/Abstract.php"; /** * Use a Zend_Db Rowset as a datatable for assertions with other PHPUnit Database extension tables. @@ -50,7 +50,7 @@ public function __construct(Zend_Db_Table_Rowset_Abstract $rowset, $tableName = if($table !== null) { $tableName = $table->info('name'); } else { - require_once "Zend/Test/PHPUnit/Db/Exception.php"; + ;// require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception( 'No table name was given to Rowset Table and table name cannot be infered from the table, '. 'because the rowset is disconnected from database.' diff --git a/library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php b/library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php index 37eaf430ca..a77ed23eb4 100644 --- a/library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php +++ b/library/Zend/Test/PHPUnit/Db/DataSet/DbTable.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Table_Abstract */ -require_once "Zend/Db/Table/Abstract.php"; +;// require_once "Zend/Db/Table/Abstract.php"; /** * Use a Zend_Db_Table for assertions with other PHPUnit Database Extension table types. diff --git a/library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php b/library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php index ed7530564c..635bdce007 100644 --- a/library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php +++ b/library/Zend/Test/PHPUnit/Db/DataSet/DbTableDataSet.php @@ -23,7 +23,7 @@ /** * @see Zend_Test_PHPUnit_Db_DataSet_DbTable */ -require_once "Zend/Test/PHPUnit/Db/DataSet/DbTable.php"; +;// require_once "Zend/Test/PHPUnit/Db/DataSet/DbTable.php"; /** * Aggregate several Zend_Db_Table instances into a dataset. diff --git a/library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php b/library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php index bd3f67daf2..b42d1e17f5 100644 --- a/library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php +++ b/library/Zend/Test/PHPUnit/Db/DataSet/QueryDataSet.php @@ -23,12 +23,12 @@ /** * @see Zend_Test_PHPUnit_Db_DataSet_QueryTable */ -require_once "Zend/Test/PHPUnit/Db/DataSet/QueryTable.php"; +;// require_once "Zend/Test/PHPUnit/Db/DataSet/QueryTable.php"; /** * @see Zend_Db_Select */ -require_once "Zend/Db/Select.php"; +;// require_once "Zend/Db/Select.php"; /** * Uses several query strings or Zend_Db_Select objects to form a dataset of tables for assertion with other datasets. @@ -50,7 +50,7 @@ class Zend_Test_PHPUnit_Db_DataSet_QueryDataSet extends PHPUnit_Extensions_Datab public function __construct(PHPUnit_Extensions_Database_DB_IDatabaseConnection $databaseConnection) { if( !($databaseConnection instanceof Zend_Test_PHPUnit_Db_Connection) ) { - require_once "Zend/Test/PHPUnit/Db/Exception.php"; + ;// require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception("Zend_Test_PHPUnit_Db_DataSet_QueryDataSet only works with Zend_Test_PHPUnit_Db_Connection connections-"); } $this->databaseConnection = $databaseConnection; diff --git a/library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php b/library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php index 6100e80577..18f9534420 100644 --- a/library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php +++ b/library/Zend/Test/PHPUnit/Db/DataSet/QueryTable.php @@ -43,7 +43,7 @@ class Zend_Test_PHPUnit_Db_DataSet_QueryTable extends PHPUnit_Extensions_Databas public function __construct($tableName, $query, PHPUnit_Extensions_Database_DB_IDatabaseConnection $databaseConnection) { if( !($databaseConnection instanceof Zend_Test_PHPUnit_Db_Connection) ) { - require_once "Zend/Test/PHPUnit/Db/Exception.php"; + ;// require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception("Zend_Test_PHPUnit_Db_DataSet_QueryTable only works with Zend_Test_PHPUnit_Db_Connection connections-"); } parent::__construct($tableName, $query, $databaseConnection); diff --git a/library/Zend/Test/PHPUnit/Db/Exception.php b/library/Zend/Test/PHPUnit/Db/Exception.php index 6cf4c57152..df0bea4cf2 100644 --- a/library/Zend/Test/PHPUnit/Db/Exception.php +++ b/library/Zend/Test/PHPUnit/Db/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Exception */ -require_once "Zend/Exception.php"; +;// require_once "Zend/Exception.php"; /** * Exception for Zend_Test_PHPUnit_Database package diff --git a/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php b/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php index d4b414494a..38827097de 100644 --- a/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php +++ b/library/Zend/Test/PHPUnit/Db/Metadata/Generic.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Adapter_Abstract */ -require_once "Zend/Db/Adapter/Abstract.php"; +;// require_once "Zend/Db/Adapter/Abstract.php"; /** * Generic Metadata accessor for the Zend_Db adapters diff --git a/library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php b/library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php index 7e4fa5e2e2..7858b0a134 100644 --- a/library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php +++ b/library/Zend/Test/PHPUnit/Db/Operation/DeleteAll.php @@ -23,7 +23,7 @@ /** * @see Zend_Test_PHPUnit_Db_Connection */ -require_once "Zend/Test/PHPUnit/Db/Connection.php"; +;// require_once "Zend/Test/PHPUnit/Db/Connection.php"; /** * Delete All Operation that can be executed on set up or tear down of a database tester. @@ -44,7 +44,7 @@ class Zend_Test_PHPUnit_Db_Operation_DeleteAll implements PHPUnit_Extensions_Dat public function execute(PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection, PHPUnit_Extensions_Database_DataSet_IDataSet $dataSet) { if(!($connection instanceof Zend_Test_PHPUnit_Db_Connection)) { - require_once "Zend/Test/PHPUnit/Db/Exception.php"; + ;// require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception("Not a valid Zend_Test_PHPUnit_Db_Connection instance, ".get_class($connection)." given!"); } diff --git a/library/Zend/Test/PHPUnit/Db/Operation/Insert.php b/library/Zend/Test/PHPUnit/Db/Operation/Insert.php index 7668d6c501..5b982c8a8e 100644 --- a/library/Zend/Test/PHPUnit/Db/Operation/Insert.php +++ b/library/Zend/Test/PHPUnit/Db/Operation/Insert.php @@ -23,7 +23,7 @@ /** * @see Zend_Test_PHPUnit_Db_Connection */ -require_once "Zend/Test/PHPUnit/Db/Connection.php"; +;// require_once "Zend/Test/PHPUnit/Db/Connection.php"; /** * Operation for Inserting on setup or teardown of a database tester. @@ -44,7 +44,7 @@ class Zend_Test_PHPUnit_Db_Operation_Insert implements PHPUnit_Extensions_Databa public function execute(PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection, PHPUnit_Extensions_Database_DataSet_IDataSet $dataSet) { if(!($connection instanceof Zend_Test_PHPUnit_Db_Connection)) { - require_once "Zend/Test/PHPUnit/Db/Exception.php"; + ;// require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception("Not a valid Zend_Test_PHPUnit_Db_Connection instance, ".get_class($connection)." given!"); } diff --git a/library/Zend/Test/PHPUnit/Db/Operation/Truncate.php b/library/Zend/Test/PHPUnit/Db/Operation/Truncate.php index da7c643b76..8040b8cc15 100644 --- a/library/Zend/Test/PHPUnit/Db/Operation/Truncate.php +++ b/library/Zend/Test/PHPUnit/Db/Operation/Truncate.php @@ -23,7 +23,7 @@ /** * @see Zend_Test_PHPUnit_Db_Connection */ -require_once "Zend/Test/PHPUnit/Db/Connection.php"; +;// require_once "Zend/Test/PHPUnit/Db/Connection.php"; /** * Operation for Truncating on setup or teardown of a database tester. @@ -46,7 +46,7 @@ class Zend_Test_PHPUnit_Db_Operation_Truncate implements PHPUnit_Extensions_Data public function execute(PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection, PHPUnit_Extensions_Database_DataSet_IDataSet $dataSet) { if(!($connection instanceof Zend_Test_PHPUnit_Db_Connection)) { - require_once "Zend/Test/PHPUnit/Db/Exception.php"; + ;// require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception("Not a valid Zend_Test_PHPUnit_Db_Connection instance, ".get_class($connection)." given!"); } @@ -81,7 +81,7 @@ protected function _truncate(Zend_Db_Adapter_Abstract $db, $tableName) } else { $db->query('IMPORT FROM /dev/null OF DEL REPLACE INTO '.$tableName); }*/ - require_once "Zend/Exception.php"; + ;// require_once "Zend/Exception.php"; throw Zend_Exception("IBM Db2 TRUNCATE not supported."); } else if($this->_isMssqlOrOracle($db)) { $db->query('TRUNCATE TABLE '.$tableName); diff --git a/library/Zend/Test/PHPUnit/Db/SimpleTester.php b/library/Zend/Test/PHPUnit/Db/SimpleTester.php index 901b4e7139..74bdee05a8 100644 --- a/library/Zend/Test/PHPUnit/Db/SimpleTester.php +++ b/library/Zend/Test/PHPUnit/Db/SimpleTester.php @@ -23,12 +23,12 @@ /** * @see Zend_Test_PHPUnit_Db_Operation_Truncate */ -require_once "Zend/Test/PHPUnit/Db/Operation/Truncate.php"; +;// require_once "Zend/Test/PHPUnit/Db/Operation/Truncate.php"; /** * @see Zend_Test_PHPUnit_Db_Operation_Insert */ -require_once "Zend/Test/PHPUnit/Db/Operation/Insert.php"; +;// require_once "Zend/Test/PHPUnit/Db/Operation/Insert.php"; /** * Simple Tester for Database Tests when the Abstract Test Case cannot be used. @@ -50,7 +50,7 @@ class Zend_Test_PHPUnit_Db_SimpleTester extends PHPUnit_Extensions_Database_Defa public function __construct(PHPUnit_Extensions_Database_DB_IDatabaseConnection $connection) { if(!($connection instanceof Zend_Test_PHPUnit_Db_Connection)) { - require_once "Zend/Test/PHPUnit/Db/Exception.php"; + ;// require_once "Zend/Test/PHPUnit/Db/Exception.php"; throw new Zend_Test_PHPUnit_Db_Exception("Not a valid Zend_Test_PHPUnit_Db_Connection instance, ".get_class($connection)." given!"); } diff --git a/library/Zend/Text/Exception.php b/library/Zend/Text/Exception.php index 026e36cc4f..775be97ab5 100644 --- a/library/Zend/Text/Exception.php +++ b/library/Zend/Text/Exception.php @@ -22,7 +22,7 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * Exception class for Zend_Text diff --git a/library/Zend/Text/Figlet.php b/library/Zend/Text/Figlet.php index 9a42430450..53ce9642ae 100644 --- a/library/Zend/Text/Figlet.php +++ b/library/Zend/Text/Figlet.php @@ -447,7 +447,7 @@ public function render($text, $encoding = 'UTF-8') $textLength = @iconv_strlen($text, 'UTF-8'); if ($textLength === false) { - require_once 'Zend/Text/Figlet/Exception.php'; + ;// require_once 'Zend/Text/Figlet/Exception.php'; throw new Zend_Text_Figlet_Exception('$text is not encoded with ' . $encoding); } @@ -968,14 +968,14 @@ protected function _loadFont($fontFile) { // Check if the font file exists if (!file_exists($fontFile)) { - require_once 'Zend/Text/Figlet/Exception.php'; + ;// require_once 'Zend/Text/Figlet/Exception.php'; throw new Zend_Text_Figlet_Exception($fontFile . ': Font file not found'); } // Check if gzip support is required if (substr($fontFile, -3) === '.gz') { if (!function_exists('gzcompress')) { - require_once 'Zend/Text/Figlet/Exception.php'; + ;// require_once 'Zend/Text/Figlet/Exception.php'; throw new Zend_Text_Figlet_Exception('GZIP library is required for ' . 'gzip compressed font files'); } @@ -989,7 +989,7 @@ protected function _loadFont($fontFile) // Try to open the file $fp = fopen($fontFile, 'rb'); if ($fp === false) { - require_once 'Zend/Text/Figlet/Exception.php'; + ;// require_once 'Zend/Text/Figlet/Exception.php'; throw new Zend_Text_Figlet_Exception($fontFile . ': Could not open file'); } @@ -1013,7 +1013,7 @@ protected function _loadFont($fontFile) $this->_fontSmush); if ($magic !== self::FONTFILE_MAGIC_NUMBER || $numsRead < 5) { - require_once 'Zend/Text/Figlet/Exception.php'; + ;// require_once 'Zend/Text/Figlet/Exception.php'; throw new Zend_Text_Figlet_Exception($fontFile . ': Not a FIGlet 2 font file'); } diff --git a/library/Zend/Text/Figlet/Exception.php b/library/Zend/Text/Figlet/Exception.php index b501a84d30..dbf1ee2daa 100644 --- a/library/Zend/Text/Figlet/Exception.php +++ b/library/Zend/Text/Figlet/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Text_Exception */ -require_once 'Zend/Text/Exception.php'; +;// require_once 'Zend/Text/Exception.php'; /** * Exception class for Zend_Figlet diff --git a/library/Zend/Text/Table.php b/library/Zend/Text/Table.php index 9f09802325..5c3f423831 100644 --- a/library/Zend/Text/Table.php +++ b/library/Zend/Text/Table.php @@ -130,7 +130,7 @@ public function __construct($options = null) // Check if column widths were set // @todo When column widths were not set, assume auto-sizing if ($this->_columnWidths === null) { - require_once 'Zend/Text/Table/Exception.php'; + ;// require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('You must define the column widths'); } @@ -188,13 +188,13 @@ public function setConfig(Zend_Config $config) public function setColumnWidths(array $columnWidths) { if (count($columnWidths) === 0) { - require_once 'Zend/Text/Table/Exception.php'; + ;// require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('You must supply at least one column'); } foreach ($columnWidths as $columnNum => $columnWidth) { if (is_int($columnWidth) === false or $columnWidth < 1) { - require_once 'Zend/Text/Table/Exception.php'; + ;// require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('Column ' . $columnNum . ' has an invalid' . ' column width'); } @@ -258,7 +258,7 @@ public function getPluginLoader() $prefix = 'Zend_Text_Table_Decorator_'; $pathPrefix = 'Zend/Text/Table/Decorator/'; - require_once 'Zend/Loader/PluginLoader.php'; + ;// require_once 'Zend/Loader/PluginLoader.php'; $this->_pluginLoader = new Zend_Loader_PluginLoader(array($prefix => $pathPrefix)); } @@ -330,18 +330,18 @@ public static function getOutputCharset() public function appendRow($row) { if (!is_array($row) && !($row instanceof Zend_Text_Table_Row)) { - require_once 'Zend/Text/Table/Exception.php'; + ;// require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('$row must be an array or instance of Zend_Text_Table_Row'); } if (is_array($row)) { if (count($row) > count($this->_columnWidths)) { - require_once 'Zend/Text/Table/Exception.php'; + ;// require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('Row contains too many columns'); } - require_once 'Zend/Text/Table/Row.php'; - require_once 'Zend/Text/Table/Column.php'; + ;// require_once 'Zend/Text/Table/Row.php'; + ;// require_once 'Zend/Text/Table/Column.php'; $data = $row; $row = new Zend_Text_Table_Row(); @@ -373,7 +373,7 @@ public function render() { // There should be at least one row if (count($this->_rows) === 0) { - require_once 'Zend/Text/Table/Exception.php'; + ;// require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('No rows were added to the table yet'); } diff --git a/library/Zend/Text/Table/Column.php b/library/Zend/Text/Table/Column.php index cd1547062a..e967f4fcc8 100644 --- a/library/Zend/Text/Table/Column.php +++ b/library/Zend/Text/Table/Column.php @@ -22,12 +22,12 @@ /** * @see Zend_Text_Table */ -require_once 'Zend/Text/Table.php'; +;// require_once 'Zend/Text/Table.php'; /** * @see Zend_Text_MultiByte */ -require_once 'Zend/Text/MultiByte.php'; +;// require_once 'Zend/Text/MultiByte.php'; /** * Column class for Zend_Text_Table_Row @@ -112,7 +112,7 @@ public function __construct($content = null, $align = null, $colSpan = null, $ch public function setContent($content, $charset = null) { if (is_string($content) === false) { - require_once 'Zend/Text/Table/Exception.php'; + ;// require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('$content must be a string'); } @@ -147,7 +147,7 @@ public function setContent($content, $charset = null) public function setAlign($align) { if (in_array($align, $this->_allowedAligns) === false) { - require_once 'Zend/Text/Table/Exception.php'; + ;// require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('Invalid align supplied'); } @@ -166,7 +166,7 @@ public function setAlign($align) public function setColSpan($colSpan) { if (is_int($colSpan) === false or $colSpan < 1) { - require_once 'Zend/Text/Table/Exception.php'; + ;// require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('$colSpan must be an integer and greater than 0'); } @@ -197,14 +197,14 @@ public function getColSpan() public function render($columnWidth, $padding = 0) { if (is_int($columnWidth) === false or $columnWidth < 1) { - require_once 'Zend/Text/Table/Exception.php'; + ;// require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('$columnWidth must be an integer and greater than 0'); } $columnWidth -= ($padding * 2); if ($columnWidth < 1) { - require_once 'Zend/Text/Table/Exception.php'; + ;// require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('Padding (' . $padding . ') is greater than column width'); } diff --git a/library/Zend/Text/Table/Decorator/Ascii.php b/library/Zend/Text/Table/Decorator/Ascii.php index bfc6fb5749..6d1df033a4 100644 --- a/library/Zend/Text/Table/Decorator/Ascii.php +++ b/library/Zend/Text/Table/Decorator/Ascii.php @@ -22,7 +22,7 @@ /** * @see Zend_Text_Table_Decorator_Interface */ -require_once 'Zend/Text/Table/Decorator/Interface.php'; +;// require_once 'Zend/Text/Table/Decorator/Interface.php'; /** * ASCII Decorator for Zend_Text_Table diff --git a/library/Zend/Text/Table/Decorator/Unicode.php b/library/Zend/Text/Table/Decorator/Unicode.php index e736afdd11..367ca4d166 100644 --- a/library/Zend/Text/Table/Decorator/Unicode.php +++ b/library/Zend/Text/Table/Decorator/Unicode.php @@ -22,7 +22,7 @@ /** * @see Zend_Text_Table_Decorator_Interface */ -require_once 'Zend/Text/Table/Decorator/Interface.php'; +;// require_once 'Zend/Text/Table/Decorator/Interface.php'; /** * Unicode Decorator for Zend_Text_Table diff --git a/library/Zend/Text/Table/Exception.php b/library/Zend/Text/Table/Exception.php index d39402f6de..3ec01e634e 100644 --- a/library/Zend/Text/Table/Exception.php +++ b/library/Zend/Text/Table/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Text_Exception */ -require_once 'Zend/Text/Exception.php'; +;// require_once 'Zend/Text/Exception.php'; /** * Exception class for Zend_Text_Table diff --git a/library/Zend/Text/Table/Row.php b/library/Zend/Text/Table/Row.php index 7af2bfc1f8..c20c977d56 100644 --- a/library/Zend/Text/Table/Row.php +++ b/library/Zend/Text/Table/Row.php @@ -60,7 +60,7 @@ public function createColumn($content, array $options = null) extract($options, EXTR_IF_EXISTS); } - require_once 'Zend/Text/Table/Column.php'; + ;// require_once 'Zend/Text/Table/Column.php'; $column = new Zend_Text_Table_Column($content, $align, $colSpan, $encoding); @@ -118,7 +118,7 @@ public function getColumns() public function getColumnWidths() { if ($this->_columnWidths === null) { - require_once 'Zend/Text/Table/Exception.php'; + ;// require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('No columns were rendered yet'); } @@ -144,7 +144,7 @@ public function render(array $columnWidths, // If there is no single column, create a column which spans over the // entire row if (count($this->_columns) === 0) { - require_once 'Zend/Text/Table/Column.php'; + ;// require_once 'Zend/Text/Table/Column.php'; $this->appendColumn(new Zend_Text_Table_Column(null, null, count($columnWidths))); } @@ -158,7 +158,7 @@ public function render(array $columnWidths, // Verify if there are enough column widths defined if (($colNum + $colSpan) > count($columnWidths)) { - require_once 'Zend/Text/Table/Exception.php'; + ;// require_once 'Zend/Text/Table/Exception.php'; throw new Zend_Text_Table_Exception('Too many columns'); } diff --git a/library/Zend/TimeSync.php b/library/Zend/TimeSync.php index 5bc5360ce0..2d8050bcf9 100644 --- a/library/Zend/TimeSync.php +++ b/library/Zend/TimeSync.php @@ -23,7 +23,7 @@ /** * Zend_Date */ -require_once 'Zend/Date.php'; +;// require_once 'Zend/Date.php'; /** * @category Zend @@ -164,7 +164,7 @@ public function setServer($alias) if (isset($this->_timeservers[$alias]) === true) { $this->_current = $this->_timeservers[$alias]; } else { - require_once 'Zend/TimeSync/Exception.php'; + ;// require_once 'Zend/TimeSync/Exception.php'; throw new Zend_TimeSync_Exception("'$alias' does not point to valid timeserver"); } } @@ -185,7 +185,7 @@ public static function getOptions($key = null) if (isset(Zend_TimeSync::$options[$key]) === true) { return Zend_TimeSync::$options[$key]; } else { - require_once 'Zend/TimeSync/Exception.php'; + ;// require_once 'Zend/TimeSync/Exception.php'; throw new Zend_TimeSync_Exception("'$key' does not point to valid option"); } } @@ -204,14 +204,14 @@ public function getServer($alias = null) if (isset($this->_current) && $this->_current !== false) { return $this->_current; } else { - require_once 'Zend/TimeSync/Exception.php'; + ;// require_once 'Zend/TimeSync/Exception.php'; throw new Zend_TimeSync_Exception('there is no timeserver set'); } } if (isset($this->_timeservers[$alias]) === true) { return $this->_timeservers[$alias]; } else { - require_once 'Zend/TimeSync/Exception.php'; + ;// require_once 'Zend/TimeSync/Exception.php'; throw new Zend_TimeSync_Exception("'$alias' does not point to valid timeserver"); } } @@ -239,7 +239,7 @@ public function getInfo() */ public function getDate($locale = null) { - require_once 'Zend/TimeSync/Exception.php'; + ;// require_once 'Zend/TimeSync/Exception.php'; foreach ($this->_timeservers as $alias => $server) { $this->_current = $server; try { @@ -288,13 +288,13 @@ protected function _addServer($target, $alias) $protocol = ucfirst(strtolower($protocol)); if (!in_array($protocol, $this->_allowedSchemes)) { - require_once 'Zend/TimeSync/Exception.php'; + ;// require_once 'Zend/TimeSync/Exception.php'; throw new Zend_TimeSync_Exception("'$protocol' is not a supported protocol"); } $className = 'Zend_TimeSync_' . $protocol; if (!class_exists($className)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($className); } $timeServerObj = new $className($adress, $port); diff --git a/library/Zend/TimeSync/Exception.php b/library/Zend/TimeSync/Exception.php index 55c0bfc4ea..ef8eb3f50f 100644 --- a/library/Zend/TimeSync/Exception.php +++ b/library/Zend/TimeSync/Exception.php @@ -22,7 +22,7 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * Exception class for Zend_TimeSync diff --git a/library/Zend/TimeSync/Ntp.php b/library/Zend/TimeSync/Ntp.php index a0f26b43a9..1ea39267a3 100644 --- a/library/Zend/TimeSync/Ntp.php +++ b/library/Zend/TimeSync/Ntp.php @@ -22,7 +22,7 @@ /** * Zend_TimeSync_Protocol */ -require_once 'Zend/TimeSync/Protocol.php'; +;// require_once 'Zend/TimeSync/Protocol.php'; /** * NTP Protocol handling class diff --git a/library/Zend/TimeSync/Sntp.php b/library/Zend/TimeSync/Sntp.php index e49d929324..4ea5bb9c3b 100644 --- a/library/Zend/TimeSync/Sntp.php +++ b/library/Zend/TimeSync/Sntp.php @@ -22,7 +22,7 @@ /** * Zend_TimeSync_Protocol */ -require_once 'Zend/TimeSync/Protocol.php'; +;// require_once 'Zend/TimeSync/Protocol.php'; /** * SNTP Protocol handling class diff --git a/library/Zend/Translate.php b/library/Zend/Translate.php index 46bec43dc1..0e88bfe32d 100644 --- a/library/Zend/Translate.php +++ b/library/Zend/Translate.php @@ -22,12 +22,12 @@ /** * @see Zend_Loader */ -require_once 'Zend/Loader.php'; +;// require_once 'Zend/Loader.php'; /** * @see Zend_Translate_Adapter */ -require_once 'Zend/Translate/Adapter.php'; +;// require_once 'Zend/Translate/Adapter.php'; /** @@ -143,7 +143,7 @@ public function setAdapter($options = array()) unset($options['adapter']); $this->_adapter = new $adapter($options); if (!$this->_adapter instanceof Zend_Translate_Adapter) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception("Adapter " . $adapter . " does not extend Zend_Translate_Adapter"); } } @@ -218,7 +218,7 @@ public function __call($method, array $options) if (method_exists($this->_adapter, $method)) { return call_user_func_array(array($this->_adapter, $method), $options); } - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception("Unknown method '" . $method . "' called!"); } } diff --git a/library/Zend/Translate/Adapter.php b/library/Zend/Translate/Adapter.php index efaaa05a25..1528c15c29 100644 --- a/library/Zend/Translate/Adapter.php +++ b/library/Zend/Translate/Adapter.php @@ -23,12 +23,12 @@ /** * @see Zend_Locale */ -require_once 'Zend/Locale.php'; +;// require_once 'Zend/Locale.php'; /** * @see Zend_Translate_Plural */ -require_once 'Zend/Translate/Plural.php'; +;// require_once 'Zend/Translate/Plural.php'; /** * Basic adapter class for each translation source adapter @@ -216,7 +216,7 @@ public function addTranslation($options = array()) } if (!isset($options['content']) || empty($options['content'])) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception("Required option 'content' is missing"); } @@ -226,7 +226,7 @@ public function addTranslation($options = array()) } if ((array_key_exists('log', $options)) && !($options['log'] instanceof Zend_Log)) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('Instance of Zend_Log expected for option log'); } @@ -239,7 +239,7 @@ public function addTranslation($options = array()) $options['locale'] = Zend_Locale::findLocale($options['locale']); } } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception("The given Language '{$options['locale']}' does not exist", 0, $e); } @@ -353,7 +353,7 @@ public function setOptions(array $options = array()) } else if ((isset($this->_options[$key]) and ($this->_options[$key] != $option)) or !isset($this->_options[$key])) { if (($key == 'log') && !($option instanceof Zend_Log)) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('Instance of Zend_Log expected for option log'); } @@ -431,7 +431,7 @@ public function setLocale($locale) try { $locale = Zend_Locale::findLocale($locale); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception("The given Language ({$locale}) does not exist", 0, $e); } @@ -620,7 +620,7 @@ private function _addTranslationData($options = array()) try { $options['locale'] = Zend_Locale::findLocale($options['locale']); } catch (Zend_Locale_Exception $e) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception("The given Language '{$options['locale']}' does not exist", 0, $e); } @@ -958,7 +958,7 @@ public static function removeCache() */ public static function clearCache($tag = null) { - require_once 'Zend/Cache.php'; + ;// require_once 'Zend/Cache.php'; if (self::$_cacheTags) { if ($tag == null) { $tag = 'Zend_Translate'; diff --git a/library/Zend/Translate/Adapter/Array.php b/library/Zend/Translate/Adapter/Array.php index 2dd298eb03..c5a87ad00a 100644 --- a/library/Zend/Translate/Adapter/Array.php +++ b/library/Zend/Translate/Adapter/Array.php @@ -21,10 +21,10 @@ /** Zend_Locale */ -require_once 'Zend/Locale.php'; +;// require_once 'Zend/Locale.php'; /** Zend_Translate_Adapter */ -require_once 'Zend/Translate/Adapter.php'; +;// require_once 'Zend/Translate/Adapter.php'; /** @@ -57,7 +57,7 @@ protected function _loadTranslationData($data, $locale, array $options = array() } } if (!is_array($data)) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception("Error including array or file '".$data."'"); } diff --git a/library/Zend/Translate/Adapter/Csv.php b/library/Zend/Translate/Adapter/Csv.php index 300de27686..8241fbe613 100644 --- a/library/Zend/Translate/Adapter/Csv.php +++ b/library/Zend/Translate/Adapter/Csv.php @@ -21,10 +21,10 @@ /** Zend_Locale */ -require_once 'Zend/Locale.php'; +;// require_once 'Zend/Locale.php'; /** Zend_Translate_Adapter */ -require_once 'Zend/Translate/Adapter.php'; +;// require_once 'Zend/Translate/Adapter.php'; /** @@ -85,7 +85,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr $options = $options + $this->_options; $this->_file = @fopen($filename, 'rb'); if (!$this->_file) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('Error opening translation file \'' . $filename . '\'.'); } diff --git a/library/Zend/Translate/Adapter/Gettext.php b/library/Zend/Translate/Adapter/Gettext.php index 81a7841ea3..f52d90a6e9 100644 --- a/library/Zend/Translate/Adapter/Gettext.php +++ b/library/Zend/Translate/Adapter/Gettext.php @@ -20,10 +20,10 @@ */ /** Zend_Locale */ -require_once 'Zend/Locale.php'; +;// require_once 'Zend/Locale.php'; /** Zend_Translate_Adapter */ -require_once 'Zend/Translate/Adapter.php'; +;// require_once 'Zend/Translate/Adapter.php'; /** * @category Zend @@ -68,12 +68,12 @@ protected function _loadTranslationData($filename, $locale, array $options = arr $this->_bigEndian = false; $this->_file = @fopen($filename, 'rb'); if (!$this->_file) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('Error opening translation file \'' . $filename . '\'.'); } if (@filesize($filename) < 10) { @fclose($this->_file); - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('\'' . $filename . '\' is not a gettext file'); } @@ -85,7 +85,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr $this->_bigEndian = true; } else { @fclose($this->_file); - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('\'' . $filename . '\' is not a gettext file'); } // read revision - not supported for now diff --git a/library/Zend/Translate/Adapter/Ini.php b/library/Zend/Translate/Adapter/Ini.php index 7935f20ee3..1dc1933d1e 100644 --- a/library/Zend/Translate/Adapter/Ini.php +++ b/library/Zend/Translate/Adapter/Ini.php @@ -20,10 +20,10 @@ */ /** Zend_Locale */ -require_once 'Zend/Locale.php'; +;// require_once 'Zend/Locale.php'; /** Zend_Translate_Adapter */ -require_once 'Zend/Translate/Adapter.php'; +;// require_once 'Zend/Translate/Adapter.php'; /** * @category Zend @@ -49,7 +49,7 @@ protected function _loadTranslationData($data, $locale, array $options = array() { $this->_data = array(); if (!file_exists($data)) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception("Ini file '".$data."' not found"); } diff --git a/library/Zend/Translate/Adapter/Qt.php b/library/Zend/Translate/Adapter/Qt.php index db543ff64e..0a04a98664 100644 --- a/library/Zend/Translate/Adapter/Qt.php +++ b/library/Zend/Translate/Adapter/Qt.php @@ -21,16 +21,16 @@ /** Zend_Locale */ -require_once 'Zend/Locale.php'; +;// require_once 'Zend/Locale.php'; /** Zend_Translate_Adapter */ -require_once 'Zend/Translate/Adapter.php'; +;// require_once 'Zend/Translate/Adapter.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** @See Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; +;// require_once 'Zend/Xml/Exception.php'; /** * @category Zend @@ -65,7 +65,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr { $this->_data = array(); if (!is_readable($filename)) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('Translation file \'' . $filename . '\' is not readable.'); } @@ -81,7 +81,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr try { Zend_Xml_Security::scanFile($filename); } catch (Zend_Xml_Exception $e) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception( $e->getMessage() ); @@ -93,7 +93,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr xml_get_current_line_number($this->_file), $filename); xml_parser_free($this->_file); - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception($ex); } diff --git a/library/Zend/Translate/Adapter/Tbx.php b/library/Zend/Translate/Adapter/Tbx.php index 107107c4e6..781add174f 100644 --- a/library/Zend/Translate/Adapter/Tbx.php +++ b/library/Zend/Translate/Adapter/Tbx.php @@ -21,16 +21,16 @@ /** Zend_Locale */ -require_once 'Zend/Locale.php'; +;// require_once 'Zend/Locale.php'; /** Zend_Translate_Adapter */ -require_once 'Zend/Translate/Adapter.php'; +;// require_once 'Zend/Translate/Adapter.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** @see Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; +;// require_once 'Zend/Xml/Exception.php'; /** * @category Zend @@ -62,7 +62,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr { $this->_data = array(); if (!is_readable($filename)) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('Translation file \'' . $filename . '\' is not readable.'); } @@ -76,7 +76,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr try { Zend_Xml_Security::scanFile($filename); } catch (Zend_Xml_Exception $e) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception( $e->getMessage() ); @@ -88,7 +88,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr xml_get_current_line_number($this->_file), $filename); xml_parser_free($this->_file); - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception($ex); } diff --git a/library/Zend/Translate/Adapter/Tmx.php b/library/Zend/Translate/Adapter/Tmx.php index d6572592df..8f1235757a 100644 --- a/library/Zend/Translate/Adapter/Tmx.php +++ b/library/Zend/Translate/Adapter/Tmx.php @@ -21,16 +21,16 @@ /** Zend_Locale */ -require_once 'Zend/Locale.php'; +;// require_once 'Zend/Locale.php'; /** Zend_Translate_Adapter */ -require_once 'Zend/Translate/Adapter.php'; +;// require_once 'Zend/Translate/Adapter.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** @See Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; +;// require_once 'Zend/Xml/Exception.php'; /** * @category Zend @@ -63,7 +63,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr { $this->_data = array(); if (!is_readable($filename)) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('Translation file \'' . $filename . '\' is not readable.'); } @@ -81,7 +81,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr try { Zend_Xml_Security::scanFile($filename); } catch (Zend_Xml_Exception $e) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception( $e->getMessage() ); @@ -93,7 +93,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr xml_get_current_line_number($this->_file), $filename); xml_parser_free($this->_file); - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception($ex); } diff --git a/library/Zend/Translate/Adapter/Xliff.php b/library/Zend/Translate/Adapter/Xliff.php index e8c664bd5b..ac130ec532 100644 --- a/library/Zend/Translate/Adapter/Xliff.php +++ b/library/Zend/Translate/Adapter/Xliff.php @@ -21,16 +21,16 @@ /** Zend_Locale */ -require_once 'Zend/Locale.php'; +;// require_once 'Zend/Locale.php'; /** Zend_Translate_Adapter */ -require_once 'Zend/Translate/Adapter.php'; +;// require_once 'Zend/Translate/Adapter.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** @See Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; +;// require_once 'Zend/Xml/Exception.php'; /** * @category Zend @@ -67,7 +67,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr { $this->_data = array(); if (!is_readable($filename)) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('Translation file \'' . $filename . '\' is not readable.'); } @@ -88,7 +88,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr try { Zend_Xml_Security::scanFile($filename); } catch (Zend_Xml_Exception $e) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception( $e->getMessage() ); @@ -100,7 +100,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr xml_get_current_line_number($this->_file), $filename); xml_parser_free($this->_file); - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception($ex); } diff --git a/library/Zend/Translate/Adapter/XmlTm.php b/library/Zend/Translate/Adapter/XmlTm.php index 87d22695e0..72609d6e89 100644 --- a/library/Zend/Translate/Adapter/XmlTm.php +++ b/library/Zend/Translate/Adapter/XmlTm.php @@ -21,16 +21,16 @@ /** Zend_Locale */ -require_once 'Zend/Locale.php'; +;// require_once 'Zend/Locale.php'; /** Zend_Translate_Adapter */ -require_once 'Zend/Translate/Adapter.php'; +;// require_once 'Zend/Translate/Adapter.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** @See Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; +;// require_once 'Zend/Xml/Exception.php'; /** * @category Zend @@ -62,7 +62,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr $this->_data = array(); $this->_lang = $locale; if (!is_readable($filename)) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('Translation file \'' . $filename . '\' is not readable.'); } @@ -76,7 +76,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr try { Zend_Xml_Security::scanFile($filename); } catch (Zend_Xml_Exception $e) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception( $e->getMessage() ); @@ -88,7 +88,7 @@ protected function _loadTranslationData($filename, $locale, array $options = arr xml_get_current_line_number($this->_file), $filename); xml_parser_free($this->_file); - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception($ex); } diff --git a/library/Zend/Translate/Exception.php b/library/Zend/Translate/Exception.php index 7309a98b26..2131d5f33a 100644 --- a/library/Zend/Translate/Exception.php +++ b/library/Zend/Translate/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** diff --git a/library/Zend/Translate/Plural.php b/library/Zend/Translate/Plural.php index 69140a4a24..ee1d17ec17 100644 --- a/library/Zend/Translate/Plural.php +++ b/library/Zend/Translate/Plural.php @@ -215,7 +215,7 @@ public static function setPlural($rule, $locale) } if (!is_callable($rule)) { - require_once 'Zend/Translate/Exception.php'; + ;// require_once 'Zend/Translate/Exception.php'; throw new Zend_Translate_Exception('The given rule can not be called'); } diff --git a/library/Zend/Uri.php b/library/Zend/Uri.php index e1660d8bf1..3edbdd1ab5 100644 --- a/library/Zend/Uri.php +++ b/library/Zend/Uri.php @@ -101,13 +101,13 @@ public static function factory($uri = 'http', $className = null) $schemeSpecific = isset($uri[1]) === true ? $uri[1] : ''; if (strlen($scheme) === 0) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('An empty string was supplied for the scheme'); } // Security check: $scheme is used to load a class file, so only alphanumerics are allowed. if (ctype_alnum($scheme) === false) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Illegal scheme supplied, only alphanumeric characters are permitted'); } @@ -126,24 +126,24 @@ public static function factory($uri = 'http', $className = null) case 'mailto': // TODO default: - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Scheme \"$scheme\" is not supported"); break; } } - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; try { Zend_Loader::loadClass($className); } catch (Exception $e) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("\"$className\" not found"); } $schemeHandler = new $className($scheme, $schemeSpecific); if (! $schemeHandler instanceof Zend_Uri) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("\"$className\" is not an instance of Zend_Uri"); } diff --git a/library/Zend/Uri/Exception.php b/library/Zend/Uri/Exception.php index f5a497edd0..011eec21b9 100644 --- a/library/Zend/Uri/Exception.php +++ b/library/Zend/Uri/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * Exceptions for Zend_Uri diff --git a/library/Zend/Uri/Http.php b/library/Zend/Uri/Http.php index b99f9f8169..fadefdb300 100644 --- a/library/Zend/Uri/Http.php +++ b/library/Zend/Uri/Http.php @@ -22,12 +22,12 @@ /** * @see Zend_Uri */ -require_once 'Zend/Uri.php'; +;// require_once 'Zend/Uri.php'; /** * @see Zend_Validate_Hostname */ -require_once 'Zend/Validate/Hostname.php'; +;// require_once 'Zend/Validate/Hostname.php'; /** * HTTP(S) URI handler @@ -152,7 +152,7 @@ protected function __construct($scheme, $schemeSpecific = '') // Validate the URI if ($this->valid() === false) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Invalid URI supplied'); } } @@ -170,7 +170,7 @@ protected function __construct($scheme, $schemeSpecific = '') public static function fromString($uri) { if (is_string($uri) === false) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('$uri is not a string'); } @@ -179,7 +179,7 @@ public static function fromString($uri) $schemeSpecific = isset($uri[1]) === true ? $uri[1] : ''; if (in_array($scheme, array('http', 'https')) === false) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Invalid scheme: '$scheme'"); } @@ -201,7 +201,7 @@ protected function _parseUri($schemeSpecific) $pattern = '~^((//)([^/?#]*))([^?#]*)(\?([^#]*))?(#(.*))?$~'; $status = @preg_match($pattern, $schemeSpecific, $matches); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: scheme-specific decomposition failed'); } @@ -220,7 +220,7 @@ protected function _parseUri($schemeSpecific) $pattern = '~^(([^:@]*)(:([^@]*))?@)?((?(?=[[])[[][^]]+[]]|[^:]+))(:(.*))?$~'; $status = @preg_match($pattern, $combo, $matches); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: authority decomposition failed'); } @@ -243,7 +243,7 @@ protected function _parseUri($schemeSpecific) public function getUri() { if ($this->valid() === false) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('One or more parts of the URI are invalid'); } @@ -316,7 +316,7 @@ public function validateUsername($username = null) self::CHAR_ALNUM . self::CHAR_MARK . ';:&=+$,' . '])+$/', $username); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: username validation failed'); } @@ -333,7 +333,7 @@ public function validateUsername($username = null) public function setUsername($username) { if ($this->validateUsername($username) === false) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Username \"$username\" is not a valid HTTP username"); } @@ -383,7 +383,7 @@ public function validatePassword($password = null) self::CHAR_ALNUM . self::CHAR_MARK . ';:&=+$,' . '])+$/', $password); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: password validation failed.'); } @@ -400,7 +400,7 @@ public function validatePassword($password = null) public function setPassword($password) { if ($this->validatePassword($password) === false) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Password \"$password\" is not a valid HTTP password."); } @@ -455,7 +455,7 @@ public function validateHost($host = null) public function setHost($host) { if ($this->validateHost($host) === false) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Host \"$host\" is not a valid HTTP host"); } @@ -507,7 +507,7 @@ public function validatePort($port = null) public function setPort($port) { if ($this->validatePort($port) === false) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Port \"$port\" is not a valid HTTP port."); } @@ -550,7 +550,7 @@ public function validatePath($path = null) $pattern = '/^' . $this->_regex['path'] . '$/'; $status = @preg_match($pattern, $path); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: path validation failed'); } @@ -567,7 +567,7 @@ public function validatePath($path = null) public function setPath($path) { if ($this->validatePath($path) === false) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Path \"$path\" is not a valid HTTP path"); } @@ -628,7 +628,7 @@ public function validateQuery($query = null) $pattern = '/^' . $this->_regex['uric'] . '*$/'; $status = @preg_match($pattern, $query); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: query validation failed'); } @@ -693,7 +693,7 @@ public function setQuery($query) // Make sure the query is valid, and set it if ($this->validateQuery($query) === false) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("'$query' is not a valid query string"); } @@ -736,7 +736,7 @@ public function validateFragment($fragment = null) $pattern = '/^' . $this->_regex['uric'] . '*$/'; $status = @preg_match($pattern, $fragment); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: fragment validation failed'); } @@ -753,7 +753,7 @@ public function validateFragment($fragment = null) public function setFragment($fragment) { if ($this->validateFragment($fragment) === false) { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Fragment \"$fragment\" is not a valid HTTP fragment"); } diff --git a/library/Zend/Validate.php b/library/Zend/Validate.php index 956d3119dc..87a11e8493 100644 --- a/library/Zend/Validate.php +++ b/library/Zend/Validate.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Interface */ -require_once 'Zend/Validate/Interface.php'; +;// require_once 'Zend/Validate/Interface.php'; /** * @category Zend @@ -198,7 +198,7 @@ public static function is($value, $classBaseName, array $args = array(), $namesp $className = ucfirst($classBaseName); try { if (!class_exists($className, false)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; foreach($namespaces as $namespace) { $class = $namespace . '_' . $className; $file = str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php'; @@ -240,7 +240,7 @@ public static function is($value, $classBaseName, array $args = array(), $namesp // fallthrough and continue for missing validation classes } - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Validate class not found from basename '$classBaseName'"); } @@ -251,7 +251,7 @@ public static function is($value, $classBaseName, array $args = array(), $namesp */ public static function getMessageLength() { - require_once 'Zend/Validate/Abstract.php'; + ;// require_once 'Zend/Validate/Abstract.php'; return Zend_Validate_Abstract::getMessageLength(); } @@ -262,7 +262,7 @@ public static function getMessageLength() */ public static function setMessageLength($length = -1) { - require_once 'Zend/Validate/Abstract.php'; + ;// require_once 'Zend/Validate/Abstract.php'; Zend_Validate_Abstract::setMessageLength($length); } @@ -273,7 +273,7 @@ public static function setMessageLength($length = -1) */ public static function getDefaultTranslator($translator = null) { - require_once 'Zend/Validate/Abstract.php'; + ;// require_once 'Zend/Validate/Abstract.php'; return Zend_Validate_Abstract::getDefaultTranslator(); } @@ -284,7 +284,7 @@ public static function getDefaultTranslator($translator = null) */ public static function setDefaultTranslator($translator = null) { - require_once 'Zend/Validate/Abstract.php'; + ;// require_once 'Zend/Validate/Abstract.php'; Zend_Validate_Abstract::setDefaultTranslator($translator); } } diff --git a/library/Zend/Validate/Abstract.php b/library/Zend/Validate/Abstract.php index 4b2fe7614d..6b7c5a5f31 100644 --- a/library/Zend/Validate/Abstract.php +++ b/library/Zend/Validate/Abstract.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Interface */ -require_once 'Zend/Validate/Interface.php'; +;// require_once 'Zend/Validate/Interface.php'; /** * @category Zend @@ -151,7 +151,7 @@ public function setMessage($messageString, $messageKey = null) } if (!isset($this->_messageTemplates[$messageKey])) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("No message template exists for key '$messageKey'"); } @@ -193,7 +193,7 @@ public function __get($property) /** * @see Zend_Validate_Exception */ - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("No property exists by the name '$property'"); } @@ -357,7 +357,7 @@ public function setTranslator($translator = null) } elseif ($translator instanceof Zend_Translate) { $this->_translator = $translator->getAdapter(); } else { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid translator specified'); } return $this; @@ -404,7 +404,7 @@ public static function setDefaultTranslator($translator = null) } elseif ($translator instanceof Zend_Translate) { self::$_defaultTranslator = $translator->getAdapter(); } else { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid translator specified'); } } @@ -417,7 +417,7 @@ public static function setDefaultTranslator($translator = null) public static function getDefaultTranslator() { if (null === self::$_defaultTranslator) { - require_once 'Zend/Registry.php'; + ;// require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Translate')) { $translator = Zend_Registry::get('Zend_Translate'); if ($translator instanceof Zend_Translate_Adapter) { diff --git a/library/Zend/Validate/Alnum.php b/library/Zend/Validate/Alnum.php index 5091830215..ed90477aeb 100644 --- a/library/Zend/Validate/Alnum.php +++ b/library/Zend/Validate/Alnum.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -132,7 +132,7 @@ public function isValid($value) /** * @see Zend_Filter_Alnum */ - require_once 'Zend/Filter/Alnum.php'; + ;// require_once 'Zend/Filter/Alnum.php'; self::$_filter = new Zend_Filter_Alnum(); } diff --git a/library/Zend/Validate/Alpha.php b/library/Zend/Validate/Alpha.php index c9ea9828f5..6933b4d13b 100644 --- a/library/Zend/Validate/Alpha.php +++ b/library/Zend/Validate/Alpha.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -132,7 +132,7 @@ public function isValid($value) /** * @see Zend_Filter_Alpha */ - require_once 'Zend/Filter/Alpha.php'; + ;// require_once 'Zend/Filter/Alpha.php'; self::$_filter = new Zend_Filter_Alpha(); } diff --git a/library/Zend/Validate/Barcode.php b/library/Zend/Validate/Barcode.php index 4d48d51603..f3cdac1b54 100644 --- a/library/Zend/Validate/Barcode.php +++ b/library/Zend/Validate/Barcode.php @@ -22,12 +22,12 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Loader */ -require_once 'Zend/Loader.php'; +;// require_once 'Zend/Loader.php'; /** * @category Zend @@ -99,7 +99,7 @@ public function __construct($adapter) if (array_key_exists('adapter', $adapter)) { $adapter = $adapter['adapter']; } else { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Missing option 'adapter'"); } } @@ -131,7 +131,7 @@ public function getAdapter() public function setAdapter($adapter, $options = null) { $adapter = ucfirst(strtolower($adapter)); - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; if (Zend_Loader::isReadable('Zend/Validate/Barcode/' . $adapter. '.php')) { $adapter = 'Zend_Validate_Barcode_' . $adapter; } @@ -142,7 +142,7 @@ public function setAdapter($adapter, $options = null) $this->_adapter = new $adapter($options); if (!$this->_adapter instanceof Zend_Validate_Barcode_AdapterInterface) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception( "Adapter " . $adapter . " does not implement Zend_Validate_Barcode_AdapterInterface" ); diff --git a/library/Zend/Validate/Barcode/AdapterAbstract.php b/library/Zend/Validate/Barcode/AdapterAbstract.php index 05dc2b9faf..b88311969f 100644 --- a/library/Zend/Validate/Barcode/AdapterAbstract.php +++ b/library/Zend/Validate/Barcode/AdapterAbstract.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterInterface */ -require_once 'Zend/Validate/Barcode/AdapterInterface.php'; +;// require_once 'Zend/Validate/Barcode/AdapterInterface.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Code25.php b/library/Zend/Validate/Barcode/Code25.php index a42048787b..ef78b52e33 100644 --- a/library/Zend/Validate/Barcode/Code25.php +++ b/library/Zend/Validate/Barcode/Code25.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Code25interleaved.php b/library/Zend/Validate/Barcode/Code25interleaved.php index 479aa03203..4c949e2662 100644 --- a/library/Zend/Validate/Barcode/Code25interleaved.php +++ b/library/Zend/Validate/Barcode/Code25interleaved.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Code39.php b/library/Zend/Validate/Barcode/Code39.php index 37b2f13afd..240a9b8ee6 100644 --- a/library/Zend/Validate/Barcode/Code39.php +++ b/library/Zend/Validate/Barcode/Code39.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Code39ext.php b/library/Zend/Validate/Barcode/Code39ext.php index cd99c363c3..b15825099b 100644 --- a/library/Zend/Validate/Barcode/Code39ext.php +++ b/library/Zend/Validate/Barcode/Code39ext.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Code93.php b/library/Zend/Validate/Barcode/Code93.php index e09ba17ec1..06b2a6941a 100644 --- a/library/Zend/Validate/Barcode/Code93.php +++ b/library/Zend/Validate/Barcode/Code93.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Code93ext.php b/library/Zend/Validate/Barcode/Code93ext.php index 6879a89372..90b0d9f667 100644 --- a/library/Zend/Validate/Barcode/Code93ext.php +++ b/library/Zend/Validate/Barcode/Code93ext.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Ean12.php b/library/Zend/Validate/Barcode/Ean12.php index e185233f5c..949aa27ba2 100644 --- a/library/Zend/Validate/Barcode/Ean12.php +++ b/library/Zend/Validate/Barcode/Ean12.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Ean13.php b/library/Zend/Validate/Barcode/Ean13.php index 8daf54237b..e63f1ed1bc 100644 --- a/library/Zend/Validate/Barcode/Ean13.php +++ b/library/Zend/Validate/Barcode/Ean13.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Ean14.php b/library/Zend/Validate/Barcode/Ean14.php index 12cf49bbc5..f135fa2bb7 100644 --- a/library/Zend/Validate/Barcode/Ean14.php +++ b/library/Zend/Validate/Barcode/Ean14.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Ean18.php b/library/Zend/Validate/Barcode/Ean18.php index 0f3df06b50..e241f70162 100644 --- a/library/Zend/Validate/Barcode/Ean18.php +++ b/library/Zend/Validate/Barcode/Ean18.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Ean2.php b/library/Zend/Validate/Barcode/Ean2.php index e2cec4b119..a0e2d448bc 100644 --- a/library/Zend/Validate/Barcode/Ean2.php +++ b/library/Zend/Validate/Barcode/Ean2.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Ean5.php b/library/Zend/Validate/Barcode/Ean5.php index ff5b4bb2ae..11e502c06e 100644 --- a/library/Zend/Validate/Barcode/Ean5.php +++ b/library/Zend/Validate/Barcode/Ean5.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Ean8.php b/library/Zend/Validate/Barcode/Ean8.php index 6b1caa973e..c1b19e0596 100644 --- a/library/Zend/Validate/Barcode/Ean8.php +++ b/library/Zend/Validate/Barcode/Ean8.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Gtin12.php b/library/Zend/Validate/Barcode/Gtin12.php index 65ff5b9a21..052d2a4ea6 100644 --- a/library/Zend/Validate/Barcode/Gtin12.php +++ b/library/Zend/Validate/Barcode/Gtin12.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Gtin13.php b/library/Zend/Validate/Barcode/Gtin13.php index 382dccd726..def7334a61 100644 --- a/library/Zend/Validate/Barcode/Gtin13.php +++ b/library/Zend/Validate/Barcode/Gtin13.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Gtin14.php b/library/Zend/Validate/Barcode/Gtin14.php index 6f291b8e3b..8ff766f229 100644 --- a/library/Zend/Validate/Barcode/Gtin14.php +++ b/library/Zend/Validate/Barcode/Gtin14.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Identcode.php b/library/Zend/Validate/Barcode/Identcode.php index 3f622fa639..4e72d40864 100644 --- a/library/Zend/Validate/Barcode/Identcode.php +++ b/library/Zend/Validate/Barcode/Identcode.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Intelligentmail.php b/library/Zend/Validate/Barcode/Intelligentmail.php index cfa2a82e6d..282725fdef 100644 --- a/library/Zend/Validate/Barcode/Intelligentmail.php +++ b/library/Zend/Validate/Barcode/Intelligentmail.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Issn.php b/library/Zend/Validate/Barcode/Issn.php index a74fa5379e..90486a8ed5 100644 --- a/library/Zend/Validate/Barcode/Issn.php +++ b/library/Zend/Validate/Barcode/Issn.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Itf14.php b/library/Zend/Validate/Barcode/Itf14.php index 4adc7447b2..4a03e28dc1 100644 --- a/library/Zend/Validate/Barcode/Itf14.php +++ b/library/Zend/Validate/Barcode/Itf14.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Leitcode.php b/library/Zend/Validate/Barcode/Leitcode.php index b41b079ea9..4e7abb5289 100644 --- a/library/Zend/Validate/Barcode/Leitcode.php +++ b/library/Zend/Validate/Barcode/Leitcode.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Planet.php b/library/Zend/Validate/Barcode/Planet.php index 227bc25d27..bbbdbd8e4e 100644 --- a/library/Zend/Validate/Barcode/Planet.php +++ b/library/Zend/Validate/Barcode/Planet.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Postnet.php b/library/Zend/Validate/Barcode/Postnet.php index 5aed312cbf..972e175877 100644 --- a/library/Zend/Validate/Barcode/Postnet.php +++ b/library/Zend/Validate/Barcode/Postnet.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Royalmail.php b/library/Zend/Validate/Barcode/Royalmail.php index 98fa38e64e..987d8ee7ed 100644 --- a/library/Zend/Validate/Barcode/Royalmail.php +++ b/library/Zend/Validate/Barcode/Royalmail.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Sscc.php b/library/Zend/Validate/Barcode/Sscc.php index e624d7d79c..0197296efa 100644 --- a/library/Zend/Validate/Barcode/Sscc.php +++ b/library/Zend/Validate/Barcode/Sscc.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Upca.php b/library/Zend/Validate/Barcode/Upca.php index 7757f2b1b4..20595652c7 100644 --- a/library/Zend/Validate/Barcode/Upca.php +++ b/library/Zend/Validate/Barcode/Upca.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Barcode/Upce.php b/library/Zend/Validate/Barcode/Upce.php index 1b2482578f..4c2bf2656d 100644 --- a/library/Zend/Validate/Barcode/Upce.php +++ b/library/Zend/Validate/Barcode/Upce.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +;// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Between.php b/library/Zend/Validate/Between.php index 53b68261dd..66a903029c 100644 --- a/library/Zend/Validate/Between.php +++ b/library/Zend/Validate/Between.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -115,7 +115,7 @@ public function __construct($options) } if (!array_key_exists('min', $options) || !array_key_exists('max', $options)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Missing option. 'min' and 'max' has to be given"); } diff --git a/library/Zend/Validate/Callback.php b/library/Zend/Validate/Callback.php index bb12ecf78d..ea7cad9e26 100644 --- a/library/Zend/Validate/Callback.php +++ b/library/Zend/Validate/Callback.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -86,7 +86,7 @@ public function __construct($callback = null) } if (null === ($initializedCallack = $this->getCallback())) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('No callback registered'); } } @@ -111,7 +111,7 @@ public function getCallback() public function setCallback($callback) { if (!is_callable($callback)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid callback given'); } $this->_callback = $callback; diff --git a/library/Zend/Validate/Ccnum.php b/library/Zend/Validate/Ccnum.php index c3c7029a38..1d6533e102 100644 --- a/library/Zend/Validate/Ccnum.php +++ b/library/Zend/Validate/Ccnum.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -80,7 +80,7 @@ public function isValid($value) /** * @see Zend_Filter_Digits */ - require_once 'Zend/Filter/Digits.php'; + ;// require_once 'Zend/Filter/Digits.php'; self::$_filter = new Zend_Filter_Digits(); } diff --git a/library/Zend/Validate/CreditCard.php b/library/Zend/Validate/CreditCard.php index 170b622507..9b52b3cfe4 100644 --- a/library/Zend/Validate/CreditCard.php +++ b/library/Zend/Validate/CreditCard.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -229,7 +229,7 @@ public function getService() public function setService($service) { if (!is_callable($service)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid callback given'); } @@ -301,7 +301,7 @@ public function isValid($value) if (!empty($this->_service)) { try { - require_once 'Zend/Validate/Callback.php'; + ;// require_once 'Zend/Validate/Callback.php'; $callback = new Zend_Validate_Callback($this->_service); $callback->setOptions($this->_type); if (!$callback->isValid($value)) { diff --git a/library/Zend/Validate/Date.php b/library/Zend/Validate/Date.php index e875aaf550..fe378ef9be 100644 --- a/library/Zend/Validate/Date.php +++ b/library/Zend/Validate/Date.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -92,7 +92,7 @@ public function __construct($options = array()) } if (!array_key_exists('locale', $options)) { - require_once 'Zend/Registry.php'; + ;// require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Locale')) { $options['locale'] = Zend_Registry::get('Zend_Locale'); } @@ -121,7 +121,7 @@ public function getLocale() */ public function setLocale($locale = null) { - require_once 'Zend/Locale.php'; + ;// require_once 'Zend/Locale.php'; $this->_locale = Zend_Locale::findLocale($locale); return $this; } @@ -170,7 +170,7 @@ public function isValid($value) if (($this->_format !== null) || ($this->_locale !== null) || is_array($value) || $value instanceof Zend_Date) { - require_once 'Zend/Date.php'; + ;// require_once 'Zend/Date.php'; if (!Zend_Date::isDate($value, $this->_format, $this->_locale)) { if ($this->_checkFormat($value) === false) { $this->_error(self::FALSEFORMAT); @@ -207,7 +207,7 @@ public function isValid($value) private function _checkFormat($value) { try { - require_once 'Zend/Locale/Format.php'; + ;// require_once 'Zend/Locale/Format.php'; $parsed = Zend_Locale_Format::getDate($value, array( 'date_format' => $this->_format, 'format_type' => 'iso', 'fix_date' => false)); diff --git a/library/Zend/Validate/Db/Abstract.php b/library/Zend/Validate/Db/Abstract.php index ffee51f267..0d4c8f5591 100644 --- a/library/Zend/Validate/Db/Abstract.php +++ b/library/Zend/Validate/Db/Abstract.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * Class for Database record validation @@ -123,12 +123,12 @@ public function __construct($options) } if (!array_key_exists('table', $options) && !array_key_exists('schema', $options)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Table or Schema option missing!'); } if (!array_key_exists('field', $options)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Field option missing!'); } @@ -164,7 +164,7 @@ public function getAdapter() if ($this->_adapter === null) { $this->_adapter = Zend_Db_Table_Abstract::getDefaultAdapter(); if (null === $this->_adapter) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('No database adapter present'); } } @@ -181,7 +181,7 @@ public function getAdapter() public function setAdapter($adapter) { if (!($adapter instanceof Zend_Db_Adapter_Abstract)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Adapter option must be a database adapter!'); } diff --git a/library/Zend/Validate/Db/NoRecordExists.php b/library/Zend/Validate/Db/NoRecordExists.php index 4dba8bc631..e1ab91e9de 100644 --- a/library/Zend/Validate/Db/NoRecordExists.php +++ b/library/Zend/Validate/Db/NoRecordExists.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Db_Abstract */ -require_once 'Zend/Validate/Db/Abstract.php'; +;// require_once 'Zend/Validate/Db/Abstract.php'; /** * Confirms a record does not exist in a table. diff --git a/library/Zend/Validate/Db/RecordExists.php b/library/Zend/Validate/Db/RecordExists.php index 540af13bc6..2164532cd7 100644 --- a/library/Zend/Validate/Db/RecordExists.php +++ b/library/Zend/Validate/Db/RecordExists.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Db_Abstract */ -require_once 'Zend/Validate/Db/Abstract.php'; +;// require_once 'Zend/Validate/Db/Abstract.php'; /** * Confirms a record exists in a table. diff --git a/library/Zend/Validate/Digits.php b/library/Zend/Validate/Digits.php index 411c4c5b34..560fa61644 100644 --- a/library/Zend/Validate/Digits.php +++ b/library/Zend/Validate/Digits.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -77,7 +77,7 @@ public function isValid($value) } if (null === self::$_filter) { - require_once 'Zend/Filter/Digits.php'; + ;// require_once 'Zend/Filter/Digits.php'; self::$_filter = new Zend_Filter_Digits(); } diff --git a/library/Zend/Validate/EmailAddress.php b/library/Zend/Validate/EmailAddress.php index 53e6f277d7..6f73e11dcf 100644 --- a/library/Zend/Validate/EmailAddress.php +++ b/library/Zend/Validate/EmailAddress.php @@ -22,12 +22,12 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Validate_Hostname */ -require_once 'Zend/Validate/Hostname.php'; +;// require_once 'Zend/Validate/Hostname.php'; /** * @category Zend @@ -288,7 +288,7 @@ public function getValidateMx() public function setValidateMx($mx) { if ((bool) $mx && !$this->validateMxSupported()) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('MX checking not available on this system'); } diff --git a/library/Zend/Validate/Exception.php b/library/Zend/Validate/Exception.php index 4a4e2b2cbd..df1d24dd21 100644 --- a/library/Zend/Validate/Exception.php +++ b/library/Zend/Validate/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/library/Zend/Validate/File/Count.php b/library/Zend/Validate/File/Count.php index aa822dfb14..55ff74dd95 100644 --- a/library/Zend/Validate/File/Count.php +++ b/library/Zend/Validate/File/Count.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * Validator for counting all given files @@ -110,7 +110,7 @@ public function __construct($options) } elseif (is_string($options) || is_numeric($options)) { $options = array('max' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } @@ -152,13 +152,13 @@ public function setMin($min) } if (!is_string($min) and !is_numeric($min)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } $min = (integer) $min; if (($this->_max !== null) && ($min > $this->_max)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The minimum must be less than or equal to the maximum file count, but $min >" . " {$this->_max}"); } @@ -191,13 +191,13 @@ public function setMax($max) } if (!is_string($max) and !is_numeric($max)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } $max = (integer) $max; if (($this->_min !== null) && ($max < $this->_min)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The maximum must be greater than or equal to the minimum file count, but " . "$max < {$this->_min}"); } diff --git a/library/Zend/Validate/File/Crc32.php b/library/Zend/Validate/File/Crc32.php index 9fd47271c6..4606c501f7 100644 --- a/library/Zend/Validate/File/Crc32.php +++ b/library/Zend/Validate/File/Crc32.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_File_Hash */ -require_once 'Zend/Validate/File/Hash.php'; +;// require_once 'Zend/Validate/File/Hash.php'; /** * Validator for the crc32 hash of given files @@ -71,7 +71,7 @@ public function __construct($options) } elseif (is_scalar($options)) { $options = array('hash1' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid options to validator provided'); } @@ -158,7 +158,7 @@ public function addCrc32($options) public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/library/Zend/Validate/File/ExcludeExtension.php b/library/Zend/Validate/File/ExcludeExtension.php index e894af6a34..050755b442 100644 --- a/library/Zend/Validate/File/ExcludeExtension.php +++ b/library/Zend/Validate/File/ExcludeExtension.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/File/Extension.php'; +;// require_once 'Zend/Validate/File/Extension.php'; /** * Validator for the excluding file extensions @@ -61,7 +61,7 @@ class Zend_Validate_File_ExcludeExtension extends Zend_Validate_File_Extension public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/library/Zend/Validate/File/ExcludeMimeType.php b/library/Zend/Validate/File/ExcludeMimeType.php index 27d4f5ac3b..0e40966ee7 100644 --- a/library/Zend/Validate/File/ExcludeMimeType.php +++ b/library/Zend/Validate/File/ExcludeMimeType.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_File_MimeType */ -require_once 'Zend/Validate/File/MimeType.php'; +;// require_once 'Zend/Validate/File/MimeType.php'; /** * Validator for the mime type of a file @@ -68,7 +68,7 @@ public function isValid($value, $file = null) } // Is file readable ? - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_READABLE); } diff --git a/library/Zend/Validate/File/Exists.php b/library/Zend/Validate/File/Exists.php index 8da1ccdd7d..0d4adb4a73 100644 --- a/library/Zend/Validate/File/Exists.php +++ b/library/Zend/Validate/File/Exists.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * Validator which checks if the file already exists in the directory @@ -72,7 +72,7 @@ public function __construct($directory = array()) } else if (is_string($directory)) { $directory = explode(',', $directory); } else if (!is_array($directory)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } @@ -123,7 +123,7 @@ public function addDirectory($directory) if (is_string($directory)) { $directory = explode(',', $directory); } else if (!is_array($directory)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } diff --git a/library/Zend/Validate/File/Extension.php b/library/Zend/Validate/File/Extension.php index 4e44fd57bb..70b0859e80 100644 --- a/library/Zend/Validate/File/Extension.php +++ b/library/Zend/Validate/File/Extension.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * Validator for the file extension of a file @@ -186,7 +186,7 @@ public function addExtension($extension) public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/library/Zend/Validate/File/FilesSize.php b/library/Zend/Validate/File/FilesSize.php index b648133416..456d3d7512 100644 --- a/library/Zend/Validate/File/FilesSize.php +++ b/library/Zend/Validate/File/FilesSize.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_File_Size */ -require_once 'Zend/Validate/File/Size.php'; +;// require_once 'Zend/Validate/File/Size.php'; /** * Validator for the size of all files which will be validated in sum @@ -76,7 +76,7 @@ public function __construct($options) } elseif (is_scalar($options)) { $options = array('max' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid options to validator provided'); } @@ -104,7 +104,7 @@ public function __construct($options) */ public function isValid($value, $file = null) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; if (is_string($value)) { $value = array($value); } diff --git a/library/Zend/Validate/File/Hash.php b/library/Zend/Validate/File/Hash.php index 54b036756f..7e42f8ceae 100644 --- a/library/Zend/Validate/File/Hash.php +++ b/library/Zend/Validate/File/Hash.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * Validator for the hash of given files @@ -70,7 +70,7 @@ public function __construct($options) } elseif (is_scalar($options)) { $options = array('hash1' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid options to validator provided'); } @@ -117,7 +117,7 @@ public function addHash($options) if (is_string($options)) { $options = array($options); } else if (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("False parameter given"); } @@ -130,7 +130,7 @@ public function addHash($options) } if (!in_array($algorithm, $known)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Unknown algorithm '{$algorithm}'"); } @@ -153,7 +153,7 @@ public function addHash($options) public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/library/Zend/Validate/File/ImageSize.php b/library/Zend/Validate/File/ImageSize.php index 871fef84ff..029026816c 100644 --- a/library/Zend/Validate/File/ImageSize.php +++ b/library/Zend/Validate/File/ImageSize.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * Validator for the image size of a image file @@ -140,7 +140,7 @@ public function __construct($options) } } } else if (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } @@ -205,7 +205,7 @@ public function setImageMin($options) { if (isset($options['minwidth'])) { if (($this->_maxwidth !== null) and ($options['minwidth'] > $this->_maxwidth)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The minimum image width must be less than or equal to the " . " maximum image width, but {$options['minwidth']} > {$this->_maxwidth}"); } @@ -213,7 +213,7 @@ public function setImageMin($options) if (isset($options['maxheight'])) { if (($this->_maxheight !== null) and ($options['minheight'] > $this->_maxheight)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The minimum image height must be less than or equal to the " . " maximum image height, but {$options['minheight']} > {$this->_maxheight}"); } @@ -242,7 +242,7 @@ public function setImageMax($options) { if (isset($options['maxwidth'])) { if (($this->_minwidth !== null) and ($options['maxwidth'] < $this->_minwidth)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The maximum image width must be greater than or equal to the " . "minimum image width, but {$options['maxwidth']} < {$this->_minwidth}"); } @@ -250,7 +250,7 @@ public function setImageMax($options) if (isset($options['maxheight'])) { if (($this->_minheight !== null) and ($options['maxheight'] < $this->_minheight)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The maximum image height must be greater than or equal to the " . "minimum image height, but {$options['maxheight']} < {$this->_minwidth}"); } @@ -308,7 +308,7 @@ public function setImageHeight($options) public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_READABLE); } diff --git a/library/Zend/Validate/File/IsCompressed.php b/library/Zend/Validate/File/IsCompressed.php index ce59423bd2..0ec5108cf0 100644 --- a/library/Zend/Validate/File/IsCompressed.php +++ b/library/Zend/Validate/File/IsCompressed.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_File_MimeType */ -require_once 'Zend/Validate/File/MimeType.php'; +;// require_once 'Zend/Validate/File/MimeType.php'; /** * Validator which checks if the file already exists in the directory diff --git a/library/Zend/Validate/File/IsImage.php b/library/Zend/Validate/File/IsImage.php index 09a6e42ab2..7b998bbe2a 100644 --- a/library/Zend/Validate/File/IsImage.php +++ b/library/Zend/Validate/File/IsImage.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_File_MimeType */ -require_once 'Zend/Validate/File/MimeType.php'; +;// require_once 'Zend/Validate/File/MimeType.php'; /** * Validator which checks if the file already exists in the directory diff --git a/library/Zend/Validate/File/Md5.php b/library/Zend/Validate/File/Md5.php index bfe0b6046e..b69826cc63 100644 --- a/library/Zend/Validate/File/Md5.php +++ b/library/Zend/Validate/File/Md5.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_File_Hash */ -require_once 'Zend/Validate/File/Hash.php'; +;// require_once 'Zend/Validate/File/Hash.php'; /** * Validator for the md5 hash of given files @@ -73,7 +73,7 @@ public function __construct($options) } elseif (is_scalar($options)) { $options = array('hash1' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid options to validator provided'); } @@ -160,7 +160,7 @@ public function addMd5($options) public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/library/Zend/Validate/File/MimeType.php b/library/Zend/Validate/File/MimeType.php index 8741488368..a733cc710e 100644 --- a/library/Zend/Validate/File/MimeType.php +++ b/library/Zend/Validate/File/MimeType.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * Validator for the mime type of a file @@ -136,7 +136,7 @@ public function __construct($mimetype) } elseif (is_string($mimetype)) { $mimetype = explode(',', $mimetype); } elseif (!is_array($mimetype)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Invalid options to validator provided"); } @@ -172,7 +172,7 @@ public function getMagicFile() !(@ini_get("safe_mode") == 'On' || @ini_get("safe_mode") === 1) && $this->shouldTryCommonMagicFiles() // @see ZF-11784 ) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; foreach ($this->_magicFiles as $file) { // supressing errors which are thrown due to openbase_dir restrictions try { @@ -209,10 +209,10 @@ public function setMagicFile($file) $this->_magicfile = null; } else if (!(class_exists('finfo', false))) { $this->_magicfile = null; - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Magicfile can not be set. There is no finfo extension installed'); } else if (!is_file($file) || !is_readable($file)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('The given magicfile can not be read'); } else { $const = defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME; @@ -221,7 +221,7 @@ public function setMagicFile($file) restore_error_handler(); if (empty($this->_finfo)) { $this->_finfo = null; - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception( sprintf('The given magicfile ("%s") is not accepted by finfo', $file), null, @@ -328,7 +328,7 @@ public function addMimeType($mimetype) if (is_string($mimetype)) { $mimetype = explode(',', $mimetype); } elseif (!is_array($mimetype)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Invalid options to validator provided"); } @@ -377,7 +377,7 @@ public function isValid($value, $file = null) } // Is file readable ? - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_READABLE); } diff --git a/library/Zend/Validate/File/NotExists.php b/library/Zend/Validate/File/NotExists.php index bf58dce229..816471a904 100644 --- a/library/Zend/Validate/File/NotExists.php +++ b/library/Zend/Validate/File/NotExists.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_File_Exists */ -require_once 'Zend/Validate/File/Exists.php'; +;// require_once 'Zend/Validate/File/Exists.php'; /** * Validator which checks if the destination file does not exist diff --git a/library/Zend/Validate/File/Sha1.php b/library/Zend/Validate/File/Sha1.php index e4076139bb..9d1783b574 100644 --- a/library/Zend/Validate/File/Sha1.php +++ b/library/Zend/Validate/File/Sha1.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_File_Hash */ -require_once 'Zend/Validate/File/Hash.php'; +;// require_once 'Zend/Validate/File/Hash.php'; /** * Validator for the sha1 hash of given files @@ -73,7 +73,7 @@ public function __construct($options) } elseif (is_scalar($options)) { $options = array('hash1' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid options to validator provided'); } @@ -160,7 +160,7 @@ public function addSha1($options) public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/library/Zend/Validate/File/Size.php b/library/Zend/Validate/File/Size.php index bc9dea0d23..ffa8477282 100644 --- a/library/Zend/Validate/File/Size.php +++ b/library/Zend/Validate/File/Size.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * Validator for the maximum size of a file up to a max of 2GB @@ -108,7 +108,7 @@ public function __construct($options) } elseif (is_string($options) || is_numeric($options)) { $options = array('max' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } @@ -182,14 +182,14 @@ public function getMin($raw = false) public function setMin($min) { if (!is_string($min) and !is_numeric($min)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } $min = (integer) $this->_fromByteString($min); $max = $this->getMax(true); if (($max !== null) && ($min > $max)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The minimum must be less than or equal to the maximum filesize, but $min >" . " $max"); } @@ -224,14 +224,14 @@ public function getMax($raw = false) public function setMax($max) { if (!is_string($max) && !is_numeric($max)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } $max = (integer) $this->_fromByteString($max); $min = $this->getMin(true); if (($min !== null) && ($max < $min)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The maximum must be greater than or equal to the minimum filesize, but " . "$max < $min"); } @@ -275,7 +275,7 @@ protected function _setSize($size) public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/library/Zend/Validate/File/Upload.php b/library/Zend/Validate/File/Upload.php index b7163d2d67..25a20207e8 100644 --- a/library/Zend/Validate/File/Upload.php +++ b/library/Zend/Validate/File/Upload.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * Validator for the maximum size of a file up to a max of 2GB @@ -111,7 +111,7 @@ public function getFiles($file = null) } if (count($return) === 0) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The file '$file' was not found"); } diff --git a/library/Zend/Validate/File/WordCount.php b/library/Zend/Validate/File/WordCount.php index 42c79a5bd5..bc3b8c328e 100644 --- a/library/Zend/Validate/File/WordCount.php +++ b/library/Zend/Validate/File/WordCount.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_File_Count */ -require_once 'Zend/Validate/File/Count.php'; +;// require_once 'Zend/Validate/File/Count.php'; /** * Validator for counting all words in a file @@ -64,7 +64,7 @@ class Zend_Validate_File_WordCount extends Zend_Validate_File_Count public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/library/Zend/Validate/Float.php b/library/Zend/Validate/Float.php index f0879a5410..55cc5afeda 100644 --- a/library/Zend/Validate/Float.php +++ b/library/Zend/Validate/Float.php @@ -22,12 +22,12 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Locale_Format */ -require_once 'Zend/Locale/Format.php'; +;// require_once 'Zend/Locale/Format.php'; /** * @category Zend @@ -70,7 +70,7 @@ public function __construct($locale = null) } if (empty($locale)) { - require_once 'Zend/Registry.php'; + ;// require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Locale')) { $locale = Zend_Registry::get('Zend_Locale'); } @@ -95,7 +95,7 @@ public function getLocale() */ public function setLocale($locale = null) { - require_once 'Zend/Locale.php'; + ;// require_once 'Zend/Locale.php'; $this->_locale = Zend_Locale::findLocale($locale); return $this; } diff --git a/library/Zend/Validate/GreaterThan.php b/library/Zend/Validate/GreaterThan.php index 5dd0579cdb..55f4e73ea0 100644 --- a/library/Zend/Validate/GreaterThan.php +++ b/library/Zend/Validate/GreaterThan.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -72,7 +72,7 @@ public function __construct($min) if (array_key_exists('min', $min)) { $min = $min['min']; } else { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Missing option 'min'"); } } diff --git a/library/Zend/Validate/Hex.php b/library/Zend/Validate/Hex.php index c6f780974d..8ce6737e22 100644 --- a/library/Zend/Validate/Hex.php +++ b/library/Zend/Validate/Hex.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/Hostname.php b/library/Zend/Validate/Hostname.php index 05d4d0fe3e..d09899ac27 100644 --- a/library/Zend/Validate/Hostname.php +++ b/library/Zend/Validate/Hostname.php @@ -22,12 +22,12 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Validate_Ip */ -require_once 'Zend/Validate/Ip.php'; +;// require_once 'Zend/Validate/Ip.php'; /** * Please note there are two standalone test scripts for testing IDN characters due to problems diff --git a/library/Zend/Validate/Iban.php b/library/Zend/Validate/Iban.php index e19c1a8d0e..0846087c7f 100644 --- a/library/Zend/Validate/Iban.php +++ b/library/Zend/Validate/Iban.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * Validates IBAN Numbers (International Bank Account Numbers) @@ -149,7 +149,7 @@ public function __construct($locale = null) } if (empty($locale)) { - require_once 'Zend/Registry.php'; + ;// require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Locale')) { $locale = Zend_Registry::get('Zend_Locale'); } @@ -181,10 +181,10 @@ public function getLocale() public function setLocale($locale = null) { if ($locale !== false) { - require_once 'Zend/Locale.php'; + ;// require_once 'Zend/Locale.php'; $locale = Zend_Locale::findLocale($locale); if (strlen($locale) < 4) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Region must be given for IBAN validation'); } } diff --git a/library/Zend/Validate/Identical.php b/library/Zend/Validate/Identical.php index 97f3b8cce7..eca7625653 100644 --- a/library/Zend/Validate/Identical.php +++ b/library/Zend/Validate/Identical.php @@ -20,7 +20,7 @@ */ /** @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/InArray.php b/library/Zend/Validate/InArray.php index 3f3ec243a2..af6e06796a 100644 --- a/library/Zend/Validate/InArray.php +++ b/library/Zend/Validate/InArray.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -73,7 +73,7 @@ public function __construct($options) if ($options instanceof Zend_Config) { $options = $options->toArray(); } else if (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Array expected as parameter'); } else { $count = func_num_args(); diff --git a/library/Zend/Validate/Int.php b/library/Zend/Validate/Int.php index 1bcf31dba0..9f5e4f6968 100644 --- a/library/Zend/Validate/Int.php +++ b/library/Zend/Validate/Int.php @@ -22,12 +22,12 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Locale_Format */ -require_once 'Zend/Locale/Format.php'; +;// require_once 'Zend/Locale/Format.php'; /** * @category Zend @@ -70,7 +70,7 @@ public function __construct($locale = null) } if (empty($locale)) { - require_once 'Zend/Registry.php'; + ;// require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Locale')) { $locale = Zend_Registry::get('Zend_Locale'); } @@ -97,7 +97,7 @@ public function getLocale() */ public function setLocale($locale = null) { - require_once 'Zend/Locale.php'; + ;// require_once 'Zend/Locale.php'; $this->_locale = Zend_Locale::findLocale($locale); return $this; } diff --git a/library/Zend/Validate/Ip.php b/library/Zend/Validate/Ip.php index ede95e92c0..42c7e56b3d 100644 --- a/library/Zend/Validate/Ip.php +++ b/library/Zend/Validate/Ip.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -104,7 +104,7 @@ public function setOptions($options) } if (!$this->_options['allowipv4'] && !$this->_options['allowipv6']) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Nothing to validate. Check your options'); } diff --git a/library/Zend/Validate/Isbn.php b/library/Zend/Validate/Isbn.php index 4d100aa573..f105e65ed9 100644 --- a/library/Zend/Validate/Isbn.php +++ b/library/Zend/Validate/Isbn.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -78,7 +78,7 @@ public function __construct($options = array()) /** * @see Zend_Validate_Exception */ - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid options provided.'); } @@ -226,7 +226,7 @@ public function setSeparator($separator) /** * @see Zend_Validate_Exception */ - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid ISBN separator.'); } @@ -258,7 +258,7 @@ public function setType($type) /** * @see Zend_Validate_Exception */ - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid ISBN type'); } diff --git a/library/Zend/Validate/Ldap/Dn.php b/library/Zend/Validate/Ldap/Dn.php index 3033cec1ef..3a75075cc8 100644 --- a/library/Zend/Validate/Ldap/Dn.php +++ b/library/Zend/Validate/Ldap/Dn.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Interface */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend diff --git a/library/Zend/Validate/LessThan.php b/library/Zend/Validate/LessThan.php index 41c28115bd..92113d1407 100644 --- a/library/Zend/Validate/LessThan.php +++ b/library/Zend/Validate/LessThan.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -71,7 +71,7 @@ public function __construct($max) if (array_key_exists('max', $max)) { $max = $max['max']; } else { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Missing option 'max'"); } } diff --git a/library/Zend/Validate/NotEmpty.php b/library/Zend/Validate/NotEmpty.php index 1bb3ceb82e..6c9a37ce55 100644 --- a/library/Zend/Validate/NotEmpty.php +++ b/library/Zend/Validate/NotEmpty.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -139,7 +139,7 @@ public function setType($type = null) } if (!is_int($type) || ($type < 0) || ($type > self::ALL)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Unknown type'); } diff --git a/library/Zend/Validate/PostCode.php b/library/Zend/Validate/PostCode.php index 7f00d04db8..b865edfea4 100644 --- a/library/Zend/Validate/PostCode.php +++ b/library/Zend/Validate/PostCode.php @@ -22,12 +22,12 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Locale_Format */ -require_once 'Zend/Locale/Format.php'; +;// require_once 'Zend/Locale/Format.php'; /** * @category Zend @@ -78,7 +78,7 @@ public function __construct($options = null) } if (empty($options)) { - require_once 'Zend/Registry.php'; + ;// require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Locale')) { $this->setLocale(Zend_Registry::get('Zend_Locale')); } @@ -98,7 +98,7 @@ public function __construct($options = null) $format = $this->getFormat(); if (empty($format)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("A postcode-format string has to be given for validation"); } } @@ -123,12 +123,12 @@ public function getLocale() */ public function setLocale($locale = null) { - require_once 'Zend/Locale.php'; + ;// require_once 'Zend/Locale.php'; $this->_locale = Zend_Locale::findLocale($locale); $locale = new Zend_Locale($this->_locale); $region = $locale->getRegion(); if (empty($region)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Unable to detect a region for the locale '$locale'"); } @@ -139,7 +139,7 @@ public function setLocale($locale = null) ); if (empty($format)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Unable to detect a postcode format for the region '{$locale->getRegion()}'"); } @@ -167,7 +167,7 @@ public function getFormat() public function setFormat($format) { if (empty($format) || !is_string($format)) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("A postcode-format string has to be given for validation"); } diff --git a/library/Zend/Validate/Regex.php b/library/Zend/Validate/Regex.php index 5b4360a228..ec697a5933 100644 --- a/library/Zend/Validate/Regex.php +++ b/library/Zend/Validate/Regex.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -75,7 +75,7 @@ public function __construct($pattern) if (array_key_exists('pattern', $pattern)) { $pattern = $pattern['pattern']; } else { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Missing option 'pattern'"); } } @@ -106,7 +106,7 @@ public function setPattern($pattern) $status = @preg_match($this->_pattern, "Test"); if (false === $status) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Internal error while using the pattern '$this->_pattern'"); } diff --git a/library/Zend/Validate/Sitemap/Changefreq.php b/library/Zend/Validate/Sitemap/Changefreq.php index b9f653f431..7688a5b441 100644 --- a/library/Zend/Validate/Sitemap/Changefreq.php +++ b/library/Zend/Validate/Sitemap/Changefreq.php @@ -23,7 +23,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * Validates whether a given value is valid as a sitemap value diff --git a/library/Zend/Validate/Sitemap/Lastmod.php b/library/Zend/Validate/Sitemap/Lastmod.php index 1e81828f1c..993e97e3d5 100644 --- a/library/Zend/Validate/Sitemap/Lastmod.php +++ b/library/Zend/Validate/Sitemap/Lastmod.php @@ -23,7 +23,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * Validates whether a given value is valid as a sitemap value diff --git a/library/Zend/Validate/Sitemap/Loc.php b/library/Zend/Validate/Sitemap/Loc.php index 24c78ed8a9..eb03b11207 100644 --- a/library/Zend/Validate/Sitemap/Loc.php +++ b/library/Zend/Validate/Sitemap/Loc.php @@ -23,12 +23,12 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Uri */ -require_once 'Zend/Uri.php'; +;// require_once 'Zend/Uri.php'; /** * Validates whether a given value is valid as a sitemap value diff --git a/library/Zend/Validate/Sitemap/Priority.php b/library/Zend/Validate/Sitemap/Priority.php index 0f85f0997e..ef4dee088d 100644 --- a/library/Zend/Validate/Sitemap/Priority.php +++ b/library/Zend/Validate/Sitemap/Priority.php @@ -23,7 +23,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * Validates whether a given value is valid as a sitemap value diff --git a/library/Zend/Validate/StringLength.php b/library/Zend/Validate/StringLength.php index b562c42fd0..cdab31df7e 100644 --- a/library/Zend/Validate/StringLength.php +++ b/library/Zend/Validate/StringLength.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +;// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -136,7 +136,7 @@ public function setMin($min) /** * @see Zend_Validate_Exception */ - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The minimum must be less than or equal to the maximum length, but $min >" . " $this->_max"); } @@ -169,7 +169,7 @@ public function setMax($max) /** * @see Zend_Validate_Exception */ - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The maximum must be greater than or equal to the minimum length, but " . "$max < $this->_min"); } else { @@ -208,7 +208,7 @@ public function setEncoding($encoding = null) $result = ini_set('default_charset', $encoding); } if (!$result) { - require_once 'Zend/Validate/Exception.php'; + ;// require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Given encoding not supported on this OS!'); } diff --git a/library/Zend/View.php b/library/Zend/View.php index 6b8f3e5650..10e5ef8e4f 100644 --- a/library/Zend/View.php +++ b/library/Zend/View.php @@ -23,7 +23,7 @@ /** * Abstract master class for extension. */ -require_once 'Zend/View/Abstract.php'; +;// require_once 'Zend/View/Abstract.php'; /** @@ -110,7 +110,7 @@ public function __construct($config = array()) $this->_useViewStream = (bool) ini_get('short_open_tag') ? false : true; if ($this->_useViewStream) { if (!in_array('zend.view', stream_get_wrappers())) { - require_once 'Zend/View/Stream.php'; + ;// require_once 'Zend/View/Stream.php'; stream_wrapper_register('zend.view', 'Zend_View_Stream'); } } diff --git a/library/Zend/View/Abstract.php b/library/Zend/View/Abstract.php index d49bd69bf3..59bdc460e7 100644 --- a/library/Zend/View/Abstract.php +++ b/library/Zend/View/Abstract.php @@ -20,13 +20,13 @@ */ /** @see Zend_Loader */ -require_once 'Zend/Loader.php'; +;// require_once 'Zend/Loader.php'; /** @see Zend_Loader_PluginLoader */ -require_once 'Zend/Loader/PluginLoader.php'; +;// require_once 'Zend/Loader/PluginLoader.php'; /** @see Zend_View_Interface */ -require_once 'Zend/View/Interface.php'; +;// require_once 'Zend/View/Interface.php'; /** * Abstract class for Zend_View to help enforce private constructs. @@ -310,7 +310,7 @@ public function __set($key, $val) return; } - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Setting private or protected class members is not allowed'); $e->setView($this); throw $e; @@ -474,7 +474,7 @@ public function setPluginLoader(Zend_Loader_PluginLoader $loader, $type) { $type = strtolower($type); if (!in_array($type, $this->_loaderTypes)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf('Invalid plugin loader type "%s"', $type)); $e->setView($this); throw $e; @@ -494,7 +494,7 @@ public function getPluginLoader($type) { $type = strtolower($type); if (!in_array($type, $this->_loaderTypes)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf('Invalid plugin loader type "%s"; cannot retrieve', $type)); $e->setView($this); throw $e; @@ -582,7 +582,7 @@ public function getHelperPaths() public function registerHelper($helper, $name) { if (!is_object($helper)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('View helper must be an object'); $e->setView($this); throw $e; @@ -590,7 +590,7 @@ public function registerHelper($helper, $name) if (!$helper instanceof Zend_View_Interface) { if (!method_exists($helper, $name)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception( 'View helper must implement Zend_View_Interface or have a method matching the name provided' ); @@ -803,7 +803,7 @@ public function assign($spec, $value = null) if (is_string($spec)) { // assign by name and value if ('_' == substr($spec, 0, 1)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Setting private or protected class members is not allowed'); $e->setView($this); throw $e; @@ -820,13 +820,13 @@ public function assign($spec, $value = null) $this->$key = $val; } if ($error) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Setting private or protected class members is not allowed'); $e->setView($this); throw $e; } } else { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('assign() expects a string or array, received ' . gettype($spec)); $e->setView($this); throw $e; @@ -963,14 +963,14 @@ public function strictVars($flag = true) protected function _script($name) { if ($this->isLfiProtectionOn() && preg_match('#\.\.[\\\/]#', $name)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Requested scripts may not include parent directory traversal ("../", "..\\" notation)'); $e->setView($this); throw $e; } if (0 == count($this->_path['script'])) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('no view script directory set; unable to determine location for view script'); $e->setView($this); throw $e; @@ -982,7 +982,7 @@ protected function _script($name) } } - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $message = "script '$name' not found in path (" . implode(PATH_SEPARATOR, $this->_path['script']) . ")"; diff --git a/library/Zend/View/Exception.php b/library/Zend/View/Exception.php index 93078bcf8e..a2299e2d1f 100644 --- a/library/Zend/View/Exception.php +++ b/library/Zend/View/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** diff --git a/library/Zend/View/Helper/Abstract.php b/library/Zend/View/Helper/Abstract.php index da481bbe33..ac89eeef0a 100644 --- a/library/Zend/View/Helper/Abstract.php +++ b/library/Zend/View/Helper/Abstract.php @@ -23,7 +23,7 @@ /** * @see Zend_View_Helper_Interface */ -require_once 'Zend/View/Helper/Interface.php'; +;// require_once 'Zend/View/Helper/Interface.php'; /** * @category Zend diff --git a/library/Zend/View/Helper/Action.php b/library/Zend/View/Helper/Action.php index a4b83af582..e233d54349 100644 --- a/library/Zend/View/Helper/Action.php +++ b/library/Zend/View/Helper/Action.php @@ -21,7 +21,7 @@ */ /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; +;// require_once 'Zend/View/Helper/Abstract.php'; /** * Helper for rendering output of a controller action @@ -65,7 +65,7 @@ public function __construct() $front = Zend_Controller_Front::getInstance(); $modules = $front->getControllerDirectory(); if (empty($modules)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Action helper depends on valid front controller instance'); $e->setView($this->view); throw $e; @@ -75,7 +75,7 @@ public function __construct() $response = $front->getResponse(); if (empty($request) || empty($response)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Action view helper requires both a registered request and response object in the front controller instance'); $e->setView($this->view); throw $e; diff --git a/library/Zend/View/Helper/BaseUrl.php b/library/Zend/View/Helper/BaseUrl.php index 391a4d680f..7701e00f76 100644 --- a/library/Zend/View/Helper/BaseUrl.php +++ b/library/Zend/View/Helper/BaseUrl.php @@ -21,7 +21,7 @@ */ /** @see Zend_View_Helper_Abstract */ -require_once 'Zend/View/Helper/Abstract.php'; +;// require_once 'Zend/View/Helper/Abstract.php'; /** * Helper for retrieving the BaseUrl @@ -82,7 +82,7 @@ public function getBaseUrl() { if ($this->_baseUrl === null) { /** @see Zend_Controller_Front */ - require_once 'Zend/Controller/Front.php'; + ;// require_once 'Zend/Controller/Front.php'; $baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl(); // Remove scriptname, eg. index.php from baseUrl diff --git a/library/Zend/View/Helper/Currency.php b/library/Zend/View/Helper/Currency.php index 592185f719..23d1ecc46b 100644 --- a/library/Zend/View/Helper/Currency.php +++ b/library/Zend/View/Helper/Currency.php @@ -21,7 +21,7 @@ */ /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; +;// require_once 'Zend/View/Helper/Abstract.php'; /** * Currency view helper @@ -49,7 +49,7 @@ class Zend_View_Helper_Currency extends Zend_View_Helper_Abstract public function __construct($currency = null) { if ($currency === null) { - require_once 'Zend/Registry.php'; + ;// require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Currency')) { $currency = Zend_Registry::get('Zend_Currency'); } @@ -73,7 +73,7 @@ public function currency($value = null, $currency = null) } if (is_string($currency) || ($currency instanceof Zend_Locale)) { - require_once 'Zend/Locale.php'; + ;// require_once 'Zend/Locale.php'; if (Zend_Locale::isLocale($currency)) { $currency = array('locale' => $currency); } @@ -100,7 +100,7 @@ public function currency($value = null, $currency = null) public function setCurrency($currency = null) { if (!$currency instanceof Zend_Currency) { - require_once 'Zend/Currency.php'; + ;// require_once 'Zend/Currency.php'; $currency = new Zend_Currency($currency); } $this->_currency = $currency; diff --git a/library/Zend/View/Helper/DeclareVars.php b/library/Zend/View/Helper/DeclareVars.php index 4663d4a41c..f4b5789f28 100644 --- a/library/Zend/View/Helper/DeclareVars.php +++ b/library/Zend/View/Helper/DeclareVars.php @@ -21,7 +21,7 @@ */ /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; +;// require_once 'Zend/View/Helper/Abstract.php'; /** * Helper for declaring default values of template variables diff --git a/library/Zend/View/Helper/Doctype.php b/library/Zend/View/Helper/Doctype.php index ca63b4dea7..8b816146f9 100644 --- a/library/Zend/View/Helper/Doctype.php +++ b/library/Zend/View/Helper/Doctype.php @@ -21,10 +21,10 @@ */ /** Zend_Registry */ -require_once 'Zend/Registry.php'; +;// require_once 'Zend/Registry.php'; /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; +;// require_once 'Zend/View/Helper/Abstract.php'; /** * Helper for setting and retrieving the doctype @@ -132,7 +132,7 @@ public function doctype($doctype = null) break; default: if (substr($doctype, 0, 9) != 'setView($this->view); throw $e; diff --git a/library/Zend/View/Helper/Fieldset.php b/library/Zend/View/Helper/Fieldset.php index fce37b9341..ad478aa7b2 100644 --- a/library/Zend/View/Helper/Fieldset.php +++ b/library/Zend/View/Helper/Fieldset.php @@ -21,7 +21,7 @@ */ /** Zend_View_Helper_FormElement */ -require_once 'Zend/View/Helper/FormElement.php'; +;// require_once 'Zend/View/Helper/FormElement.php'; /** * Helper for rendering fieldsets diff --git a/library/Zend/View/Helper/Form.php b/library/Zend/View/Helper/Form.php index 514bdd9016..fb71378431 100644 --- a/library/Zend/View/Helper/Form.php +++ b/library/Zend/View/Helper/Form.php @@ -21,7 +21,7 @@ */ /** Zend_View_Helper_FormElement */ -require_once 'Zend/View/Helper/FormElement.php'; +;// require_once 'Zend/View/Helper/FormElement.php'; /** * Helper for rendering HTML forms diff --git a/library/Zend/View/Helper/FormButton.php b/library/Zend/View/Helper/FormButton.php index abdd9f8f33..4587e723b5 100644 --- a/library/Zend/View/Helper/FormButton.php +++ b/library/Zend/View/Helper/FormButton.php @@ -24,7 +24,7 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; +;// require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/Zend/View/Helper/FormCheckbox.php b/library/Zend/View/Helper/FormCheckbox.php index fd6f4ae5b5..276f228da7 100644 --- a/library/Zend/View/Helper/FormCheckbox.php +++ b/library/Zend/View/Helper/FormCheckbox.php @@ -24,7 +24,7 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; +;// require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/Zend/View/Helper/FormElement.php b/library/Zend/View/Helper/FormElement.php index 8c1373b38c..1964eb0d8a 100644 --- a/library/Zend/View/Helper/FormElement.php +++ b/library/Zend/View/Helper/FormElement.php @@ -23,7 +23,7 @@ /** * @see Zend_View_Helper_HtmlElement */ -require_once 'Zend/View/Helper/HtmlElement.php'; +;// require_once 'Zend/View/Helper/HtmlElement.php'; /** * Base helper for form elements. Extend this, don't use it on its own. @@ -66,7 +66,7 @@ public function setTranslator($translator = null) } elseif ($translator instanceof Zend_Translate) { $this->_translator = $translator->getAdapter(); } else { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid translator specified'); $e->setView($this->view); throw $e; diff --git a/library/Zend/View/Helper/FormErrors.php b/library/Zend/View/Helper/FormErrors.php index 4e092b1157..4cde0ae902 100644 --- a/library/Zend/View/Helper/FormErrors.php +++ b/library/Zend/View/Helper/FormErrors.php @@ -23,7 +23,7 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; +;// require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/Zend/View/Helper/FormFile.php b/library/Zend/View/Helper/FormFile.php index 1ea7bfc85c..a8669616ab 100644 --- a/library/Zend/View/Helper/FormFile.php +++ b/library/Zend/View/Helper/FormFile.php @@ -24,7 +24,7 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; +;// require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/Zend/View/Helper/FormHidden.php b/library/Zend/View/Helper/FormHidden.php index fbd2b7396a..d96590eefe 100644 --- a/library/Zend/View/Helper/FormHidden.php +++ b/library/Zend/View/Helper/FormHidden.php @@ -24,7 +24,7 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; +;// require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/Zend/View/Helper/FormImage.php b/library/Zend/View/Helper/FormImage.php index be3daa3d07..b97f5db7d6 100644 --- a/library/Zend/View/Helper/FormImage.php +++ b/library/Zend/View/Helper/FormImage.php @@ -24,7 +24,7 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; +;// require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/Zend/View/Helper/FormLabel.php b/library/Zend/View/Helper/FormLabel.php index f4e034f9bb..14ab6f1024 100644 --- a/library/Zend/View/Helper/FormLabel.php +++ b/library/Zend/View/Helper/FormLabel.php @@ -21,7 +21,7 @@ */ /** Zend_View_Helper_FormElement **/ -require_once 'Zend/View/Helper/FormElement.php'; +;// require_once 'Zend/View/Helper/FormElement.php'; /** * Form label helper diff --git a/library/Zend/View/Helper/FormMultiCheckbox.php b/library/Zend/View/Helper/FormMultiCheckbox.php index 49386cc454..cd8d3ae35c 100644 --- a/library/Zend/View/Helper/FormMultiCheckbox.php +++ b/library/Zend/View/Helper/FormMultiCheckbox.php @@ -22,7 +22,7 @@ /** Zend_View_Helper_FormRadio */ -require_once 'Zend/View/Helper/FormRadio.php'; +;// require_once 'Zend/View/Helper/FormRadio.php'; /** diff --git a/library/Zend/View/Helper/FormNote.php b/library/Zend/View/Helper/FormNote.php index e051fdcc31..de174c9d13 100644 --- a/library/Zend/View/Helper/FormNote.php +++ b/library/Zend/View/Helper/FormNote.php @@ -24,7 +24,7 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; +;// require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/Zend/View/Helper/FormPassword.php b/library/Zend/View/Helper/FormPassword.php index cb42c4b75c..fec934189f 100644 --- a/library/Zend/View/Helper/FormPassword.php +++ b/library/Zend/View/Helper/FormPassword.php @@ -24,7 +24,7 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; +;// require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/Zend/View/Helper/FormRadio.php b/library/Zend/View/Helper/FormRadio.php index fa26a076b4..f6c29ae0fb 100644 --- a/library/Zend/View/Helper/FormRadio.php +++ b/library/Zend/View/Helper/FormRadio.php @@ -24,7 +24,7 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; +;// require_once 'Zend/View/Helper/FormElement.php'; /** @@ -124,7 +124,7 @@ public function formRadio($name, $value = null, $attribs = null, $value = (array) $value; // Set up the filter - Alnum + hyphen + underscore - require_once 'Zend/Filter/PregReplace.php'; + ;// require_once 'Zend/Filter/PregReplace.php'; $pattern = @preg_match('/\pL/u', 'a') ? '/[^\p{L}\p{N}\-\_]/u' // Unicode : '/[^a-zA-Z0-9\-\_]/'; // No Unicode diff --git a/library/Zend/View/Helper/FormReset.php b/library/Zend/View/Helper/FormReset.php index a4e62826de..a16b843912 100644 --- a/library/Zend/View/Helper/FormReset.php +++ b/library/Zend/View/Helper/FormReset.php @@ -24,7 +24,7 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; +;// require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/Zend/View/Helper/FormSelect.php b/library/Zend/View/Helper/FormSelect.php index 8654f3d0e7..bc13c88b66 100644 --- a/library/Zend/View/Helper/FormSelect.php +++ b/library/Zend/View/Helper/FormSelect.php @@ -24,7 +24,7 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; +;// require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/Zend/View/Helper/FormSubmit.php b/library/Zend/View/Helper/FormSubmit.php index 72223e203e..3f595e04b2 100644 --- a/library/Zend/View/Helper/FormSubmit.php +++ b/library/Zend/View/Helper/FormSubmit.php @@ -24,7 +24,7 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; +;// require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/Zend/View/Helper/FormText.php b/library/Zend/View/Helper/FormText.php index 9b9f58135e..ceb7fafd79 100644 --- a/library/Zend/View/Helper/FormText.php +++ b/library/Zend/View/Helper/FormText.php @@ -24,7 +24,7 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; +;// require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/Zend/View/Helper/FormTextarea.php b/library/Zend/View/Helper/FormTextarea.php index c384fc4da6..9c80611915 100644 --- a/library/Zend/View/Helper/FormTextarea.php +++ b/library/Zend/View/Helper/FormTextarea.php @@ -24,7 +24,7 @@ /** * Abstract class for extension */ -require_once 'Zend/View/Helper/FormElement.php'; +;// require_once 'Zend/View/Helper/FormElement.php'; /** diff --git a/library/Zend/View/Helper/Gravatar.php b/library/Zend/View/Helper/Gravatar.php index dab1f799f6..cd6f74902a 100644 --- a/library/Zend/View/Helper/Gravatar.php +++ b/library/Zend/View/Helper/Gravatar.php @@ -21,7 +21,7 @@ */ /** Zend_View_Helper_HtmlElement */ -require_once 'Zend/View/Helper/HtmlElement.php'; +;// require_once 'Zend/View/Helper/HtmlElement.php'; /** * Helper for retrieving avatars from gravatar.com @@ -194,7 +194,7 @@ public function setRating($rating) $this->_options['rating'] = $rating; break; default: - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; throw new Zend_View_Exception(sprintf( 'The rating value "%s" is not allowed', $rating diff --git a/library/Zend/View/Helper/HeadLink.php b/library/Zend/View/Helper/HeadLink.php index 1c7c48b75b..81adb0d03b 100644 --- a/library/Zend/View/Helper/HeadLink.php +++ b/library/Zend/View/Helper/HeadLink.php @@ -21,7 +21,7 @@ */ /** Zend_View_Helper_Placeholder_Container_Standalone */ -require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php'; +;// require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php'; /** * Zend_Layout_View_Helper_HeadLink @@ -159,7 +159,7 @@ public function __call($method, $args) } if (1 > $argc) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf('%s requires at least one argument', $method)); $e->setView($this->view); throw $e; @@ -217,7 +217,7 @@ protected function _isValid($value) public function append($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('append() expects a data token; please use one of the custom append*() methods'); $e->setView($this->view); throw $e; @@ -236,7 +236,7 @@ public function append($value) public function offsetSet($index, $value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('offsetSet() expects a data token; please use one of the custom offsetSet*() methods'); $e->setView($this->view); throw $e; @@ -254,7 +254,7 @@ public function offsetSet($index, $value) public function prepend($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('prepend() expects a data token; please use one of the custom prepend*() methods'); $e->setView($this->view); throw $e; @@ -272,7 +272,7 @@ public function prepend($value) public function set($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('set() expects a data token; please use one of the custom set*() methods'); $e->setView($this->view); throw $e; @@ -431,7 +431,7 @@ protected function _isDuplicateStylesheet($uri) public function createDataAlternate(array $args) { if (3 > count($args)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf('Alternate tags require 3 arguments; %s provided', count($args))); $e->setView($this->view); throw $e; diff --git a/library/Zend/View/Helper/HeadMeta.php b/library/Zend/View/Helper/HeadMeta.php index de58edd5dc..4423988ea8 100644 --- a/library/Zend/View/Helper/HeadMeta.php +++ b/library/Zend/View/Helper/HeadMeta.php @@ -21,7 +21,7 @@ */ /** Zend_View_Helper_Placeholder_Container_Standalone */ -require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php'; +;// require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php'; /** * Zend_Layout_View_Helper_HeadMeta @@ -114,7 +114,7 @@ protected function _normalizeType($type) case 'Property': return 'property'; default: - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf('Invalid type "%s" passed to _normalizeType', $type)); $e->setView($this->view); throw $e; @@ -158,7 +158,7 @@ public function __call($method, $args) } if (2 > $argc) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Too few arguments provided; requires key value, and content'); $e->setView($this->view); throw $e; @@ -241,7 +241,7 @@ protected function _isValid($item) public function append($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid value passed to append; please use appendMeta()'); $e->setView($this->view); throw $e; @@ -261,7 +261,7 @@ public function append($value) public function offsetSet($index, $value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid value passed to offsetSet; please use offsetSetName() or offsetSetHttpEquiv()'); $e->setView($this->view); throw $e; @@ -280,7 +280,7 @@ public function offsetSet($index, $value) public function offsetUnset($index) { if (!in_array($index, $this->getContainer()->getKeys())) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid index passed to offsetUnset()'); $e->setView($this->view); throw $e; @@ -299,7 +299,7 @@ public function offsetUnset($index) public function prepend($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid value passed to prepend; please use prependMeta()'); $e->setView($this->view); throw $e; @@ -318,7 +318,7 @@ public function prepend($value) public function set($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid value passed to set; please use setMeta()'); $e->setView($this->view); throw $e; @@ -346,7 +346,7 @@ public function set($value) public function itemToString(stdClass $item) { if (!in_array($item->type, $this->_typeKeys)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf('Invalid type "%s" provided for meta', $item->type)); $e->setView($this->view); throw $e; @@ -357,7 +357,7 @@ public function itemToString(stdClass $item) foreach ($item->modifiers as $key => $value) { if (!is_null($this->view) && $this->view->doctype()->isHtml5() && $key == 'scheme') { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; throw new Zend_View_Exception('Invalid modifier ' . '"scheme" provided; not supported by HTML5'); } diff --git a/library/Zend/View/Helper/HeadScript.php b/library/Zend/View/Helper/HeadScript.php index 062bed1b0c..d7248996be 100644 --- a/library/Zend/View/Helper/HeadScript.php +++ b/library/Zend/View/Helper/HeadScript.php @@ -21,7 +21,7 @@ */ /** Zend_View_Helper_Placeholder_Container_Standalone */ -require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php'; +;// require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php'; /** * Helper for setting and retrieving script elements for HTML head section @@ -150,7 +150,7 @@ public function headScript($mode = Zend_View_Helper_HeadScript::FILE, $spec = nu public function captureStart($captureType = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $type = 'text/javascript', $attrs = array()) { if ($this->_captureLock) { - require_once 'Zend/View/Helper/Placeholder/Container/Exception.php'; + ;// require_once 'Zend/View/Helper/Placeholder/Container/Exception.php'; $e = new Zend_View_Helper_Placeholder_Container_Exception('Cannot nest headScript captures'); $e->setView($this->view); throw $e; @@ -212,7 +212,7 @@ public function __call($method, $args) { if (preg_match('/^(?Pset|(ap|pre)pend|offsetSet)(?PFile|Script)$/', $method, $matches)) { if (1 > count($args)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf('Method "%s" requires at least one argument', $method)); $e->setView($this->view); throw $e; @@ -226,7 +226,7 @@ public function __call($method, $args) if ('offsetSet' == $action) { $index = array_shift($args); if (1 > count($args)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf('Method "%s" requires at least two arguments, an index and source', $method)); $e->setView($this->view); throw $e; @@ -318,7 +318,7 @@ protected function _isValid($value) public function append($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid argument passed to append(); please use one of the helper methods, appendScript() or appendFile()'); $e->setView($this->view); throw $e; @@ -336,7 +336,7 @@ public function append($value) public function prepend($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid argument passed to prepend(); please use one of the helper methods, prependScript() or prependFile()'); $e->setView($this->view); throw $e; @@ -354,7 +354,7 @@ public function prepend($value) public function set($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid argument passed to set(); please use one of the helper methods, setScript() or setFile()'); $e->setView($this->view); throw $e; @@ -373,7 +373,7 @@ public function set($value) public function offsetSet($index, $value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid argument passed to offsetSet(); please use one of the helper methods, offsetSetScript() or offsetSetFile()'); $e->setView($this->view); throw $e; diff --git a/library/Zend/View/Helper/HeadStyle.php b/library/Zend/View/Helper/HeadStyle.php index fc571bc9e0..3a55287fe3 100644 --- a/library/Zend/View/Helper/HeadStyle.php +++ b/library/Zend/View/Helper/HeadStyle.php @@ -21,7 +21,7 @@ */ /** Zend_View_Helper_Placeholder_Container_Standalone */ -require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php'; +;// require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php'; /** * Helper for setting and retrieving stylesheets @@ -150,7 +150,7 @@ public function __call($method, $args) } if (1 > $argc) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf('Method "%s" requires minimally content for the stylesheet', $method)); $e->setView($this->view); throw $e; @@ -204,7 +204,7 @@ protected function _isValid($value) public function append($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid value passed to append; please use appendStyle()'); $e->setView($this->view); throw $e; @@ -223,7 +223,7 @@ public function append($value) public function offsetSet($index, $value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid value passed to offsetSet; please use offsetSetStyle()'); $e->setView($this->view); throw $e; @@ -241,7 +241,7 @@ public function offsetSet($index, $value) public function prepend($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid value passed to prepend; please use prependStyle()'); $e->setView($this->view); throw $e; @@ -259,7 +259,7 @@ public function prepend($value) public function set($value) { if (!$this->_isValid($value)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Invalid value passed to set; please use setStyle()'); $e->setView($this->view); throw $e; @@ -278,7 +278,7 @@ public function set($value) public function captureStart($type = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $attrs = null) { if ($this->_captureLock) { - require_once 'Zend/View/Helper/Placeholder/Container/Exception.php'; + ;// require_once 'Zend/View/Helper/Placeholder/Container/Exception.php'; $e = new Zend_View_Helper_Placeholder_Container_Exception('Cannot nest headStyle captures'); $e->setView($this->view); throw $e; diff --git a/library/Zend/View/Helper/HeadTitle.php b/library/Zend/View/Helper/HeadTitle.php index 8f3d9d0dbc..746acb9927 100644 --- a/library/Zend/View/Helper/HeadTitle.php +++ b/library/Zend/View/Helper/HeadTitle.php @@ -21,7 +21,7 @@ */ /** Zend_View_Helper_Placeholder_Container_Standalone */ -require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php'; +;// require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php'; /** * Helper for setting and retrieving title element for HTML head @@ -100,7 +100,7 @@ public function setDefaultAttachOrder($setType) Zend_View_Helper_Placeholder_Container_Abstract::SET, Zend_View_Helper_Placeholder_Container_Abstract::PREPEND ))) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; throw new Zend_View_Exception("You must use a valid attach order: 'PREPEND', 'APPEND' or 'SET'"); } @@ -131,7 +131,7 @@ public function setTranslator($translate) } elseif ($translate instanceof Zend_Translate) { $this->_translator = $translate->getAdapter(); } else { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception("You must set an instance of Zend_Translate or Zend_Translate_Adapter"); $e->setView($this->view); throw $e; @@ -150,7 +150,7 @@ public function setTranslator($translate) public function getTranslator() { if (null === $this->_translator) { - require_once 'Zend/Registry.php'; + ;// require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Translate')) { $this->setTranslator(Zend_Registry::get('Zend_Translate')); } diff --git a/library/Zend/View/Helper/HtmlElement.php b/library/Zend/View/Helper/HtmlElement.php index 263fcd32d2..a0402af49d 100644 --- a/library/Zend/View/Helper/HtmlElement.php +++ b/library/Zend/View/Helper/HtmlElement.php @@ -23,7 +23,7 @@ /** * @see Zend_View_Helper_Abstract */ -require_once 'Zend/View/Helper/Abstract.php'; +;// require_once 'Zend/View/Helper/Abstract.php'; /** * @category Zend @@ -117,7 +117,7 @@ protected function _htmlAttribs($attribs) // Don't escape event attributes; _do_ substitute double quotes with singles if (!is_scalar($val)) { // non-scalar data should be cast to JSON first - require_once 'Zend/Json.php'; + ;// require_once 'Zend/Json.php'; $val = Zend_Json::encode($val); } // Escape single quotes inside event attribute values. diff --git a/library/Zend/View/Helper/HtmlFlash.php b/library/Zend/View/Helper/HtmlFlash.php index 3edcf1afce..54957fbb1e 100644 --- a/library/Zend/View/Helper/HtmlFlash.php +++ b/library/Zend/View/Helper/HtmlFlash.php @@ -23,7 +23,7 @@ /** * @see Zend_View_Helper_HtmlObject */ -require_once 'Zend/View/Helper/HtmlObject.php'; +;// require_once 'Zend/View/Helper/HtmlObject.php'; /** * @category Zend diff --git a/library/Zend/View/Helper/HtmlList.php b/library/Zend/View/Helper/HtmlList.php index 471ade4808..0451be75bd 100644 --- a/library/Zend/View/Helper/HtmlList.php +++ b/library/Zend/View/Helper/HtmlList.php @@ -24,7 +24,7 @@ /** * Zend_View_Helper_FormELement */ -require_once 'Zend/View/Helper/FormElement.php'; +;// require_once 'Zend/View/Helper/FormElement.php'; /** * Helper for ordered and unordered lists @@ -50,7 +50,7 @@ class Zend_View_Helper_HtmlList extends Zend_View_Helper_FormElement public function htmlList(array $items, $ordered = false, $attribs = false, $escape = true) { if (!is_array($items)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('First param must be an array'); $e->setView($this->view); throw $e; diff --git a/library/Zend/View/Helper/HtmlObject.php b/library/Zend/View/Helper/HtmlObject.php index 1eddfea5ee..0e291e07ce 100644 --- a/library/Zend/View/Helper/HtmlObject.php +++ b/library/Zend/View/Helper/HtmlObject.php @@ -23,7 +23,7 @@ /** * @see Zend_View_Helper_HtmlElement */ -require_once 'Zend/View/Helper/HtmlElement.php'; +;// require_once 'Zend/View/Helper/HtmlElement.php'; /** * @category Zend diff --git a/library/Zend/View/Helper/HtmlPage.php b/library/Zend/View/Helper/HtmlPage.php index e7b8b0f200..e0e36cc362 100644 --- a/library/Zend/View/Helper/HtmlPage.php +++ b/library/Zend/View/Helper/HtmlPage.php @@ -23,7 +23,7 @@ /** * @see Zend_View_Helper_HtmlObject */ -require_once 'Zend/View/Helper/HtmlObject.php'; +;// require_once 'Zend/View/Helper/HtmlObject.php'; /** * @category Zend diff --git a/library/Zend/View/Helper/HtmlQuicktime.php b/library/Zend/View/Helper/HtmlQuicktime.php index 6c200dbcec..40c30fa7c2 100644 --- a/library/Zend/View/Helper/HtmlQuicktime.php +++ b/library/Zend/View/Helper/HtmlQuicktime.php @@ -23,7 +23,7 @@ /** * @see Zend_View_Helper_HtmlObject */ -require_once 'Zend/View/Helper/HtmlObject.php'; +;// require_once 'Zend/View/Helper/HtmlObject.php'; /** * @category Zend diff --git a/library/Zend/View/Helper/InlineScript.php b/library/Zend/View/Helper/InlineScript.php index 978c6b812b..19a66c8d9a 100644 --- a/library/Zend/View/Helper/InlineScript.php +++ b/library/Zend/View/Helper/InlineScript.php @@ -21,7 +21,7 @@ */ /** Zend_View_Helper_HeadScript */ -require_once 'Zend/View/Helper/HeadScript.php'; +;// require_once 'Zend/View/Helper/HeadScript.php'; /** * Helper for setting and retrieving script elements for inclusion in HTML body diff --git a/library/Zend/View/Helper/Json.php b/library/Zend/View/Helper/Json.php index 61b21ec93d..7411573c61 100644 --- a/library/Zend/View/Helper/Json.php +++ b/library/Zend/View/Helper/Json.php @@ -21,13 +21,13 @@ */ /** Zend_Json */ -require_once 'Zend/Json.php'; +;// require_once 'Zend/Json.php'; /** Zend_Controller_Front */ -require_once 'Zend/Controller/Front.php'; +;// require_once 'Zend/Controller/Front.php'; /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; +;// require_once 'Zend/View/Helper/Abstract.php'; /** * Helper for simplifying JSON responses @@ -76,7 +76,7 @@ public function json($data, $keepLayouts = false, $encodeData = true) $data = Zend_Json::encode($data, null, $options); } if (!$keepLayouts) { - require_once 'Zend/Layout.php'; + ;// require_once 'Zend/Layout.php'; $layout = Zend_Layout::getMvcInstance(); if ($layout instanceof Zend_Layout) { $layout->disableLayout(); diff --git a/library/Zend/View/Helper/Layout.php b/library/Zend/View/Helper/Layout.php index 286a9e38e7..79be0b36c7 100644 --- a/library/Zend/View/Helper/Layout.php +++ b/library/Zend/View/Helper/Layout.php @@ -21,7 +21,7 @@ */ /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; +;// require_once 'Zend/View/Helper/Abstract.php'; /** * View helper for retrieving layout object @@ -44,7 +44,7 @@ class Zend_View_Helper_Layout extends Zend_View_Helper_Abstract public function getLayout() { if (null === $this->_layout) { - require_once 'Zend/Layout.php'; + ;// require_once 'Zend/Layout.php'; $this->_layout = Zend_Layout::getMvcInstance(); if (null === $this->_layout) { // Implicitly creates layout object diff --git a/library/Zend/View/Helper/Navigation.php b/library/Zend/View/Helper/Navigation.php index 2e82ef6a29..fe5753943f 100644 --- a/library/Zend/View/Helper/Navigation.php +++ b/library/Zend/View/Helper/Navigation.php @@ -23,7 +23,7 @@ /** * @see Zend_View_Helper_Navigation_HelperAbstract */ -require_once 'Zend/View/Helper/Navigation/HelperAbstract.php'; +;// require_once 'Zend/View/Helper/Navigation/HelperAbstract.php'; /** * Proxy helper for retrieving navigational helpers and forwarding calls @@ -186,7 +186,7 @@ public function findHelper($proxy, $strict = true) if (!$helper instanceof Zend_View_Helper_Navigation_Helper) { if ($strict) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf( 'Proxy helper "%s" is not an instance of ' . 'Zend_View_Helper_Navigation_Helper', diff --git a/library/Zend/View/Helper/Navigation/Breadcrumbs.php b/library/Zend/View/Helper/Navigation/Breadcrumbs.php index 10755c3df4..6f9b1c9bd6 100644 --- a/library/Zend/View/Helper/Navigation/Breadcrumbs.php +++ b/library/Zend/View/Helper/Navigation/Breadcrumbs.php @@ -23,7 +23,7 @@ /** * @see Zend_View_Helper_Navigation_HelperAbstract */ -require_once 'Zend/View/Helper/Navigation/HelperAbstract.php'; +;// require_once 'Zend/View/Helper/Navigation/HelperAbstract.php'; /** * Helper for printing breadcrumbs @@ -259,7 +259,7 @@ public function renderPartial(Zend_Navigation_Container $container = null, } if (empty($partial)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception( 'Unable to render menu: No partial view script provided' ); @@ -291,7 +291,7 @@ public function renderPartial(Zend_Navigation_Container $container = null, if (is_array($partial)) { if (count($partial) != 2) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception( 'Unable to render menu: A view partial supplied as ' . 'an array must contain two values: partial view ' diff --git a/library/Zend/View/Helper/Navigation/HelperAbstract.php b/library/Zend/View/Helper/Navigation/HelperAbstract.php index 2e733e4423..6c31e88d9f 100644 --- a/library/Zend/View/Helper/Navigation/HelperAbstract.php +++ b/library/Zend/View/Helper/Navigation/HelperAbstract.php @@ -23,12 +23,12 @@ /** * @see Zend_View_Helper_Navigation_Helper */ -require_once 'Zend/View/Helper/Navigation/Helper.php'; +;// require_once 'Zend/View/Helper/Navigation/Helper.php'; /** * @see Zend_View_Helper_HtmlElement */ -require_once 'Zend/View/Helper/HtmlElement.php'; +;// require_once 'Zend/View/Helper/HtmlElement.php'; /** * Base class for navigational helpers @@ -190,7 +190,7 @@ public function getContainer() { if (null === $this->_container) { // try to fetch from registry first - require_once 'Zend/Registry.php'; + ;// require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Navigation')) { $nav = Zend_Registry::get('Zend_Navigation'); if ($nav instanceof Zend_Navigation_Container) { @@ -199,7 +199,7 @@ public function getContainer() } // nothing found in registry, create new container - require_once 'Zend/Navigation.php'; + ;// require_once 'Zend/Navigation.php'; $this->_container = new Zend_Navigation(); } @@ -424,7 +424,7 @@ public function setTranslator($translator = null) public function getTranslator() { if (null === $this->_translator) { - require_once 'Zend/Registry.php'; + ;// require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Translate')) { $this->setTranslator(Zend_Registry::get('Zend_Translate')); } @@ -488,7 +488,7 @@ public function setRole($role = null) $role instanceof Zend_Acl_Role_Interface) { $this->_role = $role; } else { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf( '$role must be a string, null, or an instance of ' . 'Zend_Acl_Role_Interface; %s given', @@ -967,7 +967,7 @@ public static function setDefaultRole($role = null) $role instanceof Zend_Acl_Role_Interface) { self::$_defaultRole = $role; } else { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; throw new Zend_View_Exception( '$role must be null|string|Zend_Acl_Role_Interface' ); diff --git a/library/Zend/View/Helper/Navigation/Links.php b/library/Zend/View/Helper/Navigation/Links.php index 5d05c1008b..3be60055bf 100644 --- a/library/Zend/View/Helper/Navigation/Links.php +++ b/library/Zend/View/Helper/Navigation/Links.php @@ -23,7 +23,7 @@ /** * @see Zend_View_Helper_Navigation_HelperAbstract */ -require_once 'Zend/View/Helper/Navigation/HelperAbstract.php'; +;// require_once 'Zend/View/Helper/Navigation/HelperAbstract.php'; /** * Helper for printing elements @@ -270,7 +270,7 @@ public function findAllRelations(Zend_Navigation_Page $page, public function findRelation(Zend_Navigation_Page $page, $rel, $type) { if (!in_array($rel, array('rel', 'rev'))) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf( 'Invalid argument: $rel must be "rel" or "rev"; "%s" given', $rel)); @@ -709,7 +709,7 @@ protected function _convertToPages($mixed, $recursive = true) public function renderLink(Zend_Navigation_Page $page, $attrib, $relation) { if (!in_array($attrib, array('rel', 'rev'))) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf( 'Invalid relation attribute "%s", must be "rel" or "rev"', $attrib)); diff --git a/library/Zend/View/Helper/Navigation/Menu.php b/library/Zend/View/Helper/Navigation/Menu.php index da3faee84a..7b1b7655fc 100644 --- a/library/Zend/View/Helper/Navigation/Menu.php +++ b/library/Zend/View/Helper/Navigation/Menu.php @@ -23,7 +23,7 @@ /** * @see Zend_View_Helper_Navigation_HelperAbstract */ -require_once 'Zend/View/Helper/Navigation/HelperAbstract.php'; +;// require_once 'Zend/View/Helper/Navigation/HelperAbstract.php'; /** * Helper for rendering menus from navigation containers @@ -1038,7 +1038,7 @@ public function renderPartial(Zend_Navigation_Container $container = null, } if (empty($partial)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception( 'Unable to render menu: No partial view script provided' ); @@ -1052,7 +1052,7 @@ public function renderPartial(Zend_Navigation_Container $container = null, if (is_array($partial)) { if (count($partial) != 2) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception( 'Unable to render menu: A view partial supplied as ' . 'an array must contain two values: partial view ' diff --git a/library/Zend/View/Helper/Navigation/Sitemap.php b/library/Zend/View/Helper/Navigation/Sitemap.php index 4df6dc38d1..563d373d52 100644 --- a/library/Zend/View/Helper/Navigation/Sitemap.php +++ b/library/Zend/View/Helper/Navigation/Sitemap.php @@ -23,7 +23,7 @@ /** * @see Zend_View_Helper_Navigation_HelperAbstract */ -require_once 'Zend/View/Helper/Navigation/HelperAbstract.php'; +;// require_once 'Zend/View/Helper/Navigation/HelperAbstract.php'; /** * Helper for printing sitemaps @@ -186,7 +186,7 @@ public function getUseSchemaValidation() */ public function setServerUrl($serverUrl) { - require_once 'Zend/Uri.php'; + ;// require_once 'Zend/Uri.php'; $uri = Zend_Uri::factory($serverUrl); $uri->setFragment(''); $uri->setPath(''); @@ -195,7 +195,7 @@ public function setServerUrl($serverUrl) if ($uri->valid()) { $this->_serverUrl = $uri->getUri(); } else { - require_once 'Zend/Uri/Exception.php'; + ;// require_once 'Zend/Uri/Exception.php'; $e = new Zend_Uri_Exception(sprintf( 'Invalid server URL: "%s"', $serverUrl)); @@ -296,10 +296,10 @@ public function getDomSitemap(Zend_Navigation_Container $container = null) // check if we should validate using our own validators if ($this->getUseSitemapValidators()) { - require_once 'Zend/Validate/Sitemap/Changefreq.php'; - require_once 'Zend/Validate/Sitemap/Lastmod.php'; - require_once 'Zend/Validate/Sitemap/Loc.php'; - require_once 'Zend/Validate/Sitemap/Priority.php'; + ;// require_once 'Zend/Validate/Sitemap/Changefreq.php'; + ;// require_once 'Zend/Validate/Sitemap/Lastmod.php'; + ;// require_once 'Zend/Validate/Sitemap/Loc.php'; + ;// require_once 'Zend/Validate/Sitemap/Priority.php'; // create validators $locValidator = new Zend_Validate_Sitemap_Loc(); @@ -348,7 +348,7 @@ public function getDomSitemap(Zend_Navigation_Container $container = null) if ($this->getUseSitemapValidators() && !$locValidator->isValid($url)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf( 'Encountered an invalid URL for Sitemap XML: "%s"', $url)); @@ -406,7 +406,7 @@ public function getDomSitemap(Zend_Navigation_Container $container = null) // validate using schema if specified if ($this->getUseSchemaValidation()) { if (!@$dom->schemaValidate(self::SITEMAP_XSD)) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception(sprintf( 'Sitemap is invalid according to XML Schema at "%s"', self::SITEMAP_XSD)); diff --git a/library/Zend/View/Helper/PaginationControl.php b/library/Zend/View/Helper/PaginationControl.php index 6f5929a22d..7f999143ee 100644 --- a/library/Zend/View/Helper/PaginationControl.php +++ b/library/Zend/View/Helper/PaginationControl.php @@ -94,7 +94,7 @@ public function paginationControl(Zend_Paginator $paginator = null, $scrollingSt /** * @see Zend_View_Exception */ - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('No paginator instance provided or incorrect type'); $e->setView($this->view); @@ -107,7 +107,7 @@ public function paginationControl(Zend_Paginator $paginator = null, $scrollingSt /** * @see Zend_View_Exception */ - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('No view partial provided and no default set'); $e->setView($this->view); throw $e; @@ -127,7 +127,7 @@ public function paginationControl(Zend_Paginator $paginator = null, $scrollingSt /** * @see Zend_View_Exception */ - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('A view partial supplied as an array must contain two values: the filename and its module'); $e->setView($this->view); throw $e; diff --git a/library/Zend/View/Helper/Partial.php b/library/Zend/View/Helper/Partial.php index 733f563b9b..259de43318 100644 --- a/library/Zend/View/Helper/Partial.php +++ b/library/Zend/View/Helper/Partial.php @@ -21,7 +21,7 @@ */ /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; +;// require_once 'Zend/View/Helper/Abstract.php'; /** * Helper for rendering a template fragment in its own variable scope. @@ -76,10 +76,10 @@ public function partial($name = null, $module = null, $model = null) } if ((null !== $module) && is_string($module)) { - require_once 'Zend/Controller/Front.php'; + ;// require_once 'Zend/Controller/Front.php'; $moduleDir = Zend_Controller_Front::getInstance()->getControllerDirectory($module); if (null === $moduleDir) { - require_once 'Zend/View/Helper/Partial/Exception.php'; + ;// require_once 'Zend/View/Helper/Partial/Exception.php'; $e = new Zend_View_Helper_Partial_Exception('Cannot render partial; module does not exist'); $e->setView($this->view); throw $e; diff --git a/library/Zend/View/Helper/Partial/Exception.php b/library/Zend/View/Helper/Partial/Exception.php index 9355fd3524..7cbc04575b 100644 --- a/library/Zend/View/Helper/Partial/Exception.php +++ b/library/Zend/View/Helper/Partial/Exception.php @@ -22,7 +22,7 @@ /** Zend_View_Exception */ -require_once 'Zend/View/Exception.php'; +;// require_once 'Zend/View/Exception.php'; /** diff --git a/library/Zend/View/Helper/PartialLoop.php b/library/Zend/View/Helper/PartialLoop.php index 4f90da1918..f5d28e1de4 100644 --- a/library/Zend/View/Helper/PartialLoop.php +++ b/library/Zend/View/Helper/PartialLoop.php @@ -21,7 +21,7 @@ */ /** Zend_View_Helper_Partial */ -require_once 'Zend/View/Helper/Partial.php'; +;// require_once 'Zend/View/Helper/Partial.php'; /** * Helper for rendering a template fragment in its own variable scope; iterates @@ -70,7 +70,7 @@ public function partialLoop($name = null, $module = null, $model = null) && (!$model instanceof Traversable) && (is_object($model) && !method_exists($model, 'toArray')) ) { - require_once 'Zend/View/Helper/Partial/Exception.php'; + ;// require_once 'Zend/View/Helper/Partial/Exception.php'; $e = new Zend_View_Helper_Partial_Exception('PartialLoop helper requires iterable data'); $e->setView($this->view); throw $e; diff --git a/library/Zend/View/Helper/Placeholder.php b/library/Zend/View/Helper/Placeholder.php index c726b401db..1493ef626c 100644 --- a/library/Zend/View/Helper/Placeholder.php +++ b/library/Zend/View/Helper/Placeholder.php @@ -21,10 +21,10 @@ */ /** Zend_View_Helper_Placeholder_Registry */ -require_once 'Zend/View/Helper/Placeholder/Registry.php'; +;// require_once 'Zend/View/Helper/Placeholder/Registry.php'; /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; +;// require_once 'Zend/View/Helper/Abstract.php'; /** * Helper for passing data between otherwise segregated Views. It's called diff --git a/library/Zend/View/Helper/Placeholder/Container.php b/library/Zend/View/Helper/Placeholder/Container.php index 10e706d3b6..13764873c4 100644 --- a/library/Zend/View/Helper/Placeholder/Container.php +++ b/library/Zend/View/Helper/Placeholder/Container.php @@ -21,7 +21,7 @@ */ /** Zend_View_Helper_Placeholder_Container_Abstract */ -require_once 'Zend/View/Helper/Placeholder/Container/Abstract.php'; +;// require_once 'Zend/View/Helper/Placeholder/Container/Abstract.php'; /** * Container for placeholder values diff --git a/library/Zend/View/Helper/Placeholder/Container/Abstract.php b/library/Zend/View/Helper/Placeholder/Container/Abstract.php index 0f9cbab476..1c9e444e13 100644 --- a/library/Zend/View/Helper/Placeholder/Container/Abstract.php +++ b/library/Zend/View/Helper/Placeholder/Container/Abstract.php @@ -260,7 +260,7 @@ public function getWhitespace($indent) public function captureStart($type = Zend_View_Helper_Placeholder_Container_Abstract::APPEND, $key = null) { if ($this->_captureLock) { - require_once 'Zend/View/Helper/Placeholder/Container/Exception.php'; + ;// require_once 'Zend/View/Helper/Placeholder/Container/Exception.php'; $e = new Zend_View_Helper_Placeholder_Container_Exception('Cannot nest placeholder captures for the same placeholder'); $e->setView($this->view); throw $e; diff --git a/library/Zend/View/Helper/Placeholder/Container/Exception.php b/library/Zend/View/Helper/Placeholder/Container/Exception.php index da15f6e746..342809176e 100644 --- a/library/Zend/View/Helper/Placeholder/Container/Exception.php +++ b/library/Zend/View/Helper/Placeholder/Container/Exception.php @@ -22,7 +22,7 @@ /** Zend_View_Exception */ -require_once 'Zend/View/Exception.php'; +;// require_once 'Zend/View/Exception.php'; /** diff --git a/library/Zend/View/Helper/Placeholder/Container/Standalone.php b/library/Zend/View/Helper/Placeholder/Container/Standalone.php index 7b0a3e2420..e02be87b71 100644 --- a/library/Zend/View/Helper/Placeholder/Container/Standalone.php +++ b/library/Zend/View/Helper/Placeholder/Container/Standalone.php @@ -21,10 +21,10 @@ */ /** Zend_View_Helper_Placeholder_Registry */ -require_once 'Zend/View/Helper/Placeholder/Registry.php'; +;// require_once 'Zend/View/Helper/Placeholder/Registry.php'; /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; +;// require_once 'Zend/View/Helper/Abstract.php'; /** * Base class for targetted placeholder helpers @@ -230,7 +230,7 @@ public function __call($method, $args) return $return; } - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('Method "' . $method . '" does not exist'); $e->setView($this->view); throw $e; diff --git a/library/Zend/View/Helper/Placeholder/Registry.php b/library/Zend/View/Helper/Placeholder/Registry.php index b4a10c8c8f..8804f341d4 100644 --- a/library/Zend/View/Helper/Placeholder/Registry.php +++ b/library/Zend/View/Helper/Placeholder/Registry.php @@ -21,13 +21,13 @@ */ /** Zend_Registry */ -require_once 'Zend/Registry.php'; +;// require_once 'Zend/Registry.php'; /** Zend_View_Helper_Placeholder_Container_Abstract */ -require_once 'Zend/View/Helper/Placeholder/Container/Abstract.php'; +;// require_once 'Zend/View/Helper/Placeholder/Container/Abstract.php'; /** Zend_View_Helper_Placeholder_Container */ -require_once 'Zend/View/Helper/Placeholder/Container.php'; +;// require_once 'Zend/View/Helper/Placeholder/Container.php'; /** * Registry for placeholder containers @@ -160,13 +160,13 @@ public function deleteContainer($key) public function setContainerClass($name) { if (!class_exists($name)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($name); } $reflection = new ReflectionClass($name); if (!$reflection->isSubclassOf(new ReflectionClass('Zend_View_Helper_Placeholder_Container_Abstract'))) { - require_once 'Zend/View/Helper/Placeholder/Registry/Exception.php'; + ;// require_once 'Zend/View/Helper/Placeholder/Registry/Exception.php'; $e = new Zend_View_Helper_Placeholder_Registry_Exception('Invalid Container class specified'); $e->setView($this->view); throw $e; diff --git a/library/Zend/View/Helper/Placeholder/Registry/Exception.php b/library/Zend/View/Helper/Placeholder/Registry/Exception.php index 6bffa198a8..c450ecf684 100644 --- a/library/Zend/View/Helper/Placeholder/Registry/Exception.php +++ b/library/Zend/View/Helper/Placeholder/Registry/Exception.php @@ -22,7 +22,7 @@ /** Zend_View_Exception */ -require_once 'Zend/View/Exception.php'; +;// require_once 'Zend/View/Exception.php'; /** diff --git a/library/Zend/View/Helper/RenderToPlaceholder.php b/library/Zend/View/Helper/RenderToPlaceholder.php index fd2d3e1ef6..0f64efb156 100644 --- a/library/Zend/View/Helper/RenderToPlaceholder.php +++ b/library/Zend/View/Helper/RenderToPlaceholder.php @@ -21,7 +21,7 @@ */ /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; +;// require_once 'Zend/View/Helper/Abstract.php'; /** * Renders a template and stores the rendered output as a placeholder diff --git a/library/Zend/View/Helper/Translate.php b/library/Zend/View/Helper/Translate.php index f66a560b0d..4d6942877b 100644 --- a/library/Zend/View/Helper/Translate.php +++ b/library/Zend/View/Helper/Translate.php @@ -21,10 +21,10 @@ */ /** Zend_Locale */ -require_once 'Zend/Locale.php'; +;// require_once 'Zend/Locale.php'; /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; +;// require_once 'Zend/View/Helper/Abstract.php'; /** * Translation view helper @@ -112,7 +112,7 @@ public function setTranslator($translate) } else if ($translate instanceof Zend_Translate) { $this->_translator = $translate->getAdapter(); } else { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('You must set an instance of Zend_Translate or Zend_Translate_Adapter'); $e->setView($this->view); throw $e; @@ -129,7 +129,7 @@ public function setTranslator($translate) public function getTranslator() { if ($this->_translator === null) { - require_once 'Zend/Registry.php'; + ;// require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Translate')) { $this->setTranslator(Zend_Registry::get('Zend_Translate')); } @@ -149,7 +149,7 @@ public function setLocale($locale = null) { $translate = $this->getTranslator(); if ($translate === null) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('You must set an instance of Zend_Translate or Zend_Translate_Adapter'); $e->setView($this->view); throw $e; @@ -169,7 +169,7 @@ public function getLocale() { $translate = $this->getTranslator(); if ($translate === null) { - require_once 'Zend/View/Exception.php'; + ;// require_once 'Zend/View/Exception.php'; $e = new Zend_View_Exception('You must set an instance of Zend_Translate or Zend_Translate_Adapter'); $e->setView($this->view); throw $e; diff --git a/library/Zend/View/Helper/Url.php b/library/Zend/View/Helper/Url.php index fbf7b690e6..b2df0120db 100644 --- a/library/Zend/View/Helper/Url.php +++ b/library/Zend/View/Helper/Url.php @@ -21,7 +21,7 @@ */ /** Zend_View_Helper_Abstract.php */ -require_once 'Zend/View/Helper/Abstract.php'; +;// require_once 'Zend/View/Helper/Abstract.php'; /** * Helper for making easy links and getting urls that depend on the routes and router diff --git a/library/Zend/View/Helper/UserAgent.php b/library/Zend/View/Helper/UserAgent.php index 708ccda651..bdbf2f840d 100644 --- a/library/Zend/View/Helper/UserAgent.php +++ b/library/Zend/View/Helper/UserAgent.php @@ -20,7 +20,7 @@ */ /** Zend_View_Helper_Abstract */ -require_once 'Zend/View/Helper/Abstract.php'; +;// require_once 'Zend/View/Helper/Abstract.php'; /** * Helper for interacting with UserAgent instance @@ -75,7 +75,7 @@ public function setUserAgent(Zend_Http_UserAgent $userAgent) public function getUserAgent() { if (null === $this->_userAgent) { - require_once 'Zend/Http/UserAgent.php'; + ;// require_once 'Zend/Http/UserAgent.php'; $this->setUserAgent(new Zend_Http_UserAgent()); } return $this->_userAgent; diff --git a/library/Zend/Wildfire/Channel/HttpHeaders.php b/library/Zend/Wildfire/Channel/HttpHeaders.php index 3838089481..40017a99c0 100644 --- a/library/Zend/Wildfire/Channel/HttpHeaders.php +++ b/library/Zend/Wildfire/Channel/HttpHeaders.php @@ -21,22 +21,22 @@ */ /** Zend_Wildfire_Channel_Interface */ -require_once 'Zend/Wildfire/Channel/Interface.php'; +;// require_once 'Zend/Wildfire/Channel/Interface.php'; /** Zend_Controller_Request_Abstract */ -require_once('Zend/Controller/Request/Abstract.php'); +;// require_once('Zend/Controller/Request/Abstract.php'); /** Zend_Controller_Response_Abstract */ -require_once('Zend/Controller/Response/Abstract.php'); +;// require_once('Zend/Controller/Response/Abstract.php'); /** Zend_Controller_Plugin_Abstract */ -require_once 'Zend/Controller/Plugin/Abstract.php'; +;// require_once 'Zend/Controller/Plugin/Abstract.php'; /** Zend_Wildfire_Protocol_JsonStream */ -require_once 'Zend/Wildfire/Protocol/JsonStream.php'; +;// require_once 'Zend/Wildfire/Protocol/JsonStream.php'; /** Zend_Controller_Front **/ -require_once 'Zend/Controller/Front.php'; +;// require_once 'Zend/Controller/Front.php'; /** * Implements communication via HTTP request and response headers for Wildfire Protocols. @@ -83,17 +83,17 @@ class Zend_Wildfire_Channel_HttpHeaders extends Zend_Controller_Plugin_Abstract public static function init($class = null) { if (self::$_instance !== null) { - require_once 'Zend/Wildfire/Exception.php'; + ;// require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Singleton instance of Zend_Wildfire_Channel_HttpHeaders already exists!'); } if ($class !== null) { if (!is_string($class)) { - require_once 'Zend/Wildfire/Exception.php'; + ;// require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Third argument is not a class string'); } if (!class_exists($class)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($class); } @@ -101,7 +101,7 @@ public static function init($class = null) if (!self::$_instance instanceof Zend_Wildfire_Channel_HttpHeaders) { self::$_instance = null; - require_once 'Zend/Wildfire/Exception.php'; + ;// require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Invalid class to third argument. Must be subclass of Zend_Wildfire_Channel_HttpHeaders.'); } } else { @@ -168,7 +168,7 @@ protected function _initProtocol($uri) case Zend_Wildfire_Protocol_JsonStream::PROTOCOL_URI; return new Zend_Wildfire_Protocol_JsonStream(); } - require_once 'Zend/Wildfire/Exception.php'; + ;// require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Tyring to initialize unknown protocol for URI "'.$uri.'".'); } @@ -314,7 +314,7 @@ public function getRequest() $this->setRequest($controller->getRequest()); } if (!$this->_request) { - require_once 'Zend/Wildfire/Exception.php'; + ;// require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Request objects not initialized.'); } return $this->_request; @@ -335,7 +335,7 @@ public function getResponse() } } if (!$this->_response) { - require_once 'Zend/Wildfire/Exception.php'; + ;// require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Response objects not initialized.'); } return $this->_response; diff --git a/library/Zend/Wildfire/Exception.php b/library/Zend/Wildfire/Exception.php index ec2897967b..6537ad81f2 100644 --- a/library/Zend/Wildfire/Exception.php +++ b/library/Zend/Wildfire/Exception.php @@ -21,7 +21,7 @@ /** Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** diff --git a/library/Zend/Wildfire/Plugin/FirePhp.php b/library/Zend/Wildfire/Plugin/FirePhp.php index 5dc4be6cf1..2c2dad493d 100644 --- a/library/Zend/Wildfire/Plugin/FirePhp.php +++ b/library/Zend/Wildfire/Plugin/FirePhp.php @@ -21,19 +21,19 @@ */ /** Zend_Controller_Request_Abstract */ -require_once('Zend/Controller/Request/Abstract.php'); +;// require_once('Zend/Controller/Request/Abstract.php'); /** Zend_Controller_Response_Abstract */ -require_once('Zend/Controller/Response/Abstract.php'); +;// require_once('Zend/Controller/Response/Abstract.php'); /** Zend_Wildfire_Channel_HttpHeaders */ -require_once 'Zend/Wildfire/Channel/HttpHeaders.php'; +;// require_once 'Zend/Wildfire/Channel/HttpHeaders.php'; /** Zend_Wildfire_Protocol_JsonStream */ -require_once 'Zend/Wildfire/Protocol/JsonStream.php'; +;// require_once 'Zend/Wildfire/Protocol/JsonStream.php'; /** Zend_Wildfire_Plugin_Interface */ -require_once 'Zend/Wildfire/Plugin/Interface.php'; +;// require_once 'Zend/Wildfire/Plugin/Interface.php'; /** * Primary class for communicating with the FirePHP Firefox Extension. @@ -175,23 +175,23 @@ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface public static function init($class = null) { if (self::$_instance !== null) { - require_once 'Zend/Wildfire/Exception.php'; + ;// require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Singleton instance of Zend_Wildfire_Plugin_FirePhp already exists!'); } if ($class !== null) { if (!is_string($class)) { - require_once 'Zend/Wildfire/Exception.php'; + ;// require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Third argument is not a class string'); } if (!class_exists($class)) { - require_once 'Zend/Loader.php'; + ;// require_once 'Zend/Loader.php'; Zend_Loader::loadClass($class); } self::$_instance = new $class(); if (!self::$_instance instanceof Zend_Wildfire_Plugin_FirePhp) { self::$_instance = null; - require_once 'Zend/Wildfire/Exception.php'; + ;// require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Invalid class to third argument. Must be subclass of Zend_Wildfire_Plugin_FirePhp.'); } } else { @@ -467,7 +467,7 @@ public static function send($var, $label=null, $style=null, $options=array()) case self::GROUP_END: break; default: - require_once 'Zend/Wildfire/Exception.php'; + ;// require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Log style "'.$meta['Type'].'" not recognized!'); break; } @@ -555,11 +555,11 @@ protected function _recordMessage($structure, $data, $skipEncode=false) case self::STRUCTURE_URI_DUMP: if (!isset($data['key'])) { - require_once 'Zend/Wildfire/Exception.php'; + ;// require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('You must supply a key.'); } if (!array_key_exists('data',$data)) { - require_once 'Zend/Wildfire/Exception.php'; + ;// require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('You must supply data.'); } @@ -579,11 +579,11 @@ protected function _recordMessage($structure, $data, $skipEncode=false) !is_array($data['meta']) || !array_key_exists('Type',$data['meta'])) { - require_once 'Zend/Wildfire/Exception.php'; + ;// require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('You must supply a "Type" in the meta information.'); } if (!array_key_exists('data',$data)) { - require_once 'Zend/Wildfire/Exception.php'; + ;// require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('You must supply data.'); } @@ -599,7 +599,7 @@ protected function _recordMessage($structure, $data, $skipEncode=false) $value)); default: - require_once 'Zend/Wildfire/Exception.php'; + ;// require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Structure of name "'.$structure.'" is not recognized.'); break; } diff --git a/library/Zend/Wildfire/Plugin/FirePhp/TableMessage.php b/library/Zend/Wildfire/Plugin/FirePhp/TableMessage.php index c4366df8dc..326f21c102 100644 --- a/library/Zend/Wildfire/Plugin/FirePhp/TableMessage.php +++ b/library/Zend/Wildfire/Plugin/FirePhp/TableMessage.php @@ -21,10 +21,10 @@ */ /** Zend_Wildfire_Plugin_FirePhp */ -require_once 'Zend/Wildfire/Plugin/FirePhp.php'; +;// require_once 'Zend/Wildfire/Plugin/FirePhp.php'; /** Zend_Wildfire_Plugin_FirePhp_Message */ -require_once 'Zend/Wildfire/Plugin/FirePhp/Message.php'; +;// require_once 'Zend/Wildfire/Plugin/FirePhp/Message.php'; /** * A message envelope that can be updated for the duration of the requet before @@ -109,7 +109,7 @@ public function getRowAt($index) $count = $this->getRowCount(); if($index < 0 || $index > $count-1) { - require_once 'Zend/Wildfire/Exception.php'; + ;// require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Row index('.$index.') out of bounds('.$count.')!'); } @@ -128,7 +128,7 @@ public function setRowAt($index, $row) $count = $this->getRowCount(); if($index < 0 || $index > $count-1) { - require_once 'Zend/Wildfire/Exception.php'; + ;// require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Row index('.$index.') out of bounds('.$count.')!'); } @@ -156,7 +156,7 @@ public function getLastRow() $count = $this->getRowCount(); if($count==0) { - require_once 'Zend/Wildfire/Exception.php'; + ;// require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Cannot get last row as no rows exist!'); } diff --git a/library/Zend/Wildfire/Protocol/JsonStream.php b/library/Zend/Wildfire/Protocol/JsonStream.php index bb793cd0b8..b8932da4e2 100644 --- a/library/Zend/Wildfire/Protocol/JsonStream.php +++ b/library/Zend/Wildfire/Protocol/JsonStream.php @@ -21,13 +21,13 @@ */ /** Zend_Wildfire_Plugin_Interface */ -require_once 'Zend/Wildfire/Plugin/Interface.php'; +;// require_once 'Zend/Wildfire/Plugin/Interface.php'; /** Zend_Wildfire_Channel_Interface */ -require_once 'Zend/Wildfire/Channel/Interface.php'; +;// require_once 'Zend/Wildfire/Channel/Interface.php'; /** Zend_Json */ -require_once 'Zend/Json.php'; +;// require_once 'Zend/Json.php'; /** * Encodes messages into the Wildfire JSON Stream Communication Protocol. @@ -158,7 +158,7 @@ protected function _encode($value) public function getPayload(Zend_Wildfire_Channel_Interface $channel) { if (!$channel instanceof Zend_Wildfire_Channel_HttpHeaders) { - require_once 'Zend/Wildfire/Exception.php'; + ;// require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('The '.get_class($channel).' channel is not supported by the '.get_class($this).' protocol.'); } @@ -217,7 +217,7 @@ public function getPayload(Zend_Wildfire_Channel_Interface $channel) $message_index++; if ($message_index > 99999) { - require_once 'Zend/Wildfire/Exception.php'; + ;// require_once 'Zend/Wildfire/Exception.php'; throw new Zend_Wildfire_Exception('Maximum number (99,999) of messages reached!'); } } diff --git a/library/Zend/Xml/Exception.php b/library/Zend/Xml/Exception.php index b58c249512..43a5d22087 100644 --- a/library/Zend/Xml/Exception.php +++ b/library/Zend/Xml/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** diff --git a/library/Zend/Xml/Security.php b/library/Zend/Xml/Security.php index efa4b674cc..f9f650cf78 100644 --- a/library/Zend/Xml/Security.php +++ b/library/Zend/Xml/Security.php @@ -112,7 +112,7 @@ public static function scan($xml, DOMDocument $dom = null) foreach ($dom->childNodes as $child) { if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) { if ($child->entities->length > 0) { - require_once 'Exception.php'; + ;// require_once 'Exception.php'; throw new Zend_Xml_Exception(self::ENTITY_DETECT); } } @@ -148,7 +148,7 @@ public static function scan($xml, DOMDocument $dom = null) public static function scanFile($file, DOMDocument $dom = null) { if (!file_exists($file)) { - require_once 'Exception.php'; + ;// require_once 'Exception.php'; throw new Zend_Xml_Exception( "The file $file specified doesn't exist" ); diff --git a/library/Zend/XmlRpc/Client.php b/library/Zend/XmlRpc/Client.php index 4c298cd71c..5f40068938 100644 --- a/library/Zend/XmlRpc/Client.php +++ b/library/Zend/XmlRpc/Client.php @@ -25,44 +25,44 @@ * For handling the HTTP connection to the XML-RPC service * @see Zend_Http_Client */ -require_once 'Zend/Http/Client.php'; +;// require_once 'Zend/Http/Client.php'; /** * Enables object chaining for calling namespaced XML-RPC methods. * @see Zend_XmlRpc_Client_ServerProxy */ -require_once 'Zend/XmlRpc/Client/ServerProxy.php'; +;// require_once 'Zend/XmlRpc/Client/ServerProxy.php'; /** * Introspects remote servers using the XML-RPC de facto system.* methods * @see Zend_XmlRpc_Client_ServerIntrospection */ -require_once 'Zend/XmlRpc/Client/ServerIntrospection.php'; +;// require_once 'Zend/XmlRpc/Client/ServerIntrospection.php'; /** * Represent a native XML-RPC value, used both in sending parameters * to methods and as the parameters retrieve from method calls * @see Zend_XmlRpc_Value */ -require_once 'Zend/XmlRpc/Value.php'; +;// require_once 'Zend/XmlRpc/Value.php'; /** * XML-RPC Request * @see Zend_XmlRpc_Request */ -require_once 'Zend/XmlRpc/Request.php'; +;// require_once 'Zend/XmlRpc/Request.php'; /** * XML-RPC Response * @see Zend_XmlRpc_Response */ -require_once 'Zend/XmlRpc/Response.php'; +;// require_once 'Zend/XmlRpc/Response.php'; /** * XML-RPC Fault * @see Zend_XmlRpc_Fault */ -require_once 'Zend/XmlRpc/Fault.php'; +;// require_once 'Zend/XmlRpc/Fault.php'; /** @@ -290,7 +290,7 @@ public function doRequest($request, $response = null) * Exception thrown when an HTTP error occurs * @see Zend_XmlRpc_Client_HttpException */ - require_once 'Zend/XmlRpc/Client/HttpException.php'; + ;// require_once 'Zend/XmlRpc/Client/HttpException.php'; throw new Zend_XmlRpc_Client_HttpException( $httpResponse->getMessage(), $httpResponse->getStatus()); @@ -383,7 +383,7 @@ public function call($method, $params=array()) * Exception thrown when an XML-RPC fault is returned * @see Zend_XmlRpc_Client_FaultException */ - require_once 'Zend/XmlRpc/Client/FaultException.php'; + ;// require_once 'Zend/XmlRpc/Client/FaultException.php'; throw new Zend_XmlRpc_Client_FaultException($fault->getMessage(), $fault->getCode()); } diff --git a/library/Zend/XmlRpc/Client/Exception.php b/library/Zend/XmlRpc/Client/Exception.php index d82601da6f..f5419667a7 100644 --- a/library/Zend/XmlRpc/Client/Exception.php +++ b/library/Zend/XmlRpc/Client/Exception.php @@ -24,7 +24,7 @@ /** * Zend_XmlRpc_Exception */ -require_once 'Zend/XmlRpc/Exception.php'; +;// require_once 'Zend/XmlRpc/Exception.php'; /** diff --git a/library/Zend/XmlRpc/Client/FaultException.php b/library/Zend/XmlRpc/Client/FaultException.php index 14ffac3adf..97df939d2c 100644 --- a/library/Zend/XmlRpc/Client/FaultException.php +++ b/library/Zend/XmlRpc/Client/FaultException.php @@ -22,7 +22,7 @@ /** Zend_XmlRpc_Client_Exception */ -require_once 'Zend/XmlRpc/Client/Exception.php'; +;// require_once 'Zend/XmlRpc/Client/Exception.php'; /** diff --git a/library/Zend/XmlRpc/Client/HttpException.php b/library/Zend/XmlRpc/Client/HttpException.php index c4186acde7..5471c3582e 100644 --- a/library/Zend/XmlRpc/Client/HttpException.php +++ b/library/Zend/XmlRpc/Client/HttpException.php @@ -24,7 +24,7 @@ /** * Zend_XmlRpc_Exception */ -require_once 'Zend/XmlRpc/Client/Exception.php'; +;// require_once 'Zend/XmlRpc/Client/Exception.php'; /** diff --git a/library/Zend/XmlRpc/Client/IntrospectException.php b/library/Zend/XmlRpc/Client/IntrospectException.php index 51fb30e8db..9d2e674305 100644 --- a/library/Zend/XmlRpc/Client/IntrospectException.php +++ b/library/Zend/XmlRpc/Client/IntrospectException.php @@ -24,7 +24,7 @@ /** * Zend_XmlRpc_Client_Exception */ -require_once 'Zend/XmlRpc/Client/Exception.php'; +;// require_once 'Zend/XmlRpc/Client/Exception.php'; /** diff --git a/library/Zend/XmlRpc/Client/ServerIntrospection.php b/library/Zend/XmlRpc/Client/ServerIntrospection.php index 68848d1112..919a5a69da 100644 --- a/library/Zend/XmlRpc/Client/ServerIntrospection.php +++ b/library/Zend/XmlRpc/Client/ServerIntrospection.php @@ -56,7 +56,7 @@ public function getSignatureForEachMethod() { $methods = $this->listMethods(); - require_once 'Zend/XmlRpc/Client/FaultException.php'; + ;// require_once 'Zend/XmlRpc/Client/FaultException.php'; try { $signatures = $this->getSignatureForEachMethodByMulticall($methods); } catch (Zend_XmlRpc_Client_FaultException $e) { @@ -95,13 +95,13 @@ public function getSignatureForEachMethodByMulticall($methods = null) if (! is_array($serverSignatures)) { $type = gettype($serverSignatures); $error = "Multicall return is malformed. Expected array, got $type"; - require_once 'Zend/XmlRpc/Client/IntrospectException.php'; + ;// require_once 'Zend/XmlRpc/Client/IntrospectException.php'; throw new Zend_XmlRpc_Client_IntrospectException($error); } if (count($serverSignatures) != count($methods)) { $error = 'Bad number of signatures received from multicall'; - require_once 'Zend/XmlRpc/Client/IntrospectException.php'; + ;// require_once 'Zend/XmlRpc/Client/IntrospectException.php'; throw new Zend_XmlRpc_Client_IntrospectException($error); } @@ -146,7 +146,7 @@ public function getMethodSignature($method) $signature = $this->_system->methodSignature($method); if (!is_array($signature)) { $error = 'Invalid signature for method "' . $method . '"'; - require_once 'Zend/XmlRpc/Client/IntrospectException.php'; + ;// require_once 'Zend/XmlRpc/Client/IntrospectException.php'; throw new Zend_XmlRpc_Client_IntrospectException($error); } return $signature; diff --git a/library/Zend/XmlRpc/Exception.php b/library/Zend/XmlRpc/Exception.php index d3350515a7..15edd98ae7 100644 --- a/library/Zend/XmlRpc/Exception.php +++ b/library/Zend/XmlRpc/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +;// require_once 'Zend/Exception.php'; /** diff --git a/library/Zend/XmlRpc/Fault.php b/library/Zend/XmlRpc/Fault.php index 25a5b7d010..692f223f79 100644 --- a/library/Zend/XmlRpc/Fault.php +++ b/library/Zend/XmlRpc/Fault.php @@ -22,7 +22,7 @@ /** * Zend_XmlRpc_Value */ -require_once 'Zend/XmlRpc/Value.php'; +;// require_once 'Zend/XmlRpc/Value.php'; /** * XMLRPC Faults @@ -194,7 +194,7 @@ public function getEncoding() public function loadXml($fault) { if (!is_string($fault)) { - require_once 'Zend/XmlRpc/Exception.php'; + ;// require_once 'Zend/XmlRpc/Exception.php'; throw new Zend_XmlRpc_Exception('Invalid XML provided to fault'); } @@ -202,7 +202,7 @@ public function loadXml($fault) $xml = @new SimpleXMLElement($fault); } catch (Exception $e) { // Not valid XML - require_once 'Zend/XmlRpc/Exception.php'; + ;// require_once 'Zend/XmlRpc/Exception.php'; throw new Zend_XmlRpc_Exception('Failed to parse XML fault: ' . $e->getMessage(), 500, $e); } @@ -214,7 +214,7 @@ public function loadXml($fault) if (!$xml->fault->value->struct) { // not a proper fault - require_once 'Zend/XmlRpc/Exception.php'; + ;// require_once 'Zend/XmlRpc/Exception.php'; throw new Zend_XmlRpc_Exception('Invalid fault structure', 500); } @@ -230,7 +230,7 @@ public function loadXml($fault) } if (empty($code) && empty($message)) { - require_once 'Zend/XmlRpc/Exception.php'; + ;// require_once 'Zend/XmlRpc/Exception.php'; throw new Zend_XmlRpc_Exception('Fault code and string required'); } @@ -261,7 +261,7 @@ public function loadXml($fault) public static function isFault($xml) { $fault = new self(); - require_once 'Zend/XmlRpc/Exception.php'; + ;// require_once 'Zend/XmlRpc/Exception.php'; try { $isFault = $fault->loadXml($xml); } catch (Zend_XmlRpc_Exception $e) { diff --git a/library/Zend/XmlRpc/Generator/DomDocument.php b/library/Zend/XmlRpc/Generator/DomDocument.php index 88bc05fa0c..054548778c 100644 --- a/library/Zend/XmlRpc/Generator/DomDocument.php +++ b/library/Zend/XmlRpc/Generator/DomDocument.php @@ -23,7 +23,7 @@ /** * @var Zend_XmlRpc_Generator_GeneratorAbstract */ -require_once 'Zend/XmlRpc/Generator/GeneratorAbstract.php'; +;// require_once 'Zend/XmlRpc/Generator/GeneratorAbstract.php'; /** * DOMDocument based implementation of a XML/RPC generator diff --git a/library/Zend/XmlRpc/Generator/XmlWriter.php b/library/Zend/XmlRpc/Generator/XmlWriter.php index a84e11d3bf..5d291390d5 100644 --- a/library/Zend/XmlRpc/Generator/XmlWriter.php +++ b/library/Zend/XmlRpc/Generator/XmlWriter.php @@ -23,7 +23,7 @@ /** * @var Zend_XmlRpc_Generator_GeneratorAbstract */ -require_once 'Zend/XmlRpc/Generator/GeneratorAbstract.php'; +;// require_once 'Zend/XmlRpc/Generator/GeneratorAbstract.php'; /** * XML generator adapter based on XMLWriter diff --git a/library/Zend/XmlRpc/Request.php b/library/Zend/XmlRpc/Request.php index 73bb9670a3..bef8b58253 100644 --- a/library/Zend/XmlRpc/Request.php +++ b/library/Zend/XmlRpc/Request.php @@ -21,18 +21,18 @@ /** * Zend_XmlRpc_Value */ -require_once 'Zend/XmlRpc/Value.php'; +;// require_once 'Zend/XmlRpc/Value.php'; /** * Zend_XmlRpc_Fault */ -require_once 'Zend/XmlRpc/Fault.php'; +;// require_once 'Zend/XmlRpc/Fault.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** @see Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; +;// require_once 'Zend/Xml/Exception.php'; /** * XmlRpc Request object diff --git a/library/Zend/XmlRpc/Request/Http.php b/library/Zend/XmlRpc/Request/Http.php index df058a1a84..234f62f61d 100644 --- a/library/Zend/XmlRpc/Request/Http.php +++ b/library/Zend/XmlRpc/Request/Http.php @@ -21,7 +21,7 @@ /** * Zend_XmlRpc_Request */ -require_once 'Zend/XmlRpc/Request.php'; +;// require_once 'Zend/XmlRpc/Request.php'; /** * XmlRpc Request object -- Request via HTTP @@ -63,7 +63,7 @@ public function __construct() { $xml = @file_get_contents('php://input'); if (!$xml) { - require_once 'Zend/XmlRpc/Fault.php'; + ;// require_once 'Zend/XmlRpc/Fault.php'; $this->_fault = new Zend_XmlRpc_Fault(630); return; } diff --git a/library/Zend/XmlRpc/Request/Stdin.php b/library/Zend/XmlRpc/Request/Stdin.php index d6bb539e19..84a10f3a53 100644 --- a/library/Zend/XmlRpc/Request/Stdin.php +++ b/library/Zend/XmlRpc/Request/Stdin.php @@ -21,7 +21,7 @@ /** * Zend_XmlRpc_Request */ -require_once 'Zend/XmlRpc/Request.php'; +;// require_once 'Zend/XmlRpc/Request.php'; /** * XmlRpc Request object -- Request via STDIN diff --git a/library/Zend/XmlRpc/Response.php b/library/Zend/XmlRpc/Response.php index be5a6cbb4e..0c23718a8d 100644 --- a/library/Zend/XmlRpc/Response.php +++ b/library/Zend/XmlRpc/Response.php @@ -21,18 +21,18 @@ /** * Zend_XmlRpc_Value */ -require_once 'Zend/XmlRpc/Value.php'; +;// require_once 'Zend/XmlRpc/Value.php'; /** * Zend_XmlRpc_Fault */ -require_once 'Zend/XmlRpc/Fault.php'; +;// require_once 'Zend/XmlRpc/Fault.php'; /** @see Zend_Xml_Security */ -require_once 'Zend/Xml/Security.php'; +;// require_once 'Zend/Xml/Security.php'; /** @see Zend_Xml_Exception */ -require_once 'Zend/Xml/Exception.php'; +;// require_once 'Zend/Xml/Exception.php'; /** * XmlRpc Response @@ -208,7 +208,7 @@ public function loadXml($response) try { if (!isset($xml->params) || !isset($xml->params->param) || !isset($xml->params->param->value)) { - require_once 'Zend/XmlRpc/Value/Exception.php'; + ;// require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception('Missing XML-RPC value in XML'); } $valueXml = $xml->params->param->value->asXML(); diff --git a/library/Zend/XmlRpc/Response/Http.php b/library/Zend/XmlRpc/Response/Http.php index 5bc246ba67..f16c2c1299 100644 --- a/library/Zend/XmlRpc/Response/Http.php +++ b/library/Zend/XmlRpc/Response/Http.php @@ -21,7 +21,7 @@ /** * Zend_XmlRpc_Response */ -require_once 'Zend/XmlRpc/Response.php'; +;// require_once 'Zend/XmlRpc/Response.php'; /** * HTTP response diff --git a/library/Zend/XmlRpc/Server.php b/library/Zend/XmlRpc/Server.php index 1c747084b0..5963a77a85 100644 --- a/library/Zend/XmlRpc/Server.php +++ b/library/Zend/XmlRpc/Server.php @@ -23,64 +23,64 @@ /** * Extends Zend_Server_Abstract */ -require_once 'Zend/Server/Abstract.php'; +;// require_once 'Zend/Server/Abstract.php'; /** * XMLRPC Request */ -require_once 'Zend/XmlRpc/Request.php'; +;// require_once 'Zend/XmlRpc/Request.php'; /** * XMLRPC Response */ -require_once 'Zend/XmlRpc/Response.php'; +;// require_once 'Zend/XmlRpc/Response.php'; /** * XMLRPC HTTP Response */ -require_once 'Zend/XmlRpc/Response/Http.php'; +;// require_once 'Zend/XmlRpc/Response/Http.php'; /** * XMLRPC server fault class */ -require_once 'Zend/XmlRpc/Server/Fault.php'; +;// require_once 'Zend/XmlRpc/Server/Fault.php'; /** * XMLRPC server system methods class */ -require_once 'Zend/XmlRpc/Server/System.php'; +;// require_once 'Zend/XmlRpc/Server/System.php'; /** * Convert PHP to and from xmlrpc native types */ -require_once 'Zend/XmlRpc/Value.php'; +;// require_once 'Zend/XmlRpc/Value.php'; /** * Reflection API for function/method introspection */ -require_once 'Zend/Server/Reflection.php'; +;// require_once 'Zend/Server/Reflection.php'; /** * Zend_Server_Reflection_Function_Abstract */ -require_once 'Zend/Server/Reflection/Function/Abstract.php'; +;// require_once 'Zend/Server/Reflection/Function/Abstract.php'; /** * Specifically grab the Zend_Server_Reflection_Method for manually setting up * system.* methods and handling callbacks in {@link loadFunctions()}. */ -require_once 'Zend/Server/Reflection/Method.php'; +;// require_once 'Zend/Server/Reflection/Method.php'; /** * An XML-RPC server implementation * * Example: * - * require_once 'Zend/XmlRpc/Server.php'; - * require_once 'Zend/XmlRpc/Server/Cache.php'; - * require_once 'Zend/XmlRpc/Server/Fault.php'; - * require_once 'My/Exception.php'; - * require_once 'My/Fault/Observer.php'; + * ;// require_once 'Zend/XmlRpc/Server.php'; + * ;// require_once 'Zend/XmlRpc/Server/Cache.php'; + * ;// require_once 'Zend/XmlRpc/Server/Fault.php'; + * ;// require_once 'My/Exception.php'; + * ;// require_once 'My/Fault/Observer.php'; * * // Instantiate server * $server = new Zend_XmlRpc_Server(); @@ -91,8 +91,8 @@ * * // Get or build dispatch table: * if (!Zend_XmlRpc_Server_Cache::get($filename, $server)) { - * require_once 'Some/Service/Class.php'; - * require_once 'Another/Service/Class.php'; + * ;// require_once 'Some/Service/Class.php'; + * ;// require_once 'Another/Service/Class.php'; * * // Attach Some_Service_Class in 'some' namespace * $server->setClass('Some_Service_Class', 'some'); @@ -208,7 +208,7 @@ public function __call($method, $params) { $system = $this->getSystem(); if (!method_exists($system, $method)) { - require_once 'Zend/XmlRpc/Server/Exception.php'; + ;// require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Unknown instance method called on server: ' . $method); } return call_user_func_array(array($system, $method), $params); @@ -233,7 +233,7 @@ public function __call($method, $params) public function addFunction($function, $namespace = '') { if (!is_string($function) && !is_array($function)) { - require_once 'Zend/XmlRpc/Server/Exception.php'; + ;// require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Unable to attach function; invalid', 611); } @@ -246,7 +246,7 @@ public function addFunction($function, $namespace = '') $function = (array) $function; foreach ($function as $func) { if (!is_string($func) || !function_exists($func)) { - require_once 'Zend/XmlRpc/Server/Exception.php'; + ;// require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Unable to attach function; invalid', 611); } $reflection = Zend_Server_Reflection::reflectFunction($func, $argv, $namespace); @@ -274,7 +274,7 @@ public function addFunction($function, $namespace = '') public function setClass($class, $namespace = '', $argv = null) { if (is_string($class) && !class_exists($class)) { - require_once 'Zend/XmlRpc/Server/Exception.php'; + ;// require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Invalid method class', 610); } @@ -304,7 +304,7 @@ public function fault($fault = null, $code = 404) if (empty($fault)) { $fault = 'Unknown Error'; } - require_once 'Zend/XmlRpc/Server/Exception.php'; + ;// require_once 'Zend/XmlRpc/Server/Exception.php'; $fault = new Zend_XmlRpc_Server_Exception($fault, $code); } @@ -323,7 +323,7 @@ public function handle($request = false) if ((!$request || !$request instanceof Zend_XmlRpc_Request) && (null === ($request = $this->getRequest())) ) { - require_once 'Zend/XmlRpc/Request/Http.php'; + ;// require_once 'Zend/XmlRpc/Request/Http.php'; $request = new Zend_XmlRpc_Request_Http(); $request->setEncoding($this->getEncoding()); } @@ -364,7 +364,7 @@ public function loadFunctions($definition) } else { $type = gettype($definition); } - require_once 'Zend/XmlRpc/Server/Exception.php'; + ;// require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Unable to load server definition; must be an array or Zend_Server_Definition, received ' . $type, 612); } @@ -428,12 +428,12 @@ public function setRequest($request) if (is_string($request) && class_exists($request)) { $request = new $request(); if (!$request instanceof Zend_XmlRpc_Request) { - require_once 'Zend/XmlRpc/Server/Exception.php'; + ;// require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Invalid request class'); } $request->setEncoding($this->getEncoding()); } elseif (!$request instanceof Zend_XmlRpc_Request) { - require_once 'Zend/XmlRpc/Server/Exception.php'; + ;// require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Invalid request object'); } @@ -462,7 +462,7 @@ public function setResponseClass($class) if (!class_exists($class) or ($c = new ReflectionClass($class) and !$c->isSubclassOf('Zend_XmlRpc_Response'))) { - require_once 'Zend/XmlRpc/Server/Exception.php'; + ;// require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Invalid response class'); } $this->_responseClass = $class; @@ -559,7 +559,7 @@ protected function _handle(Zend_XmlRpc_Request $request) // Check for valid method if (!$this->_table->hasMethod($method)) { - require_once 'Zend/XmlRpc/Server/Exception.php'; + ;// require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Method "' . $method . '" does not exist', 620); } @@ -592,7 +592,7 @@ protected function _handle(Zend_XmlRpc_Request $request) } } if (!$matched) { - require_once 'Zend/XmlRpc/Server/Exception.php'; + ;// require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Calling parameters do not match signature', 623); } diff --git a/library/Zend/XmlRpc/Server/Cache.php b/library/Zend/XmlRpc/Server/Cache.php index 7c52902b62..c443da5d36 100644 --- a/library/Zend/XmlRpc/Server/Cache.php +++ b/library/Zend/XmlRpc/Server/Cache.php @@ -21,7 +21,7 @@ */ /** Zend_Server_Cache */ -require_once 'Zend/Server/Cache.php'; +;// require_once 'Zend/Server/Cache.php'; /** * Zend_XmlRpc_Server_Cache: cache Zend_XmlRpc_Server server definition diff --git a/library/Zend/XmlRpc/Server/Exception.php b/library/Zend/XmlRpc/Server/Exception.php index 36952623b4..3c298caf57 100644 --- a/library/Zend/XmlRpc/Server/Exception.php +++ b/library/Zend/XmlRpc/Server/Exception.php @@ -24,7 +24,7 @@ /** * Zend_XmlRpc_Exception */ -require_once 'Zend/XmlRpc/Exception.php'; +;// require_once 'Zend/XmlRpc/Exception.php'; /** diff --git a/library/Zend/XmlRpc/Server/Fault.php b/library/Zend/XmlRpc/Server/Fault.php index 8ccb9ba416..373f601bad 100644 --- a/library/Zend/XmlRpc/Server/Fault.php +++ b/library/Zend/XmlRpc/Server/Fault.php @@ -23,7 +23,7 @@ /** * Zend_XmlRpc_Fault */ -require_once 'Zend/XmlRpc/Fault.php'; +;// require_once 'Zend/XmlRpc/Fault.php'; /** diff --git a/library/Zend/XmlRpc/Server/System.php b/library/Zend/XmlRpc/Server/System.php index 340eb1cd73..11d3448714 100644 --- a/library/Zend/XmlRpc/Server/System.php +++ b/library/Zend/XmlRpc/Server/System.php @@ -70,7 +70,7 @@ public function methodHelp($method) { $table = $this->_server->getDispatchTable(); if (!$table->hasMethod($method)) { - require_once 'Zend/XmlRpc/Server/Exception.php'; + ;// require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Method "' . $method . '" does not exist', 640); } @@ -87,7 +87,7 @@ public function methodSignature($method) { $table = $this->_server->getDispatchTable(); if (!$table->hasMethod($method)) { - require_once 'Zend/XmlRpc/Server/Exception.php'; + ;// require_once 'Zend/XmlRpc/Server/Exception.php'; throw new Zend_XmlRpc_Server_Exception('Method "' . $method . '" does not exist', 640); } $method = $table->getMethod($method)->toArray(); diff --git a/library/Zend/XmlRpc/Value.php b/library/Zend/XmlRpc/Value.php index 6b22449964..ec156825ba 100644 --- a/library/Zend/XmlRpc/Value.php +++ b/library/Zend/XmlRpc/Value.php @@ -106,10 +106,10 @@ public static function getGenerator() { if (!self::$_generator) { if (extension_loaded('xmlwriter')) { - require_once 'Zend/XmlRpc/Generator/XmlWriter.php'; + ;// require_once 'Zend/XmlRpc/Generator/XmlWriter.php'; self::$_generator = new Zend_XmlRpc_Generator_XmlWriter(); } else { - require_once 'Zend/XmlRpc/Generator/DomDocument.php'; + ;// require_once 'Zend/XmlRpc/Generator/DomDocument.php'; self::$_generator = new Zend_XmlRpc_Generator_DomDocument(); } } @@ -203,51 +203,51 @@ public static function getXmlRpcValue($value, $type = self::AUTO_DETECT_TYPE) case self::XMLRPC_TYPE_I4: // fall through to the next case case self::XMLRPC_TYPE_INTEGER: - require_once 'Zend/XmlRpc/Value/Integer.php'; + ;// require_once 'Zend/XmlRpc/Value/Integer.php'; return new Zend_XmlRpc_Value_Integer($value); case self::XMLRPC_TYPE_I8: // fall through to the next case case self::XMLRPC_TYPE_APACHEI8: - require_once 'Zend/XmlRpc/Value/BigInteger.php'; + ;// require_once 'Zend/XmlRpc/Value/BigInteger.php'; return new Zend_XmlRpc_Value_BigInteger($value); case self::XMLRPC_TYPE_DOUBLE: - require_once 'Zend/XmlRpc/Value/Double.php'; + ;// require_once 'Zend/XmlRpc/Value/Double.php'; return new Zend_XmlRpc_Value_Double($value); case self::XMLRPC_TYPE_BOOLEAN: - require_once 'Zend/XmlRpc/Value/Boolean.php'; + ;// require_once 'Zend/XmlRpc/Value/Boolean.php'; return new Zend_XmlRpc_Value_Boolean($value); case self::XMLRPC_TYPE_STRING: - require_once 'Zend/XmlRpc/Value/String.php'; + ;// require_once 'Zend/XmlRpc/Value/String.php'; return new Zend_XmlRpc_Value_String($value); case self::XMLRPC_TYPE_BASE64: - require_once 'Zend/XmlRpc/Value/Base64.php'; + ;// require_once 'Zend/XmlRpc/Value/Base64.php'; return new Zend_XmlRpc_Value_Base64($value); case self::XMLRPC_TYPE_NIL: // fall through to the next case case self::XMLRPC_TYPE_APACHENIL: - require_once 'Zend/XmlRpc/Value/Nil.php'; + ;// require_once 'Zend/XmlRpc/Value/Nil.php'; return new Zend_XmlRpc_Value_Nil(); case self::XMLRPC_TYPE_DATETIME: - require_once 'Zend/XmlRpc/Value/DateTime.php'; + ;// require_once 'Zend/XmlRpc/Value/DateTime.php'; return new Zend_XmlRpc_Value_DateTime($value); case self::XMLRPC_TYPE_ARRAY: - require_once 'Zend/XmlRpc/Value/Array.php'; + ;// require_once 'Zend/XmlRpc/Value/Array.php'; return new Zend_XmlRpc_Value_Array($value); case self::XMLRPC_TYPE_STRUCT: - require_once 'Zend/XmlRpc/Value/Struct.php'; + ;// require_once 'Zend/XmlRpc/Value/Struct.php'; return new Zend_XmlRpc_Value_Struct($value); default: - require_once 'Zend/XmlRpc/Value/Exception.php'; + ;// require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception('Given type is not a '. __CLASS__ .' constant'); } } @@ -306,7 +306,7 @@ protected static function _phpVarToNativeXmlRpc($value) return $value; } if ($value instanceof Zend_Crypt_Math_BigInteger) { - require_once 'Zend/XmlRpc/Value/Exception.php'; + ;// require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception( 'Using Zend_Crypt_Math_BigInteger to get an ' . 'instance of Zend_XmlRpc_Value_BigInteger is not ' . @@ -318,38 +318,38 @@ protected static function _phpVarToNativeXmlRpc($value) switch (self::getXmlRpcTypeByValue($value)) { case self::XMLRPC_TYPE_DATETIME: - require_once 'Zend/XmlRpc/Value/DateTime.php'; + ;// require_once 'Zend/XmlRpc/Value/DateTime.php'; return new Zend_XmlRpc_Value_DateTime($value); case self::XMLRPC_TYPE_ARRAY: - require_once 'Zend/XmlRpc/Value/Array.php'; + ;// require_once 'Zend/XmlRpc/Value/Array.php'; return new Zend_XmlRpc_Value_Array($value); case self::XMLRPC_TYPE_STRUCT: - require_once 'Zend/XmlRpc/Value/Struct.php'; + ;// require_once 'Zend/XmlRpc/Value/Struct.php'; return new Zend_XmlRpc_Value_Struct($value); case self::XMLRPC_TYPE_INTEGER: - require_once 'Zend/XmlRpc/Value/Integer.php'; + ;// require_once 'Zend/XmlRpc/Value/Integer.php'; return new Zend_XmlRpc_Value_Integer($value); case self::XMLRPC_TYPE_DOUBLE: - require_once 'Zend/XmlRpc/Value/Double.php'; + ;// require_once 'Zend/XmlRpc/Value/Double.php'; return new Zend_XmlRpc_Value_Double($value); case self::XMLRPC_TYPE_BOOLEAN: - require_once 'Zend/XmlRpc/Value/Boolean.php'; + ;// require_once 'Zend/XmlRpc/Value/Boolean.php'; return new Zend_XmlRpc_Value_Boolean($value); case self::XMLRPC_TYPE_NIL: - require_once 'Zend/XmlRpc/Value/Nil.php'; + ;// require_once 'Zend/XmlRpc/Value/Nil.php'; return new Zend_XmlRpc_Value_Nil; case self::XMLRPC_TYPE_STRING: // Fall through to the next case default: // If type isn't identified (or identified as string), it treated as string - require_once 'Zend/XmlRpc/Value/String.php'; + ;// require_once 'Zend/XmlRpc/Value/String.php'; return new Zend_XmlRpc_Value_String($value); } } @@ -375,40 +375,40 @@ protected static function _xmlStringToNativeXmlRpc($xml) case self::XMLRPC_TYPE_I4: // Fall through to the next case case self::XMLRPC_TYPE_INTEGER: - require_once 'Zend/XmlRpc/Value/Integer.php'; + ;// require_once 'Zend/XmlRpc/Value/Integer.php'; $xmlrpcValue = new Zend_XmlRpc_Value_Integer($value); break; case self::XMLRPC_TYPE_APACHEI8: // Fall through to the next case case self::XMLRPC_TYPE_I8: - require_once 'Zend/XmlRpc/Value/BigInteger.php'; + ;// require_once 'Zend/XmlRpc/Value/BigInteger.php'; $xmlrpcValue = new Zend_XmlRpc_Value_BigInteger($value); break; case self::XMLRPC_TYPE_DOUBLE: - require_once 'Zend/XmlRpc/Value/Double.php'; + ;// require_once 'Zend/XmlRpc/Value/Double.php'; $xmlrpcValue = new Zend_XmlRpc_Value_Double($value); break; case self::XMLRPC_TYPE_BOOLEAN: - require_once 'Zend/XmlRpc/Value/Boolean.php'; + ;// require_once 'Zend/XmlRpc/Value/Boolean.php'; $xmlrpcValue = new Zend_XmlRpc_Value_Boolean($value); break; case self::XMLRPC_TYPE_STRING: - require_once 'Zend/XmlRpc/Value/String.php'; + ;// require_once 'Zend/XmlRpc/Value/String.php'; $xmlrpcValue = new Zend_XmlRpc_Value_String($value); break; case self::XMLRPC_TYPE_DATETIME: // The value should already be in a iso8601 format - require_once 'Zend/XmlRpc/Value/DateTime.php'; + ;// require_once 'Zend/XmlRpc/Value/DateTime.php'; $xmlrpcValue = new Zend_XmlRpc_Value_DateTime($value); break; case self::XMLRPC_TYPE_BASE64: // The value should already be base64 encoded - require_once 'Zend/XmlRpc/Value/Base64.php'; + ;// require_once 'Zend/XmlRpc/Value/Base64.php'; $xmlrpcValue = new Zend_XmlRpc_Value_Base64($value, true); break; case self::XMLRPC_TYPE_NIL: // Fall through to the next case case self::XMLRPC_TYPE_APACHENIL: // The value should always be NULL - require_once 'Zend/XmlRpc/Value/Nil.php'; + ;// require_once 'Zend/XmlRpc/Value/Nil.php'; $xmlrpcValue = new Zend_XmlRpc_Value_Nil(); break; case self::XMLRPC_TYPE_ARRAY: @@ -423,7 +423,7 @@ protected static function _xmlStringToNativeXmlRpc($xml) } if (null === $data) { - require_once 'Zend/XmlRpc/Value/Exception.php'; + ;// require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception('Invalid XML for XML-RPC native '. self::XMLRPC_TYPE_ARRAY .' type: ARRAY tag must contain DATA tag'); } $values = array(); @@ -432,7 +432,7 @@ protected static function _xmlStringToNativeXmlRpc($xml) foreach ($data->value as $element) { $values[] = self::_xmlStringToNativeXmlRpc($element); } - require_once 'Zend/XmlRpc/Value/Array.php'; + ;// require_once 'Zend/XmlRpc/Value/Array.php'; $xmlrpcValue = new Zend_XmlRpc_Value_Array($values); break; case self::XMLRPC_TYPE_STRUCT: @@ -448,11 +448,11 @@ protected static function _xmlStringToNativeXmlRpc($xml) } $values[(string)$member->name] = self::_xmlStringToNativeXmlRpc($member->value); } - require_once 'Zend/XmlRpc/Value/Struct.php'; + ;// require_once 'Zend/XmlRpc/Value/Struct.php'; $xmlrpcValue = new Zend_XmlRpc_Value_Struct($values); break; default: - require_once 'Zend/XmlRpc/Value/Exception.php'; + ;// require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception('Value type \''. $type .'\' parsed from the XML string is not a known XML-RPC native type'); break; } @@ -471,7 +471,7 @@ protected static function _createSimpleXMLElement(&$xml) $xml = new SimpleXMLElement($xml); } catch (Exception $e) { // The given string is not a valid XML - require_once 'Zend/XmlRpc/Value/Exception.php'; + ;// require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception('Failed to create XML-RPC value from XML string: ' . $e->getMessage(), $e->getCode(), $e); } } diff --git a/library/Zend/XmlRpc/Value/Array.php b/library/Zend/XmlRpc/Value/Array.php index 60f68b2962..318d160f75 100644 --- a/library/Zend/XmlRpc/Value/Array.php +++ b/library/Zend/XmlRpc/Value/Array.php @@ -24,7 +24,7 @@ /** * Zend_XmlRpc_Value_Collection */ -require_once 'Zend/XmlRpc/Value/Collection.php'; +;// require_once 'Zend/XmlRpc/Value/Collection.php'; /** diff --git a/library/Zend/XmlRpc/Value/Base64.php b/library/Zend/XmlRpc/Value/Base64.php index eee61bae5c..e2177e2c16 100644 --- a/library/Zend/XmlRpc/Value/Base64.php +++ b/library/Zend/XmlRpc/Value/Base64.php @@ -24,7 +24,7 @@ /** * Zend_XmlRpc_Value_Scalar */ -require_once 'Zend/XmlRpc/Value/Scalar.php'; +;// require_once 'Zend/XmlRpc/Value/Scalar.php'; /** diff --git a/library/Zend/XmlRpc/Value/BigInteger.php b/library/Zend/XmlRpc/Value/BigInteger.php index b636a5814f..128e6c3c71 100644 --- a/library/Zend/XmlRpc/Value/BigInteger.php +++ b/library/Zend/XmlRpc/Value/BigInteger.php @@ -24,7 +24,7 @@ /** * Zend_XmlRpc_Value_Integer */ -require_once 'Zend/XmlRpc/Value/Integer.php'; +;// require_once 'Zend/XmlRpc/Value/Integer.php'; /** * @category Zend @@ -40,7 +40,7 @@ class Zend_XmlRpc_Value_BigInteger extends Zend_XmlRpc_Value_Integer */ public function __construct($value) { - require_once 'Zend/Crypt/Math/BigInteger.php'; + ;// require_once 'Zend/Crypt/Math/BigInteger.php'; $integer = new Zend_Crypt_Math_BigInteger; $this->_value = $integer->init($value); $this->_type = self::XMLRPC_TYPE_I8; diff --git a/library/Zend/XmlRpc/Value/Boolean.php b/library/Zend/XmlRpc/Value/Boolean.php index 1a91872ca0..4e0b763090 100644 --- a/library/Zend/XmlRpc/Value/Boolean.php +++ b/library/Zend/XmlRpc/Value/Boolean.php @@ -24,7 +24,7 @@ /** * Zend_XmlRpc_Value_Scalar */ -require_once 'Zend/XmlRpc/Value/Scalar.php'; +;// require_once 'Zend/XmlRpc/Value/Scalar.php'; /** diff --git a/library/Zend/XmlRpc/Value/Collection.php b/library/Zend/XmlRpc/Value/Collection.php index 2ef9a9a3d5..71e3764501 100644 --- a/library/Zend/XmlRpc/Value/Collection.php +++ b/library/Zend/XmlRpc/Value/Collection.php @@ -24,7 +24,7 @@ /** * Zend_XmlRpc_Value */ -require_once 'Zend/XmlRpc/Value.php'; +;// require_once 'Zend/XmlRpc/Value.php'; /** diff --git a/library/Zend/XmlRpc/Value/DateTime.php b/library/Zend/XmlRpc/Value/DateTime.php index 18d9991dc1..196beaff5d 100644 --- a/library/Zend/XmlRpc/Value/DateTime.php +++ b/library/Zend/XmlRpc/Value/DateTime.php @@ -24,7 +24,7 @@ /** * Zend_XmlRpc_Value_Scalar */ -require_once 'Zend/XmlRpc/Value/Scalar.php'; +;// require_once 'Zend/XmlRpc/Value/Scalar.php'; /** @@ -71,7 +71,7 @@ public function __construct($value) } else { $timestamp = new DateTime($value); if ($timestamp === false) { // cannot convert the value to a timestamp - require_once 'Zend/XmlRpc/Value/Exception.php'; + ;// require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception('Cannot convert given value \''. $value .'\' to a timestamp'); } diff --git a/library/Zend/XmlRpc/Value/Double.php b/library/Zend/XmlRpc/Value/Double.php index 6251879f06..24c73fba3d 100644 --- a/library/Zend/XmlRpc/Value/Double.php +++ b/library/Zend/XmlRpc/Value/Double.php @@ -24,7 +24,7 @@ /** * Zend_XmlRpc_Value_Scalar */ -require_once 'Zend/XmlRpc/Value/Scalar.php'; +;// require_once 'Zend/XmlRpc/Value/Scalar.php'; /** diff --git a/library/Zend/XmlRpc/Value/Exception.php b/library/Zend/XmlRpc/Value/Exception.php index 3a18f28e73..69d0eabb8b 100644 --- a/library/Zend/XmlRpc/Value/Exception.php +++ b/library/Zend/XmlRpc/Value/Exception.php @@ -24,7 +24,7 @@ /** * Zend_XmlRpc_Exception */ -require_once 'Zend/XmlRpc/Exception.php'; +;// require_once 'Zend/XmlRpc/Exception.php'; /** diff --git a/library/Zend/XmlRpc/Value/Integer.php b/library/Zend/XmlRpc/Value/Integer.php index 2ad5c840d5..28ee849f36 100644 --- a/library/Zend/XmlRpc/Value/Integer.php +++ b/library/Zend/XmlRpc/Value/Integer.php @@ -24,7 +24,7 @@ /** * Zend_XmlRpc_Value_Scalar */ -require_once 'Zend/XmlRpc/Value/Scalar.php'; +;// require_once 'Zend/XmlRpc/Value/Scalar.php'; /** @@ -45,7 +45,7 @@ class Zend_XmlRpc_Value_Integer extends Zend_XmlRpc_Value_Scalar public function __construct($value) { if ($value > PHP_INT_MAX) { - require_once 'Zend/XmlRpc/Value/Exception.php'; + ;// require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception('Overlong integer given'); } diff --git a/library/Zend/XmlRpc/Value/Nil.php b/library/Zend/XmlRpc/Value/Nil.php index 67305d0d8d..df76de5fdf 100644 --- a/library/Zend/XmlRpc/Value/Nil.php +++ b/library/Zend/XmlRpc/Value/Nil.php @@ -24,7 +24,7 @@ /** * Zend_XmlRpc_Value_Scalar */ -require_once 'Zend/XmlRpc/Value/Scalar.php'; +;// require_once 'Zend/XmlRpc/Value/Scalar.php'; /** diff --git a/library/Zend/XmlRpc/Value/Scalar.php b/library/Zend/XmlRpc/Value/Scalar.php index 86397d2091..96e9c1d433 100644 --- a/library/Zend/XmlRpc/Value/Scalar.php +++ b/library/Zend/XmlRpc/Value/Scalar.php @@ -24,7 +24,7 @@ /** * Zend_XmlRpc_Value */ -require_once 'Zend/XmlRpc/Value.php'; +;// require_once 'Zend/XmlRpc/Value.php'; /** diff --git a/library/Zend/XmlRpc/Value/String.php b/library/Zend/XmlRpc/Value/String.php index 37ac5b8321..32f1c5b30e 100644 --- a/library/Zend/XmlRpc/Value/String.php +++ b/library/Zend/XmlRpc/Value/String.php @@ -24,7 +24,7 @@ /** * Zend_XmlRpc_Value_Scalar */ -require_once 'Zend/XmlRpc/Value/Scalar.php'; +;// require_once 'Zend/XmlRpc/Value/Scalar.php'; /** * @package Zend_XmlRpc diff --git a/library/Zend/XmlRpc/Value/Struct.php b/library/Zend/XmlRpc/Value/Struct.php index 5272eb508d..48672bdad3 100644 --- a/library/Zend/XmlRpc/Value/Struct.php +++ b/library/Zend/XmlRpc/Value/Struct.php @@ -24,7 +24,7 @@ /** * Zend_XmlRpc_Value_Collection */ -require_once 'Zend/XmlRpc/Value/Collection.php'; +;// require_once 'Zend/XmlRpc/Value/Collection.php'; /**