Merge branch 'florian030/ispconfig3-master' into stable-3.1

Author: Marius Burkard

interface/web/mail/xmpp_domain_edit.php

@@ -402,7 +402,7 @@ function onAfterUpdate() {
         //    $this->desyncMailusers($this->dataRecord['domain']);
         // Update DNS Records
         // TODO: Update gets only triggered from main form. WHY?
-        $soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other FROM dns_soa WHERE active = 'Y' AND origin = ?", $this->dataRecord['domain'].'.');
+        $soa = $app->db->queryOneRecord("SELECT id AS zone, sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other FROM dns_soa WHERE active = 'Y' AND `origin` = ?", $this->dataRecord['domain'].'.');
         if ( isset($soa) && !empty($soa) ) $this->update_dns($this->dataRecord, $soa);
 	}
 

interface/web/sites/database_quota_stats.php

@@ -80,7 +80,8 @@ function prepareDataRow($rec) {
 			$client = $app->db->queryOneRecord("SELECT * FROM client WHERE client_id = ?", $sys_group['client_id']);
 			$rec['client'] = $client['username'];
 			$rec['used'] = 'n/a';
-			$rec['quota'] = 'n/a';
+			if (empty($rec['database_quota'])) $rec['database_quota'] = 0;
+			$rec['quota'] = $rec['database_quota'];
 		}
 		$rec['id'] = $rec[$this->idx_key];
 

interface/web/sites/web_vhost_domain_edit.php

@@ -1460,9 +1460,13 @@ function onBeforeUpdate () {
 					$this->dataRecord["domain"] = $rec['domain'];
 				}
 				if(isset($this->dataRecord["ip_address"]) && $rec['ip_address'] != $this->dataRecord["ip_address"] && $rec['sys_perm_group'] != 'riud') {
+					//* Add a error message and switch back to old server
+					$app->tform->errorMessage .= $app->lng('The IP can not be changed. Please ask your Administrator if you want to change the IPv4-Address.');
 					$this->dataRecord["ip_address"] = $rec['ip_address'];
 				}
 				if(isset($this->dataRecord["ipv6_address"]) && $rec['ipv6_address'] != $this->dataRecord["ipv6_address"] && $rec['sys_perm_group'] != 'riud') {
+					//* Add a error message and switch back to old server
+					$app->tform->errorMessage .= $app->lng('The IP can not be changed. Please ask your Administrator if you want to change the IPv6-Address.');
 					$this->dataRecord["ipv6_address"] = $rec['ipv6_address'];
 				}
 				unset($rec);

interface/web/tools/lib/lang/ar_usersettings.lng

@@ -1,5 +1,5 @@
 <?php
-$wb['passwort_txt'] = 'Password';
+$wb['password_txt'] = 'Password';
 $wb['password_strength_txt'] = 'Password strength';
 $wb['language_txt'] = 'Language';
 $wb['password_mismatch'] = 'The password in the second password field does not match the first password.';

interface/web/tools/lib/lang/bg_usersettings.lng

@@ -1,5 +1,5 @@
 <?php
-$wb['passwort_txt'] = 'Парола';
+$wb['password_txt'] = 'Парола';
 $wb['password_strength_txt'] = 'Сила на паролата';
 $wb['language_txt'] = 'Език';
 $wb['password_mismatch'] = 'Паролите в двете полета не съвпадат.';

interface/web/tools/lib/lang/br_usersettings.lng

@@ -1,5 +1,5 @@
 <?php
-$wb['passwort_txt'] = 'Senha';
+$wb['password_txt'] = 'Senha';
 $wb['password_strength_txt'] = 'Segurança de Senha';
 $wb['language_txt'] = 'Idioma';
 $wb['password_mismatch'] = 'As senhas não conhecidem';

interface/web/tools/lib/lang/ca_usersettings.lng

@@ -1,5 +1,5 @@
 <?php
-$wb['passwort_txt'] = 'Mot de passe';
+$wb['password_txt'] = 'Mot de passe';
 $wb['password_strength_txt'] = 'Force du mot de passe';
 $wb['language_txt'] = 'Langue';
 $wb['password_mismatch'] = 'Le mot de passe de confirmation ne correspond avec le premier.';

interface/web/tools/lib/lang/cz_usersettings.lng

@@ -1,5 +1,5 @@
 <?php
-$wb['passwort_txt'] = 'Heslo';
+$wb['password_txt'] = 'Heslo';
 $wb['password_strength_txt'] = 'Bezpečnost hesla';
 $wb['language_txt'] = 'Jazyk';
 $wb['password_mismatch'] = 'Hesla se neshodují.';

interface/web/tools/lib/lang/de_usersettings.lng

@@ -1,5 +1,5 @@
 <?php
-$wb['passwort_txt'] = 'Passwort';
+$wb['password_txt'] = 'Passwort';
 $wb['language_txt'] = 'Sprache';
 $wb['password_mismatch'] = 'Die Passwörter stimmen nicht überein.';
 $wb['password_strength_txt'] = 'Passwortkomplexität';

interface/web/tools/lib/lang/el_usersettings.lng

@@ -1,5 +1,5 @@
 <?php
-$wb['passwort_txt'] = 'Συνθηματικό';
+$wb['password_txt'] = 'Συνθηματικό';
 $wb['password_strength_txt'] = 'Δύναμη συνθηματικού';
 $wb['language_txt'] = 'Γλώσσα';
 $wb['password_mismatch'] = 'Το συνθηματικό στο δεύτερο πεδίο δεν ταιριάζει με το συνθηματικό στο πρώτο πεδίο.';