Merged revisions 2794-2804 from stable branch.

install/autoupdate.php

@@ -31,6 +31,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 	ISPConfig 3 updater.
 */
 
+die("Autoupdate has been removed.\nPlease start the update on the shell with the command ispconfig_update.sh as root user.\n");
+
 error_reporting(E_ALL|E_STRICT);
 
 /*

install/lib/installer_base.lib.php

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

install/tpl/mailfilter.master

@@ -57,7 +57,11 @@ if ( $RETURNCODE == 0 )
 }
 
 # Create a mailsize file
+`test -e {dist_postfix_vmail_mailbox_base}/$HOST/$USER`
+if ( $RETURNCODE == 0 )
+{
 `echo $SIZE >> {dist_postfix_vmail_mailbox_base}/$HOST/$USER/ispconfig_mailsize`
+}
 
 
 #

interface/lib/classes/remoting.inc.php

@@ -2979,8 +2979,152 @@ class remoting {
 		return $affected_rows;
 	}
 	
+	//* Start VM
+	public function openvz_vm_start($session_id, $vm_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'vm_openvz')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		
+		$app->uses('remoting_lib');
+		$app->remoting_lib->loadFormDef('../vm/form/openvz_vm.tform.php');
+		$vm = $app->remoting_lib->getDataRecord($vm_id);
+		
+		if(!is_array($vm)) {
+			$this->server->fault('action_pending', 'No VM with this ID available.');
+			return false;
+		}
+		
+		if($vm['active'] == 'n') {
+			$this->server->fault('action_pending', 'VM is not in active state.');
+			return false;
+		}
+		
+		$action = 'openvz_start_vm';
+		
+		$tmp = $app->db->queryOneRecord("SELECT count(action_id) as actions FROM sys_remoteaction 
+				WHERE server_id = '".$vm['server_id']."' 
+				AND action_type = '$action'
+				AND action_param = '".$vm['veid']."'
+				AND action_state = 'pending'");
+		
+		if($tmp['actions'] > 0) {
+			$this->server->fault('action_pending', 'There is already a action pending for this VM.');
+			return false;
+		} else {
+			$sql =  "INSERT INTO sys_remoteaction (server_id, tstamp, action_type, action_param, action_state, response) " .
+					"VALUES (".
+					(int)$vm['server_id'] . ", ".
+					time() . ", ".
+					"'".$action."', ".
+					$vm['veid'].", ".
+					"'pending', ".
+					"''".
+					")";
+			$app->db->query($sql);
+		}
+	}
 	
+	//* Stop VM
+	public function openvz_vm_stop($session_id, $vm_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'vm_openvz')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		
+		$app->uses('remoting_lib');
+		$app->remoting_lib->loadFormDef('../vm/form/openvz_vm.tform.php');
+		$vm = $app->remoting_lib->getDataRecord($vm_id);
+		
+		if(!is_array($vm)) {
+			$this->server->fault('action_pending', 'No VM with this ID available.');
+			return false;
+		}
+		
+		if($vm['active'] == 'n') {
+			$this->server->fault('action_pending', 'VM is not in active state.');
+			return false;
+		}
+		
+		$action = 'openvz_stop_vm';
+		
+		$tmp = $app->db->queryOneRecord("SELECT count(action_id) as actions FROM sys_remoteaction 
+				WHERE server_id = '".$vm['server_id']."' 
+				AND action_type = '$action'
+				AND action_param = '".$vm['veid']."'
+				AND action_state = 'pending'");
+		
+		if($tmp['actions'] > 0) {
+			$this->server->fault('action_pending', 'There is already a action pending for this VM.');
+			return false;
+		} else {
+			$sql =  "INSERT INTO sys_remoteaction (server_id, tstamp, action_type, action_param, action_state, response) " .
+					"VALUES (".
+					(int)$vm['server_id'] . ", ".
+					time() . ", ".
+					"'".$action."', ".
+					$vm['veid'].", ".
+					"'pending', ".
+					"''".
+					")";
+			$app->db->query($sql);
+		}
+	}
 	
+	//* Restart VM
+	public function openvz_vm_restart($session_id, $vm_id)
+    {
+		global $app;
+		
+		if(!$this->checkPerm($session_id, 'vm_openvz')) {
+			$this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
+			return false;
+		}
+		
+		$app->uses('remoting_lib');
+		$app->remoting_lib->loadFormDef('../vm/form/openvz_vm.tform.php');
+		$vm = $app->remoting_lib->getDataRecord($vm_id);
+		
+		if(!is_array($vm)) {
+			$this->server->fault('action_pending', 'No VM with this ID available.');
+			return false;
+		}
+		
+		if($vm['active'] == 'n') {
+			$this->server->fault('action_pending', 'VM is not in active state.');
+			return false;
+		}
+		
+		$action = 'openvz_restart_vm';
+		
+		$tmp = $app->db->queryOneRecord("SELECT count(action_id) as actions FROM sys_remoteaction 
+				WHERE server_id = '".$vm['server_id']."' 
+				AND action_type = '$action'
+				AND action_param = '".$vm['veid']."'
+				AND action_state = 'pending'");
+		
+		if($tmp['actions'] > 0) {
+			$this->server->fault('action_pending', 'There is already a action pending for this VM.');
+			return false;
+		} else {
+			$sql =  "INSERT INTO sys_remoteaction (server_id, tstamp, action_type, action_param, action_state, response) " .
+					"VALUES (".
+					(int)$vm['server_id'] . ", ".
+					time() . ", ".
+					"'".$action."', ".
+					$vm['veid'].", ".
+					"'pending', ".
+					"''".
+					")";
+			$app->db->query($sql);
+		}
+	}
 	
 	
 	

interface/lib/lang/fr.lng

 <?php
 $wb['conf_format_dateshort'] = 'd-m-Y';
-$wb['conf_format_datelong'] = 'd-m-Y';
+$wb['conf_format_datelong'] = 'l dS of F Y';
 $wb['conf_format_timeshort'] = 'H:i';
 $wb['conf_format_timelong'] = 'H:i:s';
 $wb['conf_format_datetime'] = 'd-m-Y H:i';
+$wb['number_format_decimals'] = '2';
+$wb['number_format_dec_point'] = ',';
+$wb['number_format_thousands_sep'] = '';
 $wb['error_301'] = 'Vous navez pas accès à ce module';
 $wb['error_302'] = 'Module invalide.';
-$wb['error_1001'] = 'Le nom dutilisateur et/ou le nom de passe ne doivent pas être vides !';
-$wb['error_1002'] = 'Le nom dutilisateur et/ou le mot de passe son faux !';
-$wb['error_1003'] = 'Lutilisateur est désactivé!';
-$wb['delete_confirmation'] = 'Voulez-vous vraiment supprimer cet enregistrement';
-$wb['error_no_view_permission'] = 'Vous navez pas la permission de voir cet enregistrement, ou il nexiste pas.';
-$wb['error_no_delete_permission'] = 'Vous navez pas la permission de supprimer cet enregistrement !';
+$wb['error_1001'] = 'Le nom dutilisateur et/ou le not de passe ne doivent pas être vides !';
+$wb['error_1002'] = 'Le nom dutilisateur et/ou le mot de passe sont faux !';
+$wb['error_1003'] = 'L\'utilisateur est désactivé !';
+$wb['delete_confirmation'] = 'Voulez-vous vraiment supprimer cet enregistrement ?';
+$wb['error_no_view_permission'] = 'Vous n\'avez pas la permission de voir cet enregistrement ou il nexiste pas.';
+$wb['error_no_delete_permission'] = 'Vous n\'avez pas la permission de supprimer cet enregistrement !';
 $wb['page_txt'] = 'Page';
 $wb['page_of_txt'] = 'de';
+$wb['page_and_txt'] = 'et';
 $wb['page_next_txt'] = 'Suivant';
 $wb['page_back_txt'] = 'Précédent';
 $wb['delete_txt'] = 'Supprimer';
 $wb['filter_txt'] = 'Filtrer';
 $wb['add_new_record_txt'] = 'Ajouter une entrée';
 $wb['btn_save_txt'] = 'Enregistrer';
-$wb['btn_cancel_txt'] = 'Annuler';
-$wb['toolsarea_head_txt'] = 'Outils';
-$wb['page_and_txt'] = 'et';
+$wb['btn_cancel_txt'] = 'Retour';
 $wb['top_menu_system'] = 'Système';
 $wb['top_menu_client'] = 'Client';
 $wb['top_menu_email'] = 'Email';
@@ -34,11 +36,9 @@ $wb['top_menu_help'] = 'Aide';
 $wb['top_menu_billing'] = 'Facturation';
 $wb['top_menu_domain'] = 'Domaines';
 $wb['top_menu_dashboard'] = 'Accueil';
-$wb['latest_news_txt'] = 'Dernières actus';
-$wb['number_format_decimals'] = '2';
-$wb['number_format_dec_point'] = '.';
-$wb['number_format_thousands_sep'] = '';
 $wb['top_menu_vm'] = 'VServer';
+$wb['toolsarea_head_txt'] = 'Outils';
+$wb['latest_news_txt'] = 'Dernières actus';
 $wb['daynamesmin_su'] = 'Di';
 $wb['daynamesmin_mo'] = 'Lu';
 $wb['daynamesmin_tu'] = 'Ma';
@@ -68,3 +68,4 @@ $wb['monthnamesshort_dec'] = 'Dec';
 $wb['datepicker_nextText'] = 'Suivant';
 $wb['datepicker_prevText'] = 'Précédent';
 ?>
+

interface/lib/lang/pl.lng

@@ -34,37 +34,38 @@ $wb['top_menu_sites'] = 'Strony';
 $wb['top_menu_dns'] = 'DNS';
 $wb['top_menu_tools'] = 'Narzędzia';
 $wb['top_menu_help'] = 'Pomoc';
-$wb['top_menu_billing'] = 'Biling';
+$wb['top_menu_billing'] = 'Faktury';
 $wb['top_menu_domain'] = 'Domeny';
 $wb['top_menu_dashboard'] = 'Strona główna';
 $wb['latest_news_txt'] = 'Ostatnie wiadomości';
 $wb['top_menu_vm'] = 'VServer';
-$wb['daynamesmin_su'] = 'Su';
-$wb['daynamesmin_mo'] = 'Mo';
-$wb['daynamesmin_tu'] = 'Tu';
-$wb['daynamesmin_we'] = 'We';
-$wb['daynamesmin_th'] = 'Th';
-$wb['daynamesmin_fr'] = 'Fr';
-$wb['daynamesmin_sa'] = 'Sa';
-$wb['daynames_sunday'] = 'Sunday';
-$wb['daynames_monday'] = 'Monday';
-$wb['daynames_tuesday'] = 'Tuesday';
-$wb['daynames_wednesday'] = 'Wednesday';
-$wb['daynames_thursday'] = 'Thursday';
-$wb['daynames_friday'] = 'Friday';
-$wb['daynames_saturday'] = 'Saturday';
-$wb['monthnamesshort_jan'] = 'Jan';
-$wb['monthnamesshort_feb'] = 'Feb';
+$wb['daynamesmin_su'] = 'Ni';
+$wb['daynamesmin_mo'] = 'Po';
+$wb['daynamesmin_tu'] = 'Wt';
+$wb['daynamesmin_we'] = 'Śr';
+$wb['daynamesmin_th'] = 'Cz';
+$wb['daynamesmin_fr'] = 'Pi';
+$wb['daynamesmin_sa'] = 'So';
+$wb['daynames_sunday'] = 'Niedziela';
+$wb['daynames_monday'] = 'Poniedziałek';
+$wb['daynames_tuesday'] = 'Wtorek';
+$wb['daynames_wednesday'] = 'Środa';
+$wb['daynames_thursday'] = 'Czwartek';
+$wb['daynames_friday'] = 'Piątek';
+$wb['daynames_saturday'] = 'Sobota';
+$wb['monthnamesshort_jan'] = 'Sty';
+$wb['monthnamesshort_feb'] = 'Lut';
 $wb['monthnamesshort_mar'] = 'Mar';
-$wb['monthnamesshort_apr'] = 'Apr';
-$wb['monthnamesshort_may'] = 'May';
-$wb['monthnamesshort_jun'] = 'Jun';
-$wb['monthnamesshort_jul'] = 'Jul';
-$wb['monthnamesshort_aug'] = 'Aug';
-$wb['monthnamesshort_sep'] = 'Sep';
-$wb['monthnamesshort_oct'] = 'Oct';
-$wb['monthnamesshort_nov'] = 'Nov';
-$wb['monthnamesshort_dec'] = 'Dec';
-$wb['datepicker_nextText'] = 'Next';
-$wb['datepicker_prevText'] = 'Prev';
+$wb['monthnamesshort_apr'] = 'Kwi';
+$wb['monthnamesshort_may'] = 'Maj';
+$wb['monthnamesshort_jun'] = 'Cze';
+$wb['monthnamesshort_jul'] = 'Lip';
+$wb['monthnamesshort_aug'] = 'Sie';
+$wb['monthnamesshort_sep'] = 'Wrz';
+$wb['monthnamesshort_oct'] = 'Paź';
+$wb['monthnamesshort_nov'] = 'Lis';
+$wb['monthnamesshort_dec'] = 'Gru';
+$wb['datepicker_nextText'] = 'Nast';
+$wb['datepicker_prevText'] = 'Poprz';
 ?>
+

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

 <?php
+$wb['1001'] = 'Le nom d\'utilisateur ou le mot de passe est vide.';
+$wb['1002'] = 'Le nom d\'utilisateur ou le mot de passe est faux.';
 $wb['Firewall'] = 'Pare-feu';
 $wb['Groups'] = 'Groupes';
-$wb['groups_description'] = 'Formulaire pour éditer les groupes dutilisateurs système.';
+$wb['groups_description'] = 'Formulaire d\'édition des groupes d\'utilisateurs système.';
 $wb['Server'] = 'Serveur';
 $wb['Services'] = 'Services';
 $wb['Config'] = 'Configuration';
@@ -14,7 +16,7 @@ $wb['Jailkit'] = 'Jailkit';
 $wb['System'] = 'Système';
 $wb['Add user'] = 'Ajout utilisateur';
 $wb['Edit user'] = 'Edition utilisateur';
-$wb['CP Users'] = 'CP utilisateurs';
+$wb['CP Users'] = 'Utilisateurs';
 $wb['Add group'] = 'Ajout groupe';
 $wb['Edit group'] = 'Edition groupe';
 $wb['Edit server'] = 'Edition serveur';
@@ -30,14 +32,14 @@ $wb['Language Editor'] = 'Editeur de langue';
 $wb['Software'] = 'Applications & Plugins';
 $wb['Repositories'] = 'Dépôt';
 $wb['Server Services'] = 'Services serveur';
-$wb['Interface Config'] = 'Configuration dinterface';
+$wb['Interface Config'] = 'Configuration d\'interface';
 $wb['Packages'] = 'Paquets';
 $wb['Updates'] = 'Mises à jour';
 $wb['Merge'] = 'Fusion';
 $wb['Remote Users'] = 'Utilisateurs distants';
 $wb['Remote Actions'] = 'Actions distantes';
-$wb['Do OS-Update'] = 'Mise à jour de lOS';
+$wb['Do OS-Update'] = 'Mise à jour de l\'OS';
 $wb['Do ISPConfig-Update'] = 'Mise à jour ISPConfig';
-$wb['1001'] = 'Username or password is empty.';
-$wb['1002'] = 'Username or password is wrong.';
 ?>
+
+

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

@@ -9,3 +9,5 @@ $wb['firewall_error_unique'] = 'Il y a déjà un enregistrement dans le pare-feu
 $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 ,.';
 $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 ,.';
 ?>
+
+

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

@@ -6,3 +6,5 @@ $wb['tcp_port_txt'] = 'Ouvrir des ports TCP';
 $wb['udp_port_txt'] = 'Ouvrir des ports UDP';
 $wb['add_new_record_txt'] = 'Ajouter un enregistrement au pare-feu';
 ?>
+
+

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

@@ -3,3 +3,5 @@ $wb['description_txt'] = 'Description';
 $wb['name_txt'] = 'Groupe';
 $wb['name_err'] = 'Le groupe doit avoir entre 1 et 30 caractères.';
 ?>
+
+

interface/web/admin/lib/lang/fr_groups_list.lng

 <?php
-$wb['list_head_txt'] = 'Groupes dutilisateurs système';
+$wb['list_head_txt'] = 'Groupes d\'utilisateurs système';
 $wb['description_txt'] = 'Description';
 $wb['name_txt'] = 'Groupe';
 $wb['add_new_record_txt'] = 'Ajouter un nouveau groupe';
 $wb['warning_txt'] = '<b>ATTENTION:</b> Ne pas éditer ou modifier de paramètre utilisateur ici. Utilisez les paramètres Client et Revendeur dans le module Client à la place. Modifier ou changer les informations ici peut conduire à la perte de données';
 ?>
+
+

interface/web/admin/lib/lang/fr_iptables.lng

@@ -11,3 +11,5 @@ $wb['source_ip_txt'] = 'Source Address';
 $wb['active_txt'] = 'Active';
 $wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
 ?>
+
+

interface/web/admin/lib/lang/fr_iptables_list.lng

@@ -13,3 +13,5 @@ $wb['source_ip_txt'] = 'Source Address';
 $wb['active_txt'] = 'Active';
 $wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
 ?>
+
+

interface/web/admin/lib/lang/fr_language_add.lng

@@ -6,3 +6,5 @@ $wb['btn_save_txt'] = 'Créer un nouveau fichier de langue';
 $wb['btn_cancel_txt'] = 'Précédent';
 $wb['language_new_hint_txt'] = 'Code langage à 2 caractères ISO 639-1 (Voir http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)';
 ?>
+
+

interface/web/admin/lib/lang/fr_language_complete.lng

@@ -5,3 +5,5 @@ $wb['btn_save_txt'] = 'Fusionner les fichiers';
 $wb['btn_cancel_txt'] = 'Précédent';
 $wb['list_desc_txt'] = 'Fusionne le langage sélectionné avec le langage principal anglais. <br />Ceci ajoute les élements manquants en anglais au fichier sélectionné.';
 ?>
+
+

interface/web/admin/lib/lang/fr_language_edit.lng

@@ -6,3 +6,5 @@ $wb['lang_file_txt'] = 'Fichier de langue';
 $wb['btn_save_txt'] = 'Enregistrer';
 $wb['btn_cancel_txt'] = 'Précédent';
 ?>
+
+

interface/web/admin/lib/lang/fr_language_export.lng

@@ -4,3 +4,5 @@ $wb['language_select_txt'] = 'Sélectionnez la langue';
 $wb['btn_save_txt'] = 'Exporte la langue sélectionnée dans un fichier';
 $wb['btn_cancel_txt'] = 'Précédent';
 ?>
+
+

interface/web/admin/lib/lang/fr_language_import.lng

@@ -4,5 +4,7 @@ $wb['language_import_txt'] = 'Sélectionnez le fichier de langue';
 $wb['btn_save_txt'] = 'Importer le fichier de langue sélectionné';
 $wb['language_overwrite_txt'] = 'Ecraser le fichier sil existe déja.';
 $wb['btn_cancel_txt'] = 'Précédent';
-$wb['ignore_version_txt'] = 'Sauter le test de version ISPConfig';
+$wb['ignore_version_txt'] = 'Ignorer le test de version ISPConfig';
 ?>
+
+

interface/web/admin/lib/lang/fr_language_list.lng

@@ -5,3 +5,5 @@ $wb['module_txt'] = 'Module';
 $wb['lang_file_txt'] = 'Fichier de langue';
 $wb['lang_file_date_txt'] = 'Dernière modification';
 ?>
+
+

interface/web/admin/lib/lang/fr_package_install.lng

@@ -5,3 +5,5 @@ $wb['repo_username_txt'] = 'Utilisateur (optionnel)';
 $wb['repo_password_txt'] = 'Mot de passe (optionnel)';
 $wb['active_txt'] = 'Actif';
 ?>
+
+