+
@@ -326,27 +326,46 @@
// List blogs
case 'list':
default:
- $apage = ( isset($_GET['apage'] ) && intval( $_GET['apage'] ) ) ? absint( $_GET['apage'] ) : 1;
- $num = ( isset($_GET['num'] ) && intval( $_GET['num'] ) ) ? absint( $_GET['num'] ) : 15;
- $s = isset($_GET['s']) ? esc_attr( trim( $_GET[ 's' ] ) ) : '';
- $like_s = like_escape($s);
+ $pagenum = isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 0;
+ if ( empty($pagenum) )
+ $pagenum = 1;
+ $per_page = (int) get_user_option( 'ms_sites_per_page' );
+ if ( empty( $per_page ) || $per_page < 1 )
+ $per_page = 15;
+
+ $per_page = apply_filters( 'ms_sites_per_page', $per_page );
+
+ $s = isset($_GET['s']) ? stripslashes( trim( $_GET[ 's' ] ) ) : '';
+ $like_s = esc_sql( like_escape( $s ) );
+
$query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ";
- if ( isset($_GET['blog_name']) ) {
- $query .= " AND ( {$wpdb->blogs}.domain LIKE '%{$like_s}%' OR {$wpdb->blogs}.path LIKE '%{$like_s}%' ) ";
- } elseif ( isset($_GET['blog_id']) ) {
- $query .= " AND blog_id = '". absint( $_GET['blog_id'] )."' ";
- } elseif ( isset($_GET['blog_ip']) ) {
- $query = "SELECT *
- FROM {$wpdb->blogs}, {$wpdb->registration_log}
- WHERE site_id = '{$wpdb->siteid}'
- AND {$wpdb->blogs}.blog_id = {$wpdb->registration_log}.blog_id
- AND {$wpdb->registration_log}.IP LIKE ('%{$like_s}%')";
+ if ( isset( $_GET['blogstatus'] ) ) {
+ if ( 'deleted' == $_GET['blogstatus'] ) {
+ $query .= " AND {$wpdb->blogs}.deleted = '1' ";
+ } elseif ( 'archived' == $_GET['blogstatus'] ) {
+ $query .= " AND {$wpdb->blogs}.archived = '1' ";
+ } elseif ( 'spam' == $_GET['blogstatus'] ) {
+ $query .= " AND {$wpdb->blogs}.spam = '1' ";
+ }
}
+ if ( isset( $_GET['searchaction'] ) ) {
+ if ( 'name' == $_GET['searchaction'] ) {
+ $query .= " AND ( {$wpdb->blogs}.domain LIKE '%{$like_s}%' OR {$wpdb->blogs}.path LIKE '%{$like_s}%' ) ";
+ } elseif ( 'id' == $_GET['searchaction'] ) {
+ $query .= " AND {$wpdb->blogs}.blog_id = '{$like_s}' ";
+ } elseif ( 'ip' == $_GET['searchaction'] ) {
+ $query = "SELECT *
+ FROM {$wpdb->blogs}, {$wpdb->registration_log}
+ WHERE site_id = '{$wpdb->siteid}'
+ AND {$wpdb->blogs}.blog_id = {$wpdb->registration_log}.blog_id
+ AND {$wpdb->registration_log}.IP LIKE ('%{$like_s}%')";
+ }
+ }
+
$order_by = isset( $_GET['sortby'] ) ? $_GET['sortby'] : 'id';
-
if ( $order_by == 'registered' ) {
$query .= ' ORDER BY registered ';
} elseif ( $order_by == 'lastupdated' ) {
@@ -355,67 +374,120 @@
$query .= ' ORDER BY domain ';
} else {
$order_by = 'id';
- $query .= ' ORDER BY ' . $wpdb->blogs . '.blog_id ';
+ $query .= " ORDER BY {$wpdb->blogs}.blog_id ";
}
- $order = isset($_GET['order']) ? $_GET['order'] : 'ASC';
- $order = ( 'DESC' == $order ) ? 'DESC' : 'ASC';
+ $order = ( isset( $_GET['order'] ) && 'DESC' == $_GET['order'] ) ? "DESC" : "ASC";
$query .= $order;
- if ( !empty($s) )
- $total = $wpdb->get_var( str_replace('SELECT *', 'SELECT COUNT(blog_id)', $query) );
- else
- $total = $wpdb->get_var( "SELECT COUNT(blog_id) FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ");
+ $total = $wpdb->get_var( str_replace('SELECT *', 'SELECT COUNT(blog_id)', $query) );
- $query .= " LIMIT " . intval( ( $apage - 1 ) * $num) . ", " . intval( $num );
+ $query .= " LIMIT " . intval( ( $pagenum - 1 ) * $per_page) . ", " . intval( $per_page );
$blog_list = $wpdb->get_results( $query, ARRAY_A );
- // Pagination
- $url2 = "&order=" . $order . "&sortby=" . $order_by . "&s=";
- if ( !empty($_GET[ 'blog_ip' ]) )
- $url2 .= "&ip_address=" . urlencode( $s );
+ $num_pages = ceil($total / $per_page);
+ $page_links = paginate_links( array(
+ 'base' => add_query_arg( 'paged', '%#%' ),
+ 'format' => '',
+ 'prev_text' => __('«'),
+ 'next_text' => __('»'),
+ 'total' => $num_pages,
+ 'current' => $pagenum
+ ));
+
+ if ( empty($_GET['mode']) )
+ $mode = 'list';
else
- $url2 .= $s . "&ip_address=" . urlencode( $s );
+ $mode = esc_attr( $_GET['mode'] );
- $blog_navigation = paginate_links( array(
- 'base' => add_query_arg( 'apage', '%#%' ).$url2,
- 'format' => '',
- 'total' => ceil($total / $num),
- 'current' => $apage
- ));
+ // for subsubsub and $blog_list
+ $status_list = array( 'archived' => array( 'site-archived', __('Archived') ), 'spam' => array( 'site-spammed', __('Spam') ), 'deleted' => array( 'site-deleted', __('Deleted') ) );
?>
-
+
-
+
+
+ ' . __('Search results for “%s”') . '', esc_html( $s ) );
+ ?>
+
+
+
-
-
-
-
+
'display name'
@@ -432,35 +504,55 @@
$posts_columns['plugins'] = __('Actions');
$posts_columns = apply_filters('wpmu_blogs_columns', $posts_columns);
-
- $sortby_url = "s=";
- if ( !empty($_GET[ 'blog_ip' ]) )
- $sortby_url .= "&ip_address=" . urlencode( $s );
- else
- $sortby_url .= urlencode( $s ) . "&ip_address=" . urlencode( $s );
?>
-
+
- |
- $column_display_name) {
- $column_link = "
+
+
+ $column_display_name) {
+ $column_link = " $order2, 'paged' => $pagenum, 'sortby' => $column_id ), $_SERVER['REQUEST_URI'] ) );
+ $column_link .= "'>{$column_display_name}";
$col_url = ($column_id == 'users' || $column_id == 'plugins') ? $column_display_name : $column_link;
- ?>
- |
+ ?>
+
+
+ |
+
+
+ |
+
+ |
+ $column_display_name) {
+ $column_link = " $order2, 'paged' => $pagenum, 'sortby' => $column_id ), remove_query_arg( array('action', 'updated'), $_SERVER['REQUEST_URI'] ) ) );
+ $column_link .= "'>{$column_display_name}";
+ $col_url = ($column_id == 'users' || $column_id == 'plugins') ? $column_display_name : $column_link;
+ ?>
+
+
+ |
+
+
+
array( 'site-archived', __('Archived') ), 'spam' => array( 'site-spammed', __('Spam') ), 'deleted' => array( 'site-deleted', __('Deleted') ) );
$class = '';
foreach ( $blog_list as $blog ) {
$class = ('alternate' == $class) ? '' : 'alternate';
@@ -500,10 +592,12 @@
break;
case 'blogname': ?>
-
+ |
-
' . get_blog_option( $blog['blog_id'], 'blogname' ) . '- ' . get_blog_option( $blog['blog_id'], 'blogdescription ' ) . '';
+
$actions = array();
$actions[] = '' . __('Edit') . '';
$actions[] = "" . __('Backend') . '';
@@ -539,17 +633,21 @@
case 'lastupdated': ?>
|
- g:i:s a'), $blog['last_updated']); ?>
- |
+ g:i:s a';
+ echo ( $blog['last_updated'] == '0000-00-00 00:00:00' ) ? __("Never") : mysql2date( __( $date ), $blog['last_updated'] ); ?>
+
+ case 'registered': ?>
- g:i:s a'), $blog['registered']); ?>
+
|
-
' . __( 'More' ) . '';
}
- foreach ( $blogusers as $key => $val )
- echo '' . $val->user_login . ' ('.$val->user_email.')
';
+ foreach ( $blogusers as $key => $val ) {
+ echo '' . $val->user_login . ' ';
+ if ( 'list' != $mode )
+ echo '(' . $val->user_email . ')';
+ echo '
';
+ }
if ( $blogusers_warning != '' )
echo '' . $blogusers_warning . '
';
}
@@ -592,7 +694,7 @@
- |
+
|
+
+ $page_links_text
";
+ ?>
+
+
+
+
+
+
+
+