<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13953] trunk/wp-admin: More MS cleanups.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13953">13953</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-03 00:10:44 +0000 (Sat, 03 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>More MS cleanups. props ocean90. see <a href="http://trac.wordpress.org/ticket/12460">#12460</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmsdeletesitephp">trunk/wp-admin/ms-delete-site.php</a></li>
<li><a href="#trunkwpadminmsoptionsphp">trunk/wp-admin/ms-options.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.php</a></li>
<li><a href="#trunkwpadminmsthemesphp">trunk/wp-admin/ms-themes.php</a></li>
<li><a href="#trunkwpadminmsusersphp">trunk/wp-admin/ms-users.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmsdeletesitephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-delete-site.php (13952 => 13953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-delete-site.php 2010-04-02 23:54:56 UTC (rev 13952)
+++ trunk/wp-admin/ms-delete-site.php 2010-04-03 00:10:44 UTC (rev 13953)
</span><span class="lines">@@ -17,8 +17,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$action = isset( $_POST['action'] ) ? $_POST['action'] : 'splash';
-
</del><span class="cx"> $title = __( 'Delete Site' );
</span><span class="cx"> $parent_file = 'tools.php';
</span><span class="cx"> require_once( './admin-header.php' );
</span></span></pre></div>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-options.php (13952 => 13953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-options.php 2010-04-02 23:54:56 UTC (rev 13952)
+++ trunk/wp-admin/ms-options.php 2010-04-03 00:10:44 UTC (rev 13953)
</span><span class="lines">@@ -1,17 +1,17 @@
</span><span class="cx"> <?php
</span><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><del>-if ( !is_multisite() )
</del><ins>+if ( ! is_multisite() )
</ins><span class="cx"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx">
</span><ins>+if ( ! current_user_can( 'manage_network_options' ) )
+ wp_die( __( 'You do not have permission to access this page.' ) );
+
</ins><span class="cx"> $title = __( 'Network Options' );
</span><span class="cx"> $parent_file = 'ms-admin.php';
</span><span class="cx">
</span><span class="cx"> include( './admin-header.php' );
</span><span class="cx">
</span><del>-if ( ! current_user_can( 'manage_network_options' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
</del><span class="cx"> if (isset($_GET['updated'])) {
</span><span class="cx"> ?>
</span><span class="cx"> <div id="message" class="updated fade"><p><?php _e( 'Options saved.' ) ?></p></div>
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (13952 => 13953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-04-02 23:54:56 UTC (rev 13952)
+++ trunk/wp-admin/ms-sites.php 2010-04-03 00:10:44 UTC (rev 13953)
</span><span class="lines">@@ -4,6 +4,9 @@
</span><span class="cx"> if ( !is_multisite() )
</span><span class="cx"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx">
</span><ins>+if ( ! current_user_can( 'manage_sites' ) )
+ wp_die( __( 'You do not have permission to access this page.' ) );
+
</ins><span class="cx"> $title = __( 'Sites' );
</span><span class="cx"> $parent_file = 'ms-admin.php';
</span><span class="cx">
</span><span class="lines">@@ -11,9 +14,6 @@
</span><span class="cx">
</span><span class="cx"> require_once( './admin-header.php' );
</span><span class="cx">
</span><del>-if ( ! current_user_can( 'manage_sites' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
</del><span class="cx"> $id = isset( $_GET['id'] ) ? intval( $_GET['id'] ) : 0;
</span><span class="cx">
</span><span class="cx"> if ( isset( $_GET['updated'] ) && $_GET['updated'] == 'true' && ! empty( $_GET['action'] ) ) {
</span><span class="lines">@@ -22,10 +22,10 @@
</span><span class="cx"> <?php
</span><span class="cx"> switch ( $_GET['action'] ) {
</span><span class="cx"> case 'all_notspam':
</span><del>- _e( 'Sites mark as not spam.' );
</del><ins>+ _e( 'Sites removed from spam.' );
</ins><span class="cx"> break;
</span><span class="cx"> case 'all_spam':
</span><del>- _e( 'Sites mark as spam.' );
</del><ins>+ _e( 'Sites marked as spam.' );
</ins><span class="cx"> break;
</span><span class="cx"> case 'all_delete':
</span><span class="cx"> _e( 'Sites deleted.' );
</span><span class="lines">@@ -49,16 +49,16 @@
</span><span class="cx"> _e( 'Site deactivated.' );
</span><span class="cx"> break;
</span><span class="cx"> case 'unspam':
</span><del>- _e( 'Site mark as not spam.' );
</del><ins>+ _e( 'Site removed from spam.' );
</ins><span class="cx"> break;
</span><span class="cx"> case 'spam':
</span><del>- _e( 'Site mark as spam.' );
</del><ins>+ _e( 'Site marked as spam.' );
</ins><span class="cx"> break;
</span><span class="cx"> case 'unmature':
</span><del>- _e( 'Site mark as not mature.' );
</del><ins>+ _e( 'Site marked as not mature.' );
</ins><span class="cx"> break;
</span><span class="cx"> case 'mature':
</span><del>- _e( 'Site mark as mature.' );
</del><ins>+ _e( 'Site marked as mature.' );
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> _e( 'Settings saved.' );
</span><span class="lines">@@ -125,6 +125,7 @@
</span><span class="cx"> <label><input type="radio" style="width:20px;" name="blog[public]" value="0" <?php checked( $details->public, 0 ); ?> /> <?php _e( 'No' ) ?></label>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><ins>+ <?php if ( ! $is_main_site ) { ?>
</ins><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th scope="row"><?php _e( 'Archived' ); ?></th>
</span><span class="cx"> <td>
</span><span class="lines">@@ -133,13 +134,6 @@
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field">
</span><del>- <th scope="row"><?php _e( 'Mature' ); ?></th>
- <td>
- <label><input type="radio" style="width:20px;" name="blog[mature]" value="1" <?php checked( $details->mature, 1 ); ?> /> <?php _e( 'Yes' ) ?></label>
- <label><input type="radio" style="width:20px;" name="blog[mature]" value="0" <?php checked( $details->mature, 0); ?> /> <?php _e( 'No' ) ?></label>
- </td>
- </tr>
- <tr class="form-field">
</del><span class="cx"> <th scope="row"><?php _e( 'Spam' ); ?></th>
</span><span class="cx"> <td>
</span><span class="cx"> <label><input type="radio" style="width:20px;" name="blog[spam]" value="1" <?php checked( $details->spam, 1 ); ?> /> <?php _e( 'Yes' ) ?></label>
</span><span class="lines">@@ -153,6 +147,14 @@
</span><span class="cx"> <label><input type="radio" style="width:20px;" name="blog[deleted]" value="0" <?php checked( $details->deleted, 0 ); ?> /> <?php _e( 'No' ) ?></label>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><ins>+ <tr class="form-field">
+ <th scope="row"><?php _e( 'Mature' ); ?></th>
+ <td>
+ <label><input type="radio" style="width:20px;" name="blog[mature]" value="1" <?php checked( $details->mature, 1 ); ?> /> <?php _e( 'Yes' ) ?></label>
+ <label><input type="radio" style="width:20px;" name="blog[mature]" value="0" <?php checked( $details->mature, 0); ?> /> <?php _e( 'No' ) ?></label>
+ </td>
+ </tr>
+ <?php } ?>
</ins><span class="cx"> </table>
</span><span class="cx"> <p class="submit" style="text-align:center;"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Update Options' ) ?>" /></p>
</span><span class="cx"> </div>
</span><span class="lines">@@ -549,35 +551,39 @@
</span><span class="cx"> if ( 'list' != $mode )
</span><span class="cx"> echo '<p>' . sprintf( _x( '%1$s &#8211; <em>%2$s', '%1$s: site name. %2$s: site tagline.' ), get_blog_option( $blog['blog_id'], 'blogname' ), get_blog_option( $blog['blog_id'], 'blogdescription ' ) ) . '</em></p>';
</span><span class="cx">
</span><del>- $actions = array();
- $actions[] = '<span class="edit"><a href="' . esc_url( admin_url( 'ms-sites.php?action=editblog&amp;id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a><span>';
- $actions[] = "<span class='backend'><a href='" . esc_url( get_admin_url($blog['blog_id']) ) . "' class='edit'>" . __( 'Backend' ) . '</a></span>';
</del><ins>+ // Preordered.
+ $actions = array(
+ 'edit' => '', 'backend' => '',
+ 'activate' => '', 'deactivate' => '',
+ 'archive' => '', 'unarchive' => '',
+ 'spam' => '', 'unspam' => '',
+ 'delete' => '',
+ 'visit' => '',
+ );
+
+ $actions['edit'] = '<span class="edit"><a href="' . esc_url( admin_url( 'ms-sites.php?action=editblog&amp;id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a><span>';
+ $actions['backend'] = "<span class='backend'><a href='" . esc_url( get_admin_url($blog['blog_id']) ) . "' class='edit'>" . __( 'Backend' ) . '</a></span>';
</ins><span class="cx"> if ( $current_site->blog_id != $blog['blog_id'] ) {
</span><span class="cx"> if ( get_blog_status( $blog['blog_id'], 'deleted' ) == '1' )
</span><del>- $actions[] = '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to activate the site %s" ), $blogname ) ) ) ) . '">' . __( 'Activate' ) . '</a></span>';
</del><ins>+ $actions['activate'] = '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to activate the site %s" ), $blogname ) ) ) ) . '">' . __( 'Activate' ) . '</a></span>';
</ins><span class="cx"> else
</span><del>- $actions[] = '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to deactivate the site %s" ), $blogname ) ) ) ) . '">' . __( 'Deactivate' ) . '</a></span>';
-
</del><ins>+ $actions['deactivate'] = '<span class="activate"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to deactivate the site %s" ), $blogname ) ) ) ) . '">' . __( 'Deactivate' ) . '</a></span>';
+
</ins><span class="cx"> if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' )
</span><del>- $actions[] = '<span class="archive"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unarchive the site %s." ), $blogname ) ) ) ) . '">' . __( 'Unarchive' ) . '</a></span>';
</del><ins>+ $actions['unarchive'] = '<span class="archive"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unarchive the site %s." ), $blogname ) ) ) ) . '">' . __( 'Unarchive' ) . '</a></span>';
</ins><span class="cx"> else
</span><del>- $actions[] = '<span class="archive"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to archive the site %s." ), $blogname ) ) ) ) . '">' . __( 'Archive' ) . '</a></span>';
-
</del><ins>+ $actions['archive'] = '<span class="archive"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to archive the site %s." ), $blogname ) ) ) ) . '">' . __( 'Archive' ) . '</a></span>';
+
</ins><span class="cx"> if ( get_blog_status( $blog['blog_id'], 'spam' ) == '1' )
</span><del>- $actions[] = '<span class="spam"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unspam the site %s." ), $blogname ) ) ) ) . '">' . __( 'Not Spam' ) . '</a></span>';
</del><ins>+ $actions['unspam'] = '<span class="spam"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unspam the site %s." ), $blogname ) ) ) ) . '">' . __( 'Not Spam' ) . '</a></span>';
</ins><span class="cx"> else
</span><del>- $actions[] = '<span class="spam"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to mark the site %s as spam." ), $blogname ) ) ) ) . '">' . __( 'Spam' ) . '</a></span>';
-
- if ( get_blog_status( $blog['blog_id'], 'mature' ) == '1' )
- $actions[] = '<span class="mature"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=unmatureblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to unmature the site %s." ), $blogname ) ) ) ) . '">' . __( 'Not Mature' ) . '</a></span>';
- else
- $actions[] = '<span class="mature"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=matureblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to mark the site %s as mature." ), $blogname ) ) ) ) . '">' . __( 'Mature' ) . '</a></span>';
-
- $actions[] = '<span class="delete"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to delete the site %s." ), $blogname ) ) ) ) . '">' . __( 'Delete' ) . '</a></span>';
</del><ins>+ $actions['spam'] = '<span class="spam"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to mark the site %s as spam." ), $blogname ) ) ) ) . '">' . __( 'Spam' ) . '</a></span>';
+
+ $actions['delete'] = '<span class="delete"><a href="' . esc_url( admin_url( 'ms-edit.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to delete the site %s." ), $blogname ) ) ) ) . '">' . __( 'Delete' ) . '</a></span>';
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $actions[] = "<span class='view'><a href='" . esc_url( get_home_url( $blog['blog_id'] ) ) . "' rel='permalink'>" . __( 'Visit' ) . '</a>';
-
</del><ins>+ $actions['visit'] = "<span class='view'><a href='" . esc_url( get_home_url( $blog['blog_id'] ) ) . "' rel='permalink'>" . __( 'Visit' ) . '</a>';
+ $actions = array_filter( $actions );
</ins><span class="cx"> if ( count( $actions ) ) : ?>
</span><span class="cx"> <div class="row-actions">
</span><span class="cx"> <?php echo implode( ' | ', $actions ); ?>
</span><span class="lines">@@ -600,7 +606,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case 'registered': ?>
</span><span class="cx"> <td valign="top">
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> if ( $blog['registered'] == '0000-00-00 00:00:00' )
</span><span class="cx"> echo '&#x2014;';
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkwpadminmsthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-themes.php (13952 => 13953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-themes.php 2010-04-02 23:54:56 UTC (rev 13952)
+++ trunk/wp-admin/ms-themes.php 2010-04-03 00:10:44 UTC (rev 13953)
</span><span class="lines">@@ -1,13 +1,13 @@
</span><span class="cx"> <?php
</span><span class="cx"> require_once( './admin.php' );
</span><span class="cx">
</span><ins>+if ( ! current_user_can( 'manage_network_themes' ) )
+ wp_die( __( 'You do not have permission to access this page.' ) );
+
</ins><span class="cx"> $title = __( 'Network Themes' );
</span><span class="cx"> $parent_file = 'ms-admin.php';
</span><span class="cx"> require_once( './admin-header.php' );
</span><span class="cx">
</span><del>-if ( ! current_user_can( 'manage_network_themes' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
</del><span class="cx"> if ( isset( $_GET['updated'] ) ) {
</span><span class="cx"> ?>
</span><span class="cx"> <div id="message" class="updated fade"><p><?php _e( 'Site themes saved.' ) ?></p></div>
</span></span></pre></div>
<a id="trunkwpadminmsusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-users.php (13952 => 13953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-users.php 2010-04-02 23:54:56 UTC (rev 13952)
+++ trunk/wp-admin/ms-users.php 2010-04-03 00:10:44 UTC (rev 13953)
</span><span class="lines">@@ -4,6 +4,9 @@
</span><span class="cx"> if ( !is_multisite() )
</span><span class="cx"> wp_die( __( 'Multisite support is not enabled.' ) );
</span><span class="cx">
</span><ins>+if ( ! current_user_can( 'manage_network_users' ) )
+ wp_die( __( 'You do not have permission to access this page.' ) );
+
</ins><span class="cx"> $title = __( 'Users' );
</span><span class="cx"> $parent_file = 'ms-admin.php';
</span><span class="cx">
</span><span class="lines">@@ -11,9 +14,6 @@
</span><span class="cx">
</span><span class="cx"> require_once( './admin-header.php' );
</span><span class="cx">
</span><del>-if ( ! current_user_can( 'manage_network_users' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
</del><span class="cx"> if ( isset( $_GET['updated'] ) && $_GET['updated'] == 'true' && ! empty( $_GET['action'] ) ) {
</span><span class="cx"> ?>
</span><span class="cx"> <div id="message" class="updated fade"><p>
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> _e( 'Users marked as spam.' );
</span><span class="cx"> break;
</span><span class="cx"> case 'all_notspam':
</span><del>- _e( 'Users marked as not spam.' );
</del><ins>+ _e( 'Users removed from spam.' );
</ins><span class="cx"> break;
</span><span class="cx"> case 'all_delete':
</span><span class="cx"> _e( 'Users deleted.' );
</span></span></pre>
</div>
</div>
</body>
</html>