mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Correct patch from brockhaus, thanks a lot

Browse Source
This commit is contained in:
Garvin Hicking 2007-07-08 18:10:33 +00:00
parent c341f85b09
commit 8be9f5438d
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/functions_trackbacks.inc.php
View File

@ -53,22 +53,30 @@ function serendipity_pingback_is_success($resp) {
* Perform a HTTP query for autodiscovering a pingback URL * Perform a HTTP query for autodiscovering a pingback URL
* *
* @access public * @access public
* @param string (deprecated) The URL to try autodiscovery * @param string The URL to try autodiscovery
* @param string The response of the original URL * @param string The HTML of the source URL
* @param string The URL of our blog article
* @return * @return
*/ */
function serendipity_pingback_autodiscover($loc, $body) { function serendipity_pingback_autodiscover($loc, $body, $url=null) {
global $serendipity; global $serendipity;
// This is the old way, sending pingbacks, for downward compatibility.
// But this is wrong, as it does link from the main blog URL instead of the article URL
if (!isset($url)) {
$url = $serendipity['baseURL'];
}
if (!empty($_SERVER['X-PINGBACK'])) { if (!empty($_SERVER['X-PINGBACK'])) {
$pingback = $_SERVER['X-PINGBACK']; $pingback = $_SERVER['X-PINGBACK'];
} elseif (preg_match('@<link rel="pingback" href="([^"]+)" ?/?>@i', $body, $matches)) { } elseif (preg_match('@<link rel="pingback" href="([^"]+)" ?/?>@i', $body, $matches)) {
$pingback = $matches[1]; $pingback = $matches[1];
} else { } else {
echo '<div>&#8226; ' . sprintf(PINGBACK_FAILED, PINGBACK_NOT_FOUND) . '</div>'; echo '<div>&#8226; ' . sprintf(PINGBACK_FAILED, PINGBACK_NOT_FOUND) . '</div>';
return; return false;
} }
// xml-rpc hack // xml-rpc pingback call
$query = " $query = "
<?xml version=\"1.0\"?> <?xml version=\"1.0\"?>
<methodCall> <methodCall>
@ -76,7 +84,7 @@ global $serendipity;
<params> <params>
<param> <param>
<name>sourceURI</name> <name>sourceURI</name>
<value><string>{$serendipity['baseURL']}</string></value> <value><string>$url</string></value>
</param> </param>
<param> <param>
<name>targetURI</name> <name>targetURI</name>
@ -87,16 +95,15 @@ global $serendipity;
echo '<div>&#8226; ' . sprintf(PINGBACK_SENDING, htmlspecialchars($pingback)) . '</div>'; echo '<div>&#8226; ' . sprintf(PINGBACK_SENDING, htmlspecialchars($pingback)) . '</div>';
flush(); flush();
$response = _serendipity_send($pingback, $query, 'text/html'); $response = _serendipity_send($pingback, $query, 'text/html');
$success = serendipity_pingback_is_success($response); $success = serendipity_pingback_is_success($response);
if ($success == true) { if ($success == true) {
echo '<div>&#8226; ' . 'PINGBACK: ' . PINGBACK_SENT .'</div>'; echo '<div>&#8226; ' . PINGBACK_SENT .'</div>';
} else { } else {
echo '<div>&#8226; ' . sprintf(PINGBACK_FAILED, $response) . '</div>'; echo '<div>&#8226; ' . sprintf(PINGBACK_FAILED, $response) . '</div>';
} }
return $success; return $success;
} }
/** /**
@ -281,7 +288,7 @@ global $serendipity;
if (strlen($fContent) != 0) { if (strlen($fContent) != 0) {
$trackback_result = serendipity_trackback_autodiscover($fContent, $parsed_loc, $url, $author, $title, $text, $loc); $trackback_result = serendipity_trackback_autodiscover($fContent, $parsed_loc, $url, $author, $title, $text, $loc);
if ($trackback_result == false) { if ($trackback_result == false) {
serendipity_pingback_autodiscover($loc, $fContent); serendipity_pingback_autodiscover($parsed_loc, $fContent, $url);
} }
} else { } else {
echo '<div>&#8226; ' . TRACKBACK_NO_DATA . '</div>'; echo '<div>&#8226; ' . TRACKBACK_NO_DATA . '</div>';