<!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>[15886] trunk/wp-admin/network: Move add site form to site-new.php.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15886">15886</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-10-21 13:49:49 +0000 (Thu, 21 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move add site form to site-new.php. see <a href="http://trac.wordpress.org/ticket/15174">#15174</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworkeditphp">trunk/wp-admin/network/edit.php</a></li>
<li><a href="#trunkwpadminnetworkmenuphp">trunk/wp-admin/network/menu.php</a></li>
<li><a href="#trunkwpadminnetworksitesphp">trunk/wp-admin/network/sites.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworksitenewphp">trunk/wp-admin/network/site-new.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnetworkeditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/edit.php (15885 => 15886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/edit.php 2010-10-21 13:15:27 UTC (rev 15885)
+++ trunk/wp-admin/network/edit.php 2010-10-21 13:49:49 UTC (rev 15886)
</span><span class="lines">@@ -158,71 +158,7 @@
</span><span class="cx"> wp_redirect( add_query_arg( 'updated', 'true', network_admin_url( 'settings.php' ) ) );
</span><span class="cx"> exit();
</span><span class="cx"> break;
</span><del>- case 'addblog':
- check_admin_referer( 'add-blog', '_wpnonce_add-blog' );
</del><span class="cx">
</span><del>- if ( ! current_user_can( 'manage_sites' ) )
- wp_die( __( 'You do not have permission to access this page.' ) );
-
- if ( is_array( $_POST['blog'] ) == false )
- wp_die( __( 'Can&#8217;t create an empty site.' ) );
- $blog = $_POST['blog'];
- $domain = '';
- if ( ! preg_match( '/(--)/', $blog['domain'] ) && preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )
- $domain = strtolower( $blog['domain'] );
-
- // If not a subdomain install, make sure the domain isn't a reserved word
- if ( ! is_subdomain_install() ) {
- $subdirectory_reserved_names = apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed' ) );
- if ( in_array( $domain, $subdirectory_reserved_names ) )
- wp_die( sprintf( __('The following words are reserved for use by WordPress functions and cannot be used as blog names: <code>%s</code>' ), implode( '</code>, <code>', $subdirectory_reserved_names ) ) );
- }
-
- $email = sanitize_email( $blog['email'] );
- $title = $blog['title'];
-
- if ( empty( $domain ) )
- wp_die( __( 'Missing or invalid site address.' ) );
- if ( empty( $email ) )
- wp_die( __( 'Missing email address.' ) );
- if ( !is_email( $email ) )
- wp_die( __( 'Invalid email address.' ) );
-
- if ( is_subdomain_install() ) {
- $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
- $path = $base;
- } else {
- $newdomain = $current_site->domain;
- $path = $base . $domain . '/';
- }
-
- $password = 'N/A';
- $user_id = email_exists($email);
- if ( !$user_id ) { // Create a new user with a random password
- $password = wp_generate_password();
- $user_id = wpmu_create_user( $domain, $password, $email );
- if ( false == $user_id )
- wp_die( __( 'There was an error creating the user.' ) );
- else
- wp_new_user_notification( $user_id, $password );
- }
-
- $wpdb->hide_errors();
- $id = wpmu_create_blog( $newdomain, $path, $title, $user_id , array( 'public' => 1 ), $current_site->id );
- $wpdb->show_errors();
- if ( !is_wp_error( $id ) ) {
- if ( !is_super_admin( $user_id ) && !get_user_option( 'primary_blog', $user_id ) )
- update_user_option( $user_id, 'primary_blog', $id, true );
- $content_mail = sprintf( __( "New site created by %1s\n\nAddress: http://%2s\nName: %3s"), $current_user->user_login , $newdomain . $path, stripslashes( $title ) );
- wp_mail( get_site_option('admin_email'), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' );
- wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
- wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => 'add-blog' ), wp_get_referer() ) );
- exit();
- } else {
- wp_die( $id->get_error_message() );
- }
- break;
-
</del><span class="cx"> case 'updateblog':
</span><span class="cx"> check_admin_referer( 'editblog' );
</span><span class="cx"> if ( ! current_user_can( 'manage_sites' ) )
</span></span></pre></div>
<a id="trunkwpadminnetworkmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/menu.php (15885 => 15886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/menu.php 2010-10-21 13:15:27 UTC (rev 15885)
+++ trunk/wp-admin/network/menu.php 2010-10-21 13:49:49 UTC (rev 15886)
</span><span class="lines">@@ -14,6 +14,10 @@
</span><span class="cx">
</span><span class="cx"> /* translators: Sites menu item */
</span><span class="cx"> $menu[5] = array(__('Sites'), 'manage_sites', 'sites.php', '', 'menu-top menu-icon-site', 'menu-site', 'div');
</span><ins>+
+$submenu['sites.php'][5] = array( __('Sites'), 'manage_sites', 'sites.php' );
+$submenu['sites.php'][10] = array( __('Add New'), 'manage_sites', 'site-new.php' );
+
</ins><span class="cx"> $menu[10] = array(__('Users'), 'manage_network_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'div');
</span><span class="cx"> $menu[15] = array(__('Themes'), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'div');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworksitenewphp"></a>
<div class="addfile"><h4>Added: trunk/wp-admin/network/site-new.php (0 => 15886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-new.php (rev 0)
+++ trunk/wp-admin/network/site-new.php 2010-10-21 13:49:49 UTC (rev 15886)
</span><span class="lines">@@ -0,0 +1,137 @@
</span><ins>+<?php
+
+/**
+ * Add Site Administration Screen
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** Load WordPress Administration Bootstrap */
+require_once('./admin.php');
+
+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
+if ( ! current_user_can('manage_sites') )
+ wp_die(__('You do not have sufficient permissions to add sites to this network.'));
+
+if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
+ check_admin_referer( 'add-blog', '_wpnonce_add-blog' );
+
+ if ( ! current_user_can( 'manage_sites' ) )
+ wp_die( __( 'You do not have permission to access this page.' ) );
+
+ if ( is_array( $_POST['blog'] ) == false )
+ wp_die( __( 'Can&#8217;t create an empty site.' ) );
+ $blog = $_POST['blog'];
+ $domain = '';
+ if ( ! preg_match( '/(--)/', $blog['domain'] ) && preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )
+ $domain = strtolower( $blog['domain'] );
+
+ // If not a subdomain install, make sure the domain isn't a reserved word
+ if ( ! is_subdomain_install() ) {
+ $subdirectory_reserved_names = apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed' ) );
+ if ( in_array( $domain, $subdirectory_reserved_names ) )
+ wp_die( sprintf( __('The following words are reserved for use by WordPress functions and cannot be used as blog names: <code>%s</code>' ), implode( '</code>, <code>', $subdirectory_reserved_names ) ) );
+ }
+
+ $email = sanitize_email( $blog['email'] );
+ $title = $blog['title'];
+
+ if ( empty( $domain ) )
+ wp_die( __( 'Missing or invalid site address.' ) );
+ if ( empty( $email ) )
+ wp_die( __( 'Missing email address.' ) );
+ if ( !is_email( $email ) )
+ wp_die( __( 'Invalid email address.' ) );
+
+ if ( is_subdomain_install() ) {
+ $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
+ $path = $base;
+ } else {
+ $newdomain = $current_site->domain;
+ $path = $base . $domain . '/';
+ }
+
+ $password = 'N/A';
+ $user_id = email_exists($email);
+ if ( !$user_id ) { // Create a new user with a random password
+ $password = wp_generate_password();
+ $user_id = wpmu_create_user( $domain, $password, $email );
+ if ( false == $user_id )
+ wp_die( __( 'There was an error creating the user.' ) );
+ else
+ wp_new_user_notification( $user_id, $password );
+ }
+
+ $wpdb->hide_errors();
+ $id = wpmu_create_blog( $newdomain, $path, $title, $user_id , array( 'public' => 1 ), $current_site->id );
+ $wpdb->show_errors();
+ if ( !is_wp_error( $id ) ) {
+ if ( !is_super_admin( $user_id ) && !get_user_option( 'primary_blog', $user_id ) )
+ update_user_option( $user_id, 'primary_blog', $id, true );
+ $content_mail = sprintf( __( "New site created by %1s\n\nAddress: http://%2s\nName: %3s"), $current_user->user_login , $newdomain . $path, stripslashes( $title ) );
+ wp_mail( get_site_option('admin_email'), sprintf( __( '[%s] New Site Created' ), $current_site->site_name ), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' );
+ wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
+ wp_redirect( add_query_arg( array('update' => 'added'), 'site-new.php' ) );
+ exit;
+ } else {
+ wp_die( $id->get_error_message() );
+ }
+}
+
+if ( isset($_GET['update']) ) {
+ $messages = array();
+ if ( 'added' == $_GET['update'] )
+ $messages[] = __('Site added.');
+}
+
+$title = __('Add New Site');
+$parent_file = 'sites.php';
+
+require('../admin-header.php');
+
+?>
+
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2 id="add-new-site"><?php _e('Add New Site') ?></h2>
+<?php
+if ( ! empty( $messages ) ) {
+ foreach ( $messages as $msg )
+ echo '<div id="message" class="updated"><p>' . $msg . '</p></div>';
+} ?>
+<form method="post" action="<?php echo network_admin_url('site-new.php?action=add-site'); ?>">
+<?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?>
+ <table class="form-table">
+ <tr class="form-field form-required">
+ <th scope="row"><?php _e( 'Site Address' ) ?></th>
+ <td>
+ <?php if ( is_subdomain_install() ) { ?>
+ <input name="blog[domain]" type="text" class="regular-text" title="<?php _e( 'Domain' ) ?>"/>.<?php echo preg_replace( '|^www\.|', '', $current_site->domain );?>
+ <?php } else {
+ echo $current_site->domain . $current_site->path ?><input name="blog[domain]" class="regular-text" type="text" title="<?php _e( 'Domain' ) ?>"/>
+ <?php }
+ echo '<p>' . __( 'Only the characters a-z and 0-9 recommended.' ) . '</p>';
+ ?>
+ </td>
+ </tr>
+ <tr class="form-field form-required">
+ <th scope="row"><?php _e( 'Site Title' ) ?></th>
+ <td><input name="blog[title]" type="text" class="regular-text" title="<?php _e( 'Title' ) ?>"/></td>
+ </tr>
+ <tr class="form-field form-required">
+ <th scope="row"><?php _e( 'Admin Email' ) ?></th>
+ <td><input name="blog[email]" type="text" class="regular-text" title="<?php _e( 'Email' ) ?>"/></td>
+ </tr>
+ <tr class="form-field">
+ <td colspan="2"><?php _e( 'A new user will be created if the above email address is not in the database.' ) ?><br /><?php _e( 'The username and password will be mailed to this email address.' ) ?></td>
+ </tr>
+ </table>
+ <?php submit_button( __('Add Site'), 'primary', 'add-site' ); ?>
+ </form>
+</div>
+<?php
+require('../admin-footer.php');
+?>
</ins><span class="cx">Property changes on: trunk/wp-admin/network/site-new.php
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadminnetworksitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/sites.php (15885 => 15886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/sites.php 2010-10-21 13:15:27 UTC (rev 15885)
+++ trunk/wp-admin/network/sites.php 2010-10-21 13:49:49 UTC (rev 15886)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> );
</span><span class="cx"> } else {
</span><span class="cx"> add_contextual_help($current_screen,
</span><del>- '<p>' . __('Add New takes you farther down on this same page. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page.') . '</p>' .
</del><ins>+ '<p>' . __('Add New takes you to the Add New Site screen. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page.') . '</p>' .
</ins><span class="cx"> '<p>' . __('This is the main table of all sites on this network. Switch between list and excerpt views by using the icons above the right side of the table.') . '</p>' .
</span><span class="cx"> '<p>' . __('Hovering over each site reveals seven options (three for the primary site):') . '</p>' .
</span><span class="cx"> '<ul><li>' . __('An Edit link to a separate Edit Site screen.') . '</li>' .
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> '<li>' . __('Visit to go to the frontend site live.') . '</li></ul>' .
</span><span class="cx"> '<p>' . __('The site ID is used internally, and is not shown on the front end of the site or to users/viewers.') . '</p>' .
</span><span class="cx"> '<p>' . __('Clicking on bold settings can re-sort this table. The upper right icons switch between list and excerpt views.') . '</p>' .
</span><del>- '<p>' . __("Clicking on Add Site, after filling out the address, title, and admin's email address, adds the site instantly to the network and this table. You may want to then click on the action link to edit options for that site.") . '</p>' .
</del><span class="cx"> '<p>' . __('If the admin email for the new site does not exist in the database, a new user will also be created.') . '</p>' .
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><span class="cx"> '<p>' . __('<a href="http://codex.wordpress.org/Super_Admin_Sites_SubPanel" target="_blank">Documentation on Sites</a>') . '</p>' .
</span><span class="lines">@@ -65,9 +64,6 @@
</span><span class="cx"> case 'delete':
</span><span class="cx"> $msg = __( 'Site deleted.' );
</span><span class="cx"> break;
</span><del>- case 'add-blog':
- $msg = __( 'Site added.' );
- break;
</del><span class="cx"> case 'archive':
</span><span class="cx"> $msg = __( 'Site archived.' );
</span><span class="cx"> break;
</span><span class="lines">@@ -355,7 +351,7 @@
</span><span class="cx"> <?php screen_icon('index'); ?>
</span><span class="cx"> <h2><?php _e('Sites') ?>
</span><span class="cx"> <?php echo $msg; ?>
</span><del>- <a href="#form-add-site" class="button add-new-h2"><?php echo esc_html_x( 'Add New', 'sites' ); ?></a>
</del><ins>+ <a href="<?php echo network_admin_url('site-new.php'); ?>" class="button add-new-h2"><?php echo esc_html_x( 'Add New', 'sites' ); ?></a>
</ins><span class="cx"> <?php if ( isset( $_REQUEST['s'] ) && $_REQUEST['s'] ) {
</span><span class="cx"> printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $s ) );
</span><span class="cx"> } ?>
</span><span class="lines">@@ -378,40 +374,6 @@
</span><span class="cx"> <?php $wp_list_table->display(); ?>
</span><span class="cx"> </form>
</span><span class="cx"> </div>
</span><del>-
- <div id="form-add-site" class="wrap">
- <h3><?php _e( 'Add Site' ) ?></h3>
- <form method="post" action="edit.php?action=addblog">
- <?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?>
- <table class="form-table">
- <tr class="form-field form-required">
- <th scope="row"><?php _e( 'Site Address' ) ?></th>
- <td>
- <?php if ( is_subdomain_install() ) { ?>
- <input name="blog[domain]" type="text" class="regular-text" title="<?php _e( 'Domain' ) ?>"/>.<?php echo preg_replace( '|^www\.|', '', $current_site->domain );?>
- <?php } else {
- echo $current_site->domain . $current_site->path ?><input name="blog[domain]" class="regular-text" type="text" title="<?php _e( 'Domain' ) ?>"/>
- <?php }
- echo '<p>' . __( 'Only the characters a-z and 0-9 recommended.' ) . '</p>';
- ?>
- </td>
- </tr>
- <tr class="form-field form-required">
- <th scope="row"><?php _e( 'Site Title' ) ?></th>
- <td><input name="blog[title]" type="text" class="regular-text" title="<?php _e( 'Title' ) ?>"/></td>
- </tr>
- <tr class="form-field form-required">
- <th scope="row"><?php _e( 'Admin Email' ) ?></th>
- <td><input name="blog[email]" type="text" class="regular-text" title="<?php _e( 'Email' ) ?>"/></td>
- </tr>
- <tr class="form-field">
- <td colspan="2"><?php _e( 'A new user will be created if the above email address is not in the database.' ) ?><br /><?php _e( 'The username and password will be mailed to this email address.' ) ?></td>
- </tr>
- </table>
- <p class="submit">
- <input class="button" type="submit" name="go" value="<?php esc_attr_e( 'Add Site' ) ?>" /></p>
- </form>
- </div>
</del><span class="cx"> <?php
</span><span class="cx"> break;
</span><span class="cx"> } // end switch( $action )
</span></span></pre>
</div>
</div>
</body>
</html>