diff --git a/docs/NEWS b/docs/NEWS index dd4d5032..8c7c1d60 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -1,5 +1,11 @@ # $Id$ +Version 1.3 () +------------------------------------------------------------------------ + + * Full pingback support, fallback trackback method for WordPress + blogs. Thanks to brockha.us! + Version 1.2 () ------------------------------------------------------------------------ diff --git a/include/functions_trackbacks.inc.php b/include/functions_trackbacks.inc.php index 836cbae7..d55d2208 100644 --- a/include/functions_trackbacks.inc.php +++ b/include/functions_trackbacks.inc.php @@ -34,6 +34,21 @@ function serendipity_trackback_is_success($resp) { return true; } +/** + * Check a HTTP response if it is a valid XML pingback response + * + * @access public + * @param string HTTP Response string + * @return mixed Boolean or error message + */ +function serendipity_pingback_is_success($resp) { + // This is very rudimentary, but the fault is printed later, so what.. + if (preg_match('@@', $resp, $matches)) { + return false; + } + return true; +} + /** * Perform a HTTP query for autodiscovering a pingback URL * @@ -49,6 +64,7 @@ global $serendipity; } elseif (preg_match('@@i', $body, $matches)) { $pingback = $matches[1]; } else { + echo '
• ' . sprintf(PINGBACK_FAILED, PINGBACK_NOT_FOUND) . '
'; return; } @@ -68,8 +84,19 @@ global $serendipity; "; - _serendipity_send($pingback, $query); - return; + + echo '
• ' . sprintf(PINGBACK_SENDING, htmlspecialchars($pingback)) . '
'; + flush(); + + $response = _serendipity_send($pingback, $query, 'text/html'); + $success = serendipity_pingback_is_success($response); + + if ($success == true) { + echo '
• ' . 'PINGBACK: ' . PINGBACK_SENT .'
'; + } else { + echo '
• ' . sprintf(PINGBACK_FAILED, $response) . '
'; + } + return $success; } /** @@ -80,7 +107,7 @@ global $serendipity; * @param string The XML data with the trackback contents * @return string Reponse */ -function _serendipity_send($loc, $data) { +function _serendipity_send($loc, $data, $contenttype = null) { global $serendipity; $target = parse_url($loc); @@ -99,6 +126,10 @@ function _serendipity_send($loc, $data) { serendipity_request_start(); $req = &new HTTP_Request($uri, $options); + if (isset($contenttype)){ + $req->addHeader('Content-Type', $contenttype); + } + $req->addRawPostData($data, true); $res = $req->sendRequest(); @@ -127,14 +158,26 @@ function _serendipity_send($loc, $data) { * @return string Response */ function serendipity_trackback_autodiscover($res, $loc, $url, $author, $title, $text, $loc2 = '') { + $is_wp = false; + $wp_check = false; + + if (preg_match('@((' . preg_quote($loc, '@') . '|' . preg_quote($loc2, '@') . ')/?trackback/)@i', $res, $wp_loc)) { + // We found a WP-blog that may not advertise RDF-Tags! + $is_wp = true; + } + if (!preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*["\'](https?:[^"\']+)["\']@i', $res, $matches)) { $matches = array(); serendipity_plugin_api::hook_event('backend_trackback_check', $matches, $loc); // Plugins may say that a URI is valid, in situations where a blog has no valid RDF metadata if (empty($matches[2])) { - echo '
• ' . sprintf(TRACKBACK_FAILED, TRACKBACK_NOT_FOUND) . '
'; - return false; + if ($is_wp) { + $wp_check = true; + } else { + echo '
• ' . sprintf(TRACKBACK_FAILED, TRACKBACK_NOT_FOUND) . '
'; + return false; + } } } @@ -142,11 +185,20 @@ function serendipity_trackback_autodiscover($res, $loc, $url, $author, $title, $ if (preg_match('@dc:identifier\s*=\s*["\'](https?:[^\'"]+)["\']@i', $res, $test)) { if ($loc != $test[1] && $loc2 != $test[1]) { - echo '
• ' . sprintf(TRACKBACK_FAILED, TRACKBACK_URI_MISMATCH) . '
'; - return false; + if ($is_wp) { + $wp_check = true; + } else { + echo '
• ' . sprintf(TRACKBACK_FAILED, TRACKBACK_URI_MISMATCH) . '
'; + return false; + } } } + // If $wp_check is set it means no RDF metadata was found, and we simply try the /trackback/ url. + if ($wp_check) { + $trackURI = $wp_loc[0]; + } + $data = 'url=' . rawurlencode($url) . '&title=' . rawurlencode($title) . '&blog_name=' . rawurlencode($author) @@ -227,8 +279,10 @@ global $serendipity; serendipity_request_end(); if (strlen($fContent) != 0) { - serendipity_trackback_autodiscover($fContent, $parsed_loc, $url, $author, $title, $text, $loc); - serendipity_pingback_autodiscover($loc, $fContent); + $trackback_result = serendipity_trackback_autodiscover($fContent, $parsed_loc, $url, $author, $title, $text, $loc); + if ($trackback_result == false) { + serendipity_pingback_autodiscover($loc, $fContent); + } } else { echo '
• ' . TRACKBACK_NO_DATA . '
'; } @@ -428,7 +482,7 @@ function serendipity_handle_references($id, $author, $title, $text, $dry_run = f if ($dry_run) { // Store the current list of references. We might need to restore them for later user. $old_references = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}references WHERE (type = '' OR type IS NULL) AND entry_id = " . (int)$id, false, 'assoc'); - + if ($debug && is_string($old_references)) { echo $old_references . "
\n"; } @@ -545,7 +599,7 @@ function serendipity_handle_references($id, $author, $title, $text, $dry_run = f for ($i = 0; $i < $j; ++$i) { $i_link = serendipity_db_escape_string(strip_tags($names[$i])); $i_location = serendipity_db_escape_string($locations[$i]); - + // No link with same description AND same text should be inserted. if (isset($duplicate_check[$i_location . $i_link])) { continue; @@ -575,13 +629,13 @@ function serendipity_handle_references($id, $author, $title, $text, $dry_run = f ); $duplicate_check[$i_location . $i_link] = true; } - + if ($debug) { echo "Current lookup for {$locations[$i]}{$names[$i]} is 
" . print_r($current_references[$locations[$i] . $names[$i]], true) . "

\n"; echo $query . "
\n"; } } - + if ($debug) { echo "Old/Saved locations: 
" . print_r($old_references, true) . "

\n"; } diff --git a/lang/UTF-8/plugin_lang.php b/lang/UTF-8/plugin_lang.php index 1bd825fb..0a145649 100644 --- a/lang/UTF-8/plugin_lang.php +++ b/lang/UTF-8/plugin_lang.php @@ -94,3 +94,7 @@ foreach($const['missing'] AS $file => $constants) { @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/UTF-8/serendipity_lang_bg.inc.php b/lang/UTF-8/serendipity_lang_bg.inc.php index 36d66e01..9d96546a 100644 --- a/lang/UTF-8/serendipity_lang_bg.inc.php +++ b/lang/UTF-8/serendipity_lang_bg.inc.php @@ -881,3 +881,7 @@ $i18n_filename_to = array('-', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D @define('USERCONF_CREATE_DESC', 'Ако е позволено, потребителят няма да има никакви възможности за редактиране или създаване на каквото и да било в блога. Когато влезе в административната страница, потребителят няма да може да прави нищо друго, освен да излезе или да види своята персонална конфигурация.'); @define('CATEGORY_HIDE_SUB', 'Скриване на постингите, направени в подкатегории?'); @define('CATEGORY_HIDE_SUB_DESC', 'По подразбиране когато разглеждате катогерия, статиите от подкатегориите също се показват. Ако тази опция е включена, само статиите от текущо избраната категория ще бъдат показвани.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/UTF-8/serendipity_lang_cn.inc.php b/lang/UTF-8/serendipity_lang_cn.inc.php index ab0529e2..a76fc2f2 100644 --- a/lang/UTF-8/serendipity_lang_cn.inc.php +++ b/lang/UTF-8/serendipity_lang_cn.inc.php @@ -892,3 +892,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/UTF-8/serendipity_lang_cs.inc.php b/lang/UTF-8/serendipity_lang_cs.inc.php index 8e10b663..e34415d2 100644 --- a/lang/UTF-8/serendipity_lang_cs.inc.php +++ b/lang/UTF-8/serendipity_lang_cs.inc.php @@ -900,3 +900,7 @@ $i18n_filename_to = array ( @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/UTF-8/serendipity_lang_cz.inc.php b/lang/UTF-8/serendipity_lang_cz.inc.php index 2b8ba1e7..f3535659 100644 --- a/lang/UTF-8/serendipity_lang_cz.inc.php +++ b/lang/UTF-8/serendipity_lang_cz.inc.php @@ -900,3 +900,7 @@ $i18n_filename_to = array ( @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/UTF-8/serendipity_lang_da.inc.php b/lang/UTF-8/serendipity_lang_da.inc.php index c01b752d..a69a3dbf 100644 --- a/lang/UTF-8/serendipity_lang_da.inc.php +++ b/lang/UTF-8/serendipity_lang_da.inc.php @@ -889,3 +889,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/UTF-8/serendipity_lang_de.inc.php b/lang/UTF-8/serendipity_lang_de.inc.php index bf230f0e..35910803 100644 --- a/lang/UTF-8/serendipity_lang_de.inc.php +++ b/lang/UTF-8/serendipity_lang_de.inc.php @@ -1,4 +1,4 @@ - $constants) { @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_bg.inc.php b/lang/serendipity_lang_bg.inc.php index 1ce5b3eb..5a174da7 100644 --- a/lang/serendipity_lang_bg.inc.php +++ b/lang/serendipity_lang_bg.inc.php @@ -881,3 +881,7 @@ $i18n_filename_to = array('-', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D @define('USERCONF_CREATE_DESC', ' , . , , .'); @define('CATEGORY_HIDE_SUB', ' , ?'); @define('CATEGORY_HIDE_SUB_DESC', ' , . , .'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_cn.inc.php b/lang/serendipity_lang_cn.inc.php index cd75f89c..3b6f1225 100644 --- a/lang/serendipity_lang_cn.inc.php +++ b/lang/serendipity_lang_cn.inc.php @@ -892,3 +892,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_cs.inc.php b/lang/serendipity_lang_cs.inc.php index 25975b27..4bf25d9e 100644 --- a/lang/serendipity_lang_cs.inc.php +++ b/lang/serendipity_lang_cs.inc.php @@ -900,3 +900,7 @@ $i18n_filename_to = array ( @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_cz.inc.php b/lang/serendipity_lang_cz.inc.php index beb224af..f03e1ee0 100644 --- a/lang/serendipity_lang_cz.inc.php +++ b/lang/serendipity_lang_cz.inc.php @@ -900,3 +900,7 @@ $i18n_filename_to = array ( @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_da.inc.php b/lang/serendipity_lang_da.inc.php index 61ef1e47..4bca402c 100644 --- a/lang/serendipity_lang_da.inc.php +++ b/lang/serendipity_lang_da.inc.php @@ -889,3 +889,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_de.inc.php b/lang/serendipity_lang_de.inc.php index 03ac2cb8..7dfb3f58 100644 --- a/lang/serendipity_lang_de.inc.php +++ b/lang/serendipity_lang_de.inc.php @@ -887,3 +887,7 @@ @define('USERCONF_CREATE_DESC', 'Wenn diese Option aktiviert ist, wird dieser Benutzer keine Mglichkeit mehr haben Eintrge anzulegen oder sonstige Aktionen auszufhren. Wenn er in die Administrations-Oberflche kommt, wird er nichts anderes tun knnen als seine Persnlichen Einstellungen zu ndern und sich auszuloggen.'); @define('CATEGORY_HIDE_SUB', 'Artikel von Unterkategorien verstecken?'); @define('CATEGORY_HIDE_SUB_DESC', 'Standardmig werden bei der Ansicht einer Kategorie im Frontend alle Artikel der gewhlten Kategorie und aller Unterkategorien angezeigt. Wenn diese Option aktiviert wird, werden Artikel von Unterkategorien nicht angezeigt.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_en.inc.php b/lang/serendipity_lang_en.inc.php index c8f060ea..6fdf3a34 100644 --- a/lang/serendipity_lang_en.inc.php +++ b/lang/serendipity_lang_en.inc.php @@ -888,3 +888,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_es.inc.php b/lang/serendipity_lang_es.inc.php index c5d2bda7..32aec50b 100644 --- a/lang/serendipity_lang_es.inc.php +++ b/lang/serendipity_lang_es.inc.php @@ -908,3 +908,7 @@ Melvin TODO [20060128]: What spanish word do we use for "referrers" ?? @define('USERCONF_CREATE_DESC', 'Si activas esta opcin el usuario ya no podr crear o editar entradas en el blog. Cuando l vuelva a ingresar al sistema no podr hacer nada ms que desconectarse y ver su configuracin personal.'); @define('CATEGORY_HIDE_SUB', 'Ocultar las entradas realizadas en sub-categoras?'); @define('CATEGORY_HIDE_SUB_DESC', 'Por defecto, cuando se navega una categora tambin se muestran las entradas hechas en cualquiera de sus sub-categoras. Si activas esta opcin, se mostrn unicamente aquellas entradas que pertenezcan a la categora seleccionada.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_fa.inc.php b/lang/serendipity_lang_fa.inc.php index 8281ef8a..4004c9be 100644 --- a/lang/serendipity_lang_fa.inc.php +++ b/lang/serendipity_lang_fa.inc.php @@ -892,3 +892,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_fi.inc.php b/lang/serendipity_lang_fi.inc.php index 31fb3b1e..93005318 100644 --- a/lang/serendipity_lang_fi.inc.php +++ b/lang/serendipity_lang_fi.inc.php @@ -890,3 +890,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_fr.inc.php b/lang/serendipity_lang_fr.inc.php index 42fca890..7213ddb0 100644 --- a/lang/serendipity_lang_fr.inc.php +++ b/lang/serendipity_lang_fr.inc.php @@ -897,3 +897,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_hu.inc.php b/lang/serendipity_lang_hu.inc.php index f1c507d8..0b642e10 100644 --- a/lang/serendipity_lang_hu.inc.php +++ b/lang/serendipity_lang_hu.inc.php @@ -891,3 +891,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_is.inc.php b/lang/serendipity_lang_is.inc.php index dd9f4806..e25cc21e 100644 --- a/lang/serendipity_lang_is.inc.php +++ b/lang/serendipity_lang_is.inc.php @@ -891,3 +891,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_it.inc.php b/lang/serendipity_lang_it.inc.php index db57c3b2..8789bdd5 100644 --- a/lang/serendipity_lang_it.inc.php +++ b/lang/serendipity_lang_it.inc.php @@ -894,3 +894,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_ja.inc.php b/lang/serendipity_lang_ja.inc.php index b1eb1bac..11363109 100644 --- a/lang/serendipity_lang_ja.inc.php +++ b/lang/serendipity_lang_ja.inc.php @@ -894,3 +894,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_ko.inc.php b/lang/serendipity_lang_ko.inc.php index 27a0abed..0ad69215 100644 --- a/lang/serendipity_lang_ko.inc.php +++ b/lang/serendipity_lang_ko.inc.php @@ -893,3 +893,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_nl.inc.php b/lang/serendipity_lang_nl.inc.php index 3ac3130e..0bb0a7c4 100644 --- a/lang/serendipity_lang_nl.inc.php +++ b/lang/serendipity_lang_nl.inc.php @@ -892,3 +892,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_no.inc.php b/lang/serendipity_lang_no.inc.php index fa8b2262..dde187a4 100644 --- a/lang/serendipity_lang_no.inc.php +++ b/lang/serendipity_lang_no.inc.php @@ -893,3 +893,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_pl.inc.php b/lang/serendipity_lang_pl.inc.php index 58f2ab6b..4866f20d 100644 --- a/lang/serendipity_lang_pl.inc.php +++ b/lang/serendipity_lang_pl.inc.php @@ -889,3 +889,7 @@ $i18n_filename_to = array('_', 'a', 'A', 'a', 'A', 'b', 'B', 'c', 'C', 'c', 'C @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_pt.inc.php b/lang/serendipity_lang_pt.inc.php index c47e425a..6d6a5e91 100644 --- a/lang/serendipity_lang_pt.inc.php +++ b/lang/serendipity_lang_pt.inc.php @@ -895,3 +895,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_pt_PT.inc.php b/lang/serendipity_lang_pt_PT.inc.php index fd379786..cc99c457 100644 --- a/lang/serendipity_lang_pt_PT.inc.php +++ b/lang/serendipity_lang_pt_PT.inc.php @@ -902,3 +902,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_ro.inc.php b/lang/serendipity_lang_ro.inc.php index 4d202be8..f43168f9 100644 --- a/lang/serendipity_lang_ro.inc.php +++ b/lang/serendipity_lang_ro.inc.php @@ -891,3 +891,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_ru.inc.php b/lang/serendipity_lang_ru.inc.php index fc12f1d8..62287c47 100644 --- a/lang/serendipity_lang_ru.inc.php +++ b/lang/serendipity_lang_ru.inc.php @@ -894,3 +894,7 @@ $i18n_filename_to = array('_', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_sa.inc.php b/lang/serendipity_lang_sa.inc.php index 700723a8..52b05d41 100644 --- a/lang/serendipity_lang_sa.inc.php +++ b/lang/serendipity_lang_sa.inc.php @@ -809,3 +809,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_se.inc.php b/lang/serendipity_lang_se.inc.php index 5aa8fb80..ac655f09 100644 --- a/lang/serendipity_lang_se.inc.php +++ b/lang/serendipity_lang_se.inc.php @@ -890,3 +890,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_ta.inc.php b/lang/serendipity_lang_ta.inc.php index 2ac78516..5cdc79bc 100644 --- a/lang/serendipity_lang_ta.inc.php +++ b/lang/serendipity_lang_ta.inc.php @@ -890,3 +890,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_tn.inc.php b/lang/serendipity_lang_tn.inc.php index 74884c0c..d8823fd6 100644 --- a/lang/serendipity_lang_tn.inc.php +++ b/lang/serendipity_lang_tn.inc.php @@ -894,3 +894,7 @@ $i18n_unknown = 'tw'; @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_tr.inc.php b/lang/serendipity_lang_tr.inc.php index c8e248a5..38bb63be 100644 --- a/lang/serendipity_lang_tr.inc.php +++ b/lang/serendipity_lang_tr.inc.php @@ -894,3 +894,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_tw.inc.php b/lang/serendipity_lang_tw.inc.php index 67765aaa..478c1baf 100644 --- a/lang/serendipity_lang_tw.inc.php +++ b/lang/serendipity_lang_tw.inc.php @@ -894,3 +894,7 @@ $i18n_unknown = 'tw'; @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/lang/serendipity_lang_zh.inc.php b/lang/serendipity_lang_zh.inc.php index 0d26cd72..eb65adf6 100644 --- a/lang/serendipity_lang_zh.inc.php +++ b/lang/serendipity_lang_zh.inc.php @@ -891,3 +891,7 @@ @define('USERCONF_CREATE_DESC', 'If selected, the user will not have any editing or creation possibilities on the blog anymore. When logging in to the backend, he cannot do anything else apart from logging out and viewing his personal configuration.'); @define('CATEGORY_HIDE_SUB', 'Hide postings made to sub-categories?'); @define('CATEGORY_HIDE_SUB_DESC', 'By default, when you browse a category also entries of any subcategory are displayed. If this option is turned on, only postings of the currently selected category are displayed.'); +@define('PINGBACK_SENDING', 'Sending pingback to URI %s...'); +@define('PINGBACK_SENT', 'Pingback successful'); +@define('PINGBACK_FAILED', 'Pingback failed: %s'); +@define('PINGBACK_NOT_FOUND', 'No pingback-URI found.'); diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php index 69ad3b9f..c41309ad 100644 --- a/serendipity_config.inc.php +++ b/serendipity_config.inc.php @@ -42,7 +42,7 @@ if (defined('USE_MEMSNAP')) { } // The version string -$serendipity['version'] = '1.2-beta3'; +$serendipity['version'] = '1.3-alpha1'; // Setting this to 'false' will enable debugging output. All alpa/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'. $serendipity['production'] = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true);