diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php index f3440f0676..3200fee891 100644 --- a/mail/inc/class.mail_ui.inc.php +++ b/mail/inc/class.mail_ui.inc.php @@ -82,7 +82,7 @@ class mail_ui 'get_rows' => 'mail.mail_ui.get_rows', // I method/callback to request the data for the rows eg. 'notes.bo.get_rows' 'filter' => 'INBOX', // filter is used to choose the mailbox 'no_filter2' => false, // I disable the 2. filter (params are the same as for filter) - 'no_cat' => false, // I disable the cat-selectbox + 'no_cat' => true, // I disable the cat-selectbox //'cat_is_select' => 'no_lang', // true or no_lang 'lettersearch' => false, // I show a lettersearch 'searchletter' => false, // I0 active letter of the lettersearch or false for [all] @@ -99,8 +99,12 @@ class mail_ui } } // filter is used to choose the mailbox - //if (!isset($content['nm']['foldertree'])) // maybe wev fetch the folder here - $sel_options['nm']['foldertree'] = array('/'=>'IMAP Server','/INBOX'=>'INBOX'); + //if (!isset($content['nm']['foldertree'])) // maybe we fetch the folder here + $sel_options['foldertree'] = array( + '/'=>array('path'=>'/', 'label'=>'IMAP Server','title'=>'IMAP Server','image'=>'kfm_home.png'), + '/INBOX'=>array('path'=>'/INBOX','label'=>'INBOX','title'=>'INBOX') + ); + $sel_options['cat_id'] = array(1=>'none'); if (!isset($content['nm']['filter'])) $content['nm']['filter'] = 'INBOX'; if (!isset($content['nm']['cat_id'])) $content['nm']['cat_id'] = 'All'; $etpl = new etemplate('mail.index'); @@ -114,6 +118,12 @@ class mail_ui function TestConnection () { $preferences =& $this->mail_bo->mailPreferences; + // load translations + translation::add_app('mail'); + + common::egw_header(); + parse_navbar(); + //$GLOBALS['egw']->framework->sidebox(); if ($preferences->preferences['prefcontroltestconnection'] == 'none') die('You should not be here!'); @@ -241,8 +251,7 @@ class mail_ui 'msg' => lang("There is no IMAP Server configured.")." - ".lang("Please configure access to an existing individual IMAP account."), )); } - - exit; + common::egw_footer(); } /** @@ -680,7 +689,7 @@ error_log(__METHOD__.__LINE__.array2string($query)); if (empty($rowsFetched['messages'])) $rowsFetched['messages'] = $rowsFetched['rowsFetched']; //error_log(__METHOD__.__LINE__.' Rows fetched:'.$rowsFetched.' Data:'.array2string($sortResult)); - $cols = array('row_id','uid','check','status','attachments','subject','toaddress','fromaddress','date','size'); + $cols = array('row_id','uid','check','status','attachments','subject','toaddress','fromaddress','date','size','modified'); if ($GLOBALS['egw_info']['user']['preferences']['common']['select_mode']=='EGW_SELECTMODE_TOGGLE') unset($cols[0]); $rows = $this->header2gridelements($sortResult['header'],$cols, $_folderName, $folderType,$previewMessage); //error_log(__METHOD__.__LINE__.array2string($rows)); @@ -1007,6 +1016,10 @@ error_log(__METHOD__.__LINE__.array2string($query)); */ $data["date"] = $header['date'];//$dateShort;//''.$dateShort.''; } + if (in_array("modified", $cols)) + { + $data["modified"] = $header['internaldate']; + } if (in_array("size", $cols)) $data["size"] = self::show_readable_size($header['size']); /// size diff --git a/mail/setup/etemplates.inc.php b/mail/setup/etemplates.inc.php index 920c264f5d..91c4c20ec5 100644 --- a/mail/setup/etemplates.inc.php +++ b/mail/setup/etemplates.inc.php @@ -2,7 +2,7 @@ /** * EGroupware - eTemplates for Application mail * http://www.egroupware.org - * generated by soetemplate::dump4setup() 2013-02-11 11:44 + * generated by soetemplate::dump4setup() 2013-02-11 13:22 * * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @package mail @@ -16,3 +16,5 @@ $templ_data[] = array('name' => 'mail.index','template' => '','lang' => '','grou $templ_data[] = array('name' => 'mail.index.rows','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:2:"c1";s:2:"th";s:1:"A";s:2:"25";s:1:"F";s:2:"50";s:1:"E";s:3:"120";s:1:"D";s:3:"120";s:1:"C";s:2:"95";}i:1;a:6:{s:1:"A";a:4:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:2:"ID";s:4:"name";s:3:"uid";s:8:"readonly";s:1:"1";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"subject";s:5:"label";s:7:"subject";}s:1:"C";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"date";s:4:"name";s:4:"date";s:5:"align";s:6:"center";}s:1:"D";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:2:"to";s:4:"name";s:9:"toaddress";}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"from";s:4:"name";s:11:"fromaddress";}s:1:"F";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"size";s:4:"name";s:4:"size";s:5:"align";s:6:"center";}}i:2;a:6:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[uid]";s:8:"readonly";s:1:"1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[subject]";}s:1:"C";a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:12:"${row}[date]";s:8:"readonly";s:1:"1";s:5:"align";s:6:"center";}s:1:"D";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:17:"${row}[toaddress]";s:8:"readonly";s:1:"1";}s:1:"E";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:19:"${row}[fromaddress]";s:8:"readonly";s:1:"1";}s:1:"F";a:5:{s:4:"type";s:5:"label";s:4:"name";s:12:"${row}[size]";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";s:5:"align";s:5:"right";}}}s:4:"rows";i:2;s:4:"cols";i:6;}}','size' => '','style' => '','modified' => '1360252030',); +$templ_data[] = array('name' => 'mail.TestConnection','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1360585356',); +