Changeset 5822 in subversion

Timestamp:

Jan 25, 2012 2:19:14 PM (16 months ago)

Author:

alec

Message:

• Remove deprecated functions usage, some improvements

Location:

branches/devel-framework/roundcubemail

Files:

• index.php (modified) (10 diffs)
• program/include/html.php (modified) (3 diffs)
• program/include/main.inc (modified) (1 diff)
• program/include/rcmail.php (modified) (21 diffs)
• program/include/rcube_addressbook.php (modified) (1 diff)
• program/include/rcube_cache.php (modified) (6 diffs)
• program/include/rcube_config.php (modified) (2 diffs)
• program/include/rcube_contacts.php (modified) (19 diffs)
• program/include/rcube_html_page.php (modified) (2 diffs)
• program/include/rcube_imap.php (modified) (7 diffs)
• program/include/rcube_imap_cache.php (modified) (18 diffs)
• program/include/rcube_json_output.php (modified) (9 diffs)
• program/include/rcube_ldap.php (modified) (2 diffs)
• program/include/rcube_mdb2.php (modified) (2 diffs)
• program/include/rcube_message.php (modified) (4 diffs)
• program/include/rcube_mime.php (modified) (6 diffs)
• program/include/rcube_session.php (modified) (7 diffs)
• program/include/rcube_shared.inc (modified) (1 diff)
• program/include/rcube_smtp.php (modified) (2 diffs)
• program/include/rcube_spellchecker.php (modified) (4 diffs)
• program/include/rcube_sqlite.inc (modified) (1 diff)
• program/include/rcube_storage.php (modified) (1 diff)
• program/include/rcube_string_replacer.php (modified) (2 diffs)
• program/include/rcube_template.php (modified) (23 diffs)
• program/include/rcube_ui.php (modified) (15 diffs)
• program/include/rcube_user.php (modified) (15 diffs)
• program/include/rcube_vcard.php (modified) (2 diffs)

branches/devel-framework/roundcubemail/index.php

@@ -35 +35 @@
 
 // Make the whole PHP output non-cacheable (#1487797)
-send_nocacheing_headers();
+rcube_ui::send_nocacheing_headers();
 
 // turn on output buffering
@@ -57 +57 @@
 
 // error steps
-if ($RCMAIL->action=='error' && !empty($_GET['_code'])) {
+if ($RCMAIL->action == 'error' && !empty($_GET['_code'])) {
   raise_error(array('code' => hexdec($_GET['_code'])), FALSE, TRUE);
 }
@@ -64 +64 @@
 if (empty($_SESSION['user_id']) && ($force_https = $RCMAIL->config->get('force_https', false))) {
   $https_port = is_bool($force_https) ? 443 : $force_https;
-  if (!rcube_https_check($https_port)) {
+  if (!rcube__ui::https_check($https_port)) {
     $host  = preg_replace('/:[0-9]+$/', '', $_SERVER['HTTP_HOST']);
     $host .= ($https_port != 443 ? ':' . $https_port : '');
@@ -79 +79 @@
 // try to log in
 if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
-  $request_valid = $_SESSION['temp'] && $RCMAIL->check_request(RCUBE_INPUT_POST, 'login');
+  $request_valid = $_SESSION['temp'] && $RCMAIL->check_request(rcube_ui::INPUT_POST, 'login');
 
   // purge the session in case of new login when a session already exists 
@@ -86 +86 @@
   $auth = $RCMAIL->plugins->exec_hook('authenticate', array(
     'host' => $RCMAIL->autoselect_host(),
-    'user' => trim(get_input_value('_user', RCUBE_INPUT_POST)),
-    'pass' => get_input_value('_pass', RCUBE_INPUT_POST, true,
+    'user' => trim(rcube_ui::get_input_value('_user', rcube_ui::INPUT_POST)),
+    'pass' => rcube_ui::get_input_value('_pass', rcube_ui::INPUT_POST, true,
        $RCMAIL->config->get('password_charset', 'ISO-8859-1')),
     'cookiecheck' => true,
@@ -109 +109 @@
 
     // log successful login
-    rcmail_log_login();
+    $RCMAIL->log_login();
 
     // restore original request parameters
     $query = array();
-    if ($url = get_input_value('_url', RCUBE_INPUT_POST)) {
+    if ($url = rcube_ui::get_input_value('_url', rcube_ui::INPUT_POST)) {
       parse_str($url, $query);
 
@@ -139 +139 @@
 
 // end session (after optional referer check)
-else if ($RCMAIL->task == 'logout' && isset($_SESSION['user_id']) && (!$RCMAIL->config->get('referer_check') || rcube_check_referer())) {
+else if ($RCMAIL->task == 'logout' && isset($_SESSION['user_id']) && (!$RCMAIL->config->get('referer_check') || rcmail::check_referer())) {
   $userdata = array(
     'user' => $_SESSION['username'],
@@ -162 +162 @@
 if (empty($RCMAIL->user->ID)) {
   // log session failures
-  if (($task = get_input_value('_task', RCUBE_INPUT_GPC)) && !in_array($task, array('login','logout')) && !$session_error && ($sess_id = $_COOKIE[ini_get('session.name')])) {
+  $task = rcube_ui::get_input_value('_task', rcube_ui::INPUT_GPC);
+  if ($task && !in_array($task, array('login','logout')) && !$session_error && ($sess_id = $_COOKIE[ini_get('session.name')])) {
     $RCMAIL->session->log("Aborted session " . $sess_id . "; no valid session data found");
     $session_error = true;
@@ -198 +199 @@
   // check client X-header to verify request origin
   if ($OUTPUT->ajax_call) {
-    if (rc_request_header('X-Roundcube-Request') != $RCMAIL->get_request_token() && !$RCMAIL->config->get('devel_mode')) {
+    if (rcube_request_header('X-Roundcube-Request') != $RCMAIL->get_request_token() && !$RCMAIL->config->get('devel_mode')) {
       header('HTTP/1.1 403 Forbidden');
       die("Invalid Request");
@@ -210 +211 @@
 
   // check referer if configured
-  if (!$request_check_whitelist[$RCMAIL->action] && $RCMAIL->config->get('referer_check') && !rcube_check_referer()) {
+  if (!$request_check_whitelist[$RCMAIL->action] && $RCMAIL->config->get('referer_check') && !rcmail::check_referer()) {
     raise_error(array(
       'code' => 403,

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

@@ -296 +296 @@
             }
             else if ($key=='value') {
-                $attrib_arr[] = $key . '="' . Q($value, 'strict', false) . '"';
+                $attrib_arr[] = $key . '="' . rcube_ui::Q($value, 'strict', false) . '"';
             }
             else {
-                $attrib_arr[] = $key . '="' . Q($value) . '"';
+                $attrib_arr[] = $key . '="' . rcube_ui::Q($value) . '"';
             }
         }
@@ -541 +541 @@
 
         if (!empty($value) && !preg_match('/mce_editor/', $this->attrib['class'])) {
-            $value = Q($value, 'strict', false);
+            $value = rcube_ui::Q($value, 'strict', false);
         }
 
@@ -615 +615 @@
                   in_array($option['text'], $select, true)) ? 1 : null);
 
-            $this->content .= self::tag('option', $attr, Q($option['text']));
+            $this->content .= self::tag('option', $attr, rcube_ui::Q($option['text']));
         }
         return parent::show();

branches/devel-framework/roundcubemail/program/include/main.inc

@@ -334 +334 @@
 function rc_wordwrap($string, $width=75, $break="\n", $cut=false)
 {
-    return rcube_wordwrap($string, $width, $break, $cut);
+    return rcube_mime::wordwrap($string, $width, $break, $cut);
 }
 

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

@@ -183 +183 @@
 
     // set task and action properties
-    $this->set_task(get_input_value('_task', RCUBE_INPUT_GPC));
-    $this->action = asciiwords(get_input_value('_action', RCUBE_INPUT_GPC));
+    $this->set_task(rcube_ui::get_input_value('_task', rcube_ui::INPUT_GPC));
+    $this->action = asciiwords(rcube_ui::get_input_value('_action', rcube_ui::INPUT_GPC));
 
     // reset some session parameters when changing task
@@ -336 +336 @@
       $this->memcache = new Memcache;
       $this->mc_available = 0;
-      
+
       // add alll configured hosts to pool
       $pconnect = $this->config->get('memcache_pconnect', true);
@@ -344 +344 @@
         $this->mc_available += intval($this->memcache->addServer($host, $port, $pconnect, 1, 1, 15, false, array($this, 'memcache_failure')));
       }
-      
+
       // test connection and failover (will result in $this->mc_available == 0 on complete failure)
       $this->memcache->increment('__CONNECTIONTEST__', 1);  // NOP if key doesn't exist
@@ -354 +354 @@
     return $this->memcache;
   }
-  
+
+
   /**
    * Callback for memcache failure
@@ -361 +362 @@
   {
     static $seen = array();
-    
+
     // only report once
     if (!$seen["$host:$port"]++) {
@@ -477 +478 @@
       $list['0'] = array(
         'id'       => '0',
-        'name'     => rcube_label('personaladrbook'),
+        'name'     => $this->gettext('personaladrbook'),
         'groups'   => $this->address_books['0']->groups,
         'readonly' => $this->address_books['0']->readonly,
@@ -747 +748 @@
     }
 
-    ini_set('session.cookie_secure', rcube_https_check());
+    ini_set('session.cookie_secure', rcube_ui::https_check());
     ini_set('session.name', $sess_name ? $sess_name : 'roundcube_sessid');
     ini_set('session.use_cookies', 1);
@@ -829 +830 @@
         return false;
       }
-    else if (!empty($config['default_host']) && $host != rcube_parse_host($config['default_host']))
+    else if (!empty($config['default_host']) && $host != self::parse_host($config['default_host']))
       return false;
 
@@ -853 +854 @@
     if (!empty($config['username_domain']) && strpos($username, '@') === false) {
       if (is_array($config['username_domain']) && isset($config['username_domain'][$host]))
-        $username .= '@'.rcube_parse_host($config['username_domain'][$host], $host);
+        $username .= '@'.self::parse_host($config['username_domain'][$host], $host);
       else if (is_string($config['username_domain']))
-        $username .= '@'.rcube_parse_host($config['username_domain'], $host);
+        $username .= '@'.self::parse_host($config['username_domain'], $host);
     }
 
@@ -1003 +1004 @@
 
     if (is_array($default_host)) {
-      $post_host = get_input_value('_host', RCUBE_INPUT_POST);
+      $post_host = rcube_ui::get_input_value('_host', rcube_ui::INPUT_POST);
 
       // direct match in default_host array
@@ -1011 +1012 @@
 
       // try to select host by mail domain
-      list($user, $domain) = explode('@', get_input_value('_user', RCUBE_INPUT_POST));
+      list($user, $domain) = explode('@', rcube_ui::get_input_value('_user', rcube_ui::INPUT_POST));
       if (!empty($domain)) {
         foreach ($default_host as $storage_host => $mail_domains) {
@@ -1027 +1028 @@
     }
     else if (empty($default_host)) {
-      $host = get_input_value('_host', RCUBE_INPUT_POST);
+      $host = rcube_ui::get_input_value('_host', rcube_ui::INPUT_POST);
     }
     else
-      $host = rcube_parse_host($default_host);
+      $host = self::parse_host($default_host);
 
     return $host;
@@ -1274 +1275 @@
     if ($this->config->get('devel_mode')) {
       if (function_exists('memory_get_usage'))
-        $mem = show_bytes(memory_get_usage());
+        $mem = rcube_ui::show_bytes(memory_get_usage());
       if (function_exists('memory_get_peak_usage'))
-        $mem .= '/'.show_bytes(memory_get_peak_usage());
+        $mem .= '/'.rcube_ui::show_bytes(memory_get_peak_usage());
 
       $log = $this->task . ($this->action ? '/'.$this->action : '') . ($mem ? " [$mem]" : '');
       if (defined('RCMAIL_START'))
-        rcube_print_time(RCMAIL_START, $log);
+        self::print_timer(RCMAIL_START, $log);
       else
-        console($log);
+        self::console($log);
     }
   }
@@ -1320 +1321 @@
    * @return boolean True if request token is valid false if not
    */
-  public function check_request($mode = RCUBE_INPUT_POST)
-  {
-    $token = get_input_value('_token', $mode);
+  public function check_request($mode = rcube_ui::INPUT_POST)
+  {
+    $token = rcube_ui::get_input_value('_token', $mode);
     $sess_id = $_COOKIE[ini_get('session.name')];
     return !empty($sess_id) && $token == $this->get_request_token();
@@ -1623 +1624 @@
 
     setcookie($name, $value, $exp, $cookie['path'], $cookie['domain'],
-      rcube_https_check(), true);
+      rcube_ui::https_check(), true);
   }
 
@@ -1896 +1897 @@
 
             if ($this->config->get('smtp_log')) {
-                write_log('sendmail', sprintf("User %s [%s]; Message for %s; %s",
+                self::write_log('sendmail', sprintf("User %s [%s]; Message for %s; %s",
                     $this->user->get_username(),
                     $_SERVER['REMOTE_ADDR'],
@@ -1979 +1980 @@
         // %s - domain name after the '@' from e-mail address provided at login screen. Returns FALSE if an invalid email is provided
         if (strpos($name, '%s') !== false) {
-            $user_email = rcube_idn_convert(get_input_value('_user', RCUBE_INPUT_POST), true);
+            $user_email = rcube_ui::get_input_value('_user', rcube_ui::INPUT_POST);
+            $user_email = rcube_idn_convert($user_email, true);
             $matches    = preg_match('/(.*)@([a-z0-9\.\-\[\]\:]+)/i', $user_email, $s);
             if ($matches < 1 || filter_var($s[1]."@".$s[2], FILTER_VALIDATE_EMAIL) === false) {
@@ -2104 +2106 @@
         }
 
-        write_log('console', join(";\n", $msg));
+        self::write_log('console', join(";\n", $msg));
     }
 
@@ -2181 +2183 @@
         }
 
-        $this->write_log('userlogins',
+        self::write_log('userlogins',
             sprintf('Successful login for %s (ID: %d) from %s in session %s',
                 $this->user->get_username(),
-                $this->user->ID, $this->remote_ip(), session_id()));
+                $this->user->ID, self::remote_ip(), session_id()));
     }
 
@@ -2252 +2254 @@
 
         $print_count++;
-        $now = rcube_timer();
-        $diff = $now-$timer;
+        $now  = self::timer();
+        $diff = $now - $timer;
 
         if (empty($label)) {
@@ -2299 +2301 @@
         $ts = get_offset_time($this->config->get('message_cache_lifetime', '30d'), -1);
 
-        $db->query("DELETE FROM ".get_table_name('cache_messages')
+        $db->query("DELETE FROM " . $db->table_name('cache_messages')
             ." WHERE changed < " . $db->fromunixtime($ts));
 
-        $db->query("DELETE FROM ".get_table_name('cache_index')
+        $db->query("DELETE FROM " . $db->table_name('cache_index')
             ." WHERE changed < " . $db->fromunixtime($ts));
 
-        $db->query("DELETE FROM ".get_table_name('cache_thread')
+        $db->query("DELETE FROM " . $db->table_name('cache_thread')
             ." WHERE changed < " . $db->fromunixtime($ts));
 
-        $db->query("DELETE FROM ".get_table_name('cache')
+        $db->query("DELETE FROM " . $db->table_name('cache')
             ." WHERE created < " . $db->fromunixtime($ts));
     }

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

@@ -192 +192 @@
     public function validate(&$save_data, $autofix = false)
     {
+        $rcmail = rcmail::get_instance();
+
         // check validity of email addresses
         foreach ($this->get_col_values('email', $save_data, true) as $email) {
             if (strlen($email)) {
-                if (!check_email(rcube_idn_to_ascii($email))) {
-                    $this->set_error(self::ERROR_VALIDATE, rcube_label(array('name' => 'emailformaterror', 'vars' => array('email' => $email))));
+                if (!$rcmail->check_email(rcube_idn_to_ascii($email))) {
+                    $error = $rcmail->gettext(array('name' => 'emailformaterror', 'vars' => array('email' => $email)));
+                    $this->set_error(self::ERROR_VALIDATE, $error);
                     return false;
                 }

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

@@ -195 +195 @@
         if ($this->type == 'db' && $this->db) {
             $this->db->query(
-                "DELETE FROM ".get_table_name('cache').
+                "DELETE FROM ".$this->db->table_name('cache').
                 " WHERE user_id = ?".
                 " AND cache_key LIKE ?".
@@ -272 +272 @@
             $sql_result = $this->db->limitquery(
                 "SELECT cache_id, data, cache_key".
-                " FROM ".get_table_name('cache').
+                " FROM ".$this->db->table_name('cache').
                 " WHERE user_id = ?".
                 " AND cache_key = ?".
@@ -328 +328 @@
         if ($data == 'N;') {
             $this->db->query(
-                "DELETE FROM ".get_table_name('cache').
+                "DELETE FROM ".$this->db->table_name('cache').
                 " WHERE user_id = ?".
                 " AND cache_key = ?",
@@ -339 +339 @@
         if ($key_exists) {
             $result = $this->db->query(
-                "UPDATE ".get_table_name('cache').
+                "UPDATE ".$this->db->table_name('cache').
                 " SET created = ". $this->db->now().", data = ?".
                 " WHERE user_id = ?".
@@ -350 +350 @@
             // so, no need to check if record exist (see rcube_cache::read_record())
             $result = $this->db->query(
-                "INSERT INTO ".get_table_name('cache').
+                "INSERT INTO ".$this->db->table_name('cache').
                 " (created, user_id, cache_key, data)".
                 " VALUES (".$this->db->now().", ?, ?, ?)",
@@ -414 +414 @@
 
         $this->db->query(
-            "DELETE FROM ".get_table_name('cache').
+            "DELETE FROM ".$this->db->table_name('cache').
             " WHERE user_id = ?" . $where,
             $this->userid);

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

@@ -71 +71 @@
         // fix default imap folders encoding
         foreach (array('drafts_mbox', 'junk_mbox', 'sent_mbox', 'trash_mbox') as $folder)
-            $this->prop[$folder] = rcube_charset_convert($this->prop[$folder], RCMAIL_CHARSET, 'UTF7-IMAP');
+            $this->prop[$folder] = rcube_charset::convert($this->prop[$folder], RCMAIL_CHARSET, 'UTF7-IMAP');
 
         if (!empty($this->prop['default_folders']))
             foreach ($this->prop['default_folders'] as $n => $folder)
-                $this->prop['default_folders'][$n] = rcube_charset_convert($folder, RCMAIL_CHARSET, 'UTF7-IMAP');
+                $this->prop['default_folders'][$n] = rcube_charset::convert($folder, RCMAIL_CHARSET, 'UTF7-IMAP');
 
         // set PHP error logging according to config
@@ -347 +347 @@
         }
         else if (!empty($this->prop['mail_domain']))
-            $domain = rcube_parse_host($this->prop['mail_domain']);
+            $domain = rcmail::parse_host($this->prop['mail_domain']);
 
         if ($encode)

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

@@ -150 +150 @@
 
         $sql_result = $this->db->query(
-            "SELECT * FROM ".get_table_name($this->db_groups).
+            "SELECT * FROM ".$this->db->table_name($this->db_groups).
             " WHERE del<>1".
             " AND user_id=?".
@@ -175 +175 @@
     {
         $sql_result = $this->db->query(
-            "SELECT * FROM ".get_table_name($this->db_groups).
+            "SELECT * FROM ".$this->db->table_name($this->db_groups).
             " WHERE del<>1".
             " AND contactgroup_id=?".
@@ -211 +211 @@
 
         if ($this->group_id)
-            $join = " LEFT JOIN ".get_table_name($this->db_groupmembers)." AS m".
+            $join = " LEFT JOIN ".$this->db->table_name($this->db_groupmembers)." AS m".
                 " ON (m.contact_id = c.".$this->primary_key.")";
 
         $sql_result = $this->db->limitquery(
-            "SELECT * FROM ".get_table_name($this->db_name)." AS c" .
+            "SELECT * FROM ".$this->db->table_name($this->db_name)." AS c" .
             $join .
             " WHERE c.del<>1" .
@@ -481 +481 @@
     {
         if ($this->group_id)
-            $join = " LEFT JOIN ".get_table_name($this->db_groupmembers)." AS m".
+            $join = " LEFT JOIN ".$this->db->table_name($this->db_groupmembers)." AS m".
                 " ON (m.contact_id=c.".$this->primary_key.")";
 
@@ -487 +487 @@
         $sql_result = $this->db->query(
             "SELECT COUNT(c.contact_id) AS rows".
-            " FROM ".get_table_name($this->db_name)." AS c".
+            " FROM ".$this->db->table_name($this->db_name)." AS c".
                 $join.
             " WHERE c.del<>1".
@@ -529 +529 @@
 
         $this->db->query(
-            "SELECT * FROM ".get_table_name($this->db_name).
+            "SELECT * FROM ".$this->db->table_name($this->db_name).
             " WHERE contact_id=?".
                 " AND user_id=?".
@@ -561 +561 @@
 
       $sql_result = $this->db->query(
-        "SELECT cgm.contactgroup_id, cg.name FROM " . get_table_name($this->db_groupmembers) . " AS cgm" .
-        " LEFT JOIN " . get_table_name($this->db_groups) . " AS cg ON (cgm.contactgroup_id = cg.contactgroup_id AND cg.del<>1)" .
+        "SELECT cgm.contactgroup_id, cg.name FROM " . $this->db->table_name($this->db_groupmembers) . " AS cgm" .
+        " LEFT JOIN " . $this->db->table_name($this->db_groups) . " AS cg ON (cgm.contactgroup_id = cg.contactgroup_id AND cg.del<>1)" .
         " WHERE cgm.contact_id=?",
         $id
@@ -631 +631 @@
         if (!$existing->count && !empty($a_insert_cols)) {
             $this->db->query(
-                "INSERT INTO ".get_table_name($this->db_name).
+                "INSERT INTO ".$this->db->table_name($this->db_name).
                 " (user_id, changed, del, ".join(', ', $a_insert_cols).")".
                 " VALUES (".intval($this->user_id).", ".$this->db->now().", 0, ".join(', ', $a_insert_values).")"
@@ -669 +669 @@
         if (!empty($write_sql)) {
             $this->db->query(
-                "UPDATE ".get_table_name($this->db_name).
+                "UPDATE ".$this->db->table_name($this->db_name).
                 " SET changed=".$this->db->now().", ".join(', ', $write_sql).
                 " WHERE contact_id=?".
@@ -765 +765 @@
         // flag record as deleted (always)
         $this->db->query(
-            "UPDATE ".get_table_name($this->db_name).
+            "UPDATE ".$this->db->table_name($this->db_name).
             " SET del=1, changed=".$this->db->now().
             " WHERE user_id=?".
@@ -792 +792 @@
         // clear deleted flag
         $this->db->query(
-            "UPDATE ".get_table_name($this->db_name).
+            "UPDATE ".$this->db->table_name($this->db_name).
             " SET del=0, changed=".$this->db->now().
             " WHERE user_id=?".
@@ -812 +812 @@
         $this->cache = null;
 
-        $this->db->query("UPDATE ".get_table_name($this->db_name).
+        $this->db->query("UPDATE ".$this->db->table_name($this->db_name).
             " SET del=1, changed=".$this->db->now().
             " WHERE user_id = ?", $this->user_id);
@@ -834 +834 @@
 
         $this->db->query(
-            "INSERT INTO ".get_table_name($this->db_groups).
+            "INSERT INTO ".$this->db->table_name($this->db_groups).
             " (user_id, changed, name)".
             " VALUES (".intval($this->user_id).", ".$this->db->now().", ".$this->db->quote($name).")"
@@ -856 +856 @@
         // flag group record as deleted
         $sql_result = $this->db->query(
-            "UPDATE ".get_table_name($this->db_groups).
+            "UPDATE ".$this->db->table_name($this->db_groups).
             " SET del=1, changed=".$this->db->now().
             " WHERE contactgroup_id=?".
@@ -882 +882 @@
 
         $sql_result = $this->db->query(
-            "UPDATE ".get_table_name($this->db_groups).
+            "UPDATE ".$this->db->table_name($this->db_groups).
             " SET name=?, changed=".$this->db->now().
             " WHERE contactgroup_id=?".
@@ -910 +910 @@
         // get existing assignments ...
         $sql_result = $this->db->query(
-            "SELECT contact_id FROM ".get_table_name($this->db_groupmembers).
+            "SELECT contact_id FROM ".$this->db->table_name($this->db_groupmembers).
             " WHERE contactgroup_id=?".
                 " AND contact_id IN (".$this->db->array2list($ids, 'integer').")",
@@ -923 +923 @@
         foreach ($ids as $contact_id) {
             $this->db->query(
-                "INSERT INTO ".get_table_name($this->db_groupmembers).
+                "INSERT INTO ".$this->db->table_name($this->db_groupmembers).
                 " (contactgroup_id, contact_id, created)".
                 " VALUES (?, ?, ".$this->db->now().")",
@@ -953 +953 @@
 
         $sql_result = $this->db->query(
-            "DELETE FROM ".get_table_name($this->db_groupmembers).
+            "DELETE FROM ".$this->db->table_name($this->db_groupmembers).
             " WHERE contactgroup_id=?".
                 " AND contact_id IN ($ids)",
@@ -976 +976 @@
         do {
             $sql_result = $this->db->query(
-                "SELECT 1 FROM ".get_table_name($this->db_groups).
+                "SELECT 1 FROM ".$this->db->table_name($this->db_groups).
                 " WHERE del<>1".
                     " AND user_id=?".

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

@@ -181 +181 @@
 
         // replace specialchars in content
-        $page_title  = Q($this->title, 'show', FALSE);
+        $page_title  = rcube_ui::Q($this->title, 'show', FALSE);
         $page_header = '';
         $page_footer = '';
@@ -288 +288 @@
         if (!$hook['abort']) {
             if ($this->charset != RCMAIL_CHARSET) {
-                echo rcube_charset_convert($hook['content'], RCMAIL_CHARSET, $this->charset);
+                echo rcube_charset::convert($hook['content'], RCMAIL_CHARSET, $this->charset);
             }
             else {

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

@@ -183 +183 @@
             if ($pass && $user) {
                 $message = sprintf("Login failed for %s from %s. %s",
-                    $user, rcmail_remote_ip(), $this->conn->error);
+                    $user, rcmail::rcmail_remote_ip(), $this->conn->error);
 
                 raise_error(array('code' => 403, 'type' => 'imap',
@@ -1452 +1452 @@
                 $string_offset = $m[1] + strlen($m[0]) + 4; // {}\r\n
                 $string = substr($str, $string_offset - 1, $m[0]);
-                $string = rcube_charset_convert($string, $charset, $dest_charset);
+                $string = rcube_charset::convert($string, $charset, $dest_charset);
                 if ($string === false) {
                     continue;
@@ -1944 +1944 @@
             }
             else {
-                $charset = rc_detect_encoding($filename_mime, $this->default_charset);
+                $charset = rcube_charset::detect($filename_mime, $this->default_charset);
             }
 
@@ -1956 +1956 @@
             }
 
-            $part->filename = rcube_charset_convert(urldecode($filename_encoded), $filename_charset);
+            $part->filename = rcube_charset::convert(urldecode($filename_encoded), $filename_charset);
         }
     }
@@ -2035 +2035 @@
                     }
                 }
-                $body = rcube_charset_convert($body, $o_part->charset);
+                $body = rcube_charset::convert($body, $o_part->charset);
             }
         }
@@ -3670 +3670 @@
             }
             else {
-                $folders[$folder] = rcube_charset_convert($folder, 'UTF7-IMAP');
+                $folders[$folder] = rcube_charset::convert($folder, 'UTF7-IMAP');
             }
         }
@@ -3830 +3830 @@
     public function debug_handler(&$imap, $message)
     {
-        write_log('imap', $message);
+        rcmail::write_log('imap', $message);
     }
 

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

@@ -299 +299 @@
         $sql_result = $this->db->query(
             "SELECT uid, data, flags"
-            ." FROM ".get_table_name('cache_messages')
+            ." FROM ".$this->db->table_name('cache_messages')
             ." WHERE user_id = ?"
                 ." AND mailbox = ?"
@@ -359 +359 @@
         $sql_result = $this->db->query(
             "SELECT flags, data"
-            ." FROM ".get_table_name('cache_messages')
+            ." FROM ".$this->db->table_name('cache_messages')
             ." WHERE user_id = ?"
                 ." AND mailbox = ?"
@@ -427 +427 @@
         if (!$force) {
             $res = $this->db->query(
-                "UPDATE ".get_table_name('cache_messages')
+                "UPDATE ".$this->db->table_name('cache_messages')
                 ." SET flags = ?, data = ?, changed = ".$this->db->now()
                 ." WHERE user_id = ?"
@@ -441 +441 @@
         // insert new record
         $this->db->query(
-            "INSERT INTO ".get_table_name('cache_messages')
+            "INSERT INTO ".$this->db->table_name('cache_messages')
             ." (user_id, mailbox, uid, flags, changed, data)"
             ." VALUES (?, ?, ?, ?, ".$this->db->now().", ?)",
@@ -476 +476 @@
 
         $this->db->query(
-            "UPDATE ".get_table_name('cache_messages')
+            "UPDATE ".$this->db->table_name('cache_messages')
             ." SET changed = ".$this->db->now()
             .", flags = flags ".($enabled ? "+ $idx" : "- $idx")
@@ -497 +497 @@
         if (!strlen($mailbox)) {
             $this->db->query(
-                "DELETE FROM ".get_table_name('cache_messages')
+                "DELETE FROM ".$this->db->table_name('cache_messages')
                 ." WHERE user_id = ?",
                 $this->userid);
@@ -510 +510 @@
 
             $this->db->query(
-                "DELETE FROM ".get_table_name('cache_messages')
+                "DELETE FROM ".$this->db->table_name('cache_messages')
                 ." WHERE user_id = ?"
                     ." AND mailbox = ".$this->db->quote($mailbox)
@@ -533 +533 @@
         if ($remove) {
             $this->db->query(
-                "DELETE FROM ".get_table_name('cache_index')
+                "DELETE FROM ".$this->db->table_name('cache_index')
                 ." WHERE user_id = ".intval($this->userid)
                     .(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : "")
@@ -540 +540 @@
         else {
             $this->db->query(
-                "UPDATE ".get_table_name('cache_index')
+                "UPDATE ".$this->db->table_name('cache_index')
                 ." SET valid = 0"
                 ." WHERE user_id = ".intval($this->userid)
@@ -566 +566 @@
     {
         $this->db->query(
-            "DELETE FROM ".get_table_name('cache_thread')
+            "DELETE FROM ".$this->db->table_name('cache_thread')
             ." WHERE user_id = ".intval($this->userid)
                 .(strlen($mailbox) ? " AND mailbox = ".$this->db->quote($mailbox) : "")
@@ -604 +604 @@
         $sql_result = $this->db->query(
             "SELECT data, valid"
-            ." FROM ".get_table_name('cache_index')
+            ." FROM ".$this->db->table_name('cache_index')
             ." WHERE user_id = ?"
                 ." AND mailbox = ?",
@@ -641 +641 @@
         $sql_result = $this->db->query(
             "SELECT data"
-            ." FROM ".get_table_name('cache_thread')
+            ." FROM ".$this->db->table_name('cache_thread')
             ." WHERE user_id = ?"
                 ." AND mailbox = ?",
@@ -685 +685 @@
         if ($exists) {
             $sql_result = $this->db->query(
-                "UPDATE ".get_table_name('cache_index')
+                "UPDATE ".$this->db->table_name('cache_index')
                 ." SET data = ?, valid = 1, changed = ".$this->db->now()
                 ." WHERE user_id = ?"
@@ -693 +693 @@
         else {
             $sql_result = $this->db->query(
-                "INSERT INTO ".get_table_name('cache_index')
+                "INSERT INTO ".$this->db->table_name('cache_index')
                 ." (user_id, mailbox, data, valid, changed)"
                 ." VALUES (?, ?, ?, 1, ".$this->db->now().")",
@@ -716 +716 @@
         if ($exists) {
             $sql_result = $this->db->query(
-                "UPDATE ".get_table_name('cache_thread')
+                "UPDATE ".$this->db->table_name('cache_thread')
                 ." SET data = ?, changed = ".$this->db->now()
                 ." WHERE user_id = ?"
@@ -724 +724 @@
         else {
             $sql_result = $this->db->query(
-                "INSERT INTO ".get_table_name('cache_thread')
+                "INSERT INTO ".$this->db->table_name('cache_thread')
                 ." (user_id, mailbox, data, changed)"
                 ." VALUES (?, ?, ?, ".$this->db->now().")",
@@ -932 +932 @@
         $sql_result = $this->db->query(
             "SELECT uid"
-            ." FROM ".get_table_name('cache_messages')
+            ." FROM ".$this->db->table_name('cache_messages')
             ." WHERE user_id = ?"
                 ." AND mailbox = ?",
@@ -979 +979 @@
 
                 $this->db->query(
-                    "UPDATE ".get_table_name('cache_messages')
+                    "UPDATE ".$this->db->table_name('cache_messages')
                     ." SET flags = ?, changed = ".$this->db->now()
                     ." WHERE user_id = ?"

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

@@ -35 +35 @@
      */
     private $config;
+
+    /**
+     * Browser object
+     *
+     * @var rcube_browser
+     */
+    public $browser;
+
+    /**
+     * Framework object
+     *
+     * @var rcmail
+     */
+    private $app;
+
     private $charset = RCMAIL_CHARSET;
     private $texts = array();
@@ -41 +56 @@
     private $message = null;
 
-    public $browser;
     public $env = array();
     public $type = 'js';
@@ -50 +64 @@
      * Constructor
      */
-    public function __construct($task=null)
-    {
-        $this->config  = rcmail::get_instance()->config;
+    public function __construct($task = null)
+    {
+        $this->app     = rcmail::get_instance();
+        $this->config  = $this->app->config;
         $this->browser = new rcube_browser();
     }
@@ -157 +172 @@
 
         foreach ($args as $name) {
-            $this->texts[$name] = rcube_label($name);
+            $this->texts[$name] = $this->app->gettext($name);
         }
     }
@@ -175 +190 @@
     {
         if ($override || !$this->message) {
-            if (rcube_label_exists($message)) {
+            if ($this->app->text_exists($message)) {
                 if (!empty($vars))
                     $vars = array_map('Q', $vars);
-                $msgtext = rcube_label(array('name' => $message, 'vars' => $vars));
+                $msgtext = $this->app->gettext(array('name' => $message, 'vars' => $vars));
             }
             else
@@ -239 +254 @@
         if (!$s_header_sent) {
             $s_header_sent = true;
-            send_nocacheing_headers();
+            rcube_ui::send_nocacheing_headers();
             header('Content-Type: text/plain; charset=' . $this->get_charset());
         }
@@ -249 +264 @@
         $response['action'] = $rcmail->action;
 
-        if ($unlock = get_input_value('_unlock', RCUBE_INPUT_GPC)) {
+        if ($unlock = rcube_ui::get_input_value('_unlock', rcube_ui::INPUT_GPC)) {
             $response['unlock'] = $unlock;
         }
@@ -265 +280 @@
             $response['callbacks'] = $this->callbacks;
 
-        echo json_serialize($response);
+        echo rcube_ui::json_serialize($response);
     }
 
@@ -281 +296 @@
             $method = array_shift($args);
             foreach ($args as $i => $arg) {
-                $args[$i] = json_serialize($arg);
+                $args[$i] = rcube_ui::json_serialize($arg);
             }
 

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

@@ -174 +174 @@
         foreach ($this->prop['hosts'] as $host)
         {
-            $host     = idn_to_ascii(rcube_parse_host($host));
+            $host     = idn_to_ascii(rcmail::parse_host($host));
             $hostname = $host.($this->prop['port'] ? ':'.$this->prop['port'] : '');
 
@@ -1409 +1409 @@
     private function _debug($str)
     {
-        if ($this->debug)
-            write_log('ldap', $str);
+        if ($this->debug) {
+            rcmail::write_log('ldap', $str);
+        }
     }
 

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

@@ -359 +359 @@
             if ($this->db_provider == 'pgsql')
                 // find sequence name
-                $table = get_sequence_name($table);
+                $table = $this->sequence_name($table);
             else
                 // resolve table name
-                $table = get_table_name($table);
+                $table = $this->table_name($table);
         }
 
@@ -801 +801 @@
             $debug_output = sprintf('%s(%d): %s;',
                 $scope, $db->db_index, rtrim($message, ';'));
-            write_log('sql', $debug_output);
+            rcmail::write_log('sql', $debug_output);
         }
     }

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

@@ -94 +94 @@
             'safe' => $this->is_safe,
             'prefer_html' => $this->app->config->get('prefer_html'),
-            'get_url' => rcmail_url('get', array(
+            'get_url' => rcube_ui::url('get', array(
                 '_mbox' => $this->storage->get_folder(), '_uid' => $uid))
         );
@@ -360 +360 @@
                 $c->ctype_primary   = 'text';
                 $c->ctype_secondary = 'plain';
-                $c->body            = rcube_label('htmlmessage');
+                $c->body            = $this->app->gettext('htmlmessage');
 
                 $this->parts[] = $c;
@@ -368 +368 @@
             if ($html_part !== null && $structure->parts[$html_part] !== $print_part) {
                 $html_part = &$structure->parts[$html_part];
-                $html_part->filename = rcube_label('htmlmessage');
+                $html_part->filename = $this->app->gettext('htmlmessage');
                 $html_part->mimetype = 'text/html';
 
@@ -380 +380 @@
             $p->ctype_primary   = 'text';
             $p->ctype_secondary = 'plain';
-            $p->body            = rcube_label('encryptedmessage');
+            $p->body            = $this->app->gettext('encryptedmessage');
             $p->size            = strlen($p->body);
 

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

@@ -151 +151 @@
                 if ($start != $pos) {
                     $substr = substr($input, $start, $pos-$start);
-                    $out   .= rcube_charset_convert($substr, $default_charset);
+                    $out   .= rcube_charset::convert($substr, $default_charset);
                     $start  = $pos;
                 }
@@ -192 +192 @@
                 }
 
-                $out .= rcube_charset_convert($text, $charset);
+                $out .= rcube_charset::convert($text, $charset);
                 $tmp = array();
             }
@@ -198 +198 @@
             // add the last part of the input string
             if ($start != strlen($input)) {
-                $out .= rcube_charset_convert(substr($input, $start), $default_charset);
+                $out .= rcube_charset::convert(substr($input, $start), $default_charset);
             }
 
@@ -206 +206 @@
 
         // no encoding information, use fallback
-        return rcube_charset_convert($input, $default_charset);
+        return rcube_charset::convert($input, $default_charset);
     }
 
@@ -467 +467 @@
                     $level = strlen($prefix);
                     $line  = rtrim(substr($line, $level));
-                    $line  = $prefix . rc_wordwrap($line, $length - $level - 2, " \r\n$prefix ");
+                    $line  = $prefix . self::wordwrap($line, $length - $level - 2, " \r\n$prefix ");
                 }
                 else if ($line) {
-                    $line = rc_wordwrap(rtrim($line), $length - 2, " \r\n");
+                    $line = self::wordwrap(rtrim($line), $length - 2, " \r\n");
                     // space-stuffing
                     $line = preg_replace('/(^|\r\n)(From| |>)/', '\\1 \\2', $line);
@@ -482 +482 @@
     }
 
+
+    /**
+     * Improved wordwrap function.
+     *
+     * @param string $string  Text to wrap
+     * @param int    $width   Line width
+     * @param string $break   Line separator
+     * @param bool   $cut     Enable to cut word
+     *
+     * @return string Text
+     */
+    public static function wordwrap($string, $width=75, $break="\n", $cut=false)
+    {
+        $para   = explode($break, $string);
+        $string = '';
+
+        while (count($para)) {
+            $line = array_shift($para);
+            if ($line[0] == '>') {
+                $string .= $line.$break;
+                continue;
+            }
+
+            $list = explode(' ', $line);
+            $len = 0;
+            while (count($list)) {
+                $line   = array_shift($list);
+                $l      = mb_strlen($line);
+                $newlen = $len + $l + ($len ? 1 : 0);
+
+                if ($newlen <= $width) {
+                    $string .= ($len ? ' ' : '').$line;
+                    $len += (1 + $l);
+                }
+                else {
+                    if ($l > $width) {
+                        if ($cut) {
+                            $start = 0;
+                            while ($l) {
+                                $str = mb_substr($line, $start, $width);
+                                $strlen = mb_strlen($str);
+                                $string .= ($len ? $break : '').$str;
+                                $start += $strlen;
+                                $l -= $strlen;
+                                $len = $strlen;
+                            }
+                        }
+                        else {
+                            $string .= ($len ? $break : '').$line;
+                            if (count($list)) {
+                                $string .= $break;
+                            }
+                            $len = 0;
+                        }
+                    }
+                    else {
+                        $string .= $break.$line;
+                        $len = $l;
+                    }
+                }
+            }
+
+            if (count($para)) {
+                $string .= $break;
+            }
+        }
+
+        return $string;
+    }
+
 }

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

@@ -127 +127 @@
   {
     $sql_result = $this->db->query(
-      "SELECT vars, ip, changed FROM ".get_table_name('session')
+      "SELECT vars, ip, changed FROM ".$this->db->table_name('session')
       ." WHERE sess_id = ?", $key);
 
@@ -175 +175 @@
         $this->db->query(
           sprintf("UPDATE %s SET vars=?, changed=%s WHERE sess_id=?",
-            get_table_name('session'), $now),
+            $this->db->table_name('session'), $now),
           base64_encode($newvars), $key);
       }
       else if ($ts - $this->changed > $this->lifetime / 2) {
-        $this->db->query("UPDATE ".get_table_name('session')." SET changed=$now WHERE sess_id=?", $key);
+        $this->db->query("UPDATE ".$this->db->table_name('session')." SET changed=$now WHERE sess_id=?", $key);
       }
     }
@@ -186 +186 @@
         sprintf("INSERT INTO %s (sess_id, vars, ip, created, changed) ".
           "VALUES (?, ?, ?, %s, %s)",
-          get_table_name('session'), $now, $now),
+          $this->db->table_name('session'), $now, $now),
         $key, base64_encode($vars), (string)$this->ip);
     }
@@ -226 +226 @@
   {
     $this->db->query(
-      sprintf("DELETE FROM %s WHERE sess_id = ?", get_table_name('session')),
+      sprintf("DELETE FROM %s WHERE sess_id = ?", $this->db->table_name('session')),
       $key);
 
@@ -244 +244 @@
     $this->db->query(
       sprintf("DELETE FROM %s WHERE changed < %s",
-        get_table_name('session'), $this->db->fromunixtime(time() - $maxlifetime)));
+        $this->db->table_name('session'), $this->db->fromunixtime(time() - $maxlifetime)));
 
     $this->gc();
@@ -622 +622 @@
     return "S" . (function_exists('sha1') ? sha1($auth_string) : md5($auth_string));
   }
-  
+
   /**
    * 
@@ -629 +629 @@
   {
     if ($this->logging)
-      write_log('session', $line);
+      rcmail::write_log('session', $line);
   }
 

branches/devel-framework/roundcubemail/program/include/rcube_shared.inc

@@ -96 +96 @@
 
     return floatval($bytes);
-}
-
-
-/**
- * Wrapper function for wordwrap
- *
- * @param string $string  Text to wrap
- * @param int    $width   Line width
- * @param string $break   Line separator
- * @param bool   $cut     Enable to cut word
- *
- * @return string Text
- */
-function rcube_wordwrap($string, $width=75, $break="\n", $cut=false)
-{
-    $para = explode($break, $string);
-    $string = '';
-    while (count($para)) {
-        $line = array_shift($para);
-        if ($line[0] == '>') {
-            $string .= $line.$break;
-            continue;
-        }
-
-        $list = explode(' ', $line);
-        $len = 0;
-        while (count($list)) {
-            $line   = array_shift($list);
-            $l      = mb_strlen($line);
-            $newlen = $len + $l + ($len ? 1 : 0);
-
-            if ($newlen <= $width) {
-                $string .= ($len ? ' ' : '').$line;
-                $len += (1 + $l);
-            }
-            else {
-                if ($l > $width) {
-                    if ($cut) {
-                        $start = 0;
-                        while ($l) {
-                            $str = mb_substr($line, $start, $width);
-                            $strlen = mb_strlen($str);
-                            $string .= ($len ? $break : '').$str;
-                            $start += $strlen;
-                            $l -= $strlen;
-                            $len = $strlen;
-                        }
-                    }
-                    else {
-                        $string .= ($len ? $break : '').$line;
-                        if (count($list)) {
-                            $string .= $break;
-                        }
-                        $len = 0;
-                    }
-                }
-                else {
-                    $string .= $break.$line;
-                    $len = $l;
-                }
-            }
-        }
-
-        if (count($para)) {
-            $string .= $break;
-        }
-    }
-
-    return $string;
 }
 

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

@@ -72 +72 @@
     ));
 
-    $smtp_host = rcube_parse_host($CONFIG['smtp_server']);
+    $smtp_host = rcmail::parse_host($CONFIG['smtp_server']);
     // when called from Installer it's possible to have empty $smtp_host here
     if (!$smtp_host) $smtp_host = 'localhost';
@@ -336 +336 @@
   public function debug_handler(&$smtp, $message)
   {
-    write_log('smtp', preg_replace('/\r\n$/', '', $message));
+    rcmail::write_log('smtp', preg_replace('/\r\n$/', '', $message));
   }
 

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

@@ -546 +546 @@
             if (!empty($this->dict)) {
                 $this->rc->db->query(
-                    "UPDATE ".get_table_name('dictionary')
+                    "UPDATE ".$this->rc->db->table_name('dictionary')
                     ." SET data = ?"
                     ." WHERE user_id " . ($plugin['userid'] ? "= ".$plugin['userid'] : "IS NULL")
@@ -555 +555 @@
             else {
                 $this->rc->db->query(
-                    "DELETE FROM " . get_table_name('dictionary')
+                    "DELETE FROM " . $this->rc->db->table_name('dictionary')
                     ." WHERE user_id " . ($plugin['userid'] ? "= ".$plugin['userid'] : "IS NULL")
                         ." AND " . $this->rc->db->quoteIdentifier('language') . " = ?",
@@ -563 +563 @@
         else if (!empty($this->dict)) {
             $this->rc->db->query(
-                "INSERT INTO " .get_table_name('dictionary')
+                "INSERT INTO " .$this->rc->db->table_name('dictionary')
                 ." (user_id, " . $this->rc->db->quoteIdentifier('language') . ", data) VALUES (?, ?, ?)",
                 $plugin['userid'], $plugin['language'], implode(' ', $plugin['dictionary']));
@@ -589 +589 @@
             $dict = array();
             $this->rc->db->query(
-                "SELECT data FROM ".get_table_name('dictionary')
+                "SELECT data FROM ".$this->rc->db->table_name('dictionary')
                 ." WHERE user_id ". ($plugin['userid'] ? "= ".$plugin['userid'] : "IS NULL")
                     ." AND " . $this->rc->db->quoteIdentifier('language') . " = ?",

branches/devel-framework/roundcubemail/program/include/rcube_sqlite.inc

@@ -72 +72 @@
 function rcube_sqlite_debug($str)
 {
-    //console($str);
+    //rcmail::console($str);
 }
 

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

@@ -467 +467 @@
     {
         $headers = $this->get_message_headers($uid);
-        return rcube_charset_convert($this->get_message_part($uid, $part, null),
+        return rcube_charset::convert($this->get_message_part($uid, $part, null),
             $headers->charset ? $headers->charset : $this->default_charset);
     }

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

@@ -96 +96 @@
           'href' => $url_prefix . $url,
           'target' => '_blank'
-        ), Q($url)) . $suffix);
+        ), rcube_ui::Q($url)) . $suffix);
     }
 
@@ -116 +116 @@
     $i = $this->add(html::a(array(
         'href' => 'mailto:' . $href,
-        'onclick' => "return ".JS_OBJECT_NAME.".command('compose','".JQ($href)."',this)",
-      ), Q($href)) . $suffix);
+        'onclick' => "return ".JS_OBJECT_NAME.".command('compose','".rcube_ui::JQ($href)."',this)",
+      ), rcube_ui::Q($href)) . $suffix);
 
     return $i >= 0 ? $this->get_replacement($i) : '';

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

@@ -133 +133 @@
         }
         else if ($this->env['task'] == 'login') {
-            $title = rcube_label(array('name' => 'welcome', 'vars' => array('product' => $this->config['product_name'])));
+            $title = $this->app->gettext(array('name' => 'welcome', 'vars' => array('product' => $this->config['product_name'])));
         }
         else {
@@ -236 +236 @@
 
         foreach ($args as $name) {
-            $this->js_labels[$name] = rcube_label($name);
+            $this->js_labels[$name] = $this->app->gettext($name);
         }
     }
@@ -253 +253 @@
     {
         if ($override || !$this->message) {
-            if (rcube_label_exists($message)) {
+            if ($this->app->text_exists($message)) {
                 if (!empty($vars))
                     $vars = array_map('Q', $vars);
-                $msgtext = rcube_label(array('name' => $message, 'vars' => $vars));
+                $msgtext = $this->app->gettext(array('name' => $message, 'vars' => $vars));
             }
             else
@@ -479 +479 @@
         $out = '';
         if (!$this->framed && !empty($this->js_env)) {
-            $out .= JS_OBJECT_NAME . '.set_env('.json_serialize($this->js_env).");\n";
+            $out .= JS_OBJECT_NAME . '.set_env('.rcube_ui::json_serialize($this->js_env).");\n";
         }
         if (!empty($this->js_labels)) {
@@ -487 +487 @@
             $method = array_shift($args);
             foreach ($args as $i => $arg) {
-                $args[$i] = json_serialize($arg);
+                $args[$i] = rcube_ui::json_serialize($arg);
             }
             $parent = $this->framed || preg_match('/^parent\./', $method);
@@ -524 +524 @@
     private function parse_with_globals($input)
     {
-        $GLOBALS['__version'] = Q(RCMAIL_VERSION);
-        $GLOBALS['__comm_path'] = Q($this->app->comm_path);
+        $GLOBALS['__version'] = rcube_ui::Q(RCMAIL_VERSION);
+        $GLOBALS['__comm_path'] = rcube_ui::Q($this->app->comm_path);
         return preg_replace_callback('/\$(__[a-z0-9_\-]+)/',
             array($this, 'globals_callback'), $input);
@@ -564 +564 @@
                 return $matches[0] . $this->parse_conditions($matches[3]);
             }
-            $attrib = parse_attrib_string($matches[2]);
+            $attrib = html::parse_attrib_string($matches[2]);
             if (isset($attrib['condition'])) {
                 $condmet = $this->check_condition($attrib['condition']);
@@ -608 +608 @@
     private function alter_form_tag($matches)
     {
-        $out = $matches[0];
-        $attrib  = parse_attrib_string($matches[1]);
+        $out    = $matches[0];
+        $attrib = html::parse_attrib_string($matches[1]);
 
         if (strtolower($attrib['method']) == 'post') {
@@ -642 +642 @@
                 "\$this->app->config->get('\\1',get_boolean('\\3'))",
                 "\$this->env['\\1']",
-                "get_input_value('\\1', RCUBE_INPUT_GPC)",
+                "rcube_ui::get_input_value('\\1', rcube_ui::INPUT_GPC)",
                 "\$_COOKIE['\\1']",
                 "\$this->browser->{'\\1'}",
@@ -676 +676 @@
     {
         $command = strtolower($matches[1]);
-        $attrib  = parse_attrib_string($matches[2]);
+        $attrib  = html::parse_attrib_string($matches[2]);
 
         // empty output if required condition is not met
@@ -697 +697 @@
                     $vars = $attrib + array('product' => $this->config['product_name']);
                     unset($vars['name'], $vars['command']);
-                    $label = rcube_label($attrib + array('vars' => $vars));
-                    return !$attrib['noshow'] ? (get_boolean((string)$attrib['html']) ? $label : Q($label)) : '';
+                    $label = $this->app->gettext($attrib + array('vars' => $vars));
+                    return !$attrib['noshow'] ? (get_boolean((string)$attrib['html']) ? $label : rcube_ui::Q($label)) : '';
                 }
                 break;
@@ -760 +760 @@
                 else if ($object == 'productname') {
                     $name = !empty($this->config['product_name']) ? $this->config['product_name'] : 'Roundcube Webmail';
-                    $content = Q($name);
+                    $content = rcube_ui::Q($name);
                 }
                 else if ($object == 'version') {
@@ -768 +768 @@
                           $ver .= ' [SVN r'.$regs[1].']';
                     }
-                    $content = Q($ver);
+                    $content = rcube_ui::Q($ver);
                 }
                 else if ($object == 'steptitle') {
-                  $content = Q($this->get_pagetitle());
+                  $content = rcube_ui::Q($this->get_pagetitle());
                 }
                 else if ($object == 'pagetitle') {
@@ -781 +781 @@
                       $title = '';
                     $title .= $this->get_pagetitle();
-                    $content = Q($title);
+                    $content = rcube_ui::Q($title);
                 }
 
@@ -791 +791 @@
             case 'exp':
                 $value = $this->parse_expression($attrib['expression']);
-                return eval("return Q($value);");
+                return eval("return rcube_ui::Q($value);");
 
             // return variable
@@ -810 +810 @@
                         break;
                     case 'request':
-                        $value = get_input_value($name, RCUBE_INPUT_GPC);
+                        $value = rcube_ui::get_input_value($name, rcube_ui::INPUT_GPC);
                         break;
                     case 'session':
@@ -827 +827 @@
                 }
 
-                return Q($value);
+                return rcube_ui::Q($value);
                 break;
         }
@@ -890 +890 @@
         // get localized text for labels and titles
         if ($attrib['title']) {
-            $attrib['title'] = Q(rcube_label($attrib['title'], $attrib['domain']));
+            $attrib['title'] = rcube_ui::Q($this->app->gettext($attrib['title'], $attrib['domain']));
         }
         if ($attrib['label']) {
-            $attrib['label'] = Q(rcube_label($attrib['label'], $attrib['domain']));
+            $attrib['label'] = rcube_ui::Q($this->app->gettext($attrib['label'], $attrib['domain']));
         }
         if ($attrib['alt']) {
-            $attrib['alt'] = Q(rcube_label($attrib['alt'], $attrib['domain']));
+            $attrib['alt'] = rcube_ui::Q($this->app->gettext($attrib['alt'], $attrib['domain']));
         }
 
@@ -924 +924 @@
             // make valid href to specific buttons
             if (in_array($attrib['command'], rcmail::$main_tasks)) {
-                $attrib['href'] = rcmail_url(null, null, $attrib['command']);
+                $attrib['href'] = rcube_ui::url(null, null, $attrib['command']);
                 $attrib['onclick'] = sprintf("%s.switch_task('%s');return false", JS_OBJECT_NAME, $attrib['command']);
             }
             else if ($attrib['task'] && in_array($attrib['task'], rcmail::$main_tasks)) {
-                $attrib['href'] = rcmail_url($attrib['command'], null, $attrib['task']);
+                $attrib['href'] = rcube_ui::url($attrib['command'], null, $attrib['task']);
             }
             else if (in_array($attrib['command'], $a_static_commands)) {
-                $attrib['href'] = rcmail_url($attrib['command']);
+                $attrib['href'] = rcube_ui::url($attrib['command']);
             }
             else if ($attrib['command'] == 'permaurl' && !empty($this->env['permaurl'])) {
@@ -1105 +1105 @@
 
         // save original url
-        $url = get_input_value('_url', RCUBE_INPUT_POST);
+        $url = rcube_ui::get_input_value('_url', rcube_ui::INPUT_POST);
         if (empty($url) && !preg_match('/_(task|action)=logout/', $_SERVER['QUERY_STRING']))
             $url = $_SERVER['QUERY_STRING'];
@@ -1154 +1154 @@
         $table = new html_table(array('cols' => 2));
 
-        $table->add('title', html::label('rcmloginuser', Q(rcube_label('username'))));
-        $table->add('input', $input_user->show(get_input_value('_user', RCUBE_INPUT_GPC)));
-
-        $table->add('title', html::label('rcmloginpwd', Q(rcube_label('password'))));
+        $table->add('title', html::label('rcmloginuser', rcube_ui::Q($this->app->gettext('username'))));
+        $table->add('input', $input_user->show(rcube_ui::get_input_value('_user', rcube_ui::INPUT_GPC)));
+
+        $table->add('title', html::label('rcmloginpwd', rcube_ui::Q($this->app->gettext('password'))));
         $table->add('input', $input_pass->show());
 
         // add host selection row
         if (is_object($input_host) && !$hide_host) {
-            $table->add('title', html::label('rcmloginhost', Q(rcube_label('server'))));
-            $table->add('input', $input_host->show(get_input_value('_host', RCUBE_INPUT_GPC)));
+            $table->add('title', html::label('rcmloginhost', rcube_ui::Q($this->app->gettext('server'))));
+            $table->add('input', $input_host->show(rcube_ui::get_input_value('_host', rcube_ui::INPUT_GPC)));
         }
 
@@ -1201 +1201 @@
             return;
 
-        $this->add_script('var images = ' . json_serialize($images) .';
+        $this->add_script('var images = ' . rcube_ui::json_serialize($images) .';
             for (var i=0; i<images.length; i++) {
                 img = new Image();
@@ -1282 +1282 @@
 
         $charsets = array(
-            'UTF-8'        => 'UTF-8 ('.rcube_label('unicode').')',
-            'US-ASCII'     => 'ASCII ('.rcube_label('english').')',
-            'ISO-8859-1'   => 'ISO-8859-1 ('.rcube_label('westerneuropean').')',
-            'ISO-8859-2'   => 'ISO-8859-2 ('.rcube_label('easterneuropean').')',
-            'ISO-8859-4'   => 'ISO-8859-4 ('.rcube_label('baltic').')',
-            'ISO-8859-5'   => 'ISO-8859-5 ('.rcube_label('cyrillic').')',
-            'ISO-8859-6'   => 'ISO-8859-6 ('.rcube_label('arabic').')',
-            'ISO-8859-7'   => 'ISO-8859-7 ('.rcube_label('greek').')',
-            'ISO-8859-8'   => 'ISO-8859-8 ('.rcube_label('hebrew').')',
-            'ISO-8859-9'   => 'ISO-8859-9 ('.rcube_label('turkish').')',
-            'ISO-8859-10'   => 'ISO-8859-10 ('.rcube_label('nordic').')',
-            'ISO-8859-11'   => 'ISO-8859-11 ('.rcube_label('thai').')',
-            'ISO-8859-13'   => 'ISO-8859-13 ('.rcube_label('baltic').')',
-            'ISO-8859-14'   => 'ISO-8859-14 ('.rcube_label('celtic').')',
-            'ISO-8859-15'   => 'ISO-8859-15 ('.rcube_label('westerneuropean').')',
-            'ISO-8859-16'   => 'ISO-8859-16 ('.rcube_label('southeasterneuropean').')',
-            'WINDOWS-1250' => 'Windows-1250 ('.rcube_label('easterneuropean').')',
-            'WINDOWS-1251' => 'Windows-1251 ('.rcube_label('cyrillic').')',
-            'WINDOWS-1252' => 'Windows-1252 ('.rcube_label('westerneuropean').')',
-            'WINDOWS-1253' => 'Windows-1253 ('.rcube_label('greek').')',
-            'WINDOWS-1254' => 'Windows-1254 ('.rcube_label('turkish').')',
-            'WINDOWS-1255' => 'Windows-1255 ('.rcube_label('hebrew').')',
-            'WINDOWS-1256' => 'Windows-1256 ('.rcube_label('arabic').')',
-            'WINDOWS-1257' => 'Windows-1257 ('.rcube_label('baltic').')',
-            'WINDOWS-1258' => 'Windows-1258 ('.rcube_label('vietnamese').')',
-            'ISO-2022-JP'  => 'ISO-2022-JP ('.rcube_label('japanese').')',
-            'ISO-2022-KR'  => 'ISO-2022-KR ('.rcube_label('korean').')',
-            'ISO-2022-CN'  => 'ISO-2022-CN ('.rcube_label('chinese').')',
-            'EUC-JP'       => 'EUC-JP ('.rcube_label('japanese').')',
-            'EUC-KR'       => 'EUC-KR ('.rcube_label('korean').')',
-            'EUC-CN'       => 'EUC-CN ('.rcube_label('chinese').')',
-            'BIG5'         => 'BIG5 ('.rcube_label('chinese').')',
-            'GB2312'       => 'GB2312 ('.rcube_label('chinese').')',
+            'UTF-8'        => 'UTF-8 ('.$this->app->gettext('unicode').')',
+            'US-ASCII'     => 'ASCII ('.$this->app->gettext('english').')',
+            'ISO-8859-1'   => 'ISO-8859-1 ('.$this->app->gettext('westerneuropean').')',
+            'ISO-8859-2'   => 'ISO-8859-2 ('.$this->app->gettext('easterneuropean').')',
+            'ISO-8859-4'   => 'ISO-8859-4 ('.$this->app->gettext('baltic').')',
+            'ISO-8859-5'   => 'ISO-8859-5 ('.$this->app->gettext('cyrillic').')',
+            'ISO-8859-6'   => 'ISO-8859-6 ('.$this->app->gettext('arabic').')',
+            'ISO-8859-7'   => 'ISO-8859-7 ('.$this->app->gettext('greek').')',
+            'ISO-8859-8'   => 'ISO-8859-8 ('.$this->app->gettext('hebrew').')',
+            'ISO-8859-9'   => 'ISO-8859-9 ('.$this->app->gettext('turkish').')',
+            'ISO-8859-10'   => 'ISO-8859-10 ('.$this->app->gettext('nordic').')',
+            'ISO-8859-11'   => 'ISO-8859-11 ('.$this->app->gettext('thai').')',
+            'ISO-8859-13'   => 'ISO-8859-13 ('.$this->app->gettext('baltic').')',
+            'ISO-8859-14'   => 'ISO-8859-14 ('.$this->app->gettext('celtic').')',
+            'ISO-8859-15'   => 'ISO-8859-15 ('.$this->app->gettext('westerneuropean').')',
+            'ISO-8859-16'   => 'ISO-8859-16 ('.$this->app->gettext('southeasterneuropean').')',
+            'WINDOWS-1250' => 'Windows-1250 ('.$this->app->gettext('easterneuropean').')',
+            'WINDOWS-1251' => 'Windows-1251 ('.$this->app->gettext('cyrillic').')',
+            'WINDOWS-1252' => 'Windows-1252 ('.$this->app->gettext('westerneuropean').')',
+            'WINDOWS-1253' => 'Windows-1253 ('.$this->app->gettext('greek').')',
+            'WINDOWS-1254' => 'Windows-1254 ('.$this->app->gettext('turkish').')',
+            'WINDOWS-1255' => 'Windows-1255 ('.$this->app->gettext('hebrew').')',
+            'WINDOWS-1256' => 'Windows-1256 ('.$this->app->gettext('arabic').')',
+            'WINDOWS-1257' => 'Windows-1257 ('.$this->app->gettext('baltic').')',
+            'WINDOWS-1258' => 'Windows-1258 ('.$this->app->gettext('vietnamese').')',
+            'ISO-2022-JP'  => 'ISO-2022-JP ('.$this->app->gettext('japanese').')',
+            'ISO-2022-KR'  => 'ISO-2022-KR ('.$this->app->gettext('korean').')',
+            'ISO-2022-CN'  => 'ISO-2022-CN ('.$this->app->gettext('chinese').')',
+            'EUC-JP'       => 'EUC-JP ('.$this->app->gettext('japanese').')',
+            'EUC-KR'       => 'EUC-KR ('.$this->app->gettext('korean').')',
+            'EUC-CN'       => 'EUC-CN ('.$this->app->gettext('chinese').')',
+            'BIG5'         => 'BIG5 ('.$this->app->gettext('chinese').')',
+            'GB2312'       => 'GB2312 ('.$this->app->gettext('chinese').')',
         );
 

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

@@ -173 +173 @@
     /**
      * Quote a given string.
-     * Shortcut function for rep_specialchars_output
+     * Shortcut function for self::rep_specialchars_output()
      *
      * @return string HTML-quoted string
@@ -180 +180 @@
     public static function Q($str, $mode = 'strict', $newlines = true)
     {
-        return rep_specialchars_output($str, 'html', $mode, $newlines);
+        return self::rep_specialchars_output($str, 'html', $mode, $newlines);
     }
 
@@ -186 +186 @@
     /**
      * Quote a given string for javascript output.
-     * Shortcut function for rep_specialchars_output
+     * Shortcut function for self::rep_specialchars_output()
      *
      * @return string JS-quoted string
@@ -193 +193 @@
     public static function JQ($str)
     {
-        return rep_specialchars_output($str, 'js');
+        return self::rep_specialchars_output($str, 'js');
     }
 
@@ -234 +234 @@
         }
 
-        return parse_input_value($value, $allow_html, $charset);
-    }
-
-    /**
-     * Parse/validate input value. See get_input_value()
+        return self::parse_input_value($value, $allow_html, $charset);
+    }
+
+    /**
+     * Parse/validate input value. See self::get_input_value()
      * Performs stripslashes() and charset conversion if necessary
      *
@@ -351 +351 @@
         if (!$attrib['noheader']) {
             foreach ($a_show_cols as $col) {
-                $table->add_header($col, Q(self::label($col)));
+                $table->add_header($col, self::Q(self::label($col)));
             }
         }
@@ -362 +362 @@
                 // format each col
                 foreach ($a_show_cols as $col) {
-                    $table->add($col, Q($sql_arr[$col]));
+                    $table->add($col, self::Q($sql_arr[$col]));
                 }
             }
@@ -375 +375 @@
                 // format each col
                 foreach ($a_show_cols as $col) {
-                    $table->add($col, Q(is_array($row_data[$col]) ? $row_data[$col][0] : $row_data[$col]));
+                    $table->add($col, self::Q(is_array($row_data[$col]) ? $row_data[$col][0] : $row_data[$col]));
                 }
             }
@@ -453 +453 @@
 
         // ignore the whole block if evil styles are detected
-        $source   = rcmail_xss_entity_decode($source);
+        $source   = self::xss_entity_decode($source);
         $stripped = preg_replace('/[^a-z\(:;]/i', '', $source);
         $evilexpr = 'expression|behavior|javascript:|import[^a]' . (!$allow_remote ? '|url\(' : '');
@@ -509 +509 @@
 
     /**
-     * Convert a HTML attribute string attributes to an associative array (name => value)
-     *
-     * @param string $str Input string
-     *
-     * @return array Key-value pairs of parsed attributes
-     */
-    public static function parse_attrib_string($str)
-    {
-        $attrib = array();
-        $regexp = '/\s*([-_a-z]+)=(["\'])??(?(2)([^\2]*)\2|(\S+?))/Ui';
-
-        preg_match_all($regexp, stripslashes($str), $regs, PREG_SET_ORDER);
-
-        // convert attributes to an associative array (name => value)
-        if ($regs) {
-            foreach ($regs as $attr) {
-                $attrib[strtolower($attr[1])] = html_entity_decode($attr[3] . $attr[4]);
-            }
-        }
-
-        return $attrib;
-    }
-
-
-    /**
      * Convert the given date to a human readable form
      * This uses the date formatting properties from config
@@ -1052 +1027 @@
         $quota = self::quota_content($attrib);
 
-        $OUTPUT->add_script('rcmail.set_quota('.json_serialize($quota).');', 'docready');
+        $OUTPUT->add_script('rcmail.set_quota('.self::json_serialize($quota).');', 'docready');
 
         return html::span($attrib, '');
@@ -1144 +1119 @@
      * @return string CSS classes separated by space
      */
-    public static function filetype2classname($mimetype, $filename)
+    public static function file2class($mimetype, $filename)
     {
         list($primary, $secondary) = explode('/', $mimetype);
@@ -1300 +1275 @@
                 $_SERVER['REQUEST_URI'] . $post_query);
 
-            if (!write_log('errors', $log_entry)) {
+            if (!rcmail::write_log('errors', $log_entry)) {
                 // send error to PHPs error handler if write_log didn't succeed
                 trigger_error($arg_arr['message']);
@@ -1539 +1514 @@
         $out = html_entity_decode(html_entity_decode($content));
         $out = preg_replace_callback('/\\\([0-9a-f]{4})/i',
-            array(self, 'rcmail_xss_entity_decode_callback'), $out);
+            array(self, 'xss_entity_decode_callback'), $out);
         $out = preg_replace('#/\*.*\*/#Ums', '', $out);
 
@@ -1547 +1522 @@
 
     /**
-     * preg_replace_callback callback for rcmail_xss_entity_decode_callback
-     *
-     * @param array matches result from preg_replace_callback
-     *
-     * @return string decoded entity
+     * preg_replace_callback callback for xss_entity_decode
+     *
+     * @param array $matches Result from preg_replace_callback
+     *
+     * @return string Decoded entity
      */
     public static function xss_entity_decode_callback($matches)

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

@@ -64 +64 @@
         if ($id && !$sql_arr) {
             $sql_result = $this->db->query(
-                "SELECT * FROM ".get_table_name('users')." WHERE user_id = ?", $id);
+                "SELECT * FROM ".$this->db->table_name('users')." WHERE user_id = ?", $id);
             $sql_arr = $this->db->fetch_assoc($sql_result);
         }
@@ -171 +171 @@
 
         $this->db->query(
-            "UPDATE ".get_table_name('users').
+            "UPDATE ".$this->db->table_name('users').
             " SET preferences = ?".
                 ", language = ?".
@@ -230 +230 @@
 
         $sql_result = $this->db->query(
-            "SELECT * FROM ".get_table_name('identities').
+            "SELECT * FROM ".$this->db->table_name('identities').
             " WHERE del <> 1 AND user_id = ?".
             ($sql_add ? " ".$sql_add : "").
@@ -265 +265 @@
         $query_params[] = $this->ID;
 
-        $sql = "UPDATE ".get_table_name('identities').
+        $sql = "UPDATE ".$this->db->table_name('identities').
             " SET changed = ".$this->db->now().", ".join(', ', $query_cols).
             " WHERE identity_id = ?".
@@ -299 +299 @@
         $insert_values[] = $this->ID;
 
-        $sql = "INSERT INTO ".get_table_name('identities').
+        $sql = "INSERT INTO ".$this->db->table_name('identities').
             " (changed, ".join(', ', $insert_cols).")".
             " VALUES (".$this->db->now().", ".join(', ', array_pad(array(), sizeof($insert_values), '?')).")";
@@ -322 +322 @@
 
         $sql_result = $this->db->query(
-            "SELECT count(*) AS ident_count FROM ".get_table_name('identities').
+            "SELECT count(*) AS ident_count FROM ".$this->db->table_name('identities').
             " WHERE user_id = ? AND del <> 1",
             $this->ID);
@@ -333 +333 @@
 
         $this->db->query(
-            "UPDATE ".get_table_name('identities').
+            "UPDATE ".$this->db->table_name('identities').
             " SET del = 1, changed = ".$this->db->now().
             " WHERE user_id = ?".
@@ -353 +353 @@
         if ($this->ID && $iid) {
             $this->db->query(
-                "UPDATE ".get_table_name('identities').
+                "UPDATE ".$this->db->table_name('identities').
                 " SET ".$this->db->quoteIdentifier('standard')." = '0'".
                 " WHERE user_id = ?".
@@ -371 +371 @@
         if ($this->ID) {
             $this->db->query(
-                "UPDATE ".get_table_name('users').
+                "UPDATE ".$this->db->table_name('users').
                 " SET last_login = ".$this->db->now().
                 " WHERE user_id = ?",
@@ -401 +401 @@
 
         // query for matching user name
-        $query = "SELECT * FROM ".get_table_name('users')." WHERE mail_host = ? AND %s = ?";
+        $query = "SELECT * FROM ".$dbh->table_name('users')." WHERE mail_host = ? AND %s = ?";
         $sql_result = $dbh->query(sprintf($query, 'username'), $host, $user);
 
@@ -449 +449 @@
 
         $dbh->query(
-            "INSERT INTO ".get_table_name('users').
+            "INSERT INTO ".$dbh->table_name('users').
             " (created, last_login, username, mail_host, alias, language)".
             " VALUES (".$dbh->now().", ".$dbh->now().", ?, ?, ?, ?)",
@@ -571 +571 @@
         $sql_result = $this->db->query(
             "SELECT search_id AS id, ".$this->db->quoteIdentifier('name')
-            ." FROM ".get_table_name('searches')
+            ." FROM ".$this->db->table_name('searches')
             ." WHERE user_id = ?"
                 ." AND ".$this->db->quoteIdentifier('type')." = ?"
@@ -605 +605 @@
                 .", ".$this->db->quoteIdentifier('data')
                 .", ".$this->db->quoteIdentifier('type')
-            ." FROM ".get_table_name('searches')
+            ." FROM ".$this->db->table_name('searches')
             ." WHERE user_id = ?"
                 ." AND search_id = ?",
@@ -636 +636 @@
 
         $this->db->query(
-            "DELETE FROM ".get_table_name('searches')
+            "DELETE FROM ".$this->db->table_name('searches')
             ." WHERE user_id = ?"
                 ." AND search_id = ?",
@@ -666 +666 @@
         $insert_values[] = serialize($data['data']);
 
-        $sql = "INSERT INTO ".get_table_name('searches')
+        $sql = "INSERT INTO ".$this->db->table_name('searches')
             ." (".join(', ', $insert_cols).")"
             ." VALUES (".join(', ', array_pad(array(), sizeof($insert_values), '?')).")";

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

@@ -387 +387 @@
           foreach ($subnode as $j => $value) {
             if (is_numeric($j) && is_string($value))
-              $card[$key][$i][$j] = rcube_charset_convert($value, $charset);
+              $card[$key][$i][$j] = rcube_charset::convert($value, $charset);
           }
           unset($card[$key][$i]['charset']);
@@ -423 +423 @@
     // detect charset and convert to utf-8
     else if (($charset = self::detect_encoding($data)) && $charset != RCMAIL_CHARSET) {
-      $data = rcube_charset_convert($data, $charset);
+      $data = rcube_charset::convert($data, $charset);
       $data = preg_replace(array('/^[\xFE\xFF]{2}/', '/^\xEF\xBB\xBF/', '/^\x00+/'), '', $data); // also remove BOM
       $charset = RCMAIL_CHARSET;