From 1a2751ae8001205163a0ac0a67660a757f6f2dcb Mon Sep 17 00:00:00 2001
From: antipode <antipode@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Fri, 28 Dec 2001 17:03:55 +0000
Subject: [PATCH] Revert to 1.83 because of a bug in 1.84.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1988 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/imap_general.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/functions/imap_general.php b/functions/imap_general.php
index 391a5a9c..a9e1882b 100755
--- 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;
 }
-- 
2.25.1