Created
July 25, 2024 08:14
-
-
Save sreichel/635d0c9858bec04a6dd46fc1f85bc3e3 to your computer and use it in GitHub Desktop.
Patch to replace require_once in ZF1F
This file has been truncated, but you can view the full file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --- /dev/null | |
| +++ ../library/Zend/Acl/Exception.php | |
| @@ -23,7 +23,7 @@ | |
| /** | |
| * @see Zend_Exception | |
| */ | |
| -require_once 'Zend/Exception.php'; | |
| +#require_once 'Zend/Exception.php'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 @@ | |
| } | |
| 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,7 +287,7 @@ | |
| } | |
| 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'); | |
| } | |
| @@ -294,7 +294,7 @@ | |
| $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 @@ | |
| } | |
| $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 @@ | |
| } | |
| 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 @@ | |
| $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 @@ | |
| 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); | |
| } | |
| @@ -605,7 +605,7 @@ | |
| // 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 . "'"); | |
| } | |
| @@ -784,7 +784,7 @@ | |
| 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 . "'"); | |
| } | |
| @@ -962,7 +962,7 @@ | |
| /** | |
| * @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'); | |
| } | |
| @@ -1005,7 +1005,7 @@ | |
| /** | |
| * @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'); | |
| } | |
| @@ -1051,7 +1051,7 @@ | |
| /** | |
| * @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'); | |
| } | |
| @@ -1059,7 +1059,7 @@ | |
| /** | |
| * @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'); | |
| } | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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) { | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Adobe/Auth.php | |
| @@ -20,16 +20,16 @@ | |
| */ | |
| /** @see Zend_Amf_Auth_Abstract */ | |
| -require_once 'Zend/Amf/Auth/Abstract.php'; | |
| +#require_once 'Zend/Amf/Auth/Abstract.php'; | |
| /** @see Zend_Acl */ | |
| -require_once 'Zend/Acl.php'; | |
| +#require_once 'Zend/Acl.php'; | |
| /** @see Zend_Auth_Result */ | |
| -require_once 'Zend/Auth/Result.php'; | |
| +#require_once 'Zend/Auth/Result.php'; | |
| /** @see Zend_Xml_Security */ | |
| -require_once 'Zend/Xml/Security.php'; | |
| +#require_once 'Zend/Xml/Security.php'; | |
| /** | |
| * This class implements authentication against XML file with roles for Flex Builder. | |
| @@ -109,7 +109,7 @@ | |
| /** | |
| * @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('Username/password should be set'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Adobe/Introspector.php | |
| @@ -20,13 +20,13 @@ | |
| */ | |
| /** @see Zend_Amf_Parse_TypeLoader */ | |
| -require_once 'Zend/Amf/Parse/TypeLoader.php'; | |
| +#require_once 'Zend/Amf/Parse/TypeLoader.php'; | |
| /** @see Zend_Reflection_Class */ | |
| -require_once 'Zend/Reflection/Class.php'; | |
| +#require_once 'Zend/Reflection/Class.php'; | |
| /** @see Zend_Server_Reflection */ | |
| -require_once 'Zend/Server/Reflection.php'; | |
| +#require_once 'Zend/Server/Reflection.php'; | |
| /** | |
| * This class implements a service for generating AMF service descriptions as XML. | |
| @@ -97,7 +97,7 @@ | |
| // Introspect! | |
| if (!class_exists($serviceClass)) { | |
| - require_once 'Zend/Loader.php'; | |
| + #require_once 'Zend/Loader.php'; | |
| Zend_Loader::loadClass($serviceClass, $this->_getServicePath()); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Auth/Abstract.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** @see Zend_Auth_Adapter_Interface */ | |
| -require_once 'Zend/Auth/Adapter/Interface.php'; | |
| +#require_once 'Zend/Auth/Adapter/Interface.php'; | |
| /** | |
| * Base abstract class for AMF authentication implementation | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Exception.php | |
| @@ -22,7 +22,7 @@ | |
| /** | |
| * @see Zend_Exception | |
| */ | |
| -require_once 'Zend/Exception.php'; | |
| +#require_once 'Zend/Exception.php'; | |
| /** | |
| * @package Zend_Amf | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Parse/Amf0/Deserializer.php | |
| @@ -21,13 +21,13 @@ | |
| */ | |
| /** Zend_Amf_Constants */ | |
| -require_once 'Zend/Amf/Constants.php'; | |
| +#require_once 'Zend/Amf/Constants.php'; | |
| /** Zend_Xml_Security */ | |
| -require_once 'Zend/Xml/Security.php'; | |
| +#require_once 'Zend/Xml/Security.php'; | |
| /** @see Zend_Amf_Parse_Deserializer */ | |
| -require_once 'Zend/Amf/Parse/Deserializer.php'; | |
| +#require_once 'Zend/Amf/Parse/Deserializer.php'; | |
| /** | |
| * Read an AMF0 input stream and convert it into PHP data types | |
| @@ -133,7 +133,7 @@ | |
| return $this->readAmf3TypeMarker(); | |
| default: | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Unsupported marker type: ' . $typeMarker); | |
| } | |
| } | |
| @@ -183,7 +183,7 @@ | |
| { | |
| $key = $this->_stream->readInt(); | |
| if (!array_key_exists($key, $this->_reference)) { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Invalid reference key: '. $key); | |
| } | |
| return $this->_reference[$key]; | |
| @@ -237,7 +237,7 @@ | |
| // so read and ignore. | |
| $offset = $this->_stream->readInt(); | |
| - require_once 'Zend/Date.php'; | |
| + #require_once 'Zend/Date.php'; | |
| return new Zend_Date($timestamp); | |
| } | |
| @@ -265,7 +265,7 @@ | |
| */ | |
| public function readTypedObject() | |
| { | |
| - require_once 'Zend/Amf/Parse/TypeLoader.php'; | |
| + #require_once 'Zend/Amf/Parse/TypeLoader.php'; | |
| // get the remote class name | |
| $className = $this->_stream->readUtf(); | |
| $loader = Zend_Amf_Parse_TypeLoader::loadType($className); | |
| @@ -290,7 +290,7 @@ | |
| */ | |
| public function readAmf3TypeMarker() | |
| { | |
| - require_once 'Zend/Amf/Parse/Amf3/Deserializer.php'; | |
| + #require_once 'Zend/Amf/Parse/Amf3/Deserializer.php'; | |
| $deserializer = new Zend_Amf_Parse_Amf3_Deserializer($this->_stream); | |
| $this->_objectEncoding = Zend_Amf_Constants::AMF3_OBJECT_ENCODING; | |
| return $deserializer->readTypeMarker(); | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Parse/Amf0/Serializer.php | |
| @@ -21,10 +21,10 @@ | |
| */ | |
| /** Zend_Amf_Constants */ | |
| -require_once 'Zend/Amf/Constants.php'; | |
| +#require_once 'Zend/Amf/Constants.php'; | |
| /** @see Zend_Amf_Parse_Serializer */ | |
| -require_once 'Zend/Amf/Parse/Serializer.php'; | |
| +#require_once 'Zend/Amf/Parse/Serializer.php'; | |
| /** | |
| * Serializer PHP misc types back to there corresponding AMF0 Type Marker. | |
| @@ -112,7 +112,7 @@ | |
| $this->writeAmf3TypeMarker($data); | |
| break; | |
| default: | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception("Unknown Type Marker: " . $markerType); | |
| } | |
| } | |
| @@ -174,7 +174,7 @@ | |
| } | |
| break; | |
| default: | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Unsupported data type: ' . gettype($data)); | |
| } | |
| @@ -277,7 +277,7 @@ | |
| } elseif ($data instanceof Zend_Date) { | |
| $dateString = $data->toString('U'); | |
| } else { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Invalid date specified; must be a DateTime or Zend_Date object'); | |
| } | |
| $dateString *= 1000; | |
| @@ -313,7 +313,7 @@ | |
| */ | |
| public function writeAmf3TypeMarker(&$data) | |
| { | |
| - require_once 'Zend/Amf/Parse/Amf3/Serializer.php'; | |
| + #require_once 'Zend/Amf/Parse/Amf3/Serializer.php'; | |
| $serializer = new Zend_Amf_Parse_Amf3_Serializer($this->_stream); | |
| $serializer->writeTypeMarker($data); | |
| return $this; | |
| @@ -328,7 +328,7 @@ | |
| */ | |
| protected function getClassName($object) | |
| { | |
| - require_once 'Zend/Amf/Parse/TypeLoader.php'; | |
| + #require_once 'Zend/Amf/Parse/TypeLoader.php'; | |
| //Check to see if the object is a typed object and we need to change | |
| $className = ''; | |
| switch (true) { | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Parse/Amf3/Deserializer.php | |
| @@ -21,13 +21,13 @@ | |
| */ | |
| /** Zend_Amf_Parse_Deserializer */ | |
| -require_once 'Zend/Amf/Parse/Deserializer.php'; | |
| +#require_once 'Zend/Amf/Parse/Deserializer.php'; | |
| /** Zend_Xml_Security */ | |
| -require_once 'Zend/Xml/Security.php'; | |
| +#require_once 'Zend/Xml/Security.php'; | |
| /** Zend_Amf_Parse_TypeLoader */ | |
| -require_once 'Zend/Amf/Parse/TypeLoader.php'; | |
| +#require_once 'Zend/Amf/Parse/TypeLoader.php'; | |
| /** | |
| * Read an AMF3 input stream and convert it into PHP data types. | |
| @@ -110,7 +110,7 @@ | |
| case Zend_Amf_Constants::AMF3_BYTEARRAY: | |
| return $this->readString(); | |
| default: | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Unsupported type marker: ' . $typeMarker); | |
| } | |
| } | |
| @@ -187,7 +187,7 @@ | |
| // reference string | |
| $stringReference = $stringReference >> 1; | |
| if ($stringReference >= count($this->_referenceStrings)) { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Undefined string reference: ' . $stringReference); | |
| } | |
| // reference string found | |
| @@ -221,7 +221,7 @@ | |
| if (($dateReference & 0x01) == 0) { | |
| $dateReference = $dateReference >> 1; | |
| if ($dateReference>=count($this->_referenceObjects)) { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Undefined date reference: ' . $dateReference); | |
| } | |
| return $this->_referenceObjects[$dateReference]; | |
| @@ -229,7 +229,7 @@ | |
| $timestamp = floor($this->_stream->readDouble() / 1000); | |
| - require_once 'Zend/Date.php'; | |
| + #require_once 'Zend/Date.php'; | |
| $dateTime = new Zend_Date($timestamp); | |
| $this->_referenceObjects[] = $dateTime; | |
| return $dateTime; | |
| @@ -250,7 +250,7 @@ | |
| $arrayReference = $arrayReference >> 1; | |
| if ($arrayReference>=count($this->_referenceObjects)) { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Unknow array reference: ' . $arrayReference); | |
| } | |
| @@ -294,7 +294,7 @@ | |
| if ($storedObject) { | |
| $ref = $traitsInfo; | |
| if (!isset($this->_referenceObjects[$ref])) { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Unknown Object reference: ' . $ref); | |
| } | |
| $returnObject = $this->_referenceObjects[$ref]; | |
| @@ -305,7 +305,7 @@ | |
| if ($storedClass) { | |
| $ref = $traitsInfo; | |
| if (!isset($this->_referenceDefinitions[$ref])) { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Unknows Definition reference: '. $ref); | |
| } | |
| // Populate the reference attributes | |
| @@ -332,7 +332,7 @@ | |
| $returnObject = new $loader(); | |
| } else { | |
| //user defined typed object | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Typed object not found: '. $className . ' '); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Parse/Amf3/Serializer.php | |
| @@ -21,14 +21,14 @@ | |
| */ | |
| /** Zend_Amf_Constants */ | |
| -require_once 'Zend/Amf/Constants.php'; | |
| +#require_once 'Zend/Amf/Constants.php'; | |
| /** Zend_Amf_Parse_Serializer */ | |
| -require_once 'Zend/Amf/Parse/Serializer.php'; | |
| +#require_once 'Zend/Amf/Parse/Serializer.php'; | |
| /** Zend_Amf_Parse_TypeLoader */ | |
| -require_once 'Zend/Amf/Parse/TypeLoader.php'; | |
| +#require_once 'Zend/Amf/Parse/TypeLoader.php'; | |
| /** | |
| * Detect PHP object type and convert it to a corresponding AMF3 object type | |
| @@ -119,7 +119,7 @@ | |
| $this->writeXml($data); | |
| break; | |
| default: | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Unknown Type Marker: ' . $markerType); | |
| } | |
| } else { | |
| @@ -167,7 +167,7 @@ | |
| } | |
| break; | |
| default: | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Unsupported data type: ' . gettype($data)); | |
| } | |
| $this->writeTypeMarker($data, $markerType); | |
| @@ -267,7 +267,7 @@ | |
| } else if ($data instanceof Zend_Amf_Value_ByteArray) { | |
| $data = $data->getData(); | |
| } else { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Invalid ByteArray specified; must be a string or Zend_Amf_Value_ByteArray'); | |
| } | |
| @@ -295,7 +295,7 @@ | |
| } else if ($xml instanceof SimpleXMLElement) { | |
| $xml = $xml->asXML(); | |
| } else { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Invalid xml specified; must be a DOMDocument or SimpleXMLElement'); | |
| } | |
| @@ -321,7 +321,7 @@ | |
| } elseif ($date instanceof Zend_Date) { | |
| $dateString = $date->toString('U') * 1000; | |
| } else { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Invalid date specified; must be a string DateTime or Zend_Date object'); | |
| } | |
| @@ -517,15 +517,15 @@ | |
| $this->writeString($this->_strEmpty); | |
| break; | |
| case Zend_Amf_Constants::ET_EXTERNAL: | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('External Object Encoding not implemented'); | |
| break; | |
| default: | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Unknown Object Encoding type: ' . $encoding); | |
| } | |
| } catch (Exception $e) { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Unable to writeObject output: ' . $e->getMessage(), 0, $e); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Parse/InputStream.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Amf_Util_BinaryStream */ | |
| -require_once 'Zend/Amf/Util/BinaryStream.php'; | |
| +#require_once 'Zend/Amf/Util/BinaryStream.php'; | |
| /** | |
| * InputStream is used to iterate at a binary level through the AMF request. | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Parse/OutputStream.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Amf_Util_BinaryStream */ | |
| -require_once 'Zend/Amf/Util/BinaryStream.php'; | |
| +#require_once 'Zend/Amf/Util/BinaryStream.php'; | |
| /** | |
| * Iterate at a binary level through the AMF response | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Parse/TypeLoader.php | |
| @@ -23,23 +23,23 @@ | |
| /** | |
| * @see Zend_Amf_Value_Messaging_AcknowledgeMessage | |
| */ | |
| -require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; | |
| +#require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; | |
| /** | |
| * @see Zend_Amf_Value_Messaging_AsyncMessage | |
| */ | |
| -require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php'; | |
| +#require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php'; | |
| /** | |
| * @see Zend_Amf_Value_Messaging_CommandMessage | |
| */ | |
| -require_once 'Zend/Amf/Value/Messaging/CommandMessage.php'; | |
| +#require_once 'Zend/Amf/Value/Messaging/CommandMessage.php'; | |
| /** | |
| * @see Zend_Amf_Value_Messaging_ErrorMessage | |
| */ | |
| -require_once 'Zend/Amf/Value/Messaging/ErrorMessage.php'; | |
| +#require_once 'Zend/Amf/Value/Messaging/ErrorMessage.php'; | |
| /** | |
| * @see Zend_Amf_Value_Messaging_RemotingMessage | |
| */ | |
| -require_once 'Zend/Amf/Value/Messaging/RemotingMessage.php'; | |
| +#require_once 'Zend/Amf/Value/Messaging/RemotingMessage.php'; | |
| /** | |
| * Loads a local class and executes the instantiation of that class. | |
| @@ -202,7 +202,7 @@ | |
| public static function handleResource($resource) | |
| { | |
| if(!self::$_resourceLoader) { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Unable to handle resources - resource plugin loader not set'); | |
| } | |
| try { | |
| @@ -209,7 +209,7 @@ | |
| while(is_resource($resource)) { | |
| $resclass = self::getResourceParser($resource); | |
| if(!$resclass) { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Can not serialize resource type: '. get_resource_type($resource)); | |
| } | |
| $parser = new $resclass(); | |
| @@ -216,7 +216,7 @@ | |
| if(is_callable([$parser, 'parse'])) { | |
| $resource = $parser->parse($resource); | |
| } else { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception("Could not call parse() method on class $resclass"); | |
| } | |
| } | |
| @@ -224,7 +224,7 @@ | |
| } catch(Zend_Amf_Exception $e) { | |
| throw new Zend_Amf_Exception($e->getMessage(), $e->getCode(), $e); | |
| } catch(Exception $e) { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Can not serialize resource type: '. get_resource_type($resource), 0, $e); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Request/Http.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** @see Zend_Amf_Request */ | |
| -require_once 'Zend/Amf/Request.php'; | |
| +#require_once 'Zend/Amf/Request.php'; | |
| /** | |
| * AMF Request object -- Request via HTTP | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Request.php | |
| @@ -20,19 +20,19 @@ | |
| */ | |
| /** @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'; | |
| /** @see Zend_Amf_Constants */ | |
| -require_once 'Zend/Amf/Constants.php'; | |
| +#require_once 'Zend/Amf/Constants.php'; | |
| /** @see Zend_Amf_Value_MessageHeader */ | |
| -require_once 'Zend/Amf/Value/MessageHeader.php'; | |
| +#require_once 'Zend/Amf/Value/MessageHeader.php'; | |
| /** @see Zend_Amf_Value_MessageBody */ | |
| -require_once 'Zend/Amf/Value/MessageBody.php'; | |
| +#require_once 'Zend/Amf/Value/MessageBody.php'; | |
| /** | |
| * Handle the incoming AMF request by deserializing the data to php object | |
| @@ -108,7 +108,7 @@ | |
| && ($clientVersion != Zend_Amf_Constants::AMF3_OBJECT_ENCODING) | |
| && ($clientVersion != Zend_Amf_Constants::FMS_OBJECT_ENCODING) | |
| ) { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Unknown Player Version ' . $clientVersion); | |
| } | |
| @@ -150,7 +150,7 @@ | |
| try { | |
| $data = $this->_deserializer->readTypeMarker(); | |
| } catch (Exception $e) { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Unable to parse ' . $name . ' header data: ' . $e->getMessage() . ' '. $e->getLine(), 0, $e); | |
| } | |
| @@ -171,7 +171,7 @@ | |
| try { | |
| $data = $this->_deserializer->readTypeMarker(); | |
| } catch (Exception $e) { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Unable to parse ' . $targetURI . ' body data ' . $e->getMessage(), 0, $e); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Response/Http.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Amf_Response */ | |
| -require_once 'Zend/Amf/Response.php'; | |
| +#require_once 'Zend/Amf/Response.php'; | |
| /** | |
| * Creates the proper http headers and send the serialized AMF stream to standard out. | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Response.php | |
| @@ -20,13 +20,13 @@ | |
| */ | |
| /** @see Zend_Amf_Constants */ | |
| -require_once 'Zend/Amf/Constants.php'; | |
| +#require_once 'Zend/Amf/Constants.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'; | |
| /** | |
| * Handles converting the PHP object ready for response back into AMF | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Server/Exception.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Amf_Exception */ | |
| -require_once 'Zend/Amf/Exception.php'; | |
| +#require_once 'Zend/Amf/Exception.php'; | |
| /** | |
| * Zend_Amf_Server_Exception | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Server.php | |
| @@ -20,31 +20,31 @@ | |
| */ | |
| /** @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_Amf_Constants */ | |
| -require_once 'Zend/Amf/Constants.php'; | |
| +#require_once 'Zend/Amf/Constants.php'; | |
| /** @see Zend_Amf_Value_MessageBody */ | |
| -require_once 'Zend/Amf/Value/MessageBody.php'; | |
| +#require_once 'Zend/Amf/Value/MessageBody.php'; | |
| /** @see Zend_Amf_Value_MessageHeader */ | |
| -require_once 'Zend/Amf/Value/MessageHeader.php'; | |
| +#require_once 'Zend/Amf/Value/MessageHeader.php'; | |
| /** @see Zend_Amf_Value_Messaging_CommandMessage */ | |
| -require_once 'Zend/Amf/Value/Messaging/CommandMessage.php'; | |
| +#require_once 'Zend/Amf/Value/Messaging/CommandMessage.php'; | |
| /** @see Zend_Loader_PluginLoader */ | |
| -require_once 'Zend/Loader/PluginLoader.php'; | |
| +#require_once 'Zend/Loader/PluginLoader.php'; | |
| /** @see Zend_Amf_Parse_TypeLoader */ | |
| -require_once 'Zend/Amf/Parse/TypeLoader.php'; | |
| +#require_once 'Zend/Amf/Parse/TypeLoader.php'; | |
| /** @see Zend_Auth */ | |
| -require_once 'Zend/Auth.php'; | |
| +#require_once 'Zend/Auth.php'; | |
| /** | |
| * An AMF gateway server implementation to allow the connection of the Adobe Flash Player to | |
| * Zend Framework | |
| @@ -216,7 +216,7 @@ | |
| */ | |
| public function setSession($namespace = 'Zend_Amf') | |
| { | |
| - require_once 'Zend/Session.php'; | |
| + #require_once 'Zend/Session.php'; | |
| $this->_session = true; | |
| $this->_sesionNamespace = new Zend_Session_Namespace($namespace); | |
| return $this; | |
| @@ -248,7 +248,7 @@ | |
| if($object) { | |
| $class = is_object($object)?get_class($object):$object; | |
| if(!$this->_acl->has($class)) { | |
| - require_once 'Zend/Acl/Resource.php'; | |
| + #require_once 'Zend/Acl/Resource.php'; | |
| $this->_acl->add(new Zend_Acl_Resource($class)); | |
| } | |
| $call = [$object, "initAcl"]; | |
| @@ -267,7 +267,7 @@ | |
| if($this->_acl->hasRole(Zend_Amf_Constants::GUEST_ROLE)) { | |
| $role = Zend_Amf_Constants::GUEST_ROLE; | |
| } else { | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception("Unauthenticated access not allowed"); | |
| } | |
| } | |
| @@ -274,7 +274,7 @@ | |
| if($this->_acl->isAllowed($role, $class, $function)) { | |
| return true; | |
| } else { | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception("Access not allowed"); | |
| } | |
| } | |
| @@ -287,7 +287,7 @@ | |
| protected function getLoader() | |
| { | |
| if(empty($this->_loader)) { | |
| - require_once 'Zend/Loader/PluginLoader.php'; | |
| + #require_once 'Zend/Loader/PluginLoader.php'; | |
| $this->_loader = new Zend_Loader_PluginLoader(); | |
| } | |
| return $this->_loader; | |
| @@ -319,23 +319,23 @@ | |
| if ($source) { | |
| $className = str_replace('.', '_', $source); | |
| if(class_exists($className, false) && !isset($this->_classAllowed[$className])) { | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception('Can not call "' . $className . '" - use setClass()'); | |
| } | |
| try { | |
| $this->getLoader()->load($className); | |
| } catch (Exception $e) { | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception('Class "' . $className . '" does not exist: '.$e->getMessage(), 0, $e); | |
| } | |
| // Add the new loaded class to the server. | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| $this->setClass($className, $source); | |
| } | |
| if (!isset($this->_table[$qualifiedName])) { | |
| // Source is null or doesn't contain specified method | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception('Method "' . $method . '" does not exist'); | |
| } | |
| } | |
| @@ -367,7 +367,7 @@ | |
| try { | |
| $object = $info->getDeclaringClass()->newInstance(); | |
| } catch (Exception $e) { | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception('Error instantiating class ' . $class . ' to invoke method ' . $info->getName() . ': '.$e->getMessage(), 621, $e); | |
| } | |
| $this->_checkAcl($object, $info->getName()); | |
| @@ -374,7 +374,7 @@ | |
| $return = $info->invokeArgs($object, $params); | |
| } | |
| } else { | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception('Method missing implementation ' . get_class($info)); | |
| } | |
| @@ -394,7 +394,7 @@ | |
| */ | |
| protected function _loadCommandMessage(Zend_Amf_Value_Messaging_CommandMessage $message) | |
| { | |
| - require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; | |
| + #require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; | |
| switch($message->operation) { | |
| case Zend_Amf_Value_Messaging_CommandMessage::DISCONNECT_OPERATION : | |
| case Zend_Amf_Value_Messaging_CommandMessage::CLIENT_PING_OPERATION : | |
| @@ -405,11 +405,11 @@ | |
| $userid = $data[0]; | |
| $password = isset($data[1])?$data[1]:""; | |
| if(empty($userid)) { | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception('Login failed: username not supplied'); | |
| } | |
| if(!$this->_handleAuth($userid, $password)) { | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception('Authentication failed'); | |
| } | |
| $return = new Zend_Amf_Value_Messaging_AcknowledgeMessage($message); | |
| @@ -421,7 +421,7 @@ | |
| $return = new Zend_Amf_Value_Messaging_AcknowledgeMessage($message); | |
| break; | |
| default : | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception('CommandMessage::' . $message->operation . ' not implemented'); | |
| break; | |
| } | |
| @@ -451,7 +451,7 @@ | |
| 'code' => $code | |
| ]; | |
| case Zend_Amf_Constants::AMF3_OBJECT_ENCODING : | |
| - require_once 'Zend/Amf/Value/Messaging/ErrorMessage.php'; | |
| + #require_once 'Zend/Amf/Value/Messaging/ErrorMessage.php'; | |
| $return = new Zend_Amf_Value_Messaging_ErrorMessage ( $message ); | |
| $return->faultString = $this->isProduction () ? '' : $description; | |
| $return->faultCode = $code; | |
| @@ -485,7 +485,7 @@ | |
| return true; | |
| } else { | |
| // authentication failed, good bye | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception( | |
| "Authentication failed: " . join("\n", | |
| $result->getMessages()), $result->getCode()); | |
| @@ -588,7 +588,7 @@ | |
| // async call with command message | |
| $return = $this->_loadCommandMessage($message); | |
| } elseif ($message instanceof Zend_Amf_Value_Messaging_RemotingMessage) { | |
| - require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; | |
| + #require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; | |
| $return = new Zend_Amf_Value_Messaging_AcknowledgeMessage($message); | |
| $return->body = $this->_dispatch($message->operation, $message->body, $message->source); | |
| } else { | |
| @@ -672,7 +672,7 @@ | |
| $response = $this->getResponse(); | |
| } catch (Exception $e) { | |
| // Handle any errors in the serialization and service calls. | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception('Handle error: ' . $e->getMessage() . ' ' . $e->getLine(), 0, $e); | |
| } | |
| @@ -692,11 +692,11 @@ | |
| if (is_string($request) && class_exists($request)) { | |
| $request = new $request(); | |
| if (!$request instanceof Zend_Amf_Request) { | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception('Invalid request class'); | |
| } | |
| } elseif (!$request instanceof Zend_Amf_Request) { | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception('Invalid request object'); | |
| } | |
| $this->_request = $request; | |
| @@ -712,7 +712,7 @@ | |
| public function getRequest() | |
| { | |
| if (null === $this->_request) { | |
| - require_once 'Zend/Amf/Request/Http.php'; | |
| + #require_once 'Zend/Amf/Request/Http.php'; | |
| $this->setRequest(new Zend_Amf_Request_Http()); | |
| } | |
| @@ -731,11 +731,11 @@ | |
| if (is_string($response) && class_exists($response)) { | |
| $response = new $response(); | |
| if (!$response instanceof Zend_Amf_Response) { | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception('Invalid response class'); | |
| } | |
| } elseif (!$response instanceof Zend_Amf_Response) { | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception('Invalid response object'); | |
| } | |
| $this->_response = $response; | |
| @@ -751,7 +751,7 @@ | |
| public function getResponse() | |
| { | |
| if (null === ($response = $this->_response)) { | |
| - require_once 'Zend/Amf/Response/Http.php'; | |
| + #require_once 'Zend/Amf/Response/Http.php'; | |
| $this->setResponse(new Zend_Amf_Response_Http()); | |
| } | |
| return $this->_response; | |
| @@ -776,12 +776,12 @@ | |
| public function setClass($class, $namespace = '', $argv = null) | |
| { | |
| if (is_string($class) && !class_exists($class)) { | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception('Invalid method or class'); | |
| } | |
| if (!is_string($class) && !is_object($class)) { | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception('Invalid method or class; must be a classname or object'); | |
| } | |
| @@ -820,7 +820,7 @@ | |
| public function addFunction($function, $namespace = '') | |
| { | |
| if (!is_string($function) && !is_array($function)) { | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception('Unable to attach function'); | |
| } | |
| @@ -832,7 +832,7 @@ | |
| $function = (array) $function; | |
| foreach ($function as $func) { | |
| if (!is_string($func) || !function_exists($func)) { | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception('Unable to attach function'); | |
| } | |
| $this->_methods[] = Zend_Server_Reflection::reflectFunction($func, $argv, $namespace); | |
| @@ -884,7 +884,7 @@ | |
| $name = empty($ns) ? $name : $ns . '.' . $name; | |
| if (isset($table[$name])) { | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception('Duplicate method registered: ' . $name); | |
| } | |
| $table[$name] = $dispatchable; | |
| @@ -898,7 +898,7 @@ | |
| $name = empty($ns) ? $name : $ns . '.' . $name; | |
| if (isset($table[$name])) { | |
| - require_once 'Zend/Amf/Server/Exception.php'; | |
| + #require_once 'Zend/Amf/Server/Exception.php'; | |
| throw new Zend_Amf_Server_Exception('Duplicate method registered: ' . $name); | |
| } | |
| $table[$name] = $method; | |
| @@ -969,7 +969,7 @@ | |
| */ | |
| public function setClassMap($asClass, $phpClass) | |
| { | |
| - require_once 'Zend/Amf/Parse/TypeLoader.php'; | |
| + #require_once 'Zend/Amf/Parse/TypeLoader.php'; | |
| Zend_Amf_Parse_TypeLoader::setMapping($asClass, $phpClass); | |
| return $this; | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Util/BinaryStream.php | |
| @@ -68,7 +68,7 @@ | |
| public function __construct($stream) | |
| { | |
| if (!is_string($stream)) { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Inputdata is not of type String'); | |
| } | |
| @@ -100,7 +100,7 @@ | |
| public function readBytes($length) | |
| { | |
| if (($length + $this->_needle) > $this->_streamLength) { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception('Buffer underrun at needle position: ' . $this->_needle . ' while requesting length: ' . $length); | |
| } | |
| $bytes = $this->_mbStringFunctionsOverloaded ? mb_substr($this->_stream, $this->_needle, $length, '8bit') : substr($this->_stream, $this->_needle, $length); | |
| @@ -131,7 +131,7 @@ | |
| public function readByte() | |
| { | |
| if (($this->_needle + 1) > $this->_streamLength) { | |
| - require_once 'Zend/Amf/Exception.php'; | |
| + #require_once 'Zend/Amf/Exception.php'; | |
| throw new Zend_Amf_Exception( | |
| 'Buffer underrun at needle position: ' | |
| . $this->_needle | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Value/Messaging/AcknowledgeMessage.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Amf_Value_Messaging_AsyncMessage */ | |
| -require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php'; | |
| +#require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php'; | |
| /** | |
| * This is the type of message returned by the MessageBroker | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Value/Messaging/AsyncMessage.php | |
| @@ -22,7 +22,7 @@ | |
| /** Zend_Amf_Value_Messaging_AbstractMessage */ | |
| -require_once 'Zend/Amf/Value/Messaging/AbstractMessage.php'; | |
| +#require_once 'Zend/Amf/Value/Messaging/AbstractMessage.php'; | |
| /** | |
| * This type of message contains information necessary to perform | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Value/Messaging/CommandMessage.php | |
| @@ -23,7 +23,7 @@ | |
| /** | |
| * @see Zend_Amf_Value_Messaging_AsyncMessage | |
| */ | |
| -require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php'; | |
| +#require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php'; | |
| /** | |
| * A message that represents an infrastructure command passed between | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Value/Messaging/ErrorMessage.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** @see Zend_Amf_Value_Messaging_AcknowledgeMessage */ | |
| -require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; | |
| +#require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; | |
| /** | |
| * Creates the error message to report to flex the issue with the call | |
| --- /dev/null | |
| +++ ../library/Zend/Amf/Value/Messaging/RemotingMessage.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Amf_Value_Messaging_AbstractMessage */ | |
| -require_once 'Zend/Amf/Value/Messaging/AbstractMessage.php'; | |
| +#require_once 'Zend/Amf/Value/Messaging/AbstractMessage.php'; | |
| /** | |
| * This type of message contains information needed to perform | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../library/Zend/Application.php | |
| @@ -94,7 +94,7 @@ | |
| { | |
| $this->_environment = (string) $environment; | |
| - require_once 'Zend/Loader/Autoloader.php'; | |
| + #require_once 'Zend/Loader/Autoloader.php'; | |
| $this->_autoloader = Zend_Loader_Autoloader::getInstance(); | |
| $this->_autoloader->suppressNotFoundWarnings($suppressNotFoundWarnings); | |
| @@ -346,7 +346,7 @@ | |
| } | |
| if (!class_exists($class, false)) { | |
| - require_once $path; | |
| + #require_once $path; | |
| if (!class_exists($class, false)) { | |
| throw new Zend_Application_Exception( | |
| 'Bootstrap class not found' | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 @@ | |
| $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'])); | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| */ | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| @@ -71,12 +71,12 @@ | |
| $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.'); | |
| } | |
| 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.' | |
| ); | |
| @@ -126,7 +126,7 @@ | |
| 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 ' | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 @@ | |
| * 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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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); | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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"); | |
| } | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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'); | |
| } | |
| @@ -499,7 +499,7 @@ | |
| /** | |
| * @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)) { | |
| @@ -506,7 +506,7 @@ | |
| /** | |
| * @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'); | |
| } | |
| @@ -518,7 +518,7 @@ | |
| /** | |
| * @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'); | |
| } | |
| @@ -557,7 +557,7 @@ | |
| /** | |
| * @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)) { | |
| @@ -564,7 +564,7 @@ | |
| /** | |
| * @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'); | |
| } | |
| @@ -623,7 +623,7 @@ | |
| /** | |
| * @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 | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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,7 +115,7 @@ | |
| /** | |
| * @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'); | |
| } | |
| @@ -123,7 +123,7 @@ | |
| /** | |
| * @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'); | |
| } | |
| @@ -132,7 +132,7 @@ | |
| /** | |
| * @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'); | |
| } | |
| @@ -140,7 +140,7 @@ | |
| /** | |
| * @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.'); | |
| } | |
| @@ -151,7 +151,7 @@ | |
| /** | |
| * @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); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @see Zend_Ldap | |
| */ | |
| - require_once 'Zend/Ldap.php'; | |
| + #require_once 'Zend/Ldap.php'; | |
| $this->_ldap = new Zend_Ldap(); | |
| } | |
| @@ -246,7 +246,7 @@ | |
| /** | |
| * @see Zend_Ldap_Exception | |
| */ | |
| - require_once 'Zend/Ldap/Exception.php'; | |
| + #require_once 'Zend/Ldap/Exception.php'; | |
| $messages = []; | |
| $messages[0] = ''; // reserved | |
| @@ -284,7 +284,7 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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); | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../library/Zend/Auth/Exception.php | |
| @@ -23,7 +23,7 @@ | |
| /** | |
| * @see Zend_Exception | |
| */ | |
| -require_once 'Zend/Exception.php'; | |
| +#require_once 'Zend/Exception.php'; | |
| /** | |
| --- /dev/null | |
| +++ ../library/Zend/Auth.php | |
| @@ -87,7 +87,7 @@ | |
| /** | |
| * @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()); | |
| } | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Exception.php | |
| @@ -21,7 +21,7 @@ | |
| /** | |
| * Zend_Exception | |
| */ | |
| -require_once 'Zend/Exception.php'; | |
| +#require_once 'Zend/Exception.php'; | |
| /** | |
| * Zend_Barcode_Exception | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Object/Code128.php | |
| @@ -23,12 +23,12 @@ | |
| /** | |
| * @see Zend_Barcode_Object_ObjectAbstract | |
| */ | |
| -require_once 'Zend/Barcode/Object/ObjectAbstract.php'; | |
| +#require_once 'Zend/Barcode/Object/ObjectAbstract.php'; | |
| /** | |
| * @see Zend_Validate_Barcode | |
| */ | |
| -require_once 'Zend/Validate/Barcode.php'; | |
| +#require_once 'Zend/Validate/Barcode.php'; | |
| /** | |
| * Class for generate Code128 barcode | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Object/Code25.php | |
| @@ -23,12 +23,12 @@ | |
| /** | |
| * @see Zend_Barcode_Object_ObjectAbstract | |
| */ | |
| -require_once 'Zend/Barcode/Object/ObjectAbstract.php'; | |
| +#require_once 'Zend/Barcode/Object/ObjectAbstract.php'; | |
| /** | |
| * @see Zend_Validate_Barcode | |
| */ | |
| -require_once 'Zend/Validate/Barcode.php'; | |
| +#require_once 'Zend/Validate/Barcode.php'; | |
| /** | |
| * Class for generate Interleaved 2 of 5 barcode | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Object/Code25interleaved.php | |
| @@ -21,10 +21,10 @@ | |
| */ | |
| /** @see Zend_Barcode_Object_Code25 */ | |
| -require_once 'Zend/Barcode/Object/Code25.php'; | |
| +#require_once 'Zend/Barcode/Object/Code25.php'; | |
| /** @see Zend_Validate_Barcode */ | |
| -require_once 'Zend/Validate/Barcode.php'; | |
| +#require_once 'Zend/Validate/Barcode.php'; | |
| /** | |
| * Class for generate Interleaved 2 of 5 barcode | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Object/Code39.php | |
| @@ -23,12 +23,12 @@ | |
| /** | |
| * @see Zend_Barcode_Object_ObjectAbstract | |
| */ | |
| -require_once 'Zend/Barcode/Object/ObjectAbstract.php'; | |
| +#require_once 'Zend/Barcode/Object/ObjectAbstract.php'; | |
| /** | |
| * @see 'Zend_Validate_Barcode' | |
| */ | |
| -require_once 'Zend/Validate/Barcode.php'; | |
| +#require_once 'Zend/Validate/Barcode.php'; | |
| /** | |
| * Class for generate Code39 barcode | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Object/Ean13.php | |
| @@ -23,12 +23,12 @@ | |
| /** | |
| * @see Zend_Barcode_Object_ObjectAbstract | |
| */ | |
| -require_once 'Zend/Barcode/Object/ObjectAbstract.php'; | |
| +#require_once 'Zend/Barcode/Object/ObjectAbstract.php'; | |
| /** | |
| * @see Zend_Validate_Barcode | |
| */ | |
| -require_once 'Zend/Validate/Barcode.php'; | |
| +#require_once 'Zend/Validate/Barcode.php'; | |
| /** | |
| * Class for generate Ean13 barcode | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Object/Ean2.php | |
| @@ -23,12 +23,12 @@ | |
| /** | |
| * @see Zend_Barcode_Object_Ean5 | |
| */ | |
| -require_once 'Zend/Barcode/Object/Ean5.php'; | |
| +#require_once 'Zend/Barcode/Object/Ean5.php'; | |
| /** | |
| * @see Zend_Validate_Barcode | |
| */ | |
| -require_once 'Zend/Validate/Barcode.php'; | |
| +#require_once 'Zend/Validate/Barcode.php'; | |
| /** | |
| * Class for generate Ean2 barcode | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Object/Ean5.php | |
| @@ -23,12 +23,12 @@ | |
| /** | |
| * @see Zend_Barcode_Object_Ean13 | |
| */ | |
| -require_once 'Zend/Barcode/Object/Ean13.php'; | |
| +#require_once 'Zend/Barcode/Object/Ean13.php'; | |
| /** | |
| * @see Zend_Validate_Barcode | |
| */ | |
| -require_once 'Zend/Validate/Barcode.php'; | |
| +#require_once 'Zend/Validate/Barcode.php'; | |
| /** | |
| * Class for generate Ean5 barcode | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Object/Ean8.php | |
| @@ -23,12 +23,12 @@ | |
| /** | |
| * @see Zend_Barcode_Object_Ean13 | |
| */ | |
| -require_once 'Zend/Barcode/Object/Ean13.php'; | |
| +#require_once 'Zend/Barcode/Object/Ean13.php'; | |
| /** | |
| * @see Zend_Validate_Barcode | |
| */ | |
| -require_once 'Zend/Validate/Barcode.php'; | |
| +#require_once 'Zend/Validate/Barcode.php'; | |
| /** | |
| * Class for generate Ean8 barcode | |
| @@ -170,7 +170,7 @@ | |
| /** | |
| * @see Zend_Barcode_Object_Exception | |
| */ | |
| - require_once 'Zend/Barcode/Object/Exception.php'; | |
| + #require_once 'Zend/Barcode/Object/Exception.php'; | |
| throw new Zend_Barcode_Object_Exception($message); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Object/Error.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** @see Zend_Barcode_Object_ObjectAbstract */ | |
| -require_once 'Zend/Barcode/Object/ObjectAbstract.php'; | |
| +#require_once 'Zend/Barcode/Object/ObjectAbstract.php'; | |
| /** | |
| * Class for generate Barcode | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Object/Exception.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** @see Zend_Barcode_Exception */ | |
| -require_once 'Zend/Barcode/Exception.php'; | |
| +#require_once 'Zend/Barcode/Exception.php'; | |
| /** | |
| * Zend_Barcode_Renderer_Exception | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Object/Identcode.php | |
| @@ -23,12 +23,12 @@ | |
| /** | |
| * @see Zend_Barcode_Object_Code25interleaved | |
| */ | |
| -require_once 'Zend/Barcode/Object/Code25interleaved.php'; | |
| +#require_once 'Zend/Barcode/Object/Code25interleaved.php'; | |
| /** | |
| * @see Zend_Validate_Barcode | |
| */ | |
| -require_once 'Zend/Validate/Barcode.php'; | |
| +#require_once 'Zend/Validate/Barcode.php'; | |
| /** | |
| * Class for generate Identcode barcode | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Object/Itf14.php | |
| @@ -21,10 +21,10 @@ | |
| */ | |
| /** @see Zend_Barcode_Object_Code25interleaved */ | |
| -require_once 'Zend/Barcode/Object/Code25interleaved.php'; | |
| +#require_once 'Zend/Barcode/Object/Code25interleaved.php'; | |
| /** @see Zend_Validate_Barcode */ | |
| -require_once 'Zend/Validate/Barcode.php'; | |
| +#require_once 'Zend/Validate/Barcode.php'; | |
| /** | |
| * Class for generate Itf14 barcode | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Object/Leitcode.php | |
| @@ -23,12 +23,12 @@ | |
| /** | |
| * @see Zend_Barcode_Object_Identcode | |
| */ | |
| -require_once 'Zend/Barcode/Object/Identcode.php'; | |
| +#require_once 'Zend/Barcode/Object/Identcode.php'; | |
| /** | |
| * @see Zend_Validate_Barcode | |
| */ | |
| -require_once 'Zend/Validate/Barcode.php'; | |
| +#require_once 'Zend/Validate/Barcode.php'; | |
| /** | |
| * Class for generate Identcode barcode | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Object/ObjectAbstract.php | |
| @@ -343,7 +343,7 @@ | |
| public function setBarHeight($value) | |
| { | |
| if ((int)$value <= 0) { | |
| - require_once 'Zend/Barcode/Object/Exception.php'; | |
| + #require_once 'Zend/Barcode/Object/Exception.php'; | |
| throw new Zend_Barcode_Object_Exception( | |
| 'Bar height must be greater than 0' | |
| ); | |
| @@ -373,7 +373,7 @@ | |
| { | |
| $value = (int)$value; | |
| if ($value <= 0) { | |
| - require_once 'Zend/Barcode/Object/Exception.php'; | |
| + #require_once 'Zend/Barcode/Object/Exception.php'; | |
| throw new Zend_Barcode_Object_Exception( | |
| 'Bar width must be greater than 0' | |
| ); | |
| @@ -403,7 +403,7 @@ | |
| { | |
| $value = (int)$value; | |
| if ($value <= 0) { | |
| - require_once 'Zend/Barcode/Object/Exception.php'; | |
| + #require_once 'Zend/Barcode/Object/Exception.php'; | |
| throw new Zend_Barcode_Object_Exception( | |
| 'Bar width must be greater than 0' | |
| ); | |
| @@ -434,7 +434,7 @@ | |
| { | |
| $value = (float)$value; | |
| if ($value <= 0) { | |
| - require_once 'Zend/Barcode/Object/Exception.php'; | |
| + #require_once 'Zend/Barcode/Object/Exception.php'; | |
| throw new Zend_Barcode_Object_Exception( | |
| 'Factor must be greater than 0' | |
| ); | |
| @@ -468,7 +468,7 @@ | |
| } elseif (is_numeric($value) && $value >= 0 && $value <= 16777125) { | |
| $this->_foreColor = (int)$value; | |
| } else { | |
| - require_once 'Zend/Barcode/Object/Exception.php'; | |
| + #require_once 'Zend/Barcode/Object/Exception.php'; | |
| throw new Zend_Barcode_Object_Exception( | |
| 'Text color must be set as #[0-9A-F]{6}' | |
| ); | |
| @@ -500,7 +500,7 @@ | |
| } elseif (is_numeric($value) && $value >= 0 && $value <= 16777125) { | |
| $this->_backgroundColor = (int)$value; | |
| } else { | |
| - require_once 'Zend/Barcode/Object/Exception.php'; | |
| + #require_once 'Zend/Barcode/Object/Exception.php'; | |
| throw new Zend_Barcode_Object_Exception( | |
| 'Background color must be set as #[0-9A-F]{6}' | |
| ); | |
| @@ -803,7 +803,7 @@ | |
| { | |
| if (is_int($value) && $value >= 1 && $value <= 5) { | |
| if (!extension_loaded('gd')) { | |
| - require_once 'Zend/Barcode/Object/Exception.php'; | |
| + #require_once 'Zend/Barcode/Object/Exception.php'; | |
| throw new Zend_Barcode_Object_Exception( | |
| 'GD extension is required to use numeric font' | |
| ); | |
| @@ -817,7 +817,7 @@ | |
| } elseif (is_string($value)) { | |
| $this->_font = $value; | |
| } else { | |
| - require_once 'Zend/Barcode/Object/Exception.php'; | |
| + #require_once 'Zend/Barcode/Object/Exception.php'; | |
| throw new Zend_Barcode_Object_Exception( | |
| sprintf( | |
| 'Invalid font "%s" provided to setFont()', | |
| @@ -853,7 +853,7 @@ | |
| } | |
| if (!is_numeric($value)) { | |
| - require_once 'Zend/Barcode/Object/Exception.php'; | |
| + #require_once 'Zend/Barcode/Object/Exception.php'; | |
| throw new Zend_Barcode_Object_Exception( | |
| 'Font size must be a numeric value' | |
| ); | |
| @@ -992,7 +992,7 @@ | |
| $value = $this->_text; | |
| } | |
| if (!strlen((string) $value)) { | |
| - require_once 'Zend/Barcode/Object/Exception.php'; | |
| + #require_once 'Zend/Barcode/Object/Exception.php'; | |
| throw new Zend_Barcode_Object_Exception( | |
| 'A text must be provide to Barcode before drawing' | |
| ); | |
| @@ -1011,7 +1011,7 @@ | |
| { | |
| $ratio = $this->_barThickWidth / $this->_barThinWidth; | |
| if (!($ratio >= $min && $ratio <= $max)) { | |
| - require_once 'Zend/Barcode/Object/Exception.php'; | |
| + #require_once 'Zend/Barcode/Object/Exception.php'; | |
| throw new Zend_Barcode_Object_Exception( | |
| sprintf( | |
| 'Ratio thick/thin bar must be between %0.1f and %0.1f (actual %0.3f)', | |
| @@ -1031,7 +1031,7 @@ | |
| protected function _checkFontAndOrientation() | |
| { | |
| if (is_numeric($this->_font) && $this->_orientation != 0) { | |
| - require_once 'Zend/Barcode/Object/Exception.php'; | |
| + #require_once 'Zend/Barcode/Object/Exception.php'; | |
| throw new Zend_Barcode_Object_Exception( | |
| 'Only drawing with TTF font allow orientation of the barcode.' | |
| ); | |
| @@ -1400,7 +1400,7 @@ | |
| /** | |
| * @see Zend_Barcode_Object_Exception | |
| */ | |
| - require_once 'Zend/Barcode/Object/Exception.php'; | |
| + #require_once 'Zend/Barcode/Object/Exception.php'; | |
| throw new Zend_Barcode_Object_Exception($message); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Object/Planet.php | |
| @@ -23,12 +23,12 @@ | |
| /** | |
| * @see Zend_Barcode_Object_Postnet | |
| */ | |
| -require_once 'Zend/Barcode/Object/Postnet.php'; | |
| +#require_once 'Zend/Barcode/Object/Postnet.php'; | |
| /** | |
| * @see Zend_Validate_Barcode | |
| */ | |
| -require_once 'Zend/Validate/Barcode.php'; | |
| +#require_once 'Zend/Validate/Barcode.php'; | |
| /** | |
| * Class for generate Planet barcode | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Object/Postnet.php | |
| @@ -23,12 +23,12 @@ | |
| /** | |
| * @see Zend_Barcode_Object_ObjectAbstract | |
| */ | |
| -require_once 'Zend/Barcode/Object/ObjectAbstract.php'; | |
| +#require_once 'Zend/Barcode/Object/ObjectAbstract.php'; | |
| /** | |
| * @see Zend_Validate_Barcode | |
| */ | |
| -require_once 'Zend/Validate/Barcode.php'; | |
| +#require_once 'Zend/Validate/Barcode.php'; | |
| /** | |
| * Class for generate Postnet barcode | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Object/Royalmail.php | |
| @@ -23,12 +23,12 @@ | |
| /** | |
| * @see Zend_Barcode_Object_ObjectAbstract | |
| */ | |
| -require_once 'Zend/Barcode/Object/ObjectAbstract.php'; | |
| +#require_once 'Zend/Barcode/Object/ObjectAbstract.php'; | |
| /** | |
| * @see Zend_Validate_Barcode | |
| */ | |
| -require_once 'Zend/Validate/Barcode.php'; | |
| +#require_once 'Zend/Validate/Barcode.php'; | |
| /** | |
| * Class for generate Royal maim barcode | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Object/Upca.php | |
| @@ -23,12 +23,12 @@ | |
| /** | |
| * @see Zend_Barcode_Object_Ean13 | |
| */ | |
| -require_once 'Zend/Barcode/Object/Ean13.php'; | |
| +#require_once 'Zend/Barcode/Object/Ean13.php'; | |
| /** | |
| * @see Zend_Validate_Barcode | |
| */ | |
| -require_once 'Zend/Validate/Barcode.php'; | |
| +#require_once 'Zend/Validate/Barcode.php'; | |
| /** | |
| * Class for generate UpcA barcode | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Object/Upce.php | |
| @@ -23,12 +23,12 @@ | |
| /** | |
| * @see Zend_Barcode_Object_Ean13 | |
| */ | |
| -require_once 'Zend/Barcode/Object/Ean13.php'; | |
| +#require_once 'Zend/Barcode/Object/Ean13.php'; | |
| /** | |
| * @see Zend_Validate_Barcode | |
| */ | |
| -require_once 'Zend/Validate/Barcode.php'; | |
| +#require_once 'Zend/Validate/Barcode.php'; | |
| /** | |
| * Class for generate UpcA barcode | |
| @@ -215,7 +215,7 @@ | |
| /** | |
| * @see Zend_Barcode_Object_Exception | |
| */ | |
| - require_once 'Zend/Barcode/Object/Exception.php'; | |
| + #require_once 'Zend/Barcode/Object/Exception.php'; | |
| throw new Zend_Barcode_Object_Exception($message); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode.php | |
| @@ -139,7 +139,7 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| * 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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| * 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 @@ | |
| /** | |
| * @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 setBarcodeFont($font) | |
| { | |
| - require_once 'Zend/Barcode/Object/ObjectAbstract.php'; | |
| + #require_once 'Zend/Barcode/Object/ObjectAbstract.php'; | |
| Zend_Barcode_Object_ObjectAbstract::setBarcodeFont($font); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Renderer/Exception.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** @see Zend_Barcode_Exception */ | |
| -require_once 'Zend/Barcode/Exception.php'; | |
| +#require_once 'Zend/Barcode/Exception.php'; | |
| /** | |
| * Zend_Barcode_Renderer_Exception | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Renderer/Image.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** @see Zend_Barcode_Renderer_RendererAbstract*/ | |
| -require_once 'Zend/Barcode/Renderer/RendererAbstract.php'; | |
| +#require_once 'Zend/Barcode/Renderer/RendererAbstract.php'; | |
| /** | |
| * Class for rendering the barcode as image | |
| @@ -82,7 +82,7 @@ | |
| public function __construct($options = null) | |
| { | |
| if (!function_exists('gd_info')) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception('Zend_Barcode_Renderer_Image requires the GD extension'); | |
| } | |
| @@ -99,7 +99,7 @@ | |
| public function setHeight($value) | |
| { | |
| if (!is_numeric($value) || (int)$value < 0) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| 'Image height must be greater than or equals 0' | |
| ); | |
| @@ -128,7 +128,7 @@ | |
| public function setWidth($value) | |
| { | |
| if (!is_numeric($value) || (int)$value < 0) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| 'Image width must be greater than or equals 0' | |
| ); | |
| @@ -160,7 +160,7 @@ | |
| $this->_resource = $image; | |
| return $this; | |
| } else { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| 'Invalid image resource provided to setResource()' | |
| ); | |
| @@ -181,7 +181,7 @@ | |
| } | |
| if (!in_array($value, $this->_allowedImageType)) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception(sprintf( | |
| 'Invalid type "%s" provided to setImageType()', | |
| $value | |
| @@ -211,7 +211,7 @@ | |
| protected function _initRenderer() | |
| { | |
| if (!extension_loaded('gd')) { | |
| - require_once 'Zend/Barcode/Exception.php'; | |
| + #require_once 'Zend/Barcode/Exception.php'; | |
| $e = new Zend_Barcode_Exception( | |
| 'Gd extension must be loaded to render barcode as image' | |
| ); | |
| @@ -297,7 +297,7 @@ | |
| { | |
| if ($this->_resource !== null) { | |
| if (imagesy($this->_resource) < $this->_barcode->getHeight(true)) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| 'Barcode is define outside the image (height)' | |
| ); | |
| @@ -306,7 +306,7 @@ | |
| if ($this->_userHeight) { | |
| $height = $this->_barcode->getHeight(true); | |
| if ($this->_userHeight < $height) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception(sprintf( | |
| "Barcode is define outside the image (calculated: '%d', provided: '%d')", | |
| $height, | |
| @@ -317,7 +317,7 @@ | |
| } | |
| if ($this->_resource !== null) { | |
| if (imagesx($this->_resource) < $this->_barcode->getWidth(true)) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| 'Barcode is define outside the image (width)' | |
| ); | |
| @@ -326,7 +326,7 @@ | |
| if ($this->_userWidth) { | |
| $width = $this->_barcode->getWidth(true); | |
| if ($this->_userWidth < $width) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception(sprintf( | |
| "Barcode is define outside the image (calculated: '%d', provided: '%d')", | |
| $width, | |
| @@ -425,7 +425,7 @@ | |
| * to informe user of the problem instead of simply not drawing | |
| * the text | |
| */ | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| 'No orientation possible with GD internal font' | |
| ); | |
| @@ -447,7 +447,7 @@ | |
| } else { | |
| if (!function_exists('imagettfbbox')) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| 'A font was provided, but this instance of PHP does not have TTF (FreeType) support' | |
| ); | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Renderer/Pdf.php | |
| @@ -21,16 +21,16 @@ | |
| */ | |
| /** @see Zend_Barcode_Renderer_RendererAbstract */ | |
| -require_once 'Zend/Barcode/Renderer/RendererAbstract.php'; | |
| +#require_once 'Zend/Barcode/Renderer/RendererAbstract.php'; | |
| /** @see Zend_Pdf */ | |
| -require_once 'Zend/Pdf.php'; | |
| +#require_once 'Zend/Pdf.php'; | |
| /** @see Zend_Pdf_Page */ | |
| -require_once 'Zend/Pdf/Page.php'; | |
| +#require_once 'Zend/Pdf/Page.php'; | |
| /** @see Zend_Pdf_Color_Rgb */ | |
| -require_once 'Zend/Pdf/Color/Rgb.php'; | |
| +#require_once 'Zend/Pdf/Color/Rgb.php'; | |
| /** | |
| * Class for rendering the barcode in PDF resource | |
| @@ -71,7 +71,7 @@ | |
| public function setResource($pdf, $page = 0) | |
| { | |
| if (!$pdf instanceof Zend_Pdf) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| 'Invalid Zend_Pdf resource provided to setResource()' | |
| ); | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Renderer/RendererAbstract.php | |
| @@ -178,7 +178,7 @@ | |
| public function setTopOffset($value) | |
| { | |
| if (!is_numeric($value) || (int)$value < 0) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| 'Vertical position must be greater than or equals 0' | |
| ); | |
| @@ -206,7 +206,7 @@ | |
| public function setLeftOffset($value) | |
| { | |
| if (!is_numeric($value) || (int)$value < 0) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| 'Horizontal position must be greater than or equals 0' | |
| ); | |
| @@ -246,7 +246,7 @@ | |
| public function setHorizontalPosition($value) | |
| { | |
| if (!in_array($value, ['left' , 'center' , 'right'])) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| "Invalid barcode position provided must be 'left', 'center' or 'right'" | |
| ); | |
| @@ -274,7 +274,7 @@ | |
| public function setVerticalPosition($value) | |
| { | |
| if (!in_array($value, ['top' , 'middle' , 'bottom'])) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| "Invalid barcode position provided must be 'top', 'middle' or 'bottom'" | |
| ); | |
| @@ -302,7 +302,7 @@ | |
| public function setModuleSize($value) | |
| { | |
| if (!is_numeric($value) || (float)$value <= 0) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| 'Float size must be greater than 0' | |
| ); | |
| @@ -340,7 +340,7 @@ | |
| public function setBarcode($barcode) | |
| { | |
| if (!$barcode instanceof Zend_Barcode_Object_ObjectAbstract) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| 'Invalid barcode object provided to setBarcode()' | |
| ); | |
| @@ -381,7 +381,7 @@ | |
| /** | |
| * @see Zend_Barcode_Renderer_Exception | |
| */ | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| 'No barcode object provided' | |
| ); | |
| @@ -503,7 +503,7 @@ | |
| /** | |
| * @see Zend_Barcode_Renderer_Exception | |
| */ | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| 'Unknown drawing command' | |
| ); | |
| --- /dev/null | |
| +++ ../library/Zend/Barcode/Renderer/Svg.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** @see Zend_Barcode_Renderer_RendererAbstract*/ | |
| -require_once 'Zend/Barcode/Renderer/RendererAbstract.php'; | |
| +#require_once 'Zend/Barcode/Renderer/RendererAbstract.php'; | |
| /** | |
| * Class for rendering the barcode as svg | |
| @@ -68,7 +68,7 @@ | |
| public function setHeight($value) | |
| { | |
| if (!is_numeric($value) || (int)$value < 0) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| 'Svg height must be greater than or equals 0' | |
| ); | |
| @@ -97,7 +97,7 @@ | |
| public function setWidth($value) | |
| { | |
| if (!is_numeric($value) || (int)$value < 0) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| 'Svg width must be greater than or equals 0' | |
| ); | |
| @@ -126,7 +126,7 @@ | |
| public function setResource($svg) | |
| { | |
| if (!$svg instanceof DOMDocument) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| 'Invalid DOMDocument resource provided to setResource()' | |
| ); | |
| @@ -247,7 +247,7 @@ | |
| $this->_readRootElement(); | |
| $height = (float) $this->_rootElement->getAttribute('height'); | |
| if ($height < $this->_barcode->getHeight(true)) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| 'Barcode is define outside the image (height)' | |
| ); | |
| @@ -256,7 +256,7 @@ | |
| if ($this->_userHeight) { | |
| $height = $this->_barcode->getHeight(true); | |
| if ($this->_userHeight < $height) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception(sprintf( | |
| "Barcode is define outside the image (calculated: '%d', provided: '%d')", | |
| $height, | |
| @@ -269,7 +269,7 @@ | |
| $this->_readRootElement(); | |
| $width = $this->_rootElement->getAttribute('width'); | |
| if ($width < $this->_barcode->getWidth(true)) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception( | |
| 'Barcode is define outside the image (width)' | |
| ); | |
| @@ -278,7 +278,7 @@ | |
| if ($this->_userWidth) { | |
| $width = (float) $this->_barcode->getWidth(true); | |
| if ($this->_userWidth < $width) { | |
| - require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| + #require_once 'Zend/Barcode/Renderer/Exception.php'; | |
| throw new Zend_Barcode_Renderer_Exception(sprintf( | |
| "Barcode is define outside the image (calculated: '%d', provided: '%d')", | |
| $width, | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../library/Zend/Cache/Backend.php | |
| @@ -255,9 +255,9 @@ | |
| } | |
| // 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; | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../library/Zend/Cache/Core.php | |
| @@ -720,9 +720,9 @@ | |
| } | |
| // 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; | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 @@ | |
| 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'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Cache.php | |
| @@ -84,7 +84,7 @@ | |
| * @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_Output|Zend_Cache_Frontend_Class|Zend_Cache_Frontend_File|Zend_Cache_Frontend_Function|Zend_Cache_Frontend_Page | |
| */ | |
| @@ -130,7 +130,7 @@ | |
| // 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 @@ | |
| 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 @@ | |
| // 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 @@ | |
| 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 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); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Captcha/Base.php | |
| @@ -20,10 +20,10 @@ | |
| */ | |
| /** @see Zend_Captcha_Adapter */ | |
| -require_once 'Zend/Captcha/Adapter.php'; | |
| +#require_once 'Zend/Captcha/Adapter.php'; | |
| /** @see Zend_Validate_Abstract */ | |
| -require_once 'Zend/Validate/Abstract.php'; | |
| +#require_once 'Zend/Validate/Abstract.php'; | |
| /** | |
| * Base class for Captcha adapters | |
| --- /dev/null | |
| +++ ../library/Zend/Captcha/Dumb.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** @see Zend_Captcha_Word */ | |
| -require_once 'Zend/Captcha/Word.php'; | |
| +#require_once 'Zend/Captcha/Word.php'; | |
| /** | |
| * Example dumb word-based captcha | |
| --- /dev/null | |
| +++ ../library/Zend/Captcha/Exception.php | |
| @@ -22,7 +22,7 @@ | |
| /** | |
| * @see Zend_Exception | |
| */ | |
| -require_once 'Zend/Exception.php'; | |
| +#require_once 'Zend/Exception.php'; | |
| /** | |
| * Exception for Zend_Form component. | |
| --- /dev/null | |
| +++ ../library/Zend/Captcha/Figlet.php | |
| @@ -20,10 +20,10 @@ | |
| */ | |
| /** @see Zend_Captcha_Word */ | |
| -require_once 'Zend/Captcha/Word.php'; | |
| +#require_once 'Zend/Captcha/Word.php'; | |
| /** @see Zend_Text_Figlet */ | |
| -require_once 'Zend/Text/Figlet.php'; | |
| +#require_once 'Zend/Text/Figlet.php'; | |
| /** | |
| * Captcha based on figlet text rendering service | |
| --- /dev/null | |
| +++ ../library/Zend/Captcha/Image.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** @see Zend_Captcha_Word */ | |
| -require_once 'Zend/Captcha/Word.php'; | |
| +#require_once 'Zend/Captcha/Word.php'; | |
| /** | |
| * Image-based captcha element | |
| @@ -465,17 +465,17 @@ | |
| protected function _generateImage($id, $word) | |
| { | |
| if (!extension_loaded("gd")) { | |
| - require_once 'Zend/Captcha/Exception.php'; | |
| + #require_once 'Zend/Captcha/Exception.php'; | |
| throw new Zend_Captcha_Exception("Image CAPTCHA requires GD extension"); | |
| } | |
| if (!function_exists("imagepng")) { | |
| - require_once 'Zend/Captcha/Exception.php'; | |
| + #require_once 'Zend/Captcha/Exception.php'; | |
| throw new Zend_Captcha_Exception("Image CAPTCHA requires PNG support"); | |
| } | |
| if (!function_exists("imageftbbox")) { | |
| - require_once 'Zend/Captcha/Exception.php'; | |
| + #require_once 'Zend/Captcha/Exception.php'; | |
| throw new Zend_Captcha_Exception("Image CAPTCHA requires FT fonts support"); | |
| } | |
| @@ -482,7 +482,7 @@ | |
| $font = $this->getFont(); | |
| if (empty($font)) { | |
| - require_once 'Zend/Captcha/Exception.php'; | |
| + #require_once 'Zend/Captcha/Exception.php'; | |
| throw new Zend_Captcha_Exception("Image CAPTCHA requires font"); | |
| } | |
| @@ -496,7 +496,7 @@ | |
| } else { | |
| $img = imagecreatefrompng($this->_startImage); | |
| if(!$img) { | |
| - require_once 'Zend/Captcha/Exception.php'; | |
| + #require_once 'Zend/Captcha/Exception.php'; | |
| throw new Zend_Captcha_Exception("Can not load start image"); | |
| } | |
| $w = imagesx($img); | |
| --- /dev/null | |
| +++ ../library/Zend/Captcha/ReCaptcha.php | |
| @@ -20,10 +20,10 @@ | |
| */ | |
| /** @see Zend_Captcha_Base */ | |
| -require_once 'Zend/Captcha/Base.php'; | |
| +#require_once 'Zend/Captcha/Base.php'; | |
| /** @see Zend_Service_ReCaptcha */ | |
| -require_once 'Zend/Service/ReCaptcha.php'; | |
| +#require_once 'Zend/Service/ReCaptcha.php'; | |
| /** | |
| * ReCaptcha adapter | |
| --- /dev/null | |
| +++ ../library/Zend/Captcha/Word.php | |
| @@ -20,10 +20,10 @@ | |
| */ | |
| /** @see Zend_Captcha_Base */ | |
| -require_once 'Zend/Captcha/Base.php'; | |
| +#require_once 'Zend/Captcha/Base.php'; | |
| /** @see Zend_Crypt_Math */ | |
| -require_once 'Zend/Crypt/Math.php'; | |
| +#require_once 'Zend/Crypt/Math.php'; | |
| /** | |
| * Word-based captcha adapter | |
| @@ -257,7 +257,7 @@ | |
| if (!isset($this->_session) || (null === $this->_session)) { | |
| $id = $this->getId(); | |
| if (!class_exists($this->_sessionClass)) { | |
| - require_once 'Zend/Loader.php'; | |
| + #require_once 'Zend/Loader.php'; | |
| Zend_Loader::loadClass($this->_sessionClass); | |
| } | |
| $this->_session = new $this->_sessionClass('Zend_Form_Captcha_' . $id); | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/AbstractFactory.php | |
| @@ -56,7 +56,7 @@ | |
| $classname = $options[$adapterOption]; | |
| unset($options[$adapterOption]); | |
| if (!class_exists($classname)) { | |
| - require_once 'Zend/Loader.php'; | |
| + #require_once 'Zend/Loader.php'; | |
| Zend_Loader::loadClass($classname); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php | |
| @@ -17,10 +17,10 @@ | |
| * @license http://framework.zend.com/license/new-bsd New BSD License | |
| */ | |
| -require_once 'Zend/Cloud/DocumentService/Adapter.php'; | |
| -require_once 'Zend/Cloud/DocumentService/Document.php'; | |
| -require_once 'Zend/Cloud/DocumentService/DocumentSet.php'; | |
| -require_once 'Zend/Cloud/DocumentService/Query.php'; | |
| +#require_once 'Zend/Cloud/DocumentService/Adapter.php'; | |
| +#require_once 'Zend/Cloud/DocumentService/Document.php'; | |
| +#require_once 'Zend/Cloud/DocumentService/DocumentSet.php'; | |
| +#require_once 'Zend/Cloud/DocumentService/Query.php'; | |
| /** | |
| * Abstract document service adapter | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/DocumentService/Adapter/SimpleDb.php | |
| @@ -17,11 +17,11 @@ | |
| * @license http://framework.zend.com/license/new-bsd New BSD License | |
| */ | |
| -require_once 'Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php'; | |
| -require_once 'Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php'; | |
| -require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| -require_once 'Zend/Service/Amazon/SimpleDb.php'; | |
| -require_once 'Zend/Service/Amazon/SimpleDb/Attribute.php'; | |
| +#require_once 'Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php'; | |
| +#require_once 'Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php'; | |
| +#require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| +#require_once 'Zend/Service/Amazon/SimpleDb.php'; | |
| +#require_once 'Zend/Service/Amazon/SimpleDb/Attribute.php'; | |
| /** | |
| * SimpleDB adapter for document service. | |
| @@ -358,7 +358,7 @@ | |
| { | |
| $queryClass = $this->getQueryClass(); | |
| if (!class_exists($queryClass)) { | |
| - require_once 'Zend/Loader.php'; | |
| + #require_once 'Zend/Loader.php'; | |
| Zend_Loader::loadClass($queryClass); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/DocumentService/Adapter/SimpleDb/Query.php | |
| @@ -20,7 +20,7 @@ | |
| /* | |
| * @see Zend_Cloud_DocumentService_Query | |
| */ | |
| -require_once 'Zend/Cloud/DocumentService/Query.php'; | |
| +#require_once 'Zend/Cloud/DocumentService/Query.php'; | |
| /** | |
| * Class implementing Query adapter for working with SimpleDb queries in a | |
| @@ -130,7 +130,7 @@ | |
| } | |
| if (empty($from)) { | |
| if (null === $collectionName) { | |
| - require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| + #require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| throw new Zend_Cloud_DocumentService_Exception("Query requires a FROM clause"); | |
| } | |
| $from = $adapter->quoteName($collectionName); | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/DocumentService/Adapter/WindowsAzure.php | |
| @@ -17,11 +17,11 @@ | |
| * @license http://framework.zend.com/license/new-bsd New BSD License | |
| */ | |
| -require_once 'Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php'; | |
| -require_once 'Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php'; | |
| -require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| -require_once 'Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php'; | |
| -require_once 'Zend/Service/WindowsAzure/Storage/Table.php'; | |
| +#require_once 'Zend/Cloud/DocumentService/Adapter/AbstractAdapter.php'; | |
| +#require_once 'Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php'; | |
| +#require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| +#require_once 'Zend/Service/WindowsAzure/Storage/DynamicTableEntity.php'; | |
| +#require_once 'Zend/Service/WindowsAzure/Storage/Table.php'; | |
| /** | |
| * SimpleDB adapter for document service. | |
| @@ -476,7 +476,7 @@ | |
| { | |
| $queryClass = $this->getQueryClass(); | |
| if (!class_exists($queryClass)) { | |
| - require_once 'Zend/Loader.php'; | |
| + #require_once 'Zend/Loader.php'; | |
| Zend_Loader::loadClass($queryClass); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/DocumentService/Adapter/WindowsAzure/Query.php | |
| @@ -20,7 +20,7 @@ | |
| /* | |
| * @see Zend_Cloud_DocumentService_QueryAdapter | |
| */ | |
| -require_once 'Zend/Cloud/DocumentService/QueryAdapter.php'; | |
| +#require_once 'Zend/Cloud/DocumentService/QueryAdapter.php'; | |
| /** | |
| * Class implementing Query adapter for working with Azure queries in a | |
| @@ -52,7 +52,7 @@ | |
| public function __construct($select = null) | |
| { | |
| if (!$select instanceof Zend_Service_WindowsAzure_Storage_TableEntityQuery) { | |
| - require_once 'Zend/Service/WindowsAzure/Storage/TableEntityQuery.php'; | |
| + #require_once 'Zend/Service/WindowsAzure/Storage/TableEntityQuery.php'; | |
| $select = new Zend_Service_WindowsAzure_Storage_TableEntityQuery(); | |
| } | |
| $this->_azureSelect = $select; | |
| @@ -113,7 +113,7 @@ | |
| public function whereId($value) | |
| { | |
| if (!is_array($value)) { | |
| - require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| + #require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| throw new Zend_Cloud_DocumentService_Exception('Invalid document key'); | |
| } | |
| $this->_azureSelect->wherePartitionKey($value[0])->whereRowKey($value[1]); | |
| @@ -143,7 +143,7 @@ | |
| */ | |
| public function order($sort, $direction = 'asc') | |
| { | |
| - require_once 'Zend/Cloud/OperationNotAvailableException.php'; | |
| + #require_once 'Zend/Cloud/OperationNotAvailableException.php'; | |
| throw new Zend_Cloud_OperationNotAvailableException('No support for sorting for Azure yet'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/DocumentService/Document.php | |
| @@ -60,7 +60,7 @@ | |
| public function __construct($fields, $id = null) | |
| { | |
| if (!is_array($fields) && !$fields instanceof ArrayAccess) { | |
| - require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| + #require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| throw new Zend_Cloud_DocumentService_Exception('Fields must be an array or implement ArrayAccess'); | |
| } | |
| @@ -223,7 +223,7 @@ | |
| return $this->setField($option, $args[0]); | |
| } | |
| - require_once 'Zend/Cloud/OperationNotAvailableException.php'; | |
| + #require_once 'Zend/Cloud/OperationNotAvailableException.php'; | |
| throw new Zend_Cloud_OperationNotAvailableException("Unknown operation $name"); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/DocumentService/Exception.php | |
| @@ -23,7 +23,7 @@ | |
| /** | |
| * Zend_Cloud_Exception | |
| */ | |
| -require_once 'Zend/Cloud/Exception.php'; | |
| +#require_once 'Zend/Cloud/Exception.php'; | |
| /** | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/DocumentService/Factory.php | |
| @@ -19,7 +19,7 @@ | |
| * @license http://framework.zend.com/license/new-bsd New BSD License | |
| */ | |
| -require_once 'Zend/Cloud/AbstractFactory.php'; | |
| +#require_once 'Zend/Cloud/AbstractFactory.php'; | |
| /** | |
| * Class implementing working with Azure queries in a structured way | |
| @@ -61,13 +61,13 @@ | |
| { | |
| $adapter = parent::_getAdapter(self::DOCUMENT_ADAPTER_KEY, $options); | |
| if (!$adapter) { | |
| - require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| + #require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| throw new Zend_Cloud_DocumentService_Exception( | |
| 'Class must be specified using the \'' | |
| . self::DOCUMENT_ADAPTER_KEY . '\' key' | |
| ); | |
| } elseif (!$adapter instanceof self::$_adapterInterface) { | |
| - require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| + #require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| throw new Zend_Cloud_DocumentService_Exception( | |
| 'Adapter must implement \'' . self::$_adapterInterface . '\'' | |
| ); | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/DocumentService/Query.php | |
| @@ -17,7 +17,7 @@ | |
| * @license http://framework.zend.com/license/new-bsd New BSD License | |
| */ | |
| -require_once 'Zend/Cloud/DocumentService/QueryAdapter.php'; | |
| +#require_once 'Zend/Cloud/DocumentService/QueryAdapter.php'; | |
| /** | |
| * Generic query object | |
| @@ -81,7 +81,7 @@ | |
| return $this; | |
| } | |
| if (!is_string($select) && !is_array($select)) { | |
| - require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| + #require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| throw new Zend_Cloud_DocumentService_Exception("SELECT argument must be a string or an array of strings"); | |
| } | |
| $this->_clauses[] = [self::QUERY_SELECT, $select]; | |
| @@ -97,7 +97,7 @@ | |
| public function from($name) | |
| { | |
| if(!is_string($name)) { | |
| - require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| + #require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| throw new Zend_Cloud_DocumentService_Exception("FROM argument must be a string"); | |
| } | |
| $this->_clauses[] = [self::QUERY_FROM, $name]; | |
| @@ -115,7 +115,7 @@ | |
| public function where($cond, $value = null, $op = 'and') | |
| { | |
| if (!is_string($cond)) { | |
| - require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| + #require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| throw new Zend_Cloud_DocumentService_Exception("WHERE argument must be a string"); | |
| } | |
| $this->_clauses[] = [self::QUERY_WHERE, [$cond, $value, $op]]; | |
| @@ -131,7 +131,7 @@ | |
| public function whereId($value) | |
| { | |
| if (!is_scalar($value)) { | |
| - require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| + #require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| throw new Zend_Cloud_DocumentService_Exception("WHEREID argument must be a scalar"); | |
| } | |
| $this->_clauses[] = [self::QUERY_WHEREID, $value]; | |
| @@ -147,7 +147,7 @@ | |
| public function limit($limit) | |
| { | |
| if ($limit != (int) $limit) { | |
| - require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| + #require_once 'Zend/Cloud/DocumentService/Exception.php'; | |
| throw new Zend_Cloud_DocumentService_Exception("LIMIT argument must be an integer"); | |
| } | |
| $this->_clauses[] = [self::QUERY_LIMIT, $limit]; | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/Exception.php | |
| @@ -22,7 +22,7 @@ | |
| /** | |
| * Zend_Exception | |
| */ | |
| -require_once 'Zend/Exception.php'; | |
| +#require_once 'Zend/Exception.php'; | |
| /** | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php | |
| @@ -17,8 +17,8 @@ | |
| * @license http://framework.zend.com/license/new-bsd New BSD License | |
| */ | |
| -require_once 'Zend/Cloud/Infrastructure/Adapter.php'; | |
| -require_once 'Zend/Cloud/Infrastructure/Instance.php'; | |
| +#require_once 'Zend/Cloud/Infrastructure/Adapter.php'; | |
| +#require_once 'Zend/Cloud/Infrastructure/Instance.php'; | |
| /** | |
| * Abstract infrastructure service adapter | |
| @@ -96,17 +96,17 @@ | |
| public function deployInstance($id, $params, $cmd) | |
| { | |
| if (!function_exists("ssh2_connect")) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('Deployment requires the PHP "SSH" extension (ext/ssh2)'); | |
| } | |
| if (empty($id)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('You must specify the instance where to deploy'); | |
| } | |
| if (empty($cmd)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('You must specify the shell commands to run on the instance'); | |
| } | |
| @@ -115,13 +115,13 @@ | |
| || (empty($params[Zend_Cloud_Infrastructure_Instance::SSH_PASSWORD]) | |
| && empty($params[Zend_Cloud_Infrastructure_Instance::SSH_KEY])) | |
| ) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('You must specify the params for the SSH connection'); | |
| } | |
| $host = $this->publicDnsInstance($id); | |
| if (empty($host)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception(sprintf( | |
| 'The instance identified by "%s" does not exist', | |
| $id | |
| @@ -131,7 +131,7 @@ | |
| $conn = ssh2_connect($host); | |
| if (!ssh2_auth_password($conn, $params[Zend_Cloud_Infrastructure_Instance::SSH_USERNAME], | |
| $params[Zend_Cloud_Infrastructure_Instance::SSH_PASSWORD])) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('SSH authentication failed'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/Infrastructure/Adapter/Ec2.php | |
| @@ -7,15 +7,15 @@ | |
| * @license http://framework.zend.com/license/new-bsd New BSD License | |
| */ | |
| -require_once 'Zend/Service/Amazon/Ec2/Instance.php'; | |
| -require_once 'Zend/Service/Amazon/Ec2/Image.php'; | |
| -require_once 'Zend/Service/Amazon/Ec2/Availabilityzones.php'; | |
| -require_once 'Zend/Service/Amazon/Ec2/CloudWatch.php'; | |
| -require_once 'Zend/Cloud/Infrastructure/Instance.php'; | |
| -require_once 'Zend/Cloud/Infrastructure/InstanceList.php'; | |
| -require_once 'Zend/Cloud/Infrastructure/Image.php'; | |
| -require_once 'Zend/Cloud/Infrastructure/ImageList.php'; | |
| -require_once 'Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php'; | |
| +#require_once 'Zend/Service/Amazon/Ec2/Instance.php'; | |
| +#require_once 'Zend/Service/Amazon/Ec2/Image.php'; | |
| +#require_once 'Zend/Service/Amazon/Ec2/Availabilityzones.php'; | |
| +#require_once 'Zend/Service/Amazon/Ec2/CloudWatch.php'; | |
| +#require_once 'Zend/Cloud/Infrastructure/Instance.php'; | |
| +#require_once 'Zend/Cloud/Infrastructure/InstanceList.php'; | |
| +#require_once 'Zend/Cloud/Infrastructure/Image.php'; | |
| +#require_once 'Zend/Cloud/Infrastructure/ImageList.php'; | |
| +#require_once 'Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php'; | |
| /** | |
| * Amazon EC2 adapter for infrastructure service | |
| @@ -134,7 +134,7 @@ | |
| } | |
| if (empty($options) || !is_array($options)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('Invalid options provided'); | |
| } | |
| @@ -141,7 +141,7 @@ | |
| if (!isset($options[self::AWS_ACCESS_KEY]) | |
| || !isset($options[self::AWS_SECRET_KEY]) | |
| ) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('AWS keys not specified!'); | |
| } | |
| @@ -156,7 +156,7 @@ | |
| try { | |
| $this->ec2 = new Zend_Service_Amazon_Ec2_Instance($options[self::AWS_ACCESS_KEY], $options[self::AWS_SECRET_KEY], $this->region); | |
| } catch (Exception $e) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('Error on create: ' . $e->getMessage(), $e->getCode(), $e); | |
| } | |
| @@ -303,7 +303,7 @@ | |
| */ | |
| public function stopInstance($id) | |
| { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('The stopInstance method is not implemented in the adapter'); | |
| } | |
| @@ -315,7 +315,7 @@ | |
| */ | |
| public function startInstance($id) | |
| { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('The startInstance method is not implemented in the adapter'); | |
| } | |
| @@ -406,7 +406,7 @@ | |
| } | |
| if (!in_array($metric,$this->validMetrics)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception(sprintf( | |
| 'The metric "%s" is not valid', | |
| $metric | |
| @@ -414,7 +414,7 @@ | |
| } | |
| if (!empty($options) && !is_array($options)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('The options must be an array'); | |
| } | |
| @@ -422,7 +422,7 @@ | |
| && (empty($options[Zend_Cloud_Infrastructure_Instance::MONITOR_START_TIME]) | |
| || empty($options[Zend_Cloud_Infrastructure_Instance::MONITOR_END_TIME])) | |
| ) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception(sprintf( | |
| 'The options array must contain: "%s" and "%s"', | |
| $options[Zend_Cloud_Infrastructure_Instance::MONITOR_START_TIME], | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/Infrastructure/Adapter/Rackspace.php | |
| @@ -7,12 +7,12 @@ | |
| * @license http://framework.zend.com/license/new-bsd New BSD License | |
| */ | |
| -require_once 'Zend/Service/Rackspace/Servers.php'; | |
| -require_once 'Zend/Cloud/Infrastructure/Instance.php'; | |
| -require_once 'Zend/Cloud/Infrastructure/InstanceList.php'; | |
| -require_once 'Zend/Cloud/Infrastructure/Image.php'; | |
| -require_once 'Zend/Cloud/Infrastructure/ImageList.php'; | |
| -require_once 'Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php'; | |
| +#require_once 'Zend/Service/Rackspace/Servers.php'; | |
| +#require_once 'Zend/Cloud/Infrastructure/Instance.php'; | |
| +#require_once 'Zend/Cloud/Infrastructure/InstanceList.php'; | |
| +#require_once 'Zend/Cloud/Infrastructure/Image.php'; | |
| +#require_once 'Zend/Cloud/Infrastructure/ImageList.php'; | |
| +#require_once 'Zend/Cloud/Infrastructure/Adapter/AbstractAdapter.php'; | |
| /** | |
| * Rackspace servers adapter for infrastructure service | |
| @@ -104,17 +104,17 @@ | |
| } | |
| if (empty($options) || !is_array($options)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('Invalid options provided'); | |
| } | |
| if (!isset($options[self::RACKSPACE_USER])) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('Rackspace access user not specified!'); | |
| } | |
| if (!isset($options[self::RACKSPACE_KEY])) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('Rackspace access key not specified!'); | |
| } | |
| @@ -130,7 +130,7 @@ | |
| $this->region = Zend_Service_Rackspace_Servers::US_AUTH_URL; | |
| break; | |
| default: | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('The region is not valid'); | |
| } | |
| } else { | |
| @@ -140,7 +140,7 @@ | |
| try { | |
| $this->rackspace = new Zend_Service_Rackspace_Servers($this->accessUser,$this->accessKey, $this->region); | |
| } catch (Exception $e) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('Error on create: ' . $e->getMessage(), $e->getCode(), $e); | |
| } | |
| @@ -240,11 +240,11 @@ | |
| public function createInstance($name, $options) | |
| { | |
| if (empty($name)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('You must specify the name of the instance'); | |
| } | |
| if (empty($options) || !is_array($options)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('The options must be an array'); | |
| } | |
| // @todo create an generic abstract definition for an instance? | |
| @@ -273,7 +273,7 @@ | |
| */ | |
| public function stopInstance($id) | |
| { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('The stopInstance method is not implemented in the adapter'); | |
| } | |
| @@ -285,7 +285,7 @@ | |
| */ | |
| public function startInstance($id) | |
| { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('The startInstance method is not implemented in the adapter'); | |
| } | |
| @@ -359,23 +359,23 @@ | |
| public function monitorInstance($id, $metric, $options = null) | |
| { | |
| if (!function_exists("ssh2_connect")) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('Monitor requires the PHP "SSH" extension (ext/ssh2)'); | |
| } | |
| if (empty($id)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('You must specify the id of the instance to monitor'); | |
| } | |
| if (empty($metric)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('You must specify the metric to monitor'); | |
| } | |
| if (!in_array($metric,$this->validMetrics)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception(sprintf('The metric "%s" is not valid', $metric)); | |
| } | |
| if (!empty($options) && !is_array($options)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('The options must be an array'); | |
| } | |
| @@ -391,7 +391,7 @@ | |
| break; | |
| } | |
| if (empty($cmd)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('The metric specified is not supported by the adapter'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/Infrastructure/Exception.php | |
| @@ -12,7 +12,7 @@ | |
| /** | |
| * Zend_Cloud_Exception | |
| */ | |
| -require_once 'Zend/Cloud/Exception.php'; | |
| +#require_once 'Zend/Cloud/Exception.php'; | |
| /** | |
| * @category Zend | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/Infrastructure/Factory.php | |
| @@ -7,7 +7,7 @@ | |
| * @license http://framework.zend.com/license/new-bsd New BSD License | |
| */ | |
| -require_once 'Zend/Cloud/AbstractFactory.php'; | |
| +#require_once 'Zend/Cloud/AbstractFactory.php'; | |
| /** | |
| @@ -49,13 +49,13 @@ | |
| $adapter = parent::_getAdapter(self::INFRASTRUCTURE_ADAPTER_KEY, $options); | |
| if (!$adapter) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception(sprintf( | |
| 'Class must be specified using the "%s" key', | |
| self::INFRASTRUCTURE_ADAPTER_KEY | |
| )); | |
| } elseif (!$adapter instanceof self::$_adapterInterface) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception(sprintf( | |
| 'Adapter must implement "%s"', self::$_adapterInterface | |
| )); | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/Infrastructure/Image.php | |
| @@ -71,13 +71,13 @@ | |
| } | |
| if (empty($data) || !is_array($data)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('You must pass an array of parameters'); | |
| } | |
| foreach ($this->attributeRequired as $key) { | |
| if (empty($data[$key])) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception(sprintf( | |
| 'The param "%s" is a required parameter for class %s', | |
| $key, | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/Infrastructure/ImageList.php | |
| @@ -8,7 +8,7 @@ | |
| */ | |
| -require_once 'Zend/Cloud/Infrastructure/Image.php'; | |
| +#require_once 'Zend/Cloud/Infrastructure/Image.php'; | |
| /** | |
| * List of images | |
| @@ -47,7 +47,7 @@ | |
| public function __construct($images, $adapter = null) | |
| { | |
| if (empty($images) || !is_array($images)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception(__CLASS__ . ' expects an array of images'); | |
| } | |
| @@ -184,7 +184,7 @@ | |
| public function offsetGet($offset) | |
| { | |
| if (!$this->offsetExists($offset)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('Illegal index'); | |
| } | |
| return $this->images[$offset]; | |
| @@ -201,7 +201,7 @@ | |
| */ | |
| public function offsetSet($offset, $value): void | |
| { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('You are trying to set read-only property'); | |
| } | |
| @@ -215,7 +215,7 @@ | |
| */ | |
| public function offsetUnset($offset): void | |
| { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('You are trying to unset read-only property'); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/Infrastructure/Instance.php | |
| @@ -83,7 +83,7 @@ | |
| public function __construct($adapter, $data = null) | |
| { | |
| if (!($adapter instanceof Zend_Cloud_Infrastructure_Adapter)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception("You must pass a Zend_Cloud_Infrastructure_Adapter instance"); | |
| } | |
| @@ -96,13 +96,13 @@ | |
| } | |
| if (empty($data) || !is_array($data)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception("You must pass an array of parameters"); | |
| } | |
| foreach ($this->attributeRequired as $key) { | |
| if (empty($data[$key])) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception(sprintf( | |
| 'The param "%s" is a required param for %s', | |
| $key, | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/Infrastructure/InstanceList.php | |
| @@ -7,7 +7,7 @@ | |
| * @license http://framework.zend.com/license/new-bsd New BSD License | |
| */ | |
| -require_once 'Zend/Cloud/Infrastructure/Instance.php'; | |
| +#require_once 'Zend/Cloud/Infrastructure/Instance.php'; | |
| /** | |
| * List of instances | |
| @@ -44,11 +44,11 @@ | |
| public function __construct($adapter, array $instances = null) | |
| { | |
| if (!($adapter instanceof Zend_Cloud_Infrastructure_Adapter)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('You must pass a Zend_Cloud_Infrastructure_Adapter'); | |
| } | |
| if (empty($instances)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('You must pass an array of Instances'); | |
| } | |
| @@ -185,7 +185,7 @@ | |
| public function offsetGet($offset) | |
| { | |
| if (!$this->offsetExists($offset)) { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('Illegal index'); | |
| } | |
| return $this->instances[$offset]; | |
| @@ -202,7 +202,7 @@ | |
| */ | |
| public function offsetSet($offset, $value): void | |
| { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('You are trying to set read-only property'); | |
| } | |
| @@ -216,7 +216,7 @@ | |
| */ | |
| public function offsetUnset($offset): void | |
| { | |
| - require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| + #require_once 'Zend/Cloud/Infrastructure/Exception.php'; | |
| throw new Zend_Cloud_Infrastructure_Exception('You are trying to unset read-only property'); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/OperationNotAvailableException.php | |
| @@ -21,7 +21,7 @@ | |
| /** | |
| * Zend_Exception | |
| */ | |
| -require_once 'Zend/Exception.php'; | |
| +#require_once 'Zend/Exception.php'; | |
| /** | |
| * @category Zend | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/QueueService/Adapter/AbstractAdapter.php | |
| @@ -17,9 +17,9 @@ | |
| * @license http://framework.zend.com/license/new-bsd New BSD License | |
| */ | |
| -require_once 'Zend/Cloud/QueueService/Adapter.php'; | |
| -require_once 'Zend/Cloud/QueueService/Message.php'; | |
| -require_once 'Zend/Cloud/QueueService/MessageSet.php'; | |
| +#require_once 'Zend/Cloud/QueueService/Adapter.php'; | |
| +#require_once 'Zend/Cloud/QueueService/Message.php'; | |
| +#require_once 'Zend/Cloud/QueueService/MessageSet.php'; | |
| /** | |
| * Abstract queue adapter | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/QueueService/Adapter/Sqs.php | |
| @@ -17,10 +17,10 @@ | |
| * @license http://framework.zend.com/license/new-bsd New BSD License | |
| */ | |
| -require_once 'Zend/Service/Amazon/Sqs.php'; | |
| -require_once 'Zend/Cloud/QueueService/Adapter/AbstractAdapter.php'; | |
| -require_once 'Zend/Cloud/QueueService/Exception.php'; | |
| -require_once 'Zend/Cloud/QueueService/Message.php'; | |
| +#require_once 'Zend/Service/Amazon/Sqs.php'; | |
| +#require_once 'Zend/Cloud/QueueService/Adapter/AbstractAdapter.php'; | |
| +#require_once 'Zend/Cloud/QueueService/Exception.php'; | |
| +#require_once 'Zend/Cloud/QueueService/Message.php'; | |
| /** | |
| * SQS adapter for simple queue service. | |
| @@ -172,7 +172,7 @@ | |
| public function storeQueueMetadata($queueId, $metadata, $options = null) | |
| { | |
| // TODO Add support for SetQueueAttributes to client library | |
| - require_once 'Zend/Cloud/OperationNotAvailableException.php'; | |
| + #require_once 'Zend/Cloud/OperationNotAvailableException.php'; | |
| throw new Zend_Cloud_OperationNotAvailableException('Amazon SQS doesn\'t currently support storing metadata'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/QueueService/Adapter/WindowsAzure.php | |
| @@ -17,9 +17,9 @@ | |
| * @license http://framework.zend.com/license/new-bsd New BSD License | |
| */ | |
| -require_once 'Zend/Cloud/QueueService/Adapter/AbstractAdapter.php'; | |
| -require_once 'Zend/Cloud/QueueService/Exception.php'; | |
| -require_once 'Zend/Service/WindowsAzure/Storage/Queue.php'; | |
| +#require_once 'Zend/Cloud/QueueService/Adapter/AbstractAdapter.php'; | |
| +#require_once 'Zend/Cloud/QueueService/Exception.php'; | |
| +#require_once 'Zend/Service/WindowsAzure/Storage/Queue.php'; | |
| /** | |
| * WindowsAzure adapter for simple queue service. | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/QueueService/Adapter/ZendQueue.php | |
| @@ -17,9 +17,9 @@ | |
| * @license http://framework.zend.com/license/new-bsd New BSD License | |
| */ | |
| -require_once 'Zend/Cloud/QueueService/Adapter/AbstractAdapter.php'; | |
| -require_once 'Zend/Cloud/QueueService/Exception.php'; | |
| -require_once 'Zend/Queue.php'; | |
| +#require_once 'Zend/Cloud/QueueService/Adapter/AbstractAdapter.php'; | |
| +#require_once 'Zend/Cloud/QueueService/Exception.php'; | |
| +#require_once 'Zend/Queue.php'; | |
| /** | |
| * WindowsAzure adapter for simple queue service. | |
| @@ -297,7 +297,7 @@ | |
| */ | |
| public function peekMessages($queueId, $num = 1, $options = null) | |
| { | |
| - require_once 'Zend/Cloud/OperationNotAvailableException.php'; | |
| + #require_once 'Zend/Cloud/OperationNotAvailableException.php'; | |
| throw new Zend_Cloud_OperationNotAvailableException('ZendQueue doesn\'t currently support message peeking'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/QueueService/Exception.php | |
| @@ -23,7 +23,7 @@ | |
| /** | |
| * Zend_Cloud_Exception | |
| */ | |
| -require_once 'Zend/Cloud/Exception.php'; | |
| +#require_once 'Zend/Cloud/Exception.php'; | |
| /** | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/QueueService/Factory.php | |
| @@ -19,7 +19,7 @@ | |
| * @license http://framework.zend.com/license/new-bsd New BSD License | |
| */ | |
| -require_once 'Zend/Cloud/AbstractFactory.php'; | |
| +#require_once 'Zend/Cloud/AbstractFactory.php'; | |
| /** | |
| * @category Zend | |
| @@ -56,11 +56,11 @@ | |
| { | |
| $adapter = parent::_getAdapter(self::QUEUE_ADAPTER_KEY, $options); | |
| if (!$adapter) { | |
| - require_once 'Zend/Cloud/QueueService/Exception.php'; | |
| + #require_once 'Zend/Cloud/QueueService/Exception.php'; | |
| throw new Zend_Cloud_QueueService_Exception('Class must be specified using the \'' . | |
| self::QUEUE_ADAPTER_KEY . '\' key'); | |
| } elseif (!$adapter instanceof self::$_adapterInterface) { | |
| - require_once 'Zend/Cloud/QueueService/Exception.php'; | |
| + #require_once 'Zend/Cloud/QueueService/Exception.php'; | |
| throw new Zend_Cloud_QueueService_Exception( | |
| 'Adapter must implement \'' . self::$_adapterInterface . '\'' | |
| ); | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/StorageService/Adapter/FileSystem.php | |
| @@ -17,8 +17,8 @@ | |
| * @license http://framework.zend.com/license/new-bsd New BSD License | |
| */ | |
| -require_once 'Zend/Cloud/StorageService/Adapter.php'; | |
| -require_once 'Zend/Cloud/StorageService/Exception.php'; | |
| +#require_once 'Zend/Cloud/StorageService/Adapter.php'; | |
| +#require_once 'Zend/Cloud/StorageService/Exception.php'; | |
| /** | |
| * FileSystem adapter for unstructured cloud storage. | |
| @@ -228,7 +228,7 @@ | |
| */ | |
| public function storeMetadata($destinationPath, $metadata, $options = []) | |
| { | |
| - require_once 'Zend/Cloud/OperationNotAvailableException.php'; | |
| + #require_once 'Zend/Cloud/OperationNotAvailableException.php'; | |
| throw new Zend_Cloud_OperationNotAvailableException('Storing metadata not implemented'); | |
| } | |
| @@ -241,7 +241,7 @@ | |
| */ | |
| public function deleteMetadata($path) | |
| { | |
| - require_once 'Zend/Cloud/OperationNotAvailableException.php'; | |
| + #require_once 'Zend/Cloud/OperationNotAvailableException.php'; | |
| throw new Zend_Cloud_OperationNotAvailableException('Deleting metadata not implemented'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/StorageService/Adapter/Rackspace.php | |
| @@ -17,10 +17,10 @@ | |
| * @license http://framework.zend.com/license/new-bsd New BSD License | |
| */ | |
| -require_once 'Zend/Cloud/StorageService/Adapter.php'; | |
| -require_once 'Zend/Cloud/StorageService/Exception.php'; | |
| -require_once 'Zend/Service/Rackspace/Files.php'; | |
| -require_once 'Zend/Service/Rackspace/Exception.php'; | |
| +#require_once 'Zend/Cloud/StorageService/Adapter.php'; | |
| +#require_once 'Zend/Cloud/StorageService/Exception.php'; | |
| +#require_once 'Zend/Service/Rackspace/Files.php'; | |
| +#require_once 'Zend/Service/Rackspace/Exception.php'; | |
| /** | |
| * Adapter for Rackspace cloud storage | |
| @@ -183,7 +183,7 @@ | |
| */ | |
| public function renameItem($path, $name, $options = null) | |
| { | |
| - require_once 'Zend/Cloud/OperationNotAvailableException.php'; | |
| + #require_once 'Zend/Cloud/OperationNotAvailableException.php'; | |
| throw new Zend_Cloud_OperationNotAvailableException('Renaming not implemented'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/StorageService/Adapter/S3.php | |
| @@ -17,9 +17,9 @@ | |
| * @license http://framework.zend.com/license/new-bsd New BSD License | |
| */ | |
| -require_once 'Zend/Service/Amazon/S3.php'; | |
| -require_once 'Zend/Cloud/StorageService/Adapter.php'; | |
| -require_once 'Zend/Cloud/StorageService/Exception.php'; | |
| +#require_once 'Zend/Service/Amazon/S3.php'; | |
| +#require_once 'Zend/Cloud/StorageService/Adapter.php'; | |
| +#require_once 'Zend/Cloud/StorageService/Exception.php'; | |
| /** | |
| * S3 adapter for unstructured cloud storage. | |
| @@ -226,7 +226,7 @@ | |
| */ | |
| public function renameItem($path, $name, $options = null) | |
| { | |
| - require_once 'Zend/Cloud/OperationNotAvailableException.php'; | |
| + #require_once 'Zend/Cloud/OperationNotAvailableException.php'; | |
| throw new Zend_Cloud_OperationNotAvailableException('Rename not implemented'); | |
| } | |
| @@ -277,7 +277,7 @@ | |
| */ | |
| public function storeMetadata($destinationPath, $metadata, $options = []) | |
| { | |
| - require_once 'Zend/Cloud/OperationNotAvailableException.php'; | |
| + #require_once 'Zend/Cloud/OperationNotAvailableException.php'; | |
| throw new Zend_Cloud_OperationNotAvailableException('Storing separate metadata is not supported, use storeItem() with \'metadata\' option key'); | |
| } | |
| @@ -290,7 +290,7 @@ | |
| */ | |
| public function deleteMetadata($path) | |
| { | |
| - require_once 'Zend/Cloud/OperationNotAvailableException.php'; | |
| + #require_once 'Zend/Cloud/OperationNotAvailableException.php'; | |
| throw new Zend_Cloud_OperationNotAvailableException('Deleting metadata not supported'); | |
| } | |
| @@ -308,13 +308,13 @@ | |
| } else if (isset($this->_defaultBucketName)) { | |
| $bucket = $this->_defaultBucketName; | |
| } else { | |
| - require_once 'Zend/Cloud/StorageService/Exception.php'; | |
| + #require_once 'Zend/Cloud/StorageService/Exception.php'; | |
| throw new Zend_Cloud_StorageService_Exception('Bucket name must be specified for S3 adapter.'); | |
| } | |
| if (isset($options[self::BUCKET_AS_DOMAIN])) { | |
| // TODO: support bucket domain names | |
| - require_once 'Zend/Cloud/StorageService/Exception.php'; | |
| + #require_once 'Zend/Cloud/StorageService/Exception.php'; | |
| throw new Zend_Cloud_StorageService_Exception('The S3 adapter does not currently support buckets in domain names.'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/StorageService/Adapter/WindowsAzure.php | |
| @@ -17,9 +17,9 @@ | |
| * @license http://framework.zend.com/license/new-bsd New BSD License | |
| */ | |
| -require_once 'Zend/Cloud/StorageService/Adapter.php'; | |
| -require_once 'Zend/Service/WindowsAzure/Storage/Blob.php'; | |
| -require_once 'Zend/Cloud/StorageService/Exception.php'; | |
| +#require_once 'Zend/Cloud/StorageService/Adapter.php'; | |
| +#require_once 'Zend/Service/WindowsAzure/Storage/Blob.php'; | |
| +#require_once 'Zend/Cloud/StorageService/Exception.php'; | |
| /** | |
| * | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/StorageService/Exception.php | |
| @@ -23,7 +23,7 @@ | |
| /** | |
| * Zend_Cloud_Exception | |
| */ | |
| -require_once 'Zend/Cloud/Exception.php'; | |
| +#require_once 'Zend/Cloud/Exception.php'; | |
| /** | |
| --- /dev/null | |
| +++ ../library/Zend/Cloud/StorageService/Factory.php | |
| @@ -19,7 +19,7 @@ | |
| * @license http://framework.zend.com/license/new-bsd New BSD License | |
| */ | |
| -require_once 'Zend/Cloud/AbstractFactory.php'; | |
| +#require_once 'Zend/Cloud/AbstractFactory.php'; | |
| /** | |
| * @category Zend | |
| @@ -56,11 +56,11 @@ | |
| { | |
| $adapter = parent::_getAdapter(self::STORAGE_ADAPTER_KEY, $options); | |
| if (!$adapter) { | |
| - require_once 'Zend/Cloud/StorageService/Exception.php'; | |
| + #require_once 'Zend/Cloud/StorageService/Exception.php'; | |
| throw new Zend_Cloud_StorageService_Exception('Class must be specified using the \'' . | |
| self::STORAGE_ADAPTER_KEY . '\' key'); | |
| } elseif (!$adapter instanceof self::$_adapterInterface) { | |
| - require_once 'Zend/Cloud/StorageService/Exception.php'; | |
| + #require_once 'Zend/Cloud/StorageService/Exception.php'; | |
| throw new Zend_Cloud_StorageService_Exception( | |
| 'Adapter must implement \'' . self::$_adapterInterface . '\'' | |
| ); | |
| --- /dev/null | |
| +++ ../library/Zend/CodeGenerator/Exception.php | |
| @@ -23,7 +23,7 @@ | |
| /** | |
| * @see Zend_Exception | |
| */ | |
| -require_once 'Zend/Exception.php'; | |
| +#require_once 'Zend/Exception.php'; | |
| /** | |
| * @category Zend | |
| --- /dev/null | |
| +++ ../library/Zend/CodeGenerator/Php/Abstract.php | |
| @@ -23,7 +23,7 @@ | |
| /** | |
| * @see Zend_CodeGenerator_Abstract | |
| */ | |
| -require_once 'Zend/CodeGenerator/Abstract.php'; | |
| +#require_once 'Zend/CodeGenerator/Abstract.php'; | |
| /** | |
| * @category Zend | |
| --- /dev/null | |
| +++ ../library/Zend/CodeGenerator/Php/Body.php | |
| @@ -23,7 +23,7 @@ | |
| /** | |
| * @see Zend_CodeGenerator_Abstract | |
| */ | |
| -require_once 'Zend/CodeGenerator/Abstract.php'; | |
| +#require_once 'Zend/CodeGenerator/Abstract.php'; | |
| /** | |
| * @category Zend | |
| --- /dev/null | |
| +++ ../library/Zend/CodeGenerator/Php/Class.php | |
| @@ -23,27 +23,27 @@ | |
| /** | |
| * @see Zend_CodeGenerator_Php_Abstract | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Abstract.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Abstract.php'; | |
| /** | |
| * @see Zend_CodeGenerator_Php_Member_Container | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Member/Container.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Member/Container.php'; | |
| /** | |
| * @see Zend_CodeGenerator_Php_Method | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Method.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Method.php'; | |
| /** | |
| * @see Zend_CodeGenerator_Php_Property | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Property.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Property.php'; | |
| /** | |
| * @see Zend_CodeGenerator_Php_Docblock | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Docblock.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Docblock.php'; | |
| /** | |
| * @category Zend | |
| @@ -162,7 +162,7 @@ | |
| if (is_array($docblock)) { | |
| $docblock = new Zend_CodeGenerator_Php_Docblock($docblock); | |
| } elseif ((!is_null($docblock)) && (!$docblock instanceof Zend_CodeGenerator_Php_Docblock)) { | |
| - require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| + #require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| throw new Zend_CodeGenerator_Php_Exception('setDocblock() is expecting either a string, array or an instance of Zend_CodeGenerator_Php_Docblock'); | |
| } | |
| @@ -312,7 +312,7 @@ | |
| } elseif ($property instanceof Zend_CodeGenerator_Php_Property) { | |
| $propertyName = $property->getName(); | |
| } else { | |
| - require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| + #require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| throw new Zend_CodeGenerator_Php_Exception('setProperty() expects either an array of property options or an instance of Zend_CodeGenerator_Php_Property'); | |
| } | |
| @@ -320,7 +320,7 @@ | |
| return $this->setConstant($property); | |
| } | |
| if (isset($this->_properties[$propertyName])) { | |
| - require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| + #require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| throw new Zend_CodeGenerator_Php_Exception('A property by name ' . $propertyName . ' already exists in this class.'); | |
| } | |
| @@ -342,16 +342,16 @@ | |
| } elseif ($const instanceof Zend_CodeGenerator_Php_Property) { | |
| $constName = $const->getName(); | |
| } else { | |
| - require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| + #require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| throw new Zend_CodeGenerator_Php_Exception('setConstant() expects either an array of property options or an instance of Zend_CodeGenerator_Php_Property'); | |
| } | |
| if (!$const->isConst()) { | |
| - require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| + #require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| throw new Zend_CodeGenerator_Php_Exception('setProperty() expects argument to define a constant'); | |
| } | |
| if (isset($this->_constants[$constName])) { | |
| - require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| + #require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| throw new Zend_CodeGenerator_Php_Exception('A constant by name ' . $constName . ' already exists in this class.'); | |
| } | |
| @@ -461,12 +461,12 @@ | |
| } elseif ($method instanceof Zend_CodeGenerator_Php_Method) { | |
| $methodName = $method->getName(); | |
| } else { | |
| - require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| + #require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| throw new Zend_CodeGenerator_Php_Exception('setMethod() expects either an array of method options or an instance of Zend_CodeGenerator_Php_Method'); | |
| } | |
| if (isset($this->_methods[$methodName])) { | |
| - require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| + #require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| throw new Zend_CodeGenerator_Php_Exception('A method by name ' . $methodName . ' already exists in this class.'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/CodeGenerator/Php/Docblock.php | |
| @@ -23,12 +23,12 @@ | |
| /** | |
| * @see Zend_CodeGenerator_Php_Abstract | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Abstract.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Abstract.php'; | |
| /** | |
| * @see Zend_CodeGenerator_Php_Docblock_Tag | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php'; | |
| /** | |
| * @category Zend | |
| @@ -151,7 +151,7 @@ | |
| if (is_array($tag)) { | |
| $tag = new Zend_CodeGenerator_Php_Docblock_Tag($tag); | |
| } elseif (!$tag instanceof Zend_CodeGenerator_Php_Docblock_Tag) { | |
| - require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| + #require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| throw new Zend_CodeGenerator_Php_Exception( | |
| 'setTag() expects either an array of method options or an ' | |
| . 'instance of Zend_CodeGenerator_Php_Docblock_Tag' | |
| --- /dev/null | |
| +++ ../library/Zend/CodeGenerator/Php/Docblock/Tag/License.php | |
| @@ -23,7 +23,7 @@ | |
| /** | |
| * @see Zend_CodeGenerator_Php_Docblock_Tag | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php'; | |
| /** | |
| * @category Zend | |
| --- /dev/null | |
| +++ ../library/Zend/CodeGenerator/Php/Docblock/Tag/Param.php | |
| @@ -23,7 +23,7 @@ | |
| /** | |
| * @see Zend_CodeGenerator_Php_Docblock_Tag | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php'; | |
| /** | |
| * @category Zend | |
| --- /dev/null | |
| +++ ../library/Zend/CodeGenerator/Php/Docblock/Tag.php | |
| @@ -23,7 +23,7 @@ | |
| /** | |
| * @see Zend_CodeGenerator_Php_Abstract | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Abstract.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Abstract.php'; | |
| /** | |
| * @category Zend | |
| @@ -94,7 +94,7 @@ | |
| public static function getPluginLoader() | |
| { | |
| if (self::$_pluginLoader == null) { | |
| - require_once 'Zend/Loader/PluginLoader.php'; | |
| + #require_once 'Zend/Loader/PluginLoader.php'; | |
| self::setPluginLoader(new Zend_Loader_PluginLoader([ | |
| 'Zend_CodeGenerator_Php_Docblock_Tag' => dirname(__FILE__) . '/Tag/']) | |
| ); | |
| --- /dev/null | |
| +++ ../library/Zend/CodeGenerator/Php/Docblock/Tag/Return.php | |
| @@ -23,7 +23,7 @@ | |
| /** | |
| * @see Zend_CodeGenerator_Php_Docblock_Tag | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Docblock/Tag.php'; | |
| /** | |
| * @category Zend | |
| --- /dev/null | |
| +++ ../library/Zend/CodeGenerator/Php/Exception.php | |
| @@ -23,7 +23,7 @@ | |
| /** | |
| * @see Zend_CodeGenerator_Exception | |
| */ | |
| -require_once 'Zend/CodeGenerator/Exception.php'; | |
| +#require_once 'Zend/CodeGenerator/Exception.php'; | |
| /** | |
| * @category Zend | |
| --- /dev/null | |
| +++ ../library/Zend/CodeGenerator/Php/File.php | |
| @@ -23,12 +23,12 @@ | |
| /** | |
| * @see Zend_CodeGenerator_Php_Abstract | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Abstract.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Abstract.php'; | |
| /** | |
| * @see Zend_CodeGenerator_Php_Class | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Class.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Class.php'; | |
| /** | |
| * @category Zend | |
| @@ -84,7 +84,7 @@ | |
| } | |
| if ($fileName == '') { | |
| - require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| + #require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| throw new Zend_CodeGenerator_Php_Exception('FileName does not exist.'); | |
| } | |
| @@ -111,7 +111,7 @@ | |
| if ($realpath === false) { | |
| if ( ($realpath = Zend_Reflection_File::findRealpathInIncludePath($filePath)) === false) { | |
| - require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| + #require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| throw new Zend_CodeGenerator_Php_Exception('No file for ' . $realpath . ' was found.'); | |
| } | |
| } | |
| @@ -206,7 +206,7 @@ | |
| if (is_array($docblock)) { | |
| $docblock = new Zend_CodeGenerator_Php_Docblock($docblock); | |
| } elseif (!$docblock instanceof Zend_CodeGenerator_Php_Docblock) { | |
| - require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| + #require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| throw new Zend_CodeGenerator_Php_Exception('setDocblock() is expecting either a string, array or an instance of Zend_CodeGenerator_Php_Docblock'); | |
| } | |
| @@ -290,7 +290,7 @@ | |
| } elseif ($class instanceof Zend_CodeGenerator_Php_Class) { | |
| $className = $class->getName(); | |
| } else { | |
| - require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| + #require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| throw new Zend_CodeGenerator_Php_Exception('Expecting either an array or an instance of Zend_CodeGenerator_Php_Class'); | |
| } | |
| @@ -418,7 +418,7 @@ | |
| $requiredFiles = $this->getRequiredFiles(); | |
| if (!empty($requiredFiles)) { | |
| foreach ($requiredFiles as $requiredFile) { | |
| - $output .= 'require_once \'' . $requiredFile . '\';' . self::LINE_FEED; | |
| + $output .= '#require_once \'' . $requiredFile . '\';' . self::LINE_FEED; | |
| } | |
| $output .= self::LINE_FEED; | |
| @@ -458,7 +458,7 @@ | |
| public function write() | |
| { | |
| if ($this->_filename == '' || !is_writable(dirname($this->_filename))) { | |
| - require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| + #require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| throw new Zend_CodeGenerator_Php_Exception('This code generator object is not writable.'); | |
| } | |
| file_put_contents($this->_filename, $this->generate()); | |
| --- /dev/null | |
| +++ ../library/Zend/CodeGenerator/Php/Member/Abstract.php | |
| @@ -23,12 +23,12 @@ | |
| /** | |
| * @see Zend_CodeGenerator_Php_Abstract | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Abstract.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Abstract.php'; | |
| /** | |
| * @see Zend_CodeGenerator_Php_Abstract | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Docblock.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Docblock.php'; | |
| /** | |
| * @category Zend | |
| @@ -92,7 +92,7 @@ | |
| if (is_array($docblock)) { | |
| $docblock = new Zend_CodeGenerator_Php_Docblock($docblock); | |
| } elseif (!$docblock instanceof Zend_CodeGenerator_Php_Docblock) { | |
| - require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| + #require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| throw new Zend_CodeGenerator_Php_Exception('setDocblock() is expecting either a string, array or an instance of Zend_CodeGenerator_Php_Docblock'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/CodeGenerator/Php/Method.php | |
| @@ -23,17 +23,17 @@ | |
| /** | |
| * @see Zend_CodeGenerator_Php_Member_Abstract | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Member/Abstract.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Member/Abstract.php'; | |
| /** | |
| * @see Zend_CodeGenerator_Php_Docblock | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Docblock.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Docblock.php'; | |
| /** | |
| * @see Zend_CodeGenerator_Php_Parameter | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Parameter.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Parameter.php'; | |
| /** | |
| * @category Zend | |
| @@ -141,7 +141,7 @@ | |
| } elseif ($parameter instanceof Zend_CodeGenerator_Php_Parameter) { | |
| $parameterName = $parameter->getName(); | |
| } else { | |
| - require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| + #require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| throw new Zend_CodeGenerator_Php_Exception('setParameter() expects either an array of method options or an instance of Zend_CodeGenerator_Php_Parameter'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/CodeGenerator/Php/Parameter/DefaultValue.php | |
| @@ -44,7 +44,7 @@ | |
| public function __construct($defaultValue) | |
| { | |
| if(!is_string($defaultValue)) { | |
| - require_once "Zend/CodeGenerator/Php/Exception.php"; | |
| + #require_once "Zend/CodeGenerator/Php/Exception.php"; | |
| throw new Zend_CodeGenerator_Php_Exception( | |
| "Can only set a string as default value representation, ". | |
| "but ".gettype($defaultValue)." was given." | |
| --- /dev/null | |
| +++ ../library/Zend/CodeGenerator/Php/Parameter.php | |
| @@ -23,12 +23,12 @@ | |
| /** | |
| * @see Zend_CodeGenerator_Php_Abstract | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Abstract.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Abstract.php'; | |
| /** | |
| * @see Zend_CodeGenerator_Php_ParameterDefaultValue | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Parameter/DefaultValue.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Parameter/DefaultValue.php'; | |
| /** | |
| * @category Zend | |
| --- /dev/null | |
| +++ ../library/Zend/CodeGenerator/Php/Property/DefaultValue.php | |
| @@ -23,7 +23,7 @@ | |
| /** | |
| * @see Zend_CodeGenerator_Php_Abstract | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Abstract.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Abstract.php'; | |
| /** | |
| * @category Zend | |
| @@ -312,7 +312,7 @@ | |
| break; | |
| case self::TYPE_OTHER: | |
| default: | |
| - require_once "Zend/CodeGenerator/Php/Exception.php"; | |
| + #require_once "Zend/CodeGenerator/Php/Exception.php"; | |
| throw new Zend_CodeGenerator_Php_Exception( | |
| "Type '".get_class($value)."' is unknown or cannot be used as property default value." | |
| ); | |
| --- /dev/null | |
| +++ ../library/Zend/CodeGenerator/Php/Property.php | |
| @@ -23,12 +23,12 @@ | |
| /** | |
| * @see Zend_CodeGenerator_Php_Member_Abstract | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Member/Abstract.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Member/Abstract.php'; | |
| /** | |
| * @see Zend_CodeGenerator_Php_Property_DefaultValue | |
| */ | |
| -require_once 'Zend/CodeGenerator/Php/Property/DefaultValue.php'; | |
| +#require_once 'Zend/CodeGenerator/Php/Property/DefaultValue.php'; | |
| /** | |
| * @category Zend | |
| @@ -160,7 +160,7 @@ | |
| if ($this->isConst()) { | |
| if ($defaultValue != null && !$defaultValue->isValidConstantType()) { | |
| - require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| + #require_once 'Zend/CodeGenerator/Php/Exception.php'; | |
| throw new Zend_CodeGenerator_Php_Exception('The property ' . $this->_name . ' is said to be ' | |
| . 'constant but does not have a valid constant value.'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Config/Exception.php | |
| @@ -22,7 +22,7 @@ | |
| /** | |
| * @see Zend_Exception | |
| */ | |
| -require_once 'Zend/Exception.php'; | |
| +#require_once 'Zend/Exception.php'; | |
| /** | |
| * @category Zend | |
| --- /dev/null | |
| +++ ../library/Zend/Config/Ini.php | |
| @@ -23,7 +23,7 @@ | |
| /** | |
| * @see Zend_Config | |
| */ | |
| -require_once 'Zend/Config.php'; | |
| +#require_once 'Zend/Config.php'; | |
| /** | |
| @@ -111,7 +111,7 @@ | |
| /** | |
| * @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'); | |
| } | |
| @@ -157,7 +157,7 @@ | |
| /** | |
| * @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); | |
| @@ -188,7 +188,7 @@ | |
| /** | |
| * @see Zend_Config_Exception | |
| */ | |
| - require_once 'Zend/Config/Exception.php'; | |
| + #require_once 'Zend/Config/Exception.php'; | |
| throw new Zend_Config_Exception($this->_loadFileErrorStr); | |
| } | |
| @@ -229,7 +229,7 @@ | |
| /** | |
| * @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"); | |
| } | |
| } | |
| @@ -264,7 +264,7 @@ | |
| /** | |
| * @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 { | |
| @@ -300,7 +300,7 @@ | |
| /** | |
| * @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); | |
| @@ -308,7 +308,7 @@ | |
| /** | |
| * @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 { | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 @@ | |
| // 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 @@ | |
| $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 @@ | |
| $dataArray = []; | |
| 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 @@ | |
| 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 @@ | |
| protected function _processExtends(array $data, $section, array $config = []) | |
| { | |
| 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 @@ | |
| 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]); | |
| --- /dev/null | |
| +++ ../library/Zend/Config.php | |
| @@ -165,7 +165,7 @@ | |
| $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 @@ | |
| $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'); | |
| } | |
| @@ -429,7 +429,7 @@ | |
| 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]; | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| } | |
| 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 @@ | |
| $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 . '"'); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 "'); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -99,7 +99,7 @@ | |
| $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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 @@ | |
| } 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 @@ | |
| 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 @@ | |
| $dataArray = []; | |
| 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 @@ | |
| 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 @@ | |
| protected function _processExtends(SimpleXMLElement $element, $section, array $config = []) | |
| { | |
| 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 @@ | |
| // 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,7 +252,7 @@ | |
| 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"); | |
| } | |
| @@ -259,7 +259,7 @@ | |
| $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 @@ | |
| 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"); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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 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 __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 @@ | |
| // 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 @@ | |
| 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 @@ | |
| $dataArray = []; | |
| 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 @@ | |
| 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 @@ | |
| protected function _processExtends(array $data, $section, array $config = []) | |
| { | |
| 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 @@ | |
| $config[] = self::_decodeYaml($currentIndent + 1, $lines, $pointer); | |
| } | |
| } 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, $lines[$pointer] | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../library/Zend/Console/Getopt.php | |
| @@ -242,7 +242,7 @@ | |
| public function __construct($rules, $argv = null, $getoptConfig = []) | |
| { | |
| 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 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 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 @@ | |
| /** | |
| * @see Zend_Json | |
| */ | |
| - require_once 'Zend/Json.php'; | |
| + #require_once 'Zend/Json.php'; | |
| return Zend_Json::encode($j); | |
| } | |
| @@ -660,7 +660,7 @@ | |
| $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."); | |
| } | |
| @@ -748,7 +748,7 @@ | |
| $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() | |
| @@ -809,7 +809,7 @@ | |
| $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()); | |
| @@ -821,7 +821,7 @@ | |
| $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()); | |
| @@ -860,7 +860,7 @@ | |
| 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()); | |
| @@ -868,7 +868,7 @@ | |
| 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()); | |
| @@ -948,13 +948,13 @@ | |
| $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."); | |
| } | |
| @@ -962,7 +962,7 @@ | |
| $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."); | |
| } | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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); | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 prepareAutoCompletion($data, $keepLayouts = false) | |
| { | |
| if (!$data instanceof Zend_Dojo_Data) { | |
| - require_once 'Zend/Dojo/Data.php'; | |
| + #require_once 'Zend/Dojo/Data.php'; | |
| $items = []; | |
| foreach ($data as $key => $value) { | |
| $items[] = ['label' => $value, 'name' => $value]; | |
| @@ -69,10 +69,10 @@ | |
| } | |
| 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(); | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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)); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| { | |
| $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 @@ | |
| return call_user_func_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)); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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([ | |
| @@ -469,7 +469,7 @@ | |
| /** | |
| * @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'); | |
| } | |
| } | |
| @@ -844,7 +844,7 @@ | |
| $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); | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 getPluginLoader() | |
| { | |
| if (null === self::$_pluginLoader) { | |
| - require_once 'Zend/Loader/PluginLoader.php'; | |
| + #require_once 'Zend/Loader/PluginLoader.php'; | |
| self::$_pluginLoader = new Zend_Loader_PluginLoader([ | |
| 'Zend_Controller_Action_Helper' => 'Zend/Controller/Action/Helper/', | |
| ]); | |
| @@ -179,7 +179,7 @@ | |
| $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 @@ | |
| { | |
| $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([$helper, 'direct'], $args); | |
| @@ -365,7 +365,7 @@ | |
| 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); | |
| } | |
| @@ -372,7 +372,7 @@ | |
| $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'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Controller/Action/HelperBroker/PriorityStack.php | |
| @@ -119,7 +119,7 @@ | |
| public function offsetGet($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 ' . $priorityOrHelperName . ' does not exist.'); | |
| } | |
| @@ -143,7 +143,7 @@ | |
| $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.'); | |
| } | |
| @@ -179,7 +179,7 @@ | |
| 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.'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -172,7 +172,7 @@ | |
| 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; | |
| } | |
| @@ -185,11 +185,11 @@ | |
| } | |
| $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(['basePath' => $baseDir]); | |
| return $this->view; | |
| @@ -280,7 +280,7 @@ | |
| 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'); | |
| } | |
| @@ -437,7 +437,7 @@ | |
| } | |
| // 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'); | |
| } | |
| @@ -485,7 +485,7 @@ | |
| */ | |
| 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); | |
| --- /dev/null | |
| +++ ../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,7 +144,7 @@ | |
| } | |
| 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'); | |
| } | |
| @@ -151,7 +151,7 @@ | |
| 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 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 @@ | |
| 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(); | |
| } | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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 @@ | |
| 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 @@ | |
| $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 @@ | |
| 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 @@ | |
| $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'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Controller/Exception.php | |
| @@ -21,7 +21,7 @@ | |
| /** Zend_Exception */ | |
| -require_once 'Zend/Exception.php'; | |
| +#require_once 'Zend/Exception.php'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 @@ | |
| try{ | |
| $dir = new DirectoryIterator($path); | |
| } catch(Throwable $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 @@ | |
| { | |
| 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,7 +486,7 @@ | |
| { | |
| 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(); | |
| @@ -493,7 +493,7 @@ | |
| } | |
| 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 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 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 @@ | |
| * 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 @@ | |
| { | |
| 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 @@ | |
| { | |
| 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 @@ | |
| if ($request !== null) { | |
| $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 @@ | |
| if ($response !== null) { | |
| $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); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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(); | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -50,7 +50,7 @@ | |
| 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'); | |
| } | |
| @@ -58,7 +58,7 @@ | |
| 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 @@ | |
| // 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]); | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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 __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 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)) { | |
| @@ -293,7 +293,7 @@ | |
| 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)) { | |
| @@ -1005,7 +1005,7 @@ | |
| 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| { | |
| $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; | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../library/Zend/Controller/Response/Abstract.php | |
| @@ -284,7 +284,7 @@ | |
| 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 @@ | |
| { | |
| $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 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 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 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) . '")'); | |
| } | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| return $this->_frontController; | |
| } | |
| - require_once 'Zend/Controller/Front.php'; | |
| + #require_once 'Zend/Controller/Front.php'; | |
| $this->_frontController = Zend_Controller_Front::getInstance(); | |
| return $this->_frontController; | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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([], $dispatcher, $request); | |
| $this->_routes = ['default' => $compat] + $this->_routes; | |
| @@ -164,7 +164,7 @@ | |
| { | |
| 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 @@ | |
| 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 @@ | |
| { | |
| $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 @@ | |
| 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 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 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 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 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 @@ | |
| } | |
| 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 @@ | |
| 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 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); | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 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 @@ | |
| } 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 { | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -382,7 +382,7 @@ | |
| } 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'); | |
| } | |
| @@ -540,7 +540,7 @@ | |
| } | |
| } | |
| - 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -214,7 +214,7 @@ | |
| public function assemble($data = [], $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.'); | |
| } | |
| @@ -248,7 +248,7 @@ | |
| $return = !empty($mergedData) ? @vsprintf($this->_reverse, $mergedData) : false; | |
| 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?'); | |
| } | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../library/Zend/Crypt/DiffieHellman.php | |
| @@ -154,7 +154,7 @@ | |
| $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 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 @@ | |
| $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 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 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 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 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 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 @@ | |
| $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 @@ | |
| /** | |
| * @see Zend_Crypt_Math | |
| */ | |
| - require_once 'Zend/Crypt/Math.php'; | |
| + #require_once 'Zend/Crypt/Math.php'; | |
| $this->_math = new Zend_Crypt_Math($extension); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Crypt/Exception.php | |
| @@ -22,7 +22,7 @@ | |
| /** | |
| * @see Zend_Exception | |
| */ | |
| -require_once 'Zend/Exception.php'; | |
| +#require_once 'Zend/Exception.php'; | |
| /** | |
| * @category Zend | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| { | |
| // 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 @@ | |
| 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 @@ | |
| } | |
| 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; | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../library/Zend/Crypt/Math/BigInteger.php | |
| @@ -62,7 +62,7 @@ | |
| public function __construct($extension = null) | |
| { | |
| if ($extension !== null && !in_array($extension, ['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 __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([$this->_math, $methodName], $args); | |
| @@ -101,16 +101,16 @@ | |
| } | |
| } | |
| 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'); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -93,7 +93,7 @@ | |
| } | |
| } | |
| 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' | |
| @@ -117,7 +117,7 @@ | |
| 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' | |
| ); | |
| @@ -130,7 +130,7 @@ | |
| } | |
| if ($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' | |
| ); | |
| --- /dev/null | |
| +++ ../library/Zend/Crypt.php | |
| @@ -120,7 +120,7 @@ | |
| /** | |
| * @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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../library/Zend/Crypt/Rsa/Key.php | |
| @@ -76,7 +76,7 @@ | |
| /** | |
| * @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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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; | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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); | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 @@ | |
| $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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| } | |
| if (($this->_options['currency'] === null) && ($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 @@ | |
| // Validate the passed number | |
| if (!(isset($value)) || (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 @@ | |
| if ((Zend_Locale::isLocale($locale, true, false)) && (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 @@ | |
| } | |
| if (empty($currency) === true) { | |
| - require_once 'Zend/Currency/Exception.php'; | |
| + #require_once 'Zend/Currency/Exception.php'; | |
| throw new Zend_Currency_Exception('No currency defined'); | |
| } | |
| @@ -549,17 +549,17 @@ | |
| */ | |
| 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()); | |
| } | |
| @@ -766,7 +766,7 @@ | |
| 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'); | |
| } | |
| @@ -796,7 +796,7 @@ | |
| 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)) { | |
| @@ -808,7 +808,7 @@ | |
| } | |
| 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'); | |
| } | |
| @@ -845,7 +845,7 @@ | |
| switch($name) { | |
| case 'position': | |
| if (($value !== self::STANDARD) && ($value !== self::RIGHT) && ($value !== self::LEFT)) { | |
| - require_once 'Zend/Currency/Exception.php'; | |
| + #require_once 'Zend/Currency/Exception.php'; | |
| throw new Zend_Currency_Exception("Unknown position '" . $value . "'"); | |
| } | |
| @@ -854,7 +854,7 @@ | |
| case 'format': | |
| if ((empty($value) === false) && (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"); | |
| @@ -865,7 +865,7 @@ | |
| case 'display': | |
| if (is_numeric($value) && ($value !== self::NO_SYMBOL) && ($value !== self::USE_SYMBOL) && | |
| ($value !== self::USE_SHORTNAME) && ($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; | |
| @@ -876,7 +876,7 @@ | |
| } | |
| if (($value < -1) || ($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; | |
| @@ -885,7 +885,7 @@ | |
| 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; | |
| --- /dev/null | |
| +++ ../library/Zend/Date/Cities.php | |
| @@ -306,7 +306,7 @@ | |
| return $return; | |
| } | |
| } | |
| - require_once 'Zend/Date/Exception.php'; | |
| + #require_once 'Zend/Date/Exception.php'; | |
| throw new Zend_Date_Exception('unknown city'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Date/DateObject.php | |
| @@ -95,7 +95,7 @@ | |
| } 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); | |
| } | |
| @@ -1053,7 +1053,7 @@ | |
| // 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); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Date/Exception.php | |
| @@ -23,7 +23,7 @@ | |
| /** | |
| * Zend_Exception | |
| */ | |
| -require_once 'Zend/Exception.php'; | |
| +#require_once 'Zend/Exception.php'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 @@ | |
| 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 @@ | |
| 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 @@ | |
| 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 @@ | |
| 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'); | |
| } | |
| } | |
| @@ -955,7 +955,7 @@ | |
| 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'); | |
| } | |
| } | |
| @@ -1212,7 +1212,7 @@ | |
| 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'); | |
| } | |
| @@ -1331,7 +1331,7 @@ | |
| } | |
| 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"); | |
| } | |
| } else { | |
| @@ -1374,7 +1374,7 @@ | |
| $this->mktime(0, 0, 0, 1, 1 + (int)$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); | |
| case self::WEEKDAY_SHORT: | |
| @@ -1397,7 +1397,7 @@ | |
| } | |
| // 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); | |
| case self::DAY_SHORT: | |
| @@ -1406,7 +1406,7 @@ | |
| $this->mktime(0, 0, 0, 1, 1 + (int) $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); | |
| case self::WEEKDAY: | |
| @@ -1429,7 +1429,7 @@ | |
| } | |
| // 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); | |
| case self::WEEKDAY_8601: | |
| @@ -1440,11 +1440,11 @@ | |
| } | |
| // 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); | |
| 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); | |
| case self::WEEKDAY_DIGIT: | |
| @@ -1455,7 +1455,7 @@ | |
| } | |
| // 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); | |
| case self::DAY_OF_YEAR: | |
| @@ -1470,7 +1470,7 @@ | |
| $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); | |
| case self::WEEKDAY_NARROW: | |
| @@ -1492,7 +1492,7 @@ | |
| } | |
| // 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); | |
| case self::WEEKDAY_NAME: | |
| @@ -1514,7 +1514,7 @@ | |
| } | |
| // 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); | |
| // week formats | |
| @@ -1525,7 +1525,7 @@ | |
| 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); | |
| // month formats | |
| @@ -1568,7 +1568,7 @@ | |
| } | |
| // 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); | |
| case self::MONTH: | |
| @@ -1597,7 +1597,7 @@ | |
| $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); | |
| case self::MONTH_NAME_SHORT: | |
| @@ -1639,7 +1639,7 @@ | |
| } | |
| // 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); | |
| case self::MONTH_SHORT: | |
| @@ -1669,11 +1669,11 @@ | |
| $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); | |
| 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); | |
| case self::MONTH_NAME_NARROW: | |
| @@ -1715,12 +1715,12 @@ | |
| } | |
| // 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); | |
| // 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); | |
| case self::YEAR_8601: | |
| @@ -1737,7 +1737,7 @@ | |
| $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); | |
| case self::YEAR: | |
| @@ -1754,7 +1754,7 @@ | |
| $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); | |
| case self::YEAR_SHORT: | |
| @@ -1775,7 +1775,7 @@ | |
| $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); | |
| case self::YEAR_SHORT_8601: | |
| @@ -1796,12 +1796,12 @@ | |
| $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); | |
| // 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); | |
| case self::SWATCH: | |
| @@ -1816,7 +1816,7 @@ | |
| $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); | |
| case self::HOUR_SHORT: | |
| @@ -1826,7 +1826,7 @@ | |
| $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); | |
| case self::HOUR_AM: | |
| @@ -1835,7 +1835,7 @@ | |
| $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); | |
| case self::HOUR: | |
| @@ -1844,7 +1844,7 @@ | |
| $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); | |
| case self::MINUTE: | |
| @@ -1853,7 +1853,7 @@ | |
| $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); | |
| case self::SECOND: | |
| @@ -1862,7 +1862,7 @@ | |
| $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); | |
| case self::MILLISECOND: | |
| @@ -1879,7 +1879,7 @@ | |
| 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); | |
| case self::MINUTE_SHORT: | |
| @@ -1888,7 +1888,7 @@ | |
| $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); | |
| case self::SECOND_SHORT: | |
| @@ -1897,7 +1897,7 @@ | |
| $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); | |
| // timezone formats | |
| @@ -1905,16 +1905,16 @@ | |
| 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); | |
| 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); | |
| 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); | |
| // date strings | |
| @@ -1925,12 +1925,12 @@ | |
| // do we have enough of a date? minimum is Y-MM-dd | |
| if( strpos($date, '-') !== FALSE && strlen($date) <9) { | |
| - 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( strpos($date, '-') === FALSE && strlen($date) <6) { | |
| - require_once 'Zend/Date/Exception.php'; | |
| + #require_once 'Zend/Date/Exception.php'; | |
| throw new Zend_Date_Exception("unsupported ISO8601 format ($date)", 0, null, $date); | |
| } | |
| @@ -1972,7 +1972,7 @@ | |
| preg_match('/[T,\s]{0,1}(\d{2})(\d{2})/', $tmpdate, $timematch); | |
| } | |
| if (empty($datematch) && 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)) { | |
| @@ -2015,7 +2015,7 @@ | |
| . '{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); | |
| } | |
| @@ -2037,7 +2037,7 @@ | |
| 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); | |
| // additional formats | |
| @@ -2044,7 +2044,7 @@ | |
| // 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); | |
| case self::DATES: | |
| @@ -2063,7 +2063,7 @@ | |
| 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); | |
| } | |
| @@ -2083,7 +2083,7 @@ | |
| 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); | |
| } | |
| @@ -2103,7 +2103,7 @@ | |
| 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); | |
| } | |
| @@ -2123,7 +2123,7 @@ | |
| 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); | |
| } | |
| @@ -2145,7 +2145,7 @@ | |
| 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); | |
| } | |
| @@ -2160,7 +2160,7 @@ | |
| 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); | |
| } | |
| @@ -2181,7 +2181,7 @@ | |
| 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); | |
| } | |
| @@ -2197,7 +2197,7 @@ | |
| 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); | |
| } | |
| @@ -2213,7 +2213,7 @@ | |
| 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); | |
| } | |
| @@ -2234,7 +2234,7 @@ | |
| 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); | |
| } | |
| @@ -2252,7 +2252,7 @@ | |
| 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); | |
| } | |
| @@ -2277,7 +2277,7 @@ | |
| 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); | |
| } | |
| @@ -2297,7 +2297,7 @@ | |
| 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); | |
| } | |
| @@ -2316,7 +2316,7 @@ | |
| 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); | |
| } | |
| @@ -2343,7 +2343,7 @@ | |
| 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); | |
| } | |
| @@ -2352,7 +2352,7 @@ | |
| 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); | |
| } | |
| @@ -2370,7 +2370,7 @@ | |
| 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; | |
| @@ -2398,7 +2398,7 @@ | |
| // 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); | |
| } | |
| @@ -2419,7 +2419,7 @@ | |
| 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); | |
| } | |
| @@ -2440,7 +2440,7 @@ | |
| 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); | |
| } | |
| @@ -2460,7 +2460,7 @@ | |
| 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); | |
| } | |
| @@ -2481,7 +2481,7 @@ | |
| 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); | |
| } | |
| @@ -2537,7 +2537,7 @@ | |
| 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); | |
| } | |
| } | |
| @@ -2634,7 +2634,7 @@ | |
| 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'); | |
| } | |
| @@ -2647,7 +2647,7 @@ | |
| (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 { | |
| @@ -2661,7 +2661,7 @@ | |
| $parsed = Zend_Locale_Format::getTime($time, ['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); | |
| } | |
| } | |
| @@ -2796,7 +2796,7 @@ | |
| 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'); | |
| } | |
| @@ -2809,7 +2809,7 @@ | |
| (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 { | |
| @@ -2826,7 +2826,7 @@ | |
| $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); | |
| } | |
| } | |
| @@ -3110,15 +3110,15 @@ | |
| private function _checkLocation($location) | |
| { | |
| if (!isset($location['longitude']) || !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) || ($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) || ($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); | |
| } | |
| @@ -3236,13 +3236,13 @@ | |
| 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); | |
| } | |
| @@ -3368,7 +3368,7 @@ | |
| 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"); | |
| } | |
| @@ -3380,7 +3380,7 @@ | |
| // 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); | |
| } | |
| @@ -3515,7 +3515,7 @@ | |
| 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'); | |
| } | |
| @@ -3533,7 +3533,7 @@ | |
| 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 { | |
| @@ -3560,7 +3560,7 @@ | |
| } | |
| } | |
| 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); | |
| } | |
| } | |
| @@ -3670,7 +3670,7 @@ | |
| 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'); | |
| } | |
| @@ -3689,7 +3689,7 @@ | |
| $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 { | |
| @@ -3820,7 +3820,7 @@ | |
| 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'); | |
| } | |
| @@ -3839,7 +3839,7 @@ | |
| $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 { | |
| @@ -4299,7 +4299,7 @@ | |
| public function setFractionalPrecision($precision) | |
| { | |
| if (!(int)$precision || ($precision < 0) || ($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); | |
| } | |
| @@ -4340,7 +4340,7 @@ | |
| $milli = (int)$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); | |
| } | |
| @@ -4349,7 +4349,7 @@ | |
| } | |
| 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); | |
| } | |
| @@ -4372,7 +4372,7 @@ | |
| [$milli, $time] = explode(" ", microtime()); | |
| $milli = (int)$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); | |
| } | |
| @@ -4385,7 +4385,7 @@ | |
| } | |
| 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 | |
| ); | |
| @@ -4451,7 +4451,7 @@ | |
| [$milli, $time] = explode(" ", microtime()); | |
| $milli = (int)$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); | |
| } | |
| @@ -4458,12 +4458,12 @@ | |
| 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'); | |
| } | |
| @@ -4580,7 +4580,7 @@ | |
| 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); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| 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 @@ | |
| // 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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| 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 @@ | |
| 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 @@ | |
| $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"); | |
| } | |
| } | |
| @@ -611,7 +611,7 @@ | |
| $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"); | |
| } | |
| } | |
| @@ -1123,7 +1123,7 @@ | |
| { | |
| 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' | |
| ); | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| $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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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,7 +639,7 @@ | |
| /** | |
| * @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: | |
| @@ -646,7 +646,7 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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"); | |
| } | |
| @@ -677,7 +677,7 @@ | |
| /** | |
| * @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"); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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'); | |
| } | |
| @@ -342,7 +342,7 @@ | |
| /** | |
| * @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()); | |
| } | |
| @@ -388,7 +388,7 @@ | |
| } | |
| $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); | |
| @@ -480,7 +480,7 @@ | |
| /** | |
| * @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: | |
| @@ -487,7 +487,7 @@ | |
| /** | |
| * @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"); | |
| } | |
| } | |
| @@ -507,7 +507,7 @@ | |
| /** | |
| * @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"); | |
| } | |
| @@ -516,7 +516,7 @@ | |
| /** | |
| * @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"); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| $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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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,7 +514,7 @@ | |
| /** | |
| * @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: | |
| @@ -521,7 +521,7 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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"); | |
| } | |
| @@ -588,7 +588,7 @@ | |
| /** | |
| * @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; | |
| } | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| @@ -118,7 +118,7 @@ | |
| /** | |
| * @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'); | |
| } | |
| @@ -127,7 +127,7 @@ | |
| /** | |
| * @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'); | |
| } | |
| @@ -159,7 +159,7 @@ | |
| /** | |
| * @see Zend_Db_Adapter_Exception | |
| */ | |
| - require_once 'Zend/Db/Adapter/Exception.php'; | |
| + #require_once 'Zend/Db/Adapter/Exception.php'; | |
| $message = $e->getMessage(); | |
| if ($e->getPrevious() !== null && preg_match('~^SQLSTATE\[HY000\] \[\d{1,4}\]\s$~', $message)) { | |
| @@ -207,7 +207,7 @@ | |
| $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); | |
| @@ -269,7 +269,7 @@ | |
| /** | |
| * @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); | |
| } | |
| } | |
| @@ -296,7 +296,7 @@ | |
| /** | |
| * @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]); | |
| } | |
| @@ -305,7 +305,7 @@ | |
| /** | |
| * @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); | |
| } | |
| } | |
| @@ -373,7 +373,7 @@ | |
| /** | |
| * @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) { | |
| @@ -389,7 +389,7 @@ | |
| /** | |
| * @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; | |
| } | |
| --- /dev/null | |
| +++ ../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,7 +168,7 @@ | |
| $count = (int)$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"); | |
| } | |
| @@ -176,7 +176,7 @@ | |
| 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"); | |
| } | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| @@ -254,7 +254,7 @@ | |
| 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"); | |
| } | |
| @@ -266,7 +266,7 @@ | |
| 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"); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Db/Adapter/Pdo/Ibm.php | |
| @@ -21,16 +21,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'; | |
| /** | |
| * @category Zend | |
| @@ -129,7 +129,7 @@ | |
| } | |
| } 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); | |
| @@ -177,7 +177,7 @@ | |
| 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"); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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,7 +319,7 @@ | |
| $count = (int)$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"); | |
| } | |
| @@ -326,7 +326,7 @@ | |
| $offset = (int)$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"); | |
| } | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| @@ -260,7 +260,7 @@ | |
| $count = (int)$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"); | |
| } | |
| @@ -267,7 +267,7 @@ | |
| $offset = (int)$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"); | |
| } | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| @@ -346,7 +346,7 @@ | |
| $count = (int)$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"); | |
| } | |
| @@ -353,7 +353,7 @@ | |
| $offset = (int)$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"); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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"); | |
| } | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| @@ -114,7 +114,7 @@ | |
| // 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"); | |
| } | |
| } | |
| @@ -148,7 +148,7 @@ | |
| 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]); | |
| } | |
| @@ -156,7 +156,7 @@ | |
| 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]); | |
| } | |
| } | |
| @@ -283,7 +283,7 @@ | |
| $count = (int)$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"); | |
| } | |
| @@ -290,7 +290,7 @@ | |
| $offset = (int)$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"); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Db/Adapter/Pdo/Sqlsrv.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'; | |
| /** | |
| @@ -166,12 +166,12 @@ | |
| $sql = "SERIALIZABLE"; | |
| break; | |
| default: | |
| - require_once 'Zend/Db/Adapter/Exception.php'; | |
| + #require_once 'Zend/Db/Adapter/Exception.php'; | |
| throw new Zend_Db_Adapter_Exception("Invalid transaction isolation level mode '$level' specified"); | |
| } | |
| if (!$this->_connection->exec("SET TRANSACTION ISOLATION LEVEL $sql;")) { | |
| - require_once 'Zend/Db/Adapter/Exception.php'; | |
| + #require_once 'Zend/Db/Adapter/Exception.php'; | |
| throw new Zend_Db_Adapter_Exception("Transaction cannot be changed to '$level'"); | |
| } | |
| @@ -319,7 +319,7 @@ | |
| { | |
| $count = (int)$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"); | |
| } | |
| @@ -326,7 +326,7 @@ | |
| $offset = (int)$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"); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| // 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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| $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 @@ | |
| /** | |
| * @see Zend_Loader | |
| */ | |
| - require_once 'Zend/Loader.php'; | |
| + #require_once 'Zend/Loader.php'; | |
| Zend_Loader::loadClass($stmtClass); | |
| } | |
| @@ -527,7 +527,7 @@ | |
| 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 _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 _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 @@ | |
| $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,7 +602,7 @@ | |
| { | |
| $count = (int)$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"); | |
| } | |
| @@ -610,7 +610,7 @@ | |
| 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"); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Db/Exception.php | |
| @@ -22,7 +22,7 @@ | |
| /** | |
| * Zend_Exception | |
| */ | |
| -require_once 'Zend/Exception.php'; | |
| +#require_once 'Zend/Exception.php'; | |
| /** | |
| * @category Zend | |
| --- /dev/null | |
| +++ ../library/Zend/Db.php | |
| @@ -224,7 +224,7 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| * 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 @@ | |
| /** | |
| * @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"); | |
| } | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../library/Zend/Db/Profiler.php | |
| @@ -280,7 +280,7 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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."); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Db/Schema/Manager.php | |
| @@ -323,7 +323,7 @@ | |
| $version = $migration['version']; | |
| $filename = $migration['filename']; | |
| $classname = $migration['classname']; | |
| - require_once($this->_dir.'/'.$path.'/'.$filename); | |
| + #require_once($this->_dir.'/'.$path.'/'.$filename); | |
| if (!class_exists($classname, false)) { | |
| throw new Zend_Db_Schema_Exception("Could not find class '$classname' in file '$filename'"); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| @@ -280,7 +280,7 @@ | |
| /** | |
| * @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"); | |
| } | |
| @@ -309,7 +309,7 @@ | |
| public function union($select = [], $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." | |
| ); | |
| @@ -316,7 +316,7 @@ | |
| } | |
| 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}'"); | |
| } | |
| @@ -702,7 +702,7 @@ | |
| { | |
| $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]; | |
| @@ -795,12 +795,12 @@ | |
| /** | |
| * @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); | |
| } | |
| @@ -842,7 +842,7 @@ | |
| /** | |
| * @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"); | |
| } | |
| @@ -911,7 +911,7 @@ | |
| 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"); | |
| } | |
| @@ -1036,7 +1036,7 @@ | |
| 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); | |
| } | |
| @@ -1364,11 +1364,11 @@ | |
| 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, [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 { | |
| @@ -1378,7 +1378,7 @@ | |
| return call_user_func_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()'"); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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; | |
| } | |
| @@ -305,7 +305,7 @@ | |
| /** | |
| * @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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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( | |
| [ | |
| 'code' => 'HYC00', | |
| @@ -337,7 +337,7 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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( | |
| [ | |
| 'code' => 'HYC00', | |
| @@ -402,7 +402,7 @@ | |
| /** | |
| * @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( | |
| [ | |
| 'code' => 'HYC00', | |
| @@ -419,7 +419,7 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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( | |
| [ | |
| 'code' => 'HYC00', | |
| @@ -567,7 +567,7 @@ | |
| /** | |
| * @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)); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 @@ | |
| 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 @@ | |
| } | |
| return $this->_stmt->bindParam($parameter, $variable, $type, (int) $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 @@ | |
| 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 @@ | |
| 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 @@ | |
| 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 @@ | |
| 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 @@ | |
| 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 @@ | |
| 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); | |
| } | |
| @@ -253,7 +253,7 @@ | |
| try { | |
| return $this->_stmt->fetch($style, $cursor, $offset); | |
| } 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); | |
| } | |
| } | |
| @@ -292,7 +292,7 @@ | |
| 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); | |
| } | |
| } | |
| @@ -309,7 +309,7 @@ | |
| 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); | |
| } | |
| } | |
| @@ -327,7 +327,7 @@ | |
| 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); | |
| } | |
| } | |
| @@ -344,7 +344,7 @@ | |
| 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); | |
| } | |
| } | |
| @@ -361,7 +361,7 @@ | |
| 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); | |
| } | |
| } | |
| @@ -379,7 +379,7 @@ | |
| 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); | |
| } | |
| } | |
| @@ -397,7 +397,7 @@ | |
| 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); | |
| } | |
| } | |
| @@ -415,7 +415,7 @@ | |
| 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); | |
| } | |
| } | |
| @@ -433,7 +433,7 @@ | |
| 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); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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; | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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 @@ | |
| $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 @@ | |
| $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 @@ | |
| $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 @@ | |
| 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 @@ | |
| $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 @@ | |
| $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 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 @@ | |
| // 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()); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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 @@ | |
| 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 @@ | |
| 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 @@ | |
| 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 @@ | |
| 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 @@ | |
| // 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 @@ | |
| $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 @@ | |
| } | |
| 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 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)); | |
| @@ -1113,7 +1113,7 @@ | |
| /** | |
| * @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.'); | |
| } | |
| @@ -1293,12 +1293,12 @@ | |
| $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"); | |
| } | |
| @@ -1322,7 +1322,7 @@ | |
| 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"); | |
| } | |
| @@ -1361,7 +1361,7 @@ | |
| 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(['table' => $this, 'rowClass' => $this->getRowClass(), 'stored' => true]); | |
| @@ -1414,7 +1414,7 @@ | |
| $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); | |
| @@ -1464,7 +1464,7 @@ | |
| $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); | |
| @@ -1527,7 +1527,7 @@ | |
| $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); | |
| @@ -1613,10 +1613,10 @@ | |
| // 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); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 @@ | |
| 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 @@ | |
| { | |
| $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 @@ | |
| { | |
| $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 @@ | |
| { | |
| $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]); | |
| @@ -344,7 +344,7 @@ | |
| $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"); | |
| } | |
| @@ -354,13 +354,13 @@ | |
| $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"); | |
| } | |
| @@ -453,7 +453,7 @@ | |
| * 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'); | |
| } | |
| @@ -511,7 +511,7 @@ | |
| * 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'); | |
| } | |
| @@ -600,7 +600,7 @@ | |
| * 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'); | |
| } | |
| @@ -695,7 +695,7 @@ | |
| 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; | |
| @@ -710,7 +710,7 @@ | |
| 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"); | |
| } | |
| @@ -721,7 +721,7 @@ | |
| $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; | |
| @@ -774,7 +774,7 @@ | |
| $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'); | |
| } | |
| @@ -891,7 +891,7 @@ | |
| 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"); | |
| } | |
| @@ -947,7 +947,7 @@ | |
| 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"); | |
| } | |
| @@ -1015,7 +1015,7 @@ | |
| 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"); | |
| } | |
| @@ -1035,7 +1035,7 @@ | |
| 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"); | |
| } | |
| @@ -1099,10 +1099,10 @@ | |
| $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); | |
| } | |
| } | |
| @@ -1168,7 +1168,7 @@ | |
| 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()'"); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../library/Zend/Db/Table/Rowset/Abstract.php | |
| @@ -112,7 +112,7 @@ | |
| $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'])) { | |
| @@ -315,7 +315,7 @@ | |
| { | |
| $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; | |
| @@ -346,7 +346,7 @@ | |
| { | |
| $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; | |
| @@ -390,7 +390,7 @@ | |
| 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); | |
| } | |
| @@ -421,7 +421,7 @@ | |
| 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"); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| // 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'); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/BuildLayer.php | |
| @@ -100,7 +100,7 @@ | |
| if ($options instanceof Zend_Config) { | |
| $options = $options->toArray(); | |
| } elseif (!is_array($options)) { | |
| - require_once 'Zend/Dojo/Exception.php'; | |
| + #require_once 'Zend/Dojo/Exception.php'; | |
| throw new Zend_Dojo_Exception('Invalid options provided to constructor'); | |
| } | |
| $this->setOptions($options); | |
| @@ -173,7 +173,7 @@ | |
| { | |
| if (null === $this->_dojo) { | |
| if (null === ($view = $this->getView())) { | |
| - require_once 'Zend/Dojo/Exception.php'; | |
| + #require_once 'Zend/Dojo/Exception.php'; | |
| throw new Zend_Dojo_Exception('View object not registered; cannot retrieve dojo helper'); | |
| } | |
| $helper = $view->getHelper('dojo'); | |
| @@ -191,7 +191,7 @@ | |
| public function setLayerName($name) | |
| { | |
| if (!preg_match('/^[a-z][a-z0-9_]*(\.[a-z][a-z0-9_]*)+$/i', $name)) { | |
| - require_once 'Zend/Dojo/Exception.php'; | |
| + #require_once 'Zend/Dojo/Exception.php'; | |
| throw new Zend_Dojo_Exception('Invalid layer name provided; must be of form[a-z][a-z0-9_](\.[a-z][a-z0-9_])+'); | |
| } | |
| $this->_layerName = $name; | |
| @@ -527,7 +527,7 @@ | |
| */ | |
| protected function _filterJsonProfileToJavascript($profile) | |
| { | |
| - require_once 'Zend/Json.php'; | |
| + #require_once 'Zend/Json.php'; | |
| $profile = Zend_Json::encode($profile); | |
| $profile = trim($profile, '"'); | |
| $profile = preg_replace('/' . preg_quote('\\') . '/', '', $profile); | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Data.php | |
| @@ -114,7 +114,7 @@ | |
| $item = $this->_normalizeItem($item, $id); | |
| if ($this->hasItem($item['id'])) { | |
| - require_once 'Zend/Dojo/Exception.php'; | |
| + #require_once 'Zend/Dojo/Exception.php'; | |
| throw new Zend_Dojo_Exception('Overwriting items using addItem() is not allowed'); | |
| } | |
| @@ -132,7 +132,7 @@ | |
| public function addItems($items) | |
| { | |
| if (!is_array($items) && (!is_object($items) || !($items instanceof Traversable))) { | |
| - require_once 'Zend/Dojo/Exception.php'; | |
| + #require_once 'Zend/Dojo/Exception.php'; | |
| throw new Zend_Dojo_Exception('Only arrays and Traversable objects may be added to ' . __CLASS__); | |
| } | |
| @@ -225,7 +225,7 @@ | |
| } elseif (is_numeric($identifier)) { | |
| $this->_identifier = (int) $identifier; | |
| } else { | |
| - require_once 'Zend/Dojo/Exception.php'; | |
| + #require_once 'Zend/Dojo/Exception.php'; | |
| throw new Zend_Dojo_Exception('Invalid identifier; please use a string or integer'); | |
| } | |
| @@ -354,10 +354,10 @@ | |
| public function fromJson($json) | |
| { | |
| if (!is_string($json)) { | |
| - require_once 'Zend/Dojo/Exception.php'; | |
| + #require_once 'Zend/Dojo/Exception.php'; | |
| throw new Zend_Dojo_Exception('fromJson() expects JSON input'); | |
| } | |
| - require_once 'Zend/Json.php'; | |
| + #require_once 'Zend/Json.php'; | |
| $data = Zend_Json::decode($json); | |
| return $this->fromArray($data); | |
| } | |
| @@ -370,7 +370,7 @@ | |
| public function toArray() | |
| { | |
| if (null === ($identifier = $this->getIdentifier())) { | |
| - require_once 'Zend/Dojo/Exception.php'; | |
| + #require_once 'Zend/Dojo/Exception.php'; | |
| throw new Zend_Dojo_Exception('Serialization requires that an identifier be present in the object; first call setIdentifier()'); | |
| } | |
| @@ -400,7 +400,7 @@ | |
| */ | |
| public function toJson() | |
| { | |
| - require_once 'Zend/Json.php'; | |
| + #require_once 'Zend/Json.php'; | |
| return Zend_Json::encode($this->toArray()); | |
| } | |
| @@ -535,12 +535,12 @@ | |
| protected function _normalizeItem($item, $id) | |
| { | |
| if (null === ($identifier = $this->getIdentifier())) { | |
| - require_once 'Zend/Dojo/Exception.php'; | |
| + #require_once 'Zend/Dojo/Exception.php'; | |
| throw new Zend_Dojo_Exception('You must set an identifier prior to adding items'); | |
| } | |
| if (!is_object($item) && !is_array($item)) { | |
| - require_once 'Zend/Dojo/Exception.php'; | |
| + #require_once 'Zend/Dojo/Exception.php'; | |
| throw new Zend_Dojo_Exception('Only arrays and objects may be attached'); | |
| } | |
| @@ -553,7 +553,7 @@ | |
| } | |
| if ((null === $id) && !array_key_exists($identifier, $item)) { | |
| - require_once 'Zend/Dojo/Exception.php'; | |
| + #require_once 'Zend/Dojo/Exception.php'; | |
| throw new Zend_Dojo_Exception('Item must contain a column matching the currently set identifier'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Exception.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Exception */ | |
| -require_once 'Zend/Exception.php'; | |
| +#require_once 'Zend/Exception.php'; | |
| /** | |
| * Exception class for Zend_Dojo | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Decorator/AccordionContainer.php | |
| @@ -19,7 +19,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Decorator_DijitContainer */ | |
| -require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; | |
| +#require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; | |
| /** | |
| * AccordionContainer | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Decorator/AccordionPane.php | |
| @@ -19,7 +19,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Decorator_DijitContainer */ | |
| -require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; | |
| +#require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; | |
| /** | |
| * AccordionPane | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Decorator/BorderContainer.php | |
| @@ -19,7 +19,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Decorator_DijitContainer */ | |
| -require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; | |
| +#require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; | |
| /** | |
| * BorderContainer | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Decorator/ContentPane.php | |
| @@ -19,7 +19,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Decorator_DijitContainer */ | |
| -require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; | |
| +#require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; | |
| /** | |
| * ContentPane | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Decorator/DijitContainer.php | |
| @@ -19,7 +19,7 @@ | |
| */ | |
| /** Zend_Form_Decorator_Abstract */ | |
| -require_once 'Zend/Form/Decorator/Abstract.php'; | |
| +#require_once 'Zend/Form/Decorator/Abstract.php'; | |
| /** | |
| * Zend_Dojo_Form_Decorator_DijitContainer | |
| @@ -73,7 +73,7 @@ | |
| public function getHelper() | |
| { | |
| if (null === $this->_helper) { | |
| - require_once 'Zend/Form/Decorator/Exception.php'; | |
| + #require_once 'Zend/Form/Decorator/Exception.php'; | |
| throw new Zend_Form_Decorator_Exception('No view helper specified fo DijitContainer decorator'); | |
| } | |
| return $this->_helper; | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Decorator/DijitElement.php | |
| @@ -19,7 +19,7 @@ | |
| */ | |
| /** Zend_Form_Decorator_ViewHelper */ | |
| -require_once 'Zend/Form/Decorator/ViewHelper.php'; | |
| +#require_once 'Zend/Form/Decorator/ViewHelper.php'; | |
| /** | |
| * Zend_Dojo_Form_Decorator_DijitElement | |
| @@ -152,7 +152,7 @@ | |
| $element = $this->getElement(); | |
| $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('DijitElement decorator cannot render without a registered view object'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Decorator/DijitForm.php | |
| @@ -19,7 +19,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Decorator_DijitContainer */ | |
| -require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; | |
| +#require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; | |
| /** | |
| * Zend_Dojo_Form_Decorator_DijitForm | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Decorator/SplitContainer.php | |
| @@ -19,7 +19,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Decorator_DijitContainer */ | |
| -require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; | |
| +#require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; | |
| /** | |
| * SplitContainer | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Decorator/StackContainer.php | |
| @@ -19,7 +19,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Decorator_DijitContainer */ | |
| -require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; | |
| +#require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; | |
| /** | |
| * StackContainer | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Decorator/TabContainer.php | |
| @@ -19,7 +19,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Decorator_DijitContainer */ | |
| -require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; | |
| +#require_once 'Zend/Dojo/Form/Decorator/DijitContainer.php'; | |
| /** | |
| * TabContainer | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/DisplayGroup.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Form_DisplayGroup */ | |
| -require_once 'Zend/Form/DisplayGroup.php'; | |
| +#require_once 'Zend/Form/DisplayGroup.php'; | |
| /** | |
| * Dijit-enabled DisplayGroup | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/Button.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_Dijit */ | |
| -require_once 'Zend/Dojo/Form/Element/Dijit.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/Dijit.php'; | |
| /** | |
| * Button dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/CheckBox.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_Dijit */ | |
| -require_once 'Zend/Dojo/Form/Element/Dijit.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/Dijit.php'; | |
| /** | |
| * CheckBox dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/ComboBox.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_DijitMulti */ | |
| -require_once 'Zend/Dojo/Form/Element/DijitMulti.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/DijitMulti.php'; | |
| /** | |
| * ComboBox dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/CurrencyTextBox.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_NumberTextBox */ | |
| -require_once 'Zend/Dojo/Form/Element/NumberTextBox.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/NumberTextBox.php'; | |
| /** | |
| * CurrencyTextBox dijit | |
| @@ -75,7 +75,7 @@ | |
| $symbol = strtoupper((string) $symbol); | |
| $length = strlen($symbol); | |
| if (3 > $length) { | |
| - require_once 'Zend/Form/Element/Exception.php'; | |
| + #require_once 'Zend/Form/Element/Exception.php'; | |
| throw new Zend_Form_Element_Exception('Invalid symbol provided; please provide ISO 4217 alphabetic currency code'); | |
| } | |
| if (3 < $length) { | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/DateTextBox.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_ValidationTextBox */ | |
| -require_once 'Zend/Dojo/Form/Element/ValidationTextBox.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/ValidationTextBox.php'; | |
| /** | |
| * DateTextBox dijit | |
| @@ -165,7 +165,7 @@ | |
| { | |
| $formatLength = strtolower($formatLength); | |
| if (!in_array($formatLength, $this->_allowedFormatTypes)) { | |
| - require_once 'Zend/Form/Element/Exception.php'; | |
| + #require_once 'Zend/Form/Element/Exception.php'; | |
| throw new Zend_Form_Element_Exception(sprintf('Invalid formatLength "%s" specified', $formatLength)); | |
| } | |
| @@ -194,7 +194,7 @@ | |
| { | |
| $selector = strtolower($selector); | |
| if (!in_array($selector, $this->_allowedSelectorTypes)) { | |
| - require_once 'Zend/Form/Element/Exception.php'; | |
| + #require_once 'Zend/Form/Element/Exception.php'; | |
| throw new Zend_Form_Element_Exception(sprintf('Invalid Selector "%s" specified', $selector)); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/Dijit.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Form_Element */ | |
| -require_once 'Zend/Form/Element.php'; | |
| +#require_once 'Zend/Form/Element.php'; | |
| /** | |
| * Base element for dijit elements | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/DijitMulti.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_Dijit */ | |
| -require_once 'Zend/Dojo/Form/Element/Dijit.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/Dijit.php'; | |
| /** | |
| * CheckBox dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/Editor.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_Dijit */ | |
| -require_once 'Zend/Dojo/Form/Element/Dijit.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/Dijit.php'; | |
| /** | |
| * Editor dijit | |
| @@ -392,7 +392,7 @@ | |
| public function setHeight($height) | |
| { | |
| if (!preg_match('/^\d+(em|px|%)?$/i', $height)) { | |
| - require_once 'Zend/Form/Element/Exception.php'; | |
| + #require_once 'Zend/Form/Element/Exception.php'; | |
| throw new Zend_Form_Element_Exception('Invalid height provided; must be integer or CSS measurement'); | |
| } | |
| if (!preg_match('/(em|px|%)$/', $height)) { | |
| @@ -447,7 +447,7 @@ | |
| public function setMinHeight($minHeight) | |
| { | |
| if (!preg_match('/^\d+(em|px|%)?$/i', $minHeight)) { | |
| - require_once 'Zend/Form/Element/Exception.php'; | |
| + #require_once 'Zend/Form/Element/Exception.php'; | |
| throw new Zend_Form_Element_Exception('Invalid minHeight provided; must be integer or CSS measurement'); | |
| } | |
| if (!preg_match('/(em|px|%)$/', $minHeight)) { | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/FilteringSelect.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_ComboBox */ | |
| -require_once 'Zend/Dojo/Form/Element/ComboBox.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/ComboBox.php'; | |
| /** | |
| * FilteringSelect dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/HorizontalSlider.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_Slider */ | |
| -require_once 'Zend/Dojo/Form/Element/Slider.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/Slider.php'; | |
| /** | |
| * HorizontalSlider dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/NumberSpinner.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_ValidationTextBox */ | |
| -require_once 'Zend/Dojo/Form/Element/ValidationTextBox.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/ValidationTextBox.php'; | |
| /** | |
| * NumberSpinner dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/NumberTextBox.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_ValidationTextBox */ | |
| -require_once 'Zend/Dojo/Form/Element/ValidationTextBox.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/ValidationTextBox.php'; | |
| /** | |
| * NumberTextBox dijit | |
| @@ -106,7 +106,7 @@ | |
| { | |
| $type = strtolower($type); | |
| if (!in_array($type, $this->_allowedTypes)) { | |
| - require_once 'Zend/Form/Element/Exception.php'; | |
| + #require_once 'Zend/Form/Element/Exception.php'; | |
| throw new Zend_Form_Element_Exception(sprintf('Invalid numeric type "%s" specified', $type)); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/PasswordTextBox.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_ValidationTextBox */ | |
| -require_once 'Zend/Dojo/Form/Element/ValidationTextBox.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/ValidationTextBox.php'; | |
| /** | |
| * ValidationTextBox dijit tied to password input | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/RadioButton.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_DijitMulti */ | |
| -require_once 'Zend/Dojo/Form/Element/DijitMulti.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/DijitMulti.php'; | |
| /** | |
| * RadioButton dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/SimpleTextarea.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_Dijit */ | |
| -require_once 'Zend/Dojo/Form/Element/Dijit.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/Dijit.php'; | |
| /** | |
| * dijit.form.SimpleTextArea | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/Slider.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_Dijit */ | |
| -require_once 'Zend/Dojo/Form/Element/Dijit.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/Dijit.php'; | |
| /** | |
| * Abstract Slider dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/SubmitButton.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_Button */ | |
| -require_once 'Zend/Dojo/Form/Element/Button.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/Button.php'; | |
| /** | |
| * Submit button dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/Textarea.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_Dijit */ | |
| -require_once 'Zend/Dojo/Form/Element/Dijit.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/Dijit.php'; | |
| /** | |
| * Textarea dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/TextBox.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_Dijit */ | |
| -require_once 'Zend/Dojo/Form/Element/Dijit.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/Dijit.php'; | |
| /** | |
| * TextBox dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/TimeTextBox.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_DateTextBox */ | |
| -require_once 'Zend/Dojo/Form/Element/DateTextBox.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/DateTextBox.php'; | |
| /** | |
| * TimeTextBox dijit | |
| @@ -50,7 +50,7 @@ | |
| protected function _validateIso8601($format) | |
| { | |
| if (!preg_match('/^T\d{2}:\d{2}:\d{2}$/', $format)) { | |
| - require_once 'Zend/Form/Element/Exception.php'; | |
| + #require_once 'Zend/Form/Element/Exception.php'; | |
| throw new Zend_Form_Element_Exception(sprintf('Invalid format "%s" provided; must match T:00:00:00 format', $format)); | |
| } | |
| return true; | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/ValidationTextBox.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_TextBox */ | |
| -require_once 'Zend/Dojo/Form/Element/TextBox.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/TextBox.php'; | |
| /** | |
| * ValidationTextBox dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/Element/VerticalSlider.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Dojo_Form_Element_Slider */ | |
| -require_once 'Zend/Dojo/Form/Element/Slider.php'; | |
| +#require_once 'Zend/Dojo/Form/Element/Slider.php'; | |
| /** | |
| * VerticalSlider dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Form */ | |
| -require_once 'Zend/Form.php'; | |
| +#require_once 'Zend/Form.php'; | |
| /** | |
| * Dijit-enabled Form | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/Form/SubForm.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Form_SubForm */ | |
| -require_once 'Zend/Form/SubForm.php'; | |
| +#require_once 'Zend/Form/SubForm.php'; | |
| /** | |
| * Dijit-enabled SubForm | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Exception.php | |
| @@ -23,7 +23,7 @@ | |
| /** | |
| * @see Zend_Dojo_Exception | |
| */ | |
| -require_once 'Zend/Dojo/Exception.php'; | |
| +#require_once 'Zend/Dojo/Exception.php'; | |
| /** | |
| * @category Zend | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/AccordionContainer.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_DijitContainer */ | |
| -require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; | |
| /** | |
| * Dojo AccordionContainer dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/AccordionPane.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_DijitContainer */ | |
| -require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; | |
| /** | |
| * Dojo AccordionPane dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/BorderContainer.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_DijitContainer */ | |
| -require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; | |
| /** | |
| * Dojo BorderContainer dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/Button.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_Dijit */ | |
| -require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| /** | |
| * Dojo Button dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/CheckBox.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_Dijit */ | |
| -require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| /** | |
| * Dojo CheckBox dijit | |
| @@ -65,7 +65,7 @@ | |
| public function checkBox($id, $value = null, array $params = [], array $attribs = [], array $checkedOptions = null) | |
| { | |
| // Prepare the checkbox options | |
| - require_once 'Zend/View/Helper/FormCheckbox.php'; | |
| + #require_once 'Zend/View/Helper/FormCheckbox.php'; | |
| $checked = false; | |
| if (isset($attribs['checked']) && $attribs['checked']) { | |
| $checked = true; | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/ComboBox.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_Dijit */ | |
| -require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| /** | |
| * Dojo ComboBox dijit | |
| @@ -138,7 +138,7 @@ | |
| if ($this->_useProgrammatic()) { | |
| if (!$this->_useProgrammaticNoScript()) { | |
| - require_once 'Zend/Json.php'; | |
| + #require_once 'Zend/Json.php'; | |
| $this->dojo->addJavascript('var ' . $storeParams['jsId'] . ";\n"); | |
| $js = $storeParams['jsId'] . ' = ' | |
| . 'new ' . $storeParams['dojoType'] . '(' | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/ContentPane.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_DijitContainer */ | |
| -require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; | |
| /** | |
| * Dojo ContentPane dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/CurrencyTextBox.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_Dijit */ | |
| -require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| /** | |
| * Dojo CurrencyTextBox dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/CustomDijit.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_DijitContainer */ | |
| -require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; | |
| /** | |
| * Arbitrary dijit support | |
| @@ -62,7 +62,7 @@ | |
| if (!array_key_exists('dojoType', $params) | |
| && (null === $this->_defaultDojoType) | |
| ) { | |
| - require_once 'Zend/Dojo/View/Exception.php'; | |
| + #require_once 'Zend/Dojo/View/Exception.php'; | |
| throw new Zend_Dojo_View_Exception('No dojoType specified; cannot create dijit'); | |
| } | |
| @@ -100,7 +100,7 @@ | |
| if (!array_key_exists('dojoType', $params) | |
| && (null === $this->_defaultDojoType) | |
| ) { | |
| - require_once 'Zend/Dojo/View/Exception.php'; | |
| + #require_once 'Zend/Dojo/View/Exception.php'; | |
| throw new Zend_Dojo_View_Exception('No dojoType specified; cannot create dijit'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/DateTextBox.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_Dijit */ | |
| -require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| /** | |
| * Dojo DateTextBox dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/Dijit.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_View_Helper_HtmlElement */ | |
| -require_once 'Zend/View/Helper/HtmlElement.php'; | |
| +#require_once 'Zend/View/Helper/HtmlElement.php'; | |
| /** | |
| * Dojo dijit base class | |
| @@ -232,7 +232,7 @@ | |
| // Normalize constraints, if present | |
| foreach ($this->_jsonParams as $param) { | |
| if (array_key_exists($param, $params)) { | |
| - require_once 'Zend/Json.php'; | |
| + #require_once 'Zend/Json.php'; | |
| if (is_array($params[$param])) { | |
| $values = []; | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/DijitContainer.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_Dijit */ | |
| -require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| /** | |
| * Dijit layout container base class | |
| @@ -57,7 +57,7 @@ | |
| public function captureStart($id, array $params = [], array $attribs = []) | |
| { | |
| if (array_key_exists($id, $this->_captureLock)) { | |
| - require_once 'Zend/Dojo/View/Exception.php'; | |
| + #require_once 'Zend/Dojo/View/Exception.php'; | |
| throw new Zend_Dojo_View_Exception(sprintf('Lock already exists for id "%s"', $id)); | |
| } | |
| @@ -80,7 +80,7 @@ | |
| public function captureEnd($id) | |
| { | |
| if (!array_key_exists($id, $this->_captureLock)) { | |
| - require_once 'Zend/Dojo/View/Exception.php'; | |
| + #require_once 'Zend/Dojo/View/Exception.php'; | |
| throw new Zend_Dojo_View_Exception(sprintf('No capture lock exists for id "%s"; nothing to capture', $id)); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/Dojo/Container.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo */ | |
| -require_once 'Zend/Dojo.php'; | |
| +#require_once 'Zend/Dojo.php'; | |
| /** | |
| * Container for Dojo View Helper | |
| @@ -288,7 +288,7 @@ | |
| public function requireModule($modules) | |
| { | |
| if (!is_string($modules) && !is_array($modules)) { | |
| - require_once 'Zend/Dojo/View/Exception.php'; | |
| + #require_once 'Zend/Dojo/View/Exception.php'; | |
| throw new Zend_Dojo_View_Exception('Invalid module name specified; must be a string or an array of strings'); | |
| } | |
| @@ -296,7 +296,7 @@ | |
| foreach ($modules as $mod) { | |
| if (!preg_match('/^[a-z][a-z0-9._-]+$/i', $mod)) { | |
| - require_once 'Zend/Dojo/View/Exception.php'; | |
| + #require_once 'Zend/Dojo/View/Exception.php'; | |
| throw new Zend_Dojo_View_Exception(sprintf('Module name specified, "%s", contains invalid characters', (string) $mod)); | |
| } | |
| @@ -573,7 +573,7 @@ | |
| public function addStylesheetModule($module) | |
| { | |
| if (!preg_match('/^[a-z0-9]+\.[a-z0-9_-]+(\.[a-z0-9_-]+)*$/i', $module)) { | |
| - require_once 'Zend/Dojo/View/Exception.php'; | |
| + #require_once 'Zend/Dojo/View/Exception.php'; | |
| throw new Zend_Dojo_View_Exception('Invalid stylesheet module specified'); | |
| } | |
| if (!in_array($module, $this->_stylesheetModules)) { | |
| @@ -686,7 +686,7 @@ | |
| public function onLoadCaptureStart() | |
| { | |
| if ($this->_captureLock) { | |
| - require_once 'Zend/Dojo/View/Exception.php'; | |
| + #require_once 'Zend/Dojo/View/Exception.php'; | |
| throw new Zend_Dojo_View_Exception('Cannot nest onLoad captures'); | |
| } | |
| @@ -719,7 +719,7 @@ | |
| public function addDijit($id, array $params) | |
| { | |
| if (array_key_exists($id, $this->_dijits)) { | |
| - require_once 'Zend/Dojo/View/Exception.php'; | |
| + #require_once 'Zend/Dojo/View/Exception.php'; | |
| throw new Zend_Dojo_View_Exception(sprintf('Duplicate dijit with id "%s" already registered', $id)); | |
| } | |
| @@ -844,7 +844,7 @@ | |
| */ | |
| public function dijitsToJson() | |
| { | |
| - require_once 'Zend/Json.php'; | |
| + #require_once 'Zend/Json.php'; | |
| return Zend_Json::encode($this->getDijits(), false, ['enableJsonExprFinder' => true]); | |
| } | |
| @@ -924,7 +924,7 @@ | |
| public function javascriptCaptureStart() | |
| { | |
| if ($this->_captureLock) { | |
| - require_once 'Zend/Dojo/View/Exception.php'; | |
| + #require_once 'Zend/Dojo/View/Exception.php'; | |
| throw new Zend_Dojo_View_Exception('Cannot nest captures'); | |
| } | |
| @@ -1049,7 +1049,7 @@ | |
| return ''; | |
| } | |
| - require_once 'Zend/Json.php'; | |
| + #require_once 'Zend/Json.php'; | |
| return '<script type="text/javascript">' . PHP_EOL | |
| . (($this->_isXhtml) ? '//<![CDATA[' : '//<!--') . PHP_EOL | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/Dojo.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Registry */ | |
| -require_once 'Zend/Registry.php'; | |
| +#require_once 'Zend/Registry.php'; | |
| /** | |
| * Zend_Dojo_View_Helper_Dojo: Dojo View Helper | |
| @@ -70,7 +70,7 @@ | |
| { | |
| $registry = Zend_Registry::getInstance(); | |
| if (!isset($registry[__CLASS__])) { | |
| - require_once 'Zend/Dojo/View/Helper/Dojo/Container.php'; | |
| + #require_once 'Zend/Dojo/View/Helper/Dojo/Container.php'; | |
| $container = new Zend_Dojo_View_Helper_Dojo_Container(); | |
| $registry[__CLASS__] = $container; | |
| } | |
| @@ -110,7 +110,7 @@ | |
| public function __call($method, $args) | |
| { | |
| if (!method_exists($this->_container, $method)) { | |
| - require_once 'Zend/Dojo/View/Exception.php'; | |
| + #require_once 'Zend/Dojo/View/Exception.php'; | |
| throw new Zend_Dojo_View_Exception(sprintf('Invalid method "%s" called on dojo view helper', $method)); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/Editor.php | |
| @@ -21,10 +21,10 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_Dijit */ | |
| -require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| /** Zend_Json */ | |
| -require_once 'Zend/Json.php'; | |
| +#require_once 'Zend/Json.php'; | |
| /** | |
| * Dojo Editor dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/FilteringSelect.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_ComboBox */ | |
| -require_once 'Zend/Dojo/View/Helper/ComboBox.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/ComboBox.php'; | |
| /** | |
| * Dojo FilteringSelect dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/Form.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_Dijit */ | |
| -require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| /** | |
| * Dojo Form dijit | |
| @@ -83,7 +83,7 @@ | |
| public function getFormHelper() | |
| { | |
| if (null === $this->_helper) { | |
| - require_once 'Zend/View/Helper/Form.php'; | |
| + #require_once 'Zend/View/Helper/Form.php'; | |
| $this->_helper = new Zend_View_Helper_Form; | |
| $this->_helper->setView($this->view); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/HorizontalSlider.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_Slider */ | |
| -require_once 'Zend/Dojo/View/Helper/Slider.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/Slider.php'; | |
| /** | |
| * Dojo HorizontalSlider dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/NumberSpinner.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_Dijit */ | |
| -require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| /** | |
| * Dojo NumberSpinner dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/NumberTextBox.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_Dijit */ | |
| -require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| /** | |
| * Dojo NumberTextBox dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/PasswordTextBox.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_ValidationTextBox */ | |
| -require_once 'Zend/Dojo/View/Helper/ValidationTextBox.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/ValidationTextBox.php'; | |
| /** | |
| * Dojo ValidationTextBox dijit tied to password input | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/RadioButton.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_Dijit */ | |
| -require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| /** | |
| * Dojo RadioButton dijit | |
| @@ -76,7 +76,7 @@ | |
| if (array_key_exists('id', $attribs)) { | |
| $baseId = $attribs['id']; | |
| } | |
| - require_once 'Zend/Filter/Alnum.php'; | |
| + #require_once 'Zend/Filter/Alnum.php'; | |
| $filter = new Zend_Filter_Alnum(); | |
| foreach (array_keys($options) as $key) { | |
| $optId = $baseId . '-' . $filter->filter($key); | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/SimpleTextarea.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_Dijit */ | |
| -require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| /** | |
| * dijit.form.SimpleTextarea view helper | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/Slider.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_Dijit */ | |
| -require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| /** | |
| * Abstract class for Dojo Slider dijits | |
| @@ -71,7 +71,7 @@ | |
| foreach ($this->_requiredParams as $param) { | |
| if (!array_key_exists($param, $params)) { | |
| - require_once 'Zend/Dojo/View/Exception.php'; | |
| + #require_once 'Zend/Dojo/View/Exception.php'; | |
| throw new Zend_Dojo_View_Exception('prepareSlider() requires minimally the "minimum", "maximum", and "discreteValues" parameters'); | |
| } | |
| } | |
| @@ -127,7 +127,7 @@ | |
| } | |
| break; | |
| default: | |
| - require_once 'Zend/Dojo/View/Exception.php'; | |
| + #require_once 'Zend/Dojo/View/Exception.php'; | |
| throw new Zend_Dojo_View_Exception('Invalid slider type; slider must be horizontal or vertical'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/SplitContainer.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_DijitContainer */ | |
| -require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; | |
| /** | |
| * Dojo SplitContainer dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/StackContainer.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_DijitContainer */ | |
| -require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; | |
| /** | |
| * Dojo StackContainer dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/SubmitButton.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_Button */ | |
| -require_once 'Zend/Dojo/View/Helper/Button.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/Button.php'; | |
| /** | |
| * Dojo Button dijit tied to submit input | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/TabContainer.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_DijitContainer */ | |
| -require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/DijitContainer.php'; | |
| /** | |
| * Dojo TabContainer dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/Textarea.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_Dijit */ | |
| -require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| /** | |
| * Dojo Textarea dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/TextBox.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_Dijit */ | |
| -require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| /** | |
| * Dojo TextBox dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/TimeTextBox.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_Dijit */ | |
| -require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| /** | |
| * Dojo TimeTextBox dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/ValidationTextBox.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_Dijit */ | |
| -require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/Dijit.php'; | |
| /** | |
| * Dojo ValidationTextBox dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dojo/View/Helper/VerticalSlider.php | |
| @@ -21,7 +21,7 @@ | |
| */ | |
| /** Zend_Dojo_View_Helper_Slider */ | |
| -require_once 'Zend/Dojo/View/Helper/Slider.php'; | |
| +#require_once 'Zend/Dojo/View/Helper/Slider.php'; | |
| /** | |
| * Dojo VerticalSlider dijit | |
| --- /dev/null | |
| +++ ../library/Zend/Dom/Exception.php | |
| @@ -20,7 +20,7 @@ | |
| */ | |
| /** Zend_Exception */ | |
| -require_once 'Zend/Exception.php'; | |
| +#require_once 'Zend/Exception.php'; | |
| /** | |
| * Zend_Dom Exceptions | |
| --- /dev/null | |
| +++ ../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 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 @@ | |
| $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,13 +308,13 @@ | |
| 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)); | |
| } | |
| $nodeList = $this->_getNodeList($domDoc, $xpathQuery); | |
| if(!$nodeList){ | |
| - require_once 'Zend/Dom/Exception.php'; | |
| + #require_once 'Zend/Dom/Exception.php'; | |
| throw new Zend_Dom_Exception(sprintf('Error parsing document (type == %s)', $type)); | |
| } | |
| return new Zend_Dom_Query_Result($query, $xpathQuery, $domDoc, $nodeList); | |
| --- /dev/null | |
| +++ ../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 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)) | |
| --- /dev/null | |
| +++ ../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 @@ | |
| } | |
| 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 @@ | |
| } | |
| 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 @@ | |
| // 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 @@ | |
| } | |
| 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__, | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -90,7 +90,7 @@ | |
| 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, ['priority' => $priority]); | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| @@ -83,7 +83,7 @@ | |
| /** | |
| * @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()); | |
| } | |
| @@ -131,7 +131,7 @@ | |
| /** | |
| * @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: $phpErrormsg"); | |
| } | |
| @@ -271,7 +271,7 @@ | |
| 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'); | |
| } | |
| @@ -292,7 +292,7 @@ | |
| /** | |
| * @see Zend_Feed_Exception | |
| */ | |
| - require_once 'Zend/Feed/Exception.php'; | |
| + #require_once 'Zend/Feed/Exception.php'; | |
| throw new Zend_Feed_Exception($errormsg); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @see Zend_Feed_Exception | |
| */ | |
| - require_once 'Zend/Feed/Exception.php'; | |
| + #require_once 'Zend/Feed/Exception.php'; | |
| throw new Zend_Feed_Exception('No root <feed> or <' . $this->_entryElementName | |
| . '> element found, cannot parse feed.'); | |
| } | |
| @@ -379,7 +379,7 @@ | |
| /** | |
| * @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.'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Feed/Builder/Entry.php | |
| @@ -224,7 +224,7 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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'] : ''; | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../library/Zend/Feed/Builder/Header/Itunes.php | |
| @@ -66,7 +66,7 @@ | |
| /** | |
| * @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) { | |
| @@ -73,7 +73,7 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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); | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 = ['monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday']; | |
| @@ -401,7 +401,7 @@ | |
| /** | |
| * @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"); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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"); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Feed/Element.php | |
| @@ -247,7 +247,7 @@ | |
| /** | |
| * @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; | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -98,7 +98,7 @@ | |
| /** | |
| * @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: $phpErrormsg"); | |
| } | |
| @@ -107,7 +107,7 @@ | |
| /** | |
| * @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 { | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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.'); | |
| } | |
| @@ -167,7 +167,7 @@ | |
| /** | |
| * @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 { | |
| @@ -175,7 +175,7 @@ | |
| /** | |
| * @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(); | |
| @@ -188,7 +188,7 @@ | |
| /** | |
| * @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()); | |
| } | |
| @@ -213,7 +213,7 @@ | |
| /** | |
| * @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: ' . $phpErrormsg); | |
| } | |
| @@ -222,7 +222,7 @@ | |
| /** | |
| * @see Zend_Feed_Exception | |
| */ | |
| - require_once 'Zend/Feed/Exception.php'; | |
| + #require_once 'Zend/Feed/Exception.php'; | |
| throw new Zend_Feed_Exception('No root <feed> element found in server response:' | |
| . "\n\n" . $client->responseBody); | |
| } | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../library/Zend/Feed/Exception.php | |
| @@ -24,7 +24,7 @@ | |
| /** | |
| * @see Zend_Exception | |
| */ | |
| -require_once 'Zend/Exception.php'; | |
| +#require_once 'Zend/Exception.php'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @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 @@ | |
| /** | |
| * @see Zend_Feed_Exception | |
| */ | |
| - require_once 'Zend/Feed/Exception.php'; | |
| + #require_once 'Zend/Feed/Exception.php'; | |
| $err = error_get_last(); | |
| $phpErrormsg = $err['message']; | |
| throw new Zend_Feed_Exception("File could not be loaded: $phpErrormsg"); | |
| @@ -291,7 +291,7 @@ | |
| /** | |
| * @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(); | |
| @@ -303,7 +303,7 @@ | |
| /** | |
| * @see Zend_Feed_Exception | |
| */ | |
| - require_once 'Zend/Feed/Exception.php'; | |
| + #require_once 'Zend/Feed/Exception.php'; | |
| $err = error_get_last(); | |
| $phpErrormsg = $err['message']; | |
| throw new Zend_Feed_Exception("Internal error: $phpErrormsg"); | |
| @@ -379,7 +379,7 @@ | |
| { | |
| $obj = 'Zend_Feed_' . ucfirst(strtolower($format)); | |
| if (!class_exists($obj)) { | |
| - require_once 'Zend/Loader.php'; | |
| + #require_once 'Zend/Loader.php'; | |
| Zend_Loader::loadClass($obj); | |
| } | |
| @@ -386,7 +386,7 @@ | |
| /** | |
| * @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)); | |
| } | |
| @@ -401,7 +401,7 @@ | |
| { | |
| $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); | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 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 @@ | |
| || (!$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 @@ | |
| { | |
| $count = (int)$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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| { | |
| $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 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); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 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 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| } 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'); | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 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 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 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'); | |
| @@ -248,7 +248,7 @@ | |
| $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 "' | |
| @@ -272,7 +272,7 @@ | |
| $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'); | |
| } | |
| @@ -307,7 +307,7 @@ | |
| 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'); | |
| } | |
| @@ -316,7 +316,7 @@ | |
| 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'); | |
| } | |
| @@ -348,7 +348,7 @@ | |
| 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'); | |
| } | |
| @@ -412,7 +412,7 @@ | |
| $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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 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 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 @@ | |
| { | |
| $seconds = (int)$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 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 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 @@ | |
| { | |
| 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 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 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 @@ | |
| 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 @@ | |
| 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 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 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 @@ | |
| $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'); | |
| } | |
| @@ -704,7 +704,7 @@ | |
| protected function _getRequestParameters($hubUrl, $mode) | |
| { | |
| if (!in_array($mode, ['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"'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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):' | |
| --- /dev/null | |
| +++ ../library/Zend/Feed/Reader/EntryAbstract.php | |
| @@ -213,7 +213,7 @@ | |
| return call_user_func_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' | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 @@ | |
| 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):' | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -277,7 +277,7 @@ | |
| return call_user_func_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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @see Zend_Http_Client | |
| */ | |
| - require_once 'Zend/Http/Client.php'; | |
| + #require_once 'Zend/Http/Client.php'; | |
| self::$_httpClient = new Zend_Http_Client(); | |
| } | |
| @@ -259,7 +259,7 @@ | |
| $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()); | |
| } | |
| @@ -276,7 +276,7 @@ | |
| } | |
| } | |
| 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); | |
| @@ -289,13 +289,13 @@ | |
| $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); | |
| @@ -303,7 +303,7 @@ | |
| $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()); | |
| } | |
| @@ -310,7 +310,7 @@ | |
| $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'); | |
| } | |
| @@ -353,7 +353,7 @@ | |
| 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() | |
| ); | |
| @@ -367,7 +367,7 @@ | |
| $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); | |
| } | |
| @@ -382,7 +382,7 @@ | |
| } 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.'); | |
| } | |
| @@ -403,7 +403,7 @@ | |
| /** | |
| * @see Zend_Feed_Exception | |
| */ | |
| - require_once 'Zend/Feed/Exception.php'; | |
| + #require_once 'Zend/Feed/Exception.php'; | |
| $err = error_get_last(); | |
| $phpErrormsg = isset($err["message"]) ? $err["message"] : ''; | |
| throw new Zend_Feed_Exception("File could not be loaded: $phpErrormsg"); | |
| @@ -422,7 +422,7 @@ | |
| /** | |
| * @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()); | |
| } | |
| @@ -446,7 +446,7 @@ | |
| $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; | |
| @@ -475,7 +475,7 @@ | |
| 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() | |
| ); | |
| @@ -491,11 +491,11 @@ | |
| $phpErrormsg = '(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: $phpErrormsg"); | |
| } | |
| } 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'); | |
| } | |
| @@ -598,7 +598,7 @@ | |
| 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([ | |
| 'Zend_Feed_Reader_Extension_' => 'Zend/Feed/Reader/Extension/', | |
| ]); | |
| @@ -668,7 +668,7 @@ | |
| 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.'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| /** | |
| * @see Zend_Feed_Exception | |
| */ | |
| - require_once 'Zend/Feed/Exception.php'; | |
| + #require_once 'Zend/Feed/Exception.php'; | |
| throw new Zend_Feed_Exception('No root <channel> element found, cannot parse channel.'); | |
| } | |
| @@ -518,7 +518,7 @@ | |
| /** | |
| * @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.'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 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 @@ | |
| } 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 @@ | |
| || 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 @@ | |
| || !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']; | |
| --- /dev/null | |
| +++ ../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 @@ | |
| || 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 @@ | |
| || !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,13 +115,13 @@ | |
| */ | |
| } 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; | |
| @@ -128,7 +128,7 @@ | |
| } | |
| 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 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 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 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 @@ | |
| } 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 @@ | |
| } 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 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 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 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 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 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 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'], ['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 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 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 @@ | |
| || !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 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 @@ | |
| } 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../library/Zend/Feed/Writer/Extension/ITunes/Entry.php | |
| @@ -72,12 +72,12 @@ | |
| 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 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 @@ | |
| && !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 setItunesExplicit($value) | |
| { | |
| if (!in_array($value, ['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 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 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 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 @@ | |
| 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 | |
| ); | |
| --- /dev/null | |
| +++ ../library/Zend/Feed/Writer/Extension/ITunes/Feed.php | |
| @@ -72,12 +72,12 @@ | |
| 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 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,7 +133,7 @@ | |
| 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'); | |
| } | |
| @@ -140,7 +140,7 @@ | |
| $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'); | |
| } | |
| @@ -147,7 +147,7 @@ | |
| $this->_data['categories'][$key] = []; | |
| 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 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), ['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 @@ | |
| && !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 setItunesExplicit($value) | |
| { | |
| if (!in_array($value, ['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 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 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,7 +283,7 @@ | |
| 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"'); | |
| } | |
| @@ -290,7 +290,7 @@ | |
| 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 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 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 @@ | |
| 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 | |
| ); | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| @@ -103,13 +103,13 @@ | |
| $author = []; | |
| 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']; | |
| @@ -116,7 +116,7 @@ | |
| } | |
| 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']; | |
| @@ -123,13 +123,13 @@ | |
| } | |
| } 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; | |
| @@ -136,7 +136,7 @@ | |
| } | |
| 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; | |
| @@ -165,7 +165,7 @@ | |
| 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; | |
| @@ -186,7 +186,7 @@ | |
| } 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; | |
| @@ -207,7 +207,7 @@ | |
| } 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; | |
| @@ -228,7 +228,7 @@ | |
| } 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; | |
| @@ -242,7 +242,7 @@ | |
| 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; | |
| @@ -258,13 +258,13 @@ | |
| 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 = ['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']; | |
| @@ -271,7 +271,7 @@ | |
| } | |
| 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']; | |
| @@ -278,13 +278,13 @@ | |
| } | |
| } 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 = ['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; | |
| @@ -291,7 +291,7 @@ | |
| } | |
| 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; | |
| @@ -310,7 +310,7 @@ | |
| 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; | |
| @@ -365,7 +365,7 @@ | |
| { | |
| 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'); | |
| } | |
| @@ -383,7 +383,7 @@ | |
| { | |
| 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'); | |
| } | |
| @@ -398,7 +398,7 @@ | |
| 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; | |
| @@ -412,7 +412,7 @@ | |
| 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; | |
| @@ -426,11 +426,11 @@ | |
| 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), ['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; | |
| @@ -444,7 +444,7 @@ | |
| 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; | |
| @@ -458,7 +458,7 @@ | |
| 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; | |
| @@ -472,7 +472,7 @@ | |
| 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'); | |
| } | |
| @@ -487,7 +487,7 @@ | |
| 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'); | |
| } | |
| @@ -517,7 +517,7 @@ | |
| 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'); | |
| @@ -527,7 +527,7 @@ | |
| || !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'); | |
| } | |
| @@ -859,7 +859,7 @@ | |
| } 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 @@ | |
| 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.'); | |
| } | |
| @@ -269,7 +269,7 @@ | |
| $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".'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Feed/Writer.php | |
| @@ -100,7 +100,7 @@ | |
| 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([ | |
| 'Zend_Feed_Writer_Extension_' => 'Zend/Feed/Writer/Extension/', | |
| ]); | |
| @@ -187,7 +187,7 @@ | |
| && !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.'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -95,7 +95,7 @@ | |
| 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); | |
| @@ -145,7 +145,7 @@ | |
| 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); | |
| @@ -273,7 +273,7 @@ | |
| { | |
| 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 ' | |
| @@ -295,7 +295,7 @@ | |
| !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'); | |
| @@ -353,7 +353,7 @@ | |
| { | |
| $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 ' | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -90,7 +90,7 @@ | |
| { | |
| 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.'; | |
| @@ -120,7 +120,7 @@ | |
| { | |
| 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' | |
| @@ -222,7 +222,7 @@ | |
| 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; | |
| @@ -232,7 +232,7 @@ | |
| return; | |
| } | |
| 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; | |
| @@ -242,7 +242,7 @@ | |
| return; | |
| } | |
| 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) { | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -80,7 +80,7 @@ | |
| 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); | |
| @@ -129,7 +129,7 @@ | |
| 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); | |
| @@ -207,7 +207,7 @@ | |
| { | |
| $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 ' | |
| @@ -283,7 +283,7 @@ | |
| { | |
| 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 ' | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -147,7 +147,7 @@ | |
| 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); | |
| @@ -176,7 +176,7 @@ | |
| 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); | |
| @@ -254,7 +254,7 @@ | |
| { | |
| $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); | |
| @@ -334,7 +334,7 @@ | |
| } | |
| 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) { | |
| @@ -346,7 +346,7 @@ | |
| } | |
| 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); | |
| @@ -373,7 +373,7 @@ | |
| $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); | |
| @@ -391,7 +391,7 @@ | |
| } | |
| 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); | |
| @@ -409,7 +409,7 @@ | |
| } | |
| 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); | |
| --- /dev/null | |
| +++ ../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 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; | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../library/Zend/File/Transfer/Adapter/Abstract.php | |
| @@ -171,7 +171,7 @@ | |
| */ | |
| 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 @@ | |
| $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 @@ | |
| '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 @@ | |
| } | |
| 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 @@ | |
| } | |
| 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 @@ | |
| 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 @@ | |
| } | |
| } | |
| } 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 @@ | |
| 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 @@ | |
| $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 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 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 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 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,7 +1032,7 @@ | |
| $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' | |
| ); | |
| @@ -1039,7 +1039,7 @@ | |
| } | |
| 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 @@ | |
| 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 @@ | |
| } 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 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 @@ | |
| } 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 @@ | |
| $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 @@ | |
| 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 @@ | |
| $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 @@ | |
| return []; | |
| } | |
| - 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)); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| public function __construct($options = []) | |
| { | |
| 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 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 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 static function getProgress($id = null) | |
| { | |
| if (!function_exists('apc_fetch') && !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 @@ | |
| 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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 @@ | |
| return call_user_func_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!"); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 @@ | |
| } | |
| 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 @@ | |
| } elseif ($locale instanceof Zend_Locale) { | |
| $locale = [$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 @@ | |
| 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) { | |
| --- /dev/null | |
| +++ ../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 @@ | |
| } | |
| 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 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 @@ | |
| 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 @@ | |
| } | |
| if (is_int($compressed)) { | |
| - require_once 'Zend/Filter/Exception.php'; | |
| + #require_once 'Zend/Filter/Exception.php'; | |
| throw new Zend_Filter_Exception('Error during compression'); | |
| } | |
| @@ -159,7 +159,7 @@ | |
| 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 . "'"); | |
| } | |
| @@ -170,7 +170,7 @@ | |
| } | |
| if (is_int($compressed)) { | |
| - require_once 'Zend/Filter/Exception.php'; | |
| + #require_once 'Zend/Filter/Exception.php'; | |
| throw new Zend_Filter_Exception('Error during decompression'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 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 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 @@ | |
| 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 @@ | |
| } | |
| if (!$compressed) { | |
| - require_once 'Zend/Filter/Exception.php'; | |
| + #require_once 'Zend/Filter/Exception.php'; | |
| throw new Zend_Filter_Exception('Error during compression'); | |
| } | |
| @@ -190,7 +190,7 @@ | |
| 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 . "'"); | |
| } | |
| @@ -210,7 +210,7 @@ | |
| } | |
| if (!$compressed) { | |
| - require_once 'Zend/Filter/Exception.php'; | |
| + #require_once 'Zend/Filter/Exception.php'; | |
| throw new Zend_Filter_Exception('Error during compression'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 @@ | |
| { | |
| $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 @@ | |
| { | |
| $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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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 @@ | |
| $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 @@ | |
| 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 @@ | |
| { | |
| $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}'"); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 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 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 @@ | |
| { | |
| $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 @@ | |
| $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 @@ | |
| if (file_exists($content)) { | |
| $archive = str_replace(['/', '\\'], 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 @@ | |
| } | |
| 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 @@ | |
| $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"); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 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 @@ | |
| { | |
| $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 @@ | |
| $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 @@ | |
| $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 @@ | |
| if (file_exists($content)) { | |
| $archive = str_replace(['/', '\\'], 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 @@ | |
| $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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 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 @@ | |
| $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 @@ | |
| 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 @@ | |
| } 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 @@ | |
| $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 @@ | |
| if (file_exists($content)) { | |
| $archive = str_replace(['/', '\\'], 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,18 +224,18 @@ | |
| } | |
| 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)); | |
| } | |
| $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)); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../library/Zend/Filter/Encrypt/Mcrypt.php | |
| @@ -22,10 +22,10 @@ | |
| /** | |
| * @see Zend_Filter_Encrypt_Interface | |
| */ | |
| -require_once 'Zend/Filter/Encrypt/Interface.php'; | |
| +#require_once 'Zend/Filter/Encrypt/Interface.php'; | |
| /** @see Zend_Crypt_Math */ | |
| -require_once 'Zend/Crypt/Math.php'; | |
| +#require_once 'Zend/Crypt/Math.php'; | |
| /** | |
| * Encryption adapter for mcrypt | |
| @@ -74,7 +74,7 @@ | |
| 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'); | |
| } | |
| @@ -83,7 +83,7 @@ | |
| } elseif (is_string($options)) { | |
| $options = ['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'); | |
| } | |
| @@ -118,7 +118,7 @@ | |
| } | |
| 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'); | |
| } | |
| @@ -125,18 +125,18 @@ | |
| $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'); | |
| } | |
| @@ -180,7 +180,7 @@ | |
| } | |
| $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'); | |
| } | |
| @@ -228,7 +228,7 @@ | |
| { | |
| // 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); | |
| } | |
| @@ -260,7 +260,7 @@ | |
| // 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); | |
| } | |
| @@ -293,7 +293,7 @@ | |
| $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'); | |
| } | |
| @@ -329,13 +329,13 @@ | |
| $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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| public function __construct($options = []) | |
| { | |
| 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 @@ | |
| 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'); | |
| } | |
| @@ -142,7 +142,7 @@ | |
| 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"); | |
| } | |
| @@ -154,7 +154,7 @@ | |
| 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"); | |
| } | |
| @@ -359,7 +359,7 @@ | |
| $encryptedkeys = []; | |
| 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'); | |
| } | |
| @@ -381,7 +381,7 @@ | |
| // 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); | |
| } | |
| @@ -394,7 +394,7 @@ | |
| } | |
| 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'); | |
| } | |
| @@ -428,12 +428,12 @@ | |
| $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'); | |
| } | |
| @@ -472,13 +472,13 @@ | |
| } | |
| 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); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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 @@ | |
| { | |
| $part = substr($method, 0, 3); | |
| if ((($part != 'get') && ($part != 'set')) || !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}'"); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Filter/Exception.php | |
| @@ -24,7 +24,7 @@ | |
| /** | |
| * @see Zend_Exception | |
| */ | |
| -require_once 'Zend/Exception.php'; | |
| +#require_once 'Zend/Exception.php'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 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 @@ | |
| } | |
| if (file_exists($this->_filename) && !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 @@ | |
| $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}'"); | |
| } | |
| --- /dev/null | |
| +++ ../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 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 @@ | |
| } | |
| if (file_exists($this->_filename) && !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 @@ | |
| $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}'"); | |
| } | |
| --- /dev/null | |
| +++ ../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 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 @@ | |
| $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'"); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| } elseif (is_string($options)) { | |
| $options = ['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 @@ | |
| if (is_string($options)) { | |
| $options = ['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 @@ | |
| } | |
| 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 @@ | |
| 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)); | |
| } | |
| --- /dev/null | |
| +++ ../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 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 @@ | |
| $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'"); | |
| } | |
| --- /dev/null | |
| +++ ../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,7 +200,7 @@ | |
| $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(); | |
| @@ -207,7 +207,7 @@ | |
| $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'); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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 @@ | |
| $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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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 @@ | |
| $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( | |
| [$prefixSegment => $pathSegment] | |
| ); | |
| @@ -464,11 +464,11 @@ | |
| { | |
| $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 @@ | |
| $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 @@ | |
| $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 @@ | |
| } 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 @@ | |
| } | |
| 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) { | |
| @@ -1196,7 +1196,7 @@ | |
| $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"); | |
| } | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 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']); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| } | |
| 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 filterStatic($value, $classBaseName, array $args = [], $namespaces = []) | |
| { | |
| - require_once 'Zend/Loader.php'; | |
| + #require_once 'Zend/Loader.php'; | |
| $namespaces = array_merge((array) $namespaces, self::$_defaultNamespaces, ['Zend_Filter']); | |
| foreach ($namespaces as $namespace) { | |
| $className = $namespace . '_' . ucfirst($classBaseName); | |
| @@ -233,7 +233,7 @@ | |
| 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'"); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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 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.'); | |
| } | |
| if (!$this->_isValidMatchPattern()) { | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| { | |
| 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"); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| { | |
| 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"); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 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; | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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.'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| && (!$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 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'); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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; | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -184,7 +184,7 @@ | |
| } | |
| 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); | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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()); | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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(['tag' => $tag]); | |
| $image = $decorator->render($image); | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -280,7 +280,7 @@ | |
| $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)); | |
| } | |
| @@ -287,7 +287,7 @@ | |
| 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); | |
| @@ -306,7 +306,7 @@ | |
| } | |
| } | |
| - 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)); | |
| } | |
| @@ -452,7 +452,7 @@ | |
| } | |
| 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(['tag' => $tag, | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Form/DisplayGroup.php | |
| @@ -338,7 +338,7 @@ | |
| { | |
| $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'); | |
| } | |
| @@ -494,7 +494,7 @@ | |
| { | |
| 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); | |
| @@ -722,7 +722,7 @@ | |
| 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)) { | |
| @@ -734,7 +734,7 @@ | |
| $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'); | |
| } | |
| @@ -782,7 +782,7 @@ | |
| } | |
| } | |
| } else { | |
| - require_once 'Zend/Form/Exception.php'; | |
| + #require_once 'Zend/Form/Exception.php'; | |
| throw new Zend_Form_Exception('Invalid decorator passed to addDecorators()'); | |
| } | |
| } | |
| @@ -902,7 +902,7 @@ | |
| 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); | |
| } | |
| @@ -956,7 +956,7 @@ | |
| } 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; | |
| @@ -974,7 +974,7 @@ | |
| } | |
| if (null === $this->_translator) { | |
| - require_once 'Zend/Form.php'; | |
| + #require_once 'Zend/Form.php'; | |
| return Zend_Form::getDefaultTranslator(); | |
| } | |
| @@ -1036,11 +1036,11 @@ | |
| 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)); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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( | |
| ['Zend_Captcha' => 'Zend/Captcha/'] | |
| ); | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 @@ | |
| } | |
| if (!array_key_exists($type, $this->_loaders)) { | |
| - require_once 'Zend/Loader/PluginLoader.php'; | |
| + #require_once 'Zend/Loader/PluginLoader.php'; | |
| $loader = new Zend_Loader_PluginLoader([ | |
| 'Zend_File_Transfer_Adapter' => 'Zend/File/Transfer/Adapter/', | |
| ]); | |
| @@ -184,7 +184,7 @@ | |
| $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 @@ | |
| $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 @@ | |
| } | |
| 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'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Form/Element/Hash.php | |
| @@ -20,10 +20,10 @@ | |
| */ | |
| /** Zend_Form_Element_Xhtml */ | |
| -require_once 'Zend/Form/Element/Xhtml.php'; | |
| +#require_once 'Zend/Form/Element/Xhtml.php'; | |
| /** @see Zend_Crypt_Math */ | |
| -require_once 'Zend/Crypt/Math.php'; | |
| +#require_once 'Zend/Crypt/Math.php'; | |
| /** | |
| * CSRF form protection | |
| @@ -108,7 +108,7 @@ | |
| 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; | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -270,7 +270,7 @@ | |
| } | |
| 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'); | |
| } | |
| @@ -424,7 +424,7 @@ | |
| } 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; | |
| @@ -507,7 +507,7 @@ | |
| { | |
| $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'); | |
| } | |
| @@ -871,7 +871,7 @@ | |
| { | |
| $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)); | |
| } | |
| @@ -976,7 +976,7 @@ | |
| 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)); | |
| } | |
| @@ -1019,7 +1019,7 @@ | |
| public function __unset($key) | |
| { | |
| if ('_' == $key[0]) { | |
| - require_once 'Zend/Form/Exception.php'; | |
| + #require_once 'Zend/Form/Exception.php'; | |
| throw new Zend_Form_Exception(sprintf('Cannot unset value for protected/private property "%s"', $key)); | |
| } | |
| @@ -1053,11 +1053,11 @@ | |
| 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)); | |
| } | |
| @@ -1081,7 +1081,7 @@ | |
| $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)); | |
| } | |
| } | |
| @@ -1110,7 +1110,7 @@ | |
| $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( | |
| ['Zend_' . $prefixSegment . '_' => 'Zend/' . $pathSegment . '/'] | |
| ); | |
| @@ -1117,7 +1117,7 @@ | |
| } | |
| 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)); | |
| } | |
| } | |
| @@ -1160,7 +1160,7 @@ | |
| } | |
| 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)); | |
| } | |
| } | |
| @@ -1236,7 +1236,7 @@ | |
| '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'); | |
| } | |
| @@ -1288,7 +1288,7 @@ | |
| } | |
| } | |
| } else { | |
| - require_once 'Zend/Form/Exception.php'; | |
| + #require_once 'Zend/Form/Exception.php'; | |
| throw new Zend_Form_Exception('Invalid validator passed to addValidators()'); | |
| } | |
| } | |
| @@ -1710,7 +1710,7 @@ | |
| ]; | |
| $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'); | |
| } | |
| @@ -1755,7 +1755,7 @@ | |
| } | |
| } | |
| } else { | |
| - require_once 'Zend/Form/Exception.php'; | |
| + #require_once 'Zend/Form/Exception.php'; | |
| throw new Zend_Form_Exception('Invalid filter passed to addFilters()'); | |
| } | |
| } | |
| @@ -1887,7 +1887,7 @@ | |
| 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); | |
| } | |
| @@ -1935,7 +1935,7 @@ | |
| 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)) { | |
| @@ -1947,7 +1947,7 @@ | |
| $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'); | |
| } | |
| @@ -1995,7 +1995,7 @@ | |
| } | |
| } | |
| } else { | |
| - require_once 'Zend/Form/Exception.php'; | |
| + #require_once 'Zend/Form/Exception.php'; | |
| throw new Zend_Form_Exception('Invalid decorator passed to addDecorators()'); | |
| } | |
| } | |
| @@ -2152,7 +2152,7 @@ | |
| $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)); | |
| } | |
| @@ -2201,7 +2201,7 @@ | |
| $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)); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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 @@ | |
| $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( | |
| ['Zend_' . $prefixSegment . '_' => 'Zend/' . $pathSegment . '/'] | |
| ); | |
| @@ -515,7 +515,7 @@ | |
| } | |
| 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 @@ | |
| { | |
| $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 @@ | |
| { | |
| $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'); | |
| } | |
| @@ -1036,7 +1036,7 @@ | |
| { | |
| 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' | |
| ); | |
| @@ -1063,7 +1063,7 @@ | |
| $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' | |
| ); | |
| @@ -1093,12 +1093,12 @@ | |
| 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'); | |
| } | |
| @@ -1840,7 +1840,7 @@ | |
| } | |
| } | |
| 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'); | |
| } | |
| @@ -1868,7 +1868,7 @@ | |
| } | |
| if (!class_exists($class)) { | |
| - require_once 'Zend/Loader.php'; | |
| + #require_once 'Zend/Loader.php'; | |
| Zend_Loader::loadClass($class); | |
| } | |
| $this->_displayGroups[$name] = new $class( | |
| @@ -1899,7 +1899,7 @@ | |
| 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'); | |
| } | |
| } | |
| @@ -2268,7 +2268,7 @@ | |
| 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(); | |
| @@ -2383,7 +2383,7 @@ | |
| */ | |
| public function processAjax(array $data) | |
| { | |
| - require_once 'Zend/Json.php'; | |
| + #require_once 'Zend/Json.php'; | |
| if ($this->isValidPartial($data)) { | |
| return Zend_Json::encode(true); | |
| } | |
| @@ -2690,7 +2690,7 @@ | |
| 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); | |
| } | |
| @@ -2740,7 +2740,7 @@ | |
| 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)) { | |
| @@ -2752,7 +2752,7 @@ | |
| $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'); | |
| } | |
| @@ -2801,7 +2801,7 @@ | |
| } | |
| } | |
| } else { | |
| - require_once 'Zend/Form/Exception.php'; | |
| + #require_once 'Zend/Form/Exception.php'; | |
| throw new Zend_Form_Exception('Invalid decorator passed to addDecorators()'); | |
| } | |
| } | |
| @@ -3037,7 +3037,7 @@ | |
| } 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'); | |
| } | |
| @@ -3060,7 +3060,7 @@ | |
| } 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'); | |
| } | |
| } | |
| @@ -3101,7 +3101,7 @@ | |
| 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) { | |
| @@ -3186,7 +3186,7 @@ | |
| return; | |
| } | |
| - require_once 'Zend/Form/Exception.php'; | |
| + #require_once 'Zend/Form/Exception.php'; | |
| if (is_object($value)) { | |
| $type = get_class($value); | |
| } else { | |
| @@ -3257,11 +3257,11 @@ | |
| 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)); | |
| } | |
| @@ -3287,7 +3287,7 @@ | |
| } 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)); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Form/SubForm.php | |
| @@ -19,7 +19,7 @@ | |
| */ | |
| /** Zend_Form */ | |
| -require_once 'Zend/Form.php'; | |
| +#require_once 'Zend/Form.php'; | |
| /** | |
| * Zend_Form_SubForm | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../library/Zend/Gdata/Analytics/Goal.php | |
| @@ -23,7 +23,7 @@ | |
| /** | |
| * @see Zend_Gdata_Extension | |
| */ | |
| -require_once 'Zend/Gdata/Extension.php'; | |
| +#require_once 'Zend/Gdata/Extension.php'; | |
| /** | |
| * @category Zend | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -307,17 +307,17 @@ | |
| if (!$doc) { | |
| $err = error_get_last(); | |
| $phpErrormsg = isset($err) ? $err['message'] : ''; | |
| - require_once 'Zend/Gdata/App/Exception.php'; | |
| + #require_once 'Zend/Gdata/App/Exception.php'; | |
| throw new Zend_Gdata_App_Exception("DOMDocument cannot parse XML: $phpErrormsg"); | |
| } | |
| $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'); | |
| } | |
| } | |
| @@ -483,7 +483,7 @@ | |
| } 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'); | |
| } | |
| @@ -509,7 +509,7 @@ | |
| } 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'); | |
| } | |
| @@ -525,7 +525,7 @@ | |
| $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 { | |
| --- /dev/null | |
| +++ ../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 @@ | |
| } 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 @@ | |
| } 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 @@ | |
| $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 { | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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) | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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: | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -284,7 +284,7 @@ | |
| { | |
| $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.'); | |
| } | |
| @@ -305,7 +305,7 @@ | |
| { | |
| $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.'); | |
| } | |
| --- /dev/null | |
| +++ ../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 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 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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.'); | |
| } | |
| --- /dev/null | |
| +++ ../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,7 +76,7 @@ | |
| $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.'); | |
| } | |
| @@ -83,7 +83,7 @@ | |
| 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.'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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 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 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 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 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 @@ | |
| // 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 @@ | |
| // 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 @@ | |
| $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 @@ | |
| 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 @@ | |
| $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 @@ | |
| $minorProtocolVersion = null) | |
| { | |
| if (!class_exists($className, false)) { | |
| - require_once 'Zend/Loader.php'; | |
| + #require_once 'Zend/Loader.php'; | |
| @Zend_Loader::loadClass($className); | |
| } | |
| @@ -829,7 +829,7 @@ | |
| if (!$doc) { | |
| $err = error_get_last(); | |
| $phpErrormsg = $err['message']; | |
| - require_once 'Zend/Gdata/App/Exception.php'; | |
| + #require_once 'Zend/Gdata/App/Exception.php'; | |
| throw new Zend_Gdata_App_Exception( | |
| "DOMDocument cannot parse XML: $phpErrormsg"); | |
| } | |
| @@ -859,7 +859,7 @@ | |
| if ($feed === false) { | |
| $err = error_get_last(); | |
| $phpErrormsg = $err['message']; | |
| - require_once 'Zend/Gdata/App/Exception.php'; | |
| + #require_once 'Zend/Gdata/App/Exception.php'; | |
| throw new Zend_Gdata_App_Exception( | |
| "File could not be loaded: $phpErrormsg"); | |
| } | |
| @@ -976,7 +976,7 @@ | |
| $extraHeaders = []) | |
| { | |
| if (!class_exists($className, false)) { | |
| - require_once 'Zend/Loader.php'; | |
| + #require_once 'Zend/Loader.php'; | |
| @Zend_Loader::loadClass($className); | |
| } | |
| @@ -1017,7 +1017,7 @@ | |
| } | |
| if (!class_exists($className, false)) { | |
| - require_once 'Zend/Loader.php'; | |
| + #require_once 'Zend/Loader.php'; | |
| @Zend_Loader::loadClass($className); | |
| } | |
| @@ -1056,7 +1056,7 @@ | |
| // 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; | |
| @@ -1082,12 +1082,12 @@ | |
| } | |
| 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}"); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Gdata/App/Util.php | |
| @@ -53,7 +53,7 @@ | |
| } 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 @@ | |
| // Sanity check: Make sure that the collection isn't empty | |
| if (count($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 @@ | |
| // 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."); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 @@ | |
| } | |
| 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 @@ | |
| $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 @@ | |
| $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 @@ | |
| $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; | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 @@ | |
| } 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 @@ | |
| 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 @@ | |
| } 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.'); | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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; | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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; | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 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 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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 @@ | |
| $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 @@ | |
| (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 @@ | |
| 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 @@ | |
| // 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.')); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 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' | |
| ); | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 @@ | |
| 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.'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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; | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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) | |
| --- /dev/null | |
| +++ ../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) | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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) | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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; | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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, | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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 @@ | |
| $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 @@ | |
| $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 @@ | |
| $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 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 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 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 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 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 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 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 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; | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| // 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 @@ | |
| // 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 @@ | |
| } 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 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 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 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 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 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 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 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 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 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 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 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 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 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'); | |
| } | |
| @@ -864,7 +864,7 @@ | |
| // 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; | |
| @@ -879,7 +879,7 @@ | |
| $args = array_merge([$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"); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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.'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| // 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."); | |
| } | |
| @@ -162,7 +162,7 @@ | |
| $err = error_get_last(); | |
| $phpErrormsg = isset($err) ? $err['message'] : ''; | |
| if (!$doc) { | |
| - require_once 'Zend/Gdata/App/Exception.php'; | |
| + #require_once 'Zend/Gdata/App/Exception.php'; | |
| // $php_errormsg is automatically generated by PHP if | |
| // an error occurs while calling loadXML(), above. | |
| throw new Zend_Gdata_App_Exception("DOMDocument cannot parse XML: $phpErrormsg"); | |
| @@ -172,7 +172,7 @@ | |
| // 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.'); | |
| } | |
| @@ -185,7 +185,7 @@ | |
| } | |
| 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| { | |
| // 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 @@ | |
| $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 @@ | |
| // 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 @@ | |
| $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' | |
| ); | |
| --- /dev/null | |
| +++ ../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 @@ | |
| { | |
| // 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 @@ | |
| $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 @@ | |
| // 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 @@ | |
| $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'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Gdata/HttpClient.php | |
| @@ -23,10 +23,10 @@ | |
| /** | |
| * Zend_Http_Client | |
| */ | |
| -require_once 'Zend/Http/Client.php'; | |
| +#require_once 'Zend/Http/Client.php'; | |
| /** @see Zend_Crypt_Math */ | |
| -require_once 'Zend/Crypt/Math.php'; | |
| +#require_once 'Zend/Crypt/Math.php'; | |
| /** | |
| * Gdata Http Client object. | |
| @@ -101,7 +101,7 @@ | |
| $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.'); | |
| } | |
| @@ -127,7 +127,7 @@ | |
| */ | |
| 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.'); | |
| @@ -221,7 +221,7 @@ | |
| $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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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; | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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.'); | |
| } | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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.'); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| } 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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.'); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 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 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 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 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 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 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) { | |
| @@ -397,7 +397,7 @@ | |
| } | |
| 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'); | |
| } | |
| @@ -423,7 +423,7 @@ | |
| $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'); | |
| } | |
| @@ -450,7 +450,7 @@ | |
| $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'); | |
| } | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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.'); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 @@ | |
| 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 @@ | |
| $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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| } 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 @@ | |
| } 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'); | |
| --- /dev/null | |
| +++ ../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 @@ | |
| if (method_exists($this, $method)) { | |
| return call_user_func([&$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 @@ | |
| if (method_exists($this, $method)) { | |
| return call_user_func([&$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'); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| * | |
| --- /dev/null | |
| +++ ../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,7 +368,7 @@ | |
| 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.'); | |
| } | |
| @@ -375,7 +375,7 @@ | |
| 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.'); | |
| } | |
| @@ -382,7 +382,7 @@ | |
| 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.'); | |
| } | |
| @@ -389,7 +389,7 @@ | |
| 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.'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -228,7 +228,7 @@ | |
| 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.'); | |
| } | |
| @@ -235,7 +235,7 @@ | |
| 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.'); | |
| } | |
| @@ -254,7 +254,7 @@ | |
| 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.'); | |
| } | |
| @@ -267,7 +267,7 @@ | |
| 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(); | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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 @@ | |
| $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.'); | |
| } | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| * | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -268,7 +268,7 @@ | |
| 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.'); | |
| } | |
| @@ -275,7 +275,7 @@ | |
| 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.'); | |
| } | |
| @@ -282,7 +282,7 @@ | |
| 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.'); | |
| } | |
| @@ -289,7 +289,7 @@ | |
| 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.'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| * | |
| --- /dev/null | |
| +++ ../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. | |
| --- /dev/null | |
| +++ ../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'; | |
| /** | |
| * | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 = [ | |
| @@ -135,7 +135,7 @@ | |
| $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) | |
| ); | |
| @@ -248,7 +248,7 @@ | |
| 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); | |
| } | |
| @@ -281,12 +281,12 @@ | |
| { | |
| // 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"); | |
| } | |
| @@ -323,7 +323,7 @@ | |
| } | |
| 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."); | |
| } | |
| @@ -365,12 +365,12 @@ | |
| 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"); | |
| } | |
| @@ -433,7 +433,7 @@ | |
| 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)); | |
| } | |
| } | |
| @@ -452,7 +452,7 @@ | |
| $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)); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| // 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 @@ | |
| 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 @@ | |
| // 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 @@ | |
| 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 @@ | |
| // 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 @@ | |
| // 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 @@ | |
| } | |
| 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.' | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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 @@ | |
| } 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,7 +206,7 @@ | |
| 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'); | |
| } | |
| } | |
| @@ -213,7 +213,7 @@ | |
| 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,7 +231,7 @@ | |
| 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); | |
| } | |
| @@ -244,7 +244,7 @@ | |
| // Set the stream timeout | |
| if (! stream_set_timeout($this->socket, (int) $this->config['request_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'); | |
| } | |
| @@ -267,7 +267,7 @@ | |
| { | |
| // 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'); | |
| } | |
| @@ -274,7 +274,7 @@ | |
| $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'); | |
| } | |
| @@ -299,13 +299,13 @@ | |
| // 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'); | |
| } | |
| } | |
| @@ -371,7 +371,7 @@ | |
| $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'); | |
| } | |
| @@ -410,7 +410,7 @@ | |
| } while ($chunksize > 0); | |
| } else { | |
| $this->close(); | |
| - require_once 'Zend/Http/Client/Adapter/Exception.php'; | |
| + #require_once 'Zend/Http/Client/Adapter/Exception.php'; | |
| $encoding = $headers['transfer-encoding']; | |
| if (is_array($encoding)) { | |
| $encoding = json_encode($encoding); | |
| @@ -516,7 +516,7 @@ | |
| $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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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) | |
| ); | |
| @@ -133,7 +133,7 @@ | |
| { | |
| 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'); | |
| } | |
| } | |
| @@ -228,7 +228,7 @@ | |
| 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| @@ -310,7 +310,7 @@ | |
| 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.'); | |
| } | |
| @@ -358,7 +358,7 @@ | |
| } 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)); | |
| } | |
| @@ -388,7 +388,7 @@ | |
| 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."); | |
| } | |
| @@ -447,7 +447,7 @@ | |
| // 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"); | |
| } | |
| @@ -611,7 +611,7 @@ | |
| // 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'"); | |
| } | |
| @@ -647,7 +647,7 @@ | |
| $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'); | |
| } | |
| @@ -711,7 +711,7 @@ | |
| 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})"); | |
| } | |
| @@ -751,7 +751,7 @@ | |
| 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"); | |
| } | |
| @@ -923,7 +923,7 @@ | |
| 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); | |
| } | |
| @@ -932,7 +932,7 @@ | |
| 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'); | |
| } | |
| @@ -995,7 +995,7 @@ | |
| 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}"); | |
| } | |
| @@ -1013,7 +1013,7 @@ | |
| { | |
| 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'); | |
| } | |
| @@ -1056,7 +1056,7 @@ | |
| // 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'); | |
| } | |
| @@ -1070,7 +1070,7 @@ | |
| $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'); | |
| } | |
| } | |
| @@ -1081,7 +1081,7 @@ | |
| $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'); | |
| } | |
| @@ -1341,7 +1341,7 @@ | |
| } | |
| /** @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; | |
| @@ -1503,7 +1503,7 @@ | |
| // 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"); | |
| } | |
| @@ -1518,7 +1518,7 @@ | |
| 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'"); | |
| } | |
| @@ -1593,7 +1593,7 @@ | |
| } | |
| 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| 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 @@ | |
| // 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'); | |
| } | |
| @@ -335,7 +335,7 @@ | |
| * | |
| * @see Zend_Date | |
| */ | |
| - require_once 'Zend/Date.php'; | |
| + #require_once 'Zend/Date.php'; | |
| $expireDate = new Zend_Date($v); | |
| $expires = $expireDate->getTimestamp(); | |
| @@ -378,12 +378,12 @@ | |
| 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"); | |
| } | |
| @@ -411,12 +411,12 @@ | |
| 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"); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| $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 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 @@ | |
| { | |
| 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 @@ | |
| } | |
| 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 @@ | |
| 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; | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Http/Exception.php | |
| @@ -23,7 +23,7 @@ | |
| /** | |
| * @see Zend_Exception | |
| */ | |
| -require_once 'Zend/Exception.php'; | |
| +#require_once 'Zend/Exception.php'; | |
| /** | |
| * @category Zend | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../library/Zend/Http/Header/HeaderValue.php | |
| @@ -120,7 +120,7 @@ | |
| 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'); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 @@ | |
| { | |
| // 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"); | |
| } | |
| @@ -168,7 +168,7 @@ | |
| $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"); | |
| } | |
| @@ -184,7 +184,7 @@ | |
| // 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"); | |
| } | |
| @@ -560,7 +560,7 @@ | |
| } | |
| // 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'); | |
| } | |
| @@ -603,7 +603,7 @@ | |
| 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"); | |
| } | |
| @@ -631,7 +631,7 @@ | |
| 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' | |
| ); | |
| @@ -651,7 +651,7 @@ | |
| 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' | |
| ); | |
| --- /dev/null | |
| +++ ../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. | |
| @@ -784,7 +784,7 @@ | |
| $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'); | |
| } | |
| @@ -793,12 +793,12 @@ | |
| 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'); | |
| } | |
| } | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../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 | |
| --- /dev/null | |
| +++ ../library/Zend/Http/UserAgent/Exception.php | |
| @@ -22,7 +22,7 @@ | |
| /** | |
| * Zend_Exception | |
| */ | |
| -require_once 'Zend/Exception.php'; | |
| +#require_once 'Zend/Exception.php'; | |
| /** | |
| * @category Zend | |
| --- /dev/null | |
| +++ ../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 @@ | |
| { | |
| $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__ | |
| --- /dev/null | |
| +++ ../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 @@ | |
| { | |
| 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 @@ | |
| 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'); | |
| } | |
| --- /dev/null | |
| +++ ../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 @@ | |
| // | |
| 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 @@ | |
| 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'); | |
| } | |
| --- /dev/null | |
| +++ ../library/Zend/Http/UserAgent/Features/Exception.php | |
| @@ -22,7 +22,7 @@ | |
| /** | |
| * @see Zend_Browser_Exception | |
| */ | |
| -require_once 'Zend/Http/User |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment