Check for firewalls, using Google as the dipstick.

Attempt CURL download if HTTP_Request fails.
Report IP so repository for site admins to open outgoing connections .
Language constants for new checks and firewall notice.

diff --git a/plugins/serendipity_event_spartacus/lang_en.inc.php b/plugins/serendipity_event_spartacus/lang_en.inc.php
index cb6ababdc510ccb8ebf4ed32f6e9ce5c22010e09..26beb1867541d6784add0851264f045fdf20e002 100644 (file)
--- a/plugins/serendipity_event_spartacus/lang_en.inc.php
+++ b/plugins/serendipity_event_spartacus/lang_en.inc.php
@@ -14,6 +14,12 @@
 @define('PLUGIN_EVENT_SPARTACUS_FETCHED_BYTES_URL', 'Fetched %s bytes from the URL above. Saving file as %s...');
 @define('PLUGIN_EVENT_SPARTACUS_FETCHED_BYTES_CACHE', 'Fetched %s bytes from already existing file on your server. Saving file as %s...');
 @define('PLUGIN_EVENT_SPARTACUS_FETCHED_DONE', 'Data successfully fetched.');
+@define('PLUGIN_EVENT_SPARTACUS_REPOSITORY_ERROR', '<br />(The repository returned error code %s.)<br />');
+@define('PLUGIN_EVENT_SPARTACUS_HEALTHCHECK', '<P>Unable to retrieve data from SPARTACUS repository.  Checking for repository availability.</P>');
+@define('PLUGIN_EVENT_SPARTACUS_HEALTHERROR', '<P>The SPARTACUS health site returned an error (HTTP code %s).  This indicates that the SPARTACUS health site is down.  Please try again later.</P>');
+@define('PLUGIN_EVENT_SPARTACUS_HEALTHLINK', '<P><a target="_blank" href="%s">Click here to view the SPARTACUS health site</a> and determine if it is responding.</P>');
+@define('PLUGIN_EVENT_SPARTACUS_HEALTHBLOCKED', '<P>SPARTACUS attempted to connect to Google and failed (error %d: %s).<br />Your server is blocking outgoing connections.  SPARTACUS will not function because it cannot contact the SPARTACUS repository.  <b>Please contact your website provider and ask them to allow outgoing connections to web sites.</b></P><P>Plugins can still be installed from your local directories.  Simply download the plugin from <a href="http://spartacus.s9y.org">the SPARTACUS web repository</a>, unzip it, and upload the files to your Serendipity plugin directory.</P>');
+@define('PLUGIN_EVENT_SPARTACUS_HEALTHDOWN', '<P>SPARTACUS can contact Google, but cannot contact the SPARATACUS repository.  It is possible that your server is blocking some outgoing connections, or that the SPARTACUS health site is down.  Please contact your website provider to ensure that outgoing connections are allowed.  <b>You will not be able to use SPARTACUS unless your server can contact the SPARTACUS repository.</b></P>');
 @define('PLUGIN_EVENT_SPARTACUS_MIRROR_XML', 'File/Mirror location (XML metadata)');
 @define('PLUGIN_EVENT_SPARTACUS_MIRROR_FILES', 'File/Mirror location (files)');
 @define('PLUGIN_EVENT_SPARTACUS_MIRROR_DESC', 'Choose a download location. Do NOT change this value unless you know what you are doing and if servers get oudated. This option is available mainly for forward compatibility.');

diff --git a/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php b/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php
index 4872deb0bad8ea630fccb04b1561afb509b75e0c..76629cc020feaefcdee74dd50ce5cfe24be26fc9 100644 (file)
--- a/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php
+++ b/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php
@@ -256,6 +256,14 @@ class serendipity_event_spartacus extends serendipity_event
         // Fix double URL strings.
         $url = str_replace('http:/', 'http://', str_replace('//', '/', $url));
 
+        // --JAM: Get the URL's IP in the most error-free way possible
+        $url_parts = @parse_url($url);
+        $url_hostname = 'localhost';
+        if (is_array($url_parts)) {
+            $url_hostname = $url_parts['host'];
+        }
+        $url_ip = gethostbyname($url_hostname);
+
         printf(PLUGIN_EVENT_SPARTACUS_FETCHING, '<a href="' . $url . '">' . basename($url) . '</a>');
         echo '<br />';
 
@@ -271,8 +279,61 @@ class serendipity_event_spartacus extends serendipity_event
             $req = &new HTTP_Request($url, $options);
 
             if (PEAR::isError($req->sendRequest()) || $req->getResponseCode() != '200') {
-                printf(PLUGIN_EVENT_SPARTACUS_FETCHERROR, $url);
-                echo '<br />';
+                $resolved_url = $url . ' (at IP ' . $url_ip . ')';
+                printf(PLUGIN_EVENT_SPARTACUS_FETCHERROR, $resolved_url);
+                //--JAM: START FIREWALL DETECTION
+                if ($req->getResponseCode()) {
+                    printf(PLUGIN_EVENT_SPARTACUS_REPOSITORY_ERROR, $req->getResponseCode());
+                }
+                $check_health = true;
+                if (function_exists('curl_init')) {
+                    echo PLUGIN_EVENT_SPARTACUS_TRYCURL . "\n";
+                    $curl_handle=curl_init();
+                    curl_setopt($curl_handle, CURLOPT_URL, $url);
+                    curl_setopt($curl_handle, CURLOPT_HEADER, 0);
+                    $data = curl_exec($curl_handle);
+                    curl_close($curl_handle);
+                    if ($curl_result) {
+                        $check_health = false;
+                    } else {
+                        echo PLUGIN_EVENT_SPARTACUS_CURLFAIL . "\n";
+                    }
+                }
+            }
+            if ($check_health) {
+                echo PLUGIN_EVENT_SPARTACUS_HEALTHCHECK . "\n";
+                /*--JAM: Useful for later, when we have a health monitor for SPARTACUS
+                $propbag = new serendipity_property_bag;
+                $this->introspect($propbag);
+                $health_url = 'http://spartacus.s9y.org/spartacus_health.php?version=' . $propbag->get('version');
+                */
+                $health_url = $url;
+                $matches = array();
+                preg_match('#http://[^/]*/#', $url, $matches);
+                if ($matches[0]) {
+                    $health_url = $matches[0];
+                }
+                $health_options = $options;
+                serendipity_plugin_api::hook_event('backend_http_request', $health_options, 'spartacus_health');
+                $health_req = &new HTTP_Request($health_url, $health_options);
+                $health_result = $health_req->sendRequest();
+                if (PEAR::isError($health_result))
+                {
+                    $fp = @fsockopen('www.google.com', 80, $errno, $errstr);
+                    if (!$fp) {
+                        printf(PLUGIN_EVENT_SPARTACUS_HEALTHBLOCKED, $errno, $errstr);
+                    } else {
+                        echo PLUGIN_EVENT_SPARTACUS_HEALTHDOWN;
+                        printf(PLUGIN_EVENT_SPARTACUS_HEALTHLINK, $health_url);
+                        fclose($fp);
+                    }
+                } else if ($health_req->getResponseCode() != '200') {
+                    printf(PLUGIN_EVENT_SPARTACUS_HEALTHERROR, $health_req->getResponseCode());
+                    printf(PLUGIN_EVENT_SPARTACUS_HEALTHLINK, $health_url);
+                } else {
+                    //--JAM: Parse response and display it.
+                }
+                //--JAM: END FIREWALL DETECTION
                 if (file_exists($target) && filesize($target) > 0) {
                     $data = file_get_contents($target);
                     printf(PLUGIN_EVENT_SPARTACUS_FETCHED_BYTES_CACHE, strlen($data), $target);
@@ -280,7 +341,9 @@ class serendipity_event_spartacus extends serendipity_event
                 }
             } else {
                 // Fetch file
-                $data = $req->getResponseBody();
+                if (!$data) {
+                    $data = $req->getResponseBody();
+                }
                 printf(PLUGIN_EVENT_SPARTACUS_FETCHED_BYTES_URL, strlen($data), $target);
                 echo '<br />';
                 $tdir = dirname($target);