extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-08 23:19:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

* eMail: some Servers have very limited SEARCH capability; (no OR allowed/supported) try to detect and act accordingly

Browse Source
This commit is contained in:
Klaus Leithoff 2014-04-10 13:24:56 +00:00
parent 4c52933c35
commit 8eb9ec8ad6
3 changed files with 65 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
felamimail/inc/class.felamimail_activesync.inc.php
View File

@ -1705,9 +1705,15 @@ class felamimail_activesync implements activesync_plugin_write, activesync_plugi
//} //}
if (isset($searchquery['query'][0]['value']['FolderId'])) $folderid = $searchquery['query'][0]['value']['FolderId']; if (isset($searchquery['query'][0]['value']['FolderId'])) $folderid = $searchquery['query'][0]['value']['FolderId'];
// other types may be possible - we support quicksearch first (freeText in subject and from (or TO in Sent Folder)) // other types may be possible - we support quicksearch first (freeText in subject and from (or TO in Sent Folder))
if (is_null(felamimail_bo::$supportsORinQuery) || !isset(felamimail_bo::$supportsORinQuery[$this->mail->profileID]))
{
felamimail_bo::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']),$callback=null,$callback_params=array(),$expiration=60*60*10);
if (!isset(felamimail_bo::$supportsORinQuery[$this->mail->profileID])) felamimail_bo::$supportsORinQuery[$this->mail->profileID]=true;
}
if (isset($searchquery['query'][0]['value']['Search:FreeText'])) if (isset($searchquery['query'][0]['value']['Search:FreeText']))
{ {
$type = 'quick'; $type = (felamimail_bo::$supportsORinQuery[$this->mail->profileID]?'quick':'subject');
$searchText = $searchquery['query'][0]['value']['Search:FreeText']; $searchText = $searchquery['query'][0]['value']['Search:FreeText'];
} }
if (!$folderid) if (!$folderid)
@ -1721,7 +1727,7 @@ class felamimail_activesync implements activesync_plugin_write, activesync_plugi
//if (isset($searchquery['query'][0]['value'][subquery][1][value][POOMMAIL:DateReceived])); //if (isset($searchquery['query'][0]['value'][subquery][1][value][POOMMAIL:DateReceived]));
//$_filter = array('status'=>array('UNDELETED'),'type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate)); //$_filter = array('status'=>array('UNDELETED'),'type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate));
$rv = $this->splitID($folderid,$account,$_folderName,$id); $rv = $this->splitID($folderid,$account,$_folderName,$id);
$_filter = array('type'=> 'quick', $_filter = array('type'=> (felamimail_bo::$supportsORinQuery[$this->mail->profileID]?'quick':'subject'),
'string'=> $searchText, 'string'=> $searchText,
'status'=>'any', 'status'=>'any',
); );

59
felamimail/inc/class.felamimail_bo.inc.php
View File

@ -84,6 +84,7 @@ class felamimail_bo
var $encoding = array("7bit", "8bit", "binary", "base64", "quoted-printable", "other"); var $encoding = array("7bit", "8bit", "binary", "base64", "quoted-printable", "other");
static $displayCharset; static $displayCharset;
static $folderStatusCache; static $folderStatusCache;
static $supportsORinQuery;
/** /**
* Instance of bopreference * Instance of bopreference
@ -760,7 +761,7 @@ class felamimail_bo
} }
function createIMAPFilter($_folder, $_criterias) function createIMAPFilter($_folder, $_criterias, $_supportsOrInQuery=true)
{ {
$all = 'ALL UNDELETED'; //'ALL' $all = 'ALL UNDELETED'; //'ALL'
//_debug_array($_criterias); //_debug_array($_criterias);
@ -777,9 +778,9 @@ class felamimail_bo
switch ($criteria) { switch ($criteria) {
case 'QUICK': case 'QUICK':
if($this->isSentFolder($_folder)) { if($this->isSentFolder($_folder)) {
$imapFilter .= 'OR SUBJECT "'. $_criterias['string'] .'" TO "'. $_criterias['string'] .'" '; $imapFilter .= ($_supportsOrInQuery?'OR ':'').'SUBJECT "'. $_criterias['string'] .'" TO "'. $_criterias['string'] .'" ';
} else { } else {
$imapFilter .= 'OR SUBJECT "'. $_criterias['string'] .'" FROM "'. $_criterias['string'] .'" '; $imapFilter .= ($_supportsOrInQuery?'OR ':'').'SUBJECT "'. $_criterias['string'] .'" FROM "'. $_criterias['string'] .'" ';
} }
break; break;
case 'BCC': case 'BCC':
@ -2922,7 +2923,13 @@ class felamimail_bo
} }
//error_log(__METHOD__." USE NO CACHE for Profile:". $this->profileID." Folder:".$_folderName.'->'.($setSession?'setSession':'checkrun')); //error_log(__METHOD__." USE NO CACHE for Profile:". $this->profileID." Folder:".$_folderName.'->'.($setSession?'setSession':'checkrun'));
if (self::$debug) error_log(__METHOD__." USE NO CACHE for Profile:". $this->profileID." Folder:".$_folderName." Filter:".array2string($_filter).function_backtrace()); if (self::$debug) error_log(__METHOD__." USE NO CACHE for Profile:". $this->profileID." Folder:".$_folderName." Filter:".array2string($_filter).function_backtrace());
$filter = $this->createIMAPFilter($_folderName, $_filter); //self::$supportsORinQuery[$this->profileID]=true;
if (is_null(self::$supportsORinQuery) || !isset(self::$supportsORinQuery[$this->profileID]))
{
self::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']),$callback=null,$callback_params=array(),$expiration=60*60*10);
if (!isset(self::$supportsORinQuery[$this->profileID])) self::$supportsORinQuery[$this->profileID]=true;
}
$filter = $this->createIMAPFilter($_folderName, $_filter, self::$supportsORinQuery[$this->profileID]);
//_debug_array($filter); //_debug_array($filter);
if($this->icServer->hasCapability('SORT')) { if($this->icServer->hasCapability('SORT')) {
@ -2964,33 +2971,63 @@ class felamimail_bo
$sortResult = $this->icServer->search($advFilter, $resultByUid); $sortResult = $this->icServer->search($advFilter, $resultByUid);
if (PEAR::isError($sortResult)) if (PEAR::isError($sortResult))
{ {
if (self::$debug) error_log(__METHOD__.__LINE__." Mailserver reports:".$sortResult->message.' '."$advFilter, $resultByUid");
if (stripos(array2string($sortResult->message),'BADCHARSET')!==false) if (stripos(array2string($sortResult->message),'BADCHARSET')!==false)
{ {
$supportsCharset[$this->profileID]=false; $supportsCharset[$this->profileID]=false;
egw_cache::setCache(egw_cache::INSTANCE,'email','supportsCharset'.trim($GLOBALS['egw_info']['user']['account_id']),$supportsCharset,$expiration=60*60*10); egw_cache::setCache(egw_cache::INSTANCE,'email','supportsCharset'.trim($GLOBALS['egw_info']['user']['account_id']),$supportsCharset,$expiration=60*60*10);
if (self::$debug) error_log(__METHOD__." Mailserver has NO CHARSET Capability:".$sortResult->message); if (self::$debug) error_log(__METHOD__.__LINE__." Mailserver has NO CHARSET Capability:".$sortResult->message);
}
elseif (stripos(array2string($sortResult->message),'BAD, UID')!==false)
{
$resultByUid=false;
}
elseif (stripos(array2string($sortResult->message),'BAD, SEARCH')!==false && self::$supportsORinQuery[$this->profileID])
{
self::$supportsORinQuery[$this->profileID]=false;
egw_cache::setCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']),self::$supportsORinQuery,$expiration=60*60*10);
$filter = $this->createIMAPFilter($_folderName, $_filter, self::$supportsORinQuery[$this->profileID]);
} }
else else
{ {
$filter='*'; $filter='*';
} }
$sortResult = $this->icServer->search($filter, $resultByUid); $sortResult = $this->icServer->search($filter, $resultByUid);
if (self::$debug) error_log(__METHOD__.__LINE__." Mailserver reports:".$sortResult->message.' '."$filter, $resultByUid");
if (PEAR::isError($sortResult)) if (PEAR::isError($sortResult))
{ {
// some servers are not replying on a search for uids, so try this one if (stripos(array2string($sortResult->message),'BAD, SEARCH')!==false)
$resultByUid = false; {
if ($filter!='*') $sortResult = $this->icServer->search('*', $resultByUid); self::$supportsORinQuery[$this->profileID]=false;
egw_cache::setCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']),self::$supportsORinQuery,$expiration=60*60*10);
if (self::$debug) error_log(__METHOD__.__LINE__." Mailserver has NO OR Capability for Search:".$sortResult->message);
$filter = $this->createIMAPFilter($_folderName, $_filter, self::$supportsORinQuery[$this->profileID]);
}
else
{
// some servers are not replying on a search for uids, so try this one
$resultByUid = false;
if ($filter!='*') $filter='*';
}
$sortResult = $this->icServer->search($filter, $resultByUid);
if (self::$debug) error_log(__METHOD__.__LINE__." Mailserver reports:".$sortResult->message.' '."$filter, $resultByUid");
if (PEAR::isError($sortResult)) if (PEAR::isError($sortResult))
{ {
error_log(__METHOD__.__LINE__.' PEAR_Error:'.array2string($sortResult->message)); $resultByUid = false;
$sortResult = null; $filter='*';
$sortResult = $this->icServer->search($filter, $resultByUid);
if (PEAR::isError($sortResult))
{
error_log(__METHOD__.__LINE__.' PEAR_Error:'.array2string($sortResult->message));
$sortResult = null;
}
} }
} }
} }
if(is_array($sortResult)) { if(is_array($sortResult)) {
sort($sortResult, SORT_NUMERIC); sort($sortResult, SORT_NUMERIC);
} }
if (self::$debug) error_log(__METHOD__." using Filter:".print_r($filter,true)." ->".print_r($sortResult,true)); if (self::$debug) error_log(__METHOD__.__LINE__." using Filter:".print_r($filter,true)." ->".print_r($sortResult,true));
} }
if ($setSession) if ($setSession)
{ {

12
felamimail/inc/class.uifelamimail.inc.php
View File

@ -1039,9 +1039,6 @@ class uifelamimail
$this->t->set_var('quicksearch', $this->bofelamimail->sessionData['messageFilter']['string']); $this->t->set_var('quicksearch', $this->bofelamimail->sessionData['messageFilter']['string']);
} }
$defaultSearchType = (isset($this->bofelamimail->sessionData['messageFilter']['type']) ? $this->bofelamimail->sessionData['messageFilter']['type'] : 'quick');
$defaultSelectStatus = (isset($this->bofelamimail->sessionData['messageFilter']['status']) ? $this->bofelamimail->sessionData['messageFilter']['status'] : 'any');
$searchTypes = array( $searchTypes = array(
'quick' => 'quicksearch', 'quick' => 'quicksearch',
'subject' => 'subject', 'subject' => 'subject',
@ -1050,6 +1047,15 @@ class uifelamimail
'to' => 'to', 'to' => 'to',
'cc' => 'cc', 'cc' => 'cc',
); );
//felamimail_bo::$supportsORinQuery[$this->bofelamimail->profileID]=true;
if (is_null(felamimail_bo::$supportsORinQuery) || !isset(felamimail_bo::$supportsORinQuery[$this->bofelamimail->profileID]))
{
felamimail_bo::$supportsORinQuery = egw_cache::getCache(egw_cache::INSTANCE,'email','supportsORinQuery'.trim($GLOBALS['egw_info']['user']['account_id']),$callback=null,$callback_params=array(),$expiration=60*60*10);
if (!isset(felamimail_bo::$supportsORinQuery[$this->bofelamimail->profileID])) felamimail_bo::$supportsORinQuery[$this->bofelamimail->profileID]=true;
}
if (!felamimail_bo::$supportsORinQuery[$this->bofelamimail->profileID]) unset($searchTypes['quick']);
$defaultSearchType = (isset($this->bofelamimail->sessionData['messageFilter']['type']) ? $this->bofelamimail->sessionData['messageFilter']['type'] : (felamimail_bo::$supportsORinQuery[$this->bofelamimail->profileID]?'quick':'subject'));
$defaultSelectStatus = (isset($this->bofelamimail->sessionData['messageFilter']['status']) ? $this->bofelamimail->sessionData['messageFilter']['status'] : 'any');
$selectSearchType = html::select('searchType', $defaultSearchType, $searchTypes, false, "style='width:100%;' id='searchType' onchange='document.getElementById(\"quickSearch\").focus(); document.getElementById(\"quickSearch\").value=\"\" ;return false;'"); $selectSearchType = html::select('searchType', $defaultSearchType, $searchTypes, false, "style='width:100%;' id='searchType' onchange='document.getElementById(\"quickSearch\").focus(); document.getElementById(\"quickSearch\").value=\"\" ;return false;'");
$this->t->set_var('select_search', $selectSearchType); $this->t->set_var('select_search', $selectSearchType);