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

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

Revision: 8606
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8606&view=rev
Author:   vargenau
Date:     2012-12-05 18:19:12 +0000 (Wed, 05 Dec 2012)
Log Message:
-----------
Remove unused

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

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2012-12-05 18:09:33 UTC (rev 8605)
+++ trunk/lib/MailNotify.php	2012-12-05 18:19:12 UTC (rev 8606)
@@ -127,7 +127,6 @@
         foreach ($notify as $page => $users) {
             if (glob_match($page, $this->pagename)) {
                 $curuser = $request->getUser();
-                $curusername = $curuser->UserName();
                 $curuserprefs = $curuser->getPreferences();
                 $curuserprefsemail = $curuserprefs->get('email');
                 $ownModifications = $curuserprefs->get('ownModifications');
@@ -174,13 +173,6 @@
                                 $userids[] = $userid;
                             }
                         }
-                        // ignore verification
-                        /*
-                        if (DEBUG) {
-                            if (!in_array($user['email'], $emails))
-                                $emails[] = $user['email'];
-                        }
-                        */
                     }
                 }
             }
@@ -321,7 +313,7 @@
     /**
      * Support mass rename / remove (TBD)
      */
-    function sendPageRenameNotification($to, &$meta)
+    function sendPageRenameNotification($to)
     {
         $pagename = $this->pagename;
         $editedby = sprintf(_("Renamed by: %s"), $this->fromId());
@@ -376,11 +368,8 @@
             if (!empty($notify) and is_array($notify)) {
                 $this->getPageChangeEmails($notify);
                 if (!empty($this->emails)) {
-                    $newpage = $wikidb->getPage($new_pagename);
-                    $current = $newpage->getCurrentRevision();
-                    $meta = $current->_data;
                     $this->pagename = $oldpage;
-                    $this->sendPageRenameNotification($new_pagename, $meta);
+                    $this->sendPageRenameNotification($new_pagename);
                 }
             }
         }
@@ -437,20 +426,16 @@
         }
         // upgrade the user
         $userid = $data['userid'];
-        $email = $data['email'];
         $u = $request->getUser();
         if ($u->UserName() == $userid) { // lucky: current user (session)
-            $prefs = $u->getPreferences();
             $request->_user->_level = WIKIAUTH_USER;
             $request->_prefs->set('emailVerified', true);
         } else { // not current user
             if (ENABLE_USER_NEW) {
                 $u = WikiUser($userid);
                 $u->getPreferences();
-                $prefs = &$u->_prefs;
             } else {
                 $u = new WikiUser($request, $userid);
-                $prefs = $u->getPreferences();
             }
             $u->_level = WIKIAUTH_USER;
             $request->setUser($u);

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