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

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

Revision: 8160
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8160&view=rev
Author:   vargenau
Date:     2011-10-03 12:42:28 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
E-mail

Modified Paths:
--------------
    trunk/lib/MailNotify.php
    trunk/lib/WikiUserNew.php
    trunk/lib/plugin/WikiAdminUtils.php

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2011-10-03 12:41:45 UTC (rev 8159)
+++ trunk/lib/MailNotify.php	2011-10-03 12:42:28 UTC (rev 8160)
@@ -376,7 +376,7 @@
         while(!empty($data[$id])) { // id collision
             $id = rand_ascii_readable(16);
         }
-        $subject = _("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

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2011-10-03 12:41:45 UTC (rev 8159)
+++ trunk/lib/WikiUserNew.php	2011-10-03 12:42:28 UTC (rev 8160)
@@ -1779,7 +1779,7 @@
             return;
         if (!empty($value) and !$verified) {
             list($ok,$msg) = ValidateMail($value);
-            if ($ok and mail($value,"[".WIKI_NAME ."] "._("Email Verification"),
+            if ($ok and mail($value,"[".WIKI_NAME ."] "._("E-mail address confirmation"),
                      sprintf(_("Welcome to %s!\nYour email account is verified and\nwill be used to send page change notifications.\nSee %s"),
                              WIKI_NAME, WikiURL($GLOBALS['request']->getArg('pagename'),'',true)))) {
                 $this->set('emailVerified',1);

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2011-10-03 12:41:45 UTC (rev 8159)
+++ trunk/lib/plugin/WikiAdminUtils.php	2011-10-03 12:42:28 UTC (rev 8160)
@@ -110,7 +110,7 @@
                         'purge-bad-pagenames'         => _("Purge all Pages With Invalid Names"),
                         'purge-empty-pages'         => _("Purge all empty, unreferenced Pages"),
                         'access-restrictions'         => _("Access Restrictions"),
-                        'email-verification'         => _("Email Verification"),
+                        'email-verification'         => _("E-mail address confirmation"),
                         'convert-cached-html'         => _("Convert cached_html"),
                         'db-check'                 => _("DB Check"),
                         'db-rebuild'                 => _("Db Rebuild")
@@ -229,7 +229,7 @@
         $dbi = $request->getDbh();
         $pagelist = new PageList('pagename',0,$args);
         //$args['return_url'] = 'action=email-verification-verified';
-        $email = new _PageList_Column_email('email',_("E-Mail"),'left');
+        $email = new _PageList_Column_email('email',_("E-mail"),'left');
         $emailVerified = new _PageList_Column_emailVerified('emailVerified',
                                                             _("Verification Status"),'center');
         $pagelist->_columns[0]->_heading = _("Username");

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