diff options
Diffstat (limited to '')
| -rw-r--r-- | include/common.inc.php | 2 | ||||
| -rw-r--r-- | install.php | 8 | ||||
| -rw-r--r-- | install/db/65-database.php | 2 | ||||
| -rw-r--r-- | install/db/80-database.php | 6 | ||||
| -rw-r--r-- | install/upgrade_1.3.1.php | 4 | ||||
| -rw-r--r-- | language/de_DE/install.lang.php | 2 | ||||
| -rw-r--r-- | language/de_DE/upgrade.lang.php | 2 | ||||
| -rw-r--r-- | language/en_UK/install.lang.php | 2 | ||||
| -rw-r--r-- | language/en_UK/upgrade.lang.php | 2 | ||||
| -rw-r--r-- | language/es_ES/install.lang.php | 2 | ||||
| -rw-r--r-- | language/es_ES/upgrade.lang.php | 2 | ||||
| -rw-r--r-- | language/fr_FR/install.lang.php | 2 | ||||
| -rw-r--r-- | language/fr_FR/upgrade.lang.php | 2 | ||||
| -rw-r--r-- | language/it_IT/install.lang.php | 2 | ||||
| -rw-r--r-- | language/it_IT/upgrade.lang.php | 2 | ||||
| -rw-r--r-- | language/nl_NL/install.lang.php | 2 | ||||
| -rw-r--r-- | language/nl_NL/upgrade.lang.php | 2 | ||||
| -rw-r--r-- | language/pl_PL/install.lang.php | 2 | ||||
| -rw-r--r-- | language/pl_PL/upgrade.lang.php | 2 | ||||
| -rw-r--r-- | language/templates/install.lang.php | 2 | ||||
| -rw-r--r-- | language/templates/upgrade.lang.php | 2 | ||||
| -rwxr-xr-x | tools/pwg_rel_create.sh | 6 | ||||
| -rw-r--r-- | upgrade.php | 8 | ||||
| -rw-r--r-- | upgrade_feed.php | 2 |
24 files changed, 35 insertions, 35 deletions
diff --git a/include/common.inc.php b/include/common.inc.php index 4d405b352..21029835a 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -70,7 +70,7 @@ $header_msgs = array(); $header_notes = array(); $filter = array(); -@include(PHPWG_ROOT_PATH .'include/config_database.inc.php'); +@include(PHPWG_ROOT_PATH .'local/config/database.inc.php'); if (!defined('PHPWG_INSTALLED')) { header('Location: install.php'); diff --git a/install.php b/install.php index 2f9832b60..5dd7f9a97 100644 --- a/install.php +++ b/install.php @@ -122,9 +122,9 @@ $admin_mail = (!empty($_POST['admin_mail'])) ? $_POST['admin_mail'] : ''; $infos = array(); $errors = array(); -// database config file migration : mysql.inc.php et config_database.inc.php +// database config file migration : mysql.inc.php et database.inc.php $old_config_file = PHPWG_ROOT_PATH . 'include/mysql.inc.php'; -$config_file = PHPWG_ROOT_PATH . 'include/config_database.inc.php'; +$config_file = PHPWG_ROOT_PATH . 'local/config/database.inc.php'; if (!file_exists($config_file) && file_exists($old_config_file)) { $step = 3; @@ -304,7 +304,7 @@ define(\'DB_COLLATE\', \'\'); { $html_content = htmlentities( $file_content, ENT_QUOTES ); $html_content = nl2br( $html_content ); - $error_copy = l10n('Copy the text in pink between hyphens and paste it into the file "include/config_database.inc.php"(Warning : config_database.inc.php must only contain what is in pink, no line return or space character)'); + $error_copy = l10n('Copy the text in pink between hyphens and paste it into the file "local/config/database.inc.php"(Warning : database.inc.php must only contain what is in pink, no line return or space character)'); $error_copy .= '<br>--------------------------------------------------------------------<br>'; $error_copy .= '<span class="sql_content">' . $html_content . '</span>'; $error_copy .= '<br>--------------------------------------------------------------------<br>'; @@ -391,7 +391,7 @@ if ($step == 3) { $html_content = htmlentities( $file_content, ENT_QUOTES ); $html_content = nl2br( $html_content ); - $error_copy = l10n('Copy the text in pink between hyphens and paste it into the file "include/config_database.inc.php"(Warning : config_database.inc.php must only contain what is in pink, no line return or space character)'); + $error_copy = l10n('Copy the text in pink between hyphens and paste it into the file "local/config/database.inc.php"(Warning : database.inc.php must only contain what is in pink, no line return or space character)'); $error_copy .= '<br>--------------------------------------------------------------------<br>'; $error_copy .= '<span class="sql_content">' . $html_content . '</span>'; $error_copy .= '<br>--------------------------------------------------------------------<br>'; diff --git a/install/db/65-database.php b/install/db/65-database.php index 8558024f4..9f732b86f 100644 --- a/install/db/65-database.php +++ b/install/db/65-database.php @@ -255,7 +255,7 @@ ALTER TABLE t1 CHANGE c1 c1 TEXT CHARACTER SET utf8; // +-----------------------------------------------------------------------+ -// changes to write in config_database.inc.php +// changes to write in database.inc.php array_push($mysql_changes, 'define(\'PWG_CHARSET\', \''.$pwg_charset.'\'); define(\'DB_CHARSET\', \''.$db_charset.'\'); diff --git a/install/db/80-database.php b/install/db/80-database.php index 8842e5962..06767dae9 100644 --- a/install/db/80-database.php +++ b/install/db/80-database.php @@ -173,7 +173,7 @@ $list_files = array( 'include_phpwebgallery', 'include_phpwebgallery/config.php', 'include_phpwebgallery/index.htm', -'include_phpwebgallery/config_database.inc.php', +'include_phpwebgallery/local/config/database.inc.php', 'index.htm', // Comparison between phpwebgallery-1.2.1 and phpwebgallery-1.1.0 'admin/isadmin.php', @@ -927,7 +927,7 @@ $list_files = array( // Comparison between trunk-r3105 and phpwebgallery-2.0.0RC4 'admin/template/goto/theme/roma/images/bottom-left-bg.png', 'admin/template/goto/theme/roma/images/top-left-bg.png', -'include/config_database.inc.php', +'local/config/database.inc.php', 'template-common/lib/ui/ui.accordion.packed.js', 'template-common/lib/ui/ui.core.packed.js', 'template-common/lib/ui/ui.datepicker.css', @@ -943,7 +943,7 @@ $list_files = array( ); $list_exlude_files = array( -'include/config_database.inc.php', +'local/config/database.inc.php', ); diff --git a/install/upgrade_1.3.1.php b/install/upgrade_1.3.1.php index ecc2c875d..eab8bd57f 100644 --- a/install/upgrade_1.3.1.php +++ b/install/upgrade_1.3.1.php @@ -579,7 +579,7 @@ UPDATE '.CATEGORIES_TABLE.' } // load the config file -$config_file = PHPWG_ROOT_PATH.'include/config_database.inc.php'; +$config_file = PHPWG_ROOT_PATH.'local/config/database.inc.php'; $config_file_contents = @file_get_contents($config_file); if ($config_file_contents === false) { @@ -595,7 +595,7 @@ if (!is_writable($config_file)) die('FILE NOT WRITABLE '.$config_file); } -// changes to write in config_database.inc.php +// changes to write in database.inc.php array_push($mysql_changes, 'define(\'PHPWG_INSTALLED\', true);'); // Send infos diff --git a/language/de_DE/install.lang.php b/language/de_DE/install.lang.php index 144c52543..c68703c98 100644 --- a/language/de_DE/install.lang.php +++ b/language/de_DE/install.lang.php @@ -37,7 +37,7 @@ $lang['Connection to server succeed, but it was impossible to connect to databas $lang['Can\'t connect to server'] = "Es konnte keine Verbindung zum Datenbankserver aufgebaut werden"; $lang['The next step of the installation is now possible'] = "Der nächste Schritt der Installation ist nun möglich"; $lang['next step'] = "nächster Schritt"; -$lang['Copy the text in pink between hyphens and paste it into the file "include/config_database.inc.php"(Warning : config_database.inc.php must only contain what is in pink, no line return or space character)'] = "Kopieren Sie den rosa Text ohne die Bindestriche und fügen Sie ihn in die Datei \"include / config_database.inc.php\" auf dem Webserver ein (Warnung: die Datei \"config_database.inc.php\" darf nur die rosa Zeichen enthalten, nicht mehr und nicht weniger)"; +$lang['Copy the text in pink between hyphens and paste it into the file "local/config/database.inc.php"(Warning : database.inc.php must only contain what is in pink, no line return or space character)'] = "Kopieren Sie den rosa Text ohne die Bindestriche und fügen Sie ihn in die Datei \"local/config/database.inc.php\" auf dem Webserver ein (Warnung: die Datei \"database.inc.php\" darf nur die rosa Zeichen enthalten, nicht mehr und nicht weniger)"; $lang['Database type'] = "Database type"; $lang['The type of database your piwigo data will be store in'] = "The type of database your piwigo data will be store in"; $lang['Host'] = "Host"; diff --git a/language/de_DE/upgrade.lang.php b/language/de_DE/upgrade.lang.php index d6f3e907d..dd6bc6f37 100644 --- a/language/de_DE/upgrade.lang.php +++ b/language/de_DE/upgrade.lang.php @@ -37,7 +37,7 @@ $lang['Perform a maintenance check in [Administration>Specials>Maintenance] if y $lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = "Als Vorsichtsmaßnahme folgenden Plugins wurden deaktiviert. Sie müssen prüfen, ob Plugins aktualisieren, bevor sie reactiving:"; $lang['Only administrator can run upgrade: please sign in below.'] = "Nur Administrator können Upgrade ausführen : Bitte melden Sie sich an unter."; $lang['You do not have access rights to run upgrade'] = "Sie haben nicht das Recht auf Zugang zum Upgrade ausführen"; -$lang['In <i>include/config_database.inc.php</i>, before <b>?></b>, insert:'] = "In <i>include/config_database.inc.php</i>, vor <b>?></b>, wird Folgendes eingefügt:"; +$lang['In <i>%s</i>, before <b>?></b>, insert:'] = "In <i>%s</i>, vor <b>?></b>, wird Folgendes eingefügt:"; $lang['All sub-categories of private categories become private'] = "Alle Unter-Kategorien von privaten Gruppen wirden privaten"; $lang['User permissions and group permissions have been erased'] = "Benutzer und Gruppen Berechtigungen wurden gelöscht"; $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = "Nur Miniaturansichten Präfix und Webmaster Mail-Adresse gespeichert wurden aus früheren Konfiguration"; diff --git a/language/en_UK/install.lang.php b/language/en_UK/install.lang.php index b07130a5a..723f31495 100644 --- a/language/en_UK/install.lang.php +++ b/language/en_UK/install.lang.php @@ -37,7 +37,7 @@ $lang['Connection to server succeed, but it was impossible to connect to databas $lang['Can\'t connect to server'] = "Can't connect to server"; $lang['The next step of the installation is now possible'] = "The next step of the installation is now possible"; $lang['next step'] = "next step"; -$lang['Copy the text in pink between hyphens and paste it into the file "include/config_database.inc.php"(Warning : config_database.inc.php must only contain what is in pink, no line return or space character)'] = "Copy the text in pink between hyphens and paste it into the file \"include/config_database.inc.php\"(Warning : config_database.inc.php must only contain what is in pink, no line return or space character)"; +$lang['Copy the text in pink between hyphens and paste it into the file "local/config/database.inc.php"(Warning : database.inc.php must only contain what is in pink, no line return or space character)'] = "Copy the text in pink between hyphens and paste it into the file \"local/config/database.inc.php\"(Warning : database.inc.php must only contain what is in pink, no line return or space character)"; $lang['Database type'] = "Database type"; $lang['The type of database your piwigo data will be store in'] = "The type of database your piwigo data will be store in"; $lang['Host'] = "Host"; diff --git a/language/en_UK/upgrade.lang.php b/language/en_UK/upgrade.lang.php index 806c1cc01..39247cad0 100644 --- a/language/en_UK/upgrade.lang.php +++ b/language/en_UK/upgrade.lang.php @@ -37,7 +37,7 @@ $lang['Perform a maintenance check in [Administration>Specials>Maintenance] if y $lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = "As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:"; $lang['Only administrator can run upgrade: please sign in below.'] = "Only administrator can run upgrade: please sign in below."; $lang['You do not have access rights to run upgrade'] = "You do not have access rights to run upgrade"; -$lang['In <i>include/config_database.inc.php</i>, before <b>?></b>, insert:'] = "In <i>include/config_database.inc.php</i>, before <b>?></b>, insert:"; +$lang['In <i>%s</i>, before <b>?></b>, insert:'] = "In <i>%s</i>, before <b>?></b>, insert:"; $lang['All sub-categories of private categories become private'] = "All sub-categories of private categories become private"; $lang['User permissions and group permissions have been erased'] = "User permissions and group permissions have been erased"; $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = "Only thumbnails prefix and webmaster mail address have been saved from previous configuration"; diff --git a/language/es_ES/install.lang.php b/language/es_ES/install.lang.php index f53d8c3ef..ae1ac611f 100644 --- a/language/es_ES/install.lang.php +++ b/language/es_ES/install.lang.php @@ -37,7 +37,7 @@ $lang['Connection to server succeed, but it was impossible to connect to databas $lang['Can\'t connect to server'] = "Imposible conectarse al servidor"; $lang['The next step of the installation is now possible'] = "Puede seguir con la instalación sigiente"; $lang['next step'] = "Etapa siguiente"; -$lang['Copy the text in pink between hyphens and paste it into the file "include/config_database.inc.php"(Warning : config_database.inc.php must only contain what is in pink, no line return or space character)'] = "Copie el texto en rosa entre los guillones y pegúelo en el fichero mysql.inc.php que se encuentra en el repertorio \" include \" a la base del lugar donde usted instaló Piwigo (el fichero mysql.inc.php debe contener SÓLO lo que está en rosa entre las rayas, ninguna vuelta a la lÃnea o espacio es autorizado)"; +$lang['Copy the text in pink between hyphens and paste it into the file "local/config/database.inc.php"(Warning : database.inc.php must only contain what is in pink, no line return or space character)'] = "Copie el texto en rosa entre los guillones y pegúelo en el fichero database.inc.php que se encuentra en el repertorio \"local/config\" a la base del lugar donde usted instaló Piwigo (el fichero database.inc.php debe contener SÓLO lo que está en rosa entre las rayas, ninguna vuelta a la lÃnea o espacio es autorizado)"; $lang['Database type'] = "Database type"; $lang['The type of database your piwigo data will be store in'] = "The type of database your piwigo data will be store in"; $lang['Host'] = "Huésped MySQL"; diff --git a/language/es_ES/upgrade.lang.php b/language/es_ES/upgrade.lang.php index 35f996a3c..c83706b36 100644 --- a/language/es_ES/upgrade.lang.php +++ b/language/es_ES/upgrade.lang.php @@ -37,7 +37,7 @@ $lang['Perform a maintenance check in [Administration>Specials>Maintenance] if y $lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = "Por precaución, el plugins siguiente han sido desactivados. Verifique si existen unas actualización antes de reactivarlos:"; $lang['Only administrator can run upgrade: please sign in below.'] = "Sólo un administrador puede lanzar la actualización: por favor, identifiqúese más abajo."; $lang['You do not have access rights to run upgrade'] = ""; -$lang['In <i>include/config_database.inc.php</i>, before <b>?></b>, insert:'] = ""; +$lang['In <i>%s</i>, before <b>?></b>, insert:'] = ""; $lang['All sub-categories of private categories become private'] = "Todas las subcategorÃas de categorÃas privadas se vuelven privadas"; $lang['User permissions and group permissions have been erased'] = "Las autorizaciones de los usuarios y de los grupos han sido borradas"; $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = "Sólo el prefijo de las miniaturas y el email del webmestre han sido salvaguardados por la configuración precedente"; diff --git a/language/fr_FR/install.lang.php b/language/fr_FR/install.lang.php index 7753b06d4..230747e2c 100644 --- a/language/fr_FR/install.lang.php +++ b/language/fr_FR/install.lang.php @@ -37,7 +37,7 @@ $lang['Connection to server succeed, but it was impossible to connect to databas $lang['Can\'t connect to server'] = "Impossible de se connecter au serveur"; $lang['The next step of the installation is now possible'] = "La prochaine étape d'installation est désormais possible"; $lang['next step'] = "étape suivante"; -$lang['Copy the text in pink between hyphens and paste it into the file "include/config_database.inc.php"(Warning : config_database.inc.php must only contain what is in pink, no line return or space character)'] = "Copiez le texte en rose entre les tirets et collez-le dans le fichier config_database.inc.php qui se trouve dans le répertoire \"include\" à la base de l'endroit où vous avez installé Piwigo (le fichier config_database.inc.php ne doit comporter QUE ce qui est en rose entre les tirets, aucun retour à la ligne ou espace n'est autorisé)"; +$lang['Copy the text in pink between hyphens and paste it into the file "local/config/database.inc.php"(Warning : database.inc.php must only contain what is in pink, no line return or space character)'] = "Copiez le texte en rose entre les tirets et collez-le dans le fichier database.inc.php qui se trouve dans le répertoire \"include\" à la base de l'endroit où vous avez installé Piwigo (le fichier database.inc.php ne doit comporter QUE ce qui est en rose entre les tirets, aucun retour à la ligne ou espace n'est autorisé)"; $lang['Database type'] = "Type de base de données"; $lang['The type of database your piwigo data will be store in'] = "La base de données à utiliser pour installer piwigo"; $lang['Host'] = "Hôte"; diff --git a/language/fr_FR/upgrade.lang.php b/language/fr_FR/upgrade.lang.php index d8fa4dec9..b19b801c6 100644 --- a/language/fr_FR/upgrade.lang.php +++ b/language/fr_FR/upgrade.lang.php @@ -37,7 +37,7 @@ $lang['Perform a maintenance check in [Administration>Specials>Maintenance] if y $lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = "Par précaution, les plugins suivants ont été désactivés. Vérifiez s'il existe des mises à jour avant de les réactiver:"; $lang['Only administrator can run upgrade: please sign in below.'] = "Seul un administrateur peut lancer la mise à jour: veuillez vous identifier ci-dessous."; $lang['You do not have access rights to run upgrade'] = "Vous n'avez pas les droits necessaires pour lancer la mise à jour."; -$lang['In <i>include/config_database.inc.php</i>, before <b>?></b>, insert:'] = "Dans le fichier <i>include/config_database.inc.php</i>, avant <b>?></b>, insérez:"; +$lang['In <i>%s</i>, before <b>?></b>, insert:'] = "Dans le fichier <i>%s</i>, avant <b>?></b>, insérez:"; $lang['All sub-categories of private categories become private'] = "Toutes les sous-catégories de catégories privées deviennent privées"; $lang['User permissions and group permissions have been erased'] = "Les permissions des utilisateurs et des groupes ont été effacées"; $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = "Seuls le préfixe des miniatures et l'adresse email du webmestre ont étés sauvegardés de la configuration précédente"; diff --git a/language/it_IT/install.lang.php b/language/it_IT/install.lang.php index 93c41399e..0975abf8e 100644 --- a/language/it_IT/install.lang.php +++ b/language/it_IT/install.lang.php @@ -37,7 +37,7 @@ $lang['Connection to server succeed, but it was impossible to connect to databas $lang['Can\'t connect to server'] = "Non è stato possibile connettersi al server"; $lang['The next step of the installation is now possible'] = "Il prossimo step d'installazione è oramail possibile"; $lang['next step'] = "step successivo"; -$lang['Copy the text in pink between hyphens and paste it into the file "include/config_database.inc.php"(Warning : config_database.inc.php must only contain what is in pink, no line return or space character)'] = "Copiate il testo in rosa trà i trattini e mettetelo nel file config_database.inc.php che si trova nella directory \"include\" alla base del vostro sito dove aveto installato Piwigo (il file config_database.inc.php non deve contenere altro che ciò che è in rosa tra i trattini, nessun ritorno a capo o spazio è autorizzato)"; +$lang['Copy the text in pink between hyphens and paste it into the file "local/config/database.inc.php"(Warning : database.inc.php must only contain what is in pink, no line return or space character)'] = "Copiate il testo in rosa trà i trattini e mettetelo nel file database.inc.php che si trova nella directory \"local/config\" alla base del vostro sito dove aveto installato Piwigo (il file database.inc.php non deve contenere altro che ciò che è in rosa tra i trattini, nessun ritorno a capo o spazio è autorizzato)"; $lang['Database type'] = "Tipo di Database"; $lang['The type of database your piwigo data will be store in'] = "La base dati da utilizzare per installare Piwigo"; $lang['Host'] = "Host"; diff --git a/language/it_IT/upgrade.lang.php b/language/it_IT/upgrade.lang.php index 4dd1cd7cc..5027b7e15 100644 --- a/language/it_IT/upgrade.lang.php +++ b/language/it_IT/upgrade.lang.php @@ -37,7 +37,7 @@ $lang['Perform a maintenance check in [Administration>Specials>Maintenance] if y $lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = "Per precauzione, i plugins sono stati disattivati. Verificate se non esistono degli aggiornamenti prima di riattivarli:"; $lang['Only administrator can run upgrade: please sign in below.'] = "Solo un'amministratore può eseguire l'aggiornamento: identificatevi."; $lang['You do not have access rights to run upgrade'] = "Non avete le autorizzazioni necessarie per effettuare l'aggiornamento"; -$lang['In <i>include/config_database.inc.php</i>, before <b>?></b>, insert:'] = "Nel file <i>include/config_database.inc.php</i>, prima di <b>?></b>, inserire:"; +$lang['In <i>%s</i>, before <b>?></b>, insert:'] = "Nel file <i>%s</i>, prima di <b>?></b>, inserire:"; $lang['All sub-categories of private categories become private'] = "Tutte le sottocategorie delle categorie private diventono private"; $lang['User permissions and group permissions have been erased'] = "I permessi degli utenti e dei gruppi sono stati cancellati"; $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = "Solo il prefisso delle miniature e l'email del webmaster sono stati recuperati dalla precedente configurazione"; diff --git a/language/nl_NL/install.lang.php b/language/nl_NL/install.lang.php index b23dd9df3..c4ea8041c 100644 --- a/language/nl_NL/install.lang.php +++ b/language/nl_NL/install.lang.php @@ -37,7 +37,7 @@ $lang['Connection to server succeed, but it was impossible to connect to databas $lang['Can\'t connect to server'] = "Geen verbinding met de server"; $lang['The next step of the installation is now possible'] = "Het is nu mogelijk om verder te gaan met de volgende stap van de installatie"; $lang['next step'] = "volgende stap"; -$lang['Copy the text in pink between hyphens and paste it into the file "include/config_database.inc.php"(Warning : config_database.inc.php must only contain what is in pink, no line return or space character)'] = "Kopieer de tekst tussen de lijnen en plak deze in het bestand \"include/config_database.inc.php\"(Waarschuwing: config_database.inc.php mag alleen het roze gedeelte bevatten, geen return of extra spatie). Dit moet alleen wanneer dit bestand geen schrijfrechten"; +$lang['Copy the text in pink between hyphens and paste it into the file "local/config/database.inc.php"(Warning : database.inc.php must only contain what is in pink, no line return or space character)'] = "Kopieer de tekst tussen de lijnen en plak deze in het bestand \"local/config/database.inc.php\"(Waarschuwing: database.inc.php mag alleen het roze gedeelte bevatten, geen return of extra spatie). Dit moet alleen wanneer dit bestand geen schrijfrechten"; $lang['Database type'] = "Database type"; $lang['The type of database your piwigo data will be store in'] = "The type of database your piwigo data will be store in"; $lang['Host'] = "Host"; diff --git a/language/nl_NL/upgrade.lang.php b/language/nl_NL/upgrade.lang.php index 806c1cc01..39247cad0 100644 --- a/language/nl_NL/upgrade.lang.php +++ b/language/nl_NL/upgrade.lang.php @@ -37,7 +37,7 @@ $lang['Perform a maintenance check in [Administration>Specials>Maintenance] if y $lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = "As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:"; $lang['Only administrator can run upgrade: please sign in below.'] = "Only administrator can run upgrade: please sign in below."; $lang['You do not have access rights to run upgrade'] = "You do not have access rights to run upgrade"; -$lang['In <i>include/config_database.inc.php</i>, before <b>?></b>, insert:'] = "In <i>include/config_database.inc.php</i>, before <b>?></b>, insert:"; +$lang['In <i>%s</i>, before <b>?></b>, insert:'] = "In <i>%s</i>, before <b>?></b>, insert:"; $lang['All sub-categories of private categories become private'] = "All sub-categories of private categories become private"; $lang['User permissions and group permissions have been erased'] = "User permissions and group permissions have been erased"; $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = "Only thumbnails prefix and webmaster mail address have been saved from previous configuration"; diff --git a/language/pl_PL/install.lang.php b/language/pl_PL/install.lang.php index 7ddccc3e3..ddacbc392 100644 --- a/language/pl_PL/install.lang.php +++ b/language/pl_PL/install.lang.php @@ -37,7 +37,7 @@ $lang['Connection to server succeed, but it was impossible to connect to databas $lang['Can\'t connect to server'] = "Nie można poÅ‚Ä…czyć sie do serwera"; $lang['The next step of the installation is now possible'] = "Teraz mozliwy jest nastÄ™pny krok instalacji"; $lang['next step'] = "nastÄ™pny krok"; -$lang['Copy the text in pink between hyphens and paste it into the file "include/config_database.inc.php"(Warning : config_database.inc.php must only contain what is in pink, no line return or space character)'] = "Skopiuj tekst zaznaczony na różowo pomiÄ™dzy cudzysÅ‚owiami i wklej do pliku \"include/config_database.inc.php\"(Uwaga : config_database.inc.php musi zawierać tylko to co jest na różowo bez żadnych znaków koÅ„ca linii czy spacji)"; +$lang['Copy the text in pink between hyphens and paste it into the file "local/config/database.inc.php"(Warning : database.inc.php must only contain what is in pink, no line return or space character)'] = "Skopiuj tekst zaznaczony na różowo pomiÄ™dzy cudzysÅ‚owiami i wklej do pliku \"local/config/database.inc.php\"(Uwaga : database.inc.php musi zawierać tylko to co jest na różowo bez żadnych znaków koÅ„ca linii czy spacji)"; $lang['Database type'] = "Database type"; $lang['The type of database your piwigo data will be store in'] = "The type of database your piwigo data will be store in"; $lang['Host'] = "Host"; diff --git a/language/pl_PL/upgrade.lang.php b/language/pl_PL/upgrade.lang.php index 82c048c18..afbb6e17d 100644 --- a/language/pl_PL/upgrade.lang.php +++ b/language/pl_PL/upgrade.lang.php @@ -37,7 +37,7 @@ $lang['Perform a maintenance check in [Administration>Specials>Maintenance] if y $lang['As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'] = "W ramach zabezpieczenia zostÄ…Å‚y deaktywowane nastÄ™pujÄ…ce wtyczki. Przed ich ponownÄ… aktywacjÄ… musisz sprawdzić dostÄ™pność aktualizacji dla nich:"; $lang['Only administrator can run upgrade: please sign in below.'] = "Tylko administrator może wykonać aktualizacjÄ™: zaloguj siÄ™ poniżej."; $lang['You do not have access rights to run upgrade'] = "Nie masz uprawnieÅ„ do wykonania aktualizacji"; -$lang['In <i>include/config_database.inc.php</i>, before <b>?></b>, insert:'] = "W pliku <i>include/config_database.inc.php</i>, przed <b>?></b>, wstaw:"; +$lang['In <i>%s</i>, before <b>?></b>, insert:'] = "W pliku <i>%s</i>, przed <b>?></b>, wstaw:"; $lang['All sub-categories of private categories become private'] = "Wszystkie podkategorie kategorii prywatnych stanÄ… siÄ™ prywatne"; $lang['User permissions and group permissions have been erased'] = "Uprawnienia użytkowników oraz grup zostaÅ‚y usuniÄ™te"; $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = "Z poprzedniej konfiguracji zostaÅ‚y zapisane tylko prefixy miniatur oraz adres email administratora."; diff --git a/language/templates/install.lang.php b/language/templates/install.lang.php index 003cbc945..dce0500f0 100644 --- a/language/templates/install.lang.php +++ b/language/templates/install.lang.php @@ -37,7 +37,7 @@ $lang['step1_err_db'] = 'Connection to server succeed, but it was impossible to $lang['step1_err_server'] = 'Can\'t connect to server'; $lang['step1_err_copy_2'] = 'The next step of the installation is now possible'; $lang['step1_err_copy_next'] = 'next step'; -$lang['step1_err_copy'] = 'Copy the text in pink between hyphens and paste it into the file "include/config_database.inc.php"(Warning : config_database.inc.php must only contain what is in pink, no line return or space character)'; +$lang['step1_err_copy'] = 'Copy the text in pink between hyphens and paste it into the file "local/config/database.inc.php"(Warning : database.inc.php must only contain what is in pink, no line return or space character)'; $lang['step1_dbengine'] = 'Database type'; $lang['step1_dbengine_info'] = 'The type of database your piwigo data will be store in'; diff --git a/language/templates/upgrade.lang.php b/language/templates/upgrade.lang.php index 8d8871d79..5491e1bd2 100644 --- a/language/templates/upgrade.lang.php +++ b/language/templates/upgrade.lang.php @@ -34,7 +34,7 @@ $lang['perform a maintenance check'] = 'Perform a maintenance check in [Administ $lang['deactivated plugins'] = 'As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:'; $lang['upgrade login message'] = 'Only administrator can run upgrade: please sign in below.'; $lang['You do not have access rights to run upgrade'] = 'You do not have access rights to run upgrade'; -$lang['in include/config_database.inc.php, before ?>, insert:'] = 'In <i>include/config_database.inc.php</i>, before <b>?></b>, insert:'; +$lang['in <i>%s</i>, before ?>, insert:'] = 'In <i>%s</i>, before <b>?></b>, insert:'; // Upgrade informations from upgrade_1.3.1.php $lang['all sub-categories of private categories become private'] = 'All sub-categories of private categories become private'; diff --git a/tools/pwg_rel_create.sh b/tools/pwg_rel_create.sh index a24033309..4f62a914c 100755 --- a/tools/pwg_rel_create.sh +++ b/tools/pwg_rel_create.sh @@ -31,9 +31,9 @@ cd $version svn export http://piwigo.org/svn/tags/$tag piwigo -# creating config_database.inc.php empty and writeable -touch piwigo/include/config_database.inc.php -chmod a+w piwigo/include/config_database.inc.php +# creating database.inc.php empty and writeable +touch piwigo/local/config/database.inc.php +chmod a+w piwigo/local/config/database.inc.php zip -r $name.zip piwigo diff --git a/upgrade.php b/upgrade.php index e4b92834d..7063bf6b0 100644 --- a/upgrade.php +++ b/upgrade.php @@ -24,7 +24,7 @@ define('PHPWG_ROOT_PATH', './'); // load config file -$config_file = PHPWG_ROOT_PATH.'include/config_database.inc.php'; +$config_file = PHPWG_ROOT_PATH.'local/config/database.inc.php'; $config_file_contents = @file_get_contents($config_file); if ($config_file_contents === false) { @@ -40,7 +40,7 @@ include_once(PHPWG_ROOT_PATH.'include/functions.inc.php'); include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); include_once(PHPWG_ROOT_PATH.'admin/include/functions_upgrade.php'); -include(PHPWG_ROOT_PATH.'include/config_database.inc.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 .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php'); @@ -267,7 +267,7 @@ if (isset($_POST['submit']) and check_upgrade()) $conf['die_on_sql_error'] = false; include($upgrade_file); - // Something to add in config_database.inc.php? + // Something to add in database.inc.php? if (!empty($mysql_changes)) { $config_file_contents = @@ -279,7 +279,7 @@ if (isset($_POST['submit']) and check_upgrade()) { array_push($page['infos'], l10n_args('in <i>%s</i>, before <b>?></b>, insert:', - 'include/config_database.inc.php') . + 'local/config/database.inc.php') . '<p><textarea rows="4" cols="40">' . implode("\r\n" , $mysql_changes).'</textarea></p>' ); diff --git a/upgrade_feed.php b/upgrade_feed.php index bf3da82b2..52cf1d0ca 100644 --- a/upgrade_feed.php +++ b/upgrade_feed.php @@ -32,7 +32,7 @@ define('PHPWG_ROOT_PATH', './'); include_once(PHPWG_ROOT_PATH.'include/functions.inc.php'); include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); include_once(PHPWG_ROOT_PATH.'admin/include/functions_upgrade.php'); -include(PHPWG_ROOT_PATH.'include/config_database.inc.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 .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php'); |