extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 10:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing a problem regarding substr_count/mb_substr_count as they do not support the same number of parameters

Browse Source
This commit is contained in:
Klaus Leithoff 2009-11-20 12:35:31 +00:00
parent 024faa2a3c
commit 6ede93ebc8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
egw-pear/Net/IMAPProtocol.php
View File

@ -2363,8 +2363,14 @@ class Net_IMAPProtocol {
if ($str[$pos] === $startDelim) $delimCount++; if ($str[$pos] === $startDelim) $delimCount++;
if ($str[$pos] === $stopDelim) $delimCount--; if ($str[$pos] === $stopDelim) $delimCount--;
if ($str[$pos] === $stopDelim && ($str[$pos+1] === $startDelim || ($str[$pos+1] === $stopDelim && $delimCount<=0))) { if ($str[$pos] === $stopDelim && ($str[$pos+1] === $startDelim || ($str[$pos+1] === $stopDelim && $delimCount<=0))) {
$numOfQuotes = substr_count($str,'"',$startingpos); $encoding =mb_internal_encoding();
$numOfMaskedQuotes = substr_count($str,'\"',$startingpos); //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) { if ((($numOfQuotes - $numOfMaskedQuotes) % 2 ) == 0) {
// quotes are balanced, so its unlikely that we meet a stop condition here as strings may contain )( // 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"); //error_log(__METHOD__. "->Length: $len; NumOfQuotes: $numOfQuotes - NumofMaskedQuotes:$numOfMaskedQuotes #".$str."\n");