<!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>[17762] trunk/wp-admin/includes/ms.php:
Show access denied page and list a user'
s sites if they visit an admin they don'
t have permissions for rather than redirecting to the users' primary blog.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17762">17762</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-04-29 00:43:48 +0000 (Fri, 29 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Show access denied page and list a user's sites if they visit an admin they don't have permissions for rather than redirecting to the users' primary blog. fixes <a href="http://trac.wordpress.org/ticket/17121">#17121</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (17761 => 17762)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2011-04-29 00:19:02 UTC (rev 17761)
+++ trunk/wp-admin/includes/ms.php 2011-04-29 00:43:48 UTC (rev 17762)
</span><span class="lines">@@ -496,26 +496,41 @@
</span><span class="cx"> }
</span><span class="cx"> add_filter( 'get_term', 'sync_category_tag_slugs', 10, 2 );
</span><span class="cx">
</span><del>-function redirect_user_to_blog() {
- $c = 0;
- if ( isset( $_GET['c'] ) )
- $c = (int) $_GET['c'];
</del><ins>+function _access_denied_splash() {
+ if ( ! is_user_logged_in() )
+ return;
</ins><span class="cx">
</span><del>- if ( $c >= 5 ) {
- wp_die( __( "You don&#8217;t have permission to view this site. Please contact the system administrator." ) );
</del><ins>+ $blogs = get_blogs_of_user( get_current_user_id() );
+
+ $blog_name = get_bloginfo( 'name' );
+
+ if ( empty( $blogs ) ) {
+ wp_die( sprintf( __( 'You attempted to access the "%s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "Test" dashboard, please contact your network administrator.' ), $blog_name ) );
+ exit;
</ins><span class="cx"> }
</span><del>- $c ++;
</del><span class="cx">
</span><del>- $blog = get_active_blog_for_user( get_current_user_id() );
</del><ins>+ $output = '<p>' . sprintf( __( 'You attempted to access the "%s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "Test" dashboard, please contact your network administrator.' ), $blog_name ) . '</p>';
+ $output .= '<p>' . __( 'If you reached this screen by accident and meant to visit one your own sites, here are some shortcuts to help you find your way.' ) . '</p>';
</ins><span class="cx">
</span><del>- if ( is_object( $blog ) ) {
- wp_redirect( get_admin_url( $blog->blog_id, '?c=' . $c ) ); // redirect and count to 5, "just in case"
- } else {
- wp_redirect( user_admin_url( '?c=' . $c ) ); // redirect and count to 5, "just in case"
</del><ins>+ $output .= '<h3>' . __('Your Sites') . '</h3>';
+ $output .= '<table>';
+
+ foreach ( $blogs as $blog ) {
+ $output .= "<tr>";
+ $output .= "<td valign='top'>";
+ $output .= "{$blog->blogname}";
+ $output .= "</td>";
+ $output .= "<td valign='top'>";
+ $output .= "<a href='" . esc_url( get_admin_url( $blog->userblog_id ) ) . "'>" . __( 'Visit Dashboard' ) . "</a> | <a href='" . esc_url( get_home_url( $blog->userblog_id ) ). "'>" . __( 'View Site' ) . "</a>" ;
+ $output .= "</td>";
+ $output .= "</tr>";
</ins><span class="cx"> }
</span><ins>+ $output .= '</table>';
+
+ wp_die( $output );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><del>-add_action( 'admin_page_access_denied', 'redirect_user_to_blog', 99 );
</del><ins>+add_action( 'admin_page_access_denied', '_access_denied_splash', 99 );
</ins><span class="cx">
</span><span class="cx"> function check_import_new_users( $permission ) {
</span><span class="cx"> if ( !is_super_admin() )
</span></span></pre>
</div>
</div>
</body>
</html>