diff --git a/.htaccess b/.htaccess
deleted file mode 100644
index 5a85c80c..00000000
--- a/.htaccess
+++ /dev/null
@@ -1,15 +0,0 @@
-AddDefaultCharset UTF-8
-
-
-
-# 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]
-
-
\ No newline at end of file
diff --git a/install.php b/install.php
old mode 100644
new mode 100755
index b3aacfa9..1fc07960
--- 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
+
+ order allow,deny
+ deny from all
+
+
+AddDefaultCharset UTF-8
+
+
+
+# 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]
+
+';
+ /**
+ * 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;
}
diff --git a/plugins/about/languages/fr_FR.json b/plugins/about/languages/fr_FR.json
new file mode 100755
index 00000000..ae2c270a
--- /dev/null
+++ b/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.",
+ }
+}
\ 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..75261ea8
--- /dev/null
+++ b/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)."
+}
\ 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..fe67fbbf
--- /dev/null
+++ b/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.",
+ }
+}
\ No newline at end of file