--- a/web/wp-admin/includes/misc.php Thu Sep 16 15:45:36 2010 +0000
+++ b/web/wp-admin/includes/misc.php Mon Nov 19 18:26:13 2012 +0100
@@ -9,7 +9,7 @@
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.0.0
*
* @return unknown
*/
@@ -21,7 +21,7 @@
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 1.5.0
*
* @param unknown_type $filename
* @param unknown_type $marker
@@ -57,7 +57,7 @@
* BEGIN and END markers. Replaces existing marked info. Retains surrounding
* data. Creates file if none exists.
*
- * @since unknown
+ * @since 1.5.0
*
* @param unknown_type $filename
* @param unknown_type $marker
@@ -117,15 +117,18 @@
* Always writes to the file if it exists and is writable to ensure that we
* blank out old rules.
*
- * @since unknown
+ * @since 1.5.0
*/
function save_mod_rewrite_rules() {
+ if ( is_multisite() )
+ return;
+
global $wp_rewrite;
$home_path = get_home_path();
$htaccess_file = $home_path.'.htaccess';
- // If the file doesn't already exists check for write access to the directory and whether of not we have some rules.
+ // If the file doesn't already exist check for write access to the directory and whether we have some rules.
// else check for write access to the file.
if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) {
if ( got_mod_rewrite() ) {
@@ -146,20 +149,21 @@
* @return bool True if web.config was updated successfully
*/
function iis7_save_url_rewrite_rules(){
+ if ( is_multisite() )
+ return;
+
global $wp_rewrite;
$home_path = get_home_path();
$web_config_file = $home_path . 'web.config';
// Using win_is_writable() instead of is_writable() because of a bug in Windows PHP
- if ( ( ! file_exists($web_config_file) && win_is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks() ) || win_is_writable($web_config_file) ) {
- if ( iis7_supports_permalinks() ) {
- $rule = $wp_rewrite->iis7_url_rewrite_rules(false, '', '');
- if ( ! empty($rule) ) {
- return iis7_add_rewrite_rule($web_config_file, $rule);
- } else {
- return iis7_delete_rewrite_rule($web_config_file);
- }
+ if ( iis7_supports_permalinks() && ( ( ! file_exists($web_config_file) && win_is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks() ) || win_is_writable($web_config_file) ) ) {
+ $rule = $wp_rewrite->iis7_url_rewrite_rules(false, '', '');
+ if ( ! empty($rule) ) {
+ return iis7_add_rewrite_rule($web_config_file, $rule);
+ } else {
+ return iis7_delete_rewrite_rule($web_config_file);
}
}
return false;
@@ -168,7 +172,7 @@
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 1.5.0
*
* @param unknown_type $file
*/
@@ -190,63 +194,62 @@
/**
* If siteurl or home changed, flush rewrite rules.
*
- * @since unknown
+ * @since 2.1.0
*
- * @param unknown_type $old_value
- * @param unknown_type $value
+ * @param string $old_value
+ * @param string $value
*/
function update_home_siteurl( $old_value, $value ) {
- global $wp_rewrite;
-
if ( defined( "WP_INSTALLING" ) )
return;
// If home changed, write rewrite rules to new location.
- $wp_rewrite->flush_rules();
+ flush_rewrite_rules();
}
add_action( 'update_option_home', 'update_home_siteurl', 10, 2 );
add_action( 'update_option_siteurl', 'update_home_siteurl', 10, 2 );
/**
- * {@internal Missing Short Description}}
+ * Shorten an URL, to be used as link text
*
- * @since unknown
+ * @since 1.2.1
*
- * @param unknown_type $url
- * @return unknown
+ * @param string $url
+ * @return string
*/
function url_shorten( $url ) {
$short_url = str_replace( 'http://', '', stripslashes( $url ));
$short_url = str_replace( 'www.', '', $short_url );
- if ('/' == substr( $short_url, -1 ))
- $short_url = substr( $short_url, 0, -1 );
+ $short_url = untrailingslashit( $short_url );
if ( strlen( $short_url ) > 35 )
- $short_url = substr( $short_url, 0, 32 ).'...';
+ $short_url = substr( $short_url, 0, 32 ) . '...';
return $short_url;
}
/**
- * {@internal Missing Short Description}}
+ * Resets global variables based on $_GET and $_POST
*
- * @since unknown
+ * This function resets global variables based on the names passed
+ * in the $vars array to the value of $_POST[$var] or $_GET[$var] or ''
+ * if neither is defined.
*
- * @param unknown_type $vars
+ * @since 2.0.0
+ *
+ * @param array $vars An array of globals to reset.
*/
function wp_reset_vars( $vars ) {
for ( $i=0; $i<count( $vars ); $i += 1 ) {
$var = $vars[$i];
global $$var;
- if (!isset( $$var ) ) {
- if ( empty( $_POST["$var"] ) ) {
- if ( empty( $_GET["$var"] ) )
- $$var = '';
- else
- $$var = $_GET["$var"];
- } else {
- $$var = $_POST["$var"];
- }
+ if ( empty( $_POST[$var] ) ) {
+ if ( empty( $_GET[$var] ) )
+ $$var = '';
+ else
+ $$var = $_GET[$var];
+ } else {
+ $$var = $_POST[$var];
}
}
}
@@ -254,18 +257,20 @@
/**
* {@internal Missing Short Description}}
*
- * @since unknown
+ * @since 2.1.0
*
* @param unknown_type $message
*/
function show_message($message) {
- if( is_wp_error($message) ){
- if( $message->get_error_data() )
+ if ( is_wp_error($message) ){
+ if ( $message->get_error_data() )
$message = $message->get_error_message() . ': ' . $message->get_error_data();
else
$message = $message->get_error_message();
}
echo "<p>$message</p>\n";
+ wp_ob_end_flush_all();
+ flush();
}
function wp_doc_link_parse( $content ) {
@@ -306,76 +311,6 @@
}
/**
- * Determines the language to use for CodePress syntax highlighting,
- * based only on a filename.
- *
- * @since 2.8
- *
- * @param string $filename The name of the file to be highlighting
-**/
-function codepress_get_lang( $filename ) {
- $codepress_supported_langs = apply_filters( 'codepress_supported_langs',
- array( '.css' => 'css',
- '.js' => 'javascript',
- '.php' => 'php',
- '.html' => 'html',
- '.htm' => 'html',
- '.txt' => 'text'
- ) );
- $extension = substr( $filename, strrpos( $filename, '.' ) );
- if ( $extension && array_key_exists( $extension, $codepress_supported_langs ) )
- return $codepress_supported_langs[$extension];
-
- return 'generic';
-}
-
-/**
- * Adds Javascript required to make CodePress work on the theme/plugin editors.
- *
- * This code is attached to the action admin_print_footer_scripts.
- *
- * @since 2.8
-**/
-function codepress_footer_js() {
- // Script-loader breaks CP's automatic path-detection, thus CodePress.path
- // CP edits in an iframe, so we need to grab content back into normal form
- ?><script type="text/javascript">
-/* <![CDATA[ */
-var codepress_path = '<?php echo includes_url('js/codepress/'); ?>';
-jQuery('#template').submit(function(){
- if (jQuery('#newcontent_cp').length)
- jQuery('#newcontent_cp').val(newcontent.getCode()).removeAttr('disabled');
-});
-jQuery('#codepress-on').hide();
-jQuery('#codepress-off').show();
-/* ]]> */
-</script>
-<?php
-}
-
-/**
- * Determine whether to use CodePress or not.
- *
- * @since 2.8
-**/
-function use_codepress() {
-
- if ( isset($_GET['codepress']) ) {
- $on = 'on' == $_GET['codepress'] ? 'on' : 'off';
- set_user_setting( 'codepress', $on );
- } else {
- $on = get_user_setting('codepress', 'on');
- }
-
- if ( 'on' == $on ) {
- add_action( 'admin_print_footer_scripts', 'codepress_footer_js' );
- return true;
- }
-
- return false;
-}
-
-/**
* Saves option for number of rows when listing posts, pages, comments, etc.
*
* @since 2.8
@@ -395,14 +330,28 @@
$option = str_replace('-', '_', $option);
- switch ( $option ) {
+ $map_option = $option;
+ $type = str_replace('edit_', '', $map_option);
+ $type = str_replace('_per_page', '', $type);
+ if ( in_array($type, get_post_types()) )
+ $map_option = 'edit_per_page';
+ if ( in_array( $type, get_taxonomies()) )
+ $map_option = 'edit_tags_per_page';
+
+ switch ( $map_option ) {
case 'edit_per_page':
- case 'edit_pages_per_page':
+ case 'users_per_page':
case 'edit_comments_per_page':
case 'upload_per_page':
- case 'categories_per_page':
case 'edit_tags_per_page':
case 'plugins_per_page':
+ // Network admin
+ case 'sites_network_per_page':
+ case 'users_network_per_page':
+ case 'site_users_network_per_page':
+ case 'plugins_network_per_page':
+ case 'themes_network_per_page':
+ case 'site_themes_network_per_page':
$value = (int) $value;
if ( $value < 1 || $value > 999 )
return;
@@ -414,48 +363,12 @@
break;
}
- update_usermeta($user->ID, $option, $value);
- wp_redirect( remove_query_arg( array('pagenum', 'apage', 'paged'), wp_get_referer() ) );
+ update_user_meta($user->ID, $option, $value);
+ wp_safe_redirect( remove_query_arg( array('pagenum', 'apage', 'paged'), wp_get_referer() ) );
exit;
}
}
-function wp_menu_unfold() {
- if ( isset($_GET['unfoldmenu']) ) {
- delete_user_setting('mfold');
- wp_redirect( remove_query_arg( 'unfoldmenu', stripslashes($_SERVER['REQUEST_URI']) ) );
- exit;
- }
-}
-
-/**
- * Check if IIS 7 supports pretty permalinks
- *
- * @since 2.8.0
- *
- * @return bool
- */
-function iis7_supports_permalinks() {
- global $is_iis7;
-
- $supports_permalinks = false;
- if ( $is_iis7 ) {
- /* First we check if the DOMDocument class exists. If it does not exist,
- * which is the case for PHP 4.X, then we cannot easily update the xml configuration file,
- * hence we just bail out and tell user that pretty permalinks cannot be used.
- * This is not a big issue because PHP 4.X is going to be depricated and for IIS it
- * is recommended to use PHP 5.X NTS.
- * Next we check if the URL Rewrite Module 1.1 is loaded and enabled for the web site. When
- * URL Rewrite 1.1 is loaded it always sets a server variable called 'IIS_UrlRewriteModule'.
- * Lastly we make sure that PHP is running via FastCGI. This is important because if it runs
- * via ISAPI then pretty permalinks will not work.
- */
- $supports_permalinks = class_exists('DOMDocument') && isset($_SERVER['IIS_UrlRewriteModule']) && ( php_sapi_name() == 'cgi-fcgi' );
- }
-
- return apply_filters('iis7_supports_permalinks', $supports_permalinks);
-}
-
/**
* Check if rewrite rule for WordPress already exists in the IIS 7 configuration file
*
@@ -474,7 +387,7 @@
if ( $doc->load($filename) === false )
return false;
$xpath = new DOMXPath($doc);
- $rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[@name=\'wordpress\']');
+ $rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')]');
if ( $rules->length == 0 )
return false;
else
@@ -503,7 +416,7 @@
if ( $doc -> load($filename) === false )
return false;
$xpath = new DOMXPath($doc);
- $rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[@name=\'wordpress\']');
+ $rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')]');
if ( $rules->length > 0 ) {
$child = $rules->item(0);
$parent = $child->parentNode;
@@ -543,7 +456,7 @@
$xpath = new DOMXPath($doc);
// First check if the rule already exists as in that case there is no need to re-add it
- $wordpress_rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[@name=\'wordpress\']');
+ $wordpress_rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')]');
if ( $wordpress_rules->length > 0 )
return true;
@@ -615,28 +528,65 @@
*
* @since 2.8.0
*
- * @param object $path
+ * @param string $path
* @return bool
*/
-function win_is_writable($path) {
+function win_is_writable( $path ) {
/* will work in despite of Windows ACLs bug
* NOTE: use a trailing slash for folders!!!
* see http://bugs.php.net/bug.php?id=27609
* see http://bugs.php.net/bug.php?id=30931
*/
- if ( $path{strlen($path)-1} == '/' ) // recursively return a temporary file path
- return win_is_writable($path . uniqid(mt_rand()) . '.tmp');
- else if ( is_dir($path) )
- return win_is_writable($path . '/' . uniqid(mt_rand()) . '.tmp');
- // check tmp file for read/write capabilities
- $rm = file_exists($path);
- $f = @fopen($path, 'a');
- if ($f===false)
- return false;
- fclose($f);
- if ( ! $rm )
- unlink($path);
- return true;
+ if ( $path[strlen( $path ) - 1] == '/' ) // recursively return a temporary file path
+ return win_is_writable( $path . uniqid( mt_rand() ) . '.tmp');
+ else if ( is_dir( $path ) )
+ return win_is_writable( $path . '/' . uniqid( mt_rand() ) . '.tmp' );
+ // check tmp file for read/write capabilities
+ $should_delete_tmp_file = !file_exists( $path );
+ $f = @fopen( $path, 'a' );
+ if ( $f === false )
+ return false;
+ fclose( $f );
+ if ( $should_delete_tmp_file )
+ unlink( $path );
+ return true;
}
-?>
+
+/**
+ * Display the default admin color scheme picker (Used in user-edit.php)
+ *
+ * @since 3.0.0
+ */
+function admin_color_scheme_picker() {
+ global $_wp_admin_css_colors, $user_id; ?>
+<fieldset><legend class="screen-reader-text"><span><?php _e('Admin Color Scheme')?></span></legend>
+<?php
+$current_color = get_user_option('admin_color', $user_id);
+if ( empty($current_color) )
+ $current_color = 'fresh';
+foreach ( $_wp_admin_css_colors as $color => $color_info ): ?>
+<div class="color-option"><input name="admin_color" id="admin_color_<?php echo $color; ?>" type="radio" value="<?php echo esc_attr($color) ?>" class="tog" <?php checked($color, $current_color); ?> />
+ <table class="color-palette">
+ <tr>
+ <?php foreach ( $color_info->colors as $html_color ): ?>
+ <td style="background-color: <?php echo $html_color ?>" title="<?php echo $color ?>"> </td>
+ <?php endforeach; ?>
+ </tr>
+ </table>
+
+ <label for="admin_color_<?php echo $color; ?>"><?php echo $color_info->name ?></label>
+</div>
+ <?php endforeach; ?>
+</fieldset>
+<?php
+}
+
+function _ipad_meta() {
+ if ( wp_is_mobile() ) {
+ ?>
+ <meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=1">
+ <?php
+ }
+}
+add_action('admin_head', '_ipad_meta');