diff --git a/lib/Froxlor/Api/Commands/Customers.php b/lib/Froxlor/Api/Commands/Customers.php index 5a1d63d2..1f5bba68 100644 --- a/lib/Froxlor/Api/Commands/Customers.php +++ b/lib/Froxlor/Api/Commands/Customers.php @@ -1669,7 +1669,7 @@ class Customers extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resource * @param string $extra * optional, default empty * @param int $increase_by - * optional, default 1 + * optional, default 1 */ public static function increaseUsage($customerid = 0, $resource = null, $extra = '', $increase_by = 1) { @@ -1684,7 +1684,7 @@ class Customers extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resource * @param string $extra * optional, default empty * @param int $decrease_by - * optional, default 1 + * optional, default 1 */ public static function decreaseUsage($customerid = 0, $resource = null, $extra = '', $decrease_by = 1) { diff --git a/lib/Froxlor/Dns/DnsEntry.php b/lib/Froxlor/Dns/DnsEntry.php index 4a678d05..6d388ac1 100644 --- a/lib/Froxlor/Dns/DnsEntry.php +++ b/lib/Froxlor/Dns/DnsEntry.php @@ -32,13 +32,13 @@ class DnsEntry public $content; - public function __construct($record = '', $type = 'A', $content = null, $prio = 0, $ttl = 18000, $class = 'IN') + public function __construct($record = '', $type = 'A', $content = null, $prio = 0, $ttl = 0, $class = 'IN') { $this->record = $record; $this->type = $type; $this->content = $content; $this->priority = $prio; - $this->ttl = $ttl; + $this->ttl = ($ttl <= 0 ? Settings::Get('system.defaultttl') : $ttl); $this->class = $class; } diff --git a/lib/Froxlor/Dns/DnsZone.php b/lib/Froxlor/Dns/DnsZone.php index c3b2b088..863b56f2 100644 --- a/lib/Froxlor/Dns/DnsZone.php +++ b/lib/Froxlor/Dns/DnsZone.php @@ -1,6 +1,8 @@ ttl = $ttl; + $this->ttl = ($ttl <= 0 ? Settings::Get('system.defaultttl') : $ttl); $this->origin = $origin; $this->serial = $serial; $this->records = $records;