diff options
| author | thomascube <thomas@roundcube.net> | 2005-10-22 14:17:25 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2005-10-22 14:17:25 +0000 |
| commit | f619dedc5aa2020eeffa01e05feacedb043ccb66 (patch) | |
| tree | 21d544808edbd23837951cbe19d64ed84242dbe5 /program/include | |
| parent | 7dd801e71011f62ff7b2dd59636a6908fd037993 (diff) | |
Patches for 20051021 release
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/main.inc | 18 | ||||
| -rw-r--r-- | program/include/rcube_imap.inc | 4 | ||||
| -rw-r--r-- | program/include/rcube_shared.inc | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/program/include/main.inc b/program/include/main.inc index f0df4ef65..7955aa870 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -253,6 +253,15 @@ function rcmail_login($user, $pass, $host=NULL) if (!$host) $host = $CONFIG['default_host']; + // parse $host URL + $a_host = parse_url($host); + if ($a_host['host']) + { + $host = $a_host['host']; + $imap_ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? TRUE : FALSE; + $imap_port = isset($a_host['port']) ? $a_host['port'] : ($imap_ssl ? 993 : $CONFIG['default_port']); + } + // query if user already registered $sql_result = $DB->query(sprintf("SELECT user_id, username, language, preferences FROM %s @@ -269,15 +278,6 @@ function rcmail_login($user, $pass, $host=NULL) $user = $sql_arr['username']; } - // parse $host URL - $a_host = parse_url($host); - if ($a_host['host']) - { - $host = $a_host['host']; - $imap_ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? TRUE : FALSE; - $imap_port = isset($a_host['port']) ? $a_host['port'] : ($imap_ssl ? 993 : $CONFIG['default_port']); - } - // exit if IMAP login failed if (!($imap_login = $IMAP->connect($host, $user, $pass, $imap_port, $imap_ssl))) return FALSE; diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc index 009c80add..47999c860 100644 --- a/program/include/rcube_imap.inc +++ b/program/include/rcube_imap.inc @@ -1086,10 +1086,10 @@ class rcube_imap function _mod_mailbox($mbox, $mode='in') { - if (!empty($this->root_ns) && $this->root_ns == $mbox) + if ((!empty($this->root_ns) && $this->root_ns == $mbox) || ($mbox == 'INBOX' && $mode == 'in')) return $mbox; - if (!empty($this->root_dir) && $mode=='in') + if (!empty($this->root_dir) && $mode=='in') $mbox = $this->root_dir.$this->delimiter.$mbox; else if (strlen($this->root_dir) && $mode=='out') $mbox = substr($mbox, strlen($this->root_dir)+1); diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc index 6874094a1..c0df2e585 100644 --- a/program/include/rcube_shared.inc +++ b/program/include/rcube_shared.inc @@ -1245,7 +1245,7 @@ function rep_specialchars_output($str, $enctype='', $mode='', $newlines=TRUE) // encode for javascript use if ($enctype=='js') - return preg_replace(array("/\r\n/", '/"/', "/'/"), array('\n', '\"', "\'"), strtr($str, $js_rep_table)); + return preg_replace(array("/\r\n/", '/"/', "/([^\\\])'/"), array('\n', '\"', "$1\'"), strtr($str, $js_rep_table)); // encode for RTF if ($enctype=='rtf') |