0ct0pu5/squirrelmail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert to 1.83 because of a bug in 1.84.

Browse source
This commit is contained in:
antipode 2001-12-28 17:03:55 +00:00
parent a5a0e4a892
commit aeec82aaf2
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
functions/imap_general.php
View file

@ -343,21 +343,23 @@ function sqimap_find_email ($string) {
function sqimap_find_displayable_name ($string) {
$string = ' '.trim($string);
$orig_string = $string;
if (($angle1=strpos($string, '<')) && strpos($string, '>')) {
if ($angle1 == 1) {
if (strpos($string, '<') && strpos($string, '>')) {
if (strpos($string, '<') == 1) {
$string = sqimap_find_email($string);
} else {
$string = trim($string);
$string = substr($string, 0, $angle1);
$string = substr($string, 0, strpos($string, '<'));
$string = ereg_replace ('"', '', $string);
}
if (trim($string) == '') {
$string = sqimap_find_email($orig_string);
}
} else if ( ($paren1=strpos($string, '('))
&& ($paren2=strpos($string, ')'))) {
$string = substr($string, $paren1 + 1, $paren2 - $fn_start);
} else if (strpos($string, '(') && strpos($string, ')')) {
$fn_start = strpos($string, '(') + 1;
$fn_len = strpos($string, ')') - $fn_start;
$string = substr($string, $fn_start, $fn_len);
}
return $string;
}