Revert to 1.83 because of a bug in 1.84.

[squirrelmail.git] / functions / imap_general.php

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 391a5a9c9c0cf6bd7ea167d1fe14c8ae98d39799..a9e1882bdd82a9613f5abb6bc7985b63e3b3e481 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -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;
 }