[phpwiki-checkins] SF.net SVN: phpwiki:[7123] trunk/lib

[<var...@us...>]

Revision: 7123
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7123&view=rev
Author:   vargenau
Date:     2009-09-16 08:23:59 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
Encode the notification mail subject if it contains non-ASCII characters

Modified Paths:
--------------
    trunk/lib/MailNotify.php
    trunk/lib/stdlib.php

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2009-09-16 08:20:16 UTC (rev 7122)
+++ trunk/lib/MailNotify.php	2009-09-16 08:23:59 UTC (rev 7123)
@@ -181,6 +181,12 @@
                       $notice = false,
                       $silent = true)
     {
+        if (defined('GFORGE') and GFORGE) {
+            // Add WIKI_NAME to Subject
+            $subject = "[".WIKI_NAME."] ".$subject;
+        }
+        // Encode $subject if needed
+        $encoded_subject = $this->subject_encode($subject);
         $emails = $this->emails;
         $from = $this->from;
         // Do not send if modification is from Gforge admin
@@ -197,7 +203,7 @@
                    "Content-Transfer-Encoding: 8bit";
 
         $ok = mail(($to = array_shift($emails)),
-                 "[".WIKI_NAME."] ".$subject, 
+                   $encoded_subject, 
 		   $subject."\n".$content,
 		   $headers
 		   );
@@ -211,7 +217,7 @@
 		fwrite($f, "\nX-MailFailure: " . $last_err);
 	    }
 	    fwrite($f, "\nDate: " . CTime());
-	    fwrite($f, "\nSubject: $subject");
+	    fwrite($f, "\nSubject: $encoded_subject");
 	    fwrite($f, "\nFrom: $from");
 	    fwrite($f, "\nTo: $to");
 	    fwrite($f, "\nBcc: ".join(',', $emails));
@@ -250,7 +256,7 @@
             return;
         }
         $backend = &$request->_dbi->_backend;
-        $subject = _("Page change").' '.urlencode($this->pagename);
+        $subject = _("Page change").' '.($this->pagename);
         $previous = $backend->get_previous_version($this->pagename, $version);
         if (!isset($meta['mtime'])) $meta['mtime'] = time();
         if ($previous) {
@@ -300,7 +306,7 @@
             $pagename = $this->pagename;
             //$editedby = sprintf(_("Edited by: %s"), $meta['author']) . ' ' . $meta['author_id'];
             $editedby = sprintf(_("Edited by: %s"), $this->from);
-            $subject = sprintf(_("Page rename %s to %s"), urlencode($pagename), urlencode($to));
+            $subject = sprintf(_("Page rename %s to %s"), $pagename, $to);
             $link = WikiURL($to, true);
             $this->sendMail($subject, 
                             $editedby."\n".$link."\n\n"."Renamed $pagename to $to");
@@ -339,7 +345,7 @@
 		if (!empty($this->emails)) {
 		    $editedby = sprintf(_("Removed by: %s"), $this->from); // Todo: host_id
 		    //$emails = join(',', $this->emails);
-		    $subject = sprintf(_("Page removed %s"), urlencode($pagename));
+		    $subject = sprintf(_("Page removed %s"), $pagename);
 		    $page = $wikidb->getPage($pagename);
 		    $rev = $page->getCurrentRevision(true);
 		    $content = $rev->getPackedContent();
@@ -449,6 +455,25 @@
         return HTML(HTML::h1("Confirm E-mail address"),
                     HTML::p("Your e-mail address has now been confirmed."));
     }
+
+    function subject_encode ($subject) {
+        // We need to encode the subject if it contains non-ASCII characters
+        // The page name may contain non-ASCII characters, as well as
+        // the translation of the messages, e.g. _("PageChange Notification of %s");
+
+        // If all characters are ASCII, do nothing
+        if (isAsciiString($subject)) {
+            return $subject;
+        }
+
+        // Let us try quoted printable first
+        if (function_exists('quoted_printable_encode')) { // PHP 5.3
+            return quoted_printable_encode($subject);
+        }
+
+        // If not, encode in base64 (less human-readable)
+        return base64_encode($subject);
+    }
 }
 
 // Local Variables:

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2009-09-16 08:20:16 UTC (rev 7122)
+++ trunk/lib/stdlib.php	2009-09-16 08:23:59 UTC (rev 7123)
@@ -1980,6 +1980,14 @@
 }
 
 /**
+ * isAsciiString($string)
+ */
+function isAsciiString($s) {
+    $ptrASCII  = '[\x00-\x7F]';
+    return preg_match("/^($ptrASCII)*$/s", $s);
+}
+
+/**
  * isUtf8String($string) - cheap utf-8 detection
  *
  * segfaults for strings longer than 10kb!


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.