Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
Open sidebar
Zvonimir
ISPConfig 3
Commits
8d0c359e
Commit
8d0c359e
authored
Sep 18, 2012
by
mcramer
Browse files
Bugfix: domain module check on client editing websites
Added: bank account owner field for client
parent
ea10bfc0
Changes
10
Hide whitespace changes
Inline
Side-by-side
install/sql/incremental/upd_0041.sql
0 → 100644
View file @
8d0c359e
-- Add bank account owner
ALTER
TABLE
`client`
ADD
`bank_account_owner`
varchar
(
255
)
DEFAULT
NULL
AFTER
`notes`
;
install/sql/ispconfig3.sql
View file @
8d0c359e
...
...
@@ -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
View file @
8d0c359e
...
...
@@ -339,6 +339,17 @@ $form["tabs"]['address'] = array (
'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
View file @
8d0c359e
...
...
@@ -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
View file @
8d0c359e
...
...
@@ -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
View file @
8d0c359e
...
...
@@ -102,6 +102,10 @@
<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
View file @
8d0c359e
...
...
@@ -193,7 +193,7 @@ class page_action extends tform_actions {
$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
View file @
8d0c359e
...
...
@@ -128,7 +128,7 @@ class page_action extends tform_actions {
$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
View file @
8d0c359e
...
...
@@ -467,7 +467,7 @@ class page_action extends tform_actions {
$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
View file @
8d0c359e
...
...
@@ -304,7 +304,7 @@ class page_action extends tform_actions {
$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
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment