|
@@ 4846-4881 (lines=36) @@
|
| 4843 |
|
if (isset($_messageList['activeFilters']) && $_messageList['activeFilters']) |
| 4844 |
|
{ |
| 4845 |
|
$query = $_messageList['activeFilters']; |
| 4846 |
|
if (!empty($query['search']) || !empty($query['filter'])||($query['cat_id']=='bydate' && (!empty($query['startdate'])||!empty($query['enddate'])))) |
| 4847 |
|
{ |
| 4848 |
|
//([filterName] => Schnellsuche[type] => quick[string] => ebay[status] => any |
| 4849 |
|
if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) |
| 4850 |
|
{ |
| 4851 |
|
Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10); |
| 4852 |
|
if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID]=true; |
| 4853 |
|
} |
| 4854 |
|
$filtered = true; |
| 4855 |
|
$cutoffdate = $cutoffdate2 = null; |
| 4856 |
|
if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'],'ts');//SINCE, enddate |
| 4857 |
|
if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'],'ts');//BEFORE, startdate |
| 4858 |
|
//error_log(__METHOD__.__LINE__.' Startdate:'.$cutoffdate2.' Enddate'.$cutoffdate); |
| 4859 |
|
$filter = array( |
| 4860 |
|
'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?lang('quicksearch'):lang('subject')), |
| 4861 |
|
'type' => ($query['cat_id']?$query['cat_id']:(Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?'quick':'subject')), |
| 4862 |
|
'string' => $query['search'], |
| 4863 |
|
'status' => (!empty($query['filter'])?$query['filter']:'any'), |
| 4864 |
|
//'range'=>"BETWEEN",'since'=> date("d-M-Y", $cutoffdate),'before'=> date("d-M-Y", $cutoffdate2) |
| 4865 |
|
); |
| 4866 |
|
if ($query['enddate']||$query['startdate']) { |
| 4867 |
|
$filter['range'] = "BETWEEN"; |
| 4868 |
|
if ($cutoffdate) { |
| 4869 |
|
$filter[(empty($cutoffdate2)?'date':'since')] = date("d-M-Y", $cutoffdate); |
| 4870 |
|
if (empty($cutoffdate2)) $filter['range'] = "SINCE"; |
| 4871 |
|
} |
| 4872 |
|
if ($cutoffdate2) { |
| 4873 |
|
$filter[(empty($cutoffdate)?'date':'before')] = date("d-M-Y", $cutoffdate2); |
| 4874 |
|
if (empty($cutoffdate)) $filter['range'] = "BEFORE"; |
| 4875 |
|
} |
| 4876 |
|
} |
| 4877 |
|
} |
| 4878 |
|
else |
| 4879 |
|
{ |
| 4880 |
|
$filter = array(); |
| 4881 |
|
} |
| 4882 |
|
//error_log(__METHOD__.__LINE__."->".print_r($filter,true).' folder:'.$folder.' Method:'.$_forceDeleteMethod); |
| 4883 |
|
$reverse = 1; |
| 4884 |
|
$rByUid = true; |
|
@@ 5006-5041 (lines=36) @@
|
| 5003 |
|
if (isset($_messageList['activeFilters']) && $_messageList['activeFilters']) |
| 5004 |
|
{ |
| 5005 |
|
$query = $_messageList['activeFilters']; |
| 5006 |
|
if (!empty($query['search']) || !empty($query['filter'])||($query['cat_id']=='bydate' && (!empty($query['startdate'])||!empty($query['enddate'])))) |
| 5007 |
|
{ |
| 5008 |
|
//([filterName] => Schnellsuche[type] => quick[string] => ebay[status] => any |
| 5009 |
|
if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) |
| 5010 |
|
{ |
| 5011 |
|
Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10); |
| 5012 |
|
if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID]=true; |
| 5013 |
|
} |
| 5014 |
|
$filtered = true; |
| 5015 |
|
$cutoffdate = $cutoffdate2 = null; |
| 5016 |
|
if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'],'ts');//SINCE, enddate |
| 5017 |
|
if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'],'ts');//BEFORE, startdate |
| 5018 |
|
//error_log(__METHOD__.__LINE__.' Startdate:'.$cutoffdate2.' Enddate'.$cutoffdate); |
| 5019 |
|
$filter = array( |
| 5020 |
|
'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?lang('quicksearch'):lang('subject')), |
| 5021 |
|
'type' => ($query['cat_id']?$query['cat_id']:(Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?'quick':'subject')), |
| 5022 |
|
'string' => $query['search'], |
| 5023 |
|
'status' => (!empty($query['filter'])?$query['filter']:'any'), |
| 5024 |
|
//'range'=>"BETWEEN",'since'=> date("d-M-Y", $cutoffdate),'before'=> date("d-M-Y", $cutoffdate2) |
| 5025 |
|
); |
| 5026 |
|
if ($query['enddate']||$query['startdate']) { |
| 5027 |
|
$filter['range'] = "BETWEEN"; |
| 5028 |
|
if ($cutoffdate) { |
| 5029 |
|
$filter[(empty($cutoffdate2)?'date':'since')] = date("d-M-Y", $cutoffdate); |
| 5030 |
|
if (empty($cutoffdate2)) $filter['range'] = "SINCE"; |
| 5031 |
|
} |
| 5032 |
|
if ($cutoffdate2) { |
| 5033 |
|
$filter[(empty($cutoffdate)?'date':'before')] = date("d-M-Y", $cutoffdate2); |
| 5034 |
|
if (empty($cutoffdate)) $filter['range'] = "BEFORE"; |
| 5035 |
|
} |
| 5036 |
|
} |
| 5037 |
|
} |
| 5038 |
|
else |
| 5039 |
|
{ |
| 5040 |
|
$filter = array(); |
| 5041 |
|
} |
| 5042 |
|
$reverse = 1; |
| 5043 |
|
$rByUid = true; |
| 5044 |
|
$_sR = $this->mail_bo->getSortedList( |
EGroupware /
egroupware
