[squirrelmail] update php54fix patch to use upstream provided solution

[Michal Hlavinka]

commit 983978edb43946129778c35423a40c3e5ea36897
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Mon Mar 26 15:41:08 2012 +0200

    update php54fix patch to use upstream provided solution

 squirrelmail-1.4.22-php54fixes.patch |   42 +++++++++++++++++++++++++---------
 1 files changed, 31 insertions(+), 11 deletions(-)
---
diff --git a/squirrelmail-1.4.22-php54fixes.patch b/squirrelmail-1.4.22-php54fixes.patch
index 88064d2..a609c53 100644
--- a/squirrelmail-1.4.22-php54fixes.patch
+++ b/squirrelmail-1.4.22-php54fixes.patch
@@ -21,14 +21,34 @@ diff -up squirrelmail-webmail-1.4.22/functions/i18n.php.php54fixes squirrelmail-
      $charset = strtolower($charset);
  
      set_my_charset();
-diff -up squirrelmail-webmail-1.4.22/functions/imap_general.php.php54fixes squirrelmail-webmail-1.4.22/functions/imap_general.php
---- squirrelmail-webmail-1.4.22/functions/imap_general.php.php54fixes	2012-02-24 14:22:51.916597229 +0100
-+++ squirrelmail-webmail-1.4.22/functions/imap_general.php	2012-02-24 14:22:51.952596473 +0100
-@@ -704,6 +704,7 @@ function sqimap_get_delimiter ($imap_str
-                 $pna = explode(')(', $pn);
-                 while (list($k, $v) = each($pna)) {
-                     $lst = explode('"', $v);
-+		    if ($lst[1]=='') $lst[1]=0;
-                     if (isset($lst[3])) {
-                         $pn[$lst[1]] = $lst[3];
-                     } else {
+--- squirrelmail/functions/imap_general.php.php54fixes	2012/01/02 00:18:17	14248
++++ squirrelmail/functions/imap_general.php	2012/03/24 10:41:19	14290
+@@ -765,18 +765,19 @@
+             if (preg_match('/\* NAMESPACE +(\( *\(.+\) *\)|NIL) +(\( *\(.+\) *\)|NIL) +(\( *\(.+\) *\)|NIL)/i', $read[0], $data)) {
+                 if (preg_match('/^\( *\((.*)\) *\)/', $data[1], $data2)) {
+                     $pn = $data2[1];
+-                }
+-                $pna = explode(')(', $pn);
+-                while (list($k, $v) = each($pna)) {
+-                    $lst = explode('"', $v);
+-                    if (isset($lst[3])) {
+-                        $pn[$lst[1]] = $lst[3];
+-                    } else {
+-                        $pn[$lst[1]] = '';
++                    $pna = explode(')(', $pn);
++                    $delnew = array();
++                    while (list($k, $v) = each($pna)) {
++                        $lst = explode('"', $v);
++                        if (isset($lst[3])) {
++                            $delnew[$lst[1]] = $lst[3];
++                        } else {
++                            $delnew[$lst[1]] = '';
++                        }
+                     }
++                    $sqimap_delimiter = array_shift($delnew);
+                 }
+             }
+-            $sqimap_delimiter = $pn[0];
+         } else {
+             fputs ($imap_stream, ". LIST \"INBOX\" \"\"\r\n");
+             $read = sqimap_read_data($imap_stream, '.', true, $a, $b);