Changeset 1142

Timestamp:

06/10/2008 02:11:08 AM (2 years ago)

Author:

DotMG

Message:

refs #753. Porting [1089], [1090], [1094] and [1104] to trunk.

+ adding phpDocumentor cross-refs (@uses).

Files:

• trunk/actions/adminusers/adminusers.php (modified) (12 diffs)

trunk/actions/adminusers/adminusers.php

@@ -17 +17 @@
  * @since               Wikka 1.1.6.4
  *
+ * @uses Wakka::Action()
+ * @uses Wakka::ExistsPage()
+ * @uses Wakka::FormClose()
+ * @uses Wakka::FormOpen()
+ * @uses Wakka::getCount()
+ * @uses Wakka::GetUser()
+ * @uses Wakka::Href()
+ * @uses Wakka::htmlspecialchars_ent()
+ * @uses Wakka::IsAdmin()
+ * @uses Wakka::Link()
+ * @uses Wakka::LoadAll()
+ * @uses Wakka::Redirect()
+ *
+ * @uses Config::$wikka_action_path
+ * 
  * @input               integer $colcolor  optional: enables color for statistics columns
  *                              1: enable colored columns;
@@ -168 +183 @@
         define('ADMINUSERS_FORM_MASSACTION_SUBMIT','Submit');
         define('ADMINUSERS_ERROR_NO_MATCHES','Sorry, there are no users matching "%s"');
+        define('ADMINUSERS_DELETE_USERS_HEADING', 'Delete these users?');
+        define('ADMINUSERS_DELETE_USERS_BUTTON', 'Delete Users');
+        define('ADMINUSERS_CANCEL_BUTTON', 'Cancel'); #TODO: replace with appropriate constant from language file!
 
         //initialize row & column colors variables
@@ -197 +215 @@
         
         //perform actions if required
-        if ($_GET['action'] == 'owned') 
+        $g_action = '';
+        if(isset($_GET['action']))
+        {
+                $g_action = $_GET['action'];
+        }
+        if($g_action == 'owned') 
         {
                 echo $this->Action('mypages');
         } 
-        elseif ($_GET['action'] == 'changes') 
+        elseif($g_action == 'changes') 
         {
                 echo $this->Action('mychanges');
         } 
-        elseif ($_GET['action'] == 'comments') 
+        elseif($g_action == 'comments') 
         {
                 echo $this->Action('recentcomments');
         } 
         /*
-        elseif ($_GET['action'] == 'feedback' || $_REQUEST['mail']) 
+        elseif ($g_action == 'feedback' || $_REQUEST['mail']) 
         {
                 echo $this->Action('userfeedback'); #to be added in 1.1.7, see #608
         }
         */
-        elseif($_GET['action'] == 'delete')
+        elseif($g_action == 'delete')
         {
                 if(isset($_GET['user']))
@@ -228 +251 @@
                         else
                         {
-                                $this->Redirect($this->Href());
-                        }
-                }
-        }
-        else if($_GET['action'] == 'massdelete')
+                                $this->Redirect($this->Href(), USERDELETE_MESSAGE_SUCCESS);
+                        }
+                }
+        }
+        else if($g_action == 'massdelete')
         {
                 $usernames = array();
@@ -244 +267 @@
                 if(count($usernames) > 0)
                 {
-                        ?>
-                        <h3>Delete these users?</h3><br/>
-                        <ul>
-                        <?php
+                        echo '<h3>'.ADMINUSERS_DELETE_USERS_HEADING.'</h3><br />'."\n".'<ul>';
                         $errors = 0;
                         foreach($usernames as $username)
@@ -254 +274 @@
                                 {
                                         ++$errors;
-                                        echo "<li><span class='disabled'>".$username."&nbsp;</span><em class='error'>(".ADMINUSERS_FORM_MASSACTION_DELETE_ERROR.")</em></li>\n";
+                                        echo '<li><span class="disabled">'.$username.'&nbsp;</span><em class="error">('.ADMINUSERS_FORM_MASSACTION_DELETE_ERROR.")</em></li>\n";
                                         continue;
                                 }
@@ -280 +300 @@
                                                 <input type="hidden" name="massaction" value="massdelete"/>
                                                 <?php if($errors < count($usernames)) { ?>
-                                                <input type="submit" value="Delete Users"  style="width: 120px"   />
+                                                <input type="submit" value="<?php echo ADMINUSERS_DELETE_USERS_BUTTON;?>"  style="width: 120px"   />
                                                 <?php } ?>
-                                                <input type="button" value="Cancel" onclick="history.back();" style="width: 120px" />
+                                                <input type="button" value="<?php echo ADMINUSERS_CANCEL_BUTTON;?>" onclick="history.back();" style="width: 120px" />
                                         </td>
                                 </tr>
@@ -315 +335 @@
                 else
                 {
-                        $this->Redirect($this->Href());
+                        $this->Redirect($this->Href(), USERDELETE_MESSAGE_SUCCESS);
                 }
         }
@@ -345 +365 @@
         
                 // search string
+                $q = '';
                 if (isset($_POST['q']))
                 {
@@ -353 +374 @@
                         $q = $_GET['q'];
                 }
-                elseif($_POST['submit'] == ADMINUSERS_FORM_SEARCH_SUBMIT)
+                elseif(isset($_POST['submit']) && $_POST['submit'] == ADMINUSERS_FORM_SEARCH_SUBMIT)
                 {
                         // Reset num recs per page for empty (reset) search
@@ -376 +397 @@
                 // (search string, num recs per page) get out of sync, requiring
                 // multiple submissions.
-                if(!isset($_GET['l']) && $_POST['submit'] != ADMINUSERS_FORM_PAGER_SUBMIT)
+                if(!isset($_GET['l']) && isset($_POST['submit']) && $_POST['submit'] != ADMINUSERS_FORM_PAGER_SUBMIT)
                 {
                         $l = ADMINUSERS_DEFAULT_RECORDS_LIMIT;
@@ -383 +404 @@
                 // print page header
                 echo '<h3>'.ADMINUSERS_PAGE_TITLE.'</h3>'."\n";
-                $msg = '';
-                if($msg = $this->GetRedirectMessage())
-                {
-                        echo '<p><em class="error">'.sprintf($msg).'</em></p>';
-                }
-        
+
+                //non-working message retrieval removed, see #753
                 // build pager form     
                 $form_filter = $this->FormOpen('','','post','user_admin_panel');