From a7d3e6e6eb6d6f87ba09d4ec1900b2c90b72c22b Mon Sep 17 00:00:00 2001 From: Mark Schouten Date: Wed, 3 Aug 2016 14:19:31 +0200 Subject: [PATCH] Fix typo and move function to correct class --- includes/class/Zone.php | 30 +++++++++++++++--------------- zones.php | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/includes/class/Zone.php b/includes/class/Zone.php index d7b4ba0..cf4c5dc 100644 --- a/includes/class/Zone.php +++ b/includes/class/Zone.php @@ -144,6 +144,21 @@ class Zone { } } + public function rrsets2records() { + $ret = Array(); + + foreach ($this->rrsets as $rrset) { + foreach ($rrset->export_records() as $record) { + $record['name'] = $rrset['name']; + $record['ttl'] = $rrset['ttl']; + $record['type'] = $rrset['type']; + } + array_push($ret, $record); + } + + return $ret; + } + public function export() { $ret = Array(); $ret['account'] = $this->account; @@ -215,21 +230,6 @@ class RRSet { array_push($this->comments, $comment); } - public function rrsets2records() { - $ret = Array(); - - foreach ($this->rrsets as $rrset) { - foreach ($rrset->export_records() as $record) { - $record['name'] = $rrset['name']; - $record['ttl'] = $rrset['ttl']; - $record['type'] = $rrset['type']; - } - array_push($ret, $record); - } - - return $ret; - } - public function export() { $ret = Array(); $ret['comments'] = $this->export_comments(); diff --git a/zones.php b/zones.php index 3baf524..dfed7fb 100644 --- a/zones.php +++ b/zones.php @@ -307,7 +307,7 @@ case "listslaves": case "listrecords": $zonedata = $api->loadzone($_GET['zoneid']); - $zone = new Zone() + $zone = new Zone(); $zone->parse($zonedata); $records = $zone->rrsets2records(); foreach ($records as &$record) {