Changeset 2894

Timestamp:

09/20/05 03:17:43 (3 years ago)

Author:

ryan

Message:

wp_insert_comment(), wp_update_comment(), wp_allow_comment(), and wp_filter_comment() from skeltoac. fixes #1683

Files:

• trunk/wp-admin/import/blogger.php (modified) (19 diffs)
• trunk/wp-includes/comment-functions.php (modified) (1 diff)
• trunk/wp-includes/functions-post.php (modified) (1 diff)

trunk/wp-admin/import/blogger.php

@@ -22 +22 @@
-        echo '<h2>'.__('Import Blogger').'</h2>';
-        _e("<p>Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress blog.</p>
-may want to back up your Blogger template
+should <u>back up your Blogger template</u>
-<p>When you are ready to begin, enter your Blogger username and password below and click Start. Do not close this window until the process is complete.</p>");
-        echo "<iframe src='admin.php?import=blogger&noheader=true' height='350px' width = '99%'></iframe>";
@@ -38 +38 @@
-    // Generates a string that will make the page reload in a specified interval.
-    function refresher($msec) {
-
+
+
+
+
-    }
-
@@ -79 +82 @@
-        curl_setopt($ch, CURLOPT_POSTFIELDS,$params);
-        curl_setopt($ch, CURLOPT_URL,$_url);
-Developing 
+
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
-        curl_setopt($ch, CURLOPT_HEADER,1);
@@ -99 +102 @@
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
+        curl_setopt($ch, CURLOPT_USERAGENT, 'Blogger Exporter');
-        curl_setopt($ch, CURLOPT_HEADER,1);
-        if (is_array($header)) curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
@@ -131 +135 @@
-        if ($user && $pass) curl_setopt($ch, CURLOPT_USERPWD,"{$user}:{$pass}");
-        curl_setopt($ch, CURLOPT_URL,$url);
-Developing 
+
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-        curl_setopt($ch, CURLOPT_HEADER,$parse);
@@ -166 +170 @@
-
-    // Publishes.
-
+
+
-        if ( ! $this->import['blogs'][$_GET['blog']]['publish'][$i] ) {
-            // First call. Start the publish process.
@@ -178 +183 @@
-                if ( preg_match('#<p class="progressIndicator">.*</p>#U', $response['body'], $matches) ) {
-                    $progress = $matches[0];
-
+head . $
-                } else {
-                    echo "matches:<pre>" . print_r($matches,1) . "</pre>\n";
-                }
-            } else {
-
+
+
+
+
+
+
+
-            }
-            die();
@@ -194 +205 @@
-                if ( strstr($progress, '100%') )
-                    $this->set_next_step($i);
-
+head . $
-            } else {
-                echo "<h1>Publish error: No matches</h1><p>Please tell the devs.</p><pre>" . print_r($matches,1) . "</pre>\n";
@@ -271 +282 @@
-                    'published' => false,
-                    'archives' => false,
-                    'newusers' => array(),
-                    'lump_authors' => false,
-                    'newusers' => 0,
@@ -368 +378 @@
-    // Step 3: Publish with the new template and settings.
-    function publish_blog() {
-
-
+
-    }
-
@@ -403 +412 @@
-                $commentcount = 0;
-                $skippedcommentcount = 0;
-
+
+
+
-                $archive = implode('',file($url));
-    
@@ -417 +428 @@
-                    //$post_number = $postinfo[3];
-                    $post_title = ( $postinfo[4] != '' ) ? $postinfo[4] : $postinfo[3];
-
-
+
-                    $post_author_email = $postinfo[5] ? $postinfo[5] : 'no@email.com';
-    
@@ -465 +475 @@
-                    $post_status = 'publish';
-    
-
+$comment_post_ID = 
-                        $skippedpostcount++;
-                        $comment_post_ID = $dupcheck[0]['ID'];
-                    } else {
-                        $post_array = compact('post_author', 'post_content', 'post_title', 'post_category', 'post_author', 'post_date', 'post_status');
@@ -491 +500 @@
-                            $commenthour = '00';
-                        $comment_date = "$commentyear-$commentmonth-$commentday $commenthour:$commentminute:$commentsecond";
- // Believe it or not, Blogger allows a user to call himself "Mr. Hell's Kitchen" which, as a string, really confuses SQL.
+
-                        if ( strpos($commentinfo[1], 'a href') ) {
-                            $comment_author_parts = explode('&quot;', htmlentities($commentinfo[1]));
-                            $comment_author_url = $comment_author_parts[1];
-                        } else $comment_author_url = '';
-
-
-
+
+
+
+
-                            $skippedcommentcount++;
-                        } else {
-
-
-
-
-
-
+
+
+
-                        }
-                        $commentcount++;
@@ -523 +530 @@
-        if ( ! $did_one )
-            $this->set_next_step(7);
-5
+1
-    }
-
@@ -569 +576 @@
-    // Step 8: Republish, all back to normal
-    function republish_blog() {
-
-
+
-    }
-
@@ -582 +588 @@
-        if ( count($this->import['blogs']) > 1 )
-            echo "<li>In case you haven't done it already, you can import the posts from any other blogs you may have:" . $this->show_blogs() . "</li>\n";
-count($this->import['blogs'][$_GET['blog']]['newusers'])
-s
+$this->import['blogs'][$_GET['blog']]['newusers']
+" . ( $n > 1 ? 's' : '' ) . "
-        
-        echo "\n<ul>";
@@ -596 +602 @@
-        if ( isset($_GET['noheader']) ) {
-            $this->import = get_settings('import-blogger');
+
+            ob_start();
-
-            if ( isset($_GET['step']) ) {
@@ -606 +614 @@
-                $step = 0;
-            }
+
-            switch ($step) {
-                case 0 :

trunk/wp-includes/comment-functions.php

@@ -29 +29 @@
-
-    endif;
+}
+
+function wp_new_comment( $commentdata ) {
+    $commentdata = apply_filters('preprocess_comment', $commentdata);
+
+    $commentdata['comment_post_ID'] = (int) $commentdata['comment_post_ID'];
+    $commentdata['comment_author_IP'] = $_SERVER['REMOTE_ADDR'];
+    $commentdata['comment_agent'] = $_SERVER['HTTP_USER_AGENT'];
+    $commentdata['comment_date'] = current_time('mysql');
+    $commentdata['comment_date_gmt'] = current_time('mysql', 1);
+
+    $commentdata = wp_filter_comment($commentdata);
+
+    $commentdata['comment_approved'] = wp_allow_comment($commentdata);
+
+    $comment_ID = wp_insert_comment($commentdata);
+
+    do_action('comment_post', $comment_ID, $commentdata['approved']);
+
+    if ( 'spam' !== $commentdata['comment_approved'] ) { // If it's spam save it silently for later crunching
+        if ( '0' == $commentdata['comment_approved'] )
+            wp_notify_moderator($comment_ID);
+    
+        if ( get_settings('comments_notify') && $commentdata['comment_approved'] )
+            wp_notify_postauthor($comment_ID, $commentdata['comment_type']);
+    }
+
+    return $comment_id;
+}
+
+function wp_insert_comment($commentdata) {
+    global $wpdb;
+    extract($commentdata);
+
+    if ( ! isset($comment_author_IP) )
+        $comment_author_IP = $_SERVER['REMOTE_ADDR'];
+    if ( ! isset($comment_date) )
+        $comment_date = current_time('mysql');
+    if ( ! isset($comment_date_gmt) )
+        $comment_date_gmt = gmdate('Y-m-d H:i:s', strtotime($comment_date) );
+
+    $result = $wpdb->query("INSERT INTO $wpdb->comments 
+    (comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_author_IP, comment_date, comment_date_gmt, comment_content, comment_approved, comment_agent, comment_type, comment_parent, user_id)
+    VALUES 
+    ('$comment_post_ID', '$comment_author', '$comment_author_email', '$comment_author_url', '$comment_author_IP', '$comment_date', '$comment_date_gmt', '$comment_content', '$comment_approved', '$comment_agent', '$comment_type', '$comment_parent', '$user_id')
+    ");
+
+    return $wpdb->insert_id;
+}
+
+function wp_filter_comment($commentdata) {
+    $commentdata['user_id'] = apply_filters('pre_user_id', $commentdata['user_ID']);
+    $commentdata['comment_agent'] = apply_filters('pre_comment_user_agent', $commentdata['comment_agent']);
+    $commentdata['comment_author'] = apply_filters('pre_comment_author_name', $commentdata['comment_author']);
+    $commentdata['comment_content'] = apply_filters('pre_comment_content', $commentdata['comment_content']);
+    $commentdata['comment_author_IP'] = apply_filters('pre_comment_user_ip', $commentdata['comment_author_IP']);
+    $commentdata['comment_author_url'] = apply_filters('pre_comment_author_url', $commentdata['comment_author_url']);
+    $commentdata['comment_author_email'] = apply_filters('pre_comment_author_email', $commentdata['comment_author_email']);
+    $commentdata['filtered'] = true;
+    return $commentdata;
+}
+
+function wp_allow_comment($commentdata) {
+    global $wpdb;
+    extract($commentdata);
+
+    $comment_user_domain = apply_filters('pre_comment_user_domain', gethostbyaddr($comment_author_ip) );
+
+    // Simple duplicate check
+    $dupe = "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = '$comment_post_ID' AND ( comment_author = '$comment_author' ";
+    if ( $comment_author_email )
+        $dupe .= "OR comment_author_email = '$comment_author_email' ";
+    $dupe .= ") AND comment_content = '$comment_content' LIMIT 1";
+    if ( $wpdb->get_var($dupe) )
+        die( __('Duplicate comment detected; it looks as though you\'ve already said that!') );
+
+    // Simple flood-protection
+    if ( $lasttime = $wpdb->get_var("SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_author_IP = '$comment_author_IP' OR comment_author_email = '$comment_author_email' ORDER BY comment_date DESC LIMIT 1") ) {
+        $time_lastcomment = mysql2date('U', $lasttime);
+        $time_newcomment  = mysql2date('U', $comment_date_gmt);
+        if ( ($time_newcomment - $time_lastcomment) < 15 ) {
+            do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);
+            die( __('Sorry, you can only post a new comment once every 15 seconds. Slow down cowboy.') );
+        }
+    }
+
+    if ( $user_id ) {
+        $userdata = get_userdata($user_id);
+        $user = new WP_User($user_id);
+        $post_author = $wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = '$comment_post_ID' LIMIT 1");
+    }
+
+    // The author and the admins get respect.
+    if ( $userdata && ( $user_id == $post_author || $user->has_cap('level_9') ) ) {
+        $approved = 1;
+    }
+
+    // Everyone else's comments will be checked.
+    else {
+        if ( check_comment($comment_author, $comment_author_email, $comment_author_url, $comment_content, $comment_author_IP, $comment_agent, $comment_type) )
+            $approved = 1;
+        else
+            $approved = 0;
+        if ( wp_blacklist_check($comment_author, $comment_author_email, $comment_author_url, $comment_content, $comment_author_IP, $comment_agent) )
+            $approved = 'spam';
+    }
+
+    $approved = apply_filters('pre_comment_approved', $approved);
+    return $approved;
+}
+
+
+function wp_update_comment($commentarr) {
+    global $wpdb;
+
+    // First, get all of the original fields
+    $comment = get_comment($commentarr['comment_ID'], ARRAY_A);
+
+    // Escape data pulled from DB.
+    foreach ($comment as $key => $value)
+        $comment[$key] = $wpdb->escape($value);
+
+    // Merge old and new fields with new fields overwriting old ones.
+    $commentarr = array_merge($comment, $commentarr);
+
+    // Now extract the merged array.
+    extract($commentarr);
+
+    $comment_content = apply_filters('comment_save_pre', $comment_content);
+
+    $result = $wpdb->query(
+        "UPDATE $wpdb->comments SET
+            comment_content = '$comment_content',
+            comment_author = '$comment_author',
+            comment_author_email = '$comment_author_email',
+            comment_approved = '$comment_approved',
+            comment_author_url = '$comment_author_url',
+            comment_date = '$comment_date'
+        WHERE comment_ID = $comment_ID" );
+
+    $rval = $wpdb->rows_affected;
+
+    do_action('edit_comment', $comment_ID);
+
+    return $rval;   
-}
-

trunk/wp-includes/functions-post.php

@@ -457 +457 @@
-}
-
-function wp_new_comment( $commentdata, $spam = false ) {
-    global $wpdb;
-
-    $commentdata = apply_filters('preprocess_comment', $commentdata);
-    extract($commentdata);
-
-    $comment_post_ID = (int) $comment_post_ID;
-
-    $user_id = apply_filters('pre_user_id', $user_ID);
-    $author  = apply_filters('pre_comment_author_name', $comment_author);
-    $email   = apply_filters('pre_comment_author_email', $comment_author_email);
-    $url     = apply_filters('pre_comment_author_url', $comment_author_url);
-    $comment = apply_filters('pre_comment_content', $comment_content);
-    $comment = apply_filters('post_comment_text', $comment); // Deprecated
-    $comment = apply_filters('comment_content_presave', $comment); // Deprecated
-
-    $user_ip     = apply_filters('pre_comment_user_ip', $_SERVER['REMOTE_ADDR']);
-    $user_domain = apply_filters('pre_comment_user_domain', gethostbyaddr($user_ip) );
-    $user_agent  = apply_filters('pre_comment_user_agent', $_SERVER['HTTP_USER_AGENT']);
-
-    $now     = current_time('mysql');
-    $now_gmt = current_time('mysql', 1);
-
-    if ( $user_id ) {
-        $userdata = get_userdata($user_id);
-        $user = new WP_User($user_id);
-        $post_author = $wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = '$comment_post_ID' LIMIT 1");
-    }
-
-    // Simple duplicate check
-    $dupe = "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = '$comment_post_ID' AND ( comment_author = '$author' ";
-    if ( $email ) $dupe .= "OR comment_author_email = '$email' ";
-    $dupe .= ") AND comment_content = '$comment' LIMIT 1";
-    if ( $wpdb->get_var($dupe) )
-        die( __('Duplicate comment detected; it looks as though you\'ve already said that!') );
-
-    // Simple flood-protection
-    if ( $lasttime = $wpdb->get_var("SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_author_IP = '$user_ip' OR comment_author_email = '$email' ORDER BY comment_date DESC LIMIT 1") ) {
-        $time_lastcomment = mysql2date('U', $lasttime);
-        $time_newcomment  = mysql2date('U', $now_gmt);
-        if ( ($time_newcomment - $time_lastcomment) < 15 ) {
-            do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);
-            die( __('Sorry, you can only post a new comment once every 15 seconds. Slow down cowboy.') );
-        }
-    }
-
-    if ( $userdata && ( $user_id == $post_author || $user->has_cap('level_9') ) ) {
-        $approved = 1;
-    } else {
-        if ( check_comment($author, $email, $url, $comment, $user_ip, $user_agent, $comment_type) )
-            $approved = 1;
-        else
-            $approved = 0;
-        if ( wp_blacklist_check($author, $email, $url, $comment, $user_ip, $user_agent) )
-            $approved = 'spam';
-    }
-
-    $approved = apply_filters('pre_comment_approved', $approved);
-
-    $result = $wpdb->query("INSERT INTO $wpdb->comments 
-    (comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_author_IP, comment_date, comment_date_gmt, comment_content, comment_approved, comment_agent, comment_type, user_id)
-    VALUES 
-    ('$comment_post_ID', '$author', '$email', '$url', '$user_ip', '$now', '$now_gmt', '$comment', '$approved', '$user_agent', '$comment_type', '$user_id')
-    ");
-
-    $comment_id = $wpdb->insert_id;
-    do_action('comment_post', $comment_id, $approved);
-
-    if ( 'spam' !== $approved ) { // If it's spam save it silently for later crunching
-        if ( '0' == $approved )
-            wp_notify_moderator($comment_id);
-    
-        if ( get_settings('comments_notify') && $approved )
-            wp_notify_postauthor($comment_id, $comment_type);
-    }
-
-    return $result;
-}
-
-function wp_update_comment($commentarr) {
-    global $wpdb;
-
-    // First, get all of the original fields
-    $comment = get_comment($commentarr['comment_ID'], ARRAY_A);
-
-    // Escape data pulled from DB.
-    foreach ($comment as $key => $value)
-        $comment[$key] = $wpdb->escape($value);
-
-    // Merge old and new fields with new fields overwriting old ones.
-    $commentarr = array_merge($comment, $commentarr);
-
-    // Now extract the merged array.
-    extract($commentarr);
-
-    $comment_content = apply_filters('comment_save_pre', $comment_content);
-
-    $result = $wpdb->query(
-        "UPDATE $wpdb->comments SET
-            comment_content = '$comment_content',
-            comment_author = '$comment_author',
-            comment_author_email = '$comment_author_email',
-            comment_approved = '$comment_approved',
-            comment_author_url = '$comment_author_url',
-            comment_date = '$comment_date'
-        WHERE comment_ID = $comment_ID" );
-
-    $rval = $wpdb->rows_affected;
-
-    do_action('edit_comment', $comment_ID);
-
-    return $rval;   
-}
-
-function do_trackbacks($post_id) {
-    global $wpdb;