diff options
| author | robocoder <anthon.pang@gmail.com> | 2010-04-24 10:02:35 +0400 |
|---|---|---|
| committer | robocoder <anthon.pang@gmail.com> | 2010-04-24 10:02:35 +0400 |
| commit | 63a4254ca8f6bea0189e82c8890bdcbcbeeb3fba (patch) | |
| tree | 3758571c220b5026710c41d4254af4bd40d45724 | |
| parent | 20a13ff27eb085592d61dc1d50490a8e838183ee (diff) | |
fixes #1312
- index.php, piwik.php - no longer set include path
- libs/Zend - comment out require_once per http://www.zendframework.com/manual/e
n/performance.classloading.html
- libs/Zend - comment out some redundant Zend_Loader::loadClass() calls
- libs/HTML - use absolute include paths
- libs/open-flash-chart/php-ofc-library - use absolute include paths
git-svn-id: http://dev.piwik.org/svn/trunk@2118 59fd770c-687e-43c8-a1e3-f5a4ff64c105
384 files changed, 1619 insertions, 1637 deletions
@@ -31,15 +31,6 @@ if(!defined('PIWIK_INCLUDE_PATH')) define('PIWIK_INCLUDE_PATH', PIWIK_DOCUMENT_ROOT); } -if(!defined('PIWIK_INCLUDE_SEARCH_PATH')) -{ - define('PIWIK_INCLUDE_SEARCH_PATH', PIWIK_INCLUDE_PATH . '/core' - . PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/libs' - . PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/plugins'); - @ini_set('include_path', PIWIK_INCLUDE_SEARCH_PATH); - @set_include_path(PIWIK_INCLUDE_SEARCH_PATH); -} - if(!defined('PIWIK_SESSION_NAME')) { define('PIWIK_SESSION_NAME', 'PIWIK_SESSID'); diff --git a/libs/HTML/QuickForm.php b/libs/HTML/QuickForm.php index df3fbdf079..de0318292c 100644 --- a/libs/HTML/QuickForm.php +++ b/libs/HTML/QuickForm.php @@ -26,11 +26,11 @@ /** * PEAR and PEAR_Error classes, for error handling */ -require_once 'PEAR.php'; +require_once dirname(__FILE__) . '/../PEAR.php'; /** * Base class for all HTML classes */ -require_once 'HTML/Common.php'; +require_once dirname(__FILE__) . '/Common.php'; /** * Element types known to HTML_QuickForm @@ -378,7 +378,7 @@ class HTML_QuickForm extends HTML_Common */ function registerRule($ruleName, $type, $data1, $data2 = null) { - include_once('HTML/QuickForm/RuleRegistry.php'); + include_once(dirname(__FILE__) . '/QuickForm/RuleRegistry.php'); $registry =& HTML_QuickForm_RuleRegistry::singleton(); $registry->registerRule($ruleName, $type, $data1, $data2); } // end func registerRule @@ -593,7 +593,7 @@ class HTML_QuickForm extends HTML_Common } $className = $GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES'][$type][1]; $includeFile = $GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES'][$type][0]; - include_once($includeFile); + include_once(dirname(__FILE__) . '/../' . $includeFile); $elementObject = new $className(); for ($i = 0; $i < 5; $i++) { if (!isset($args[$i])) { @@ -1376,7 +1376,7 @@ class HTML_QuickForm extends HTML_Common return false; } // automatically register the rule if requested - include_once 'HTML/QuickForm/RuleRegistry.php'; + include_once dirname(__FILE__) . '/QuickForm/RuleRegistry.php'; $ruleName = false; if (is_object($name) && is_a($name, 'html_quickform_rule')) { $ruleName = !empty($name->name)? $name->name: strtolower(get_class($name)); @@ -1514,7 +1514,7 @@ class HTML_QuickForm extends HTML_Common return false; } - include_once('HTML/QuickForm/RuleRegistry.php'); + include_once(dirname(__FILE__) . '/QuickForm/RuleRegistry.php'); $registry = HTML_QuickForm_RuleRegistry::singleton(); foreach ($this->_rules as $target => $rules) { @@ -1703,7 +1703,7 @@ class HTML_QuickForm extends HTML_Common function &defaultRenderer() { if (!isset($GLOBALS['_HTML_QuickForm_default_renderer'])) { - include_once('HTML/QuickForm/Renderer/Default.php'); + include_once(dirname(__FILE__) . '/QuickForm/Renderer/Default.php'); $GLOBALS['_HTML_QuickForm_default_renderer'] = new HTML_QuickForm_Renderer_Default(); } return $GLOBALS['_HTML_QuickForm_default_renderer']; @@ -1748,7 +1748,7 @@ class HTML_QuickForm extends HTML_Common return ''; } - include_once('HTML/QuickForm/RuleRegistry.php'); + include_once(dirname(__FILE__) . '/QuickForm/RuleRegistry.php'); $registry =& HTML_QuickForm_RuleRegistry::singleton(); $test = array(); $js_escape = array( @@ -1860,7 +1860,7 @@ class HTML_QuickForm extends HTML_Common */ function toArray($collectHidden = false) { - include_once 'HTML/QuickForm/Renderer/Array.php'; + include_once dirname(__FILE__) . '/QuickForm/Renderer/Array.php'; $renderer = new HTML_QuickForm_Renderer_Array($collectHidden); $this->accept($renderer); return $renderer->toArray(); diff --git a/libs/HTML/QuickForm/Renderer/Array.php b/libs/HTML/QuickForm/Renderer/Array.php index 28f5893102..dfb04647f5 100644 --- a/libs/HTML/QuickForm/Renderer/Array.php +++ b/libs/HTML/QuickForm/Renderer/Array.php @@ -27,7 +27,7 @@ /** * An abstract base class for QuickForm renderers */ -require_once 'HTML/QuickForm/Renderer.php'; +require_once dirname(__FILE__) . '/../Renderer.php'; /** * A concrete renderer for HTML_QuickForm, makes an array of form contents @@ -337,4 +337,4 @@ class HTML_QuickForm_Renderer_Array extends HTML_QuickForm_Renderer } } } -?>
\ No newline at end of file +?> diff --git a/libs/HTML/QuickForm/Renderer/ArraySmarty.php b/libs/HTML/QuickForm/Renderer/ArraySmarty.php index 89b59e7dee..d7433d0150 100644 --- a/libs/HTML/QuickForm/Renderer/ArraySmarty.php +++ b/libs/HTML/QuickForm/Renderer/ArraySmarty.php @@ -27,7 +27,7 @@ /** * A concrete renderer for HTML_QuickForm, makes an array of form contents */ -require_once 'HTML/QuickForm/Renderer/Array.php'; +require_once dirname(__FILE__) . '/Array.php'; /** * A static renderer for HTML_QuickForm, makes an array of form content @@ -400,4 +400,4 @@ class HTML_QuickForm_Renderer_ArraySmarty extends HTML_QuickForm_Renderer_Array $this->_error = $template; } // end func setErrorTemplate } -?>
\ No newline at end of file +?> diff --git a/libs/HTML/QuickForm/Renderer/Default.php b/libs/HTML/QuickForm/Renderer/Default.php index 0801105ba8..0ec24a6454 100644 --- a/libs/HTML/QuickForm/Renderer/Default.php +++ b/libs/HTML/QuickForm/Renderer/Default.php @@ -26,7 +26,7 @@ /** * An abstract base class for QuickForm renderers */ -require_once 'HTML/QuickForm/Renderer.php'; +require_once dirname(__FILE__) . '/../Renderer.php'; /** * A concrete renderer for HTML_QuickForm, based on QuickForm 2.x built-in one diff --git a/libs/HTML/QuickForm/Renderer/ITDynamic.php b/libs/HTML/QuickForm/Renderer/ITDynamic.php index f554203dfa..de0dec577b 100644 --- a/libs/HTML/QuickForm/Renderer/ITDynamic.php +++ b/libs/HTML/QuickForm/Renderer/ITDynamic.php @@ -24,7 +24,7 @@ /** * An abstract base class for QuickForm renderers */ -require_once 'HTML/QuickForm/Renderer.php'; +require_once dirname(__FILE__) . '/../Renderer.php'; /** * A concrete renderer for HTML_QuickForm, using Integrated Templates. diff --git a/libs/HTML/QuickForm/Renderer/ITStatic.php b/libs/HTML/QuickForm/Renderer/ITStatic.php index 56c9d1fed2..94be06a1d5 100644 --- a/libs/HTML/QuickForm/Renderer/ITStatic.php +++ b/libs/HTML/QuickForm/Renderer/ITStatic.php @@ -25,7 +25,7 @@ /** * An abstract base class for QuickForm renderers */ -require_once 'HTML/QuickForm/Renderer.php'; +require_once dirname(__FILE__) . '/../Renderer.php'; /** * A static renderer for HTML_QuickForm compatible @@ -501,4 +501,4 @@ class HTML_QuickForm_Renderer_ITStatic extends HTML_QuickForm_Renderer return $ret; } } // end class HTML_QuickForm_Renderer_ITStatic -?>
\ No newline at end of file +?> diff --git a/libs/HTML/QuickForm/Renderer/Object.php b/libs/HTML/QuickForm/Renderer/Object.php index c36494b867..9613931835 100644 --- a/libs/HTML/QuickForm/Renderer/Object.php +++ b/libs/HTML/QuickForm/Renderer/Object.php @@ -24,7 +24,7 @@ /** * An abstract base class for QuickForm renderers */ -require_once 'HTML/QuickForm/Renderer.php'; +require_once dirname(__FILE__) . '/../Renderer.php'; /** * A concrete renderer for HTML_QuickForm, makes an object from form contents diff --git a/libs/HTML/QuickForm/Renderer/ObjectFlexy.php b/libs/HTML/QuickForm/Renderer/ObjectFlexy.php index e992e895fe..37d45e38d6 100644 --- a/libs/HTML/QuickForm/Renderer/ObjectFlexy.php +++ b/libs/HTML/QuickForm/Renderer/ObjectFlexy.php @@ -24,7 +24,7 @@ /** * A concrete renderer for HTML_QuickForm, makes an object from form contents */ -require_once 'HTML/QuickForm/Renderer/Object.php'; +require_once dirname(__FILE__) . '/Object.php'; /** * QuickForm renderer for Flexy template engine, static version. diff --git a/libs/HTML/QuickForm/Renderer/QuickHtml.php b/libs/HTML/QuickForm/Renderer/QuickHtml.php index ca067daa70..f71d3c109b 100644 --- a/libs/HTML/QuickForm/Renderer/QuickHtml.php +++ b/libs/HTML/QuickForm/Renderer/QuickHtml.php @@ -24,7 +24,7 @@ /** * A concrete renderer for HTML_QuickForm, based on QuickForm 2.x built-in one */ -require_once 'HTML/QuickForm/Renderer/Default.php'; +require_once dirname(__FILE__) . '/Default.php'; /** * A renderer that makes it quick and easy to create customized forms. diff --git a/libs/HTML/QuickForm/Rule/Callback.php b/libs/HTML/QuickForm/Rule/Callback.php index d6e9eab35e..8796dedaa0 100644 --- a/libs/HTML/QuickForm/Rule/Callback.php +++ b/libs/HTML/QuickForm/Rule/Callback.php @@ -24,7 +24,7 @@ /** * Abstract base class for QuickForm validation rules */ -require_once 'HTML/QuickForm/Rule.php'; +require_once dirname(__FILE__) . '/../Rule.php'; /** * Validates values using callback functions or methods @@ -121,4 +121,4 @@ class HTML_QuickForm_Rule_Callback extends HTML_QuickForm_Rule } // end func getValidationScript } // end class HTML_QuickForm_Rule_Callback -?>
\ No newline at end of file +?> diff --git a/libs/HTML/QuickForm/Rule/Compare.php b/libs/HTML/QuickForm/Rule/Compare.php index df4f86b795..6eeda4b65e 100644 --- a/libs/HTML/QuickForm/Rule/Compare.php +++ b/libs/HTML/QuickForm/Rule/Compare.php @@ -24,7 +24,7 @@ /** * Abstract base class for QuickForm validation rules */ -require_once 'HTML/QuickForm/Rule.php'; +require_once dirname(__FILE__) . '/../Rule.php'; /** * Rule to compare two form fields diff --git a/libs/HTML/QuickForm/Rule/Email.php b/libs/HTML/QuickForm/Rule/Email.php index 6f79653378..d9fc49ec62 100644 --- a/libs/HTML/QuickForm/Rule/Email.php +++ b/libs/HTML/QuickForm/Rule/Email.php @@ -24,7 +24,7 @@ /** * Abstract base class for QuickForm validation rules */ -require_once 'HTML/QuickForm/Rule.php'; +require_once dirname(__FILE__) . '/../Rule.php'; /** * Email validation rule @@ -70,4 +70,4 @@ class HTML_QuickForm_Rule_Email extends HTML_QuickForm_Rule } // end func getValidationScript } // end class HTML_QuickForm_Rule_Email -?>
\ No newline at end of file +?> diff --git a/libs/HTML/QuickForm/Rule/Range.php b/libs/HTML/QuickForm/Rule/Range.php index 97a8806dc6..e466e3d120 100644 --- a/libs/HTML/QuickForm/Rule/Range.php +++ b/libs/HTML/QuickForm/Rule/Range.php @@ -24,7 +24,7 @@ /** * Abstract base class for QuickForm validation rules */ -require_once 'HTML/QuickForm/Rule.php'; +require_once dirname(__FILE__) . '/../Rule.php'; /** * Checks that the length of value is within range @@ -72,4 +72,4 @@ class HTML_QuickForm_Rule_Range extends HTML_QuickForm_Rule } // end func getValidationScript } // end class HTML_QuickForm_Rule_Range -?>
\ No newline at end of file +?> diff --git a/libs/HTML/QuickForm/Rule/Regex.php b/libs/HTML/QuickForm/Rule/Regex.php index f496a3fb1c..a43aea22dc 100644 --- a/libs/HTML/QuickForm/Rule/Regex.php +++ b/libs/HTML/QuickForm/Rule/Regex.php @@ -24,7 +24,7 @@ /** * Abstract base class for QuickForm validation rules */ -require_once 'HTML/QuickForm/Rule.php'; +require_once dirname(__FILE__) . '/../Rule.php'; /** * Validates values using regular expressions @@ -104,4 +104,4 @@ class HTML_QuickForm_Rule_Regex extends HTML_QuickForm_Rule } // end func getValidationScript } // end class HTML_QuickForm_Rule_Regex -?>
\ No newline at end of file +?> diff --git a/libs/HTML/QuickForm/Rule/Required.php b/libs/HTML/QuickForm/Rule/Required.php index 28ccc604ac..e73af090b0 100644 --- a/libs/HTML/QuickForm/Rule/Required.php +++ b/libs/HTML/QuickForm/Rule/Required.php @@ -24,7 +24,7 @@ /** * Abstract base class for QuickForm validation rules */ -require_once 'HTML/QuickForm/Rule.php'; +require_once dirname(__FILE__) . '/../Rule.php'; /** * Required elements validation diff --git a/libs/HTML/QuickForm/RuleRegistry.php b/libs/HTML/QuickForm/RuleRegistry.php index 89e98144e6..c257fc328d 100644 --- a/libs/HTML/QuickForm/RuleRegistry.php +++ b/libs/HTML/QuickForm/RuleRegistry.php @@ -123,7 +123,7 @@ class HTML_QuickForm_RuleRegistry if (!isset($this->_rules[$class])) { if (!empty($path)) { - include_once($path); + include_once(dirname(__FILE__) . '/../../' . $path); } $this->_rules[$class] = new $class(); } diff --git a/libs/HTML/QuickForm/advcheckbox.php b/libs/HTML/QuickForm/advcheckbox.php index 9951e79885..fada1e70ae 100644 --- a/libs/HTML/QuickForm/advcheckbox.php +++ b/libs/HTML/QuickForm/advcheckbox.php @@ -25,7 +25,7 @@ /** * HTML class for a checkbox type field */ -require_once 'HTML/QuickForm/checkbox.php'; +require_once dirname(__FILE__) . '/checkbox.php'; /** * HTML class for an advanced checkbox type field diff --git a/libs/HTML/QuickForm/autocomplete.php b/libs/HTML/QuickForm/autocomplete.php index 57d1e4311c..0275ceafb1 100644 --- a/libs/HTML/QuickForm/autocomplete.php +++ b/libs/HTML/QuickForm/autocomplete.php @@ -24,7 +24,7 @@ /** * HTML class for a text field */ -require_once 'HTML/QuickForm/text.php'; +require_once dirname(__FILE__) . '/text.php'; /** * HTML class for an autocomplete element diff --git a/libs/HTML/QuickForm/button.php b/libs/HTML/QuickForm/button.php index cae1888c18..d0ee0157f3 100644 --- a/libs/HTML/QuickForm/button.php +++ b/libs/HTML/QuickForm/button.php @@ -25,7 +25,7 @@ /** * Base class for <input /> form elements */ -require_once 'HTML/QuickForm/input.php'; +require_once dirname(__FILE__) . '/input.php'; /** * HTML class for an <input type="button" /> elements diff --git a/libs/HTML/QuickForm/checkbox.php b/libs/HTML/QuickForm/checkbox.php index 4cf1de238f..5bfc361a17 100644 --- a/libs/HTML/QuickForm/checkbox.php +++ b/libs/HTML/QuickForm/checkbox.php @@ -26,7 +26,7 @@ /** * Base class for <input /> form elements */ -require_once 'HTML/QuickForm/input.php'; +require_once dirname(__FILE__) . '/input.php'; /** * HTML class for a checkbox type field diff --git a/libs/HTML/QuickForm/date.php b/libs/HTML/QuickForm/date.php index 5fe3320aba..60811ab347 100644 --- a/libs/HTML/QuickForm/date.php +++ b/libs/HTML/QuickForm/date.php @@ -24,11 +24,11 @@ /** * Class for a group of form elements */ -require_once 'HTML/QuickForm/group.php'; +require_once dirname(__FILE__) . '/group.php'; /** * Class for <select></select> elements */ -require_once 'HTML/QuickForm/select.php'; +require_once dirname(__FILE__) . '/select.php'; /** * Class for a group of elements used to input dates (and times). @@ -494,7 +494,7 @@ class HTML_QuickForm_date extends HTML_QuickForm_group function toHtml() { - include_once('HTML/QuickForm/Renderer/Default.php'); + include_once(dirname(__FILE__) . '/Renderer/Default.php'); $renderer = new HTML_QuickForm_Renderer_Default(); $renderer->setElementTemplate('{element}'); parent::accept($renderer); diff --git a/libs/HTML/QuickForm/element.php b/libs/HTML/QuickForm/element.php index 3a5e2b97a6..93761f2740 100644 --- a/libs/HTML/QuickForm/element.php +++ b/libs/HTML/QuickForm/element.php @@ -26,7 +26,7 @@ /** * Base class for all HTML classes */ -require_once 'HTML/Common.php'; +require_once dirname(__FILE__) . '/../Common.php'; /** * Base class for form elements @@ -491,4 +491,4 @@ class HTML_QuickForm_element extends HTML_Common // }}} } // end class HTML_QuickForm_element -?>
\ No newline at end of file +?> diff --git a/libs/HTML/QuickForm/file.php b/libs/HTML/QuickForm/file.php index afdf585962..f271cc5a72 100644 --- a/libs/HTML/QuickForm/file.php +++ b/libs/HTML/QuickForm/file.php @@ -26,7 +26,7 @@ /** * Base class for <input /> form elements */ -require_once 'HTML/QuickForm/input.php'; +require_once dirname(__FILE__) . '/input.php'; // register file-related rules if (class_exists('HTML_QuickForm')) { diff --git a/libs/HTML/QuickForm/group.php b/libs/HTML/QuickForm/group.php index 6a538ea8f5..9ecda4958d 100644 --- a/libs/HTML/QuickForm/group.php +++ b/libs/HTML/QuickForm/group.php @@ -26,7 +26,7 @@ /** * Base class for form elements */ -require_once 'HTML/QuickForm/element.php'; +require_once dirname(__FILE__) . '/element.php'; /** * HTML class for a form element group @@ -298,7 +298,7 @@ class HTML_QuickForm_group extends HTML_QuickForm_element */ function toHtml() { - include_once('HTML/QuickForm/Renderer/Default.php'); + include_once(dirname(__FILE__) . '/Renderer/Default.php'); $renderer = new HTML_QuickForm_Renderer_Default(); $renderer->setElementTemplate('{element}'); $this->accept($renderer); diff --git a/libs/HTML/QuickForm/header.php b/libs/HTML/QuickForm/header.php index b1bd222003..49b5679fb9 100644 --- a/libs/HTML/QuickForm/header.php +++ b/libs/HTML/QuickForm/header.php @@ -24,7 +24,7 @@ /** * HTML class for static data */ -require_once 'HTML/QuickForm/static.php'; +require_once dirname(__FILE__) . '/static.php'; /** * A pseudo-element used for adding headers to form diff --git a/libs/HTML/QuickForm/hidden.php b/libs/HTML/QuickForm/hidden.php index e0bb7e1d1f..bd77c36ad5 100644 --- a/libs/HTML/QuickForm/hidden.php +++ b/libs/HTML/QuickForm/hidden.php @@ -25,7 +25,7 @@ /** * Base class for <input /> form elements */ -require_once 'HTML/QuickForm/input.php'; +require_once dirname(__FILE__) . '/input.php'; /** * HTML class for a hidden type element diff --git a/libs/HTML/QuickForm/hiddenselect.php b/libs/HTML/QuickForm/hiddenselect.php index 0c16e96494..56212db090 100644 --- a/libs/HTML/QuickForm/hiddenselect.php +++ b/libs/HTML/QuickForm/hiddenselect.php @@ -24,7 +24,7 @@ /** * Class for <select></select> elements */ -require_once 'HTML/QuickForm/select.php'; +require_once dirname(__FILE__) . '/select.php'; /** * Hidden select pseudo-element diff --git a/libs/HTML/QuickForm/hierselect.php b/libs/HTML/QuickForm/hierselect.php index fa92cc64a4..5889cca2d0 100644 --- a/libs/HTML/QuickForm/hierselect.php +++ b/libs/HTML/QuickForm/hierselect.php @@ -26,11 +26,11 @@ /** * Class for a group of form elements */ -require_once 'HTML/QuickForm/group.php'; +require_once dirname(__FILE__) . '/group.php'; /** * Class for <select></select> elements */ -require_once 'HTML/QuickForm/select.php'; +require_once dirname(__FILE__) . '/select.php'; /** * Hierarchical select element @@ -461,7 +461,7 @@ JAVASCRIPT; $this->_js .= "_hs_defaults['" . $this->_escapeString($this->getName()) . "'] = " . $this->_convertArrayToJavascript($values, false) . ";\n"; } - include_once('HTML/QuickForm/Renderer/Default.php'); + include_once(dirname(__FILE__) . '/Renderer/Default.php'); $renderer = new HTML_QuickForm_Renderer_Default(); $renderer->setElementTemplate('{element}'); parent::accept($renderer); diff --git a/libs/HTML/QuickForm/html.php b/libs/HTML/QuickForm/html.php index 7310f5f150..6cba2dabb2 100644 --- a/libs/HTML/QuickForm/html.php +++ b/libs/HTML/QuickForm/html.php @@ -24,7 +24,7 @@ /** * HTML class for static data */ -require_once 'HTML/QuickForm/static.php'; +require_once dirname(__FILE__) . '/static.php'; /** * A pseudo-element used for adding raw HTML to form diff --git a/libs/HTML/QuickForm/image.php b/libs/HTML/QuickForm/image.php index 52190ec446..d63169aa2b 100644 --- a/libs/HTML/QuickForm/image.php +++ b/libs/HTML/QuickForm/image.php @@ -25,7 +25,7 @@ /** * Base class for <input /> form elements */ -require_once 'HTML/QuickForm/input.php'; +require_once dirname(__FILE__) . '/input.php'; /** * HTML class for an <input type="image" /> element diff --git a/libs/HTML/QuickForm/input.php b/libs/HTML/QuickForm/input.php index 354f050f45..01407e0e63 100644 --- a/libs/HTML/QuickForm/input.php +++ b/libs/HTML/QuickForm/input.php @@ -25,7 +25,7 @@ /** * Base class for form elements */ -require_once 'HTML/QuickForm/element.php'; +require_once dirname(__FILE__) . '/element.php'; /** * Base class for <input /> form elements diff --git a/libs/HTML/QuickForm/link.php b/libs/HTML/QuickForm/link.php index d5d3d46c1f..7ae6638828 100644 --- a/libs/HTML/QuickForm/link.php +++ b/libs/HTML/QuickForm/link.php @@ -25,7 +25,7 @@ /** * HTML class for static data */ -require_once 'HTML/QuickForm/static.php'; +require_once dirname(__FILE__) . '/static.php'; /** * HTML class for a link type field diff --git a/libs/HTML/QuickForm/password.php b/libs/HTML/QuickForm/password.php index 7c6b3902d3..214b362202 100644 --- a/libs/HTML/QuickForm/password.php +++ b/libs/HTML/QuickForm/password.php @@ -25,7 +25,7 @@ /** * Base class for <input /> form elements */ -require_once 'HTML/QuickForm/input.php'; +require_once dirname(__FILE__) . '/input.php'; /** * HTML class for a password type field diff --git a/libs/HTML/QuickForm/radio.php b/libs/HTML/QuickForm/radio.php index c9d340fcbb..6f8af6e2f1 100644 --- a/libs/HTML/QuickForm/radio.php +++ b/libs/HTML/QuickForm/radio.php @@ -25,7 +25,7 @@ /** * Base class for <input /> form elements */ -require_once 'HTML/QuickForm/input.php'; +require_once dirname(__FILE__) . '/input.php'; /** * HTML class for a radio type element diff --git a/libs/HTML/QuickForm/reset.php b/libs/HTML/QuickForm/reset.php index bf2cbef908..41f8368b9a 100644 --- a/libs/HTML/QuickForm/reset.php +++ b/libs/HTML/QuickForm/reset.php @@ -25,7 +25,7 @@ /** * Base class for <input /> form elements */ -require_once 'HTML/QuickForm/input.php'; +require_once dirname(__FILE__) . '/input.php'; /** * HTML class for a reset type element diff --git a/libs/HTML/QuickForm/select.php b/libs/HTML/QuickForm/select.php index 801a718390..7a94ce8bed 100644 --- a/libs/HTML/QuickForm/select.php +++ b/libs/HTML/QuickForm/select.php @@ -26,7 +26,7 @@ /** * Base class for form elements */ -require_once 'HTML/QuickForm/element.php'; +require_once dirname(__FILE__) . '/element.php'; /** * Class to dynamically create an HTML SELECT @@ -447,7 +447,7 @@ class HTML_QuickForm_select extends HTML_QuickForm_element { function loadQuery(&$conn, $sql, $textCol=null, $valueCol=null, $values=null) { if (is_string($conn)) { - require_once('DB.php'); + require_once(dirname(__FILE__) . '/../../DB.php'); $dbConn = &DB::connect($conn, true); if (DB::isError($dbConn)) { return $dbConn; diff --git a/libs/HTML/QuickForm/static.php b/libs/HTML/QuickForm/static.php index f5ce3cdca2..ef388cc456 100644 --- a/libs/HTML/QuickForm/static.php +++ b/libs/HTML/QuickForm/static.php @@ -24,7 +24,7 @@ /** * Base class for form elements */ -require_once 'HTML/QuickForm/element.php'; +require_once dirname(__FILE__) . '/element.php'; /** * HTML class for static data diff --git a/libs/HTML/QuickForm/submit.php b/libs/HTML/QuickForm/submit.php index a9fa99d65b..25a98e8a26 100644 --- a/libs/HTML/QuickForm/submit.php +++ b/libs/HTML/QuickForm/submit.php @@ -25,7 +25,7 @@ /** * Base class for <input /> form elements */ -require_once 'HTML/QuickForm/input.php'; +require_once dirname(__FILE__) . '/input.php'; /** * HTML class for a submit type element diff --git a/libs/HTML/QuickForm/text.php b/libs/HTML/QuickForm/text.php index 8d99735850..3240c41d5f 100644 --- a/libs/HTML/QuickForm/text.php +++ b/libs/HTML/QuickForm/text.php @@ -25,7 +25,7 @@ /** * Base class for <input /> form elements */ -require_once 'HTML/QuickForm/input.php'; +require_once dirname(__FILE__) . '/input.php'; /** * HTML class for a text field diff --git a/libs/HTML/QuickForm/textarea.php b/libs/HTML/QuickForm/textarea.php index a675e973bf..7aaac4c6ad 100644 --- a/libs/HTML/QuickForm/textarea.php +++ b/libs/HTML/QuickForm/textarea.php @@ -25,7 +25,7 @@ /** * Base class for form elements */ -require_once 'HTML/QuickForm/element.php'; +require_once dirname(__FILE__) . '/element.php'; /** * HTML class for a textarea type field diff --git a/libs/HTML/QuickForm/xbutton.php b/libs/HTML/QuickForm/xbutton.php index c795fa53bc..98524cca89 100644 --- a/libs/HTML/QuickForm/xbutton.php +++ b/libs/HTML/QuickForm/xbutton.php @@ -24,7 +24,7 @@ /** * Base class for form elements */ -require_once 'HTML/QuickForm/element.php'; +require_once dirname(__FILE__) . '/element.php'; /** * Class for HTML 4.0 <button> element diff --git a/libs/Zend/Auth.php b/libs/Zend/Auth.php index 5bd2b96d4f..47d474458a 100644 --- a/libs/Zend/Auth.php +++ b/libs/Zend/Auth.php @@ -87,7 +87,7 @@ class Zend_Auth /** * @see Zend_Auth_Storage_Session */ - require_once 'Zend/Auth/Storage/Session.php'; + // require_once 'Zend/Auth/Storage/Session.php'; $this->setStorage(new Zend_Auth_Storage_Session()); } diff --git a/libs/Zend/Auth/Adapter/DbTable.php b/libs/Zend/Auth/Adapter/DbTable.php index 908423f640..30bbd2478d 100644 --- a/libs/Zend/Auth/Adapter/DbTable.php +++ b/libs/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'; /** @@ -341,7 +341,7 @@ class Zend_Auth_Adapter_DbTable implements Zend_Auth_Adapter_Interface /** * @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); } @@ -412,7 +412,7 @@ class Zend_Auth_Adapter_DbTable implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + // require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('The supplied parameters to Zend_Auth_Adapter_DbTable failed to ' . 'produce a valid sql statement, please check table and column names ' . 'for validity.', 0, $e); diff --git a/libs/Zend/Auth/Adapter/Digest.php b/libs/Zend/Auth/Adapter/Digest.php index 90b79a8363..a099bef358 100644 --- a/libs/Zend/Auth/Adapter/Digest.php +++ b/libs/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'; /** @@ -186,7 +186,7 @@ class Zend_Auth_Adapter_Digest implements Zend_Auth_Adapter_Interface /** * @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"); } } @@ -195,7 +195,7 @@ class Zend_Auth_Adapter_Digest implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + // require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception("Cannot open '$this->_filename' for reading"); } diff --git a/libs/Zend/Auth/Adapter/Exception.php b/libs/Zend/Auth/Adapter/Exception.php index aee0a014b3..23282dddf2 100644 --- a/libs/Zend/Auth/Adapter/Exception.php +++ b/libs/Zend/Auth/Adapter/Exception.php @@ -24,7 +24,7 @@ /** * Zend_Auth_Exception */ -require_once 'Zend/Auth/Exception.php'; +// require_once 'Zend/Auth/Exception.php'; /** diff --git a/libs/Zend/Auth/Adapter/Http.php b/libs/Zend/Auth/Adapter/Http.php index 7edbc628bc..d645d8db93 100644 --- a/libs/Zend/Auth/Adapter/Http.php +++ b/libs/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'; /** @@ -171,7 +171,7 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @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'); } @@ -184,7 +184,7 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @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'); } @@ -194,7 +194,7 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @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)); } @@ -208,7 +208,7 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @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 { @@ -222,7 +222,7 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @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 { @@ -234,7 +234,7 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @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 { @@ -368,7 +368,7 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @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()'); } @@ -415,7 +415,7 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @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'); } @@ -502,14 +502,14 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + // require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('The value of the client Authorization header is required'); } if (empty($this->_basicResolver)) { /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + // require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('A basicResolver object must be set before doing Basic ' . 'authentication'); } @@ -521,7 +521,7 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @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'); } @@ -559,14 +559,14 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + // require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('The value of the client Authorization header is required'); } if (empty($this->_digestResolver)) { /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + // require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('A digestResolver object must be set before doing Digest authentication'); } @@ -625,7 +625,7 @@ class Zend_Auth_Adapter_Http implements Zend_Auth_Adapter_Interface /** * @see Zend_Auth_Adapter_Exception */ - require_once 'Zend/Auth/Adapter/Exception.php'; + // require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('Client requested an unsupported qop option'); } // Using hash() should make parameterizing the hash algorithm diff --git a/libs/Zend/Auth/Adapter/Http/Resolver/Exception.php b/libs/Zend/Auth/Adapter/Http/Resolver/Exception.php index 3e927f51f4..5a4c9bf358 100644 --- a/libs/Zend/Auth/Adapter/Http/Resolver/Exception.php +++ b/libs/Zend/Auth/Adapter/Http/Resolver/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Auth_Exception */ -require_once 'Zend/Auth/Exception.php'; +// require_once 'Zend/Auth/Exception.php'; /** diff --git a/libs/Zend/Auth/Adapter/Http/Resolver/File.php b/libs/Zend/Auth/Adapter/Http/Resolver/File.php index dfcb087daf..d17c2ecb37 100644 --- a/libs/Zend/Auth/Adapter/Http/Resolver/File.php +++ b/libs/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'; /** @@ -71,7 +71,7 @@ class Zend_Auth_Adapter_Http_Resolver_File implements Zend_Auth_Adapter_Http_Res /** * @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; @@ -116,13 +116,13 @@ class Zend_Auth_Adapter_Http_Resolver_File implements Zend_Auth_Adapter_Http_Res /** * @see Zend_Auth_Adapter_Http_Resolver_Exception */ - require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; + // require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; throw new Zend_Auth_Adapter_Http_Resolver_Exception('Username is required'); } else if (!ctype_print($username) || strpos($username, ':') !== false) { /** * @see Zend_Auth_Adapter_Http_Resolver_Exception */ - require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; + // require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; throw new Zend_Auth_Adapter_Http_Resolver_Exception('Username must consist only of printable characters, ' . 'excluding the colon'); } @@ -130,13 +130,13 @@ class Zend_Auth_Adapter_Http_Resolver_File implements Zend_Auth_Adapter_Http_Res /** * @see Zend_Auth_Adapter_Http_Resolver_Exception */ - require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; + // require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; throw new Zend_Auth_Adapter_Http_Resolver_Exception('Realm is required'); } else if (!ctype_print($realm) || strpos($realm, ':') !== false) { /** * @see Zend_Auth_Adapter_Http_Resolver_Exception */ - require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; + // require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; throw new Zend_Auth_Adapter_Http_Resolver_Exception('Realm must consist only of printable characters, ' . 'excluding the colon.'); } @@ -147,7 +147,7 @@ class Zend_Auth_Adapter_Http_Resolver_File implements Zend_Auth_Adapter_Http_Res /** * @see Zend_Auth_Adapter_Http_Resolver_Exception */ - require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; + // require_once 'Zend/Auth/Adapter/Http/Resolver/Exception.php'; throw new Zend_Auth_Adapter_Http_Resolver_Exception('Unable to open password file: ' . $this->_file); } diff --git a/libs/Zend/Auth/Adapter/InfoCard.php b/libs/Zend/Auth/Adapter/InfoCard.php index a2f57329d4..8f2572a571 100644 --- a/libs/Zend/Auth/Adapter/InfoCard.php +++ b/libs/Zend/Auth/Adapter/InfoCard.php @@ -23,17 +23,17 @@ /** * @see Zend_Auth_Adapter_Interface */ -require_once 'Zend/Auth/Adapter/Interface.php'; +// require_once 'Zend/Auth/Adapter/Interface.php'; /** * @see Zend_Auth_Result */ -require_once 'Zend/Auth/Result.php'; +// require_once 'Zend/Auth/Result.php'; /** * @see Zend_InfoCard */ -require_once 'Zend/InfoCard.php'; +// require_once 'Zend/InfoCard.php'; /** * A Zend_Auth Authentication Adapter allowing the use of Information Cards as an diff --git a/libs/Zend/Auth/Adapter/Interface.php b/libs/Zend/Auth/Adapter/Interface.php index d2c3207e31..3f8204842b 100644 --- a/libs/Zend/Auth/Adapter/Interface.php +++ b/libs/Zend/Auth/Adapter/Interface.php @@ -24,7 +24,7 @@ /** * @see Zend_Auth_Result */ -require_once 'Zend/Auth/Result.php'; +// require_once 'Zend/Auth/Result.php'; /** diff --git a/libs/Zend/Auth/Adapter/Ldap.php b/libs/Zend/Auth/Adapter/Ldap.php index b159c91064..20f31c1fe0 100644 --- a/libs/Zend/Auth/Adapter/Ldap.php +++ b/libs/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 @@ -199,7 +199,7 @@ class Zend_Auth_Adapter_Ldap implements Zend_Auth_Adapter_Interface /** * @see Zend_Ldap */ - require_once 'Zend/Ldap.php'; + // require_once 'Zend/Ldap.php'; $this->_ldap = new Zend_Ldap(); } @@ -247,7 +247,7 @@ class Zend_Auth_Adapter_Ldap implements Zend_Auth_Adapter_Interface /** * @see Zend_Ldap_Exception */ - require_once 'Zend/Ldap/Exception.php'; + // require_once 'Zend/Ldap/Exception.php'; $messages = array(); $messages[0] = ''; // reserved @@ -285,7 +285,7 @@ class Zend_Auth_Adapter_Ldap implements Zend_Auth_Adapter_Interface /** * @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); @@ -452,7 +452,7 @@ class Zend_Auth_Adapter_Ldap implements Zend_Auth_Adapter_Interface /** * @see Zend_Ldap_Filter */ - require_once 'Zend/Ldap/Filter.php'; + // require_once 'Zend/Ldap/Filter.php'; $groupName = Zend_Ldap_Filter::equals($adapterOptions['groupAttr'], $adapterOptions['group']); $membership = Zend_Ldap_Filter::equals($adapterOptions['memberAttr'], $user); $group = Zend_Ldap_Filter::andFilter($groupName, $membership); diff --git a/libs/Zend/Auth/Adapter/OpenId.php b/libs/Zend/Auth/Adapter/OpenId.php index 1d55605ab1..08f21d949b 100644 --- a/libs/Zend/Auth/Adapter/OpenId.php +++ b/libs/Zend/Auth/Adapter/OpenId.php @@ -24,13 +24,13 @@ /** * @see Zend_Auth_Adapter_Interface */ -require_once 'Zend/Auth/Adapter/Interface.php'; +// require_once 'Zend/Auth/Adapter/Interface.php'; /** * @see Zend_OpenId_Consumer */ -require_once 'Zend/OpenId/Consumer.php'; +// require_once 'Zend/OpenId/Consumer.php'; /** diff --git a/libs/Zend/Auth/Exception.php b/libs/Zend/Auth/Exception.php index 933ce1c0d8..80334c1911 100644 --- a/libs/Zend/Auth/Exception.php +++ b/libs/Zend/Auth/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +// require_once 'Zend/Exception.php'; /** diff --git a/libs/Zend/Auth/Storage/Exception.php b/libs/Zend/Auth/Storage/Exception.php index d45afe7e90..218c909c50 100644 --- a/libs/Zend/Auth/Storage/Exception.php +++ b/libs/Zend/Auth/Storage/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Auth_Exception */ -require_once 'Zend/Auth/Exception.php'; +// require_once 'Zend/Auth/Exception.php'; /** diff --git a/libs/Zend/Auth/Storage/NonPersistent.php b/libs/Zend/Auth/Storage/NonPersistent.php index c8101e9da3..1dd034b7ef 100644 --- a/libs/Zend/Auth/Storage/NonPersistent.php +++ b/libs/Zend/Auth/Storage/NonPersistent.php @@ -24,7 +24,7 @@ /** * @see Zend_Auth_Storage_Interface */ -require_once 'Zend/Auth/Storage/Interface.php'; +// require_once 'Zend/Auth/Storage/Interface.php'; /** diff --git a/libs/Zend/Auth/Storage/Session.php b/libs/Zend/Auth/Storage/Session.php index 60579dbe9b..a3775ce3d3 100644 --- a/libs/Zend/Auth/Storage/Session.php +++ b/libs/Zend/Auth/Storage/Session.php @@ -24,13 +24,13 @@ /** * @see Zend_Auth_Storage_Interface */ -require_once 'Zend/Auth/Storage/Interface.php'; +// require_once 'Zend/Auth/Storage/Interface.php'; /** * @see Zend_Session */ -require_once 'Zend/Session.php'; +// require_once 'Zend/Session.php'; /** diff --git a/libs/Zend/Cache.php b/libs/Zend/Cache.php index 3792511511..6d219f3f8a 100644 --- a/libs/Zend/Cache.php +++ b/libs/Zend/Cache.php @@ -83,7 +83,7 @@ abstract class Zend_Cache * @param array $backendOptions associative array of options for the corresponding backend constructor * @param boolean $customFrontendNaming if true, the frontend argument is used as a complete class name ; if false, the frontend argument is used as the end of "Zend_Cache_Frontend_[...]" class name * @param boolean $customBackendNaming if true, the backend argument is used as a complete class name ; if false, the backend argument is used as the end of "Zend_Cache_Backend_[...]" class name - * @param boolean $autoload if true, there will no require_once for backend and frontend (usefull only for custom backends/frontends) + * @param boolean $autoload if true, there will no // require_once for backend and frontend (usefull only for custom backends/frontends) * @throws Zend_Cache_Exception * @return Zend_Cache_Core|Zend_Cache_Frontend */ @@ -129,7 +129,7 @@ abstract class Zend_Cache // 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)) { @@ -146,7 +146,7 @@ abstract class Zend_Cache if (!(self::_isReadable($file))) { self::throwException("file $file not found in include_path"); } - require_once $file; + // require_once $file; } } return new $backendClass($backendOptions); @@ -171,7 +171,7 @@ abstract class Zend_Cache // 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)) { @@ -188,7 +188,7 @@ abstract class Zend_Cache if (!(self::_isReadable($file))) { self::throwException("file $file not found in include_path"); } - require_once $file; + // require_once $file; } } return new $frontendClass($frontendOptions); @@ -204,7 +204,7 @@ abstract class Zend_Cache public static function throwException($msg, Exception $e = null) { // For perfs reasons, we use this dynamic inclusion - require_once 'Zend/Cache/Exception.php'; + // require_once 'Zend/Cache/Exception.php'; throw new Zend_Cache_Exception($msg, 0, $e); } diff --git a/libs/Zend/Cache/Backend.php b/libs/Zend/Cache/Backend.php index 8049a1a84d..f71dae135a 100644 --- a/libs/Zend/Cache/Backend.php +++ b/libs/Zend/Cache/Backend.php @@ -235,8 +235,8 @@ class Zend_Cache_Backend } // 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.php'; + // require_once 'Zend/Log/Writer/Stream.php'; $logger = new Zend_Log(new Zend_Log_Writer_Stream('php://output')); $this->_directives['logger'] = $logger; } diff --git a/libs/Zend/Cache/Backend/Apc.php b/libs/Zend/Cache/Backend/Apc.php index 0a13a57720..e25bd397bb 100644 --- a/libs/Zend/Cache/Backend/Apc.php +++ b/libs/Zend/Cache/Backend/Apc.php @@ -24,12 +24,12 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; +// require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +// require_once 'Zend/Cache/Backend.php'; /** diff --git a/libs/Zend/Cache/Backend/BlackHole.php b/libs/Zend/Cache/Backend/BlackHole.php index 9ae72f3972..3eb382eca2 100644 --- a/libs/Zend/Cache/Backend/BlackHole.php +++ b/libs/Zend/Cache/Backend/BlackHole.php @@ -23,12 +23,12 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; +// require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +// require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache diff --git a/libs/Zend/Cache/Backend/ExtendedInterface.php b/libs/Zend/Cache/Backend/ExtendedInterface.php index ec735a476e..f24ecc1091 100644 --- a/libs/Zend/Cache/Backend/ExtendedInterface.php +++ b/libs/Zend/Cache/Backend/ExtendedInterface.php @@ -23,7 +23,7 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; +// require_once 'Zend/Cache/Backend/Interface.php'; /** * @package Zend_Cache diff --git a/libs/Zend/Cache/Backend/File.php b/libs/Zend/Cache/Backend/File.php index dc8888c7b8..eeddfa5b80 100644 --- a/libs/Zend/Cache/Backend/File.php +++ b/libs/Zend/Cache/Backend/File.php @@ -23,12 +23,12 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; +// require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +// require_once 'Zend/Cache/Backend.php'; /** diff --git a/libs/Zend/Cache/Backend/Memcached.php b/libs/Zend/Cache/Backend/Memcached.php index 5c488a6e0f..9c79522069 100644 --- a/libs/Zend/Cache/Backend/Memcached.php +++ b/libs/Zend/Cache/Backend/Memcached.php @@ -24,12 +24,12 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; +// require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +// require_once 'Zend/Cache/Backend.php'; /** diff --git a/libs/Zend/Cache/Backend/Sqlite.php b/libs/Zend/Cache/Backend/Sqlite.php index 5b81fc3223..3bb5ba91e3 100644 --- a/libs/Zend/Cache/Backend/Sqlite.php +++ b/libs/Zend/Cache/Backend/Sqlite.php @@ -24,12 +24,12 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; +// require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +// require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache diff --git a/libs/Zend/Cache/Backend/Static.php b/libs/Zend/Cache/Backend/Static.php index 224e9d4e7d..19d83d5fd4 100644 --- a/libs/Zend/Cache/Backend/Static.php +++ b/libs/Zend/Cache/Backend/Static.php @@ -23,12 +23,12 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; +// require_once 'Zend/Cache/Backend/Interface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +// require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache diff --git a/libs/Zend/Cache/Backend/Test.php b/libs/Zend/Cache/Backend/Test.php index eaeec3b4b7..f143ab4609 100644 --- a/libs/Zend/Cache/Backend/Test.php +++ b/libs/Zend/Cache/Backend/Test.php @@ -24,12 +24,12 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; +// require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +// require_once 'Zend/Cache/Backend.php'; /** * @package Zend_Cache diff --git a/libs/Zend/Cache/Backend/TwoLevels.php b/libs/Zend/Cache/Backend/TwoLevels.php index c027844949..b8a63734de 100644 --- a/libs/Zend/Cache/Backend/TwoLevels.php +++ b/libs/Zend/Cache/Backend/TwoLevels.php @@ -24,12 +24,12 @@ /** * @see Zend_Cache_Backend_ExtendedInterface */ -require_once 'Zend/Cache/Backend/ExtendedInterface.php'; +// require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +// require_once 'Zend/Cache/Backend.php'; /** diff --git a/libs/Zend/Cache/Backend/Xcache.php b/libs/Zend/Cache/Backend/Xcache.php index fbdf4d0f44..ccd9672ca6 100644 --- a/libs/Zend/Cache/Backend/Xcache.php +++ b/libs/Zend/Cache/Backend/Xcache.php @@ -24,12 +24,12 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; +// require_once 'Zend/Cache/Backend/Interface.php'; /** * @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +// require_once 'Zend/Cache/Backend.php'; /** diff --git a/libs/Zend/Cache/Backend/ZendPlatform.php b/libs/Zend/Cache/Backend/ZendPlatform.php index 011428384b..90b7c608c4 100644 --- a/libs/Zend/Cache/Backend/ZendPlatform.php +++ b/libs/Zend/Cache/Backend/ZendPlatform.php @@ -23,12 +23,12 @@ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend.php'; +// require_once 'Zend/Cache/Backend.php'; /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; +// require_once 'Zend/Cache/Backend/Interface.php'; /** diff --git a/libs/Zend/Cache/Backend/ZendServer.php b/libs/Zend/Cache/Backend/ZendServer.php index ee9dc4c06a..f7a62f6276 100644 --- a/libs/Zend/Cache/Backend/ZendServer.php +++ b/libs/Zend/Cache/Backend/ZendServer.php @@ -22,10 +22,10 @@ /** @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; +// require_once 'Zend/Cache/Backend/Interface.php'; /** @see Zend_Cache_Backend */ -require_once 'Zend/Cache/Backend.php'; +// require_once 'Zend/Cache/Backend.php'; /** diff --git a/libs/Zend/Cache/Backend/ZendServer/Disk.php b/libs/Zend/Cache/Backend/ZendServer/Disk.php index 40ffb51586..49c604d005 100644 --- a/libs/Zend/Cache/Backend/ZendServer/Disk.php +++ b/libs/Zend/Cache/Backend/ZendServer/Disk.php @@ -22,10 +22,10 @@ /** @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; +// require_once 'Zend/Cache/Backend/Interface.php'; /** @see Zend_Cache_Backend_ZendServer */ -require_once 'Zend/Cache/Backend/ZendServer.php'; +// require_once 'Zend/Cache/Backend/ZendServer.php'; /** diff --git a/libs/Zend/Cache/Backend/ZendServer/ShMem.php b/libs/Zend/Cache/Backend/ZendServer/ShMem.php index 46bc946221..fd08df68bb 100644 --- a/libs/Zend/Cache/Backend/ZendServer/ShMem.php +++ b/libs/Zend/Cache/Backend/ZendServer/ShMem.php @@ -22,10 +22,10 @@ /** @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; +// require_once 'Zend/Cache/Backend/Interface.php'; /** @see Zend_Cache_Backend_ZendServer */ -require_once 'Zend/Cache/Backend/ZendServer.php'; +// require_once 'Zend/Cache/Backend/ZendServer.php'; /** diff --git a/libs/Zend/Cache/Core.php b/libs/Zend/Cache/Core.php index 6598c109a7..680d4d8028 100644 --- a/libs/Zend/Cache/Core.php +++ b/libs/Zend/Cache/Core.php @@ -713,7 +713,7 @@ class Zend_Cache_Core } // Create a default logger to the standard output stream - require_once 'Zend/Log/Writer/Stream.php'; + // require_once 'Zend/Log/Writer/Stream.php'; $logger = new Zend_Log(new Zend_Log_Writer_Stream('php://output')); $this->_options['logger'] = $logger; } diff --git a/libs/Zend/Cache/Exception.php b/libs/Zend/Cache/Exception.php index 5ca005d18e..63a4a28838 100644 --- a/libs/Zend/Cache/Exception.php +++ b/libs/Zend/Cache/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +// require_once 'Zend/Exception.php'; /** * @package Zend_Cache diff --git a/libs/Zend/Cache/Frontend/Capture.php b/libs/Zend/Cache/Frontend/Capture.php index a4ed47d6a0..8536c5ffb5 100644 --- a/libs/Zend/Cache/Frontend/Capture.php +++ b/libs/Zend/Cache/Frontend/Capture.php @@ -23,7 +23,7 @@ /** * @see Zend_Cache_Core */ -require_once 'Zend/Cache/Core.php'; +// require_once 'Zend/Cache/Core.php'; /** diff --git a/libs/Zend/Cache/Frontend/Class.php b/libs/Zend/Cache/Frontend/Class.php index e5e2d0eb38..3dbdcf666b 100644 --- a/libs/Zend/Cache/Frontend/Class.php +++ b/libs/Zend/Cache/Frontend/Class.php @@ -23,7 +23,7 @@ /** * @see Zend_Cache_Core */ -require_once 'Zend/Cache/Core.php'; +// require_once 'Zend/Cache/Core.php'; /** diff --git a/libs/Zend/Cache/Frontend/File.php b/libs/Zend/Cache/Frontend/File.php index 07c7ddcaba..2cbfe74d0c 100644 --- a/libs/Zend/Cache/Frontend/File.php +++ b/libs/Zend/Cache/Frontend/File.php @@ -24,7 +24,7 @@ /** * @see Zend_Cache_Core */ -require_once 'Zend/Cache/Core.php'; +// require_once 'Zend/Cache/Core.php'; /** diff --git a/libs/Zend/Cache/Frontend/Function.php b/libs/Zend/Cache/Frontend/Function.php index d6ca522ffe..7d7f827fee 100644 --- a/libs/Zend/Cache/Frontend/Function.php +++ b/libs/Zend/Cache/Frontend/Function.php @@ -24,7 +24,7 @@ /** * @see Zend_Cache_Core */ -require_once 'Zend/Cache/Core.php'; +// require_once 'Zend/Cache/Core.php'; /** diff --git a/libs/Zend/Cache/Frontend/Output.php b/libs/Zend/Cache/Frontend/Output.php index 021150e6d9..1757381ce4 100644 --- a/libs/Zend/Cache/Frontend/Output.php +++ b/libs/Zend/Cache/Frontend/Output.php @@ -24,7 +24,7 @@ /** * @see Zend_Cache_Core */ -require_once 'Zend/Cache/Core.php'; +// require_once 'Zend/Cache/Core.php'; /** diff --git a/libs/Zend/Cache/Frontend/Page.php b/libs/Zend/Cache/Frontend/Page.php index c8edceb7ff..21ce6537a7 100644 --- a/libs/Zend/Cache/Frontend/Page.php +++ b/libs/Zend/Cache/Frontend/Page.php @@ -24,7 +24,7 @@ /** * @see Zend_Cache_Core */ -require_once 'Zend/Cache/Core.php'; +// require_once 'Zend/Cache/Core.php'; /** diff --git a/libs/Zend/Cache/Manager.php b/libs/Zend/Cache/Manager.php index a409a2b816..51516caabe 100644 --- a/libs/Zend/Cache/Manager.php +++ b/libs/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 @@ -190,7 +190,7 @@ class Zend_Cache_Manager 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'); } @@ -240,7 +240,7 @@ class Zend_Cache_Manager if ($options instanceof Zend_Config) { $options = $options->toArray(); } elseif (!is_array($options)) { - require_once 'Zend/Cache/Exception.php'; + // require_once 'Zend/Cache/Exception.php'; throw new Zend_Cache_Exception('Options passed must be in' . ' an associative array or instance of Zend_Config'); } diff --git a/libs/Zend/Config.php b/libs/Zend/Config.php index 357f18839e..0ba76392f4 100644 --- a/libs/Zend/Config.php +++ b/libs/Zend/Config.php @@ -165,7 +165,7 @@ class Zend_Config implements Countable, Iterator $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 @@ class Zend_Config implements Countable, Iterator $this->_skipNextIteration = true; } else { /** @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; + // require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Zend_Config is read only'); } @@ -427,7 +427,7 @@ class Zend_Config implements Countable, Iterator while (array_key_exists($extendedSectionCurrent, $this->_extends)) { if ($this->_extends[$extendedSectionCurrent] == $extendingSection) { /** @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; + // require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Illegal circular inheritance detected'); } $extendedSectionCurrent = $this->_extends[$extendedSectionCurrent]; diff --git a/libs/Zend/Config/Exception.php b/libs/Zend/Config/Exception.php index 1532c16524..8ef700783c 100644 --- a/libs/Zend/Config/Exception.php +++ b/libs/Zend/Config/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/libs/Zend/Config/Ini.php b/libs/Zend/Config/Ini.php index e1966d5058..63cab0f9a4 100644 --- a/libs/Zend/Config/Ini.php +++ b/libs/Zend/Config/Ini.php @@ -23,7 +23,7 @@ /** * @see Zend_Config */ -require_once 'Zend/Config.php'; +// require_once 'Zend/Config.php'; /** @@ -103,7 +103,7 @@ class Zend_Config_Ini extends Zend_Config /** * @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'); } @@ -146,7 +146,7 @@ class Zend_Config_Ini extends Zend_Config /** * @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); @@ -177,7 +177,7 @@ class Zend_Config_Ini extends Zend_Config /** * @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; + // require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception($this->_loadFileErrorStr); } @@ -218,7 +218,7 @@ class Zend_Config_Ini extends Zend_Config /** * @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"); } } @@ -253,7 +253,7 @@ class Zend_Config_Ini extends Zend_Config /** * @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 { @@ -289,7 +289,7 @@ class Zend_Config_Ini extends Zend_Config /** * @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); @@ -297,7 +297,7 @@ class Zend_Config_Ini extends Zend_Config /** * @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; + // require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Invalid key '$key'"); } } else { diff --git a/libs/Zend/Config/Writer/Array.php b/libs/Zend/Config/Writer/Array.php index d6fb134c53..6e9b158997 100644 --- a/libs/Zend/Config/Writer/Array.php +++ b/libs/Zend/Config/Writer/Array.php @@ -22,7 +22,7 @@ /** * @see Zend_Config_Writer */ -require_once 'Zend/Config/Writer/FileAbstract.php'; +// require_once 'Zend/Config/Writer/FileAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Config/Writer/FileAbstract.php b/libs/Zend/Config/Writer/FileAbstract.php index e90213e8a4..ee14b772fa 100644 --- a/libs/Zend/Config/Writer/FileAbstract.php +++ b/libs/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 @@ class Zend_Config_Writer_FileAbstract extends Zend_Config_Writer } 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 @@ class Zend_Config_Writer_FileAbstract extends Zend_Config_Writer $result = @file_put_contents($this->_filename, $configString, $flags); if ($result === false) { - require_once 'Zend/Config/Exception.php'; + // require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Could not write to file "' . $this->_filename . '"'); } } diff --git a/libs/Zend/Config/Writer/Ini.php b/libs/Zend/Config/Writer/Ini.php index 7457a0aee1..163c95e216 100644 --- a/libs/Zend/Config/Writer/Ini.php +++ b/libs/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 @@ -156,7 +156,7 @@ class Zend_Config_Writer_Ini extends Zend_Config_Writer_FileAbstract return '"' . $value . '"'; } else { /** @see Zend_Config_Exception */ - require_once 'Zend/Config/Exception.php'; + // require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Value can not contain double quotes "'); } } diff --git a/libs/Zend/Config/Writer/Xml.php b/libs/Zend/Config/Writer/Xml.php index 72fc0a0b8d..7b779d63af 100644 --- a/libs/Zend/Config/Writer/Xml.php +++ b/libs/Zend/Config/Writer/Xml.php @@ -22,12 +22,12 @@ /** * @see Zend_Config_Writer */ -require_once 'Zend/Config/Writer/FileAbstract.php'; +// require_once 'Zend/Config/Writer/FileAbstract.php'; /** * @see Zend_Config_Xml */ -require_once 'Zend/Config/Xml.php'; +// require_once 'Zend/Config/Xml.php'; /** * @category Zend @@ -101,7 +101,7 @@ class Zend_Config_Writer_Xml extends Zend_Config_Writer_FileAbstract $branchType = 'string'; } } else if ($branchType !== (is_numeric($key) ? 'numeric' : 'string')) { - require_once 'Zend/Config/Exception.php'; + // require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Mixing of string and numeric keys is not allowed'); } diff --git a/libs/Zend/Config/Xml.php b/libs/Zend/Config/Xml.php index fa14b9e42e..698247cec8 100644 --- a/libs/Zend/Config/Xml.php +++ b/libs/Zend/Config/Xml.php @@ -22,7 +22,7 @@ /** * @see Zend_Config */ -require_once 'Zend/Config.php'; +// require_once 'Zend/Config.php'; /** * XML Adapter for Zend_Config @@ -68,7 +68,7 @@ class Zend_Config_Xml extends Zend_Config public function __construct($xml, $section = null, $options = false) { if (empty($xml)) { - require_once 'Zend/Config/Exception.php'; + // require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception('Filename is not set'); } @@ -94,7 +94,7 @@ class Zend_Config_Xml extends Zend_Config 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); } @@ -109,7 +109,7 @@ class Zend_Config_Xml extends Zend_Config $dataArray = array(); foreach ($section as $sectionName) { if (!isset($config->$sectionName)) { - require_once 'Zend/Config/Exception.php'; + // require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Section '$sectionName' cannot be found in $xml"); } @@ -119,7 +119,7 @@ class Zend_Config_Xml extends Zend_Config 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"); } @@ -148,7 +148,7 @@ class Zend_Config_Xml extends Zend_Config protected function _processExtends(SimpleXMLElement $element, $section, array $config = array()) { if (!isset($element->$section)) { - require_once 'Zend/Config/Exception.php'; + // require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Section '$section' cannot be found"); } @@ -205,7 +205,7 @@ class Zend_Config_Xml extends Zend_Config // 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"); } @@ -224,14 +224,14 @@ class Zend_Config_Xml extends Zend_Config switch ($node->localName) { case 'const': if (!$node->hasAttributeNS(self::XML_NAMESPACE, 'name')) { - require_once 'Zend/Config/Exception.php'; + // require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Misssing 'name' attribute in 'const' node"); } $constantName = $node->getAttributeNS(self::XML_NAMESPACE, 'name'); if (!defined($constantName)) { - require_once 'Zend/Config/Exception.php'; + // require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Constant with name '$constantName' was not defined"); } @@ -241,7 +241,7 @@ class Zend_Config_Xml extends Zend_Config break; default: - require_once 'Zend/Config/Exception.php'; + // require_once 'Zend/Config/Exception.php'; throw new Zend_Config_Exception("Unknown node with name '$node->localName' found"); } } diff --git a/libs/Zend/Db.php b/libs/Zend/Db.php index eb0070ce13..9bbf1e793f 100644 --- a/libs/Zend/Db.php +++ b/libs/Zend/Db.php @@ -219,7 +219,7 @@ class Zend_Db /** * @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'); } @@ -230,7 +230,7 @@ class Zend_Db /** * @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'); } @@ -253,10 +253,10 @@ class Zend_Db * Load the adapter class. This throws an exception * if the specified class cannot be loaded. */ - if (!class_exists($adapterName)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($adapterName); - } + // if (!class_exists($adapterName)) { + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($adapterName); + // } /* * Create an instance of the adapter class. @@ -271,7 +271,7 @@ class Zend_Db /** * @see Zend_Db_Exception */ - require_once 'Zend/Db/Exception.php'; + // require_once 'Zend/Db/Exception.php'; throw new Zend_Db_Exception("Adapter class '$adapterName' does not extend Zend_Db_Adapter_Abstract"); } diff --git a/libs/Zend/Db/Adapter/Abstract.php b/libs/Zend/Db/Adapter/Abstract.php index ac9403ef28..09ab9e692d 100644 --- a/libs/Zend/Db/Adapter/Abstract.php +++ b/libs/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. @@ -175,7 +175,7 @@ abstract class Zend_Db_Adapter_Abstract /** * @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'); } } @@ -230,7 +230,7 @@ abstract class Zend_Db_Adapter_Abstract 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'); } @@ -272,7 +272,7 @@ abstract class Zend_Db_Adapter_Abstract // 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"); } @@ -280,7 +280,7 @@ abstract class Zend_Db_Adapter_Abstract /** * @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"); } @@ -288,7 +288,7 @@ abstract class Zend_Db_Adapter_Abstract /** * @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"); } } @@ -358,7 +358,7 @@ abstract class Zend_Db_Adapter_Abstract /** * @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'); } @@ -379,16 +379,16 @@ abstract class Zend_Db_Adapter_Abstract } if ($profilerInstance === null) { - if (!class_exists($profilerClass)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($profilerClass); - } + // if (!class_exists($profilerClass)) { + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($profilerClass); + // } $profilerInstance = new $profilerClass(); } 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'); } @@ -579,7 +579,7 @@ abstract class Zend_Db_Adapter_Abstract $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"); } } @@ -1097,7 +1097,7 @@ abstract class Zend_Db_Adapter_Abstract { 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"); } $this->_connection = false; diff --git a/libs/Zend/Db/Adapter/Db2.php b/libs/Zend/Db/Adapter/Db2.php index 7181a45faf..bde2100793 100644 --- a/libs/Zend/Db/Adapter/Db2.php +++ b/libs/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 @@ class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract /** * @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'); } @@ -184,7 +184,7 @@ class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract /** * @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()); } } @@ -223,10 +223,10 @@ class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract { $this->_connect(); $stmtClass = $this->_defaultStmtClass; - if (!class_exists($stmtClass)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($stmtClass); - } + // if (!class_exists($stmtClass)) { + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($stmtClass); + // } $stmt = new $stmtClass($this, $sql); $stmt->setFetchMode($this->_fetchMode); return $stmt; @@ -258,7 +258,7 @@ class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract /** * @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; } @@ -583,7 +583,7 @@ class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract /** * @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)); @@ -603,7 +603,7 @@ class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract /** * @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)); @@ -631,14 +631,14 @@ class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Db2_Exception */ - require_once 'Zend/Db/Adapter/Db2/Exception.php'; + // require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception('FETCH_BOUND is not supported yet'); break; default: /** * @see Zend_Db_Adapter_Db2_Exception */ - require_once 'Zend/Db/Adapter/Db2/Exception.php'; + // require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception("Invalid fetch mode '$mode' specified"); break; } @@ -659,7 +659,7 @@ class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract /** * @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"); } @@ -668,7 +668,7 @@ class Zend_Db_Adapter_Db2 extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Db2_Exception */ - require_once 'Zend/Db/Adapter/Db2/Exception.php'; + // require_once 'Zend/Db/Adapter/Db2/Exception.php'; throw new Zend_Db_Adapter_Db2_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/libs/Zend/Db/Adapter/Db2/Exception.php b/libs/Zend/Db/Adapter/Db2/Exception.php index 2ee356d40c..8104606d59 100644 --- a/libs/Zend/Db/Adapter/Db2/Exception.php +++ b/libs/Zend/Db/Adapter/Db2/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Adapter_Exception */ -require_once 'Zend/Db/Adapter/Exception.php'; +// require_once 'Zend/Db/Adapter/Exception.php'; /** * Zend_Db_Adapter_Db2_Exception diff --git a/libs/Zend/Db/Adapter/Exception.php b/libs/Zend/Db/Adapter/Exception.php index 06585c1784..2510ef6526 100644 --- a/libs/Zend/Db/Adapter/Exception.php +++ b/libs/Zend/Db/Adapter/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Exception */ -require_once 'Zend/Db/Exception.php'; +// require_once 'Zend/Db/Exception.php'; /** * @category Zend diff --git a/libs/Zend/Db/Adapter/Mysqli.php b/libs/Zend/Db/Adapter/Mysqli.php index a92a00fef8..eb9437d059 100644 --- a/libs/Zend/Db/Adapter/Mysqli.php +++ b/libs/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 @@ class Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract /** * @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 @@ class Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract /** * @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 @@ class Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract /** * @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'); } @@ -329,7 +329,7 @@ class Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract /** * @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()); } @@ -374,10 +374,10 @@ class Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract $this->_stmt->close(); } $stmtClass = $this->_defaultStmtClass; - if (!class_exists($stmtClass)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($stmtClass); - } + // if (!class_exists($stmtClass)) { + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($stmtClass); + // } $stmt = new $stmtClass($this, $sql); if ($stmt === false) { return false; @@ -467,14 +467,14 @@ class Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Mysqli_Exception */ - require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; + // require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; throw new Zend_Db_Adapter_Mysqli_Exception('FETCH_BOUND is not supported yet'); break; default: /** * @see Zend_Db_Adapter_Mysqli_Exception */ - require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; + // require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; throw new Zend_Db_Adapter_Mysqli_Exception("Invalid fetch mode '$mode' specified"); } } @@ -494,7 +494,7 @@ class Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract /** * @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"); } @@ -503,7 +503,7 @@ class Zend_Db_Adapter_Mysqli extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Mysqli_Exception */ - require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; + // require_once 'Zend/Db/Adapter/Mysqli/Exception.php'; throw new Zend_Db_Adapter_Mysqli_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/libs/Zend/Db/Adapter/Mysqli/Exception.php b/libs/Zend/Db/Adapter/Mysqli/Exception.php index 2c3eb93efd..f7f9f4a8fa 100644 --- a/libs/Zend/Db/Adapter/Mysqli/Exception.php +++ b/libs/Zend/Db/Adapter/Mysqli/Exception.php @@ -24,7 +24,7 @@ /** * Zend */ -require_once 'Zend/Db/Adapter/Exception.php'; +// require_once 'Zend/Db/Adapter/Exception.php'; /** * Zend_Db_Adapter_Mysqli_Exception diff --git a/libs/Zend/Db/Adapter/Oracle.php b/libs/Zend/Db/Adapter/Oracle.php index 474a8d0f88..17fb8488f4 100644 --- a/libs/Zend/Db/Adapter/Oracle.php +++ b/libs/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 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract /** * @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 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract /** * @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()); } } @@ -204,10 +204,10 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract { $this->_connect(); $stmtClass = $this->_defaultStmtClass; - if (!class_exists($stmtClass)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($stmtClass); - } + // if (!class_exists($stmtClass)) { + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($stmtClass); + // } $stmt = new $stmtClass($this, $sql); if ($stmt instanceof Zend_Db_Statement_Oracle) { $stmt->setLobAsString($this->getLobAsString()); @@ -467,7 +467,7 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract /** * @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); @@ -485,7 +485,7 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract /** * @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); @@ -513,14 +513,14 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Adapter/Oracle/Exception.php'; + // require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception('FETCH_BOUND is not supported yet'); break; default: /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Adapter/Oracle/Exception.php'; + // require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception("Invalid fetch mode '$mode' specified"); break; } @@ -542,7 +542,7 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract /** * @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"); } @@ -551,7 +551,7 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract /** * @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 @@ class Zend_Db_Adapter_Oracle extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Adapter/Oracle/Exception.php'; + // require_once 'Zend/Db/Adapter/Oracle/Exception.php'; throw new Zend_Db_Adapter_Oracle_Exception("Invalid execution mode '$mode' specified"); break; } diff --git a/libs/Zend/Db/Adapter/Oracle/Exception.php b/libs/Zend/Db/Adapter/Oracle/Exception.php index 61f4a3dc88..a2f43ae893 100644 --- a/libs/Zend/Db/Adapter/Oracle/Exception.php +++ b/libs/Zend/Db/Adapter/Oracle/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Adapter_Exception */ -require_once 'Zend/Db/Adapter/Exception.php'; +// require_once 'Zend/Db/Adapter/Exception.php'; /** * Zend_Db_Adapter_Oracle_Exception diff --git a/libs/Zend/Db/Adapter/Pdo/Abstract.php b/libs/Zend/Db/Adapter/Pdo/Abstract.php index 97dd2fdf8f..0ffc1f428f 100644 --- a/libs/Zend/Db/Adapter/Pdo/Abstract.php +++ b/libs/Zend/Db/Adapter/Pdo/Abstract.php @@ -24,13 +24,13 @@ /** * @see Zend_Db_Adapter_Abstract */ -require_once 'Zend/Db/Adapter/Abstract.php'; +// require_once 'Zend/Db/Adapter/Abstract.php'; /** * @see Zend_Db_Statement_Pdo */ -require_once 'Zend/Db/Statement/Pdo.php'; +// require_once 'Zend/Db/Statement/Pdo.php'; /** @@ -99,7 +99,7 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception('The PDO extension is required for this adapter but the extension is not loaded'); } @@ -108,7 +108,7 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception('The ' . $this->_pdoType . ' driver is not currently installed'); } @@ -140,7 +140,7 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @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); } @@ -177,10 +177,10 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract { $this->_connect(); $stmtClass = $this->_defaultStmtClass; - if (!class_exists($stmtClass)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($stmtClass); - } + // if (!class_exists($stmtClass)) { + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($stmtClass); + // } $stmt = new $stmtClass($this, $sql); $stmt->setFetchMode($this->_fetchMode); return $stmt; @@ -240,7 +240,7 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Statement_Exception */ - require_once 'Zend/Db/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -267,7 +267,7 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception($errorInfo[2]); } @@ -276,7 +276,7 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @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); } } @@ -338,7 +338,7 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @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) { @@ -354,7 +354,7 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Invalid fetch mode '$mode' specified"); break; } diff --git a/libs/Zend/Db/Adapter/Pdo/Ibm.php b/libs/Zend/Db/Adapter/Pdo/Ibm.php index 92f740d4d0..22738248a9 100644 --- a/libs/Zend/Db/Adapter/Pdo/Ibm.php +++ b/libs/Zend/Db/Adapter/Pdo/Ibm.php @@ -22,16 +22,16 @@ /** @see Zend_Db_Adapter_Pdo_Abstract */ -require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; +// require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; /** @see Zend_Db_Abstract_Pdo_Ibm_Db2 */ -require_once 'Zend/Db/Adapter/Pdo/Ibm/Db2.php'; +// require_once 'Zend/Db/Adapter/Pdo/Ibm/Db2.php'; /** @see Zend_Db_Abstract_Pdo_Ibm_Ids */ -require_once 'Zend/Db/Adapter/Pdo/Ibm/Ids.php'; +// require_once 'Zend/Db/Adapter/Pdo/Ibm/Ids.php'; /** @see Zend_Db_Statement_Pdo_Ibm */ -require_once 'Zend/Db/Statement/Pdo/Ibm.php'; +// require_once 'Zend/Db/Statement/Pdo/Ibm.php'; /** @@ -131,7 +131,7 @@ class Zend_Db_Adapter_Pdo_Ibm extends Zend_Db_Adapter_Pdo_Abstract } } catch (PDOException $e) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; $error = strpos($e->getMessage(), 'driver does not support that attribute'); if ($error) { throw new Zend_Db_Adapter_Exception("PDO_IBM driver extension is downlevel. Please use driver release version 1.2.1 or later", 0, $e); @@ -178,7 +178,7 @@ class Zend_Db_Adapter_Pdo_Ibm extends Zend_Db_Adapter_Pdo_Abstract if (array_key_exists('host', $this->_config) && !array_key_exists('port', $config)) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration must have a key for 'port' when 'host' is specified"); } } diff --git a/libs/Zend/Db/Adapter/Pdo/Ibm/Db2.php b/libs/Zend/Db/Adapter/Pdo/Ibm/Db2.php index 214b71626c..94899d4462 100644 --- a/libs/Zend/Db/Adapter/Pdo/Ibm/Db2.php +++ b/libs/Zend/Db/Adapter/Pdo/Ibm/Db2.php @@ -22,10 +22,10 @@ /** @see Zend_Db_Adapter_Pdo_Ibm */ -require_once 'Zend/Db/Adapter/Pdo/Ibm.php'; +// require_once 'Zend/Db/Adapter/Pdo/Ibm.php'; /** @see Zend_Db_Statement_Pdo_Ibm */ -require_once 'Zend/Db/Statement/Pdo/Ibm.php'; +// require_once 'Zend/Db/Statement/Pdo/Ibm.php'; /** @@ -168,13 +168,13 @@ class Zend_Db_Adapter_Pdo_Ibm_Db2 $count = intval($count); if ($count < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } else { $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/libs/Zend/Db/Adapter/Pdo/Ibm/Ids.php b/libs/Zend/Db/Adapter/Pdo/Ibm/Ids.php index 7c710b45d6..5777e5621c 100644 --- a/libs/Zend/Db/Adapter/Pdo/Ibm/Ids.php +++ b/libs/Zend/Db/Adapter/Pdo/Ibm/Ids.php @@ -22,10 +22,10 @@ /** @see Zend_Db_Adapter_Pdo_Ibm */ -require_once 'Zend/Db/Adapter/Pdo/Ibm.php'; +// require_once 'Zend/Db/Adapter/Pdo/Ibm.php'; /** @see Zend_Db_Statement_Pdo_Ibm */ -require_once 'Zend/Db/Statement/Pdo/Ibm.php'; +// require_once 'Zend/Db/Statement/Pdo/Ibm.php'; /** @@ -250,7 +250,7 @@ class Zend_Db_Adapter_Pdo_Ibm_Ids $count = intval($count); if ($count < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } else if ($count == 0) { $limit_sql = str_ireplace("SELECT", "SELECT * FROM (SELECT", $sql); @@ -259,7 +259,7 @@ class Zend_Db_Adapter_Pdo_Ibm_Ids $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } if ($offset == 0) { diff --git a/libs/Zend/Db/Adapter/Pdo/Mssql.php b/libs/Zend/Db/Adapter/Pdo/Mssql.php index 3c3fb7710f..0bd7a1bfbd 100644 --- a/libs/Zend/Db/Adapter/Pdo/Mssql.php +++ b/libs/Zend/Db/Adapter/Pdo/Mssql.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Adapter_Pdo_Abstract */ -require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; +// require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; /** @@ -319,14 +319,14 @@ class Zend_Db_Adapter_Pdo_Mssql extends Zend_Db_Adapter_Pdo_Abstract $count = intval($count); if ($count <= 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/libs/Zend/Db/Adapter/Pdo/Mysql.php b/libs/Zend/Db/Adapter/Pdo/Mysql.php index 768b887115..0e4d794922 100644 --- a/libs/Zend/Db/Adapter/Pdo/Mysql.php +++ b/libs/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'; /** @@ -235,14 +235,14 @@ class Zend_Db_Adapter_Pdo_Mysql extends Zend_Db_Adapter_Pdo_Abstract $count = intval($count); if ($count <= 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/libs/Zend/Db/Adapter/Pdo/Oci.php b/libs/Zend/Db/Adapter/Pdo/Oci.php index 195cdd3375..fb47ad1c0b 100644 --- a/libs/Zend/Db/Adapter/Pdo/Oci.php +++ b/libs/Zend/Db/Adapter/Pdo/Oci.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Adapter_Pdo_Abstract */ -require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; +// require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; /** @@ -347,14 +347,14 @@ class Zend_Db_Adapter_Pdo_Oci extends Zend_Db_Adapter_Pdo_Abstract $count = intval($count); if ($count <= 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/libs/Zend/Db/Adapter/Pdo/Pgsql.php b/libs/Zend/Db/Adapter/Pdo/Pgsql.php index d4fb174516..bec14b569b 100644 --- a/libs/Zend/Db/Adapter/Pdo/Pgsql.php +++ b/libs/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 @@ class Zend_Db_Adapter_Pdo_Pgsql extends Zend_Db_Adapter_Pdo_Abstract /** * @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 @@ class Zend_Db_Adapter_Pdo_Pgsql extends Zend_Db_Adapter_Pdo_Abstract /** * @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/libs/Zend/Db/Adapter/Pdo/Sqlite.php b/libs/Zend/Db/Adapter/Pdo/Sqlite.php index afc26c53e7..f1e6562ef7 100644 --- a/libs/Zend/Db/Adapter/Pdo/Sqlite.php +++ b/libs/Zend/Db/Adapter/Pdo/Sqlite.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Adapter_Pdo_Abstract */ -require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; +// require_once 'Zend/Db/Adapter/Pdo/Abstract.php'; /** @@ -106,7 +106,7 @@ class Zend_Db_Adapter_Pdo_Sqlite extends Zend_Db_Adapter_Pdo_Abstract // we need at least a dbname if (! array_key_exists('dbname', $config)) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("Configuration array must have a key for 'dbname' that names the database instance"); } } @@ -140,7 +140,7 @@ class Zend_Db_Adapter_Pdo_Sqlite extends Zend_Db_Adapter_Pdo_Abstract if ($retval === false) { $error = $this->_connection->errorInfo(); /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception($error[2]); } @@ -148,7 +148,7 @@ class Zend_Db_Adapter_Pdo_Sqlite extends Zend_Db_Adapter_Pdo_Abstract if ($retval === false) { $error = $this->_connection->errorInfo(); /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception($error[2]); } } @@ -275,14 +275,14 @@ class Zend_Db_Adapter_Pdo_Sqlite extends Zend_Db_Adapter_Pdo_Abstract $count = intval($count); if ($count <= 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/libs/Zend/Db/Adapter/Sqlsrv.php b/libs/Zend/Db/Adapter/Sqlsrv.php index 6cccc9f5eb..533523759e 100644 --- a/libs/Zend/Db/Adapter/Sqlsrv.php +++ b/libs/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 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract /** * @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 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract /** * @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 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract // 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 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract /** * @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 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract /** * @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 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract $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'"); } @@ -287,13 +287,13 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract $this->_connect(); $stmtClass = $this->_defaultStmtClass; - if (!class_exists($stmtClass)) { + // if (!class_exists($stmtClass)) { /** * @see Zend_Loader */ - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($stmtClass); - } + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($stmtClass); + // } $stmt = new $stmtClass($this, $sql); $stmt->setFetchMode($this->_fetchMode); @@ -519,7 +519,7 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract 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()); } } @@ -533,7 +533,7 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract 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()); } } @@ -547,7 +547,7 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract 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()); } } @@ -571,11 +571,11 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract $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; } @@ -594,14 +594,14 @@ class Zend_Db_Adapter_Sqlsrv extends Zend_Db_Adapter_Abstract { $count = intval($count); if ($count <= 0) { - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument count=$count is not valid"); } $offset = intval($offset); if ($offset < 0) { /** @see Zend_Db_Adapter_Exception */ - require_once 'Zend/Db/Adapter/Exception.php'; + // require_once 'Zend/Db/Adapter/Exception.php'; throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } diff --git a/libs/Zend/Db/Adapter/Sqlsrv/Exception.php b/libs/Zend/Db/Adapter/Sqlsrv/Exception.php index 75fd142676..1f68aa9c56 100644 --- a/libs/Zend/Db/Adapter/Sqlsrv/Exception.php +++ b/libs/Zend/Db/Adapter/Sqlsrv/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Adapter_Exception */ -require_once 'Zend/Db/Adapter/Exception.php'; +// require_once 'Zend/Db/Adapter/Exception.php'; /** * Zend_Db_Adapter_Sqlsrv_Exception diff --git a/libs/Zend/Db/Exception.php b/libs/Zend/Db/Exception.php index 2d1987c6e2..43e374b1b0 100644 --- a/libs/Zend/Db/Exception.php +++ b/libs/Zend/Db/Exception.php @@ -22,7 +22,7 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/libs/Zend/Db/Profiler.php b/libs/Zend/Db/Profiler.php index 007fa78886..9d695b877d 100644 --- a/libs/Zend/Db/Profiler.php +++ b/libs/Zend/Db/Profiler.php @@ -278,7 +278,7 @@ class Zend_Db_Profiler /** * @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); @@ -306,7 +306,7 @@ class 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("Profiler has no query with handle '$queryId'."); } @@ -317,7 +317,7 @@ class 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("Query with profiler handle '$queryId' has already ended."); } @@ -359,7 +359,7 @@ class 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("Query handle '$queryId' not found in profiler log."); } diff --git a/libs/Zend/Db/Profiler/Exception.php b/libs/Zend/Db/Profiler/Exception.php index 9af1232469..6caab626f7 100644 --- a/libs/Zend/Db/Profiler/Exception.php +++ b/libs/Zend/Db/Profiler/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Exception */ -require_once 'Zend/Db/Exception.php'; +// require_once 'Zend/Db/Exception.php'; /** diff --git a/libs/Zend/Db/Profiler/Firebug.php b/libs/Zend/Db/Profiler/Firebug.php index 6be53add05..0ffaf142be 100644 --- a/libs/Zend/Db/Profiler/Firebug.php +++ b/libs/Zend/Db/Profiler/Firebug.php @@ -21,13 +21,13 @@ */ /** Zend_Db_Profiler */ -require_once 'Zend/Db/Profiler.php'; +// require_once 'Zend/Db/Profiler.php'; /** Zend_Wildfire_Plugin_FirePhp */ -require_once 'Zend/Wildfire/Plugin/FirePhp.php'; +// require_once 'Zend/Wildfire/Plugin/FirePhp.php'; /** Zend_Wildfire_Plugin_FirePhp_TableMessage */ -require_once 'Zend/Wildfire/Plugin/FirePhp/TableMessage.php'; +// require_once 'Zend/Wildfire/Plugin/FirePhp/TableMessage.php'; /** * Writes DB events as log messages to the Firebug Console via FirePHP. diff --git a/libs/Zend/Db/Select.php b/libs/Zend/Db/Select.php index 4ef6536ba0..721f3ec859 100644 --- a/libs/Zend/Db/Select.php +++ b/libs/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'; /** @@ -251,7 +251,7 @@ class Zend_Db_Select /** * @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"); } @@ -280,14 +280,14 @@ class Zend_Db_Select public function union($select = array(), $type = self::SQL_UNION) { if (!is_array($select)) { - require_once 'Zend/Db/Select/Exception.php'; + // require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception( "union() only accepts an array of Zend_Db_Select instances of sql query strings." ); } if (!in_array($type, self::$_unionTypes)) { - require_once 'Zend/Db/Select/Exception.php'; + // require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Invalid union type '{$type}'"); } @@ -664,7 +664,7 @@ class Zend_Db_Select { $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]; @@ -757,12 +757,12 @@ class Zend_Db_Select /** * @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); } @@ -804,7 +804,7 @@ class Zend_Db_Select /** * @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"); } @@ -873,7 +873,7 @@ class Zend_Db_Select 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"); } @@ -992,7 +992,7 @@ class Zend_Db_Select 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); } @@ -1314,11 +1314,11 @@ class Zend_Db_Select if ($type) { $type .= ' join'; if (!in_array($type, self::$_joinTypes)) { - require_once 'Zend/Db/Select/Exception.php'; + // require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Unrecognized method '$method()'"); } if (in_array($type, array(self::CROSS_JOIN, self::NATURAL_JOIN))) { - require_once 'Zend/Db/Select/Exception.php'; + // require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Cannot perform a joinUsing with method '$method()'"); } } else { @@ -1328,7 +1328,7 @@ class Zend_Db_Select return call_user_func_array(array($this, '_joinUsing'), $args); } - require_once 'Zend/Db/Select/Exception.php'; + // require_once 'Zend/Db/Select/Exception.php'; throw new Zend_Db_Select_Exception("Unrecognized method '$method()'"); } diff --git a/libs/Zend/Db/Select/Exception.php b/libs/Zend/Db/Select/Exception.php index d95fdb20de..dc02cb40ab 100644 --- a/libs/Zend/Db/Select/Exception.php +++ b/libs/Zend/Db/Select/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Exception */ -require_once 'Zend/Db/Exception.php'; +// require_once 'Zend/Db/Exception.php'; /** * @category Zend diff --git a/libs/Zend/Db/Statement.php b/libs/Zend/Db/Statement.php index 6e8d20a4ab..df99fa0133 100644 --- a/libs/Zend/Db/Statement.php +++ b/libs/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 @@ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface /** * @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 @@ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface /** * @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'"); } } @@ -241,7 +241,7 @@ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface /** * @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'); } @@ -263,7 +263,7 @@ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface /** * @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'"); } @@ -433,7 +433,7 @@ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface /** * @see Zend_Db_Statement_Exception */ - require_once 'Zend/Db/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception('invalid fetch mode'); break; } diff --git a/libs/Zend/Db/Statement/Db2.php b/libs/Zend/Db/Statement/Db2.php index eec6575306..729d65c61a 100644 --- a/libs/Zend/Db/Statement/Db2.php +++ b/libs/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 @@ class Zend_Db_Statement_Db2 extends Zend_Db_Statement /** * @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 @@ class Zend_Db_Statement_Db2 extends Zend_Db_Statement /** * @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 @@ class Zend_Db_Statement_Db2 extends Zend_Db_Statement /** * @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 @@ class Zend_Db_Statement_Db2 extends Zend_Db_Statement /** * @see Zend_Db_Statement_Db2_Exception */ - require_once 'Zend/Db/Statement/Db2/Exception.php'; + // require_once 'Zend/Db/Statement/Db2/Exception.php'; throw new Zend_Db_Statement_Db2_Exception("Invalid fetch mode '$style' specified"); break; } @@ -306,7 +306,7 @@ class Zend_Db_Statement_Db2 extends Zend_Db_Statement /** * @see Zend_Db_Statement_Db2_Exception */ - require_once 'Zend/Db/Statement/Db2/Exception.php'; + // require_once 'Zend/Db/Statement/Db2/Exception.php'; throw new Zend_Db_Statement_Db2_Exception(__FUNCTION__ . '() is not implemented'); } diff --git a/libs/Zend/Db/Statement/Db2/Exception.php b/libs/Zend/Db/Statement/Db2/Exception.php index d758854d8f..d77b5d830c 100644 --- a/libs/Zend/Db/Statement/Db2/Exception.php +++ b/libs/Zend/Db/Statement/Db2/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Statement_Exception */ -require_once 'Zend/Db/Statement/Exception.php'; +// require_once 'Zend/Db/Statement/Exception.php'; /** * @package Zend_Db diff --git a/libs/Zend/Db/Statement/Exception.php b/libs/Zend/Db/Statement/Exception.php index f628ea059f..511888a5e3 100644 --- a/libs/Zend/Db/Statement/Exception.php +++ b/libs/Zend/Db/Statement/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Exception */ -require_once 'Zend/Db/Exception.php'; +// require_once 'Zend/Db/Exception.php'; /** * Zend_Db_Statement_Exception diff --git a/libs/Zend/Db/Statement/Mysqli.php b/libs/Zend/Db/Statement/Mysqli.php index 808f692763..51dba7160f 100644 --- a/libs/Zend/Db/Statement/Mysqli.php +++ b/libs/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 @@ class Zend_Db_Statement_Mysqli extends Zend_Db_Statement /** * @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 @@ class Zend_Db_Statement_Mysqli extends Zend_Db_Statement /** * @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 @@ class Zend_Db_Statement_Mysqli extends Zend_Db_Statement /** * @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 @@ class Zend_Db_Statement_Mysqli extends Zend_Db_Statement /** * @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 @@ class Zend_Db_Statement_Mysqli extends Zend_Db_Statement /** * @see Zend_Db_Statement_Mysqli_Exception */ - require_once 'Zend/Db/Statement/Mysqli/Exception.php'; + // require_once 'Zend/Db/Statement/Mysqli/Exception.php'; throw new Zend_Db_Statement_Mysqli_Exception(__FUNCTION__.'() is not implemented'); } diff --git a/libs/Zend/Db/Statement/Mysqli/Exception.php b/libs/Zend/Db/Statement/Mysqli/Exception.php index a1c5ff8e79..4847231476 100644 --- a/libs/Zend/Db/Statement/Mysqli/Exception.php +++ b/libs/Zend/Db/Statement/Mysqli/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Statement_Exception */ -require_once 'Zend/Db/Statement/Exception.php'; +// require_once 'Zend/Db/Statement/Exception.php'; /** * @package Zend_Db diff --git a/libs/Zend/Db/Statement/Oracle.php b/libs/Zend/Db/Statement/Oracle.php index 6aedc93d8a..d84d2bab7f 100644 --- a/libs/Zend/Db/Statement/Oracle.php +++ b/libs/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 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @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 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @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 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @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 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @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 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Statement/Oracle/Exception.php'; + // require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception( array( 'code' => 'HYC00', @@ -337,7 +337,7 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @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 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Statement/Oracle/Exception.php'; + // require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception( array( 'code' => 'HYC00', @@ -402,7 +402,7 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Statement/Oracle/Exception.php'; + // require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception( array( 'code' => 'HYC00', @@ -419,7 +419,7 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @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 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @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 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @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 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @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 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @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 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @see Zend_Db_Statement_Oracle_Exception */ - require_once 'Zend/Db/Statement/Oracle/Exception.php'; + // require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception( array( 'code' => 'HYC00', @@ -567,7 +567,7 @@ class Zend_Db_Statement_Oracle extends Zend_Db_Statement /** * @see Zend_Db_Adapter_Oracle_Exception */ - require_once 'Zend/Db/Statement/Oracle/Exception.php'; + // require_once 'Zend/Db/Statement/Oracle/Exception.php'; throw new Zend_Db_Statement_Oracle_Exception(oci_error($this->_stmt)); } diff --git a/libs/Zend/Db/Statement/Oracle/Exception.php b/libs/Zend/Db/Statement/Oracle/Exception.php index 215477bbcd..d5e21bad3f 100644 --- a/libs/Zend/Db/Statement/Oracle/Exception.php +++ b/libs/Zend/Db/Statement/Oracle/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Statement_Exception */ -require_once 'Zend/Db/Statement/Exception.php'; +// require_once 'Zend/Db/Statement/Exception.php'; /** * @category Zend diff --git a/libs/Zend/Db/Statement/Pdo.php b/libs/Zend/Db/Statement/Pdo.php index 775e401032..b9e9400d28 100644 --- a/libs/Zend/Db/Statement/Pdo.php +++ b/libs/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 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega 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 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega 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 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega } return $this->_stmt->bindParam($parameter, $variable, $type, $length, $options); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } @@ -142,7 +142,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega 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 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega 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 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega 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 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega 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 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega 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 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega return $this->_stmt->execute(); } } 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(), (int) $e->getCode(), $e); } } @@ -252,7 +252,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega 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); } } @@ -290,7 +290,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega 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); } } @@ -307,7 +307,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega 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); } } @@ -325,7 +325,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega 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); } } @@ -342,7 +342,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega 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); } } @@ -359,7 +359,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega 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); } } @@ -377,7 +377,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega 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); } } @@ -395,7 +395,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega 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); } } @@ -413,7 +413,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega 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); } } @@ -431,7 +431,7 @@ class Zend_Db_Statement_Pdo extends Zend_Db_Statement implements IteratorAggrega try { return $this->_stmt->setFetchMode($mode); } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } diff --git a/libs/Zend/Db/Statement/Pdo/Ibm.php b/libs/Zend/Db/Statement/Pdo/Ibm.php index 52eb23b88a..20b6aea7a9 100644 --- a/libs/Zend/Db/Statement/Pdo/Ibm.php +++ b/libs/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 @@ class Zend_Db_Statement_Pdo_Ibm extends Zend_Db_Statement_Pdo return $this->_stmt->bindParam($parameter, $variable, $type, $length, $options); } } catch (PDOException $e) { - require_once 'Zend/Db/Statement/Exception.php'; + // require_once 'Zend/Db/Statement/Exception.php'; throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e); } } diff --git a/libs/Zend/Db/Statement/Pdo/Oci.php b/libs/Zend/Db/Statement/Pdo/Oci.php index 49d82c2870..2306228187 100644 --- a/libs/Zend/Db/Statement/Pdo/Oci.php +++ b/libs/Zend/Db/Statement/Pdo/Oci.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Statement_Pdo */ -require_once 'Zend/Db/Statement/Pdo.php'; +// require_once 'Zend/Db/Statement/Pdo.php'; /** * Proxy class to wrap a PDOStatement object for IBM Databases. diff --git a/libs/Zend/Db/Statement/Sqlsrv.php b/libs/Zend/Db/Statement/Sqlsrv.php index 0460991b87..9663c83ccf 100644 --- a/libs/Zend/Db/Statement/Sqlsrv.php +++ b/libs/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 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement $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 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement $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 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement $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 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement $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 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement 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 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement $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 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement $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 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement 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()); } @@ -402,7 +402,7 @@ class Zend_Db_Statement_Sqlsrv extends Zend_Db_Statement // Strict check is necessary; 0 is a valid return value if ($num_rows === false) { - require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; + // require_once 'Zend/Db/Statement/Sqlsrv/Exception.php'; throw new Zend_Db_Statement_Sqlsrv_Exception(sqlsrv_errors()); } diff --git a/libs/Zend/Db/Statement/Sqlsrv/Exception.php b/libs/Zend/Db/Statement/Sqlsrv/Exception.php index 4c0fb095b5..cbd4cf4d45 100644 --- a/libs/Zend/Db/Statement/Sqlsrv/Exception.php +++ b/libs/Zend/Db/Statement/Sqlsrv/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Db_Statement_Exception */ -require_once 'Zend/Db/Statement/Exception.php'; +// require_once 'Zend/Db/Statement/Exception.php'; /** * @package Zend_Db diff --git a/libs/Zend/Db/Table.php b/libs/Zend/Db/Table.php index 1ff00e91e7..ba22f7f262 100644 --- a/libs/Zend/Db/Table.php +++ b/libs/Zend/Db/Table.php @@ -23,12 +23,12 @@ /** * @see Zend_Db_Table_Abstract */ -require_once 'Zend/Db/Table/Abstract.php'; +// require_once 'Zend/Db/Table/Abstract.php'; /** * @see Zend_Db_Table_Definition */ -require_once 'Zend/Db/Table/Definition.php'; +// require_once 'Zend/Db/Table/Definition.php'; /** * Class for SQL table interface. diff --git a/libs/Zend/Db/Table/Abstract.php b/libs/Zend/Db/Table/Abstract.php index 24235eb01d..e07ed22517 100644 --- a/libs/Zend/Db/Table/Abstract.php +++ b/libs/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. @@ -466,11 +466,11 @@ abstract class Zend_Db_Table_Abstract $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]; @@ -480,7 +480,7 @@ abstract class Zend_Db_Table_Abstract 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"); } @@ -603,11 +603,11 @@ abstract class Zend_Db_Table_Abstract 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; @@ -698,11 +698,11 @@ abstract class Zend_Db_Table_Abstract 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; @@ -750,7 +750,7 @@ abstract class Zend_Db_Table_Abstract 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)); } } @@ -872,7 +872,7 @@ abstract class Zend_Db_Table_Abstract // 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'); } } else if (!is_array($this->_primary)) { @@ -884,7 +884,7 @@ abstract class Zend_Db_Table_Abstract $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 (" @@ -986,7 +986,7 @@ abstract class Zend_Db_Table_Abstract } 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 . '"'); } @@ -1001,7 +1001,7 @@ abstract class Zend_Db_Table_Abstract */ 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)); @@ -1088,7 +1088,7 @@ abstract class Zend_Db_Table_Abstract /** * @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.'); } @@ -1221,12 +1221,12 @@ abstract class Zend_Db_Table_Abstract $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"); } @@ -1243,7 +1243,7 @@ abstract class Zend_Db_Table_Abstract if ($numberTerms == 0) { $numberTerms = $keyValuesCount; } else if ($keyValuesCount != $numberTerms) { - require_once 'Zend/Db/Table/Exception.php'; + // require_once 'Zend/Db/Table/Exception.php'; throw new Zend_Db_Table_Exception("Missing value(s) for the primary key"); } $keyValues = array_values($keyValues); @@ -1276,10 +1276,10 @@ abstract class Zend_Db_Table_Abstract // issue ZF-5775 (empty where clause should return empty rowset) if ($whereClause == null) { $rowsetClass = $this->getRowsetClass(); - if (!class_exists($rowsetClass)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($rowsetClass); - } + // if (!class_exists($rowsetClass)) { + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($rowsetClass); + // } return new $rowsetClass(array('table' => $this, 'rowClass' => $this->getRowClass(), 'stored' => true)); } @@ -1329,10 +1329,10 @@ abstract class Zend_Db_Table_Abstract ); $rowsetClass = $this->getRowsetClass(); - if (!class_exists($rowsetClass)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($rowsetClass); - } + // if (!class_exists($rowsetClass)) { + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($rowsetClass); + // } return new $rowsetClass($data); } @@ -1378,10 +1378,10 @@ abstract class Zend_Db_Table_Abstract ); $rowClass = $this->getRowClass(); - if (!class_exists($rowClass)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($rowClass); - } + // if (!class_exists($rowClass)) { + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($rowClass); + // } return new $rowClass($data); } @@ -1441,10 +1441,10 @@ abstract class Zend_Db_Table_Abstract ); $rowClass = $this->getRowClass(); - if (!class_exists($rowClass)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($rowClass); - } + // if (!class_exists($rowClass)) { + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($rowClass); + // } $row = new $rowClass($config); $row->setFromArray($data); return $row; diff --git a/libs/Zend/Db/Table/Exception.php b/libs/Zend/Db/Table/Exception.php index 7916b84991..3757324052 100644 --- a/libs/Zend/Db/Table/Exception.php +++ b/libs/Zend/Db/Table/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Exception */ -require_once 'Zend/Db/Exception.php'; +// require_once 'Zend/Db/Exception.php'; /** * @category Zend diff --git a/libs/Zend/Db/Table/Row.php b/libs/Zend/Db/Table/Row.php index 435776a512..5e80a644c0 100644 --- a/libs/Zend/Db/Table/Row.php +++ b/libs/Zend/Db/Table/Row.php @@ -24,7 +24,7 @@ /** * @see Zend_Db_Table_Row_Abstract */ -require_once 'Zend/Db/Table/Row/Abstract.php'; +// require_once 'Zend/Db/Table/Row/Abstract.php'; /** diff --git a/libs/Zend/Db/Table/Row/Abstract.php b/libs/Zend/Db/Table/Row/Abstract.php index 944f4382f6..1d4710dbdf 100644 --- a/libs/Zend/Db/Table/Row/Abstract.php +++ b/libs/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 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess 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 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess 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 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess { $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 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess { $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 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess { $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]); @@ -342,7 +342,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess $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"); } @@ -352,13 +352,13 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess $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"); } @@ -451,7 +451,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess * 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'); } @@ -509,7 +509,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess * 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'); } @@ -598,7 +598,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess * 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'); } @@ -687,7 +687,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess 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; @@ -702,7 +702,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess 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"); } @@ -713,7 +713,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess $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; @@ -755,7 +755,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess $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'); } @@ -872,7 +872,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess 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"); } @@ -928,7 +928,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess 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"); } @@ -996,7 +996,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess 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"); } @@ -1016,7 +1016,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess 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"); } @@ -1080,10 +1080,10 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess $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); } } @@ -1149,7 +1149,7 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess 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()'"); } @@ -1174,10 +1174,10 @@ abstract class Zend_Db_Table_Row_Abstract implements ArrayAccess // assume the tableName is the class name if (!class_exists($tableName)) { try { - require_once 'Zend/Loader.php'; + // require_once 'Zend/Loader.php'; Zend_Loader::loadClass($tableName); } catch (Zend_Exception $e) { - require_once 'Zend/Db/Table/Row/Exception.php'; + // require_once 'Zend/Db/Table/Row/Exception.php'; throw new Zend_Db_Table_Row_Exception($e->getMessage(), $e->getCode(), $e); } } diff --git a/libs/Zend/Db/Table/Row/Exception.php b/libs/Zend/Db/Table/Row/Exception.php index c3c717c174..236c4bec42 100644 --- a/libs/Zend/Db/Table/Row/Exception.php +++ b/libs/Zend/Db/Table/Row/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Table_Exception */ -require_once 'Zend/Db/Table/Exception.php'; +// require_once 'Zend/Db/Table/Exception.php'; /** * @category Zend diff --git a/libs/Zend/Db/Table/Rowset.php b/libs/Zend/Db/Table/Rowset.php index b04c5142c8..186abe14fd 100644 --- a/libs/Zend/Db/Table/Rowset.php +++ b/libs/Zend/Db/Table/Rowset.php @@ -25,7 +25,7 @@ /** * @see Zend_Db_Table_Rowset_Abstract */ -require_once 'Zend/Db/Table/Rowset/Abstract.php'; +// require_once 'Zend/Db/Table/Rowset/Abstract.php'; /** diff --git a/libs/Zend/Db/Table/Rowset/Abstract.php b/libs/Zend/Db/Table/Rowset/Abstract.php index c258656a76..8cafadc91e 100644 --- a/libs/Zend/Db/Table/Rowset/Abstract.php +++ b/libs/Zend/Db/Table/Rowset/Abstract.php @@ -111,10 +111,10 @@ abstract class Zend_Db_Table_Rowset_Abstract implements SeekableIterator, Counta if (isset($config['rowClass'])) { $this->_rowClass = $config['rowClass']; } - if (!class_exists($this->_rowClass)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($this->_rowClass); - } + // if (!class_exists($this->_rowClass)) { + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($this->_rowClass); + // } if (isset($config['data'])) { $this->_data = $config['data']; } @@ -321,7 +321,7 @@ abstract class Zend_Db_Table_Rowset_Abstract implements SeekableIterator, Counta { $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; @@ -390,7 +390,7 @@ abstract class Zend_Db_Table_Rowset_Abstract implements SeekableIterator, Counta $this->seek($position); $row = $this->current(); } 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); } if ($seek == false) { diff --git a/libs/Zend/Db/Table/Rowset/Exception.php b/libs/Zend/Db/Table/Rowset/Exception.php index 8bdaedd17e..8696c74e06 100644 --- a/libs/Zend/Db/Table/Rowset/Exception.php +++ b/libs/Zend/Db/Table/Rowset/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Table_Exception */ -require_once 'Zend/Db/Table/Exception.php'; +// require_once 'Zend/Db/Table/Exception.php'; /** * @category Zend diff --git a/libs/Zend/Db/Table/Select.php b/libs/Zend/Db/Table/Select.php index 2f23f88f47..699c071884 100644 --- a/libs/Zend/Db/Table/Select.php +++ b/libs/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 @@ class Zend_Db_Table_Select extends Zend_Db_Select // Check each column to ensure it only references the primary table if ($column) { if (!isset($from[$table]) || $from[$table]['tableName'] != $primary) { - require_once 'Zend/Db/Table/Select/Exception.php'; + // require_once 'Zend/Db/Table/Select/Exception.php'; throw new Zend_Db_Table_Select_Exception('Select query cannot join with another table'); } } diff --git a/libs/Zend/Db/Table/Select/Exception.php b/libs/Zend/Db/Table/Select/Exception.php index c93c861310..ac03702c2d 100644 --- a/libs/Zend/Db/Table/Select/Exception.php +++ b/libs/Zend/Db/Table/Select/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Db_Exception */ -require_once 'Zend/Db/Select/Exception.php'; +// require_once 'Zend/Db/Select/Exception.php'; /** * @category Zend diff --git a/libs/Zend/Feed.php b/libs/Zend/Feed.php index 93154a91c9..5e4d7b0894 100644 --- a/libs/Zend/Feed.php +++ b/libs/Zend/Feed.php @@ -84,7 +84,7 @@ class Zend_Feed /** * @see Zend_Http_Client */ - require_once 'Zend/Http/Client.php'; + // require_once 'Zend/Http/Client.php'; self::$_httpClient = new Zend_Http_Client(); } @@ -173,7 +173,7 @@ class Zend_Feed /** * @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(); @@ -194,7 +194,7 @@ class Zend_Feed $libxml_errflag = libxml_use_internal_errors(true); $doc = new DOMDocument; 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'); } @@ -216,7 +216,7 @@ class Zend_Feed /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception($errormsg); } @@ -226,7 +226,7 @@ class Zend_Feed /** * @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); } @@ -236,7 +236,7 @@ class Zend_Feed /** * @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); } @@ -245,7 +245,7 @@ class Zend_Feed /** * @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'); } @@ -266,7 +266,7 @@ class Zend_Feed /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception("File could not be loaded: $php_errormsg"); } return self::importString($feed); @@ -293,7 +293,7 @@ class Zend_Feed /** * @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(); @@ -307,7 +307,7 @@ class Zend_Feed /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception("Internal error: $php_errormsg"); } @@ -380,15 +380,15 @@ class Zend_Feed public static function importArray(array $data, $format = 'atom') { $obj = 'Zend_Feed_' . ucfirst(strtolower($format)); - if (!class_exists($obj)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($obj); - } + // if (!class_exists($obj)) { + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($obj); + // } /** * @see Zend_Feed_Builder */ - require_once 'Zend/Feed/Builder.php'; + // require_once 'Zend/Feed/Builder.php'; return new $obj(null, null, new Zend_Feed_Builder($data)); } @@ -402,10 +402,10 @@ class Zend_Feed public static function importBuilder(Zend_Feed_Builder_Interface $builder, $format = 'atom') { $obj = 'Zend_Feed_' . ucfirst(strtolower($format)); - if (!class_exists($obj)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($obj); - } + // if (!class_exists($obj)) { + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($obj); + // } return new $obj(null, null, $builder); } } diff --git a/libs/Zend/Feed/Abstract.php b/libs/Zend/Feed/Abstract.php index 5cba5a2519..8cd77dee7c 100644 --- a/libs/Zend/Feed/Abstract.php +++ b/libs/Zend/Feed/Abstract.php @@ -24,7 +24,7 @@ /** * @see Zend_Feed_Element */ -require_once 'Zend/Feed/Element.php'; +// require_once 'Zend/Feed/Element.php'; /** @@ -80,7 +80,7 @@ abstract class Zend_Feed_Abstract extends Zend_Feed_Element implements Iterator, /** * @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()); } $this->_element = $response->getBody(); @@ -127,7 +127,7 @@ abstract class Zend_Feed_Abstract extends Zend_Feed_Element implements Iterator, /** * @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: $php_errormsg"); } diff --git a/libs/Zend/Feed/Atom.php b/libs/Zend/Feed/Atom.php index 186cde50aa..8a723f862d 100644 --- a/libs/Zend/Feed/Atom.php +++ b/libs/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 @@ class Zend_Feed_Atom extends Zend_Feed_Abstract /** * @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 @@ class Zend_Feed_Atom extends Zend_Feed_Abstract /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Cannot send ATOM because headers have already been sent.'); } diff --git a/libs/Zend/Feed/Builder.php b/libs/Zend/Feed/Builder.php index b44055ec26..a9517ce5be 100644 --- a/libs/Zend/Feed/Builder.php +++ b/libs/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 @@ class Zend_Feed_Builder implements Zend_Feed_Builder_Interface /** * @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 @@ class Zend_Feed_Builder implements Zend_Feed_Builder_Interface /** * @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 @@ class Zend_Feed_Builder implements Zend_Feed_Builder_Interface /** * @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 @@ class Zend_Feed_Builder implements Zend_Feed_Builder_Interface /** * @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 @@ class Zend_Feed_Builder implements Zend_Feed_Builder_Interface /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + // require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("$mandatory key of source property is missing"); } } diff --git a/libs/Zend/Feed/Builder/Entry.php b/libs/Zend/Feed/Builder/Entry.php index d27dded6f7..6e7edc67b0 100644 --- a/libs/Zend/Feed/Builder/Entry.php +++ b/libs/Zend/Feed/Builder/Entry.php @@ -224,7 +224,7 @@ class Zend_Feed_Builder_Entry extends ArrayObject /** * @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 @@ class Zend_Feed_Builder_Entry extends ArrayObject /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + // require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("you have to supply an url for your enclosure"); } $type = isset($enclosure['type']) ? $enclosure['type'] : ''; diff --git a/libs/Zend/Feed/Builder/Exception.php b/libs/Zend/Feed/Builder/Exception.php index c979321cff..9037cc891a 100644 --- a/libs/Zend/Feed/Builder/Exception.php +++ b/libs/Zend/Feed/Builder/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Feed_Exception */ -require_once 'Zend/Feed/Exception.php'; +// require_once 'Zend/Feed/Exception.php'; /** diff --git a/libs/Zend/Feed/Builder/Header.php b/libs/Zend/Feed/Builder/Header.php index fe9ecc34f2..51a57953f2 100644 --- a/libs/Zend/Feed/Builder/Header.php +++ b/libs/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 @@ class Zend_Feed_Builder_Header extends ArrayObject /** * @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 @@ class Zend_Feed_Builder_Header extends ArrayObject /** * @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 @@ class Zend_Feed_Builder_Header extends ArrayObject /** * @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 @@ class Zend_Feed_Builder_Header extends ArrayObject /** * @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 @@ class Zend_Feed_Builder_Header extends ArrayObject /** * @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 @@ class Zend_Feed_Builder_Header extends ArrayObject /** * @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 @@ class Zend_Feed_Builder_Header extends ArrayObject /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + // require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("you can not have more than 7 days in the skipDays property"); } $valid = array('monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday'); @@ -401,7 +401,7 @@ class Zend_Feed_Builder_Header extends ArrayObject /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + // require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("$day is not a valid day"); } } diff --git a/libs/Zend/Feed/Builder/Header/Itunes.php b/libs/Zend/Feed/Builder/Header/Itunes.php index 9c25653f5d..9445460c07 100644 --- a/libs/Zend/Feed/Builder/Header/Itunes.php +++ b/libs/Zend/Feed/Builder/Header/Itunes.php @@ -66,14 +66,14 @@ class Zend_Feed_Builder_Header_Itunes extends ArrayObject /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + // require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("you have to set at least one itunes category"); } if ($nb > 3) { /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + // require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("you have to set at most three itunes categories"); } foreach ($categories as $i => $category) { @@ -81,7 +81,7 @@ class Zend_Feed_Builder_Header_Itunes extends ArrayObject /** * @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 @@ class Zend_Feed_Builder_Header_Itunes extends ArrayObject /** * @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 @@ class Zend_Feed_Builder_Header_Itunes extends ArrayObject /** * @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 @@ class Zend_Feed_Builder_Header_Itunes extends ArrayObject /** * @see Zend_Feed_Builder_Exception */ - require_once 'Zend/Feed/Builder/Exception.php'; + // require_once 'Zend/Feed/Builder/Exception.php'; throw new Zend_Feed_Builder_Exception("you have to set yes, no or clean to the itunes explicit property"); } $this->offsetSet('explicit', $explicit); diff --git a/libs/Zend/Feed/Element.php b/libs/Zend/Feed/Element.php index 9d452f1996..b7a8e632f2 100644 --- a/libs/Zend/Feed/Element.php +++ b/libs/Zend/Feed/Element.php @@ -242,7 +242,7 @@ class Zend_Feed_Element implements ArrayAccess /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Cannot set the value of multiple tags simultaneously.'); } else { $nodes[0]->nodeValue = $val; diff --git a/libs/Zend/Feed/Entry/Abstract.php b/libs/Zend/Feed/Entry/Abstract.php index b9a46823c4..60c10cc89a 100644 --- a/libs/Zend/Feed/Entry/Abstract.php +++ b/libs/Zend/Feed/Entry/Abstract.php @@ -24,12 +24,12 @@ /** * @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'; /** @@ -96,7 +96,7 @@ abstract class Zend_Feed_Entry_Abstract extends Zend_Feed_Element /** * @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: $php_errormsg"); } @@ -105,7 +105,7 @@ abstract class Zend_Feed_Entry_Abstract extends Zend_Feed_Element /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('No root <' . $this->_rootElement . '> element found, cannot parse feed.'); } } else { diff --git a/libs/Zend/Feed/Entry/Atom.php b/libs/Zend/Feed/Entry/Atom.php index 01a096d67c..01a17232eb 100644 --- a/libs/Zend/Feed/Entry/Atom.php +++ b/libs/Zend/Feed/Entry/Atom.php @@ -24,7 +24,7 @@ /** * @see Zend_Feed_Entry_Abstract */ -require_once 'Zend/Feed/Entry/Abstract.php'; +// require_once 'Zend/Feed/Entry/Abstract.php'; /** @@ -79,7 +79,7 @@ class Zend_Feed_Entry_Atom extends Zend_Feed_Entry_Abstract /** * @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.'); } @@ -107,7 +107,7 @@ class Zend_Feed_Entry_Atom extends Zend_Feed_Entry_Abstract /** * @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); @@ -144,7 +144,7 @@ class Zend_Feed_Entry_Atom extends Zend_Feed_Entry_Abstract /** * @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.'); } @@ -164,7 +164,7 @@ class Zend_Feed_Entry_Atom extends Zend_Feed_Entry_Abstract /** * @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 { @@ -172,7 +172,7 @@ class Zend_Feed_Entry_Atom extends Zend_Feed_Entry_Abstract /** * @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(); @@ -185,7 +185,7 @@ class Zend_Feed_Entry_Atom extends Zend_Feed_Entry_Abstract /** * @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()); } @@ -210,7 +210,7 @@ class Zend_Feed_Entry_Atom extends Zend_Feed_Entry_Abstract /** * @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: ' . $php_errormsg); } @@ -219,7 +219,7 @@ class Zend_Feed_Entry_Atom extends Zend_Feed_Entry_Abstract /** * @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); } diff --git a/libs/Zend/Feed/Entry/Rss.php b/libs/Zend/Feed/Entry/Rss.php index 0d638c7244..a03fe8052e 100644 --- a/libs/Zend/Feed/Entry/Rss.php +++ b/libs/Zend/Feed/Entry/Rss.php @@ -24,7 +24,7 @@ /** * @see Zend_Feed_Entry_Abstract */ -require_once 'Zend/Feed/Entry/Abstract.php'; +// require_once 'Zend/Feed/Entry/Abstract.php'; /** diff --git a/libs/Zend/Feed/Exception.php b/libs/Zend/Feed/Exception.php index 733c626693..1142c88a00 100644 --- a/libs/Zend/Feed/Exception.php +++ b/libs/Zend/Feed/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +// require_once 'Zend/Exception.php'; /** diff --git a/libs/Zend/Feed/Pubsubhubbub.php b/libs/Zend/Feed/Pubsubhubbub.php index 05f60b9130..eeffd74218 100644 --- a/libs/Zend/Feed/Pubsubhubbub.php +++ b/libs/Zend/Feed/Pubsubhubbub.php @@ -21,27 +21,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 @@ -89,7 +89,7 @@ class Zend_Feed_Pubsubhubbub } elseif (is_object($source) && $source instanceof Zend_Feed_Abstract) { $feed = Zend_Feed_Reader::importFeed($source); } else { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + // require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('The source parameter was' . ' invalid, i.e. not a URL string or an instance of type' . ' Zend_Feed_Reader_FeedAbstract or Zend_Feed_Abstract'); diff --git a/libs/Zend/Feed/Pubsubhubbub/CallbackAbstract.php b/libs/Zend/Feed/Pubsubhubbub/CallbackAbstract.php index 48fc56d438..2fae31b831 100644 --- a/libs/Zend/Feed/Pubsubhubbub/CallbackAbstract.php +++ b/libs/Zend/Feed/Pubsubhubbub/CallbackAbstract.php @@ -22,12 +22,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 @@ -89,7 +89,7 @@ abstract class Zend_Feed_Pubsubhubbub_CallbackAbstract 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)); } @@ -136,7 +136,7 @@ abstract class Zend_Feed_Pubsubhubbub_CallbackAbstract 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'); } @@ -157,7 +157,7 @@ abstract class Zend_Feed_Pubsubhubbub_CallbackAbstract || (!$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'); @@ -193,7 +193,7 @@ abstract class Zend_Feed_Pubsubhubbub_CallbackAbstract { $count = intval($count); if ($count <= 0) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + // require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Subscriber count must be' . ' greater than zero'); } diff --git a/libs/Zend/Feed/Pubsubhubbub/Exception.php b/libs/Zend/Feed/Pubsubhubbub/Exception.php index cac6d2386e..5bc562c94e 100644 --- a/libs/Zend/Feed/Pubsubhubbub/Exception.php +++ b/libs/Zend/Feed/Pubsubhubbub/Exception.php @@ -21,7 +21,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Pubsubhubbub/HttpResponse.php b/libs/Zend/Feed/Pubsubhubbub/HttpResponse.php index 5a14eb60f4..e44f0eb86a 100644 --- a/libs/Zend/Feed/Pubsubhubbub/HttpResponse.php +++ b/libs/Zend/Feed/Pubsubhubbub/HttpResponse.php @@ -21,7 +21,7 @@ /** * @see Zend_Feed_Pubsubhubbub */ -require_once 'Zend/Feed/Pubsubhubbub.php'; +// require_once 'Zend/Feed/Pubsubhubbub.php'; /** * @category Zend @@ -161,7 +161,7 @@ class Zend_Feed_Pubsubhubbub_HttpResponse { $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; @@ -176,7 +176,7 @@ class Zend_Feed_Pubsubhubbub_HttpResponse public function setHttpResponseCode($code) { if (!is_int($code) || (100 > $code) || (599 < $code)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + // require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid HTTP response' . ' code:' . $code); } diff --git a/libs/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php b/libs/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php index 839644648e..eab4b56322 100644 --- a/libs/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php +++ b/libs/Zend/Feed/Pubsubhubbub/Model/ModelAbstract.php @@ -20,13 +20,13 @@ /** @see Zend_Db_Table */ -require_once 'Zend/Db/Table.php'; +// require_once 'Zend/Db/Table.php'; /** * @see Zend_Registry * Seems to fix the file not being included by Zend_Db_Table... */ -require_once 'Zend/Registry.php'; +// require_once 'Zend/Registry.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Pubsubhubbub/Model/Subscription.php b/libs/Zend/Feed/Pubsubhubbub/Model/Subscription.php index 0b3ab2abee..ea971b4f77 100644 --- a/libs/Zend/Feed/Pubsubhubbub/Model/Subscription.php +++ b/libs/Zend/Feed/Pubsubhubbub/Model/Subscription.php @@ -20,10 +20,10 @@ */ /** @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'; /** * @category Zend @@ -46,7 +46,7 @@ class Zend_Feed_Pubsubhubbub_Model_Subscription public function setSubscription(array $data) { if (!isset($data['id'])) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + // require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception( 'ID must be set before attempting a save' ); @@ -79,7 +79,7 @@ class Zend_Feed_Pubsubhubbub_Model_Subscription 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'); } @@ -99,7 +99,7 @@ class Zend_Feed_Pubsubhubbub_Model_Subscription public function hasSubscription($key) { if (empty($key) || !is_string($key)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + // require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid parameter "key"' .' of "' . $key . '" must be a non-empty string'); } diff --git a/libs/Zend/Feed/Pubsubhubbub/Publisher.php b/libs/Zend/Feed/Pubsubhubbub/Publisher.php index 1eb594f0dd..dfc388beca 100644 --- a/libs/Zend/Feed/Pubsubhubbub/Publisher.php +++ b/libs/Zend/Feed/Pubsubhubbub/Publisher.php @@ -21,7 +21,7 @@ /** * @see Zend_Feed_Pubsubhubbub */ -require_once 'Zend/Feed/Pubsubhubbub.php'; +// require_once 'Zend/Feed/Pubsubhubbub.php'; /** * @category Zend @@ -89,7 +89,7 @@ class Zend_Feed_Pubsubhubbub_Publisher 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)); } @@ -114,7 +114,7 @@ class Zend_Feed_Pubsubhubbub_Publisher 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'); @@ -173,7 +173,7 @@ class Zend_Feed_Pubsubhubbub_Publisher 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'); @@ -233,7 +233,7 @@ class Zend_Feed_Pubsubhubbub_Publisher 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'); @@ -242,7 +242,7 @@ class Zend_Feed_Pubsubhubbub_Publisher $client->setUri($url); $response = $client->request(); if ($response->getStatus() !== 204) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + // require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Notification to Hub Server ' . 'at "' . $url . '" appears to have failed with a status code of "' . $response->getStatus() . '" and message "' @@ -266,7 +266,7 @@ class Zend_Feed_Pubsubhubbub_Publisher $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'); } @@ -297,7 +297,7 @@ class Zend_Feed_Pubsubhubbub_Publisher 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'); } @@ -306,7 +306,7 @@ class Zend_Feed_Pubsubhubbub_Publisher return $this; } if (empty($value) || (!is_string($value) && !is_null($value))) { - 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'); } @@ -337,7 +337,7 @@ class Zend_Feed_Pubsubhubbub_Publisher 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'); } @@ -399,7 +399,7 @@ class Zend_Feed_Pubsubhubbub_Publisher $params[] = 'hub.mode=publish'; $topics = $this->getUpdatedTopicUrls(); if (empty($topics)) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + // require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('No updated topic URLs' . ' have been set'); } diff --git a/libs/Zend/Feed/Pubsubhubbub/Subscriber.php b/libs/Zend/Feed/Pubsubhubbub/Subscriber.php index 35a4ccf96c..9921bce594 100644 --- a/libs/Zend/Feed/Pubsubhubbub/Subscriber.php +++ b/libs/Zend/Feed/Pubsubhubbub/Subscriber.php @@ -21,12 +21,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 @@ -165,7 +165,7 @@ class Zend_Feed_Pubsubhubbub_Subscriber 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)); } @@ -211,7 +211,7 @@ class Zend_Feed_Pubsubhubbub_Subscriber 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'); @@ -229,7 +229,7 @@ class Zend_Feed_Pubsubhubbub_Subscriber 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'); } @@ -246,7 +246,7 @@ class Zend_Feed_Pubsubhubbub_Subscriber { $seconds = intval($seconds); if ($seconds <= 0) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + // require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Expected lease seconds' . ' must be an integer greater than zero'); } @@ -274,7 +274,7 @@ class Zend_Feed_Pubsubhubbub_Subscriber 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'); @@ -292,7 +292,7 @@ class Zend_Feed_Pubsubhubbub_Subscriber 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'); } @@ -314,7 +314,7 @@ class Zend_Feed_Pubsubhubbub_Subscriber { 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' @@ -343,7 +343,7 @@ class Zend_Feed_Pubsubhubbub_Subscriber 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'); @@ -403,7 +403,7 @@ class Zend_Feed_Pubsubhubbub_Subscriber 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'); @@ -462,7 +462,7 @@ class Zend_Feed_Pubsubhubbub_Subscriber 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'); } @@ -471,7 +471,7 @@ class Zend_Feed_Pubsubhubbub_Subscriber return $this; } if (empty($value) || (!is_string($value) && !is_null($value))) { - 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'); } @@ -503,7 +503,7 @@ class Zend_Feed_Pubsubhubbub_Subscriber 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'); } @@ -546,7 +546,7 @@ class Zend_Feed_Pubsubhubbub_Subscriber 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.'); } @@ -625,7 +625,7 @@ class Zend_Feed_Pubsubhubbub_Subscriber $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'); } @@ -688,7 +688,7 @@ class Zend_Feed_Pubsubhubbub_Subscriber protected function _getRequestParameters($hubUrl, $mode) { if (!in_array($mode, array('subscribe', 'unsubscribe'))) { - require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; + // require_once 'Zend/Feed/Pubsubhubbub/Exception.php'; throw new Zend_Feed_Pubsubhubbub_Exception('Invalid mode specified: "' . $mode . '" which should have been "subscribe" or "unsubscribe"'); } diff --git a/libs/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php b/libs/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php index c7195809c9..1f42375839 100644 --- a/libs/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php +++ b/libs/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php @@ -21,17 +21,17 @@ /** * @see Zend_Feed_Pubsubhubbub */ -require_once 'Zend/Feed/Pubsubhubbub.php'; +// require_once 'Zend/Feed/Pubsubhubbub.php'; /** * @see Zend_Feed_Pubsubhubbub */ -require_once 'Zend/Feed/Pubsubhubbub/CallbackAbstract.php'; +// require_once 'Zend/Feed/Pubsubhubbub/CallbackAbstract.php'; /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +// require_once 'Zend/Feed/Reader.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Reader.php b/libs/Zend/Feed/Reader.php index f44a7483a8..0fb8b1206b 100644 --- a/libs/Zend/Feed/Reader.php +++ b/libs/Zend/Feed/Reader.php @@ -22,22 +22,22 @@ /** * @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'; /** * @category Zend @@ -167,7 +167,7 @@ class Zend_Feed_Reader /** * @see Zend_Http_Client */ - require_once 'Zend/Http/Client.php'; + // require_once 'Zend/Http/Client.php'; self::$_httpClient = new Zend_Http_Client(); } @@ -251,7 +251,7 @@ class Zend_Feed_Reader } $response = $client->request('GET'); if ($response->getStatus() !== 200 && $response->getStatus() !== 304) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus()); } if ($response->getStatus() == 304) { @@ -274,7 +274,7 @@ class Zend_Feed_Reader } $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(); @@ -283,7 +283,7 @@ class Zend_Feed_Reader } else { $response = $client->request('GET'); if ($response->getStatus() !== 200) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus()); } return self::importString($response->getBody()); @@ -332,7 +332,7 @@ class Zend_Feed_Reader $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); } @@ -347,7 +347,7 @@ class Zend_Feed_Reader } 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.'); } @@ -370,7 +370,7 @@ class Zend_Feed_Reader /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception("File could not be loaded: $php_errormsg"); } return self::importString($feed); @@ -386,7 +386,7 @@ class Zend_Feed_Reader /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception("Failed to access $uri, got response code " . $response->getStatus()); } $responseHtml = $response->getBody(); @@ -403,7 +403,7 @@ class Zend_Feed_Reader $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; @@ -437,11 +437,11 @@ class Zend_Feed_Reader $php_errormsg = '(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: $php_errormsg"); } } 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'); } @@ -544,7 +544,7 @@ class Zend_Feed_Reader public static function getPluginLoader() { if (!isset(self::$_pluginLoader)) { - require_once 'Zend/Loader/PluginLoader.php'; + // require_once 'Zend/Loader/PluginLoader.php'; self::$_pluginLoader = new Zend_Loader_PluginLoader(array( 'Zend_Feed_Reader_Extension_' => 'Zend/Feed/Reader/Extension/', )); @@ -614,7 +614,7 @@ class Zend_Feed_Reader if (!self::getPluginLoader()->isLoaded($feedName) && !self::getPluginLoader()->isLoaded($entryName) ) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Could not load extension: ' . $name . 'using Plugin Loader. Check prefix paths are configured and extension exists.'); } diff --git a/libs/Zend/Feed/Reader/Collection/Author.php b/libs/Zend/Feed/Reader/Collection/Author.php index 98a8aea226..6a039974b6 100644 --- a/libs/Zend/Feed/Reader/Collection/Author.php +++ b/libs/Zend/Feed/Reader/Collection/Author.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Reader_Collection_CollectionAbstract */ -require_once 'Zend/Feed/Reader/Collection/CollectionAbstract.php'; +// require_once 'Zend/Feed/Reader/Collection/CollectionAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Reader/Collection/Category.php b/libs/Zend/Feed/Reader/Collection/Category.php index 3bbc5f168a..2587c13268 100644 --- a/libs/Zend/Feed/Reader/Collection/Category.php +++ b/libs/Zend/Feed/Reader/Collection/Category.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Reader_Collection_CollectionAbstract */ -require_once 'Zend/Feed/Reader/Collection/CollectionAbstract.php'; +// require_once 'Zend/Feed/Reader/Collection/CollectionAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Reader/Entry/Atom.php b/libs/Zend/Feed/Reader/Entry/Atom.php index 308deba59e..77289b411b 100644 --- a/libs/Zend/Feed/Reader/Entry/Atom.php +++ b/libs/Zend/Feed/Reader/Entry/Atom.php @@ -22,22 +22,22 @@ /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_Feed_Reader_EntryInterface */ -require_once 'Zend/Feed/Reader/EntryInterface.php'; +// require_once 'Zend/Feed/Reader/EntryInterface.php'; /** * @see Zend_Feed_Reader_EntryAbstract */ -require_once 'Zend/Feed/Reader/EntryAbstract.php'; +// require_once 'Zend/Feed/Reader/EntryAbstract.php'; /** * @see Zend_Feed_Reader_Extension_Atom_Entry */ -require_once 'Zend/Feed/Reader/Extension/Atom/Entry.php'; +// require_once 'Zend/Feed/Reader/Extension/Atom/Entry.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Reader/Entry/Rss.php b/libs/Zend/Feed/Reader/Entry/Rss.php index 30f90d8de3..f6911879e1 100644 --- a/libs/Zend/Feed/Reader/Entry/Rss.php +++ b/libs/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 @@ -274,7 +274,7 @@ class Zend_Feed_Reader_Entry_Rss extends Zend_Feed_Reader_EntryAbstract implemen break; } catch (Zend_Date_Exception $e) { if ($standard == Zend_Date::DATES) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception( 'Could not load date due to unrecognised' .' format (should follow RFC 822 or 2822):' diff --git a/libs/Zend/Feed/Reader/EntryAbstract.php b/libs/Zend/Feed/Reader/EntryAbstract.php index 193bb65c5d..f73e1d1e8e 100644 --- a/libs/Zend/Feed/Reader/EntryAbstract.php +++ b/libs/Zend/Feed/Reader/EntryAbstract.php @@ -211,7 +211,7 @@ abstract class Zend_Feed_Reader_EntryAbstract return call_user_func_array(array($extension, $method), $args); } } - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Method: ' . $method . 'does not exist and could not be located on a registered Extension'); } diff --git a/libs/Zend/Feed/Reader/Extension/Atom/Entry.php b/libs/Zend/Feed/Reader/Extension/Atom/Entry.php index 57c12e2d1c..41dc134a6e 100644 --- a/libs/Zend/Feed/Reader/Extension/Atom/Entry.php +++ b/libs/Zend/Feed/Reader/Extension/Atom/Entry.php @@ -22,32 +22,32 @@ /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_Feed_Reader_Extension_EntryAbstract */ -require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; +// require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; /** * @see Zend_Date */ -require_once 'Zend/Date.php'; +// require_once 'Zend/Date.php'; /** * @see Zend_Uri */ -require_once 'Zend/Uri.php'; +// require_once 'Zend/Uri.php'; /** * @see Zend_Feed_Reader_Collection_Category */ -require_once 'Zend/Feed/Reader/Collection/Category.php'; +// require_once 'Zend/Feed/Reader/Collection/Category.php'; /** * @see Zend_Feed_Reader_Feed_Atom_Source */ -require_once 'Zend/Feed/Reader/Feed/Atom/Source.php'; +// require_once 'Zend/Feed/Reader/Feed/Atom/Source.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Reader/Extension/Atom/Feed.php b/libs/Zend/Feed/Reader/Extension/Atom/Feed.php index 502e9a9c1e..5f102ca268 100644 --- a/libs/Zend/Feed/Reader/Extension/Atom/Feed.php +++ b/libs/Zend/Feed/Reader/Extension/Atom/Feed.php @@ -22,22 +22,22 @@ /** * @see Zend_Feed_Reader_Extension_FeedAbstract */ -require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php'; +// require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php'; /** * @see Zend_Date */ -require_once 'Zend/Date.php'; +// require_once 'Zend/Date.php'; /** * @see Zend_Uri */ -require_once 'Zend/Uri.php'; +// require_once 'Zend/Uri.php'; /** * @see Zend_Feed_Reader_Collection_Author */ -require_once 'Zend/Feed/Reader/Collection/Author.php'; +// require_once 'Zend/Feed/Reader/Collection/Author.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Reader/Extension/Content/Entry.php b/libs/Zend/Feed/Reader/Extension/Content/Entry.php index c6375b2244..f01e0ad248 100644 --- a/libs/Zend/Feed/Reader/Extension/Content/Entry.php +++ b/libs/Zend/Feed/Reader/Extension/Content/Entry.php @@ -22,12 +22,12 @@ /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_Feed_Reader_Entry_EntryAbstract */ -require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; +// require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php b/libs/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php index 9c8cd4da72..5e78db10ab 100644 --- a/libs/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php +++ b/libs/Zend/Feed/Reader/Extension/CreativeCommons/Entry.php @@ -22,12 +22,12 @@ /** * @see Zend_Feed_Reader_Extension_EntryAbstract */ -require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; +// require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; /** * @see Zend_Feed_Reader_Extension_CreativeCommons_Feed */ -require_once 'Zend/Feed/Reader/Extension/CreativeCommons/Feed.php'; +// require_once 'Zend/Feed/Reader/Extension/CreativeCommons/Feed.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php b/libs/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php index 4b1c7a9fbe..3d29c6911f 100644 --- a/libs/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php +++ b/libs/Zend/Feed/Reader/Extension/CreativeCommons/Feed.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Reader_Extension_FeedAbstract */ -require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php'; +// require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Reader/Extension/DublinCore/Entry.php b/libs/Zend/Feed/Reader/Extension/DublinCore/Entry.php index c20394594b..4ad104b6ff 100644 --- a/libs/Zend/Feed/Reader/Extension/DublinCore/Entry.php +++ b/libs/Zend/Feed/Reader/Extension/DublinCore/Entry.php @@ -22,17 +22,17 @@ /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_Feed_Reader_Extension_EntryAbstract */ -require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; +// require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; /** * @see Zend_Date */ -require_once 'Zend/Date.php'; +// require_once 'Zend/Date.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Reader/Extension/DublinCore/Feed.php b/libs/Zend/Feed/Reader/Extension/DublinCore/Feed.php index 5b7816f54e..4e4bcf4888 100644 --- a/libs/Zend/Feed/Reader/Extension/DublinCore/Feed.php +++ b/libs/Zend/Feed/Reader/Extension/DublinCore/Feed.php @@ -22,17 +22,17 @@ /** * @see Zend_Feed_Reader_Extension_FeedAbstract */ -require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php'; +// require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php'; /** * @see Zend_Date */ -require_once 'Zend/Date.php'; +// require_once 'Zend/Date.php'; /** * @see Zend_Feed_Reader_Collection_Author */ -require_once 'Zend/Feed/Reader/Collection/Author.php'; +// require_once 'Zend/Feed/Reader/Collection/Author.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Reader/Extension/FeedAbstract.php b/libs/Zend/Feed/Reader/Extension/FeedAbstract.php index 73aa8c90ee..23d97d3f7a 100644 --- a/libs/Zend/Feed/Reader/Extension/FeedAbstract.php +++ b/libs/Zend/Feed/Reader/Extension/FeedAbstract.php @@ -22,18 +22,18 @@ /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_Feed_Reader_Entry_Atom */ -require_once 'Zend/Feed/Reader/Entry/Atom.php'; +// require_once 'Zend/Feed/Reader/Entry/Atom.php'; /** * @see Zend_Feed_Reader_Entry_Rss */ -require_once 'Zend/Feed/Reader/Entry/Rss.php'; +// require_once 'Zend/Feed/Reader/Entry/Rss.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Reader/Extension/Podcast/Entry.php b/libs/Zend/Feed/Reader/Extension/Podcast/Entry.php index eeffed2b1f..bbe340ce63 100644 --- a/libs/Zend/Feed/Reader/Extension/Podcast/Entry.php +++ b/libs/Zend/Feed/Reader/Extension/Podcast/Entry.php @@ -22,12 +22,12 @@ /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_Feed_Reader_Extension_EntryAbstract */ -require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; +// require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Reader/Extension/Podcast/Feed.php b/libs/Zend/Feed/Reader/Extension/Podcast/Feed.php index 01a5a191db..c4ea180f7c 100644 --- a/libs/Zend/Feed/Reader/Extension/Podcast/Feed.php +++ b/libs/Zend/Feed/Reader/Extension/Podcast/Feed.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Reader_Extension_FeedAbstract */ -require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php'; +// require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Reader/Extension/Slash/Entry.php b/libs/Zend/Feed/Reader/Extension/Slash/Entry.php index c5f259fb3c..222c0e1062 100644 --- a/libs/Zend/Feed/Reader/Extension/Slash/Entry.php +++ b/libs/Zend/Feed/Reader/Extension/Slash/Entry.php @@ -22,12 +22,12 @@ /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_Feed_Reader_Extension_EntryAbstract */ -require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; +// require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Reader/Extension/Syndication/Feed.php b/libs/Zend/Feed/Reader/Extension/Syndication/Feed.php index 9104486520..5b383cfedb 100644 --- a/libs/Zend/Feed/Reader/Extension/Syndication/Feed.php +++ b/libs/Zend/Feed/Reader/Extension/Syndication/Feed.php @@ -22,9 +22,9 @@ /** * @see Zend_Feed_Reader_Extension_FeedAbstract */ -require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php'; +// require_once 'Zend/Feed/Reader/Extension/FeedAbstract.php'; -require_once 'Zend/Date.php'; +// require_once 'Zend/Date.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Reader/Extension/Thread/Entry.php b/libs/Zend/Feed/Reader/Extension/Thread/Entry.php index 7b397de763..e8a4bde92f 100644 --- a/libs/Zend/Feed/Reader/Extension/Thread/Entry.php +++ b/libs/Zend/Feed/Reader/Extension/Thread/Entry.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Reader_Extension_EntryAbstract */ -require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; +// require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php b/libs/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php index 24832fee61..fe47448338 100644 --- a/libs/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php +++ b/libs/Zend/Feed/Reader/Extension/WellFormedWeb/Entry.php @@ -22,12 +22,12 @@ /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_Feed_Reader_Extension_EntryAbstract */ -require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; +// require_once 'Zend/Feed/Reader/Extension/EntryAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Reader/Feed/Atom.php b/libs/Zend/Feed/Reader/Feed/Atom.php index fb1e53e218..493c3fa3a9 100644 --- a/libs/Zend/Feed/Reader/Feed/Atom.php +++ b/libs/Zend/Feed/Reader/Feed/Atom.php @@ -22,12 +22,12 @@ /** * @see Zend_Feed_Reader_FeedAbstract */ -require_once 'Zend/Feed/Reader/FeedAbstract.php'; +// require_once 'Zend/Feed/Reader/FeedAbstract.php'; /** * @see Zend_Feed_Reader_Extension_Atom_Feed */ -require_once 'Zend/Feed/Reader/Extension/Atom/Feed.php'; +// require_once 'Zend/Feed/Reader/Extension/Atom/Feed.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Reader/Feed/Atom/Source.php b/libs/Zend/Feed/Reader/Feed/Atom/Source.php index 8d5fe0c94b..bdd972f93e 100644 --- a/libs/Zend/Feed/Reader/Feed/Atom/Source.php +++ b/libs/Zend/Feed/Reader/Feed/Atom/Source.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Reader_Feed_Atom */ -require_once 'Zend/Feed/Reader/Feed/Atom.php'; +// require_once 'Zend/Feed/Reader/Feed/Atom.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Reader/Feed/Rss.php b/libs/Zend/Feed/Reader/Feed/Rss.php index dcb6192608..254698ce18 100644 --- a/libs/Zend/Feed/Reader/Feed/Rss.php +++ b/libs/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 @@ -235,7 +235,7 @@ class Zend_Feed_Reader_Feed_Rss extends Zend_Feed_Reader_FeedAbstract break; } catch (Zend_Date_Exception $e) { if ($standard == Zend_Date::DATES) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception( 'Could not load date due to unrecognised' .' format (should follow RFC 822 or 2822):' diff --git a/libs/Zend/Feed/Reader/FeedAbstract.php b/libs/Zend/Feed/Reader/FeedAbstract.php index 6ec899a726..89e7c1d5ba 100644 --- a/libs/Zend/Feed/Reader/FeedAbstract.php +++ b/libs/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 @@ -243,7 +243,7 @@ abstract class Zend_Feed_Reader_FeedAbstract implements Zend_Feed_Reader_FeedInt return call_user_func_array(array($extension, $method), $args); } } - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Method: ' . $method . 'does not exist and could not be located on a registered Extension'); } diff --git a/libs/Zend/Feed/Reader/FeedSet.php b/libs/Zend/Feed/Reader/FeedSet.php index 3d073c7326..57ccbf6056 100644 --- a/libs/Zend/Feed/Reader/FeedSet.php +++ b/libs/Zend/Feed/Reader/FeedSet.php @@ -22,12 +22,12 @@ /** * @see Zend_Feed_Reader */ -require_once 'Zend/Feed/Reader.php'; +// require_once 'Zend/Feed/Reader.php'; /** * @see Zend_Uri */ -require_once 'Zend/Uri.php'; +// require_once 'Zend/Uri.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Rss.php b/libs/Zend/Feed/Rss.php index 39be817e1c..19eaa8ec19 100644 --- a/libs/Zend/Feed/Rss.php +++ b/libs/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 @@ class Zend_Feed_Rss extends Zend_Feed_Abstract /** * @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 @@ class Zend_Feed_Rss extends Zend_Feed_Abstract /** * @see Zend_Feed_Exception */ - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Cannot send RSS because headers have already been sent.'); } diff --git a/libs/Zend/Feed/Writer.php b/libs/Zend/Feed/Writer.php index 8653af8d0e..1a40f63cd9 100644 --- a/libs/Zend/Feed/Writer.php +++ b/libs/Zend/Feed/Writer.php @@ -100,7 +100,7 @@ class Zend_Feed_Writer public static function getPluginLoader() { if (!isset(self::$_pluginLoader)) { - require_once 'Zend/Loader/PluginLoader.php'; + // require_once 'Zend/Loader/PluginLoader.php'; self::$_pluginLoader = new Zend_Loader_PluginLoader(array( 'Zend_Feed_Writer_Extension_' => 'Zend/Feed/Writer/Extension/', )); @@ -187,7 +187,7 @@ class Zend_Feed_Writer && !self::getPluginLoader()->isLoaded($feedRendererName) && !self::getPluginLoader()->isLoaded($entryRendererName) ) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Could not load extension: ' . $name . 'using Plugin Loader. Check prefix paths are configured and extension exists.'); } diff --git a/libs/Zend/Feed/Writer/Deleted.php b/libs/Zend/Feed/Writer/Deleted.php index 4f17c9d7ac..19bb56b49e 100644 --- a/libs/Zend/Feed/Writer/Deleted.php +++ b/libs/Zend/Feed/Writer/Deleted.php @@ -19,7 +19,7 @@ * @version $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $ */ -require_once 'Zend/Feed/Writer/Feed/FeedAbstract.php'; +// require_once 'Zend/Feed/Writer/Feed/FeedAbstract.php'; /** * @category Zend @@ -53,7 +53,7 @@ class Zend_Feed_Writer_Deleted public function setEncoding($encoding) { if (empty($encoding) || !is_string($encoding)) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: parameter must be a non-empty string'); } $this->_data['encoding'] = $encoding; @@ -109,7 +109,7 @@ class Zend_Feed_Writer_Deleted 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 @@ class Zend_Feed_Writer_Deleted } elseif ($date instanceof Zend_Date) { $zdate = $date; } 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 @@ class Zend_Feed_Writer_Deleted || 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 @@ class Zend_Feed_Writer_Deleted || !is_string($by['uri']) || !Zend_Uri::check($by['uri']) ) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "uri" array value must be a non-empty string and valid URI/IRI'); } $author['uri'] = $by['uri']; diff --git a/libs/Zend/Feed/Writer/Entry.php b/libs/Zend/Feed/Writer/Entry.php index ff9550b528..e8a6857cdc 100644 --- a/libs/Zend/Feed/Writer/Entry.php +++ b/libs/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 @@ class Zend_Feed_Writer_Entry || 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 @@ class Zend_Feed_Writer_Entry || !is_string($name['uri']) || !Zend_Uri::check($name['uri']) ) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "uri" array value must be a non-empty string and valid URI/IRI'); } $author['uri'] = $name['uri']; @@ -115,20 +115,20 @@ class Zend_Feed_Writer_Entry */ } else { if (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: "name" must be a non-empty string value'); } $author['name'] = $name; if (isset($email)) { if (empty($email) || !is_string($email)) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "email" value must be a non-empty string'); } $author['email'] = $email; } if (isset($uri)) { if (empty($uri) || !is_string($uri) || !Zend_Uri::check($uri)) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "uri" value must be a non-empty string and valid URI/IRI'); } $author['uri'] = $uri; @@ -157,7 +157,7 @@ class Zend_Feed_Writer_Entry 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 @@ class Zend_Feed_Writer_Entry 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 @@ class Zend_Feed_Writer_Entry 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 @@ class Zend_Feed_Writer_Entry } elseif ($date instanceof Zend_Date) { $zdate = $date; } 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 @@ class Zend_Feed_Writer_Entry } elseif ($date instanceof Zend_Date) { $zdate = $date; } 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 @@ class Zend_Feed_Writer_Entry 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 @@ class Zend_Feed_Writer_Entry 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 @@ class Zend_Feed_Writer_Entry 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 @@ class Zend_Feed_Writer_Entry public function setCommentCount($count) { if (empty($count) || !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 @@ class Zend_Feed_Writer_Entry 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 @@ class Zend_Feed_Writer_Entry public function setCommentFeedLink(array $link) { if (!isset($link['uri']) || !is_string($link['uri']) || !Zend_Uri::check($link['uri'])) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "link" must be a non-empty string and valid URI/IRI'); } if (!isset($link['type']) || !in_array($link['type'], array('atom', 'rss', 'rdf'))) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "type" must be one' . ' of "atom", "rss" or "rdf"'); } @@ -360,7 +360,7 @@ class Zend_Feed_Writer_Entry 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 @@ class Zend_Feed_Writer_Entry 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 @@ class Zend_Feed_Writer_Entry || !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'); } @@ -599,23 +599,23 @@ class Zend_Feed_Writer_Entry public function setEnclosure(array $enclosure) { if (!isset($enclosure['type'])) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Enclosure "type" is not set'); } if (!isset($enclosure['length'])) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Enclosure "length" is not set'); } 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'); } if ((int) $enclosure['length'] <= 0) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Enclosure "length" must be an integer' . ' indicating the content\'s length in bytes'); } @@ -709,7 +709,7 @@ class Zend_Feed_Writer_Entry } catch (Zend_Feed_Writer_Exception_InvalidMethodException $e) { } } - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Method: ' . $method . ' does not exist and could not be located on a registered Extension'); } diff --git a/libs/Zend/Feed/Writer/Exception/InvalidMethodException.php b/libs/Zend/Feed/Writer/Exception/InvalidMethodException.php index f6c4f9331d..4510f12b68 100644 --- a/libs/Zend/Feed/Writer/Exception/InvalidMethodException.php +++ b/libs/Zend/Feed/Writer/Exception/InvalidMethodException.php @@ -24,7 +24,7 @@ /** * @see Zend_Feed_Exception */ -require_once 'Zend/Feed/Exception.php'; +// require_once 'Zend/Feed/Exception.php'; /** diff --git a/libs/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php b/libs/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php index f23901d7e8..588a57af66 100644 --- a/libs/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php +++ b/libs/Zend/Feed/Writer/Extension/Atom/Renderer/Feed.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ -require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; +// require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php b/libs/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php index 7960f4cdf3..0036c6325e 100644 --- a/libs/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php +++ b/libs/Zend/Feed/Writer/Extension/Content/Renderer/Entry.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ -require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; +// require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php b/libs/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php index 6a72277815..c433ea3a6c 100644 --- a/libs/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php +++ b/libs/Zend/Feed/Writer/Extension/DublinCore/Renderer/Entry.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ -require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; +// require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php b/libs/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php index bfa4de49a1..e1a0105019 100644 --- a/libs/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php +++ b/libs/Zend/Feed/Writer/Extension/DublinCore/Renderer/Feed.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ -require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; +// require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Writer/Extension/ITunes/Entry.php b/libs/Zend/Feed/Writer/Extension/ITunes/Entry.php index 49eecb7132..1d7fbc5070 100644 --- a/libs/Zend/Feed/Writer/Extension/ITunes/Entry.php +++ b/libs/Zend/Feed/Writer/Extension/ITunes/Entry.php @@ -72,12 +72,12 @@ class Zend_Feed_Writer_Extension_ITunes_Entry 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 @@ class Zend_Feed_Writer_Extension_ITunes_Entry 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 @@ class Zend_Feed_Writer_Extension_ITunes_Entry && !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 @@ class Zend_Feed_Writer_Extension_ITunes_Entry public function setItunesExplicit($value) { if (!in_array($value, array('yes','no','clean'))) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "explicit" may only' . ' be one of "yes", "no" or "clean"'); } @@ -165,13 +165,13 @@ class Zend_Feed_Writer_Extension_ITunes_Entry 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 @@ class Zend_Feed_Writer_Extension_ITunes_Entry 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 @@ class Zend_Feed_Writer_Extension_ITunes_Entry 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 @@ class Zend_Feed_Writer_Extension_ITunes_Entry if (!method_exists($this, 'setItunes' . ucfirst($point)) && !method_exists($this, 'addItunes' . ucfirst($point)) ) { - require_once 'Zend/Feed/Writer/Exception/InvalidMethodException.php'; + // require_once 'Zend/Feed/Writer/Exception/InvalidMethodException.php'; throw new Zend_Feed_Writer_Exception_InvalidMethodException( 'invalid method: ' . $method ); diff --git a/libs/Zend/Feed/Writer/Extension/ITunes/Feed.php b/libs/Zend/Feed/Writer/Extension/ITunes/Feed.php index 565fdc5c78..caf0440a03 100644 --- a/libs/Zend/Feed/Writer/Extension/ITunes/Feed.php +++ b/libs/Zend/Feed/Writer/Extension/ITunes/Feed.php @@ -72,12 +72,12 @@ class Zend_Feed_Writer_Extension_ITunes_Feed 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 @@ class Zend_Feed_Writer_Extension_ITunes_Feed public function addItunesAuthor($value) { if (iconv_strlen($value, $this->getEncoding()) > 255) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: any "author" may only' . ' contain a maximum of 255 characters each'); } @@ -133,21 +133,21 @@ class Zend_Feed_Writer_Extension_ITunes_Feed foreach ($values as $key=>$value) { if (!is_array($value)) { if (iconv_strlen($value, $this->getEncoding()) > 255) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: any "category" may only' . ' contain a maximum of 255 characters each'); } $this->_data['categories'][] = $value; } else { if (iconv_strlen($key, $this->getEncoding()) > 255) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: any "category" may only' . ' contain a maximum of 255 characters each'); } $this->_data['categories'][$key] = array(); foreach ($value as $val) { if (iconv_strlen($val, $this->getEncoding()) > 255) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: any "category" may only' . ' contain a maximum of 255 characters each'); } @@ -167,12 +167,12 @@ class Zend_Feed_Writer_Extension_ITunes_Feed public function setItunesImage($value) { if (!Zend_Uri::check($value)) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "image" may only' . ' be a valid URI/IRI'); } if (!in_array(substr($value, -3), array('jpg','png'))) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "image" may only' . ' use file extension "jpg" or "png" which must be the last three' . ' characters of the URI (i.e. no query string or fragment)'); @@ -194,7 +194,7 @@ class Zend_Feed_Writer_Extension_ITunes_Feed && !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 @@ class Zend_Feed_Writer_Extension_ITunes_Feed public function setItunesExplicit($value) { if (!in_array($value, array('yes','no','clean'))) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "explicit" may only' . ' be one of "yes", "no" or "clean"'); } @@ -228,13 +228,13 @@ class Zend_Feed_Writer_Extension_ITunes_Feed 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 @@ class Zend_Feed_Writer_Extension_ITunes_Feed public function setItunesNewFeedUrl($value) { if (!Zend_Uri::check($value)) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: "newFeedUrl" may only' . ' be a valid URI/IRI'); } @@ -283,14 +283,14 @@ class Zend_Feed_Writer_Extension_ITunes_Feed public function addItunesOwner(array $value) { if (!isset($value['name']) || !isset($value['email'])) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: any "owner" must' . ' be an array containing keys "name" and "email"'); } if (iconv_strlen($value['name'], $this->getEncoding()) > 255 || iconv_strlen($value['email'], $this->getEncoding()) > 255 ) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('invalid parameter: any "owner" may only' . ' contain a maximum of 255 characters each for "name" and "email"'); } @@ -310,7 +310,7 @@ class Zend_Feed_Writer_Extension_ITunes_Feed 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 @@ class Zend_Feed_Writer_Extension_ITunes_Feed 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 @@ class Zend_Feed_Writer_Extension_ITunes_Feed if (!method_exists($this, 'setItunes' . ucfirst($point)) && !method_exists($this, 'addItunes' . ucfirst($point)) ) { - require_once 'Zend/Feed/Writer/Exception/InvalidMethodException.php'; + // require_once 'Zend/Feed/Writer/Exception/InvalidMethodException.php'; throw new Zend_Feed_Writer_Exception_InvalidMethodException( 'invalid method: ' . $method ); diff --git a/libs/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php b/libs/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php index fc6b98d3ad..046cb546fb 100644 --- a/libs/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php +++ b/libs/Zend/Feed/Writer/Extension/ITunes/Renderer/Entry.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ -require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; +// require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php b/libs/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php index 1fafdaa13e..192d19ec42 100644 --- a/libs/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php +++ b/libs/Zend/Feed/Writer/Extension/ITunes/Renderer/Feed.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ -require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; +// require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Writer/Extension/RendererAbstract.php b/libs/Zend/Feed/Writer/Extension/RendererAbstract.php index 9a0f93dfeb..b381be3657 100644 --- a/libs/Zend/Feed/Writer/Extension/RendererAbstract.php +++ b/libs/Zend/Feed/Writer/Extension/RendererAbstract.php @@ -21,7 +21,7 @@ /** * @see Zend_Feed_Writer_Extension_RendererInterface */ -require_once 'Zend/Feed/Writer/Extension/RendererInterface.php'; +// require_once 'Zend/Feed/Writer/Extension/RendererInterface.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php b/libs/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php index aae81fbbd4..2814775551 100644 --- a/libs/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php +++ b/libs/Zend/Feed/Writer/Extension/Slash/Renderer/Entry.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ -require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; +// require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php b/libs/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php index 1900ec459f..69e731d4ba 100644 --- a/libs/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php +++ b/libs/Zend/Feed/Writer/Extension/Threading/Renderer/Entry.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ -require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; +// require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php b/libs/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php index d6a17454d9..c57244ae4b 100644 --- a/libs/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php +++ b/libs/Zend/Feed/Writer/Extension/WellFormedWeb/Renderer/Entry.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Extension_RendererAbstract */ -require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; +// require_once 'Zend/Feed/Writer/Extension/RendererAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Writer/Feed.php b/libs/Zend/Feed/Writer/Feed.php index dd69dde834..724caed1a2 100644 --- a/libs/Zend/Feed/Writer/Feed.php +++ b/libs/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 @@ implements Iterator, Countable 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 @@ implements Iterator, Countable 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.'); } @@ -266,7 +266,7 @@ implements Iterator, Countable $this->setType(strtolower($type)); $type = ucfirst($this->getType()); if ($type !== 'Rss' && $type !== 'Atom') { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid feed type specified: ' . $type . '.' . ' Should be one of "rss" or "atom".'); } diff --git a/libs/Zend/Feed/Writer/Feed/FeedAbstract.php b/libs/Zend/Feed/Writer/Feed/FeedAbstract.php index 24fbe73025..6ab6e91b2c 100644 --- a/libs/Zend/Feed/Writer/Feed/FeedAbstract.php +++ b/libs/Zend/Feed/Writer/Feed/FeedAbstract.php @@ -22,32 +22,32 @@ /** * @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'; /** * @category Zend @@ -95,40 +95,40 @@ class Zend_Feed_Writer_Feed_FeedAbstract $author = array(); if (is_array($name)) { if (!array_key_exists('name', $name) || empty($name['name']) || !is_string($name['name'])) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: author array must include a "name" key with a non-empty string value'); } $author['name'] = $name['name']; if (isset($name['email'])) { if (empty($name['email']) || !is_string($name['email'])) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "email" array value must be a non-empty string'); } $author['email'] = $name['email']; } if (isset($name['uri'])) { if (empty($name['uri']) || !is_string($name['uri']) || !Zend_Uri::check($name['uri'])) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "uri" array value must be a non-empty string and valid URI/IRI'); } $author['uri'] = $name['uri']; } } else { if (empty($name['name']) || !is_string($name['name'])) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "name" must be a non-empty string value'); } $author['name'] = $name; if (isset($email)) { if (empty($email) || !is_string($email)) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "email" value must be a non-empty string'); } $author['email'] = $email; } if (isset($uri)) { if (empty($uri) || !is_string($uri) || !Zend_Uri::check($uri)) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "uri" value must be a non-empty string and valid URI/IRI'); } $author['uri'] = $uri; @@ -157,7 +157,7 @@ class Zend_Feed_Writer_Feed_FeedAbstract 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; @@ -178,7 +178,7 @@ class Zend_Feed_Writer_Feed_FeedAbstract } elseif ($date instanceof Zend_Date) { $zdate = $date; } 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; @@ -199,7 +199,7 @@ class Zend_Feed_Writer_Feed_FeedAbstract } elseif ($date instanceof Zend_Date) { $zdate = $date; } 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; @@ -213,7 +213,7 @@ class Zend_Feed_Writer_Feed_FeedAbstract 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; @@ -227,20 +227,20 @@ class Zend_Feed_Writer_Feed_FeedAbstract public function setGenerator($name, $version = null, $uri = null) { if (empty($name) || !is_string($name)) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "name" must be a non-empty string'); } $generator = array('name' => $name); if (isset($version)) { if (empty($version) || !is_string($version)) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "version" must be a non-empty string'); } $generator['version'] = $version; } if (isset($uri)) { if (empty($uri) || !is_string($uri) || !Zend_Uri::check($uri)) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "uri" must be a non-empty string and a valid URI/IRI'); } $generator['uri'] = $uri; @@ -257,7 +257,7 @@ class Zend_Feed_Writer_Feed_FeedAbstract { 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)) { - 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; @@ -271,7 +271,7 @@ class Zend_Feed_Writer_Feed_FeedAbstract 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; @@ -285,7 +285,7 @@ class Zend_Feed_Writer_Feed_FeedAbstract 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; @@ -299,11 +299,11 @@ class Zend_Feed_Writer_Feed_FeedAbstract public function setFeedLink($link, $type) { if (empty($link) || !is_string($link) || !Zend_Uri::check($link)) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "link"" must be a non-empty string and valid URI/IRI'); } if (!in_array(strtolower($type), array('rss', 'rdf', 'atom'))) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: "type"; You must declare the type of feed the link points to, i.e. RSS, RDF or Atom'); } $this->_data['feedLinks'][strtolower($type)] = $link; @@ -317,7 +317,7 @@ class Zend_Feed_Writer_Feed_FeedAbstract 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; @@ -331,7 +331,7 @@ class Zend_Feed_Writer_Feed_FeedAbstract 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; @@ -345,7 +345,7 @@ class Zend_Feed_Writer_Feed_FeedAbstract 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'); } @@ -360,7 +360,7 @@ class Zend_Feed_Writer_Feed_FeedAbstract 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'); } @@ -390,7 +390,7 @@ class Zend_Feed_Writer_Feed_FeedAbstract 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'); @@ -400,7 +400,7 @@ class Zend_Feed_Writer_Feed_FeedAbstract || !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'); } @@ -693,7 +693,7 @@ class Zend_Feed_Writer_Feed_FeedAbstract } catch (Zend_Feed_Writer_Exception_InvalidMethodException $e) { } } - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Method: ' . $method . ' does not exist and could not be located on a registered Extension'); } diff --git a/libs/Zend/Feed/Writer/Renderer/Entry/Atom.php b/libs/Zend/Feed/Writer/Renderer/Entry/Atom.php index b029dede42..6e44190277 100644 --- a/libs/Zend/Feed/Writer/Renderer/Entry/Atom.php +++ b/libs/Zend/Feed/Writer/Renderer/Entry/Atom.php @@ -22,9 +22,9 @@ /** * @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'; /** * @category Zend @@ -91,7 +91,7 @@ class Zend_Feed_Writer_Renderer_Entry_Atom 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); @@ -140,7 +140,7 @@ class Zend_Feed_Writer_Renderer_Entry_Atom 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); @@ -263,7 +263,7 @@ class Zend_Feed_Writer_Renderer_Entry_Atom { 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 ' @@ -283,7 +283,7 @@ class Zend_Feed_Writer_Renderer_Entry_Atom } if (!Zend_Uri::check($this->getDataContainer()->getId()) && !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())) { - 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'); @@ -303,7 +303,7 @@ class Zend_Feed_Writer_Renderer_Entry_Atom { $content = $this->getDataContainer()->getContent(); if (!$content && !$this->getDataContainer()->getLink()) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; $message = 'Atom 1.0 entry elements MUST contain exactly one ' . 'atom:content element, or as an alternative, at least one link ' . 'with a rel attribute of "alternate" to indicate an alternate ' diff --git a/libs/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php b/libs/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php index f7baf60c54..fb75262935 100644 --- a/libs/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php +++ b/libs/Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Renderer_RendererAbstract */ -require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php'; +// require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Writer/Renderer/Entry/Rss.php b/libs/Zend/Feed/Writer/Renderer/Entry/Rss.php index 6f2c349d51..d34291f4cc 100644 --- a/libs/Zend/Feed/Writer/Renderer/Entry/Rss.php +++ b/libs/Zend/Feed/Writer/Renderer/Entry/Rss.php @@ -22,7 +22,7 @@ /** * @see Zend_Feed_Writer_Renderer_RendererAbstract */ -require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php'; +// require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php'; /** * @category Zend @@ -89,7 +89,7 @@ class Zend_Feed_Writer_Renderer_Entry_Rss { if(!$this->getDataContainer()->getDescription() && !$this->getDataContainer()->getTitle()) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; $message = 'RSS 2.0 entry elements SHOULD contain exactly one' . ' title element but a title has not been set. In addition, there' . ' is no description as required in the absence of a title.'; @@ -118,7 +118,7 @@ class Zend_Feed_Writer_Renderer_Entry_Rss { 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' diff --git a/libs/Zend/Feed/Writer/Renderer/Feed/Atom.php b/libs/Zend/Feed/Writer/Renderer/Feed/Atom.php index ed080c1515..964a926a89 100644 --- a/libs/Zend/Feed/Writer/Renderer/Feed/Atom.php +++ b/libs/Zend/Feed/Writer/Renderer/Feed/Atom.php @@ -20,24 +20,24 @@ */ /** @see Zend_Feed_Writer_Feed */ -require_once 'Zend/Feed/Writer/Feed.php'; +// require_once 'Zend/Feed/Writer/Feed.php'; /** @see Zend_Version */ -require_once 'Zend/Version.php'; +// require_once 'Zend/Version.php'; /** @see Zend_Feed_Writer_Renderer_RendererInterface */ -require_once 'Zend/Feed/Writer/Renderer/RendererInterface.php'; +// require_once 'Zend/Feed/Writer/Renderer/RendererInterface.php'; /** @see Zend_Feed_Writer_Renderer_Entry_Atom */ -require_once 'Zend/Feed/Writer/Renderer/Entry/Atom.php'; +// require_once 'Zend/Feed/Writer/Renderer/Entry/Atom.php'; /** @see Zend_Feed_Writer_Renderer_Entry_Atom_Deleted */ -require_once 'Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php'; +// require_once 'Zend/Feed/Writer/Renderer/Entry/Atom/Deleted.php'; /** @see Zend_Feed_Writer_Renderer_RendererAbstract */ -require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php'; +// require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php'; -require_once 'Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php'; +// require_once 'Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php b/libs/Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php index 35be0464d9..f8b746b89c 100644 --- a/libs/Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php +++ b/libs/Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php @@ -20,19 +20,19 @@ */ /** @see Zend_Feed_Writer_Feed */ -require_once 'Zend/Feed/Writer/Feed.php'; +// require_once 'Zend/Feed/Writer/Feed.php'; /** @see Zend_Version */ -require_once 'Zend/Version.php'; +// require_once 'Zend/Version.php'; /** @see Zend_Feed_Writer_Renderer_RendererInterface */ -require_once 'Zend/Feed/Writer/Renderer/RendererInterface.php'; +// require_once 'Zend/Feed/Writer/Renderer/RendererInterface.php'; /** @see Zend_Feed_Writer_Renderer_Entry_Atom */ -require_once 'Zend/Feed/Writer/Renderer/Entry/Atom.php'; +// require_once 'Zend/Feed/Writer/Renderer/Entry/Atom.php'; /** @see Zend_Feed_Writer_Renderer_RendererAbstract */ -require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php'; +// require_once 'Zend/Feed/Writer/Renderer/RendererAbstract.php'; /** * @category Zend @@ -79,7 +79,7 @@ class Zend_Feed_Writer_Renderer_Feed_Atom_AtomAbstract protected function _setTitle(DOMDocument $dom, DOMElement $root) { if(!$this->getDataContainer()->getTitle()) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; $message = 'Atom 1.0 feed elements MUST contain exactly one' . ' atom:title element but a title has not been set'; $exception = new Zend_Feed_Exception($message); @@ -127,7 +127,7 @@ class Zend_Feed_Writer_Renderer_Feed_Atom_AtomAbstract protected function _setDateModified(DOMDocument $dom, DOMElement $root) { if(!$this->getDataContainer()->getDateModified()) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; $message = 'Atom 1.0 feed elements MUST contain exactly one' . ' atom:updated element but a modification date has not been set'; $exception = new Zend_Feed_Exception($message); @@ -204,7 +204,7 @@ class Zend_Feed_Writer_Renderer_Feed_Atom_AtomAbstract { $flinks = $this->getDataContainer()->getFeedLinks(); if(!$flinks || !array_key_exists('atom', $flinks)) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; $message = 'Atom 1.0 feed elements SHOULD contain one atom:link ' . 'element with a rel attribute value of "self". This is the ' . 'preferred URI for retrieving Atom Feed Documents representing ' @@ -279,7 +279,7 @@ class Zend_Feed_Writer_Renderer_Feed_Atom_AtomAbstract { if(!$this->getDataContainer()->getId() && !$this->getDataContainer()->getLink()) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; $message = 'Atom 1.0 feed elements MUST contain exactly one ' . 'atom:id element, or as an alternative, we can use the same ' . 'value as atom:link however neither a suitable link nor an ' diff --git a/libs/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php b/libs/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php index 2fda14a06c..125fed1eaf 100644 --- a/libs/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php +++ b/libs/Zend/Feed/Writer/Renderer/Feed/Atom/Source.php @@ -19,7 +19,7 @@ * @version $Id: Atom.php 20096 2010-01-06 02:05:09Z bkarwin $ */ -require_once 'Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php'; +// require_once 'Zend/Feed/Writer/Renderer/Feed/Atom/AtomAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Feed/Writer/Renderer/Feed/Rss.php b/libs/Zend/Feed/Writer/Renderer/Feed/Rss.php index 2d8ab5c8a0..28db436f5a 100644 --- a/libs/Zend/Feed/Writer/Renderer/Feed/Rss.php +++ b/libs/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 @@ -144,7 +144,7 @@ class Zend_Feed_Writer_Renderer_Feed_Rss 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); @@ -172,7 +172,7 @@ class Zend_Feed_Writer_Renderer_Feed_Rss 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); @@ -249,7 +249,7 @@ class Zend_Feed_Writer_Renderer_Feed_Rss { $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); diff --git a/libs/Zend/Feed/Writer/Renderer/RendererAbstract.php b/libs/Zend/Feed/Writer/Renderer/RendererAbstract.php index 0778e435cd..b3457ed643 100644 --- a/libs/Zend/Feed/Writer/Renderer/RendererAbstract.php +++ b/libs/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 @@ class Zend_Feed_Writer_Renderer_RendererAbstract public function ignoreExceptions($bool = true) { if (!is_bool($bool)) { - require_once 'Zend/Feed/Exception.php'; + // require_once 'Zend/Feed/Exception.php'; throw new Zend_Feed_Exception('Invalid parameter: $bool. Should be TRUE or FALSE (defaults to TRUE if null)'); } $this->_ignoreExceptions = $bool; diff --git a/libs/Zend/Feed/Writer/Source.php b/libs/Zend/Feed/Writer/Source.php index 37fcd4833c..3861fc77fc 100644 --- a/libs/Zend/Feed/Writer/Source.php +++ b/libs/Zend/Feed/Writer/Source.php @@ -19,7 +19,7 @@ * @version $Id: Feed.php 20096 2010-01-06 02:05:09Z bkarwin $ */ -require_once 'Zend/Feed/Writer/Feed/FeedAbstract.php'; +// require_once 'Zend/Feed/Writer/Feed/FeedAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Http/Client.php b/libs/Zend/Http/Client.php index b375ccd684..065079e9cd 100644 --- a/libs/Zend/Http/Client.php +++ b/libs/Zend/Http/Client.php @@ -24,30 +24,30 @@ /** * @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_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 implemetation of an HTTP client in PHP. The client @@ -271,7 +271,7 @@ class Zend_Http_Client 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.'); } @@ -319,7 +319,7 @@ class Zend_Http_Client } 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)); } @@ -350,7 +350,7 @@ class Zend_Http_Client { if (! preg_match('/^[^\x00-\x1f\x7f-\xff\(\)<>@,;:\\\\"\/\[\]\?={}\s]+$/', $method)) { /** @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("'{$method}' is not a valid HTTP request method."); } @@ -402,7 +402,7 @@ class Zend_Http_Client // Make sure the name is valid if we are in strict mode if ($this->config['strict'] && (! preg_match('/^[a-zA-Z0-9-]+$/', $name))) { /** @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("{$name} is not a valid HTTP header name"); } @@ -559,7 +559,7 @@ class Zend_Http_Client // 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'"); } @@ -586,7 +586,7 @@ class Zend_Http_Client public function setCookieJar($cookiejar = true) { if (! class_exists('Zend_Http_CookieJar')) { - require_once 'Zend/Http/CookieJar.php'; + // require_once 'Zend/Http/CookieJar.php'; } if ($cookiejar instanceof Zend_Http_CookieJar) { @@ -597,7 +597,7 @@ class Zend_Http_Client $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'); } @@ -626,7 +626,7 @@ class Zend_Http_Client public function setCookie($cookie, $value = null) { if (! class_exists('Zend_Http_Cookie')) { - require_once 'Zend/Http/Cookie.php'; + // require_once 'Zend/Http/Cookie.php'; } if (is_array($cookie)) { @@ -663,7 +663,7 @@ class Zend_Http_Client 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})"); } @@ -703,7 +703,7 @@ class Zend_Http_Client 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"); } @@ -841,11 +841,11 @@ class Zend_Http_Client if (is_string($adapter)) { if (!class_exists($adapter)) { try { - require_once 'Zend/Loader.php'; + // require_once 'Zend/Loader.php'; 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); } } @@ -855,7 +855,7 @@ class Zend_Http_Client 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'); } @@ -913,7 +913,7 @@ class Zend_Http_Client $fp = fopen($this->_stream_name, "w+b"); if(!$fp) { $this->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 $name"); } @@ -931,7 +931,7 @@ class Zend_Http_Client { 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'); } @@ -966,7 +966,7 @@ class Zend_Http_Client // 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'); } @@ -980,7 +980,7 @@ class Zend_Http_Client $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'); } } @@ -991,7 +991,7 @@ class Zend_Http_Client $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'); } @@ -1227,7 +1227,7 @@ class Zend_Http_Client } /** @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; @@ -1388,7 +1388,7 @@ class Zend_Http_Client // 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"); } @@ -1403,7 +1403,7 @@ class Zend_Http_Client 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'"); } diff --git a/libs/Zend/Http/Client/Adapter/Curl.php b/libs/Zend/Http/Client/Adapter/Curl.php index 79e78e77f4..8ac364711a 100644 --- a/libs/Zend/Http/Client/Adapter/Curl.php +++ b/libs/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. @@ -116,7 +116,7 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac public function __construct() { if (!extension_loaded('curl')) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + // require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('cURL extension has to be loaded to use this Zend_Http_Client adapter.'); } } @@ -134,7 +134,7 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac $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) ); @@ -229,7 +229,7 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac 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); } @@ -262,12 +262,12 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac { // 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"); } @@ -304,7 +304,7 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac } 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."); } @@ -336,12 +336,12 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac 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"); } @@ -394,7 +394,7 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac 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)); } } @@ -413,7 +413,7 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac $request .= $body; if (empty($this->_response)) { - require_once 'Zend/Http/Client/Exception.php'; + // require_once 'Zend/Http/Client/Exception.php'; throw new Zend_Http_Client_Exception("Error in cURL request: " . curl_error($this->_curl)); } diff --git a/libs/Zend/Http/Client/Adapter/Exception.php b/libs/Zend/Http/Client/Adapter/Exception.php index c744c54abb..082c8af302 100644 --- a/libs/Zend/Http/Client/Adapter/Exception.php +++ b/libs/Zend/Http/Client/Adapter/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Http_Client_Exception */ -require_once 'Zend/Http/Client/Exception.php'; +// require_once 'Zend/Http/Client/Exception.php'; /** * @category Zend diff --git a/libs/Zend/Http/Client/Adapter/Proxy.php b/libs/Zend/Http/Client/Adapter/Proxy.php index aaec6f6589..cda6d62dbb 100644 --- a/libs/Zend/Http/Client/Adapter/Proxy.php +++ b/libs/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 @@ -122,7 +122,7 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket // 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"); } @@ -130,7 +130,7 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket $port = $this->config['proxy_port']; 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"); } @@ -172,7 +172,7 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket // 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"); } @@ -208,7 +208,7 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket // 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"); } @@ -225,7 +225,7 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket // 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); } @@ -245,7 +245,7 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket } if (! $success) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + // require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception("Unable to connect to" . " HTTPS server through proxy: could not negotiate secure connection."); } diff --git a/libs/Zend/Http/Client/Adapter/Socket.php b/libs/Zend/Http/Client/Adapter/Socket.php index 1a8f0d6ac3..a5ed78adda 100644 --- a/libs/Zend/Http/Client/Adapter/Socket.php +++ b/libs/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 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf $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 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf } else { // Invalid parameter - require_once 'Zend/Http/Client/Adapter/Exception.php'; + // require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( "Expecting either a stream context resource or array, got " . gettype($context) ); @@ -206,14 +206,14 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf if ($this->config['sslcert'] !== null) { if (! stream_context_set_option($context, 'ssl', 'local_cert', $this->config['sslcert'])) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + // require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Unable to set sslcert option'); } } if ($this->config['sslpassphrase'] !== null) { if (! stream_context_set_option($context, 'ssl', 'passphrase', $this->config['sslpassphrase'])) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + // require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Unable to set sslpassphrase option'); } } @@ -231,14 +231,14 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf if (! $this->socket) { $this->close(); - require_once 'Zend/Http/Client/Adapter/Exception.php'; + // require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Unable to Connect to ' . $host . ':' . $port . '. Error #' . $errno . ': ' . $errstr); } // Set the stream timeout if (! stream_set_timeout($this->socket, (int) $this->config['timeout'])) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + // require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Unable to set the connection timeout'); } @@ -261,14 +261,14 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf { // Make sure we're properly connected if (! $this->socket) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + // require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Trying to write but we are not connected'); } $host = $uri->getHost(); $host = (strtolower($uri->getScheme()) == 'https' ? $this->config['ssltransport'] : 'tcp') . '://' . $host; if ($this->connected_to[0] != $host || $this->connected_to[1] != $uri->getPort()) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + // require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Trying to write but we are connected to the wrong host'); } @@ -293,13 +293,13 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf // 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'); } } @@ -366,7 +366,7 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf $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'); } @@ -499,7 +499,7 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf $timedout = $info['timed_out']; if ($timedout) { $this->close(); - require_once 'Zend/Http/Client/Adapter/Exception.php'; + // require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( "Read timed out after {$this->config['timeout']} seconds", Zend_Http_Client_Adapter_Exception::READ_TIMEOUT diff --git a/libs/Zend/Http/Client/Adapter/Test.php b/libs/Zend/Http/Client/Adapter/Test.php index 82e9f04118..f974400868 100644 --- a/libs/Zend/Http/Client/Adapter/Test.php +++ b/libs/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 @@ class Zend_Http_Client_Adapter_Test implements Zend_Http_Client_Adapter_Interfac $config = $config->toArray(); } elseif (! is_array($config)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + // require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Array or Zend_Config object expected, got ' . gettype($config) ); @@ -134,7 +134,7 @@ class Zend_Http_Client_Adapter_Test implements Zend_Http_Client_Adapter_Interfac { if ($this->_nextRequestWillFail) { $this->_nextRequestWillFail = false; - require_once 'Zend/Http/Client/Adapter/Exception.php'; + // require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Request failed'); } } @@ -229,7 +229,7 @@ class Zend_Http_Client_Adapter_Test implements Zend_Http_Client_Adapter_Interfac public function setResponseIndex($index) { if ($index < 0 || $index >= count($this->responses)) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + // require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception( 'Index out of range of response buffer size'); } diff --git a/libs/Zend/Http/Client/Exception.php b/libs/Zend/Http/Client/Exception.php index 8d47dcbff6..dc35e3a0e2 100644 --- a/libs/Zend/Http/Client/Exception.php +++ b/libs/Zend/Http/Client/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Http_Exception */ -require_once 'Zend/Http/Exception.php'; +// require_once 'Zend/Http/Exception.php'; /** * @category Zend diff --git a/libs/Zend/Http/Cookie.php b/libs/Zend/Http/Cookie.php index 987d7951ab..49d2ff6ad8 100644 --- a/libs/Zend/Http/Cookie.php +++ b/libs/Zend/Http/Cookie.php @@ -24,7 +24,7 @@ /** * @see Zend_Uri_Http */ -require_once 'Zend/Uri/Http.php'; +// require_once 'Zend/Uri/Http.php'; /** @@ -110,17 +110,17 @@ class Zend_Http_Cookie public function __construct($name, $value, $domain, $expires = null, $path = null, $secure = false) { if (preg_match("/[=,; \t\r\n\013\014]/", $name)) { - require_once 'Zend/Http/Exception.php'; + // require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("Cookie name cannot contain these characters: =,; \\t\\r\\n\\013\\014 ({$name})"); } if (! $this->name = (string) $name) { - require_once 'Zend/Http/Exception.php'; + // require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception('Cookies must have a name'); } if (! $this->domain = (string) $domain) { - require_once 'Zend/Http/Exception.php'; + // require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception('Cookies must have a domain'); } @@ -234,7 +234,7 @@ class Zend_Http_Cookie // Make sure we have a valid Zend_Uri_Http object if (! ($uri->valid() && ($uri->getScheme() == 'http' || $uri->getScheme() =='https'))) { - require_once 'Zend/Http/Exception.php'; + // require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception('Passed URI is not a valid HTTP or HTTPS URI'); } @@ -334,7 +334,7 @@ class Zend_Http_Cookie * * @see Zend_Date */ - require_once 'Zend/Date.php'; + // require_once 'Zend/Date.php'; $expireDate = new Zend_Date($v); $expires = $expireDate->getTimestamp(); @@ -377,12 +377,12 @@ class Zend_Http_Cookie public static function matchCookieDomain($cookieDomain, $host) { if (! $cookieDomain) { - require_once 'Zend/Http/Exception.php'; + // require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("\$cookieDomain is expected to be a cookie domain"); } if (! $host) { - require_once 'Zend/Http/Exception.php'; + // require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("\$host is expected to be a host name"); } @@ -410,12 +410,12 @@ class Zend_Http_Cookie public static function matchCookiePath($cookiePath, $path) { if (! $cookiePath) { - require_once 'Zend/Http/Exception.php'; + // require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("\$cookiePath is expected to be a cookie path"); } if (! $path) { - require_once 'Zend/Http/Exception.php'; + // require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("\$path is expected to be a host name"); } diff --git a/libs/Zend/Http/CookieJar.php b/libs/Zend/Http/CookieJar.php index 9253479cf0..3d00a8e0af 100644 --- a/libs/Zend/Http/CookieJar.php +++ b/libs/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 @@ -131,7 +131,7 @@ class Zend_Http_CookieJar implements Countable, IteratorAggregate $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'); } } @@ -146,7 +146,7 @@ class Zend_Http_CookieJar implements Countable, IteratorAggregate public function addCookiesFromResponse($response, $ref_uri) { 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'); } @@ -190,7 +190,7 @@ class Zend_Http_CookieJar implements Countable, IteratorAggregate { 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"); } @@ -226,7 +226,7 @@ class Zend_Http_CookieJar implements Countable, IteratorAggregate } 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'); } @@ -249,7 +249,7 @@ class Zend_Http_CookieJar implements Countable, IteratorAggregate break; default: - require_once 'Zend/Http/Exception.php'; + // require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception("Invalid value passed for \$ret_as: {$ret_as}"); break; } diff --git a/libs/Zend/Http/Exception.php b/libs/Zend/Http/Exception.php index 099dfde48b..230c9c0a77 100644 --- a/libs/Zend/Http/Exception.php +++ b/libs/Zend/Http/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/libs/Zend/Http/Response.php b/libs/Zend/Http/Response.php index b4d8847ba2..decb5f357e 100644 --- a/libs/Zend/Http/Response.php +++ b/libs/Zend/Http/Response.php @@ -152,7 +152,7 @@ class Zend_Http_Response { // 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"); } @@ -160,7 +160,7 @@ class Zend_Http_Response // Make sure we got valid headers and set them if (! is_array($headers)) { - require_once 'Zend/Http/Exception.php'; + // require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception('No valid headers were passed'); } @@ -176,7 +176,7 @@ class Zend_Http_Response // 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"); } @@ -572,7 +572,7 @@ class Zend_Http_Response 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"); } @@ -600,7 +600,7 @@ class Zend_Http_Response 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' ); @@ -620,7 +620,7 @@ class Zend_Http_Response public static function decodeDeflate($body) { if (! function_exists('gzuncompress')) { - require_once 'Zend/Http/Exception.php'; + // require_once 'Zend/Http/Exception.php'; throw new Zend_Http_Exception( 'zlib extension is required in order to decode "deflate" encoding' ); diff --git a/libs/Zend/Loader.php b/libs/Zend/Loader.php index 4647abde53..56e2e11394 100644 --- a/libs/Zend/Loader.php +++ b/libs/Zend/Loader.php @@ -56,7 +56,7 @@ class Zend_Loader } if ((null !== $dirs) && !is_string($dirs) && !is_array($dirs)) { - require_once 'Zend/Exception.php'; + // require_once 'Zend/Exception.php'; throw new Zend_Exception('Directory argument must be a string or an array'); } @@ -95,7 +95,7 @@ class Zend_Loader } if (!class_exists($class, false) && !interface_exists($class, false)) { - require_once 'Zend/Exception.php'; + // require_once 'Zend/Exception.php'; throw new Zend_Exception("File \"$file\" does not exist or class \"$class\" was not found in the file"); } } @@ -256,7 +256,7 @@ class Zend_Loader public static function registerAutoload($class = 'Zend_Loader', $enabled = true) { trigger_error(__CLASS__ . '::' . __METHOD__ . ' is deprecated as of 1.8.0 and will be removed with 2.0.0; use Zend_Loader_Autoloader instead', E_USER_NOTICE); - require_once 'Zend/Loader/Autoloader.php'; + // require_once 'Zend/Loader/Autoloader.php'; $autoloader = Zend_Loader_Autoloader::getInstance(); $autoloader->setFallbackAutoloader(true); @@ -264,7 +264,7 @@ class Zend_Loader self::loadClass($class); $methods = get_class_methods($class); if (!in_array('autoload', (array) $methods)) { - require_once 'Zend/Exception.php'; + // require_once 'Zend/Exception.php'; throw new Zend_Exception("The class \"$class\" does not have an autoload() method"); } @@ -291,7 +291,7 @@ class Zend_Loader * Security check */ if (preg_match('/[^a-z0-9\\/\\\\_.:-]/i', $filename)) { - require_once 'Zend/Exception.php'; + // require_once 'Zend/Exception.php'; throw new Zend_Exception('Security check: Illegal character in filename'); } } diff --git a/libs/Zend/Loader/Autoloader/Resource.php b/libs/Zend/Loader/Autoloader/Resource.php index 8eddbbcec5..cd0a7fe7fc 100644 --- a/libs/Zend/Loader/Autoloader/Resource.php +++ b/libs/Zend/Loader/Autoloader/Resource.php @@ -21,7 +21,7 @@ */ /** Zend_Loader_Autoloader_Interface */ -require_once 'Zend/Loader/Autoloader/Interface.php'; +// require_once 'Zend/Loader/Autoloader/Interface.php'; /** * Resource loader @@ -71,7 +71,7 @@ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interfac $options = $options->toArray(); } if (!is_array($options)) { - require_once 'Zend/Loader/Exception.php'; + // require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('Options must be passed to resource loader constructor'); } @@ -81,7 +81,7 @@ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interfac if ((null === $namespace) || (null === $this->getBasePath()) ) { - require_once 'Zend/Loader/Exception.php'; + // require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('Resource loader requires both a namespace and a base path for initialization'); } @@ -116,18 +116,18 @@ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interfac if ('get' == substr($method, 0, 3)) { $type = strtolower(substr($method, 3)); if (!$this->hasResourceType($type)) { - require_once 'Zend/Loader/Exception.php'; + // require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception("Invalid resource type $type; cannot load resource"); } if (empty($args)) { - require_once 'Zend/Loader/Exception.php'; + // require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception("Cannot load resources; no resource specified"); } $resource = array_shift($args); return $this->load($resource, $type); } - require_once 'Zend/Loader/Exception.php'; + // require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception("Method '$method' is not supported"); } @@ -272,7 +272,7 @@ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interfac $type = strtolower($type); if (!isset($this->_resourceTypes[$type])) { if (null === $namespace) { - require_once 'Zend/Loader/Exception.php'; + // require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('Initial definition of a resource type must include a namespace'); } $namespaceTopLevel = $this->getNamespace(); @@ -282,7 +282,7 @@ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interfac ); } if (!is_string($path)) { - require_once 'Zend/Loader/Exception.php'; + // require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('Invalid path specification provided; must be string'); } $this->_resourceTypes[$type]['path'] = $this->getBasePath() . '/' . rtrim($path, '\/'); @@ -322,11 +322,11 @@ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interfac { foreach ($types as $type => $spec) { if (!is_array($spec)) { - require_once 'Zend/Loader/Exception.php'; + // require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('addResourceTypes() expects an array of arrays'); } if (!isset($spec['path'])) { - require_once 'Zend/Loader/Exception.php'; + // require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('addResourceTypes() expects each array to include a paths element'); } $paths = $spec['path']; @@ -442,12 +442,12 @@ class Zend_Loader_Autoloader_Resource implements Zend_Loader_Autoloader_Interfac if (null === $type) { $type = $this->getDefaultResourceType(); if (empty($type)) { - require_once 'Zend/Loader/Exception.php'; + // require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('No resource type specified'); } } if (!$this->hasResourceType($type)) { - require_once 'Zend/Loader/Exception.php'; + // require_once 'Zend/Loader/Exception.php'; throw new Zend_Loader_Exception('Invalid resource type specified'); } $namespace = $this->_resourceTypes[$type]['namespace']; diff --git a/libs/Zend/Loader/Exception.php b/libs/Zend/Loader/Exception.php index 0b1f683d0d..84d40420ef 100644 --- a/libs/Zend/Loader/Exception.php +++ b/libs/Zend/Loader/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/libs/Zend/Loader/PluginLoader.php b/libs/Zend/Loader/PluginLoader.php index 0c63bae366..f3f6170c67 100644 --- a/libs/Zend/Loader/PluginLoader.php +++ b/libs/Zend/Loader/PluginLoader.php @@ -21,10 +21,10 @@ */ /** Zend_Loader_PluginLoader_Interface */ -require_once 'Zend/Loader/PluginLoader/Interface.php'; +// require_once 'Zend/Loader/PluginLoader/Interface.php'; /** Zend_Loader */ -require_once 'Zend/Loader.php'; +// require_once 'Zend/Loader.php'; /** * Generic plugin class loader @@ -145,7 +145,7 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface public function addPrefixPath($prefix, $path) { if (!is_string($prefix) || !is_string($path)) { - require_once 'Zend/Loader/PluginLoader/Exception.php'; + // require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception('Zend_Loader_PluginLoader::addPrefixPath() method only takes strings for prefix and path.'); } @@ -250,14 +250,14 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface } if (!isset($registry[$prefix])) { - require_once 'Zend/Loader/PluginLoader/Exception.php'; + // require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception('Prefix ' . $prefix . ' was not found in the PluginLoader.'); } if ($path != null) { $pos = array_search($path, $registry[$prefix]); if ($pos === null) { - require_once 'Zend/Loader/PluginLoader/Exception.php'; + // require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception('Prefix ' . $prefix . ' / Path ' . $path . ' was not found in the PluginLoader.'); } unset($registry[$prefix][$pos]); @@ -408,7 +408,7 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface foreach ($registry as $prefix => $paths) { $message .= "\n$prefix: " . implode(PATH_SEPARATOR, $paths); } - require_once 'Zend/Loader/PluginLoader/Exception.php'; + // require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception($message); } @@ -438,15 +438,15 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface } if (!file_exists($file) && !file_exists(dirname($file))) { - require_once 'Zend/Loader/PluginLoader/Exception.php'; + // require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception('Specified file does not exist and/or directory does not exist (' . $file . ')'); } if (file_exists($file) && !is_writable($file)) { - require_once 'Zend/Loader/PluginLoader/Exception.php'; + // require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception('Specified file is not writeable (' . $file . ')'); } if (!file_exists($file) && file_exists(dirname($file)) && !is_writable(dirname($file))) { - require_once 'Zend/Loader/PluginLoader/Exception.php'; + // require_once 'Zend/Loader/PluginLoader/Exception.php'; throw new Zend_Loader_PluginLoader_Exception('Specified file is not writeable (' . $file . ')'); } diff --git a/libs/Zend/Loader/PluginLoader/Exception.php b/libs/Zend/Loader/PluginLoader/Exception.php index 4388313fc5..7db26ae6be 100644 --- a/libs/Zend/Loader/PluginLoader/Exception.php +++ b/libs/Zend/Loader/PluginLoader/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Loader_Exception */ -require_once 'Zend/Loader/Exception.php'; +// require_once 'Zend/Loader/Exception.php'; /** * Plugin class loader exceptions diff --git a/libs/Zend/Log.php b/libs/Zend/Log.php index 7e552d73e5..471c0e3cf4 100644 --- a/libs/Zend/Log.php +++ b/libs/Zend/Log.php @@ -101,7 +101,7 @@ class Zend_Log if (!is_array($config) || empty($config)) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Configuration must be an array or instance of Zend_Config'); } @@ -131,7 +131,7 @@ class Zend_Log if (!$writer instanceof Zend_Log_Writer_Abstract) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception("{$writerName} does not extend Zend_Log_Writer_Abstract!"); } @@ -155,7 +155,7 @@ class Zend_Log if (!$filter instanceof Zend_Log_Filter_Interface) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception("{$filterName} does not implement Zend_Log_Filter_Interface"); } @@ -177,7 +177,7 @@ class Zend_Log } if (!is_array($config) || empty($config)) { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception( 'Configuration must be an array or instance of Zend_Config' ); @@ -185,14 +185,14 @@ class Zend_Log $params = isset($config[ $type .'Params' ]) ? $config[ $type .'Params' ] : array(); $className = $this->getClassName($config, $type, $namespace); - if (!class_exists($className)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($className); - } + // if (!class_exists($className)) { + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($className); + // } $reflection = new ReflectionClass($className); if (!$reflection->implementsInterface('Zend_Log_FactoryInterface')) { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception( 'Driver does not implement Zend_Log_FactoryInterface and can not be constructed from config.' ); @@ -212,7 +212,7 @@ class Zend_Log protected function getClassName($config, $type, $defaultNamespace) { if (!isset($config[ $type . 'Name' ])) { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception("Specify {$type}Name in the configuration array"); } $className = $config[ $type . 'Name' ]; @@ -256,7 +256,7 @@ class Zend_Log switch (count($params)) { case 0: /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Missing log message'); case 1: $message = array_shift($params); @@ -270,7 +270,7 @@ class Zend_Log $this->log($message, $priority, $extras); } else { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Bad log priority'); } } @@ -289,13 +289,13 @@ class Zend_Log // sanity checks if (empty($this->_writers)) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('No writers were added'); } if (! isset($this->_priorities[$priority])) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Bad log priority'); } @@ -353,7 +353,7 @@ class Zend_Log if (isset($this->_priorities[$priority]) || array_search($name, $this->_priorities)) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Existing priorities cannot be overwritten'); } @@ -372,7 +372,7 @@ class Zend_Log { if (is_integer($filter)) { /** @see Zend_Log_Filter_Priority */ - require_once 'Zend/Log/Filter/Priority.php'; + // require_once 'Zend/Log/Filter/Priority.php'; $filter = new Zend_Log_Filter_Priority($filter); } elseif ($filter instanceof Zend_Config || is_array($filter)) { @@ -380,7 +380,7 @@ class Zend_Log } elseif(! $filter instanceof Zend_Log_Filter_Interface) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Invalid filter provided'); } @@ -402,7 +402,7 @@ class Zend_Log if (!$writer instanceof Zend_Log_Writer_Abstract) { /** @see Zend_Log_Exception */ - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception( 'Writer must be an instance of Zend_Log_Writer_Abstract' . ' or you should pass a configuration array' diff --git a/libs/Zend/Log/Exception.php b/libs/Zend/Log/Exception.php index 08557db8fb..b4bd50b5bb 100644 --- a/libs/Zend/Log/Exception.php +++ b/libs/Zend/Log/Exception.php @@ -20,7 +20,7 @@ */ /** Zend_Exception */ -require_once 'Zend/Exception.php'; +// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/libs/Zend/Log/Filter/Abstract.php b/libs/Zend/Log/Filter/Abstract.php index 72edad1f6e..e0e97b89f2 100644 --- a/libs/Zend/Log/Filter/Abstract.php +++ b/libs/Zend/Log/Filter/Abstract.php @@ -21,10 +21,10 @@ */ /** @see Zend_Log_Filter_Interface */ -require_once 'Zend/Log/Filter/Interface.php'; +// require_once 'Zend/Log/Filter/Interface.php'; /** @see Zend_Log_FactoryInterface */ -require_once 'Zend/Log/FactoryInterface.php'; +// require_once 'Zend/Log/FactoryInterface.php'; /** * @category Zend @@ -51,7 +51,7 @@ abstract class Zend_Log_Filter_Abstract } if (!is_array($config)) { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Configuration must be an array or instance of Zend_Config'); } diff --git a/libs/Zend/Log/Filter/Message.php b/libs/Zend/Log/Filter/Message.php index 96433f6406..4510888610 100644 --- a/libs/Zend/Log/Filter/Message.php +++ b/libs/Zend/Log/Filter/Message.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Filter_Abstract */ -require_once 'Zend/Log/Filter/Abstract.php'; +// require_once 'Zend/Log/Filter/Abstract.php'; /** * @category Zend @@ -47,7 +47,7 @@ class Zend_Log_Filter_Message extends Zend_Log_Filter_Abstract public function __construct($regexp) { if (@preg_match($regexp, '') === false) { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception("Invalid regular expression '$regexp'"); } $this->_regexp = $regexp; diff --git a/libs/Zend/Log/Filter/Priority.php b/libs/Zend/Log/Filter/Priority.php index 1835c9a299..45ba7c953b 100644 --- a/libs/Zend/Log/Filter/Priority.php +++ b/libs/Zend/Log/Filter/Priority.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Filter_Abstract */ -require_once 'Zend/Log/Filter/Abstract.php'; +// require_once 'Zend/Log/Filter/Abstract.php'; /** * @category Zend @@ -54,7 +54,7 @@ class Zend_Log_Filter_Priority extends Zend_Log_Filter_Abstract public function __construct($priority, $operator = NULL) { if (! is_integer($priority)) { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Priority must be an integer'); } diff --git a/libs/Zend/Log/Filter/Suppress.php b/libs/Zend/Log/Filter/Suppress.php index 14b74ae603..d87d2720a2 100644 --- a/libs/Zend/Log/Filter/Suppress.php +++ b/libs/Zend/Log/Filter/Suppress.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Filter_Interface */ -require_once 'Zend/Log/Filter/Interface.php'; +// require_once 'Zend/Log/Filter/Interface.php'; /** * @category Zend diff --git a/libs/Zend/Log/Formatter/Firebug.php b/libs/Zend/Log/Formatter/Firebug.php index ef155a5999..a0238935ec 100644 --- a/libs/Zend/Log/Formatter/Firebug.php +++ b/libs/Zend/Log/Formatter/Firebug.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Formatter_Interface */ -require_once 'Zend/Log/Formatter/Interface.php'; +// require_once 'Zend/Log/Formatter/Interface.php'; /** * @category Zend diff --git a/libs/Zend/Log/Formatter/Simple.php b/libs/Zend/Log/Formatter/Simple.php index c53b7c0d60..22f5a116fc 100644 --- a/libs/Zend/Log/Formatter/Simple.php +++ b/libs/Zend/Log/Formatter/Simple.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Formatter_Interface */ -require_once 'Zend/Log/Formatter/Interface.php'; +// require_once 'Zend/Log/Formatter/Interface.php'; /** * @category Zend @@ -53,7 +53,7 @@ class Zend_Log_Formatter_Simple implements Zend_Log_Formatter_Interface } if (! is_string($format)) { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Format must be a string'); } diff --git a/libs/Zend/Log/Formatter/Xml.php b/libs/Zend/Log/Formatter/Xml.php index a0af504bc2..ebf3c29e97 100644 --- a/libs/Zend/Log/Formatter/Xml.php +++ b/libs/Zend/Log/Formatter/Xml.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Formatter_Interface */ -require_once 'Zend/Log/Formatter/Interface.php'; +// require_once 'Zend/Log/Formatter/Interface.php'; /** * @category Zend diff --git a/libs/Zend/Log/Writer/Abstract.php b/libs/Zend/Log/Writer/Abstract.php index 979375a83f..80b939db18 100644 --- a/libs/Zend/Log/Writer/Abstract.php +++ b/libs/Zend/Log/Writer/Abstract.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Filter_Priority */ -require_once 'Zend/Log/Filter/Priority.php'; +// require_once 'Zend/Log/Filter/Priority.php'; /** * @category Zend @@ -118,7 +118,7 @@ abstract class Zend_Log_Writer_Abstract implements Zend_Log_FactoryInterface } if (!is_array($config)) { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception( 'Configuration must be an array or instance of Zend_Config' ); diff --git a/libs/Zend/Log/Writer/Db.php b/libs/Zend/Log/Writer/Db.php index 63660aec6f..6f77a12cb7 100644 --- a/libs/Zend/Log/Writer/Db.php +++ b/libs/Zend/Log/Writer/Db.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +// require_once 'Zend/Log/Writer/Abstract.php'; /** * @category Zend @@ -98,7 +98,7 @@ class Zend_Log_Writer_Db extends Zend_Log_Writer_Abstract */ public function setFormatter($formatter) { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception(get_class() . ' does not support formatting'); } @@ -121,7 +121,7 @@ class Zend_Log_Writer_Db extends Zend_Log_Writer_Abstract protected function _write($event) { if ($this->_db === null) { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Database adapter is null'); } diff --git a/libs/Zend/Log/Writer/Firebug.php b/libs/Zend/Log/Writer/Firebug.php index 5afd752401..585f6a3dc1 100644 --- a/libs/Zend/Log/Writer/Firebug.php +++ b/libs/Zend/Log/Writer/Firebug.php @@ -21,16 +21,16 @@ */ /** Zend_Log */ -require_once 'Zend/Log.php'; +// require_once 'Zend/Log.php'; /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +// require_once 'Zend/Log/Writer/Abstract.php'; /** Zend_Log_Formatter_Firebug */ -require_once 'Zend/Log/Formatter/Firebug.php'; +// require_once 'Zend/Log/Formatter/Firebug.php'; /** Zend_Wildfire_Plugin_FirePhp */ -require_once 'Zend/Wildfire/Plugin/FirePhp.php'; +// require_once 'Zend/Wildfire/Plugin/FirePhp.php'; /** * Writes log messages to the Firebug Console via FirePHP. diff --git a/libs/Zend/Log/Writer/Mail.php b/libs/Zend/Log/Writer/Mail.php index 2d47670e1d..70f57b8616 100644 --- a/libs/Zend/Log/Writer/Mail.php +++ b/libs/Zend/Log/Writer/Mail.php @@ -21,13 +21,13 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +// require_once 'Zend/Log/Writer/Abstract.php'; /** Zend_Log_Exception */ -require_once 'Zend/Log/Exception.php'; +// require_once 'Zend/Log/Exception.php'; /** Zend_Log_Formatter_Simple*/ -require_once 'Zend/Log/Formatter/Simple.php'; +// require_once 'Zend/Log/Formatter/Simple.php'; /** * Class used for writing log messages to email via Zend_Mail. diff --git a/libs/Zend/Log/Writer/Mock.php b/libs/Zend/Log/Writer/Mock.php index f946219a9f..1e14a2f00e 100644 --- a/libs/Zend/Log/Writer/Mock.php +++ b/libs/Zend/Log/Writer/Mock.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +// require_once 'Zend/Log/Writer/Abstract.php'; /** * @category Zend diff --git a/libs/Zend/Log/Writer/Null.php b/libs/Zend/Log/Writer/Null.php index d86b69b583..f281883fbb 100644 --- a/libs/Zend/Log/Writer/Null.php +++ b/libs/Zend/Log/Writer/Null.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +// require_once 'Zend/Log/Writer/Abstract.php'; /** * @category Zend diff --git a/libs/Zend/Log/Writer/Stream.php b/libs/Zend/Log/Writer/Stream.php index fdf924efdc..b722dbb4bd 100644 --- a/libs/Zend/Log/Writer/Stream.php +++ b/libs/Zend/Log/Writer/Stream.php @@ -21,10 +21,10 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +// require_once 'Zend/Log/Writer/Abstract.php'; /** Zend_Log_Formatter_Simple */ -require_once 'Zend/Log/Formatter/Simple.php'; +// require_once 'Zend/Log/Formatter/Simple.php'; /** * @category Zend @@ -57,12 +57,12 @@ class Zend_Log_Writer_Stream extends Zend_Log_Writer_Abstract if (is_resource($streamOrUrl)) { if (get_resource_type($streamOrUrl) != 'stream') { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Resource is not a stream'); } if ($mode != 'a') { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception('Mode cannot be changed on existing streams'); } @@ -73,7 +73,7 @@ class Zend_Log_Writer_Stream extends Zend_Log_Writer_Abstract } if (! $this->_stream = @fopen($streamOrUrl, $mode, false)) { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; $msg = "\"$streamOrUrl\" cannot be opened with mode \"$mode\""; throw new Zend_Log_Exception($msg); } @@ -128,7 +128,7 @@ class Zend_Log_Writer_Stream extends Zend_Log_Writer_Abstract $line = $this->_formatter->format($event); if (false === @fwrite($this->_stream, $line)) { - require_once 'Zend/Log/Exception.php'; + // require_once 'Zend/Log/Exception.php'; throw new Zend_Log_Exception("Unable to write to stream"); } } diff --git a/libs/Zend/Log/Writer/Syslog.php b/libs/Zend/Log/Writer/Syslog.php index 96fbe56922..310bcf54ec 100644 --- a/libs/Zend/Log/Writer/Syslog.php +++ b/libs/Zend/Log/Writer/Syslog.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +// require_once 'Zend/Log/Writer/Abstract.php'; /** * Writes log messages to syslog diff --git a/libs/Zend/Log/Writer/ZendMonitor.php b/libs/Zend/Log/Writer/ZendMonitor.php index 082f2a4f58..59a648fa8b 100644 --- a/libs/Zend/Log/Writer/ZendMonitor.php +++ b/libs/Zend/Log/Writer/ZendMonitor.php @@ -21,7 +21,7 @@ */ /** Zend_Log_Writer_Abstract */ -require_once 'Zend/Log/Writer/Abstract.php'; +// require_once 'Zend/Log/Writer/Abstract.php'; /** * @category Zend diff --git a/libs/Zend/Mail.php b/libs/Zend/Mail.php index 2f9c50f1f5..81d1b5051d 100644 --- a/libs/Zend/Mail.php +++ b/libs/Zend/Mail.php @@ -23,22 +23,22 @@ /** * @see Zend_Mail_Transport_Abstract */ -require_once 'Zend/Mail/Transport/Abstract.php'; +// require_once 'Zend/Mail/Transport/Abstract.php'; /** * @see Zend_Mime */ -require_once 'Zend/Mime.php'; +// require_once 'Zend/Mime.php'; /** * @see Zend_Mime_Message */ -require_once 'Zend/Mime/Message.php'; +// require_once 'Zend/Mime/Message.php'; /** * @see Zend_Mime_Part */ -require_once 'Zend/Mime/Part.php'; +// require_once 'Zend/Mime/Part.php'; /** @@ -245,7 +245,7 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Invalid content type "' . $type . '"'); } @@ -339,7 +339,7 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Invalid encoding "' . $encoding . '"'); } $this->_headerEncoding = $encoding; @@ -660,7 +660,7 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('From Header set twice'); } @@ -686,7 +686,7 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Reply-To Header set twice'); } @@ -784,7 +784,7 @@ class Zend_Mail extends Zend_Mime_Message public function setFromToDefaultFrom() { $from = self::getDefaultFrom(); if($from === null) { - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception( 'No default From Address set to use'); } @@ -834,7 +834,7 @@ class Zend_Mail extends Zend_Mime_Message public function setReplyToFromDefault() { $replyTo = self::getDefaultReplyTo(); if($replyTo === null) { - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception( 'No default Reply-To Address set to use'); } @@ -861,7 +861,7 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Return-Path Header set twice'); } return $this; @@ -913,7 +913,7 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Subject set twice'); } return $this; @@ -962,7 +962,7 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('String representations of Date Header must be ' . 'strtotime()-compatible'); } @@ -973,7 +973,7 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception(__METHOD__ . ' only accepts UNIX timestamps, Zend_Date objects, ' . ' and strtotime()-compatible strings'); } @@ -983,7 +983,7 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Date Header set twice'); } return $this; @@ -1039,7 +1039,7 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Message-ID set twice'); } @@ -1123,7 +1123,7 @@ class Zend_Mail extends Zend_Mime_Message /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('Cannot set standard header from addHeader()'); } @@ -1156,7 +1156,7 @@ class Zend_Mail extends Zend_Mime_Message { if ($transport === null) { if (! self::$_defaultTransport instanceof Zend_Mail_Transport_Abstract) { - require_once 'Zend/Mail/Transport/Sendmail.php'; + // require_once 'Zend/Mail/Transport/Sendmail.php'; $transport = new Zend_Mail_Transport_Sendmail(); } else { $transport = self::$_defaultTransport; diff --git a/libs/Zend/Mail/Exception.php b/libs/Zend/Mail/Exception.php index 470fc3d54e..c912769ee4 100644 --- a/libs/Zend/Mail/Exception.php +++ b/libs/Zend/Mail/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +// require_once 'Zend/Exception.php'; /** diff --git a/libs/Zend/Mail/Message.php b/libs/Zend/Mail/Message.php index 2bb96bc2f5..bff51340d2 100644 --- a/libs/Zend/Mail/Message.php +++ b/libs/Zend/Mail/Message.php @@ -23,12 +23,12 @@ /** * Zend_Mail_Part */ -require_once 'Zend/Mail/Part.php'; +// require_once 'Zend/Mail/Part.php'; /** * Zend_Mail_Message_Interface */ -require_once 'Zend/Mail/Message/Interface.php'; +// require_once 'Zend/Mail/Message/Interface.php'; /** * @category Zend @@ -63,7 +63,7 @@ class Zend_Mail_Message extends Zend_Mail_Part implements Zend_Mail_Message_Inte /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('could not open file'); } } else { diff --git a/libs/Zend/Mail/Message/File.php b/libs/Zend/Mail/Message/File.php index 3714f9ecf0..7857c743d6 100644 --- a/libs/Zend/Mail/Message/File.php +++ b/libs/Zend/Mail/Message/File.php @@ -23,12 +23,12 @@ /** * Zend_Mail_Part */ -require_once 'Zend/Mail/Part/File.php'; +// require_once 'Zend/Mail/Part/File.php'; /** * Zend_Mail_Message_Interface */ -require_once 'Zend/Mail/Message/Interface.php'; +// require_once 'Zend/Mail/Message/Interface.php'; /** * @category Zend diff --git a/libs/Zend/Mail/Part.php b/libs/Zend/Mail/Part.php index 51818e71e9..bb7b38e447 100644 --- a/libs/Zend/Mail/Part.php +++ b/libs/Zend/Mail/Part.php @@ -23,12 +23,12 @@ /** * @see Zend_Mime_Decode */ -require_once 'Zend/Mime/Decode.php'; +// require_once 'Zend/Mime/Decode.php'; /** * @see Zend_Mail_Part_Interface */ -require_once 'Zend/Mail/Part/Interface.php'; +// require_once 'Zend/Mail/Part/Interface.php'; /** @@ -108,14 +108,14 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('handler is not a valid mail handler'); } if (!isset($params['id'])) { /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('need a message id with a handler'); } @@ -176,7 +176,7 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('no content'); } } @@ -216,7 +216,7 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('no boundary found in content type to split message'); } $parts = Zend_Mime_Decode::splitMessageStruct($this->_content, $boundary); @@ -246,7 +246,7 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('part not found'); } @@ -261,7 +261,7 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('part not found'); } @@ -343,7 +343,7 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception("no Header with Name $name or $lowerName found"); } } diff --git a/libs/Zend/Mail/Part/File.php b/libs/Zend/Mail/Part/File.php index 9e87009346..581195bcc0 100644 --- a/libs/Zend/Mail/Part/File.php +++ b/libs/Zend/Mail/Part/File.php @@ -23,12 +23,12 @@ /** * @see Zend_Mime_Decode */ -require_once 'Zend/Mime/Decode.php'; +// require_once 'Zend/Mime/Decode.php'; /** * @see Zend_Mail_Part */ -require_once 'Zend/Mail/Part.php'; +// require_once 'Zend/Mail/Part.php'; /** @@ -60,7 +60,7 @@ class Zend_Mail_Part_File extends Zend_Mail_Part /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('no file given in params'); } @@ -73,7 +73,7 @@ class Zend_Mail_Part_File extends Zend_Mail_Part /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('could not open file'); } if (isset($params['startPos'])) { @@ -103,7 +103,7 @@ class Zend_Mail_Part_File extends Zend_Mail_Part /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('no boundary found in content type to split message'); } @@ -119,7 +119,7 @@ class Zend_Mail_Part_File extends Zend_Mail_Part /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('error reading file'); } @@ -188,7 +188,7 @@ class Zend_Mail_Part_File extends Zend_Mail_Part /** * @see Zend_Mail_Exception */ - require_once 'Zend/Mail/Exception.php'; + // require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('part not found'); } diff --git a/libs/Zend/Mail/Protocol/Abstract.php b/libs/Zend/Mail/Protocol/Abstract.php index 80c8e2fa97..cbfeaa8946 100644 --- a/libs/Zend/Mail/Protocol/Abstract.php +++ b/libs/Zend/Mail/Protocol/Abstract.php @@ -25,13 +25,13 @@ /** * @see Zend_Validate */ -require_once 'Zend/Validate.php'; +// require_once 'Zend/Validate.php'; /** * @see Zend_Validate_Hostname */ -require_once 'Zend/Validate/Hostname.php'; +// require_once 'Zend/Validate/Hostname.php'; /** @@ -140,7 +140,7 @@ abstract class Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception(join(', ', $this->_validHost->getMessages())); } @@ -250,7 +250,7 @@ abstract class Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception($errorStr); } @@ -258,7 +258,7 @@ abstract class Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('Could not set stream timeout'); } @@ -292,7 +292,7 @@ abstract class Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('No connection has been established to ' . $this->_host); } @@ -307,7 +307,7 @@ abstract class Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('Could not send request to ' . $this->_host); } @@ -328,7 +328,7 @@ abstract class Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('No connection has been established to ' . $this->_host); } @@ -350,7 +350,7 @@ abstract class Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception($this->_host . ' has timed out'); } @@ -358,7 +358,7 @@ abstract class Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('Could not read from ' . $this->_host); } @@ -404,7 +404,7 @@ abstract class Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception($errMsg); } diff --git a/libs/Zend/Mail/Protocol/Exception.php b/libs/Zend/Mail/Protocol/Exception.php index 15f446836e..30999c2d14 100644 --- a/libs/Zend/Mail/Protocol/Exception.php +++ b/libs/Zend/Mail/Protocol/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Mail/Exception.php'; +// require_once 'Zend/Mail/Exception.php'; /** diff --git a/libs/Zend/Mail/Protocol/Imap.php b/libs/Zend/Mail/Protocol/Imap.php index 77c2ee32c7..286642fb48 100644 --- a/libs/Zend/Mail/Protocol/Imap.php +++ b/libs/Zend/Mail/Protocol/Imap.php @@ -96,7 +96,7 @@ class Zend_Mail_Protocol_Imap /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot connect to host; error = ' . $errstr . ' (errno = ' . $errno . ' )'); } @@ -105,7 +105,7 @@ class Zend_Mail_Protocol_Imap /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('host doesn\'t allow connection'); } @@ -116,7 +116,7 @@ class Zend_Mail_Protocol_Imap /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot enable TLS'); } } @@ -135,7 +135,7 @@ class Zend_Mail_Protocol_Imap /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot read - connection closed?'); } @@ -348,14 +348,14 @@ class Zend_Mail_Protocol_Imap /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot write - connection closed?'); } if (!$this->_assumedNextLine('+ ')) { /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot send literal string'); } $line = $token[1]; @@ -368,7 +368,7 @@ class Zend_Mail_Protocol_Imap /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot write - connection closed?'); } } @@ -629,7 +629,7 @@ class Zend_Mail_Protocol_Imap /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('the single id was not found in response'); } diff --git a/libs/Zend/Mail/Protocol/Pop3.php b/libs/Zend/Mail/Protocol/Pop3.php index 7678b345de..78f01fe376 100644 --- a/libs/Zend/Mail/Protocol/Pop3.php +++ b/libs/Zend/Mail/Protocol/Pop3.php @@ -105,7 +105,7 @@ class Zend_Mail_Protocol_Pop3 /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot connect to host; error = ' . $errstr . ' (errno = ' . $errno . ' )'); } @@ -127,7 +127,7 @@ class Zend_Mail_Protocol_Pop3 /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('cannot enable TLS'); } } @@ -150,7 +150,7 @@ class Zend_Mail_Protocol_Pop3 /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('send failed - connection closed?'); } } @@ -170,7 +170,7 @@ class Zend_Mail_Protocol_Pop3 /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('read failed - connection closed?'); } @@ -186,7 +186,7 @@ class Zend_Mail_Protocol_Pop3 /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('last request failed'); } @@ -385,7 +385,7 @@ class Zend_Mail_Protocol_Pop3 /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('top not supported and no fallback wanted'); } } diff --git a/libs/Zend/Mail/Protocol/Smtp.php b/libs/Zend/Mail/Protocol/Smtp.php index acd5c5425b..a7d8153fa2 100644 --- a/libs/Zend/Mail/Protocol/Smtp.php +++ b/libs/Zend/Mail/Protocol/Smtp.php @@ -25,13 +25,13 @@ /** * @see Zend_Mime */ -require_once 'Zend/Mime.php'; +// require_once 'Zend/Mime.php'; /** * @see Zend_Mail_Protocol_Abstract */ -require_once 'Zend/Mail/Protocol/Abstract.php'; +// require_once 'Zend/Mail/Protocol/Abstract.php'; /** @@ -140,7 +140,7 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception($config['ssl'] . ' is unsupported SSL type'); break; } @@ -182,7 +182,7 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('Cannot issue HELO to existing session'); } @@ -191,7 +191,7 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception(join(', ', $this->_validHost->getMessages())); } @@ -207,7 +207,7 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('Unable to connect via TLS'); } $this->_ehlo($host); @@ -253,7 +253,7 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('A valid session has not been started'); } @@ -280,7 +280,7 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('No sender reverse path has been supplied'); } @@ -305,7 +305,7 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('No recipient forward path has been supplied'); } @@ -403,7 +403,7 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; + // require_once 'Zend/Mail/Protocol/Exception.php'; throw new Zend_Mail_Protocol_Exception('Already authenticated for this session'); } } diff --git a/libs/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php b/libs/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php index 4b2aa4b28b..523d383e23 100644 --- a/libs/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php +++ b/libs/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php @@ -24,7 +24,7 @@ /** * @see Zend_Mail_Protocol_Smtp */ -require_once 'Zend/Mail/Protocol/Smtp.php'; +// require_once 'Zend/Mail/Protocol/Smtp.php'; /** diff --git a/libs/Zend/Mail/Protocol/Smtp/Auth/Login.php b/libs/Zend/Mail/Protocol/Smtp/Auth/Login.php index ab79748aed..892f6724ec 100644 --- a/libs/Zend/Mail/Protocol/Smtp/Auth/Login.php +++ b/libs/Zend/Mail/Protocol/Smtp/Auth/Login.php @@ -24,7 +24,7 @@ /** * @see Zend_Mail_Protocol_Smtp */ -require_once 'Zend/Mail/Protocol/Smtp.php'; +// require_once 'Zend/Mail/Protocol/Smtp.php'; /** diff --git a/libs/Zend/Mail/Protocol/Smtp/Auth/Plain.php b/libs/Zend/Mail/Protocol/Smtp/Auth/Plain.php index a8c2f61f85..02784cb9d3 100644 --- a/libs/Zend/Mail/Protocol/Smtp/Auth/Plain.php +++ b/libs/Zend/Mail/Protocol/Smtp/Auth/Plain.php @@ -24,7 +24,7 @@ /** * @see Zend_Mail_Protocol_Smtp */ -require_once 'Zend/Mail/Protocol/Smtp.php'; +// require_once 'Zend/Mail/Protocol/Smtp.php'; /** diff --git a/libs/Zend/Mail/Storage/Abstract.php b/libs/Zend/Mail/Storage/Abstract.php index 344a07d7e9..0d5f1ed1e7 100644 --- a/libs/Zend/Mail/Storage/Abstract.php +++ b/libs/Zend/Mail/Storage/Abstract.php @@ -82,7 +82,7 @@ abstract class Zend_Mail_Storage_Abstract implements Countable, ArrayAccess, See /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception($var . ' not found'); } @@ -264,7 +264,7 @@ abstract class Zend_Mail_Storage_Abstract implements Countable, ArrayAccess, See /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot write mail messages via array access'); } diff --git a/libs/Zend/Mail/Storage/Exception.php b/libs/Zend/Mail/Storage/Exception.php index 96219196ce..29cbc26981 100644 --- a/libs/Zend/Mail/Storage/Exception.php +++ b/libs/Zend/Mail/Storage/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Mail_Exception */ -require_once 'Zend/Mail/Exception.php'; +// require_once 'Zend/Mail/Exception.php'; /** diff --git a/libs/Zend/Mail/Storage/Folder.php b/libs/Zend/Mail/Storage/Folder.php index 10b368a9be..51d8a61a5d 100644 --- a/libs/Zend/Mail/Storage/Folder.php +++ b/libs/Zend/Mail/Storage/Folder.php @@ -154,7 +154,7 @@ class Zend_Mail_Storage_Folder implements RecursiveIterator /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("no subfolder named $name"); } diff --git a/libs/Zend/Mail/Storage/Folder/Maildir.php b/libs/Zend/Mail/Storage/Folder/Maildir.php index d486703c5f..228465a9e3 100644 --- a/libs/Zend/Mail/Storage/Folder/Maildir.php +++ b/libs/Zend/Mail/Storage/Folder/Maildir.php @@ -24,17 +24,17 @@ /** * @see Zend_Mail_Storage_Folder */ -require_once 'Zend/Mail/Storage/Folder.php'; +// require_once 'Zend/Mail/Storage/Folder.php'; /** * @see Zend_Mail_Storage_Folder_Interface */ -require_once 'Zend/Mail/Storage/Folder/Interface.php'; +// require_once 'Zend/Mail/Storage/Folder/Interface.php'; /** * @see Zend_Mail_Storage_Maildir */ -require_once 'Zend/Mail/Storage/Maildir.php'; +// require_once 'Zend/Mail/Storage/Maildir.php'; /** @@ -90,7 +90,7 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('no valid dirname given in params'); } @@ -123,7 +123,7 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("can't read folders in maildir"); } $dirs = array(); @@ -152,7 +152,7 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('error while reading maildir'); } array_push($stack, $parent); @@ -171,7 +171,7 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('error while reading maildir'); } } @@ -208,7 +208,7 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("folder $rootFolder not found"); } return $currentFolder; @@ -238,7 +238,7 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("{$this->_currentFolder} is not selectable", 0, $e); } // seems like file has vanished; rebuilding folder tree - but it's still an exception @@ -246,7 +246,7 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('seems like the maildir has vanished, I\'ve rebuild the ' . 'folder tree, search for an other folder and try again', 0, $e); } diff --git a/libs/Zend/Mail/Storage/Folder/Mbox.php b/libs/Zend/Mail/Storage/Folder/Mbox.php index 0c5cfd88ef..fc1d50b2a0 100644 --- a/libs/Zend/Mail/Storage/Folder/Mbox.php +++ b/libs/Zend/Mail/Storage/Folder/Mbox.php @@ -24,17 +24,17 @@ /** * @see Zend_Mail_Storage_Folder */ -require_once 'Zend/Mail/Storage/Folder.php'; +// require_once 'Zend/Mail/Storage/Folder.php'; /** * @see Zend_Mail_Storage_Folder_Interface */ -require_once 'Zend/Mail/Storage/Folder/Interface.php'; +// require_once 'Zend/Mail/Storage/Folder/Interface.php'; /** * @see Zend_Mail_Storage_Mbox */ -require_once 'Zend/Mail/Storage/Mbox.php'; +// require_once 'Zend/Mail/Storage/Mbox.php'; /** @@ -86,7 +86,7 @@ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Ze /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('use Zend_Mail_Storage_Mbox for a single file'); } @@ -94,7 +94,7 @@ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Ze /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('no valid dirname given in params'); } @@ -130,7 +130,7 @@ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Ze /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("can't read dir $currentDir"); } while (($entry = readdir($dh)) !== false) { @@ -182,7 +182,7 @@ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Ze /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("folder $rootFolder not found"); } return $currentFolder; @@ -212,7 +212,7 @@ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Ze /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("{$this->_currentFolder} is not selectable", 0, $e); } // seems like file has vanished; rebuilding folder tree - but it's still an exception @@ -220,7 +220,7 @@ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Ze /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('seems like the mbox file has vanished, I\'ve rebuild the ' . 'folder tree, search for an other folder and try again', 0, $e); } diff --git a/libs/Zend/Mail/Storage/Imap.php b/libs/Zend/Mail/Storage/Imap.php index 0910e6fe67..2efc5b856b 100644 --- a/libs/Zend/Mail/Storage/Imap.php +++ b/libs/Zend/Mail/Storage/Imap.php @@ -24,37 +24,37 @@ /** * @see Zend_Mail_Storage_Abstract */ -require_once 'Zend/Mail/Storage/Abstract.php'; +// require_once 'Zend/Mail/Storage/Abstract.php'; /** * @see Zend_Mail_Protocol_Imap */ -require_once 'Zend/Mail/Protocol/Imap.php'; +// require_once 'Zend/Mail/Protocol/Imap.php'; /** * @see Zend_Mail_Storage_Writable_Interface */ -require_once 'Zend/Mail/Storage/Writable/Interface.php'; +// require_once 'Zend/Mail/Storage/Writable/Interface.php'; /** * @see Zend_Mail_Storage_Folder_Interface */ -require_once 'Zend/Mail/Storage/Folder/Interface.php'; +// require_once 'Zend/Mail/Storage/Folder/Interface.php'; /** * @see Zend_Mail_Storage_Folder */ -require_once 'Zend/Mail/Storage/Folder.php'; +// require_once 'Zend/Mail/Storage/Folder.php'; /** * @see Zend_Mail_Message */ -require_once 'Zend/Mail/Message.php'; +// require_once 'Zend/Mail/Message.php'; /** * @see Zend_Mail_Storage */ -require_once 'Zend/Mail/Storage.php'; +// require_once 'Zend/Mail/Storage.php'; /** * @category Zend @@ -116,7 +116,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('No selected folder to count'); } @@ -189,7 +189,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -213,7 +213,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -250,7 +250,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot select INBOX, is this a valid transport?', 0, $e); } return; @@ -260,7 +260,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('need at least user in params'); } @@ -275,7 +275,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot login, user or password wrong'); } $this->selectFolder(isset($params->folder) ? $params->folder : 'INBOX'); @@ -305,7 +305,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('could not do nothing'); } } @@ -325,7 +325,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot set deleted flag'); } // TODO: expunge here or at close? we can handle an error here better and are more fail safe @@ -333,7 +333,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('message marked as deleted, but could not expunge'); } } @@ -379,7 +379,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('unique id not found'); } @@ -399,7 +399,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('folder not found'); } @@ -437,7 +437,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('error while constructing folder tree'); } } @@ -463,7 +463,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot change folder, maybe it does not exist'); } } @@ -506,7 +506,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot create folder'); } } @@ -528,7 +528,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot delete folder'); } } @@ -553,7 +553,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot rename folder'); } } @@ -582,7 +582,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot create message, please check if the folder exists and your flags'); } } @@ -601,7 +601,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot copy message, does the folder exist?'); } } @@ -636,7 +636,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot set flags, have you tried to set the recent flag or special chars?'); } } diff --git a/libs/Zend/Mail/Storage/Maildir.php b/libs/Zend/Mail/Storage/Maildir.php index 2bb4b00e95..736b70cc66 100644 --- a/libs/Zend/Mail/Storage/Maildir.php +++ b/libs/Zend/Mail/Storage/Maildir.php @@ -24,17 +24,17 @@ /** * @see Zend_Mail_Storage_Abstract */ -require_once 'Zend/Mail/Storage/Abstract.php'; +// require_once 'Zend/Mail/Storage/Abstract.php'; /** * @see Zend_Mail_Message_File */ -require_once 'Zend/Mail/Message/File.php'; +// require_once 'Zend/Mail/Message/File.php'; /** * @see Zend_Mail_Storage */ -require_once 'Zend/Mail/Storage.php'; +// require_once 'Zend/Mail/Storage.php'; /** @@ -122,7 +122,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('id does not exist'); } @@ -134,7 +134,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('field does not exist'); } @@ -200,7 +200,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -234,7 +234,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -270,7 +270,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('no valid dirname given in params'); } @@ -278,7 +278,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('invalid maildir given'); } @@ -322,7 +322,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot open maildir'); } $this->_getMaildirFiles($dh, $dirname . '/cur/'); @@ -336,7 +336,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot read recent mails in maildir'); } } @@ -422,7 +422,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('maildir is (currently) read-only'); } @@ -469,7 +469,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('unique id not found'); } } diff --git a/libs/Zend/Mail/Storage/Mbox.php b/libs/Zend/Mail/Storage/Mbox.php index 3398c31b92..97bc56e394 100644 --- a/libs/Zend/Mail/Storage/Mbox.php +++ b/libs/Zend/Mail/Storage/Mbox.php @@ -25,17 +25,17 @@ * @see Zend_Loader * May be used in constructor, but commented out for now */ -// require_once 'Zend/Loader.php'; +// // require_once 'Zend/Loader.php'; /** * @see Zend_Mail_Storage_Abstract */ -require_once 'Zend/Mail/Storage/Abstract.php'; +// require_once 'Zend/Mail/Storage/Abstract.php'; /** * @see Zend_Mail_Message_File */ -require_once 'Zend/Mail/Message/File.php'; +// require_once 'Zend/Mail/Message/File.php'; /** @@ -124,7 +124,7 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('id does not exist'); } @@ -180,7 +180,7 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } $messagePos = $this->_getPos($id); @@ -204,7 +204,7 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } $messagePos = $this->_getPos($id); @@ -229,7 +229,7 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('no valid filename given in params'); } @@ -290,7 +290,7 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot open mbox file'); } $this->_filename = $filename; @@ -301,7 +301,7 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('file is not a valid mbox format'); } @@ -362,7 +362,7 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('mbox is read-only'); } @@ -438,7 +438,7 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot open mbox file'); } } diff --git a/libs/Zend/Mail/Storage/Pop3.php b/libs/Zend/Mail/Storage/Pop3.php index 78d8dea306..0841c3c352 100644 --- a/libs/Zend/Mail/Storage/Pop3.php +++ b/libs/Zend/Mail/Storage/Pop3.php @@ -24,17 +24,17 @@ /** * @see Zend_Mail_Storage_Abstract */ -require_once 'Zend/Mail/Storage/Abstract.php'; +// require_once 'Zend/Mail/Storage/Abstract.php'; /** * @see Zend_Mail_Protocol_Pop3 */ -require_once 'Zend/Mail/Protocol/Pop3.php'; +// require_once 'Zend/Mail/Protocol/Pop3.php'; /** * @see Zend_Mail_Message */ -require_once 'Zend/Mail/Message.php'; +// require_once 'Zend/Mail/Message.php'; /** @@ -112,7 +112,7 @@ class Zend_Mail_Storage_Pop3 extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -135,7 +135,7 @@ class Zend_Mail_Storage_Pop3 extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -177,7 +177,7 @@ class Zend_Mail_Storage_Pop3 extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('need at least user in params'); } @@ -279,7 +279,7 @@ class Zend_Mail_Storage_Pop3 extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('unique id not found'); } diff --git a/libs/Zend/Mail/Storage/Writable/Maildir.php b/libs/Zend/Mail/Storage/Writable/Maildir.php index 3288040554..3519a4b411 100644 --- a/libs/Zend/Mail/Storage/Writable/Maildir.php +++ b/libs/Zend/Mail/Storage/Writable/Maildir.php @@ -24,12 +24,12 @@ /** * @see Zend_Mail_Storage_Folder_Maildir */ -require_once 'Zend/Mail/Storage/Folder/Maildir.php'; +// require_once 'Zend/Mail/Storage/Folder/Maildir.php'; /** * @see Zend_Mail_Storage_Writable_Interface */ -require_once 'Zend/Mail/Storage/Writable/Interface.php'; +// require_once 'Zend/Mail/Storage/Writable/Interface.php'; /** @@ -66,7 +66,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('maildir must be a directory if already exists'); } } else { @@ -74,7 +74,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; $dir = dirname($dir); if (!file_exists($dir)) { throw new Zend_Mail_Storage_Exception("parent $dir not found"); @@ -93,7 +93,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('could not create subdir ' . $subdir); } } @@ -154,7 +154,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('folder already exists'); } @@ -162,7 +162,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('invalid name - folder parts may not be empty'); } @@ -178,7 +178,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('invalid name - no directory seprator allowed in folder name'); } @@ -199,7 +199,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('error while creating new folder, may be created incompletly'); } @@ -241,7 +241,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('delete children first'); } @@ -249,7 +249,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('wont delete INBOX'); } @@ -257,7 +257,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('wont delete selected folder'); } @@ -271,7 +271,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("error opening $subdir"); } while (($entry = readdir($dh)) !== false) { @@ -282,7 +282,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("error cleaning $subdir"); } } @@ -292,7 +292,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("error removing $subdir"); } } @@ -304,7 +304,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("error removing maindir"); } @@ -345,7 +345,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('new folder cannot be a child of old folder'); } @@ -356,7 +356,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('wont rename INBOX'); } @@ -364,7 +364,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('wont rename selected folder'); } @@ -387,7 +387,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('error while moving ' . $subdir); } } @@ -442,7 +442,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('problems creating tmp dir'); } } @@ -464,7 +464,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('could not open temp file'); } break; @@ -476,7 +476,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("tried $max_tries unique ids for a temp file, but all were taken" . ' - giving up'); } @@ -500,7 +500,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('recent flag may not be set'); } @@ -520,7 +520,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('unknown flag(s): ' . $wanted_flags); } @@ -545,7 +545,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('storage is over quota!'); } @@ -587,7 +587,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; $exception = new Zend_Mail_Storage_Exception('cannot link message file to final dir'); } @unlink($temp_file['filename']); @@ -618,7 +618,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('storage is over quota!'); } @@ -656,13 +656,13 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; $exception = new Zend_Mail_Storage_Exception('cannot copy message file'); } else if (!link($temp_file['filename'], $new_file)) { /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; $exception = new Zend_Mail_Storage_Exception('cannot link message file to final dir'); } @unlink($temp_file['filename']); @@ -701,7 +701,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('target is current folder'); } @@ -734,7 +734,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; $exception = new Zend_Mail_Storage_Exception('cannot move message file'); } @unlink($temp_file['filename']); @@ -770,7 +770,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot rename file'); } @@ -799,7 +799,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot remove message'); } unset($this->_files[$id - 1]); @@ -839,7 +839,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - require_once 'Zend/Mail/Storage/Exception.php'; + // require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot open maildirsize'); } $definition = fgets($fh); diff --git a/libs/Zend/Mail/Transport/Abstract.php b/libs/Zend/Mail/Transport/Abstract.php index 1d225a3e66..74d6ab005f 100644 --- a/libs/Zend/Mail/Transport/Abstract.php +++ b/libs/Zend/Mail/Transport/Abstract.php @@ -24,7 +24,7 @@ /** * @see Zend_Mime */ -require_once 'Zend/Mime.php'; +// require_once 'Zend/Mime.php'; /** @@ -184,7 +184,7 @@ abstract class Zend_Mail_Transport_Abstract /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; + // require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('Missing Zend_Mail object in _mail property'); } @@ -213,7 +213,7 @@ abstract class Zend_Mail_Transport_Abstract /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; + // require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Exception('At least one mail header line is too long'); } } @@ -280,7 +280,7 @@ abstract class Zend_Mail_Transport_Abstract /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; + // require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('No body specified'); } @@ -319,7 +319,7 @@ abstract class Zend_Mail_Transport_Abstract /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; + // require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('Empty mail cannot be sent'); } diff --git a/libs/Zend/Mail/Transport/Exception.php b/libs/Zend/Mail/Transport/Exception.php index 63bf1cd4fd..cf4165a886 100644 --- a/libs/Zend/Mail/Transport/Exception.php +++ b/libs/Zend/Mail/Transport/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Mail_Exception */ -require_once 'Zend/Mail/Exception.php'; +// require_once 'Zend/Mail/Exception.php'; /** diff --git a/libs/Zend/Mail/Transport/Sendmail.php b/libs/Zend/Mail/Transport/Sendmail.php index 6111ba7cf6..c12eb46a23 100644 --- a/libs/Zend/Mail/Transport/Sendmail.php +++ b/libs/Zend/Mail/Transport/Sendmail.php @@ -24,7 +24,7 @@ /** * @see Zend_Mail_Transport_Abstract */ -require_once 'Zend/Mail/Transport/Abstract.php'; +// require_once 'Zend/Mail/Transport/Abstract.php'; /** @@ -113,7 +113,7 @@ class Zend_Mail_Transport_Sendmail extends Zend_Mail_Transport_Abstract * Exception is thrown here because * $parameters is a public property */ - require_once 'Zend/Mail/Transport/Exception.php'; + // require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception( 'Parameters were set but are not a string' ); @@ -133,7 +133,7 @@ class Zend_Mail_Transport_Sendmail extends Zend_Mail_Transport_Abstract /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; + // require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('Unable to send mail. ' . $this->_errstr); } } @@ -157,7 +157,7 @@ class Zend_Mail_Transport_Sendmail extends Zend_Mail_Transport_Abstract /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; + // require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('_prepareHeaders requires a registered Zend_Mail object'); } @@ -169,7 +169,7 @@ class Zend_Mail_Transport_Sendmail extends Zend_Mail_Transport_Abstract /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; + // require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('Missing To addresses'); } } else { @@ -178,7 +178,7 @@ class Zend_Mail_Transport_Sendmail extends Zend_Mail_Transport_Abstract /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; + // require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('Missing To header'); } diff --git a/libs/Zend/Mail/Transport/Smtp.php b/libs/Zend/Mail/Transport/Smtp.php index 4175d8b845..288cb4644f 100644 --- a/libs/Zend/Mail/Transport/Smtp.php +++ b/libs/Zend/Mail/Transport/Smtp.php @@ -24,17 +24,17 @@ /** * @see Zend_Mime */ -require_once 'Zend/Mime.php'; +// require_once 'Zend/Mime.php'; /** * @see Zend_Mail_Protocol_Smtp */ -require_once 'Zend/Mail/Protocol/Smtp.php'; +// require_once 'Zend/Mail/Protocol/Smtp.php'; /** * @see Zend_Mail_Transport_Abstract */ -require_once 'Zend/Mail/Transport/Abstract.php'; +// require_once 'Zend/Mail/Transport/Abstract.php'; /** @@ -191,10 +191,10 @@ class Zend_Mail_Transport_Smtp extends Zend_Mail_Transport_Abstract if ($this->_auth) { $connectionClass .= '_Auth_' . ucwords($this->_auth); } - if (!class_exists($connectionClass)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($connectionClass); - } + // if (!class_exists($connectionClass)) { + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($connectionClass); + // } $this->setConnection(new $connectionClass($this->_host, $this->_port, $this->_config)); $this->_connection->connect(); $this->_connection->helo($this->_name); @@ -231,7 +231,7 @@ class Zend_Mail_Transport_Smtp extends Zend_Mail_Transport_Abstract /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; + // require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('_prepareHeaders requires a registered Zend_Mail object'); } diff --git a/libs/Zend/Mime/Decode.php b/libs/Zend/Mime/Decode.php index 5e4c0a7af8..b996a4a028 100644 --- a/libs/Zend/Mime/Decode.php +++ b/libs/Zend/Mime/Decode.php @@ -22,7 +22,7 @@ /** * @see Zend_Mime */ -require_once 'Zend/Mime.php'; +// require_once 'Zend/Mime.php'; /** * @category Zend diff --git a/libs/Zend/Mime/Exception.php b/libs/Zend/Mime/Exception.php index a38affe97c..cb76e79c50 100644 --- a/libs/Zend/Mime/Exception.php +++ b/libs/Zend/Mime/Exception.php @@ -23,7 +23,7 @@ /** * Zend_Exception */ -require_once 'Zend/Exception.php'; +// require_once 'Zend/Exception.php'; /** diff --git a/libs/Zend/Mime/Message.php b/libs/Zend/Mime/Message.php index 6207bda131..781ac99246 100644 --- a/libs/Zend/Mime/Message.php +++ b/libs/Zend/Mime/Message.php @@ -23,12 +23,12 @@ /** * Zend_Mime */ -require_once 'Zend/Mime.php'; +// require_once 'Zend/Mime.php'; /** * Zend_Mime_Part */ -require_once 'Zend/Mime/Part.php'; +// require_once 'Zend/Mime/Part.php'; /** @@ -242,7 +242,7 @@ class Zend_Mime_Message */ public static function createFromMessage($message, $boundary, $EOL = Zend_Mime::LINEEND) { - require_once 'Zend/Mime/Decode.php'; + // require_once 'Zend/Mime/Decode.php'; $parts = Zend_Mime_Decode::splitMessageStruct($message, $boundary, $EOL); $res = new self(); diff --git a/libs/Zend/Mime/Part.php b/libs/Zend/Mime/Part.php index eb0c978136..96e20d09a3 100644 --- a/libs/Zend/Mime/Part.php +++ b/libs/Zend/Mime/Part.php @@ -22,7 +22,7 @@ /** * Zend_Mime */ -require_once 'Zend/Mime.php'; +// require_once 'Zend/Mime.php'; /** * Class representing a MIME part. @@ -92,7 +92,7 @@ class Zend_Mime_Part { public function getEncodedStream() { if (!$this->_isStream) { - require_once 'Zend/Mime/Exception.php'; + // require_once 'Zend/Mime/Exception.php'; throw new Zend_Mime_Exception('Attempt to get a stream from a string part'); } @@ -109,7 +109,7 @@ class Zend_Mime_Part { ) ); if (!is_resource($filter)) { - require_once 'Zend/Mime/Exception.php'; + // require_once 'Zend/Mime/Exception.php'; throw new Zend_Mime_Exception('Failed to append quoted-printable filter'); } break; @@ -124,7 +124,7 @@ class Zend_Mime_Part { ) ); if (!is_resource($filter)) { - require_once 'Zend/Mime/Exception.php'; + // require_once 'Zend/Mime/Exception.php'; throw new Zend_Mime_Exception('Failed to append base64 filter'); } break; diff --git a/libs/Zend/Registry.php b/libs/Zend/Registry.php index 6623da260b..845ef66bba 100644 --- a/libs/Zend/Registry.php +++ b/libs/Zend/Registry.php @@ -66,7 +66,7 @@ class Zend_Registry extends ArrayObject public static function setInstance(Zend_Registry $registry) { if (self::$_registry !== null) { - require_once 'Zend/Exception.php'; + // require_once 'Zend/Exception.php'; throw new Zend_Exception('Registry is already initialized'); } @@ -97,22 +97,22 @@ class Zend_Registry extends ArrayObject public static function setClassName($registryClassName = 'Zend_Registry') { if (self::$_registry !== null) { - require_once 'Zend/Exception.php'; + // require_once 'Zend/Exception.php'; throw new Zend_Exception('Registry is already initialized'); } if (!is_string($registryClassName)) { - require_once 'Zend/Exception.php'; + // require_once 'Zend/Exception.php'; throw new Zend_Exception("Argument is not a class name"); } /** * @see Zend_Loader */ - if (!class_exists($registryClassName)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($registryClassName); - } + // if (!class_exists($registryClassName)) { + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($registryClassName); + // } self::$_registryClassName = $registryClassName; } @@ -143,7 +143,7 @@ class Zend_Registry extends ArrayObject $instance = self::getInstance(); if (!$instance->offsetExists($index)) { - require_once 'Zend/Exception.php'; + // require_once 'Zend/Exception.php'; throw new Zend_Exception("No entry is registered for key '$index'"); } diff --git a/libs/Zend/Session.php b/libs/Zend/Session.php index 17116fbd41..e361d15db2 100644 --- a/libs/Zend/Session.php +++ b/libs/Zend/Session.php @@ -25,17 +25,17 @@ /** * @see Zend_Session_Abstract */ -require_once 'Zend/Session/Abstract.php'; +// require_once 'Zend/Session/Abstract.php'; /** * @see Zend_Session_Namespace */ -require_once 'Zend/Session/Namespace.php'; +// require_once 'Zend/Session/Namespace.php'; /** * @see Zend_Session_SaveHandler_Interface */ -require_once 'Zend/Session/SaveHandler/Interface.php'; +// require_once 'Zend/Session/SaveHandler/Interface.php'; /** @@ -223,7 +223,7 @@ class Zend_Session extends Zend_Session_Abstract } else { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("Unknown option: $userOptionName = $userOptionValue"); } } @@ -303,7 +303,7 @@ class Zend_Session extends Zend_Session_Abstract { if (!self::$_unitTestEnabled && headers_sent($filename, $linenum)) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("You must call " . __CLASS__ . '::' . __FUNCTION__ . "() before any output has been sent to the browser; output started in {$filename}/{$linenum}"); } @@ -427,7 +427,7 @@ class Zend_Session extends Zend_Session_Abstract public static function start($options = false) { if (self::$_sessionStarted && self::$_destroyed) { - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('The session was explicitly destroyed during this request, attempting to re-start is not allowed.'); } @@ -443,14 +443,14 @@ class Zend_Session extends Zend_Session_Abstract // In strict mode, do not allow auto-starting Zend_Session, such as via "new Zend_Session_Namespace()" if (self::$_strict && $options === true) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('You must explicitly start the session with Zend_Session::start() when session options are set to strict.'); } $filename = $linenum = null; if (!self::$_unitTestEnabled && headers_sent($filename, $linenum)) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("Session must be started before any output has been sent to the browser;" . " output started in {$filename}/{$linenum}"); } @@ -458,7 +458,7 @@ class Zend_Session extends Zend_Session_Abstract // See http://www.php.net/manual/en/ref.session.php for explanation if (!self::$_unitTestEnabled && defined('SID')) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('session has already been started by session.auto-start or session_start()'); } @@ -473,7 +473,7 @@ class Zend_Session extends Zend_Session_Abstract if (!self::$_unitTestEnabled) { if (self::$_throwStartupExceptions) { - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; set_error_handler(array('Zend_Session_Exception', 'handleSessionStartError'), $errorLevel); } @@ -632,20 +632,20 @@ class Zend_Session extends Zend_Session_Abstract { if (!self::$_unitTestEnabled && defined('SID')) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('The session has already been started. The session id must be set first.'); } if (!self::$_unitTestEnabled && headers_sent($filename, $linenum)) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("You must call ".__CLASS__.'::'.__FUNCTION__. "() before any output has been sent to the browser; output started in {$filename}/{$linenum}"); } if (!is_string($id) || $id === '') { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('You must provide a non-empty string as a session identifier.'); } @@ -774,14 +774,14 @@ class Zend_Session extends Zend_Session_Abstract private static function _processValidators() { foreach ($_SESSION['__ZF']['VALID'] as $validator_name => $valid_data) { - if (!class_exists($validator_name)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($validator_name); - } + // if (!class_exists($validator_name)) { + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($validator_name); + // } $validator = new $validator_name; if ($validator->validate() === false) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("This session is not valid according to {$validator_name}."); } } @@ -838,7 +838,7 @@ class Zend_Session extends Zend_Session_Abstract { if (parent::$_readable === false) { /** @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(parent::_THROW_NOT_READABLE_MSG); } diff --git a/libs/Zend/Session/Abstract.php b/libs/Zend/Session/Abstract.php index 5603d146c7..2c5b613e95 100644 --- a/libs/Zend/Session/Abstract.php +++ b/libs/Zend/Session/Abstract.php @@ -82,7 +82,7 @@ abstract class Zend_Session_Abstract /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(self::_THROW_NOT_READABLE_MSG); } @@ -108,7 +108,7 @@ abstract class Zend_Session_Abstract /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(self::_THROW_NOT_WRITABLE_MSG); } @@ -143,7 +143,7 @@ abstract class Zend_Session_Abstract /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(self::_THROW_NOT_READABLE_MSG); } diff --git a/libs/Zend/Session/Exception.php b/libs/Zend/Session/Exception.php index 04c34f7295..dc8aa638ff 100644 --- a/libs/Zend/Session/Exception.php +++ b/libs/Zend/Session/Exception.php @@ -24,7 +24,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +// require_once 'Zend/Exception.php'; /** diff --git a/libs/Zend/Session/Namespace.php b/libs/Zend/Session/Namespace.php index b3d759477f..ef811a066b 100644 --- a/libs/Zend/Session/Namespace.php +++ b/libs/Zend/Session/Namespace.php @@ -24,13 +24,13 @@ /** * @see Zend_Session */ -require_once 'Zend/Session.php'; +// require_once 'Zend/Session.php'; /** * @see Zend_Session_Abstract */ -require_once 'Zend/Session/Abstract.php'; +// require_once 'Zend/Session/Abstract.php'; /** @@ -105,7 +105,7 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('Session namespace must be a non-empty string.'); } @@ -113,7 +113,7 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('Session namespace must not start with an underscore.'); } @@ -121,7 +121,7 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('Session namespace must not start with a number.'); } @@ -129,7 +129,7 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("A session namespace object already exists for this namespace ('$namespace'), and no additional accessors (session namespace objects) for this namespace are permitted."); } @@ -146,7 +146,7 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(self::_THROW_NOT_READABLE_MSG); } @@ -280,7 +280,7 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("The '$name' key must be a non-empty string"); } @@ -302,7 +302,7 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('This session/namespace has been marked as read-only.'); } @@ -310,7 +310,7 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("The '$name' key must be a non-empty string"); } @@ -318,7 +318,7 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(parent::_THROW_NOT_WRITABLE_MSG); } @@ -367,7 +367,7 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('Result must be an array. Got: ' . gettype($result)); } $_SESSION[$this->_namespace] = $result; @@ -387,7 +387,7 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("The '$name' key must be a non-empty string"); } @@ -407,7 +407,7 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception("The '$name' key must be a non-empty string"); } @@ -430,7 +430,7 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(parent::_THROW_NOT_WRITABLE_MSG); } @@ -438,7 +438,7 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('Seconds must be positive.'); } @@ -478,7 +478,7 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception(parent::_THROW_NOT_WRITABLE_MSG); } @@ -486,7 +486,7 @@ class Zend_Session_Namespace extends Zend_Session_Abstract implements IteratorAg /** * @see Zend_Session_Exception */ - require_once 'Zend/Session/Exception.php'; + // require_once 'Zend/Session/Exception.php'; throw new Zend_Session_Exception('Hops must be positive number.'); } diff --git a/libs/Zend/Session/SaveHandler/DbTable.php b/libs/Zend/Session/SaveHandler/DbTable.php index df75a28aa7..b59526d3a9 100644 --- a/libs/Zend/Session/SaveHandler/DbTable.php +++ b/libs/Zend/Session/SaveHandler/DbTable.php @@ -23,22 +23,22 @@ /** * @see Zend_Session */ -require_once 'Zend/Session.php'; +// require_once 'Zend/Session.php'; /** * @see Zend_Db_Table_Abstract */ -require_once 'Zend/Db/Table/Abstract.php'; +// require_once 'Zend/Db/Table/Abstract.php'; /** * @see Zend_Db_Table_Row_Abstract */ -require_once 'Zend/Db/Table/Row/Abstract.php'; +// require_once 'Zend/Db/Table/Row/Abstract.php'; /** * @see Zend_Config */ -require_once 'Zend/Config.php'; +// require_once 'Zend/Config.php'; /** * Zend_Session_SaveHandler_DbTable @@ -168,7 +168,7 @@ class Zend_Session_SaveHandler_DbTable /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; + // require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception( '$config must be an instance of Zend_Config or array of key/value pairs containing ' @@ -232,7 +232,7 @@ class Zend_Session_SaveHandler_DbTable /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; + // require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception(); } else if (empty($lifetime)) { $this->_lifetime = (int) ini_get('session.gc_maxlifetime'); @@ -420,7 +420,7 @@ class Zend_Session_SaveHandler_DbTable /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; + // require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception('session.save_path is a path and not a table name.'); } @@ -452,7 +452,7 @@ class Zend_Session_SaveHandler_DbTable /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; + // require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception( "Value for configuration option '" . self::PRIMARY_ASSIGNMENT . "' must have an assignment " @@ -461,7 +461,7 @@ class Zend_Session_SaveHandler_DbTable /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; + // require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception( "Value for configuration option '" . self::PRIMARY_ASSIGNMENT . "' must have an assignment " @@ -481,7 +481,7 @@ class Zend_Session_SaveHandler_DbTable /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; + // require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception( "Configuration must define '" . self::MODIFIED_COLUMN . "' which names the " @@ -490,7 +490,7 @@ class Zend_Session_SaveHandler_DbTable /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; + // require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception( "Configuration must define '" . self::LIFETIME_COLUMN . "' which names the " @@ -499,7 +499,7 @@ class Zend_Session_SaveHandler_DbTable /** * @see Zend_Session_SaveHandler_Exception */ - require_once 'Zend/Session/SaveHandler/Exception.php'; + // require_once 'Zend/Session/SaveHandler/Exception.php'; throw new Zend_Session_SaveHandler_Exception( "Configuration must define '" . self::DATA_COLUMN . "' which names the " diff --git a/libs/Zend/Session/SaveHandler/Exception.php b/libs/Zend/Session/SaveHandler/Exception.php index 5f72d30f75..249dcfa930 100644 --- a/libs/Zend/Session/SaveHandler/Exception.php +++ b/libs/Zend/Session/SaveHandler/Exception.php @@ -23,7 +23,7 @@ /** * @see Zend_Session_Exception */ -require_once 'Zend/Session/Exception.php'; +// require_once 'Zend/Session/Exception.php'; /** * Zend_Session_SaveHandler_Exception diff --git a/libs/Zend/Session/Validator/Abstract.php b/libs/Zend/Session/Validator/Abstract.php index c5050d5d34..6c4caaeb94 100644 --- a/libs/Zend/Session/Validator/Abstract.php +++ b/libs/Zend/Session/Validator/Abstract.php @@ -23,7 +23,7 @@ /** * @see Zend_Session_Validator_Interface */ -require_once 'Zend/Session/Validator/Interface.php'; +// require_once 'Zend/Session/Validator/Interface.php'; /** * Zend_Session_Validator_Abstract diff --git a/libs/Zend/Session/Validator/HttpUserAgent.php b/libs/Zend/Session/Validator/HttpUserAgent.php index 86f171bff0..fef7d33329 100644 --- a/libs/Zend/Session/Validator/HttpUserAgent.php +++ b/libs/Zend/Session/Validator/HttpUserAgent.php @@ -23,7 +23,7 @@ /** * @see Zend_Session_Validator_Abstract */ -require_once 'Zend/Session/Validator/Abstract.php'; +// require_once 'Zend/Session/Validator/Abstract.php'; /** * Zend_Session_Validator_HttpUserAgent diff --git a/libs/Zend/Uri.php b/libs/Zend/Uri.php index 6e7a2822e4..90d9d405c5 100644 --- a/libs/Zend/Uri.php +++ b/libs/Zend/Uri.php @@ -94,13 +94,13 @@ abstract class Zend_Uri $schemeSpecific = isset($uri[1]) === true ? $uri[1] : ''; if (strlen($scheme) === 0) { - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('An empty string was supplied for the scheme'); } // Security check: $scheme is used to load a class file, so only alphanumerics are allowed. if (ctype_alnum($scheme) === false) { - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Illegal scheme supplied, only alphanumeric characters are permitted'); } @@ -118,15 +118,15 @@ abstract class Zend_Uri case 'mailto': // TODO default: - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Scheme \"$scheme\" is not supported"); break; } - if (!class_exists($className)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($className); - } + // if (!class_exists($className)) { + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($className); + // } $schemeHandler = new $className($scheme, $schemeSpecific); return $schemeHandler; diff --git a/libs/Zend/Uri/Exception.php b/libs/Zend/Uri/Exception.php index e71c32e1a8..ba2f1a8342 100644 --- a/libs/Zend/Uri/Exception.php +++ b/libs/Zend/Uri/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +// require_once 'Zend/Exception.php'; /** * Exceptions for Zend_Uri diff --git a/libs/Zend/Uri/Http.php b/libs/Zend/Uri/Http.php index 28f315953c..48911dad64 100644 --- a/libs/Zend/Uri/Http.php +++ b/libs/Zend/Uri/Http.php @@ -22,12 +22,12 @@ /** * @see Zend_Uri */ -require_once 'Zend/Uri.php'; +// require_once 'Zend/Uri.php'; /** * @see Zend_Validate_Hostname */ -require_once 'Zend/Validate/Hostname.php'; +// require_once 'Zend/Validate/Hostname.php'; /** * HTTP(S) URI handler @@ -152,7 +152,7 @@ class Zend_Uri_Http extends Zend_Uri // Validate the URI if ($this->valid() === false) { - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Invalid URI supplied'); } } @@ -170,7 +170,7 @@ class Zend_Uri_Http extends Zend_Uri public static function fromString($uri) { if (is_string($uri) === false) { - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('$uri is not a string'); } @@ -179,7 +179,7 @@ class Zend_Uri_Http extends Zend_Uri $schemeSpecific = isset($uri[1]) === true ? $uri[1] : ''; if (in_array($scheme, array('http', 'https')) === false) { - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Invalid scheme: '$scheme'"); } @@ -201,7 +201,7 @@ class Zend_Uri_Http extends Zend_Uri $pattern = '~^((//)([^/?#]*))([^?#]*)(\?([^#]*))?(#(.*))?$~'; $status = @preg_match($pattern, $schemeSpecific, $matches); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: scheme-specific decomposition failed'); } @@ -220,7 +220,7 @@ class Zend_Uri_Http extends Zend_Uri $pattern = '~^(([^:@]*)(:([^@]*))?@)?([^:]+)(:(.*))?$~'; $status = @preg_match($pattern, $combo, $matches); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: authority decomposition failed'); } @@ -247,7 +247,7 @@ class Zend_Uri_Http extends Zend_Uri public function getUri() { if ($this->valid() === false) { - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('One or more parts of the URI are invalid'); } @@ -320,7 +320,7 @@ class Zend_Uri_Http extends Zend_Uri self::CHAR_ALNUM . self::CHAR_MARK . ';:&=+$,' . '])+$/', $username); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: username validation failed'); } @@ -337,7 +337,7 @@ class Zend_Uri_Http extends Zend_Uri public function setUsername($username) { if ($this->validateUsername($username) === false) { - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Username \"$username\" is not a valid HTTP username"); } @@ -387,7 +387,7 @@ class Zend_Uri_Http extends Zend_Uri self::CHAR_ALNUM . self::CHAR_MARK . ';:&=+$,' . '])+$/', $password); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: password validation failed.'); } @@ -404,7 +404,7 @@ class Zend_Uri_Http extends Zend_Uri public function setPassword($password) { if ($this->validatePassword($password) === false) { - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Password \"$password\" is not a valid HTTP password."); } @@ -459,7 +459,7 @@ class Zend_Uri_Http extends Zend_Uri public function setHost($host) { if ($this->validateHost($host) === false) { - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Host \"$host\" is not a valid HTTP host"); } @@ -511,7 +511,7 @@ class Zend_Uri_Http extends Zend_Uri public function setPort($port) { if ($this->validatePort($port) === false) { - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Port \"$port\" is not a valid HTTP port."); } @@ -554,7 +554,7 @@ class Zend_Uri_Http extends Zend_Uri $pattern = '/^' . $this->_regex['path'] . '$/'; $status = @preg_match($pattern, $path); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: path validation failed'); } @@ -571,7 +571,7 @@ class Zend_Uri_Http extends Zend_Uri public function setPath($path) { if ($this->validatePath($path) === false) { - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Path \"$path\" is not a valid HTTP path"); } @@ -632,7 +632,7 @@ class Zend_Uri_Http extends Zend_Uri $pattern = '/^' . $this->_regex['uric'] . '*$/'; $status = @preg_match($pattern, $query); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: query validation failed'); } @@ -697,7 +697,7 @@ class Zend_Uri_Http extends Zend_Uri // Make sure the query is valid, and set it if ($this->validateQuery($query) === false) { - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("'$query' is not a valid query string"); } @@ -740,7 +740,7 @@ class Zend_Uri_Http extends Zend_Uri $pattern = '/^' . $this->_regex['uric'] . '*$/'; $status = @preg_match($pattern, $fragment); if ($status === false) { - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception('Internal error: fragment validation failed'); } @@ -757,7 +757,7 @@ class Zend_Uri_Http extends Zend_Uri public function setFragment($fragment) { if ($this->validateFragment($fragment) === false) { - require_once 'Zend/Uri/Exception.php'; + // require_once 'Zend/Uri/Exception.php'; throw new Zend_Uri_Exception("Fragment \"$fragment\" is not a valid HTTP fragment"); } diff --git a/libs/Zend/Validate.php b/libs/Zend/Validate.php index 98b9c310b4..f14eb671e7 100644 --- a/libs/Zend/Validate.php +++ b/libs/Zend/Validate.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Interface */ -require_once 'Zend/Validate/Interface.php'; +// require_once 'Zend/Validate/Interface.php'; /** * @category Zend @@ -198,7 +198,7 @@ class Zend_Validate implements Zend_Validate_Interface $className = ucfirst($classBaseName); try { if (!class_exists($className, false)) { - require_once 'Zend/Loader.php'; + // require_once 'Zend/Loader.php'; foreach($namespaces as $namespace) { $class = $namespace . '_' . $className; $file = str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php'; @@ -240,7 +240,7 @@ class Zend_Validate implements Zend_Validate_Interface // fallthrough and continue for missing validation classes } - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Validate class not found from basename '$classBaseName'"); } @@ -251,7 +251,7 @@ class Zend_Validate implements Zend_Validate_Interface */ public static function getMessageLength() { - require_once 'Zend/Validate/Abstract.php'; + // require_once 'Zend/Validate/Abstract.php'; return Zend_Validate_Abstract::getMessageLength(); } @@ -262,7 +262,7 @@ class Zend_Validate implements Zend_Validate_Interface */ public static function setMessageLength($length = -1) { - require_once 'Zend/Validate/Abstract.php'; + // require_once 'Zend/Validate/Abstract.php'; Zend_Validate_Abstract::setMessageLength($length); } @@ -273,7 +273,7 @@ class Zend_Validate implements Zend_Validate_Interface */ public static function getDefaultTranslator($translator = null) { - require_once 'Zend/Validate/Abstract.php'; + // require_once 'Zend/Validate/Abstract.php'; return Zend_Validate_Abstract::getDefaultTranslator(); } @@ -284,7 +284,7 @@ class Zend_Validate implements Zend_Validate_Interface */ public static function setDefaultTranslator($translator = null) { - require_once 'Zend/Validate/Abstract.php'; + // require_once 'Zend/Validate/Abstract.php'; Zend_Validate_Abstract::setDefaultTranslator($translator); } } diff --git a/libs/Zend/Validate/Abstract.php b/libs/Zend/Validate/Abstract.php index b59478e97d..49cd7f10ff 100644 --- a/libs/Zend/Validate/Abstract.php +++ b/libs/Zend/Validate/Abstract.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Interface */ -require_once 'Zend/Validate/Interface.php'; +// require_once 'Zend/Validate/Interface.php'; /** * @category Zend @@ -149,7 +149,7 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface } if (!isset($this->_messageTemplates[$messageKey])) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("No message template exists for key '$messageKey'"); } @@ -191,7 +191,7 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface /** * @see Zend_Validate_Exception */ - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("No property exists by the name '$property'"); } @@ -328,7 +328,7 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface } elseif ($translator instanceof Zend_Translate) { $this->_translator = $translator->getAdapter(); } else { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid translator specified'); } return $this; @@ -365,7 +365,7 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface } elseif ($translator instanceof Zend_Translate) { self::$_defaultTranslator = $translator->getAdapter(); } else { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid translator specified'); } } @@ -378,7 +378,7 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface public static function getDefaultTranslator() { if (null === self::$_defaultTranslator) { - require_once 'Zend/Registry.php'; + // require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Translate')) { $translator = Zend_Registry::get('Zend_Translate'); if ($translator instanceof Zend_Translate_Adapter) { diff --git a/libs/Zend/Validate/Alnum.php b/libs/Zend/Validate/Alnum.php index d222a368f3..9db12a3062 100644 --- a/libs/Zend/Validate/Alnum.php +++ b/libs/Zend/Validate/Alnum.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -133,7 +133,7 @@ class Zend_Validate_Alnum extends Zend_Validate_Abstract /** * @see Zend_Filter_Alnum */ - require_once 'Zend/Filter/Alnum.php'; + // require_once 'Zend/Filter/Alnum.php'; self::$_filter = new Zend_Filter_Alnum(); } diff --git a/libs/Zend/Validate/Alpha.php b/libs/Zend/Validate/Alpha.php index 5474177744..42864fa561 100644 --- a/libs/Zend/Validate/Alpha.php +++ b/libs/Zend/Validate/Alpha.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -133,7 +133,7 @@ class Zend_Validate_Alpha extends Zend_Validate_Abstract /** * @see Zend_Filter_Alpha */ - require_once 'Zend/Filter/Alpha.php'; + // require_once 'Zend/Filter/Alpha.php'; self::$_filter = new Zend_Filter_Alpha(); } diff --git a/libs/Zend/Validate/Barcode.php b/libs/Zend/Validate/Barcode.php index 933999a504..40bb9cb623 100644 --- a/libs/Zend/Validate/Barcode.php +++ b/libs/Zend/Validate/Barcode.php @@ -22,12 +22,12 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Loader */ -require_once 'Zend/Loader.php'; +// require_once 'Zend/Loader.php'; /** * @category Zend @@ -100,7 +100,7 @@ class Zend_Validate_Barcode extends Zend_Validate_Abstract if (array_key_exists('adapter', $adapter)) { $adapter = $adapter['adapter']; } else { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Missing option 'adapter'"); } } @@ -132,18 +132,18 @@ class Zend_Validate_Barcode extends Zend_Validate_Abstract public function setAdapter($adapter, $options = null) { $adapter = ucfirst(strtolower($adapter)); - require_once 'Zend/Loader.php'; + // require_once 'Zend/Loader.php'; if (Zend_Loader::isReadable('Zend/Validate/Barcode/' . $adapter. '.php')) { $adapter = 'Zend_Validate_Barcode_' . $adapter; } - if (!class_exists($adapter)) { - Zend_Loader::loadClass($adapter); - } + // if (!class_exists($adapter)) { + // Zend_Loader::loadClass($adapter); + // } $this->_adapter = new $adapter($options); if (!$this->_adapter instanceof Zend_Validate_Barcode_AdapterInterface) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception( "Adapter " . $adapter . " does not implement Zend_Validate_Barcode_AdapterInterface" ); @@ -214,4 +214,4 @@ class Zend_Validate_Barcode extends Zend_Validate_Abstract return true; } -}
\ No newline at end of file +} diff --git a/libs/Zend/Validate/Barcode/AdapterAbstract.php b/libs/Zend/Validate/Barcode/AdapterAbstract.php index 043189e6c2..7cbb4644f8 100644 --- a/libs/Zend/Validate/Barcode/AdapterAbstract.php +++ b/libs/Zend/Validate/Barcode/AdapterAbstract.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterInterface */ -require_once 'Zend/Validate/Barcode/AdapterInterface.php'; +// require_once 'Zend/Validate/Barcode/AdapterInterface.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Code25.php b/libs/Zend/Validate/Barcode/Code25.php index efb5a395c7..6d1525da4c 100644 --- a/libs/Zend/Validate/Barcode/Code25.php +++ b/libs/Zend/Validate/Barcode/Code25.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Code25interleaved.php b/libs/Zend/Validate/Barcode/Code25interleaved.php index 7e5a8d919b..54fd90bd28 100644 --- a/libs/Zend/Validate/Barcode/Code25interleaved.php +++ b/libs/Zend/Validate/Barcode/Code25interleaved.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Code39.php b/libs/Zend/Validate/Barcode/Code39.php index 858084fe25..8208cffb9e 100644 --- a/libs/Zend/Validate/Barcode/Code39.php +++ b/libs/Zend/Validate/Barcode/Code39.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Code39ext.php b/libs/Zend/Validate/Barcode/Code39ext.php index 5c1d65ee64..5b90254c50 100644 --- a/libs/Zend/Validate/Barcode/Code39ext.php +++ b/libs/Zend/Validate/Barcode/Code39ext.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Code93.php b/libs/Zend/Validate/Barcode/Code93.php index deb5183d43..36a6567f36 100644 --- a/libs/Zend/Validate/Barcode/Code93.php +++ b/libs/Zend/Validate/Barcode/Code93.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Code93ext.php b/libs/Zend/Validate/Barcode/Code93ext.php index 740d485c4a..2aaf343162 100644 --- a/libs/Zend/Validate/Barcode/Code93ext.php +++ b/libs/Zend/Validate/Barcode/Code93ext.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Ean12.php b/libs/Zend/Validate/Barcode/Ean12.php index 56a2384be2..26dee47fb5 100644 --- a/libs/Zend/Validate/Barcode/Ean12.php +++ b/libs/Zend/Validate/Barcode/Ean12.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Ean13.php b/libs/Zend/Validate/Barcode/Ean13.php index b7e52f4c13..d5387e52f9 100644 --- a/libs/Zend/Validate/Barcode/Ean13.php +++ b/libs/Zend/Validate/Barcode/Ean13.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Ean14.php b/libs/Zend/Validate/Barcode/Ean14.php index 93d46d8c4f..19756c8ee7 100644 --- a/libs/Zend/Validate/Barcode/Ean14.php +++ b/libs/Zend/Validate/Barcode/Ean14.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Ean18.php b/libs/Zend/Validate/Barcode/Ean18.php index 93398dd916..7c6519959f 100644 --- a/libs/Zend/Validate/Barcode/Ean18.php +++ b/libs/Zend/Validate/Barcode/Ean18.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Ean2.php b/libs/Zend/Validate/Barcode/Ean2.php index deab558ea4..009bfe5e57 100644 --- a/libs/Zend/Validate/Barcode/Ean2.php +++ b/libs/Zend/Validate/Barcode/Ean2.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Ean5.php b/libs/Zend/Validate/Barcode/Ean5.php index af6e493241..7574e897e4 100644 --- a/libs/Zend/Validate/Barcode/Ean5.php +++ b/libs/Zend/Validate/Barcode/Ean5.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Ean8.php b/libs/Zend/Validate/Barcode/Ean8.php index c87af039fd..ca68fe45d9 100644 --- a/libs/Zend/Validate/Barcode/Ean8.php +++ b/libs/Zend/Validate/Barcode/Ean8.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Gtin12.php b/libs/Zend/Validate/Barcode/Gtin12.php index 8915c4ec4c..7453e05f64 100644 --- a/libs/Zend/Validate/Barcode/Gtin12.php +++ b/libs/Zend/Validate/Barcode/Gtin12.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Gtin13.php b/libs/Zend/Validate/Barcode/Gtin13.php index 0719b31eb6..c466f5896a 100644 --- a/libs/Zend/Validate/Barcode/Gtin13.php +++ b/libs/Zend/Validate/Barcode/Gtin13.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Gtin14.php b/libs/Zend/Validate/Barcode/Gtin14.php index d1dad51069..7c5c1cdb5b 100644 --- a/libs/Zend/Validate/Barcode/Gtin14.php +++ b/libs/Zend/Validate/Barcode/Gtin14.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Identcode.php b/libs/Zend/Validate/Barcode/Identcode.php index c0119a5cd9..6899c17910 100644 --- a/libs/Zend/Validate/Barcode/Identcode.php +++ b/libs/Zend/Validate/Barcode/Identcode.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Intelligentmail.php b/libs/Zend/Validate/Barcode/Intelligentmail.php index 4c266db8a4..a0e81cfca6 100644 --- a/libs/Zend/Validate/Barcode/Intelligentmail.php +++ b/libs/Zend/Validate/Barcode/Intelligentmail.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Issn.php b/libs/Zend/Validate/Barcode/Issn.php index be629920e7..e9507c9a5f 100644 --- a/libs/Zend/Validate/Barcode/Issn.php +++ b/libs/Zend/Validate/Barcode/Issn.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Itf14.php b/libs/Zend/Validate/Barcode/Itf14.php index d207a314c8..10cfeb761c 100644 --- a/libs/Zend/Validate/Barcode/Itf14.php +++ b/libs/Zend/Validate/Barcode/Itf14.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Leitcode.php b/libs/Zend/Validate/Barcode/Leitcode.php index 551ded0649..52f1fc0428 100644 --- a/libs/Zend/Validate/Barcode/Leitcode.php +++ b/libs/Zend/Validate/Barcode/Leitcode.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Planet.php b/libs/Zend/Validate/Barcode/Planet.php index 72608fa38a..b4eaf66cb9 100644 --- a/libs/Zend/Validate/Barcode/Planet.php +++ b/libs/Zend/Validate/Barcode/Planet.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Postnet.php b/libs/Zend/Validate/Barcode/Postnet.php index c638dc7314..9d2ff879b8 100644 --- a/libs/Zend/Validate/Barcode/Postnet.php +++ b/libs/Zend/Validate/Barcode/Postnet.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Royalmail.php b/libs/Zend/Validate/Barcode/Royalmail.php index 8c4b733b5b..0bcdf1e16c 100644 --- a/libs/Zend/Validate/Barcode/Royalmail.php +++ b/libs/Zend/Validate/Barcode/Royalmail.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Sscc.php b/libs/Zend/Validate/Barcode/Sscc.php index 50dd820793..b44b19a561 100644 --- a/libs/Zend/Validate/Barcode/Sscc.php +++ b/libs/Zend/Validate/Barcode/Sscc.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Upca.php b/libs/Zend/Validate/Barcode/Upca.php index 449c78dd37..2f0411ef95 100644 --- a/libs/Zend/Validate/Barcode/Upca.php +++ b/libs/Zend/Validate/Barcode/Upca.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Barcode/Upce.php b/libs/Zend/Validate/Barcode/Upce.php index f4ccc74eb6..3199f19b90 100644 --- a/libs/Zend/Validate/Barcode/Upce.php +++ b/libs/Zend/Validate/Barcode/Upce.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Barcode_AdapterAbstract */ -require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; +// require_once 'Zend/Validate/Barcode/AdapterAbstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Between.php b/libs/Zend/Validate/Between.php index 332d7cb1e2..7245295dbb 100644 --- a/libs/Zend/Validate/Between.php +++ b/libs/Zend/Validate/Between.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -115,7 +115,7 @@ class Zend_Validate_Between extends Zend_Validate_Abstract } if (!array_key_exists('min', $options) || !array_key_exists('max', $options)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Missing option. 'min' and 'max' has to be given"); } diff --git a/libs/Zend/Validate/Callback.php b/libs/Zend/Validate/Callback.php index 7dbade86a7..398e27324c 100644 --- a/libs/Zend/Validate/Callback.php +++ b/libs/Zend/Validate/Callback.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -88,7 +88,7 @@ class Zend_Validate_Callback extends Zend_Validate_Abstract } if (null === ($initializedCallack = $this->getCallback())) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('No callback registered'); } } @@ -112,7 +112,7 @@ class Zend_Validate_Callback extends Zend_Validate_Abstract public function setCallback($callback) { if (!is_callable($callback)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid callback given'); } $this->_callback = $callback; diff --git a/libs/Zend/Validate/Ccnum.php b/libs/Zend/Validate/Ccnum.php index 71f0f83bf3..8c2a8beb14 100644 --- a/libs/Zend/Validate/Ccnum.php +++ b/libs/Zend/Validate/Ccnum.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -80,7 +80,7 @@ class Zend_Validate_Ccnum extends Zend_Validate_Abstract /** * @see Zend_Filter_Digits */ - require_once 'Zend/Filter/Digits.php'; + // require_once 'Zend/Filter/Digits.php'; self::$_filter = new Zend_Filter_Digits(); } diff --git a/libs/Zend/Validate/CreditCard.php b/libs/Zend/Validate/CreditCard.php index e96b92a97a..9c8c039718 100644 --- a/libs/Zend/Validate/CreditCard.php +++ b/libs/Zend/Validate/CreditCard.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -227,7 +227,7 @@ class Zend_Validate_CreditCard extends Zend_Validate_Abstract public function setService($service) { if (!is_callable($service)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid callback given'); } @@ -299,7 +299,7 @@ class Zend_Validate_CreditCard extends Zend_Validate_Abstract if (!empty($this->_service)) { try { - require_once 'Zend/Validate/Callback.php'; + // require_once 'Zend/Validate/Callback.php'; $callback = new Zend_Validate_Callback($this->_service); $callback->setOptions($this->_type); if (!$callback->isValid($value)) { diff --git a/libs/Zend/Validate/Date.php b/libs/Zend/Validate/Date.php index 993f99cb51..22e49b7aee 100644 --- a/libs/Zend/Validate/Date.php +++ b/libs/Zend/Validate/Date.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -93,7 +93,7 @@ class Zend_Validate_Date extends Zend_Validate_Abstract } if (!array_key_exists('locale', $options)) { - require_once 'Zend/Registry.php'; + // require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Locale')) { $options['locale'] = Zend_Registry::get('Zend_Locale'); } @@ -122,7 +122,7 @@ class Zend_Validate_Date extends Zend_Validate_Abstract */ public function setLocale($locale = null) { - require_once 'Zend/Locale.php'; + // require_once 'Zend/Locale.php'; $this->_locale = Zend_Locale::findLocale($locale); return $this; } @@ -171,7 +171,7 @@ class Zend_Validate_Date extends Zend_Validate_Abstract if (($this->_format !== null) || ($this->_locale !== null) || is_array($value) || $value instanceof Zend_Date) { - require_once 'Zend/Date.php'; + // require_once 'Zend/Date.php'; if (!Zend_Date::isDate($value, $this->_format, $this->_locale)) { if ($this->_checkFormat($value) === false) { $this->_error(self::FALSEFORMAT); @@ -208,7 +208,7 @@ class Zend_Validate_Date extends Zend_Validate_Abstract private function _checkFormat($value) { try { - require_once 'Zend/Locale/Format.php'; + // require_once 'Zend/Locale/Format.php'; $parsed = Zend_Locale_Format::getDate($value, array( 'date_format' => $this->_format, 'format_type' => 'iso', 'fix_date' => false)); diff --git a/libs/Zend/Validate/Db/Abstract.php b/libs/Zend/Validate/Db/Abstract.php index c1d2a98b3f..01bbc13e86 100644 --- a/libs/Zend/Validate/Db/Abstract.php +++ b/libs/Zend/Validate/Db/Abstract.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * Class for Database record validation @@ -112,12 +112,12 @@ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract } if (!array_key_exists('table', $options) && !array_key_exists('schema', $options)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Table or Schema option missing!'); } if (!array_key_exists('field', $options)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Field option missing!'); } @@ -158,7 +158,7 @@ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract public function setAdapter($adapter) { if (!($adapter instanceof Zend_Db_Adapter_Abstract)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Adapter option must be a database adapter!'); } @@ -268,7 +268,7 @@ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract if ($this->_adapter === null) { $this->_adapter = Zend_Db_Table_Abstract::getDefaultAdapter(); if (null === $this->_adapter) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('No database adapter present'); } } diff --git a/libs/Zend/Validate/Db/NoRecordExists.php b/libs/Zend/Validate/Db/NoRecordExists.php index 98dc59b8a2..700102e436 100644 --- a/libs/Zend/Validate/Db/NoRecordExists.php +++ b/libs/Zend/Validate/Db/NoRecordExists.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Db_Abstract */ -require_once 'Zend/Validate/Db/Abstract.php'; +// require_once 'Zend/Validate/Db/Abstract.php'; /** * Confirms a record does not exist in a table. diff --git a/libs/Zend/Validate/Db/RecordExists.php b/libs/Zend/Validate/Db/RecordExists.php index 4a9122ad02..bf96b96f5c 100644 --- a/libs/Zend/Validate/Db/RecordExists.php +++ b/libs/Zend/Validate/Db/RecordExists.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Db_Abstract */ -require_once 'Zend/Validate/Db/Abstract.php'; +// require_once 'Zend/Validate/Db/Abstract.php'; /** * Confirms a record exists in a table. diff --git a/libs/Zend/Validate/Digits.php b/libs/Zend/Validate/Digits.php index 6439d37e05..9194568e27 100644 --- a/libs/Zend/Validate/Digits.php +++ b/libs/Zend/Validate/Digits.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -77,7 +77,7 @@ class Zend_Validate_Digits extends Zend_Validate_Abstract } if (null === self::$_filter) { - require_once 'Zend/Filter/Digits.php'; + // require_once 'Zend/Filter/Digits.php'; self::$_filter = new Zend_Filter_Digits(); } diff --git a/libs/Zend/Validate/EmailAddress.php b/libs/Zend/Validate/EmailAddress.php index 834ed65e75..c008dcfe9f 100644 --- a/libs/Zend/Validate/EmailAddress.php +++ b/libs/Zend/Validate/EmailAddress.php @@ -22,12 +22,12 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Validate_Hostname */ -require_once 'Zend/Validate/Hostname.php'; +// require_once 'Zend/Validate/Hostname.php'; /** * @category Zend @@ -278,7 +278,7 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract public function setValidateMx($mx) { if ((bool) $mx && !$this->validateMxSupported()) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('MX checking not available on this system'); } diff --git a/libs/Zend/Validate/Exception.php b/libs/Zend/Validate/Exception.php index fa875e14ed..fd34efe0c1 100644 --- a/libs/Zend/Validate/Exception.php +++ b/libs/Zend/Validate/Exception.php @@ -22,7 +22,7 @@ /** * @see Zend_Exception */ -require_once 'Zend/Exception.php'; +// require_once 'Zend/Exception.php'; /** * @category Zend diff --git a/libs/Zend/Validate/File/Count.php b/libs/Zend/Validate/File/Count.php index b2a4e27a02..a4bff7ee8c 100644 --- a/libs/Zend/Validate/File/Count.php +++ b/libs/Zend/Validate/File/Count.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * Validator for counting all given files @@ -110,7 +110,7 @@ class Zend_Validate_File_Count extends Zend_Validate_Abstract } elseif (is_string($options) || is_numeric($options)) { $options = array('max' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } @@ -152,13 +152,13 @@ class Zend_Validate_File_Count extends Zend_Validate_Abstract } if (!is_string($min) and !is_numeric($min)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } $min = (integer) $min; if (($this->_max !== null) && ($min > $this->_max)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The minimum must be less than or equal to the maximum file count, but $min >" . " {$this->_max}"); } @@ -191,13 +191,13 @@ class Zend_Validate_File_Count extends Zend_Validate_Abstract } if (!is_string($max) and !is_numeric($max)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } $max = (integer) $max; if (($this->_min !== null) && ($max < $this->_min)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The maximum must be greater than or equal to the minimum file count, but " . "$max < {$this->_min}"); } diff --git a/libs/Zend/Validate/File/Crc32.php b/libs/Zend/Validate/File/Crc32.php index e7c06d6035..31b420585e 100644 --- a/libs/Zend/Validate/File/Crc32.php +++ b/libs/Zend/Validate/File/Crc32.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_File_Hash */ -require_once 'Zend/Validate/File/Hash.php'; +// require_once 'Zend/Validate/File/Hash.php'; /** * Validator for the crc32 hash of given files @@ -70,7 +70,7 @@ class Zend_Validate_File_Crc32 extends Zend_Validate_File_Hash } elseif (is_scalar($options)) { $options = array('hash1' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid options to validator provided'); } @@ -157,7 +157,7 @@ class Zend_Validate_File_Crc32 extends Zend_Validate_File_Hash public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; + // require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/libs/Zend/Validate/File/ExcludeExtension.php b/libs/Zend/Validate/File/ExcludeExtension.php index b31e372747..94fb27bb6d 100644 --- a/libs/Zend/Validate/File/ExcludeExtension.php +++ b/libs/Zend/Validate/File/ExcludeExtension.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/File/Extension.php'; +// require_once 'Zend/Validate/File/Extension.php'; /** * Validator for the excluding file extensions @@ -61,7 +61,7 @@ class Zend_Validate_File_ExcludeExtension extends Zend_Validate_File_Extension public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; + // require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/libs/Zend/Validate/File/ExcludeMimeType.php b/libs/Zend/Validate/File/ExcludeMimeType.php index 22f74fba8b..0c28aa1d7b 100644 --- a/libs/Zend/Validate/File/ExcludeMimeType.php +++ b/libs/Zend/Validate/File/ExcludeMimeType.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_File_MimeType */ -require_once 'Zend/Validate/File/MimeType.php'; +// require_once 'Zend/Validate/File/MimeType.php'; /** * Validator for the mime type of a file @@ -59,7 +59,7 @@ class Zend_Validate_File_ExcludeMimeType extends Zend_Validate_File_MimeType } // Is file readable ? - require_once 'Zend/Loader.php'; + // require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_READABLE); } diff --git a/libs/Zend/Validate/File/Exists.php b/libs/Zend/Validate/File/Exists.php index 86a21780fb..6ecd11f1f0 100644 --- a/libs/Zend/Validate/File/Exists.php +++ b/libs/Zend/Validate/File/Exists.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * Validator which checks if the file already exists in the directory @@ -72,7 +72,7 @@ class Zend_Validate_File_Exists extends Zend_Validate_Abstract } else if (is_string($directory)) { $directory = explode(',', $directory); } else if (!is_array($directory)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } @@ -122,7 +122,7 @@ class Zend_Validate_File_Exists extends Zend_Validate_Abstract if (is_string($directory)) { $directory = explode(',', $directory); } else if (!is_array($directory)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } diff --git a/libs/Zend/Validate/File/Extension.php b/libs/Zend/Validate/File/Extension.php index 021b5e03bb..8d903e4093 100644 --- a/libs/Zend/Validate/File/Extension.php +++ b/libs/Zend/Validate/File/Extension.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * Validator for the file extension of a file @@ -187,7 +187,7 @@ class Zend_Validate_File_Extension extends Zend_Validate_Abstract public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; + // require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/libs/Zend/Validate/File/FilesSize.php b/libs/Zend/Validate/File/FilesSize.php index 05c660b81b..ca20ad50af 100644 --- a/libs/Zend/Validate/File/FilesSize.php +++ b/libs/Zend/Validate/File/FilesSize.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_File_Size */ -require_once 'Zend/Validate/File/Size.php'; +// require_once 'Zend/Validate/File/Size.php'; /** * Validator for the size of all files which will be validated in sum @@ -76,7 +76,7 @@ class Zend_Validate_File_FilesSize extends Zend_Validate_File_Size } elseif (is_scalar($options)) { $options = array('max' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid options to validator provided'); } @@ -104,7 +104,7 @@ class Zend_Validate_File_FilesSize extends Zend_Validate_File_Size */ public function isValid($value, $file = null) { - require_once 'Zend/Loader.php'; + // require_once 'Zend/Loader.php'; if (is_string($value)) { $value = array($value); } diff --git a/libs/Zend/Validate/File/Hash.php b/libs/Zend/Validate/File/Hash.php index 2b20cac699..6ade30cf41 100644 --- a/libs/Zend/Validate/File/Hash.php +++ b/libs/Zend/Validate/File/Hash.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * Validator for the hash of given files @@ -70,7 +70,7 @@ class Zend_Validate_File_Hash extends Zend_Validate_Abstract } elseif (is_scalar($options)) { $options = array('hash1' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid options to validator provided'); } @@ -116,7 +116,7 @@ class Zend_Validate_File_Hash extends Zend_Validate_Abstract if (is_string($options)) { $options = array($options); } else if (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("False parameter given"); } @@ -129,7 +129,7 @@ class Zend_Validate_File_Hash extends Zend_Validate_Abstract } if (!in_array($algorithm, $known)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Unknown algorithm '{$algorithm}'"); } @@ -152,7 +152,7 @@ class Zend_Validate_File_Hash extends Zend_Validate_Abstract public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; + // require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/libs/Zend/Validate/File/ImageSize.php b/libs/Zend/Validate/File/ImageSize.php index 0d8a4fa74e..54c1457500 100644 --- a/libs/Zend/Validate/File/ImageSize.php +++ b/libs/Zend/Validate/File/ImageSize.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * Validator for the image size of a image file @@ -140,7 +140,7 @@ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract } } } else if (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } @@ -205,7 +205,7 @@ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract { if (isset($options['minwidth'])) { if (($this->_maxwidth !== null) and ($options['minwidth'] > $this->_maxwidth)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The minimum image width must be less than or equal to the " . " maximum image width, but {$options['minwidth']} > {$this->_maxwidth}"); } @@ -213,7 +213,7 @@ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract if (isset($options['maxheight'])) { if (($this->_maxheight !== null) and ($options['minheight'] > $this->_maxheight)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The minimum image height must be less than or equal to the " . " maximum image height, but {$options['minheight']} > {$this->_maxheight}"); } @@ -242,7 +242,7 @@ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract { if (isset($options['maxwidth'])) { if (($this->_minwidth !== null) and ($options['maxwidth'] < $this->_minwidth)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The maximum image width must be greater than or equal to the " . "minimum image width, but {$options['maxwidth']} < {$this->_minwidth}"); } @@ -250,7 +250,7 @@ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract if (isset($options['maxheight'])) { if (($this->_minheight !== null) and ($options['maxheight'] < $this->_minheight)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The maximum image height must be greater than or equal to the " . "minimum image height, but {$options['maxheight']} < {$this->_minwidth}"); } @@ -308,7 +308,7 @@ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; + // require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_READABLE); } diff --git a/libs/Zend/Validate/File/IsCompressed.php b/libs/Zend/Validate/File/IsCompressed.php index 3b7983f264..dc0d99abb5 100644 --- a/libs/Zend/Validate/File/IsCompressed.php +++ b/libs/Zend/Validate/File/IsCompressed.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_File_MimeType */ -require_once 'Zend/Validate/File/MimeType.php'; +// require_once 'Zend/Validate/File/MimeType.php'; /** * Validator which checks if the file already exists in the directory diff --git a/libs/Zend/Validate/File/IsImage.php b/libs/Zend/Validate/File/IsImage.php index cfff3e3c55..d602ebe763 100644 --- a/libs/Zend/Validate/File/IsImage.php +++ b/libs/Zend/Validate/File/IsImage.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_File_MimeType */ -require_once 'Zend/Validate/File/MimeType.php'; +// require_once 'Zend/Validate/File/MimeType.php'; /** * Validator which checks if the file already exists in the directory diff --git a/libs/Zend/Validate/File/Md5.php b/libs/Zend/Validate/File/Md5.php index 80fed0bd26..e76df71917 100644 --- a/libs/Zend/Validate/File/Md5.php +++ b/libs/Zend/Validate/File/Md5.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_File_Hash */ -require_once 'Zend/Validate/File/Hash.php'; +// require_once 'Zend/Validate/File/Hash.php'; /** * Validator for the md5 hash of given files @@ -72,7 +72,7 @@ class Zend_Validate_File_Md5 extends Zend_Validate_File_Hash } elseif (is_scalar($options)) { $options = array('hash1' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid options to validator provided'); } @@ -161,7 +161,7 @@ class Zend_Validate_File_Md5 extends Zend_Validate_File_Hash public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; + // require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/libs/Zend/Validate/File/MimeType.php b/libs/Zend/Validate/File/MimeType.php index f70788e4ee..26d996411f 100644 --- a/libs/Zend/Validate/File/MimeType.php +++ b/libs/Zend/Validate/File/MimeType.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * Validator for the mime type of a file @@ -124,7 +124,7 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract } elseif (is_string($mimetype)) { $mimetype = explode(',', $mimetype); } elseif (!is_array($mimetype)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Invalid options to validator provided"); } @@ -152,7 +152,7 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract if (!empty($_ENV['MAGIC'])) { $this->setMagicFile($_ENV['MAGIC']); } elseif (!(@ini_get("safe_mode") == 'On' || @ini_get("safe_mode") === 1)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; foreach ($this->_magicFiles as $file) { // supressing errors which are thrown due to openbase_dir restrictions try { @@ -189,17 +189,17 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract $this->_magicfile = null; } else if (!(class_exists('finfo', false))) { $this->_magicfile = null; - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Magicfile can not be set. There is no finfo extension installed'); } else if (!is_readable($file)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('The given magicfile can not be read'); } else { $const = defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME; $this->_finfo = @finfo_open($const, $file); if ($this->_finfo === false) { $this->_finfo = null; - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('The given magicfile is not accepted by finfo'); } else { $this->_magicfile = $file; @@ -275,7 +275,7 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract if (is_string($mimetype)) { $mimetype = explode(',', $mimetype); } elseif (!is_array($mimetype)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Invalid options to validator provided"); } @@ -324,7 +324,7 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract } // Is file readable ? - require_once 'Zend/Loader.php'; + // require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_READABLE); } diff --git a/libs/Zend/Validate/File/NotExists.php b/libs/Zend/Validate/File/NotExists.php index 87ebb827b4..a5afe94686 100644 --- a/libs/Zend/Validate/File/NotExists.php +++ b/libs/Zend/Validate/File/NotExists.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_File_Exists */ -require_once 'Zend/Validate/File/Exists.php'; +// require_once 'Zend/Validate/File/Exists.php'; /** * Validator which checks if the destination file does not exist diff --git a/libs/Zend/Validate/File/Sha1.php b/libs/Zend/Validate/File/Sha1.php index 2157bfb26c..1b5f8ee622 100644 --- a/libs/Zend/Validate/File/Sha1.php +++ b/libs/Zend/Validate/File/Sha1.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_File_Hash */ -require_once 'Zend/Validate/File/Hash.php'; +// require_once 'Zend/Validate/File/Hash.php'; /** * Validator for the sha1 hash of given files @@ -72,7 +72,7 @@ class Zend_Validate_File_Sha1 extends Zend_Validate_File_Hash } elseif (is_scalar($options)) { $options = array('hash1' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid options to validator provided'); } @@ -159,7 +159,7 @@ class Zend_Validate_File_Sha1 extends Zend_Validate_File_Hash public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; + // require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/libs/Zend/Validate/File/Size.php b/libs/Zend/Validate/File/Size.php index bfd02aa80b..a3431cfae1 100644 --- a/libs/Zend/Validate/File/Size.php +++ b/libs/Zend/Validate/File/Size.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * Validator for the maximum size of a file up to a max of 2GB @@ -107,7 +107,7 @@ class Zend_Validate_File_Size extends Zend_Validate_Abstract } elseif (is_string($options) || is_numeric($options)) { $options = array('max' => $options); } elseif (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } @@ -181,14 +181,14 @@ class Zend_Validate_File_Size extends Zend_Validate_Abstract public function setMin($min) { if (!is_string($min) and !is_numeric($min)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } $min = (integer) $this->_fromByteString($min); $max = $this->getMax(true); if (($max !== null) && ($min > $max)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The minimum must be less than or equal to the maximum filesize, but $min >" . " $max"); } @@ -223,14 +223,14 @@ class Zend_Validate_File_Size extends Zend_Validate_Abstract public function setMax($max) { if (!is_string($max) && !is_numeric($max)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception ('Invalid options to validator provided'); } $max = (integer) $this->_fromByteString($max); $min = $this->getMin(true); if (($min !== null) && ($max < $min)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The maximum must be greater than or equal to the minimum filesize, but " . "$max < $min"); } @@ -274,7 +274,7 @@ class Zend_Validate_File_Size extends Zend_Validate_Abstract public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; + // require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/libs/Zend/Validate/File/Upload.php b/libs/Zend/Validate/File/Upload.php index 85f408c735..9a12f301d1 100644 --- a/libs/Zend/Validate/File/Upload.php +++ b/libs/Zend/Validate/File/Upload.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * Validator for the maximum size of a file up to a max of 2GB @@ -112,7 +112,7 @@ class Zend_Validate_File_Upload extends Zend_Validate_Abstract } if (count($return) === 0) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The file '$file' was not found"); } diff --git a/libs/Zend/Validate/File/WordCount.php b/libs/Zend/Validate/File/WordCount.php index 9936cb662f..e69bf1db79 100644 --- a/libs/Zend/Validate/File/WordCount.php +++ b/libs/Zend/Validate/File/WordCount.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_File_Count */ -require_once 'Zend/Validate/File/Count.php'; +// require_once 'Zend/Validate/File/Count.php'; /** * Validator for counting all words in a file @@ -64,7 +64,7 @@ class Zend_Validate_File_WordCount extends Zend_Validate_File_Count public function isValid($value, $file = null) { // Is file readable ? - require_once 'Zend/Loader.php'; + // require_once 'Zend/Loader.php'; if (!Zend_Loader::isReadable($value)) { return $this->_throw($file, self::NOT_FOUND); } diff --git a/libs/Zend/Validate/Float.php b/libs/Zend/Validate/Float.php index 4b0899d5a6..37755a8ab7 100644 --- a/libs/Zend/Validate/Float.php +++ b/libs/Zend/Validate/Float.php @@ -22,12 +22,12 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Locale_Format */ -require_once 'Zend/Locale/Format.php'; +// require_once 'Zend/Locale/Format.php'; /** * @category Zend @@ -70,7 +70,7 @@ class Zend_Validate_Float extends Zend_Validate_Abstract } if (empty($locale)) { - require_once 'Zend/Registry.php'; + // require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Locale')) { $locale = Zend_Registry::get('Zend_Locale'); } @@ -94,7 +94,7 @@ class Zend_Validate_Float extends Zend_Validate_Abstract */ public function setLocale($locale = null) { - require_once 'Zend/Locale.php'; + // require_once 'Zend/Locale.php'; $this->_locale = Zend_Locale::findLocale($locale); return $this; } diff --git a/libs/Zend/Validate/GreaterThan.php b/libs/Zend/Validate/GreaterThan.php index 53c71ccbc2..a9b7a21879 100644 --- a/libs/Zend/Validate/GreaterThan.php +++ b/libs/Zend/Validate/GreaterThan.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -72,7 +72,7 @@ class Zend_Validate_GreaterThan extends Zend_Validate_Abstract if (array_key_exists('min', $min)) { $min = $min['min']; } else { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Missing option 'min'"); } } diff --git a/libs/Zend/Validate/Hex.php b/libs/Zend/Validate/Hex.php index ced156dfe3..b2080d3aaa 100644 --- a/libs/Zend/Validate/Hex.php +++ b/libs/Zend/Validate/Hex.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/Hostname.php b/libs/Zend/Validate/Hostname.php index 3199767b76..1732e69c77 100644 --- a/libs/Zend/Validate/Hostname.php +++ b/libs/Zend/Validate/Hostname.php @@ -22,12 +22,12 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Validate_Ip */ -require_once 'Zend/Validate/Ip.php'; +// require_once 'Zend/Validate/Ip.php'; /** * Please note there are two standalone test scripts for testing IDN characters due to problems @@ -544,7 +544,7 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract $regexChars = array(0 => '/^[a-z0-9\x2d]{1,63}$/i'); if ($this->_options['idn'] && isset($this->_validIdns[strtoupper($this->_tld)])) { if (is_string($this->_validIdns[strtoupper($this->_tld)])) { - $regexChars += include($this->_validIdns[strtoupper($this->_tld)]); + $regexChars += include(dirname(__FILE__) . '/../../' . $this->_validIdns[strtoupper($this->_tld)]); } else { $regexChars += $this->_validIdns[strtoupper($this->_tld)]; } diff --git a/libs/Zend/Validate/Iban.php b/libs/Zend/Validate/Iban.php index a35dff5263..097cd32cbd 100644 --- a/libs/Zend/Validate/Iban.php +++ b/libs/Zend/Validate/Iban.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * Validates IBAN Numbers (International Bank Account Numbers) @@ -124,7 +124,7 @@ class Zend_Validate_Iban extends Zend_Validate_Abstract } if ($locale !== false) { - require_once 'Zend/Registry.php'; + // require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Locale')) { $locale = Zend_Registry::get('Zend_Locale'); } @@ -154,10 +154,10 @@ class Zend_Validate_Iban extends Zend_Validate_Abstract public function setLocale($locale = null) { if ($locale !== false) { - require_once 'Zend/Locale.php'; + // require_once 'Zend/Locale.php'; $locale = Zend_Locale::findLocale($locale); if (strlen($locale) < 4) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Region must be given for IBAN validation'); } } diff --git a/libs/Zend/Validate/Identical.php b/libs/Zend/Validate/Identical.php index 3886f3975f..ce08faab91 100644 --- a/libs/Zend/Validate/Identical.php +++ b/libs/Zend/Validate/Identical.php @@ -20,7 +20,7 @@ */ /** @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend diff --git a/libs/Zend/Validate/InArray.php b/libs/Zend/Validate/InArray.php index 1d8196025d..3b1870543c 100644 --- a/libs/Zend/Validate/InArray.php +++ b/libs/Zend/Validate/InArray.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -73,7 +73,7 @@ class Zend_Validate_InArray extends Zend_Validate_Abstract if ($options instanceof Zend_Config) { $options = $options->toArray(); } else if (!is_array($options)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Array expected as parameter'); } else { $count = func_num_args(); diff --git a/libs/Zend/Validate/Int.php b/libs/Zend/Validate/Int.php index 4c14f25e47..89fa168627 100644 --- a/libs/Zend/Validate/Int.php +++ b/libs/Zend/Validate/Int.php @@ -22,12 +22,12 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Locale_Format */ -require_once 'Zend/Locale/Format.php'; +// require_once 'Zend/Locale/Format.php'; /** * @category Zend @@ -70,7 +70,7 @@ class Zend_Validate_Int extends Zend_Validate_Abstract } if (empty($locale)) { - require_once 'Zend/Registry.php'; + // require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Locale')) { $locale = Zend_Registry::get('Zend_Locale'); } @@ -96,7 +96,7 @@ class Zend_Validate_Int extends Zend_Validate_Abstract */ public function setLocale($locale = null) { - require_once 'Zend/Locale.php'; + // require_once 'Zend/Locale.php'; $this->_locale = Zend_Locale::findLocale($locale); return $this; } diff --git a/libs/Zend/Validate/Ip.php b/libs/Zend/Validate/Ip.php index 7892b8a62c..992e60a787 100644 --- a/libs/Zend/Validate/Ip.php +++ b/libs/Zend/Validate/Ip.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -104,7 +104,7 @@ class Zend_Validate_Ip extends Zend_Validate_Abstract } if (!$this->_options['allowipv4'] && !$this->_options['allowipv6']) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Nothing to validate. Check your options'); } diff --git a/libs/Zend/Validate/Isbn.php b/libs/Zend/Validate/Isbn.php index 0d392ffbb4..bbcd370c87 100644 --- a/libs/Zend/Validate/Isbn.php +++ b/libs/Zend/Validate/Isbn.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -77,7 +77,7 @@ class Zend_Validate_Isbn extends Zend_Validate_Abstract /** * @see Zend_Validate_Exception */ - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid options provided.'); } @@ -221,7 +221,7 @@ class Zend_Validate_Isbn extends Zend_Validate_Abstract /** * @see Zend_Validate_Exception */ - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid ISBN separator.'); } @@ -253,7 +253,7 @@ class Zend_Validate_Isbn extends Zend_Validate_Abstract /** * @see Zend_Validate_Exception */ - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Invalid ISBN type'); } diff --git a/libs/Zend/Validate/LessThan.php b/libs/Zend/Validate/LessThan.php index e730603f05..213c766f88 100644 --- a/libs/Zend/Validate/LessThan.php +++ b/libs/Zend/Validate/LessThan.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -71,7 +71,7 @@ class Zend_Validate_LessThan extends Zend_Validate_Abstract if (array_key_exists('max', $max)) { $max = $max['max']; } else { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Missing option 'max'"); } } diff --git a/libs/Zend/Validate/NotEmpty.php b/libs/Zend/Validate/NotEmpty.php index 40eeb993e1..e370459cf9 100644 --- a/libs/Zend/Validate/NotEmpty.php +++ b/libs/Zend/Validate/NotEmpty.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -133,7 +133,7 @@ class Zend_Validate_NotEmpty extends Zend_Validate_Abstract } if (!is_int($type) || ($type < 0) || ($type > self::ALL)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Unknown type'); } diff --git a/libs/Zend/Validate/PostCode.php b/libs/Zend/Validate/PostCode.php index 9d122c93e5..1ba58a996b 100644 --- a/libs/Zend/Validate/PostCode.php +++ b/libs/Zend/Validate/PostCode.php @@ -22,12 +22,12 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Locale_Format */ -require_once 'Zend/Locale/Format.php'; +// require_once 'Zend/Locale/Format.php'; /** * @category Zend @@ -78,7 +78,7 @@ class Zend_Validate_PostCode extends Zend_Validate_Abstract } if (empty($options)) { - require_once 'Zend/Registry.php'; + // require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Locale')) { $this->setLocale(Zend_Registry::get('Zend_Locale')); } @@ -98,7 +98,7 @@ class Zend_Validate_PostCode extends Zend_Validate_Abstract $format = $this->getFormat(); if (empty($format)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("A postcode-format string has to be given for validation"); } } @@ -123,12 +123,12 @@ class Zend_Validate_PostCode extends Zend_Validate_Abstract */ public function setLocale($locale = null) { - require_once 'Zend/Locale.php'; + // require_once 'Zend/Locale.php'; $this->_locale = Zend_Locale::findLocale($locale); $locale = new Zend_Locale($this->_locale); $region = $locale->getRegion(); if (empty($region)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Unable to detect a region for the locale '$locale'"); } @@ -139,7 +139,7 @@ class Zend_Validate_PostCode extends Zend_Validate_Abstract ); if (empty($format)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Unable to detect a postcode format for the region '{$locale->getRegion()}'"); } @@ -167,7 +167,7 @@ class Zend_Validate_PostCode extends Zend_Validate_Abstract public function setFormat($format) { if (empty($format) || !is_string($format)) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("A postcode-format string has to be given for validation"); } diff --git a/libs/Zend/Validate/Regex.php b/libs/Zend/Validate/Regex.php index 4c9b5ed36f..e46143287f 100644 --- a/libs/Zend/Validate/Regex.php +++ b/libs/Zend/Validate/Regex.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -76,7 +76,7 @@ class Zend_Validate_Regex extends Zend_Validate_Abstract if (array_key_exists('pattern', $pattern)) { $pattern = $pattern['pattern']; } else { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Missing option 'pattern'"); } } @@ -107,7 +107,7 @@ class Zend_Validate_Regex extends Zend_Validate_Abstract $status = @preg_match($this->_pattern, "Test"); if (false === $status) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("Internal error while using the pattern '$this->_pattern'"); } diff --git a/libs/Zend/Validate/Sitemap/Changefreq.php b/libs/Zend/Validate/Sitemap/Changefreq.php index 517f9b577d..6f023856dc 100644 --- a/libs/Zend/Validate/Sitemap/Changefreq.php +++ b/libs/Zend/Validate/Sitemap/Changefreq.php @@ -23,7 +23,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * Validates whether a given value is valid as a sitemap <changefreq> value diff --git a/libs/Zend/Validate/Sitemap/Lastmod.php b/libs/Zend/Validate/Sitemap/Lastmod.php index 5644137da5..aa2266ecd9 100644 --- a/libs/Zend/Validate/Sitemap/Lastmod.php +++ b/libs/Zend/Validate/Sitemap/Lastmod.php @@ -23,7 +23,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * Validates whether a given value is valid as a sitemap <lastmod> value diff --git a/libs/Zend/Validate/Sitemap/Loc.php b/libs/Zend/Validate/Sitemap/Loc.php index 7e0668f9ff..180f669a01 100644 --- a/libs/Zend/Validate/Sitemap/Loc.php +++ b/libs/Zend/Validate/Sitemap/Loc.php @@ -23,12 +23,12 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @see Zend_Uri */ -require_once 'Zend/Uri.php'; +// require_once 'Zend/Uri.php'; /** * Validates whether a given value is valid as a sitemap <loc> value diff --git a/libs/Zend/Validate/Sitemap/Priority.php b/libs/Zend/Validate/Sitemap/Priority.php index 9875ecd20a..58772d5b2d 100644 --- a/libs/Zend/Validate/Sitemap/Priority.php +++ b/libs/Zend/Validate/Sitemap/Priority.php @@ -23,7 +23,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * Validates whether a given value is valid as a sitemap <priority> value diff --git a/libs/Zend/Validate/StringLength.php b/libs/Zend/Validate/StringLength.php index c9c5b80ff3..c9362ace22 100644 --- a/libs/Zend/Validate/StringLength.php +++ b/libs/Zend/Validate/StringLength.php @@ -22,7 +22,7 @@ /** * @see Zend_Validate_Abstract */ -require_once 'Zend/Validate/Abstract.php'; +// require_once 'Zend/Validate/Abstract.php'; /** * @category Zend @@ -137,7 +137,7 @@ class Zend_Validate_StringLength extends Zend_Validate_Abstract /** * @see Zend_Validate_Exception */ - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The minimum must be less than or equal to the maximum length, but $min >" . " $this->_max"); } @@ -170,7 +170,7 @@ class Zend_Validate_StringLength extends Zend_Validate_Abstract /** * @see Zend_Validate_Exception */ - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception("The maximum must be greater than or equal to the minimum length, but " . "$max < $this->_min"); } else { @@ -202,7 +202,7 @@ class Zend_Validate_StringLength extends Zend_Validate_Abstract $orig = iconv_get_encoding('internal_encoding'); $result = iconv_set_encoding('internal_encoding', $encoding); if (!$result) { - require_once 'Zend/Validate/Exception.php'; + // require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Given encoding not supported on this OS!'); } diff --git a/libs/open-flash-chart/php-ofc-library/ofc_bar.php b/libs/open-flash-chart/php-ofc-library/ofc_bar.php index 6ddda42749..728420c503 100644 --- a/libs/open-flash-chart/php-ofc-library/ofc_bar.php +++ b/libs/open-flash-chart/php-ofc-library/ofc_bar.php @@ -1,6 +1,6 @@ <?php -include_once 'ofc_bar_base.php'; +include_once dirname(__FILE__) . '/ofc_bar_base.php'; class bar_value { diff --git a/libs/open-flash-chart/php-ofc-library/ofc_bar_3d.php b/libs/open-flash-chart/php-ofc-library/ofc_bar_3d.php index 47552184ce..9b7f697615 100644 --- a/libs/open-flash-chart/php-ofc-library/ofc_bar_3d.php +++ b/libs/open-flash-chart/php-ofc-library/ofc_bar_3d.php @@ -1,6 +1,6 @@ <?php -include_once 'ofc_bar_base.php'; +include_once dirname(__FILE__) . '/ofc_bar_base.php'; class bar_3d_value { diff --git a/libs/open-flash-chart/php-ofc-library/ofc_bar_filled.php b/libs/open-flash-chart/php-ofc-library/ofc_bar_filled.php index 837c1fc458..2439bd2159 100644 --- a/libs/open-flash-chart/php-ofc-library/ofc_bar_filled.php +++ b/libs/open-flash-chart/php-ofc-library/ofc_bar_filled.php @@ -1,6 +1,6 @@ <?php -include_once 'ofc_bar_base.php'; +include_once dirname(__FILE__) . '/ofc_bar_base.php'; class bar_filled_value extends bar_value { diff --git a/libs/open-flash-chart/php-ofc-library/ofc_bar_glass.php b/libs/open-flash-chart/php-ofc-library/ofc_bar_glass.php index e833501519..bc330d3c74 100644 --- a/libs/open-flash-chart/php-ofc-library/ofc_bar_glass.php +++ b/libs/open-flash-chart/php-ofc-library/ofc_bar_glass.php @@ -1,6 +1,6 @@ <?php -include_once 'ofc_bar_base.php'; +include_once dirname(__FILE__) . '/ofc_bar_base.php'; class bar_on_show { @@ -128,4 +128,4 @@ class bar_3d extends bar_base $this->type = "bar_3d"; parent::bar_base(); } -}
\ No newline at end of file +} diff --git a/libs/open-flash-chart/php-ofc-library/ofc_bar_sketch.php b/libs/open-flash-chart/php-ofc-library/ofc_bar_sketch.php index ce1bcccf8a..2bad3a3b75 100644 --- a/libs/open-flash-chart/php-ofc-library/ofc_bar_sketch.php +++ b/libs/open-flash-chart/php-ofc-library/ofc_bar_sketch.php @@ -1,6 +1,6 @@ <?php -include_once 'ofc_bar_base.php'; +include_once dirname(__FILE__) . '/ofc_bar_base.php'; class bar_sketch extends bar_base { diff --git a/libs/open-flash-chart/php-ofc-library/ofc_bar_stack.php b/libs/open-flash-chart/php-ofc-library/ofc_bar_stack.php index 3d9f8d9f0c..5977409982 100644 --- a/libs/open-flash-chart/php-ofc-library/ofc_bar_stack.php +++ b/libs/open-flash-chart/php-ofc-library/ofc_bar_stack.php @@ -1,6 +1,6 @@ <?php -include_once 'ofc_bar_base.php'; +include_once dirname(__FILE__) . '/ofc_bar_base.php'; class bar_stack extends bar_base { @@ -52,4 +52,4 @@ class bar_stack_key $tmp = 'font-size'; $this->$tmp = $font_size; } -}
\ No newline at end of file +} diff --git a/libs/open-flash-chart/php-ofc-library/ofc_candle.php b/libs/open-flash-chart/php-ofc-library/ofc_candle.php index 21ad67f8d3..7ed047f843 100644 --- a/libs/open-flash-chart/php-ofc-library/ofc_candle.php +++ b/libs/open-flash-chart/php-ofc-library/ofc_candle.php @@ -1,6 +1,6 @@ <?php -include_once 'ofc_bar_base.php'; +include_once dirname(__FILE__) . '/ofc_bar_base.php'; class candle_value { diff --git a/libs/open-flash-chart/php-ofc-library/ofc_tooltip.php b/libs/open-flash-chart/php-ofc-library/ofc_tooltip.php index 3104ee33b9..21f8aa2ecd 100644 --- a/libs/open-flash-chart/php-ofc-library/ofc_tooltip.php +++ b/libs/open-flash-chart/php-ofc-library/ofc_tooltip.php @@ -1,6 +1,6 @@ <?php -include_once 'ofc_bar_base.php'; +include_once dirname(__FILE__) . '/ofc_bar_base.php'; class tooltip { diff --git a/libs/open-flash-chart/php-ofc-library/open-flash-chart.php b/libs/open-flash-chart/php-ofc-library/open-flash-chart.php index b017097d00..9ba0db6d59 100644 --- a/libs/open-flash-chart/php-ofc-library/open-flash-chart.php +++ b/libs/open-flash-chart/php-ofc-library/open-flash-chart.php @@ -10,55 +10,55 @@ // if (! function_exists('json_encode')) { - include_once 'JSON.php'; + include_once dirname(__FILE__) . '/JSON.php'; } -include_once 'json_format.php'; +include_once dirname(__FILE__) . '/json_format.php'; // ofc classes -include_once 'ofc_title.php'; -include_once 'ofc_y_axis_base.php'; -include_once 'ofc_y_axis.php'; -include_once 'ofc_y_axis_right.php'; -include_once 'ofc_y_axis_labels.php'; -include_once 'ofc_y_axis_label.php'; -include_once 'ofc_x_axis.php'; +include_once dirname(__FILE__) . '/ofc_title.php'; +include_once dirname(__FILE__) . '/ofc_y_axis_base.php'; +include_once dirname(__FILE__) . '/ofc_y_axis.php'; +include_once dirname(__FILE__) . '/ofc_y_axis_right.php'; +include_once dirname(__FILE__) . '/ofc_y_axis_labels.php'; +include_once dirname(__FILE__) . '/ofc_y_axis_label.php'; +include_once dirname(__FILE__) . '/ofc_x_axis.php'; -include_once 'ofc_pie.php'; -//include_once 'ofc_bar.php'; -include_once 'ofc_bar_glass.php'; -include_once 'ofc_bar_filled.php'; -include_once 'ofc_bar_stack.php'; -//include_once 'ofc_bar_3d.php'; -include_once 'ofc_hbar.php'; -include_once 'ofc_line_base.php'; -include_once 'ofc_line.php'; -//include_once 'ofc_line_dot.php'; -//include_once 'ofc_line_hollow.php'; -include_once 'ofc_candle.php'; -include_once 'ofc_area_base.php'; -include_once 'ofc_tags.php'; -include_once 'ofc_arrow.php'; -//include_once 'ofc_area_hollow.php'; -//include_once 'ofc_area_line.php'; +include_once dirname(__FILE__) . '/ofc_pie.php'; +//include_once dirname(__FILE__) . '/ofc_bar.php'; +include_once dirname(__FILE__) . '/ofc_bar_glass.php'; +include_once dirname(__FILE__) . '/ofc_bar_filled.php'; +include_once dirname(__FILE__) . '/ofc_bar_stack.php'; +//include_once dirname(__FILE__) . '/ofc_bar_3d.php'; +include_once dirname(__FILE__) . '/ofc_hbar.php'; +include_once dirname(__FILE__) . '/ofc_line_base.php'; +include_once dirname(__FILE__) . '/ofc_line.php'; +//include_once dirname(__FILE__) . '/ofc_line_dot.php'; +//include_once dirname(__FILE__) . '/ofc_line_hollow.php'; +include_once dirname(__FILE__) . '/ofc_candle.php'; +include_once dirname(__FILE__) . '/ofc_area_base.php'; +include_once dirname(__FILE__) . '/ofc_tags.php'; +include_once dirname(__FILE__) . '/ofc_arrow.php'; +//include_once dirname(__FILE__) . '/ofc_area_hollow.php'; +//include_once dirname(__FILE__) . '/ofc_area_line.php'; -include_once 'ofc_x_legend.php'; -include_once 'ofc_y_legend.php'; -include_once 'ofc_bar_sketch.php'; -include_once 'ofc_scatter.php'; -include_once 'ofc_scatter_line.php'; -include_once 'ofc_x_axis_labels.php'; -include_once 'ofc_x_axis_label.php'; -include_once 'ofc_tooltip.php'; -include_once 'ofc_shape.php'; -include_once 'ofc_radar_axis.php'; -include_once 'ofc_radar_axis_labels.php'; -include_once 'ofc_radar_spoke_labels.php'; -include_once 'ofc_line_style.php'; +include_once dirname(__FILE__) . '/ofc_x_legend.php'; +include_once dirname(__FILE__) . '/ofc_y_legend.php'; +include_once dirname(__FILE__) . '/ofc_bar_sketch.php'; +include_once dirname(__FILE__) . '/ofc_scatter.php'; +include_once dirname(__FILE__) . '/ofc_scatter_line.php'; +include_once dirname(__FILE__) . '/ofc_x_axis_labels.php'; +include_once dirname(__FILE__) . '/ofc_x_axis_label.php'; +include_once dirname(__FILE__) . '/ofc_tooltip.php'; +include_once dirname(__FILE__) . '/ofc_shape.php'; +include_once dirname(__FILE__) . '/ofc_radar_axis.php'; +include_once dirname(__FILE__) . '/ofc_radar_axis_labels.php'; +include_once dirname(__FILE__) . '/ofc_radar_spoke_labels.php'; +include_once dirname(__FILE__) . '/ofc_line_style.php'; -include_once 'dot_base.php'; -include_once 'ofc_menu.php'; +include_once dirname(__FILE__) . '/dot_base.php'; +include_once dirname(__FILE__) . '/ofc_menu.php'; class open_flash_chart { @@ -175,4 +175,4 @@ class open_flash_chart // // there is no PHP end tag so we don't mess the headers up! -//
\ No newline at end of file +// @@ -31,15 +31,6 @@ if(!defined('PIWIK_INCLUDE_PATH')) @ignore_user_abort(true); -if(!defined('PIWIK_INCLUDE_SEARCH_PATH')) -{ - define('PIWIK_INCLUDE_SEARCH_PATH', PIWIK_INCLUDE_PATH . '/core' - . PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/libs' - . PATH_SEPARATOR . PIWIK_INCLUDE_PATH . '/plugins'); - @ini_set('include_path', PIWIK_INCLUDE_SEARCH_PATH); - @set_include_path(PIWIK_INCLUDE_SEARCH_PATH); -} - require_once PIWIK_INCLUDE_PATH .'/libs/upgradephp/common.php'; require_once PIWIK_INCLUDE_PATH .'/libs/Event/Dispatcher.php'; require_once PIWIK_INCLUDE_PATH .'/libs/Event/Notification.php'; |