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
9a30ecda
Commit
9a30ecda
authored
Feb 16, 2014
by
Till Brehm
Browse files
Fixed: FS#2737 - Check xfer regex on dns slave zones and add the one of the primary zones
Changed cron_daily.php to avoid some php notices.
parent
8748b35d
Changes
2
Hide whitespace changes
Inline
Side-by-side
interface/web/dns/form/dns_slave.tform.php
View file @
9a30ecda
...
...
@@ -121,6 +121,11 @@ $form["tabs"]['dns_slave'] = array (
'xfer'
=>
array
(
'datatype'
=>
'VARCHAR'
,
'formtype'
=>
'TEXT'
,
'validators'
=>
array
(
0
=>
array
(
'type'
=>
'ISIP'
,
'allowempty'
=>
'y'
,
'separator'
=>
','
,
'errmsg'
=>
'xfer_error_regex'
),
),
'default'
=>
''
,
'value'
=>
''
,
'width'
=>
'30'
,
...
...
server/cron_daily.php
View file @
9a30ecda
...
...
@@ -808,10 +808,10 @@ if ($app->dbmaster == $app->db) {
$domain
=
$rec
[
'domain'
];
$username
=
$rec
[
'system_user'
];
$rec
[
'used'
]
=
$monitor_data
[
'user'
][
$username
][
'used'
];
$rec
[
'soft'
]
=
$monitor_data
[
'user'
][
$username
][
'soft'
];
$rec
[
'hard'
]
=
$monitor_data
[
'user'
][
$username
][
'hard'
];
$rec
[
'files'
]
=
$monitor_data
[
'user'
][
$username
][
'files'
];
$rec
[
'used'
]
=
@
$monitor_data
[
'user'
][
$username
][
'used'
];
$rec
[
'soft'
]
=
@
$monitor_data
[
'user'
][
$username
][
'soft'
];
$rec
[
'hard'
]
=
@
$monitor_data
[
'user'
][
$username
][
'hard'
];
$rec
[
'files'
]
=
@
$monitor_data
[
'user'
][
$username
][
'files'
];
if
(
!
is_numeric
(
$rec
[
'used'
])){
if
(
$rec
[
'used'
][
0
]
>
$rec
[
'used'
][
1
]){
...
...
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