[phpwiki-checkins] SF.net SVN: phpwiki:[7128] trunk/lib/MailNotify.php

[<ru...@us...>]

Revision: 7128
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7128&view=rev
Author:   rurban
Date:     2009-09-16 12:54:07 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
always prefix mails with [WIKI_NAME]

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

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2009-09-16 09:12:00 UTC (rev 7127)
+++ trunk/lib/MailNotify.php	2009-09-16 12:54:07 UTC (rev 7128)
@@ -1,6 +1,6 @@
 <?php
 rcs_id('$Id$');
-/* Copyright (C) 2006-2007 Reini Urban
+/* Copyright (C) 2006-2007,2009 Reini Urban
  * Copyright (C) 2009 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
@@ -181,10 +181,8 @@
                       $notice = false,
                       $silent = true)
     {
-        if (defined('GFORGE') and GFORGE) {
-            // Add WIKI_NAME to Subject
-            $subject = "[".WIKI_NAME."] ".$subject;
-        }
+        // Add WIKI_NAME to Subject
+        $subject = "[".WIKI_NAME."] ".$subject;
         // Encode $subject if needed
         $encoded_subject = $this->subject_encode($subject);
         $emails = $this->emails;
@@ -213,7 +211,8 @@
 	    if (!$ok) {
 		global $ErrorManager;
 		// get last error message
-		$last_err = $ErrorManager->_postponed_errors[count($ErrorHandler->_postponed_errors)-1];
+		$last_err = 
+                    $ErrorManager->_postponed_errors[count($ErrorHandler->_postponed_errors)-1];
 		fwrite($f, "\nX-MailFailure: " . $last_err);
 	    }
 	    fwrite($f, "\nDate: " . CTime());
@@ -304,7 +303,6 @@
                 array($this->pagename, $to, $meta, $this->emails, $this->userids);
         } else {
             $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"), $pagename, $to);
             $link = WikiURL($to, true);
@@ -379,7 +377,7 @@
         while(!empty($data[$id])) { // id collision
             $id = rand_ascii_readable(16);
         }
-        $subject = WIKI_NAME . " " . _("e-mail address confirmation");
+        $subject = _("E-Mail address confirmation");
         $ip = $request->get('REMOTE_HOST');
         $expire_date = time() + 7*86400;
         $content = fmt("Someone, probably you from IP address %s, has registered an


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