From 5d80708ffad88b651eab517e7fcc5e357ad4cc9e Mon Sep 17 00:00:00 2001
From: Mitsukarenai <mitsu@suumitsu.eu>
Date: Sat, 23 Feb 2013 16:02:14 +0100
Subject: [PATCH] =?UTF-8?q?=09modified:=20=20=200.3/index.php=20-=20avec?=
 =?UTF-8?q?=20[export]=20en=20JSON=20typ=C3=A9=20objet,=20facile=20d'extra?=
 =?UTF-8?q?ire=20les=20feed=5Furl.=20[feedexport]=20n'est=20plus=20n=C3=A9?=
 =?UTF-8?q?cessaire.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 0.3/index.php | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)
 mode change 100755 => 100644 0.3/index.php

diff --git a/0.3/index.php b/0.3/index.php
old mode 100755
new mode 100644
index aecf5c5..1339370
--- a/0.3/index.php
+++ b/0.3/index.php
@@ -136,7 +136,7 @@ if (isset($_GET['check']))
 /**
  * Simple and Full Export
  **/
-if (isset($_GET['export']) || isset($_GET['feedexport'])) {
+if (isset($_GET['export'])) {
     header('Content-Type: application/json');
     $directory = "./";
     $subdirs = glob($directory . "*");
@@ -154,23 +154,15 @@ if (isset($_GET['export']) || isset($_GET['feedexport'])) {
 			unset($ini);
             
             $feed=$config->feed_url;
-            
-            if( isset($_GET['export']) ) {
-    			$type=$config->site_type;
-    			$title=$config->site_title;
-    			$url=$config->site_url;			
-    			$reponse[$unit] = array("SITE_TYPE"=>"$type", "SITE_TITLE"=>"$title", "SITE_URL"=>"$url", "FEED_URL"=>"$feed");
-            }
-            // export feed only
-            else
-                $reponse=$reponse.";$feed";
+            $type=$config->site_type;
+    		$title=$config->site_title;
+    		$url=$config->site_url;			
+    		$reponse[$unit] = array("SITE_TYPE"=>"$type", "SITE_TITLE"=>"$title", "SITE_URL"=>"$url", "FEED_URL"=>"$feed");
+
  		}
 	}
-    if( isset($_GET['export']) )
-	    echo json_encode( array( "meta"=> array("xsaf-version"=>XSAF_VERSION,"xsaf-db_transfer"=>"true","xsaf-media_transfer"=>"true"),
+    echo json_encode( array( "meta"=> array("xsaf-version"=>XSAF_VERSION,"xsaf-db_transfer"=>"true","xsaf-media_transfer"=>"true"),
 								"autoblogs"=>$reponse));
-    else
-        echo json_encode(explode(';', substr($reponse, 1)));
     die;
 }
 
@@ -549,7 +541,7 @@ if( !empty($_POST['opml']) && ALLOW_NEW_AUTOBLOGS && ALLOW_NEW_AUTOBLOGS_BY_OPML
             	&rarr; <a href="https://duckduckgo.com/?q=!g%20%22Voici%20une%20liste%20d'autoblogs%20hébergés%22">Rechercher</a>
             </p>
 
-            <div class="clear"><a href="?export">export<sup> JSON</sup></a></div>
+            <div class="clear"><a href="?sitemap">sitemap</a> | <a href="?export">export<sup> JSON</sup></a></div>
             
             <?php
             $directory = "./";