diff --git a/vtlib/Vtiger/Package.php b/vtlib/Vtiger/Package.php index 4ec88da12259dc2fb6f34908dac1b0deb26dbc15..60c1a5dd96b92a3241ea8b6e0986eceb80a40288 100644 --- a/vtlib/Vtiger/Package.php +++ b/vtlib/Vtiger/Package.php @@ -18,8 +18,11 @@ class Vtiger_Package extends Vtiger_PackageUpdate { /** * Constructor */ + function __construct() { + parent::__construct(); + } function Vtiger_Package() { - parent::__construct(); + self::__construct(); } } ?> diff --git a/vtlib/Vtiger/PackageExport.php b/vtlib/Vtiger/PackageExport.php index 64a71c5b9d4e74940478f3bd356efedefb57d71b..ac5346e7d017cdee3a465853b4c6e18e507e46e3 100644 --- a/vtlib/Vtiger/PackageExport.php +++ b/vtlib/Vtiger/PackageExport.php @@ -24,10 +24,13 @@ class Vtiger_PackageExport { /** * Constructor */ - function Vtiger_PackageExport() { - if(is_dir($this->_export_tmpdir) === FALSE) { + function __construct() { + if(is_dir($this->_export_tmpdir) === FALSE) { mkdir($this->_export_tmpdir); - } + } + } + function Vtiger_PackageExport() { + self::__construct(); } /** Output Handlers */ diff --git a/vtlib/Vtiger/PackageImport.php b/vtlib/Vtiger/PackageImport.php index f6b974b168e4b347017a613e1bba979668d92ad4..468030faaa43e2701d8d1566a7316d6ecb1ae86e 100644 --- a/vtlib/Vtiger/PackageImport.php +++ b/vtlib/Vtiger/PackageImport.php @@ -40,8 +40,11 @@ class Vtiger_PackageImport extends Vtiger_PackageExport { /** * Constructor */ + function __construct() { + parent::__construct(); + } function Vtiger_PackageImport() { - parent::__construct(); + self::__construct(); } /** diff --git a/vtlib/Vtiger/PackageUpdate.php b/vtlib/Vtiger/PackageUpdate.php index bcadacadbce44568e13b29aa9a7732762ffbcdd8..f57fa7cc0e828a3c5895bd4ed61ef52d06c01594 100644 --- a/vtlib/Vtiger/PackageUpdate.php +++ b/vtlib/Vtiger/PackageUpdate.php @@ -20,8 +20,11 @@ class Vtiger_PackageUpdate extends Vtiger_PackageImport { /** * Constructor */ + function __construct() { + parent::__construct(); + } function Vtiger_PackageUpdate() { - parent::__construct(); + self::__construct(); } /** diff --git a/vtlib/thirdparty/network/PEAR.php b/vtlib/thirdparty/network/PEAR.php index 45665a575526e07c154a4902dced3c49625ecd17..b4c38c9354dc2522bc654d0e8d9ed5485edf580f 100644 --- a/vtlib/thirdparty/network/PEAR.php +++ b/vtlib/thirdparty/network/PEAR.php @@ -167,8 +167,7 @@ class PEAR * @access public * @return void */ - function PEAR($error_class = null) - { + function __construct($error_class = null) { $classname = strtolower(get_class($this)); if ($this->_debug) { print "PEAR constructor called, class=$classname\n"; @@ -191,6 +190,10 @@ class PEAR } } } + function PEAR($error_class = null) + { + self::__construct($error_class); + } // }}} // {{{ destructor @@ -858,9 +861,8 @@ class PEAR_Error * @access public * */ - function PEAR_Error($message = 'unknown error', $code = null, - $mode = null, $options = null, $userinfo = null) - { + function __construct($message = 'unknown error', $code = null, + $mode = null, $options = null, $userinfo = null) { if ($mode === null) { $mode = PEAR_ERROR_RETURN; } @@ -917,6 +919,11 @@ class PEAR_Error eval('$e = new Exception($this->message, $this->code);throw($e);'); } } + function PEAR_Error($message = 'unknown error', $code = null, + $mode = null, $options = null, $userinfo = null) + { + self::__construct($message, $code, $mode , $options , $userinfo ); + } // }}} // {{{ getMode() diff --git a/vtlib/thirdparty/network/Request.php b/vtlib/thirdparty/network/Request.php index 1d46bd61d5903b7a541f6bb456a2ca3c486d3543..d25a390ffcd7c7f98b85c70e387a6c31cba2c97a 100644 --- a/vtlib/thirdparty/network/Request.php +++ b/vtlib/thirdparty/network/Request.php @@ -310,8 +310,7 @@ class HTTP_Request * </ul> * @access public */ - function HTTP_Request($url = '', $params = array()) - { + function __construct($url = '', $params = array()) { $this->_method = HTTP_REQUEST_METHOD_GET; $this->_http = HTTP_REQUEST_HTTP_VER_1_1; $this->_requestHeaders = array(); @@ -362,6 +361,10 @@ class HTTP_Request $this->addHeader('Accept-Encoding', 'gzip'); } } + function HTTP_Request($url = '', $params = array()) + { + self::__construct($url, $params); + } /** * Generates a Host header for HTTP/1.1 requests @@ -1196,11 +1199,14 @@ class HTTP_Response * @param Net_Socket socket to read the response from * @param array listeners attached to request */ - function HTTP_Response(&$sock, &$listeners) - { + function __construct(&$sock, &$listeners) { $this->_sock = $sock; $this->_listeners = $listeners; } + function HTTP_Response(&$sock, &$listeners) + { + self::__construct($sock, $listeners); + } /** diff --git a/vtlib/thirdparty/network/Request/Listener.php b/vtlib/thirdparty/network/Request/Listener.php index c9095ebc902891ce786bb2f3592c5e12b0352800..7e4f891c7f623541a87e3281311b57cff34aee09 100644 --- a/vtlib/thirdparty/network/Request/Listener.php +++ b/vtlib/thirdparty/network/Request/Listener.php @@ -67,9 +67,12 @@ class HTTP_Request_Listener * * @access public */ + function __construct() { + $this->_id = md5(uniqid('http_request_', 1)); + } function HTTP_Request_Listener() { - $this->_id = md5(uniqid('http_request_', 1)); + self::__construct(); }