From 1ac0bcc0605f991a93c6786bd3d73fc7393afba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20K?= <stradfred@gmail.com>
Date: Fri, 27 Nov 2015 13:24:01 +0100
Subject: [PATCH 1/7] Feature to detect web server and write the .htaccess

Just a idea for write the htaccess with the good webserver in install.
I think notice if Bludit is in localhost or not.
---
 .htaccess   | 15 -----------
 install.php | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 15 deletions(-)
 delete mode 100644 .htaccess
 mode change 100644 => 100755 install.php

diff --git a/.htaccess b/.htaccess
deleted file mode 100644
index 5a85c80c..00000000
--- a/.htaccess
+++ /dev/null
@@ -1,15 +0,0 @@
-AddDefaultCharset UTF-8
-
-<IfModule mod_rewrite.c>
-
-# Enable rewrite rules
-RewriteEngine on
-
-# Deny direct access to .txt files
-RewriteRule ^content/(.*)\.txt$ - [R=404,L]
-
-# All URL process by index.php
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(.*) index.php [PT,L]
-
-</IfModule>
\ No newline at end of file
diff --git a/install.php b/install.php
old mode 100644
new mode 100755
index 9f64bc8e..cb47c937
--- a/install.php
+++ b/install.php
@@ -131,6 +131,79 @@ function getLanguageList()
 
 	return $tmp;
 }
+// Server detection
+function checkServer($serveur)
+{
+	$server = '';
+	/**
+	 * Whether the server software is Apache or something else
+	 */	 
+	if( strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'LiteSpeed') !== false )
+	  $server =  '# secure htaccess file
+<Files .htaccess>
+ order allow,deny
+ deny from all
+</Files>
+
+AddDefaultCharset UTF-8
+
+<IfModule mod_rewrite.c>
+
+# Enable rewrite rules
+RewriteEngine on
+
+# Deny direct access to .txt files
+RewriteRule ^content/(.*)\.txt$ - [R=404,L]
+
+# All URL process by index.php
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^(.*) index.php [PT,L]
+
+</IfModule>';
+	/**
+	 * Whether the server software is Nginx or something else
+	 */
+	if( strpos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false )
+	  $server =  '# nginx configuration charset utf-8; location / { if (!-e $request_filename){ rewrite ^/(.*) /index.php break; } } location /.htaccess { deny all; }';	
+
+	/**
+	 * Whether the server software is Hiawatha or something else http://forum.bludit.com/viewtopic.php?f=6&t=138
+	 */
+	if( strpos($_SERVER['SERVER_SOFTWARE'], 'hiawatha') !== false )
+	  $server =  'UrlToolkit {
+        ToolkitID = bludit
+        RequestURI exists Return
+        Match (.*)\?(.*) Rewrite $1&$2 Continue
+        Match ^/(.*) Rewrite /index.php?url=$1
+}';	
+
+	/**
+	 * Whether the server software is Cherokee/Lighttpd or something else http://forum.bludit.com/viewtopic.php?f=6&t=121#p670)
+	 */
+	if( strpos($_SERVER['SERVER_SOFTWARE'], 'cherokee') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'Lighttpd') !== false )
+	  $server =  'url.rewrite-once = (
+        ".*\.(txt)$" => "/",
+)
+
+url.rewrite-if-not-file  = (
+        ".*\?(.*)" => "index.php?$1",
+        "." => "index.php"
+)';
+	  	
+    return $server;
+    
+}
+// Write .htaccess
+function writeht($serveur)
+{
+	$ht = checkServer($serveur);
+    $fp = fopen('.htaccess','a+');
+    if($fp)
+    {
+        fwrite($fp, $ht);
+        fclose($fp);
+    }
+}
 
 // Generate a random string.
 // Thanks, http://stackoverflow.com/questions/4356289/php-random-string-generator
@@ -155,6 +228,7 @@ function checkSystem()
 		$phpModules = get_loaded_extensions();
 	}
 
+/*
 	if(!file_exists(PATH_ROOT.'.htaccess'))
 	{
 		$errorText = 'Missing file, upload the file .htaccess (ERR_201)';
@@ -164,6 +238,7 @@ function checkSystem()
 		$tmp['errorText'] = $errorText;
 		array_push($stdOut, $tmp);
 	}
+*/
 
 	if(!in_array('dom', $phpModules))
 	{
@@ -462,6 +537,7 @@ Content:
 
 	file_put_contents(PATH_POSTS.$firstPostSlug.DS.'index.txt', $data, LOCK_EX);
 
+	writeht();
 	return true;
 }
 

From 53cb4e7dd19d48953aa745c7903555106e7a71b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20K?= <stradfred@gmail.com>
Date: Wed, 2 Dec 2015 12:50:15 +0100
Subject: [PATCH 2/7] Add french lang in plugins

---
 plugins/about/languages/fr_FR.json       | 12 ++++++++++++
 plugins/googletools/languages/fr_FR.json | 16 ++++++++++++++++
 plugins/pages/languages/fr_FR.json       |  2 +-
 plugins/tinymce/languages/fr_FR.json     | 12 ++++++++++++
 4 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100755 plugins/about/languages/fr_FR.json
 create mode 100755 plugins/googletools/languages/fr_FR.json
 mode change 100644 => 100755 plugins/pages/languages/fr_FR.json
 create mode 100644 plugins/tinymce/languages/fr_FR.json

diff --git a/plugins/about/languages/fr_FR.json b/plugins/about/languages/fr_FR.json
new file mode 100755
index 00000000..5469b7b8
--- /dev/null
+++ b/plugins/about/languages/fr_FR.json
@@ -0,0 +1,12 @@
+{
+	"plugin-data":
+	{
+		"name": "À propos",
+		"description": "Courte description de votre site ou de vous-même.",
+		"author": "Bludit",
+		"email": "",
+		"website": "https://github.com/dignajar/bludit-plugins",
+		"version": "0.6",
+		"releaseDate": "2015-11-13"
+	}
+}
\ No newline at end of file
diff --git a/plugins/googletools/languages/fr_FR.json b/plugins/googletools/languages/fr_FR.json
new file mode 100755
index 00000000..bff07e85
--- /dev/null
+++ b/plugins/googletools/languages/fr_FR.json
@@ -0,0 +1,16 @@
+{
+	"plugin-data":
+	{
+		"name": "Outils Google",
+		"description": "Ce plugin génère la balise meta pour valider votre site avec Google Webmasters Tools et le code JavaScript pour le suivi de votre site avec Google Analytics.",
+		"author": "Bludit",
+		"email": "",
+		"website": "https://github.com/dignajar/bludit-plugins",
+		"version": "0.6",
+		"releaseDate": "2015-11-13"
+	},
+	"google-webmasters-tools": "Google Webmasters tools",
+	"google-analytics-tracking-id": "Votre ID de suivi Google Analytics",
+	"complete-this-field-with-the-google-site-verification": "Remplissez ce champ avec la clé de vérification de Google Site afin de vérifier le propriétaire du site.",
+	"complete-this-field-with-the-tracking-id": "Il s’agit du code de suivi Google Analytics correspondant à cette propriété (UA-XXXXXXXX-X)."
+}
\ No newline at end of file
diff --git a/plugins/pages/languages/fr_FR.json b/plugins/pages/languages/fr_FR.json
old mode 100644
new mode 100755
index 3efb4769..60f38832
--- a/plugins/pages/languages/fr_FR.json
+++ b/plugins/pages/languages/fr_FR.json
@@ -2,7 +2,7 @@
 	"plugin-data":
 	{
 		"name": "Page navigation",
-		"description": "Constitue un menu avec les liens des pages dans la colonne du thème."
+		"description": "Constitue un menu ordonné, avec les liens des pages dans votre thème."
 	},
 
 	"home": "Accueil",
diff --git a/plugins/tinymce/languages/fr_FR.json b/plugins/tinymce/languages/fr_FR.json
new file mode 100644
index 00000000..7a7e81b6
--- /dev/null
+++ b/plugins/tinymce/languages/fr_FR.json
@@ -0,0 +1,12 @@
+{
+	"plugin-data":
+	{
+		"name": "TinyMCE",
+		"description": "TinyMCE est un éditeur HTML très simple, avec de nombreux plugins et très personnalisable.",
+		"author": "TinyMCE",
+		"email": "",
+		"website": "http://www.tinymce.com",
+		"version": "4.3",
+		"releaseDate": "2015-11-29"
+	}
+}
\ No newline at end of file

From 420200cd4f4a703fa58ce912de5082dabc5e9257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20K?= <stradfred@gmail.com>
Date: Wed, 2 Dec 2015 17:36:40 +0100
Subject: [PATCH 3/7] Lang update

---
 plugins/about/languages/fr_FR.json       | 5 -----
 plugins/googletools/languages/fr_FR.json | 5 -----
 plugins/tinymce/languages/fr_FR.json     | 5 -----
 3 files changed, 15 deletions(-)

diff --git a/plugins/about/languages/fr_FR.json b/plugins/about/languages/fr_FR.json
index 5469b7b8..ae2c270a 100755
--- a/plugins/about/languages/fr_FR.json
+++ b/plugins/about/languages/fr_FR.json
@@ -3,10 +3,5 @@
 	{
 		"name": "À propos",
 		"description": "Courte description de votre site ou de vous-même.",
-		"author": "Bludit",
-		"email": "",
-		"website": "https://github.com/dignajar/bludit-plugins",
-		"version": "0.6",
-		"releaseDate": "2015-11-13"
 	}
 }
\ No newline at end of file
diff --git a/plugins/googletools/languages/fr_FR.json b/plugins/googletools/languages/fr_FR.json
index bff07e85..75261ea8 100755
--- a/plugins/googletools/languages/fr_FR.json
+++ b/plugins/googletools/languages/fr_FR.json
@@ -3,11 +3,6 @@
 	{
 		"name": "Outils Google",
 		"description": "Ce plugin génère la balise meta pour valider votre site avec Google Webmasters Tools et le code JavaScript pour le suivi de votre site avec Google Analytics.",
-		"author": "Bludit",
-		"email": "",
-		"website": "https://github.com/dignajar/bludit-plugins",
-		"version": "0.6",
-		"releaseDate": "2015-11-13"
 	},
 	"google-webmasters-tools": "Google Webmasters tools",
 	"google-analytics-tracking-id": "Votre ID de suivi Google Analytics",
diff --git a/plugins/tinymce/languages/fr_FR.json b/plugins/tinymce/languages/fr_FR.json
index 7a7e81b6..fe67fbbf 100644
--- a/plugins/tinymce/languages/fr_FR.json
+++ b/plugins/tinymce/languages/fr_FR.json
@@ -3,10 +3,5 @@
 	{
 		"name": "TinyMCE",
 		"description": "TinyMCE est un éditeur HTML très simple, avec de nombreux plugins et très personnalisable.",
-		"author": "TinyMCE",
-		"email": "",
-		"website": "http://www.tinymce.com",
-		"version": "4.3",
-		"releaseDate": "2015-11-29"
 	}
 }
\ No newline at end of file

From a4add1e55e9e3dfdc46b23c3be8d328d521f5470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20K?= <stradfred@gmail.com>
Date: Sun, 6 Dec 2015 20:59:54 +0100
Subject: [PATCH 4/7] Lang bug Fix

---
 plugins/about/languages/fr_FR.json       | 2 +-
 plugins/googletools/languages/fr_FR.json | 2 +-
 plugins/tinymce/languages/fr_FR.json     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/about/languages/fr_FR.json b/plugins/about/languages/fr_FR.json
index ae2c270a..f01a593e 100755
--- a/plugins/about/languages/fr_FR.json
+++ b/plugins/about/languages/fr_FR.json
@@ -2,6 +2,6 @@
 	"plugin-data":
 	{
 		"name": "À propos",
-		"description": "Courte description de votre site ou de vous-même.",
+		"description": "Courte description de votre site ou de vous-même."
 	}
 }
\ No newline at end of file
diff --git a/plugins/googletools/languages/fr_FR.json b/plugins/googletools/languages/fr_FR.json
index 75261ea8..e79b69cc 100755
--- a/plugins/googletools/languages/fr_FR.json
+++ b/plugins/googletools/languages/fr_FR.json
@@ -2,7 +2,7 @@
 	"plugin-data":
 	{
 		"name": "Outils Google",
-		"description": "Ce plugin génère la balise meta pour valider votre site avec Google Webmasters Tools et le code JavaScript pour le suivi de votre site avec Google Analytics.",
+		"description": "Ce plugin génère la balise meta pour valider votre site avec Google Webmasters Tools et le code JavaScript pour le suivi de votre site avec Google Analytics."
 	},
 	"google-webmasters-tools": "Google Webmasters tools",
 	"google-analytics-tracking-id": "Votre ID de suivi Google Analytics",
diff --git a/plugins/tinymce/languages/fr_FR.json b/plugins/tinymce/languages/fr_FR.json
index fe67fbbf..5c892c8e 100644
--- a/plugins/tinymce/languages/fr_FR.json
+++ b/plugins/tinymce/languages/fr_FR.json
@@ -2,6 +2,6 @@
 	"plugin-data":
 	{
 		"name": "TinyMCE",
-		"description": "TinyMCE est un éditeur HTML très simple, avec de nombreux plugins et très personnalisable.",
+		"description": "TinyMCE est un éditeur HTML très simple, avec de nombreux plugins et très personnalisable."
 	}
 }
\ No newline at end of file

From 2b04117022226c223186679afce2ffd996122db1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20K?= <stradfred@gmail.com>
Date: Wed, 9 Dec 2015 19:31:41 +0100
Subject: [PATCH 5/7] Grid/List plugin view feature

---
 kernel/admin/views/plugins.php | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/kernel/admin/views/plugins.php b/kernel/admin/views/plugins.php
index 9f200a38..9016e2ee 100644
--- a/kernel/admin/views/plugins.php
+++ b/kernel/admin/views/plugins.php
@@ -3,7 +3,20 @@
 HTML::title(array('title'=>$L->g('Plugins'), 'icon'=>'puzzle-piece'));
 
 echo '
-<table class="uk-table uk-table-striped">
+<style>
+.list tr{ width: 100%; border-bottom: 1px dotted #CCC; margin-bottom: 10px; padding-bottom: 10px; }
+.grid tr{ float: left; width: 20%; height: 100px; border-right: 1px dotted #CCC; border-bottom: 1px dotted #CCC; padding: 10px; }
+.grid .desc, .grid thead { display:none }
+.grid .plugin-name{ text-transform: uppercase; font-size: 12px }
+.grid td{ border:none }
+.grid div.plugin-links { display:block }
+</style>
+    <div class="uk-button-group">
+        <button class="uk-button grid"><i class="uk-icon-th-large"></i></button>
+        <button class="uk-button list"><i class="uk-icon-list"></i></button>
+    </div>
+    
+<table class="uk-table uk-table-striped grid">
 <thead>
 	<tr>
 	<th class="uk-width-1-5">'.$L->g('Name').'</th>
@@ -38,7 +51,7 @@ foreach($plugins['all'] as $Plugin)
 	echo '
 	</div>
 	</td>
-	<td>'.$Plugin->description().'</td>
+	<td class="desc">'.$Plugin->description().'</td>
 	<td class="uk-text-center">'.$Plugin->version().'</td>
 	<td class="uk-text-center"><a targe="_blank" href="'.$Plugin->website().'">'.$Plugin->author().'</a></td>
 	';
@@ -49,4 +62,13 @@ foreach($plugins['all'] as $Plugin)
 echo '
 </tbody>
 </table>
-';
\ No newline at end of file
+<script>
+$("button").on("click",function(e) {
+    if ($(this).hasClass("grid")) {
+        $(".uk-table").removeClass("list").addClass("grid");
+    }
+    else if($(this).hasClass("list")) {
+        $(".uk-table").removeClass("grid").addClass("list");
+    }
+});
+</script>';
\ No newline at end of file

From c96db7c533179204dd4556bf49f3e4f808ecc9c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20K?= <stradfred@gmail.com>
Date: Mon, 28 Dec 2015 09:40:27 +0100
Subject: [PATCH 6/7] French update

---
 languages/fr_FR.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/languages/fr_FR.json b/languages/fr_FR.json
index 20179f01..771b7dd0 100644
--- a/languages/fr_FR.json
+++ b/languages/fr_FR.json
@@ -213,5 +213,10 @@
 	"the-about-page-is-very-important": "Votre page **à propos** est très utile. Elle fournit à vos visiteurs des informations importantes sur vous, elle crée un rapport de confiance entre vous et votre visiteur, elle présente votre société et votre site et elle vous différencie de tous les autres sites de votre niche.",
 	"change-this-pages-content-on-the-admin-panel": "Changer le contenu de cette page à partir du panneau d’administration, Gestion de contenu -> Pages et cliquez sur la page « à propos » pour l’éditer.",
 	"about-your-site-or-yourself": "À propos de vous",
-	"welcome-to-bludit": "Bienvenue sur Bludit"
+	"welcome-to-bludit": "Bienvenue sur Bludit",
+
+	"site-information": "Informations sur le site",
+	"date-and-time-formats": "Format de la date et de l’heure",
+	"activate": "Activer",
+	"deactivate": "Désactiver"
 }
\ No newline at end of file

From df233f04273e13d9e7730af1079b2895b4d42928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20K?= <stradfred@gmail.com>
Date: Mon, 4 Jan 2016 10:39:33 +0100
Subject: [PATCH 7/7] update lang

---
 languages/fr_FR.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/languages/fr_FR.json b/languages/fr_FR.json
index 771b7dd0..c7c041c6 100644
--- a/languages/fr_FR.json
+++ b/languages/fr_FR.json
@@ -218,5 +218,7 @@
 	"site-information": "Informations sur le site",
 	"date-and-time-formats": "Format de la date et de l’heure",
 	"activate": "Activer",
-	"deactivate": "Désactiver"
+	"deactivate": "Désactiver",
+
+	"cover-image": "Image de couverture"
 }
\ No newline at end of file