From 8d0c359e014afaf79bfb2e574662721285066f84 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 18 Sep 2012 08:56:25 -0400
Subject: [PATCH] Bugfix: domain module check on client editing websites Added: bank account owner field for client
---
install/sql/ispconfig3.sql | 1 +
interface/web/sites/web_aliasdomain_edit.php | 2 +-
interface/web/sites/web_vhost_subdomain_edit.php | 2 +-
interface/web/client/form/client.tform.php | 11 +++++++++++
interface/web/mail/mail_domain_edit.php | 2 +-
interface/web/sites/web_domain_edit.php | 2 +-
interface/web/client/lib/lang/de_client.lng | 1 +
interface/web/client/templates/client_edit_address.htm | 4 ++++
interface/web/client/lib/lang/en_client.lng | 1 +
install/sql/incremental/upd_0041.sql | 4 ++++
10 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/install/sql/incremental/upd_0041.sql b/install/sql/incremental/upd_0041.sql
new file mode 100644
index 0000000..ba8ee64
--- /dev/null
+++ b/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`;
+
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 77ea80c..782705d 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -160,6 +160,7 @@
`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,
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index 32a31fb..20c46c2 100644
--- a/interface/web/client/form/client.tform.php
+++ b/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',
diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng
index a6425b3..d9b5f83 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -120,6 +120,7 @@
$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';
diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng
index adc41c6..b871290 100644
--- a/interface/web/client/lib/lang/en_client.lng
+++ b/interface/web/client/lib/lang/en_client.lng
@@ -123,6 +123,7 @@
$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';
diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm
index c03827e..9387944 100644
--- a/interface/web/client/templates/client_edit_address.htm
+++ b/interface/web/client/templates/client_edit_address.htm
@@ -103,6 +103,10 @@
<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" />
</div>
diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php
index 1690a25..ce5e7cc 100644
--- a/interface/web/mail/mail_domain_edit.php
+++ b/interface/web/mail/mail_domain_edit.php
@@ -193,7 +193,7 @@
$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) {
diff --git a/interface/web/sites/web_aliasdomain_edit.php b/interface/web/sites/web_aliasdomain_edit.php
index b928c92..47fdf4c 100644
--- a/interface/web/sites/web_aliasdomain_edit.php
+++ b/interface/web/sites/web_aliasdomain_edit.php
@@ -128,7 +128,7 @@
$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) {
diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php
index b8db757..ca57df3 100644
--- a/interface/web/sites/web_domain_edit.php
+++ b/interface/web/sites/web_domain_edit.php
@@ -467,7 +467,7 @@
$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) {
diff --git a/interface/web/sites/web_vhost_subdomain_edit.php b/interface/web/sites/web_vhost_subdomain_edit.php
index c96c69c..62e351a 100644
--- a/interface/web/sites/web_vhost_subdomain_edit.php
+++ b/interface/web/sites/web_vhost_subdomain_edit.php
@@ -304,7 +304,7 @@
$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) {
--
Gitblit v1.9.1