Saved four invocations to strpos() in sqimap_find_displayable_name()

(take 2) :^)

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1989 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/imap_general.php b/functions/imap_general.php
index a9e1882bdd82a9613f5abb6bc7985b63e3b3e481..e07bbc99590aaf7770f0b22abdcf04d40ca9c6e5 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -343,23 +343,21 @@ function sqimap_find_email ($string) {
 function sqimap_find_displayable_name ($string) {
     $string = ' '.trim($string);
     $orig_string = $string;
-    if (strpos($string, '<') && strpos($string, '>')) {
-        if (strpos($string, '<') == 1) {
+    if (($angle1 = strpos($string, '<')) && strpos($string, '>')) {
+        if ($angle1 == 1) {
             $string = sqimap_find_email($string);
         } else {
             $string = trim($string);
-            $string = substr($string, 0, strpos($string, '<'));
+            $string = substr($string, 0, $angle1-1);
             $string = ereg_replace ('"', '', $string);
         }
         
         if (trim($string) == '') {
             $string = sqimap_find_email($orig_string);
         }
-     } else if (strpos($string, '(') && strpos($string, ')')) {
-         $fn_start = strpos($string, '(') + 1;
-         $fn_len   = strpos($string, ')') - $fn_start;
- 
-         $string = substr($string, $fn_start, $fn_len);
+    } else if ( ($paren1 = strpos($string, '('))
+                && ($paren2 = strpos($string, ')'))) {
+        $string = substr($string, $paren1 + 1, $paren2 - $paren1 - 1);
     }
     return $string;
 }