diff options
Diffstat (limited to 'program')
-rw-r--r-- | program/include/rcube_contacts.php | 10 | ||||
-rw-r--r-- | program/include/rcube_db.php | 11 | ||||
-rw-r--r-- | program/include/rcube_imap.php | 11 | ||||
-rw-r--r-- | program/include/rcube_ldap.php | 10 | ||||
-rw-r--r-- | program/include/rcube_mdb2.php | 11 | ||||
-rw-r--r-- | program/include/rcube_result_set.php | 5 | ||||
-rw-r--r-- | program/include/rcube_user.php | 12 | ||||
-rw-r--r-- | program/lib/utf8.class.php | 6 |
8 files changed, 1 insertions, 75 deletions
diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php index 0c0f932fc..811ec4cc3 100644 --- a/program/include/rcube_contacts.php +++ b/program/include/rcube_contacts.php @@ -58,16 +58,6 @@ class rcube_contacts $this->ready = $this->db && !$this->db->is_error(); } - /** - * PHP 4 object constructor - * - * @see rcube_contacts::__construct() - */ - function rcube_contacts($dbconn, $user) - { - $this->__construct($dbconn, $user); - } - /** * Set internal list page diff --git a/program/include/rcube_db.php b/program/include/rcube_db.php index 716e0d9bf..ee2789785 100644 --- a/program/include/rcube_db.php +++ b/program/include/rcube_db.php @@ -69,17 +69,6 @@ class rcube_db /** - * PHP 4 object constructor - * - * @see rcube_db::__construct - */ - function rcube_db($db_dsnw, $db_dsnr='', $pconn=false) - { - $this->__construct($db_dsnw, $db_dsnr, $pconn); - } - - - /** * Connect to specific database * * @param string DSN for DB connections diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index 95f7d8b7a..922b15ec1 100644 --- a/program/include/rcube_imap.php +++ b/program/include/rcube_imap.php @@ -81,17 +81,6 @@ class rcube_imap /** - * PHP 4 object constructor - * - * @see rcube_imap::__construct - */ - function rcube_imap($db_conn) - { - $this->__construct($db_conn); - } - - - /** * Connect to an IMAP server * * @param string Host to connect diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php index 78642db36..929634e5e 100644 --- a/program/include/rcube_ldap.php +++ b/program/include/rcube_ldap.php @@ -62,16 +62,6 @@ class rcube_ldap $this->connect(); } - /** - * PHP 4 object constructor - * - * @see rcube_ldap::__construct() - */ - function rcube_ldap($p) - { - $this->__construct($p); - } - /** * Establish a connection to the LDAP server diff --git a/program/include/rcube_mdb2.php b/program/include/rcube_mdb2.php index 0adb6e293..0588256e7 100644 --- a/program/include/rcube_mdb2.php +++ b/program/include/rcube_mdb2.php @@ -69,17 +69,6 @@ class rcube_mdb2 /** - * PHP 4 object constructor - * - * @see rcube_mdb2::__construct - */ - function rcube_db($db_dsnw,$db_dsnr='') - { - $this->__construct($db_dsnw,$db_dsnr); - } - - - /** * Connect to specific database * * @param string DSN for DB connections diff --git a/program/include/rcube_result_set.php b/program/include/rcube_result_set.php index 7e968cd2b..b3afe694c 100644 --- a/program/include/rcube_result_set.php +++ b/program/include/rcube_result_set.php @@ -39,11 +39,6 @@ class rcube_result_set $this->first = (int)$f; } - function rcube_result_set($c=0, $f=0) - { - $this->__construct($c, $f); - } - function add($rec) { $this->records[] = $rec; diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php index 1d070854a..a5dc73bca 100644 --- a/program/include/rcube_user.php +++ b/program/include/rcube_user.php @@ -59,17 +59,7 @@ class rcube_user } } - /** - * PHP 4 object constructor - * - * @see rcube_user::__construct - */ - function rcube_user($id = null, $sql_arr = null) - { - $this->__construct($id, $sql_arr); - } - - + /** * Build a user name string (as e-mail address) * diff --git a/program/lib/utf8.class.php b/program/lib/utf8.class.php index 3371c25a8..cd5be8395 100644 --- a/program/lib/utf8.class.php +++ b/program/lib/utf8.class.php @@ -68,16 +68,10 @@ Class utf8{ var $ascMap = array(); var $utfMap = array(); - // made PHP5 capable by RoundCube function __construct($charset="ISO-8859-1"){ $this->loadCharset($charset); } - //Constructor - function utf8($charset="ISO-8859-1"){ - $this->__construct($charset); - } - //Load charset function loadCharset($charset){ global $utf8_maps; |