Changeset 2014:d0613b4b66d5

Timestamp:

09/22/13 18:04:25 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Should fixes #1709

File:

• admin/blog_pref.php (modified) (1 diff)

admin/blog_pref.php

@@ -326 +326 @@
           form::combo('url_scan',$url_scan_combo,$blog_settings->system->url_scan).'</p>';
           
-          # Test URL of blog by testing it's ATOM feed
-          $file = $blog_url.$core->url->getURLFor('feed','atom');
-          $path = '';
-          $status = '404';
-          $content = '';
-          $client = netHttp::initClient($file,$path);
-          if ($client !== false) {
-               $client->setTimeout(4);
-               $client->setUserAgent($_SERVER['HTTP_USER_AGENT']);
-               $client->get($path);
-               $status = $client->getStatus();
-               $content = $client->getContent();
-          }
-          if ($status != '200') {
-               // Might be 404 (URL not found), 670 (blog not online), ...
-               echo
-               '<p class="form-note warn">'.
-               sprintf(__('The URL of blog or the URL scan method might not be well set (<code>%s</code> return a <strong>%s</strong> status).'),
-                         $file,$status).
-               '</p>';
-          } else {
-               if (substr($content,0,6) != '<?xml ') {
-                    // Not well formed XML feed
+          try
+          {
+               # Test URL of blog by testing it's ATOM feed
+               $file = $blog_url.$core->url->getURLFor('feed','atom');
+               $path = '';
+               $status = '404';
+               $content = '';
+
+               $client = netHttp::initClient($file,$path);
+               if ($client !== false) {
+                    $client->setTimeout(4);
+                    $client->setUserAgent($_SERVER['HTTP_USER_AGENT']);
+                    $client->get($path);
+                    $status = $client->getStatus();
+                    $content = $client->getContent();
+               }
+               if ($status != '200') {
+                    // Might be 404 (URL not found), 670 (blog not online), ...
                     echo
                     '<p class="form-note warn">'.
-                    sprintf(__('The URL of blog or the URL scan method might not be well set (<code>%s</code> does not return an ATOM feed).'),
-                              $file).
+                    sprintf(__('The URL of blog or the URL scan method might not be well set (<code>%s</code> return a <strong>%s</strong> status).'),
+                              $file,$status).
                     '</p>';
+               } else {
+                    if (substr($content,0,6) != '<?xml ') {
+                         // Not well formed XML feed
+                         echo
+                         '<p class="form-note warn">'.
+                         sprintf(__('The URL of blog or the URL scan method might not be well set (<code>%s</code> does not return an ATOM feed).'),
+                                   $file).
+                         '</p>';
+                    }
                }
           }
-
+          catch (Exception $e)
+          {
+               $core->error->add($e->getMessage());
+          }
           echo
           '<p><label for="blog_status">'.__('Blog status:').'</label>'.