rpms/squirrelmail/devel squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch, 1.2, 1.3 squirrelmail.spec, 1.52, 1.53

[fedora-cvs-commits at redhat.com]

Author: mbacovsk

Update of /cvs/dist/rpms/squirrelmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20110

Modified Files:
	squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch 
	squirrelmail.spec 
Log Message:
* Mon Apr 23 2007 Martin Bacovsky <mbacovsk at redhat.com> - 1.4.9a-2
- resolves: #237136:PHP Fatal error: Call to a member 
  function getParameter() on a non-object in 
  /usr/share/squirrelmail/functions/mime.php on line 317
- resolves: #229454: Errors in /var/log/httpd/error_log
- resolves: #222879: squirrelmail ja_JP patches break build


squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch:
 mime.php |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

Index: squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch	17 Apr 2007 16:52:44 -0000	1.2
+++ squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch	24 Apr 2007 12:28:57 -0000	1.3
@@ -1,66 +1,6 @@
 diff -ruNp squirrelmail-1.4.6.org/functions/mime.php squirrelmail-1.4.6/functions/mime.php
 --- squirrelmail-1.4.6.org/functions/mime.php	2006-08-15 13:10:40.000000000 +0900
 +++ squirrelmail-1.4.6/functions/mime.php	2006-08-15 15:39:53.000000000 +0900
-@@ -249,6 +249,7 @@ function translateText(&$body, $wrap_at,
- 
-     require_once(SM_PATH . 'functions/url_parser.php');
- 
-+    $charset = strtolower($charset);
-     $body_ary = explode("\n", $body);
-     for ($i=0; $i < count($body_ary); $i++) {
-         $line = $body_ary[$i];
-@@ -312,6 +313,16 @@ function formatBody($imap_stream, $messa
-     }
- 
-     $body = '';
-+    $charset_converted = false;
-+    $charset = strtolower($body_message->header->getParameter('charset'));
-+    if (!$charset_converted) {
-+        if ($charset == 'iso-2022-jp' || $charset == 'shift_jis' || $charset == 'euc-jp' ||
-+           ($squirrelmail_language == 'ja_JP' &&
-+           ($charset == 'utf-8' || $charset == '' || $charset == 'us-ascii'))) {
-+           $body = $languages['ja_JP']['XTRA_CODE']('decode', $body);
-+           $charset_converted = true;
-+        }
-+    }
-     $urlmailbox = urlencode($mailbox);
-     $body_message = getEntity($message, $ent_num);
-     if (($body_message->header->type0 == 'text') ||
-@@ -319,12 +328,15 @@ function formatBody($imap_stream, $messa
-         $body = mime_fetch_body ($imap_stream, $id, $ent_num);
-         $body = decodeBody($body, $body_message->header->encoding);
- 
--        if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
--                function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
--            if (mb_detect_encoding($body) != 'ASCII') {
--                $body = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $body);
--            }
-+        $charset_converted = false;
-+        if (strtolower($body_message->header->getParameter('charset')) == 'iso-2022-jp' &&
-+           isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
-+           function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
-+           if (mb_detect_encoding($body) != 'ASCII') {
-+               $body = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $body);
-+           }
-         }
-+	
-         $hookResults = do_hook("message_body", $body);
-         $body = $hookResults[1];
- 
-@@ -584,6 +596,13 @@ function decodeBody($body, $encoding) {
-          * str_replace("\r\n", "\n", $body); call.
-          */
-         $body = quoted_printable_decode($body);
-+
-+        if ($squirrelmail_language != 'ja_JP') {
-+            while (ereg("=n", $body)) {
-+                $body = ereg_replace ("=n", '', $body);
-+            }
-+        }
-+
-     } elseif ($encoding == 'base64') {
-         $body = base64_decode($body);
-     }
 @@ -2142,13 +2161,14 @@ function SendDownloadHeaders($type0, $ty
          $isIE6plus = true;
      }


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- squirrelmail.spec	17 Apr 2007 17:34:27 -0000	1.52
+++ squirrelmail.spec	24 Apr 2007 12:28:57 -0000	1.53
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.9a
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -17,7 +17,7 @@
 Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.9-20070106.tar.bz2
 Source5: config_local.php
 Patch1:  squirrelmail-1.4.6-zenkaku-subject-convert.patch
-Patch2:  squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch
+#Patch2:  squirrelmail-1.4.8-IE-Japanese-download-ugly-hack.patch
 Patch3:  squirrelmail-1.4.6-japanese-multibyte-view-text.patch
 Patch4:  squirrelmail-1.4.6-japanese-multibyte-view-body.patch
 #Patch5:  squirrelmail-1.4.7-ja-translate.patch
@@ -45,7 +45,7 @@
 %prep
 %setup -q -n squirrelmail-%{version}
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 
@@ -258,6 +258,13 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Mon Apr 23 2007 Martin Bacovsky <mbacovsk at redhat.com> - 1.4.9a-2
+- resolves: #237136:PHP Fatal error: Call to a member 
+  function getParameter() on a non-object in 
+  /usr/share/squirrelmail/functions/mime.php on line 317
+- resolves: #229454: Errors in /var/log/httpd/error_log
+- resolves: #222879: squirrelmail ja_JP patches break build
+
 * Tue Apr 17 2007 Martin Bacovsky <mbacovsk at redhat.com> - 1.4.9a-1
 - upgarde to new upstream 1.4.9a
 - resolves: #235560 Many SM errors in apache logs