mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-01 04:13:28 +01:00
fixing a problem regarding substr_count/mb_substr_count as they do not support the same number of parameters
This commit is contained in:
parent
024faa2a3c
commit
6ede93ebc8
@ -2363,8 +2363,14 @@ class Net_IMAPProtocol {
|
||||
if ($str[$pos] === $startDelim) $delimCount++;
|
||||
if ($str[$pos] === $stopDelim) $delimCount--;
|
||||
if ($str[$pos] === $stopDelim && ($str[$pos+1] === $startDelim || ($str[$pos+1] === $stopDelim && $delimCount<=0))) {
|
||||
$numOfQuotes = substr_count($str,'"',$startingpos);
|
||||
$numOfMaskedQuotes = substr_count($str,'\"',$startingpos);
|
||||
$encoding =mb_internal_encoding();
|
||||
//if (mb_check_encoding($str)) {
|
||||
// error_log(__METHOD__.' Encoding used:'.mb_internal_encoding().' Detected:'.mb_detect_encoding($str));
|
||||
// $encoding = mb_detect_encoding($str);
|
||||
//}
|
||||
// beware as mb_substr_count does not support the offset parameter.
|
||||
$numOfQuotes = substr_count(substr($str,$startingpos),'"');
|
||||
$numOfMaskedQuotes = substr_count(substr($str,$startingpos),'\"');
|
||||
if ((($numOfQuotes - $numOfMaskedQuotes) % 2 ) == 0) {
|
||||
// quotes are balanced, so its unlikely that we meet a stop condition here as strings may contain )(
|
||||
//error_log(__METHOD__. "->Length: $len; NumOfQuotes: $numOfQuotes - NumofMaskedQuotes:$numOfMaskedQuotes #".$str."\n");
|
||||
|
Loading…
Reference in New Issue
Block a user