[Frugalware-darcs] frugalware-current: wapreader-1.1-2-i686

[VMiklos]

Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061008110358-e2957-f28490c7d29eb7235b9d1deb09f0d47bcb73cf29.gz;

[wapreader-1.1-2-i686
VMiklos <vmiklos at frugalware.org>**20061008110358
 Small fixes from http://sourceforge.net/tracker/?group_id=102542&atid=633302 +
 my own fixes.
 Fixes from the bugtracker:
 * sort the folders
 * bugfix for the "foo" <foo at bar.com>-like email addresses
 My fixes:
 * make the sort case-insensitive
 * bugfix for quoted-printable messages
 * don't strip the newlines
 Unfortunatelly these is no need to submit this patch to upstream since other
 fixes are ignored by others as well.. :-/
] {
hunk ./source/network-extra/wapreader/FrugalBuild 1
-# Last Modified: Tue, 16 Aug 2005 18:43:21 +0200
+# Last Modified: Sun, 08 Oct 2006 13:01:46 +0200
hunk ./source/network-extra/wapreader/FrugalBuild 7
-pkgrel=1
+pkgrel=2
hunk ./source/network-extra/wapreader/FrugalBuild 9
+Finclude sourceforge
hunk ./source/network-extra/wapreader/FrugalBuild 11
-depends=('php')
+rodepends=('php')
hunk ./source/network-extra/wapreader/FrugalBuild 15
-source=(http://heanet.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-sha1sums=('c641eb167a631b7d6b5b75d188ed522e953e5324')
+source=($source wapreader-1.1-fixes.diff)
hunk ./source/network-extra/wapreader/FrugalBuild 19
+	Fcd $pkgname
+	Fpatchall
+	cd ..
hunk ./source/network-extra/wapreader/FrugalBuild 28
+sha1sums=('c641eb167a631b7d6b5b75d188ed522e953e5324' \
+	  'a08d12a51c54d4262c3c88cb618b42254733af82')
addfile ./source/network-extra/wapreader/wapreader-1.1-fixes.diff
hunk ./source/network-extra/wapreader/wapreader-1.1-fixes.diff 1
+Small fixes from http://sourceforge.net/tracker/?group_id=102542&atid=633302 +
+my own fixes.
+Fixes from the bugtracker:
+* sort the folders
+* bugfix for the "foo" <foo at bar.com>-like email addresses
+My fixes:
+* make the sort case-insensitive
+* bugfix for quoted-printable messages
+* don't strip the newlines
+Unfortunatelly these is no need to submit this patch to upstream since other
+fixes are ignored by others as well.. :-/
+diff -Naur wapreader.orig/wapreader.php wapreader/wapreader.php
+--- wapreader.orig/wapreader.php	2005-07-08 12:32:33.000000000 +0200
++++ wapreader/wapreader.php	2006-10-08 12:47:11.000000000 +0200
+@@ -28,6 +28,11 @@
+ //--------------- config -----------------------------------
+ //----------------------------------------------------------
+ 
++function cmp($a, $b)
++{
++	return (strtoupper($a->name) < strtoupper($b->name)) ? -1 : 1;
++}
++
+ //Defaul imap/pop3 host.
+ $host_default="";
+ 
+@@ -227,6 +232,7 @@
+ //----------------------------------------------------
+ case "folders":
+   $folders=imap_getmailboxes($box, $_SESSION["connect"], "*");
++  usort($folders, "cmp");
+   if(!count($folders)) {
+ 
+ ?>
+@@ -573,7 +579,7 @@
+     case "base64":
+       $text=imap_base64($text);
+       break;
+-    case "quoted-printable":
++    case "QUOTED-PRINTABLE":
+       $text=imap_qprint($text);
+       break;
+   }
+@@ -583,7 +589,7 @@
+   if(strlen($text)>$message_maxlen) $text=substr($text, 0, $message_maxlen);
+   $text=wmlspecialchars($text);
+   
+-  $text=wordwrap($text, 70, "\n");
++  $text=wordwrap($text, 70, "<br />\n");
+ 
+   if(!empty($info["charset"]) && $info["charset"]!="utf-8") {
+     $text=xiconv($info["charset"], "utf-8", $text);
+@@ -620,7 +626,7 @@
+ //----------------------------------------------------
+ function wmlspecialchars($text)
+ {
+-  $text=str_replace( array("\"","'","&","<",">","$"), array("&quot;","&apos;","&amp;","&lt;","&gt;","$$"), $text);
++  $text=str_replace( array("'","&","\"","<",">","$"), array("&apos;","&amp;","&quot;","&lt;","&gt;","$$"), $text);
+   return $text;
+ }
+ 
}