From abbce87143fb9b808baa64c77ae9f8d4bf85e1f8 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 27 May 2016 09:29:19 +0200 Subject: [PATCH] Refactored current_zone_allow_transfer. --- src/include/dns-server/dialog-masterzone.rb | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/include/dns-server/dialog-masterzone.rb b/src/include/dns-server/dialog-masterzone.rb index b79bcc7..df01f74 100644 --- a/src/include/dns-server/dialog-masterzone.rb +++ b/src/include/dns-server/dialog-masterzone.rb @@ -202,18 +202,16 @@ def GetMasterZoneEditorTabBasics # @return [Array] def current_zone_allow_transfer - items = [] - @current_zone.fetch("options", []).each do |m| - if m["key"] == "allow-transfer" - key = m.fetch("value", "") - key = key[/\A.*\{[ \t]*(.*)[ \t]*\}.*\z/, 1] - if key != nil - items = key.split(/[ \t;]/).find_all{|i| !i.empty?} - break - end - end + target_pair = @current_zone.fetch("options", []).find do |m| + m["key"] == "allow-transfer" end - items + return [] unless target_pair + + value = target_pair["value"] || "" + value = value[/\A.*\{[ \t]*(.*)[ \t]*\}.*\z/, 1] + return [] unless value + + value.split(/[ \t;]/).reject(&:empty?) end def ZoneAclInit