Merge f3cc4b2643372e5723a8f8c5d5174ccd3fd11b8b into d10bd4996a5cef62bea2304bd9608c78a4796c95

.htaccess

@@ -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>

install.php

@@ -132,6 +132,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
@@ -156,6 +229,7 @@ function checkSystem()
 		$phpModules = get_loaded_extensions();
 	}
 
+/*
 	if(!file_exists(PATH_ROOT.'.htaccess'))
 	{
 		$errorText = 'Missing file, upload the file .htaccess (ERR_201)';
@@ -165,6 +239,7 @@ function checkSystem()
 		$tmp['errorText'] = $errorText;
 		array_push($stdOut, $tmp);
 	}
+*/
 
 	if(!in_array('dom', $phpModules))
 	{
@@ -463,6 +538,7 @@ Content:
 
 	file_put_contents(PATH_POSTS.$firstPostSlug.DS.'index.txt', $data, LOCK_EX);
 
+	writeht();
 	return true;
 }
 

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>
-';
+<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>';

plugins/about/languages/fr_FR.json

@@ -0,0 +1,7 @@
+{
+	"plugin-data":
+	{
+		"name": "À propos",
+		"description": "Courte description de votre site ou de vous-même."
+	}
+}

plugins/googletools/languages/fr_FR.json

@@ -0,0 +1,11 @@
+{
+	"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."
+	},
+	"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)."
+}

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",

plugins/tinymce/languages/fr_FR.json

@@ -0,0 +1,7 @@
+{
+	"plugin-data":
+	{
+		"name": "TinyMCE",
+		"description": "TinyMCE est un éditeur HTML très simple, avec de nombreux plugins et très personnalisable."
+	}
+}