extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-18 11:58:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

add some new searchTypes; remember last SearchType used with user-pref

Browse Source
This commit is contained in:
Klaus Leithoff 2016-03-24 10:38:35 +00:00
parent 2e148944cd
commit 99193029da
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mail/inc/class.mail_ui.inc.php
View File

@ -86,12 +86,15 @@ class mail_ui
*/ */
var $searchTypes = array( var $searchTypes = array(
'quick' => 'quicksearch', // lang('quicksearch') 'quick' => 'quicksearch', // lang('quicksearch')
'quickwithcc'=> 'quicksearch (with cc)', // lang('quicksearch (with cc)')
'subject' => 'subject', // lang('subject') 'subject' => 'subject', // lang('subject')
'body' => 'message body', // lang('message body') 'body' => 'message body', // lang('message body')
'from' => 'from', // lang('from') 'from' => 'from', // lang('from')
'to' => 'to', // lang('to') 'to' => 'to', // lang('to')
'cc' => 'cc', // lang('cc') 'cc' => 'cc', // lang('cc')
'text' => 'whole message', // lang('whole message') 'text' => 'whole message', // lang('whole message')
'larger' => 'greater than', // lang('greater than')
'smaller' => 'less than', // lang('less than')
// 'custom' => 'Selected range',// lang('Selected range') // 'custom' => 'Selected range',// lang('Selected range')
); );
@ -523,8 +526,15 @@ class mail_ui
emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10); emailadmin_imapbase::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10);
if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true; if (!isset(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])) emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]=true;
} }
if (!emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]) unset($this->searchTypes['quick']); if (!emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])
{
unset($this->searchTypes['quick']);
unset($this->searchTypes['quickwithcc']);
}
$sel_options['cat_id'] = $this->searchTypes; $sel_options['cat_id'] = $this->searchTypes;
error_log(__METHOD__.__LINE__.array2string($sel_options['cat_id']));
error_log(__METHOD__.__LINE__.array2string($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType']));
$content[self::$nm_index]['cat_id'] = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType'];
$sel_options['filter'] = $this->statusTypes; $sel_options['filter'] = $this->statusTypes;
$sel_options['filter2'] = array(''=>'No details',1=>'Details'); $sel_options['filter2'] = array(''=>'No details',1=>'Details');
$content[self::$nm_index]['filter2'] = $GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails']; $content[self::$nm_index]['filter2'] = $GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails'];
@ -1337,9 +1347,19 @@ class mail_ui
$filter['status'] = $query['filter']; $filter['status'] = $query['filter'];
} }
$reverse = ($query['sort']=='ASC'?false:true); $reverse = ($query['sort']=='ASC'?false:true);
$prefchanged = false;
if (!isset($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType']) || ($query['cat_id'] !=$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveSearchType']))
{
$GLOBALS['egw']->preferences->add('mail','ActiveSearchType',$query['cat_id'],'user');
$prefchanged = true;
}
if (!isset($GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails']) || ($query['filter2'] !=$GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails'])) if (!isset($GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails']) || ($query['filter2'] !=$GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails']))
{ {
$GLOBALS['egw']->preferences->add('mail','ShowDetails',$query['filter2'],'user'); $GLOBALS['egw']->preferences->add('mail','ShowDetails',$query['filter2'],'user');
$prefchanged = true;
}
if ($prefchanged)
{
// save prefs // save prefs
$GLOBALS['egw']->preferences->save_repository(true); $GLOBALS['egw']->preferences->save_repository(true);
} }
@ -4143,6 +4163,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
if (!emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]) if (!emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID])
{ {
unset($this->searchTypes['quick']); unset($this->searchTypes['quick']);
unset($this->searchTypes['quickwithcc']);
} }
if ( $this->mail_bo->icServer->hasCapability('SUPPORTS_KEYWORDS')) if ( $this->mail_bo->icServer->hasCapability('SUPPORTS_KEYWORDS'))
{ {