Changeset 636

Timestamp:

12/22/2003 02:46:40 AM (21 years ago)

Author:

saxmatt

Message:

Trackback on edit done.

Location:

trunk

Files:

• wp-admin/edit-form.php (modified) (2 diffs)
• wp-admin/post.php (modified) (10 diffs)
• wp-admin/upgrade-072-to-080.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)
• wp-trackback.php (modified) (1 diff)

trunk/wp-admin/edit-form.php

@@ -27 +27 @@
         }
         if ($use_trackback) {
-            $form_trackback = '<p><label for="trackback"><a href="http://wordpress.org/docs/reference/post/#trackback" title="Help on trackbacks"><strong>TrackBack</strong> an <acronym title="Uniform Resource Locator">URL</acronym></a>:</label> (Separate multiple <acronym title="Uniform Resource Locator">URL</acronym>s with commas.)<br />
+            $form_trackback = '<p><label for="trackback"><a href="http://wordpress.org/docs/reference/post/#trackback" title="Help on trackbacks"><strong>TrackBack</strong> an <acronym title="Uniform Resource Locator">URL</acronym></a>:</label> (Separate multiple <acronym title="Uniform Resource Locator">URL</acronym>s with spaces.)<br />
             <input type="text" name="trackback_url" style="width: 415px" id="trackback" tabindex="7" /></p>';
+            if ('' != $pinged) {
+                $form_trackback .= '<p>Already pinged:</p><ul>';
+                $already_pinged = explode("\n", trim($pinged));
+                foreach ($already_pinged as $pinged_url) {
+                    $form_trackback .= "\n\t<li>$pinged_url</li>";
+                }
+                $form_trackback .= '</ul>';
+            }
         } else {
             $form_trackback = '';
@@ -43 +51 @@
         $form_pingback = '<input type="hidden" name="post_pingback" value="0" />';
         $form_prevstatus = '<input type="hidden" name="prev_status" value="'.$post_status.'" />';
-        $form_trackback = '';
+        if ($use_trackback) {
+            $form_trackback = '<p><label for="trackback"><a href="http://wordpress.org/docs/reference/post/#trackback" title="Help on trackbacks"><strong>TrackBack</strong> an <acronym title="Uniform Resource Locator">URL</acronym></a></label>
+             (Separate multiple <acronym title="Uniform Resource Locator">URL</acronym>s with spaces.)<br />
+            <input type="text" name="trackback_url" style="width: 415px" id="trackback" tabindex="7" value="'. str_replace("\n", ' ', $to_ping) .'" /></p>';
+            if ('' != $pinged) {
+                $form_trackback .= '<p>Already pinged:</p><ul>';
+                $already_pinged = explode("\n", trim($pinged));
+                foreach ($already_pinged as $pinged_url) {
+                    $form_trackback .= "\n\t<li>$pinged_url</li>";
+                }
+                $form_trackback .= '</ul>';
+            }
+        } else {
+            $form_trackback = '';
+        }
         break;
     case "editcomment":

trunk/wp-admin/post.php

@@ -63 +63 @@
             $post_password = addslashes($HTTP_POST_VARS['post_password']);
             $post_name = sanitize_title($post_title);
+            $trackback = $HTTP_POST_VARS['trackback_url'];
+        // Format trackbacks
+        $trackback = preg_replace('|\s+|', '\n', $trackback);
 
         if ($user_level == 0)
@@ -87 +90 @@
         if((get_settings('use_geo_positions')) && (strlen($latstr) > 2) && (strlen($lonstr) > 2) ) {
         $postquery ="INSERT INTO $tableposts
-                (ID, post_author, post_date, post_content, post_title, post_lat, post_lon, post_excerpt,  post_status, comment_status, ping_status, post_password, post_name)
+                (ID, post_author, post_date, post_content, post_title, post_lat, post_lon, post_excerpt,  post_status, comment_status, ping_status, post_password, post_name, to_ping)
                 VALUES
-                ('0', '$user_ID', '$now', '$content', '$post_title', $post_latf, $post_lonf,'$excerpt', '$post_status', '$comment_status', '$ping_status', '$post_password', '$post_name')
+                ('0', '$user_ID', '$now', '$content', '$post_title', $post_latf, $post_lonf,'$excerpt', '$post_status', '$comment_status', '$ping_status', '$post_password', '$post_name', '$trackback')
                 ";
         } else {
         $postquery ="INSERT INTO $tableposts
-                (ID, post_author, post_date, post_content, post_title, post_excerpt,  post_status, comment_status, ping_status, post_password, post_name)
+                (ID, post_author, post_date, post_content, post_title, post_excerpt,  post_status, comment_status, ping_status, post_password, post_name, to_ping)
                 VALUES
-                ('0', '$user_ID', '$now', '$content', '$post_title', '$excerpt', '$post_status', '$comment_status', '$ping_status', '$post_password', '$post_name')
+                ('0', '$user_ID', '$now', '$content', '$post_title', '$excerpt', '$post_status', '$comment_status', '$ping_status', '$post_password', '$post_name', '$trackback')
                 ";
         }
@@ -141 +144 @@
         
         if ('' != $HTTP_POST_VARS['save']) $location = "post.php?action=edit&post=$post_ID";
-        header("Location: $location");
+        
+        header("Location: $location");
 
         if ($post_status == 'publish') {
@@ -154 +158 @@
             }
 
-            if (!empty($HTTP_POST_VARS['trackback_url'])) {
+            // Time for trackbacks
+            $to_ping = $wpdb->get_var("SELECT to_ping FROM $tableposts WHERE ID = $post_ID");
+            $pinged = $wpdb->get_var("SELECT pinged FROM $tableposts WHERE ID = $post_ID");
+            $pinged = explode("\n", $pinged);
+            if ('' != $to_ping) {
                 if (strlen($excerpt) > 0) {
                     $the_excerpt = (strlen(strip_tags($excerpt)) > 255) ? substr(strip_tags($excerpt), 0, 252) . '...' : strip_tags($excerpt)   ;
@@ -160 +168 @@
                     $the_excerpt = (strlen(strip_tags($content)) > 255) ? substr(strip_tags($content), 0, 252) . '...' : strip_tags($content);
                 }
-                $excerpt = stripslashes($the_excerpt);
-                $trackback_urls = explode(',', $HTTP_POST_VARS['trackback_url']);
-                foreach($trackback_urls as $tb_url) {
-                    $tb_url = trim($tb_url);
-                    trackback($tb_url, stripslashes($post_title), $excerpt, $post_ID);
-                }
-            }
+                $excerpt = stripslashes($the_excerpt);
+                $to_pings = explode("\n", $to_ping);
+                foreach ($to_pings as $tb_ping) {
+                    $tb_ping = trim($tb_ping);
+                    if (!in_array($tb_ping, $pinged)) {
+                     trackback($tb_ping, stripslashes($post_title), $excerpt, $post_ID);
+                    }
+                }
+            }
+
         } // end if publish
 
@@ -196 +207 @@
             $ping_status = $postdata['ping_status'];
             $post_password = $postdata['post_password'];
+            $to_ping = $postdata['to_ping'];
+            $pinged = $postdata['pinged'];
 
             include('edit-form.php');
@@ -246 +259 @@
             $post_password = addslashes($HTTP_POST_VARS['post_password']);
             $post_name = sanitize_title($post_title);
+            $trackback = $HTTP_POST_VARS['trackback_url'];
+        // Format trackbacks
+        $trackback = preg_replace('|\s+|', '\n', $trackback);
 
         if (($user_level > 4) && (!empty($HTTP_POST_VARS['edit_date']))) {
@@ -274 +290 @@
                 ping_status = '$ping_status',
                 post_password = '$post_password',
-                post_name = '$post_name'
+                post_name = '$post_name',
+                to_ping = '$trackback'
             WHERE ID = $post_ID ");
 
@@ -302 +319 @@
             pingWeblogs($blog_ID);
             pingBlogs($blog_ID);
-
-            if ($post_pingback) {
-                pingback($content, $post_ID);
-            }
-
-            if (!empty($HTTP_POST_VARS['trackback_url'])) {
-                $excerpt = (strlen(strip_tags($content)) > 255) ? substr(strip_tags($content), 0, 252) . '...' : strip_tags($content);
-                $excerpt = stripslashes($excerpt);
-                $trackback_urls = explode(',', $HTTP_POST_VARS['trackback_url']);
-                foreach($trackback_urls as $tb_url) {
-                    $tb_url = trim($tb_url);
-                    trackback($tb_url, stripslashes($post_title), $excerpt, $post_ID);
-                }
-            }
+        } // end if moving from draft/private to published
+        if ($post_status == 'publish') {
+            // Trackback time.
+            $to_ping = trim($wpdb->get_var("SELECT to_ping FROM $tableposts WHERE ID = $post_ID"));
+            $pinged = trim($wpdb->get_var("SELECT pinged FROM $tableposts WHERE ID = $post_ID"));
+            $pinged = explode("\n", $pinged);
+            if ('' != $to_ping) {
+                if (strlen($excerpt) > 0) {
+                    $the_excerpt = (strlen(strip_tags($excerpt)) > 255) ? substr(strip_tags($excerpt), 0, 252) . '...' : strip_tags($excerpt)   ;
+                } else {
+                    $the_excerpt = (strlen(strip_tags($content)) > 255) ? substr(strip_tags($content), 0, 252) . '...' : strip_tags($content);
+                }
+                $excerpt = stripslashes($the_excerpt);
+                $to_pings = explode("\n", $to_ping);
+                foreach ($to_pings as $tb_ping) {
+                    $tb_ping = trim($tb_ping);
+                    if (!in_array($tb_ping, $pinged)) {
+                     trackback($tb_ping, stripslashes($post_title), $excerpt, $post_ID);
+                    }
+                }
+            }
         } // end if publish
+        
 
         $location = "Location: post.php";
@@ -358 +383 @@
         }
 
-        // pingWeblogs($blog_ID);
         $sendback = $HTTP_SERVER_VARS['HTTP_REFERER'];
         if (strstr($sendback, 'post.php')) $sendback = $siteurl .'/wp-admin/post.php';

trunk/wp-admin/upgrade-072-to-080.php

@@ -60 +60 @@
 $wpdb->show_errors();
 
-
+// Create ping status fields
+
+$query = "ALTER TABLE $tableposts ADD `to_ping` TEXT NOT NULL";
+maybe_add_column($tableposts, 'to_ping', $query);
+$query = "ALTER TABLE $tableposts ADD `pinged` TEXT NOT NULL";
+maybe_add_column($tableposts, 'pinged', $query);
 
 // Create category_nicename field

trunk/wp-includes/functions.php

@@ -589 +589 @@
         'comment_status' => $post->comment_status,
         'ping_status' => $post->ping_status,
-        'post_password' => $post->post_password
+        'post_password' => $post->post_password,
+        'to_ping' => $post->to_ping,
+        'pinged' => $post->pinged
     );
     return $postdata;
@@ -888 +890 @@
 
 
-// trackback - send
+// Send a Trackback
 function trackback($trackback_url, $title, $excerpt, $ID) {
-    global $siteurl, $blogfilename, $blogname;
-    global $querystring_start, $querystring_equal;
-    $title = urlencode($title);
+    global $blogname, $wpdb, $tableposts;
+    $title = urlencode(stripslashes($title));
     $excerpt = urlencode(stripslashes($excerpt));
-    $blog_name = urlencode($blogname);
-    $url = urlencode($siteurl.'/'.$blogfilename.$querystring_start.'p'.$querystring_equal.$ID);
+    $blog_name = urlencode(stripslashes($blogname));
+    $tb_url = $trackback_url;
+    $url = urlencode(get_permalink($ID));
     $query_string = "title=$title&url=$url&blog_name=$blog_name&excerpt=$excerpt";
-    if (strstr($trackback_url, '?')) {
-        $trackback_url .= "&".$query_string;;
-        $fp = @fopen($trackback_url, 'r');
-        $result = @fread($fp, 4096);
-        @fclose($fp);
-/* debug code
-        $debug_file = 'trackback.log';
-        $fp = fopen($debug_file, 'a');
-        fwrite($fp, "\n*****\nTrackback URL query:\n\n$trackback_url\n\nResponse:\n\n");
-        fwrite($fp, $result);
-        fwrite($fp, "\n\n");
-        fclose($fp);
+    $trackback_url = parse_url($trackback_url);
+    $http_request  = 'POST '.$trackback_url['path']." HTTP/1.0\r\n";
+    $http_request .= 'Host: '.$trackback_url['host']."\r\n";
+    $http_request .= 'Content-Type: application/x-www-form-urlencoded'."\r\n";
+    $http_request .= 'Content-Length: '.strlen($query_string)."\r\n";
+    $http_request .= "\r\n";
+    $http_request .= $query_string;
+    $fs = @fsockopen($trackback_url['host'], 80);
+    @fputs($fs, $http_request);
+/*
+    $debug_file = 'trackback.log';
+    $fp = fopen($debug_file, 'a');
+    fwrite($fp, "\n*****\nRequest:\n\n$http_request\n\nResponse:\n\n");
+    while(!@feof($fs)) {
+        fwrite($fp, @fgets($fs, 4096));
+    }
+    fwrite($fp, "\n\n");
+    fclose($fp);
 */
-    } else {
-        $trackback_url = parse_url($trackback_url);
-        $http_request  = 'POST '.$trackback_url['path']." HTTP/1.0\r\n";
-        $http_request .= 'Host: '.$trackback_url['host']."\r\n";
-        $http_request .= 'Content-Type: application/x-www-form-urlencoded'."\r\n";
-        $http_request .= 'Content-Length: '.strlen($query_string)."\r\n";
-        $http_request .= "\r\n";
-        $http_request .= $query_string;
-        $fs = @fsockopen($trackback_url['host'], 80);
-        @fputs($fs, $http_request);
-/* debug code
-        $debug_file = 'trackback.log';
-        $fp = fopen($debug_file, 'a');
-        fwrite($fp, "\n*****\nRequest:\n\n$http_request\n\nResponse:\n\n");
-        while(!@feof($fs)) {
-            fwrite($fp, @fgets($fs, 4096));
-        }
-        fwrite($fp, "\n\n");
-        fclose($fp);
-*/
-        @fclose($fs);
-    }
+    @fclose($fs);
+
+    $wpdb->query("UPDATE $tableposts SET pinged = CONCAT(pinged, '\n', '$tb_url') WHERE ID = $ID");
+    $wpdb->query("UPDATE $tableposts SET to_ping = REPLACE(to_ping, '$tb_url', '') WHERE ID = $ID");
     return $result;
 }

trunk/wp-trackback.php

@@ -42 +42 @@
     $comment .= "<strong>$title</strong>\n$excerpt";
 
-    $author = addslashes($blog_name);
+    $author = addslashes(stripslashes(stripslashes($blog_name)));
     $email = '';
     $original_comment = $comment;