Removed old references to 'HTTP/Request.php' in pingback and Links pl…

…ugin (bug #755)
Geeklog-Core · Feb 3, 2017 · 9ac7007 · 9ac7007
1 parent 6dff2c8
commit 9ac7007
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/plugins/links/functions.inc b/plugins/links/functions.inc
@@ -1312,29 +1312,30 @@ function plugin_getListField_categories($fieldname, $fieldvalue, $A, $icon_arr)
     return $retval;
 }
 
-
+/**
+ * Check if the given URL exists
+ *
+ * @param  string $url
+ * @return string
+ */
 function links_validateUrl($url)
 {
     global $LANG_LINKS_STATUS;
 
-    require_once 'HTTP/Request.php';
+    $req = new HTTP_Request2($url, HTTP_Request2::METHOD_HEAD);
+    $req->setHeader('User-Agent', 'Geeklog/' . VERSION);
 
-    $retval = '';
-
-    $req = new HTTP_Request($url);
-    $req->setMethod(HTTP_REQUEST_METHOD_HEAD);
-    $req->addHeader('User-Agent', 'Geeklog/' . VERSION);
+    try {
+        $response = $req->send();
+        $status_code = $response->getStatus();
 
-    $response = $req->sendRequest();
-    if (PEAR::isError($response)) {
-        $retval = $response->getMessage();
-    } else {
-        $status_code = $req->getResponseCode();
         if (isset($LANG_LINKS_STATUS[$status_code])) {
-            $retval = $status_code . ": " . $LANG_LINKS_STATUS[$status_code];
+            $retval = $status_code . ': ' . $LANG_LINKS_STATUS[$status_code];
         } else {
             $retval = $LANG_LINKS_STATUS[999];
         }
+    } catch (HTTP_Request2_Exception $e) {
+        $retval = $e->getMessage();
     }
 
     return $retval;

diff --git a/public_html/pingback.php b/public_html/pingback.php
@@ -64,8 +64,6 @@ function PNB_handlePingback($id, $type, $url, $oururl)
 {
     global $_CONF, $_TABLES, $PNB_ERROR;
 
-    require_once 'HTTP/Request.php';
-
     if (!isset($_CONF['check_trackback_link'])) {
         $_CONF['check_trackback_link'] = 2;
     }