Only in /var/web/oberon.atia.com/mail/config: db.inc.php Only in /var/web/oberon.atia.com/mail/config: main.inc.php Only in /var/web/oberon.atia.com/mail/logs: console Only in /var/web/oberon.atia.com/mail/logs: errors Only in /var/web/oberon.atia.com/mail/logs: userlogins diff -ru roundcubemail/program/include/main.inc /var/web/oberon.atia.com/mail/program/include/main.inc --- roundcubemail/program/include/main.inc Mon Mar 2 20:23:16 2009 +++ /var/web/oberon.atia.com/mail/program/include/main.inc Thu Oct 22 03:29:49 2009 @@ -1071,6 +1071,8 @@ $classes[] = 'trash'; else if ($folder['id']==$CONFIG['junk_mbox']) $classes[] = 'junk'; + else if ($folder['id']==$CONFIG['inbox_mbox']) + $classes[] = 'inbox'; else if ($folder['id']=='INBOX') $classes[] = 'inbox'; else @@ -1165,7 +1167,7 @@ global $CONFIG; // for these mailboxes we have localized labels and css classes - foreach (array('sent', 'drafts', 'trash', 'junk') as $smbx) + foreach (array('inbox', 'sent', 'drafts', 'trash', 'junk') as $smbx) { if ($folder_id == $CONFIG[$smbx.'_mbox']) return $smbx; diff -ru roundcubemail/program/include/rcube_config.php /var/web/oberon.atia.com/mail/program/include/rcube_config.php --- roundcubemail/program/include/rcube_config.php Sat Dec 6 20:52:18 2008 +++ /var/web/oberon.atia.com/mail/program/include/rcube_config.php Thu Oct 22 01:45:00 2009 @@ -76,7 +76,7 @@ $this->prop['temp_dir'] = $this->prop['temp_dir'] ? unslashify($this->prop['temp_dir']) : INSTALL_PATH . 'temp'; // fix default imap folders encoding - foreach (array('drafts_mbox', 'junk_mbox', 'sent_mbox', 'trash_mbox') as $folder) + foreach (array('inbox_mbox', 'drafts_mbox', 'junk_mbox', 'sent_mbox', 'trash_mbox') as $folder) $this->prop[$folder] = rcube_charset_convert($this->prop[$folder], RCMAIL_CHARSET, 'UTF-7'); if (!empty($this->prop['default_imap_folders'])) diff -ru roundcubemail/program/include/rcube_imap.php /var/web/oberon.atia.com/mail/program/include/rcube_imap.php --- roundcubemail/program/include/rcube_imap.php Thu Dec 25 10:33:21 2008 +++ /var/web/oberon.atia.com/mail/program/include/rcube_imap.php Thu Oct 22 03:33:44 2009 @@ -77,6 +77,11 @@ function __construct($db_conn) { $this->db = $db_conn; + $inbox = rcmail::get_instance()->config->get('inbox_mbox', 'INBOX'); + //console("inbox on construct: ".$inbox); + $this->mailbox = $inbox; + $this->default_folders = array($inbox); + $this->default_folders_lc = array(strtolower($inbox)); } @@ -399,8 +404,8 @@ $a_out[] = $name; } - // INBOX should always be available - if (!in_array_nocase('INBOX', $a_out)) + // at least INBOX should always be available + if (empty($a_out)) array_unshift($a_out, 'INBOX'); // sort mailboxes diff -ru roundcubemail/program/js/app.js /var/web/oberon.atia.com/mail/program/js/app.js --- roundcubemail/program/js/app.js Tue Dec 30 17:25:56 2008 +++ /var/web/oberon.atia.com/mail/program/js/app.js Thu Oct 22 03:26:40 2009 @@ -947,7 +947,7 @@ } var url=this.get_task_url(_5d); if(_5d=="mail"){ -url+="&_mbox=INBOX"; +//url+="&_mbox=INBOX"; } this.redirect(url); }; diff -ru roundcubemail/program/js/app.js.src /var/web/oberon.atia.com/mail/program/js/app.js.src --- roundcubemail/program/js/app.js.src Tue Dec 30 17:25:19 2008 +++ /var/web/oberon.atia.com/mail/program/js/app.js.src Thu Oct 22 03:34:16 2009 @@ -1131,7 +1131,7 @@ var url = this.get_task_url(task); if (task=='mail') - url += '&_mbox=INBOX'; +// url += '&_mbox=INBOX'; this.redirect(url); }; Only in /var/web/oberon.atia.com/mail/program/js/tiny_mce/plugins: cleanup Only in /var/web/oberon.atia.com/mail/program/js/tiny_mce/plugins/emotions: images Only in /var/web/oberon.atia.com/mail/program/js/tiny_mce/plugins/emotions: jscripts Only in /var/web/oberon.atia.com/mail/program/js/tiny_mce/plugins/media: images Only in /var/web/oberon.atia.com/mail/program/js/tiny_mce/plugins/media: jscripts Only in /var/web/oberon.atia.com/mail/program/js/tiny_mce/plugins/nonbreaking: images Only in /var/web/oberon.atia.com/mail/program/js/tiny_mce/plugins/nonbreaking: langs Only in /var/web/oberon.atia.com/mail/program/js/tiny_mce/plugins/searchreplace: images Only in /var/web/oberon.atia.com/mail/program/js/tiny_mce/plugins/searchreplace: jscripts Only in /var/web/oberon.atia.com/mail/program/js/tiny_mce/plugins/spellchecker: images Only in /var/web/oberon.atia.com/mail/program/js/tiny_mce/plugins/spellchecker: langs Only in /var/web/oberon.atia.com/mail/program/js/tiny_mce/plugins/table: images Only in /var/web/oberon.atia.com/mail/program/js/tiny_mce/plugins/table: jscripts Only in /var/web/oberon.atia.com/mail/program/js/tiny_mce/plugins/visualchars: images Only in /var/web/oberon.atia.com/mail/program/js/tiny_mce/plugins/visualchars: langs Only in /var/web/oberon.atia.com/mail/program/js/tiny_mce/themes/advanced: css Only in /var/web/oberon.atia.com/mail/program/js/tiny_mce/themes/advanced: docs Only in /var/web/oberon.atia.com/mail/program/js/tiny_mce/themes/advanced: images Only in /var/web/oberon.atia.com/mail/program/js/tiny_mce/themes/advanced: jscripts diff -ru roundcubemail/program/steps/mail/func.inc /var/web/oberon.atia.com/mail/program/steps/mail/func.inc --- roundcubemail/program/steps/mail/func.inc Tue Dec 30 15:30:20 2008 +++ /var/web/oberon.atia.com/mail/program/steps/mail/func.inc Thu Oct 22 01:45:50 2009 @@ -89,6 +89,8 @@ $OUTPUT->set_env('quota', $IMAP->get_capability('quota')); $OUTPUT->set_env('delimiter', $IMAP->get_hierarchy_delimiter()); + if ($CONFIG['inbox_mbox']) + $OUTPUT->set_env('inbox_mailbox', $CONFIG['inbox_mbox']); if ($CONFIG['trash_mbox']) $OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']); if ($CONFIG['drafts_mbox']) diff -ru roundcubemail/program/steps/settings/func.inc /var/web/oberon.atia.com/mail/program/steps/settings/func.inc --- roundcubemail/program/steps/settings/func.inc Tue Dec 16 21:05:50 2008 +++ /var/web/oberon.atia.com/mail/program/steps/settings/func.inc Thu Oct 22 03:07:00 2009 @@ -309,6 +309,12 @@ $table = new html_table(array('cols' => 2)); + if (!isset($no_override['inbox_mbox'])) { + $table->add('title', Q(rcube_label('inbox'))); + $select_inbox = rcmail_mailbox_select(array('realnames' => true, 'maxlength' => 30)); + $table->add(null, $select_inbox->show($config['inbox_mbox'], array('name' => "_inbox_mbox"))); + } + if (!isset($no_override['drafts_mbox'])) { $table->add('title', Q(rcube_label('drafts'))); $table->add(null, $select->show($config['drafts_mbox'], array('name' => "_drafts_mbox", 'onchange' => "document.getElementById('rcmfd_autosave').disabled=this.selectedIndex==0"))); diff -ru roundcubemail/program/steps/settings/save_prefs.inc /var/web/oberon.atia.com/mail/program/steps/settings/save_prefs.inc --- roundcubemail/program/steps/settings/save_prefs.inc Thu Dec 4 12:21:34 2008 +++ /var/web/oberon.atia.com/mail/program/steps/settings/save_prefs.inc Thu Oct 22 02:08:54 2009 @@ -42,6 +42,7 @@ 'mime_param_folding' => isset($_POST['_mime_param_folding']) ? intval($_POST['_mime_param_folding']) : 0, 'mdn_requests' => isset($_POST['_mdn_requests']) ? intval($_POST['_mdn_requests']) : 0, 'skin' => isset($_POST['_skin']) ? get_input_value('_skin', RCUBE_INPUT_POST) : $CONFIG['skin'], + 'inbox_mbox' => get_input_value('_inbox_mbox', RCUBE_INPUT_POST), 'drafts_mbox' => get_input_value('_drafts_mbox', RCUBE_INPUT_POST), 'sent_mbox' => get_input_value('_sent_mbox', RCUBE_INPUT_POST), 'junk_mbox' => get_input_value('_junk_mbox', RCUBE_INPUT_POST), @@ -54,12 +55,12 @@ // special handling for 'default_imap_folders' if (in_array('default_imap_folders', (array)$CONFIG['dont_override'])) { - foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) + foreach (array('inbox_mbox','drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) $a_user_prefs[$p] = $CONFIG[$p]; } else { $a_user_prefs['default_imap_folders'] = array('INBOX'); - foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) { + foreach (array('inbox_mbox','drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) { if ($a_user_prefs[$p]) $a_user_prefs['default_imap_folders'][] = $a_user_prefs[$p]; }