@@ -410,8 +410,8 @@ Thanks!
$current_site->site_name = ucfirst( $domain );
wpmu_create_blog( $domain, $base, $weblog_title, $user_id, array( 'blog_public' => 1, 'public' => 1 ) );
- update_blog_option( 1, 'template', 'portal');
- update_blog_option( 1, 'stylesheet', 'portal');
+ update_blog_option( 1, 'template', 'home');
+ update_blog_option( 1, 'stylesheet', 'home');
if( constant( 'VHOST' ) == 'yes' ) {
update_blog_option( 1, 'permalink_structure', '/%year%/%monthnum%/%day%/%postname%/');
} else {
index-install.php
@@ -110,7 +110,7 @@ if ( ($is_gecko || $is_winIE) && strpos(strtolower($_SERVER['HTTP_USER_AGENT']),
<?php } ?>
-<div id="user_info"><p><?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> | <a href="<?php echo site_url('wp-login.php?action=logout', 'login') ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a> | <?php echo apply_filters( 'admin_header_navigation', __('<a href="http://codex.wordpress.org/">Help</a>') . ' | ' . __('<a href="http://wordpress.org/support/">Forums</a>') ); if ( $gears_compat ) { ?> | <span id="gears-menu"><a href="#" onclick="wpGears.message(1);return false;"><?php _e('Turbo') ?></a></span><?php } ?></p></div>
+<div id="user_info"><p><?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> | <a href="<?php echo site_url('wp-login.php?action=logout', 'login') ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a><?php echo apply_filters( 'admin_header_navigation', __(' | <a href="http://codex.wordpress.org/">Help</a>') . ' | ' . __('<a href="http://wordpress.org/support/">Forums</a>') ); if ( $gears_compat ) { ?> | <span id="gears-menu"><a href="#" onclick="wpGears.message(1);return false;"><?php _e('Turbo') ?></a></span><?php } ?></p></div>
<?php
require(ABSPATH . 'wp-admin/menu-header.php');
wp-admin/admin-header.php
@@ -33,3 +33,9 @@ form#all-my-blogs p, form#all-my-blogs p * {
#all-my-blogs a:hover, #all-my-blogs a:active {
text-decoration: none;
}
+
+form#wpmu-search {
+ position:absolute;
+ right:0;
+ top:0;
+}
wp-admin/css/mu.css
@@ -663,7 +663,7 @@ remove_action( 'media_buttons', 'media_buttons' );
function secret_salt_warning() {
if( !is_site_admin() )
return;
- $secret_keys = array( 'SECRET_KEY', 'SECRET_SALT', 'LOGGED_IN_KEY', 'LOGGED_IN_SALT', 'AUTH_KEY', 'SECURE_AUTH_KEY' );
+ $secret_keys = array( 'SECRET_KEY', 'SECRET_SALT', 'LOGGED_IN_KEY', 'LOGGED_IN_SALT', 'AUTH_KEY', 'SECURE_AUTH_KEY', 'SECURE_AUTH_SALT' );
$out = '';
foreach( $secret_keys as $key ) {
if( !defined( $key ) )
wp-admin/includes/mu.php
@@ -312,7 +312,9 @@ function print_plugins_table($plugins, $context = '') {
<?php print_plugins_table($active_plugins, 'active') ?>
</form>
+<?php if( is_site_admin() ) { ?>
<p><?php printf(__('If something goes wrong with a plugin and you can’t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.'), WP_PLUGIN_DIR); ?></p>
+<?php } ?>
<?php endif; ?>
<?php if ( ! empty($recent_plugins) ) : ?>
wp-admin/plugins.php
@@ -264,8 +264,9 @@ case 'addexistinguser':
if( ($username != null && is_site_admin( $username ) == false ) && ( array_key_exists($blog_id, get_blogs_of_user($user_id)) ) ) {
$location = 'users.php?update=add_existing';
} else {
- add_user_to_blog('', $user_id, $_REQUEST[ 'new_role' ]);
- do_action( "added_existing_user", $user_id );
+ $newuser_key = substr( md5( $user_id ), 0, 5 );
+ add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user->user_email, 'role' => $_REQUEST[ 'new_role' ] ) );
+ wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), get_option( 'blogname' ) ), "Hi,\n\nYou have been invited to join '" . get_option( 'blogname' ) . "' at\n" . site_url() . "\nPlease click the following link to confirm the invite:\n" . site_url( "/newbloguser/$newuser_key/" ) );
$location = 'users.php?update=add';
}
wp_redirect("$location");
wp-admin/users.php
@@ -294,23 +294,16 @@ switch( $_GET['action'] ) {
$query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ";
if( isset($_GET['blog_name']) ) {
- $query = "SELECT blog_id, {$wpdb->blogs}.domain, {$wpdb->blogs}.path, registered, last_updated
- FROM {$wpdb->blogs}, {$wpdb->site}
- WHERE site_id = '{$wpdb->siteid}'
- AND {$wpdb->blogs}.site_id = {$wpdb->site}.id
- AND ( {$wpdb->blogs}.domain LIKE '%{$s}%' OR {$wpdb->blogs}.path LIKE '%{$s}%' )";
+ $query .= " AND ( {$wpdb->blogs}.domain LIKE '%{$s}%' OR {$wpdb->blogs}.path LIKE '%{$s}%' ) ";
} elseif( isset($_GET['blog_id']) ) {
- $query = "SELECT *
- FROM {$wpdb->blogs}
- WHERE site_id = '{$wpdb->siteid}'
- AND blog_id = '".intval($_GET['s'])."'";
+ $query .= " AND blog_id = '".intval($_GET['s'])."' ";
} 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 ('%{$s}%')";
- }
+ }
if( isset( $_GET['sortby'] ) == false ) {
$_GET['sortby'] = 'id';
@@ -328,15 +321,13 @@ switch( $_GET['action'] ) {
$query .= ( $_GET['order'] == 'DESC' ) ? 'DESC' : 'ASC';
- if( !empty($_GET['s']) ) {
- $blog_list = $wpdb->get_results( $query, ARRAY_A );
- $total = count($blog_list);
+ if( !empty($s) ) {
+ $total = $wpdb->get_var( str_replace('SELECT *', 'SELECT COUNT(blog_id)', $query) );
} else {
- $total = $wpdb->get_var( "SELECT COUNT(*) FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ");
+ $total = $wpdb->get_var( "SELECT COUNT(blog_id) FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ");
}
$query .= " LIMIT " . intval( ( $apage - 1 ) * $num) . ", " . intval( $num );
-
$blog_list = $wpdb->get_results( $query, ARRAY_A );
// Pagination
@@ -357,7 +348,7 @@ switch( $_GET['action'] ) {
<div class="wrap" style="position:relative;">
<h2><?php _e('Blogs') ?></h2>
- <form id="searchform" action="wpmu-blogs.php" method="get" style="position:absolute;right:0;top:0;">
+ <form action="wpmu-blogs.php" method="get" id="wpmu-search">
<input type="hidden" name="action" value="blogs" />
<input type="text" name="s" value="<?php if (isset($_GET['s'])) echo stripslashes( wp_specialchars( $s, 1 ) ); ?>" size="17" />
<input type="submit" class="button" name="blog_name" value="<?php _e('Search blogs by name') ?>" />
@@ -396,7 +387,7 @@ switch( $_GET['action'] ) {
'users' => __('Users'),
'plugins' => __('Actions')
);
- $posts_columns = apply_filters('manage_posts_columns', $posts_columns);
+ $posts_columns = apply_filters('wpmu_blogs_columns', $posts_columns);
// you can not edit these at the moment
$posts_columns['control_edit'] = '';
wp-admin/wpmu-blogs.php
@@ -95,9 +95,9 @@ switch( $_GET['action'] ) {
check_admin_referer('add-blog');
$blog = $_POST['blog'];
- $domain = ereg_replace("[^A-Za-z0-9]", "", strtolower( wp_specialchars( $blog['domain'] ) ) );
- $email = wp_specialchars( $blog['email'] );
- $title = stripslashes( wp_specialchars( $blog['title'] ) );
+ $domain = sanitize_user( str_replace( '/', '', $blog[ 'domain' ] ) );
+ $email = sanitize_email( $blog[ 'email' ] );
+ $title = $blog[ 'title' ];
if ( empty($domain) || empty($email))
wp_die( __('Missing blog address or email address.') );
@@ -129,7 +129,7 @@ switch( $_GET['action'] ) {
if( !is_wp_error($id) ) {
if( get_user_option( $user_id, 'primary_blog' ) == 1 )
update_user_option( $user_id, 'primary_blog', $id, true );
- $content_mail = sprintf( __( "New blog created by %1s\n\nAddress: http://%2s\nName: %3s"), $current_user->user_login , $newdomain.$path, $title );
+ $content_mail = sprintf( __( "New blog 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 Blog Created'), $current_site->site_name), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' );
wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'add-blog'), $_SERVER['HTTP_REFERER'] ) );
exit();
@@ -241,6 +241,7 @@ switch( $_GET['action'] ) {
$wpdb->query( "INSERT INTO " . $wpdb->usermeta . "( `umeta_id` , `user_id` , `meta_key` , `meta_value` ) VALUES ( NULL, '$userid', '" . $wpdb->base_prefix . $id . "_capabilities', 'a:1:{s:" . strlen( $_POST['new_role'] ) . ":\"" . $_POST['new_role'] . "\";b:1;}')" );
}
}
+ do_action( 'wpmu_update_blog_options' );
wpmu_admin_do_redirect( "wpmu-blogs.php?action=editblog&updated=true&id=".$id );
break;
wp-admin/wpmu-edit.php
@@ -49,9 +49,9 @@ if (isset($_GET['updated'])) {
?>
<td>
<label><input name="registration" type="radio" id="registration1" value='none' <?php echo get_site_option('registration') == 'none' ? 'checked="checked"' : ''; ?> /> <?php _e('Disabled'); ?></label><br />
- <label><input name="registration" type="radio" id="registration2" value='all' <?php echo get_site_option('registration') == 'all' ? 'checked="checked"' : ''; ?> /> <?php _e('Enabled for all. Blogs and user accounts can be created.'); ?></label><br />
- <label><input name="registration" type="radio" id="registration3" value='user' <?php echo get_site_option('registration') == 'user' ? 'checked="checked"' : ''; ?> /> <?php _e('Enabled for users only. Only user account can be created.'); ?></label><br />
- <label><input name="registration" type="radio" id="registration4" value='blog' <?php echo get_site_option('registration') == 'blog' ? 'checked="checked"' : ''; ?> /> <?php _e('Enabled for blogs only. Only logged in users can create new blogs.'); ?></label><br />
+ <label><input name="registration" type="radio" id="registration2" value='all' <?php echo get_site_option('registration') == 'all' ? 'checked="checked"' : ''; ?> /> <?php _e('Enabled. Blogs and user accounts can be created.'); ?></label><br />
+ <label><input name="registration" type="radio" id="registration3" value='user' <?php echo get_site_option('registration') == 'user' ? 'checked="checked"' : ''; ?> /> <?php _e('Only user account can be created.'); ?></label><br />
+ <label><input name="registration" type="radio" id="registration4" value='blog' <?php echo get_site_option('registration') == 'blog' ? 'checked="checked"' : ''; ?> /> <?php _e('Only logged in users can create new blogs.'); ?></label><br />
<?php _e('Disable or enable registration and who or what can be registered. (Default=all)') ?>
</td>
</tr>
wp-admin/wpmu-options.php
@@ -33,13 +33,17 @@ $allowed_themes = get_site_allowed_themes();
</thead>
<tbody id="plugins">
<?php
+ $total_theme_count = 0;
+ $activated_themes_count = 0;
foreach( (array) $themes as $key => $theme ) :
+ $total_theme_count++;
$theme_key = wp_specialchars($theme['Stylesheet']);
$class = ('alt' == $class) ? '' : 'alt';
$class1 = $enabled = $disabled = '';
if( isset( $allowed_themes[ $theme_key ] ) == true ) {
$enabled = 'checked="checked" ';
+ $activated_themes_count++;
$class1 = ' active';
} else {
$disabled = 'checked="checked" ';
@@ -62,6 +66,8 @@ $allowed_themes = get_site_allowed_themes();
<p class="submit">
<input type='submit' value='<?php _e('Update Themes »') ?>' /></p>
</form>
+<p>Total Themes Installed: <?php echo $total_theme_count; ?><br />
+Themes Activated: <?php echo $activated_themes_count; ?></p>
</div>
<?php include('admin-footer.php'); ?>
wp-admin/wpmu-themes.php
@@ -68,10 +68,9 @@ if ( $_GET['updated'] == 'true' ) {
$query .= ( $_GET['order'] == 'DESC' ) ? 'DESC' : 'ASC';
if( !empty( $s )) {
- $user_list = $wpdb->get_results( $query, ARRAY_A );
- $total = count($user_list);
+ $total = $wpdb->get_var( str_replace('SELECT *', 'SELECT COUNT(ID)', $query) );
} else {
- $total = $wpdb->get_var( "SELECT COUNT(*) FROM {$wpdb->users}");
+ $total = $wpdb->get_var( "SELECT COUNT(ID) FROM {$wpdb->users}");
}
$query .= " LIMIT " . intval( ( $apage - 1 ) * $num) . ", " . intval( $num );
@@ -87,7 +86,7 @@ if ( $_GET['updated'] == 'true' ) {
));
?>
<h2><?php _e("Users"); ?></h2>
- <form action="wpmu-users.php" method="get" style="position:absolute;right:0;top:0;">
+ <form action="wpmu-users.php" method="get" id="wpmu-search">
<input type="text" name="s" value="<?php if (isset($_GET['s'])) echo stripslashes( $s ); ?>" size="17" />
<input type="submit" id="post-query-submit" value="<?php _e('Search Users') ?>" class="button" />
</form>
@@ -122,7 +121,7 @@ if ( $_GET['updated'] == 'true' ) {
'registered' => __('Registered'),
'blogs' => ''
);
- $posts_columns = apply_filters('manage_posts_columns', $posts_columns);
+ $posts_columns = apply_filters('wpmu_users_columns', $posts_columns);
?>
<table class="widefat" cellpadding="3" cellspacing="3">
<thead>
wp-admin/wpmu-users.php
@@ -15,6 +15,7 @@ $base = 'BASE';
// to get keys generated for you, or just make something up. Each key should have a different phrase.
define('AUTH_KEY', 'put your unique phrase here'); // Change this to a unique phrase.
define('SECURE_AUTH_KEY', 'put your unique phrase here'); // Change this to a unique phrase.
+define('SECURE_AUTH_SALT', 'put your unique phrase here'); // Change this to a unique phrase.
define('LOGGED_IN_KEY', 'put your unique phrase here'); // Change this to a unique phrase.
define('SECRET_KEY', 'put your unique phrase here'); // Change these to unique phrases.
define('SECRET_SALT', 'put your unique phrase here');
@@ -30,7 +31,7 @@ $table_prefix = 'wp_'; // Only numbers, letters, and underscores please!
// chosen language must be installed to wp-content/languages.
// For example, install de.mo to wp-content/languages and set WPLANG to 'de'
// to enable German language support.
-define ('WPLANG', 'es_ES');
+define ('WPLANG', '');
// uncomment this to enable wp-content/sunrise.php support
//define( 'SUNRISE', 'on' );
wp-config-sample.php
@@ -109,7 +109,7 @@ function is_main_blog() {
function get_id_from_blogname( $name ) {
global $wpdb, $current_site;
- if( constant( 'VHOST' ) ) {
+ if( constant( 'VHOST' ) == 'yes' ) {
$domain = $name . '.' . $current_site->domain;
$path = $current_site->path;
} else {
@@ -149,11 +149,11 @@ function get_blog_details( $id, $getall = true ) {
return $details;
}
- $wpdb->hide_errors();
+ $wpdb->suppress_errors();
$details->blogname = get_blog_option($id, 'blogname');
$details->siteurl = get_blog_option($id, 'siteurl');
$details->post_count = get_blog_option($id, 'post_count');
- $wpdb->show_errors();
+ $wpdb->suppress_errors( false );
$details = apply_filters('blog_details', $details);
@@ -360,6 +360,9 @@ function switch_to_blog( $new_blog ) {
if ( $blog_id == $new_blog )
return;
+ $wp_object_cache->switched_cache[ $blog_id ] = $wp_object_cache->cache;
+ unset( $wp_object_cache->cache );
+
$wpdb->set_blog_id($new_blog);
$table_prefix = $wpdb->prefix;
$prev_blog_id = $blog_id;
@@ -388,6 +391,9 @@ function restore_current_blog() {
if ( $blog_id == $blog )
return;
+ $wp_object_cache->cache = $wp_object_cache->switched_cache[ $blog ];
+ unset( $wp_object_cache->switched_cache[ $blog ] );
+
$wpdb->set_blog_id($blog);
$prev_blog_id = $blog_id;
$blog_id = $blog;
@@ -414,9 +420,7 @@ function get_blogs_of_user( $id, $all = false ) {
if ( !$user )
return false;
- $blogs = array();
-
- $i = 0;
+ $blogs = $match = array();
foreach ( (array) $user as $key => $value ) {
if ( strstr( $key, '_capabilities') && strstr( $key, $wpdb->base_prefix) ) {
preg_match('/' . $wpdb->base_prefix . '(\d+)_capabilities/', $key, $match);
@@ -514,95 +518,12 @@ function get_blog_status( $id, $pref ) {
return $wpdb->get_var( "SELECT $pref FROM {$wpdb->blogs} WHERE blog_id = '$id'" );
}
-function get_last_updated($num = 10, $display = false ) {
-
- $selection = array();
- $offset = 0;
-
- $limit = false;
- $result = get_updated_blogs($limit);
-
- // Update limit in second to remove long forgotten posts that has been edited recently.
- // $update_limit = 3600*24;
-
- // Push valid element from DB result into selection
- foreach ( (array) $result as $key => $details ) {
- $post = get_last_blog_post($details['blog_id']);
-
- // $post_update = strtotime($post->post_modified) - strtotime($post->post_date_gmt);
-
- // Do not include if the post title is empty
- if(!empty($post->post_title)) {
- // Do not include "Hello World!"
- if($post->post_title != __("Hello World!") and $post->post_status != 'private'){
- $post->domain_url = "http://" . $details['domain'] . $details['path'];
- array_push($selection, $post);
- }
- }
- }
-
- // sort posts by modified date
- usort($selection, "sort_post_by_date");
- // Slice array
- $selection = array_slice($selection, 0, $num);
-
- if($display == true){
- reset( $selection );
- $list = "";
- $last = count($selection) - 1;
- $i = 0;
-
- foreach ( (array) $selection as $post ) {
-
- $post_link = $post->guid;
- // No guid set on last post, display homepage
- if(strlen($post_link) == 0) $post_link = $post->domain_url;
-
- $list .= "<li";
- // Display class for last element
- if($i == $last) { $list .= " class='last clearfix'"; }
-
- $list .= "><a class='avatar' href='$post_link'><img src='".author_image_path($post->post_author, $display = false)."' width='48px' height='48px' alt='".strip_tags($post->post_title)."'/></a><h3><a href='$post_link'>$post->post_title</a></h3><p>hace ".get_time_difference($post->post_modified, $decorate=true)."</p></li>";
- $i++;
- }
- echo "<ul>$list</ul>";
- }
-
- return $result;
-}
-
-function sort_post_by_date($post_1, $post_2){
- return ($post_1->post_modified < $post_2->post_modified) ? 1 : -1;
-}
-
-function get_updated_blogs($limit = true, $count = 10, $offset = 0){
+function get_last_updated( $display = false ) {
global $wpdb;
- $query = "SELECT blog_id, domain, path, last_updated ".
- "FROM $wpdb->blogs WHERE site_id = '$wpdb->siteid' ".
- "AND mature = '0' AND spam = '0' AND deleted = '0' ".
- "AND last_updated >= DATE_SUB(CURRENT_DATE(), INTERVAL 7 DAY) ".
- "ORDER BY last_updated DESC";
-
- if($limit) $query .= " LIMIT $offset, $count";
-
- return $wpdb->get_results( $query, ARRAY_A );
-}
-
-function get_last_blog_post($blog_id) {
- global $wpdb;
-
- $key = $blog_id."-".$post_id."-last_blog_post";
- $post = wp_cache_get( $key, "site-options" );
- if( $post == false ) {
- $post = $wpdb->get_row( "SELECT * FROM {$wpdb->base_prefix}{$blog_id}_posts WHERE post_type = 'post' AND post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1" );
- wp_cache_add( $key, $post, "site-options", 120 );
- }
-
- return $post;
+ return $wpdb->get_results( "SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = '$wpdb->siteid' AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit 0,40", ARRAY_A );
}
-function get_most_active_blogs( $num = 10, $display = true, $title = "blogs") {
- global $wpdb;
+function get_most_active_blogs( $num = 10, $display = true ) {
$most_active = get_site_option( "most_active" );
$update = false;
if( is_array( $most_active ) ) {
@@ -632,42 +553,17 @@ function get_most_active_blogs( $num = 10, $display = true, $title = "blogs") {
}
update_site_option( "most_active", $most_active );
}
-
- $most_active = array_slice( $most_active, 0, $num );
if( $display == true ) {
if( is_array( $most_active ) ) {
reset( $most_active );
- $list = "";
- $last = count($most_active) - 1;
- $i = 0;
- foreach($most_active as $blog) {
- $url = "http://" . $blog['domain'] . $blog['path'];
-
- switch ($title) {
- case "blogs": $title = get_blog_option($blog['blog_id'], 'blogname');
- break;
-
- case "posts": $title = get_blog_option($blog['blog_id'], 'blogname');
- break;
-
- default: $title = get_blog_option($blog['blog_id'], 'blogname');
- break;
- }
-
- if($i != $last){
- $list .= "<li><a href='$url'>$title</a></li>";
- } else {
- $list .= "<li class='last clearfix'><a href='$url'>$title</a></li>";
- }
- $i++;
+ foreach ( (array) $most_active as $key => $details ) {
+ $url = clean_url("http://" . $details['domain'] . $details['path']);
+ echo "<li>" . $details['postcount'] . " <a href='$url'>$url</a></li>";
}
-
- // Display resulting list
- echo "<ul>$list</ul>";
}
}
- return $most_active;
+ return array_slice( $most_active, 0, $num );
}
function get_blog_list( $start = 0, $num = 10, $display = true ) {
@@ -934,7 +830,7 @@ function wpmu_validate_user_signup($user_name, $user_email) {
$errors = new WP_Error();
- $user_name = sanitize_user($user_name);
+ $user_name = preg_replace( "/\s+/", '', sanitize_user( $user_name, true ) );
$user_email = sanitize_email( $user_email );
if ( empty( $user_name ) )
@@ -1031,7 +927,7 @@ function wpmu_validate_user_signup($user_name, $user_email) {
function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') {
global $wpdb, $domain, $base;
- $blogname = sanitize_user( $blogname );
+ $blogname = preg_replace( "/\s+/", '', sanitize_user( $blogname, true ) );
$blog_title = strip_tags( $blog_title );
$blog_title = substr( $blog_title, 0, 50 );
@@ -1130,7 +1026,7 @@ function wpmu_signup_blog($domain, $path, $title, $user, $user_email, $meta = ''
function wpmu_signup_user($user, $user_email, $meta = '') {
global $wpdb;
- $user = sanitize_user( $user );
+ $user = preg_replace( "/\s+/", '', sanitize_user( $user, true ) );
$user_email = sanitize_email( $user_email );
$key = substr( md5( time() . rand() . $user_email ), 0, 16 );
@@ -1255,7 +1151,7 @@ function generate_random_password( $len = 8 ) {
}
function wpmu_create_user( $user_name, $password, $email) {
- $user_name = ereg_replace("[^A-Za-z0-9]", "", $user_name);
+ $user_name = preg_replace( "/\s+/", '', sanitize_user( $user_name, true ) );
if ( username_exists($user_name) )
return false;
@@ -1275,7 +1171,9 @@ function wpmu_create_user( $user_name, $password, $email) {
}
function wpmu_create_blog($domain, $path, $title, $user_id, $meta = '', $site_id = 1) {
- $domain = sanitize_user( $domain );
+ $domain = preg_replace( "/\s+/", '', sanitize_user( $domain, true ) );
+ if( constant( 'VHOST' ) == 'yes' )
+ $domain = str_replace( '@', '', $domain );
$title = strip_tags( $title );
$user_id = (int) $user_id;
@@ -2006,47 +1904,6 @@ if( is_object( $wp_object_cache ) ) {
$wp_object_cache->non_persistent_groups = array('comment', 'counts');
}
-// support a GET parameter for disabling the flash uploader
-function wpmu_upload_flash($flash) {
- if ( array_key_exists('flash', $_REQUEST) )
- $flash = !empty($_REQUEST['flash']);
- return $flash;
-}
-
-add_filter('flash_uploader', 'wpmu_upload_flash');
-
-function wpmu_upload_flash_bypass() {
- echo '<p class="upload-flash-bypass">';
- printf( __('You are using the Flash uploader. Problems? Try the <a href="%s">Browser uploader</a> instead.'), add_query_arg('flash', 0) );
- echo '</p>';
-}
-
-add_action('post-flash-upload-ui', 'wpmu_upload_flash_bypass');
-
-function wpmu_upload_html_bypass() {
- echo '<p class="upload-html-bypass">';
- if ( array_key_exists('flash', $_REQUEST) )
- // the user manually selected the browser uploader, so let them switch back to Flash
- printf( __('You are using the Browser uploader. Try the <a href="%s">Flash uploader</a> instead.'), add_query_arg('flash', 1) );
- else
- // the user probably doesn't have Flash
- printf( __('You are using the Browser uploader.') );
-
- echo '</p>';
-}
-
-add_action('post-flash-upload-ui', 'wpmu_upload_flash_bypass');
-add_action('post-html-upload-ui', 'wpmu_upload_html_bypass');
-
-// make sure the GET parameter sticks when we submit a form
-function wpmu_upload_bypass_url($url) {
- if ( array_key_exists('flash', $_REQUEST) )
- $url = add_query_arg('flash', intval($_REQUEST['flash']));
- return $url;
-}
-
-add_filter('media_upload_form_url', 'wpmu_upload_bypass_url');
-
function mu_locale( $locale ) {
if( defined('WP_INSTALLING') == false ) {
$mu_locale = get_option('WPLANG');
@@ -2088,43 +1945,25 @@ function maybe_redirect_404() {
}
add_action( 'template_redirect', 'maybe_redirect_404' );
-function get_time_difference($post_time, $decorate = false){
- $timestamp = time() - strtotime($post_time);
-
- if($decorate == true){
- return duration($timestamp);
- } else {
- return $timestamp;
+function remove_tinymce_media_button( $buttons ) {
+ unset( $buttons[ array_search( 'media', $buttons ) ] );
+ return $buttons;
+}
+add_filter( 'mce_buttons_2', 'remove_tinymce_media_button' );
+
+function add_existing_user_to_blog() {
+ if( false !== strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) ) {
+ $parts = explode( '/', $_SERVER[ 'REQUEST_URI' ] );
+ $key = array_pop( $parts );
+ if( $key == '' )
+ $key = array_pop( $parts );
+ $details = get_option( "new_user_" . $key );
+ if( is_array( $details ) ) {
+ add_user_to_blog( '', $details[ 'user_id' ], $details[ 'role' ] );
+ do_action( "added_existing_user", $details[ 'user_id' ] );
+ wp_die( 'You have been added to this blog. Please visit the <a href="' . site_url() . '">homepage</a> or <a href="' . site_url( '/wp-admin/' ) . '">login</a> using your username and password.' );
+ }
}
}
-
-function duration($timestamp) {
-
- $years=floor($timestamp / (60*60*24*365));
- $timestamp%=60*60*24*365;
-
- $weeks=floor($timestamp / (60*60*24*7));
- $timestamp%=60*60*24*7;
-
- $days=floor($timestamp / (60*60*24));
- $timestamp%=60*60*24;
-
- $hrs=floor($timestamp / (60*60));
- $timestamp%=60*60;
-
- $mins=floor($timestamp / 60);
- $secs=$timestamp % 60;
-
- $str="";
-
- if ($secs >= 1) { $str ="{$secs} segundos "; }
- if ($mins >= 1) { $str ="{$mins} minutos "; }
- if ($hrs >= 1) { $str ="{$hrs} horas "; }
- if ($days >= 1) { $str ="{$days} días "; }
- if ($weeks >= 1) { $str ="{$weeks} semanas "; }
- if ($years >= 1) { $str ="{$years} años "; }
-
- return $str;
-}
-
+add_action( 'init', 'add_existing_user_to_blog' );
?>
wp-includes/wpmu-functions.php
@@ -36,14 +36,14 @@ if ( file_exists( ABSPATH . 'wp-config.php') ) {
// A config file doesn't exist
// Set a path for the link to the installer
- if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';
- else $path = 'wp-admin/';
+ if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '../';
+ else $path = '';
// Die with an error message
require_once( ABSPATH . '/wp-includes/classes.php' );
require_once( ABSPATH . '/wp-includes/functions.php' );
require_once( ABSPATH . '/wp-includes/plugin.php' );
- wp_die(sprintf(/*WP_I18N_NO_CONFIG*/"There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.</p><p><a href='%ssetup-config.php' class='button'>Create a Configuration File</a>"/*/WP_I18N_NO_CONFIG*/, $path), /*WP_I18N_ERROR_TITLE*/"WordPress › Error"/*/WP_I18N_ERROR_TITLE*/);
+ wp_die(sprintf(/*WP_I18N_NO_CONFIG*/"There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started.<p><a href='%sindex.php' class='button'>Create a Configuration File</a>"/*/WP_I18N_NO_CONFIG*/, $path), /*WP_I18N_ERROR_TITLE*/"WordPress › Error"/*/WP_I18N_ERROR_TITLE*/);
}
wp-load.php
@@ -129,6 +129,13 @@ function retrieve_password() {
do_action('retreive_password', $user_login); // Misspelled and deprecated
do_action('retrieve_password', $user_login);
+ $allow = apply_filters('allow_password_reset', true, $user_data->ID);
+
+ if ( ! $allow )
+ return new WP_Error('no_password_reset', __('Password reset is not allowed for this user'));
+ else if ( is_wp_error($allow) )
+ return $allow;
+
$key = $wpdb->get_var($wpdb->prepare("SELECT user_activation_key FROM $wpdb->users WHERE user_login = %s", $user_login));
if ( empty($key) ) {
// Generate something random for a key...
wp-login.php
@@ -299,7 +299,8 @@ if ( !defined('WP_PLUGIN_URL') )
if ( !defined('PLUGINDIR') )
define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH. For back compat.
-$current_site->site_name = get_site_option('site_name');
+if( !isset($current_site->site_name) )
+ $current_site->site_name = get_site_option('site_name');
if( $current_site->site_name == false )
$current_site->site_name = ucfirst( $current_site->domain );
wp-settings.php
@@ -417,7 +417,10 @@ if( $active_signup == "none" ) {
$newblog = 'http://' . $current_site->domain . $current_site->path . $newblogname . '/';
else
$newblog = 'http://' . $newblogname . '.' . $current_site->domain . $current_site->path;
- printf(__("<p><em>The blog you were looking for, <strong>%s</strong> doesn't exist but you can create it now!</em></p>"), $newblog );
+ if ($active_signup == 'blog' || $active_signup == 'all')
+ printf(__("<p><em>The blog you were looking for, <strong>%s</strong> doesn't exist but you can create it now!</em></p>"), $newblog );
+ else
+ printf(__("<p><em>The blog you were looking for, <strong>%s</strong> doesn't exist.</em></p>"), $newblog );
}
break;
}
wp-signup.php
5304c261310d3e7e4f63372f85c600111ce2a2e8
redwarrior
redwarrior@debian-redwarrior.(none)
http://github.com/alx/blogsfera/commit/9cb2436ed51e1899387e2b345d8a926cfb4d7ff0
9cb2436ed51e1899387e2b345d8a926cfb4d7ff0
2008-07-29T06:55:41-07:00
2008-07-29T06:55:41-07:00
upgrade to wpmu 2.6
84113f73f22a2d7534c1b4b069a0f82d1405dec9
redwarrior
redwarrior@debian-redwarrior.(none)