From 3d9792a36b5bb18d24216eea4b0ad402358db997 Mon Sep 17 00:00:00 2001 From: Jerome Jutteau Date: Mon, 29 Jul 2013 21:52:52 +0000 Subject: [PATCH 1/1] Fix config parameter and rename config.php --- admin.php | 2 +- f.php | 2 +- index.php | 2 +- install.php | 6 ++++-- lib/{config.php => config.original.php} | 2 +- lib/lang/fr.php | 2 +- script.php | 2 +- tos.php | 4 ++-- 8 files changed, 12 insertions(+), 10 deletions(-) rename lib/{config.php => config.original.php} (98%) diff --git a/admin.php b/admin.php index 5867961..56db0e5 100755 --- a/admin.php +++ b/admin.php @@ -19,7 +19,7 @@ define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/'); -require (JIRAFEAU_ROOT . 'lib/config.php'); +require (JIRAFEAU_ROOT . 'lib/config.original.php'); require (JIRAFEAU_ROOT . 'lib/settings.php'); require (JIRAFEAU_ROOT . 'lib/functions.php'); require (JIRAFEAU_ROOT . 'lib/lang.php'); diff --git a/f.php b/f.php index e7d2241..2a5a6da 100644 --- a/f.php +++ b/f.php @@ -20,7 +20,7 @@ define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/'); require (JIRAFEAU_ROOT . 'lib/lang.php'); -require (JIRAFEAU_ROOT . 'lib/config.php'); +require (JIRAFEAU_ROOT . 'lib/config.original.php'); require (JIRAFEAU_ROOT . 'lib/settings.php'); require (JIRAFEAU_ROOT . 'lib/functions.php'); diff --git a/index.php b/index.php index 5f7f6ff..9b2e4f6 100755 --- a/index.php +++ b/index.php @@ -20,7 +20,7 @@ */ define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/'); -require (JIRAFEAU_ROOT . 'lib/config.php'); +require (JIRAFEAU_ROOT . 'lib/config.original.php'); require (JIRAFEAU_ROOT . 'lib/settings.php'); require (JIRAFEAU_ROOT . 'lib/functions.php'); require (JIRAFEAU_ROOT . 'lib/lang.php'); diff --git a/install.php b/install.php index 26ae291..d8e5fdf 100755 --- a/install.php +++ b/install.php @@ -24,7 +24,7 @@ define ('JIRAFEAU_CFG', JIRAFEAU_ROOT.'lib/config.local.php'); define ('JIRAFEAU_VAR_RAND_LENGTH', 15); require (JIRAFEAU_ROOT . 'lib/lang.php'); -require (JIRAFEAU_ROOT . 'lib/config.php'); +require (JIRAFEAU_ROOT . 'lib/config.original.php'); function jirafeau_quoted ($str) @@ -40,7 +40,7 @@ jirafeau_export_cfg ($cfg) fwrite ($handle, '/* ' . t ('This file was generated by the install process. ' . - 'You can edit it. Please see config.php to understand the ' . + 'You can edit it. Please see config.original.php to understand the ' . 'configuration items.') . ' */' . NL); foreach ($cfg as $key => $item) { @@ -49,6 +49,8 @@ jirafeau_export_cfg ($cfg) fwrite ($handle, ($item ? 'true' : 'false')); else if (is_string ($item)) fwrite ($handle, jirafeau_quoted ($item)); + else if (is_int ($item)) + fwrite ($handle, $item); else fwrite ($handle, 'null'); fwrite ($handle, ';'.NL); diff --git a/lib/config.php b/lib/config.original.php similarity index 98% rename from lib/config.php rename to lib/config.original.php index 42ca69f..a2c3fa0 100644 --- a/lib/config.php +++ b/lib/config.original.php @@ -51,7 +51,7 @@ $cfg['enable_blocks'] = false; * By disabling it, file-level deduplication will be effective. */ $cfg['enable_crypt'] = true; /* Split lenght of link refenrece. */ -$cfg['link_name_lenght'] = 5; +$cfg['link_name_lenght'] = 8; if ((basename (__FILE__) != 'config.local.php') && file_exists (JIRAFEAU_ROOT.'lib/config.local.php')) diff --git a/lib/lang/fr.php b/lib/lang/fr.php index ce08467..75332be 100755 --- a/lib/lang/fr.php +++ b/lib/lang/fr.php @@ -61,7 +61,7 @@ $tr = array ( /* functions.php */ 'Internal error during file creation.' => 'Erreur interne lors la creation de fichier.', /* install.hpp */ - 'This file was generated by the install process. You can edit it. Please see config.php to understand the configuration items.' => 'Ce fichier a été généré par le processus d\'installation. Vous pouvez l\'éditer. Merci de se référer à config.php pour comprendre les éléments de configuration.', + 'This file was generated by the install process. You can edit it. Please see config.original.php to understand the configuration items.' => 'Ce fichier a été généré par le processus d\'installation. Vous pouvez l\'éditer. Merci de se référer à config.original.php pour comprendre les éléments de configuration.', 'The following directory could not be created' => 'Le dossier suivant ne peut être créé', 'You should create this directory by hand.' => 'Vous devriez creer manuelement ce dossier', 'The following directory is not writable' => 'Le dossier suivant ne peut être créé', diff --git a/script.php b/script.php index b968540..1d420b6 100755 --- a/script.php +++ b/script.php @@ -25,7 +25,7 @@ define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/'); -require (JIRAFEAU_ROOT . 'lib/config.php'); +require (JIRAFEAU_ROOT . 'lib/config.original.php'); require (JIRAFEAU_ROOT . 'lib/settings.php'); require (JIRAFEAU_ROOT . 'lib/functions.php'); require (JIRAFEAU_ROOT . 'lib/lang.php'); diff --git a/tos.php b/tos.php index fb14428..d84704d 100755 --- a/tos.php +++ b/tos.php @@ -1,6 +1,6 @@ '; echo '

This license text is under Creative Commons - Attribution 3.0 Unported.

It has been based on this work: http://opensource.org/ToS

'; echo ''; require (JIRAFEAU_ROOT . 'lib/template/footer.php'); -?> \ No newline at end of file +?> -- 2.34.1