Fix config parameter and rename config.php

diff --git a/admin.php b/admin.php
index 5867961ee7041a30b64de7ffd4c58db883739d42..56db0e5149a90ef1081c83831c1726c42ff207bd 100755 (executable)
--- a/admin.php
+++ b/admin.php
@@ -19,7 +19,7 @@
  
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 
  
 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');
 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 e7d22416e3de1c54fa505555520223f59798b714..2a5a6dad35b68a786ff85540df7af799fc772e52 100644 (file)
--- a/f.php
+++ b/f.php
@@ -20,7 +20,7 @@
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 
 require (JIRAFEAU_ROOT . 'lib/lang.php');
 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');
 
 require (JIRAFEAU_ROOT . 'lib/settings.php');
 require (JIRAFEAU_ROOT . 'lib/functions.php');
 

diff --git a/index.php b/index.php
index 5f7f6ff198731d27397d91d28c68a6a8a992a182..9b2e4f66b1df62514cf3edbb9cb2a2e38d2bc069 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -20,7 +20,7 @@
  */
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');
 
  */
 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');
 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 26ae291f0a974574cd211f2811500d12909d4079..d8e5fdfef6db07632340479f11f71c2e3bebc560 100755 (executable)
--- 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');
 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)
 
 function
 jirafeau_quoted ($str)


@@ -40,7 +40,7 @@ jirafeau_export_cfg ($cfg)
     fwrite ($handle,
             '/* ' .
             t ('This file was generated by the install process. ' .
     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)
     {
                '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));
             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);
         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 42ca69fcb3839ac4d2416b729e7dda82ab273418..a2c3fa08afb82c644de626101bd08fdbb8a022b2 100644 (file)
--- 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. */
  * 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'))
 
 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 ce0846714c4a02c9b27f3f61463308869464e69c..75332be61c3f2c0686d296ba0c93128bfa6346be 100755 (executable)
--- 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 */
              /* 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éé',
              '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 b9685407311d8dcaab4e8adbaebfd57b98cab6cd..1d420b60dd126521941fd0846ea14706e1a7d1c7 100755 (executable)
--- a/script.php
+++ b/script.php
@@ -25,7 +25,7 @@
 \r
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');\r
 \r
 \r
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');\r
 \r

-require (JIRAFEAU_ROOT . 'lib/config.php');\r
+require (JIRAFEAU_ROOT . 'lib/config.original.php');\r

 require (JIRAFEAU_ROOT . 'lib/settings.php');\r
 require (JIRAFEAU_ROOT . 'lib/functions.php');\r
 require (JIRAFEAU_ROOT . 'lib/lang.php');\r
 require (JIRAFEAU_ROOT . 'lib/settings.php');\r
 require (JIRAFEAU_ROOT . 'lib/functions.php');\r
 require (JIRAFEAU_ROOT . 'lib/lang.php');\r

diff --git a/tos.php b/tos.php
index fb144281c323b5fbeb682aa2bb88b9f0e25f3fff..d84704d38d67210ab3d6f274a551990910299fcd 100755 (executable)
--- a/tos.php
+++ b/tos.php
@@ -1,6 +1,6 @@
 <?php\r
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');\r
 <?php\r
 define ('JIRAFEAU_ROOT', dirname (__FILE__) . '/');\r

-require (JIRAFEAU_ROOT . 'lib/config.php');\r
+require (JIRAFEAU_ROOT . 'lib/config.original.php');\r

 require (JIRAFEAU_ROOT . 'lib/settings.php');\r
 require (JIRAFEAU_ROOT . 'lib/functions.php');\r
 require (JIRAFEAU_ROOT . 'lib/lang.php');\r
 require (JIRAFEAU_ROOT . 'lib/settings.php');\r
 require (JIRAFEAU_ROOT . 'lib/functions.php');\r
 require (JIRAFEAU_ROOT . 'lib/lang.php');\r


@@ -23,4 +23,4 @@ echo '</textarea>';
 echo '<p>This license text is under <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons - Attribution 3.0 Unported</a>.</p><p>It has been based on this work: <a href="http://opensource.org/ToS">http://opensource.org/ToS</a></p>';\r
 echo '</div>';\r
 require (JIRAFEAU_ROOT . 'lib/template/footer.php');\r
 echo '<p>This license text is under <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons - Attribution 3.0 Unported</a>.</p><p>It has been based on this work: <a href="http://opensource.org/ToS">http://opensource.org/ToS</a></p>';\r
 echo '</div>';\r
 require (JIRAFEAU_ROOT . 'lib/template/footer.php');\r

-?>
\ No newline at end of file
+?>\r