Changeset 5213
- Timestamp:
- Mar 21, 2010, 1:32:49 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 24 edited
-
include/common.inc.php (modified) (1 diff)
-
install.php (modified) (3 diffs)
-
install/db/65-database.php (modified) (1 diff)
-
install/db/80-database.php (modified) (3 diffs)
-
install/upgrade_1.3.1.php (modified) (2 diffs)
-
language/de_DE/install.lang.php (modified) (1 diff)
-
language/de_DE/upgrade.lang.php (modified) (1 diff)
-
language/en_UK/install.lang.php (modified) (1 diff)
-
language/en_UK/upgrade.lang.php (modified) (1 diff)
-
language/es_ES/install.lang.php (modified) (1 diff)
-
language/es_ES/upgrade.lang.php (modified) (1 diff)
-
language/fr_FR/install.lang.php (modified) (1 diff)
-
language/fr_FR/upgrade.lang.php (modified) (1 diff)
-
language/it_IT/install.lang.php (modified) (1 diff)
-
language/it_IT/upgrade.lang.php (modified) (1 diff)
-
language/nl_NL/install.lang.php (modified) (1 diff)
-
language/nl_NL/upgrade.lang.php (modified) (1 diff)
-
language/pl_PL/install.lang.php (modified) (1 diff)
-
language/pl_PL/upgrade.lang.php (modified) (1 diff)
-
language/templates/install.lang.php (modified) (1 diff)
-
language/templates/upgrade.lang.php (modified) (1 diff)
-
tools/pwg_rel_create.sh (modified) (1 diff)
-
upgrade.php (modified) (4 diffs)
-
upgrade_feed.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/common.inc.php
r5208 r5213 71 71 $filter = array(); 72 72 73 @include(PHPWG_ROOT_PATH .' include/config_database.inc.php');73 @include(PHPWG_ROOT_PATH .'local/config/database.inc.php'); 74 74 if (!defined('PHPWG_INSTALLED')) 75 75 { -
trunk/install.php
r5207 r5213 123 123 $errors = array(); 124 124 125 // database config file migration : mysql.inc.php et config_database.inc.php125 // database config file migration : mysql.inc.php et database.inc.php 126 126 $old_config_file = PHPWG_ROOT_PATH . 'include/mysql.inc.php'; 127 $config_file = PHPWG_ROOT_PATH . ' include/config_database.inc.php';127 $config_file = PHPWG_ROOT_PATH . 'local/config/database.inc.php'; 128 128 if (!file_exists($config_file) && file_exists($old_config_file)) 129 129 { … … 305 305 $html_content = htmlentities( $file_content, ENT_QUOTES ); 306 306 $html_content = nl2br( $html_content ); 307 $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)');307 $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)'); 308 308 $error_copy .= '<br>--------------------------------------------------------------------<br>'; 309 309 $error_copy .= '<span class="sql_content">' . $html_content . '</span>'; … … 392 392 $html_content = htmlentities( $file_content, ENT_QUOTES ); 393 393 $html_content = nl2br( $html_content ); 394 $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)');394 $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)'); 395 395 $error_copy .= '<br>--------------------------------------------------------------------<br>'; 396 396 $error_copy .= '<span class="sql_content">' . $html_content . '</span>'; -
trunk/install/db/65-database.php
r5196 r5213 256 256 257 257 // +-----------------------------------------------------------------------+ 258 // changes to write in config_database.inc.php258 // changes to write in database.inc.php 259 259 array_push($mysql_changes, 260 260 'define(\'PWG_CHARSET\', \''.$pwg_charset.'\'); -
trunk/install/db/80-database.php
r5196 r5213 174 174 'include_phpwebgallery/config.php', 175 175 'include_phpwebgallery/index.htm', 176 'include_phpwebgallery/ config_database.inc.php',176 'include_phpwebgallery/local/config/database.inc.php', 177 177 'index.htm', 178 178 // Comparison between phpwebgallery-1.2.1 and phpwebgallery-1.1.0 … … 928 928 'admin/template/goto/theme/roma/images/bottom-left-bg.png', 929 929 'admin/template/goto/theme/roma/images/top-left-bg.png', 930 ' include/config_database.inc.php',930 'local/config/database.inc.php', 931 931 'template-common/lib/ui/ui.accordion.packed.js', 932 932 'template-common/lib/ui/ui.core.packed.js', … … 944 944 945 945 $list_exlude_files = array( 946 ' include/config_database.inc.php',946 'local/config/database.inc.php', 947 947 ); 948 948 -
trunk/install/upgrade_1.3.1.php
r5196 r5213 580 580 581 581 // load the config file 582 $config_file = PHPWG_ROOT_PATH.' include/config_database.inc.php';582 $config_file = PHPWG_ROOT_PATH.'local/config/database.inc.php'; 583 583 $config_file_contents = @file_get_contents($config_file); 584 584 if ($config_file_contents === false) … … 596 596 } 597 597 598 // changes to write in config_database.inc.php598 // changes to write in database.inc.php 599 599 array_push($mysql_changes, 'define(\'PHPWG_INSTALLED\', true);'); 600 600 -
trunk/language/de_DE/install.lang.php
r5156 r5213 38 38 $lang['The next step of the installation is now possible'] = "Der nächste Schritt der Installation ist nun möglich"; 39 39 $lang['next step'] = "nächster Schritt"; 40 $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)";40 $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)"; 41 41 $lang['Database type'] = "Database type"; 42 42 $lang['The type of database your piwigo data will be store in'] = "The type of database your piwigo data will be store in"; -
trunk/language/de_DE/upgrade.lang.php
r5156 r5213 38 38 $lang['Only administrator can run upgrade: please sign in below.'] = "Nur Administrator können Upgrade ausführen : Bitte melden Sie sich an unter."; 39 39 $lang['You do not have access rights to run upgrade'] = "Sie haben nicht das Recht auf Zugang zum Upgrade ausführen"; 40 $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:";40 $lang['In <i>%s</i>, before <b>?></b>, insert:'] = "In <i>%s</i>, vor <b>?></b>, wird Folgendes eingefügt:"; 41 41 $lang['All sub-categories of private categories become private'] = "Alle Unter-Kategorien von privaten Gruppen wirden privaten"; 42 42 $lang['User permissions and group permissions have been erased'] = "Benutzer und Gruppen Berechtigungen wurden gelöscht"; -
trunk/language/en_UK/install.lang.php
r5156 r5213 38 38 $lang['The next step of the installation is now possible'] = "The next step of the installation is now possible"; 39 39 $lang['next step'] = "next step"; 40 $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)";40 $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)"; 41 41 $lang['Database type'] = "Database type"; 42 42 $lang['The type of database your piwigo data will be store in'] = "The type of database your piwigo data will be store in"; -
trunk/language/en_UK/upgrade.lang.php
r5156 r5213 38 38 $lang['Only administrator can run upgrade: please sign in below.'] = "Only administrator can run upgrade: please sign in below."; 39 39 $lang['You do not have access rights to run upgrade'] = "You do not have access rights to run upgrade"; 40 $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:";40 $lang['In <i>%s</i>, before <b>?></b>, insert:'] = "In <i>%s</i>, before <b>?></b>, insert:"; 41 41 $lang['All sub-categories of private categories become private'] = "All sub-categories of private categories become private"; 42 42 $lang['User permissions and group permissions have been erased'] = "User permissions and group permissions have been erased"; -
trunk/language/es_ES/install.lang.php
r5156 r5213 38 38 $lang['The next step of the installation is now possible'] = "Puede seguir con la instalación sigiente"; 39 39 $lang['next step'] = "Etapa siguiente"; 40 $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)";40 $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)"; 41 41 $lang['Database type'] = "Database type"; 42 42 $lang['The type of database your piwigo data will be store in'] = "The type of database your piwigo data will be store in"; -
trunk/language/es_ES/upgrade.lang.php
r5156 r5213 38 38 $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."; 39 39 $lang['You do not have access rights to run upgrade'] = ""; 40 $lang['In <i> include/config_database.inc.php</i>, before <b>?></b>, insert:'] = "";40 $lang['In <i>%s</i>, before <b>?></b>, insert:'] = ""; 41 41 $lang['All sub-categories of private categories become private'] = "Todas las subcategorías de categorías privadas se vuelven privadas"; 42 42 $lang['User permissions and group permissions have been erased'] = "Las autorizaciones de los usuarios y de los grupos han sido borradas"; -
trunk/language/fr_FR/install.lang.php
r5156 r5213 38 38 $lang['The next step of the installation is now possible'] = "La prochaine étape d'installation est désormais possible"; 39 39 $lang['next step'] = "étape suivante"; 40 $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é)";40 $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é)"; 41 41 $lang['Database type'] = "Type de base de données"; 42 42 $lang['The type of database your piwigo data will be store in'] = "La base de données à utiliser pour installer piwigo"; -
trunk/language/fr_FR/upgrade.lang.php
r5156 r5213 38 38 $lang['Only administrator can run upgrade: please sign in below.'] = "Seul un administrateur peut lancer la mise à jour: veuillez vous identifier ci-dessous."; 39 39 $lang['You do not have access rights to run upgrade'] = "Vous n'avez pas les droits necessaires pour lancer la mise à jour."; 40 $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:";40 $lang['In <i>%s</i>, before <b>?></b>, insert:'] = "Dans le fichier <i>%s</i>, avant <b>?></b>, insérez:"; 41 41 $lang['All sub-categories of private categories become private'] = "Toutes les sous-catégories de catégories privées deviennent privées"; 42 42 $lang['User permissions and group permissions have been erased'] = "Les permissions des utilisateurs et des groupes ont été effacées"; -
trunk/language/it_IT/install.lang.php
r5156 r5213 38 38 $lang['The next step of the installation is now possible'] = "Il prossimo step d'installazione è oramail possibile"; 39 39 $lang['next step'] = "step successivo"; 40 $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)";40 $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)"; 41 41 $lang['Database type'] = "Tipo di Database"; 42 42 $lang['The type of database your piwigo data will be store in'] = "La base dati da utilizzare per installare Piwigo"; -
trunk/language/it_IT/upgrade.lang.php
r5156 r5213 38 38 $lang['Only administrator can run upgrade: please sign in below.'] = "Solo un'amministratore può eseguire l'aggiornamento: identificatevi."; 39 39 $lang['You do not have access rights to run upgrade'] = "Non avete le autorizzazioni necessarie per effettuare l'aggiornamento"; 40 $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:";40 $lang['In <i>%s</i>, before <b>?></b>, insert:'] = "Nel file <i>%s</i>, prima di <b>?></b>, inserire:"; 41 41 $lang['All sub-categories of private categories become private'] = "Tutte le sottocategorie delle categorie private diventono private"; 42 42 $lang['User permissions and group permissions have been erased'] = "I permessi degli utenti e dei gruppi sono stati cancellati"; -
trunk/language/nl_NL/install.lang.php
r5156 r5213 38 38 $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"; 39 39 $lang['next step'] = "volgende stap"; 40 $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";40 $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"; 41 41 $lang['Database type'] = "Database type"; 42 42 $lang['The type of database your piwigo data will be store in'] = "The type of database your piwigo data will be store in"; -
trunk/language/nl_NL/upgrade.lang.php
r5156 r5213 38 38 $lang['Only administrator can run upgrade: please sign in below.'] = "Only administrator can run upgrade: please sign in below."; 39 39 $lang['You do not have access rights to run upgrade'] = "You do not have access rights to run upgrade"; 40 $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:";40 $lang['In <i>%s</i>, before <b>?></b>, insert:'] = "In <i>%s</i>, before <b>?></b>, insert:"; 41 41 $lang['All sub-categories of private categories become private'] = "All sub-categories of private categories become private"; 42 42 $lang['User permissions and group permissions have been erased'] = "User permissions and group permissions have been erased"; -
trunk/language/pl_PL/install.lang.php
r5156 r5213 38 38 $lang['The next step of the installation is now possible'] = "Teraz mozliwy jest następny krok instalacji"; 39 39 $lang['next step'] = "następny krok"; 40 $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)";40 $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)"; 41 41 $lang['Database type'] = "Database type"; 42 42 $lang['The type of database your piwigo data will be store in'] = "The type of database your piwigo data will be store in"; -
trunk/language/pl_PL/upgrade.lang.php
r5156 r5213 38 38 $lang['Only administrator can run upgrade: please sign in below.'] = "Tylko administrator może wykonać aktualizację: zaloguj się poniżej."; 39 39 $lang['You do not have access rights to run upgrade'] = "Nie masz uprawnień do wykonania aktualizacji"; 40 $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:";40 $lang['In <i>%s</i>, before <b>?></b>, insert:'] = "W pliku <i>%s</i>, przed <b>?></b>, wstaw:"; 41 41 $lang['All sub-categories of private categories become private'] = "Wszystkie podkategorie kategorii prywatnych staną się prywatne"; 42 42 $lang['User permissions and group permissions have been erased'] = "Uprawnienia użytkowników oraz grup zostały usunięte"; -
trunk/language/templates/install.lang.php
r5196 r5213 38 38 $lang['step1_err_copy_2'] = 'The next step of the installation is now possible'; 39 39 $lang['step1_err_copy_next'] = 'next step'; 40 $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)';40 $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)'; 41 41 42 42 $lang['step1_dbengine'] = 'Database type'; -
trunk/language/templates/upgrade.lang.php
r5196 r5213 35 35 $lang['upgrade login message'] = 'Only administrator can run upgrade: please sign in below.'; 36 36 $lang['You do not have access rights to run upgrade'] = 'You do not have access rights to run upgrade'; 37 $lang['in include/config_database.inc.php, before ?>, insert:'] = 'In <i>include/config_database.inc.php</i>, before <b>?></b>, insert:';37 $lang['in <i>%s</i>, before ?>, insert:'] = 'In <i>%s</i>, before <b>?></b>, insert:'; 38 38 39 39 // Upgrade informations from upgrade_1.3.1.php -
trunk/tools/pwg_rel_create.sh
r4669 r5213 32 32 svn export http://piwigo.org/svn/tags/$tag piwigo 33 33 34 # creating config_database.inc.php empty and writeable35 touch piwigo/ include/config_database.inc.php36 chmod a+w piwigo/ include/config_database.inc.php34 # creating database.inc.php empty and writeable 35 touch piwigo/local/config/database.inc.php 36 chmod a+w piwigo/local/config/database.inc.php 37 37 38 38 zip -r $name.zip piwigo -
trunk/upgrade.php
r5207 r5213 25 25 26 26 // load config file 27 $config_file = PHPWG_ROOT_PATH.' include/config_database.inc.php';27 $config_file = PHPWG_ROOT_PATH.'local/config/database.inc.php'; 28 28 $config_file_contents = @file_get_contents($config_file); 29 29 if ($config_file_contents === false) … … 41 41 include_once(PHPWG_ROOT_PATH.'admin/include/functions_upgrade.php'); 42 42 43 include(PHPWG_ROOT_PATH.' include/config_database.inc.php');43 include(PHPWG_ROOT_PATH.'local/config/database.inc.php'); 44 44 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php'); 45 45 @include(PHPWG_ROOT_PATH. 'include/config_local.inc.php'); … … 268 268 include($upgrade_file); 269 269 270 // Something to add in config_database.inc.php?270 // Something to add in database.inc.php? 271 271 if (!empty($mysql_changes)) 272 272 { … … 280 280 array_push($page['infos'], 281 281 l10n_args('in <i>%s</i>, before <b>?></b>, insert:', 282 ' include/config_database.inc.php') .282 'local/config/database.inc.php') . 283 283 '<p><textarea rows="4" cols="40">' . 284 284 implode("\r\n" , $mysql_changes).'</textarea></p>' -
trunk/upgrade_feed.php
r5196 r5213 33 33 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); 34 34 include_once(PHPWG_ROOT_PATH.'admin/include/functions_upgrade.php'); 35 include(PHPWG_ROOT_PATH.' include/config_database.inc.php');35 include(PHPWG_ROOT_PATH.'local/config/database.inc.php'); 36 36 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php'); 37 37 @include(PHPWG_ROOT_PATH. 'include/config_local.inc.php');
Note: See TracChangeset
for help on using the changeset viewer.
