Skip to content

Commit baeb2be

Browse files
committed
- Fixed bugs in the updater related to multiserver setups.
- Updated french translation.
1 parent a3ca8d9 commit baeb2be

File tree

122 files changed

+2390
-1867
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+2390
-1867
lines changed

install/update.php

Lines changed: 42 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -149,18 +149,46 @@
149149
system("mysqldump -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -c -t --add-drop-table --all --quick ".$conf['mysql']['database']." > existing_db.sql");
150150
}
151151

152+
// create a backup copy of the ispconfig database in the root folder
153+
$backup_db_name = '/root/ispconfig_db_backup_'.@date('Y-m-d_h-i').'.sql';
154+
copy('existing_db.sql',$backup_db_name);
155+
exec("chmod 700 $backup_db_name");
156+
exec("chown root:root $backup_db_name");
157+
152158

153159
//* initialize the database
154160
$inst->db = new db();
155161

156162
//* initialize the master DB, if we have a multiserver setup
157163
if($conf['mysql']['master_slave_setup'] == 'y') {
158-
$inst->dbmaster = new db();
159-
if($inst->dbmaster->linkId) $inst->dbmaster->closeConn();
160-
$inst->dbmaster->dbHost = $conf['mysql']["master_host"];
161-
$inst->dbmaster->dbName = $conf['mysql']["master_database"];
162-
$inst->dbmaster->dbUser = $conf['mysql']["master_admin_user"];
163-
$inst->dbmaster->dbPass = $conf['mysql']["master_admin_password"];
164+
//** Get MySQL root credentials
165+
$finished = false;
166+
do {
167+
$tmp_mysql_server_host = $inst->free_query('MySQL master server hostname', $conf['mysql']['master_host']);
168+
$tmp_mysql_server_admin_user = $inst->free_query('MySQL master server root username', $conf['mysql']['master_admin_user']);
169+
$tmp_mysql_server_admin_password = $inst->free_query('MySQL master server root password', $conf['mysql']['master_admin_password']);
170+
$tmp_mysql_server_database = $inst->free_query('MySQL master server database name', $conf['mysql']['master_database']);
171+
172+
//* Initialize the MySQL server connection
173+
if(@mysql_connect($tmp_mysql_server_host, $tmp_mysql_server_admin_user, $tmp_mysql_server_admin_password)) {
174+
$conf['mysql']['master_host'] = $tmp_mysql_server_host;
175+
$conf['mysql']['master_admin_user'] = $tmp_mysql_server_admin_user;
176+
$conf['mysql']['master_admin_password'] = $tmp_mysql_server_admin_password;
177+
$conf['mysql']['master_database'] = $tmp_mysql_server_database;
178+
$finished = true;
179+
} else {
180+
swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());
181+
}
182+
} while ($finished == false);
183+
unset($finished);
184+
185+
// initialize the connection to the master database
186+
$inst->dbmaster = new db();
187+
if($inst->dbmaster->linkId) $inst->dbmaster->closeConn();
188+
$inst->dbmaster->dbHost = $conf['mysql']["master_host"];
189+
$inst->dbmaster->dbName = $conf['mysql']["master_database"];
190+
$inst->dbmaster->dbUser = $conf['mysql']["master_admin_user"];
191+
$inst->dbmaster->dbPass = $conf['mysql']["master_admin_password"];
164192
} else {
165193
$inst->dbmaster = $inst->db;
166194
}
@@ -188,8 +216,14 @@
188216
//** Create the mysql database
189217
$inst->configure_database();
190218

191-
//** Update master database rights
192-
$inst->grant_master_database_rights();
219+
if($conf['mysql']['master_slave_setup'] == 'y') {
220+
//** Update master database rights
221+
$reconfigure_master_database_rights_answer = $inst->simple_query('Reconfigure Permissions in master database?', array('yes','no'),'no');
222+
223+
if($reconfigure_master_database_rights_answer == 'yes') {
224+
$inst->grant_master_database_rights();
225+
}
226+
}
193227

194228
//** empty all databases
195229
$db_tables = $inst->db->getTables();
@@ -208,12 +242,6 @@
208242
system("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['mysql']['database']." < existing_db.sql");
209243
}
210244

211-
// create a backup copy of the ispconfig database in the root folder
212-
$backup_db_name = '/root/ispconfig_db_backup_'.@date('Y-m-d_h-i').'.sql';
213-
copy('existing_db.sql',$backup_db_name);
214-
exec("chmod 700 $backup_db_name");
215-
exec("chown root:root $backup_db_name");
216-
217245

218246
//** Update server ini
219247
$tmp_server_rec = $inst->db->queryOneRecord("SELECT config FROM server WHERE server_id = ".$conf['server_id']);

interface/lib/lang/fr.lng

Lines changed: 58 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,58 @@
1-
<?php
2-
$wb['conf_format_dateshort'] = 'Y-m-d';
3-
$wb['conf_format_datelong'] = 'l dS of F Y';
4-
$wb['conf_format_timeshort'] = 'H:i';
5-
$wb['conf_format_timelong'] = 'H:i:s';
6-
$wb['conf_format_datetime'] = 'Y-m-d H:i';
7-
$wb['301'] = 'Module interdit pour lutilisateur courant.';
8-
$wb['302'] = 'Module invalide.';
9-
$wb['1001'] = 'The username and password must not be empty!';
10-
$wb['1002'] = 'The username and/or password are not correct!';
11-
$wb['1003'] = 'The username is deactivated!';
12-
$wb['delete_confirmation'] = 'Do you really want to delete this record?';
13-
$wb['error_no_view_permission'] = 'You dont have the permission to view this record or this record does not exist!';
14-
$wb['error_no_delete_permission'] = 'You dont have the permission to delete this record!';
15-
$wb['page_txt'] = 'Page';
16-
$wb['page_of_txt'] = 'of';
17-
$wb['page_next_txt'] = 'Next';
18-
$wb['page_back_txt'] = 'Back';
19-
$wb['delete_txt'] = 'Delete';
20-
$wb['filter_txt'] = 'Filter';
21-
$wb['add_new_record_txt'] = 'Add new record';
22-
$wb['btn_save_txt'] = 'Save';
23-
$wb['btn_cancel_txt'] = 'Cancel';
24-
$wb['System'] = 'System';
25-
$wb['Client'] = 'Client';
26-
$wb['Email'] = 'Email';
27-
$wb['Monitor'] = 'Monitor';
28-
$wb['Sites'] = 'Sites';
29-
$wb['DNS'] = 'DNS';
30-
$wb['Tools'] = 'Tools';
31-
$wb['Help'] = 'Help';
32-
$wb['toolsarea_head_txt'] = 'Tools';
33-
?>
1+
<?php
2+
/*
3+
Traduction Française de ISPConfig 3
4+
Version 0.1 - Ecrite avec ISPConfig 3.0.1.4
5+
Copyright (C) 2009 Falistos - http://hyodream.fr/
6+
7+
Cette traduction est distribuée sous la licence GPL v3
8+
9+
This program is free software; you can redistribute it and/or modify
10+
it under the terms of the GNU General Public License as published by
11+
the Free Software Foundation; either version 2 of the License, or
12+
(at your option) any later version.
13+
14+
This program is distributed in the hope that it will be useful,
15+
but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
GNU General Public License for more details.
18+
19+
You should have received a copy of the GNU General Public License along
20+
with this program; if not, write to the Free Software Foundation, Inc.,
21+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
22+
23+
http://www.gnu.org/licenses/gpl.txt
24+
*/
25+
26+
$wb["conf_format_dateshort"] = "d-m-Y";
27+
$wb["conf_format_datelong"] = "d-m-Y";
28+
$wb["conf_format_timeshort"] = "H:i";
29+
$wb["conf_format_timelong"] = "H:i:s";
30+
$wb["conf_format_datetime"] = "d-m-Y H:i";
31+
$wb["301"] = "Module interdit pour l'utilisateur courant.";
32+
$wb["302"] = "Module invalide.";
33+
$wb["1001"] = "Le nomp d'utilisateur et/ou le nom de passe ne doivent pas être vides!";
34+
$wb["1002"] = "Le nom d'utilisateur et/ou le mot de passe son faux!!";
35+
$wb["1003"] = "L'utilisateur est désactivé!";
36+
$wb["delete_confirmation"] = "Vouslez-vous vraiment supprimer cet enregistrement";
37+
$wb["error_no_view_permission"] = "Vous n'avez pas la permission de voir cet enregistrement, ou il n'éxiste pas.";
38+
$wb["error_no_delete_permission"] = "Vous n'avez pas la permission de supprimer cet enregistrement!";
39+
$wb["page_txt"] = "Page";
40+
$wb["page_of_txt"] = "de";
41+
$wb["page_next_txt"] = "Suivant";
42+
$wb["page_back_txt"] = "Précédent";
43+
$wb["delete_txt"] = "Supprimer";
44+
$wb["filter_txt"] = "Filtrer";
45+
$wb["add_new_record_txt"] = "Ajouter une entrée";
46+
$wb["btn_save_txt"] = "Enregistrer";
47+
$wb["btn_cancel_txt"] = "Annuler";
48+
$wb["System"] = "Système";
49+
$wb["Client"] = "Client";
50+
$wb["Email"] = "Email";
51+
$wb["Monitor"] = "Moniteur";
52+
$wb["Sites"] = "Sites";
53+
$wb["DNS"] = "DNS";
54+
$wb["Tools"] = "Outils";
55+
$wb["Help"] = "Aide";
56+
$wb["toolsarea_head_txt"] = "Outils";
57+
?>
58+
Lines changed: 21 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,21 @@
1-
<?php
2-
$wb['1001'] = 'Nom dutilisateur ou mot de passe vide.';
3-
$wb['1002'] = 'Nom dutilisateur ou mot de passe faux.';
4-
$wb['Firewall'] = 'Firewall';
5-
$wb['Groups'] = 'Groups';
6-
$wb['groups_description'] = 'Form to edit systemuser groups.';
7-
$wb['Server'] = 'Server';
8-
$wb['Services'] = 'Services';
9-
$wb['Config'] = 'Config';
10-
$wb['Server Config'] = 'Server Config';
11-
$wb['Mail'] = 'Mail';
12-
$wb['Getmail'] = 'Getmail';
13-
$wb['Web'] = 'Web';
14-
$wb['FastCGI'] = 'FastCGI';
15-
$wb['Jailkit'] = 'Jailkit';
16-
$wb['System'] = 'System';
17-
$wb['Add user'] = 'Add user';
18-
$wb['Edit user'] = 'Edit user';
19-
$wb['CP Users'] = 'CP Users';
20-
$wb['Add group'] = 'Add group';
21-
$wb['Edit group'] = 'Edit group';
22-
$wb['Edit server'] = 'Edit server';
23-
$wb['Edit Server IP'] = 'Edit Server IP';
24-
$wb['Servers'] = 'Servers';
25-
$wb['Sync. Now'] = 'Sync. Now';
26-
$wb['DB Sync.'] = 'DB Sync.';
27-
$wb['Languages'] = 'Languages';
28-
$wb['New Language'] = 'New Language';
29-
$wb['Export'] = 'Export';
30-
$wb['Import'] = 'Import';
31-
$wb['Language Editor'] = 'Language Editor';
32-
$wb['Software'] = 'Software';
33-
$wb['Repositories'] = 'Repositories';
34-
?>
1+
<?php
2+
// Traduction française par Falistos (http://hyodream.fr/ispconfig-fr)
3+
// Traduction sous licence GPL v3, voir http://www.gnu.org/licenses/gpl.txt
4+
5+
$wb["pass_reset_txt"] = "Un nouveau mot de passe vous sera envoyé par e-mail si celle-ci correspond avec celle entrée dans vos pamramètres.";
6+
$wb["pw_reset"] = "Le mot de passe a été réinitialisé et envoyé à votre adresse e-mail.";
7+
$wb["pw_error"] = "Le nom d'utilisateur ou l'adresse e-mail ne correspondent pas.";
8+
$wb["pw_error_noinput"] = "Please enter email address and username.";
9+
$wb["pw_reset_mail_msg"] = "Le mot de passe d'accès à votre panneau contrôle ISPConfig a été réinitialisé. Le nouveau mot de passe est: ";
10+
$wb["pw_reset_mail_title"] = "Le mot de passe du panneau de contrôle ISPConfig a été réinitialisé.";
11+
$wb["user_regex_error"] = "Le nom d'utilisateur contient des caractères invalides, ou est plus grand que 64 caractères.";
12+
$wb["pw_error_length"] = "La longueur du mot de passe est supérieure à 64 caractères.";
13+
$wb["error_user_password_empty"] = "Nom d'utilisateur ou mot de passe vide.";
14+
$wb["error_user_password_incorrect"] = "Nom d'utilisateur ou mot de passe faux.";
15+
$wb["error_user_blocked"] = "L'utilisateur est bloqué.";
16+
$wb["error_user_too_many_logins"] = "Vous avez tenté trop de connections, veuillez réésayer dans 15 minutes.";
17+
$wb["username_txt"] = "Nom d'utilisateur";
18+
$wb["password_txt"] = "Mot de passe";
19+
$wb["login_button_txt"] = "Connection";
20+
?>
21+
Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
<?php
2-
$wb['server_id_txt'] = 'Server';
3-
$wb['tcp_port_txt'] = 'Open TCP ports';
4-
$wb['udp_port_txt'] = 'Open UDP ports';
5-
$wb['tcp_port_help_txt'] = 'Separated by comma';
6-
$wb['udp_port_help_txt'] = 'Separated by comma';
7-
$wb['active_txt'] = 'Active';
8-
$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
9-
$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, : and ,.';
10-
$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, : and ,.';
11-
?>
1+
<?php
2+
// Traduction française par Falistos (http://hyodream.fr/ispconfig-fr)
3+
// Traduction sous licence GPL v3, voir http://www.gnu.org/licenses/gpl.txt
4+
5+
$wb["server_id_txt"] = "Serveur";
6+
$wb["tcp_port_txt"] = "Ouvrir des ports TCP";
7+
$wb["udp_port_txt"] = "Ouvrir des ports UDP";
8+
$wb["tcp_port_help_txt"] = "Séparés par des virgules";
9+
$wb["udp_port_help_txt"] = "Séparés par des virgules";
10+
$wb["active_txt"] = "Actif";
11+
$wb["firewall_error_unique"] = "Il y a déja un enregistrement au pare-feu pour ce serveur.";
12+
$wb["tcp_ports_error_regex"] = "Caractère non autorisé dans la définition du port TCP. Les caractères autorisés sont les nombres, : et ,.";
13+
$wb["udp_ports_error_regex"] = "Caractère non autorisé dans la définition du port USP. Les caractères autorisés sont les nombres, : et ,.";
14+
?>
15+
Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
<?php
2-
$wb['list_head_txt'] = 'Firewall';
3-
$wb['active_txt'] = 'Active';
4-
$wb['server_id_txt'] = 'Server';
5-
$wb['tcp_port_txt'] = 'Open TCP ports';
6-
$wb['udp_port_txt'] = 'Open UDP ports';
7-
$wb['add_new_record_txt'] = 'Add Firewall record';
8-
?>
1+
<?php
2+
// Traduction française par Falistos (http://hyodream.fr/ispconfig-fr)
3+
// Traduction sous licence GPL v3, voir http://www.gnu.org/licenses/gpl.txt
4+
5+
$wb["list_head_txt"] = "Pare-feu";
6+
$wb["active_txt"] = "Actif";
7+
$wb["server_id_txt"] = "Serveur";
8+
$wb["tcp_port_txt"] = "Ouvrir des ports TCP";
9+
$wb["udp_port_txt"] = "Ouvrir des ports UDP";
10+
$wb["add_new_record_txt"] = "Ajouter un enregistrement au pare-feu";
11+
?>
12+
Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
<?php
2-
$wb['description_txt'] = 'Description';
3-
$wb['name_txt'] = 'Groupe';
4-
$wb['name_err'] = 'Le groupe doit avoir entre 1 et 30 Chars.';
5-
?>
1+
<?php
2+
// Traduction française par Falistos (http://hyodream.fr/ispconfig-fr)
3+
// Traduction sous licence GPL v3, voir http://www.gnu.org/licenses/gpl.txt
4+
5+
$wb["description_txt"] = "Description";
6+
$wb["name_txt"] = "Groupe";
7+
$wb["name_err"] = "Le groupe doit avoir entre 1 et 30 caractères.";
8+
?>
9+
Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
<?php
2-
$wb['list_head_txt'] = 'Groupes dutilisateur Syst�me';
3-
$wb['description_txt'] = 'Description';
4-
$wb['name_txt'] = 'Groupe';
5-
$wb['add_new_record_txt'] = 'Add new Group';
6-
?>
1+
<?php
2+
// Traduction française par Falistos (http://hyodream.fr/ispconfig-fr)
3+
// Traduction sous licence GPL v3, voir http://www.gnu.org/licenses/gpl.txt
4+
5+
$wb["list_head_txt"] = "Groupes d'utilisateurs système";
6+
$wb["description_txt"] = "Description";
7+
$wb["name_txt"] = "Groupe";
8+
$wb["add_new_record_txt"] = "Ajouter nouveau groupe";
9+
?>
10+
Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
<?php
2-
$wb['list_head_txt'] = 'Add new language';
3-
$wb['language_select_txt'] = 'Select language basis';
4-
$wb['language_new_txt'] = 'New language';
5-
$wb['btn_save_txt'] = 'Create new language file set';
6-
$wb['btn_cancel_txt'] = 'Back';
7-
$wb['language_new_hint_txt'] = '2 characters ISO 639-1 language-code (See http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)';
8-
?>
1+
<?php
2+
// Traduction française par Falistos (http://hyodream.fr/ispconfig-fr)
3+
// Traduction sous licence GPL v3, voir http://www.gnu.org/licenses/gpl.txt
4+
5+
$wb["list_head_txt"] = "Ajouter un nouveau lanage";
6+
$wb["language_select_txt"] = "Sélectionnez la base du langage";
7+
$wb["language_new_txt"] = "Nouveau langage";
8+
$wb["btn_save_txt"] = "Créer un nouveau fichier de langue";
9+
$wb["btn_cancel_txt"] = "Précédent";
10+
$wb["language_new_hint_txt"] = "2 caractères de l'ISO 639-1 code langage (Voir http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)";
11+
?>
12+
Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
<?php
2-
$wb['list_head_txt'] = 'Merge the selected language file with the english master language file. <br />This adds missing strings from the english master language files to the selected language.';
3-
$wb['language_select_txt'] = 'Select language';
4-
$wb['btn_save_txt'] = 'Merge files now';
5-
$wb['btn_cancel_txt'] = 'Back';
6-
$wb['list_desc_txt'] = 'Merge the selected language file with the english master language file. <br />This adds missing strings from the english master language files to the selected language.';
7-
?>
1+
<?php
2+
// Traduction française par Falistos (http://hyodream.fr/ispconfig-fr)
3+
// Traduction sous licence GPL v3, voir http://www.gnu.org/licenses/gpl.txt
4+
5+
$wb["list_head_txt"] = "Fusion de langages";
6+
$wb["language_select_txt"] = "Sélectionnez le langage";
7+
$wb["btn_save_txt"] = "Fusionner les fichiers";
8+
$wb["btn_cancel_txt"] = "Précédent";
9+
$wb["list_desc_txt"] = "Fusionne le langage sélectionné avec le langage principal anglais. <br />Ceci ajoute les élements manquant en anglais au fichier sélectionné.";
10+
?>
11+
Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
<?php
2-
$wb['list_head_txt'] = 'Language file editor';
3-
$wb['language_select_txt'] = 'Select language';
4-
$wb['module_txt'] = 'Module';
5-
$wb['lang_file_txt'] = 'Language file';
6-
$wb['btn_save_txt'] = 'Save';
7-
$wb['btn_cancel_txt'] = 'Back';
8-
?>
1+
<?php
2+
// Traduction française par Falistos (http://hyodream.fr/ispconfig-fr)
3+
// Traduction sous licence GPL v3, voir http://www.gnu.org/licenses/gpl.txt
4+
5+
$wb["list_head_txt"] = "Editeur de fichier de langue";
6+
$wb["language_select_txt"] = "Sélectionnez le langage";
7+
$wb["module_txt"] = "Module";
8+
$wb["lang_file_txt"] = "Fichier de langue";
9+
$wb["btn_save_txt"] = "Enregistrer";
10+
$wb["btn_cancel_txt"] = "Précédent";
11+
?>
12+

0 commit comments

Comments
 (0)