Changeset 5829 in subversion

Timestamp:

Jan 27, 2012 4:56:11 AM (16 months ago)

Author:

alec

Message:

• Provide general get_user_id/get_user_name methods, removing dependency on rcube_user in some classes

Location:

branches/devel-framework/roundcubemail/program/include

Files:

• rcmail.php (modified) (1 diff)
• rcube_imap.php (modified) (1 diff)
• rcube_imap_cache.php (modified) (5 diffs)
• rcube_ldap.php (modified) (3 diffs)
• rcube_spellchecker.php (modified) (5 diffs)
• rcube_user.php (modified) (1 diff)

branches/devel-framework/roundcubemail/program/include/rcmail.php

@@ -2406 +2406 @@
     }
 
+
+    /**
+     * Getter for logged user ID.
+     *
+     * @return mixed User identifier
+     */
+    public function get_user_id()
+    {
+        if (is_object($this->user)) {
+            return $this->user->ID;
+        }
+    }
+
+
+    /**
+     * Getter for logged user name.
+     *
+     * @return string User name
+     */
+    public function get_user_name()
+    {
+        if (is_object($this->user)) {
+            return $this->user->get_username();
+        }
+    }
 }

branches/devel-framework/roundcubemail/program/include/rcube_imap.php

@@ -3606 +3606 @@
             if ($dbh = $rcmail->get_dbh()) {
                 $this->mcache = new rcube_imap_cache(
-                    $dbh, $this, $rcmail->user->ID, $this->options['skip_deleted']);
+                    $dbh, $this, $rcmail->get_user_id(), $this->options['skip_deleted']);
             }
         }

branches/devel-framework/roundcubemail/program/include/rcube_imap_cache.php

@@ -93 +93 @@
         $this->db           = $db;
         $this->imap         = $imap;
-        $this->userid       = (int)$userid;
+        $this->userid       = $userid;
         $this->skip_deleted = $skip_deleted;
     }
@@ -512 +512 @@
                 "DELETE FROM ".$this->db->table_name('cache_messages')
                 ." WHERE user_id = ?"
-                    ." AND mailbox = ".$this->db->quote($mailbox)
+                    ." AND mailbox = ?"
                     .($uids !== null ? " AND uid IN (".$this->db->array2list((array)$uids, 'integer').")" : ""),
-                $this->userid);
+                $this->userid, $mailbox);
         }
 
@@ -534 +534 @@
             $this->db->query(
                 "DELETE FROM ".$this->db->table_name('cache_index')
-                ." WHERE user_id = ".intval($this->userid)
-                    .(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : "")
+                ." WHERE user_id = ?"
+                    .(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : ""),
+                $this->userid
             );
         }
@@ -542 +543 @@
                 "UPDATE ".$this->db->table_name('cache_index')
                 ." SET valid = 0"
-                ." WHERE user_id = ".intval($this->userid)
-                    .(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : "")
+                ." WHERE user_id = ?"
+                    .(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : ""),
+                $this->userid
             );
         }
@@ -567 +569 @@
         $this->db->query(
             "DELETE FROM ".$this->db->table_name('cache_thread')
-            ." WHERE user_id = ".intval($this->userid)
-                .(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : "")
+            ." WHERE user_id = ?"
+                .(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : ""),
+            $this->userid
         );
 

branches/devel-framework/roundcubemail/program/include/rcube_ldap.php

@@ -64 +64 @@
     * Object constructor
     *
-    * @param array      LDAP connection properties
-    * @param boolean    Enables debug mode
-    * @param string     Current user mail domain name
-    * @param integer User-ID
+    * @param array       $p            LDAP connection properties
+    * @param boolean $debug        Enables debug mode
+    * @param string  $mail_domain  Current user mail domain name
     */
-    function __construct($p, $debug=false, $mail_domain=NULL)
+    function __construct($p, $debug = false, $mail_domain = null)
     {
         $this->prop = $p;
@@ -155 +154 @@
     private function _connect()
     {
-        global $RCMAIL;
+        $RCMAIL = rcmail::get_instance();
 
         if (!function_exists('ldap_connect'))
@@ -227 +226 @@
 
             // Get the pieces needed for variable replacement.
-            if ($fu = $RCMAIL->user->get_username())
+            if ($fu = $RCMAIL->get_user_name())
                 list($u, $d) = explode('@', $fu);
             else

branches/devel-framework/roundcubemail/program/include/rcube_spellchecker.php

@@ -533 +533 @@
     {
         if (strcasecmp($this->options['dictionary'], 'shared') != 0) {
-            $userid = (int) $this->rc->user->ID;
+            $userid = $this->rc->get_user_id();
         }
 
@@ -548 +548 @@
                     "UPDATE ".$this->rc->db->table_name('dictionary')
                     ." SET data = ?"
-                    ." WHERE user_id " . ($plugin['userid'] ? "= ".$plugin['userid'] : "IS NULL")
+                    ." WHERE user_id " . ($plugin['userid'] ? "= ".$this->rc->db->quote($plugin['userid']) : "IS NULL")
                         ." AND " . $this->rc->db->quoteIdentifier('language') . " = ?",
                     implode(' ', $plugin['dictionary']), $plugin['language']);
@@ -556 +556 @@
                 $this->rc->db->query(
                     "DELETE FROM " . $this->rc->db->table_name('dictionary')
-                    ." WHERE user_id " . ($plugin['userid'] ? "= ".$plugin['userid'] : "IS NULL")
+                    ." WHERE user_id " . ($plugin['userid'] ? "= ".$this->rc->db->quote($plugin['userid']) : "IS NULL")
                         ." AND " . $this->rc->db->quoteIdentifier('language') . " = ?",
                     $plugin['language']);
@@ -580 +580 @@
 
         if (strcasecmp($this->options['dictionary'], 'shared') != 0) {
-            $userid = (int) $this->rc->user->ID;
+            $userid = $this->rc->get_user_id();
         }
 
@@ -590 +590 @@
             $this->rc->db->query(
                 "SELECT data FROM ".$this->rc->db->table_name('dictionary')
-                ." WHERE user_id ". ($plugin['userid'] ? "= ".$plugin['userid'] : "IS NULL")
+                ." WHERE user_id ". ($plugin['userid'] ? "= ".$this->rc->db->quote($plugin['userid']) : "IS NULL")
                     ." AND " . $this->rc->db->quoteIdentifier('language') . " = ?",
                 $plugin['language']);

branches/devel-framework/roundcubemail/program/include/rcube_user.php

@@ -125 +125 @@
                 // Check last write attempt time, try to write again (every 5 minutes)
                 if ($_SESSION['preferences_time'] < time() - 5 * 60) {
-                    $saved_prefs = unserialize($_SESSION['preferences']);
+                    $saved_prefs = unserialize($_SESSION['preferences']);
                     $this->rc->session->remove('preferences');
-                    $this->rc->session->remove('preferences_time');
+                    $this->rc->session->remove('preferences_time');
                     $this->save_prefs($saved_prefs);
                 }