Commit 9a30ecda authored by Till Brehm's avatar Till Brehm

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
......@@ -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',
......
......@@ -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]){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment