From ad941d6f0d86522b6268a620a317b20074a1d7cb Mon Sep 17 00:00:00 2001
From: Oros <oros@ecirtam.net>
Date: Wed, 23 Jan 2013 20:11:49 +0100
Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20l'import=20sans=20l?=
 =?UTF-8?q?e=20protocole=20http=20ou=20https=20=09modified:=20=20=20xsaf2.?=
 =?UTF-8?q?php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md         |  0
 autoblog.php      |  0
 automicroblog.php |  0
 config.php        |  0
 icon-logo.svg     |  0
 index.php         |  0
 xsaf2.php         | 32 +++++++++++---------------------
 7 files changed, 11 insertions(+), 21 deletions(-)
 mode change 100644 => 100755 README.md
 mode change 100644 => 100755 autoblog.php
 mode change 100644 => 100755 automicroblog.php
 mode change 100644 => 100755 config.php
 mode change 100644 => 100755 icon-logo.svg
 mode change 100644 => 100755 index.php
 mode change 100644 => 100755 xsaf2.php

diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/autoblog.php b/autoblog.php
old mode 100644
new mode 100755
diff --git a/automicroblog.php b/automicroblog.php
old mode 100644
new mode 100755
diff --git a/config.php b/config.php
old mode 100644
new mode 100755
diff --git a/icon-logo.svg b/icon-logo.svg
old mode 100644
new mode 100755
diff --git a/index.php b/index.php
old mode 100644
new mode 100755
diff --git a/xsaf2.php b/xsaf2.php
old mode 100644
new mode 100755
index 1a1eeb0..78ee123
--- a/xsaf2.php
+++ b/xsaf2.php
@@ -1,5 +1,5 @@
 <?php
-// update 17/01/2013
+/* modtime 2013-01-23 */
 
 define('DEBUG', true);
 
@@ -29,6 +29,12 @@ function serverUrl()
     $serverport = ($_SERVER["SERVER_PORT"]=='80' || ($https && $_SERVER["SERVER_PORT"]=='443') ? '' : ':'.$_SERVER["SERVER_PORT"]);
     return 'http'.($https?'s':'').'://'.$_SERVER["SERVER_NAME"].$serverport;
 }
+function NoProtocolSiteURL($url)
+{
+	$siteurlnoprototypes = array("http://", "https://");
+	$siteurlnoproto = str_replace($siteurlnoprototypes, "", $url);
+	return $siteurlnoproto;
+}
 function xsafimport($xsafremote)
 { 
 	$json_import = file_get_contents($xsafremote);
@@ -42,24 +48,8 @@ function xsafimport($xsafremote)
 
 				// check done, writing out
 				$siteurl = escape($value[1]);
-				/*
-				// suppression du http et https
-				if(substr($siteurl, 0, 5)== 'https'){
-					$siteurl2 = substr($siteurl, 5);
-				}elseif(substr($siteurl, 0, 4)== 'http'){
-					$siteurl2 = substr($siteurl, 4);
-				}else{
-					$siteurl2 = $siteurl;
-				}
-				*/
-				$foldername = sha1($siteurl);
-
-				if(substr($siteurl, -1) == '/'){
-					$foldername2 = sha1(substr($siteurl, 0, -1));
-				}else{
-					$foldername2 = sha1($siteurl.'/');
-				}
-
+				$foldername = sha1(NoProtocolSiteURL($siteurl));
+				if(substr($siteurl, -1) == '/'){ $foldername2 = sha1(NoProtocolSiteURL(substr($siteurl, 0, -1))); }else{ $foldername2 = sha1(NoProtocolSiteURL($siteurl).'/');}
 				$sitename = $value[0];
 				$sitedomain1 = preg_split('/\//', $siteurl, 0);
 				$sitedomain2=$sitedomain1[2];
@@ -109,8 +99,8 @@ DOWNLOAD_MEDIA_FROM='.$sitedomain) ){
 
 /* And now, the XSAF links to be imported ! */
 
-#xsafimport('https://www.ecirtam.net/autoblogs/?export');
-#xsafimport('http://autoblog.suumitsu.eu/?export');
+//xsafimport('https://www.ecirtam.net/autoblogs/?export');
+xsafimport('http://autoblog.suumitsu.eu/?export');
 if(DEBUG){ echo "\n\nXSAF import finished\n\n"; }
 
 ?>