Skip to content

Commit 6882ab1

Browse files
tbrehmtbrehm
committed
Merged revisions 2794-2804 from stable branch.
1 parent 29c974a commit 6882ab1

File tree

348 files changed

+1530
-907
lines changed

Some content is hidden

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

348 files changed

+1530
-907
lines changed

‎install/autoupdate.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
ISPConfig 3 updater.
3232
*/
3333

34+
die("Autoupdate has been removed.\nPlease start the update on the shell with the command ispconfig_update.sh as root user.\n");
35+
3436
error_reporting(E_ALL|E_STRICT);
3537

3638
/*

‎install/lib/installer_base.lib.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ public function configure_postfix($options = '') {
635635

636636
//* If there are RBL's defined, format the list and add them to smtp_recipient_restrictions to prevent removeal after an update
637637
$rbl_list = '';
638-
if (isset($server_ini_array['mail']['realtime_blackhole_list']) && $server_ini_array['mail']['realtime_blackhole_list'] != '') {
638+
if (@isset($server_ini_array['mail']['realtime_blackhole_list']) && $server_ini_array['mail']['realtime_blackhole_list'] != '') {
639639
$rbl_hosts = explode(",",str_replace(" ", "", $server_ini_array['mail']['realtime_blackhole_list']));
640640
foreach ($rbl_hosts as $key => $value) {
641641
$rbl_list .= ", reject_rbl_client ". $value;

‎install/tpl/mailfilter.master‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,11 @@ if ( $RETURNCODE == 0 )
5757
}
5858

5959
# Create a mailsize file
60+
`test -e {dist_postfix_vmail_mailbox_base}/$HOST/$USER`
61+
if ( $RETURNCODE == 0 )
62+
{
6063
`echo $SIZE >> {dist_postfix_vmail_mailbox_base}/$HOST/$USER/ispconfig_mailsize`
64+
}
6165

6266

6367
#

‎interface/lib/classes/remoting.inc.php‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2979,8 +2979,152 @@ public function openvz_vm_delete($session_id, $vm_id)
29792979
return $affected_rows;
29802980
}
29812981

2982+
//* Start VM
2983+
public function openvz_vm_start($session_id, $vm_id)
2984+
{
2985+
global $app;
2986+
2987+
if(!$this->checkPerm($session_id, 'vm_openvz')) {
2988+
$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
2989+
return false;
2990+
}
2991+
2992+
$app->uses('remoting_lib');
2993+
$app->remoting_lib->loadFormDef('../vm/form/openvz_vm.tform.php');
2994+
$vm = $app->remoting_lib->getDataRecord($vm_id);
2995+
2996+
if(!is_array($vm)) {
2997+
$this->server->fault('action_pending', 'No VM with this ID available.');
2998+
return false;
2999+
}
3000+
3001+
if($vm['active'] == 'n') {
3002+
$this->server->fault('action_pending', 'VM is not in active state.');
3003+
return false;
3004+
}
3005+
3006+
$action = 'openvz_start_vm';
3007+
3008+
$tmp = $app->db->queryOneRecord("SELECT count(action_id) as actions FROM sys_remoteaction
3009+
WHERE server_id = '".$vm['server_id']."'
3010+
AND action_type = '$action'
3011+
AND action_param = '".$vm['veid']."'
3012+
AND action_state = 'pending'");
3013+
3014+
if($tmp['actions'] > 0) {
3015+
$this->server->fault('action_pending', 'There is already a action pending for this VM.');
3016+
return false;
3017+
} else {
3018+
$sql = "INSERT INTO sys_remoteaction (server_id, tstamp, action_type, action_param, action_state, response) " .
3019+
"VALUES (".
3020+
(int)$vm['server_id'] . ", ".
3021+
time() . ", ".
3022+
"'".$action."', ".
3023+
$vm['veid'].", ".
3024+
"'pending', ".
3025+
"''".
3026+
")";
3027+
$app->db->query($sql);
3028+
}
3029+
}
29823030

3031+
//* Stop VM
3032+
public function openvz_vm_stop($session_id, $vm_id)
3033+
{
3034+
global $app;
3035+
3036+
if(!$this->checkPerm($session_id, 'vm_openvz')) {
3037+
$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
3038+
return false;
3039+
}
3040+
3041+
$app->uses('remoting_lib');
3042+
$app->remoting_lib->loadFormDef('../vm/form/openvz_vm.tform.php');
3043+
$vm = $app->remoting_lib->getDataRecord($vm_id);
3044+
3045+
if(!is_array($vm)) {
3046+
$this->server->fault('action_pending', 'No VM with this ID available.');
3047+
return false;
3048+
}
3049+
3050+
if($vm['active'] == 'n') {
3051+
$this->server->fault('action_pending', 'VM is not in active state.');
3052+
return false;
3053+
}
3054+
3055+
$action = 'openvz_stop_vm';
3056+
3057+
$tmp = $app->db->queryOneRecord("SELECT count(action_id) as actions FROM sys_remoteaction
3058+
WHERE server_id = '".$vm['server_id']."'
3059+
AND action_type = '$action'
3060+
AND action_param = '".$vm['veid']."'
3061+
AND action_state = 'pending'");
3062+
3063+
if($tmp['actions'] > 0) {
3064+
$this->server->fault('action_pending', 'There is already a action pending for this VM.');
3065+
return false;
3066+
} else {
3067+
$sql = "INSERT INTO sys_remoteaction (server_id, tstamp, action_type, action_param, action_state, response) " .
3068+
"VALUES (".
3069+
(int)$vm['server_id'] . ", ".
3070+
time() . ", ".
3071+
"'".$action."', ".
3072+
$vm['veid'].", ".
3073+
"'pending', ".
3074+
"''".
3075+
")";
3076+
$app->db->query($sql);
3077+
}
3078+
}
29833079

3080+
//* Restart VM
3081+
public function openvz_vm_restart($session_id, $vm_id)
3082+
{
3083+
global $app;
3084+
3085+
if(!$this->checkPerm($session_id, 'vm_openvz')) {
3086+
$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
3087+
return false;
3088+
}
3089+
3090+
$app->uses('remoting_lib');
3091+
$app->remoting_lib->loadFormDef('../vm/form/openvz_vm.tform.php');
3092+
$vm = $app->remoting_lib->getDataRecord($vm_id);
3093+
3094+
if(!is_array($vm)) {
3095+
$this->server->fault('action_pending', 'No VM with this ID available.');
3096+
return false;
3097+
}
3098+
3099+
if($vm['active'] == 'n') {
3100+
$this->server->fault('action_pending', 'VM is not in active state.');
3101+
return false;
3102+
}
3103+
3104+
$action = 'openvz_restart_vm';
3105+
3106+
$tmp = $app->db->queryOneRecord("SELECT count(action_id) as actions FROM sys_remoteaction
3107+
WHERE server_id = '".$vm['server_id']."'
3108+
AND action_type = '$action'
3109+
AND action_param = '".$vm['veid']."'
3110+
AND action_state = 'pending'");
3111+
3112+
if($tmp['actions'] > 0) {
3113+
$this->server->fault('action_pending', 'There is already a action pending for this VM.');
3114+
return false;
3115+
} else {
3116+
$sql = "INSERT INTO sys_remoteaction (server_id, tstamp, action_type, action_param, action_state, response) " .
3117+
"VALUES (".
3118+
(int)$vm['server_id'] . ", ".
3119+
time() . ", ".
3120+
"'".$action."', ".
3121+
$vm['veid'].", ".
3122+
"'pending', ".
3123+
"''".
3124+
")";
3125+
$app->db->query($sql);
3126+
}
3127+
}
29843128

29853129

29863130

‎interface/lib/lang/fr.lng‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
<?php
22
$wb['conf_format_dateshort'] = 'd-m-Y';
3-
$wb['conf_format_datelong'] = 'd-m-Y';
3+
$wb['conf_format_datelong'] = 'l dS of F Y';
44
$wb['conf_format_timeshort'] = 'H:i';
55
$wb['conf_format_timelong'] = 'H:i:s';
66
$wb['conf_format_datetime'] = 'd-m-Y H:i';
7+
$wb['number_format_decimals'] = '2';
8+
$wb['number_format_dec_point'] = ',';
9+
$wb['number_format_thousands_sep'] = '';
710
$wb['error_301'] = 'Vous navez pas accès à ce module';
811
$wb['error_302'] = 'Module invalide.';
9-
$wb['error_1001'] = 'Le nom dutilisateur et/ou le nom de passe ne doivent pas être vides !';
10-
$wb['error_1002'] = 'Le nom dutilisateur et/ou le mot de passe son faux !';
11-
$wb['error_1003'] = 'Lutilisateur est désactivé!';
12-
$wb['delete_confirmation'] = 'Voulez-vous vraiment supprimer cet enregistrement';
13-
$wb['error_no_view_permission'] = 'Vous navez pas la permission de voir cet enregistrement, ou il nexiste pas.';
14-
$wb['error_no_delete_permission'] = 'Vous navez pas la permission de supprimer cet enregistrement !';
12+
$wb['error_1001'] = 'Le nom dutilisateur et/ou le not de passe ne doivent pas être vides !';
13+
$wb['error_1002'] = 'Le nom dutilisateur et/ou le mot de passe sont faux !';
14+
$wb['error_1003'] = 'L\'utilisateur est désactivé !';
15+
$wb['delete_confirmation'] = 'Voulez-vous vraiment supprimer cet enregistrement ?';
16+
$wb['error_no_view_permission'] = 'Vous n\'avez pas la permission de voir cet enregistrement ou il nexiste pas.';
17+
$wb['error_no_delete_permission'] = 'Vous n\'avez pas la permission de supprimer cet enregistrement !';
1518
$wb['page_txt'] = 'Page';
1619
$wb['page_of_txt'] = 'de';
20+
$wb['page_and_txt'] = 'et';
1721
$wb['page_next_txt'] = 'Suivant';
1822
$wb['page_back_txt'] = 'Précédent';
1923
$wb['delete_txt'] = 'Supprimer';
2024
$wb['filter_txt'] = 'Filtrer';
2125
$wb['add_new_record_txt'] = 'Ajouter une entrée';
2226
$wb['btn_save_txt'] = 'Enregistrer';
23-
$wb['btn_cancel_txt'] = 'Annuler';
24-
$wb['toolsarea_head_txt'] = 'Outils';
25-
$wb['page_and_txt'] = 'et';
27+
$wb['btn_cancel_txt'] = 'Retour';
2628
$wb['top_menu_system'] = 'Système';
2729
$wb['top_menu_client'] = 'Client';
2830
$wb['top_menu_email'] = 'Email';
@@ -34,11 +36,9 @@ $wb['top_menu_help'] = 'Aide';
3436
$wb['top_menu_billing'] = 'Facturation';
3537
$wb['top_menu_domain'] = 'Domaines';
3638
$wb['top_menu_dashboard'] = 'Accueil';
37-
$wb['latest_news_txt'] = 'Dernières actus';
38-
$wb['number_format_decimals'] = '2';
39-
$wb['number_format_dec_point'] = '.';
40-
$wb['number_format_thousands_sep'] = '';
4139
$wb['top_menu_vm'] = 'VServer';
40+
$wb['toolsarea_head_txt'] = 'Outils';
41+
$wb['latest_news_txt'] = 'Dernières actus';
4242
$wb['daynamesmin_su'] = 'Di';
4343
$wb['daynamesmin_mo'] = 'Lu';
4444
$wb['daynamesmin_tu'] = 'Ma';
@@ -68,3 +68,4 @@ $wb['monthnamesshort_dec'] = 'Dec';
6868
$wb['datepicker_nextText'] = 'Suivant';
6969
$wb['datepicker_prevText'] = 'Précédent';
7070
?>
71+

‎interface/lib/lang/pl.lng‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -34,37 +34,38 @@ $wb['top_menu_sites'] = 'Strony';
3434
$wb['top_menu_dns'] = 'DNS';
3535
$wb['top_menu_tools'] = 'Narzędzia';
3636
$wb['top_menu_help'] = 'Pomoc';
37-
$wb['top_menu_billing'] = 'Biling';
37+
$wb['top_menu_billing'] = 'Faktury';
3838
$wb['top_menu_domain'] = 'Domeny';
3939
$wb['top_menu_dashboard'] = 'Strona główna';
4040
$wb['latest_news_txt'] = 'Ostatnie wiadomości';
4141
$wb['top_menu_vm'] = 'VServer';
42-
$wb['daynamesmin_su'] = 'Su';
43-
$wb['daynamesmin_mo'] = 'Mo';
44-
$wb['daynamesmin_tu'] = 'Tu';
45-
$wb['daynamesmin_we'] = 'We';
46-
$wb['daynamesmin_th'] = 'Th';
47-
$wb['daynamesmin_fr'] = 'Fr';
48-
$wb['daynamesmin_sa'] = 'Sa';
49-
$wb['daynames_sunday'] = 'Sunday';
50-
$wb['daynames_monday'] = 'Monday';
51-
$wb['daynames_tuesday'] = 'Tuesday';
52-
$wb['daynames_wednesday'] = 'Wednesday';
53-
$wb['daynames_thursday'] = 'Thursday';
54-
$wb['daynames_friday'] = 'Friday';
55-
$wb['daynames_saturday'] = 'Saturday';
56-
$wb['monthnamesshort_jan'] = 'Jan';
57-
$wb['monthnamesshort_feb'] = 'Feb';
42+
$wb['daynamesmin_su'] = 'Ni';
43+
$wb['daynamesmin_mo'] = 'Po';
44+
$wb['daynamesmin_tu'] = 'Wt';
45+
$wb['daynamesmin_we'] = 'Śr';
46+
$wb['daynamesmin_th'] = 'Cz';
47+
$wb['daynamesmin_fr'] = 'Pi';
48+
$wb['daynamesmin_sa'] = 'So';
49+
$wb['daynames_sunday'] = 'Niedziela';
50+
$wb['daynames_monday'] = 'Poniedziałek';
51+
$wb['daynames_tuesday'] = 'Wtorek';
52+
$wb['daynames_wednesday'] = 'Środa';
53+
$wb['daynames_thursday'] = 'Czwartek';
54+
$wb['daynames_friday'] = 'Piątek';
55+
$wb['daynames_saturday'] = 'Sobota';
56+
$wb['monthnamesshort_jan'] = 'Sty';
57+
$wb['monthnamesshort_feb'] = 'Lut';
5858
$wb['monthnamesshort_mar'] = 'Mar';
59-
$wb['monthnamesshort_apr'] = 'Apr';
60-
$wb['monthnamesshort_may'] = 'May';
61-
$wb['monthnamesshort_jun'] = 'Jun';
62-
$wb['monthnamesshort_jul'] = 'Jul';
63-
$wb['monthnamesshort_aug'] = 'Aug';
64-
$wb['monthnamesshort_sep'] = 'Sep';
65-
$wb['monthnamesshort_oct'] = 'Oct';
66-
$wb['monthnamesshort_nov'] = 'Nov';
67-
$wb['monthnamesshort_dec'] = 'Dec';
68-
$wb['datepicker_nextText'] = 'Next';
69-
$wb['datepicker_prevText'] = 'Prev';
59+
$wb['monthnamesshort_apr'] = 'Kwi';
60+
$wb['monthnamesshort_may'] = 'Maj';
61+
$wb['monthnamesshort_jun'] = 'Cze';
62+
$wb['monthnamesshort_jul'] = 'Lip';
63+
$wb['monthnamesshort_aug'] = 'Sie';
64+
$wb['monthnamesshort_sep'] = 'Wrz';
65+
$wb['monthnamesshort_oct'] = 'Paź';
66+
$wb['monthnamesshort_nov'] = 'Lis';
67+
$wb['monthnamesshort_dec'] = 'Gru';
68+
$wb['datepicker_nextText'] = 'Nast';
69+
$wb['datepicker_prevText'] = 'Poprz';
7070
?>
71+

‎interface/web/admin/lib/lang/fr.lng‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?php
2+
$wb['1001'] = 'Le nom d\'utilisateur ou le mot de passe est vide.';
3+
$wb['1002'] = 'Le nom d\'utilisateur ou le mot de passe est faux.';
24
$wb['Firewall'] = 'Pare-feu';
35
$wb['Groups'] = 'Groupes';
4-
$wb['groups_description'] = 'Formulaire pour éditer les groupes dutilisateurs système.';
6+
$wb['groups_description'] = 'Formulaire d\'édition des groupes d\'utilisateurs système.';
57
$wb['Server'] = 'Serveur';
68
$wb['Services'] = 'Services';
79
$wb['Config'] = 'Configuration';
@@ -14,7 +16,7 @@ $wb['Jailkit'] = 'Jailkit';
1416
$wb['System'] = 'Système';
1517
$wb['Add user'] = 'Ajout utilisateur';
1618
$wb['Edit user'] = 'Edition utilisateur';
17-
$wb['CP Users'] = 'CP utilisateurs';
19+
$wb['CP Users'] = 'Utilisateurs';
1820
$wb['Add group'] = 'Ajout groupe';
1921
$wb['Edit group'] = 'Edition groupe';
2022
$wb['Edit server'] = 'Edition serveur';
@@ -30,14 +32,14 @@ $wb['Language Editor'] = 'Editeur de langue';
3032
$wb['Software'] = 'Applications & Plugins';
3133
$wb['Repositories'] = 'Dépôt';
3234
$wb['Server Services'] = 'Services serveur';
33-
$wb['Interface Config'] = 'Configuration dinterface';
35+
$wb['Interface Config'] = 'Configuration d\'interface';
3436
$wb['Packages'] = 'Paquets';
3537
$wb['Updates'] = 'Mises à jour';
3638
$wb['Merge'] = 'Fusion';
3739
$wb['Remote Users'] = 'Utilisateurs distants';
3840
$wb['Remote Actions'] = 'Actions distantes';
39-
$wb['Do OS-Update'] = 'Mise à jour de lOS';
41+
$wb['Do OS-Update'] = 'Mise à jour de l\'OS';
4042
$wb['Do ISPConfig-Update'] = 'Mise à jour ISPConfig';
41-
$wb['1001'] = 'Username or password is empty.';
42-
$wb['1002'] = 'Username or password is wrong.';
4343
?>
44+
45+

‎interface/web/admin/lib/lang/fr_firewall.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ $wb['firewall_error_unique'] = 'Il y a déjà un enregistrement dans le pare-feu
99
$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 ,.';
1010
$wb['udp_ports_error_regex'] = 'Caractère non autorisé dans la définition du port UDP. Les caractères autorisés sont les nombres, : et ,.';
1111
?>
12+
13+

‎interface/web/admin/lib/lang/fr_firewall_list.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ $wb['tcp_port_txt'] = 'Ouvrir des ports TCP';
66
$wb['udp_port_txt'] = 'Ouvrir des ports UDP';
77
$wb['add_new_record_txt'] = 'Ajouter un enregistrement au pare-feu';
88
?>
9+
10+

‎interface/web/admin/lib/lang/fr_groups.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ $wb['description_txt'] = 'Description';
33
$wb['name_txt'] = 'Groupe';
44
$wb['name_err'] = 'Le groupe doit avoir entre 1 et 30 caractères.';
55
?>
6+
7+

0 commit comments

Comments
 (0)