X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f..refs/tags/wordpress-4.4:/wp-admin/includes/misc.php diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php index f93e1388..d3d2d342 100644 --- a/wp-admin/includes/misc.php +++ b/wp-admin/includes/misc.php @@ -38,6 +38,8 @@ function got_mod_rewrite() { * * @since 3.7.0 * + * @global bool $is_nginx + * * @return bool Whether the server supports URL rewriting. */ function got_url_rewrite() { @@ -54,12 +56,12 @@ function got_url_rewrite() { } /** - * {@internal Missing Short Description}} + * Extracts strings from between the BEGIN and END markers in the .htaccess file. * * @since 1.5.0 * - * @param unknown_type $filename - * @param unknown_type $marker + * @param string $filename + * @param string $marker * @return array An array of strings from a file (.htaccess ) from between BEGIN and END markers. */ function extract_from_markers( $filename, $marker ) { @@ -86,64 +88,99 @@ function extract_from_markers( $filename, $marker ) { } /** - * {@internal Missing Short Description}} - * * Inserts an array of strings into a file (.htaccess ), placing it between - * BEGIN and END markers. Replaces existing marked info. Retains surrounding + * BEGIN and END markers. + * + * Replaces existing marked info. Retains surrounding * data. Creates file if none exists. * * @since 1.5.0 * - * @param unknown_type $filename - * @param unknown_type $marker - * @param unknown_type $insertion + * @param string $filename Filename to alter. + * @param string $marker The marker to alter. + * @param array|string $insertion The new content to insert. * @return bool True on write success, false on failure. */ function insert_with_markers( $filename, $marker, $insertion ) { - if (!file_exists( $filename ) || is_writeable( $filename ) ) { - if (!file_exists( $filename ) ) { - $markerdata = ''; - } else { - $markerdata = explode( "\n", implode( '', file( $filename ) ) ); + if ( ! file_exists( $filename ) ) { + if ( ! is_writable( dirname( $filename ) ) ) { + return false; } - - if ( !$f = @fopen( $filename, 'w' ) ) + if ( ! touch( $filename ) ) { return false; + } + } elseif ( ! is_writeable( $filename ) ) { + return false; + } - $foundit = false; - if ( $markerdata ) { - $state = true; - foreach ( $markerdata as $n => $markerline ) { - if (strpos($markerline, '# BEGIN ' . $marker) !== false) - $state = false; - if ( $state ) { - if ( $n + 1 < count( $markerdata ) ) - fwrite( $f, "{$markerline}\n" ); - else - fwrite( $f, "{$markerline}" ); - } - if (strpos($markerline, '# END ' . $marker) !== false) { - fwrite( $f, "# BEGIN {$marker}\n" ); - if ( is_array( $insertion )) - foreach ( $insertion as $insertline ) - fwrite( $f, "{$insertline}\n" ); - fwrite( $f, "# END {$marker}\n" ); - $state = true; - $foundit = true; - } - } + if ( ! is_array( $insertion ) ) { + $insertion = explode( "\n", $insertion ); + } + + $start_marker = "# BEGIN {$marker}"; + $end_marker = "# END {$marker}"; + + $fp = fopen( $filename, 'r+' ); + if ( ! $fp ) { + return false; + } + + // Attempt to get a lock. If the filesystem supports locking, this will block until the lock is acquired. + flock( $fp, LOCK_EX ); + + $lines = array(); + while ( ! feof( $fp ) ) { + $lines[] = rtrim( fgets( $fp ), "\r\n" ); + } + + // Split out the existing file into the preceeding lines, and those that appear after the marker + $pre_lines = $post_lines = $existing_lines = array(); + $found_marker = $found_end_marker = false; + foreach ( $lines as $line ) { + if ( ! $found_marker && false !== strpos( $line, $start_marker ) ) { + $found_marker = true; + continue; + } elseif ( ! $found_end_marker && false !== strpos( $line, $end_marker ) ) { + $found_end_marker = true; + continue; } - if (!$foundit) { - fwrite( $f, "\n# BEGIN {$marker}\n" ); - foreach ( $insertion as $insertline ) - fwrite( $f, "{$insertline}\n" ); - fwrite( $f, "# END {$marker}\n" ); + if ( ! $found_marker ) { + $pre_lines[] = $line; + } elseif ( $found_marker && $found_end_marker ) { + $post_lines[] = $line; + } else { + $existing_lines[] = $line; } - fclose( $f ); + } + + // Check to see if there was a change + if ( $existing_lines === $insertion ) { + flock( $fp, LOCK_UN ); + fclose( $fp ); + return true; - } else { - return false; } + + // Generate the new file data + $new_file_data = implode( "\n", array_merge( + $pre_lines, + array( $start_marker ), + $insertion, + array( $end_marker ), + $post_lines + ) ); + + // Write to the start of the file, and truncate it to that length + fseek( $fp, 0 ); + $bytes = fwrite( $fp, $new_file_data ); + if ( $bytes ) { + ftruncate( $fp, ftell( $fp ) ); + } + fflush( $fp ); + flock( $fp, LOCK_UN ); + fclose( $fp ); + + return (bool) $bytes; } /** @@ -153,6 +190,8 @@ function insert_with_markers( $filename, $marker, $insertion ) { * blank out old rules. * * @since 1.5.0 + * + * @global WP_Rewrite $wp_rewrite */ function save_mod_rewrite_rules() { if ( is_multisite() ) @@ -183,6 +222,8 @@ function save_mod_rewrite_rules() { * * @since 2.8.0 * + * @global WP_Rewrite $wp_rewrite + * * @return bool True if web.config was updated successfully */ function iis7_save_url_rewrite_rules(){ @@ -207,11 +248,11 @@ function iis7_save_url_rewrite_rules(){ } /** - * {@internal Missing Short Description}} + * Update the "recently-edited" file for the plugin or theme editor. * * @since 1.5.0 * - * @param unknown_type $file + * @param string $file */ function update_recently_edited( $file ) { $oldfiles = (array ) get_option( 'recently_edited' ); @@ -229,7 +270,7 @@ function update_recently_edited( $file ) { } /** - * If siteurl, home or page_on_front changed, flush rewrite rules. + * Flushes rewrite rules if siteurl, home or page_on_front changed. * * @since 2.1.0 * @@ -237,32 +278,16 @@ function update_recently_edited( $file ) { * @param string $value */ function update_home_siteurl( $old_value, $value ) { - if ( defined( "WP_INSTALLING" ) ) + if ( wp_installing() ) return; - // If home changed, write rewrite rules to new location. - flush_rewrite_rules(); + if ( is_multisite() && ms_is_switched() ) { + delete_option( 'rewrite_rules' ); + } else { + flush_rewrite_rules(); + } } -add_action( 'update_option_home', 'update_home_siteurl', 10, 2 ); -add_action( 'update_option_siteurl', 'update_home_siteurl', 10, 2 ); -add_action( 'update_option_page_on_front', 'update_home_siteurl', 10, 2 ); - -/** - * Shorten an URL, to be used as link text - * - * @since 1.2.0 - * - * @param string $url - * @return string - */ -function url_shorten( $url ) { - $short_url = str_replace( array( 'http://', 'www.' ), '', $url ); - $short_url = untrailingslashit( $short_url ); - if ( strlen( $short_url ) > 35 ) - $short_url = substr( $short_url, 0, 32 ) . '…'; - return $short_url; -} /** * Resets global variables based on $_GET and $_POST @@ -290,11 +315,11 @@ function wp_reset_vars( $vars ) { } /** - * {@internal Missing Short Description}} + * Displays the given administration message. * * @since 2.1.0 * - * @param unknown_type $message + * @param string|WP_Error $message */ function show_message($message) { if ( is_wp_error($message) ){ @@ -308,6 +333,12 @@ function show_message($message) { flush(); } +/** + * @since 2.8.0 + * + * @param string $content + * @return array + */ function wp_doc_link_parse( $content ) { if ( !is_string( $content ) || empty( $content ) ) return array(); @@ -430,7 +461,13 @@ function set_screen_options() { } update_user_meta($user->ID, $option, $value); - wp_safe_redirect( remove_query_arg( array('pagenum', 'apage', 'paged'), wp_get_referer() ) ); + + $url = remove_query_arg( array( 'pagenum', 'apage', 'paged' ), wp_get_referer() ); + if ( isset( $_POST['mode'] ) ) { + $url = add_query_arg( array( 'mode' => $_POST['mode'] ), $url ); + } + + wp_safe_redirect( $url ); exit; } } @@ -446,8 +483,9 @@ function set_screen_options() { function iis7_rewrite_rule_exists($filename) { if ( ! file_exists($filename) ) return false; - if ( ! class_exists('DOMDocument') ) + if ( ! class_exists( 'DOMDocument', false ) ) { return false; + } $doc = new DOMDocument(); if ( $doc->load($filename) === false ) @@ -473,8 +511,9 @@ function iis7_delete_rewrite_rule($filename) { if ( ! file_exists($filename) ) return true; - if ( ! class_exists('DOMDocument') ) + if ( ! class_exists( 'DOMDocument', false ) ) { return false; + } $doc = new DOMDocument(); $doc->preserveWhiteSpace = false; @@ -503,8 +542,9 @@ function iis7_delete_rewrite_rule($filename) { * @return bool */ function iis7_add_rewrite_rule($filename, $rewrite_rule) { - if ( ! class_exists('DOMDocument') ) + if ( ! class_exists( 'DOMDocument', false ) ) { return false; + } // If configuration file does not exist then we create one. if ( ! file_exists($filename) ) { @@ -593,6 +633,8 @@ function saveDomDocument($doc, $filename) { * Display the default admin color scheme picker (Used in user-edit.php) * * @since 3.0.0 + * + * @global array $_wp_admin_css_colors */ function admin_color_scheme_picker( $user_id ) { global $_wp_admin_css_colors; @@ -621,7 +663,7 @@ function admin_color_scheme_picker( $user_id ) {