From: Michael M Slusarz Date: Thu, 14 Jan 2010 22:06:22 +0000 (-0700) Subject: Remove unneded require_once() calls and @since tags X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a9e8ae51befc5a9fc97366e1f623e3a822060afa;p=horde.git Remove unneded require_once() calls and @since tags --- diff --git a/framework/Alarm/Alarm/sql.php b/framework/Alarm/Alarm/sql.php index a2a4cafeb..9f934ada4 100644 --- a/framework/Alarm/Alarm/sql.php +++ b/framework/Alarm/Alarm/sql.php @@ -33,7 +33,6 @@ * script. * * @author Jan Schneider - * @since Horde 3.2 * @package Horde_Alarm */ class Horde_Alarm_sql extends Horde_Alarm { diff --git a/framework/DOM/DOM.php b/framework/DOM/DOM.php index 3f6e7aab0..8df6f6d38 100644 --- a/framework/DOM/DOM.php +++ b/framework/DOM/DOM.php @@ -13,13 +13,9 @@ * * @author Chuck Hagenbuch * @author Michael J. Rubinsky - * @since Horde 3.2 * @package Horde_DOM */ -/** PEAR */ -require_once 'PEAR.php'; - /** Validate against the DTD */ define('HORDE_DOM_LOAD_VALIDATE', 1); diff --git a/framework/Data/Data.php b/framework/Data/Data.php index 5a907f14a..9a65cb2d1 100644 --- a/framework/Data/Data.php +++ b/framework/Data/Data.php @@ -1,7 +1,4 @@ * @author Chuck Hagenbuch - * @since Horde 1.3 * @package Horde_Data */ class Horde_Data extends PEAR { @@ -56,7 +52,6 @@ class Horde_Data extends PEAR { * A list of warnings raised during the last operation. * * @var array - * @since Horde 3.1 */ var $_warnings = array(); @@ -141,8 +136,6 @@ class Horde_Data extends PEAR { * Returns a list of warnings that have been raised during the last * operation. * - * @since Horde 3.1 - * * @return array A (possibly empty) list of warnings. */ function warnings() diff --git a/framework/Data/Data/csv.php b/framework/Data/Data/csv.php index 43a672d20..4896028fd 100644 --- a/framework/Data/Data/csv.php +++ b/framework/Data/Data/csv.php @@ -4,11 +4,6 @@ */ /** - * Horde's File_CSV class. - */ -include_once 'File/CSV.php'; - -/** * Horde_Data implementation for comma-separated data (CSV). * * Copyright 1999-2010 The Horde Project (http://www.horde.org/) @@ -18,7 +13,6 @@ include_once 'File/CSV.php'; * * @author Jan Schneider * @author Chuck Hagenbuch - * @since Horde 1.3 * @package Horde_Data */ class Horde_Data_csv extends Horde_Data { diff --git a/framework/Data/Data/icalendar.php b/framework/Data/Data/icalendar.php index d0b5df3c7..c13022883 100644 --- a/framework/Data/Data/icalendar.php +++ b/framework/Data/Data/icalendar.php @@ -14,7 +14,6 @@ require_once dirname(__FILE__) . '/imc.php'; * @author Chuck Hagenbuch * @author Karsten Fourmont * @package Horde_Data - * @since Horde 3.0 */ class Horde_Data_icalendar extends Horde_Data_imc { diff --git a/framework/Data/Data/imc.php b/framework/Data/Data/imc.php index 3d34d196c..f25dcea6d 100644 --- a/framework/Data/Data/imc.php +++ b/framework/Data/Data/imc.php @@ -1,7 +1,4 @@ * @package Horde_Data - * @since Horde 3.0 */ class Horde_Data_imc extends Horde_Data { diff --git a/framework/Data/Data/tsv.php b/framework/Data/Data/tsv.php index 86e7572e6..d3377d45c 100644 --- a/framework/Data/Data/tsv.php +++ b/framework/Data/Data/tsv.php @@ -9,7 +9,6 @@ * * @author Jan Schneider * @author Chuck Hagenbuch - * @since Horde 1.3 * @package Horde_Data */ class Horde_Data_tsv extends Horde_Data { diff --git a/framework/Data/Data/vcard.php b/framework/Data/Data/vcard.php index fce61f64c..9807a1ebd 100644 --- a/framework/Data/Data/vcard.php +++ b/framework/Data/Data/vcard.php @@ -1,8 +1,4 @@ - * @since Horde 3.0 * @package Horde_Data */ class Horde_Data_vcard extends Horde_Data_imc { diff --git a/framework/Data/Data/vnote.php b/framework/Data/Data/vnote.php index 90973febf..1e03c9b19 100644 --- a/framework/Data/Data/vnote.php +++ b/framework/Data/Data/vnote.php @@ -1,7 +1,4 @@ * @author Chuck Hagenbuch * @package Horde_Data - * @since Horde 3.0 */ class Horde_Data_vnote extends Horde_Data_imc { diff --git a/framework/Data/Data/vtodo.php b/framework/Data/Data/vtodo.php index 319bd377f..683ff172e 100644 --- a/framework/Data/Data/vtodo.php +++ b/framework/Data/Data/vtodo.php @@ -1,8 +1,4 @@ * @author Chuck Hagenbuch * @package Horde_Data - * @since Horde 3.0 */ class Horde_Data_vtodo extends Horde_Data_imc { diff --git a/framework/DataTree/DataTree.php b/framework/DataTree/DataTree.php index 17ef45654..6073e52f9 100644 --- a/framework/DataTree/DataTree.php +++ b/framework/DataTree/DataTree.php @@ -561,8 +561,6 @@ class DataTree { /** * Create attribute sort hash * - * @since Horde 3.1 - * * @param string $root The name of the leaf from which we start * the export tree. * @param string $sortby_name Attribute name to use for sorting. @@ -1092,8 +1090,6 @@ class DataTree { * * @abstract * - * @since Horde 3.1 - * * @param string $root Which portion of the tree to sort. * Defaults to all of it. * @param boolean $loadTree Sort the tree starting at $root, or just the @@ -1298,8 +1294,6 @@ class DataTree { * You never call this function; it's used in uasort() calls. Do NOT use * usort(); you'll lose key => value associations. * - * @since Horde 3.1 - * * @private * * @param array $a The first object @@ -1404,7 +1398,6 @@ class DataTree { * * @author Stephane Huther * @author Chuck Hagenbuch - * @since Horde 2.1 * @package Horde_DataTree */ class DataTreeObject { diff --git a/framework/DataTree/DataTree/null.php b/framework/DataTree/DataTree/null.php index 2f71fad7b..124a027d6 100644 --- a/framework/DataTree/DataTree/null.php +++ b/framework/DataTree/DataTree/null.php @@ -10,7 +10,6 @@ * * @author Stephane Huther * @author Chuck Hagenbuch - * @since Horde 3.0 * @package Horde_DataTree */ class DataTree_null extends DataTree { @@ -98,8 +97,6 @@ class DataTree_null extends DataTree { /** * Get a tree sorted by the specified attribute name and/or key. * - * @since Horde 3.1 - * * @param string $root Which portion of the tree to sort. * Defaults to all of it. * @param boolean $loadTree Sort the tree starting at $root, or just the diff --git a/framework/DataTree/DataTree/sql.php b/framework/DataTree/DataTree/sql.php index 249126d97..7ea673002 100644 --- a/framework/DataTree/DataTree/sql.php +++ b/framework/DataTree/DataTree/sql.php @@ -40,7 +40,6 @@ * @author Stephane Huther * @author Chuck Hagenbuch * @author Jan Schneider - * @since Horde 2.1 * @package Horde_DataTree */ class DataTree_sql extends DataTree { @@ -467,8 +466,6 @@ class DataTree_sql extends DataTree { /** * Returns a tree sorted by the specified attribute name and/or key. * - * @since Horde 3.1 - * * @param string $root Which portion of the tree to sort. * Defaults to all of it. * @param boolean $loadTree Sort the tree starting at $root, or just the @@ -1310,8 +1307,6 @@ class DataTree_sql extends DataTree { * given criteria. Either attribute_name or attribute_key MUST be * supplied, and both MAY be supplied. * - * @since Horde 3.2 - * * @see buildAttributeQuery() * * @param array $criteria The array of criteria. @@ -1357,8 +1352,6 @@ class DataTree_sql extends DataTree { * Either attribute_name or attribute_key MUST be * supplied, and both MAY be supplied. * - * @since Horde 3.2 - * * @see buildAttributeQuery() * * @param array $criteria The array of criteria. diff --git a/framework/File_CSV/CSV.php b/framework/File_CSV/CSV.php index 425c05914..d844f9fc2 100644 --- a/framework/File_CSV/CSV.php +++ b/framework/File_CSV/CSV.php @@ -3,9 +3,6 @@ * @package File_CSV */ -/** PEAR */ -require_once 'PEAR.php'; - /** Mode to use for reading from files */ define('HORDE_FILE_CSV_MODE_READ', 'rb'); @@ -30,7 +27,6 @@ define('HORDE_FILE_CSV_MODE_APPEND', 'ab'); * * @author Tomas Von Veschler Cox * @author Jan Schneider - * @since Horde 3.1 * @package File_CSV */ class File_CSV { diff --git a/framework/File_PDF/PDF.php b/framework/File_PDF/PDF.php index 0fc53ba10..de339a658 100644 --- a/framework/File_PDF/PDF.php +++ b/framework/File_PDF/PDF.php @@ -606,7 +606,6 @@ class File_PDF { */ function raiseError($error) { - require_once 'PEAR.php'; return PEAR::raiseError($error); } @@ -685,7 +684,6 @@ class File_PDF { * Returns the actual page width. * * @since File_PDF 0.2.0 - * @since Horde 3.2 * * @return float The page width. */ @@ -698,7 +696,6 @@ class File_PDF { * Returns the actual page height. * * @since File_PDF 0.2.0 - * @since Horde 3.2 * * @return float The page height. */ @@ -1132,7 +1129,6 @@ class File_PDF { * between 0 and 1. Required for cmyk. * * @since File_PDF 0.2.0 - * @since Horde 3.2 * @see setFillColor() * @see setDrawColor() * @see rect() @@ -1630,7 +1626,6 @@ class File_PDF { * @param string $style The font style. * * @since File_PDF 0.2.0 - * @since Horde 3.2 * @see setFont() */ function setFontStyle($style) @@ -2501,7 +2496,6 @@ class File_PDF { * memory usage during the call. * * @since File_PDF 0.2.0 - * @since Horde 3.2 * @see getOutput() */ function flush() diff --git a/framework/Form/Form.php b/framework/Form/Form.php index 3a90c5678..9e70e784b 100644 --- a/framework/Form/Form.php +++ b/framework/Form/Form.php @@ -17,7 +17,6 @@ require_once 'Horde/Form/Variable.php'; * * @author Robert E. Coyle * @author Chuck Hagenbuch - * @since Horde 3.0 * @package Horde_Form */ class Horde_Form { diff --git a/framework/Form/Form/Action/setcursorpos.php b/framework/Form/Form/Action/setcursorpos.php index 14d8bcac1..0d98726e5 100644 --- a/framework/Form/Form/Action/setcursorpos.php +++ b/framework/Form/Form/Action/setcursorpos.php @@ -11,7 +11,6 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Chuck Hagenbuch - * @since Horde 3.2 * @package Horde_Form */ class Horde_Form_Action_setcursorpos extends Horde_Form_Action { diff --git a/framework/Form/Form/Type.php b/framework/Form/Form/Type.php index 5cc7eaec1..1a14a8798 100644 --- a/framework/Form/Form/Type.php +++ b/framework/Form/Form/Type.php @@ -405,9 +405,6 @@ class Horde_Form_Type_stringlist extends Horde_Form_Type_text { } -/** - * @since Horde 3.3 - */ class Horde_Form_Type_stringarray extends Horde_Form_Type_stringlist { function getInfo(&$vars, &$var, &$info) @@ -434,9 +431,6 @@ class Horde_Form_Type_stringarray extends Horde_Form_Type_stringlist { } -/** - * @since Horde 3.2 - */ class Horde_Form_Type_phone extends Horde_Form_Type { function isValid(&$var, &$vars, $value, &$message) @@ -754,9 +748,6 @@ class Horde_Form_Type_addresslink extends Horde_Form_Type_address { } -/** - * @since Horde 3.3 - */ class Horde_Form_Type_pgp extends Horde_Form_Type_longtext { /** @@ -810,9 +801,6 @@ class Horde_Form_Type_pgp extends Horde_Form_Type_longtext { } -/** - * @since Horde 3.3 - */ class Horde_Form_Type_smime extends Horde_Form_Type_longtext { /** @@ -856,9 +844,6 @@ class Horde_Form_Type_smime extends Horde_Form_Type_longtext { } -/** - * @since Horde 3.2 - */ class Horde_Form_Type_country extends Horde_Form_Type_enum { function init($prompt = null) @@ -1982,9 +1967,6 @@ class Horde_Form_Type_enum extends Horde_Form_Type { return $this->_values; } - /** - * @since Horde 3.2 - */ function setValues($values) { $this->_values = $values; @@ -2742,9 +2724,6 @@ class Horde_Form_Type_monthdayyear extends Horde_Form_Type { } -/** - * @since Horde 3.2 - */ class Horde_Form_Type_datetime extends Horde_Form_Type { var $_mdy; @@ -3499,9 +3478,6 @@ class Horde_Form_Type_captcha extends Horde_Form_Type_figlet { } -/** - * @since Horde 3.2 - */ class Horde_Form_Type_category extends Horde_Form_Type { function getInfo(&$vars, &$var, &$info) diff --git a/framework/Form/Form/Type/tableset.php b/framework/Form/Form/Type/tableset.php index a2d14a4b0..6451cfd97 100644 --- a/framework/Form/Form/Type/tableset.php +++ b/framework/Form/Form/Type/tableset.php @@ -4,7 +4,6 @@ require_once 'Horde/Form.php'; /** * @package Horde_Form - * @since Horde 3.1 */ class Horde_Form_Type_tableset extends Horde_Form_Type { diff --git a/framework/Group/Group.php b/framework/Group/Group.php index 706ca5ed0..1105c66c6 100644 --- a/framework/Group/Group.php +++ b/framework/Group/Group.php @@ -15,7 +15,6 @@ define('GROUP_ROOT', -1); * * @author Stephane Huther * @author Chuck Hagenbuch - * @since Horde 2.1 * @package Horde_Group */ class Group { @@ -715,7 +714,6 @@ class Group { * DataTreeObject directly. * * @author Chuck Hagenbuch - * @since Horde 2.1 * @package Horde_Group */ class DataTreeObject_Group extends DataTreeObject { diff --git a/framework/Group/Group/contactlists.php b/framework/Group/Group/contactlists.php index f95fb6f2a..cdd2400d8 100644 --- a/framework/Group/Group/contactlists.php +++ b/framework/Group/Group/contactlists.php @@ -619,7 +619,6 @@ class Group_contactlists extends Group { * Extension of the DataTreeObject_Group class for storing Group information. * * @author Michael J. Rubinsky - * @since Horde 4.0 * @package Horde_Group */ class ContactListObject_Group extends DataTreeObject_Group { diff --git a/framework/Group/Group/hooks.php b/framework/Group/Group/hooks.php index 96ec5cac5..afb7b876c 100644 --- a/framework/Group/Group/hooks.php +++ b/framework/Group/Group/hooks.php @@ -10,7 +10,6 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Jason Rust - * @since Horde 3.0 * @package Horde_Group */ class Group_hooks extends Group { diff --git a/framework/Group/Group/kolab.php b/framework/Group/Group/kolab.php index 40b803c26..95ffed94e 100644 --- a/framework/Group/Group/kolab.php +++ b/framework/Group/Group/kolab.php @@ -16,7 +16,6 @@ require_once 'Horde/LDAP.php'; * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Gunnar Wrobel - * @since Horde 3.2 * @package Horde_Group */ class Group_kolab extends Group_ldap { @@ -347,7 +346,6 @@ class Group_kolab extends Group_ldap { * * * @author Ben Chavet - * @since Horde 3.1 * @package Horde_Group */ class Kolab_Group extends LDAP_Group { diff --git a/framework/Group/Group/ldap.php b/framework/Group/Group/ldap.php index ffd32d8a8..b8484667f 100644 --- a/framework/Group/Group/ldap.php +++ b/framework/Group/Group/ldap.php @@ -9,7 +9,6 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Ben Chavet - * @since Horde 3.1 * @package Horde_Group */ class Group_ldap extends Group { @@ -738,7 +737,6 @@ class Group_ldap extends Group { * in an LDAP directory. * * @author Ben Chavet - * @since Horde 3.1 * @package Horde_Group */ class LDAP_Group extends DataTreeObject_Group { diff --git a/framework/Group/Group/mock.php b/framework/Group/Group/mock.php index 8f83771e7..5c57a1f01 100644 --- a/framework/Group/Group/mock.php +++ b/framework/Group/Group/mock.php @@ -8,7 +8,6 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Duck - * @since Horde 3.2 * @package Horde_Group */ class Group_mock extends Group { diff --git a/framework/Group/Group/sql.php b/framework/Group/Group/sql.php index 720213543..3f361a3f0 100644 --- a/framework/Group/Group/sql.php +++ b/framework/Group/Group/sql.php @@ -8,7 +8,6 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Duck - * @since Horde 3.2 * @package Horde_Group */ class Group_sql extends Group { @@ -768,7 +767,6 @@ class Group_sql extends Group { * SQLObject directly. * * @author Duck - * @since Horde 3.2 * @package Horde_Group */ class SQLObject_Group extends DataTreeObject_Group { diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Base.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Base.php index c6d8d6bdc..872c51867 100644 --- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Base.php +++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Base.php @@ -3,26 +3,9 @@ * @package Kolab_Filter */ -/** Load the required PEAR libraries */ -require_once 'PEAR.php'; - -/** Console_Getopt */ -require_once 'Console/Getopt.php'; - -/** Load the required Horde libraries */ -require_once 'Horde.php'; - /** Load the Filter libraries */ require_once dirname(__FILE__) . '/Response.php'; -/** Load the argument parsing library */ -require_once 'Horde/Argv/Option.php'; -require_once 'Horde/Argv/OptionContainer.php'; -require_once 'Horde/Argv/HelpFormatter.php'; -require_once 'Horde/Argv/IndentedHelpFormatter.php'; -require_once 'Horde/Argv/Values.php'; -require_once 'Horde/Argv/Parser.php'; - /** * A basic definition for a PHP based postfix filter. * diff --git a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Response.php b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Response.php index e8db71197..8a4695cdd 100644 --- a/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Response.php +++ b/framework/Kolab_Filter/lib/Horde/Kolab/Filter/Response.php @@ -3,12 +3,9 @@ * @package Kolab_Filter */ -/* Require the PEAR library for PEAR errors */ -require_once 'PEAR.php'; - /* Some output constants */ -define( 'OUT_STDOUT', 128 ); -define( 'OUT_LOG', 256 ); +define('OUT_STDOUT', 128); +define('OUT_LOG', 256); /* Failure constants from postfix src/global/sys_exits.h */ define('EX_USAGE', 64); /* command line usage error */ diff --git a/framework/LDAP/LDAP.php b/framework/LDAP/LDAP.php index 75ec293d6..b9c471850 100644 --- a/framework/LDAP/LDAP.php +++ b/framework/LDAP/LDAP.php @@ -8,7 +8,6 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Chuck Hagenbuch - * @since Horde 2.2 * @package Horde_LDAP */ class Horde_LDAP @@ -19,8 +18,7 @@ class Horde_LDAP * @param string $lhs The attribute to test. * @param string $op The operator. * @param string $rhs The comparison value. - * @param array $params Any additional parameters for the operator. @since - * Horde 3.2 + * @param array $params Any additional parameters for the operator. * * @return string The LDAP search fragment. */ diff --git a/framework/Mobile/Mobile.php b/framework/Mobile/Mobile.php index a6e0f63ea..27717a1db 100644 --- a/framework/Mobile/Mobile.php +++ b/framework/Mobile/Mobile.php @@ -109,7 +109,6 @@ class Horde_Mobile_card extends Horde_Mobile_element { * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Chuck Hagenbuch - * @since Horde 3.0 * @package Horde_Mobile */ class Horde_Mobile extends Horde_Mobile_card { diff --git a/framework/Mobile/Mobile/Renderer.php b/framework/Mobile/Mobile/Renderer.php index a0d493bfd..9c4b1c195 100644 --- a/framework/Mobile/Mobile/Renderer.php +++ b/framework/Mobile/Mobile/Renderer.php @@ -9,7 +9,6 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Chuck Hagenbuch - * @since Horde 3.0 * @package Horde_Mobile */ class Horde_Mobile_Renderer extends Horde_Mobile { diff --git a/framework/Mobile/Mobile/Renderer/html.php b/framework/Mobile/Mobile/Renderer/html.php index 00303db2d..afb38e021 100644 --- a/framework/Mobile/Mobile/Renderer/html.php +++ b/framework/Mobile/Mobile/Renderer/html.php @@ -9,7 +9,6 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Chuck Hagenbuch - * @since Horde 3.0 * @package Horde_Mobile */ class Horde_Mobile_Renderer_html extends Horde_Mobile_Renderer { diff --git a/framework/Mobile/Mobile/Renderer/wml.php b/framework/Mobile/Mobile/Renderer/wml.php index 122fe0b8a..2e5c71528 100644 --- a/framework/Mobile/Mobile/Renderer/wml.php +++ b/framework/Mobile/Mobile/Renderer/wml.php @@ -8,7 +8,6 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Chuck Hagenbuch - * @since Horde 3.0 * @package Horde_Mobile */ class Horde_Mobile_Renderer_wml extends Horde_Mobile_Renderer { diff --git a/framework/Net_IMSP/IMSP/Utils.php b/framework/Net_IMSP/IMSP/Utils.php index 920335aa3..dea10c3ca 100644 --- a/framework/Net_IMSP/IMSP/Utils.php +++ b/framework/Net_IMSP/IMSP/Utils.php @@ -141,7 +141,6 @@ class Net_IMSP_Utils { * the current user. * * @return mixed Array describing any shares added or removed | PEAR_Error. - * @since Horde 3.2 */ function synchShares(&$share_obj, $serverInfo) { @@ -243,7 +242,6 @@ class Net_IMSP_Utils { * @param array Parameters for the share * * @return mixed True | PEAR_Error - * @since Horde 3.2 */ function _createShare(&$share_obj, $params, $shareparams) { @@ -266,7 +264,6 @@ class Net_IMSP_Utils { * @param array $params Parameters to check for ownership. * * @return boolean True if $user is owner, otherwise false. - * @since Horde 3.2 */ function _isOwner($bookName, $username, $acl) { @@ -283,7 +280,6 @@ class Net_IMSP_Utils { * * @param Datatree_Object_Share $share The share to assign perms to * @param string $acl The IMSP acl string. - * @since Horde 3.2 */ function _setPerms(&$share, $acl) { @@ -309,7 +305,6 @@ class Net_IMSP_Utils { * @param integer $perms Horde_Perms style permission bitmask. * * @return string An IMSP acl string - * @since Horde 3.2 */ function permsToACL($perms) { @@ -338,7 +333,6 @@ class Net_IMSP_Utils { * @param string $acl The acl string to set. * * @return mixed True | Pear_Error - * @since Horde 3.2 */ function setACL($params, $book, $name, $acl) { diff --git a/framework/Net_SMS/SMS.php b/framework/Net_SMS/SMS.php index 2545a8d3e..90e4b2d8e 100644 --- a/framework/Net_SMS/SMS.php +++ b/framework/Net_SMS/SMS.php @@ -1,7 +1,4 @@ * @link http://pear.php.net/package/Net_SMS * @since Net_SMS 0.2.0 - * @since Horde 3.2 */ class Net_SMS_generic_smpp extends Net_SMS { diff --git a/framework/Net_SMS/SMS/generic_smtp.php b/framework/Net_SMS/SMS/generic_smtp.php index af6113101..c4580b21b 100644 --- a/framework/Net_SMS/SMS/generic_smtp.php +++ b/framework/Net_SMS/SMS/generic_smtp.php @@ -13,7 +13,6 @@ * @category Networking * @package Net_SMS * @author Ian Eure - * @since Horde 3.1 * @since Net_SMS 0.0.2 */ class Net_SMS_generic_smtp extends Net_SMS { diff --git a/framework/Notification/test/Horde/Notification/Class/Notification/ListenerTest.php b/framework/Notification/test/Horde/Notification/Class/Notification/ListenerTest.php index 8d6a49b93..3f3e50258 100644 --- a/framework/Notification/test/Horde/Notification/Class/Notification/ListenerTest.php +++ b/framework/Notification/test/Horde/Notification/Class/Notification/ListenerTest.php @@ -34,7 +34,6 @@ class Horde_Notification_Class_Notification_ListenerTest extends PHPUnit_Framewo { public function setUp() { - @include_once 'PEAR.php'; if (!class_exists('PEAR_Error')) { $this->markTestSkipped('The PEAR_Error class is not available!'); } diff --git a/framework/SQL/SQL.php b/framework/SQL/SQL.php index a14c194c9..49594cc2f 100644 --- a/framework/SQL/SQL.php +++ b/framework/SQL/SQL.php @@ -9,7 +9,6 @@ * * @author Chuck Hagenbuch * @author Jan Schneider - * @since Horde 2.2 * @package Horde_SQL */ class Horde_SQL { @@ -24,8 +23,7 @@ class Horde_SQL { * @param string $rhs The comparison value. * @param boolean $bind If true, the method returns the query and a list * of values suitable for binding as an array. - * @param array $params Any additional parameters for the operator. @since - * Horde 3.2 + * @param array $params Any additional parameters for the operator. * * @return mixed The SQL test fragment, or an array containing the query * and a list of values if $bind is true. diff --git a/framework/SQL/SQL/Keywords.php b/framework/SQL/SQL/Keywords.php index e9c326bdd..ac698ba90 100644 --- a/framework/SQL/SQL/Keywords.php +++ b/framework/SQL/SQL/Keywords.php @@ -37,7 +37,6 @@ * quoting it or use unbalanced parentheses. * * @author Jason M. Felice - * @since Horde 3.0 * @package Horde_SQL */ class Horde_SQL_Keywords { diff --git a/framework/Share/Share.php b/framework/Share/Share.php index df8c8cfdf..c44588e4d 100644 --- a/framework/Share/Share.php +++ b/framework/Share/Share.php @@ -15,7 +15,6 @@ * @author Chuck Hagenbuch * @author Jan Schneider * @author Gunnar Wrobel - * @since Horde 3.0 * @package Horde_Share */ class Horde_Share { @@ -343,8 +342,6 @@ class Horde_Share { /** * Returns the number of shares that $userid has access to. * - * @since Horde 3.2 - * * @param string $userid The userid of the user to check access for. * @param integer $perm The level of permissions required. * @param mixed $attributes Restrict the shares counted to those @@ -560,7 +557,6 @@ class Horde_Share { * @author Mike Cochrane * @author Jan Schneider * @author Gunnar Wrobel - * @since Horde 3.2 * @package Horde_Share */ class Horde_Share_Object { diff --git a/framework/Share/Share/datatree.php b/framework/Share/Share/datatree.php index b7134f3ca..d9a1492dc 100644 --- a/framework/Share/Share/datatree.php +++ b/framework/Share/Share/datatree.php @@ -17,7 +17,6 @@ require_once 'Horde/DataTree.php'; * @author Chuck Hagenbuch * @author Jan Schneider * @author Gunnar Wrobel - * @since Horde 3.2 * @package Horde_Share */ class Horde_Share_datatree extends Horde_Share { @@ -180,8 +179,6 @@ class Horde_Share_datatree extends Horde_Share { /** * Returns the number of shares that $userid has access to. * - * @since Horde 3.2 - * * @param string $userid The userid of the user to check access for. * @param integer $perm The level of permissions required. * @param mixed $attributes Restrict the shares counted to those @@ -346,7 +343,6 @@ class Horde_Share_datatree extends Horde_Share { * @author Mike Cochrane * @author Jan Schneider * @author Gunnar Wrobel - * @since Horde 3.2 * @package Horde_Share */ class Horde_Share_Object_datatree extends Horde_Share_Object { @@ -489,7 +485,6 @@ class Horde_Share_Object_datatree extends Horde_Share_Object { * * @author Mike Cochrane * @author Jan Schneider - * @since Horde 3.0 * @package Horde_Share */ class DataTreeObject_Share extends DataTreeObject { diff --git a/framework/Share/Share/kolab.php b/framework/Share/Share/kolab.php index 2561ffebd..bae3d07e8 100644 --- a/framework/Share/Share/kolab.php +++ b/framework/Share/Share/kolab.php @@ -13,7 +13,6 @@ * * @author Stuart Binge * @author Gunnar Wrobel - * @since Horde 3.2 * @package Horde_Share */ class Horde_Share_kolab extends Horde_Share { @@ -267,8 +266,6 @@ class Horde_Share_kolab extends Horde_Share { /** * Returns the number of shares that $userid has access to. * - * @since Horde 3.2 - * * @param string $userid The userid of the user to check access for. * @param integer $perm The level of permissions required. * @param mixed $attributes Restrict the shares counted to those @@ -389,7 +386,6 @@ class Horde_Share_kolab extends Horde_Share { * * @author Stuart Binge * @author Gunnar Wrobel - * @since Horde 3.2 * @package Horde_Share */ class Horde_Share_Object_kolab extends Horde_Share_Object { diff --git a/framework/Share/Share/sql.php b/framework/Share/Share/sql.php index a4465677c..b5664509e 100644 --- a/framework/Share/Share/sql.php +++ b/framework/Share/Share/sql.php @@ -9,7 +9,6 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Duck - * @since Horde 3.2 * @package Horde_Share */ @@ -916,7 +915,6 @@ class Horde_Share_sql extends Horde_Share { * the sql driver. * * @author Duck - * @since Horde 3.2 * @package Horde_Share */ class Horde_Share_Object_sql extends Horde_Share_Object { diff --git a/framework/Share/Share/sql_hierarchical.php b/framework/Share/Share/sql_hierarchical.php index 6154f0b49..0a0f262c8 100644 --- a/framework/Share/Share/sql_hierarchical.php +++ b/framework/Share/Share/sql_hierarchical.php @@ -5,7 +5,6 @@ * * @author Duck * @author Michael J. Rubinsky - * @since Horde 3.2 * @package Horde_Share */ class Horde_Share_sql_hierarchical extends Horde_Share_sql { diff --git a/framework/SyncML/SyncML.php b/framework/SyncML/SyncML.php index 9a579fd0f..09ba6ed9b 100644 --- a/framework/SyncML/SyncML.php +++ b/framework/SyncML/SyncML.php @@ -26,7 +26,6 @@ * * @author Karsten Fourmont * @author Anthony Mills - * @since Horde 3.0 * @package SyncML */ diff --git a/framework/SyncML/SyncML/Command.php b/framework/SyncML/SyncML/Command.php index f23eed187..a27b87a17 100644 --- a/framework/SyncML/SyncML/Command.php +++ b/framework/SyncML/SyncML/Command.php @@ -19,7 +19,6 @@ * * @author Anthony Mills * @author Jan Schneider - * @since Horde 3.0 * @package SyncML */ class SyncML_Command { @@ -163,7 +162,6 @@ class SyncML_Command { $msg = 'Class definition of ' . $class . ' not found.'; $GLOBALS['backend']->logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR); - require_once 'PEAR.php'; $cmd = PEAR::raiseError($msg); } diff --git a/framework/SyncML/SyncML/Command/Alert.php b/framework/SyncML/SyncML/Command/Alert.php index 4081c32df..4f07515f2 100644 --- a/framework/SyncML/SyncML/Command/Alert.php +++ b/framework/SyncML/SyncML/Command/Alert.php @@ -20,7 +20,6 @@ require_once 'SyncML/Command.php'; * @author Anthony Mills * @author Karsten Fourmont * @author Jan Schneider - * @since Horde 3.0 * @package SyncML */ class SyncML_Command_Alert extends SyncML_Command { diff --git a/framework/SyncML/SyncML/Command/Final.php b/framework/SyncML/SyncML/Command/Final.php index 85dca8c1a..d4396cbd0 100644 --- a/framework/SyncML/SyncML/Command/Final.php +++ b/framework/SyncML/SyncML/Command/Final.php @@ -17,7 +17,6 @@ require_once 'SyncML/Command.php'; * * @author Karsten Fourmont * @author Jan Schneider - * @since Horde 3.0 * @package SyncML */ class SyncML_Command_Final extends SyncML_Command { diff --git a/framework/SyncML/SyncML/Command/Get.php b/framework/SyncML/SyncML/Command/Get.php index c151f0235..6f72fdfca 100644 --- a/framework/SyncML/SyncML/Command/Get.php +++ b/framework/SyncML/SyncML/Command/Get.php @@ -18,7 +18,6 @@ require_once 'SyncML/Command.php'; * * @author Karsten Fourmont * @author Jan Schneider - * @since Horde 3.0 * @package SyncML */ class SyncML_Command_Get extends SyncML_Command { diff --git a/framework/SyncML/SyncML/Command/Map.php b/framework/SyncML/SyncML/Command/Map.php index 5ac3bcd1b..8d05b452e 100644 --- a/framework/SyncML/SyncML/Command/Map.php +++ b/framework/SyncML/SyncML/Command/Map.php @@ -16,7 +16,6 @@ require_once 'SyncML/Command.php'; * * @author Karsten Fourmont * @author Jan Schneider - * @since Horde 3.0 * @package SyncML */ class SyncML_Command_Map extends SyncML_Command { diff --git a/framework/SyncML/SyncML/Command/Put.php b/framework/SyncML/SyncML/Command/Put.php index 6c10e2d12..738368dbb 100644 --- a/framework/SyncML/SyncML/Command/Put.php +++ b/framework/SyncML/SyncML/Command/Put.php @@ -21,7 +21,6 @@ require_once 'SyncML/Command.php'; * * @author Karsten Fourmont * @author Jan Schneider - * @since Horde 3.0 * @package SyncML */ class SyncML_Command_Put extends SyncML_Command { diff --git a/framework/SyncML/SyncML/Command/Replace.php b/framework/SyncML/SyncML/Command/Replace.php index 0729a9939..730f164d7 100644 --- a/framework/SyncML/SyncML/Command/Replace.php +++ b/framework/SyncML/SyncML/Command/Replace.php @@ -16,7 +16,6 @@ require_once 'SyncML/Command.php'; * * @author Anthony Mills * @author Jan Schneider - * @since Horde 3.0 * @package SyncML */ class SyncML_Command_Replace extends SyncML_Command { diff --git a/framework/SyncML/SyncML/Command/Results.php b/framework/SyncML/SyncML/Command/Results.php index 772cf3c76..5168f9653 100644 --- a/framework/SyncML/SyncML/Command/Results.php +++ b/framework/SyncML/SyncML/Command/Results.php @@ -19,7 +19,6 @@ require_once 'SyncML/Command/Put.php'; * * @author Nathan P Sharp * @author Jan Schneider - * @since Horde 3.0 * @package SyncML */ class SyncML_Command_Results extends SyncML_Command_Put { diff --git a/framework/SyncML/SyncML/Command/Status.php b/framework/SyncML/SyncML/Command/Status.php index 599724190..be8a52a87 100644 --- a/framework/SyncML/SyncML/Command/Status.php +++ b/framework/SyncML/SyncML/Command/Status.php @@ -17,7 +17,6 @@ require_once 'SyncML/Command.php'; * * @author Karsten Fourmont * @author Jan Schneider - * @since Horde 3.0 * @package SyncML */ class SyncML_Command_Status extends SyncML_Command { diff --git a/framework/SyncML/SyncML/Command/Sync.php b/framework/SyncML/SyncML/Command/Sync.php index c9041cac2..58fe2b98e 100644 --- a/framework/SyncML/SyncML/Command/Sync.php +++ b/framework/SyncML/SyncML/Command/Sync.php @@ -26,7 +26,6 @@ require_once 'SyncML/Command/SyncElement.php'; * * @author Karsten Fourmont * @author Jan Schneider - * @since Horde 3.0 * @package SyncML */ class SyncML_Command_Sync extends SyncML_Command { diff --git a/framework/SyncML/SyncML/Command/SyncElement.php b/framework/SyncML/SyncML/Command/SyncElement.php index def92ff99..a1a4a80d7 100644 --- a/framework/SyncML/SyncML/Command/SyncElement.php +++ b/framework/SyncML/SyncML/Command/SyncElement.php @@ -13,7 +13,6 @@ * * @author Karsten Fourmont * @author Jan Schneider - * @since Horde 3.0.5 * @package SyncML */ class SyncML_SyncElement { diff --git a/framework/SyncML/SyncML/Command/SyncHdr.php b/framework/SyncML/SyncML/Command/SyncHdr.php index 20337cd55..56f4a49d2 100644 --- a/framework/SyncML/SyncML/Command/SyncHdr.php +++ b/framework/SyncML/SyncML/Command/SyncHdr.php @@ -17,7 +17,6 @@ require_once 'SyncML/Command.php'; * * @author Karsten Fourmont * @author Jan Schneider - * @since Horde 3.2 * @package SyncML */ class SyncML_Command_SyncHdr extends SyncML_Command { diff --git a/framework/SyncML/SyncML/State.php b/framework/SyncML/SyncML/State.php index 9ac19651d..f9b60b672 100644 --- a/framework/SyncML/SyncML/State.php +++ b/framework/SyncML/SyncML/State.php @@ -17,7 +17,6 @@ require_once 'SyncML/Command/SyncElement.php'; * * @author Anthony Mills * @author Jan Schneider - * @since Horde 3.0 * @package SyncML */ class SyncML_State { diff --git a/framework/SyncML/SyncML/Sync.php b/framework/SyncML/SyncML/Sync.php index bb075c89d..83b376f9e 100644 --- a/framework/SyncML/SyncML/Sync.php +++ b/framework/SyncML/SyncML/Sync.php @@ -6,7 +6,6 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Anthony Mills - * @since Horde 3.0 * @package SyncML */ diff --git a/framework/SyncML/SyncML/XMLOutput.php b/framework/SyncML/SyncML/XMLOutput.php index 750b567b2..abf59203c 100644 --- a/framework/SyncML/SyncML/XMLOutput.php +++ b/framework/SyncML/SyncML/XMLOutput.php @@ -17,7 +17,6 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Karsten Fourmont - * @since Horde 3.2 * @package SyncML */ diff --git a/framework/SyncML/tests/testpacket.php b/framework/SyncML/tests/testpacket.php index 3a02813d1..c3aa0c9d9 100755 --- a/framework/SyncML/tests/testpacket.php +++ b/framework/SyncML/tests/testpacket.php @@ -15,11 +15,9 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Jan Schneider - * @since Horde 3.3.4 * @package SyncML */ -require_once 'PEAR.php'; require_once 'SyncML.php'; class Backend extends SyncML_Backend { diff --git a/framework/SyncML/tests/testsync.php b/framework/SyncML/tests/testsync.php index c73457b8d..5abaee12a 100755 --- a/framework/SyncML/tests/testsync.php +++ b/framework/SyncML/tests/testsync.php @@ -15,7 +15,6 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Karsten Fourmont - * @since Horde 3.2 * @package SyncML */ diff --git a/framework/Text_Diff/Diff.php b/framework/Text_Diff/Diff.php index 665f163f6..2b65bcfc4 100644 --- a/framework/Text_Diff/Diff.php +++ b/framework/Text_Diff/Diff.php @@ -66,7 +66,6 @@ class Text_Diff { * returns the number of new (added) lines in a given diff. * * @since Text_Diff 1.1.0 - * @since Horde 3.2 * * @return integer The number of new lines */ @@ -86,7 +85,6 @@ class Text_Diff { * Returns the number of deleted (removed) lines in a given diff. * * @since Text_Diff 1.1.0 - * @since Horde 3.2 * * @return integer The number of deleted lines */ diff --git a/framework/VFS/lib/VFS.php b/framework/VFS/lib/VFS.php index 3d3962210..45fa4ff62 100644 --- a/framework/VFS/lib/VFS.php +++ b/framework/VFS/lib/VFS.php @@ -1,6 +1,5 @@ * @package VFS - * @since Horde 2.2 */ class VFS { @@ -194,8 +192,6 @@ class VFS { /** * Returns the size of a folder * - * @since Horde 3.1 - * * @param string $path The path to the folder. * @param string $name The name of the folder. * @@ -822,8 +818,6 @@ class VFS { /** * Returns the size of the VFS item. * - * @since Horde 3.1 - * * @return integer The size, in bytes, of the VFS item. */ function getVFSSize() @@ -837,8 +831,6 @@ class VFS { /** * Sets the VFS quota limit. * - * @since Horde 3.1 - * * @param integer $quota The limit to apply. * @param integer $metric The metric to multiply the quota into. */ @@ -864,8 +856,6 @@ class VFS { /** * Sets the VFS quota root. * - * @since Horde 3.1 - * * @param string $dir The root directory for the quota determination. */ function setQuotaRoot($dir) @@ -876,8 +866,6 @@ class VFS { /** * Get quota information (used/allocated), in bytes. * - * @since Horde 3.1 - * * @return mixed An associative array. * 'limit' = Maximum quota allowed * 'usage' = Currently used portion of quota (in bytes) diff --git a/framework/VFS/lib/VFS/horde.php b/framework/VFS/lib/VFS/horde.php index f65c9f19d..0b03c8f2b 100644 --- a/framework/VFS/lib/VFS/horde.php +++ b/framework/VFS/lib/VFS/horde.php @@ -15,7 +15,6 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Jan Schneider - * @since Horde 3.2 * @package VFS */ class VFS_horde extends VFS { diff --git a/framework/VFS/lib/VFS/smb.php b/framework/VFS/lib/VFS/smb.php index 7c791fa87..af2c11ebe 100644 --- a/framework/VFS/lib/VFS/smb.php +++ b/framework/VFS/lib/VFS/smb.php @@ -31,7 +31,6 @@ * * @author Paul Gareau * @author Patrice Levesque - * @since Horde 3.1 * @package VFS */ class VFS_smb extends VFS { diff --git a/framework/VFS/lib/VFS/ssh2.php b/framework/VFS/lib/VFS/ssh2.php index 73e027006..3c3beda9e 100644 --- a/framework/VFS/lib/VFS/ssh2.php +++ b/framework/VFS/lib/VFS/ssh2.php @@ -18,7 +18,6 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @editor Cliff Green - * @since Horde 3.2 * @package VFS */ class VFS_ssh2 extends VFS { diff --git a/framework/VFS_ISOWriter/ISOWriter.php b/framework/VFS_ISOWriter/ISOWriter.php index daace435c..45cfaaae1 100644 --- a/framework/VFS_ISOWriter/ISOWriter.php +++ b/framework/VFS_ISOWriter/ISOWriter.php @@ -1,7 +1,4 @@ * @package VFS_ISO - * @since Horde 3.0 */ class VFS_ISOWriter { diff --git a/framework/VFS_ISOWriter/ISOWriter/RealInputStrategy.php b/framework/VFS_ISOWriter/ISOWriter/RealInputStrategy.php index fc201275a..78aa68558 100644 --- a/framework/VFS_ISOWriter/ISOWriter/RealInputStrategy.php +++ b/framework/VFS_ISOWriter/ISOWriter/RealInputStrategy.php @@ -10,7 +10,6 @@ * * @author Jason M. Felice * @package VFS_ISO - * @since Horde 3.0 */ class VFS_ISOWriter_RealInputStrategy { diff --git a/framework/VFS_ISOWriter/ISOWriter/RealInputStrategy/copy.php b/framework/VFS_ISOWriter/ISOWriter/RealInputStrategy/copy.php index 12e037739..e37a5b297 100644 --- a/framework/VFS_ISOWriter/ISOWriter/RealInputStrategy/copy.php +++ b/framework/VFS_ISOWriter/ISOWriter/RealInputStrategy/copy.php @@ -9,7 +9,6 @@ * * @author Jason M. Felice * @package VFS_ISO - * @since Horde 3.0 */ class VFS_ISOWriter_RealInputStrategy_copy extends VFS_ISOWriter_RealInputStrategy { diff --git a/framework/VFS_ISOWriter/ISOWriter/RealInputStrategy/direct.php b/framework/VFS_ISOWriter/ISOWriter/RealInputStrategy/direct.php index e663c527c..6b61b17b6 100644 --- a/framework/VFS_ISOWriter/ISOWriter/RealInputStrategy/direct.php +++ b/framework/VFS_ISOWriter/ISOWriter/RealInputStrategy/direct.php @@ -9,7 +9,6 @@ * * @author Jason M. Felice * @package VFS_ISO - * @since Horde 3.0 */ class VFS_ISOWriter_RealInputStrategy_direct extends VFS_ISOWriter_RealInputStrategy { diff --git a/framework/VFS_ISOWriter/ISOWriter/RealOutputStrategy.php b/framework/VFS_ISOWriter/ISOWriter/RealOutputStrategy.php index d5bd7ac2c..db39b16b7 100644 --- a/framework/VFS_ISOWriter/ISOWriter/RealOutputStrategy.php +++ b/framework/VFS_ISOWriter/ISOWriter/RealOutputStrategy.php @@ -9,7 +9,6 @@ * * @author Jason M. Felice * @package VFS_ISO - * @since Horde 3.0 */ class VFS_ISOWriter_RealOutputStrategy { diff --git a/framework/VFS_ISOWriter/ISOWriter/RealOutputStrategy/copy.php b/framework/VFS_ISOWriter/ISOWriter/RealOutputStrategy/copy.php index 3d054f37f..b2e29d2fc 100644 --- a/framework/VFS_ISOWriter/ISOWriter/RealOutputStrategy/copy.php +++ b/framework/VFS_ISOWriter/ISOWriter/RealOutputStrategy/copy.php @@ -9,7 +9,6 @@ * * @author Jason M. Felice * @package VFS_ISO - * @since Horde 3.0 */ class VFS_ISOWriter_RealOutputStrategy_copy extends VFS_ISOWriter_RealOutputStrategy { diff --git a/framework/VFS_ISOWriter/ISOWriter/RealOutputStrategy/direct.php b/framework/VFS_ISOWriter/ISOWriter/RealOutputStrategy/direct.php index e82c3b39a..a6082b2aa 100644 --- a/framework/VFS_ISOWriter/ISOWriter/RealOutputStrategy/direct.php +++ b/framework/VFS_ISOWriter/ISOWriter/RealOutputStrategy/direct.php @@ -9,7 +9,6 @@ * * @author Jason M. Felice * @package VFS_ISO - * @since Horde 3.0 */ class VFS_ISOWriter_RealOutputStrategy_direct extends VFS_ISOWriter_RealOutputStrategy { diff --git a/framework/VFS_ISOWriter/ISOWriter/mkisofs.php b/framework/VFS_ISOWriter/ISOWriter/mkisofs.php index 2dfb0a251..a872e2c31 100644 --- a/framework/VFS_ISOWriter/ISOWriter/mkisofs.php +++ b/framework/VFS_ISOWriter/ISOWriter/mkisofs.php @@ -9,7 +9,6 @@ * * @author Jason M. Felice * @package VFS_ISO - * @since Horde 3.0 */ class VFS_ISOWriter_mkisofs extends VFS_ISOWriter { diff --git a/framework/XML_WBXML/WBXML/ContentHandler.php b/framework/XML_WBXML/WBXML/ContentHandler.php index fb2f6b504..7dd35c03e 100644 --- a/framework/XML_WBXML/WBXML/ContentHandler.php +++ b/framework/XML_WBXML/WBXML/ContentHandler.php @@ -38,9 +38,6 @@ class XML_WBXML_ContentHandler { */ function raiseError($error) { - if (!class_exists('PEAR')) { - require 'PEAR.php'; - } return PEAR::raiseError($error); } diff --git a/framework/iCalendar/iCalendar.php b/framework/iCalendar/iCalendar.php index 4a8a711be..68a6f4f39 100644 --- a/framework/iCalendar/iCalendar.php +++ b/framework/iCalendar/iCalendar.php @@ -12,7 +12,6 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Mike Cochrane - * @since Horde 3.0 * @package Horde_iCalendar */ class Horde_iCalendar { @@ -223,7 +222,6 @@ class Horde_iCalendar { } } if (!count($result)) { - require_once 'PEAR.php'; return PEAR::raiseError('Attribute "' . $name . '" Not Found'); } if (count($result) == 1 && !$params) { return $result[0]; diff --git a/framework/iCalendar/iCalendar/vfreebusy.php b/framework/iCalendar/iCalendar/vfreebusy.php index b8f4b8103..730beef9a 100644 --- a/framework/iCalendar/iCalendar/vfreebusy.php +++ b/framework/iCalendar/iCalendar/vfreebusy.php @@ -10,7 +10,6 @@ * @todo Don't use timestamps * * @author Mike Cochrane - * @since Horde 3.0 * @package Horde_iCalendar */ class Horde_iCalendar_vfreebusy extends Horde_iCalendar { diff --git a/framework/iCalendar/iCalendar/vjournal.php b/framework/iCalendar/iCalendar/vjournal.php index 1b0e24465..94e07b45b 100644 --- a/framework/iCalendar/iCalendar/vjournal.php +++ b/framework/iCalendar/iCalendar/vjournal.php @@ -8,7 +8,6 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Mike Cochrane - * @since Horde 3.0 * @package Horde_iCalendar */ class Horde_iCalendar_vjournal extends Horde_iCalendar { diff --git a/framework/iCalendar/iCalendar/vtimezone.php b/framework/iCalendar/iCalendar/vtimezone.php index 64e34be5b..5719afa66 100644 --- a/framework/iCalendar/iCalendar/vtimezone.php +++ b/framework/iCalendar/iCalendar/vtimezone.php @@ -8,7 +8,6 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Mike Cochrane - * @since Horde 3.0 * @package Horde_iCalendar */ class Horde_iCalendar_vtimezone extends Horde_iCalendar { diff --git a/framework/iCalendar/iCalendar/vtodo.php b/framework/iCalendar/iCalendar/vtodo.php index 6ddce40bc..ef81d505a 100644 --- a/framework/iCalendar/iCalendar/vtodo.php +++ b/framework/iCalendar/iCalendar/vtodo.php @@ -8,7 +8,6 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Mike Cochrane - * @since Horde 3.0 * @package Horde_iCalendar */ class Horde_iCalendar_vtodo extends Horde_iCalendar { diff --git a/horde/docs/CODING_STANDARDS b/horde/docs/CODING_STANDARDS index 6fe845abe..e58b461c3 100644 --- a/horde/docs/CODING_STANDARDS +++ b/horde/docs/CODING_STANDARDS @@ -201,7 +201,7 @@ Quick example function definition for Horde:: * [Once again, insert 2 spaces after the datatype, and line up all * subsequent lines, if any, with this character.] * - * @since Horde x.x [Only if necessary - use if function is added to the + * @since Horde x.x.x [Only if necessary - use if function is added to the * current release versions to indicate that the function has not been * available in previous versions. @since is only needed if the function * has been added after the last major point release - e.g. x.0.] @@ -257,7 +257,7 @@ Example for `LGPL`_'ed Horde code:: * * @author Original Author * @author Your Name - * @since Horde 3.0 [only if needed] + * @since Horde 4.0.1 [only if needed] * @category Horde * @package Horde_Package */ @@ -277,7 +277,7 @@ Example for `GPL`_'ed application code:: * * @author Original Author * @author Your Name - * @since App 1.0 [only if needed] + * @since App 1.0.1 [only if needed] * @category Horde * @package app */ diff --git a/horde/lib/Block/account.php b/horde/lib/Block/account.php index 2050c453d..96b1fc38d 100644 --- a/horde/lib/Block/account.php +++ b/horde/lib/Block/account.php @@ -133,7 +133,6 @@ class Horde_Block_Horde_account extends Horde_Block { * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Eric Jon Rostetter - * @since Horde 3.1 * @package Horde_Block */ class Accounts_Driver { @@ -243,7 +242,6 @@ class Accounts_Driver { * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Eric Jon Rostetter - * @since Horde 3.1 * @package Horde_Block */ class Accounts_Driver_localhost extends Accounts_Driver { @@ -411,7 +409,6 @@ class Accounts_Driver_localhost extends Accounts_Driver { * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Eric Jon Rostetter - * @since Horde 3.1 * @package Horde_Block */ class Accounts_Driver_ldap extends Accounts_Driver { diff --git a/hylax/lib/SQL/Attributes.php b/hylax/lib/SQL/Attributes.php index 0123454d7..ce5c2363e 100644 --- a/hylax/lib/SQL/Attributes.php +++ b/hylax/lib/SQL/Attributes.php @@ -8,7 +8,6 @@ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. * * @author Chuck Hagenbuch - * @since Horde 2.2 * @package Hylax */ class Hylax_SQL_Attributes { diff --git a/shout/ajax.php b/shout/ajax.php index 45137d374..bc7b9d725 100644 --- a/shout/ajax.php +++ b/shout/ajax.php @@ -10,7 +10,6 @@ * http://www.opensource.org/licenses/bsd-license.php. * * @author Ben Klang - * @since Shout 0.1 * @package Shout */ diff --git a/shout/config/conf.xml b/shout/config/conf.xml index 00c4fd26a..cb5ba5b53 100644 --- a/shout/config/conf.xml +++ b/shout/config/conf.xml @@ -9,7 +9,6 @@ * http://www.opensource.org/licenses/bsd-license.php. * * @author Ben Klang - * @since Shout 0.1 * @package Shout --> diff --git a/shout/lib/Driver.php b/shout/lib/Driver.php index 4e811578e..06a6374c1 100644 --- a/shout/lib/Driver.php +++ b/shout/lib/Driver.php @@ -9,10 +9,8 @@ * http://www.opensource.org/licenses/bsd-license.php. * * @author Ben Klang - * @since Shout 0.1 * @package Shout */ - class Shout_Driver { /** diff --git a/shout/lib/Driver/Ldap.php b/shout/lib/Driver/Ldap.php index 8d6b50f85..c8e918cfb 100644 --- a/shout/lib/Driver/Ldap.php +++ b/shout/lib/Driver/Ldap.php @@ -9,7 +9,6 @@ * http://www.opensource.org/licenses/bsd-license.php. * * @author Ben Klang - * @since Shout 0.1 * @package Shout */ diff --git a/shout/lib/Driver/Sql.php b/shout/lib/Driver/Sql.php index b0c58f537..d34f4355d 100644 --- a/shout/lib/Driver/Sql.php +++ b/shout/lib/Driver/Sql.php @@ -9,11 +9,8 @@ * http://www.opensource.org/licenses/bsd-license.php. * * @author Ben Klang - * @since Shout 0.1 * @package Shout */ - - class Shout_Driver_Sql extends Shout_Driver { /** diff --git a/shout/lib/Shout.php b/shout/lib/Shout.php index 357560037..0c8f5b4ad 100644 --- a/shout/lib/Shout.php +++ b/shout/lib/Shout.php @@ -9,7 +9,6 @@ * http://www.opensource.org/licenses/bsd-license.php. * * @author Ben Klang - * @since Shout 0.1 * @package Shout */ class Shout diff --git a/shout/themes/screen.css b/shout/themes/screen.css index fca3ecad8..b9678176d 100644 --- a/shout/themes/screen.css +++ b/shout/themes/screen.css @@ -8,12 +8,9 @@ * http://www.opensource.org/licenses/bsd-license.php. * * @author Ben Klang - * @since Shout 0.1 * @package Shout */ - - table { width: 100%; } diff --git a/vilma/lib/MailboxDriver/maildrop.php b/vilma/lib/MailboxDriver/maildrop.php index b98499ee1..734e547db 100644 --- a/vilma/lib/MailboxDriver/maildrop.php +++ b/vilma/lib/MailboxDriver/maildrop.php @@ -13,7 +13,6 @@ class Vilma_MailboxDriver_maildrop extends Vilma_MailboxDriver { function _getMailboxDir($user, $domain) { if (empty($this->_params['mail_dir_base'])) { - require_once 'PEAR.php'; throw new Vilma_Exception(_("No 'mail_dir_base' parameter specified to maildrop driver.")); } $dir = $this->_params['mail_dir_base']; @@ -39,7 +38,6 @@ class Vilma_MailboxDriver_maildrop extends Vilma_MailboxDriver { } if (!$exists[$dir]) { - require_once 'PEAR.php'; throw new Vilma_Exception(sprintf(_("Maildrop directory \"%s\" does not exist."), $dir)); } @@ -53,7 +51,6 @@ class Vilma_MailboxDriver_maildrop extends Vilma_MailboxDriver { return $dir; } if (empty($this->_params['system_user'])) { - require_once 'PEAR.php'; throw new Vilma_Exception(_("No 'system_user' parameter specified to maildrop driver.")); }