X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/fd1685fbc29cf422e0d23f1bf1815bc023be805d..a5227bf01edbe6660486c9f5c0f0ed7b7fea3130:/wp-admin/options-general.php

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index def21249..1aaee472 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -9,8 +9,8 @@
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
 
-if ( ! current_user_can('manage_options') )
-	wp_die(__('You do not have sufficient permissions to manage options for this blog.'));
+if ( ! current_user_can( 'manage_options' ) )
+	wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
 
 $title = __('General Settings');
 $parent_file = 'options-general.php';
@@ -50,6 +50,18 @@ function add_js() {
 }
 add_filter('admin_head', 'add_js');
 
+add_contextual_help($current_screen,
+	'<p>' . __('The fields on this screen determine some of the basics of your site setup.') . '</p>' .
+	'<p>' . __('Most themes display the site title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. The tagline is also displayed by many themes.') . '</p>' .
+	'<p>' . __('The WordPress URL and the Site URL can be the same (example.com) or different; for example, having the WordPress core files (example.com/wordpress) in a subdirectory instead of the root directory.') . '</p>' .
+	'<p>' . __('If you want site visitors to be able to register themselves, as opposed to being registered by the site administrator, check the membership box. A default user role can be set for all new users, whether self-registered or registered by the site administrator.') . '</p>' .
+	'<p>' . __('UTC means Coordinated Universal Time.') . '</p>' .
+	'<p>' . __('Remember to click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>' .
+	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p>' . __('<a href="http://codex.wordpress.org/Settings_General_SubPanel" target="_blank">Documentation on General Settings</a>') . '</p>' .
+	'<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+);
+
 include('./admin-header.php');
 ?>
 
@@ -62,22 +74,23 @@ include('./admin-header.php');
 
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><label for="blogname"><?php _e('Blog Title') ?></label></th>
+<th scope="row"><label for="blogname"><?php _e('Site Title') ?></label></th>
 <td><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" class="regular-text" /></td>
 </tr>
 <tr valign="top">
 <th scope="row"><label for="blogdescription"><?php _e('Tagline') ?></label></th>
 <td><input name="blogdescription" type="text" id="blogdescription"  value="<?php form_option('blogdescription'); ?>" class="regular-text" />
-<span class="description"><?php _e('In a few words, explain what this blog is about.') ?></span></td>
+<span class="description"><?php _e('In a few words, explain what this site is about.') ?></span></td>
 </tr>
+<?php if ( !is_multisite() ) { ?>
 <tr valign="top">
 <th scope="row"><label for="siteurl"><?php _e('WordPress address (URL)') ?></label></th>
-<td><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>" class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) : ?> disabled" disabled="disabled"<?php else: ?>"<?php endif; ?> /></td>
+<td><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) echo ' disabled' ?>" /></td>
 </tr>
 <tr valign="top">
-<th scope="row"><label for="home"><?php _e('Blog address (URL)') ?></label></th>
-<td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>" class="regular-text code<?php if ( defined( 'WP_HOME' ) ) : ?> disabled" disabled="disabled"<?php else: ?>"<?php endif; ?> />
-<span class="description"><?php _e('Enter the address here if you want your blog homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different from the directory</a> you installed WordPress.'); ?></span></td>
+<th scope="row"><label for="home"><?php _e('Site address (URL)') ?></label></th>
+<td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) echo ' disabled' ?>" />
+<span class="description"><?php _e('Enter the address here if you want your site homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different from the directory</a> you installed WordPress.'); ?></span></td>
 </tr>
 <tr valign="top">
 <th scope="row"><label for="admin_email"><?php _e('E-mail address') ?> </label></th>
@@ -97,6 +110,21 @@ include('./admin-header.php');
 <select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option('default_role') ); ?></select>
 </td>
 </tr>
+<?php } else { ?>
+<tr valign="top">
+<th scope="row"><label for="new_admin_email"><?php _e('E-mail address') ?> </label></th>
+<td><input name="new_admin_email" type="text" id="new_admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text code" />
+<span class="setting-description"><?php _e('This address is used for admin purposes. If you change this we will send you an e-mail at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>') ?></span>
+<?php
+$new_admin_email = get_option( 'new_admin_email' );
+if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?>
+<div class="updated inline">
+<p><?php printf( __('There is a pending change of the admin e-mail to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), $new_admin_email, esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ) ); ?></p>
+</div>
+<?php endif; ?>
+</td>
+</tr>
+<?php } ?>
 <tr>
 <?php
 if ( !wp_timezone_supported() ) : // no magic timezone support here
@@ -133,17 +161,29 @@ foreach ( $offset_range as $offset ) {
 	<span id="local-time"><?php printf(__('UTC %1$s is <code>%2$s</code>'), $current_offset_name, date_i18n($time_format)); ?></span>
 <?php endif; ?>
 <br />
-<span class="description"><?php _e('Unfortunately, you have to manually update this for Daylight Savings Time. Lame, we know, but will be fixed in the future.'); ?></span>
+<span class="description"><?php _e('Unfortunately, you have to manually update this for daylight saving time. The PHP Date/Time library is not supported by your web host.'); ?></span>
 </td>
 <?php
 else: // looks like we can do nice timezone selection!
 $current_offset = get_option('gmt_offset');
 $tzstring = get_option('timezone_string');
-if (empty($tzstring)) { // set the Etc zone if no timezone string exists
-	if ($current_offset < 0) $offnum = - ceil($current_offset);
-	else $offnum = - floor($current_offset);
-	$tzstring = 'Etc/GMT' . (($offnum >= 0) ? '+' : '') . $offnum;
+
+$check_zone_info = true;
+
+// Remove old Etc mappings.  Fallback to gmt_offset.
+if ( false !== strpos($tzstring,'Etc/GMT') )
+	$tzstring = '';
+
+if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
+	$check_zone_info = false;
+	if ( 0 == $current_offset )
+		$tzstring = 'UTC+0';
+	elseif ($current_offset < 0)
+		$tzstring = 'UTC' . $current_offset;
+	else
+		$tzstring = 'UTC+' . $current_offset;
 }
+
 ?>
 <th scope="row"><label for="timezone_string"><?php _e('Timezone') ?></label></th>
 <td>
@@ -153,40 +193,50 @@ if (empty($tzstring)) { // set the Etc zone if no timezone string exists
 </select>
 
     <span id="utc-time"><?php printf(__('<abbr title="Coordinated Universal Time">UTC</abbr> time is <code>%s</code>'), date_i18n($timezone_format, false, 'gmt')); ?></span>
-<?php if (get_option('timezone_string')) : ?>
+<?php if ( get_option('timezone_string') || !empty($current_offset) ) : ?>
 	<span id="local-time"><?php printf(__('Local time is <code>%1$s</code>'), date_i18n($timezone_format)); ?></span>
 <?php endif; ?>
 <br />
 <span class="description"><?php _e('Choose a city in the same timezone as you.'); ?></span>
+<?php if ($check_zone_info && $tzstring) : ?>
 <br />
 <span>
-<?php if ($tzstring) : ?>
 	<?php
-	$now = localtime(time(),true);
-	if ($now['tm_isdst']) _e('This timezone is currently in daylight savings time.');
-	else _e('This timezone is currently in standard time.');
+	// Set TZ so localtime works.
+	date_default_timezone_set($tzstring);
+	$now = localtime(time(), true);
+	if ( $now['tm_isdst'] )
+		_e('This timezone is currently in daylight saving time.');
+	else
+		_e('This timezone is currently in standard time.');
 	?>
 	<br />
 	<?php
-	if (function_exists('timezone_transitions_get')) {
-		$dateTimeZoneSelected = new DateTimeZone($tzstring);
-		foreach (timezone_transitions_get($dateTimeZoneSelected) as $tr) {
-			if ($tr['ts'] > time()) {
+	if ( function_exists('timezone_transitions_get') ) {
+		$found = false;
+		$date_time_zone_selected = new DateTimeZone($tzstring);
+		$tz_offset = timezone_offset_get($date_time_zone_selected, date_create());
+		$right_now = time();
+		foreach ( timezone_transitions_get($date_time_zone_selected) as $tr) {
+			if ( $tr['ts'] > $right_now ) {
 			    $found = true;
 				break;
 			}
 		}
 
-		if ( isset($found) && $found === true ) {
+		if ( $found ) {
 			echo ' ';
 			$message = $tr['isdst'] ?
-				__('Daylight savings time begins on: <code>%s</code>.') :
+				__('Daylight saving time begins on: <code>%s</code>.') :
 				__('Standard time begins  on: <code>%s</code>.');
-			printf( $message, date_i18n(get_option('date_format').' '.get_option('time_format'), $tr['ts'] ) );
+			// Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
+			printf( $message, date_i18n(get_option('date_format') . ' ' . get_option('time_format'), $tr['ts'] + ($tz_offset - $tr['offset']) ) );
 		} else {
-			_e('This timezone does not observe daylight savings time.');
+			_e('This timezone does not observe daylight saving time.');
 		}
 	}
+	// Set back to UTC.
+	date_default_timezone_set('UTC');
 	?>
 	</span>
 <?php endif; ?>
@@ -207,13 +257,13 @@ if (empty($tzstring)) { // set the Etc zone if no timezone string exists
 		'd/m/Y',
 	) );
 
-	$custom = TRUE;
+	$custom = true;
 
 	foreach ( $date_formats as $format ) {
 		echo "\t<label title='" . esc_attr($format) . "'><input type='radio' name='date_format' value='" . esc_attr($format) . "'";
 		if ( get_option('date_format') === $format ) { // checked() uses "==" rather than "==="
 			echo " checked='checked'";
-			$custom = FALSE;
+			$custom = false;
 		}
 		echo ' /> ' . date_i18n( $format ) . "</label><br />\n";
 	}
@@ -239,13 +289,13 @@ if (empty($tzstring)) { // set the Etc zone if no timezone string exists
 		'H:i',
 	) );
 
-	$custom = TRUE;
+	$custom = true;
 
 	foreach ( $time_formats as $format ) {
 		echo "\t<label title='" . esc_attr($format) . "'><input type='radio' name='time_format' value='" . esc_attr($format) . "'";
 		if ( get_option('time_format') === $format ) { // checked() uses "==" rather than "==="
 			echo " checked='checked'";
-			$custom = FALSE;
+			$custom = false;
 		}
 		echo ' /> ' . date_i18n( $format ) . "</label><br />\n";
 	}
@@ -269,6 +319,21 @@ endfor;
 </select></td>
 </tr>
 <?php do_settings_fields('general', 'default'); ?>
+<?php
+	$languages = get_available_languages();
+	if ( is_multisite() && !empty( $languages ) ):
+?>
+	<tr valign="top">
+		<th width="33%" scope="row"><?php _e('Site language:') ?></th>
+		<td>
+			<select name="WPLANG" id="WPLANG">
+				<?php mu_dropdown_languages( $languages, get_option('WPLANG') ); ?>
+			</select>
+		</td>
+	</tr>
+<?php
+	endif;
+?>
 </table>
 
 <?php do_settings_sections('general'); ?>