feature 1522: Move config_local.inc.php to local/config/config.inc.php

git-svn-id: http://piwigo.org/svn/trunk@5215 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Mar 21, 2010 · 8db5b54 · 8db5b54
1 parent 545b104
commit 8db5b54
Show file tree

Hide file tree

Showing 23 changed files with 22 additions and 22 deletions.
diff --git a/admin/include/c13y_internal.class.php b/admin/include/c13y_internal.class.php
@@ -83,7 +83,7 @@ function c13y_exif($c13y)
           sprintf(l10n('%s value is not correct file because exif are not supported'), '$conf[\''.$value.'\']'),
           null,
           null,
-          sprintf(l10n('%s must be to set to false in your config_local.inc.php file'), '$conf[\''.$value.'\']')
+          sprintf(l10n('%s must be to set to false in your local/config/config.inc.php file'), '$conf[\''.$value.'\']')
           .'<br>'.
           $c13y->get_htlm_links_more_info());
       }

diff --git a/include/common.inc.php b/include/common.inc.php
@@ -90,7 +90,7 @@ function sanitize_mysql_kv(&$v, $k)
 }
 
 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
-@include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
+@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
 include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php');
 
 if(isset($conf['show_php_errors']) && !empty($conf['show_php_errors']))

diff --git a/include/config_default.inc.php b/include/config_default.inc.php
@@ -30,7 +30,7 @@
  *
  * It is recommended to let config_default.inc.php as provided and to
  * overwrite configuration in your local configuration file
- * config_local.inc.php. See tools/config_local.inc.php as an example.
+ * local/config/config.inc.php. See tools/config.inc.php as an example.
  *
  * Why having some parameters in config table and others in
  * config_*.inc.php? Modifying config_*.inc.php is a "hard" task for low

diff --git a/install.php b/install.php
@@ -158,7 +158,7 @@
 
 $prefixeTable = $table_prefix;
 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
-@include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
+@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
 include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$dblayer.'.inc.php');
 include(PHPWG_ROOT_PATH . 'include/constants.php');
 include(PHPWG_ROOT_PATH . 'include/functions.inc.php');

diff --git a/install/db/12-database.php b/install/db/12-database.php
@@ -30,7 +30,7 @@
 
 include_once(PHPWG_ROOT_PATH.'include/constants.php');
 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
-@include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
+@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
 
 // +-----------------------------------------------------------------------+
 // |                            Upgrade content                            |

diff --git a/install/db/14-database.php b/install/db/14-database.php
@@ -30,7 +30,7 @@
 
 include_once(PHPWG_ROOT_PATH.'include/constants.php');
 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
-@include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
+@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
 
 // +-----------------------------------------------------------------------+
 // |                            Upgrade content                            |

diff --git a/install/db/60-database.php b/install/db/60-database.php
@@ -30,7 +30,7 @@
 
 include_once(PHPWG_ROOT_PATH.'include/constants.php');
 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
-@include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
+@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
 
 // +-----------------------------------------------------------------------+
 // |                            Upgrade content                            |

diff --git a/install/db/65-database.php b/install/db/65-database.php
@@ -135,7 +135,7 @@ function upgrade65_change_table_to_charset($table, $field_definitions, $db_chars
 // +-----------------------------------------------------------------------+
 // get admin charset
   include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
-  @include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
+  @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
   $admin_charset='iso-8859-1';
   $query='
 SELECT language FROM '.USER_INFOS_TABLE.'

diff --git a/install/db/8-database.php b/install/db/8-database.php
@@ -40,7 +40,7 @@
 
 $conf_save = $conf;
 unset($conf);
-@include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
+@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
 if ( isset($conf['gallery_url']) )
 {
   $params['gallery_url'][0] = $conf['gallery_url'];

diff --git a/install/upgrade_1.4.0.php b/install/upgrade_1.4.0.php
@@ -282,7 +282,7 @@
   array_push(
     $page['infos'],
     'the thumbnail prefix configuration parameter was moved to configuration
-file, copy config_local.inc.php from "tools" directory to "include" directory
+file, copy config.inc.php from "tools" directory to "local/config" directory
 and edit $conf[\'prefix_thumbnail\'] = '.$prefix_thumbnail
     );
 }

diff --git a/install/upgrade_1.5.0.php b/install/upgrade_1.5.0.php
@@ -333,7 +333,7 @@ function tag_replace_keywords()
 // Get real values from config file
 $conf_save = $conf;
 unset($conf);
-@include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
+@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
 if ( isset($conf['gallery_url']) )
 {
   $params['gallery_url'][0] = $conf['gallery_url'];

diff --git a/language/de_DE/admin.lang.php b/language/de_DE/admin.lang.php
@@ -535,7 +535,7 @@
 $lang['the forum'] = "das Forum";
 $lang['the wiki'] = "das wiki";
 $lang['%s value is not correct file because exif are not supported'] = "Der Wert %s ist nicht korrekt weil EXIF nicht unterstützt wird";
-$lang['%s must be to set to false in your config_local.inc.php file'] = "%s muss auf \"false\" in Ihrer Datei config_local.inc.php";
+$lang['%s must be to set to false in your local/config/config.inc.php file'] = "%s muss auf \"false\" in Ihrer Datei local/config/config.inc.php";
 $lang['Main "guest" user does not exist'] = "Der Benutzer \"Gast\" Haupt nicht mehr";
 $lang['Main "guest" user status is incorrect'] = "Der Status der Benutzer \"Gast\" ist falsch";
 $lang['Default user does not exist'] = "Der Benutzer standardmäßig nicht mehr";

diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
@@ -535,7 +535,7 @@
 $lang['the forum'] = "the forum";
 $lang['the wiki'] = "the wiki";
 $lang['%s value is not correct file because exif are not supported'] = "%s value is not correct file because exif are not supported";
-$lang['%s must be to set to false in your config_local.inc.php file'] = "%s must be to set to false in your config_local.inc.php file";
+$lang['%s must be to set to false in your local/config/config.inc.php file'] = "%s must be to set to false in your local/config/config.inc.php file";
 $lang['Main "guest" user does not exist'] = "Main \"guest\" user does not exist";
 $lang['Main "guest" user status is incorrect'] = "Main \"guest\" user status is incorrect";
 $lang['Default user does not exist'] = "Default user does not exist";

diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
@@ -534,7 +534,7 @@
 $lang['the forum'] = "El foro";
 $lang['the wiki'] = "El wiki";
 $lang['%s value is not correct file because exif are not supported'] = "El valor de %s no es correcto porque datos Exif no son soportados";
-$lang['%s must be to set to false in your config_local.inc.php file'] = "%s debe ser puesto a \"false\" en su fichero config_local.inc.php";
+$lang['%s must be to set to false in your local/config/config.inc.php file'] = "%s debe ser puesto a \"false\" en su fichero local/config/config.inc.php";
 $lang['Main "guest" user does not exist'] = "El usuario \"invitado\" principal no existe más";
 $lang['Main "guest" user status is incorrect'] = "El estatuto del usuario \"invitado\" principal es incorrecto";
 $lang['Default user does not exist'] = "El usuario por defecto no existe más";

diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
@@ -534,7 +534,7 @@
 $lang['the forum'] = "le forum";
 $lang['the wiki'] = "le wiki";
 $lang['%s value is not correct file because exif are not supported'] = "La valeur de %s n'est pas correcte parce que l'exif n'est pas supporté";
-$lang['%s must be to set to false in your config_local.inc.php file'] = "%s doit être mis à \"false\" dans votre fichier config_local.inc.php";
+$lang['%s must be to set to false in your local/config/config.inc.php file'] = "%s doit être mis à \"false\" dans votre fichier local/config/config.inc.php";
 $lang['Main "guest" user does not exist'] = "L'utilisateur \"invité\" principal n'existe plus";
 $lang['Main "guest" user status is incorrect'] = "Le statut de l'utilisateur \"invité\" principal est incorrect";
 $lang['Default user does not exist'] = "L'utilisateur par défaut n'existe plus";

diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php
@@ -534,7 +534,7 @@
 $lang['the forum'] = "il forum";
 $lang['the wiki'] = "il wiki";
 $lang['%s value is not correct file because exif are not supported'] = "Il valore di %s non è corretto per causa del exif che non è sopportato";
-$lang['%s must be to set to false in your config_local.inc.php file'] = "%s deve essere impostato a \"false\" nel vostro file config_local.inc.php";
+$lang['%s must be to set to false in your local/config/config.inc.php file'] = "%s deve essere impostato a \"false\" nel vostro file local/config/config.inc.php";
 $lang['Main "guest" user does not exist'] = "L'utente \"ospite\" principale non esiste più";
 $lang['Main "guest" user status is incorrect'] = "Lo statuto del'utente \"ospite\" principale non è corretto";
 $lang['Default user does not exist'] = "L'utente di default non esiste più";

diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
@@ -535,7 +535,7 @@
 $lang['the forum'] = "het forum";
 $lang['the wiki'] = "de wiki";
 $lang['%s value is not correct file because exif are not supported'] = "%s waarde is niet een correct bestand omdat exif niet ondersteund word";
-$lang['%s must be to set to false in your config_local.inc.php file'] = "%s moet aangepast worden naar false in je config_local.inc.php bestand";
+$lang['%s must be to set to false in your local/config/config.inc.php file'] = "%s moet aangepast worden naar false in je local/config/config.inc.php bestand";
 $lang['Main "guest" user does not exist'] = "Hooft \"gast\" gebruiker bestaat niet meer";
 $lang['Main "guest" user status is incorrect'] = "Hooft \"gast\" gebruikers status is niet correct";
 $lang['Default user does not exist'] = "Standaard gebruiker bestaat niet meer";

diff --git a/language/pl_PL/admin.lang.php b/language/pl_PL/admin.lang.php
@@ -535,7 +535,7 @@
 $lang['the forum'] = "forum";
 $lang['the wiki'] = "wiki";
 $lang['%s value is not correct file because exif are not supported'] = "Wartość %s nie jest poprawna, ponieważ exif nie jest wspierany";
-$lang['%s must be to set to false in your config_local.inc.php file'] = "Wartość %s musi być ustawiona na false w pliku konfiguracyjnym config_local.inc.php";
+$lang['%s must be to set to false in your local/config/config.inc.php file'] = "Wartość %s musi być ustawiona na false w pliku konfiguracyjnym local/config/config.inc.php";
 $lang['Main "guest" user does not exist'] = "Główny użytkownik \"gość\" nie istnieje";
 $lang['Main "guest" user status is incorrect'] = "Status głównego użytkownika \"gość\" jest niepoprawny";
 $lang['Default user does not exist'] = "Domyślny użytkownik nie istnieje";

diff --git a/language/templates/admin.lang.php b/language/templates/admin.lang.php
@@ -531,7 +531,7 @@
 $lang['c13y_more_info_forum'] = 'the forum';
 $lang['c13y_more_info_wiki'] = 'the wiki';
 $lang['c13y_exif_anomaly'] = '%s value is not correct file because exif are not supported';
-$lang['c13y_exif_correction'] = '%s must be to set to false in your config_local.inc.php file';
+$lang['c13y_exif_correction'] = '%s must be to set to false in your local/config/config.inc.php file';
 $lang['c13y_guest_non_existent'] = 'Main "guest" user does not exist';
 $lang['c13y_bad_guest_status'] = 'Main "guest" user status is incorrect';
 $lang['c13y_default_non_existent'] = 'Default user does not exist';

diff --git a/plugins/LocalFilesEditor/admin.php b/plugins/LocalFilesEditor/admin.php
@@ -127,7 +127,7 @@
 switch ($page['tab'])
 {
   case 'localconf':
-    $edited_file = PHPWG_ROOT_PATH . "include/config_local.inc.php";
+    $edited_file = PHPWG_ROOT_PATH . "local/config/config.inc.php";
     $content_file = file_exists($edited_file) ?
       file_get_contents($edited_file) : $new_file['localconf'];
 

diff --git a/tools/config_local.inc.php → tools/config.inc.php b/tools/config_local.inc.php → tools/config.inc.php
diff --git a/upgrade.php b/upgrade.php
@@ -42,7 +42,7 @@
 
 include(PHPWG_ROOT_PATH.'local/config/database.inc.php');
 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
-@include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
+@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
 include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php');
 
 prepare_conf_upgrade();

diff --git a/upgrade_feed.php b/upgrade_feed.php
@@ -34,7 +34,7 @@
 include_once(PHPWG_ROOT_PATH.'admin/include/functions_upgrade.php');
 include(PHPWG_ROOT_PATH.'local/config/database.inc.php');
 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
-@include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
+@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
 include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php');
 
 // +-----------------------------------------------------------------------+