From 960ab022d791fa591bbccc27e8701488ef7bf8f0 Mon Sep 17 00:00:00 2001 From: Mitsukarenai Date: Thu, 11 Jul 2013 13:04:17 +0200 Subject: [PATCH 1/4] minifix: URL XSAF de mon instance --- config.php.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.php.example b/config.php.example index 0280ded..31808ca 100644 --- a/config.php.example +++ b/config.php.example @@ -40,7 +40,7 @@ $friends_autoblog_farm = array( 'https://raw.github.com/mitsukarenai/xsaf-bootstrap/master/3.json', // 'https://www.ecirtam.net/autoblogs/?export', - // 'https://autoblog.suumitsu.eu/?export', + // 'http://autoblog.suumitsu.eu/?export', // 'http://streisand.hoa.ro/?export', ); ?> From edb75a5f4b6db1ad3d872aaf1e19c700d2037b41 Mon Sep 17 00:00:00 2001 From: Mitsukarenai Date: Thu, 11 Jul 2013 13:38:29 +0200 Subject: [PATCH 2/4] =?UTF-8?q?trial:=20ne=20pas=20=C3=A9crire=20import.js?= =?UTF-8?q?on=20si=20d=C3=A9codage=20JSON=20=C3=A9chou=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xsaf3.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xsaf3.php b/xsaf3.php index 257756b..5479ff6 100755 --- a/xsaf3.php +++ b/xsaf3.php @@ -120,7 +120,7 @@ function xsafimport($xsafremote, $max_exec_time) { $json_media_import = file_get_contents($remote_media); if(DEBUG) debug($json_media_import); - if(!empty($json_media_import) && !strpos($json_media_import, '[]}')) + if(!empty($json_media_import) && !strpos($json_media_import, '[]}') && json_decode($json_media_import) !== null) { file_put_contents('./'. $foldername .'/import.json', $json_media_import); } From 7030352d2466eb7ea1d9ea18a91a839dc0efbddb Mon Sep 17 00:00:00 2001 From: Mitsukarenai Date: Sat, 13 Jul 2013 18:00:32 +0200 Subject: [PATCH 3/4] =?UTF-8?q?d=C3=A9sactivation=20autoblog=20(test)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- autoblogs/autoblog.php | 23 +++++++++++++---------- index.php | 2 ++ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/autoblogs/autoblog.php b/autoblogs/autoblog.php index a2aff27..5a7895e 100644 --- a/autoblogs/autoblog.php +++ b/autoblogs/autoblog.php @@ -350,16 +350,19 @@ class VroumVroum_Blog { if (!$this->mustUpdate()) return false; - - 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()); - } - + 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()); + } + } libxml_use_internal_errors(true); $xml = @simplexml_load_string($body); diff --git a/index.php b/index.php index d18f390..4b70e10 100755 --- a/index.php +++ b/index.php @@ -236,6 +236,7 @@ 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', ''); @@ -253,6 +254,7 @@ 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)) From 1cda22292528a29afbda4a0d6cb867f4c4197476 Mon Sep 17 00:00:00 2001 From: Mitsukarenai Date: Sat, 13 Jul 2013 18:13:07 +0200 Subject: [PATCH 4/4] =?UTF-8?q?Revert=20"d=C3=A9sactivation=20autoblog=20(?= =?UTF-8?q?test)"?= 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))