diff options
Diffstat (limited to 'program/include/rcmail.php')
| -rw-r--r-- | program/include/rcmail.php | 89 |
1 files changed, 66 insertions, 23 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php index 4aa3dedad..cc70739cf 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -139,6 +139,8 @@ class rcmail extends rcube if ($this->user && $this->user->ID) $task = !$task ? 'mail' : $task; + else if (php_sapi_name() == 'cli') + $task = 'cli'; else $task = 'login'; @@ -426,7 +428,7 @@ class rcmail extends rcube } // add some basic labels to client - $this->output->add_label('loading', 'servererror', 'requesttimedout', 'refreshing'); + $this->output->add_label('loading', 'servererror', 'connerror', 'requesttimedout', 'refreshing'); return $this->output; } @@ -644,10 +646,8 @@ class rcmail extends rcube // fix some old settings according to namespace prefix $this->fix_namespace_settings($user); - // create default folders on login - if ($this->config->get('create_default_folders')) { - $storage->create_default_folders(); - } + // set/create special folders + $this->set_special_folders(); // clear all mailboxes related cache(s) $storage->clear_cache('mailboxes', true); @@ -841,6 +841,9 @@ class rcmail extends rcube // write performance stats to logs/console if ($this->config->get('devel_mode')) { + // make sure logged numbers use unified format + setlocale(LC_NUMERIC, 'en_US.utf8', 'en_US.UTF-8', 'en_US', 'C'); + if (function_exists('memory_get_usage')) $mem = $this->show_bytes(memory_get_usage()); if (function_exists('memory_get_peak_usage')) @@ -927,14 +930,6 @@ class rcmail extends rcube } } - if (!empty($prefs['default_folders'])) { - foreach ($prefs['default_folders'] as $idx => $name) { - if ($name != 'INBOX' && !preg_match($regexp, $name)) { - $prefs['default_folders'][$idx] = $prefix.$name; - } - } - } - if (!empty($prefs['search_mods'])) { $folders = array(); foreach ($prefs['search_mods'] as $idx => $value) { @@ -1162,11 +1157,11 @@ class rcmail extends rcube $week_limit = mktime(0, 0, 0, $now_date['mon'], $now_date['mday']-6, $now_date['year']); $pretty_date = $this->config->get('prettydate'); - if ($pretty_date && $timestamp > $today_limit && $timestamp < $now) { + if ($pretty_date && $timestamp > $today_limit && $timestamp <= $now) { $format = $this->config->get('date_today', $this->config->get('time_format', 'H:i')); $today = true; } - else if ($pretty_date && $timestamp > $week_limit && $timestamp < $now) { + else if ($pretty_date && $timestamp > $week_limit && $timestamp <= $now) { $format = $this->config->get('date_short', 'D H:i'); } else { @@ -1613,10 +1608,14 @@ class rcmail extends rcube * * @return string Localized folder name in UTF-8 encoding */ - public function localize_foldername($name, $with_path = true) + public function localize_foldername($name, $with_path = false) { $realnames = $this->config->get('show_real_foldernames'); + if (!$realnames && ($folder_class = $this->folder_classname($name))) { + return $this->gettext($folder_class); + } + // try to localize path of the folder if ($with_path && !$realnames) { $storage = $this->get_storage(); @@ -1625,7 +1624,7 @@ class rcmail extends rcube $count = count($path); if ($count > 1) { - for ($i = 0; $i < $count; $i++) { + for ($i = 1; $i < $count; $i++) { $folder = implode($delimiter, array_slice($path, 0, -$i)); if ($folder_class = $this->folder_classname($folder)) { $name = implode($delimiter, array_slice($path, $count - $i)); @@ -1635,10 +1634,6 @@ class rcmail extends rcube } } - if (!$realnames && ($folder_class = $this->folder_classname($name))) { - return $this->gettext($folder_class); - } - return rcube_charset::convert($name, 'UTF7-IMAP'); } @@ -1646,14 +1641,13 @@ class rcmail extends rcube public function localize_folderpath($path) { $protect_folders = $this->config->get('protect_default_folders'); - $default_folders = (array) $this->config->get('default_folders'); $delimiter = $this->storage->get_hierarchy_delimiter(); $path = explode($delimiter, $path); $result = array(); foreach ($path as $idx => $dir) { $directory = implode($delimiter, array_slice($path, 0, $idx+1)); - if ($protect_folders && in_array($directory, $default_folders)) { + if ($protect_folders && $this->storage->is_special_folder($directory)) { unset($result); $result[] = $this->localize_foldername($directory); } @@ -2021,6 +2015,55 @@ class rcmail extends rcube return $size; } + /** + * Returns message UID(s) and IMAP folder(s) from GET/POST data + * + * @param string UID value to decode + * @param string Default mailbox value (if not encoded in UIDs) + * @return array List of message UIDs per folder + */ + public static function get_uids($uids = null, $mbox = null) + { + // message UID (or comma-separated list of IDs) is provided in + // the form of <ID>-<MBOX>[,<ID>-<MBOX>]* + + $_uid = $uids ?: rcube_utils::get_input_value('_uid', RCUBE_INPUT_GPC); + $_mbox = $mbox ?: (string)rcube_utils::get_input_value('_mbox', RCUBE_INPUT_GPC); + + // already a hash array + if (is_array($_uid) && !isset($_uid[0])) { + return $_uid; + } + + $result = array(); + + // special case: * + if ($_uid == '*' && is_object($_SESSION['search'][1]) && $_SESSION['search'][1]->multi) { + // extract the full list of UIDs per folder from the search set + foreach ($_SESSION['search'][1]->sets as $subset) { + $mbox = $subset->get_parameters('MAILBOX'); + $result[$mbox] = $subset->get(); + } + } + else { + if (is_string($_uid)) + $_uid = explode(',', $_uid); + + // create a per-folder UIDs array + foreach ((array)$_uid as $uid) { + list($uid, $mbox) = explode('-', $uid, 2); + if (!strlen($mbox)) + $mbox = $_mbox; + if ($uid == '*') + $result[$mbox] = $uid; + else + $result[$mbox][] = $uid; + } + } + + return $result; + } + /************************************************************************ ********* Deprecated methods (to be removed) ********* |