Changeset 8646 for trunk/wp-admin/users.php

Timestamp:

08/14/2008 05:00:37 PM (18 years ago)

Author:

ryan

Message:

Notice fixes. Props DD32. see #7509

File:

• trunk/wp-admin/users.php (modified) (9 diffs)

trunk/wp-admin/users.php

@@ -9 +9 @@
 $parent_file = 'users.php';
 
-$action = $_REQUEST['action'];
+$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
 $update = '';
 
@@ -26 +26 @@
 } else {
     $redirect = 'users.php';
+    $referer = '';
 }
 
@@ -193 +194 @@
     include('admin-header.php');
 
+    $usersearch = isset($_GET['usersearch']) ? $_GET['usersearch'] : null;
+    $userspage = isset($_GET['userspage']) ? $_GET['userspage'] : null;
+    $role = isset($_GET['role']) ? $_GET['role'] : null;
+    
     // Query the users
-    $wp_user_search = new WP_User_Search($_GET['usersearch'], $_GET['userspage'], $_GET['role']);
+    $wp_user_search = new WP_User_Search($usersearch, $userspage, $role);
 
     if ( isset($_GET['update']) ) :
@@ -201 +206 @@
         case 'del_many':
         ?>
-            <?php $delete_count = (int) $_GET['delete_count']; ?>
+            <?php $delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0; ?>
             <div id="message" class="updated fade"><p><?php printf(__ngettext('%s user deleted', '%s users deleted', $delete_count), $delete_count); ?></p></div>
         <?php
@@ -230 +235 @@
     endif; ?>
 
-<?php if ( is_wp_error( $errors ) ) : ?>
+<?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>
     <div class="error">
         <ul>
@@ -266 +271 @@
 
 $current_role = false;
-$class = empty($_GET['role']) ? ' class="current"' : '';
+$class = empty($role) ? ' class="current"' : '';
 $role_links[] = "<li><a href=\"users.php\"$class>" . __('All Users') . "</a>";
-foreach ( $wp_roles->get_names() as $role => $name ) {
+foreach ( $wp_roles->get_names() as $this_role => $name ) {
     if ( !isset($avail_roles[$role]) )
         continue;
@@ -274 +279 @@
     $class = '';
 
-    if ( $role == $_GET['role'] ) {
-        $current_role = $_GET['role'];
+    if ( $this_role == $role ) {
+        $current_role = $role;
         $class = ' class="current"';
     }
 
     $name = translate_with_context($name);
-    $name = sprintf(_c('%1$s (%2$s)|user role with count'), $name, $avail_roles[$role]);
-    $role_links[] = "<li><a href=\"users.php?role=$role\"$class>" . $name . '</a>';
+    $name = sprintf(_c('%1$s (%2$s)|user role with count'), $name, $avail_roles[$this_role]);
+    $role_links[] = "<li><a href=\"users.php?role=$this_role\"$class>" . $name . '</a>';
 }
 echo implode(' |</li>', $role_links) . '</li>';
@@ -370 +375 @@
 
 <?php
-    if ( is_wp_error($add_user_errors) ) {
-        foreach ( array('user_login' => 'user_login', 'first_name' => 'user_firstname', 'last_name' => 'user_lastname', 'email' => 'user_email', 'url' => 'user_uri', 'role' => 'user_role') as $formpost => $var ) {
-            $var = 'new_' . $var;
-            $$var = attribute_escape(stripslashes($_REQUEST[$formpost]));
-        }
-        unset($name);
-    }
+    foreach ( array('user_login' => 'user_login', 'first_name' => 'user_firstname', 'last_name' => 'user_lastname', 'email' => 'user_email', 'url' => 'user_uri', 'role' => 'user_role') as $formpost => $var ) {
+        $var = 'new_' . $var;
+        $$var = isset($_REQUEST[$formpost]) ? attribute_escape(stripslashes($_REQUEST[$formpost])) : '';
+    }
+    unset($name);
 ?>
 
@@ -385 +388 @@
 <h2 id="add-new-user"><?php _e('Add New User') ?></h2>
 
-<?php if ( is_wp_error( $add_user_errors ) ) : ?>
+<?php if ( isset($add_user_errors) && is_wp_error( $add_user_errors ) ) : ?>
     <div class="error">
         <?php