|
@@ 4731-4766 (lines=36) @@
|
| 4728 |
|
if (isset($_messageList['activeFilters']) && $_messageList['activeFilters']) |
| 4729 |
|
{ |
| 4730 |
|
$query = $_messageList['activeFilters']; |
| 4731 |
|
if (!empty($query['search']) || !empty($query['filter'])||($query['cat_id']=='bydate' && (!empty($query['startdate'])||!empty($query['enddate'])))) |
| 4732 |
|
{ |
| 4733 |
|
//([filterName] => Schnellsuche[type] => quick[string] => ebay[status] => any |
| 4734 |
|
if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) |
| 4735 |
|
{ |
| 4736 |
|
Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10); |
| 4737 |
|
if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID]=true; |
| 4738 |
|
} |
| 4739 |
|
$filtered = true; |
| 4740 |
|
$cutoffdate = $cutoffdate2 = null; |
| 4741 |
|
if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'],'ts');//SINCE, enddate |
| 4742 |
|
if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'],'ts');//BEFORE, startdate |
| 4743 |
|
//error_log(__METHOD__.__LINE__.' Startdate:'.$cutoffdate2.' Enddate'.$cutoffdate); |
| 4744 |
|
$filter = array( |
| 4745 |
|
'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?lang('quicksearch'):lang('subject')), |
| 4746 |
|
'type' => ($query['cat_id']?$query['cat_id']:(Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?'quick':'subject')), |
| 4747 |
|
'string' => $query['search'], |
| 4748 |
|
'status' => (!empty($query['filter'])?$query['filter']:'any'), |
| 4749 |
|
//'range'=>"BETWEEN",'since'=> date("d-M-Y", $cutoffdate),'before'=> date("d-M-Y", $cutoffdate2) |
| 4750 |
|
); |
| 4751 |
|
if ($query['enddate']||$query['startdate']) { |
| 4752 |
|
$filter['range'] = "BETWEEN"; |
| 4753 |
|
if ($cutoffdate) { |
| 4754 |
|
$filter[(empty($cutoffdate2)?'date':'since')] = date("d-M-Y", $cutoffdate); |
| 4755 |
|
if (empty($cutoffdate2)) $filter['range'] = "SINCE"; |
| 4756 |
|
} |
| 4757 |
|
if ($cutoffdate2) { |
| 4758 |
|
$filter[(empty($cutoffdate)?'date':'before')] = date("d-M-Y", $cutoffdate2); |
| 4759 |
|
if (empty($cutoffdate)) $filter['range'] = "BEFORE"; |
| 4760 |
|
} |
| 4761 |
|
} |
| 4762 |
|
} |
| 4763 |
|
else |
| 4764 |
|
{ |
| 4765 |
|
$filter = array(); |
| 4766 |
|
} |
| 4767 |
|
//error_log(__METHOD__.__LINE__."->".print_r($filter,true).' folder:'.$folder.' Method:'.$_forceDeleteMethod); |
| 4768 |
|
$reverse = 1; |
| 4769 |
|
$rByUid = true; |
|
@@ 4891-4926 (lines=36) @@
|
| 4888 |
|
if (isset($_messageList['activeFilters']) && $_messageList['activeFilters']) |
| 4889 |
|
{ |
| 4890 |
|
$query = $_messageList['activeFilters']; |
| 4891 |
|
if (!empty($query['search']) || !empty($query['filter'])||($query['cat_id']=='bydate' && (!empty($query['startdate'])||!empty($query['enddate'])))) |
| 4892 |
|
{ |
| 4893 |
|
//([filterName] => Schnellsuche[type] => quick[string] => ebay[status] => any |
| 4894 |
|
if (is_null(Mail::$supportsORinQuery) || !isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) |
| 4895 |
|
{ |
| 4896 |
|
Mail::$supportsORinQuery = Api\Cache::getCache(Api\Cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), 60*60*10); |
| 4897 |
|
if (!isset(Mail::$supportsORinQuery[$this->mail_bo->profileID])) Mail::$supportsORinQuery[$this->mail_bo->profileID]=true; |
| 4898 |
|
} |
| 4899 |
|
$filtered = true; |
| 4900 |
|
$cutoffdate = $cutoffdate2 = null; |
| 4901 |
|
if ($query['startdate']) $cutoffdate = Api\DateTime::to($query['startdate'],'ts');//SINCE, enddate |
| 4902 |
|
if ($query['enddate']) $cutoffdate2 = Api\DateTime::to($query['enddate'],'ts');//BEFORE, startdate |
| 4903 |
|
//error_log(__METHOD__.__LINE__.' Startdate:'.$cutoffdate2.' Enddate'.$cutoffdate); |
| 4904 |
|
$filter = array( |
| 4905 |
|
'filterName' => (Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?lang('quicksearch'):lang('subject')), |
| 4906 |
|
'type' => ($query['cat_id']?$query['cat_id']:(Mail::$supportsORinQuery[$mail_ui->mail_bo->profileID]?'quick':'subject')), |
| 4907 |
|
'string' => $query['search'], |
| 4908 |
|
'status' => (!empty($query['filter'])?$query['filter']:'any'), |
| 4909 |
|
//'range'=>"BETWEEN",'since'=> date("d-M-Y", $cutoffdate),'before'=> date("d-M-Y", $cutoffdate2) |
| 4910 |
|
); |
| 4911 |
|
if ($query['enddate']||$query['startdate']) { |
| 4912 |
|
$filter['range'] = "BETWEEN"; |
| 4913 |
|
if ($cutoffdate) { |
| 4914 |
|
$filter[(empty($cutoffdate2)?'date':'since')] = date("d-M-Y", $cutoffdate); |
| 4915 |
|
if (empty($cutoffdate2)) $filter['range'] = "SINCE"; |
| 4916 |
|
} |
| 4917 |
|
if ($cutoffdate2) { |
| 4918 |
|
$filter[(empty($cutoffdate)?'date':'before')] = date("d-M-Y", $cutoffdate2); |
| 4919 |
|
if (empty($cutoffdate)) $filter['range'] = "BEFORE"; |
| 4920 |
|
} |
| 4921 |
|
} |
| 4922 |
|
} |
| 4923 |
|
else |
| 4924 |
|
{ |
| 4925 |
|
$filter = array(); |
| 4926 |
|
} |
| 4927 |
|
$reverse = 1; |
| 4928 |
|
$rByUid = true; |
| 4929 |
|
$_sR = $this->mail_bo->getSortedList( |
EGroupware /
egroupware
