Bugfix: domain module check on client editing websites

Added: bank account owner field for client

Author: mcramer

install/sql/incremental/upd_0041.sql

@@ -0,0 +1,4 @@
+
+-- Add bank account owner
+ALTER TABLE `client` ADD `bank_account_owner` varchar(255) DEFAULT NULL AFTER `notes`;
+

install/sql/ispconfig3.sql

@@ -160,6 +160,7 @@ CREATE TABLE `client` (
   `internet` varchar(255) NOT NULL,
   `icq` varchar(16) DEFAULT NULL,
   `notes` text,
+  `bank_account_owner` varchar(255) DEFAULT NULL,
   `bank_account_number` varchar(255) DEFAULT NULL,
   `bank_code` varchar(255) DEFAULT NULL,
   `bank_name` varchar(255) DEFAULT NULL,

interface/web/client/form/client.tform.php

@@ -339,6 +339,17 @@
 			'rows'		=> '',
 			'cols'		=> ''
 		),
+		'bank_account_owner' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'value'		=> '',
+			'separator'	=> '',
+			'width'		=> '30',
+			'maxlength'	=> '255',
+			'rows'		=> '',
+			'cols'		=> ''
+		),
 		'bank_account_number' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',

interface/web/client/lib/lang/de_client.lng

@@ -120,6 +120,7 @@ $wb['web_php_options_notempty'] = 'Keine PHP-Option ausgewählt. Wähle mindeste
 $wb['ssh_chroot_notempty'] = 'Keine SSH chroot-Option ausgewählt. Wähle mindestens eine SSH-Option.';
 $wb['username_error_collision'] = 'Der Benutzername sollte nicht mit dem Wort -web- oder -web- gefolgt von einer Nummer anfangen.';
 $wb['bank_account_number_txt'] = 'Kontonr.';
+$wb["bank_account_owner_txt"] = 'Kontoinhaber';
 $wb['bank_code_txt'] = 'BLZ';
 $wb['bank_name_txt'] = 'Bank';
 $wb['bank_account_iban_txt'] = 'IBAN';

interface/web/client/lib/lang/en_client.lng

@@ -123,6 +123,7 @@ $wb["web_php_options_notempty"] = 'No PHP option(s) selected. Select at least on
 $wb["ssh_chroot_notempty"] = 'No SSH chroot option selected. Select at least one SSH option.';
 $wb["username_error_collision"] = 'The username may not start with the word -web- or -web- followed by a number.';
 $wb["bank_account_number_txt"] = 'Bank account no.';
+$wb["bank_account_owner_txt"] = 'Bank account owner';
 $wb["bank_code_txt"] = 'Bank code';
 $wb["bank_name_txt"] = 'Bank name';
 $wb["bank_account_iban_txt"] = 'IBAN';

interface/web/client/templates/client_edit_address.htm

@@ -102,6 +102,10 @@ <h2><tmpl_var name="list_head_txt"></h2>
                 <label for="company_id">{tmpl_var name='company_id_txt'}</label>
                 <input name="company_id" id="company_id" value="{tmpl_var name='company_id'}" size="30" maxlength="255" type="text" class="textInput" />
             </div>
+            <div class="ctrlHolder">
+                <label for="bank_account_owner">{tmpl_var name='bank_account_owner_txt'}</label>
+                <input name="bank_account_owner" id="bank_account_owner" value="{tmpl_var name='bank_account_owner'}" size="30" maxlength="255" type="text" class="textInput" />
+            </div>
             <div class="ctrlHolder">
                 <label for="bank_account_number">{tmpl_var name='bank_account_number_txt'}</label>
                 <input name="bank_account_number" id="bank_account_number" value="{tmpl_var name='bank_account_number'}" size="30" maxlength="255" type="text" class="textInput" />

interface/web/mail/mail_domain_edit.php

@@ -193,7 +193,7 @@ function onSubmit() {
 
             $sql = "SELECT domain_id, domain FROM domain WHERE domain_id = " . $app->functions->intval($this->dataRecord['domain']);
 			if ($_SESSION["s"]["user"]["typ"] != 'admin') {
-				$sql .= "AND sys_groupid =" . $client_group_id;
+				$sql .= " AND sys_groupid =" . $client_group_id;
 			}
 			$domain_check = $app->db->queryOneRecord($sql);
             if(!$domain_check) {

interface/web/sites/web_aliasdomain_edit.php

@@ -128,7 +128,7 @@ function onSubmit() {
 
             $sql = "SELECT domain_id, domain FROM domain WHERE domain_id = " . $app->functions->intval($this->dataRecord['domain']);
 			if ($_SESSION["s"]["user"]["typ"] != 'admin') {
-				$sql .= "AND sys_groupid =" . $client_group_id;
+				$sql .= " AND sys_groupid =" . $client_group_id;
 			}
 			$domain_check = $app->db->queryOneRecord($sql);
             if(!$domain_check) {

interface/web/sites/web_domain_edit.php

@@ -467,7 +467,7 @@ function onSubmit() {
 
                 $sql = "SELECT domain_id, domain FROM domain WHERE domain_id = " . $app->functions->intval($this->dataRecord['domain']);
                 if ($_SESSION["s"]["user"]["typ"] != 'admin') {
-                    $sql .= "AND sys_groupid =" . $client_group_id;
+                    $sql .= " AND sys_groupid =" . $client_group_id;
                 }
                 $domain_check = $app->db->queryOneRecord($sql);
                 if(!$domain_check) {

interface/web/sites/web_vhost_subdomain_edit.php

@@ -304,7 +304,7 @@ function onSubmit() {
 
                 $sql = "SELECT domain_id, domain FROM domain WHERE domain_id = " . $app->functions->intval($this->dataRecord['sel_domain']);
                 if ($_SESSION["s"]["user"]["typ"] != 'admin') {
-                    $sql .= "AND sys_groupid =" . $client_group_id;
+                    $sql .= " AND sys_groupid =" . $client_group_id;
                 }
                 $domain_check = $app->db->queryOneRecord($sql);
                 if(!$domain_check) {