X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/d3b1ea255664edd2deef17f900a655613d20820d..refs/tags/wordpress-2.9.2:/wp-includes/functions.php diff --git a/wp-includes/functions.php b/wp-includes/functions.php index cfd12bad..1df479e6 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -497,7 +497,7 @@ function update_option( $option_name, $newvalue ) { wp_protect_special_option( $option_name ); - $safe_option_name = $wpdb->escape( $option_name ); + $safe_option_name = esc_sql( $option_name ); $newvalue = sanitize_option( $option_name, $newvalue ); $oldvalue = get_option( $safe_option_name ); @@ -522,6 +522,7 @@ function update_option( $option_name, $newvalue ) { $_newvalue = $newvalue; $newvalue = maybe_serialize( $newvalue ); + do_action( 'update_option', $option_name, $oldvalue, $newvalue ); $alloptions = wp_load_alloptions(); if ( isset( $alloptions[$option_name] ) ) { $alloptions[$option_name] = $newvalue; @@ -534,6 +535,7 @@ function update_option( $option_name, $newvalue ) { if ( $wpdb->rows_affected == 1 ) { do_action( "update_option_{$option_name}", $oldvalue, $_newvalue ); + do_action( 'updated_option', $option_name, $oldvalue, $_newvalue ); return true; } return false; @@ -571,7 +573,7 @@ function add_option( $name, $value = '', $deprecated = '', $autoload = 'yes' ) { global $wpdb; wp_protect_special_option( $name ); - $safe_name = $wpdb->escape( $name ); + $safe_name = esc_sql( $name ); $value = sanitize_option( $name, $value ); // Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query @@ -582,7 +584,7 @@ function add_option( $name, $value = '', $deprecated = '', $autoload = 'yes' ) { $value = maybe_serialize( $value ); $autoload = ( 'no' === $autoload ) ? 'no' : 'yes'; - + do_action( 'add_option', $name, $value ); if ( 'yes' == $autoload ) { $alloptions = wp_load_alloptions(); $alloptions[$name] = $value; @@ -598,9 +600,11 @@ function add_option( $name, $value = '', $deprecated = '', $autoload = 'yes' ) { wp_cache_set( 'notoptions', $notoptions, 'options' ); } - $wpdb->insert($wpdb->options, array('option_name' => $name, 'option_value' => $value, 'autoload' => $autoload) ); + $wpdb->query( $wpdb->prepare( "INSERT INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, %s) ON DUPLICATE KEY UPDATE `option_name` = VALUES(`option_name`), `option_value` = VALUES(`option_value`), `autoload` = VALUES(`autoload`)", $name, $value, $autoload ) ); do_action( "add_option_{$name}", $name, $value ); + do_action( 'added_option', $name, $value ); + return; } @@ -621,9 +625,10 @@ function delete_option( $name ) { // Get the ID, if no ID then return // expected_slashed ($name) - $option = $wpdb->get_row( "SELECT option_id, autoload FROM $wpdb->options WHERE option_name = '$name'" ); - if ( is_null($option) || !$option->option_id ) + $option = $wpdb->get_row( "SELECT autoload FROM $wpdb->options WHERE option_name = '$name'" ); + if ( is_null($option) ) return false; + do_action( 'delete_option', $name ); // expected_slashed ($name) $wpdb->query( "DELETE FROM $wpdb->options WHERE option_name = '$name'" ); if ( 'yes' == $option->autoload ) { @@ -635,6 +640,7 @@ function delete_option( $name ) { } else { wp_cache_delete( $name, 'options' ); } + do_action( 'deleted_option', $name ); return true; } @@ -654,7 +660,7 @@ function delete_transient($transient) { if ( $_wp_using_ext_object_cache ) { return wp_cache_delete($transient, 'transient'); } else { - $transient = '_transient_' . $wpdb->escape($transient); + $transient = '_transient_' . esc_sql($transient); return delete_option($transient); } } @@ -682,11 +688,11 @@ function get_transient($transient) { if ( $_wp_using_ext_object_cache ) { $value = wp_cache_get($transient, 'transient'); } else { - $transient_option = '_transient_' . $wpdb->escape($transient); + $transient_option = '_transient_' . esc_sql($transient); // If option is not in alloptions, it is not autoloaded and thus has a timeout $alloptions = wp_load_alloptions(); if ( !isset( $alloptions[$transient_option] ) ) { - $transient_timeout = '_transient_timeout_' . $wpdb->escape($transient); + $transient_timeout = '_transient_timeout_' . esc_sql($transient); if ( get_option($transient_timeout) < time() ) { delete_option($transient_option); delete_option($transient_timeout); @@ -723,7 +729,7 @@ function set_transient($transient, $value, $expiration = 0) { } else { $transient_timeout = '_transient_timeout_' . $transient; $transient = '_transient_' . $transient; - $safe_transient = $wpdb->escape($transient); + $safe_transient = esc_sql($transient); if ( false === get_option( $safe_transient ) ) { $autoload = 'yes'; if ( 0 != $expiration ) { @@ -964,34 +970,6 @@ function maybe_serialize( $data ) { return $data; } -/** - * Strip HTML and put links at the bottom of stripped content. - * - * Searches for all of the links, strips them out of the content, and places - * them at the bottom of the content with numbers. - * - * @since 0.71 - * - * @param string $content Content to get links - * @return string HTML stripped out of content with links at the bottom. - */ -function make_url_footnote( $content ) { - preg_match_all( '/(.+?)<\/a>/', $content, $matches ); - $links_summary = "\n"; - for ( $i=0; $iquery( $wpdb->prepare("DELETE FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE (%s)", $post_ID, $link_test . '%') ); + $mid = $wpdb->get_col( $wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE (%s)", $post_ID, $link_test . '%') ); + do_action( 'delete_postmeta', $mid ); + $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->postmeta WHERE post_id IN(%s)", implode( ',', $mid ) ) ); + do_action( 'deleted_postmeta', $mid ); } } @@ -1186,6 +1167,7 @@ function do_enclose( $content, $post_ID ) { if ( in_array( substr( $type, 0, strpos( $type, "/" ) ), $allowed_types ) ) { $meta_value = "$url\n$len\n$type\n"; $wpdb->insert($wpdb->postmeta, array('post_id' => $post_ID, 'meta_key' => 'enclosure', 'meta_value' => $meta_value) ); + do_action( 'added_postmeta', $wpdb->insert_id, $post_ID, 'enclosure', $meta_value ); } } } @@ -1408,7 +1390,7 @@ function add_magic_quotes( $array ) { if ( is_array( $v ) ) { $array[$k] = add_magic_quotes( $v ); } else { - $array[$k] = $wpdb->escape( $v ); + $array[$k] = esc_sql( $v ); } } return $array; @@ -1771,7 +1753,31 @@ function is_blog_installed() { $installed = !empty( $installed ); wp_cache_set( 'is_blog_installed', $installed ); - return $installed; + if ( $installed ) + return true; + + $suppress = $wpdb->suppress_errors(); + $tables = $wpdb->get_col('SHOW TABLES'); + $wpdb->suppress_errors( $suppress ); + + // Loop over the WP tables. If none exist, then scratch install is allowed. + // If one or more exist, suggest table repair since we got here because the options + // table could not be accessed. + foreach ($wpdb->tables as $table) { + // If one of the WP tables exist, then we are in an insane state. + if ( in_array($wpdb->prefix . $table, $tables) ) { + // If visiting repair.php, return true and let it take over. + if ( defined('WP_REPAIRING') ) + return true; + // Die with a DB error. + $wpdb->error = __('One or more database tables are unavailable. The database may need to be repaired.'); + dead_db(); + } + } + + wp_cache_set( 'is_blog_installed', false ); + + return false; } /** @@ -2029,16 +2035,20 @@ function wp_upload_dir( $time = null ) { $siteurl = get_option( 'siteurl' ); $upload_path = get_option( 'upload_path' ); $upload_path = trim($upload_path); - if ( empty($upload_path) ) + if ( empty($upload_path) ) { $dir = WP_CONTENT_DIR . '/uploads'; - else + } else { $dir = $upload_path; - - // $dir is absolute, $path is (maybe) relative to ABSPATH - $dir = path_join( ABSPATH, $dir ); + if ( 'wp-content/uploads' == $upload_path ) { + $dir = WP_CONTENT_DIR . '/uploads'; + } elseif ( 0 !== strpos($dir, ABSPATH) ) { + // $dir is absolute, $upload_path is (maybe) relative to ABSPATH + $dir = path_join( ABSPATH, $dir ); + } + } if ( !$url = get_option( 'upload_url_path' ) ) { - if ( empty($upload_path) or ( $upload_path == $dir ) ) + if ( empty($upload_path) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) ) $url = WP_CONTENT_URL . '/uploads'; else $url = trailingslashit( $siteurl ) . $upload_path; @@ -2099,11 +2109,11 @@ function wp_unique_filename( $dir, $filename, $unique_filename_callback = null ) // separate the filename into a name and extension $info = pathinfo($filename); - $ext = !empty($info['extension']) ? $info['extension'] : ''; - $name = basename($filename, ".{$ext}"); + $ext = !empty($info['extension']) ? '.' . $info['extension'] : ''; + $name = basename($filename, $ext); // edge case: if file is named '.ext', treat as an empty name - if( $name === ".$ext" ) + if( $name === $ext ) $name = ''; // Increment the file number until we have a unique file to save in $dir. Use $override['unique_filename_callback'] if supplied. @@ -2112,8 +2122,20 @@ function wp_unique_filename( $dir, $filename, $unique_filename_callback = null ) } else { $number = ''; - if ( !empty( $ext ) ) - $ext = ".$ext"; + // change '.ext' to lower case + if ( $ext && strtolower($ext) != $ext ) { + $ext2 = strtolower($ext); + $filename2 = preg_replace( '|' . preg_quote($ext) . '$|', $ext2, $filename ); + + // check for both lower and upper case extension or image sub-sizes may be overwritten + while ( file_exists($dir . "/$filename") || file_exists($dir . "/$filename2") ) { + $new_number = $number + 1; + $filename = str_replace( "$number$ext", "$new_number$ext", $filename ); + $filename2 = str_replace( "$number$ext2", "$new_number$ext2", $filename2 ); + $number = $new_number; + } + return $filename2; + } while ( file_exists( $dir . "/$filename" ) ) { if ( '' == "$number$ext" ) @@ -2226,8 +2248,36 @@ function wp_ext2type( $ext ) { * @return array Values with extension first and mime type. */ function wp_check_filetype( $filename, $mimes = null ) { - // Accepted MIME types are set here as PCRE unless provided. - $mimes = ( is_array( $mimes ) ) ? $mimes : apply_filters( 'upload_mimes', array( + if ( empty($mimes) ) + $mimes = get_allowed_mime_types(); + $type = false; + $ext = false; + + foreach ( $mimes as $ext_preg => $mime_match ) { + $ext_preg = '!\.(' . $ext_preg . ')$!i'; + if ( preg_match( $ext_preg, $filename, $ext_matches ) ) { + $type = $mime_match; + $ext = $ext_matches[1]; + break; + } + } + + return compact( 'ext', 'type' ); +} + +/** + * Retrieve list of allowed mime types and file extensions. + * + * @since 2.8.6 + * + * @return array Array of mime types keyed by the file extension regex corresponding to those types. + */ +function get_allowed_mime_types() { + static $mimes = false; + + if ( !$mimes ) { + // Accepted MIME types are set here as PCRE unless provided. + $mimes = apply_filters( 'upload_mimes', array( 'jpg|jpeg|jpe' => 'image/jpeg', 'gif' => 'image/gif', 'png' => 'image/png', @@ -2237,6 +2287,7 @@ function wp_check_filetype( $filename, $mimes = null ) { 'asf|asx|wax|wmv|wmx' => 'video/asf', 'avi' => 'video/avi', 'divx' => 'video/divx', + 'flv' => 'video/x-flv', 'mov|qt' => 'video/quicktime', 'mpeg|mpg|mpe' => 'video/mpeg', 'txt|c|cc|h' => 'text/plain', @@ -2273,22 +2324,10 @@ function wp_check_filetype( $filename, $mimes = null ) { 'odc' => 'application/vnd.oasis.opendocument.chart', 'odb' => 'application/vnd.oasis.opendocument.database', 'odf' => 'application/vnd.oasis.opendocument.formula', - ) - ); - - $type = false; - $ext = false; - - foreach ( $mimes as $ext_preg => $mime_match ) { - $ext_preg = '!\.(' . $ext_preg . ')$!i'; - if ( preg_match( $ext_preg, $filename, $ext_matches ) ) { - $type = $mime_match; - $ext = $ext_matches[1]; - break; - } + ) ); } - return compact( 'ext', 'type' ); + return $mimes; } /** @@ -2383,7 +2422,7 @@ function wp_explain_nonce( $action ) { } } - return apply_filters( 'explain_nonce_' . $verb . '-' . $noun, __( 'Are you sure you want to do this?' ), $matches[4] ); + return apply_filters( 'explain_nonce_' . $verb . '-' . $noun, __( 'Are you sure you want to do this?' ), isset($matches[4]) ? $matches[4] : '' ); } else { return apply_filters( 'explain_nonce_' . $action, __( 'Are you sure you want to do this?' ) ); } @@ -2404,12 +2443,12 @@ function wp_explain_nonce( $action ) { function wp_nonce_ays( $action ) { $title = __( 'WordPress Failure Notice' ); $html = esc_html( wp_explain_nonce( $action ) ); - if ( wp_get_referer() ) - $html .= "

" . __( 'Please try again.' ) . ""; - elseif ( 'log-out' == $action ) + if ( 'log-out' == $action ) $html .= "

" . sprintf( __( "Do you really want to log out?"), wp_logout_url() ); + elseif ( wp_get_referer() ) + $html .= "

" . __( 'Please try again.' ) . ""; - wp_die( $html, $title); + wp_die( $html, $title, array('response' => 403) ); } /** @@ -2487,6 +2526,7 @@ function wp_die( $message, $title = '', $args = array() ) { if ( ( $wp_locale ) && ( 'rtl' == $wp_locale->text_direction ) ) $text_direction = 'rtl'; ?> + > @@ -2501,7 +2541,6 @@ if ( 'rtl' == $text_direction ) : ?> - deprecated since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) ); else @@ -2928,8 +2980,7 @@ function _deprecated_function($function, $version, $replacement=null) { * to get the backtrace up to what file and function included the deprecated * file. * - * The current behavior is to trigger an user error if WP_DEBUG is defined and - * is true. + * The current behavior is to trigger an user error if WP_DEBUG is true. * * This function is to be used in every file that is depreceated * @@ -2950,7 +3001,7 @@ function _deprecated_file($file, $version, $replacement=null) { do_action('deprecated_file_included', $file, $replacement); // Allow plugin to filter the output error trigger - if( defined('WP_DEBUG') && ( true === WP_DEBUG ) && apply_filters( 'deprecated_file_trigger_error', true )) { + if( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) { if( !is_null($replacement) ) trigger_error( sprintf( __('%1$s is deprecated since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) ); else @@ -3021,12 +3072,12 @@ function validate_file( $file, $allowed_files = '' ) { if ( false !== strpos( $file, './' )) return 1; - if (':' == substr( $file, 1, 1 )) - return 2; - if (!empty ( $allowed_files ) && (!in_array( $file, $allowed_files ) ) ) return 3; + if (':' == substr( $file, 1, 1 )) + return 2; + return 0; } @@ -3057,10 +3108,10 @@ function is_ssl() { * @param string|bool $force Optional. * @return bool True if forced, false if not forced. */ -function force_ssl_login($force = '') { - static $forced; +function force_ssl_login( $force = null ) { + static $forced = false; - if ( '' != $force ) { + if ( !is_null( $force ) ) { $old_forced = $forced; $forced = $force; return $old_forced; @@ -3077,10 +3128,10 @@ function force_ssl_login($force = '') { * @param string|bool $force * @return bool True if forced, false if not forced. */ -function force_ssl_admin($force = '') { - static $forced; +function force_ssl_admin( $force = null ) { + static $forced = false; - if ( '' != $force ) { + if ( !is_null( $force ) ) { $old_forced = $forced; $forced = $force; return $old_forced; @@ -3130,150 +3181,335 @@ function wp_suspend_cache_invalidation($suspend = true) { } function get_site_option( $key, $default = false, $use_cache = true ) { - return get_option($key, $default); + // Allow plugins to short-circuit site options. + $pre = apply_filters( 'pre_site_option_' . $key, false ); + if ( false !== $pre ) + return $pre; + + $value = get_option($key, $default); + + return apply_filters( 'site_option_' . $key, $value ); } // expects $key, $value not to be SQL escaped function add_site_option( $key, $value ) { - return add_option($key, $value); + $value = apply_filters( 'pre_add_site_option_' . $key, $value ); + $result = add_option($key, $value); + do_action( "add_site_option_{$key}", $key, $value ); + return $result; +} + +function delete_site_option( $key ) { + $result = delete_option($key); + do_action( "delete_site_option_{$key}", $key ); + return $result; } // expects $key, $value not to be SQL escaped function update_site_option( $key, $value ) { - return update_option($key, $value); + $oldvalue = get_site_option( $key ); + $value = apply_filters( 'pre_update_site_option_' . $key, $value, $oldvalue ); + $result = update_option($key, $value); + do_action( "update_site_option_{$key}", $key, $value ); + return $result; } /** - * gmt_offset modification for smart timezone handling + * Delete a site transient * - * Overrides the gmt_offset option if we have a timezone_string available + * @since 2.890 + * @package WordPress + * @subpackage Transient + * + * @param string $transient Transient name. Expected to not be SQL-escaped + * @return bool true if successful, false otherwise */ -function wp_timezone_override_offset() { - if (!wp_timezone_supported()) return false; +function delete_site_transient($transient) { + global $_wp_using_ext_object_cache, $wpdb; - $tz = get_option('timezone_string'); - if (empty($tz)) return false; + if ( $_wp_using_ext_object_cache ) { + return wp_cache_delete($transient, 'site-transient'); + } else { + $transient = '_site_transient_' . esc_sql($transient); + return delete_site_option($transient); + } +} - @date_default_timezone_set($tz); +/** + * Get the value of a site transient + * + * If the transient does not exist or does not have a value, then the return value + * will be false. + * + * @since 2.9.0 + * @package WordPress + * @subpackage Transient + * + * @param string $transient Transient name. Expected to not be SQL-escaped + * @return mixed Value of transient + */ +function get_site_transient($transient) { + global $_wp_using_ext_object_cache, $wpdb; - $dateTimeZoneSelected = timezone_open($tz); - $dateTimeServer = date_create(); - if ($dateTimeZoneSelected === false || $dateTimeServer === false) return false; + $pre = apply_filters( 'pre_site_transient_' . $transient, false ); + if ( false !== $pre ) + return $pre; - $timeOffset = timezone_offset_get($dateTimeZoneSelected, $dateTimeServer); - $timeOffset = $timeOffset / 3600; + if ( $_wp_using_ext_object_cache ) { + $value = wp_cache_get($transient, 'site-transient'); + } else { + $transient_option = '_site_transient_' . esc_sql($transient); + $transient_timeout = '_site_transient_timeout_' . esc_sql($transient); + if ( get_site_option($transient_timeout) < time() ) { + delete_site_option($transient_option); + delete_site_option($transient_timeout); + return false; + } + + $value = get_site_option($transient_option); + } - return $timeOffset; + return apply_filters('site_transient_' . $transient, $value); } /** - * Check for PHP timezone support + * Set/update the value of a site transient + * + * You do not need to serialize values, if the value needs to be serialize, then + * it will be serialized before it is set. + * + * @since 2.9.0 + * @package WordPress + * @subpackage Transient * + * @param string $transient Transient name. Expected to not be SQL-escaped + * @param mixed $value Transient value. + * @param int $expiration Time until expiration in seconds, default 0 + * @return bool False if value was not set and true if value was set. */ -function wp_timezone_supported() { - if (function_exists('date_default_timezone_set') - && function_exists('timezone_identifiers_list') - && function_exists('timezone_open') - && function_exists('timezone_offset_get') - ) - return apply_filters('timezone_support',true); +function set_site_transient($transient, $value, $expiration = 0) { + global $_wp_using_ext_object_cache, $wpdb; + + if ( $_wp_using_ext_object_cache ) { + return wp_cache_set($transient, $value, 'site-transient', $expiration); + } else { + $transient_timeout = '_site_transient_timeout_' . $transient; + $transient = '_site_transient_' . $transient; + $safe_transient = esc_sql($transient); + if ( false === get_site_option( $safe_transient ) ) { + if ( 0 != $expiration ) + add_site_option($transient_timeout, time() + $expiration); + return add_site_option($transient, $value); + } else { + if ( 0 != $expiration ) + update_site_option($transient_timeout, time() + $expiration); + return update_site_option($transient, $value); + } + } +} - return apply_filters('timezone_support',false); +/** + * gmt_offset modification for smart timezone handling + * + * Overrides the gmt_offset option if we have a timezone_string available + */ +function wp_timezone_override_offset() { + if ( !wp_timezone_supported() ) { + return false; + } + if ( !$timezone_string = get_option( 'timezone_string' ) ) { + return false; + } + + @date_default_timezone_set( $timezone_string ); + $timezone_object = timezone_open( $timezone_string ); + $datetime_object = date_create(); + if ( false === $timezone_object || false === $datetime_object ) { + return false; + } + return round( timezone_offset_get( $timezone_object, $datetime_object ) / 3600, 2 ); +} + +/** + * Check for PHP timezone support + */ +function wp_timezone_supported() { + $support = false; + if ( + function_exists( 'date_default_timezone_set' ) && + function_exists( 'timezone_identifiers_list' ) && + function_exists( 'timezone_open' ) && + function_exists( 'timezone_offset_get' ) + ) { + $support = true; + } + return apply_filters( 'timezone_support', $support ); +} + +function _wp_timezone_choice_usort_callback( $a, $b ) { + // Don't use translated versions of Etc + if ( 'Etc' === $a['continent'] && 'Etc' === $b['continent'] ) { + // Make the order of these more like the old dropdown + if ( 'GMT+' === substr( $a['city'], 0, 4 ) && 'GMT+' === substr( $b['city'], 0, 4 ) ) { + return -1 * ( strnatcasecmp( $a['city'], $b['city'] ) ); + } + if ( 'UTC' === $a['city'] ) { + if ( 'GMT+' === substr( $b['city'], 0, 4 ) ) { + return 1; + } + return -1; + } + if ( 'UTC' === $b['city'] ) { + if ( 'GMT+' === substr( $a['city'], 0, 4 ) ) { + return -1; + } + return 1; + } + return strnatcasecmp( $a['city'], $b['city'] ); + } + if ( $a['t_continent'] == $b['t_continent'] ) { + if ( $a['t_city'] == $b['t_city'] ) { + return strnatcasecmp( $a['t_subcity'], $b['t_subcity'] ); + } + return strnatcasecmp( $a['t_city'], $b['t_city'] ); + } else { + // Force Etc to the bottom of the list + if ( 'Etc' === $a['continent'] ) { + return 1; + } + if ( 'Etc' === $b['continent'] ) { + return -1; + } + return strnatcasecmp( $a['t_continent'], $b['t_continent'] ); + } } /** * Gives a nicely formatted list of timezone strings // temporary! Not in final * - * @param string $selectedzone - which zone should be the selected one + * @param $selected_zone string Selected Zone * */ -function wp_timezone_choice($selectedzone) { +function wp_timezone_choice( $selected_zone ) { static $mo_loaded = false; - $continents = array('Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific', 'Etc'); + $continents = array( 'Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific'); // Load translations for continents and cities - if ( ! $mo_loaded ) { + if ( !$mo_loaded ) { $locale = get_locale(); - $mofile = WP_LANG_DIR . "/continents-cities-$locale.mo"; - load_textdomain('continents-cities', $mofile); + $mofile = WP_LANG_DIR . '/continents-cities-' . $locale . '.mo'; + load_textdomain( 'continents-cities', $mofile ); $mo_loaded = true; } - $all = timezone_identifiers_list(); - - $i = 0; - foreach ( $all as $zone ) { - $zone = explode('/',$zone); - if ( ! in_array($zone[0], $continents) ) - continue; - if ( $zone[0] == 'Etc' && in_array($zone[1], array('UCT', 'GMT', 'GMT0', 'GMT+0', 'GMT-0', 'Greenwich', 'Universal', 'Zulu')) ) + $zonen = array(); + foreach ( timezone_identifiers_list() as $zone ) { + $zone = explode( '/', $zone ); + if ( !in_array( $zone[0], $continents ) ) { continue; - $zonen[$i]['continent'] = isset($zone[0]) ? $zone[0] : ''; - $zonen[$i]['city'] = isset($zone[1]) ? $zone[1] : ''; - $zonen[$i]['subcity'] = isset($zone[2]) ? $zone[2] : ''; - $i++; - } - - usort($zonen, create_function( - '$a, $b', ' - $t = create_function(\'$s\', \'return translate(str_replace("_", " ", $s), "continents-cities");\'); - $a_continent = $t($a["continent"]); - $b_continent = $t($b["continent"]); - $a_city = $t($a["city"]); - $b_city = $t($b["city"]); - $a_subcity = $t($a["subcity"]); - $b_subcity = $t($b["subcity"]); - if ( $a_continent == $b_continent && $a_city == $b_city ) - return strnatcasecmp($a_subcity, $b_subcity); - elseif ( $a_continent == $b_continent ) - return strnatcasecmp($a_city, $b_city); - else - return strnatcasecmp($a_continent, $b_continent); - ')); - - $structure = ''; - $pad = '   '; - - if ( empty($selectedzone) ) - $structure .= '\n"; - foreach ( $zonen as $zone ) { - extract($zone); - if ( empty($selectcontinent) && !empty($city) ) { - $selectcontinent = $continent; - $structure .= '' . "\n"; // continent - } elseif ( !empty($selectcontinent) && $selectcontinent != $continent ) { - $structure .= "\n"; - $selectcontinent = ''; - if ( !empty($city) ) { - $selectcontinent = $continent; - $structure .= '' . "\n"; // continent - } } - if ( !empty($city) ) { - $display = str_replace('_',' ',$city); - $display = translate($display, "continents-cities"); - if ( !empty($subcity) ) { - $display_subcity = str_replace('_', ' ', $subcity); - $display_subcity = translate($display_subcity, "continents-cities"); - $city = $city . '/'. $subcity; - $display = $display . '/' . $display_subcity; - } - if ( $continent == 'Etc' ) - $display = strtr($display, '+-', '-+'); - $structure .= "\t\n"; //Timezone + // This determines what gets set and translated - we don't translate Etc/* strings here, they are done later + $exists = array( + 0 => ( isset( $zone[0] ) && $zone[0] ) ? true : false, + 1 => ( isset( $zone[1] ) && $zone[1] ) ? true : false, + 2 => ( isset( $zone[2] ) && $zone[2] ) ? true : false + ); + $exists[3] = ( $exists[0] && 'Etc' !== $zone[0] ) ? true : false; + $exists[4] = ( $exists[1] && $exists[3] ) ? true : false; + $exists[5] = ( $exists[2] && $exists[3] ) ? true : false; + + $zonen[] = array( + 'continent' => ( $exists[0] ? $zone[0] : '' ), + 'city' => ( $exists[1] ? $zone[1] : '' ), + 'subcity' => ( $exists[2] ? $zone[2] : '' ), + 't_continent' => ( $exists[3] ? translate( str_replace( '_', ' ', $zone[0] ), 'continents-cities' ) : '' ), + 't_city' => ( $exists[4] ? translate( str_replace( '_', ' ', $zone[1] ), 'continents-cities' ) : '' ), + 't_subcity' => ( $exists[5] ? translate( str_replace( '_', ' ', $zone[2] ), 'continents-cities' ) : '' ) + ); + } + usort( $zonen, '_wp_timezone_choice_usort_callback' ); + + $structure = array(); + + if ( empty( $selected_zone ) ) { + $structure[] = ''; + } + + foreach ( $zonen as $key => $zone ) { + // Build value in an array to join later + $value = array( $zone['continent'] ); + + if ( empty( $zone['city'] ) ) { + // It's at the continent level (generally won't happen) + $display = $zone['t_continent']; } else { - $structure .= "\n"; //Timezone + // It's inside a continent group + + // Continent optgroup + if ( !isset( $zonen[$key - 1] ) || $zonen[$key - 1]['continent'] !== $zone['continent'] ) { + $label = $zone['t_continent']; + $structure[] = ''; + } + + // Add the city to the value + $value[] = $zone['city']; + + $display = $zone['t_city']; + if ( !empty( $zone['subcity'] ) ) { + // Add the subcity to the value + $value[] = $zone['subcity']; + $display .= ' - ' . $zone['t_subcity']; + } + } + + // Build the value + $value = join( '/', $value ); + $selected = ''; + if ( $value === $selected_zone ) { + $selected = 'selected="selected" '; + } + $structure[] = '"; + + // Close continent optgroup + if ( !empty( $zone['city'] ) && ( !isset($zonen[$key + 1]) || (isset( $zonen[$key + 1] ) && $zonen[$key + 1]['continent'] !== $zone['continent']) ) ) { + $structure[] = ''; } } - if ( !empty($selectcontinent) ) - $structure .= "\n"; - return $structure; -} + // Do UTC + $structure[] = ''; + $selected = ''; + if ( 'UTC' === $selected_zone ) + $selected = 'selected="selected" '; + $structure[] = ''; + $structure[] = ''; + + // Do manual UTC offsets + $structure[] = ''; + $offset_range = array (-12, -11.5, -11, -10.5, -10, -9.5, -9, -8.5, -8, -7.5, -7, -6.5, -6, -5.5, -5, -4.5, -4, -3.5, -3, -2.5, -2, -1.5, -1, -0.5, + 0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 5.75, 6, 6.5, 7, 7.5, 8, 8.5, 8.75, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 13.75, 14); + foreach ( $offset_range as $offset ) { + if ( 0 <= $offset ) + $offset_name = '+' . $offset; + else + $offset_name = (string) $offset; + $offset_value = $offset_name; + $offset_name = str_replace(array('.25','.5','.75'), array(':15',':30',':45'), $offset_name); + $offset_name = 'UTC' . $offset_name; + $offset_value = 'UTC' . $offset_value; + $selected = ''; + if ( $offset_value === $selected_zone ) + $selected = 'selected="selected" '; + $structure[] = '"; + + } + $structure[] = ''; + return join( "\n", $structure ); +} /** * Strip close comment and close php tags from file headers used by WP @@ -3284,4 +3520,121 @@ function wp_timezone_choice($selectedzone) { function _cleanup_header_comment($str) { return trim(preg_replace("/\s*(?:\*\/|\?>).*/", '', $str)); } + +/** + * Permanently deletes posts, pages, attachments, and comments which have been in the trash for EMPTY_TRASH_DAYS. + * + * @since 2.9.0 + * + * @return void + */ +function wp_scheduled_delete() { + global $wpdb; + + $delete_timestamp = time() - (60*60*24*EMPTY_TRASH_DAYS); + + $posts_to_delete = $wpdb->get_results($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_trash_meta_time' AND meta_value < '%d'", $delete_timestamp), ARRAY_A); + + foreach ( (array) $posts_to_delete as $post ) { + $post_id = (int) $post['post_id']; + if ( !$post_id ) + continue; + + $del_post = get_post($post_id); + + if ( !$del_post || 'trash' != $del_post->post_status ) { + delete_post_meta($post_id, '_wp_trash_meta_status'); + delete_post_meta($post_id, '_wp_trash_meta_time'); + } else { + wp_delete_post($post_id); + } + } + + $comments_to_delete = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM $wpdb->commentmeta WHERE meta_key = '_wp_trash_meta_time' AND meta_value < '%d'", $delete_timestamp), ARRAY_A); + + foreach ( (array) $comments_to_delete as $comment ) { + $comment_id = (int) $comment['comment_id']; + if ( !$comment_id ) + continue; + + $del_comment = get_comment($comment_id); + + if ( !$del_comment || 'trash' != $del_comment->comment_approved ) { + delete_comment_meta($comment_id, '_wp_trash_meta_time'); + delete_comment_meta($comment_id, '_wp_trash_meta_status'); + } else { + wp_delete_comment($comment_id); + } + } +} + +/** + * Parse the file contents to retrieve its metadata. + * + * Searches for metadata for a file, such as a plugin or theme. Each piece of + * metadata must be on its own line. For a field spanning multple lines, it + * must not have any newlines or only parts of it will be displayed. + * + * Some users have issues with opening large files and manipulating the contents + * for want is usually the first 1kiB or 2kiB. This function stops pulling in + * the file contents when it has all of the required data. + * + * The first 8kiB of the file will be pulled in and if the file data is not + * within that first 8kiB, then the author should correct their plugin file + * and move the data headers to the top. + * + * The file is assumed to have permissions to allow for scripts to read + * the file. This is not checked however and the file is only opened for + * reading. + * + * @since 2.9.0 + * + * @param string $file Path to the file + * @param bool $markup If the returned data should have HTML markup applied + * @param string $context If specified adds filter hook "extra_<$context>_headers" + */ +function get_file_data( $file, $default_headers, $context = '' ) { + // We don't need to write to the file, so just open for reading. + $fp = fopen( $file, 'r' ); + + // Pull only the first 8kiB of the file in. + $file_data = fread( $fp, 8192 ); + + // PHP will close file handle, but we are good citizens. + fclose( $fp ); + + if( $context != '' ) { + $extra_headers = apply_filters( "extra_$context".'_headers', array() ); + + $extra_headers = array_flip( $extra_headers ); + foreach( $extra_headers as $key=>$value ) { + $extra_headers[$key] = $key; + } + $all_headers = array_merge($extra_headers, $default_headers); + } else { + $all_headers = $default_headers; + } + + + foreach ( $all_headers as $field => $regex ) { + preg_match( '/' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, ${$field}); + if ( !empty( ${$field} ) ) + ${$field} = _cleanup_header_comment( ${$field}[1] ); + else + ${$field} = ''; + } + + $file_data = compact( array_keys( $all_headers ) ); + + return $file_data; +} +/* + * Used internally to tidy up the search terms + * + * @private + * @since 2.9.0 + */ +function _search_terms_tidy($t) { + return trim($t, "\"'\n\r "); +} ?>