Changeset 5215


Ignore:
Timestamp:
Mar 21, 2010, 2:31:20 PM (10 years ago)
Author:
patdenice
Message:

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

Location:
trunk
Files:
22 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/admin/include/c13y_internal.class.php

    r5207 r5215  
    8484          null,
    8585          null,
    86           sprintf(l10n('%s must be to set to false in your config_local.inc.php file'), '$conf[\''.$value.'\']')
     86          sprintf(l10n('%s must be to set to false in your local/config/config.inc.php file'), '$conf[\''.$value.'\']')
    8787          .'<br>'.
    8888          $c13y->get_htlm_links_more_info());
  • trunk/include/common.inc.php

    r5213 r5215  
    9191
    9292include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
    93 @include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
     93@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
    9494include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php');
    9595
  • trunk/include/config_default.inc.php

    r5208 r5215  
    3131 * It is recommended to let config_default.inc.php as provided and to
    3232 * overwrite configuration in your local configuration file
    33  * config_local.inc.php. See tools/config_local.inc.php as an example.
     33 * local/config/config.inc.php. See tools/config.inc.php as an example.
    3434 *
    3535 * Why having some parameters in config table and others in
  • trunk/install.php

    r5213 r5215  
    159159$prefixeTable = $table_prefix;
    160160include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
    161 @include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
     161@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
    162162include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$dblayer.'.inc.php');
    163163include(PHPWG_ROOT_PATH . 'include/constants.php');
  • trunk/install/db/12-database.php

    r5196 r5215  
    3131include_once(PHPWG_ROOT_PATH.'include/constants.php');
    3232include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
    33 @include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
     33@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
    3434
    3535// +-----------------------------------------------------------------------+
  • trunk/install/db/14-database.php

    r5196 r5215  
    3131include_once(PHPWG_ROOT_PATH.'include/constants.php');
    3232include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
    33 @include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
     33@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
    3434
    3535// +-----------------------------------------------------------------------+
  • trunk/install/db/60-database.php

    r5196 r5215  
    3131include_once(PHPWG_ROOT_PATH.'include/constants.php');
    3232include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
    33 @include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
     33@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
    3434
    3535// +-----------------------------------------------------------------------+
  • trunk/install/db/65-database.php

    r5213 r5215  
    136136// get admin charset
    137137  include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
    138   @include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
     138  @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
    139139  $admin_charset='iso-8859-1';
    140140  $query='
  • trunk/install/db/8-database.php

    r5196 r5215  
    4141$conf_save = $conf;
    4242unset($conf);
    43 @include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
     43@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
    4444if ( isset($conf['gallery_url']) )
    4545{
  • trunk/install/upgrade_1.4.0.php

    r5196 r5215  
    283283    $page['infos'],
    284284    'the thumbnail prefix configuration parameter was moved to configuration
    285 file, copy config_local.inc.php from "tools" directory to "include" directory
     285file, copy config.inc.php from "tools" directory to "local/config" directory
    286286and edit $conf[\'prefix_thumbnail\'] = '.$prefix_thumbnail
    287287    );
  • trunk/install/upgrade_1.5.0.php

    r5196 r5215  
    334334$conf_save = $conf;
    335335unset($conf);
    336 @include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
     336@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
    337337if ( isset($conf['gallery_url']) )
    338338{
  • trunk/language/de_DE/admin.lang.php

    r5209 r5215  
    536536$lang['the wiki'] = "das wiki";
    537537$lang['%s value is not correct file because exif are not supported'] = "Der Wert %s ist nicht korrekt weil EXIF nicht unterstützt wird";
    538 $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";
     538$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";
    539539$lang['Main "guest" user does not exist'] = "Der Benutzer \"Gast\" Haupt nicht mehr";
    540540$lang['Main "guest" user status is incorrect'] = "Der Status der Benutzer \"Gast\" ist falsch";
  • trunk/language/en_UK/admin.lang.php

    r5209 r5215  
    536536$lang['the wiki'] = "the wiki";
    537537$lang['%s value is not correct file because exif are not supported'] = "%s value is not correct file because exif are not supported";
    538 $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";
     538$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";
    539539$lang['Main "guest" user does not exist'] = "Main \"guest\" user does not exist";
    540540$lang['Main "guest" user status is incorrect'] = "Main \"guest\" user status is incorrect";
  • trunk/language/es_ES/admin.lang.php

    r5209 r5215  
    535535$lang['the wiki'] = "El wiki";
    536536$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";
    537 $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";
     537$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";
    538538$lang['Main "guest" user does not exist'] = "El usuario \"invitado\" principal no existe más";
    539539$lang['Main "guest" user status is incorrect'] = "El estatuto del usuario \"invitado\" principal es incorrecto";
  • trunk/language/fr_FR/admin.lang.php

    r5209 r5215  
    535535$lang['the wiki'] = "le wiki";
    536536$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é";
    537 $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";
     537$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";
    538538$lang['Main "guest" user does not exist'] = "L'utilisateur \"invité\" principal n'existe plus";
    539539$lang['Main "guest" user status is incorrect'] = "Le statut de l'utilisateur \"invité\" principal est incorrect";
  • trunk/language/it_IT/admin.lang.php

    r5209 r5215  
    535535$lang['the wiki'] = "il wiki";
    536536$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";
    537 $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";
     537$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";
    538538$lang['Main "guest" user does not exist'] = "L'utente \"ospite\" principale non esiste più";
    539539$lang['Main "guest" user status is incorrect'] = "Lo statuto del'utente \"ospite\" principale non è corretto";
  • trunk/language/nl_NL/admin.lang.php

    r5209 r5215  
    536536$lang['the wiki'] = "de wiki";
    537537$lang['%s value is not correct file because exif are not supported'] = "%s waarde is niet een correct bestand omdat exif niet ondersteund word";
    538 $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";
     538$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";
    539539$lang['Main "guest" user does not exist'] = "Hooft \"gast\" gebruiker bestaat niet meer";
    540540$lang['Main "guest" user status is incorrect'] = "Hooft \"gast\" gebruikers status is niet correct";
  • trunk/language/pl_PL/admin.lang.php

    r5209 r5215  
    536536$lang['the wiki'] = "wiki";
    537537$lang['%s value is not correct file because exif are not supported'] = "Wartość %s nie jest poprawna, ponieważ exif nie jest wspierany";
    538 $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";
     538$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";
    539539$lang['Main "guest" user does not exist'] = "Główny użytkownik \"gość\" nie istnieje";
    540540$lang['Main "guest" user status is incorrect'] = "Status głównego użytkownika \"gość\" jest niepoprawny";
  • trunk/language/templates/admin.lang.php

    r5207 r5215  
    532532$lang['c13y_more_info_wiki'] = 'the wiki';
    533533$lang['c13y_exif_anomaly'] = '%s value is not correct file because exif are not supported';
    534 $lang['c13y_exif_correction'] = '%s must be to set to false in your config_local.inc.php file';
     534$lang['c13y_exif_correction'] = '%s must be to set to false in your local/config/config.inc.php file';
    535535$lang['c13y_guest_non_existent'] = 'Main "guest" user does not exist';
    536536$lang['c13y_bad_guest_status'] = 'Main "guest" user status is incorrect';
  • trunk/plugins/LocalFilesEditor/admin.php

    r5196 r5215  
    128128{
    129129  case 'localconf':
    130     $edited_file = PHPWG_ROOT_PATH . "include/config_local.inc.php";
     130    $edited_file = PHPWG_ROOT_PATH . "local/config/config.inc.php";
    131131    $content_file = file_exists($edited_file) ?
    132132      file_get_contents($edited_file) : $new_file['localconf'];
  • trunk/upgrade.php

    r5213 r5215  
    4343include(PHPWG_ROOT_PATH.'local/config/database.inc.php');
    4444include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
    45 @include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
     45@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
    4646include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php');
    4747
  • trunk/upgrade_feed.php

    r5213 r5215  
    3535include(PHPWG_ROOT_PATH.'local/config/database.inc.php');
    3636include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
    37 @include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
     37@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
    3838include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php');
    3939
Note: See TracChangeset for help on using the changeset viewer.