Skip to content

Commit 9a30ecd

Browse files
author
Till Brehm
committed
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.
1 parent 8748b35 commit 9a30ecd

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

interface/web/dns/form/dns_slave.tform.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@
121121
'xfer' => array (
122122
'datatype' => 'VARCHAR',
123123
'formtype' => 'TEXT',
124+
'validators' => array ( 0 => array ( 'type' => 'ISIP',
125+
'allowempty' => 'y',
126+
'separator' => ',',
127+
'errmsg'=> 'xfer_error_regex'),
128+
),
124129
'default' => '',
125130
'value' => '',
126131
'width' => '30',

server/cron_daily.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -808,10 +808,10 @@ function send_notification_email($template, $placeholders, $recipients) {
808808
$domain = $rec['domain'];
809809

810810
$username = $rec['system_user'];
811-
$rec['used'] = $monitor_data['user'][$username]['used'];
812-
$rec['soft'] = $monitor_data['user'][$username]['soft'];
813-
$rec['hard'] = $monitor_data['user'][$username]['hard'];
814-
$rec['files'] = $monitor_data['user'][$username]['files'];
811+
$rec['used'] = @$monitor_data['user'][$username]['used'];
812+
$rec['soft'] = @$monitor_data['user'][$username]['soft'];
813+
$rec['hard'] = @$monitor_data['user'][$username]['hard'];
814+
$rec['files'] = @$monitor_data['user'][$username]['files'];
815815

816816
if (!is_numeric($rec['used'])){
817817
if ($rec['used'][0] > $rec['used'][1]){

0 commit comments

Comments
 (0)