Changeset 656

Timestamp:

02/02/07 00:31:15 (2 years ago)

Author:

mdawaffe

Message:

use bb_admin_notice() for user admin pages

Files:

• trunk/bb-admin/admin-functions.php (modified) (3 diffs)
• trunk/bb-admin/content-forums.php (modified) (2 diffs)
• trunk/bb-admin/themes.php (modified) (1 diff)
• trunk/bb-admin/users-blocked.php (modified) (1 diff)
• trunk/bb-admin/users-moderators.php (modified) (1 diff)
• trunk/bb-admin/users.php (modified) (1 diff)

trunk/bb-admin/admin-functions.php

@@ -248 +248 @@
-                elseif ( !is_wp_error($this->search_errors) )
-                        $this->search_errors = new WP_Error('no_matching_users_found', __('No matching users were found!'));
+
+                if ( is_wp_error( $this->search_errors ) )
+                        bb_admin_notice( join( "<br />\n", $this->search_errors->get_error_messages() ), 'error' );
-        }
-
@@ -314 +317 @@
-                        $r .= "\t\t<input type='submit' value='" . __('Search for users &raquo;') . "' />\n\t</p>\n";
-                        $r .= "</form>\n\n";
-                }
-
-                if ( is_wp_error( $this->search_errors ) ) {
-                        $r .= "<div class='error'>\n";
-                        $r .= "\t<ul>\n";
-                        foreach ( $this->search_errors->get_error_messages() as $message )
-                                $r .= "\t\t<li>$message</li>\n";
-                        $r .= "\t</ul>\n</div>\n\n";
-                }
-
@@ -394 +389 @@
-                else
-                        $this->search_errors = new WP_Error('no_matching_users_found', __('No matching users were found!'));
+
+                if ( is_wp_error( $this->search_errors ) )
+                        bb_admin_notice( join( "<br />\n", $this->search_errors->get_error_messages() ), 'error' );
-        }
-

trunk/bb-admin/content-forums.php

@@ -10 +10 @@
-        if ( !$deleted_forum || $forums_count < 2 || !bb_current_user_can( 'delete_forum', $forum_to_delete ) )
-                wp_redirect( add_query_arg( array('action' => false, 'id' => false) ) );
+}
+
+if ( isset($_GET['message']) ) {
+        switch ( $_GET['message'] ) :
+        case 'deleted' :
+                bb_admin_notice( sprintf(__('Forum deleted.  You should have bbPress <a href="%s">recount your site information</a>.'), bb_get_option( 'uri' ) . 'bb-admin/site.php') );
+                break;
+        endswitch;
-}
-
@@ -54 +62 @@
-</div>
-<?php else: // action ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-<form method="post" id="add-forum" action="<?php bb_option('uri'); ?>bb-admin/bb-forum.php">
-        <h3><?php _e('Add forum'); ?></h3>

trunk/bb-admin/themes.php

@@ -15 +15 @@
-        $activetheme = BBPATH . 'bb-templates/kakumei';
-        bb_update_option('bb_active_theme',$activetheme);
-
+, 'error'
-}
-

trunk/bb-admin/users-blocked.php

@@ -1 +1 @@
-<?php
-require_once('admin.php');
-bb_get_admin_header();
-
-// Query the users
-$bb_blocked_users = new BB_Users_By_Role( array('inactive', 'blocked'), $_GET['userspage'] );
+
+bb_get_admin_header();
+
-$bb_blocked_users->title = __('These users have been blocked by the forum administrators');
-$bb_blocked_users->display( false, bb_current_user_can( 'edit_users' ) );

trunk/bb-admin/users-moderators.php

@@ -1 +1 @@
-<?php
-require_once('admin.php');
-bb_get_admin_header();
-
-// Query the users
-$bb_moderators = new BB_Users_By_Role( bb_trusted_roles(), $_GET['userspage'] );
+
+bb_get_admin_header();
+
-$bb_moderators->title = __('Forum Administrators');
-$bb_moderators->display( false, bb_current_user_can( 'edit_users' ) );

trunk/bb-admin/users.php

@@ -1 +1 @@
-<?php
-require_once('admin.php');
-bb_get_admin_header();
-
-// Query the users
-$bb_user_search = new BB_User_Search($_GET['usersearch'], $_GET['userspage']);
+
+bb_get_admin_header();
+
-$bb_user_search->display( true, bb_current_user_can( 'edit_users' ) );
-