Changeset 4626

Timestamp:

12/07/06 03:57:23 (2 years ago)

Author:

markjaquith

Message:

Bunch of whitespace and coding standardization.

Files:

• trunk/wp-includes/comment.php (modified) (36 diffs)
• trunk/wp-includes/feed.php (modified) (11 diffs)
• trunk/wp-includes/plugin.php (modified) (2 diffs)
• trunk/wp-includes/registration.php (modified) (7 diffs)
• trunk/wp-includes/vars.php (modified) (3 diffs)

trunk/wp-includes/comment.php

@@ -4 +4 @@
-    global $wpdb;
-
-
+
+
-
-    if ( preg_match_all("|(href\t*?=\t*?['\"]?)?(https?:)?//|i", $comment, $out) >= get_option('comment_max_links') )
-        return false; // Check # of external links
-
- get_option('moderation_keys') 
+get_option('moderation_keys')
-    if ( !empty($mod_keys) ) {
-        $words = explode("\n", $mod_keys );
@@ -17 +18 @@
-
-            // Skip empty lines
-
+
+
-
-            // Do some escaping magic so that '#' chars in the
@@ -44 +46 @@
-            else
-                return false;
-
+ 
-            $ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = '$author' AND comment_author_email = '$email' and comment_approved = '1' LIMIT 1");
-            if ( ( 1 == $ok_to_comment ) &&
@@ -55 +57 @@
-        }
-    }
-
-    return true;
-}
+
-
-function get_approved_comments($post_id) {
@@ -65 +67 @@
-    return $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post_id' AND comment_approved = '1' ORDER BY comment_date");
-}
+
-
-// Retrieves comment data given a comment ID or comment object.
@@ -98 +101 @@
-}
-
+
-// Deprecate in favor of get_comment()?
-function get_commentdata( $comment_ID, $no_cache = 0, $include_unapproved = false ) { // less flexible, but saves DB queries
-    global $postc, $id, $commentdata, $wpdb;
-$no_cache
+ $no_cache 
-        $query = "SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment_ID'";
-
-
-
-
+
+
+
-    } else {
-
-
-
+          
+     
+      
-        $myrow['comment_author_email'] = $postc->comment_author_email;
-
-
-
-
-
-
-
+  
+   
+        
+     
+       
+    
+        
-    }
-    return $myrow;
-}
+
-
-function get_lastcommentmodified($timezone = 'server') {
@@ -129 +133 @@
-    $now = current_time('mysql', 1);
-    if ( !isset($cache_lastcommentmodified[$timezone]) ) {
-(
+ ( 
-            case 'gmt':
-                $lastcommentmodified = $wpdb->get_var("SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_date_gmt <= '$now' ORDER BY comment_date_gmt DESC LIMIT 1");
@@ -147 +151 @@
-}
-
+
-function sanitize_comment_cookies() {
-    if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) ) {
@@ -169 +174 @@
-    }
-}
+
-
-function wp_allow_comment($commentdata) {
@@ -199 +205 @@
-    }
-
-    // The author and the admins get respect.
-    if ( $userdata && ( $user_id == $post_author || $user->has_cap('level_9') ) ) {
+        // The author and the admins get respect.
-        $approved = 1;
-
-
-
-
+
+
-        if ( check_comment($comment_author, $comment_author_email, $comment_author_url, $comment_content, $comment_author_IP, $comment_agent, $comment_type) )
-            $approved = 1;
@@ -218 +222 @@
-}
-
+
-function wp_blacklist_check($author, $email, $url, $comment, $user_ip, $user_agent) {
-    global $wpdb;
@@ -224 +229 @@
-
-    if ( preg_match_all('/&#(\d+);/', $comment . $author . $url, $chars) ) {
-$chars[1] as $char
+ (array) $chars[1] as $char 
-            // If it's an encoded char in the normal ASCII set, reject
-            if ( 38 == $char )
-                continue; // Unless it's &
-$char < 128
+ $char < 128 
-                return true;
-        }
@@ -234 +239 @@
-
-    $mod_keys = trim( get_option('blacklist_keys') );
-
+ 
-        return false; // If moderation keys are empty
-    $words = explode("\n", $mod_keys );
-
-$words as $word
+ (array) $words as $word 
-        $word = trim($word);
-
@@ -249 +254 @@
-
-        $pattern = "#$word#i";
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    return false;
-}
+
-
-function wp_delete_comment($comment_id) {
@@ -277 +285 @@
-}
-
+
-function wp_get_comment_status($comment_id) {
-    global $wpdb;
-
-    $result = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_ID='$comment_id' LIMIT 1");
-
+
+
-        return 'deleted';
-} else if ($result == '1') {
+elseif ( $result == '1' )
-        return 'approved';
-} else if ($result == '0') {
+elseif ( $result == '0' )
-        return 'unapproved';
-} else if ($result == 'spam') {
+elseif ( $result == 'spam' )
-        return 'spam';
-} else {
+else
-        return false;
-   
-
+
+
-
-function wp_get_current_commenter() {
@@ -311 +321 @@
-    return compact('comment_author', 'comment_author_email', 'comment_author_url');
-}
+
-
-function wp_insert_comment($commentdata) {
@@ -343 +354 @@
-}
-
+
-function wp_filter_comment($commentdata) {
-    $commentdata['user_id']              = apply_filters('pre_user_id', $commentdata['user_ID']);
@@ -355 +367 @@
-}
-
+
-function wp_throttle_comment_flood($block, $time_lastcomment, $time_newcomment) {
-    if ( $block ) // a plugin has already blocked... we'll let that decision stand
@@ -363 +376 @@
-}
-
+
-function wp_new_comment( $commentdata ) {
-    $commentdata = apply_filters('preprocess_comment', $commentdata);
@@ -374 +388 @@
-    $commentdata['comment_date']     = current_time('mysql');
-    $commentdata['comment_date_gmt'] = current_time('mysql', 1);
-
-
-    $commentdata = wp_filter_comment($commentdata);
@@ -397 +410 @@
-}
-
+
-function wp_set_comment_status($comment_id, $comment_status) {
-   
-
-   switch($comment_status
+
+
+switch ( $comment_status 
-        case 'hold':
-            $query = "UPDATE $wpdb->comments SET comment_approved='0' WHERE comment_ID='$comment_id' LIMIT 1";
-
+   
-        case 'approve':
-            $query = "UPDATE $wpdb->comments SET comment_approved='1' WHERE comment_ID='$comment_id' LIMIT 1";
-
+   
-        case 'spam':
-            $query = "UPDATE $wpdb->comments SET comment_approved='spam' WHERE comment_ID='$comment_id' LIMIT 1";
-
+   
-        case 'delete':
-            return wp_delete_comment($comment_id);
-
+   
-        default:
-            return false;
-   
-
-   if ($wpdb->query($query)
+
+
+if ( $wpdb->query($query) 
-        do_action('wp_set_comment_status', $comment_id, $comment_status);
-
-        $comment = get_comment($comment_id);
-        $comment_post_ID = $comment->comment_post_ID;
- "SELECT count(*) as c FROM {$wpdb->comments} WHERE comment_post_ID = '$comment_post_ID' AND comment_approved = '1'" 
-( is_object( $c 
- "UPDATE $wpdb->posts SET comment_count = '$c->c' WHERE ID = '$comment_post_ID'" 
+"SELECT count(*) as c FROM {$wpdb->comments} WHERE comment_post_ID = '$comment_post_ID' AND comment_approved = '1'"
+ ( is_object($c
+"UPDATE $wpdb->posts SET comment_count = '$c->c' WHERE ID = '$comment_post_ID'"
-        return true;
-   
+
-        return false;
-
-
+
+
+
-
-function wp_update_comment($commentarr) {
@@ -438 +453 @@
-
-    // Escape data pulled from DB.
-$comment as $key => $value
+ (array) $comment as $key => $value 
-        $comment[$key] = $wpdb->escape($value);
-
@@ -453 +468 @@
-    $result = $wpdb->query(
-        "UPDATE $wpdb->comments SET
-
-
+     
+      
-            comment_author_email = '$comment_author_email',
-
-
-
+    
+  
+        
-        WHERE comment_ID = $comment_ID" );
-
-    $rval = $wpdb->rows_affected;
-
-    wp_update_comment_count($comment_post_ID);
-
-    do_action('edit_comment', $comment_ID);
-
-    return $rval;
-}
+
-
-function wp_update_comment_count($post_id) {
@@ -481 +494 @@
-}
-
+
-//
-// Ping and trackback functions.
@@ -498 +512 @@
-    extract(parse_url($url));
-
-
-
+
-        return false;
-
-
-
-
-
+
+
+
+
-
-    // Try to connect to the server at $host
-    $fp = @fsockopen($host, $port, $errno, $errstr, 2);
-
-
+
-        return false;
-    }
-
-    // Send the GET request
-    $request = "GET $path HTTP/1.1\r\nHost: $host\r\nUser-Agent: WordPress/$wp_version \r\n\r\n";
-// 
+   // 
-    fputs($fp, $request);
-
-    // Let's check for an X-Pingback header first
-!feof($fp)
+ !feof($fp) 
-        $line = fgets($fp, 512);
-trim($line) == '') {
+ trim($line) == '' )
-            break;
-        }
-        $headers .= trim($line)."\n";
-        $x_pingback_header_offset = strpos(strtolower($headers), $x_pingback_str);
-$x_pingback_header_offset
+ $x_pingback_header_offset 
-            // We got it!
-            preg_match('#x-pingback: (.+)#is', $headers, $matches);
@@ -533 +542 @@
-            return $pingback_server_url;
-        }
-(strpos(strtolower($headers), 'content-type: ')
+ ( strpos(strtolower($headers), 'content-type: ') 
-            preg_match('#content-type: (.+)#is', $headers, $matches);
-            $content_type = trim($matches[1]);
@@ -539 +548 @@
-    }
-
-
-
+
-        return false;
-
-
-
+
+
-        $line = fgets($fp, 1024);
-        $contents .= trim($line);
-        $pingback_link_offset_dquote = strpos($contents, $pingback_str_dquote);
-        $pingback_link_offset_squote = strpos($contents, $pingback_str_squote);
-$pingback_link_offset_dquote || $pingback_link_offset_squote
+ $pingback_link_offset_dquote || $pingback_link_offset_squote 
-            $quote = ($pingback_link_offset_dquote) ? '"' : '\'';
-            $pingback_link_offset = ($quote=='"') ? $pingback_link_offset_dquote : $pingback_link_offset_squote;
@@ -558 +565 @@
-            $pingback_server_url = substr($contents, $pingback_href_start, $pingback_server_url_len);
-            // We may find rel="pingback" but an incomplete pingback URL
-
-
+
-                return $pingback_server_url;
-            }
-        }
-        $byte_count += strlen($line);
-$byte_count > $timeout_bytes
+ $byte_count > $timeout_bytes 
-            // It's no use going further, there probably isn't any pingback
-            // server to find in this file. (Prevents loading large files.)
@@ -574 +579 @@
-    return false;
-}
+
-
-function do_all_pings() {
@@ -593 +599 @@
-    $trackbacks = $wpdb->get_results("SELECT ID FROM $wpdb->posts WHERE CHAR_LENGTH(TRIM(to_ping)) > 7 AND post_status = 'publish'");
-    if ( is_array($trackbacks) ) {
- {
+
-            do_trackbacks($trackback->ID);
-        }
-    }
-
@@ -613 +618 @@
-    }
-
-empty($post->post_excerpt)
+ empty($post->post_excerpt) 
-        $excerpt = apply_filters('the_content', $post->post_content);
-    else
@@ -627 +632 @@
-    $post_title = strip_tags($post_title);
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-function generic_ping($post_id = 0) {
@@ -644 +652 @@
-    if ( '' != $services ) {
-        $services = explode("\n", $services);
-$services as $service) {
+ (array) $services as $service )
-            weblog_ping($service);
-        }
-    }
-
-    return $post_id;
-}
+
-
-function pingback($content, $post_ID) {
-    global $wp_version, $wpdb;
- 
+
-
-    // original code by Mort (http://mort.mine.nu:8080)
-    $log = debug_fopen(ABSPATH . '/pingback.log', 'a');
-    $post_links = array();
-.date('YmdHis', time()).
+ . date('YmdHis', time()) . 
-
-    $pung = get_pung($post_ID);
@@ -688 +696 @@
-    // We don't wanna ping first and second types, even if they have a valid <link/>
-
-($post_links_temp[0] as $link_test
+ ( $post_links_temp[0] as $link_test 
-        if ( !in_array($link_test, $pung) && (url_to_postid($link_test) != $post_ID) // If we haven't pung it already and it isn't a link to itself
-                && !is_local_attachment($link_test) ) : // Also, let's never ping local attachments.
-            $test = parse_url($link_test);
-isset($test['query'])
+ isset($test['query']) 
-                $post_links[] = $link_test;
-(($test['path'] != '/') && ($test['path'] != '')
+ ( ($test['path'] != '/') && ($test['path'] != '') 
-                $post_links[] = $link_test;
-        endif;
-    endforeach;
-
- 
-
-$post_links as $pagelinkedto)
+
+
+ (array) $post_links as $pagelinkedto ) 
-        debug_fwrite($log, "Processing -- $pagelinkedto\n");
-        $pingback_server_url = discover_pingback_server_uri($pagelinkedto, 2048);
-
-$pingback_server_url
+ $pingback_server_url 
-            @ set_time_limit( 60 );
-             // Now, the RPC call
@@ -732 +740 @@
-}
-
-
+
+
-    if ( '0' != get_option('blog_public') )
-        return $sites;
@@ -781 +790 @@
-}
-
+
-function weblog_ping($server = '', $path = '') {
-    global $wp_version;
- 
+
-
-    // using a timeout of 3 seconds should be enough to cover slow servers

trunk/wp-includes/feed.php

@@ -6 +6 @@
-}
-
+
-function bloginfo_rss($show = '') {
-    echo get_bloginfo_rss($show);
-}
+
-
-function get_the_title_rss() {
@@ -17 +19 @@
-}
-
+
-function the_title_rss() {
-    echo get_the_title_rss();
-}
+
-
-function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {
@@ -43 +47 @@
-            $use_dotdotdot = 0;
-        }
- {
+
-            $excerpt .= $blah[$i].' ';
-        }
-        $excerpt .= ($use_dotdotdot) ? '...' : '';
-        $content = $excerpt;
@@ -53 +56 @@
-}
-
+
-function the_excerpt_rss() {
-    $output = get_the_excerpt(true);
@@ -58 +62 @@
-}
-
+
-function permalink_single_rss($file = '') {
-    echo get_permalink();
-}
+
-
-function comment_link() {
@@ -66 +72 @@
-}
-
+
-function get_comment_author_rss() {
-    return apply_filters('comment_author_rss', get_comment_author() );
-}
+
+
-function comment_author_rss() {
-    echo get_comment_author_rss();
-}
+
-
-function comment_text_rss() {
@@ -79 +89 @@
-}
-
+
-function comments_rss_link($link_text = 'Comments RSS', $commentsrssfilename = '') {
-    $url = comments_rss($commentsrssfilename);
-    echo "<a href='$url'>$link_text</a>";
-}
+
-
-function comments_rss($commentsrssfilename = '') {
@@ -94 +106 @@
-    return apply_filters('post_comments_feed_link', $url);
-}
+
-
-function get_author_rss_link($echo = false, $author_id, $author_nicename) {
@@ -113 +126 @@
-}
-
+
-function get_category_rss_link($echo = false, $cat_ID, $category_nicename) {
-    $permalink_structure = get_option('permalink_structure');
@@ -130 +144 @@
-}
-
+
-function get_the_category_rss($type = 'rss') {
-    $categories = get_the_category();
@@ -143 +158 @@
-}
-
+
-function the_category_rss($type = 'rss') {
-    echo get_the_category_rss($type);
-}
+
-
-function rss_enclosure() {

trunk/wp-includes/plugin.php

@@ -10 +10 @@
-    // check that we don't already have the same filter at the same priority
-    if ( isset($wp_filter[$tag]["$priority"]) ) {
-($wp_filter[$tag]["$priority"] as $filter
+ ( $wp_filter[$tag]["$priority"] as $filter 
-            // uncomment if we want to match function AND accepted_args
-            // if ( $filter == array($function, $accepted_args) ) {
@@ -136 +136 @@
-    foreach ( (array) $wp_filter[$tag] as $priority => $functions ) {
-        if ( !is_null($functions) ) {
-
+ 
-                $function_name = $function['function'];
-                $accepted_args = $function['accepted_args'];

trunk/wp-includes/registration.php

@@ -11 +11 @@
-}
-
+
-function email_exists( $email ) {
-    global $wpdb;
@@ -16 +17 @@
-    return $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_email = '$email'");
-}
+
-
-function validate_username( $username ) {
@@ -26 +28 @@
-    return apply_filters('validate_username', $valid, $username);
-}
+
-
-function wp_insert_user($userdata) {
@@ -124 +127 @@
-}
-
+
-function wp_update_user($userdata) {
-    global $wpdb;
@@ -147 +151 @@
-    // Update the cookies if the password changed.
-    $current_user = wp_get_current_user();
-
+ 
-        if ( isset($plaintext_pass) ) {
-            wp_clearcookie();
@@ -157 +161 @@
-}
-
-
+
+
-    global $wpdb;
-
- $username 
- $email 
+$username
+$email
-    $user_pass = $password;
-
@@ -169 +174 @@
-
-
- $username, $password, $email 
- $username, $password, $email 
+$username, $password, $email
+$username, $password, $email
-}
-
-
-?>

trunk/wp-includes/vars.php

@@ -2 +2 @@
-
-// On which page are we ?
-preg_match('#([^/]+\.php)$#', $PHP_SELF, $self_matches)
+ preg_match('#([^/]+\.php)$#', $PHP_SELF, $self_matches) 
-    $pagenow = $self_matches[1];
- if (strstr($PHP_SELF, '?')
+if ( strpos($PHP_SELF, '?') !== false 
-    $pagenow = explode('/', $PHP_SELF);
-    $pagenow = trim($pagenow[(sizeof($pagenow)-1)]);
@@ -14 +14 @@
-
-// Simple browser detection
+// We should probably be doing true/false instead of 1/0 here ~ Mark
-$is_lynx = 0; $is_gecko = 0; $is_winIE = 0; $is_macIE = 0; $is_opera = 0; $is_NS4 = 0;
-
-preg_match('/Lynx/', $_SERVER['HTTP_USER_AGENT'])) {
+ preg_match('/Lynx/', $_SERVER['HTTP_USER_AGENT']) )
-    $is_lynx = 1;
-
+
-    $is_gecko = 1;
-
+
-    $is_winIE = 1;
-
+
-    $is_macIE = 1;
-
+
-    $is_opera = 1;
-
+
-    $is_NS4 = 1;
-
-   = (($is_macIE) || ($is_winIE)
+
+= ( $is_macIE || $is_winIE 
-
-// Server detection
@@ -38 +39 @@
-if (!isset($wpsmiliestrans)) {
-    $wpsmiliestrans = array(
-    
-    
-    
-':arrow:'  
-':shock:'  
-':smile:'  
-':???:'    
-':cool:'   
-':evil:'   
-':grin:'   
-':idea:'   
-':oops:'   
-':razz:'   
-':roll:'   
-':wink:'   
-':cry:'        
-':eek:'        
-':lol:'        
-':mad:'        
-':sad:'        
-'8-)'      
-'8-O'      
-':-('      
-':-)'      
-':-?'      
-':-D'      
-':-P'      
-':-o'      
-':-x'      
-':-|'      
-';-)'      
-'8)'       
-'8O'       
-':('       
-':)'       
-':?'       
-':D'       
-':P'       
-':o'       
-':x'       
-':|'       
-';)'       
-':!:'      
-':?:'      
+ 
+ 
+ 
+  ':arrow:' 
+  ':shock:' 
+  ':smile:' 
+    ':???:' 
+   ':cool:' 
+   ':evil:' 
+   ':grin:' 
+   ':idea:' 
+   ':oops:' 
+   ':razz:' 
+   ':roll:' 
+   ':wink:' 
+    ':cry:' 
+    ':eek:' 
+    ':lol:' 
+    ':mad:' 
+    ':sad:' 
+      '8-)' 
+      '8-O' 
+      ':-(' 
+      ':-)' 
+      ':-?' 
+      ':-D' 
+      ':-P' 
+      ':-o' 
+      ':-x' 
+      ':-|' 
+      ';-)' 
+       '8)' 
+       '8O' 
+       ':(' 
+       ':)' 
+       ':?' 
+       ':D' 
+       ':P' 
+       ':o' 
+       ':x' 
+       ':|' 
+       ';)' 
+      ':!:' 
+      ':?:' 
-    );
-}
-
-
-// generates smilies' search & replace arrays
-($wpsmiliestrans as $smiley => $img
+ ( (array) $wpsmiliestrans as $smiley => $img 
-    $wp_smiliessearch[] = '/(\s|^)'.preg_quote($smiley, '/').'(\s|$)/';
- trim($smiley) 
+trim($smiley)
-    $wp_smiliesreplace[] = " <img src='" . get_option('siteurl') . "/wp-includes/images/smilies/$img' alt='$smiley_masked' class='wp-smiley' /> ";
-}