Changeset 6223

Timestamp:

10/11/07 05:46:57 (1 year ago)

Author:

markjaquith

Message:

Code cleanup and standardization for functions.php

Files:

• trunk/wp-includes/functions.php (modified) (46 diffs)

trunk/wp-includes/functions.php

@@ -1 +1 @@
-<?php
-
-$dateformatstring, $mysqlstring, $translate = true
+ $dateformatstring, $mysqlstring, $translate = true 
-    global $wp_locale;
-    $m = $mysqlstring;
-$m) ) {
+ $m ) )
-        return false;
-    }
-    $i = mktime(
-        (int) substr( $m, 11, 2 ), (int) substr( $m, 14, 2 ), (int) substr( $m, 17, 2 ),
@@ -18 +17 @@
-        $i = 0;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return $j;
-}
-
-
-
+
+
+
-        case 'mysql':
-
-
-
+
-            break;
-        case 'timestamp':
-
-
-
+
-            break;
-    }
-}
-
-
+
+
-    global $wp_locale;
-    $i = $unixtimestamp;
-!empty($wp_locale->month)) && (!empty($wp_locale->weekday)
-date('m', $i)
-$datemonth
-date('w', $i)
-$dateweekday
-date('a', $i)
-date('A', $i)
+ !empty( $wp_locale->month ) ) && ( !empty( $wp_locale->weekday ) 
+ date( 'm', $i ) 
+ $datemonth 
+ date( 'w', $i ) 
+ $dateweekday 
+ date( 'a', $i ) 
+ date( 'A', $i ) 
-        $dateformatstring = ' '.$dateformatstring;
-"/([^\\\])D/", "\\1".backslashit($dateweekday_abbrev), $dateformatstring
-"/([^\\\])F/", "\\1".backslashit($datemonth), $dateformatstring
-"/([^\\\])l/", "\\1".backslashit($dateweekday), $dateformatstring
-"/([^\\\])M/", "\\1".backslashit($datemonth_abbrev), $dateformatstring
-"/([^\\\])a/", "\\1".backslashit($datemeridiem), $dateformatstring
-"/([^\\\])A/", "\\1".backslashit($datemeridiem_capital), $dateformatstring
-
-$dateformatstring, 1, strlen($dateformatstring)-1
-
-$dateformatstring, $i
+ "/([^\\\])D/", "\\1" . backslashit( $dateweekday_abbrev ), $dateformatstring 
+ "/([^\\\])F/", "\\1" . backslashit( $datemonth ), $dateformatstring 
+ "/([^\\\])l/", "\\1" . backslashit( $dateweekday ), $dateformatstring 
+ "/([^\\\])M/", "\\1" . backslashit( $datemonth_abbrev ), $dateformatstring 
+ "/([^\\\])a/", "\\1" . backslashit( $datemeridiem ), $dateformatstring 
+ "/([^\\\])A/", "\\1" . backslashit( $datemeridiem_capital ), $dateformatstring 
+
+ $dateformatstring, 1, strlen( $dateformatstring ) -1 
+
+ $dateformatstring, $i 
-    return $j;
-}
-
-
+
+
-    global $wp_locale;
-    // let the user override the precision only
-
-
-
-
-
-
+
+
+
+
+
+
+
-    // technically the correct unit names for powers of 1024 are KiB, MiB etc
-    // see http://en.wikipedia.org/wiki/Byte
-    $quant = array(
-
-
-
-
-
+
+
+
+
+
+
-    );
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    $i = 86400;
-
-'start_of_week'
-get_option('start_of_week') - $weekday
-
-$weekday > get_option('start_of_week')
-'w',$day
-'start_of_week'
-get_option('start_of_week') - $weekday
+ 'start_of_week' 
+ get_option( 'start_of_week' ) - $weekday 
+
+ $weekday > get_option( 'start_of_week' ) 
+ 'w', $day 
+ 'start_of_week' 
+ get_option( 'start_of_week' ) - $weekday 
-
-        $day = $day - 86400;
@@ -126 +129 @@
-    }
-    $week['start'] = $day + 86400 - $i;
-    // $week['end'] = $day - $i + 691199;
-    $week['end'] = $week['start'] + 604799;
-    return $week;
-}
-
-
-
-
+
+
+
+
-            return $gm;
-    return $original;
-}
-
-
+
+
-    // if it isn't a string, it isn't serialized
-$data
+ $data 
-        return false;
-$data
+ $data 
-    if ( 'N;' == $data )
-        return true;
-'/^([adObis]):/', $data, $badions
+ '/^([adObis]):/', $data, $badions 
-        return false;
-:
-
-
-
-if ( preg_match("/^{$badions[1]}:[0-9]+:.*[;}]\$/s", $data
-
-
-
-
-
-if ( preg_match("/^{$badions[1]}:[0-9.E-]+;\$/", $data
-
-
-endswitch;
+{
+   
+   
+   
+   if ( preg_match( "/^{$badions[1]}:[0-9]+:.*[;}]\$/s", $data 
+   
+   
+   
+   
+   
+   if ( preg_match( "/^{$badions[1]}:[0-9.E-]+;\$/", $data 
+   
+   
+}
-    return false;
-}
-
-
+
+
-    // if it isn't a string, it isn't a serialized string
-$data
+ $data 
-        return false;
-$data
-'/^s:[0-9]+:.*;$/s',$data
+ $data 
+ '/^s:[0-9]+:.*;$/s', $data 
-        return true;
-    return false;
-}
-
+
-/* Options functions */
-
-// expects $setting to already be SQL-escaped
-$setting
+ $setting 
-    global $wpdb;
-
@@ -186 +192 @@
-
-    // prevent non-existent options from triggering multiple queries
-'notoptions', 'options'
-$notoptions[$setting]
+ 'notoptions', 'options' 
+ $notoptions[$setting] 
-        return false;
-
-    $alloptions = wp_load_alloptions();
-
-$alloptions[$setting]
+ $alloptions[$setting] 
-        $value = $alloptions[$setting];
-    } else {
-$setting, 'options'
+ $setting, 'options' 
-
-        if ( false === $value ) {
-'WP_INSTALLING'
+ 'WP_INSTALLING' 
-                $wpdb->hide_errors();
-            // expected_slashed ($setting)
-"SELECT option_value FROM $wpdb->options WHERE option_name = '$setting' LIMIT 1"
-'WP_INSTALLING'
+ "SELECT option_value FROM $wpdb->options WHERE option_name = '$setting' LIMIT 1" 
+ 'WP_INSTALLING' 
-                $wpdb->show_errors();
-
-
+ 
-                $value = $row->option_value;
-$setting, $value, 'options'
+ $setting, $value, 'options' 
-            } else { // option does not exist, so we must cache its non-existence
-                $notoptions[$setting] = true;
-'notoptions', $notoptions, 'options'
+ 'notoptions', $notoptions, 'options' 
-                return false;
-            }
@@ -218 +224 @@
-    // If home is not set use siteurl.
-    if ( 'home' == $setting && '' == $value )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -239 +246 @@
-    global $wpdb, $wp_queries;
-    $wpdb->hide_errors();
-
-
-
+
+
-    $wpdb->show_errors();
-
-$options as $option
+ $options as $option 
-        // "When trying to design a foolproof system,
-        //  never underestimate the ingenuity of the fools :)" -- Dougal
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-function wp_load_alloptions() {
-    global $wpdb;
-
-'alloptions', 'options'
+ 'alloptions', 'options' 
-
-    if ( !$alloptions ) {
-        $wpdb->hide_errors();
-"SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'"
-"SELECT option_name, option_value FROM $wpdb->options"
+ "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" 
+ "SELECT option_name, option_value FROM $wpdb->options" 
-        $wpdb->show_errors();
-        $alloptions = array();
-        foreach ( (array) $alloptions_db as $o )
-            $alloptions[$o->option_name] = $o->option_value;
-'alloptions', $alloptions, 'options'
+ 'alloptions', $alloptions, 'options' 
-    }
-    return $alloptions;
-}
-
+
-// expects $option_name to NOT be SQL-escaped
-$option_name, $newvalue
+ $option_name, $newvalue 
-    global $wpdb;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-    // If the new and old values are the same, no need to update.
-$safe_option_name
- {
+ $safe_option_name 
+
-        return false;
-    }
-
-    if ( false === $oldvalue ) {
-$option_name, $newvalue
+ $option_name, $newvalue 
-        return true;
-    }
-
-'notoptions', 'options'
-$notoptions) && isset($notoptions[$option_name]
-$notoptions[$option_name]
-'notoptions', $notoptions, 'options'
+ 'notoptions', 'options' 
+ $notoptions ) && isset( $notoptions[$option_name] 
+ $notoptions[$option_name] 
+ 'notoptions', $notoptions, 'options' 
-    }
-
-    $_newvalue = $newvalue;
-$newvalue
+ $newvalue 
-
-    $alloptions = wp_load_alloptions();
-$alloptions[$option_name]
+ $alloptions[$option_name] 
-        $alloptions[$option_name] = $newvalue;
-'alloptions', $alloptions, 'options'
+ 'alloptions', $alloptions, 'options' 
-    } else {
-$option_name, $newvalue, 'options'
-
-
-$wpdb->prepare("UPDATE $wpdb->options SET option_value = %s WHERE option_name = %s", $newvalue, $option_name)
+ $option_name, $newvalue, 'options' 
+
+
+ $wpdb->prepare( "UPDATE $wpdb->options SET option_value = %s WHERE option_name = %s", $newvalue, $option_name ) 
-    if ( $wpdb->rows_affected == 1 ) {
-"update_option_{$option_name}", $oldvalue, $_newvalue
+ "update_option_{$option_name}", $oldvalue, $_newvalue 
-        return true;
-    }
-    return false;
-}
+
-
-// thx Alex Stapleton, http://alex.vort-x.net/blog/
-// expects $name to NOT be SQL-escaped
-$name, $value = '', $deprecated = '', $autoload = 'yes'
+ $name, $value = '', $deprecated = '', $autoload = 'yes' 
-    global $wpdb;
-
-$name
-$name
+ $name 
+ $name 
-
-    // Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query
-'notoptions', 'options'
-$notoptions) || !isset($notoptions[$name]
-$safe_name
+ 'notoptions', 'options' 
+ $notoptions ) || !isset( $notoptions[$name] 
+ $safe_name 
-            return;
-
-$value
+ $value 
-    $autoload = ( 'no' === $autoload ) ? 'no' : 'yes';
-
@@ -345 +350 @@
-        $alloptions = wp_load_alloptions();
-        $alloptions[$name] = $value;
-'alloptions', $alloptions, 'options'
+ 'alloptions', $alloptions, 'options' 
-    } else {
-$name, $value, 'options'
+ $name, $value, 'options' 
-    }
-
-    // This option exists now
-'notoptions', 'options'
-$notoptions) && isset($notoptions[$name]
-$notoptions[$name]
-'notoptions', $notoptions, 'options'
-
-
-$wpdb->prepare("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES (%s, %s, %s)", $name, $value, $autoload)
+ 'notoptions', 'options' 
+ $notoptions ) && isset( $notoptions[$name] 
+ $notoptions[$name] 
+ 'notoptions', $notoptions, 'options' 
+
+
+ $wpdb->prepare( "INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES (%s, %s, %s)", $name, $value, $autoload ) 
-
-    return;
-}
-
-
+
+
-    global $wpdb;
-
-$name
+ $name 
-
-    // Get the ID, if no ID then return
-    // expected_slashed ($name)
-
-
+
+
+
-    // expected_slashed ($name)
-"DELETE FROM $wpdb->options WHERE option_name = '$name'"
+ "DELETE FROM $wpdb->options WHERE option_name = '$name'" 
-    if ( 'yes' == $option->autoload ) {
-        $alloptions = wp_load_alloptions();
-$alloptions[$name]
-$alloptions[$name]
-'alloptions', $alloptions, 'options'
+ $alloptions[$name] 
+ $alloptions[$name] 
+ 'alloptions', $alloptions, 'options' 
-        }
-    } else {
-$name, 'options'
+ $name, 'options' 
-    }
-    return true;
-}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    return $data;
-}
-
+
-function gzip_compression() {
-) {
+|| ini_get( 'zlib.output_compression' ) == 'On' || ini_get( 'zlib.output_compression_level' ) > 0  || ini_get( 'output_handler' ) == 'ob_gzhandler' || !extension_loaded( 'zlib' ) )
-        return false;
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    $j = 0;
-$i=0; $i<count($matches[0]); $i++
-!$j
+ $i=0; $i<count($matches[0]); $i++ 
+ !$j 
-        $j++;
-        $link_match = $matches[0][$i];
@@ -419 +421 @@
-        $link_url = $matches[2][$i];
-        $link_text = $matches[4][$i];
-$link_match, $link_text.' '.$link_number, $content
-(strtolower(substr($link_url,0,7)) != 'http://') && (strtolower(substr($link_url,0,8)) != 'https://')) ? get_option('home'
-.$link_number.' '.
-
-= strip_tags($content
+ $link_match, $link_text . ' ' . $link_number, $content 
+ ( strtolower( substr( $link_url, 0, 7 ) ) != 'http://' ) && ( strtolower( substr( $link_url, 0, 8 ) ) != 'https://' ) ) ? get_option( 'home' 
+ . $link_number . ' ' . 
+
+ = strip_tags( $content 
-    $content .= $links_summary;
-    return $content;
@@ -429 +431 @@
-
-
-$content
+ $content 
-    global $post_default_title;
-'/<title>(.+?)<\/title>/is', $content, $matchtitle
+ '/<title>(.+?)<\/title>/is', $content, $matchtitle 
-        $post_title = $matchtitle[0];
-'/<title>/si', '', $post_title
-'/<\/title>/si', '', $post_title
+ '/<title>/si', '', $post_title 
+ '/<\/title>/si', '', $post_title 
-    } else {
-        $post_title = $post_default_title;
@@ -441 +443 @@
-}
-
-
+
+
-    global $post_default_category;
-'/<category>(.+?)<\/category>/is', $content, $matchcat
-$matchcat[1], ','
-',', $post_category
+ '/<category>(.+?)<\/category>/is', $content, $matchcat 
+ $matchcat[1], ',' 
+ ',', $post_category 
-    } else {
-        $post_category = $post_default_category;
@@ -452 +455 @@
-}
-
-
-
-
-
+
+
+
+
+
-    return $content;
-}
-
-
+
+
-    global $debug;
-$debug == 1
-$filename, $mode
+1 == $debug
+ $filename, $mode 
-        return $fp;
-    } else {
@@ -469 +474 @@
-}
-
-
+
+
-    global $debug;
-$debug == 1 ) {
-$fp, $string
-   
-
-
-$fp
+1 == $debug )
+ $fp, $string 
+
+
+
+ $fp 
-    global $debug;
-
-
-
+
+
-}
-
-function do_enclose( $content, $post_ID ) {
-    global $wp_version, $wpdb;
- (ABSPATH . WPINC . '/class-IXR.php'
-
-ABSPATH . 'enclosures.log', 'a'
+( ABSPATH . WPINC . '/class-IXR.php' 
+
+ ABSPATH . 'enclosures.log', 'a' 
-    $post_links = array();
-$log, 'BEGIN '.date('YmdHis', time())."\n"
+ $log, 'BEGIN ' . date( 'YmdHis', time() ) . "\n" 
-
-    $pung = get_enclosed( $post_ID );
@@ -498 +503 @@
-    $any = $ltrs . $gunk . $punc;
-
-"{\b http : [$any] +? (?= [$punc] * [^$any] | $)}x", $content, $post_links_temp
-
-$log, 'Post contents:'
-$log, $content."\n"
-
-($post_links_temp[0] as $link_test) :
-$link_test, $pung) ) :
-$link_test
-$test['query']
+ "{\b http : [$any] +? (?= [$punc] * [^$any] | $)}x", $content, $post_links_temp 
+
+ $log, 'Post contents:' 
+ $log, $content . "\n" 
+
+ ( $post_links_temp[0] as $link_test ) {
+ $link_test, $pung ) ) {
+ $link_test 
+ $test['query'] 
-                $post_links[] = $link_test;
-($test['path'] != '/') && ($test['path'] != '')
+ $test['path'] != '/' && $test['path'] != '' 
-                $post_links[] = $link_test;
-endif;
-endforeach;
-
-$post_links as $url) :
-$wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE (%s)", $post_ID, $url.'%')
+}
+}
+
+ $post_links as $url ) {
+ $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE (%s)", $post_ID, $url . '%' ) 
-            if ( $headers = wp_get_http_headers( $url) ) {
-                $len = (int) $headers['content-length'];
@@ -521 +526 @@
-                if ( in_array( substr( $type, 0, strpos( $type, "/" ) ), $allowed_types ) ) {
-                    $meta_value = "$url\n$len\n$type\n";
-$wpdb->prepare(
-)
+ $wpdb->prepare( 
+ ) 
-                }
-            }
-        }
-
-
+
+
+
-
-function wp_get_http_headers( $url, $red = 1 ) {
@@ -537 +543 @@
-
-    $parts = parse_url( $url );
-$parts['query'] ? '?'.$parts['query'] : ''
+ ( $parts['query'] ) ? '?' . $parts['query'] : '' 
-    $host = $parts['host'];
-    if ( !isset( $parts['port'] ) )
@@ -544 +550 @@
-    $head = "HEAD $file HTTP/1.1\r\nHOST: $host\r\nUser-Agent: WordPress/" . $wp_version . "\r\n\r\n";
-
-$host, $parts['port'], $err_num, $err_msg, 3
+ $host, $parts['port'], $err_num, $err_msg, 3 
-    if ( !$fp )
-        return false;
@@ -553 +559 @@
-        $response .= fgets( $fp, 2048 );
-    fclose( $fp );
-'/(.*?): (.*)\r/', $response, $matches
-$matches[1]
-
-$matches[1][$i]
+ '/(.*?): (.*)\r/', $response, $matches 
+ $matches[1] 
+ 
+ $matches[1][$i] 
-        $headers["$key"] = $matches[2][$i];
-    }
-
-'/.*([0-9]{3}).*/', $response, $return
+ '/.*([0-9]{3}).*/', $response, $return 
-    $headers['response'] = $return[1]; // HTTP response code eg 204, 200, 404
-
-        $code = $headers['response'];
-'302' == $code || '301' == $code) && isset($headers['location']
+ '302' == $code || '301' == $code ) && isset( $headers['location'] 
-                return wp_get_http_headers( $headers['location'], ++$red );
-
-    return $headers;
-}
+
-
-function is_new_day() {
-    global $day, $previousday;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-/*
@@ -595 +603 @@
-function add_query_arg() {
-    $ret = '';
-func_get_arg(0)
-1
+ func_get_arg(0) 
+ 1 
-            $uri = $_SERVER['REQUEST_URI'];
-        else
-1
+ 1 
-    } else {
-2
+ 2 
-            $uri = $_SERVER['REQUEST_URI'];
-        else
-2
-
-
-$uri, '#'
-$uri, 0, -strlen($frag)
+ 2 
+
+
+ $uri, '#' 
+ $uri, 0, -strlen( $frag ) 
-    else
-        $frag = '';
-
-'|^https?://|i', $uri, $matches
+ '|^https?://|i', $uri, $matches 
-        $protocol = $matches[0];
-$uri, strlen($protocol)
+ $uri, strlen( $protocol ) 
-    } else {
-        $protocol = '';
-    }
-
-strpos($uri, '?') !== false
-'?', $uri, 2
-$parts
+ strpos( $uri, '?' ) !== false 
+ '?', $uri, 2 
+ $parts 
-            $base = '?';
-            $query = $parts[0];
@@ -628 +636 @@
-            $query = $parts[1];
-        }
-!empty($protocol) || strpos($uri, '='
+ !empty( $protocol ) || strpos( $uri, '=' 
-        $base = $uri . '?';
-        $query = '';
@@ -636 +644 @@
-    }
-
-$query, $qs
-$qs
-func_get_arg(0)
-0
-$qs, $kayvees
+ $query, $qs 
+ $qs 
+ func_get_arg( 0 ) 
+ 0 
+ $qs, $kayvees 
-    } else {
-0)] = func_get_arg(1
+ 0 )] = func_get_arg( 1 
-    }
-
-    foreach ( $qs as $k => $v ) {
-        if ( $v === false )
-$qs[$k]
-
-
-$qs
-$ret, '?'
-'#=(&|$)#', '$1', $ret
+ $qs[$k] 
+
+
+ $qs 
+ $ret, '?' 
+ '#=(&|$)#', '$1', $ret 
-    $ret = $protocol . $base . $ret . $frag;
-$ret, '?'
+ $ret, '?' 
-    return $ret;
-}
+
-
-/*
@@ -668 +677 @@
-*/
-
-$key, $query=FALSE
-$key
+ $key, $query=FALSE 
+ $key 
-        foreach ( (array) $key as $k )
-$k, FALSE, $query
+ $k, FALSE, $query 
-        return $query;
-    }
-
-
-
-
+
+
+
+
+
-    global $wpdb;
-
-$array as $k => $v