[Svn] r1664 - in trunk/roundcubemail/program: include lib

[trac at roundcube.net]

Author: alec
Date: 2008-08-21 06:59:45 +0000 (Thu, 21 Aug 2008)
New Revision: 1664

Modified:
   trunk/roundcubemail/program/include/rcube_contacts.php
   trunk/roundcubemail/program/include/rcube_db.php
   trunk/roundcubemail/program/include/rcube_imap.php
   trunk/roundcubemail/program/include/rcube_ldap.php
   trunk/roundcubemail/program/include/rcube_mdb2.php
   trunk/roundcubemail/program/include/rcube_result_set.php
   trunk/roundcubemail/program/include/rcube_user.php
   trunk/roundcubemail/program/lib/utf8.class.php
Log:
- removed PHP4 class constructors


Modified: trunk/roundcubemail/program/include/rcube_contacts.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_contacts.php	2008-08-21 06:19:10 UTC (rev 1663)
+++ trunk/roundcubemail/program/include/rcube_contacts.php	2008-08-21 06:59:45 UTC (rev 1664)
@@ -58,17 +58,7 @@
     $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
    *

Modified: trunk/roundcubemail/program/include/rcube_db.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_db.php	2008-08-21 06:19:10 UTC (rev 1663)
+++ trunk/roundcubemail/program/include/rcube_db.php	2008-08-21 06:59:45 UTC (rev 1664)
@@ -69,17 +69,6 @@
 
 
   /**
-   * 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

Modified: trunk/roundcubemail/program/include/rcube_imap.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_imap.php	2008-08-21 06:19:10 UTC (rev 1663)
+++ trunk/roundcubemail/program/include/rcube_imap.php	2008-08-21 06:59:45 UTC (rev 1664)
@@ -81,17 +81,6 @@
 
 
   /**
-   * 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

Modified: trunk/roundcubemail/program/include/rcube_ldap.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_ldap.php	2008-08-21 06:19:10 UTC (rev 1663)
+++ trunk/roundcubemail/program/include/rcube_ldap.php	2008-08-21 06:59:45 UTC (rev 1664)
@@ -62,16 +62,6 @@
     $this->connect();
   }
 
-  /**
-   * PHP 4 object constructor
-   *
-   * @see  rcube_ldap::__construct()
-   */
-  function rcube_ldap($p)
-  {
-    $this->__construct($p);
-  }
-  
 
   /**
    * Establish a connection to the LDAP server

Modified: trunk/roundcubemail/program/include/rcube_mdb2.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_mdb2.php	2008-08-21 06:19:10 UTC (rev 1663)
+++ trunk/roundcubemail/program/include/rcube_mdb2.php	2008-08-21 06:59:45 UTC (rev 1664)
@@ -69,17 +69,6 @@
 
 
   /**
-   * 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

Modified: trunk/roundcubemail/program/include/rcube_result_set.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_result_set.php	2008-08-21 06:19:10 UTC (rev 1663)
+++ trunk/roundcubemail/program/include/rcube_result_set.php	2008-08-21 06:59:45 UTC (rev 1664)
@@ -39,11 +39,6 @@
     $this->first = (int)$f;
   }
   
-  function rcube_result_set($c=0, $f=0)
-  {
-    $this->__construct($c, $f);
-  }
-  
   function add($rec)
   {
     $this->records[] = $rec;

Modified: trunk/roundcubemail/program/include/rcube_user.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_user.php	2008-08-21 06:19:10 UTC (rev 1663)
+++ trunk/roundcubemail/program/include/rcube_user.php	2008-08-21 06:59:45 UTC (rev 1664)
@@ -59,18 +59,8 @@
     }
   }
 
+
   /**
-   * 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)
    *
    * @return string Full user name

Modified: trunk/roundcubemail/program/lib/utf8.class.php
===================================================================
--- trunk/roundcubemail/program/lib/utf8.class.php	2008-08-21 06:19:10 UTC (rev 1663)
+++ trunk/roundcubemail/program/lib/utf8.class.php	2008-08-21 06:59:45 UTC (rev 1664)
@@ -68,16 +68,10 @@
   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;

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn