Changeset 13918 for trunk/wp-admin/my-sites.php

Timestamp:

04/01/2010 09:21:27 PM (15 years ago)

Author:

markjaquith

Message:

Huge MS refactoring and code cleanup. see #12460. props ocean90.

File:

• trunk/wp-admin/my-sites.php (modified) (5 diffs)

trunk/wp-admin/my-sites.php

@@ -1 +1 @@
 <?php
-
-require_once('admin.php');
+require_once( './admin.php' );
 
 if ( !is_multisite() )
-    wp_die( __('Multisite support is not enabled.') );
+    wp_die( __( 'Multisite support is not enabled.' ) );
 
 if ( ! current_user_can('read') )
-    wp_die(__('You do not have sufficient permissions to view this page.'));
+    wp_die( __( 'You do not have sufficient permissions to view this page.' ) );
 
-$action = isset($_POST['action']) ? $_POST['action'] : 'splash';
+$action = isset( $_POST['action'] ) ? $_POST['action'] : 'splash';
 
 $blogs = get_blogs_of_user( $current_user->id );
@@ -18 +17 @@
 $updated = false;
 if ( 'updateblogsettings' == $action && isset( $_POST['primary_blog'] ) ) {
-    check_admin_referer('update-my-sites');
-    // @todo Validate primary blog.
-    update_user_option( $current_user->id, 'primary_blog', (int) $_POST['primary_blog'], true );
-    $updated = true;
+    check_admin_referer( 'update-my-sites' );
+
+    $blog = get_blog_details( (int) $_POST['primary_blog'] );
+    if ( $blog && isset( $blog->domain ) ) {
+        update_user_option( $current_user->id, 'primary_blog', (int) $_POST['primary_blog'], true );
+        $updated = true;
+    } else {
+        wp_die( __( "The primary site, which you have choosen, doesn't exists." ) );    
+    }
 }
 
-$title = __('My Sites');
+$title = __( 'My Sites' );
 $parent_file = 'index.php';
-require_once('admin-header.php');
+require_once( './admin-header.php' );
 
 if ( $updated ) { ?>
-        <div id="message" class="updated fade"><p><strong><?php _e( 'Your site preferences have been updated.' ); ?></strong></p></div>
+    <div id="message" class="updated fade"><p><strong><?php _e( 'Settings saved.' ); ?></strong></p></div>
 <?php } ?>
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html($title); ?></h2>
+<h2><?php esc_html_e( $title ); ?></h2>
 <form id="myblogs" action="" method="post">
     <?php
     choose_primary_blog();
     do_action( 'myblogs_allblogs_options' );
-    ?><table class='widefat'> <?php
+    ?>
+    <br clear="all" />
+    <table class="widefat fixed">
+    <?php
     $settings_html = apply_filters( 'myblogs_options', '', 'global' );
     if ( $settings_html != '' ) {
@@ -53 +60 @@
     elseif ( $num >= 10 )
         $cols = 2;
-    $num_rows = ceil($num/$cols);
+    $num_rows = ceil( $num / $cols );
     $split = 0;
     for ( $i = 1; $i <= $num_rows; $i++ ) {
@@ -62 +69 @@
     $c = '';
     foreach ( $rows as $row ) {
-        $c = $c == "alternate" ? '' : 'alternate';
+        $c = $c == 'alternate' ? '' : 'alternate';
         echo "<tr class='$c'>";
-        $t = '';
+        $i = 0;
         foreach ( $row as $user_blog ) {
-            $t = $t == 'border-right: 1px solid #ccc;' ? '' : 'border-right: 1px solid #ccc;';
-            echo "<td valign='top' style='$t; width:50%'>";
+            $s = $i == 3 ? '' : 'border-right: 1px solid #ccc;';
+            echo "<td valign='top' style='$s'>";
             echo "<h3>{$user_blog->blogname}</h3>";
-            echo "<p>" . apply_filters( "myblogs_blog_actions", "<a href='" . get_home_url($user_blog->userblog_id) . "'>" . __( 'Visit' ) . "</a> | <a href='" . get_admin_url($user_blog->userblog_id) . "'>" . __( 'Dashboard' ) . "</a>", $user_blog ) . "</p>";
+            echo "<p>" . apply_filters( 'myblogs_blog_actions', "<a href='" . esc_url( get_home_url( $user_blog->userblog_id ) ). "'>" . __( 'Visit' ) . "</a> | <a href='" . esc_url( get_admin_url( $user_blog->userblog_id ) ) . "'>" . __( 'Dashboard' ) . "</a>", $user_blog ) . "</p>";
             echo apply_filters( 'myblogs_options', '', $user_blog );
             echo "</td>";
+            $i++;
         }
         echo "</tr>";
@@ -77 +85 @@
     </table>
     <input type="hidden" name="action" value="updateblogsettings" />
-    <?php wp_nonce_field('update-my-sites'); ?>
+    <?php wp_nonce_field( 'update-my-sites' ); ?>
     <p>
-     <input type="submit" class="button-primary" value="<?php _e('Update Options') ?>" name="submit" />
+     <input type="submit" class="button-primary" value="<?php _e( 'Save Changes' ) ?>" />
     </p>
     </form>
     </div>
 <?php
-include('admin-footer.php');
-
+include( './admin-footer.php' );
 ?>