[phpwiki-checkins] SF.net SVN: phpwiki:[8641] trunk/lib/main.php

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

Revision: 8641
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8641&view=rev
Author:   vargenau
Date:     2012-12-11 14:01:42 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Use getArg and setArg

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

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2012-12-11 13:58:48 UTC (rev 8640)
+++ trunk/lib/main.php	2012-12-11 14:01:42 UTC (rev 8641)
@@ -518,13 +518,15 @@
             update_locale(DEFAULT_LANGUAGE);
 
         // User does not have required authority.  Prompt for login.
-        $what = $this->getActionDescription($this->getArg('action'));
+        $action = $this->getArg('action');
+        $what = $this->getActionDescription($action);
         $pass_required = ($require_level >= WIKIAUTH_USER);
         if ($require_level == WIKIAUTH_UNOBTAINABLE) {
             global $DisabledActions;
             if ($DisabledActions and in_array($action, $DisabledActions)) {
                 $msg = fmt("%s is disallowed on this wiki.",
                     $this->getDisallowedActionDescription($this->getArg('action')));
+                $this->_user->PrintLoginForm($this, compact('require_level'), $msg);
                 $this->finish();
                 return;
             }
@@ -979,8 +981,12 @@
     {
         global $HTTP_ENV_VARS;
 
-        if (!empty($this->args['auth']) and !empty($this->args['auth']['userid']))
-            return $this->args['auth']['userid'];
+        if ($this->getArg('auth')) {
+             $auth = $this->getArg('auth');
+             if ($auth['userid']) {
+                 return $auth['userid'];
+             }
+        }
 
         if ($user = $this->getSessionVar('wiki_user')) {
             // Switched auth between sessions.
@@ -1106,11 +1112,11 @@
             $this->setArg('verify', 1); // only for POST
             if ($this->getArg('action') != 'rename')
                 $this->setArg('action', $action);
-            elseif ($this->getArg('to') && empty($this->args['admin_rename'])) {
-                $this->args['admin_rename']
-                    = array('from' => $this->getArg('s'),
+            elseif ($this->getArg('to') && !$this->getArg('admin_rename')) {
+                $this->setArg('admin_rename',
+                    array('from' => $this->getArg('s'),
                     'to' => $this->getArg('to'),
-                    'action' => 'select');
+                    'action' => 'select'));
             }
             $this->actionpage($action);
         } else {

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