From 1cda22292528a29afbda4a0d6cb867f4c4197476 Mon Sep 17 00:00:00 2001 From: Mitsukarenai Date: Sat, 13 Jul 2013 18:13:07 +0200 Subject: [PATCH] =?UTF-8?q?Revert=20"d=C3=A9sactivation=20autoblog=20(test?= =?UTF-8?q?)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7030352d2466eb7ea1d9ea18a91a839dc0efbddb. --- autoblogs/autoblog.php | 23 ++++++++++------------- index.php | 2 -- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/autoblogs/autoblog.php b/autoblogs/autoblog.php index 5a7895e..a2aff27 100644 --- a/autoblogs/autoblog.php +++ b/autoblogs/autoblog.php @@ -350,19 +350,16 @@ class VroumVroum_Blog { if (!$this->mustUpdate()) return false; - if(isset($this->config->off)) { - throw new VroumVroum_Feed_Exception('This autoblog has been turned off'); - } - else { - try { - $body = file_get_contents($this->config->feed_url, false, $this->_getStreamContext()); - } - catch (ErrorException $e) - { - $this->log_update(false, $e->getMessage() . "\n\n" . (!empty($http_response_header) ? implode("\n", $http_response_header) : '')); - throw new VroumVroum_Feed_Exception("Can't retrieve feed: ".$e->getMessage()); - } - } + + try { + $body = file_get_contents($this->config->feed_url, false, $this->_getStreamContext()); + } + catch (ErrorException $e) + { + $this->log_update(false, $e->getMessage() . "\n\n" . (!empty($http_response_header) ? implode("\n", $http_response_header) : '')); + throw new VroumVroum_Feed_Exception("Can't retrieve feed: ".$e->getMessage()); + } + libxml_use_internal_errors(true); $xml = @simplexml_load_string($body); diff --git a/index.php b/index.php index 4b70e10..d18f390 100755 --- a/index.php +++ b/index.php @@ -236,7 +236,6 @@ function svg_status($fill, $text, $back) } $svg_ok=svg_status('#008000', 'ok', ''); - $svg_off=svg_status('#00158F', 'off', ''); $svg_mv=svg_status('#0000ff', 'mv', ''); $svg_err=svg_status('#000000', 'err', ''); @@ -254,7 +253,6 @@ function svg_status($fill, $text, $back) else /* ..sinon, lancer la procédure de contrôle */ { $ini = parse_ini_file("./". escape( $_GET['check'] ) ."/vvb.ini") or die; - if(isset($ini['OFF'])) { die($svg_off); } $headers = get_headers($ini['FEED_URL']); if(!empty($headers))