phpipam / phpipam

functions/classes/class.Rackspace.php

Indentation +48 added lines, -48 removed lines

@@ -37,29 +37,29 @@ 
      */
     private $rack_content = array();
 
-	/**
-	 * Result printing class
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $Result;
-
-	/**
-	 * Database class
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Database;
-
-	/**
-	 * Logging class
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $Log;
+    /**
+     * Result printing class
+     *
+     * @var mixed
+     * @access public
+     */
+    public $Result;
+
+    /**
+     * Database class
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Database;
+
+    /**
+     * Logging class
+     *
+     * @var mixed
+     * @access public
+     */
+    public $Log;
 
     /**
      * Rack
@@ -87,33 +87,33 @@ 
 
 
 
-	/**
-	 * __construct function
-	 *
-	 * @access public
-	 */
-	public function __construct (Database_PDO $database) {
-		# Save database object
-		$this->Database = $database;
-		# initialize Result
-		$this->Result = new Result ();
-		# Log object
-		$this->Log = new Logging ($this->Database);
-
-		# set racksizes
-		$this->define_rack_sizes ();
-		# initialize rack
+    /**
+     * __construct function
+     *
+     * @access public
+     */
+    public function __construct (Database_PDO $database) {
+        # Save database object
+        $this->Database = $database;
+        # initialize Result
+        $this->Result = new Result ();
+        # Log object
+        $this->Log = new Logging ($this->Database);
+
+        # set racksizes
+        $this->define_rack_sizes ();
+        # initialize rack
         $this->Drawer = new RackDrawer();
-	}
+    }
 
 
 
 
 
-	/**
-	 *	@definitions and default methods
-	 *	--------------------------------
-	 */
+    /**
+     *	@definitions and default methods
+     *	--------------------------------
+     */
 
     /**
      * Defines all possible rack sizes
@@ -181,10 +181,10 @@ 
 
 
 
-	/**
-	 *	@draw rack methods
-	 *	--------------------------------
-	 */
+    /**
+     *	@draw rack methods
+     *	--------------------------------
+     */
 
     /**
      * Prepare rack object and content

Doc Comments +10 added lines, -10 removed lines

@@ -152,7 +152,7 @@ 
      * Fetches details about specific rack
      *
      * @access public
-     * @param mixed $id
+     * @param integer $id
      * @return void
      */
     public function fetch_rack_details ($id) {
@@ -169,7 +169,7 @@ 
      * Fetches all devices attached to rack
      *
      * @access public
-     * @param mixed $id
+     * @param integer $id
      * @return void
      */
     public function fetch_rack_devices ($id) {
@@ -247,7 +247,7 @@ 
      * Set active rack devide.
      *
      * @access public
-     * @param mixed $id         // device id
+     * @param boolean $id         // device id
      * @return void
      */
     public function set_active_rack_device ($id) {
@@ -383,7 +383,7 @@ 
      *
      * @access private
      * @param RackContent $content
-     * @param mixed $img
+     * @param resource $img
      * @param mixed $name
      * @return void
      */
@@ -501,7 +501,7 @@ 
      * getSpace function.
      *
      * @access public
-     * @return void
+     * @return integer
      */
     public function getSpace() {
         return $this->space;
@@ -543,7 +543,7 @@ 
      * Checks if item is active
      *
      * @access public
-     * @return void
+     * @return boolean
      */
     public function isActive() {
         return $this->active;
@@ -614,7 +614,7 @@ 
      * returns id
      *
      * @access public
-     * @return void
+     * @return integer
      */
     public function getId() {
         return $this->id;
@@ -656,7 +656,7 @@ 
      * Checks if item is active
      *
      * @access public
-     * @return void
+     * @return boolean
      */
     public function isActive() {
         return $this->active;
@@ -677,7 +677,7 @@ 
      * Returns start position
      *
      * @access public
-     * @return void
+     * @return integer
      */
     public function getStartLocation() {
         return $this->startLocation;
@@ -698,7 +698,7 @@ 
      * Gets rack size.
      *
      * @access public
-     * @return void
+     * @return integer
      */
     public function getSize() {
         return $this->size;

Braces +2 added lines, -1 removed lines

@@ -130,7 +130,8 @@
         if ($this->key_size > 0) {
 
             $out .= ' ' . trim($this->key_data, '.') . '.';
-        } else {
+        }
+        else {
 
             $out .= ' .';
         }

Spacing +75 added lines, -75 removed lines

@@ -15,7 +15,7 @@ 
      * @var array
      * @access public
      */
-    public $rack_sizes = array();
+    public $rack_sizes = array ();
 
     /**
      * List of all racks
@@ -35,7 +35,7 @@ 
      * @var array
      * @access private
      */
-    private $rack_content = array();
+    private $rack_content = array ();
 
 	/**
 	 * Result printing class
@@ -103,7 +103,7 @@ 
 		# set racksizes
 		$this->define_rack_sizes ();
 		# initialize rack
-        $this->Drawer = new RackDrawer();
+        $this->Drawer = new RackDrawer ();
 	}
 
 
@@ -122,7 +122,7 @@ 
      * @return void
      */
     private function define_rack_sizes () {
-        $this->rack_sizes = array(14, 20, 24, 30, 35, 40, 42, 44, 45, 48);
+        $this->rack_sizes = array (14, 20, 24, 30, 35, 40, 42, 44, 45, 48);
     }
 
 
@@ -133,9 +133,9 @@ 
      * @return void
      */
     public function fetch_all_racks () {
-        $all_racks = $this->fetch_all_objects("racks", "name", "acs");
+        $all_racks = $this->fetch_all_objects ("racks", "name", "acs");
         // reorder
-        if ($all_racks==false) {
+        if ($all_racks == false) {
             $this->all_racks = false;
         }
         else {
@@ -161,7 +161,7 @@ 
             return $this->all_racks->$id;
         }
         else {
-            return $this->fetch_object("racks", "id", $id);
+            return $this->fetch_object ("racks", "id", $id);
         }
     }
 
@@ -204,10 +204,10 @@ 
         $this->rack_size = $rack->size;
 
         // set content
-        if ($devices!==false) {
+        if ($devices !== false) {
             foreach ($devices as $d) {
                 // add initial location
-                $rd = array("id"=>$d->id,
+                $rd = array ("id"=>$d->id,
                             "name"=>$d->hostname,
                             "startLocation"=>$d->rack_start,
                             "size"=>$d->rack_size,
@@ -223,7 +223,7 @@ 
         // create rack
         $this->set_rack ();
         // set active device
-        if ($deviceId!==false) {
+        if ($deviceId !== false) {
             $this->set_active_rack_device ($deviceId);
         }
         // draw rack drawer
@@ -238,9 +238,9 @@ 
      */
     private function set_rack () {
         // initialize
-        $this->Rack = new Rack (array("name"=>$this->rack_name, "content"=>$this->rack_content));
+        $this->Rack = new Rack (array ("name"=>$this->rack_name, "content"=>$this->rack_content));
         // set rack size
-        $this->Rack->setSpace($this->rack_size);
+        $this->Rack->setSpace ($this->rack_size);
     }
 
     /**
@@ -251,9 +251,9 @@ 
      * @return void
      */
     public function set_active_rack_device ($id) {
-        foreach ($this->Rack->getContent() as $content) {
-            if ($content->getId() == $id) {
-                $content->setActive();
+        foreach ($this->Rack->getContent () as $content) {
+            if ($content->getId () == $id) {
+                $content->setActive ();
             }
         }
     }
@@ -312,15 +312,15 @@ 
      * @param Rack $rack
      * @return void
      */
-    public function draw(Rack $rack) {
+    public function draw (Rack $rack) {
         $this->rack = $rack;
-        $this->template = imagecreatefrompng( $this->createURL().BASE."css/1.2/images/blankracks/".$this->rack->getSpace().".png" );
-        $this->drawNameplate();
-        $this->drawContents();
+        $this->template = imagecreatefrompng ($this->createURL ().BASE."css/1.2/images/blankracks/".$this->rack->getSpace ().".png");
+        $this->drawNameplate ();
+        $this->drawContents ();
 
-        header("Content-type: image/png");
-        imagepng($this->template);
-        imagedestroy($this->template);
+        header ("Content-type: image/png");
+        imagepng ($this->template);
+        imagedestroy ($this->template);
     }
 
     /**
@@ -329,12 +329,12 @@ 
      * @access private
      * @return void
      */
-    private function drawNameplate() {
-        $nameplate = imagecreate(150, 20);
-        imagecolorallocate( $nameplate, 255, 255, 255 ); // Allocate a background color (first color assigned)
-        $textColour = imagecolorallocate($nameplate, 0, 0, 0);
-        $this->imageCenterString($nameplate, 3, $this->rack->getName(), $textColour);
-        imagecopy($this->template, $nameplate, 52, 1, 0, 0, 150, 20);
+    private function drawNameplate () {
+        $nameplate = imagecreate (150, 20);
+        imagecolorallocate ($nameplate, 255, 255, 255); // Allocate a background color (first color assigned)
+        $textColour = imagecolorallocate ($nameplate, 0, 0, 0);
+        $this->imageCenterString ($nameplate, 3, $this->rack->getName (), $textColour);
+        imagecopy ($this->template, $nameplate, 52, 1, 0, 0, 150, 20);
     }
 
     /**
@@ -345,15 +345,15 @@ 
      * @param string $text
      * @param int $color
      */
-    private function imageCenterString($img, $font, $text, $color) {
+    private function imageCenterString ($img, $font, $text, $color) {
         if ($font < 0 || $font > 5) {
             $font = 0;
         }
-        $num = Array( Array(4.6, 6), Array(4.6, 6), Array(5.6, 12), Array(6.5, 12), Array(7.6, 16), Array(8.5, 16));
-        $width = ceil(strlen($text) * $num[$font][0]);
-        $x = imagesx($img) - $width - 8;
-        $y = Imagesy($img) - ($num[$font][1] + 2);
-        imagestring($img, $font, $x/2, $y/2, $text, $color);
+        $num = Array (Array (4.6, 6), Array (4.6, 6), Array (5.6, 12), Array (6.5, 12), Array (7.6, 16), Array (8.5, 16));
+        $width = ceil (strlen ($text) * $num[$font][0]);
+        $x = imagesx ($img) - $width - 8;
+        $y = Imagesy ($img) - ($num[$font][1] + 2);
+        imagestring ($img, $font, $x / 2, $y / 2, $text, $color);
     }
 
 
@@ -363,18 +363,18 @@ 
      * @access private
      * @return void
      */
-    private function drawContents() {
-        foreach ($this->rack->getContent() as $content)
+    private function drawContents () {
+        foreach ($this->rack->getContent () as $content)
         {
-            $pixelSize = 20 * $content->getSize();
+            $pixelSize = 20 * $content->getSize ();
 
-            $img = imagecreate(200, $pixelSize);
-            $this->drawContent($content, $img, $content->getName());
+            $img = imagecreate (200, $pixelSize);
+            $this->drawContent ($content, $img, $content->getName ());
 
-            $yPos = 22 + 20 * ($this->rack->getSpace() - ($content->getStartLocation() + $content->getSize()));
+            $yPos = 22 + 20 * ($this->rack->getSpace () - ($content->getStartLocation () + $content->getSize ()));
 
-            imagecopy($this->template, $img, 27, $yPos, 0, 0, 200, $pixelSize);
-            imagedestroy($img);
+            imagecopy ($this->template, $img, 27, $yPos, 0, 0, 200, $pixelSize);
+            imagedestroy ($img);
         }
     }
 
@@ -387,21 +387,21 @@ 
      * @param mixed $name
      * @return void
      */
-    private function drawContent(RackContent $content, $img, $name)
+    private function drawContent (RackContent $content, $img, $name)
     {
-        if ($content->isActive()) {
-            imagecolorallocate($img, 207, 232, 255); // Allocate a background color (first color assigned) - active
-            $textColour = imagecolorallocate($img, 0, 0, 0);
-            $lineColour = imagecolorallocate($img, 122, 137, 150);
+        if ($content->isActive ()) {
+            imagecolorallocate ($img, 207, 232, 255); // Allocate a background color (first color assigned) - active
+            $textColour = imagecolorallocate ($img, 0, 0, 0);
+            $lineColour = imagecolorallocate ($img, 122, 137, 150);
         } else {
-            imagecolorallocate($img, 230, 230, 230); // Allocate a background color (first color assigned)  - all
-            $textColour = imagecolorallocate($img, 0, 0, 0);
-            $lineColour = imagecolorallocate($img, 122, 137, 150);
+            imagecolorallocate ($img, 230, 230, 230); // Allocate a background color (first color assigned)  - all
+            $textColour = imagecolorallocate ($img, 0, 0, 0);
+            $lineColour = imagecolorallocate ($img, 122, 137, 150);
         }
 
-        $this->imageCenterString($img, 3, $name, $textColour);
-        imageline($img, 0, 0, 200, 0, $lineColour);
-        imageline($img, 0, imagesy($img) - 1, 200, imagesy($img) - 1, $lineColour);
+        $this->imageCenterString ($img, 3, $name, $textColour);
+        imageline ($img, 0, 0, 200, 0, $lineColour);
+        imageline ($img, 0, imagesy ($img) - 1, 200, imagesy ($img) - 1, $lineColour);
     }
 }
 
@@ -418,13 +418,13 @@ 
      * @param array $fields
      * @return void
      */
-    public function __construct(array $fields)
+    public function __construct (array $fields)
     {
         foreach ($fields as $field => $value)
         {
-            $setter = 'set' . ucfirst($field);
-            if (method_exists($this, $setter)) {
-                $this->$setter($value);
+            $setter = 'set'.ucfirst ($field);
+            if (method_exists ($this, $setter)) {
+                $this->$setter ($value);
             }
         }
     }
@@ -482,7 +482,7 @@ 
      * @access public
      * @return void
      */
-    public function getName() {
+    public function getName () {
         return $this->name;
     }
 
@@ -493,7 +493,7 @@ 
      * @param mixed $name
      * @return void
      */
-    public function setName($name) {
+    public function setName ($name) {
         $this->name = $name;
     }
 
@@ -503,7 +503,7 @@ 
      * @access public
      * @return void
      */
-    public function getSpace() {
+    public function getSpace () {
         return $this->space;
     }
 
@@ -514,7 +514,7 @@ 
      * @param mixed $space
      * @return void
      */
-    public function setSpace($space) {
+    public function setSpace ($space) {
         $this->space = $space;
     }
 
@@ -524,7 +524,7 @@ 
      * @access public
      * @return void
      */
-    public function getContent() {
+    public function getContent () {
         return $this->content;
     }
 
@@ -535,7 +535,7 @@ 
      * @param mixed $content
      * @return void
      */
-    public function setContent($content) {
+    public function setContent ($content) {
         $this->content = $content;
     }
 
@@ -545,7 +545,7 @@ 
      * @access public
      * @return void
      */
-    public function isActive() {
+    public function isActive () {
         return $this->active;
     }
 
@@ -556,7 +556,7 @@ 
      * @param bool $active (default: true)
      * @return void
      */
-    public function setActive($active) {
+    public function setActive ($active) {
         $this->active = $active;
     }
 }
@@ -616,7 +616,7 @@ 
      * @access public
      * @return void
      */
-    public function getId() {
+    public function getId () {
         return $this->id;
     }
 
@@ -627,7 +627,7 @@ 
      * @param mixed $id
      * @return void
      */
-    public function setId($id) {
+    public function setId ($id) {
         $this->id = $id;
     }
 
@@ -637,7 +637,7 @@ 
      * @access public
      * @return void
      */
-    public function getName() {
+    public function getName () {
         return $this->name;
     }
 
@@ -648,7 +648,7 @@ 
      * @param mixed $name
      * @return void
      */
-    public function setName($name) {
+    public function setName ($name) {
         $this->name = $name;
     }
 
@@ -658,7 +658,7 @@ 
      * @access public
      * @return void
      */
-    public function isActive() {
+    public function isActive () {
         return $this->active;
     }
 
@@ -669,7 +669,7 @@ 
      * @param bool $active (default: true)
      * @return void
      */
-    public function setActive($active = true) {
+    public function setActive ($active = true) {
         $this->active = $active;
     }
 
@@ -679,7 +679,7 @@ 
      * @access public
      * @return void
      */
-    public function getStartLocation() {
+    public function getStartLocation () {
         return $this->startLocation;
     }
 
@@ -690,7 +690,7 @@ 
      * @param mixed $startLocation
      * @return void
      */
-    public function setStartLocation($startLocation) {
+    public function setStartLocation ($startLocation) {
         $this->startLocation = $startLocation;
     }
 
@@ -700,7 +700,7 @@ 
      * @access public
      * @return void
      */
-    public function getSize() {
+    public function getSize () {
         return $this->size;
     }
 
@@ -711,7 +711,7 @@ 
      * @param mixed $size
      * @return void
      */
-    public function setSize($size) {
+    public function setSize ($size) {
         $this->size = $size;
     }
 }

functions/classes/class.FirewallZones.php

Doc Comments +1 added lines, -1 removed lines

@@ -239,7 +239,7 @@
 	 * Fetches zone mapping from database, depending on id
 	 *
 	 * @access public
-	 * @param mixed $id
+	 * @param string $id
 	 * @return void
 	 */
 	public function get_zone_mapping ($id) {

Braces +63 added lines, -60 removed lines

@@ -50,7 +50,8 @@ 
 		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
 		if ($firewallZoneSettings['padding'] == 'on') {
 			return str_pad(dechex($zone),$firewallZoneSettings['zoneLength'],"0",STR_PAD_LEFT);
-		} else {
+		}
+		else {
 			return dechex($zone);
 		}
 
@@ -70,9 +71,11 @@ 
 		# execute based on action
 		if($firewallZoneSettings['zoneGenerator'] == 0 || $firewallZoneSettings['zoneGenerator'] == 1 ) {
 			return $this->generate_numeric_zone_name ($firewallZoneSettings['zoneLength'],$firewallZoneSettings['zoneGenerator']);
-		} elseif($firewallZoneSettings['zoneGenerator'] == 2 ) {
+		}
+		elseif($firewallZoneSettings['zoneGenerator'] == 2 ) {
 			return $this->validate_text_zone_name ($values);
-		} else {
+		}
+		else {
 			return $this->Result->show("danger", _("Invalid generator ID"), true);
 		}
 	}
@@ -89,8 +92,7 @@ 
 	private function generate_numeric_zone_name ($zoneLength,$zoneGenerator) {
 
 		# execute
-		try { $maxZone = $this->Database->getObjectsQuery('SELECT MAX(CAST(zone as UNSIGNED)) as zone FROM firewallZones WHERE generator NOT LIKE 2;');}
-		catch (Exception $e) {
+		try { $maxZone = $this->Database->getObjectsQuery('SELECT MAX(CAST(zone as UNSIGNED)) as zone FROM firewallZones WHERE generator NOT LIKE 2;');} catch (Exception $e) {
 			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 			return false;
 		}
@@ -102,17 +104,19 @@ 
 				if(strlen($zoneName) > $zoneLength) {
 					return $this->Result->show("danger", _("Maximum zone name length reached! Consider to change your settings in order to generate larger zone names."), true);
 				}
-			} elseif($zoneGenerator == 1) {
+			}
+			elseif($zoneGenerator == 1) {
 				# the highest convertable integer value for dechex() is 4294967295!
 				if($zoneName > 4294967295) {
 					return $this->Result->show("danger", _("The maximum convertable vlaue is reached. Consider to switch to decimal or text mode and change the zone name length value."), true);
 				}
-				if(strlen(dechex($zoneName)) > $zoneLength){
+				if(strlen(dechex($zoneName)) > $zoneLength) {
 					return $this->Result->show("danger", _("Maximum zone name length reached! Consider to change your settings in order to generate larger zone names."), true);
 				}
 			}
 
-		} else {
+		}
+		else {
 			# set the initial zone name to "1"
 			$zoneName = 1;
 		}
@@ -133,17 +137,17 @@ 
 		# get settings
 		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
 
-		if($values[1]){
+		if($values[1]) {
 			$query = 'SELECT zone FROM firewallZones WHERE zone = ? AND id NOT LIKE ?;';
 			$params = $values;
-		} else {
+		}
+		else {
 			$query = 'SELECT zone FROM firewallZones WHERE zone = ?;';
 			$params = $values[0];
 		}
 
 		# execute
-		try { $uniqueZone = $this->Database->getObjectsQuery($query,$params);}
-		catch (Exception $e) {
+		try { $uniqueZone = $this->Database->getObjectsQuery($query,$params);} catch (Exception $e) {
 			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 			return false;
 		}
@@ -152,7 +156,8 @@ 
 
 			$this->Result->show("danger", _("Error: The zone name ".$zone." is not unique!"), false);
 
-		} else {
+		}
+		else {
 			# set the initial zone name to "1"
 			$zoneName = $values[0];
 		}
@@ -213,11 +218,11 @@ 
 		# modify the zone output values
 		foreach ($mappings as $key => $val) {
 			# transform the zone name from decimal to hex
-			if($mappings[$key]->generator == 1 ){
+			if($mappings[$key]->generator == 1 ) {
 				$mappings[$key]->zone = dechex($mappings[$key]->zone);
 			}
 			# add some padding if it is activated and the zone generatore is not text
-			if($mappings[$key]->padding == 1 && $mappings[$key]->generator != 2){
+			if($mappings[$key]->padding == 1 && $mappings[$key]->generator != 2) {
 			# remove leading zeros (padding) and raise the value in case of any zone name length changes
 			# add some padding to reach the maximum zone name lenght
 			$mappings[$key]->zone = str_pad(ltrim($mappings[$key]->zone,0),$mappings[$key]->length,"0",STR_PAD_LEFT);
@@ -287,11 +292,11 @@ 
 		# modify the zone output values
 		foreach ($mapping as $key => $val) {
 			# transform the zone name from decimal to hex
-			if($mapping[$key]->generator == 1 ){
+			if($mapping[$key]->generator == 1 ) {
 				$mapping[$key]->zone = dechex($mapping[$key]->zone);
 			}
 			# add some padding if it is activated and the zone generatore is not text
-			if($mapping[$key]->padding == 1 && $mapping[$key]->generator != 2){
+			if($mapping[$key]->padding == 1 && $mapping[$key]->generator != 2) {
 			# remove leading zeros (padding) and raise the value in case of any zone name length changes
 			# add some padding to reach the maximum zone name lenght
 			$mapping[$key]->zone = str_pad(ltrim($mapping[$key]->zone,0),$mapping[$key]->length,"0",STR_PAD_LEFT);
@@ -365,11 +370,11 @@ 
 			# modify the zone output values
 			foreach ($info as $key => $val) {
 				# transform the zone name from decimal to hex
-				if($info[$key]->generator == 1 ){
+				if($info[$key]->generator == 1 ) {
 					$info[$key]->zone = dechex($info[$key]->zone);
 				}
 				# add some padding if it is activated and the zone generatore is not text
-				if($info[$key]->padding == 1 && $info[$key]->generator != 2){
+				if($info[$key]->padding == 1 && $info[$key]->generator != 2) {
 				# remove leading zeros (padding) and raise the value in case of any zone name length changes
 				# add some padding to reach the maximum zone name lenght
 				$info[$key]->zone = str_pad(ltrim($info[$key]->zone,0),$info[$key]->length,"0",STR_PAD_LEFT);
@@ -416,11 +421,11 @@ 
 		# modify the zone output values
 		foreach ($zones as $key => $val) {
 			# transform the zone name from decimal to hex
-			if($zones[$key]->generator == 1 ){
+			if($zones[$key]->generator == 1 ) {
 				$zones[$key]->zone = dechex($zones[$key]->zone);
 			}
 			# add some padding if it is activated and the zone generatore is not text
-			if($zones[$key]->padding == 1 && $zones[$key]->generator != 2){
+			if($zones[$key]->padding == 1 && $zones[$key]->generator != 2) {
 			# remove leading zeros (padding) and raise the value in case of any zone name length changes
 			# add some padding to reach the maximum zone name lenght
 			$zones[$key]->zone = str_pad(ltrim($zones[$key]->zone,0),$zones[$key]->length,"0",STR_PAD_LEFT);
@@ -476,11 +481,11 @@ 
 		# modify the zone output values
 		foreach ($zone as $key => $val) {
 			# transform the zone name from decimal to hex
-			if($zone[$key]->generator == 1 ){
+			if($zone[$key]->generator == 1 ) {
 				$zone[$key]->zone = dechex($zone[$key]->zone);
 			}
 			# add some padding if it is activated and the zone generatore is not text
-			if($zone[$key]->padding == 1 && $zone[$key]->generator != 2){
+			if($zone[$key]->padding == 1 && $zone[$key]->generator != 2) {
 			# remove leading zeros (padding) and raise the value in case of any zone name length changes
 			# add some padding to reach the maximum zone name lenght
 			$zone[$key]->zone = str_pad(ltrim($zone[$key]->zone,0),$zone[$key]->length,"0",STR_PAD_LEFT);
@@ -545,7 +550,8 @@ 
 
 				if (!$network->subnetIsFolder) {
 					print '<td>'.$this->Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.$network->subnetDescription.'</td>';
-				} else{
+				}
+				else {
 					print '<td>Folder '.$network->subnetDescription.'</td>';
 				}
 				print '<td>'.$network->vlan.$network->vlanName.'</td>';
@@ -597,7 +603,8 @@ 
 
 			if ($network->subnetIsFolder == 1 ) {
 				print 'Folder: '.$network->subnetDescription;
-			} else {
+			}
+			else {
 				# display network information with or without description
 				if ($network->subnetDescription) 	{	print $this->Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.' ('.$network->subnetDescription.')</td>';	}
 				else 								{	print $this->Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.'</td>';	}
@@ -626,7 +633,8 @@ 
 		if(!sizeof($networkInformation)>0 ) {
 			# return dummy value
 			return 'success';
-		} else {
+		}
+		else {
 			$this->Result->show("danger","<strong>"._('Error').":</strong><br>"._("This network is already bound to this or another zone.<br>The binding must be unique."), false);
 			return false;
 		}
@@ -659,7 +667,8 @@ 
 
 			# throw exception
 			catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
-		} else {
+		}
+		else {
 			$this->Result->show("danger","<strong>"._('Error').":</strong><br>"._("This network is already bound to this or another zone.<br>The binding must be unique."), false);
 			return false;
 		}
@@ -686,7 +695,8 @@ 
 		# return dummy value or false
 		if ($deleteRow) {
 			return 'success';
-		} else {
+		}
+		else {
 			return false;
 		}
 	}
@@ -738,16 +748,14 @@ 
 		$values['length'] = $firewallZoneSettings['zoneLength'];
 
 		# execute insert
-		try { $this->Database->insertObject("firewallZones", $values); }
-		catch (Exception $e) {
+		try { $this->Database->insertObject("firewallZones", $values); } catch (Exception $e) {
 			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 			$this->Log->write( "Firewall zone created", "Failed to add new firewall zone<hr>".$e->getMessage(), 2, $this->User->username);
 			return false;
 		}
 
 		# fetch the highest inserted id, matching the zone name
-		try { $lastId=$this->Database->getObjectsQuery("SELECT MAX(id) AS id FROM firewallZones WHERE zone = ? ;", $values['zone']);}
-		catch (Exception $e) {
+		try { $lastId=$this->Database->getObjectsQuery("SELECT MAX(id) AS id FROM firewallZones WHERE zone = ? ;", $values['zone']);} catch (Exception $e) {
 			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 			return false;
 		}
@@ -756,8 +764,7 @@ 
 			foreach ($network as $subnetId) {
 				$values = array('zoneId' => $lastId[0]->id, 'subnetId' => $subnetId);
 				# add the network bindings if there are any
-				try { $this->Database->insertObject("firewallZoneSubnet", $values); }
-				catch (Exception $e) {
+				try { $this->Database->insertObject("firewallZoneSubnet", $values); } catch (Exception $e) {
 					$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 					return false;
 				}
@@ -779,8 +786,7 @@ 
 	 */
 	private function zone_edit ($values) {
 		# execute
-		try { $this->Database->updateObject("firewallZones", $values, "id"); }
-		catch (Exception $e) {
+		try { $this->Database->updateObject("firewallZones", $values, "id"); } catch (Exception $e) {
 			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 			$this->Log->write( "Firewall zone edited", "Failed to edit firewall zone<hr>".$e->getMessage(), 2, $this->User->username);
 			return false;
@@ -803,16 +809,14 @@ 
 		$old_zone = $this->get_zone($id);
 
 		# delete mappings
-		try { $this->Database->deleteRow("firewallZoneMapping", "zoneId", $id); }
-		catch (Exception $e) {
+		try { $this->Database->deleteRow("firewallZoneMapping", "zoneId", $id); } catch (Exception $e) {
 			$this->Log->write( "Firewall zone and mappings delete", "Failed to delete firewall zone mappfings of $old_zone->zone<hr>".$e->getMessage(), 2, $this->User->username);
 			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 			return false;
 		}
 
 		# delete zone
-		try { $this->Database->deleteRow("firewallZones", "id", $id); }
-		catch (Exception $e) {
+		try { $this->Database->deleteRow("firewallZones", "id", $id); } catch (Exception $e) {
 			$this->Log->write( "Firewall zone delete", "Failed to delete firewall zone $old_zone->zone<hr>".$e->getMessage(), 2, $this->User->username);
 			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 			return false;
@@ -859,8 +863,7 @@ 
 		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
 
 		# execute
-		try { $this->Database->insertObject("firewallZoneMapping", $values); }
-		catch (Exception $e) {
+		try { $this->Database->insertObject("firewallZoneMapping", $values); } catch (Exception $e) {
 			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 			$this->Log->write( "Firewall zone mapping created", "Failed to add new firewall zone mapping<hr>".$e->getMessage(), 2, $this->User->username);
 			return false;
@@ -880,8 +883,7 @@ 
 	 */
 	private function mapping_edit ($values) {
 		# execute
-		try { $this->Database->updateObject("firewallZoneMapping", $values, "id"); }
-		catch (Exception $e) {
+		try { $this->Database->updateObject("firewallZoneMapping", $values, "id"); } catch (Exception $e) {
 			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 			$this->Log->write( "Firewall zone mapping edited", "Failed to edit firewall zone mapping<hr>".$e->getMessage(), 2, $this->User->username);
 			return false;
@@ -904,8 +906,7 @@ 
 		$old_mapping = $this->get_zone_mapping($id);
 
 		# delete mapping
-		try { $this->Database->deleteRow("firewallZoneMapping", "id", $id); }
-		catch (Exception $e) {
+		try { $this->Database->deleteRow("firewallZoneMapping", "id", $id); } catch (Exception $e) {
 			$this->Log->write( "Firewall zone mapping delete", "Failed to delete firewall zone mapping $old_zone->zone<hr>".$e->getMessage(), 2, $this->User->username);
 			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 			return false;
@@ -944,7 +945,8 @@ 
 					# check if the subnet is v4 or v6
 					if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][0];
-					} elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+					}
+					elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
 						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][1];
 					}
 					break;
@@ -959,10 +961,12 @@ 
 			# check if the subnet is v4 or v6
 			if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 				$firewallAddressObject = $firewallAddressObject.$this->Subnets->transform_to_dotted($zone->subnet).'-'.$zone->mask;
-			} elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+			}
+			elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
 				$firewallAddressObject = $firewallAddressObject.str_replace(':',$firewallZoneSettings['separator'],$this->Subnets->transform_to_dotted($zone->subnet)).'-'.$zone->mask;
 			}
-		} elseif ($firewallZoneSettings['subnetPatternValues'][$firewallZoneSettings['subnetPattern']] == 'description' ) {
+		}
+		elseif ($firewallZoneSettings['subnetPatternValues'][$firewallZoneSettings['subnetPattern']] == 'description' ) {
 			$firewallAddressObject = $firewallAddressObject.str_replace(' ',$firewallZoneSettings['separator'],strtolower($zone->subnetDescription));
 		}
 
@@ -973,8 +977,7 @@ 
 		if ($zone->firewallAddressObject != $firewallAddressObject ) {
 			# update field in database
 			$values = array('id' => $id , 'firewallAddressObject' => $firewallAddressObject);
-			try { $this->Database->updateObject("subnets", $values, "id"); }
-			catch (Exception $e) {
+			try { $this->Database->updateObject("subnets", $values, "id"); } catch (Exception $e) {
 				$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 				return false;
 			}
@@ -1018,7 +1021,8 @@ 
 					# check if the subnet is v4 or v6
 					if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][0];
-					} elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+					}
+					elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
 						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][1];
 					}
 					break;
@@ -1072,7 +1076,8 @@ 
 					# check if the subnet is v4 or v6
 					if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][0];
-					} elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+					}
+					elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
 						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][1];
 					}
 					break;
@@ -1092,8 +1097,7 @@ 
 		if ($address_old->firewallAddressObject != $firewallAddressObject) {
 			# update field in database
 			$values = array('id' => $IPId , 'subnetId' => $subnetId, 'firewallAddressObject' => $firewallAddressObject);
-			try { $this->Database->updateObject("ipaddresses", $values, "id", "subnetId"); }
-			catch (Exception $e) {
+			try { $this->Database->updateObject("ipaddresses", $values, "id", "subnetId"); } catch (Exception $e) {
 				$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 				return false;
 			}
@@ -1127,8 +1131,7 @@ 
 		# fetch zone informations
 		$zone = $this->get_zone_subnet_info($subnetId);
 
-		try { $ipaddresses = $this->Database->getObjectsQuery('SELECT id, dns_name FROM ipaddresses WHERE subnetId = ? ',$subnetId); }
-		catch (Exception $e) {
+		try { $ipaddresses = $this->Database->getObjectsQuery('SELECT id, dns_name FROM ipaddresses WHERE subnetId = ? ',$subnetId); } catch (Exception $e) {
 			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 			return false;
 		}
@@ -1149,7 +1152,8 @@ 
 						# check if the subnet is v4 or v6
 						if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 							$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][0];
-						} elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+						}
+						elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
 							$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][1];
 						}
 						break;
@@ -1169,8 +1173,7 @@ 
 			if ($address_old->firewallAddressObject != $firewallAddressObject) {
 				# update field in database
 				$values = array('id' => $ipaddress->id , 'subnetId' => $subnetId, 'firewallAddressObject' => $firewallAddressObject);
-				try { $this->Database->updateObject("ipaddresses", $values, "id", "subnetId"); }
-				catch (Exception $e) {
+				try { $this->Database->updateObject("ipaddresses", $values, "id", "subnetId"); } catch (Exception $e) {
 					$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 					return false;
 				}

Indentation +1104 added lines, -1104 removed lines

@@ -8,219 +8,219 @@ 
 class FirewallZones extends Common_functions {
 
 
-	/**
-	 * connection error string
-	 *
-	 * (default value: false)
-	 *
-	 * @var bool
-	 * @access public
-	 */
-	public $error = false;
-
-	/**
-	 * number of results
-	 *
-	 * @var int
-	 * @access public
-	 */
-	public $limit;
-
-	/**
-	 * orderby
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $orderby;
-
-	/**
-	 * orderdir
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $orderdir;
-
-	/**
-	 * firewallZoneSettings
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $firewallZoneSettings;
-
-	/**
-	 * Log
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $Log;
-
-	/**
-	 * Database
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Database;
-
-
-
-	/**
-	 * __construct function.
-	 *
-	 * @access public
-	 * @param Database_PDO $Database
-	 * @return void
-	 */
-	public function __construct (Database_PDO $Database) {
-		# initialize Result
-		$this->Result = new Result ();
-		# initialize object
-		$this->Database = $Database;
-		# Log object
-		$this->Log = new Logging ($this->Database);
-		# get settings
-		$this->get_settings();
-		# subnet object
-		$this->Subnets = new Subnets ($this->Database);
-	}
-
-
-	/**
-	 * convert zone name from decimal to hex (only for display reasons)
-	 *
-	 * @access public
-	 * @param mixed $zone
-	 * @return string
-	 */
-	public function zone2hex ($zone) {
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
-		if ($firewallZoneSettings['padding'] == 'on') {
-			return str_pad(dechex($zone),$firewallZoneSettings['zoneLength'],"0",STR_PAD_LEFT);
-		} else {
-			return dechex($zone);
-		}
-
-	}
-
-
-	/**
-	 * Generate unique zone names by generator type
-	 *
-	 * @access public
-	 * @param mixed $values
-	 * @return void
-	 */
-	public function generate_zone_name ($values = NULL) {
-		# get settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
-		# execute based on action
-		if($firewallZoneSettings['zoneGenerator'] == 0 || $firewallZoneSettings['zoneGenerator'] == 1 ) {
-			return $this->generate_numeric_zone_name ($firewallZoneSettings['zoneLength'],$firewallZoneSettings['zoneGenerator']);
-		} elseif($firewallZoneSettings['zoneGenerator'] == 2 ) {
-			return $this->validate_text_zone_name ($values);
-		} else {
-			return $this->Result->show("danger", _("Invalid generator ID"), true);
-		}
-	}
-
-
-	/**
-	 * Create decimal zone name
-	 *
-	 * @access private
-	 * @param mixed $zoneLength
-	 * @param mixed $zoneGenerator
-	 * @return void
-	 */
-	private function generate_numeric_zone_name ($zoneLength,$zoneGenerator) {
-
-		# execute
-		try { $maxZone = $this->Database->getObjectsQuery('SELECT MAX(CAST(zone as UNSIGNED)) as zone FROM firewallZones WHERE generator NOT LIKE 2;');}
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			return false;
-		}
-
-		if($maxZone[0]->zone) {
-			# add 1 to the zone name
-			$zoneName = ++$maxZone[0]->zone;
-			if($zoneGenerator == 0 ) {
-				if(strlen($zoneName) > $zoneLength) {
-					return $this->Result->show("danger", _("Maximum zone name length reached! Consider to change your settings in order to generate larger zone names."), true);
-				}
-			} elseif($zoneGenerator == 1) {
-				# the highest convertable integer value for dechex() is 4294967295!
-				if($zoneName > 4294967295) {
-					return $this->Result->show("danger", _("The maximum convertable vlaue is reached. Consider to switch to decimal or text mode and change the zone name length value."), true);
-				}
-				if(strlen(dechex($zoneName)) > $zoneLength){
-					return $this->Result->show("danger", _("Maximum zone name length reached! Consider to change your settings in order to generate larger zone names."), true);
-				}
-			}
-
-		} else {
-			# set the initial zone name to "1"
-			$zoneName = 1;
-		}
-
-		# return the values
-		return sizeof($zoneName)>0 ? $zoneName : false;
-	}
-
-
-	/**
-	 * validate text zone names
-	 *
-	 * @access private
-	 * @param mixed $values
-	 * @return void
-	 */
-	private function validate_text_zone_name ($values) {
-		# get settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
-
-		if($values[1]){
-			$query = 'SELECT zone FROM firewallZones WHERE zone = ? AND id NOT LIKE ?;';
-			$params = $values;
-		} else {
-			$query = 'SELECT zone FROM firewallZones WHERE zone = ?;';
-			$params = $values[0];
-		}
-
-		# execute
-		try { $uniqueZone = $this->Database->getObjectsQuery($query,$params);}
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			return false;
-		}
-
-		if ($uniqueZone[0]->zone && $firewallZoneSettings['strictMode'] == 'on') {
-
-			$this->Result->show("danger", _("Error: The zone name ".$zone." is not unique!"), false);
-
-		} else {
-			# set the initial zone name to "1"
-			$zoneName = $values[0];
-		}
-
-		# return the values
-		return sizeof($zoneName)>0 ? $zoneName : false;
-	}
-
-
-	/**
-	 * Fetches zone mappings from database
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function get_zone_mappings () {
-		# try to fetch all zone mappings
-		try { $mappings =  $this->Database->getObjectsQuery('SELECT
+    /**
+     * connection error string
+     *
+     * (default value: false)
+     *
+     * @var bool
+     * @access public
+     */
+    public $error = false;
+
+    /**
+     * number of results
+     *
+     * @var int
+     * @access public
+     */
+    public $limit;
+
+    /**
+     * orderby
+     *
+     * @var mixed
+     * @access public
+     */
+    public $orderby;
+
+    /**
+     * orderdir
+     *
+     * @var mixed
+     * @access public
+     */
+    public $orderdir;
+
+    /**
+     * firewallZoneSettings
+     *
+     * @var mixed
+     * @access public
+     */
+    public $firewallZoneSettings;
+
+    /**
+     * Log
+     *
+     * @var mixed
+     * @access public
+     */
+    public $Log;
+
+    /**
+     * Database
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Database;
+
+
+
+    /**
+     * __construct function.
+     *
+     * @access public
+     * @param Database_PDO $Database
+     * @return void
+     */
+    public function __construct (Database_PDO $Database) {
+        # initialize Result
+        $this->Result = new Result ();
+        # initialize object
+        $this->Database = $Database;
+        # Log object
+        $this->Log = new Logging ($this->Database);
+        # get settings
+        $this->get_settings();
+        # subnet object
+        $this->Subnets = new Subnets ($this->Database);
+    }
+
+
+    /**
+     * convert zone name from decimal to hex (only for display reasons)
+     *
+     * @access public
+     * @param mixed $zone
+     * @return string
+     */
+    public function zone2hex ($zone) {
+        $firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+        if ($firewallZoneSettings['padding'] == 'on') {
+            return str_pad(dechex($zone),$firewallZoneSettings['zoneLength'],"0",STR_PAD_LEFT);
+        } else {
+            return dechex($zone);
+        }
+
+    }
+
+
+    /**
+     * Generate unique zone names by generator type
+     *
+     * @access public
+     * @param mixed $values
+     * @return void
+     */
+    public function generate_zone_name ($values = NULL) {
+        # get settings
+        $firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+        # execute based on action
+        if($firewallZoneSettings['zoneGenerator'] == 0 || $firewallZoneSettings['zoneGenerator'] == 1 ) {
+            return $this->generate_numeric_zone_name ($firewallZoneSettings['zoneLength'],$firewallZoneSettings['zoneGenerator']);
+        } elseif($firewallZoneSettings['zoneGenerator'] == 2 ) {
+            return $this->validate_text_zone_name ($values);
+        } else {
+            return $this->Result->show("danger", _("Invalid generator ID"), true);
+        }
+    }
+
+
+    /**
+     * Create decimal zone name
+     *
+     * @access private
+     * @param mixed $zoneLength
+     * @param mixed $zoneGenerator
+     * @return void
+     */
+    private function generate_numeric_zone_name ($zoneLength,$zoneGenerator) {
+
+        # execute
+        try { $maxZone = $this->Database->getObjectsQuery('SELECT MAX(CAST(zone as UNSIGNED)) as zone FROM firewallZones WHERE generator NOT LIKE 2;');}
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+            return false;
+        }
+
+        if($maxZone[0]->zone) {
+            # add 1 to the zone name
+            $zoneName = ++$maxZone[0]->zone;
+            if($zoneGenerator == 0 ) {
+                if(strlen($zoneName) > $zoneLength) {
+                    return $this->Result->show("danger", _("Maximum zone name length reached! Consider to change your settings in order to generate larger zone names."), true);
+                }
+            } elseif($zoneGenerator == 1) {
+                # the highest convertable integer value for dechex() is 4294967295!
+                if($zoneName > 4294967295) {
+                    return $this->Result->show("danger", _("The maximum convertable vlaue is reached. Consider to switch to decimal or text mode and change the zone name length value."), true);
+                }
+                if(strlen(dechex($zoneName)) > $zoneLength){
+                    return $this->Result->show("danger", _("Maximum zone name length reached! Consider to change your settings in order to generate larger zone names."), true);
+                }
+            }
+
+        } else {
+            # set the initial zone name to "1"
+            $zoneName = 1;
+        }
+
+        # return the values
+        return sizeof($zoneName)>0 ? $zoneName : false;
+    }
+
+
+    /**
+     * validate text zone names
+     *
+     * @access private
+     * @param mixed $values
+     * @return void
+     */
+    private function validate_text_zone_name ($values) {
+        # get settings
+        $firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+
+        if($values[1]){
+            $query = 'SELECT zone FROM firewallZones WHERE zone = ? AND id NOT LIKE ?;';
+            $params = $values;
+        } else {
+            $query = 'SELECT zone FROM firewallZones WHERE zone = ?;';
+            $params = $values[0];
+        }
+
+        # execute
+        try { $uniqueZone = $this->Database->getObjectsQuery($query,$params);}
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+            return false;
+        }
+
+        if ($uniqueZone[0]->zone && $firewallZoneSettings['strictMode'] == 'on') {
+
+            $this->Result->show("danger", _("Error: The zone name ".$zone." is not unique!"), false);
+
+        } else {
+            # set the initial zone name to "1"
+            $zoneName = $values[0];
+        }
+
+        # return the values
+        return sizeof($zoneName)>0 ? $zoneName : false;
+    }
+
+
+    /**
+     * Fetches zone mappings from database
+     *
+     * @access public
+     * @return void
+     */
+    public function get_zone_mappings () {
+        # try to fetch all zone mappings
+        try { $mappings =  $this->Database->getObjectsQuery('SELECT
 						firewallZones.id AS id,
 						firewallZones.generator AS generator,
 						firewallZones.length AS length,
@@ -238,11 +238,11 @@ 
 						RIGHT JOIN firewallZones ON zoneId = firewallZones.id
 						LEFT JOIN devices ON deviceId = devices.id
 						having  deviceId is not NULL order by firewallZones.id ASC;');}
-		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+        # throw exception
+        catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
 
-		# try to fetch all subnet and vlan informations for all zones
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT
+        # try to fetch all subnet and vlan informations for all zones
+        try { $networkInformation =  $this->Database->getObjectsQuery('SELECT
 						firewallZoneSubnet.zoneId AS zoneId,
 						firewallZoneSubnet.subnetId AS subnetId,
 						subnets.sectionId AS sectionId,
@@ -257,44 +257,44 @@ 
 						FROM firewallZoneSubnet
 						LEFT JOIN subnets ON subnetId = subnets.id
 						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId ORDER BY subnet ASC;');}
-		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
-
-		# modify the zone output values
-		foreach ($mappings as $key => $val) {
-			# transform the zone name from decimal to hex
-			if($mappings[$key]->generator == 1 ){
-				$mappings[$key]->zone = dechex($mappings[$key]->zone);
-			}
-			# add some padding if it is activated and the zone generatore is not text
-			if($mappings[$key]->padding == 1 && $mappings[$key]->generator != 2){
-			# remove leading zeros (padding) and raise the value in case of any zone name length changes
-			# add some padding to reach the maximum zone name lenght
-			$mappings[$key]->zone = str_pad(ltrim($mappings[$key]->zone,0),$mappings[$key]->length,"0",STR_PAD_LEFT);
-			}
-			# inject network informations
-			foreach ($networkInformation as $nkey => $nval) {
-				if($mappings[$key]->id == $nval->zoneId) {
-					# add each network and vlan information to the object
-					$mappings[$key]->network[] = $networkInformation[$nkey];
-				}
-			}
-		}
-		# return the values
-		return sizeof($mappings)>0 ? $mappings : false;
-	}
-
-
-	/**
-	 * Fetches zone mapping from database, depending on id
-	 *
-	 * @access public
-	 * @param mixed $id
-	 * @return void
-	 */
-	public function get_zone_mapping ($id) {
-		# try to fetch id specific zone mapping
-		try { $mapping =  $this->Database->getObjectsQuery('SELECT
+        # throw exception
+        catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+
+        # modify the zone output values
+        foreach ($mappings as $key => $val) {
+            # transform the zone name from decimal to hex
+            if($mappings[$key]->generator == 1 ){
+                $mappings[$key]->zone = dechex($mappings[$key]->zone);
+            }
+            # add some padding if it is activated and the zone generatore is not text
+            if($mappings[$key]->padding == 1 && $mappings[$key]->generator != 2){
+            # remove leading zeros (padding) and raise the value in case of any zone name length changes
+            # add some padding to reach the maximum zone name lenght
+            $mappings[$key]->zone = str_pad(ltrim($mappings[$key]->zone,0),$mappings[$key]->length,"0",STR_PAD_LEFT);
+            }
+            # inject network informations
+            foreach ($networkInformation as $nkey => $nval) {
+                if($mappings[$key]->id == $nval->zoneId) {
+                    # add each network and vlan information to the object
+                    $mappings[$key]->network[] = $networkInformation[$nkey];
+                }
+            }
+        }
+        # return the values
+        return sizeof($mappings)>0 ? $mappings : false;
+    }
+
+
+    /**
+     * Fetches zone mapping from database, depending on id
+     *
+     * @access public
+     * @param mixed $id
+     * @return void
+     */
+    public function get_zone_mapping ($id) {
+        # try to fetch id specific zone mapping
+        try { $mapping =  $this->Database->getObjectsQuery('SELECT
 						firewallZones.id AS id,
 						firewallZones.generator AS generator,
 						firewallZones.length AS length,
@@ -311,11 +311,11 @@ 
 						RIGHT JOIN firewallZones ON zoneId = firewallZones.id
 						LEFT JOIN devices ON deviceId = devices.id
 						having  deviceId is not NULL AND mappingId = ?;', $id);}
-		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+        # throw exception
+        catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
 
-		# try to fetch all subnet and vlan informations for all zones
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT
+        # try to fetch all subnet and vlan informations for all zones
+        try { $networkInformation =  $this->Database->getObjectsQuery('SELECT
 						firewallZoneSubnet.zoneId AS zoneId,
 						firewallZoneSubnet.subnetId AS subnetId,
 						subnets.sectionId AS sectionId,
@@ -331,64 +331,64 @@ 
 						LEFT JOIN subnets ON subnetId = subnets.id
 						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId
 						HAVING zoneId = ? ORDER BY subnet ASC;', $mapping[0]->id);}
-		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
-
-		# modify the zone output values
-		foreach ($mapping as $key => $val) {
-			# transform the zone name from decimal to hex
-			if($mapping[$key]->generator == 1 ){
-				$mapping[$key]->zone = dechex($mapping[$key]->zone);
-			}
-			# add some padding if it is activated and the zone generatore is not text
-			if($mapping[$key]->padding == 1 && $mapping[$key]->generator != 2){
-			# remove leading zeros (padding) and raise the value in case of any zone name length changes
-			# add some padding to reach the maximum zone name lenght
-			$mapping[$key]->zone = str_pad(ltrim($mapping[$key]->zone,0),$mapping[$key]->length,"0",STR_PAD_LEFT);
-			}
-			# inject network informations
-			foreach ($networkInformation as $nkey => $nval) {
-				if($mapping[$key]->id == $nval->zoneId) {
-					# remove the zoneId, we don't need it anymore
-					unset($networkInformation[$nkey]->zoneId);
-					# add each network and vlan information to the object
-					$mapping[$key]->network[] = $networkInformation[$nkey];
-				}
-			}
-		}
-		# return the values
-		return sizeof($mapping)>0 ? $mapping[0] : false;
-	}
-
-	/**
-	 * Checks if there is any mapping for a specific zone
-	 *
-	 * @access public
-	 * @param mixed $zoneId
-	 * @return void
-	 */
-	public function check_zone_mapping ($zoneId) {
-		# try to fetch id specific zone mapping
-		try { $mapping =  $this->Database->getObjectsQuery('SELECT id FROM firewallZoneMapping WHERE zoneId = ?;', $zoneId);}
-
-		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
-
-		# return the values
-		return sizeof($mapping)>0 ? $mapping[0] : false;
-	}
-
-
-	/**
-	 * Fetches zone mapping informations for subnet detaul from database, depending on id
-	 *
-	 * @access public
-	 * @param mixed $id
-	 * @return void
-	 */
-	public function get_zone_subnet_info ($id) {
-		# try to fetch id specific zone information
-		try { $info =  $this->Database->getObjectsQuery('SELECT
+        # throw exception
+        catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+
+        # modify the zone output values
+        foreach ($mapping as $key => $val) {
+            # transform the zone name from decimal to hex
+            if($mapping[$key]->generator == 1 ){
+                $mapping[$key]->zone = dechex($mapping[$key]->zone);
+            }
+            # add some padding if it is activated and the zone generatore is not text
+            if($mapping[$key]->padding == 1 && $mapping[$key]->generator != 2){
+            # remove leading zeros (padding) and raise the value in case of any zone name length changes
+            # add some padding to reach the maximum zone name lenght
+            $mapping[$key]->zone = str_pad(ltrim($mapping[$key]->zone,0),$mapping[$key]->length,"0",STR_PAD_LEFT);
+            }
+            # inject network informations
+            foreach ($networkInformation as $nkey => $nval) {
+                if($mapping[$key]->id == $nval->zoneId) {
+                    # remove the zoneId, we don't need it anymore
+                    unset($networkInformation[$nkey]->zoneId);
+                    # add each network and vlan information to the object
+                    $mapping[$key]->network[] = $networkInformation[$nkey];
+                }
+            }
+        }
+        # return the values
+        return sizeof($mapping)>0 ? $mapping[0] : false;
+    }
+
+    /**
+     * Checks if there is any mapping for a specific zone
+     *
+     * @access public
+     * @param mixed $zoneId
+     * @return void
+     */
+    public function check_zone_mapping ($zoneId) {
+        # try to fetch id specific zone mapping
+        try { $mapping =  $this->Database->getObjectsQuery('SELECT id FROM firewallZoneMapping WHERE zoneId = ?;', $zoneId);}
+
+        # throw exception
+        catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+
+        # return the values
+        return sizeof($mapping)>0 ? $mapping[0] : false;
+    }
+
+
+    /**
+     * Fetches zone mapping informations for subnet detaul from database, depending on id
+     *
+     * @access public
+     * @param mixed $id
+     * @return void
+     */
+    public function get_zone_subnet_info ($id) {
+        # try to fetch id specific zone information
+        try { $info =  $this->Database->getObjectsQuery('SELECT
 						firewallZones.zone as zone,
 						firewallZones.padding as padding,
 						firewallZones.length as length,
@@ -409,43 +409,43 @@ 
 						LEFT JOIN devices ON firewallZoneMapping.deviceId = devices.id
 						LEFT JOIN subnets ON firewallZoneSubnet.subnetId = subnets.id
 						HAVING firewallZoneSubnet.subnetId = ?;', $id);}
-		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
-		if ($info) {
-			# modify the zone output values
-			foreach ($info as $key => $val) {
-				# transform the zone name from decimal to hex
-				if($info[$key]->generator == 1 ){
-					$info[$key]->zone = dechex($info[$key]->zone);
-				}
-				# add some padding if it is activated and the zone generatore is not text
-				if($info[$key]->padding == 1 && $info[$key]->generator != 2){
-				# remove leading zeros (padding) and raise the value in case of any zone name length changes
-				# add some padding to reach the maximum zone name lenght
-				$info[$key]->zone = str_pad(ltrim($info[$key]->zone,0),$info[$key]->length,"0",STR_PAD_LEFT);
-				}
-			}
-		}
-
-		# return the values
-		return sizeof($info)>0 ? $info[0] : false;
-	}
-
-
-	/**
-	 * Fetches all zones from database
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function get_zones () {
-		# try to fetch all zones
-		try { $zones =  $this->Database->getObjectsQuery('SELECT * FROM firewallZones;');}
-		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
-
-		# try to fetch all subnet and vlan informations for all zones
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT
+        # throw exception
+        catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+        if ($info) {
+            # modify the zone output values
+            foreach ($info as $key => $val) {
+                # transform the zone name from decimal to hex
+                if($info[$key]->generator == 1 ){
+                    $info[$key]->zone = dechex($info[$key]->zone);
+                }
+                # add some padding if it is activated and the zone generatore is not text
+                if($info[$key]->padding == 1 && $info[$key]->generator != 2){
+                # remove leading zeros (padding) and raise the value in case of any zone name length changes
+                # add some padding to reach the maximum zone name lenght
+                $info[$key]->zone = str_pad(ltrim($info[$key]->zone,0),$info[$key]->length,"0",STR_PAD_LEFT);
+                }
+            }
+        }
+
+        # return the values
+        return sizeof($info)>0 ? $info[0] : false;
+    }
+
+
+    /**
+     * Fetches all zones from database
+     *
+     * @access public
+     * @return void
+     */
+    public function get_zones () {
+        # try to fetch all zones
+        try { $zones =  $this->Database->getObjectsQuery('SELECT * FROM firewallZones;');}
+        # throw exception
+        catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+
+        # try to fetch all subnet and vlan informations for all zones
+        try { $networkInformation =  $this->Database->getObjectsQuery('SELECT
 						firewallZoneSubnet.zoneId AS zoneId,
 						firewallZoneSubnet.subnetId AS subnetId,
 						subnets.sectionId AS sectionId,
@@ -460,52 +460,52 @@ 
 						FROM firewallZoneSubnet
 						LEFT JOIN subnets ON firewallZoneSubnet.subnetId = subnets.id
 						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId ORDER BY subnet ASC;');}
-		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
-
-		# modify the zone output values
-		foreach ($zones as $key => $val) {
-			# transform the zone name from decimal to hex
-			if($zones[$key]->generator == 1 ){
-				$zones[$key]->zone = dechex($zones[$key]->zone);
-			}
-			# add some padding if it is activated and the zone generatore is not text
-			if($zones[$key]->padding == 1 && $zones[$key]->generator != 2){
-			# remove leading zeros (padding) and raise the value in case of any zone name length changes
-			# add some padding to reach the maximum zone name lenght
-			$zones[$key]->zone = str_pad(ltrim($zones[$key]->zone,0),$zones[$key]->length,"0",STR_PAD_LEFT);
-			}
-			# inject network informations
-			foreach ($networkInformation as $nkey => $nval) {
-				if($zones[$key]->id == $nval->zoneId) {
-					# remove the zoneId, we don't need it anymore
-					unset($networkInformation[$nkey]->zoneId);
-					# add each network and vlan information to the object
-					$zones[$key]->network[] = $networkInformation[$nkey];
-				}
-			}
-		}
-		# return the values
-		return sizeof($zones)>0 ? $zones : false;
-	}
-
-
-	/**
-	 * Fetches single zone from database, depending on zone id
-	 *
-	 * @access public
-	 * @param mixed $id
-	 * @return void
-	 */
-	public function get_zone ($id) {
-		# try to fetch zone with ID $id
-		try { $zone = $this->Database->getObjectsQuery('SELECT * FROM firewallZones WHERE id = ?;', $id);}
-
-		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
-
-		# try to fetch all subnet and vlan informations for this zone
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT
+        # throw exception
+        catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+
+        # modify the zone output values
+        foreach ($zones as $key => $val) {
+            # transform the zone name from decimal to hex
+            if($zones[$key]->generator == 1 ){
+                $zones[$key]->zone = dechex($zones[$key]->zone);
+            }
+            # add some padding if it is activated and the zone generatore is not text
+            if($zones[$key]->padding == 1 && $zones[$key]->generator != 2){
+            # remove leading zeros (padding) and raise the value in case of any zone name length changes
+            # add some padding to reach the maximum zone name lenght
+            $zones[$key]->zone = str_pad(ltrim($zones[$key]->zone,0),$zones[$key]->length,"0",STR_PAD_LEFT);
+            }
+            # inject network informations
+            foreach ($networkInformation as $nkey => $nval) {
+                if($zones[$key]->id == $nval->zoneId) {
+                    # remove the zoneId, we don't need it anymore
+                    unset($networkInformation[$nkey]->zoneId);
+                    # add each network and vlan information to the object
+                    $zones[$key]->network[] = $networkInformation[$nkey];
+                }
+            }
+        }
+        # return the values
+        return sizeof($zones)>0 ? $zones : false;
+    }
+
+
+    /**
+     * Fetches single zone from database, depending on zone id
+     *
+     * @access public
+     * @param mixed $id
+     * @return void
+     */
+    public function get_zone ($id) {
+        # try to fetch zone with ID $id
+        try { $zone = $this->Database->getObjectsQuery('SELECT * FROM firewallZones WHERE id = ?;', $id);}
+
+        # throw exception
+        catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+
+        # try to fetch all subnet and vlan informations for this zone
+        try { $networkInformation =  $this->Database->getObjectsQuery('SELECT
 						firewallZoneSubnet.zoneId AS zoneId,
 						firewallZoneSubnet.subnetId AS subnetId,
 						subnets.sectionId AS sectionId,
@@ -520,101 +520,101 @@ 
 						FROM firewallZoneSubnet
 						LEFT JOIN subnets ON firewallZoneSubnet.subnetId = subnets.id
 						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId HAVING zoneId = ? ORDER BY subnet ASC;', $id);}
-		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
-
-		# modify the zone output values
-		foreach ($zone as $key => $val) {
-			# transform the zone name from decimal to hex
-			if($zone[$key]->generator == 1 ){
-				$zone[$key]->zone = dechex($zone[$key]->zone);
-			}
-			# add some padding if it is activated and the zone generatore is not text
-			if($zone[$key]->padding == 1 && $zone[$key]->generator != 2){
-			# remove leading zeros (padding) and raise the value in case of any zone name length changes
-			# add some padding to reach the maximum zone name lenght
-			$zone[$key]->zone = str_pad(ltrim($zone[$key]->zone,0),$zone[$key]->length,"0",STR_PAD_LEFT);
-			}
-			# inject network informations
-			foreach ($networkInformation as $nkey => $nval) {
-				if($zone[$key]->id == $nval->zoneId) {
-					# remove the zoneId, we don't need it anymore
-					unset($networkInformation[$nkey]->zoneId);
-					# add each network and vlan information to the object
-					$zone[$key]->network[] = $networkInformation[$nkey];
-				}
-			}
-		}
-
-		# return the values
-		return sizeof($zone)>0 ? $zone[0] : false;
-	}
-
-
-	/**
-	 * display formated zone data
-	 *
-	 * @access public
-	 * @param mixed $id
-	 * @return void
-	 */
-	public function get_zone_detail ($id) {
-		# get zone informations
-		$zoneInformation = $this->get_zone($id);
-
-		# build html output
-		print '<table class="table table-auto table-condensed" style="margin-bottom:0px;">';
-		print "<tr><td colspan='2'><h4>Zone details</h4><hr></td></tr>";
-		print '<tr>';
-		print '<td style="width:110px;">'._('Zone Name').'</td>';
-		print '<td>'.$zoneInformation->zone.'</td>';
-		print '</tr>';
-		print '<tr>';
-		print '<td>'._('Indicator').'</td>';
-		$title = $zoneInformation->indicator == 0 ? 'Own Zone' : 'Customer Zone';
-		print '<td><span class="fa fa-home"  title="'._($title).'"></span></td>';
-		print '</tr>';
-		print '<tr>';
-		print '<td>'._('Description').'</td>';
-		print '<td>'.$zoneInformation->description.'</td>';
-		print '</tr>';
-		print "</table>";
-		// networks
-		if ($zoneInformation->network) {
-			print "<table class='table table-condensed' style='margin-bottom:30px;'>";
-			print "<tr><td colspan='2'><br><h4>Subnets</h4><hr></td></tr>";
-			print '<tr>';
-			print '<th>'._('Subnet').'</th>';
-			print '<th>'._('VLAN').'</th>';
-			print '</tr>';
-			foreach ($zoneInformation->network as $network) {
-				print '<tr>';
-				// description fix
-				$network->subnetDescription = $network->subnetDescription ? " (".$network->subnetDescription.")" : "/";
-				$network->vlanName = $network->vlanName ? "(".$network->vlanName.")" : "";
-
-				if (!$network->subnetIsFolder) {
-					print '<td>'.$this->Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.$network->subnetDescription.'</td>';
-				} else{
-					print '<td>Folder '.$network->subnetDescription.'</td>';
-				}
-				print '<td>'.$network->vlan.$network->vlanName.'</td>';
-				print '</tr>';
-			}
-		}
-	}
-
-
-	/**
-	 * display formated zone network(s)
-	 *
-	 * @access public
-	 * @param mixed $id
-	 * @return void
-	 */
-	public function get_zone_network ($id) {
-		# try to fetch all subnet and vlan informations for this zone
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT
+        # throw exception
+        catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+
+        # modify the zone output values
+        foreach ($zone as $key => $val) {
+            # transform the zone name from decimal to hex
+            if($zone[$key]->generator == 1 ){
+                $zone[$key]->zone = dechex($zone[$key]->zone);
+            }
+            # add some padding if it is activated and the zone generatore is not text
+            if($zone[$key]->padding == 1 && $zone[$key]->generator != 2){
+            # remove leading zeros (padding) and raise the value in case of any zone name length changes
+            # add some padding to reach the maximum zone name lenght
+            $zone[$key]->zone = str_pad(ltrim($zone[$key]->zone,0),$zone[$key]->length,"0",STR_PAD_LEFT);
+            }
+            # inject network informations
+            foreach ($networkInformation as $nkey => $nval) {
+                if($zone[$key]->id == $nval->zoneId) {
+                    # remove the zoneId, we don't need it anymore
+                    unset($networkInformation[$nkey]->zoneId);
+                    # add each network and vlan information to the object
+                    $zone[$key]->network[] = $networkInformation[$nkey];
+                }
+            }
+        }
+
+        # return the values
+        return sizeof($zone)>0 ? $zone[0] : false;
+    }
+
+
+    /**
+     * display formated zone data
+     *
+     * @access public
+     * @param mixed $id
+     * @return void
+     */
+    public function get_zone_detail ($id) {
+        # get zone informations
+        $zoneInformation = $this->get_zone($id);
+
+        # build html output
+        print '<table class="table table-auto table-condensed" style="margin-bottom:0px;">';
+        print "<tr><td colspan='2'><h4>Zone details</h4><hr></td></tr>";
+        print '<tr>';
+        print '<td style="width:110px;">'._('Zone Name').'</td>';
+        print '<td>'.$zoneInformation->zone.'</td>';
+        print '</tr>';
+        print '<tr>';
+        print '<td>'._('Indicator').'</td>';
+        $title = $zoneInformation->indicator == 0 ? 'Own Zone' : 'Customer Zone';
+        print '<td><span class="fa fa-home"  title="'._($title).'"></span></td>';
+        print '</tr>';
+        print '<tr>';
+        print '<td>'._('Description').'</td>';
+        print '<td>'.$zoneInformation->description.'</td>';
+        print '</tr>';
+        print "</table>";
+        // networks
+        if ($zoneInformation->network) {
+            print "<table class='table table-condensed' style='margin-bottom:30px;'>";
+            print "<tr><td colspan='2'><br><h4>Subnets</h4><hr></td></tr>";
+            print '<tr>';
+            print '<th>'._('Subnet').'</th>';
+            print '<th>'._('VLAN').'</th>';
+            print '</tr>';
+            foreach ($zoneInformation->network as $network) {
+                print '<tr>';
+                // description fix
+                $network->subnetDescription = $network->subnetDescription ? " (".$network->subnetDescription.")" : "/";
+                $network->vlanName = $network->vlanName ? "(".$network->vlanName.")" : "";
+
+                if (!$network->subnetIsFolder) {
+                    print '<td>'.$this->Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.$network->subnetDescription.'</td>';
+                } else{
+                    print '<td>Folder '.$network->subnetDescription.'</td>';
+                }
+                print '<td>'.$network->vlan.$network->vlanName.'</td>';
+                print '</tr>';
+            }
+        }
+    }
+
+
+    /**
+     * display formated zone network(s)
+     *
+     * @access public
+     * @param mixed $id
+     * @return void
+     */
+    public function get_zone_network ($id) {
+        # try to fetch all subnet and vlan informations for this zone
+        try { $networkInformation =  $this->Database->getObjectsQuery('SELECT
 						firewallZoneSubnet.zoneId AS zoneId,
 						firewallZoneSubnet.subnetId AS subnetId,
 						subnets.sectionId AS sectionId,
@@ -629,613 +629,613 @@ 
 						FROM firewallZoneSubnet
 						LEFT JOIN subnets ON firewallZoneSubnet.subnetId = subnets.id
 						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId HAVING zoneId = ? ORDER BY subnet ASC;', $id);}
-		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
-
-		$rowspan = count($networkInformation);
-		$i = 1;
-		print '<table class="table table-noborder table-condensed" style="padding-bottom:20px;">';
-		foreach ($networkInformation as $network) {
-			print '<tr>';
-			if ($i === 1) {
-				print '<td rowspan="'.$rowspan.'" style="width:150px;">Network</td>';
-			}
-			print '<td>';
-			print '<a class="btn btn-xs btn-danger editNetwork" style="margin-right:5px;" alt="'._('Delete Network').'" title="'._('Delete Network').'" data-action="delete" data-zoneId="'.$id.'" data-subnetId="'.$network->subnetId.'">';
-			print '<span><i class="fa fa-close"></i></span>';
-			print "</a>";
-
-			if ($network->subnetIsFolder == 1 ) {
-				print 'Folder: '.$network->subnetDescription;
-			} else {
-				# display network information with or without description
-				if ($network->subnetDescription) 	{	print $this->Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.' ('.$network->subnetDescription.')</td>';	}
-				else 								{	print $this->Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.'</td>';	}
-			}
-			print '</tr>';
-			$i++;
-		}
-		print '</table>';
-	}
-
-
-	/**
-	 * validate if a network is suitable to map to a zone
-	 *
-	 * @access public
-	 * @param mixed $subnetId
-	 * @return void
-	 */
-	public function check_zone_network ($subnetId) {
-		# check if the subnet is already bound to this or any other zone
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT * FROM firewallZoneSubnet WHERE subnetId = ?;', $subnetId);}
-
-		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
-
-		if(!sizeof($networkInformation)>0 ) {
-			# return dummy value
-			return 'success';
-		} else {
-			$this->Result->show("danger","<strong>"._('Error').":</strong><br>"._("This network is already bound to this or another zone.<br>The binding must be unique."), false);
-			return false;
-		}
-		# return dummy value
-		return 'success';
-	}
-
-
-	/**
-	 * add a network to a zone
-	 *
-	 * @access public
-	 * @param mixed $zoneId
-	 * @param mixed $subnetId
-	 * @return false|string
-	 */
-	public function add_zone_network ($zoneId,$subnetId) {
-		# check if the subnet is already bound to this or any other zone
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT * FROM firewallZoneSubnet WHERE subnetId = ?;', $subnetId);}
-
-		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
-
-		if(!sizeof($networkInformation)>0 ) {
-			$query = 'INSERT INTO firewallZoneSubnet (zoneId, subnetId) VALUES (?,?);';
-			$params = array('zoneId' => $zoneId, 'subnetId' => $subnetId);
-
-			# try to fetch all subnet and vlan informations for this zone
-			try { $addRow =  $this->Database->insertObject("firewallZoneSubnet", $params);}
-
-			# throw exception
-			catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
-		} else {
-			$this->Result->show("danger","<strong>"._('Error').":</strong><br>"._("This network is already bound to this or another zone.<br>The binding must be unique."), false);
-			return false;
-		}
-		# return dummy value
-		return 'success';
-	}
-
-
-	/**
-	 * delete a network of a zone
-	 *
-	 * @access public
-	 * @param mixed $zoneId
-	 * @param mixed $subnetId
-	 * @return string|false
-	 */
-	public function delete_zone_network ($zoneId,$subnetId) {
-		# try to fetch all subnet and vlan informations for this zone
-		try { $deleteRow =  $this->Database->deleteRow("firewallZoneSubnet", "zoneId", $zoneId, "subnetId", $subnetId); }
-
-		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
-
-		# return dummy value or false
-		if ($deleteRow) {
-			return 'success';
-		} else {
-			return false;
-		}
-	}
-
-
-	/**
-	 * Modify zone details main method
-	 *
-	 * @access public
-	 * @param mixed $action
-	 * @param mixed $values
-	 * @return void
-	 */
-	public function modify_zone ($action, $values) {
-		# initialize user
-		$this->User = new User ($this->Database);
-
-		# separate network informations if available
-		$network = $values['network'];
-		unset($values['network']);
-
-		# null empty values
-		$values = $this->reformat_empty_array_fields ($values, null);
-		if ($network) {
-			$network = $this->reformat_empty_array_fields ($network, null);
-		}
-
-		# execute based on action
-		if($action=="add")			{ return $this->zone_add ($values,$network); }
-		elseif($action=="edit")		{ return $this->zone_edit ($values); }
-		elseif($action=="delete")	{ return $this->zone_delete ($values['id']); }
-		else						{ return $this->Result->show("danger", _("Invalid action"), true); }
-	}
-
-
-	/**
-	 * Create new zone method
-	 *
-	 * @access private
-	 * @param mixed $values
-	 * @param mixed $network
-	 * @return boolean
-	 */
-	private function zone_add ($values,$network) {
-		# get the settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
-
-		# push the zone name length into the values array
-		$values['length'] = $firewallZoneSettings['zoneLength'];
-
-		# execute insert
-		try { $this->Database->insertObject("firewallZones", $values); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			$this->Log->write( "Firewall zone created", "Failed to add new firewall zone<hr>".$e->getMessage(), 2, $this->User->username);
-			return false;
-		}
-
-		# fetch the highest inserted id, matching the zone name
-		try { $lastId=$this->Database->getObjectsQuery("SELECT MAX(id) AS id FROM firewallZones WHERE zone = ? ;", $values['zone']);}
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			return false;
-		}
-
-		if ($network) {
-			foreach ($network as $subnetId) {
-				$values = array('zoneId' => $lastId[0]->id, 'subnetId' => $subnetId);
-				# add the network bindings if there are any
-				try { $this->Database->insertObject("firewallZoneSubnet", $values); }
-				catch (Exception $e) {
-					$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-					return false;
-				}
-			}
-			# ok
-			return true;
-		}
-		# ok
-		return true;
-	}
-
-
-	/**
-	 * Edit zone
-	 *
-	 * @access private
-	 * @param mixed $values
-	 * @return boolean
-	 */
-	private function zone_edit ($values) {
-		# execute
-		try { $this->Database->updateObject("firewallZones", $values, "id"); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			$this->Log->write( "Firewall zone edited", "Failed to edit firewall zone<hr>".$e->getMessage(), 2, $this->User->username);
-			return false;
-		}
-		# ok
-		$this->Log->write( "Firewall zone edited", "Firewall zone edited<hr>".$this->array_to_log($values), 0, $this->User->username);
-		return true;
-	}
-
-
-	/**
-	 * Deletes zone and all corresponding mappings
-	 *
-	 * @access private
-	 * @param string $id
-	 * @return boolean
-	 */
-	private function zone_delete ($id) {
-		# save old values
-		$old_zone = $this->get_zone($id);
-
-		# delete mappings
-		try { $this->Database->deleteRow("firewallZoneMapping", "zoneId", $id); }
-		catch (Exception $e) {
-			$this->Log->write( "Firewall zone and mappings delete", "Failed to delete firewall zone mappfings of $old_zone->zone<hr>".$e->getMessage(), 2, $this->User->username);
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			return false;
-		}
-
-		# delete zone
-		try { $this->Database->deleteRow("firewallZones", "id", $id); }
-		catch (Exception $e) {
-			$this->Log->write( "Firewall zone delete", "Failed to delete firewall zone $old_zone->zone<hr>".$e->getMessage(), 2, $this->User->username);
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			return false;
-		}
-		# ok
-		$this->Log->write( "Firewall zone deleted", "Firewall zone ".$old_zone->zone." deleted<hr>".$this->array_to_log($old_subnet), 0, $this->User->username);
-
-		return true;
-	}
-
-
-	/**
-	 * Modify mapping - main method
-	 *
-	 * @access public
-	 * @param mixed $action
-	 * @param mixed $values
-	 * @return void
-	 */
-	public function modify_mapping ($action, $values) {
-		# initialize user
-		$this->User = new User ($this->Database);
-
-		# null empty values
-		$values = $this->reformat_empty_array_fields ($values, null);
-
-		# execute based on action
-		if($action=="add")			{ return $this->mapping_add ($values); }
-		elseif($action=="edit")		{ return $this->mapping_edit ($values); }
-		elseif($action=="delete")	{ return $this->mapping_delete ($values['id']); }
-		else						{ return $this->Result->show("danger", _("Invalid action"), true); }
-	}
-
-
-	/**
-	 * Create new mapping
-	 *
-	 * @access private
-	 * @param mixed $values
-	 * @return boolean
-	 */
-	private function mapping_add ($values) {
-		# get the settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
-
-		# execute
-		try { $this->Database->insertObject("firewallZoneMapping", $values); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			$this->Log->write( "Firewall zone mapping created", "Failed to add new firewall zone mapping<hr>".$e->getMessage(), 2, $this->User->username);
-			return false;
-		}
-		# ok
-		$this->Log->write( "Firewall zone mapping created", "New firewall zone mapping created<hr>".$this->array_to_log($values), 0, $this->User->username);
-		return true;
-	}
-
-
-	/**
-	 * Edit mapping
-	 *
-	 * @access private
-	 * @param mixed $values
-	 * @return boolean
-	 */
-	private function mapping_edit ($values) {
-		# execute
-		try { $this->Database->updateObject("firewallZoneMapping", $values, "id"); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			$this->Log->write( "Firewall zone mapping edited", "Failed to edit firewall zone mapping<hr>".$e->getMessage(), 2, $this->User->username);
-			return false;
-		}
-		# ok
-		$this->Log->write( "Firewall zone mapping edited", "Firewall zone mapping edited<hr>".$this->array_to_log($values), 0, $this->User->username);
-		return true;
-	}
-
-
-	/**
-	 * Deletes single mapping
-	 *
-	 * @access private
-	 * @param string $id
-	 * @return boolean
-	 */
-	private function mapping_delete ($id) {
-		# save old values
-		$old_mapping = $this->get_zone_mapping($id);
-
-		# delete mapping
-		try { $this->Database->deleteRow("firewallZoneMapping", "id", $id); }
-		catch (Exception $e) {
-			$this->Log->write( "Firewall zone mapping delete", "Failed to delete firewall zone mapping $old_zone->zone<hr>".$e->getMessage(), 2, $this->User->username);
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			return false;
-		}
-		# ok
-		$this->Log->write( "Firewall zone mapping deleted", "Firewall zone mapping ".$old_zone->zone." deleted<hr>".$this->array_to_log($old_subnet), 0, $this->User->username);
-
-		return true;
-	}
-
-	/**
-	 * generate a firewall subnet object
-	 *
-	 * @access public
-	 * @param mixed $id
-	 * @return void
-	 */
-	public function generate_subnet_object ($id) {
-		# fetch the settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
-
-		# fetch zone informations
-		$zone = $this->get_zone_subnet_info($id);
-
-		# build the object name prefix
-		foreach ($firewallZoneSettings['pattern'] as $pattern) {
-			switch ($pattern) {
-				case 'patternIndicator':
-					if ($zone->indicator == 0 ) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
-					else 						{ 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
-					break;
-				case 'patternZoneName':
-					$firewallAddressObject = $firewallAddressObject.$zone->zone;
-					break;
-				case 'patternIPType':
-					# check if the subnet is v4 or v6
-					if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][0];
-					} elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][1];
-					}
-					break;
-				case 'patternSeparator':
-						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['separator'];
-					break;
-			}
-		}
-
-		#build the object name
-		if ($firewallZoneSettings['subnetPatternValues'][$firewallZoneSettings['subnetPattern']] == 'network' ) {
-			# check if the subnet is v4 or v6
-			if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-				$firewallAddressObject = $firewallAddressObject.$this->Subnets->transform_to_dotted($zone->subnet).'-'.$zone->mask;
-			} elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-				$firewallAddressObject = $firewallAddressObject.str_replace(':',$firewallZoneSettings['separator'],$this->Subnets->transform_to_dotted($zone->subnet)).'-'.$zone->mask;
-			}
-		} elseif ($firewallZoneSettings['subnetPatternValues'][$firewallZoneSettings['subnetPattern']] == 'description' ) {
-			$firewallAddressObject = $firewallAddressObject.str_replace(' ',$firewallZoneSettings['separator'],strtolower($zone->subnetDescription));
-		}
-
-		# get subnet information to compare against the changes
-		$subnet = (array) $this->Subnets->fetch_subnet("id",$id);
-
-		# compare both versions, if there is no difference, just do nothing
-		if ($zone->firewallAddressObject != $firewallAddressObject ) {
-			# update field in database
-			$values = array('id' => $id , 'firewallAddressObject' => $firewallAddressObject);
-			try { $this->Database->updateObject("subnets", $values, "id"); }
-			catch (Exception $e) {
-				$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-				return false;
-			}
-			# clone the address_old obj and replace the firewallAddressObject field to get a diff for logging
-			$subnet_old = $subnet;
-			$subnet['firewallAddressObject'] = $firewallAddressObject;
-
-			# write changelog
-			$this->Log->write_changelog('subnet', 'edit', 'success', $subnet_old,$subnet);
-
-			return ture;
-		}
-		return false;
-	}
-
-	/**
-	 * generate a firewall address object
-	 *
-	 * @access public
-	 * @param mixed $id
-	 * @param mixed $dnsName
-	 * @return string
-	 */
-	public function generate_address_object ($id,$dnsName) {
-		# fetch the settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
-
-		# fetch zone informations
-		$zone = $this->get_zone_subnet_info($id);
-
-		foreach ($firewallZoneSettings['pattern'] as $pattern) {
-			switch ($pattern) {
-				case 'patternIndicator':
-					if ($zone->indicator == 0 ) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
-					else 						{ 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
-					break;
-				case 'patternZoneName':
-					$firewallAddressObject = $firewallAddressObject.$zone->zone;
-					break;
-				case 'patternIPType':
-					# check if the subnet is v4 or v6
-					if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][0];
-					} elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][1];
-					}
-					break;
-				case 'patternHost':
-						$hostName = explode('.', $dnsName);
-						$firewallAddressObject = $firewallAddressObject.$hostName[0];
-					break;
-				case 'patternFQDN':
-						$firewallAddressObject = $firewallAddressObject.$dnsName;
-					break;
-				case 'patternSeparator':
-						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['separator'];
-					break;
-			}
-		}
-		return $firewallAddressObject;
-	}
-
-	/**
-	 * update a firewall address object
-	 *
-	 * @access public
-	 * @param mixed $subnetId
-	 * @param mixed $IPId
-	 * @param mixed $dnsName
-	 * @return void
-	 */
-	public function update_address_object ($subnetId,$IPId,$dnsName) {
-		# Addresses object
-		$this->Addresses = new Addresses ($this->Database);
-
-		# fetch old details for logging
-		$address_old = $this->Addresses->fetch_address (null, $IPId);
-
-		# fetch the settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
-
-		# fetch zone informations
-		$zone = $this->get_zone_subnet_info($subnetId);
-
-		foreach ($firewallZoneSettings['pattern'] as $pattern) {
-			switch ($pattern) {
-				case 'patternIndicator':
-					if ($zone->indicator == 0 ) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
-					else 						{ 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
-					break;
-				case 'patternZoneName':
-					$firewallAddressObject = $firewallAddressObject.$zone->zone;
-					break;
-				case 'patternIPType':
-					# check if the subnet is v4 or v6
-					if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][0];
-					} elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][1];
-					}
-					break;
-				case 'patternHost':
-						$hostName = explode('.', $dnsName);
-						$firewallAddressObject = $firewallAddressObject.$hostName[0];
-					break;
-				case 'patternFQDN':
-						$firewallAddressObject = $firewallAddressObject.$dnsName;
-					break;
-				case 'patternSeparator':
-						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['separator'];
-					break;
-			}
-		}
-
-		if ($address_old->firewallAddressObject != $firewallAddressObject) {
-			# update field in database
-			$values = array('id' => $IPId , 'subnetId' => $subnetId, 'firewallAddressObject' => $firewallAddressObject);
-			try { $this->Database->updateObject("ipaddresses", $values, "id", "subnetId"); }
-			catch (Exception $e) {
-				$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-				return false;
-			}
-			# clone the address_old obj and replace the firewallAddressObject field to get a diff for logging
-			$address = clone($address_old);
-			$address->firewallAddressObject = $firewallAddressObject;
-
-			# write changelog
-			$this->Log->write_changelog('ip_addr', 'edit', 'success', (array)$address_old,(array)$address);
-
-			return ture;
-		}
-
-		return false;
-	}
-
-	/**
-	 * update a firewall address objects for a whole network
-	 *
-	 * @access public
-	 * @param mixed $subnetId
-	 * @return boolean
-	 */
-	public function update_address_objects ($subnetId) {
-		# Addresses object
-		$this->Addresses = new Addresses ($this->Database);
-
-		# fetch the settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
-
-		# fetch zone informations
-		$zone = $this->get_zone_subnet_info($subnetId);
-
-		try { $ipaddresses = $this->Database->getObjectsQuery('SELECT id, dns_name FROM ipaddresses WHERE subnetId = ? ',$subnetId); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			return false;
-		}
-		foreach ($ipaddresses as $ipaddress) {
-			# fetch old details for logging
-			$address_old = $this->Addresses->fetch_address (null, $ipaddress->id);
-
-			foreach ($firewallZoneSettings['pattern'] as $key => $pattern) {
-				switch ($pattern) {
-					case 'patternIndicator':
-						if ($zone->indicator == 0 ) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
-						else 						{ 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
-						break;
-					case 'patternZoneName':
-						$firewallAddressObject = $firewallAddressObject.$zone->zone;
-						break;
-					case 'patternIPType':
-						# check if the subnet is v4 or v6
-						if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-							$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][0];
-						} elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-							$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][1];
-						}
-						break;
-					case 'patternHost':
-							$hostName = explode('.', $ipaddress->dns_name);
-							$firewallAddressObject = $firewallAddressObject.$hostName[0];
-						break;
-					case 'patternFQDN':
-							$firewallAddressObject = $firewallAddressObject.$ipaddress->dns_name;
-						break;
-					case 'patternSeparator':
-							$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['separator'];
-						break;
-				}
-			}
-
-			if ($address_old->firewallAddressObject != $firewallAddressObject) {
-				# update field in database
-				$values = array('id' => $ipaddress->id , 'subnetId' => $subnetId, 'firewallAddressObject' => $firewallAddressObject);
-				try { $this->Database->updateObject("ipaddresses", $values, "id", "subnetId"); }
-				catch (Exception $e) {
-					$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-					return false;
-				}
-				# clone the address_old obj and replace the firewallAddressObject field to get a diff for logging
-				$address = clone($address_old);
-				$address->firewallAddressObject = $firewallAddressObject;
-
-				# write changelog
-				$this->Log->write_changelog('ip_addr', 'edit', 'success', (array)$address_old,(array)$address);
-			}
-
-			# unset firewallAddressObject to avoid chaining
-			unset($firewallAddressObject);
-
-	}
-	return true;
-	}
+        # throw exception
+        catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+
+        $rowspan = count($networkInformation);
+        $i = 1;
+        print '<table class="table table-noborder table-condensed" style="padding-bottom:20px;">';
+        foreach ($networkInformation as $network) {
+            print '<tr>';
+            if ($i === 1) {
+                print '<td rowspan="'.$rowspan.'" style="width:150px;">Network</td>';
+            }
+            print '<td>';
+            print '<a class="btn btn-xs btn-danger editNetwork" style="margin-right:5px;" alt="'._('Delete Network').'" title="'._('Delete Network').'" data-action="delete" data-zoneId="'.$id.'" data-subnetId="'.$network->subnetId.'">';
+            print '<span><i class="fa fa-close"></i></span>';
+            print "</a>";
+
+            if ($network->subnetIsFolder == 1 ) {
+                print 'Folder: '.$network->subnetDescription;
+            } else {
+                # display network information with or without description
+                if ($network->subnetDescription) 	{	print $this->Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.' ('.$network->subnetDescription.')</td>';	}
+                else 								{	print $this->Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.'</td>';	}
+            }
+            print '</tr>';
+            $i++;
+        }
+        print '</table>';
+    }
+
+
+    /**
+     * validate if a network is suitable to map to a zone
+     *
+     * @access public
+     * @param mixed $subnetId
+     * @return void
+     */
+    public function check_zone_network ($subnetId) {
+        # check if the subnet is already bound to this or any other zone
+        try { $networkInformation =  $this->Database->getObjectsQuery('SELECT * FROM firewallZoneSubnet WHERE subnetId = ?;', $subnetId);}
+
+        # throw exception
+        catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+
+        if(!sizeof($networkInformation)>0 ) {
+            # return dummy value
+            return 'success';
+        } else {
+            $this->Result->show("danger","<strong>"._('Error').":</strong><br>"._("This network is already bound to this or another zone.<br>The binding must be unique."), false);
+            return false;
+        }
+        # return dummy value
+        return 'success';
+    }
+
+
+    /**
+     * add a network to a zone
+     *
+     * @access public
+     * @param mixed $zoneId
+     * @param mixed $subnetId
+     * @return false|string
+     */
+    public function add_zone_network ($zoneId,$subnetId) {
+        # check if the subnet is already bound to this or any other zone
+        try { $networkInformation =  $this->Database->getObjectsQuery('SELECT * FROM firewallZoneSubnet WHERE subnetId = ?;', $subnetId);}
+
+        # throw exception
+        catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+
+        if(!sizeof($networkInformation)>0 ) {
+            $query = 'INSERT INTO firewallZoneSubnet (zoneId, subnetId) VALUES (?,?);';
+            $params = array('zoneId' => $zoneId, 'subnetId' => $subnetId);
+
+            # try to fetch all subnet and vlan informations for this zone
+            try { $addRow =  $this->Database->insertObject("firewallZoneSubnet", $params);}
+
+            # throw exception
+            catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+        } else {
+            $this->Result->show("danger","<strong>"._('Error').":</strong><br>"._("This network is already bound to this or another zone.<br>The binding must be unique."), false);
+            return false;
+        }
+        # return dummy value
+        return 'success';
+    }
+
+
+    /**
+     * delete a network of a zone
+     *
+     * @access public
+     * @param mixed $zoneId
+     * @param mixed $subnetId
+     * @return string|false
+     */
+    public function delete_zone_network ($zoneId,$subnetId) {
+        # try to fetch all subnet and vlan informations for this zone
+        try { $deleteRow =  $this->Database->deleteRow("firewallZoneSubnet", "zoneId", $zoneId, "subnetId", $subnetId); }
+
+        # throw exception
+        catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+
+        # return dummy value or false
+        if ($deleteRow) {
+            return 'success';
+        } else {
+            return false;
+        }
+    }
+
+
+    /**
+     * Modify zone details main method
+     *
+     * @access public
+     * @param mixed $action
+     * @param mixed $values
+     * @return void
+     */
+    public function modify_zone ($action, $values) {
+        # initialize user
+        $this->User = new User ($this->Database);
+
+        # separate network informations if available
+        $network = $values['network'];
+        unset($values['network']);
+
+        # null empty values
+        $values = $this->reformat_empty_array_fields ($values, null);
+        if ($network) {
+            $network = $this->reformat_empty_array_fields ($network, null);
+        }
+
+        # execute based on action
+        if($action=="add")			{ return $this->zone_add ($values,$network); }
+        elseif($action=="edit")		{ return $this->zone_edit ($values); }
+        elseif($action=="delete")	{ return $this->zone_delete ($values['id']); }
+        else						{ return $this->Result->show("danger", _("Invalid action"), true); }
+    }
+
+
+    /**
+     * Create new zone method
+     *
+     * @access private
+     * @param mixed $values
+     * @param mixed $network
+     * @return boolean
+     */
+    private function zone_add ($values,$network) {
+        # get the settings
+        $firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+
+        # push the zone name length into the values array
+        $values['length'] = $firewallZoneSettings['zoneLength'];
+
+        # execute insert
+        try { $this->Database->insertObject("firewallZones", $values); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+            $this->Log->write( "Firewall zone created", "Failed to add new firewall zone<hr>".$e->getMessage(), 2, $this->User->username);
+            return false;
+        }
+
+        # fetch the highest inserted id, matching the zone name
+        try { $lastId=$this->Database->getObjectsQuery("SELECT MAX(id) AS id FROM firewallZones WHERE zone = ? ;", $values['zone']);}
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+            return false;
+        }
+
+        if ($network) {
+            foreach ($network as $subnetId) {
+                $values = array('zoneId' => $lastId[0]->id, 'subnetId' => $subnetId);
+                # add the network bindings if there are any
+                try { $this->Database->insertObject("firewallZoneSubnet", $values); }
+                catch (Exception $e) {
+                    $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+                    return false;
+                }
+            }
+            # ok
+            return true;
+        }
+        # ok
+        return true;
+    }
+
+
+    /**
+     * Edit zone
+     *
+     * @access private
+     * @param mixed $values
+     * @return boolean
+     */
+    private function zone_edit ($values) {
+        # execute
+        try { $this->Database->updateObject("firewallZones", $values, "id"); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+            $this->Log->write( "Firewall zone edited", "Failed to edit firewall zone<hr>".$e->getMessage(), 2, $this->User->username);
+            return false;
+        }
+        # ok
+        $this->Log->write( "Firewall zone edited", "Firewall zone edited<hr>".$this->array_to_log($values), 0, $this->User->username);
+        return true;
+    }
+
+
+    /**
+     * Deletes zone and all corresponding mappings
+     *
+     * @access private
+     * @param string $id
+     * @return boolean
+     */
+    private function zone_delete ($id) {
+        # save old values
+        $old_zone = $this->get_zone($id);
+
+        # delete mappings
+        try { $this->Database->deleteRow("firewallZoneMapping", "zoneId", $id); }
+        catch (Exception $e) {
+            $this->Log->write( "Firewall zone and mappings delete", "Failed to delete firewall zone mappfings of $old_zone->zone<hr>".$e->getMessage(), 2, $this->User->username);
+            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+            return false;
+        }
+
+        # delete zone
+        try { $this->Database->deleteRow("firewallZones", "id", $id); }
+        catch (Exception $e) {
+            $this->Log->write( "Firewall zone delete", "Failed to delete firewall zone $old_zone->zone<hr>".$e->getMessage(), 2, $this->User->username);
+            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+            return false;
+        }
+        # ok
+        $this->Log->write( "Firewall zone deleted", "Firewall zone ".$old_zone->zone." deleted<hr>".$this->array_to_log($old_subnet), 0, $this->User->username);
+
+        return true;
+    }
+
+
+    /**
+     * Modify mapping - main method
+     *
+     * @access public
+     * @param mixed $action
+     * @param mixed $values
+     * @return void
+     */
+    public function modify_mapping ($action, $values) {
+        # initialize user
+        $this->User = new User ($this->Database);
+
+        # null empty values
+        $values = $this->reformat_empty_array_fields ($values, null);
+
+        # execute based on action
+        if($action=="add")			{ return $this->mapping_add ($values); }
+        elseif($action=="edit")		{ return $this->mapping_edit ($values); }
+        elseif($action=="delete")	{ return $this->mapping_delete ($values['id']); }
+        else						{ return $this->Result->show("danger", _("Invalid action"), true); }
+    }
+
+
+    /**
+     * Create new mapping
+     *
+     * @access private
+     * @param mixed $values
+     * @return boolean
+     */
+    private function mapping_add ($values) {
+        # get the settings
+        $firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+
+        # execute
+        try { $this->Database->insertObject("firewallZoneMapping", $values); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+            $this->Log->write( "Firewall zone mapping created", "Failed to add new firewall zone mapping<hr>".$e->getMessage(), 2, $this->User->username);
+            return false;
+        }
+        # ok
+        $this->Log->write( "Firewall zone mapping created", "New firewall zone mapping created<hr>".$this->array_to_log($values), 0, $this->User->username);
+        return true;
+    }
+
+
+    /**
+     * Edit mapping
+     *
+     * @access private
+     * @param mixed $values
+     * @return boolean
+     */
+    private function mapping_edit ($values) {
+        # execute
+        try { $this->Database->updateObject("firewallZoneMapping", $values, "id"); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+            $this->Log->write( "Firewall zone mapping edited", "Failed to edit firewall zone mapping<hr>".$e->getMessage(), 2, $this->User->username);
+            return false;
+        }
+        # ok
+        $this->Log->write( "Firewall zone mapping edited", "Firewall zone mapping edited<hr>".$this->array_to_log($values), 0, $this->User->username);
+        return true;
+    }
+
+
+    /**
+     * Deletes single mapping
+     *
+     * @access private
+     * @param string $id
+     * @return boolean
+     */
+    private function mapping_delete ($id) {
+        # save old values
+        $old_mapping = $this->get_zone_mapping($id);
+
+        # delete mapping
+        try { $this->Database->deleteRow("firewallZoneMapping", "id", $id); }
+        catch (Exception $e) {
+            $this->Log->write( "Firewall zone mapping delete", "Failed to delete firewall zone mapping $old_zone->zone<hr>".$e->getMessage(), 2, $this->User->username);
+            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+            return false;
+        }
+        # ok
+        $this->Log->write( "Firewall zone mapping deleted", "Firewall zone mapping ".$old_zone->zone." deleted<hr>".$this->array_to_log($old_subnet), 0, $this->User->username);
+
+        return true;
+    }
+
+    /**
+     * generate a firewall subnet object
+     *
+     * @access public
+     * @param mixed $id
+     * @return void
+     */
+    public function generate_subnet_object ($id) {
+        # fetch the settings
+        $firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+
+        # fetch zone informations
+        $zone = $this->get_zone_subnet_info($id);
+
+        # build the object name prefix
+        foreach ($firewallZoneSettings['pattern'] as $pattern) {
+            switch ($pattern) {
+                case 'patternIndicator':
+                    if ($zone->indicator == 0 ) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
+                    else 						{ 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
+                    break;
+                case 'patternZoneName':
+                    $firewallAddressObject = $firewallAddressObject.$zone->zone;
+                    break;
+                case 'patternIPType':
+                    # check if the subnet is v4 or v6
+                    if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+                        $firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][0];
+                    } elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+                        $firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][1];
+                    }
+                    break;
+                case 'patternSeparator':
+                        $firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['separator'];
+                    break;
+            }
+        }
+
+        #build the object name
+        if ($firewallZoneSettings['subnetPatternValues'][$firewallZoneSettings['subnetPattern']] == 'network' ) {
+            # check if the subnet is v4 or v6
+            if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+                $firewallAddressObject = $firewallAddressObject.$this->Subnets->transform_to_dotted($zone->subnet).'-'.$zone->mask;
+            } elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+                $firewallAddressObject = $firewallAddressObject.str_replace(':',$firewallZoneSettings['separator'],$this->Subnets->transform_to_dotted($zone->subnet)).'-'.$zone->mask;
+            }
+        } elseif ($firewallZoneSettings['subnetPatternValues'][$firewallZoneSettings['subnetPattern']] == 'description' ) {
+            $firewallAddressObject = $firewallAddressObject.str_replace(' ',$firewallZoneSettings['separator'],strtolower($zone->subnetDescription));
+        }
+
+        # get subnet information to compare against the changes
+        $subnet = (array) $this->Subnets->fetch_subnet("id",$id);
+
+        # compare both versions, if there is no difference, just do nothing
+        if ($zone->firewallAddressObject != $firewallAddressObject ) {
+            # update field in database
+            $values = array('id' => $id , 'firewallAddressObject' => $firewallAddressObject);
+            try { $this->Database->updateObject("subnets", $values, "id"); }
+            catch (Exception $e) {
+                $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+                return false;
+            }
+            # clone the address_old obj and replace the firewallAddressObject field to get a diff for logging
+            $subnet_old = $subnet;
+            $subnet['firewallAddressObject'] = $firewallAddressObject;
+
+            # write changelog
+            $this->Log->write_changelog('subnet', 'edit', 'success', $subnet_old,$subnet);
+
+            return ture;
+        }
+        return false;
+    }
+
+    /**
+     * generate a firewall address object
+     *
+     * @access public
+     * @param mixed $id
+     * @param mixed $dnsName
+     * @return string
+     */
+    public function generate_address_object ($id,$dnsName) {
+        # fetch the settings
+        $firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+
+        # fetch zone informations
+        $zone = $this->get_zone_subnet_info($id);
+
+        foreach ($firewallZoneSettings['pattern'] as $pattern) {
+            switch ($pattern) {
+                case 'patternIndicator':
+                    if ($zone->indicator == 0 ) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
+                    else 						{ 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
+                    break;
+                case 'patternZoneName':
+                    $firewallAddressObject = $firewallAddressObject.$zone->zone;
+                    break;
+                case 'patternIPType':
+                    # check if the subnet is v4 or v6
+                    if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+                        $firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][0];
+                    } elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+                        $firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][1];
+                    }
+                    break;
+                case 'patternHost':
+                        $hostName = explode('.', $dnsName);
+                        $firewallAddressObject = $firewallAddressObject.$hostName[0];
+                    break;
+                case 'patternFQDN':
+                        $firewallAddressObject = $firewallAddressObject.$dnsName;
+                    break;
+                case 'patternSeparator':
+                        $firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['separator'];
+                    break;
+            }
+        }
+        return $firewallAddressObject;
+    }
+
+    /**
+     * update a firewall address object
+     *
+     * @access public
+     * @param mixed $subnetId
+     * @param mixed $IPId
+     * @param mixed $dnsName
+     * @return void
+     */
+    public function update_address_object ($subnetId,$IPId,$dnsName) {
+        # Addresses object
+        $this->Addresses = new Addresses ($this->Database);
+
+        # fetch old details for logging
+        $address_old = $this->Addresses->fetch_address (null, $IPId);
+
+        # fetch the settings
+        $firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+
+        # fetch zone informations
+        $zone = $this->get_zone_subnet_info($subnetId);
+
+        foreach ($firewallZoneSettings['pattern'] as $pattern) {
+            switch ($pattern) {
+                case 'patternIndicator':
+                    if ($zone->indicator == 0 ) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
+                    else 						{ 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
+                    break;
+                case 'patternZoneName':
+                    $firewallAddressObject = $firewallAddressObject.$zone->zone;
+                    break;
+                case 'patternIPType':
+                    # check if the subnet is v4 or v6
+                    if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+                        $firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][0];
+                    } elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+                        $firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][1];
+                    }
+                    break;
+                case 'patternHost':
+                        $hostName = explode('.', $dnsName);
+                        $firewallAddressObject = $firewallAddressObject.$hostName[0];
+                    break;
+                case 'patternFQDN':
+                        $firewallAddressObject = $firewallAddressObject.$dnsName;
+                    break;
+                case 'patternSeparator':
+                        $firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['separator'];
+                    break;
+            }
+        }
+
+        if ($address_old->firewallAddressObject != $firewallAddressObject) {
+            # update field in database
+            $values = array('id' => $IPId , 'subnetId' => $subnetId, 'firewallAddressObject' => $firewallAddressObject);
+            try { $this->Database->updateObject("ipaddresses", $values, "id", "subnetId"); }
+            catch (Exception $e) {
+                $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+                return false;
+            }
+            # clone the address_old obj and replace the firewallAddressObject field to get a diff for logging
+            $address = clone($address_old);
+            $address->firewallAddressObject = $firewallAddressObject;
+
+            # write changelog
+            $this->Log->write_changelog('ip_addr', 'edit', 'success', (array)$address_old,(array)$address);
+
+            return ture;
+        }
+
+        return false;
+    }
+
+    /**
+     * update a firewall address objects for a whole network
+     *
+     * @access public
+     * @param mixed $subnetId
+     * @return boolean
+     */
+    public function update_address_objects ($subnetId) {
+        # Addresses object
+        $this->Addresses = new Addresses ($this->Database);
+
+        # fetch the settings
+        $firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+
+        # fetch zone informations
+        $zone = $this->get_zone_subnet_info($subnetId);
+
+        try { $ipaddresses = $this->Database->getObjectsQuery('SELECT id, dns_name FROM ipaddresses WHERE subnetId = ? ',$subnetId); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+            return false;
+        }
+        foreach ($ipaddresses as $ipaddress) {
+            # fetch old details for logging
+            $address_old = $this->Addresses->fetch_address (null, $ipaddress->id);
+
+            foreach ($firewallZoneSettings['pattern'] as $key => $pattern) {
+                switch ($pattern) {
+                    case 'patternIndicator':
+                        if ($zone->indicator == 0 ) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
+                        else 						{ 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
+                        break;
+                    case 'patternZoneName':
+                        $firewallAddressObject = $firewallAddressObject.$zone->zone;
+                        break;
+                    case 'patternIPType':
+                        # check if the subnet is v4 or v6
+                        if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+                            $firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][0];
+                        } elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+                            $firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][1];
+                        }
+                        break;
+                    case 'patternHost':
+                            $hostName = explode('.', $ipaddress->dns_name);
+                            $firewallAddressObject = $firewallAddressObject.$hostName[0];
+                        break;
+                    case 'patternFQDN':
+                            $firewallAddressObject = $firewallAddressObject.$ipaddress->dns_name;
+                        break;
+                    case 'patternSeparator':
+                            $firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['separator'];
+                        break;
+                }
+            }
+
+            if ($address_old->firewallAddressObject != $firewallAddressObject) {
+                # update field in database
+                $values = array('id' => $ipaddress->id , 'subnetId' => $subnetId, 'firewallAddressObject' => $firewallAddressObject);
+                try { $this->Database->updateObject("ipaddresses", $values, "id", "subnetId"); }
+                catch (Exception $e) {
+                    $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+                    return false;
+                }
+                # clone the address_old obj and replace the firewallAddressObject field to get a diff for logging
+                $address = clone($address_old);
+                $address->firewallAddressObject = $firewallAddressObject;
+
+                # write changelog
+                $this->Log->write_changelog('ip_addr', 'edit', 'success', (array)$address_old,(array)$address);
+            }
+
+            # unset firewallAddressObject to avoid chaining
+            unset($firewallAddressObject);
+
+    }
+    return true;
+    }
 }
\ No newline at end of file

Spacing +213 added lines, -213 removed lines

@@ -83,7 +83,7 @@ 
 		# Log object
 		$this->Log = new Logging ($this->Database);
 		# get settings
-		$this->get_settings();
+		$this->get_settings ();
 		# subnet object
 		$this->Subnets = new Subnets ($this->Database);
 	}
@@ -97,11 +97,11 @@ 
 	 * @return string
 	 */
 	public function zone2hex ($zone) {
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+		$firewallZoneSettings = json_decode ($this->settings->firewallZoneSettings, true);
 		if ($firewallZoneSettings['padding'] == 'on') {
-			return str_pad(dechex($zone),$firewallZoneSettings['zoneLength'],"0",STR_PAD_LEFT);
+			return str_pad (dechex ($zone), $firewallZoneSettings['zoneLength'], "0", STR_PAD_LEFT);
 		} else {
-			return dechex($zone);
+			return dechex ($zone);
 		}
 
 	}
@@ -116,14 +116,14 @@ 
 	 */
 	public function generate_zone_name ($values = NULL) {
 		# get settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+		$firewallZoneSettings = json_decode ($this->settings->firewallZoneSettings, true);
 		# execute based on action
-		if($firewallZoneSettings['zoneGenerator'] == 0 || $firewallZoneSettings['zoneGenerator'] == 1 ) {
-			return $this->generate_numeric_zone_name ($firewallZoneSettings['zoneLength'],$firewallZoneSettings['zoneGenerator']);
-		} elseif($firewallZoneSettings['zoneGenerator'] == 2 ) {
+		if ($firewallZoneSettings['zoneGenerator'] == 0 || $firewallZoneSettings['zoneGenerator'] == 1) {
+			return $this->generate_numeric_zone_name ($firewallZoneSettings['zoneLength'], $firewallZoneSettings['zoneGenerator']);
+		} elseif ($firewallZoneSettings['zoneGenerator'] == 2) {
 			return $this->validate_text_zone_name ($values);
 		} else {
-			return $this->Result->show("danger", _("Invalid generator ID"), true);
+			return $this->Result->show ("danger", _ ("Invalid generator ID"), true);
 		}
 	}
 
@@ -136,29 +136,29 @@ 
 	 * @param mixed $zoneGenerator
 	 * @return void
 	 */
-	private function generate_numeric_zone_name ($zoneLength,$zoneGenerator) {
+	private function generate_numeric_zone_name ($zoneLength, $zoneGenerator) {
 
 		# execute
-		try { $maxZone = $this->Database->getObjectsQuery('SELECT MAX(CAST(zone as UNSIGNED)) as zone FROM firewallZones WHERE generator NOT LIKE 2;');}
+		try { $maxZone = $this->Database->getObjectsQuery ('SELECT MAX(CAST(zone as UNSIGNED)) as zone FROM firewallZones WHERE generator NOT LIKE 2;'); }
 		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 			return false;
 		}
 
-		if($maxZone[0]->zone) {
+		if ($maxZone[0]->zone) {
 			# add 1 to the zone name
 			$zoneName = ++$maxZone[0]->zone;
-			if($zoneGenerator == 0 ) {
-				if(strlen($zoneName) > $zoneLength) {
-					return $this->Result->show("danger", _("Maximum zone name length reached! Consider to change your settings in order to generate larger zone names."), true);
+			if ($zoneGenerator == 0) {
+				if (strlen ($zoneName) > $zoneLength) {
+					return $this->Result->show ("danger", _ ("Maximum zone name length reached! Consider to change your settings in order to generate larger zone names."), true);
 				}
-			} elseif($zoneGenerator == 1) {
+			} elseif ($zoneGenerator == 1) {
 				# the highest convertable integer value for dechex() is 4294967295!
-				if($zoneName > 4294967295) {
-					return $this->Result->show("danger", _("The maximum convertable vlaue is reached. Consider to switch to decimal or text mode and change the zone name length value."), true);
+				if ($zoneName > 4294967295) {
+					return $this->Result->show ("danger", _ ("The maximum convertable vlaue is reached. Consider to switch to decimal or text mode and change the zone name length value."), true);
 				}
-				if(strlen(dechex($zoneName)) > $zoneLength){
-					return $this->Result->show("danger", _("Maximum zone name length reached! Consider to change your settings in order to generate larger zone names."), true);
+				if (strlen (dechex ($zoneName)) > $zoneLength) {
+					return $this->Result->show ("danger", _ ("Maximum zone name length reached! Consider to change your settings in order to generate larger zone names."), true);
 				}
 			}
 
@@ -168,7 +168,7 @@ 
 		}
 
 		# return the values
-		return sizeof($zoneName)>0 ? $zoneName : false;
+		return sizeof ($zoneName) > 0 ? $zoneName : false;
 	}
 
 
@@ -181,9 +181,9 @@ 
 	 */
 	private function validate_text_zone_name ($values) {
 		# get settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+		$firewallZoneSettings = json_decode ($this->settings->firewallZoneSettings, true);
 
-		if($values[1]){
+		if ($values[1]) {
 			$query = 'SELECT zone FROM firewallZones WHERE zone = ? AND id NOT LIKE ?;';
 			$params = $values;
 		} else {
@@ -192,15 +192,15 @@ 
 		}
 
 		# execute
-		try { $uniqueZone = $this->Database->getObjectsQuery($query,$params);}
+		try { $uniqueZone = $this->Database->getObjectsQuery ($query, $params); }
 		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 			return false;
 		}
 
 		if ($uniqueZone[0]->zone && $firewallZoneSettings['strictMode'] == 'on') {
 
-			$this->Result->show("danger", _("Error: The zone name ".$zone." is not unique!"), false);
+			$this->Result->show ("danger", _ ("Error: The zone name ".$zone." is not unique!"), false);
 
 		} else {
 			# set the initial zone name to "1"
@@ -208,7 +208,7 @@ 
 		}
 
 		# return the values
-		return sizeof($zoneName)>0 ? $zoneName : false;
+		return sizeof ($zoneName) > 0 ? $zoneName : false;
 	}
 
 
@@ -220,7 +220,7 @@ 
 	 */
 	public function get_zone_mappings () {
 		# try to fetch all zone mappings
-		try { $mappings =  $this->Database->getObjectsQuery('SELECT
+		try { $mappings = $this->Database->getObjectsQuery ('SELECT
 						firewallZones.id AS id,
 						firewallZones.generator AS generator,
 						firewallZones.length AS length,
@@ -237,12 +237,12 @@ 
 						FROM firewallZoneMapping
 						RIGHT JOIN firewallZones ON zoneId = firewallZones.id
 						LEFT JOIN devices ON deviceId = devices.id
-						having  deviceId is not NULL order by firewallZones.id ASC;');}
+						having  deviceId is not NULL order by firewallZones.id ASC;'); }
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
 		# try to fetch all subnet and vlan informations for all zones
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT
+		try { $networkInformation = $this->Database->getObjectsQuery ('SELECT
 						firewallZoneSubnet.zoneId AS zoneId,
 						firewallZoneSubnet.subnetId AS subnetId,
 						subnets.sectionId AS sectionId,
@@ -256,32 +256,32 @@ 
 						vlans.name AS vlanName
 						FROM firewallZoneSubnet
 						LEFT JOIN subnets ON subnetId = subnets.id
-						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId ORDER BY subnet ASC;');}
+						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId ORDER BY subnet ASC;'); }
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
 		# modify the zone output values
 		foreach ($mappings as $key => $val) {
 			# transform the zone name from decimal to hex
-			if($mappings[$key]->generator == 1 ){
-				$mappings[$key]->zone = dechex($mappings[$key]->zone);
+			if ($mappings[$key]->generator == 1) {
+				$mappings[$key]->zone = dechex ($mappings[$key]->zone);
 			}
 			# add some padding if it is activated and the zone generatore is not text
-			if($mappings[$key]->padding == 1 && $mappings[$key]->generator != 2){
+			if ($mappings[$key]->padding == 1 && $mappings[$key]->generator != 2) {
 			# remove leading zeros (padding) and raise the value in case of any zone name length changes
 			# add some padding to reach the maximum zone name lenght
-			$mappings[$key]->zone = str_pad(ltrim($mappings[$key]->zone,0),$mappings[$key]->length,"0",STR_PAD_LEFT);
+			$mappings[$key]->zone = str_pad (ltrim ($mappings[$key]->zone, 0), $mappings[$key]->length, "0", STR_PAD_LEFT);
 			}
 			# inject network informations
 			foreach ($networkInformation as $nkey => $nval) {
-				if($mappings[$key]->id == $nval->zoneId) {
+				if ($mappings[$key]->id == $nval->zoneId) {
 					# add each network and vlan information to the object
 					$mappings[$key]->network[] = $networkInformation[$nkey];
 				}
 			}
 		}
 		# return the values
-		return sizeof($mappings)>0 ? $mappings : false;
+		return sizeof ($mappings) > 0 ? $mappings : false;
 	}
 
 
@@ -294,7 +294,7 @@ 
 	 */
 	public function get_zone_mapping ($id) {
 		# try to fetch id specific zone mapping
-		try { $mapping =  $this->Database->getObjectsQuery('SELECT
+		try { $mapping = $this->Database->getObjectsQuery ('SELECT
 						firewallZones.id AS id,
 						firewallZones.generator AS generator,
 						firewallZones.length AS length,
@@ -310,12 +310,12 @@ 
 						FROM firewallZoneMapping
 						RIGHT JOIN firewallZones ON zoneId = firewallZones.id
 						LEFT JOIN devices ON deviceId = devices.id
-						having  deviceId is not NULL AND mappingId = ?;', $id);}
+						having  deviceId is not NULL AND mappingId = ?;', $id); }
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
 		# try to fetch all subnet and vlan informations for all zones
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT
+		try { $networkInformation = $this->Database->getObjectsQuery ('SELECT
 						firewallZoneSubnet.zoneId AS zoneId,
 						firewallZoneSubnet.subnetId AS subnetId,
 						subnets.sectionId AS sectionId,
@@ -330,25 +330,25 @@ 
 						FROM firewallZoneSubnet
 						LEFT JOIN subnets ON subnetId = subnets.id
 						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId
-						HAVING zoneId = ? ORDER BY subnet ASC;', $mapping[0]->id);}
+						HAVING zoneId = ? ORDER BY subnet ASC;', $mapping[0]->id); }
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
 		# modify the zone output values
 		foreach ($mapping as $key => $val) {
 			# transform the zone name from decimal to hex
-			if($mapping[$key]->generator == 1 ){
-				$mapping[$key]->zone = dechex($mapping[$key]->zone);
+			if ($mapping[$key]->generator == 1) {
+				$mapping[$key]->zone = dechex ($mapping[$key]->zone);
 			}
 			# add some padding if it is activated and the zone generatore is not text
-			if($mapping[$key]->padding == 1 && $mapping[$key]->generator != 2){
+			if ($mapping[$key]->padding == 1 && $mapping[$key]->generator != 2) {
 			# remove leading zeros (padding) and raise the value in case of any zone name length changes
 			# add some padding to reach the maximum zone name lenght
-			$mapping[$key]->zone = str_pad(ltrim($mapping[$key]->zone,0),$mapping[$key]->length,"0",STR_PAD_LEFT);
+			$mapping[$key]->zone = str_pad (ltrim ($mapping[$key]->zone, 0), $mapping[$key]->length, "0", STR_PAD_LEFT);
 			}
 			# inject network informations
 			foreach ($networkInformation as $nkey => $nval) {
-				if($mapping[$key]->id == $nval->zoneId) {
+				if ($mapping[$key]->id == $nval->zoneId) {
 					# remove the zoneId, we don't need it anymore
 					unset($networkInformation[$nkey]->zoneId);
 					# add each network and vlan information to the object
@@ -357,7 +357,7 @@ 
 			}
 		}
 		# return the values
-		return sizeof($mapping)>0 ? $mapping[0] : false;
+		return sizeof ($mapping) > 0 ? $mapping[0] : false;
 	}
 
 	/**
@@ -369,13 +369,13 @@ 
 	 */
 	public function check_zone_mapping ($zoneId) {
 		# try to fetch id specific zone mapping
-		try { $mapping =  $this->Database->getObjectsQuery('SELECT id FROM firewallZoneMapping WHERE zoneId = ?;', $zoneId);}
+		try { $mapping = $this->Database->getObjectsQuery ('SELECT id FROM firewallZoneMapping WHERE zoneId = ?;', $zoneId); }
 
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
 		# return the values
-		return sizeof($mapping)>0 ? $mapping[0] : false;
+		return sizeof ($mapping) > 0 ? $mapping[0] : false;
 	}
 
 
@@ -388,7 +388,7 @@ 
 	 */
 	public function get_zone_subnet_info ($id) {
 		# try to fetch id specific zone information
-		try { $info =  $this->Database->getObjectsQuery('SELECT
+		try { $info = $this->Database->getObjectsQuery ('SELECT
 						firewallZones.zone as zone,
 						firewallZones.padding as padding,
 						firewallZones.length as length,
@@ -408,27 +408,27 @@ 
 						LEFT JOIN firewallZoneSubnet on firewallZoneMapping.zoneId = firewallZoneSubnet.zoneId
 						LEFT JOIN devices ON firewallZoneMapping.deviceId = devices.id
 						LEFT JOIN subnets ON firewallZoneSubnet.subnetId = subnets.id
-						HAVING firewallZoneSubnet.subnetId = ?;', $id);}
+						HAVING firewallZoneSubnet.subnetId = ?;', $id); }
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 		if ($info) {
 			# modify the zone output values
 			foreach ($info as $key => $val) {
 				# transform the zone name from decimal to hex
-				if($info[$key]->generator == 1 ){
-					$info[$key]->zone = dechex($info[$key]->zone);
+				if ($info[$key]->generator == 1) {
+					$info[$key]->zone = dechex ($info[$key]->zone);
 				}
 				# add some padding if it is activated and the zone generatore is not text
-				if($info[$key]->padding == 1 && $info[$key]->generator != 2){
+				if ($info[$key]->padding == 1 && $info[$key]->generator != 2) {
 				# remove leading zeros (padding) and raise the value in case of any zone name length changes
 				# add some padding to reach the maximum zone name lenght
-				$info[$key]->zone = str_pad(ltrim($info[$key]->zone,0),$info[$key]->length,"0",STR_PAD_LEFT);
+				$info[$key]->zone = str_pad (ltrim ($info[$key]->zone, 0), $info[$key]->length, "0", STR_PAD_LEFT);
 				}
 			}
 		}
 
 		# return the values
-		return sizeof($info)>0 ? $info[0] : false;
+		return sizeof ($info) > 0 ? $info[0] : false;
 	}
 
 
@@ -440,12 +440,12 @@ 
 	 */
 	public function get_zones () {
 		# try to fetch all zones
-		try { $zones =  $this->Database->getObjectsQuery('SELECT * FROM firewallZones;');}
+		try { $zones = $this->Database->getObjectsQuery ('SELECT * FROM firewallZones;'); }
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
 		# try to fetch all subnet and vlan informations for all zones
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT
+		try { $networkInformation = $this->Database->getObjectsQuery ('SELECT
 						firewallZoneSubnet.zoneId AS zoneId,
 						firewallZoneSubnet.subnetId AS subnetId,
 						subnets.sectionId AS sectionId,
@@ -459,25 +459,25 @@ 
 						vlans.name AS vlanName
 						FROM firewallZoneSubnet
 						LEFT JOIN subnets ON firewallZoneSubnet.subnetId = subnets.id
-						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId ORDER BY subnet ASC;');}
+						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId ORDER BY subnet ASC;'); }
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
 		# modify the zone output values
 		foreach ($zones as $key => $val) {
 			# transform the zone name from decimal to hex
-			if($zones[$key]->generator == 1 ){
-				$zones[$key]->zone = dechex($zones[$key]->zone);
+			if ($zones[$key]->generator == 1) {
+				$zones[$key]->zone = dechex ($zones[$key]->zone);
 			}
 			# add some padding if it is activated and the zone generatore is not text
-			if($zones[$key]->padding == 1 && $zones[$key]->generator != 2){
+			if ($zones[$key]->padding == 1 && $zones[$key]->generator != 2) {
 			# remove leading zeros (padding) and raise the value in case of any zone name length changes
 			# add some padding to reach the maximum zone name lenght
-			$zones[$key]->zone = str_pad(ltrim($zones[$key]->zone,0),$zones[$key]->length,"0",STR_PAD_LEFT);
+			$zones[$key]->zone = str_pad (ltrim ($zones[$key]->zone, 0), $zones[$key]->length, "0", STR_PAD_LEFT);
 			}
 			# inject network informations
 			foreach ($networkInformation as $nkey => $nval) {
-				if($zones[$key]->id == $nval->zoneId) {
+				if ($zones[$key]->id == $nval->zoneId) {
 					# remove the zoneId, we don't need it anymore
 					unset($networkInformation[$nkey]->zoneId);
 					# add each network and vlan information to the object
@@ -486,7 +486,7 @@ 
 			}
 		}
 		# return the values
-		return sizeof($zones)>0 ? $zones : false;
+		return sizeof ($zones) > 0 ? $zones : false;
 	}
 
 
@@ -499,13 +499,13 @@ 
 	 */
 	public function get_zone ($id) {
 		# try to fetch zone with ID $id
-		try { $zone = $this->Database->getObjectsQuery('SELECT * FROM firewallZones WHERE id = ?;', $id);}
+		try { $zone = $this->Database->getObjectsQuery ('SELECT * FROM firewallZones WHERE id = ?;', $id); }
 
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
 		# try to fetch all subnet and vlan informations for this zone
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT
+		try { $networkInformation = $this->Database->getObjectsQuery ('SELECT
 						firewallZoneSubnet.zoneId AS zoneId,
 						firewallZoneSubnet.subnetId AS subnetId,
 						subnets.sectionId AS sectionId,
@@ -519,25 +519,25 @@ 
 						vlans.name AS vlanName
 						FROM firewallZoneSubnet
 						LEFT JOIN subnets ON firewallZoneSubnet.subnetId = subnets.id
-						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId HAVING zoneId = ? ORDER BY subnet ASC;', $id);}
+						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId HAVING zoneId = ? ORDER BY subnet ASC;', $id); }
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
 		# modify the zone output values
 		foreach ($zone as $key => $val) {
 			# transform the zone name from decimal to hex
-			if($zone[$key]->generator == 1 ){
-				$zone[$key]->zone = dechex($zone[$key]->zone);
+			if ($zone[$key]->generator == 1) {
+				$zone[$key]->zone = dechex ($zone[$key]->zone);
 			}
 			# add some padding if it is activated and the zone generatore is not text
-			if($zone[$key]->padding == 1 && $zone[$key]->generator != 2){
+			if ($zone[$key]->padding == 1 && $zone[$key]->generator != 2) {
 			# remove leading zeros (padding) and raise the value in case of any zone name length changes
 			# add some padding to reach the maximum zone name lenght
-			$zone[$key]->zone = str_pad(ltrim($zone[$key]->zone,0),$zone[$key]->length,"0",STR_PAD_LEFT);
+			$zone[$key]->zone = str_pad (ltrim ($zone[$key]->zone, 0), $zone[$key]->length, "0", STR_PAD_LEFT);
 			}
 			# inject network informations
 			foreach ($networkInformation as $nkey => $nval) {
-				if($zone[$key]->id == $nval->zoneId) {
+				if ($zone[$key]->id == $nval->zoneId) {
 					# remove the zoneId, we don't need it anymore
 					unset($networkInformation[$nkey]->zoneId);
 					# add each network and vlan information to the object
@@ -547,7 +547,7 @@ 
 		}
 
 		# return the values
-		return sizeof($zone)>0 ? $zone[0] : false;
+		return sizeof ($zone) > 0 ? $zone[0] : false;
 	}
 
 
@@ -560,22 +560,22 @@ 
 	 */
 	public function get_zone_detail ($id) {
 		# get zone informations
-		$zoneInformation = $this->get_zone($id);
+		$zoneInformation = $this->get_zone ($id);
 
 		# build html output
 		print '<table class="table table-auto table-condensed" style="margin-bottom:0px;">';
 		print "<tr><td colspan='2'><h4>Zone details</h4><hr></td></tr>";
 		print '<tr>';
-		print '<td style="width:110px;">'._('Zone Name').'</td>';
+		print '<td style="width:110px;">'._ ('Zone Name').'</td>';
 		print '<td>'.$zoneInformation->zone.'</td>';
 		print '</tr>';
 		print '<tr>';
-		print '<td>'._('Indicator').'</td>';
+		print '<td>'._ ('Indicator').'</td>';
 		$title = $zoneInformation->indicator == 0 ? 'Own Zone' : 'Customer Zone';
-		print '<td><span class="fa fa-home"  title="'._($title).'"></span></td>';
+		print '<td><span class="fa fa-home"  title="'._ ($title).'"></span></td>';
 		print '</tr>';
 		print '<tr>';
-		print '<td>'._('Description').'</td>';
+		print '<td>'._ ('Description').'</td>';
 		print '<td>'.$zoneInformation->description.'</td>';
 		print '</tr>';
 		print "</table>";
@@ -584,8 +584,8 @@ 
 			print "<table class='table table-condensed' style='margin-bottom:30px;'>";
 			print "<tr><td colspan='2'><br><h4>Subnets</h4><hr></td></tr>";
 			print '<tr>';
-			print '<th>'._('Subnet').'</th>';
-			print '<th>'._('VLAN').'</th>';
+			print '<th>'._ ('Subnet').'</th>';
+			print '<th>'._ ('VLAN').'</th>';
 			print '</tr>';
 			foreach ($zoneInformation->network as $network) {
 				print '<tr>';
@@ -594,8 +594,8 @@ 
 				$network->vlanName = $network->vlanName ? "(".$network->vlanName.")" : "";
 
 				if (!$network->subnetIsFolder) {
-					print '<td>'.$this->Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.$network->subnetDescription.'</td>';
-				} else{
+					print '<td>'.$this->Subnets->transform_to_dotted ($network->subnet).'/'.$network->subnetMask.$network->subnetDescription.'</td>';
+				} else {
 					print '<td>Folder '.$network->subnetDescription.'</td>';
 				}
 				print '<td>'.$network->vlan.$network->vlanName.'</td>';
@@ -614,7 +614,7 @@ 
 	 */
 	public function get_zone_network ($id) {
 		# try to fetch all subnet and vlan informations for this zone
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT
+		try { $networkInformation = $this->Database->getObjectsQuery ('SELECT
 						firewallZoneSubnet.zoneId AS zoneId,
 						firewallZoneSubnet.subnetId AS subnetId,
 						subnets.sectionId AS sectionId,
@@ -628,11 +628,11 @@ 
 						vlans.name AS vlanName
 						FROM firewallZoneSubnet
 						LEFT JOIN subnets ON firewallZoneSubnet.subnetId = subnets.id
-						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId HAVING zoneId = ? ORDER BY subnet ASC;', $id);}
+						LEFT JOIN vlans ON subnets.vlanId = vlans.vlanId HAVING zoneId = ? ORDER BY subnet ASC;', $id); }
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
-		$rowspan = count($networkInformation);
+		$rowspan = count ($networkInformation);
 		$i = 1;
 		print '<table class="table table-noborder table-condensed" style="padding-bottom:20px;">';
 		foreach ($networkInformation as $network) {
@@ -641,16 +641,16 @@ 
 				print '<td rowspan="'.$rowspan.'" style="width:150px;">Network</td>';
 			}
 			print '<td>';
-			print '<a class="btn btn-xs btn-danger editNetwork" style="margin-right:5px;" alt="'._('Delete Network').'" title="'._('Delete Network').'" data-action="delete" data-zoneId="'.$id.'" data-subnetId="'.$network->subnetId.'">';
+			print '<a class="btn btn-xs btn-danger editNetwork" style="margin-right:5px;" alt="'._ ('Delete Network').'" title="'._ ('Delete Network').'" data-action="delete" data-zoneId="'.$id.'" data-subnetId="'.$network->subnetId.'">';
 			print '<span><i class="fa fa-close"></i></span>';
 			print "</a>";
 
-			if ($network->subnetIsFolder == 1 ) {
+			if ($network->subnetIsFolder == 1) {
 				print 'Folder: '.$network->subnetDescription;
 			} else {
 				# display network information with or without description
-				if ($network->subnetDescription) 	{	print $this->Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.' ('.$network->subnetDescription.')</td>';	}
-				else 								{	print $this->Subnets->transform_to_dotted($network->subnet).'/'.$network->subnetMask.'</td>';	}
+				if ($network->subnetDescription) {	print $this->Subnets->transform_to_dotted ($network->subnet).'/'.$network->subnetMask.' ('.$network->subnetDescription.')</td>'; }
+				else {	print $this->Subnets->transform_to_dotted ($network->subnet).'/'.$network->subnetMask.'</td>'; }
 			}
 			print '</tr>';
 			$i++;
@@ -668,16 +668,16 @@ 
 	 */
 	public function check_zone_network ($subnetId) {
 		# check if the subnet is already bound to this or any other zone
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT * FROM firewallZoneSubnet WHERE subnetId = ?;', $subnetId);}
+		try { $networkInformation = $this->Database->getObjectsQuery ('SELECT * FROM firewallZoneSubnet WHERE subnetId = ?;', $subnetId); }
 
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
-		if(!sizeof($networkInformation)>0 ) {
+		if (!sizeof ($networkInformation) > 0) {
 			# return dummy value
 			return 'success';
 		} else {
-			$this->Result->show("danger","<strong>"._('Error').":</strong><br>"._("This network is already bound to this or another zone.<br>The binding must be unique."), false);
+			$this->Result->show ("danger", "<strong>"._ ('Error').":</strong><br>"._ ("This network is already bound to this or another zone.<br>The binding must be unique."), false);
 			return false;
 		}
 		# return dummy value
@@ -693,24 +693,24 @@ 
 	 * @param mixed $subnetId
 	 * @return false|string
 	 */
-	public function add_zone_network ($zoneId,$subnetId) {
+	public function add_zone_network ($zoneId, $subnetId) {
 		# check if the subnet is already bound to this or any other zone
-		try { $networkInformation =  $this->Database->getObjectsQuery('SELECT * FROM firewallZoneSubnet WHERE subnetId = ?;', $subnetId);}
+		try { $networkInformation = $this->Database->getObjectsQuery ('SELECT * FROM firewallZoneSubnet WHERE subnetId = ?;', $subnetId); }
 
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
-		if(!sizeof($networkInformation)>0 ) {
+		if (!sizeof ($networkInformation) > 0) {
 			$query = 'INSERT INTO firewallZoneSubnet (zoneId, subnetId) VALUES (?,?);';
-			$params = array('zoneId' => $zoneId, 'subnetId' => $subnetId);
+			$params = array ('zoneId' => $zoneId, 'subnetId' => $subnetId);
 
 			# try to fetch all subnet and vlan informations for this zone
-			try { $addRow =  $this->Database->insertObject("firewallZoneSubnet", $params);}
+			try { $addRow = $this->Database->insertObject ("firewallZoneSubnet", $params); }
 
 			# throw exception
-			catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+			catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 		} else {
-			$this->Result->show("danger","<strong>"._('Error').":</strong><br>"._("This network is already bound to this or another zone.<br>The binding must be unique."), false);
+			$this->Result->show ("danger", "<strong>"._ ('Error').":</strong><br>"._ ("This network is already bound to this or another zone.<br>The binding must be unique."), false);
 			return false;
 		}
 		# return dummy value
@@ -726,12 +726,12 @@ 
 	 * @param mixed $subnetId
 	 * @return string|false
 	 */
-	public function delete_zone_network ($zoneId,$subnetId) {
+	public function delete_zone_network ($zoneId, $subnetId) {
 		# try to fetch all subnet and vlan informations for this zone
-		try { $deleteRow =  $this->Database->deleteRow("firewallZoneSubnet", "zoneId", $zoneId, "subnetId", $subnetId); }
+		try { $deleteRow = $this->Database->deleteRow ("firewallZoneSubnet", "zoneId", $zoneId, "subnetId", $subnetId); }
 
 		# throw exception
-		catch (Exception $e) {$this->Result->show("danger", _("Database error: ").$e->getMessage());}
+		catch (Exception $e) {$this->Result->show ("danger", _ ("Database error: ").$e->getMessage ()); }
 
 		# return dummy value or false
 		if ($deleteRow) {
@@ -765,10 +765,10 @@ 
 		}
 
 		# execute based on action
-		if($action=="add")			{ return $this->zone_add ($values,$network); }
-		elseif($action=="edit")		{ return $this->zone_edit ($values); }
-		elseif($action=="delete")	{ return $this->zone_delete ($values['id']); }
-		else						{ return $this->Result->show("danger", _("Invalid action"), true); }
+		if ($action == "add") { return $this->zone_add ($values, $network); }
+		elseif ($action == "edit") { return $this->zone_edit ($values); }
+		elseif ($action == "delete") { return $this->zone_delete ($values['id']); }
+		else { return $this->Result->show ("danger", _ ("Invalid action"), true); }
 	}
 
 
@@ -780,35 +780,35 @@ 
 	 * @param mixed $network
 	 * @return boolean
 	 */
-	private function zone_add ($values,$network) {
+	private function zone_add ($values, $network) {
 		# get the settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+		$firewallZoneSettings = json_decode ($this->settings->firewallZoneSettings, true);
 
 		# push the zone name length into the values array
 		$values['length'] = $firewallZoneSettings['zoneLength'];
 
 		# execute insert
-		try { $this->Database->insertObject("firewallZones", $values); }
+		try { $this->Database->insertObject ("firewallZones", $values); }
 		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			$this->Log->write( "Firewall zone created", "Failed to add new firewall zone<hr>".$e->getMessage(), 2, $this->User->username);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
+			$this->Log->write ("Firewall zone created", "Failed to add new firewall zone<hr>".$e->getMessage (), 2, $this->User->username);
 			return false;
 		}
 
 		# fetch the highest inserted id, matching the zone name
-		try { $lastId=$this->Database->getObjectsQuery("SELECT MAX(id) AS id FROM firewallZones WHERE zone = ? ;", $values['zone']);}
+		try { $lastId = $this->Database->getObjectsQuery ("SELECT MAX(id) AS id FROM firewallZones WHERE zone = ? ;", $values['zone']); }
 		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 			return false;
 		}
 
 		if ($network) {
 			foreach ($network as $subnetId) {
-				$values = array('zoneId' => $lastId[0]->id, 'subnetId' => $subnetId);
+				$values = array ('zoneId' => $lastId[0]->id, 'subnetId' => $subnetId);
 				# add the network bindings if there are any
-				try { $this->Database->insertObject("firewallZoneSubnet", $values); }
+				try { $this->Database->insertObject ("firewallZoneSubnet", $values); }
 				catch (Exception $e) {
-					$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+					$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 					return false;
 				}
 			}
@@ -829,14 +829,14 @@ 
 	 */
 	private function zone_edit ($values) {
 		# execute
-		try { $this->Database->updateObject("firewallZones", $values, "id"); }
+		try { $this->Database->updateObject ("firewallZones", $values, "id"); }
 		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			$this->Log->write( "Firewall zone edited", "Failed to edit firewall zone<hr>".$e->getMessage(), 2, $this->User->username);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
+			$this->Log->write ("Firewall zone edited", "Failed to edit firewall zone<hr>".$e->getMessage (), 2, $this->User->username);
 			return false;
 		}
 		# ok
-		$this->Log->write( "Firewall zone edited", "Firewall zone edited<hr>".$this->array_to_log($values), 0, $this->User->username);
+		$this->Log->write ("Firewall zone edited", "Firewall zone edited<hr>".$this->array_to_log ($values), 0, $this->User->username);
 		return true;
 	}
 
@@ -850,25 +850,25 @@ 
 	 */
 	private function zone_delete ($id) {
 		# save old values
-		$old_zone = $this->get_zone($id);
+		$old_zone = $this->get_zone ($id);
 
 		# delete mappings
-		try { $this->Database->deleteRow("firewallZoneMapping", "zoneId", $id); }
+		try { $this->Database->deleteRow ("firewallZoneMapping", "zoneId", $id); }
 		catch (Exception $e) {
-			$this->Log->write( "Firewall zone and mappings delete", "Failed to delete firewall zone mappfings of $old_zone->zone<hr>".$e->getMessage(), 2, $this->User->username);
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+			$this->Log->write ("Firewall zone and mappings delete", "Failed to delete firewall zone mappfings of $old_zone->zone<hr>".$e->getMessage (), 2, $this->User->username);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 			return false;
 		}
 
 		# delete zone
-		try { $this->Database->deleteRow("firewallZones", "id", $id); }
+		try { $this->Database->deleteRow ("firewallZones", "id", $id); }
 		catch (Exception $e) {
-			$this->Log->write( "Firewall zone delete", "Failed to delete firewall zone $old_zone->zone<hr>".$e->getMessage(), 2, $this->User->username);
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+			$this->Log->write ("Firewall zone delete", "Failed to delete firewall zone $old_zone->zone<hr>".$e->getMessage (), 2, $this->User->username);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 			return false;
 		}
 		# ok
-		$this->Log->write( "Firewall zone deleted", "Firewall zone ".$old_zone->zone." deleted<hr>".$this->array_to_log($old_subnet), 0, $this->User->username);
+		$this->Log->write ("Firewall zone deleted", "Firewall zone ".$old_zone->zone." deleted<hr>".$this->array_to_log ($old_subnet), 0, $this->User->username);
 
 		return true;
 	}
@@ -890,10 +890,10 @@ 
 		$values = $this->reformat_empty_array_fields ($values, null);
 
 		# execute based on action
-		if($action=="add")			{ return $this->mapping_add ($values); }
-		elseif($action=="edit")		{ return $this->mapping_edit ($values); }
-		elseif($action=="delete")	{ return $this->mapping_delete ($values['id']); }
-		else						{ return $this->Result->show("danger", _("Invalid action"), true); }
+		if ($action == "add") { return $this->mapping_add ($values); }
+		elseif ($action == "edit") { return $this->mapping_edit ($values); }
+		elseif ($action == "delete") { return $this->mapping_delete ($values['id']); }
+		else { return $this->Result->show ("danger", _ ("Invalid action"), true); }
 	}
 
 
@@ -906,17 +906,17 @@ 
 	 */
 	private function mapping_add ($values) {
 		# get the settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+		$firewallZoneSettings = json_decode ($this->settings->firewallZoneSettings, true);
 
 		# execute
-		try { $this->Database->insertObject("firewallZoneMapping", $values); }
+		try { $this->Database->insertObject ("firewallZoneMapping", $values); }
 		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			$this->Log->write( "Firewall zone mapping created", "Failed to add new firewall zone mapping<hr>".$e->getMessage(), 2, $this->User->username);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
+			$this->Log->write ("Firewall zone mapping created", "Failed to add new firewall zone mapping<hr>".$e->getMessage (), 2, $this->User->username);
 			return false;
 		}
 		# ok
-		$this->Log->write( "Firewall zone mapping created", "New firewall zone mapping created<hr>".$this->array_to_log($values), 0, $this->User->username);
+		$this->Log->write ("Firewall zone mapping created", "New firewall zone mapping created<hr>".$this->array_to_log ($values), 0, $this->User->username);
 		return true;
 	}
 
@@ -930,14 +930,14 @@ 
 	 */
 	private function mapping_edit ($values) {
 		# execute
-		try { $this->Database->updateObject("firewallZoneMapping", $values, "id"); }
+		try { $this->Database->updateObject ("firewallZoneMapping", $values, "id"); }
 		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			$this->Log->write( "Firewall zone mapping edited", "Failed to edit firewall zone mapping<hr>".$e->getMessage(), 2, $this->User->username);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
+			$this->Log->write ("Firewall zone mapping edited", "Failed to edit firewall zone mapping<hr>".$e->getMessage (), 2, $this->User->username);
 			return false;
 		}
 		# ok
-		$this->Log->write( "Firewall zone mapping edited", "Firewall zone mapping edited<hr>".$this->array_to_log($values), 0, $this->User->username);
+		$this->Log->write ("Firewall zone mapping edited", "Firewall zone mapping edited<hr>".$this->array_to_log ($values), 0, $this->User->username);
 		return true;
 	}
 
@@ -951,17 +951,17 @@ 
 	 */
 	private function mapping_delete ($id) {
 		# save old values
-		$old_mapping = $this->get_zone_mapping($id);
+		$old_mapping = $this->get_zone_mapping ($id);
 
 		# delete mapping
-		try { $this->Database->deleteRow("firewallZoneMapping", "id", $id); }
+		try { $this->Database->deleteRow ("firewallZoneMapping", "id", $id); }
 		catch (Exception $e) {
-			$this->Log->write( "Firewall zone mapping delete", "Failed to delete firewall zone mapping $old_zone->zone<hr>".$e->getMessage(), 2, $this->User->username);
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+			$this->Log->write ("Firewall zone mapping delete", "Failed to delete firewall zone mapping $old_zone->zone<hr>".$e->getMessage (), 2, $this->User->username);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 			return false;
 		}
 		# ok
-		$this->Log->write( "Firewall zone mapping deleted", "Firewall zone mapping ".$old_zone->zone." deleted<hr>".$this->array_to_log($old_subnet), 0, $this->User->username);
+		$this->Log->write ("Firewall zone mapping deleted", "Firewall zone mapping ".$old_zone->zone." deleted<hr>".$this->array_to_log ($old_subnet), 0, $this->User->username);
 
 		return true;
 	}
@@ -975,26 +975,26 @@ 
 	 */
 	public function generate_subnet_object ($id) {
 		# fetch the settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+		$firewallZoneSettings = json_decode ($this->settings->firewallZoneSettings, true);
 
 		# fetch zone informations
-		$zone = $this->get_zone_subnet_info($id);
+		$zone = $this->get_zone_subnet_info ($id);
 
 		# build the object name prefix
 		foreach ($firewallZoneSettings['pattern'] as $pattern) {
 			switch ($pattern) {
 				case 'patternIndicator':
-					if ($zone->indicator == 0 ) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
-					else 						{ 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
+					if ($zone->indicator == 0) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
+					else { 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
 					break;
 				case 'patternZoneName':
 					$firewallAddressObject = $firewallAddressObject.$zone->zone;
 					break;
 				case 'patternIPType':
 					# check if the subnet is v4 or v6
-					if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+					if (filter_var ($this->Subnets->transform_to_dotted ($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][0];
-					} elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+					} elseif (filter_var ($this->Subnets->transform_to_dotted ($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
 						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][1];
 					}
 					break;
@@ -1005,27 +1005,27 @@ 
 		}
 
 		#build the object name
-		if ($firewallZoneSettings['subnetPatternValues'][$firewallZoneSettings['subnetPattern']] == 'network' ) {
+		if ($firewallZoneSettings['subnetPatternValues'][$firewallZoneSettings['subnetPattern']] == 'network') {
 			# check if the subnet is v4 or v6
-			if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-				$firewallAddressObject = $firewallAddressObject.$this->Subnets->transform_to_dotted($zone->subnet).'-'.$zone->mask;
-			} elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-				$firewallAddressObject = $firewallAddressObject.str_replace(':',$firewallZoneSettings['separator'],$this->Subnets->transform_to_dotted($zone->subnet)).'-'.$zone->mask;
+			if (filter_var ($this->Subnets->transform_to_dotted ($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+				$firewallAddressObject = $firewallAddressObject.$this->Subnets->transform_to_dotted ($zone->subnet).'-'.$zone->mask;
+			} elseif (filter_var ($this->Subnets->transform_to_dotted ($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+				$firewallAddressObject = $firewallAddressObject.str_replace (':', $firewallZoneSettings['separator'], $this->Subnets->transform_to_dotted ($zone->subnet)).'-'.$zone->mask;
 			}
-		} elseif ($firewallZoneSettings['subnetPatternValues'][$firewallZoneSettings['subnetPattern']] == 'description' ) {
-			$firewallAddressObject = $firewallAddressObject.str_replace(' ',$firewallZoneSettings['separator'],strtolower($zone->subnetDescription));
+		} elseif ($firewallZoneSettings['subnetPatternValues'][$firewallZoneSettings['subnetPattern']] == 'description') {
+			$firewallAddressObject = $firewallAddressObject.str_replace (' ', $firewallZoneSettings['separator'], strtolower ($zone->subnetDescription));
 		}
 
 		# get subnet information to compare against the changes
-		$subnet = (array) $this->Subnets->fetch_subnet("id",$id);
+		$subnet = (array) $this->Subnets->fetch_subnet ("id", $id);
 
 		# compare both versions, if there is no difference, just do nothing
-		if ($zone->firewallAddressObject != $firewallAddressObject ) {
+		if ($zone->firewallAddressObject != $firewallAddressObject) {
 			# update field in database
-			$values = array('id' => $id , 'firewallAddressObject' => $firewallAddressObject);
-			try { $this->Database->updateObject("subnets", $values, "id"); }
+			$values = array ('id' => $id, 'firewallAddressObject' => $firewallAddressObject);
+			try { $this->Database->updateObject ("subnets", $values, "id"); }
 			catch (Exception $e) {
-				$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+				$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 				return false;
 			}
 			# clone the address_old obj and replace the firewallAddressObject field to get a diff for logging
@@ -1033,7 +1033,7 @@ 
 			$subnet['firewallAddressObject'] = $firewallAddressObject;
 
 			# write changelog
-			$this->Log->write_changelog('subnet', 'edit', 'success', $subnet_old,$subnet);
+			$this->Log->write_changelog ('subnet', 'edit', 'success', $subnet_old, $subnet);
 
 			return ture;
 		}
@@ -1048,32 +1048,32 @@ 
 	 * @param mixed $dnsName
 	 * @return string
 	 */
-	public function generate_address_object ($id,$dnsName) {
+	public function generate_address_object ($id, $dnsName) {
 		# fetch the settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+		$firewallZoneSettings = json_decode ($this->settings->firewallZoneSettings, true);
 
 		# fetch zone informations
-		$zone = $this->get_zone_subnet_info($id);
+		$zone = $this->get_zone_subnet_info ($id);
 
 		foreach ($firewallZoneSettings['pattern'] as $pattern) {
 			switch ($pattern) {
 				case 'patternIndicator':
-					if ($zone->indicator == 0 ) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
-					else 						{ 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
+					if ($zone->indicator == 0) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
+					else { 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
 					break;
 				case 'patternZoneName':
 					$firewallAddressObject = $firewallAddressObject.$zone->zone;
 					break;
 				case 'patternIPType':
 					# check if the subnet is v4 or v6
-					if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+					if (filter_var ($this->Subnets->transform_to_dotted ($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][0];
-					} elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+					} elseif (filter_var ($this->Subnets->transform_to_dotted ($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
 						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][1];
 					}
 					break;
 				case 'patternHost':
-						$hostName = explode('.', $dnsName);
+						$hostName = explode ('.', $dnsName);
 						$firewallAddressObject = $firewallAddressObject.$hostName[0];
 					break;
 				case 'patternFQDN':
@@ -1096,7 +1096,7 @@ 
 	 * @param mixed $dnsName
 	 * @return void
 	 */
-	public function update_address_object ($subnetId,$IPId,$dnsName) {
+	public function update_address_object ($subnetId, $IPId, $dnsName) {
 		# Addresses object
 		$this->Addresses = new Addresses ($this->Database);
 
@@ -1104,30 +1104,30 @@ 
 		$address_old = $this->Addresses->fetch_address (null, $IPId);
 
 		# fetch the settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+		$firewallZoneSettings = json_decode ($this->settings->firewallZoneSettings, true);
 
 		# fetch zone informations
-		$zone = $this->get_zone_subnet_info($subnetId);
+		$zone = $this->get_zone_subnet_info ($subnetId);
 
 		foreach ($firewallZoneSettings['pattern'] as $pattern) {
 			switch ($pattern) {
 				case 'patternIndicator':
-					if ($zone->indicator == 0 ) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
-					else 						{ 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
+					if ($zone->indicator == 0) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
+					else { 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
 					break;
 				case 'patternZoneName':
 					$firewallAddressObject = $firewallAddressObject.$zone->zone;
 					break;
 				case 'patternIPType':
 					# check if the subnet is v4 or v6
-					if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+					if (filter_var ($this->Subnets->transform_to_dotted ($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][0];
-					} elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+					} elseif (filter_var ($this->Subnets->transform_to_dotted ($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
 						$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][1];
 					}
 					break;
 				case 'patternHost':
-						$hostName = explode('.', $dnsName);
+						$hostName = explode ('.', $dnsName);
 						$firewallAddressObject = $firewallAddressObject.$hostName[0];
 					break;
 				case 'patternFQDN':
@@ -1141,10 +1141,10 @@ 
 
 		if ($address_old->firewallAddressObject != $firewallAddressObject) {
 			# update field in database
-			$values = array('id' => $IPId , 'subnetId' => $subnetId, 'firewallAddressObject' => $firewallAddressObject);
-			try { $this->Database->updateObject("ipaddresses", $values, "id", "subnetId"); }
+			$values = array ('id' => $IPId, 'subnetId' => $subnetId, 'firewallAddressObject' => $firewallAddressObject);
+			try { $this->Database->updateObject ("ipaddresses", $values, "id", "subnetId"); }
 			catch (Exception $e) {
-				$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+				$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 				return false;
 			}
 			# clone the address_old obj and replace the firewallAddressObject field to get a diff for logging
@@ -1152,7 +1152,7 @@ 
 			$address->firewallAddressObject = $firewallAddressObject;
 
 			# write changelog
-			$this->Log->write_changelog('ip_addr', 'edit', 'success', (array)$address_old,(array)$address);
+			$this->Log->write_changelog ('ip_addr', 'edit', 'success', (array) $address_old, (array) $address);
 
 			return ture;
 		}
@@ -1172,14 +1172,14 @@ 
 		$this->Addresses = new Addresses ($this->Database);
 
 		# fetch the settings
-		$firewallZoneSettings = json_decode($this->settings->firewallZoneSettings,true);
+		$firewallZoneSettings = json_decode ($this->settings->firewallZoneSettings, true);
 
 		# fetch zone informations
-		$zone = $this->get_zone_subnet_info($subnetId);
+		$zone = $this->get_zone_subnet_info ($subnetId);
 
-		try { $ipaddresses = $this->Database->getObjectsQuery('SELECT id, dns_name FROM ipaddresses WHERE subnetId = ? ',$subnetId); }
+		try { $ipaddresses = $this->Database->getObjectsQuery ('SELECT id, dns_name FROM ipaddresses WHERE subnetId = ? ', $subnetId); }
 		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+			$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 			return false;
 		}
 		foreach ($ipaddresses as $ipaddress) {
@@ -1189,22 +1189,22 @@ 
 			foreach ($firewallZoneSettings['pattern'] as $key => $pattern) {
 				switch ($pattern) {
 					case 'patternIndicator':
-						if ($zone->indicator == 0 ) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
-						else 						{ 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
+						if ($zone->indicator == 0) {	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][0]; }
+						else { 	$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['indicator'][1]; }
 						break;
 					case 'patternZoneName':
 						$firewallAddressObject = $firewallAddressObject.$zone->zone;
 						break;
 					case 'patternIPType':
 						# check if the subnet is v4 or v6
-						if (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+						if (filter_var ($this->Subnets->transform_to_dotted ($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 							$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][0];
-						} elseif (filter_var($this->Subnets->transform_to_dotted($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+						} elseif (filter_var ($this->Subnets->transform_to_dotted ($zone->subnet), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
 							$firewallAddressObject = $firewallAddressObject.$firewallZoneSettings['ipType'][1];
 						}
 						break;
 					case 'patternHost':
-							$hostName = explode('.', $ipaddress->dns_name);
+							$hostName = explode ('.', $ipaddress->dns_name);
 							$firewallAddressObject = $firewallAddressObject.$hostName[0];
 						break;
 					case 'patternFQDN':
@@ -1218,10 +1218,10 @@ 
 
 			if ($address_old->firewallAddressObject != $firewallAddressObject) {
 				# update field in database
-				$values = array('id' => $ipaddress->id , 'subnetId' => $subnetId, 'firewallAddressObject' => $firewallAddressObject);
-				try { $this->Database->updateObject("ipaddresses", $values, "id", "subnetId"); }
+				$values = array ('id' => $ipaddress->id, 'subnetId' => $subnetId, 'firewallAddressObject' => $firewallAddressObject);
+				try { $this->Database->updateObject ("ipaddresses", $values, "id", "subnetId"); }
 				catch (Exception $e) {
-					$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+					$this->Result->show ("danger", _ ("Error: ").$e->getMessage (), false);
 					return false;
 				}
 				# clone the address_old obj and replace the firewallAddressObject field to get a diff for logging
@@ -1229,7 +1229,7 @@ 
 				$address->firewallAddressObject = $firewallAddressObject;
 
 				# write changelog
-				$this->Log->write_changelog('ip_addr', 'edit', 'success', (array)$address_old,(array)$address);
+				$this->Log->write_changelog ('ip_addr', 'edit', 'success', (array) $address_old, (array) $address);
 			}
 
 			# unset firewallAddressObject to avoid chaining

functions/classes/class.Mail.php

Indentation +242 added lines, -242 removed lines

@@ -11,248 +11,248 @@
 class phpipam_mail {
 
 
-	/**
-	 * (obj) phpipam settings
-	 *
-	 * (default value: null)
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	private $settings = null;
-
-	/**
-	 * (obj) mail settings
-	 *
-	 * (default value: null)
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	private $mail_settings = null;
-
-	/**
-	 * Php_mailer object
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $Php_mailer;
-
-
-
-
-
-
-	/**
-	 * __construct function.
-	 *
-	 * @access public
-	 * @param mixed $settings
-	 */
-	public function __construct ($settings, $mail_settings) {
-		# set settings and mailsettings
-		$this->settings = $settings;
-		$this->mail_settings = $mail_settings;
-	}
-
-
-
-	/**
-	 * Initializes mailer object.
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function initialize_mailer () {
-		# we need phpmailer
-		require_once( dirname(__FILE__).'/../PHPMailer/PHPMailerAutoload.php');
-
-		# initialize object
-		$this->Php_mailer = new PHPMailer(true);			//localhost by default
-		$this->Php_mailer->CharSet="UTF-8";					//set utf8
-		$this->Php_mailer->SMTPDebug = 0;					//default no debugging
-
-		# localhost or smtp?
-		if ($this->mail_settings->mtype=="smtp")    { $this->set_smtp(); }
-	}
-
-	/**
-	 * Sets SMTP parameters
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function set_smtp() {
-		//set smtp
-		$this->Php_mailer->isSMTP();
-		//tls, ssl?
-		if ($this->mail_settings->msecure != 'none')
-		$this->Php_mailer->SMTPSecure = $this->mail_settings->msecure == 'ssl' ? 'ssl' : 'tls';
-		//server
-		$this->Php_mailer->Host = $this->mail_settings->mserver;
-		$this->Php_mailer->Port = $this->mail_settings->mport;
-		//permit self-signed certs and dont verify certs
-		$this->Php_mailer->SMTPOptions = array("ssl"=>array("verify_peer"=>false, "verify_peer_name"=>false, "allow_self_signed"=>true));
-		//set smtp auth
-		$this->set_smtp_auth();
-	}
-
-	/**
-	 * Set SMTP login parameters
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function set_smtp_auth() {
-		if ($this->mail_settings->mauth == "yes") {
-			$this->Php_mailer->SMTPAuth = true;
-			$this->Php_mailer->Username = $this->mail_settings->muser;
-			$this->Php_mailer->Password = $this->mail_settings->mpass;
-		} else {
-			$this->Php_mailer->SMTPAuth = false;
-		}
-	}
-
-	/**
-	 * Overrides mail settings in database. For sending test emails.
-	 *
-	 * @access public
-	 * @param mixed $override_settings
-	 * @return void
-	 */
-	public function override_settings($override_settings) {
-		foreach ($override_settings as $k=>$s) {
-			$this->mail_settings->$k = $s;
-		}
-	}
-
-	/**
-	 * Resets SMTP debugging
-	 *
-	 * @access public
-	 * @param int $level (default: 2)
-	 * @return void
-	 */
-	public function set_debugging ($level = 2) {
-		$this->Php_mailer->SMTPDebug = $level == 1 ? 1 : 2;
-		// output
-		$this->Php_mailer->Debugoutput = 'html';
-	}
-
-
-
-
-
-
-
-
-	/**
-	 * Generates mail message
-	 *
-	 * @access public
-	 * @param string $body
-	 * @return string
-	 */
-	public function generate_message ($body) {
-		$html[] = $this->set_header ();			//set header
-		$html[] = $this->set_body_start ();		//start body
-		$html[] = $body;						//set body
-		$html[] = $this->set_footer ();			//set footer
-		$html[] = $this->set_body_end ();		//end
-		# return
-		return implode("\n", $html);
-	}
-
-	/**
-	 * Generates plain text mail
-	 *
-	 * @access public
-	 * @param mixed $body
-	 * @return void
-	 */
-	public function generate_message_plain ($body) {
-		$html[] = $body;						//set body
-		$html[] = $this->set_footer_plain ();	//set footer
-	}
-
-	/**
-	 * set_header function.
-	 *
-	 * @access private
-	 * @return string
-	 */
-	private function set_header () {
-		$html[] = "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>";
-		$html[] = "<html><head>";
-		$html[] = "<meta http-equiv='Content-Type' content='text/html; charset=utf-8'>";
-		$html[] = "<meta name='viewport' content='width=device-width, initial-scale=0.7, maximum-scale=1, user-scalable=no'>";
-		$html[] = "</head>";
-		# return
-		return implode("\n", $html);
-	}
-
-	/**
-	 * Begins message body
-	 *
-	 * @access private
-	 * @return string
-	 */
-	private function set_body_start () {
-		return "<body style='margin:0px;padding:0px;background:#f9f9f9;border-collapse:collapse;'>";
-	}
-
-	/**
-	 * Sets message body
-	 *
-	 * @access public
-	 * @param mixed $body
-	 * @return void
-	 */
-	public function set_body ($body) {
-		return is_array($body) ? implode("\n", $body) : $body;
-	}
-
-	/**
-	 * ends message body and html
-	 *
-	 * @access private
-	 * @return string
-	 */
-	private function set_body_end () {
-		return "</body></html>";
-	}
-
-	/**
-	 * Sets footer
-	 *
-	 * @access public
-	 * @return string
-	 */
-	public function set_footer () {
-		$html[] = "<table style='margin-left:10px;margin-top:25px;width:auto;padding:0px;border-collapse:collapse;'>";
-		$html[] = "<tr>";
-		$html[] = "	<td><font face='Helvetica, Verdana, Arial, sans-serif' style='font-size:13px;'>E-mail</font></td>";
-		$html[] = "	<td><font face='Helvetica, Verdana, Arial, sans-serif' style='font-size:13px;'><a href='mailto:".$this->settings->siteAdminMail."' style='color:#08c;'>".$this->settings->siteAdminName."</a></font></td>";
-		$html[] = "</tr>";
-		$html[] = "<tr>";
-		$html[] = "	<td><font face='Helvetica, Verdana, Arial, sans-serif' style='font-size:13px;'>www</font></td>";
-		$html[] = "	<td><font face='Helvetica, Verdana, Arial, sans-serif' style='font-size:13px;'><a href='".$this->settings->siteURL."' style='color:#08c;'>".$this->settings->siteURL."</a></font></td>";
-		$html[] = "</tr>";
-		$html[] = "</table>";
-		# return
-		return implode("\n", $html);
-	}
-
-	/**
-	 * Sets plain footer
-	 *
-	 * @access public
-	 * @return string
-	 */
-	public function set_footer_plain () {
-		return "\r\n------------------------------\r\n".$this->settings->siteAdminName." (".$this->settings->siteAdminMail.") :: ".$this->settings->siteURL;
-	}
+    /**
+     * (obj) phpipam settings
+     *
+     * (default value: null)
+     *
+     * @var mixed
+     * @access private
+     */
+    private $settings = null;
+
+    /**
+     * (obj) mail settings
+     *
+     * (default value: null)
+     *
+     * @var mixed
+     * @access private
+     */
+    private $mail_settings = null;
+
+    /**
+     * Php_mailer object
+     *
+     * @var mixed
+     * @access public
+     */
+    public $Php_mailer;
+
+
+
+
+
+
+    /**
+     * __construct function.
+     *
+     * @access public
+     * @param mixed $settings
+     */
+    public function __construct ($settings, $mail_settings) {
+        # set settings and mailsettings
+        $this->settings = $settings;
+        $this->mail_settings = $mail_settings;
+    }
+
+
+
+    /**
+     * Initializes mailer object.
+     *
+     * @access public
+     * @return void
+     */
+    public function initialize_mailer () {
+        # we need phpmailer
+        require_once( dirname(__FILE__).'/../PHPMailer/PHPMailerAutoload.php');
+
+        # initialize object
+        $this->Php_mailer = new PHPMailer(true);			//localhost by default
+        $this->Php_mailer->CharSet="UTF-8";					//set utf8
+        $this->Php_mailer->SMTPDebug = 0;					//default no debugging
+
+        # localhost or smtp?
+        if ($this->mail_settings->mtype=="smtp")    { $this->set_smtp(); }
+    }
+
+    /**
+     * Sets SMTP parameters
+     *
+     * @access private
+     * @return void
+     */
+    private function set_smtp() {
+        //set smtp
+        $this->Php_mailer->isSMTP();
+        //tls, ssl?
+        if ($this->mail_settings->msecure != 'none')
+        $this->Php_mailer->SMTPSecure = $this->mail_settings->msecure == 'ssl' ? 'ssl' : 'tls';
+        //server
+        $this->Php_mailer->Host = $this->mail_settings->mserver;
+        $this->Php_mailer->Port = $this->mail_settings->mport;
+        //permit self-signed certs and dont verify certs
+        $this->Php_mailer->SMTPOptions = array("ssl"=>array("verify_peer"=>false, "verify_peer_name"=>false, "allow_self_signed"=>true));
+        //set smtp auth
+        $this->set_smtp_auth();
+    }
+
+    /**
+     * Set SMTP login parameters
+     *
+     * @access private
+     * @return void
+     */
+    private function set_smtp_auth() {
+        if ($this->mail_settings->mauth == "yes") {
+            $this->Php_mailer->SMTPAuth = true;
+            $this->Php_mailer->Username = $this->mail_settings->muser;
+            $this->Php_mailer->Password = $this->mail_settings->mpass;
+        } else {
+            $this->Php_mailer->SMTPAuth = false;
+        }
+    }
+
+    /**
+     * Overrides mail settings in database. For sending test emails.
+     *
+     * @access public
+     * @param mixed $override_settings
+     * @return void
+     */
+    public function override_settings($override_settings) {
+        foreach ($override_settings as $k=>$s) {
+            $this->mail_settings->$k = $s;
+        }
+    }
+
+    /**
+     * Resets SMTP debugging
+     *
+     * @access public
+     * @param int $level (default: 2)
+     * @return void
+     */
+    public function set_debugging ($level = 2) {
+        $this->Php_mailer->SMTPDebug = $level == 1 ? 1 : 2;
+        // output
+        $this->Php_mailer->Debugoutput = 'html';
+    }
+
+
+
+
+
+
+
+
+    /**
+     * Generates mail message
+     *
+     * @access public
+     * @param string $body
+     * @return string
+     */
+    public function generate_message ($body) {
+        $html[] = $this->set_header ();			//set header
+        $html[] = $this->set_body_start ();		//start body
+        $html[] = $body;						//set body
+        $html[] = $this->set_footer ();			//set footer
+        $html[] = $this->set_body_end ();		//end
+        # return
+        return implode("\n", $html);
+    }
+
+    /**
+     * Generates plain text mail
+     *
+     * @access public
+     * @param mixed $body
+     * @return void
+     */
+    public function generate_message_plain ($body) {
+        $html[] = $body;						//set body
+        $html[] = $this->set_footer_plain ();	//set footer
+    }
+
+    /**
+     * set_header function.
+     *
+     * @access private
+     * @return string
+     */
+    private function set_header () {
+        $html[] = "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>";
+        $html[] = "<html><head>";
+        $html[] = "<meta http-equiv='Content-Type' content='text/html; charset=utf-8'>";
+        $html[] = "<meta name='viewport' content='width=device-width, initial-scale=0.7, maximum-scale=1, user-scalable=no'>";
+        $html[] = "</head>";
+        # return
+        return implode("\n", $html);
+    }
+
+    /**
+     * Begins message body
+     *
+     * @access private
+     * @return string
+     */
+    private function set_body_start () {
+        return "<body style='margin:0px;padding:0px;background:#f9f9f9;border-collapse:collapse;'>";
+    }
+
+    /**
+     * Sets message body
+     *
+     * @access public
+     * @param mixed $body
+     * @return void
+     */
+    public function set_body ($body) {
+        return is_array($body) ? implode("\n", $body) : $body;
+    }
+
+    /**
+     * ends message body and html
+     *
+     * @access private
+     * @return string
+     */
+    private function set_body_end () {
+        return "</body></html>";
+    }
+
+    /**
+     * Sets footer
+     *
+     * @access public
+     * @return string
+     */
+    public function set_footer () {
+        $html[] = "<table style='margin-left:10px;margin-top:25px;width:auto;padding:0px;border-collapse:collapse;'>";
+        $html[] = "<tr>";
+        $html[] = "	<td><font face='Helvetica, Verdana, Arial, sans-serif' style='font-size:13px;'>E-mail</font></td>";
+        $html[] = "	<td><font face='Helvetica, Verdana, Arial, sans-serif' style='font-size:13px;'><a href='mailto:".$this->settings->siteAdminMail."' style='color:#08c;'>".$this->settings->siteAdminName."</a></font></td>";
+        $html[] = "</tr>";
+        $html[] = "<tr>";
+        $html[] = "	<td><font face='Helvetica, Verdana, Arial, sans-serif' style='font-size:13px;'>www</font></td>";
+        $html[] = "	<td><font face='Helvetica, Verdana, Arial, sans-serif' style='font-size:13px;'><a href='".$this->settings->siteURL."' style='color:#08c;'>".$this->settings->siteURL."</a></font></td>";
+        $html[] = "</tr>";
+        $html[] = "</table>";
+        # return
+        return implode("\n", $html);
+    }
+
+    /**
+     * Sets plain footer
+     *
+     * @access public
+     * @return string
+     */
+    public function set_footer_plain () {
+        return "\r\n------------------------------\r\n".$this->settings->siteAdminName." (".$this->settings->siteAdminMail.") :: ".$this->settings->siteURL;
+    }
 
 }
 

Braces +5 added lines, -3 removed lines

@@ -87,8 +87,9 @@ 
 		//set smtp
 		$this->Php_mailer->isSMTP();
 		//tls, ssl?
-		if ($this->mail_settings->msecure != 'none')
-		$this->Php_mailer->SMTPSecure = $this->mail_settings->msecure == 'ssl' ? 'ssl' : 'tls';
+		if ($this->mail_settings->msecure != 'none') {
+				$this->Php_mailer->SMTPSecure = $this->mail_settings->msecure == 'ssl' ? 'ssl' : 'tls';
+		}
 		//server
 		$this->Php_mailer->Host = $this->mail_settings->mserver;
 		$this->Php_mailer->Port = $this->mail_settings->mport;
@@ -109,7 +110,8 @@ 
 			$this->Php_mailer->SMTPAuth = true;
 			$this->Php_mailer->Username = $this->mail_settings->muser;
 			$this->Php_mailer->Password = $this->mail_settings->mpass;
-		} else {
+		}
+		else {
 			$this->Php_mailer->SMTPAuth = false;
 		}
 	}

Spacing +22 added lines, -22 removed lines

@@ -66,15 +66,15 @@ 
 	 */
 	public function initialize_mailer () {
 		# we need phpmailer
-		require_once( dirname(__FILE__).'/../PHPMailer/PHPMailerAutoload.php');
+		require_once(dirname (__FILE__).'/../PHPMailer/PHPMailerAutoload.php');
 
 		# initialize object
-		$this->Php_mailer = new PHPMailer(true);			//localhost by default
-		$this->Php_mailer->CharSet="UTF-8";					//set utf8
-		$this->Php_mailer->SMTPDebug = 0;					//default no debugging
+		$this->Php_mailer = new PHPMailer (true); //localhost by default
+		$this->Php_mailer->CharSet = "UTF-8"; //set utf8
+		$this->Php_mailer->SMTPDebug = 0; //default no debugging
 
 		# localhost or smtp?
-		if ($this->mail_settings->mtype=="smtp")    { $this->set_smtp(); }
+		if ($this->mail_settings->mtype == "smtp") { $this->set_smtp (); }
 	}
 
 	/**
@@ -83,9 +83,9 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function set_smtp() {
+	private function set_smtp () {
 		//set smtp
-		$this->Php_mailer->isSMTP();
+		$this->Php_mailer->isSMTP ();
 		//tls, ssl?
 		if ($this->mail_settings->msecure != 'none')
 		$this->Php_mailer->SMTPSecure = $this->mail_settings->msecure == 'ssl' ? 'ssl' : 'tls';
@@ -93,9 +93,9 @@ 
 		$this->Php_mailer->Host = $this->mail_settings->mserver;
 		$this->Php_mailer->Port = $this->mail_settings->mport;
 		//permit self-signed certs and dont verify certs
-		$this->Php_mailer->SMTPOptions = array("ssl"=>array("verify_peer"=>false, "verify_peer_name"=>false, "allow_self_signed"=>true));
+		$this->Php_mailer->SMTPOptions = array ("ssl"=>array ("verify_peer"=>false, "verify_peer_name"=>false, "allow_self_signed"=>true));
 		//set smtp auth
-		$this->set_smtp_auth();
+		$this->set_smtp_auth ();
 	}
 
 	/**
@@ -104,7 +104,7 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function set_smtp_auth() {
+	private function set_smtp_auth () {
 		if ($this->mail_settings->mauth == "yes") {
 			$this->Php_mailer->SMTPAuth = true;
 			$this->Php_mailer->Username = $this->mail_settings->muser;
@@ -121,7 +121,7 @@ 
 	 * @param mixed $override_settings
 	 * @return void
 	 */
-	public function override_settings($override_settings) {
+	public function override_settings ($override_settings) {
 		foreach ($override_settings as $k=>$s) {
 			$this->mail_settings->$k = $s;
 		}
@@ -155,13 +155,13 @@ 
 	 * @return string
 	 */
 	public function generate_message ($body) {
-		$html[] = $this->set_header ();			//set header
-		$html[] = $this->set_body_start ();		//start body
-		$html[] = $body;						//set body
-		$html[] = $this->set_footer ();			//set footer
-		$html[] = $this->set_body_end ();		//end
+		$html[] = $this->set_header (); //set header
+		$html[] = $this->set_body_start (); //start body
+		$html[] = $body; //set body
+		$html[] = $this->set_footer (); //set footer
+		$html[] = $this->set_body_end (); //end
 		# return
-		return implode("\n", $html);
+		return implode ("\n", $html);
 	}
 
 	/**
@@ -172,8 +172,8 @@ 
 	 * @return void
 	 */
 	public function generate_message_plain ($body) {
-		$html[] = $body;						//set body
-		$html[] = $this->set_footer_plain ();	//set footer
+		$html[] = $body; //set body
+		$html[] = $this->set_footer_plain (); //set footer
 	}
 
 	/**
@@ -189,7 +189,7 @@ 
 		$html[] = "<meta name='viewport' content='width=device-width, initial-scale=0.7, maximum-scale=1, user-scalable=no'>";
 		$html[] = "</head>";
 		# return
-		return implode("\n", $html);
+		return implode ("\n", $html);
 	}
 
 	/**
@@ -210,7 +210,7 @@ 
 	 * @return void
 	 */
 	public function set_body ($body) {
-		return is_array($body) ? implode("\n", $body) : $body;
+		return is_array ($body) ? implode ("\n", $body) : $body;
 	}
 
 	/**
@@ -241,7 +241,7 @@ 
 		$html[] = "</tr>";
 		$html[] = "</table>";
 		# return
-		return implode("\n", $html);
+		return implode ("\n", $html);
 	}
 
 	/**

upgrade/index.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 		Make sure BASE directive is set for your installation. This is used to properly detect phpIPAM directory. It must be set in config.php and in .htaccess
 
 		<div class="well" style="padding:5px;margin-top:5px;">
-		Detected BASE: <?php print str_replace("upgrade/", "", $_SERVER['REQUEST_URI']);  ?>
+		Detected BASE: <?php print str_replace ("upgrade/", "", $_SERVER['REQUEST_URI']); ?>
 		</div>
 
 		<h4>2.) Enable mod_rewrite</h4>

api/controllers/Addresses.php

Braces +4 added lines, -4 removed lines

@@ -216,11 +216,11 @@ 
 		$this->remap_keys ();
 
 		// first free
-		if($this->_params->id=="first_free")   {
+		if($this->_params->id=="first_free") {
     		$this->_params->ip_addr = $this->Addresses->get_first_available_address ($this->_params->subnetId, $this->Subnets);
     		// null
     		if ($this->_params->ip_addr==false)          { $this->Response->throw_exception(404, 'No free addresses found'); }
-            else                                         { $this->_params->ip_addr = $this->Addresses->transform_address ($this->_params->ip_addr, "dotted"); }
+    		else                                         { $this->_params->ip_addr = $this->Addresses->transform_address ($this->_params->ip_addr, "dotted"); }
 		}
 
 		// validate ip address - format, proper subnet, subnet/broadcast check
@@ -240,7 +240,7 @@ 
 		}
 		else {
     		//set result
-    		if($this->_params->id=="first_free")   {
+    		if($this->_params->id=="first_free") {
         	    return array("code"=>201, "data"=>"Address created", "location"=>"/api/".$this->_params->app_id."/addresses/".$this->Addresses->lastId."/", "ip"=>$this->Addresses->transform_address ($this->_params->ip_addr, "dotted"));
     		}
     		else {
@@ -315,7 +315,7 @@ 
 		# execute update
 		if(!$this->Addresses->modify_address ($values))
 													{ $this->Response->throw_exception(500, "Failed to delete address"); }
-		else {
+													else {
 			//set result
 			return array("code"=>200, "data"=>"Address deleted");
 		}

Indentation +478 added lines, -478 removed lines

@@ -8,497 +8,497 @@
 class Addresses_controller extends Common_api_functions  {
 
 
-	/**
-	 * Input parameters
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $_params;
-
-	/**
-	 * Custom address fields
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $custom_fields;
-
-	/**
-	 * Database object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Database;
-
-	/**
-	 * Sections object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Sections;
-
-	/**
-	 * Response handler
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Response;
-
-	/**
-	 * Tools object from master Tools class
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Tools;
-
-	/**
-	 * Subnets object from master Subnets class
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	public $Subnets;
-
-	/**
-	 * Addresses object from master Addresses class
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $Addresses;
-
-	/**
-	 * Admin class form master Admin class
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $Admin;
-
-	/**
-	 * Saves details of currnt subnet
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	private $subnet_details;
-
-	/**
-	 * Old address values
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	private $old_address;
-
-
-	/**
-	 * __construct function
-	 *
-	 * @access public
-	 * @param class $Database
-	 * @param class $Tools
-	 * @param mixed $params		// post/get values
-	 */
-	public function __construct($Database, $Tools, $params, $Response) {
-		$this->Database = $Database;
-		$this->Tools 	= $Tools;
-		$this->_params 	= $params;
-		$this->Response = $Response;
-		// init required objects
-		$this->init_object ("Subnets", $Database);
-		$this->init_object ("Addresses", $Database);
-		// set valid keys
-		$this->set_valid_keys ("ipaddresses");
-	}
-
-
-
-
-
-	/**
-	 * Returns json encoded options
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function OPTIONS () {
-		// validate
-		$this->validate_options_request ();
-
-		// methods
-		$result = array();
-		$result['methods'] = array(
-								array("href"=>"/api/".$this->_params->app_id."/addresses/", 	"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
-								array("href"=>"/api/".$this->_params->app_id."/addresses/{id}/","methods"=>array(array("rel"=>"read", 	"method"=>"GET"),
-																												 array("rel"=>"create", "method"=>"POST"),
-																												 array("rel"=>"update", "method"=>"PATCH"),
-																												 array("rel"=>"delete", "method"=>"DELETE"))),
-							);
-		# result
-		return array("code"=>200, "data"=>$result);
-	}
-
-
-
-
-
-	/**
-	 * Read address functions
-	 *
-	 *	identifiers can be:
-	 *		- {id}
-	 *		- {id}/ping/					// pings address
-	 *		- /search/{ip_address}/			// searches for addresses in database, returns multiple if found
-	 *		- custom_fields
-	 *		- tags							// all tags
-	 *		- tags/{id}/					// specific tag
-	 *		- tags/{id}/addresses			// returns all addresses that are tagged with this tag ***if subnetId is provided it will be filtered to specific subnet
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function GET () {
-		// subnet Id > read all addresses in subnet
-		if($this->_params->id=="custom_fields") {
-			// check result
-			if(sizeof($this->custom_fields)==0)			{ $this->Response->throw_exception(404, 'No custom fields defined'); }
-			else										{ return array("code"=>200, "data"=>$this->custom_fields); }
-		}
-		// tags
-		elseif($this->_params->id=="tags") {
-			// validate
-			$this->validate_tag ();
-			// all addresses with tag
-			if (@$this->_params->id3=="addresses") {
-				// fetch
-				$result = $this->Tools->fetch_multiple_objects ("ipaddresses", "state", $this->_params->id2);
-
-				// filter by subnetId
-				if ($result!==false) {
-					if(isset($this->_params->subnetId)) {
-						if (is_numeric($this->_params->subnetId)) {
-							// filter
-							foreach ($result as $k=>$v) {
-								if ($v->subnetId != $this->_params->subnetId) {
-									unset($result[$k]);
-								}
-							}
-							// any left
-							if (sizeof($result)==0) {
-								$result = false;
-							}
-						}
-					}
-				}
-
-				// result
-				if($result===false)						{ $this->Response->throw_exception(404, 'No addresses found'); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, "addresses", true, false)); }
-			}
-			// tags
-			else {
-				// fetch all by tag
-				if(isset($this->_params->id2)) {
-					// numeric
-					if(is_numeric($this->_params->id2)) { $result = $this->Tools->fetch_object ("ipTags", "id", $this->_params->id2); }
-					// type
-					else 								{ $result = $this->Tools->fetch_multiple_objects ("ipTags", "type", $this->_params->id2); }
-				}
-				// all tags
-				else 									{ $result = $this->Tools->fetch_all_objects ("ipTags"); }
-
-				// result
-				if($result===false)						{ $this->Response->throw_exception(404, 'Tag not found'); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, "addresses/tags", true, false)); }
-			}
-		}
-		// id not set
-		elseif (!isset($this->_params->id)) {
-														{ $this->Response->throw_exception(400, 'Address ID is required'); }
-		}
-		// id
-		elseif (is_numeric($this->_params->id)) {
-			// ping
-			if(@$this->_params->id2=="ping") {
-				# scan class
-				$Scan = new Scan ($this->Database);
-				$Scan->ping_set_exit (false);
-				// check address
-				$this->validate_address_id ();
-
-				// set result
-				$result = array();
-				$result['scan_type'] = $Scan->icmp_type;
-				$result['exit_code'] = $Scan->ping_address ($this->old_address->ip_addr);
-
-				// success
-				if($result['exit_code']==0) 			{ $Scan->ping_update_lastseen ($this->_params->id); return array("code"=>200, "data"=>$result); }
-				else									{ $this->Response->throw_exception(404, "Address offline. Exit code: ".$result['exit_code']."( ".$Scan->ping_exit_explain ($result['exit_code'])." )"); }
-			}
-			else {
-				// fetch
-				$result = $this->Addresses->fetch_address ("id", $this->_params->id);
-				// check result
-				if($result==false)						{ $this->Response->throw_exception(404, "Invalid Id"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, $this->_params->controller, true, true)); }
-			}
-		}
-		// ip address ?
-		elseif (@$this->_params->id=="search") {
-			// validate
-			if(!$this->Addresses->validate_address ($this->_params->id2))
-														{ $this->Response->throw_exception(404, 'Invalid address'); }
-			// search
-			$result = $this->Tools->fetch_multiple_objects ("ipaddresses", "ip_addr", $this->Subnets->transform_address ($this->_params->id2, "decimal"));
-			// check result
-			if($result===false)							{ $this->Response->throw_exception(404, 'Address not found'); }
-			else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, $this->_params->controller, true, true)); }
-		}
-		// false
-		else											{  $this->Response->throw_exception(400, "Invalid Id"); }
-	}
-
-
-
-
-
-	/**
-	 * HEAD, no response
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function HEAD () {
-		return $this->GET ();
-	}
-
-
-
-
-
-	/**
-	 * Creates new address
-	 *
-	 *	required parameters: ip, subnetId
-	 *
-	 *   {subnetId}/first_free/     will search for first free address in subnet, creating ip_addr
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function POST () {
-		// remap keys
-		$this->remap_keys ();
-
-		// first free
-		if($this->_params->id=="first_free")   {
-    		$this->_params->ip_addr = $this->Addresses->get_first_available_address ($this->_params->subnetId, $this->Subnets);
-    		// null
-    		if ($this->_params->ip_addr==false)          { $this->Response->throw_exception(404, 'No free addresses found'); }
+    /**
+     * Input parameters
+     *
+     * @var mixed
+     * @access public
+     */
+    public $_params;
+
+    /**
+     * Custom address fields
+     *
+     * @var mixed
+     * @access public
+     */
+    public $custom_fields;
+
+    /**
+     * Database object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Database;
+
+    /**
+     * Sections object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Sections;
+
+    /**
+     * Response handler
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Response;
+
+    /**
+     * Tools object from master Tools class
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Tools;
+
+    /**
+     * Subnets object from master Subnets class
+     *
+     * @var mixed
+     * @access protected
+     */
+    public $Subnets;
+
+    /**
+     * Addresses object from master Addresses class
+     *
+     * @var mixed
+     * @access public
+     */
+    public $Addresses;
+
+    /**
+     * Admin class form master Admin class
+     *
+     * @var mixed
+     * @access public
+     */
+    public $Admin;
+
+    /**
+     * Saves details of currnt subnet
+     *
+     * @var mixed
+     * @access private
+     */
+    private $subnet_details;
+
+    /**
+     * Old address values
+     *
+     * @var mixed
+     * @access private
+     */
+    private $old_address;
+
+
+    /**
+     * __construct function
+     *
+     * @access public
+     * @param class $Database
+     * @param class $Tools
+     * @param mixed $params		// post/get values
+     */
+    public function __construct($Database, $Tools, $params, $Response) {
+        $this->Database = $Database;
+        $this->Tools 	= $Tools;
+        $this->_params 	= $params;
+        $this->Response = $Response;
+        // init required objects
+        $this->init_object ("Subnets", $Database);
+        $this->init_object ("Addresses", $Database);
+        // set valid keys
+        $this->set_valid_keys ("ipaddresses");
+    }
+
+
+
+
+
+    /**
+     * Returns json encoded options
+     *
+     * @access public
+     * @return void
+     */
+    public function OPTIONS () {
+        // validate
+        $this->validate_options_request ();
+
+        // methods
+        $result = array();
+        $result['methods'] = array(
+                                array("href"=>"/api/".$this->_params->app_id."/addresses/", 	"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
+                                array("href"=>"/api/".$this->_params->app_id."/addresses/{id}/","methods"=>array(array("rel"=>"read", 	"method"=>"GET"),
+                                                                                                                    array("rel"=>"create", "method"=>"POST"),
+                                                                                                                    array("rel"=>"update", "method"=>"PATCH"),
+                                                                                                                    array("rel"=>"delete", "method"=>"DELETE"))),
+                            );
+        # result
+        return array("code"=>200, "data"=>$result);
+    }
+
+
+
+
+
+    /**
+     * Read address functions
+     *
+     *	identifiers can be:
+     *		- {id}
+     *		- {id}/ping/					// pings address
+     *		- /search/{ip_address}/			// searches for addresses in database, returns multiple if found
+     *		- custom_fields
+     *		- tags							// all tags
+     *		- tags/{id}/					// specific tag
+     *		- tags/{id}/addresses			// returns all addresses that are tagged with this tag ***if subnetId is provided it will be filtered to specific subnet
+     *
+     * @access public
+     * @return void
+     */
+    public function GET () {
+        // subnet Id > read all addresses in subnet
+        if($this->_params->id=="custom_fields") {
+            // check result
+            if(sizeof($this->custom_fields)==0)			{ $this->Response->throw_exception(404, 'No custom fields defined'); }
+            else										{ return array("code"=>200, "data"=>$this->custom_fields); }
+        }
+        // tags
+        elseif($this->_params->id=="tags") {
+            // validate
+            $this->validate_tag ();
+            // all addresses with tag
+            if (@$this->_params->id3=="addresses") {
+                // fetch
+                $result = $this->Tools->fetch_multiple_objects ("ipaddresses", "state", $this->_params->id2);
+
+                // filter by subnetId
+                if ($result!==false) {
+                    if(isset($this->_params->subnetId)) {
+                        if (is_numeric($this->_params->subnetId)) {
+                            // filter
+                            foreach ($result as $k=>$v) {
+                                if ($v->subnetId != $this->_params->subnetId) {
+                                    unset($result[$k]);
+                                }
+                            }
+                            // any left
+                            if (sizeof($result)==0) {
+                                $result = false;
+                            }
+                        }
+                    }
+                }
+
+                // result
+                if($result===false)						{ $this->Response->throw_exception(404, 'No addresses found'); }
+                else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, "addresses", true, false)); }
+            }
+            // tags
+            else {
+                // fetch all by tag
+                if(isset($this->_params->id2)) {
+                    // numeric
+                    if(is_numeric($this->_params->id2)) { $result = $this->Tools->fetch_object ("ipTags", "id", $this->_params->id2); }
+                    // type
+                    else 								{ $result = $this->Tools->fetch_multiple_objects ("ipTags", "type", $this->_params->id2); }
+                }
+                // all tags
+                else 									{ $result = $this->Tools->fetch_all_objects ("ipTags"); }
+
+                // result
+                if($result===false)						{ $this->Response->throw_exception(404, 'Tag not found'); }
+                else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, "addresses/tags", true, false)); }
+            }
+        }
+        // id not set
+        elseif (!isset($this->_params->id)) {
+                                                        { $this->Response->throw_exception(400, 'Address ID is required'); }
+        }
+        // id
+        elseif (is_numeric($this->_params->id)) {
+            // ping
+            if(@$this->_params->id2=="ping") {
+                # scan class
+                $Scan = new Scan ($this->Database);
+                $Scan->ping_set_exit (false);
+                // check address
+                $this->validate_address_id ();
+
+                // set result
+                $result = array();
+                $result['scan_type'] = $Scan->icmp_type;
+                $result['exit_code'] = $Scan->ping_address ($this->old_address->ip_addr);
+
+                // success
+                if($result['exit_code']==0) 			{ $Scan->ping_update_lastseen ($this->_params->id); return array("code"=>200, "data"=>$result); }
+                else									{ $this->Response->throw_exception(404, "Address offline. Exit code: ".$result['exit_code']."( ".$Scan->ping_exit_explain ($result['exit_code'])." )"); }
+            }
+            else {
+                // fetch
+                $result = $this->Addresses->fetch_address ("id", $this->_params->id);
+                // check result
+                if($result==false)						{ $this->Response->throw_exception(404, "Invalid Id"); }
+                else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, $this->_params->controller, true, true)); }
+            }
+        }
+        // ip address ?
+        elseif (@$this->_params->id=="search") {
+            // validate
+            if(!$this->Addresses->validate_address ($this->_params->id2))
+                                                        { $this->Response->throw_exception(404, 'Invalid address'); }
+            // search
+            $result = $this->Tools->fetch_multiple_objects ("ipaddresses", "ip_addr", $this->Subnets->transform_address ($this->_params->id2, "decimal"));
+            // check result
+            if($result===false)							{ $this->Response->throw_exception(404, 'Address not found'); }
+            else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, $this->_params->controller, true, true)); }
+        }
+        // false
+        else											{  $this->Response->throw_exception(400, "Invalid Id"); }
+    }
+
+
+
+
+
+    /**
+     * HEAD, no response
+     *
+     * @access public
+     * @return void
+     */
+    public function HEAD () {
+        return $this->GET ();
+    }
+
+
+
+
+
+    /**
+     * Creates new address
+     *
+     *	required parameters: ip, subnetId
+     *
+     *   {subnetId}/first_free/     will search for first free address in subnet, creating ip_addr
+     *
+     * @access public
+     * @return void
+     */
+    public function POST () {
+        // remap keys
+        $this->remap_keys ();
+
+        // first free
+        if($this->_params->id=="first_free")   {
+            $this->_params->ip_addr = $this->Addresses->get_first_available_address ($this->_params->subnetId, $this->Subnets);
+            // null
+            if ($this->_params->ip_addr==false)          { $this->Response->throw_exception(404, 'No free addresses found'); }
             else                                         { $this->_params->ip_addr = $this->Addresses->transform_address ($this->_params->ip_addr, "dotted"); }
-		}
+        }
 
-		// validate ip address - format, proper subnet, subnet/broadcast check
-		$this->validate_create_parameters ();
+        // validate ip address - format, proper subnet, subnet/broadcast check
+        $this->validate_create_parameters ();
 
-		// check for valid keys
-		$values = $this->validate_keys ();
+        // check for valid keys
+        $values = $this->validate_keys ();
 
-		// transform address to decimal format
-		$values['ip_addr'] = $this->Addresses->transform_address($values['ip_addr'] ,"decimal");
-		// set action
-		$values['action'] = "add";
+        // transform address to decimal format
+        $values['ip_addr'] = $this->Addresses->transform_address($values['ip_addr'] ,"decimal");
+        // set action
+        $values['action'] = "add";
 
-		# execute
-		if(!$this->Addresses->modify_address ($values)) {
-			$this->Response->throw_exception(500, "Failed to create address");
-		}
-		else {
-    		//set result
-    		if($this->_params->id=="first_free")   {
-        	    return array("code"=>201, "data"=>"Address created", "location"=>"/api/".$this->_params->app_id."/addresses/".$this->Addresses->lastId."/", "ip"=>$this->Addresses->transform_address ($this->_params->ip_addr, "dotted"));
-    		}
-    		else {
-        	    return array("code"=>201, "data"=>"Address created", "location"=>"/api/".$this->_params->app_id."/addresses/".$this->Addresses->lastId."/");
-    		}
-		}
-	}
+        # execute
+        if(!$this->Addresses->modify_address ($values)) {
+            $this->Response->throw_exception(500, "Failed to create address");
+        }
+        else {
+            //set result
+            if($this->_params->id=="first_free")   {
+                return array("code"=>201, "data"=>"Address created", "location"=>"/api/".$this->_params->app_id."/addresses/".$this->Addresses->lastId."/", "ip"=>$this->Addresses->transform_address ($this->_params->ip_addr, "dotted"));
+            }
+            else {
+                return array("code"=>201, "data"=>"Address created", "location"=>"/api/".$this->_params->app_id."/addresses/".$this->Addresses->lastId."/");
+            }
+        }
+    }
 
 
 
 
 
 
-	/**
-	 * Updates existing address
-	 *
-	 *	forbidden parameters: ip, subnetId
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function PATCH () {
-		// remap keys
-		$this->remap_keys ();
+    /**
+     * Updates existing address
+     *
+     *	forbidden parameters: ip, subnetId
+     *
+     * @access public
+     * @return void
+     */
+    public function PATCH () {
+        // remap keys
+        $this->remap_keys ();
 
-		// we dont allow address or subnet change
-		if(isset($this->_params->ip_addr))			{ $this->Response->throw_exception(400, "IP address cannot be changed"); }
-		if(isset($this->_params->subnetId))			{ $this->Response->throw_exception(400, "Subnet cannot be changed"); }
+        // we dont allow address or subnet change
+        if(isset($this->_params->ip_addr))			{ $this->Response->throw_exception(400, "IP address cannot be changed"); }
+        if(isset($this->_params->subnetId))			{ $this->Response->throw_exception(400, "Subnet cannot be changed"); }
 
-		// validations
-		$this->validate_update_parameters ();
-
-		# check for valid keys
-		$values = $this->validate_keys ();
-		// add action and id
-		$values["id"] = $this->_params->id;
-
-		# we need admin object
-		$this->init_object ("Admin", $this->Database);
-
-		# execute
-		if(!$this->Admin->object_modify ("ipaddresses", "edit", "id", $values)) {
-			$this->Response->throw_exception(500, "Failed to update address");
-		}
-		else {
-			//set result
-			return array("code"=>200, "data"=>"Address updated");
-		}
-
-	}
-
-
-
-
-
-	/**
-	 * Deletes existing address
-	 *
-	 *	required parameters: id
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function DELETE () {
-		// Check for id
-		$this->validate_address_id ();
-
-		// set variables for delete
-		$values = array();
-		$values["id"] 	  = $this->_params->id;
-		$values["action"] = "delete";
-
-		# execute update
-		if(!$this->Addresses->modify_address ($values))
-													{ $this->Response->throw_exception(500, "Failed to delete address"); }
-		else {
-			//set result
-			return array("code"=>200, "data"=>"Address deleted");
-		}
-
-	}
-
-
-
-
-
-
-
-
-
-	/* @validations ---------- */
-
-	/**
-	 * Make sure the address exists in database.
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_address_id () {
-		if(!$this->old_address = $this->Addresses->fetch_address ("id", $this->_params->id)){ $this->Response->throw_exception(404, "Address does not exist"); }
-	}
-
-	/**
-	 * Validate IP tag
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_tag () {
-		// numeric
-		if(!is_numeric(@$this->_params->id2))												{ $this->Response->throw_exception(400, 'Invalid tag identifier'); }
-		// check db
-		if (!$this->Tools->fetch_object ("ipTags", "id", $this->_params->id2))				{ $this->Response->throw_exception(404, "Address tag does not exist"); }
-	}
-
-	/**
-	 * Validates subnet
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_subnet () {
-		// numberic
-		if(!is_numeric($this->_params->subnetId))											{ $this->Response->throw_exception(400, "Subnet Id must be numeric"); }
-		// check subnet
-		if(is_null($res = $this->Subnets->fetch_subnet ("id", $this->_params->subnetId)))	{ $this->Response->throw_exception(400, "Invalid subnet Id"); }
-		else																				{ $this->subnet_details = $res; }
-	}
-
-	/**
-	 * Validates address on creation
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_create_parameters () {
-		// validate subnet
-		$this->validate_subnet ();
-
-		// validate overlapping
-		if($this->Addresses->address_exists ($this->_params->ip_addr, $this->_params->subnetId))	{ $this->Response->throw_exception(400, "IP address already exists"); }
-
-		// fetch subnet
-		$subnet = $this->subnet_details;
-		// formulate CIDR
-		$subnet = $this->Subnets->transform_to_dotted ($subnet->subnet)."/".$subnet->mask;
-
-		// validate address, that it is inside subnet, not subnet/broadcast
-		$this->Addresses->verify_address( $this->_params->ip_addr, $subnet, false, true );
-
-		// validate device
-		if(isset($this->_params->switch)) {
-		if($this->Tools->fetch_object("devices", "vlanId", $this->_params->switch)===false)	{ $this->Response->throw_exception(400, "Device does not exist"); } }
-		// validate state
-		if(isset($this->_params->state)) {
-		if($this->Tools->fetch_object("ipTags", "id", $this->_params->state)===false)		{ $this->Response->throw_exception(400, "Tag does not exist"); } }
-		else { $this->_params->state = 2; }
-	}
-
-	/**
-	 * Validation of PATCH parameters
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_update_parameters () {
-		// make sure address exists
-		$this->validate_address_id ();
-
-		// validate device
-		if(isset($this->_params->switch)) {
-		if($this->Tools->fetch_object("devices", "vlanId", $this->_params->switch)===false)	{ $this->Response->throw_exception(400, "Device does not exist"); } }
-		// validate state
-		if(isset($this->_params->state)) {
-		if($this->Tools->fetch_object("ipTags", "id", $this->_params->state)===false)		{ $this->Response->throw_exception(400, "Tag does not exist"); } }
-		else { $this->_params->state = 2; }
-	}
+        // validations
+        $this->validate_update_parameters ();
+
+        # check for valid keys
+        $values = $this->validate_keys ();
+        // add action and id
+        $values["id"] = $this->_params->id;
+
+        # we need admin object
+        $this->init_object ("Admin", $this->Database);
+
+        # execute
+        if(!$this->Admin->object_modify ("ipaddresses", "edit", "id", $values)) {
+            $this->Response->throw_exception(500, "Failed to update address");
+        }
+        else {
+            //set result
+            return array("code"=>200, "data"=>"Address updated");
+        }
+
+    }
+
+
+
+
+
+    /**
+     * Deletes existing address
+     *
+     *	required parameters: id
+     *
+     * @access public
+     * @return void
+     */
+    public function DELETE () {
+        // Check for id
+        $this->validate_address_id ();
+
+        // set variables for delete
+        $values = array();
+        $values["id"] 	  = $this->_params->id;
+        $values["action"] = "delete";
+
+        # execute update
+        if(!$this->Addresses->modify_address ($values))
+                                                    { $this->Response->throw_exception(500, "Failed to delete address"); }
+        else {
+            //set result
+            return array("code"=>200, "data"=>"Address deleted");
+        }
+
+    }
+
+
+
+
+
+
+
+
+
+    /* @validations ---------- */
+
+    /**
+     * Make sure the address exists in database.
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_address_id () {
+        if(!$this->old_address = $this->Addresses->fetch_address ("id", $this->_params->id)){ $this->Response->throw_exception(404, "Address does not exist"); }
+    }
+
+    /**
+     * Validate IP tag
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_tag () {
+        // numeric
+        if(!is_numeric(@$this->_params->id2))												{ $this->Response->throw_exception(400, 'Invalid tag identifier'); }
+        // check db
+        if (!$this->Tools->fetch_object ("ipTags", "id", $this->_params->id2))				{ $this->Response->throw_exception(404, "Address tag does not exist"); }
+    }
+
+    /**
+     * Validates subnet
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_subnet () {
+        // numberic
+        if(!is_numeric($this->_params->subnetId))											{ $this->Response->throw_exception(400, "Subnet Id must be numeric"); }
+        // check subnet
+        if(is_null($res = $this->Subnets->fetch_subnet ("id", $this->_params->subnetId)))	{ $this->Response->throw_exception(400, "Invalid subnet Id"); }
+        else																				{ $this->subnet_details = $res; }
+    }
+
+    /**
+     * Validates address on creation
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_create_parameters () {
+        // validate subnet
+        $this->validate_subnet ();
+
+        // validate overlapping
+        if($this->Addresses->address_exists ($this->_params->ip_addr, $this->_params->subnetId))	{ $this->Response->throw_exception(400, "IP address already exists"); }
+
+        // fetch subnet
+        $subnet = $this->subnet_details;
+        // formulate CIDR
+        $subnet = $this->Subnets->transform_to_dotted ($subnet->subnet)."/".$subnet->mask;
+
+        // validate address, that it is inside subnet, not subnet/broadcast
+        $this->Addresses->verify_address( $this->_params->ip_addr, $subnet, false, true );
+
+        // validate device
+        if(isset($this->_params->switch)) {
+        if($this->Tools->fetch_object("devices", "vlanId", $this->_params->switch)===false)	{ $this->Response->throw_exception(400, "Device does not exist"); } }
+        // validate state
+        if(isset($this->_params->state)) {
+        if($this->Tools->fetch_object("ipTags", "id", $this->_params->state)===false)		{ $this->Response->throw_exception(400, "Tag does not exist"); } }
+        else { $this->_params->state = 2; }
+    }
+
+    /**
+     * Validation of PATCH parameters
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_update_parameters () {
+        // make sure address exists
+        $this->validate_address_id ();
+
+        // validate device
+        if(isset($this->_params->switch)) {
+        if($this->Tools->fetch_object("devices", "vlanId", $this->_params->switch)===false)	{ $this->Response->throw_exception(400, "Device does not exist"); } }
+        // validate state
+        if(isset($this->_params->state)) {
+        if($this->Tools->fetch_object("ipTags", "id", $this->_params->state)===false)		{ $this->Response->throw_exception(400, "Tag does not exist"); } }
+        else { $this->_params->state = 2; }
+    }
 }
 
 ?>
\ No newline at end of file

Spacing +77 added lines, -77 removed lines

@@ -5,7 +5,7 @@ 
  *
  *
  */
-class Addresses_controller extends Common_api_functions  {
+class Addresses_controller extends Common_api_functions {
 
 
 	/**
@@ -105,9 +105,9 @@ 
 	 * @param class $Tools
 	 * @param mixed $params		// post/get values
 	 */
-	public function __construct($Database, $Tools, $params, $Response) {
+	public function __construct ($Database, $Tools, $params, $Response) {
 		$this->Database = $Database;
-		$this->Tools 	= $Tools;
+		$this->Tools = $Tools;
 		$this->_params 	= $params;
 		$this->Response = $Response;
 		// init required objects
@@ -132,16 +132,16 @@ 
 		$this->validate_options_request ();
 
 		// methods
-		$result = array();
-		$result['methods'] = array(
-								array("href"=>"/api/".$this->_params->app_id."/addresses/", 	"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
-								array("href"=>"/api/".$this->_params->app_id."/addresses/{id}/","methods"=>array(array("rel"=>"read", 	"method"=>"GET"),
-																												 array("rel"=>"create", "method"=>"POST"),
-																												 array("rel"=>"update", "method"=>"PATCH"),
-																												 array("rel"=>"delete", "method"=>"DELETE"))),
+		$result = array ();
+		$result['methods'] = array (
+								array ("href"=>"/api/".$this->_params->app_id."/addresses/", "methods"=>array (array ("rel"=>"options", "method"=>"OPTIONS"))),
+								array ("href"=>"/api/".$this->_params->app_id."/addresses/{id}/", "methods"=>array (array ("rel"=>"read", "method"=>"GET"),
+																												 array ("rel"=>"create", "method"=>"POST"),
+																												 array ("rel"=>"update", "method"=>"PATCH"),
+																												 array ("rel"=>"delete", "method"=>"DELETE"))),
 							);
 		# result
-		return array("code"=>200, "data"=>$result);
+		return array ("code"=>200, "data"=>$result);
 	}
 
 
@@ -165,24 +165,24 @@ 
 	 */
 	public function GET () {
 		// subnet Id > read all addresses in subnet
-		if($this->_params->id=="custom_fields") {
+		if ($this->_params->id == "custom_fields") {
 			// check result
-			if(sizeof($this->custom_fields)==0)			{ $this->Response->throw_exception(404, 'No custom fields defined'); }
-			else										{ return array("code"=>200, "data"=>$this->custom_fields); }
+			if (sizeof ($this->custom_fields) == 0) { $this->Response->throw_exception (404, 'No custom fields defined'); }
+			else { return array ("code"=>200, "data"=>$this->custom_fields); }
 		}
 		// tags
-		elseif($this->_params->id=="tags") {
+		elseif ($this->_params->id == "tags") {
 			// validate
 			$this->validate_tag ();
 			// all addresses with tag
-			if (@$this->_params->id3=="addresses") {
+			if (@$this->_params->id3 == "addresses") {
 				// fetch
 				$result = $this->Tools->fetch_multiple_objects ("ipaddresses", "state", $this->_params->id2);
 
 				// filter by subnetId
-				if ($result!==false) {
-					if(isset($this->_params->subnetId)) {
-						if (is_numeric($this->_params->subnetId)) {
+				if ($result !== false) {
+					if (isset($this->_params->subnetId)) {
+						if (is_numeric ($this->_params->subnetId)) {
 							// filter
 							foreach ($result as $k=>$v) {
 								if ($v->subnetId != $this->_params->subnetId) {
@@ -190,7 +190,7 @@ 
 								}
 							}
 							// any left
-							if (sizeof($result)==0) {
+							if (sizeof ($result) == 0) {
 								$result = false;
 							}
 						}
@@ -198,34 +198,34 @@ 
 				}
 
 				// result
-				if($result===false)						{ $this->Response->throw_exception(404, 'No addresses found'); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, "addresses", true, false)); }
+				if ($result === false) { $this->Response->throw_exception (404, 'No addresses found'); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, "addresses", true, false)); }
 			}
 			// tags
 			else {
 				// fetch all by tag
-				if(isset($this->_params->id2)) {
+				if (isset($this->_params->id2)) {
 					// numeric
-					if(is_numeric($this->_params->id2)) { $result = $this->Tools->fetch_object ("ipTags", "id", $this->_params->id2); }
+					if (is_numeric ($this->_params->id2)) { $result = $this->Tools->fetch_object ("ipTags", "id", $this->_params->id2); }
 					// type
-					else 								{ $result = $this->Tools->fetch_multiple_objects ("ipTags", "type", $this->_params->id2); }
+					else { $result = $this->Tools->fetch_multiple_objects ("ipTags", "type", $this->_params->id2); }
 				}
 				// all tags
-				else 									{ $result = $this->Tools->fetch_all_objects ("ipTags"); }
+				else { $result = $this->Tools->fetch_all_objects ("ipTags"); }
 
 				// result
-				if($result===false)						{ $this->Response->throw_exception(404, 'Tag not found'); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, "addresses/tags", true, false)); }
+				if ($result === false) { $this->Response->throw_exception (404, 'Tag not found'); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, "addresses/tags", true, false)); }
 			}
 		}
 		// id not set
 		elseif (!isset($this->_params->id)) {
-														{ $this->Response->throw_exception(400, 'Address ID is required'); }
+														{ $this->Response->throw_exception (400, 'Address ID is required'); }
 		}
 		// id
-		elseif (is_numeric($this->_params->id)) {
+		elseif (is_numeric ($this->_params->id)) {
 			// ping
-			if(@$this->_params->id2=="ping") {
+			if (@$this->_params->id2 == "ping") {
 				# scan class
 				$Scan = new Scan ($this->Database);
 				$Scan->ping_set_exit (false);
@@ -233,35 +233,35 @@ 
 				$this->validate_address_id ();
 
 				// set result
-				$result = array();
+				$result = array ();
 				$result['scan_type'] = $Scan->icmp_type;
 				$result['exit_code'] = $Scan->ping_address ($this->old_address->ip_addr);
 
 				// success
-				if($result['exit_code']==0) 			{ $Scan->ping_update_lastseen ($this->_params->id); return array("code"=>200, "data"=>$result); }
-				else									{ $this->Response->throw_exception(404, "Address offline. Exit code: ".$result['exit_code']."( ".$Scan->ping_exit_explain ($result['exit_code'])." )"); }
+				if ($result['exit_code'] == 0) { $Scan->ping_update_lastseen ($this->_params->id); return array ("code"=>200, "data"=>$result); }
+				else { $this->Response->throw_exception (404, "Address offline. Exit code: ".$result['exit_code']."( ".$Scan->ping_exit_explain ($result['exit_code'])." )"); }
 			}
 			else {
 				// fetch
 				$result = $this->Addresses->fetch_address ("id", $this->_params->id);
 				// check result
-				if($result==false)						{ $this->Response->throw_exception(404, "Invalid Id"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, $this->_params->controller, true, true)); }
+				if ($result == false) { $this->Response->throw_exception (404, "Invalid Id"); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, $this->_params->controller, true, true)); }
 			}
 		}
 		// ip address ?
-		elseif (@$this->_params->id=="search") {
+		elseif (@$this->_params->id == "search") {
 			// validate
-			if(!$this->Addresses->validate_address ($this->_params->id2))
-														{ $this->Response->throw_exception(404, 'Invalid address'); }
+			if (!$this->Addresses->validate_address ($this->_params->id2))
+														{ $this->Response->throw_exception (404, 'Invalid address'); }
 			// search
 			$result = $this->Tools->fetch_multiple_objects ("ipaddresses", "ip_addr", $this->Subnets->transform_address ($this->_params->id2, "decimal"));
 			// check result
-			if($result===false)							{ $this->Response->throw_exception(404, 'Address not found'); }
-			else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, $this->_params->controller, true, true)); }
+			if ($result === false) { $this->Response->throw_exception (404, 'Address not found'); }
+			else { return array ("code"=>200, "data"=>$this->prepare_result ($result, $this->_params->controller, true, true)); }
 		}
 		// false
-		else											{  $this->Response->throw_exception(400, "Invalid Id"); }
+		else {  $this->Response->throw_exception (400, "Invalid Id"); }
 	}
 
 
@@ -297,11 +297,11 @@ 
 		$this->remap_keys ();
 
 		// first free
-		if($this->_params->id=="first_free")   {
+		if ($this->_params->id == "first_free") {
     		$this->_params->ip_addr = $this->Addresses->get_first_available_address ($this->_params->subnetId, $this->Subnets);
     		// null
-    		if ($this->_params->ip_addr==false)          { $this->Response->throw_exception(404, 'No free addresses found'); }
-            else                                         { $this->_params->ip_addr = $this->Addresses->transform_address ($this->_params->ip_addr, "dotted"); }
+    		if ($this->_params->ip_addr == false) { $this->Response->throw_exception (404, 'No free addresses found'); }
+            else { $this->_params->ip_addr = $this->Addresses->transform_address ($this->_params->ip_addr, "dotted"); }
 		}
 
 		// validate ip address - format, proper subnet, subnet/broadcast check
@@ -311,21 +311,21 @@ 
 		$values = $this->validate_keys ();
 
 		// transform address to decimal format
-		$values['ip_addr'] = $this->Addresses->transform_address($values['ip_addr'] ,"decimal");
+		$values['ip_addr'] = $this->Addresses->transform_address ($values['ip_addr'], "decimal");
 		// set action
 		$values['action'] = "add";
 
 		# execute
-		if(!$this->Addresses->modify_address ($values)) {
-			$this->Response->throw_exception(500, "Failed to create address");
+		if (!$this->Addresses->modify_address ($values)) {
+			$this->Response->throw_exception (500, "Failed to create address");
 		}
 		else {
     		//set result
-    		if($this->_params->id=="first_free")   {
-        	    return array("code"=>201, "data"=>"Address created", "location"=>"/api/".$this->_params->app_id."/addresses/".$this->Addresses->lastId."/", "ip"=>$this->Addresses->transform_address ($this->_params->ip_addr, "dotted"));
+    		if ($this->_params->id == "first_free") {
+        	    return array ("code"=>201, "data"=>"Address created", "location"=>"/api/".$this->_params->app_id."/addresses/".$this->Addresses->lastId."/", "ip"=>$this->Addresses->transform_address ($this->_params->ip_addr, "dotted"));
     		}
     		else {
-        	    return array("code"=>201, "data"=>"Address created", "location"=>"/api/".$this->_params->app_id."/addresses/".$this->Addresses->lastId."/");
+        	    return array ("code"=>201, "data"=>"Address created", "location"=>"/api/".$this->_params->app_id."/addresses/".$this->Addresses->lastId."/");
     		}
 		}
 	}
@@ -348,8 +348,8 @@ 
 		$this->remap_keys ();
 
 		// we dont allow address or subnet change
-		if(isset($this->_params->ip_addr))			{ $this->Response->throw_exception(400, "IP address cannot be changed"); }
-		if(isset($this->_params->subnetId))			{ $this->Response->throw_exception(400, "Subnet cannot be changed"); }
+		if (isset($this->_params->ip_addr)) { $this->Response->throw_exception (400, "IP address cannot be changed"); }
+		if (isset($this->_params->subnetId)) { $this->Response->throw_exception (400, "Subnet cannot be changed"); }
 
 		// validations
 		$this->validate_update_parameters ();
@@ -363,12 +363,12 @@ 
 		$this->init_object ("Admin", $this->Database);
 
 		# execute
-		if(!$this->Admin->object_modify ("ipaddresses", "edit", "id", $values)) {
-			$this->Response->throw_exception(500, "Failed to update address");
+		if (!$this->Admin->object_modify ("ipaddresses", "edit", "id", $values)) {
+			$this->Response->throw_exception (500, "Failed to update address");
 		}
 		else {
 			//set result
-			return array("code"=>200, "data"=>"Address updated");
+			return array ("code"=>200, "data"=>"Address updated");
 		}
 
 	}
@@ -390,16 +390,16 @@ 
 		$this->validate_address_id ();
 
 		// set variables for delete
-		$values = array();
-		$values["id"] 	  = $this->_params->id;
+		$values = array ();
+		$values["id"] = $this->_params->id;
 		$values["action"] = "delete";
 
 		# execute update
-		if(!$this->Addresses->modify_address ($values))
-													{ $this->Response->throw_exception(500, "Failed to delete address"); }
+		if (!$this->Addresses->modify_address ($values))
+													{ $this->Response->throw_exception (500, "Failed to delete address"); }
 		else {
 			//set result
-			return array("code"=>200, "data"=>"Address deleted");
+			return array ("code"=>200, "data"=>"Address deleted");
 		}
 
 	}
@@ -421,7 +421,7 @@ 
 	 * @return void
 	 */
 	private function validate_address_id () {
-		if(!$this->old_address = $this->Addresses->fetch_address ("id", $this->_params->id)){ $this->Response->throw_exception(404, "Address does not exist"); }
+		if (!$this->old_address = $this->Addresses->fetch_address ("id", $this->_params->id)) { $this->Response->throw_exception (404, "Address does not exist"); }
 	}
 
 	/**
@@ -432,9 +432,9 @@ 
 	 */
 	private function validate_tag () {
 		// numeric
-		if(!is_numeric(@$this->_params->id2))												{ $this->Response->throw_exception(400, 'Invalid tag identifier'); }
+		if (!is_numeric (@$this->_params->id2)) { $this->Response->throw_exception (400, 'Invalid tag identifier'); }
 		// check db
-		if (!$this->Tools->fetch_object ("ipTags", "id", $this->_params->id2))				{ $this->Response->throw_exception(404, "Address tag does not exist"); }
+		if (!$this->Tools->fetch_object ("ipTags", "id", $this->_params->id2)) { $this->Response->throw_exception (404, "Address tag does not exist"); }
 	}
 
 	/**
@@ -445,10 +445,10 @@ 
 	 */
 	private function validate_subnet () {
 		// numberic
-		if(!is_numeric($this->_params->subnetId))											{ $this->Response->throw_exception(400, "Subnet Id must be numeric"); }
+		if (!is_numeric ($this->_params->subnetId)) { $this->Response->throw_exception (400, "Subnet Id must be numeric"); }
 		// check subnet
-		if(is_null($res = $this->Subnets->fetch_subnet ("id", $this->_params->subnetId)))	{ $this->Response->throw_exception(400, "Invalid subnet Id"); }
-		else																				{ $this->subnet_details = $res; }
+		if (is_null ($res = $this->Subnets->fetch_subnet ("id", $this->_params->subnetId))) { $this->Response->throw_exception (400, "Invalid subnet Id"); }
+		else { $this->subnet_details = $res; }
 	}
 
 	/**
@@ -462,7 +462,7 @@ 
 		$this->validate_subnet ();
 
 		// validate overlapping
-		if($this->Addresses->address_exists ($this->_params->ip_addr, $this->_params->subnetId))	{ $this->Response->throw_exception(400, "IP address already exists"); }
+		if ($this->Addresses->address_exists ($this->_params->ip_addr, $this->_params->subnetId)) { $this->Response->throw_exception (400, "IP address already exists"); }
 
 		// fetch subnet
 		$subnet = $this->subnet_details;
@@ -470,14 +470,14 @@ 
 		$subnet = $this->Subnets->transform_to_dotted ($subnet->subnet)."/".$subnet->mask;
 
 		// validate address, that it is inside subnet, not subnet/broadcast
-		$this->Addresses->verify_address( $this->_params->ip_addr, $subnet, false, true );
+		$this->Addresses->verify_address ($this->_params->ip_addr, $subnet, false, true);
 
 		// validate device
-		if(isset($this->_params->switch)) {
-		if($this->Tools->fetch_object("devices", "vlanId", $this->_params->switch)===false)	{ $this->Response->throw_exception(400, "Device does not exist"); } }
+		if (isset($this->_params->switch)) {
+		if ($this->Tools->fetch_object ("devices", "vlanId", $this->_params->switch) === false) { $this->Response->throw_exception (400, "Device does not exist"); } }
 		// validate state
-		if(isset($this->_params->state)) {
-		if($this->Tools->fetch_object("ipTags", "id", $this->_params->state)===false)		{ $this->Response->throw_exception(400, "Tag does not exist"); } }
+		if (isset($this->_params->state)) {
+		if ($this->Tools->fetch_object ("ipTags", "id", $this->_params->state) === false) { $this->Response->throw_exception (400, "Tag does not exist"); } }
 		else { $this->_params->state = 2; }
 	}
 
@@ -492,11 +492,11 @@ 
 		$this->validate_address_id ();
 
 		// validate device
-		if(isset($this->_params->switch)) {
-		if($this->Tools->fetch_object("devices", "vlanId", $this->_params->switch)===false)	{ $this->Response->throw_exception(400, "Device does not exist"); } }
+		if (isset($this->_params->switch)) {
+		if ($this->Tools->fetch_object ("devices", "vlanId", $this->_params->switch) === false) { $this->Response->throw_exception (400, "Device does not exist"); } }
 		// validate state
-		if(isset($this->_params->state)) {
-		if($this->Tools->fetch_object("ipTags", "id", $this->_params->state)===false)		{ $this->Response->throw_exception(400, "Tag does not exist"); } }
+		if (isset($this->_params->state)) {
+		if ($this->Tools->fetch_object ("ipTags", "id", $this->_params->state) === false) { $this->Response->throw_exception (400, "Tag does not exist"); } }
 		else { $this->_params->state = 2; }
 	}
 }

api/controllers/Sections.php

Braces +3 added lines, -3 removed lines

@@ -189,7 +189,7 @@ 
 		# execute update
 		if(!$this->Sections->modify_section ("add", $values))
 														{ $this->Response->throw_exception(500, "Section create failed"); }
-		else {
+														else {
 			//set result
 			return array("code"=>201, "data"=>"Section created", "location"=>"/api/".$this->_params->app_id."/sections/".$this->Sections->lastInsertId."/");
 		}
@@ -218,7 +218,7 @@ 
 		# execute update
 		if(!$this->Sections->modify_section ("edit", $values))
 														{ $this->Response->throw_exception(500, "Section update failed"); }
-		else {
+														else {
 			//set result
 			return array("code"=>200, "data"=>NULL);
 		}
@@ -247,7 +247,7 @@ 
 		# execute update
 		if(!$this->Sections->modify_section ("delete", $values))
 														{ $this->Response->throw_exception(500, "Section delete failed"); }
-		else {
+														else {
 			//set result
 			return array("code"=>200, "data"=>NULL);
 		}

Spacing +48 added lines, -48 removed lines

@@ -74,10 +74,10 @@ 
 	 * @param mixed $params
 	 * @param mixed $Response
 	 */
-	public function __construct($Database, $Tools, $params, $Response) {
+	public function __construct ($Database, $Tools, $params, $Response) {
 		$this->Database = $Database;
 		$this->Response = $Response;
-		$this->Tools 	= $Tools;
+		$this->Tools = $Tools;
 		$this->_params 	= $params;
 		# sections
 		// init required objects
@@ -101,16 +101,16 @@ 
 		$this->validate_options_request ();
 
 		// methods
-		$result = array();
-		$result['methods'] = array(
-								array("href"=>"/api/".$this->_params->app_id."/sections/", 			"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
-								array("href"=>"/api/".$this->_params->app_id."/sections/{id}/", 	"methods"=>array(array("rel"=>"read", 	"method"=>"GET"),
-																													 array("rel"=>"create", "method"=>"POST"),
-																													 array("rel"=>"update", "method"=>"PATCH"),
-																													 array("rel"=>"delete", "method"=>"DELETE"))),
+		$result = array ();
+		$result['methods'] = array (
+								array ("href"=>"/api/".$this->_params->app_id."/sections/", "methods"=>array (array ("rel"=>"options", "method"=>"OPTIONS"))),
+								array ("href"=>"/api/".$this->_params->app_id."/sections/{id}/", "methods"=>array (array ("rel"=>"read", "method"=>"GET"),
+																													 array ("rel"=>"create", "method"=>"POST"),
+																													 array ("rel"=>"update", "method"=>"PATCH"),
+																													 array ("rel"=>"delete", "method"=>"DELETE"))),
 							);
 		# result
-		return array("code"=>200, "data"=>$result);
+		return array ("code"=>200, "data"=>$result);
 	}
 
 
@@ -133,7 +133,7 @@ 
 	 */
 	public function GET () {
 		// fetch subnets in section
-		if(@$this->_params->id2=="subnets" && is_numeric($this->_params->id)) {
+		if (@$this->_params->id2 == "subnets" && is_numeric ($this->_params->id)) {
 			// we dont need id2 anymore
 			unset($this->_params->id2);
 			//validate section
@@ -143,54 +143,54 @@ 
 			//fetch
 			$result = $this->Subnets->fetch_section_subnets ($this->_params->id);
             // add gateway
-			if($result!=false) {
+			if ($result != false) {
 				foreach ($result as $k=>$r) {
     				//gw
             		$gateway = $this->read_subnet_gateway ($r->id);
-            		if ( $gateway!== false) {
+            		if ($gateway !== false) {
                 		$result[$k]->gatewayId = $gateway->id;
             		}
             		//nameservers
             		$ns = $this->read_subnet_nameserver ($r->nameserverId);
-                    if ($ns!==false) {
+                    if ($ns !== false) {
                         $result[$k]->nameservers = $ns;
                     }
 				}
 			}
 			// check result
-			if(sizeof($result)==0) 						{ return array("code"=>200, "data"=>NULL); }
-			else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
+			if (sizeof ($result) == 0) { return array ("code"=>200, "data"=>NULL); }
+			else { return array ("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
 		}
 		// verify ID
-		elseif(isset($this->_params->id)) {
+		elseif (isset($this->_params->id)) {
 			# fetch by id
-			if(is_numeric($this->_params->id)) {
+			if (is_numeric ($this->_params->id)) {
 				$result = $this->Sections->fetch_section ("id", $this->_params->id);
 				// check result
-				if(sizeof($result)==0) 					{ $this->Response->throw_exception(404, NULL); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+				if (sizeof ($result) == 0) { $this->Response->throw_exception (404, NULL); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 			}
 			# return custom fields
-			elseif($this->_params->id=="custom_fields") {
+			elseif ($this->_params->id == "custom_fields") {
 				// check result
-				if(sizeof($this->custom_fields)==0)		{ $this->Response->throw_exception(404, 'No custom fields defined'); }
-				else									{ return array("code"=>200, "data"=>$result); }
+				if (sizeof ($this->custom_fields) == 0) { $this->Response->throw_exception (404, 'No custom fields defined'); }
+				else { return array ("code"=>200, "data"=>$result); }
 			}
 			# fetch by name
 			else {
 				$result = $this->Sections->fetch_section ("name", $this->_params->id);
 				// check result
-				if(sizeof($result)==0) 					{ $this->Response->throw_exception(404, $this->Response->errors[404]); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+				if (sizeof ($result) == 0) { $this->Response->throw_exception (404, $this->Response->errors[404]); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 			}
 		}
 		# all sections
 		else {
 				// all sections
-				$result = $this->Sections->fetch_all_sections();
+				$result = $this->Sections->fetch_all_sections ();
 				// check result
-				if($result===false) 					{ return array("code"=>204, NULL); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+				if ($result === false) { return array ("code"=>204, NULL); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 		}
 	}
 
@@ -225,22 +225,22 @@ 
 		unset($values['editDate']);
 
 		# validate mandatory parameters
-		if(strlen($this->_params->name)<3)				{ $this->Response->throw_exception(400, 'Name is mandatory or too short (mininum 3 characters)'); }
+		if (strlen ($this->_params->name) < 3) { $this->Response->throw_exception (400, 'Name is mandatory or too short (mininum 3 characters)'); }
 
 		# verify masterSection
-		if(isset($this->_params->masterSection)) {
+		if (isset($this->_params->masterSection)) {
 			$masterSection = $this->Sections->fetch_section ("id", $this->_params->masterSection);
 			// checks
-			if(sizeof($masterSection)==0)				{ $this->Response->throw_exception(400, 'Invalid masterSection id '.$this->_params->masterSection); }
-			elseif($masterSection->masterSection!="0")	{ $this->Response->throw_exception(400, 'Only 1 level of nesting is permitted for sections');  }
+			if (sizeof ($masterSection) == 0) { $this->Response->throw_exception (400, 'Invalid masterSection id '.$this->_params->masterSection); }
+			elseif ($masterSection->masterSection != "0") { $this->Response->throw_exception (400, 'Only 1 level of nesting is permitted for sections'); }
 		}
 
 		# execute update
-		if(!$this->Sections->modify_section ("add", $values))
-														{ $this->Response->throw_exception(500, "Section create failed"); }
+		if (!$this->Sections->modify_section ("add", $values))
+														{ $this->Response->throw_exception (500, "Section create failed"); }
 		else {
 			//set result
-			return array("code"=>201, "data"=>"Section created", "location"=>"/api/".$this->_params->app_id."/sections/".$this->Sections->lastInsertId."/");
+			return array ("code"=>201, "data"=>"Section created", "location"=>"/api/".$this->_params->app_id."/sections/".$this->Sections->lastInsertId."/");
 		}
 	}
 
@@ -256,20 +256,20 @@ 
 	 */
 	public function PATCH () {
 		# Check for id
-		if(!isset($this->_params->id))					{ $this->Response->throw_exception(400, "Section Id required"); }
+		if (!isset($this->_params->id)) { $this->Response->throw_exception (400, "Section Id required"); }
 		# check that section exists
-		if(sizeof($this->Sections->fetch_section ("id", $this->_params->id))==0)
-														{ $this->Response->throw_exception(404, "Section does not exist"); }
+		if (sizeof ($this->Sections->fetch_section ("id", $this->_params->id)) == 0)
+														{ $this->Response->throw_exception (404, "Section does not exist"); }
 
 		# validate and prepare keys
 		$values = $this->validate_keys ();
 
 		# execute update
-		if(!$this->Sections->modify_section ("edit", $values))
-														{ $this->Response->throw_exception(500, "Section update failed"); }
+		if (!$this->Sections->modify_section ("edit", $values))
+														{ $this->Response->throw_exception (500, "Section update failed"); }
 		else {
 			//set result
-			return array("code"=>200, "data"=>NULL);
+			return array ("code"=>200, "data"=>NULL);
 		}
 	}
 
@@ -285,21 +285,21 @@ 
 	 */
 	public function DELETE () {
 		# Check for id
-		if(!isset($this->_params->id))					{ $this->Response->throw_exception(400, "Section Id required"); }
+		if (!isset($this->_params->id)) { $this->Response->throw_exception (400, "Section Id required"); }
 		# check that section exists
-		if(sizeof($this->Sections->fetch_section ("id", $this->_params->id))==0)
-														{ $this->Response->throw_exception(404, "Section does not exist"); }
+		if (sizeof ($this->Sections->fetch_section ("id", $this->_params->id)) == 0)
+														{ $this->Response->throw_exception (404, "Section does not exist"); }
 
 		# set variables for update
-		$values = array();
+		$values = array ();
 		$values["id"] = $this->_params->id;
 
 		# execute update
-		if(!$this->Sections->modify_section ("delete", $values))
-														{ $this->Response->throw_exception(500, "Section delete failed"); }
+		if (!$this->Sections->modify_section ("delete", $values))
+														{ $this->Response->throw_exception (500, "Section delete failed"); }
 		else {
 			//set result
-			return array("code"=>200, "data"=>NULL);
+			return array ("code"=>200, "data"=>NULL);
 		}
 	}
 

Indentation +312 added lines, -312 removed lines

@@ -8,322 +8,322 @@
 class Sections_controller extends Common_api_functions {
 
 
-	/**
-	 * _params provided
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $_params;
-
-	/**
-	 * custom_fields
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	public $custom_fields;
-
-	/**
-	 * Database object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Database;
-
-	/**
-	 *  Response handler
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Response;
-
-	/**
-	 * Master Subnets object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Subnets;
-
-	/**
-	 * Master Sections object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Sections;
-
-	/**
-	 * Master Tools object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Tools;
-
-
-	/**
-	 * __construct function
-	 *
-	 * @access public
-	 * @param class $Database
-	 * @param class $Tools
-	 * @param mixed $params
-	 * @param mixed $Response
-	 */
-	public function __construct($Database, $Tools, $params, $Response) {
-		$this->Database = $Database;
-		$this->Response = $Response;
-		$this->Tools 	= $Tools;
-		$this->_params 	= $params;
-		# sections
-		// init required objects
-		$this->init_object ("Sections", $Database);
-		# set valid keys
-		$this->set_valid_keys ("sections");
-	}
-
-
-
-
-
-	/**
-	 * Returns json encoded options and version
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function OPTIONS () {
-		// validate
-		$this->validate_options_request ();
-
-		// methods
-		$result = array();
-		$result['methods'] = array(
-								array("href"=>"/api/".$this->_params->app_id."/sections/", 			"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
-								array("href"=>"/api/".$this->_params->app_id."/sections/{id}/", 	"methods"=>array(array("rel"=>"read", 	"method"=>"GET"),
-																													 array("rel"=>"create", "method"=>"POST"),
-																													 array("rel"=>"update", "method"=>"PATCH"),
-																													 array("rel"=>"delete", "method"=>"DELETE"))),
-							);
-		# result
-		return array("code"=>200, "data"=>$result);
-	}
-
-
-
-
-
-	/**
-	 * GET sections functions
-	 *
-	 *	ID can be:
-	 *		- {id}
-	 *		- {id}/subnets/		// returns all subnets in this section
-	 *		- name 				// section name
-	 *		- custom_fields		// returns custom fields
-	 *
-	 *	If no ID is provided all sections are returned
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function GET () {
-		// fetch subnets in section
-		if(@$this->_params->id2=="subnets" && is_numeric($this->_params->id)) {
-			// we dont need id2 anymore
-			unset($this->_params->id2);
-			//validate section
-			$this->GET ();
-			// init required objects
-			$this->init_object ("Subnets", $this->Database);
-			//fetch
-			$result = $this->Subnets->fetch_section_subnets ($this->_params->id);
+    /**
+     * _params provided
+     *
+     * @var mixed
+     * @access public
+     */
+    public $_params;
+
+    /**
+     * custom_fields
+     *
+     * @var mixed
+     * @access protected
+     */
+    public $custom_fields;
+
+    /**
+     * Database object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Database;
+
+    /**
+     *  Response handler
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Response;
+
+    /**
+     * Master Subnets object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Subnets;
+
+    /**
+     * Master Sections object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Sections;
+
+    /**
+     * Master Tools object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Tools;
+
+
+    /**
+     * __construct function
+     *
+     * @access public
+     * @param class $Database
+     * @param class $Tools
+     * @param mixed $params
+     * @param mixed $Response
+     */
+    public function __construct($Database, $Tools, $params, $Response) {
+        $this->Database = $Database;
+        $this->Response = $Response;
+        $this->Tools 	= $Tools;
+        $this->_params 	= $params;
+        # sections
+        // init required objects
+        $this->init_object ("Sections", $Database);
+        # set valid keys
+        $this->set_valid_keys ("sections");
+    }
+
+
+
+
+
+    /**
+     * Returns json encoded options and version
+     *
+     * @access public
+     * @return void
+     */
+    public function OPTIONS () {
+        // validate
+        $this->validate_options_request ();
+
+        // methods
+        $result = array();
+        $result['methods'] = array(
+                                array("href"=>"/api/".$this->_params->app_id."/sections/", 			"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
+                                array("href"=>"/api/".$this->_params->app_id."/sections/{id}/", 	"methods"=>array(array("rel"=>"read", 	"method"=>"GET"),
+                                                                                                                        array("rel"=>"create", "method"=>"POST"),
+                                                                                                                        array("rel"=>"update", "method"=>"PATCH"),
+                                                                                                                        array("rel"=>"delete", "method"=>"DELETE"))),
+                            );
+        # result
+        return array("code"=>200, "data"=>$result);
+    }
+
+
+
+
+
+    /**
+     * GET sections functions
+     *
+     *	ID can be:
+     *		- {id}
+     *		- {id}/subnets/		// returns all subnets in this section
+     *		- name 				// section name
+     *		- custom_fields		// returns custom fields
+     *
+     *	If no ID is provided all sections are returned
+     *
+     * @access public
+     * @return void
+     */
+    public function GET () {
+        // fetch subnets in section
+        if(@$this->_params->id2=="subnets" && is_numeric($this->_params->id)) {
+            // we dont need id2 anymore
+            unset($this->_params->id2);
+            //validate section
+            $this->GET ();
+            // init required objects
+            $this->init_object ("Subnets", $this->Database);
+            //fetch
+            $result = $this->Subnets->fetch_section_subnets ($this->_params->id);
             // add gateway
-			if($result!=false) {
-				foreach ($result as $k=>$r) {
-    				//gw
-            		$gateway = $this->read_subnet_gateway ($r->id);
-            		if ( $gateway!== false) {
-                		$result[$k]->gatewayId = $gateway->id;
-            		}
-            		//nameservers
-            		$ns = $this->read_subnet_nameserver ($r->nameserverId);
+            if($result!=false) {
+                foreach ($result as $k=>$r) {
+                    //gw
+                    $gateway = $this->read_subnet_gateway ($r->id);
+                    if ( $gateway!== false) {
+                        $result[$k]->gatewayId = $gateway->id;
+                    }
+                    //nameservers
+                    $ns = $this->read_subnet_nameserver ($r->nameserverId);
                     if ($ns!==false) {
                         $result[$k]->nameservers = $ns;
                     }
-				}
-			}
-			// check result
-			if(sizeof($result)==0) 						{ return array("code"=>200, "data"=>NULL); }
-			else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
-		}
-		// verify ID
-		elseif(isset($this->_params->id)) {
-			# fetch by id
-			if(is_numeric($this->_params->id)) {
-				$result = $this->Sections->fetch_section ("id", $this->_params->id);
-				// check result
-				if(sizeof($result)==0) 					{ $this->Response->throw_exception(404, NULL); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
-			}
-			# return custom fields
-			elseif($this->_params->id=="custom_fields") {
-				// check result
-				if(sizeof($this->custom_fields)==0)		{ $this->Response->throw_exception(404, 'No custom fields defined'); }
-				else									{ return array("code"=>200, "data"=>$result); }
-			}
-			# fetch by name
-			else {
-				$result = $this->Sections->fetch_section ("name", $this->_params->id);
-				// check result
-				if(sizeof($result)==0) 					{ $this->Response->throw_exception(404, $this->Response->errors[404]); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
-			}
-		}
-		# all sections
-		else {
-				// all sections
-				$result = $this->Sections->fetch_all_sections();
-				// check result
-				if($result===false) 					{ return array("code"=>204, NULL); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
-		}
-	}
-
-
-
-
-	/**
-	 * HEAD, no response
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function HEAD () {
-		return $this->GET ();
-	}
-
-
-
-
-
-	/**
-	 * Creates new section
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function POST () {
-		# check for valid keys
-		$values = $this->validate_keys ();
-
-		// remove editDate if set
-		unset($values['editDate']);
-
-		# validate mandatory parameters
-		if(strlen($this->_params->name)<3)				{ $this->Response->throw_exception(400, 'Name is mandatory or too short (mininum 3 characters)'); }
-
-		# verify masterSection
-		if(isset($this->_params->masterSection)) {
-			$masterSection = $this->Sections->fetch_section ("id", $this->_params->masterSection);
-			// checks
-			if(sizeof($masterSection)==0)				{ $this->Response->throw_exception(400, 'Invalid masterSection id '.$this->_params->masterSection); }
-			elseif($masterSection->masterSection!="0")	{ $this->Response->throw_exception(400, 'Only 1 level of nesting is permitted for sections');  }
-		}
-
-		# execute update
-		if(!$this->Sections->modify_section ("add", $values))
-														{ $this->Response->throw_exception(500, "Section create failed"); }
-		else {
-			//set result
-			return array("code"=>201, "data"=>"Section created", "location"=>"/api/".$this->_params->app_id."/sections/".$this->Sections->lastInsertId."/");
-		}
-	}
-
-
-
-
-
-	/**
-	 * Updates existing section
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function PATCH () {
-		# Check for id
-		if(!isset($this->_params->id))					{ $this->Response->throw_exception(400, "Section Id required"); }
-		# check that section exists
-		if(sizeof($this->Sections->fetch_section ("id", $this->_params->id))==0)
-														{ $this->Response->throw_exception(404, "Section does not exist"); }
-
-		# validate and prepare keys
-		$values = $this->validate_keys ();
-
-		# execute update
-		if(!$this->Sections->modify_section ("edit", $values))
-														{ $this->Response->throw_exception(500, "Section update failed"); }
-		else {
-			//set result
-			return array("code"=>200, "data"=>NULL);
-		}
-	}
-
-
-
-
-
-	/**
-	 * Deletes existing section along with subnets and addresses
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function DELETE () {
-		# Check for id
-		if(!isset($this->_params->id))					{ $this->Response->throw_exception(400, "Section Id required"); }
-		# check that section exists
-		if(sizeof($this->Sections->fetch_section ("id", $this->_params->id))==0)
-														{ $this->Response->throw_exception(404, "Section does not exist"); }
-
-		# set variables for update
-		$values = array();
-		$values["id"] = $this->_params->id;
-
-		# execute update
-		if(!$this->Sections->modify_section ("delete", $values))
-														{ $this->Response->throw_exception(500, "Section delete failed"); }
-		else {
-			//set result
-			return array("code"=>200, "data"=>NULL);
-		}
-	}
-
-	/**
-	 * Returns id of subnet gateay
-	 *
-	 * @access private
-	 * @params mixed $subnetId
-	 * @return void
-	 */
-	private function read_subnet_gateway ($subnetId) {
-    	return $this->Subnets->find_gateway ($subnetId);
-	}
-
-	/**
-	 * Returns nameserver details
-	 *
-	 * @access private
-	 * @param mixed $nsid
-	 * @return void
-	 */
-	private function read_subnet_nameserver ($nsid) {
-    	return $this->Tools->fetch_object ("nameservers", "id", $nsid);
-	}
+                }
+            }
+            // check result
+            if(sizeof($result)==0) 						{ return array("code"=>200, "data"=>NULL); }
+            else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
+        }
+        // verify ID
+        elseif(isset($this->_params->id)) {
+            # fetch by id
+            if(is_numeric($this->_params->id)) {
+                $result = $this->Sections->fetch_section ("id", $this->_params->id);
+                // check result
+                if(sizeof($result)==0) 					{ $this->Response->throw_exception(404, NULL); }
+                else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+            }
+            # return custom fields
+            elseif($this->_params->id=="custom_fields") {
+                // check result
+                if(sizeof($this->custom_fields)==0)		{ $this->Response->throw_exception(404, 'No custom fields defined'); }
+                else									{ return array("code"=>200, "data"=>$result); }
+            }
+            # fetch by name
+            else {
+                $result = $this->Sections->fetch_section ("name", $this->_params->id);
+                // check result
+                if(sizeof($result)==0) 					{ $this->Response->throw_exception(404, $this->Response->errors[404]); }
+                else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+            }
+        }
+        # all sections
+        else {
+                // all sections
+                $result = $this->Sections->fetch_all_sections();
+                // check result
+                if($result===false) 					{ return array("code"=>204, NULL); }
+                else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+        }
+    }
+
+
+
+
+    /**
+     * HEAD, no response
+     *
+     * @access public
+     * @return void
+     */
+    public function HEAD () {
+        return $this->GET ();
+    }
+
+
+
+
+
+    /**
+     * Creates new section
+     *
+     * @access public
+     * @return void
+     */
+    public function POST () {
+        # check for valid keys
+        $values = $this->validate_keys ();
+
+        // remove editDate if set
+        unset($values['editDate']);
+
+        # validate mandatory parameters
+        if(strlen($this->_params->name)<3)				{ $this->Response->throw_exception(400, 'Name is mandatory or too short (mininum 3 characters)'); }
+
+        # verify masterSection
+        if(isset($this->_params->masterSection)) {
+            $masterSection = $this->Sections->fetch_section ("id", $this->_params->masterSection);
+            // checks
+            if(sizeof($masterSection)==0)				{ $this->Response->throw_exception(400, 'Invalid masterSection id '.$this->_params->masterSection); }
+            elseif($masterSection->masterSection!="0")	{ $this->Response->throw_exception(400, 'Only 1 level of nesting is permitted for sections');  }
+        }
+
+        # execute update
+        if(!$this->Sections->modify_section ("add", $values))
+                                                        { $this->Response->throw_exception(500, "Section create failed"); }
+        else {
+            //set result
+            return array("code"=>201, "data"=>"Section created", "location"=>"/api/".$this->_params->app_id."/sections/".$this->Sections->lastInsertId."/");
+        }
+    }
+
+
+
+
+
+    /**
+     * Updates existing section
+     *
+     * @access public
+     * @return void
+     */
+    public function PATCH () {
+        # Check for id
+        if(!isset($this->_params->id))					{ $this->Response->throw_exception(400, "Section Id required"); }
+        # check that section exists
+        if(sizeof($this->Sections->fetch_section ("id", $this->_params->id))==0)
+                                                        { $this->Response->throw_exception(404, "Section does not exist"); }
+
+        # validate and prepare keys
+        $values = $this->validate_keys ();
+
+        # execute update
+        if(!$this->Sections->modify_section ("edit", $values))
+                                                        { $this->Response->throw_exception(500, "Section update failed"); }
+        else {
+            //set result
+            return array("code"=>200, "data"=>NULL);
+        }
+    }
+
+
+
+
+
+    /**
+     * Deletes existing section along with subnets and addresses
+     *
+     * @access public
+     * @return void
+     */
+    public function DELETE () {
+        # Check for id
+        if(!isset($this->_params->id))					{ $this->Response->throw_exception(400, "Section Id required"); }
+        # check that section exists
+        if(sizeof($this->Sections->fetch_section ("id", $this->_params->id))==0)
+                                                        { $this->Response->throw_exception(404, "Section does not exist"); }
+
+        # set variables for update
+        $values = array();
+        $values["id"] = $this->_params->id;
+
+        # execute update
+        if(!$this->Sections->modify_section ("delete", $values))
+                                                        { $this->Response->throw_exception(500, "Section delete failed"); }
+        else {
+            //set result
+            return array("code"=>200, "data"=>NULL);
+        }
+    }
+
+    /**
+     * Returns id of subnet gateay
+     *
+     * @access private
+     * @params mixed $subnetId
+     * @return void
+     */
+    private function read_subnet_gateway ($subnetId) {
+        return $this->Subnets->find_gateway ($subnetId);
+    }
+
+    /**
+     * Returns nameserver details
+     *
+     * @access private
+     * @param mixed $nsid
+     * @return void
+     */
+    private function read_subnet_nameserver ($nsid) {
+        return $this->Tools->fetch_object ("nameservers", "id", $nsid);
+    }
 }
 
 ?>

api/controllers/Common.php

Braces +6 added lines, -4 removed lines

@@ -244,10 +244,12 @@
 						$result->links[$m] = new stdClass ();
 						$result->links[$m]->rel  	= $link;
 						// self ?
-						if ($link=="self")
-						$result->links[$m]->href 	= "/api/".$this->_params->app_id."/$controller/".$result->id."/";
-						else
-						$result->links[$m]->href 	= "/api/".$this->_params->app_id."/$controller/".$result->id."/$link/";
+						if ($link=="self") {
+												$result->links[$m]->href 	= "/api/".$this->_params->app_id."/$controller/".$result->id."/";
+						}
+						else {
+												$result->links[$m]->href 	= "/api/".$this->_params->app_id."/$controller/".$result->id."/$link/";
+						}
 						$result->links[$m]->methods = $method;
 						// next
 						$m++;

Doc Comments +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
 	 * Initializes new Object.
 	 *
 	 * @access protected
-	 * @param mixed $Object_name		// object name
+	 * @param string $Object_name		// object name
 	 * @param mixed $Database	       // Database object
 	 */
 	protected function init_object ($Object_name, $Database) {
@@ -340,7 +340,7 @@ 
 	 * Defines links for controller
 	 *
 	 * @access private
-	 * @param mixed $controller
+	 * @param string $controller
 	 * @return void
 	 */
 	private function define_links ($controller) {

Indentation +664 added lines, -664 removed lines

@@ -8,21 +8,21 @@ 
 class Common_api_functions {
 
 
-	/**
-	 * controller_keys
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $controller_keys;
-
-	/**
-	 * _params provided from request
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $_params;
+    /**
+     * controller_keys
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $controller_keys;
+
+    /**
+     * _params provided from request
+     *
+     * @var mixed
+     * @access public
+     */
+    public $_params;
 
     /**
      * Custom fields
@@ -32,655 +32,655 @@ 
      */
     public $custom_fields;
 
-	/**
-	 * valid_keys
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $valid_keys;
-
-	/**
-	 * custom_keys
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $custom_keys;
-
-	/**
-	 * Keys to be removed
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $remove_keys;
-
-	/**
-	 * keys
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $keys;
-
-	/**
-	 * Master Tools class
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Tools;
-
-	/**
-	 * Response class
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Response;
-
-	/**
-	 * Master subnets class
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Subnets;
-
-
-
-
-
-
-	/**
-	 * Initializes new Object.
-	 *
-	 * @access protected
-	 * @param mixed $Object_name		// object name
-	 * @param mixed $Database	       // Database object
-	 */
-	protected function init_object ($Object_name, $Database) {
-		// admin fix
-		if($Object_name=="Admin")	    { $this->$Object_name	= new $Object_name ($Database, false); }
-		// User fix
-		elseif($Object_name=="User")	{ $this->$Object_name	= new $Object_name ($Database, true); $this->$Object_name->user = null; }
-		// default
-		else					        { $this->$Object_name	= new $Object_name ($Database); }
-		// set exit method
-		$this->$Object_name->Result->exit_method = "exception";
-		// set API flag
-		$this->$Object_name->api = true;
-	}
-
-	/**
-	 * Sets valid keys for actions
-	 *
-	 * @access protected
-	 * @param mixed $controller
-	 * @return void
-	 */
-	protected function set_valid_keys ($controller) {
-		# array of controller keys
-		$this->controller_keys = array("app_id", "controller");
-
-		# array of all valid keys - fetch from SCHEMA
-		$this->valid_keys = $this->Tools->fetch_standard_fields ($controller);
-
-		# add custom fields
-		$custom_fields = $this->Tools->fetch_custom_fields($controller);
-		if(sizeof($custom_fields)>0) {
-			foreach($custom_fields as $cf) {
-				$this->custom_keys[] = $cf['name'];
-			}
-		}
-
-		# save custom fields
-		$this->custom_fields = $custom_fields;
-
-		# merge all
-		$this->valid_keys = array_merge($this->controller_keys, $this->valid_keys);
-		if(isset($this->custom_keys)) {
-			$this->valid_keys = array_merge($this->valid_keys, $this->custom_keys);
-		}
-
-		# set items to remove
-		$this->remove_keys = array("editDate");
-		# remove update time
-		foreach($this->valid_keys as $k=>$v) {
-			if(in_array($v, $this->remove_keys)) {
-				unset($this->valid_keys[$k]);
-			}
-		}
-	}
-
-	/**
-	 * Prepares result, creates links if requested and transforms address/subnet to
-	 *	decimal format
-	 *
-	 * @access protected
-	 * @param mixed $result
-	 * @param mixed $controller (default: null)
-	 * @param bool $links (default: true)
-	 * @param bool $transform_address (default: true)
-	 * @return void
-	 */
-	protected function prepare_result ($result, $controller = null, $links = true, $transform_address = true) {
-		// empty controller
-		$controller = is_null($controller) ? $this->_params->controller : $controller;
-
-		// links
-		if($links) {
-			// explicitly set to no
-			if(@$this->_params->links!="false")
-								{ $result = $this->add_links ($result, $controller); }
-		}
-		// filter
-		if (isset($this->_params->filter_by)) {
-								{ $result = $this->filter_result ($result); }
-		}
-		// transform address
-		if($transform_address)	{ $result = $this->transform_address ($result); }
-
-		// remove subnets and addresses if needed
-		$result = $this->remove_folders ($result);
-		$result = $this->remove_subnets ($result);
-
-		// remap keys
-		$result = $this->remap_keys ($result, $controller);
-
-		# return
-		return $result;
-	}
-
-	/**
-	 * Filters result
-	 *
-	 *	parameters: filter_by, filter_value
-	 *
-	 * @access protected
-	 * @param mixed $result
-	 * @return void
-	 */
-	protected function filter_result ($result) {
-    	// remap keys before applying filter
-    	$result = $this->remap_keys ($result, false);
-		// validate
-		$this->validate_filter_by ($result);
-
-		// filter - array
-		if (is_array($result)) {
-			foreach ($result as $m=>$r) {
-				foreach ($r as $k=>$v) {
-					if ($k == $this->_params->filter_by) {
-						if ($v != $this->_params->filter_value) {
-							unset($result[$m]);
-							break;
-						}
-					}
-				}
-			}
-		}
-		// filter - single
-		else {
-				foreach ($result as $k=>$v) {
-					if ($k == $this->_params->filter_by) {
-						if ($v != $this->_params->filter_value) {
-							unset($result);
-							break;
-						}
-					}
-				}
-		}
-
-		# null?
-		if (sizeof($result)==0)				{ $this->Response->throw_exception(404, 'No results (filter applied)'); }
-
-		# result
-		return $result;
-	}
-
-	/**
-	 * Validates filter_by
-	 *
-	 * @access protected
-	 * @param mixed $result
-	 * @return void
-	 */
-	protected function validate_filter_by ($result) {
-		// validate filter
-		if (is_array($result))	{ $result_tmp = $result[0]; }
-		else					{ $result_tmp = $result; }
-
-		$error = true;
-		foreach ($result_tmp as $k=>$v) {
-			if ($k==$this->_params->filter_by) {
-				$error = false;
-			}
-		}
-		// die
-		if ($error)							{ $this->Response->throw_exception(400, 'Invalid filter value'); }
-	}
-
-	/**
-	 * Creates links for GET requests
-	 *
-	 * @access private
-	 * @param mixed $result
-	 * @param mixed $controller
-	 * @return void
-	 */
-	protected function add_links ($result, $controller=null) {
-		// lower controller
-		$controller = strtolower($controller);
-
-		// multiple options
-		if(is_array($result)) {
-			foreach($result as $k=>$r) {
-				// fix for Vlans and vrfs
-				if($controller=="vlans")				{ $r->id = $r->vlanId; }
-				if($controller=="tools/vlans")			{ $r->id = $r->vlanId; }
-				if($controller=="vrfs")					{ $r->id = $r->vrfId; }
-				if($this->_params->id=="deviceTypes")	{ $r->id = $r->tid; }
-
-				$m=0;
-				// custom links
-				$custom_links = $this->define_links ($controller);
-				if($custom_links!==false) {
-					foreach($this->define_links ($controller) as $link=>$method) {
-						// self only !
-						if ($link=="self") {
-						$result[$k]->links[$m] = new stdClass ();
-						$result[$k]->links[$m]->rel  	= $link;
-						$result[$k]->links[$m]->href 	= "/api/".$this->_params->app_id."/$controller/".$r->id."/";
-						}
-					}
-				}
-
-				// remove id for vlans
-				if($controller=="vlans")	{ unset($r->id); }
-				if($controller=="vrfs")		{ unset($r->id); }
-			}
-		}
-		// single item
-		else {
-				// fix for Vlans and Vrfs
-				if($controller=="vlans")				{ $result->id = $result->vlanId; }
-				if($controller=="tools/vlans")			{ $result->id = $result->vlanId; }
-				if($controller=="vrfs")					{ $result->id = $result->vrfId; }
-				if($this->_params->id=="deviceTypes")	{ $result->id = $result->tid; }
-
-				$m=0;
-				// custom links
-				$custom_links = $this->define_links ($controller);
-				if($custom_links!==false) {
-					foreach($this->define_links ($controller) as $link=>$method) {
-						$result->links[$m] = new stdClass ();
-						$result->links[$m]->rel  	= $link;
-						// self ?
-						if ($link=="self")
-						$result->links[$m]->href 	= "/api/".$this->_params->app_id."/$controller/".$result->id."/";
-						else
-						$result->links[$m]->href 	= "/api/".$this->_params->app_id."/$controller/".$result->id."/$link/";
-						$result->links[$m]->methods = $method;
-						// next
-						$m++;
-					}
-				}
-
-				// remove id for vlans
-				if($controller=="vlans")	{ unset($result->id); }
-				if($controller=="vrfs")		{ unset($result->id); }
-		}
-		# return
-		return $result;
-	}
-
-	/**
-	 * Defines links for controller
-	 *
-	 * @access private
-	 * @param mixed $controller
-	 * @return void
-	 */
-	private function define_links ($controller) {
-    	// init
-    	$result = array();
-		// sections
-		if($controller=="sections") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["subnets"]          = array ("GET");
-			// return
-			return $result;
-		}
-		// subnets
-		elseif($controller=="subnets") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["addresses"]        = array ("GET");
-			$result["usage"]            = array ("GET");
-			$result["first_free"]       = array ("GET");
-			$result["slaves"]           = array ("GET");
-			$result["slaves_recursive"] = array ("GET");
-			$result["truncate"]         = array ("DELETE");
-			$result["resize"]           = array ("PATCH");
-			$result["split"]            = array ("PATCH");
-			// return
-			return $result;
-		}
-		// addresses
-		elseif($controller=="addresses") {
-			$result["self"]				= array ("GET","POST","DELETE","PATCH");
-			$result["ping"]				= array ("GET");
-			// return
-			return $result;
-		}
-		// tags
-		elseif($controller=="addresses/tags") {
-			$result["self"]				= array ("GET");
-			$result["addresses"]		= array ("GET");
-			// return
-			return $result;
-		}
-		// tools - devices
-		elseif($controller=="tools/devices") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["addresses"]        = array ("GET");
-			// return
-			return $result;
-		}
-		// tools - devices
-		elseif($controller=="tools/devicetypes") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["devices"]        	= array ("GET");
-			// return
-			return $result;
-		}
-		// tools - tags
-		elseif($controller=="tools/iptags") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["addresses"]        = array ("GET");
-			// return
-			return $result;
-		}
-		// tools - tags
-		elseif($controller=="tools/vlans") {
-			$result["self"]			 	= array ("GET");
-			$result["subnets"]          = array ("GET");
-			// return
-			return $result;
-		}
-		// tools - tags
-		elseif($controller=="tools/vrf") {
-			$result["self"]			 	= array ("GET");
-			$result["subnets"]          = array ("GET");
-			// return
-			return $result;
-		}
-		// tags
-		elseif($controller=="iptags") {
-			$result["self"]				= array ("GET");
-			$result["addresses"]		= array ("GET");
-			// return
-			return $result;
-		}
-		// tags
-		elseif($controller=="devices") {
-			$result["self"]				= array ("GET");
-			$result["addresses"]		= array ("GET");
-			// return
-			return $result;
-		}
-		// vlan domains
-		elseif($controller=="l2domains") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["vlans"]          	= array ("GET");
-			// return
-			return $result;
-		}
-		// vlans
-		elseif($controller=="vlans") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["subnets"]          = array ("GET");
-			// return
-			return $result;
-		}
-		// vrfs
-		elseif($controller=="vrfs") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["subnets"]          = array ("GET");
-			// return
-			return $result;
-		}
-
-		// default
-		return false;
-	}
-
-	/**
-	 * Transforms IP address and subnet
-	 *
-	 * @access protected
-	 * @param mixed $result
-	 * @return void
-	 */
-	protected function transform_address ($result) {
-		// multiple options
-		if (is_array($result)) {
-			foreach($result as $k=>$r) {
-				// remove IP
-				if (isset($r->ip))					{ unset($r->ip); }
-				// transform
-				if (isset($r->subnet))				{ $r->subnet  = $this->Subnets->transform_address ($r->subnet,  "dotted"); }
-				elseif (isset($r->ip_addr))			{ $r->ip_addr = $this->Subnets->transform_address ($r->ip_addr, "dotted"); }
-			}
-		}
-		// single item
-		else {
-				// remove IP
-				if (isset($result->ip))				{ unset($result->ip); }
-				// transform
-				if (isset($result->subnet))			{ $result->subnet  = $this->Subnets->transform_address ($result->subnet,  "dotted"); }
-				elseif (isset($result->ip_addr))	{ $result->ip_addr = $this->Subnets->transform_address ($result->ip_addr, "dotted"); }
-		}
-
-		# return
-		return $result;
-	}
-
-	/**
-	 * Validates posted keys and returns proper inset values
-	 *
-	 * @access private
-	 * @return void
-	 */
-	protected function validate_keys () {
-    	// init values
-    	$values = array();
-    	// loop
-		foreach($this->_params as $pk=>$pv) {
-			if(!in_array($pk, $this->valid_keys)) 	{ $this->Response->throw_exception(400, 'Invalid request key '.$pk); }
-			// set parameters
-			else {
-				if(!in_array($pk, $this->controller_keys)) {
-					 $values[$pk] = $pv;
-				}
-			}
-		}
-		# remove editDate
-		unset($values['editDate']);
-		# return
-		return $values;
-	}
-
-	/**
-	 * Validates OPTIONS request
-	 *
-	 * @access protected
-	 * @return void
-	 */
-	protected function validate_options_request () {
-		foreach($this->_params as $key=>$val) {
-			if(!in_array($key, array("app_id", "controller", "id"))) {
-													{ $this->Response->throw_exception(400, 'Invalid request key parameter '.$key); }
-			}
-		}
-	}
-
-	/**
-	 * This method removes all folders if controller is subnets
-	 *
-	 * @access protected
-	 * @param mixed $result
-	 * @return void
-	 */
-	protected function remove_folders ($result) {
-		// must be subnets
-		if($this->_params->controller!="subnets") {
-			return $result;
-		}
-		else {
-			// multiple options
-			if (is_array($result)) {
-				foreach($result as $k=>$r) {
-					// remove
-					if($r->isFolder=="1")				{ unset($r); }
-			}	}
-			// single item
-			else {
-					// remove
-					if($result->isFolder=="1")			{ unset($result); }
-			}
-			# return
-			if($result===false)	{ $this->Response->throw_exception(404, "No subnets found"); }
-			else				{ return $result; }
-	}	}
-
-	/**
-	 * This method removes all subnets if controller is subnets
-	 *
-	 * @access protected
-	 * @param mixed $result
-	 * @return void
-	 */
-	protected function remove_subnets ($result) {
-		// must be subnets
-		if($this->_params->controller!="folders") {
-			return $result;
-		}
-		else {
-			// multiple options
-			if (is_array($result)) {
-				foreach($result as $k=>$r) {
-					// remove
-					if($r->isFolder!="1")				{ unset($r); }
-			}	}
-			// single item
-			else {
-					// remove
-					if($result->isFolder!="1")			{ unset($result); }
-			}
-			# return
-			if($result===NULL)	{ $this->Response->throw_exception(404, "No folders found"); }
-			else				{ return $result; }
-	}	}
-
-
-
-
-	/**
-	 * Remaps keys based on request type
-	 *
-	 * @access protected
-	 * @param mixed $result (default: null)
-	 * @param mixed $controller (default: null)
-	 * @return void
-	 */
-	protected function remap_keys ($result = null, $controller = null) {
-		// define keys array
-		$this->keys = array("switch"=>"deviceId", "state"=>"tag", "ip_addr"=>"ip", "dns_name"=>"hostname");
-
-		// exceptions
-		if($controller=="vlans") 	{ $this->keys['vlanId'] = "id"; }
-		if($controller=="vrfs")  	{ $this->keys['vrfId'] = "id"; }
-		if($this->_params->controller=="tools" && $this->_params->id=="deviceTypes")  { $this->keys['tid'] = "id"; }
-
-		// POST / PATCH
-		if ($_SERVER['REQUEST_METHOD']=="POST" || $_SERVER['REQUEST_METHOD']=="PATCH")		{ return $this->remap_update_keys (); }
-		// GET
-		elseif ($_SERVER['REQUEST_METHOD']=="GET")											{ return $this->remap_result_keys ($result); }
-	}
-
-	/**
-	 * Updates request keys to database ones
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function remap_update_keys () {
-		// loop
-		foreach($this->keys as $k=>$v) {
-			// match
-			if(array_key_exists($v, $this->_params)) {
-				// replace
-				$this->_params->$k = $this->_params->$v;
-				// remove
-				unset($this->_params->$v);
-			}
-		}
-	}
-
-	/**
-	 * Remap result keys - what is offered to client
-	 *
-	 * @access private
-	 * @param mixed $result
-	 * @return void
-	 */
-	private function remap_result_keys ($result) {
-		# single
-		if(!is_array($result)) {
-			// params
-			$result_remapped = new StdClass ();
-			// search and replace
-			foreach($result as $k=>$v) {
-				if(array_key_exists($k, $this->keys)) {
-					// replace
-					$key = $this->keys[$k];
-					$result_remapped->$key = $v;
-				}
-				else {
-					$result_remapped->$k = $v;
-				}
-			}
-		}
-		# array
-		else {
-			// create a new array for the remapped data
-			$result_remapped = array();
-
-			// loop
-			foreach ($result as $m=>$r) {
-				// start object
-				$result_remapped[$m] = new StdClass ();
-
-				// search and replace
-				foreach($r as $k=>$v) {
-					if(array_key_exists($k, $this->keys)) {
-						// replace
-						$key_val = $this->keys[$k];
-						$result_remapped[$m]->$key_val = $v;
-					}
-					else {
-						$result_remapped[$m]->$k = $v;
-					}
-				}
-			}
-		}
-
-
-		# result
-		return $result_remapped;
-	}
+    /**
+     * valid_keys
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $valid_keys;
+
+    /**
+     * custom_keys
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $custom_keys;
+
+    /**
+     * Keys to be removed
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $remove_keys;
+
+    /**
+     * keys
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $keys;
+
+    /**
+     * Master Tools class
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Tools;
+
+    /**
+     * Response class
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Response;
+
+    /**
+     * Master subnets class
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Subnets;
+
+
+
+
+
+
+    /**
+     * Initializes new Object.
+     *
+     * @access protected
+     * @param mixed $Object_name		// object name
+     * @param mixed $Database	       // Database object
+     */
+    protected function init_object ($Object_name, $Database) {
+        // admin fix
+        if($Object_name=="Admin")	    { $this->$Object_name	= new $Object_name ($Database, false); }
+        // User fix
+        elseif($Object_name=="User")	{ $this->$Object_name	= new $Object_name ($Database, true); $this->$Object_name->user = null; }
+        // default
+        else					        { $this->$Object_name	= new $Object_name ($Database); }
+        // set exit method
+        $this->$Object_name->Result->exit_method = "exception";
+        // set API flag
+        $this->$Object_name->api = true;
+    }
+
+    /**
+     * Sets valid keys for actions
+     *
+     * @access protected
+     * @param mixed $controller
+     * @return void
+     */
+    protected function set_valid_keys ($controller) {
+        # array of controller keys
+        $this->controller_keys = array("app_id", "controller");
+
+        # array of all valid keys - fetch from SCHEMA
+        $this->valid_keys = $this->Tools->fetch_standard_fields ($controller);
+
+        # add custom fields
+        $custom_fields = $this->Tools->fetch_custom_fields($controller);
+        if(sizeof($custom_fields)>0) {
+            foreach($custom_fields as $cf) {
+                $this->custom_keys[] = $cf['name'];
+            }
+        }
+
+        # save custom fields
+        $this->custom_fields = $custom_fields;
+
+        # merge all
+        $this->valid_keys = array_merge($this->controller_keys, $this->valid_keys);
+        if(isset($this->custom_keys)) {
+            $this->valid_keys = array_merge($this->valid_keys, $this->custom_keys);
+        }
+
+        # set items to remove
+        $this->remove_keys = array("editDate");
+        # remove update time
+        foreach($this->valid_keys as $k=>$v) {
+            if(in_array($v, $this->remove_keys)) {
+                unset($this->valid_keys[$k]);
+            }
+        }
+    }
+
+    /**
+     * Prepares result, creates links if requested and transforms address/subnet to
+     *	decimal format
+     *
+     * @access protected
+     * @param mixed $result
+     * @param mixed $controller (default: null)
+     * @param bool $links (default: true)
+     * @param bool $transform_address (default: true)
+     * @return void
+     */
+    protected function prepare_result ($result, $controller = null, $links = true, $transform_address = true) {
+        // empty controller
+        $controller = is_null($controller) ? $this->_params->controller : $controller;
+
+        // links
+        if($links) {
+            // explicitly set to no
+            if(@$this->_params->links!="false")
+                                { $result = $this->add_links ($result, $controller); }
+        }
+        // filter
+        if (isset($this->_params->filter_by)) {
+                                { $result = $this->filter_result ($result); }
+        }
+        // transform address
+        if($transform_address)	{ $result = $this->transform_address ($result); }
+
+        // remove subnets and addresses if needed
+        $result = $this->remove_folders ($result);
+        $result = $this->remove_subnets ($result);
+
+        // remap keys
+        $result = $this->remap_keys ($result, $controller);
+
+        # return
+        return $result;
+    }
+
+    /**
+     * Filters result
+     *
+     *	parameters: filter_by, filter_value
+     *
+     * @access protected
+     * @param mixed $result
+     * @return void
+     */
+    protected function filter_result ($result) {
+        // remap keys before applying filter
+        $result = $this->remap_keys ($result, false);
+        // validate
+        $this->validate_filter_by ($result);
+
+        // filter - array
+        if (is_array($result)) {
+            foreach ($result as $m=>$r) {
+                foreach ($r as $k=>$v) {
+                    if ($k == $this->_params->filter_by) {
+                        if ($v != $this->_params->filter_value) {
+                            unset($result[$m]);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        // filter - single
+        else {
+                foreach ($result as $k=>$v) {
+                    if ($k == $this->_params->filter_by) {
+                        if ($v != $this->_params->filter_value) {
+                            unset($result);
+                            break;
+                        }
+                    }
+                }
+        }
+
+        # null?
+        if (sizeof($result)==0)				{ $this->Response->throw_exception(404, 'No results (filter applied)'); }
+
+        # result
+        return $result;
+    }
+
+    /**
+     * Validates filter_by
+     *
+     * @access protected
+     * @param mixed $result
+     * @return void
+     */
+    protected function validate_filter_by ($result) {
+        // validate filter
+        if (is_array($result))	{ $result_tmp = $result[0]; }
+        else					{ $result_tmp = $result; }
+
+        $error = true;
+        foreach ($result_tmp as $k=>$v) {
+            if ($k==$this->_params->filter_by) {
+                $error = false;
+            }
+        }
+        // die
+        if ($error)							{ $this->Response->throw_exception(400, 'Invalid filter value'); }
+    }
+
+    /**
+     * Creates links for GET requests
+     *
+     * @access private
+     * @param mixed $result
+     * @param mixed $controller
+     * @return void
+     */
+    protected function add_links ($result, $controller=null) {
+        // lower controller
+        $controller = strtolower($controller);
+
+        // multiple options
+        if(is_array($result)) {
+            foreach($result as $k=>$r) {
+                // fix for Vlans and vrfs
+                if($controller=="vlans")				{ $r->id = $r->vlanId; }
+                if($controller=="tools/vlans")			{ $r->id = $r->vlanId; }
+                if($controller=="vrfs")					{ $r->id = $r->vrfId; }
+                if($this->_params->id=="deviceTypes")	{ $r->id = $r->tid; }
+
+                $m=0;
+                // custom links
+                $custom_links = $this->define_links ($controller);
+                if($custom_links!==false) {
+                    foreach($this->define_links ($controller) as $link=>$method) {
+                        // self only !
+                        if ($link=="self") {
+                        $result[$k]->links[$m] = new stdClass ();
+                        $result[$k]->links[$m]->rel  	= $link;
+                        $result[$k]->links[$m]->href 	= "/api/".$this->_params->app_id."/$controller/".$r->id."/";
+                        }
+                    }
+                }
+
+                // remove id for vlans
+                if($controller=="vlans")	{ unset($r->id); }
+                if($controller=="vrfs")		{ unset($r->id); }
+            }
+        }
+        // single item
+        else {
+                // fix for Vlans and Vrfs
+                if($controller=="vlans")				{ $result->id = $result->vlanId; }
+                if($controller=="tools/vlans")			{ $result->id = $result->vlanId; }
+                if($controller=="vrfs")					{ $result->id = $result->vrfId; }
+                if($this->_params->id=="deviceTypes")	{ $result->id = $result->tid; }
+
+                $m=0;
+                // custom links
+                $custom_links = $this->define_links ($controller);
+                if($custom_links!==false) {
+                    foreach($this->define_links ($controller) as $link=>$method) {
+                        $result->links[$m] = new stdClass ();
+                        $result->links[$m]->rel  	= $link;
+                        // self ?
+                        if ($link=="self")
+                        $result->links[$m]->href 	= "/api/".$this->_params->app_id."/$controller/".$result->id."/";
+                        else
+                        $result->links[$m]->href 	= "/api/".$this->_params->app_id."/$controller/".$result->id."/$link/";
+                        $result->links[$m]->methods = $method;
+                        // next
+                        $m++;
+                    }
+                }
+
+                // remove id for vlans
+                if($controller=="vlans")	{ unset($result->id); }
+                if($controller=="vrfs")		{ unset($result->id); }
+        }
+        # return
+        return $result;
+    }
+
+    /**
+     * Defines links for controller
+     *
+     * @access private
+     * @param mixed $controller
+     * @return void
+     */
+    private function define_links ($controller) {
+        // init
+        $result = array();
+        // sections
+        if($controller=="sections") {
+            $result["self"]			 	= array ("GET","POST","DELETE","PATCH");
+            $result["subnets"]          = array ("GET");
+            // return
+            return $result;
+        }
+        // subnets
+        elseif($controller=="subnets") {
+            $result["self"]			 	= array ("GET","POST","DELETE","PATCH");
+            $result["addresses"]        = array ("GET");
+            $result["usage"]            = array ("GET");
+            $result["first_free"]       = array ("GET");
+            $result["slaves"]           = array ("GET");
+            $result["slaves_recursive"] = array ("GET");
+            $result["truncate"]         = array ("DELETE");
+            $result["resize"]           = array ("PATCH");
+            $result["split"]            = array ("PATCH");
+            // return
+            return $result;
+        }
+        // addresses
+        elseif($controller=="addresses") {
+            $result["self"]				= array ("GET","POST","DELETE","PATCH");
+            $result["ping"]				= array ("GET");
+            // return
+            return $result;
+        }
+        // tags
+        elseif($controller=="addresses/tags") {
+            $result["self"]				= array ("GET");
+            $result["addresses"]		= array ("GET");
+            // return
+            return $result;
+        }
+        // tools - devices
+        elseif($controller=="tools/devices") {
+            $result["self"]			 	= array ("GET","POST","DELETE","PATCH");
+            $result["addresses"]        = array ("GET");
+            // return
+            return $result;
+        }
+        // tools - devices
+        elseif($controller=="tools/devicetypes") {
+            $result["self"]			 	= array ("GET","POST","DELETE","PATCH");
+            $result["devices"]        	= array ("GET");
+            // return
+            return $result;
+        }
+        // tools - tags
+        elseif($controller=="tools/iptags") {
+            $result["self"]			 	= array ("GET","POST","DELETE","PATCH");
+            $result["addresses"]        = array ("GET");
+            // return
+            return $result;
+        }
+        // tools - tags
+        elseif($controller=="tools/vlans") {
+            $result["self"]			 	= array ("GET");
+            $result["subnets"]          = array ("GET");
+            // return
+            return $result;
+        }
+        // tools - tags
+        elseif($controller=="tools/vrf") {
+            $result["self"]			 	= array ("GET");
+            $result["subnets"]          = array ("GET");
+            // return
+            return $result;
+        }
+        // tags
+        elseif($controller=="iptags") {
+            $result["self"]				= array ("GET");
+            $result["addresses"]		= array ("GET");
+            // return
+            return $result;
+        }
+        // tags
+        elseif($controller=="devices") {
+            $result["self"]				= array ("GET");
+            $result["addresses"]		= array ("GET");
+            // return
+            return $result;
+        }
+        // vlan domains
+        elseif($controller=="l2domains") {
+            $result["self"]			 	= array ("GET","POST","DELETE","PATCH");
+            $result["vlans"]          	= array ("GET");
+            // return
+            return $result;
+        }
+        // vlans
+        elseif($controller=="vlans") {
+            $result["self"]			 	= array ("GET","POST","DELETE","PATCH");
+            $result["subnets"]          = array ("GET");
+            // return
+            return $result;
+        }
+        // vrfs
+        elseif($controller=="vrfs") {
+            $result["self"]			 	= array ("GET","POST","DELETE","PATCH");
+            $result["subnets"]          = array ("GET");
+            // return
+            return $result;
+        }
+
+        // default
+        return false;
+    }
+
+    /**
+     * Transforms IP address and subnet
+     *
+     * @access protected
+     * @param mixed $result
+     * @return void
+     */
+    protected function transform_address ($result) {
+        // multiple options
+        if (is_array($result)) {
+            foreach($result as $k=>$r) {
+                // remove IP
+                if (isset($r->ip))					{ unset($r->ip); }
+                // transform
+                if (isset($r->subnet))				{ $r->subnet  = $this->Subnets->transform_address ($r->subnet,  "dotted"); }
+                elseif (isset($r->ip_addr))			{ $r->ip_addr = $this->Subnets->transform_address ($r->ip_addr, "dotted"); }
+            }
+        }
+        // single item
+        else {
+                // remove IP
+                if (isset($result->ip))				{ unset($result->ip); }
+                // transform
+                if (isset($result->subnet))			{ $result->subnet  = $this->Subnets->transform_address ($result->subnet,  "dotted"); }
+                elseif (isset($result->ip_addr))	{ $result->ip_addr = $this->Subnets->transform_address ($result->ip_addr, "dotted"); }
+        }
+
+        # return
+        return $result;
+    }
+
+    /**
+     * Validates posted keys and returns proper inset values
+     *
+     * @access private
+     * @return void
+     */
+    protected function validate_keys () {
+        // init values
+        $values = array();
+        // loop
+        foreach($this->_params as $pk=>$pv) {
+            if(!in_array($pk, $this->valid_keys)) 	{ $this->Response->throw_exception(400, 'Invalid request key '.$pk); }
+            // set parameters
+            else {
+                if(!in_array($pk, $this->controller_keys)) {
+                        $values[$pk] = $pv;
+                }
+            }
+        }
+        # remove editDate
+        unset($values['editDate']);
+        # return
+        return $values;
+    }
+
+    /**
+     * Validates OPTIONS request
+     *
+     * @access protected
+     * @return void
+     */
+    protected function validate_options_request () {
+        foreach($this->_params as $key=>$val) {
+            if(!in_array($key, array("app_id", "controller", "id"))) {
+                                                    { $this->Response->throw_exception(400, 'Invalid request key parameter '.$key); }
+            }
+        }
+    }
+
+    /**
+     * This method removes all folders if controller is subnets
+     *
+     * @access protected
+     * @param mixed $result
+     * @return void
+     */
+    protected function remove_folders ($result) {
+        // must be subnets
+        if($this->_params->controller!="subnets") {
+            return $result;
+        }
+        else {
+            // multiple options
+            if (is_array($result)) {
+                foreach($result as $k=>$r) {
+                    // remove
+                    if($r->isFolder=="1")				{ unset($r); }
+            }	}
+            // single item
+            else {
+                    // remove
+                    if($result->isFolder=="1")			{ unset($result); }
+            }
+            # return
+            if($result===false)	{ $this->Response->throw_exception(404, "No subnets found"); }
+            else				{ return $result; }
+    }	}
+
+    /**
+     * This method removes all subnets if controller is subnets
+     *
+     * @access protected
+     * @param mixed $result
+     * @return void
+     */
+    protected function remove_subnets ($result) {
+        // must be subnets
+        if($this->_params->controller!="folders") {
+            return $result;
+        }
+        else {
+            // multiple options
+            if (is_array($result)) {
+                foreach($result as $k=>$r) {
+                    // remove
+                    if($r->isFolder!="1")				{ unset($r); }
+            }	}
+            // single item
+            else {
+                    // remove
+                    if($result->isFolder!="1")			{ unset($result); }
+            }
+            # return
+            if($result===NULL)	{ $this->Response->throw_exception(404, "No folders found"); }
+            else				{ return $result; }
+    }	}
+
+
+
+
+    /**
+     * Remaps keys based on request type
+     *
+     * @access protected
+     * @param mixed $result (default: null)
+     * @param mixed $controller (default: null)
+     * @return void
+     */
+    protected function remap_keys ($result = null, $controller = null) {
+        // define keys array
+        $this->keys = array("switch"=>"deviceId", "state"=>"tag", "ip_addr"=>"ip", "dns_name"=>"hostname");
+
+        // exceptions
+        if($controller=="vlans") 	{ $this->keys['vlanId'] = "id"; }
+        if($controller=="vrfs")  	{ $this->keys['vrfId'] = "id"; }
+        if($this->_params->controller=="tools" && $this->_params->id=="deviceTypes")  { $this->keys['tid'] = "id"; }
+
+        // POST / PATCH
+        if ($_SERVER['REQUEST_METHOD']=="POST" || $_SERVER['REQUEST_METHOD']=="PATCH")		{ return $this->remap_update_keys (); }
+        // GET
+        elseif ($_SERVER['REQUEST_METHOD']=="GET")											{ return $this->remap_result_keys ($result); }
+    }
+
+    /**
+     * Updates request keys to database ones
+     *
+     * @access private
+     * @return void
+     */
+    private function remap_update_keys () {
+        // loop
+        foreach($this->keys as $k=>$v) {
+            // match
+            if(array_key_exists($v, $this->_params)) {
+                // replace
+                $this->_params->$k = $this->_params->$v;
+                // remove
+                unset($this->_params->$v);
+            }
+        }
+    }
+
+    /**
+     * Remap result keys - what is offered to client
+     *
+     * @access private
+     * @param mixed $result
+     * @return void
+     */
+    private function remap_result_keys ($result) {
+        # single
+        if(!is_array($result)) {
+            // params
+            $result_remapped = new StdClass ();
+            // search and replace
+            foreach($result as $k=>$v) {
+                if(array_key_exists($k, $this->keys)) {
+                    // replace
+                    $key = $this->keys[$k];
+                    $result_remapped->$key = $v;
+                }
+                else {
+                    $result_remapped->$k = $v;
+                }
+            }
+        }
+        # array
+        else {
+            // create a new array for the remapped data
+            $result_remapped = array();
+
+            // loop
+            foreach ($result as $m=>$r) {
+                // start object
+                $result_remapped[$m] = new StdClass ();
+
+                // search and replace
+                foreach($r as $k=>$v) {
+                    if(array_key_exists($k, $this->keys)) {
+                        // replace
+                        $key_val = $this->keys[$k];
+                        $result_remapped[$m]->$key_val = $v;
+                    }
+                    else {
+                        $result_remapped[$m]->$k = $v;
+                    }
+                }
+            }
+        }
+
+
+        # result
+        return $result_remapped;
+    }
 
 }
 

Spacing +131 added lines, -131 removed lines

@@ -102,11 +102,11 @@ 
 	 */
 	protected function init_object ($Object_name, $Database) {
 		// admin fix
-		if($Object_name=="Admin")	    { $this->$Object_name	= new $Object_name ($Database, false); }
+		if ($Object_name == "Admin") { $this->$Object_name = new $Object_name ($Database, false); }
 		// User fix
-		elseif($Object_name=="User")	{ $this->$Object_name	= new $Object_name ($Database, true); $this->$Object_name->user = null; }
+		elseif ($Object_name == "User") { $this->$Object_name = new $Object_name ($Database, true); $this->$Object_name->user = null; }
 		// default
-		else					        { $this->$Object_name	= new $Object_name ($Database); }
+		else { $this->$Object_name = new $Object_name ($Database); }
 		// set exit method
 		$this->$Object_name->Result->exit_method = "exception";
 		// set API flag
@@ -122,15 +122,15 @@ 
 	 */
 	protected function set_valid_keys ($controller) {
 		# array of controller keys
-		$this->controller_keys = array("app_id", "controller");
+		$this->controller_keys = array ("app_id", "controller");
 
 		# array of all valid keys - fetch from SCHEMA
 		$this->valid_keys = $this->Tools->fetch_standard_fields ($controller);
 
 		# add custom fields
-		$custom_fields = $this->Tools->fetch_custom_fields($controller);
-		if(sizeof($custom_fields)>0) {
-			foreach($custom_fields as $cf) {
+		$custom_fields = $this->Tools->fetch_custom_fields ($controller);
+		if (sizeof ($custom_fields) > 0) {
+			foreach ($custom_fields as $cf) {
 				$this->custom_keys[] = $cf['name'];
 			}
 		}
@@ -139,16 +139,16 @@ 
 		$this->custom_fields = $custom_fields;
 
 		# merge all
-		$this->valid_keys = array_merge($this->controller_keys, $this->valid_keys);
-		if(isset($this->custom_keys)) {
-			$this->valid_keys = array_merge($this->valid_keys, $this->custom_keys);
+		$this->valid_keys = array_merge ($this->controller_keys, $this->valid_keys);
+		if (isset($this->custom_keys)) {
+			$this->valid_keys = array_merge ($this->valid_keys, $this->custom_keys);
 		}
 
 		# set items to remove
-		$this->remove_keys = array("editDate");
+		$this->remove_keys = array ("editDate");
 		# remove update time
-		foreach($this->valid_keys as $k=>$v) {
-			if(in_array($v, $this->remove_keys)) {
+		foreach ($this->valid_keys as $k=>$v) {
+			if (in_array ($v, $this->remove_keys)) {
 				unset($this->valid_keys[$k]);
 			}
 		}
@@ -167,12 +167,12 @@ 
 	 */
 	protected function prepare_result ($result, $controller = null, $links = true, $transform_address = true) {
 		// empty controller
-		$controller = is_null($controller) ? $this->_params->controller : $controller;
+		$controller = is_null ($controller) ? $this->_params->controller : $controller;
 
 		// links
-		if($links) {
+		if ($links) {
 			// explicitly set to no
-			if(@$this->_params->links!="false")
+			if (@$this->_params->links != "false")
 								{ $result = $this->add_links ($result, $controller); }
 		}
 		// filter
@@ -180,7 +180,7 @@ 
 								{ $result = $this->filter_result ($result); }
 		}
 		// transform address
-		if($transform_address)	{ $result = $this->transform_address ($result); }
+		if ($transform_address) { $result = $this->transform_address ($result); }
 
 		// remove subnets and addresses if needed
 		$result = $this->remove_folders ($result);
@@ -209,7 +209,7 @@ 
 		$this->validate_filter_by ($result);
 
 		// filter - array
-		if (is_array($result)) {
+		if (is_array ($result)) {
 			foreach ($result as $m=>$r) {
 				foreach ($r as $k=>$v) {
 					if ($k == $this->_params->filter_by) {
@@ -234,7 +234,7 @@ 
 		}
 
 		# null?
-		if (sizeof($result)==0)				{ $this->Response->throw_exception(404, 'No results (filter applied)'); }
+		if (sizeof ($result) == 0) { $this->Response->throw_exception (404, 'No results (filter applied)'); }
 
 		# result
 		return $result;
@@ -249,17 +249,17 @@ 
 	 */
 	protected function validate_filter_by ($result) {
 		// validate filter
-		if (is_array($result))	{ $result_tmp = $result[0]; }
-		else					{ $result_tmp = $result; }
+		if (is_array ($result)) { $result_tmp = $result[0]; }
+		else { $result_tmp = $result; }
 
 		$error = true;
 		foreach ($result_tmp as $k=>$v) {
-			if ($k==$this->_params->filter_by) {
+			if ($k == $this->_params->filter_by) {
 				$error = false;
 			}
 		}
 		// die
-		if ($error)							{ $this->Response->throw_exception(400, 'Invalid filter value'); }
+		if ($error) { $this->Response->throw_exception (400, 'Invalid filter value'); }
 	}
 
 	/**
@@ -270,26 +270,26 @@ 
 	 * @param mixed $controller
 	 * @return void
 	 */
-	protected function add_links ($result, $controller=null) {
+	protected function add_links ($result, $controller = null) {
 		// lower controller
-		$controller = strtolower($controller);
+		$controller = strtolower ($controller);
 
 		// multiple options
-		if(is_array($result)) {
-			foreach($result as $k=>$r) {
+		if (is_array ($result)) {
+			foreach ($result as $k=>$r) {
 				// fix for Vlans and vrfs
-				if($controller=="vlans")				{ $r->id = $r->vlanId; }
-				if($controller=="tools/vlans")			{ $r->id = $r->vlanId; }
-				if($controller=="vrfs")					{ $r->id = $r->vrfId; }
-				if($this->_params->id=="deviceTypes")	{ $r->id = $r->tid; }
+				if ($controller == "vlans") { $r->id = $r->vlanId; }
+				if ($controller == "tools/vlans") { $r->id = $r->vlanId; }
+				if ($controller == "vrfs") { $r->id = $r->vrfId; }
+				if ($this->_params->id == "deviceTypes") { $r->id = $r->tid; }
 
-				$m=0;
+				$m = 0;
 				// custom links
 				$custom_links = $this->define_links ($controller);
-				if($custom_links!==false) {
-					foreach($this->define_links ($controller) as $link=>$method) {
+				if ($custom_links !== false) {
+					foreach ($this->define_links ($controller) as $link=>$method) {
 						// self only !
-						if ($link=="self") {
+						if ($link == "self") {
 						$result[$k]->links[$m] = new stdClass ();
 						$result[$k]->links[$m]->rel  	= $link;
 						$result[$k]->links[$m]->href 	= "/api/".$this->_params->app_id."/$controller/".$r->id."/";
@@ -298,27 +298,27 @@ 
 				}
 
 				// remove id for vlans
-				if($controller=="vlans")	{ unset($r->id); }
-				if($controller=="vrfs")		{ unset($r->id); }
+				if ($controller == "vlans") { unset($r->id); }
+				if ($controller == "vrfs") { unset($r->id); }
 			}
 		}
 		// single item
 		else {
 				// fix for Vlans and Vrfs
-				if($controller=="vlans")				{ $result->id = $result->vlanId; }
-				if($controller=="tools/vlans")			{ $result->id = $result->vlanId; }
-				if($controller=="vrfs")					{ $result->id = $result->vrfId; }
-				if($this->_params->id=="deviceTypes")	{ $result->id = $result->tid; }
+				if ($controller == "vlans") { $result->id = $result->vlanId; }
+				if ($controller == "tools/vlans") { $result->id = $result->vlanId; }
+				if ($controller == "vrfs") { $result->id = $result->vrfId; }
+				if ($this->_params->id == "deviceTypes") { $result->id = $result->tid; }
 
-				$m=0;
+				$m = 0;
 				// custom links
 				$custom_links = $this->define_links ($controller);
-				if($custom_links!==false) {
-					foreach($this->define_links ($controller) as $link=>$method) {
+				if ($custom_links !== false) {
+					foreach ($this->define_links ($controller) as $link=>$method) {
 						$result->links[$m] = new stdClass ();
 						$result->links[$m]->rel  	= $link;
 						// self ?
-						if ($link=="self")
+						if ($link == "self")
 						$result->links[$m]->href 	= "/api/".$this->_params->app_id."/$controller/".$result->id."/";
 						else
 						$result->links[$m]->href 	= "/api/".$this->_params->app_id."/$controller/".$result->id."/$link/";
@@ -329,8 +329,8 @@ 
 				}
 
 				// remove id for vlans
-				if($controller=="vlans")	{ unset($result->id); }
-				if($controller=="vrfs")		{ unset($result->id); }
+				if ($controller == "vlans") { unset($result->id); }
+				if ($controller == "vrfs") { unset($result->id); }
 		}
 		# return
 		return $result;
@@ -345,17 +345,17 @@ 
 	 */
 	private function define_links ($controller) {
     	// init
-    	$result = array();
+    	$result = array ();
 		// sections
-		if($controller=="sections") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["subnets"]          = array ("GET");
+		if ($controller == "sections") {
+			$result["self"] = array ("GET", "POST", "DELETE", "PATCH");
+			$result["subnets"] = array ("GET");
 			// return
 			return $result;
 		}
 		// subnets
-		elseif($controller=="subnets") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
+		elseif ($controller == "subnets") {
+			$result["self"] = array ("GET", "POST", "DELETE", "PATCH");
 			$result["addresses"]        = array ("GET");
 			$result["usage"]            = array ("GET");
 			$result["first_free"]       = array ("GET");
@@ -368,86 +368,86 @@ 
 			return $result;
 		}
 		// addresses
-		elseif($controller=="addresses") {
-			$result["self"]				= array ("GET","POST","DELETE","PATCH");
+		elseif ($controller == "addresses") {
+			$result["self"]				= array ("GET", "POST", "DELETE", "PATCH");
 			$result["ping"]				= array ("GET");
 			// return
 			return $result;
 		}
 		// tags
-		elseif($controller=="addresses/tags") {
-			$result["self"]				= array ("GET");
-			$result["addresses"]		= array ("GET");
+		elseif ($controller == "addresses/tags") {
+			$result["self"] = array ("GET");
+			$result["addresses"] = array ("GET");
 			// return
 			return $result;
 		}
 		// tools - devices
-		elseif($controller=="tools/devices") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["addresses"]        = array ("GET");
+		elseif ($controller == "tools/devices") {
+			$result["self"] = array ("GET", "POST", "DELETE", "PATCH");
+			$result["addresses"] = array ("GET");
 			// return
 			return $result;
 		}
 		// tools - devices
-		elseif($controller=="tools/devicetypes") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["devices"]        	= array ("GET");
+		elseif ($controller == "tools/devicetypes") {
+			$result["self"] = array ("GET", "POST", "DELETE", "PATCH");
+			$result["devices"] = array ("GET");
 			// return
 			return $result;
 		}
 		// tools - tags
-		elseif($controller=="tools/iptags") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["addresses"]        = array ("GET");
+		elseif ($controller == "tools/iptags") {
+			$result["self"] = array ("GET", "POST", "DELETE", "PATCH");
+			$result["addresses"] = array ("GET");
 			// return
 			return $result;
 		}
 		// tools - tags
-		elseif($controller=="tools/vlans") {
-			$result["self"]			 	= array ("GET");
-			$result["subnets"]          = array ("GET");
+		elseif ($controller == "tools/vlans") {
+			$result["self"] = array ("GET");
+			$result["subnets"] = array ("GET");
 			// return
 			return $result;
 		}
 		// tools - tags
-		elseif($controller=="tools/vrf") {
-			$result["self"]			 	= array ("GET");
-			$result["subnets"]          = array ("GET");
+		elseif ($controller == "tools/vrf") {
+			$result["self"] = array ("GET");
+			$result["subnets"] = array ("GET");
 			// return
 			return $result;
 		}
 		// tags
-		elseif($controller=="iptags") {
-			$result["self"]				= array ("GET");
-			$result["addresses"]		= array ("GET");
+		elseif ($controller == "iptags") {
+			$result["self"] = array ("GET");
+			$result["addresses"] = array ("GET");
 			// return
 			return $result;
 		}
 		// tags
-		elseif($controller=="devices") {
-			$result["self"]				= array ("GET");
-			$result["addresses"]		= array ("GET");
+		elseif ($controller == "devices") {
+			$result["self"] = array ("GET");
+			$result["addresses"] = array ("GET");
 			// return
 			return $result;
 		}
 		// vlan domains
-		elseif($controller=="l2domains") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["vlans"]          	= array ("GET");
+		elseif ($controller == "l2domains") {
+			$result["self"] = array ("GET", "POST", "DELETE", "PATCH");
+			$result["vlans"] = array ("GET");
 			// return
 			return $result;
 		}
 		// vlans
-		elseif($controller=="vlans") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["subnets"]          = array ("GET");
+		elseif ($controller == "vlans") {
+			$result["self"] = array ("GET", "POST", "DELETE", "PATCH");
+			$result["subnets"] = array ("GET");
 			// return
 			return $result;
 		}
 		// vrfs
-		elseif($controller=="vrfs") {
-			$result["self"]			 	= array ("GET","POST","DELETE","PATCH");
-			$result["subnets"]          = array ("GET");
+		elseif ($controller == "vrfs") {
+			$result["self"] = array ("GET", "POST", "DELETE", "PATCH");
+			$result["subnets"] = array ("GET");
 			// return
 			return $result;
 		}
@@ -465,22 +465,22 @@ 
 	 */
 	protected function transform_address ($result) {
 		// multiple options
-		if (is_array($result)) {
-			foreach($result as $k=>$r) {
+		if (is_array ($result)) {
+			foreach ($result as $k=>$r) {
 				// remove IP
-				if (isset($r->ip))					{ unset($r->ip); }
+				if (isset($r->ip)) { unset($r->ip); }
 				// transform
-				if (isset($r->subnet))				{ $r->subnet  = $this->Subnets->transform_address ($r->subnet,  "dotted"); }
-				elseif (isset($r->ip_addr))			{ $r->ip_addr = $this->Subnets->transform_address ($r->ip_addr, "dotted"); }
+				if (isset($r->subnet)) { $r->subnet = $this->Subnets->transform_address ($r->subnet, "dotted"); }
+				elseif (isset($r->ip_addr)) { $r->ip_addr = $this->Subnets->transform_address ($r->ip_addr, "dotted"); }
 			}
 		}
 		// single item
 		else {
 				// remove IP
-				if (isset($result->ip))				{ unset($result->ip); }
+				if (isset($result->ip)) { unset($result->ip); }
 				// transform
-				if (isset($result->subnet))			{ $result->subnet  = $this->Subnets->transform_address ($result->subnet,  "dotted"); }
-				elseif (isset($result->ip_addr))	{ $result->ip_addr = $this->Subnets->transform_address ($result->ip_addr, "dotted"); }
+				if (isset($result->subnet)) { $result->subnet = $this->Subnets->transform_address ($result->subnet, "dotted"); }
+				elseif (isset($result->ip_addr)) { $result->ip_addr = $this->Subnets->transform_address ($result->ip_addr, "dotted"); }
 		}
 
 		# return
@@ -495,13 +495,13 @@ 
 	 */
 	protected function validate_keys () {
     	// init values
-    	$values = array();
+    	$values = array ();
     	// loop
-		foreach($this->_params as $pk=>$pv) {
-			if(!in_array($pk, $this->valid_keys)) 	{ $this->Response->throw_exception(400, 'Invalid request key '.$pk); }
+		foreach ($this->_params as $pk=>$pv) {
+			if (!in_array ($pk, $this->valid_keys)) { $this->Response->throw_exception (400, 'Invalid request key '.$pk); }
 			// set parameters
 			else {
-				if(!in_array($pk, $this->controller_keys)) {
+				if (!in_array ($pk, $this->controller_keys)) {
 					 $values[$pk] = $pv;
 				}
 			}
@@ -519,9 +519,9 @@ 
 	 * @return void
 	 */
 	protected function validate_options_request () {
-		foreach($this->_params as $key=>$val) {
-			if(!in_array($key, array("app_id", "controller", "id"))) {
-													{ $this->Response->throw_exception(400, 'Invalid request key parameter '.$key); }
+		foreach ($this->_params as $key=>$val) {
+			if (!in_array ($key, array ("app_id", "controller", "id"))) {
+													{ $this->Response->throw_exception (400, 'Invalid request key parameter '.$key); }
 			}
 		}
 	}
@@ -535,24 +535,24 @@ 
 	 */
 	protected function remove_folders ($result) {
 		// must be subnets
-		if($this->_params->controller!="subnets") {
+		if ($this->_params->controller != "subnets") {
 			return $result;
 		}
 		else {
 			// multiple options
-			if (is_array($result)) {
-				foreach($result as $k=>$r) {
+			if (is_array ($result)) {
+				foreach ($result as $k=>$r) {
 					// remove
-					if($r->isFolder=="1")				{ unset($r); }
+					if ($r->isFolder == "1") { unset($r); }
 			}	}
 			// single item
 			else {
 					// remove
-					if($result->isFolder=="1")			{ unset($result); }
+					if ($result->isFolder == "1") { unset($result); }
 			}
 			# return
-			if($result===false)	{ $this->Response->throw_exception(404, "No subnets found"); }
-			else				{ return $result; }
+			if ($result === false) { $this->Response->throw_exception (404, "No subnets found"); }
+			else { return $result; }
 	}	}
 
 	/**
@@ -564,24 +564,24 @@ 
 	 */
 	protected function remove_subnets ($result) {
 		// must be subnets
-		if($this->_params->controller!="folders") {
+		if ($this->_params->controller != "folders") {
 			return $result;
 		}
 		else {
 			// multiple options
-			if (is_array($result)) {
-				foreach($result as $k=>$r) {
+			if (is_array ($result)) {
+				foreach ($result as $k=>$r) {
 					// remove
-					if($r->isFolder!="1")				{ unset($r); }
+					if ($r->isFolder != "1") { unset($r); }
 			}	}
 			// single item
 			else {
 					// remove
-					if($result->isFolder!="1")			{ unset($result); }
+					if ($result->isFolder != "1") { unset($result); }
 			}
 			# return
-			if($result===NULL)	{ $this->Response->throw_exception(404, "No folders found"); }
-			else				{ return $result; }
+			if ($result === NULL) { $this->Response->throw_exception (404, "No folders found"); }
+			else { return $result; }
 	}	}
 
 
@@ -597,17 +597,17 @@ 
 	 */
 	protected function remap_keys ($result = null, $controller = null) {
 		// define keys array
-		$this->keys = array("switch"=>"deviceId", "state"=>"tag", "ip_addr"=>"ip", "dns_name"=>"hostname");
+		$this->keys = array ("switch"=>"deviceId", "state"=>"tag", "ip_addr"=>"ip", "dns_name"=>"hostname");
 
 		// exceptions
-		if($controller=="vlans") 	{ $this->keys['vlanId'] = "id"; }
-		if($controller=="vrfs")  	{ $this->keys['vrfId'] = "id"; }
-		if($this->_params->controller=="tools" && $this->_params->id=="deviceTypes")  { $this->keys['tid'] = "id"; }
+		if ($controller == "vlans") { $this->keys['vlanId'] = "id"; }
+		if ($controller == "vrfs") { $this->keys['vrfId'] = "id"; }
+		if ($this->_params->controller == "tools" && $this->_params->id == "deviceTypes") { $this->keys['tid'] = "id"; }
 
 		// POST / PATCH
-		if ($_SERVER['REQUEST_METHOD']=="POST" || $_SERVER['REQUEST_METHOD']=="PATCH")		{ return $this->remap_update_keys (); }
+		if ($_SERVER['REQUEST_METHOD'] == "POST" || $_SERVER['REQUEST_METHOD'] == "PATCH") { return $this->remap_update_keys (); }
 		// GET
-		elseif ($_SERVER['REQUEST_METHOD']=="GET")											{ return $this->remap_result_keys ($result); }
+		elseif ($_SERVER['REQUEST_METHOD'] == "GET") { return $this->remap_result_keys ($result); }
 	}
 
 	/**
@@ -618,9 +618,9 @@ 
 	 */
 	private function remap_update_keys () {
 		// loop
-		foreach($this->keys as $k=>$v) {
+		foreach ($this->keys as $k=>$v) {
 			// match
-			if(array_key_exists($v, $this->_params)) {
+			if (array_key_exists ($v, $this->_params)) {
 				// replace
 				$this->_params->$k = $this->_params->$v;
 				// remove
@@ -638,12 +638,12 @@ 
 	 */
 	private function remap_result_keys ($result) {
 		# single
-		if(!is_array($result)) {
+		if (!is_array ($result)) {
 			// params
 			$result_remapped = new StdClass ();
 			// search and replace
-			foreach($result as $k=>$v) {
-				if(array_key_exists($k, $this->keys)) {
+			foreach ($result as $k=>$v) {
+				if (array_key_exists ($k, $this->keys)) {
 					// replace
 					$key = $this->keys[$k];
 					$result_remapped->$key = $v;
@@ -656,7 +656,7 @@ 
 		# array
 		else {
 			// create a new array for the remapped data
-			$result_remapped = array();
+			$result_remapped = array ();
 
 			// loop
 			foreach ($result as $m=>$r) {
@@ -664,8 +664,8 @@ 
 				$result_remapped[$m] = new StdClass ();
 
 				// search and replace
-				foreach($r as $k=>$v) {
-					if(array_key_exists($k, $this->keys)) {
+				foreach ($r as $k=>$v) {
+					if (array_key_exists ($k, $this->keys)) {
 						// replace
 						$key_val = $this->keys[$k];
 						$result_remapped[$m]->$key_val = $v;

api/controllers/Vrfs.php

Braces +3 added lines, -3 removed lines

@@ -163,7 +163,7 @@ 
 		# execute update
 		if(!$this->Admin->object_modify ("vrf", "add", "vrfId", $values))
 													{ $this->Response->throw_exception(500, "VRF creation failed"); }
-		else {
+													else {
 			//set result
 			return array("code"=>201, "data"=>"VRF created", "location"=>"/api/".$this->_params->app_id."/vrfs/".$this->Admin->lastId."/");
 		}
@@ -195,7 +195,7 @@ 
 		# execute update
 		if(!$this->Admin->object_modify ("vrf", "edit", "vrfId", $values))
 													{ $this->Response->throw_exception(500, "Vrf edit failed"); }
-		else {
+													else {
 			//set result
 			return array("code"=>200, "data"=>"VRF updated");
 		}
@@ -222,7 +222,7 @@ 
 		# execute delete
 		if(!$this->Admin->object_modify ("vrf", "delete", "vrfId", $values))
 													{ $this->Response->throw_exception(500, "Vrf delete failed"); }
-		else {
+													else {
 			// delete all references
 			$this->Admin->remove_object_references ("subnets", "vrfId", $this->_params->id);
 

Indentation +306 added lines, -306 removed lines

@@ -9,269 +9,269 @@ 
 class Vrfs_controller extends Common_api_functions {
 
 
-	/**
-	 * _params [provided
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $_params;
-
-	/**
-	 * Database object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Database;
-
-	/**
-	 * Master Sections object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Sections;
-
-	/**
-	 * Master Subnets object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Subnets;
-
-	/**
-	 * Master Tools object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Tools;
-
-	/**
-	 * Master  Admin object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Admin;
-
-
-	/**
-	 * __construct function
-	 *
-	 * @access public
-	 * @param class $Database
-	 * @param class $Tools
-	 * @param mixed $params		// post/get values
-	 * @param class $Response
-	 */
-	public function __construct($Database, $Tools, $params, $Response) {
-		$this->Database = $Database;
-		$this->Tools 	= $Tools;
-		$this->_params 	= $params;
-		$this->Response = $Response;
-		// init required objects
-		$this->init_object ("Admin", $Database);
-		$this->init_object ("Subnets", $Database);
-		// set valid keys
-		$this->set_valid_keys ("vrf");
-	}
-
-
-
-
-
-
-	/**
-	 * Returns json encoded options
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function OPTIONS () {
-		// validate
-		$this->validate_options_request ();
-
-		// methods
-		$result['methods'] = array(
-								array("href"=>"/api/".$this->_params->app_id."/vrfs/", 		"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
-								array("href"=>"/api/".$this->_params->app_id."/vrfs/{id}/", "methods"=>array(array("rel"=>"read", 	"method"=>"GET"),
-																											 array("rel"=>"create", "method"=>"POST"),
-																											 array("rel"=>"update", "method"=>"PATCH"),
-																											 array("rel"=>"delete", "method"=>"DELETE"))),
-							);
-		# result
-		return array("code"=>200, "data"=>$result);
-	}
-
-
-
-
-
-
-	/**
-	 * Read vrf
-	 *
-	 *	identifiers:
-	 *		- NONE				// returns all VRFs
-	 *		- {id}				// returns VRF by id
-	 *		- {id}/subnets/		// subnets inside vrf
-	 *
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function GET () {
-		// all
-		if (!isset($this->_params->id)) {
-			$result = $this->Tools->fetch_all_objects ("vrf", 'vrfId');
-			// check result
-			if($result===false)						{ $this->Response->throw_exception(404, 'No vrfs configured'); }
-			else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
-		}
-		// subnets
-		elseif (isset($this->_params->id2)) {
-			// subnets
-			if ($this->_params->id2 == "subnets") {
-				// validate
-				$this->validate_vrf ();
-				// fetch
-				$result = $this->Tools->fetch_multiple_objects ("subnets", "vrfId", $this->_params->id, 'subnet', true);
-				// add gateway if present
-    			if($result!=false) {
-    				foreach ($result as $k=>$r) {
-                		$gateway = $this->read_subnet_gateway ($r->id);
-                		if ( $gateway!== false) {
-                    		$result[$k]->gatewayId = $gateway->id;
-                		}
-    				}
-    			}
-
-				// check result
-				if($result===false)					{ $this->Response->throw_exception(404, 'No subnets belonging to this vrf'); }
-				else								{ return array("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
-			}
-			// error
-			else {
-													{ $this->Response->throw_exception(400, "Invalid identifier"); }
-			}
-		}
-		// by id
-		else {
-			// validate
-			$this->validate_vrf ();
-			// fetch
-			$result = $this->Tools->fetch_object ("vrf", "vrfId", $this->_params->id);
-			// check result
-			if($result==NULL)						{ $this->Response->throw_exception(404, "VRF not found"); }
-			else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
-		}
-	}
-
-
-
-
-
-	/**
-	 * HEAD, no response
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function HEAD () {
-		return $this->GET ();
-	}
-
-
+    /**
+     * _params [provided
+     *
+     * @var mixed
+     * @access public
+     */
+    public $_params;
+
+    /**
+     * Database object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Database;
+
+    /**
+     * Master Sections object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Sections;
+
+    /**
+     * Master Subnets object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Subnets;
+
+    /**
+     * Master Tools object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Tools;
+
+    /**
+     * Master  Admin object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Admin;
+
+
+    /**
+     * __construct function
+     *
+     * @access public
+     * @param class $Database
+     * @param class $Tools
+     * @param mixed $params		// post/get values
+     * @param class $Response
+     */
+    public function __construct($Database, $Tools, $params, $Response) {
+        $this->Database = $Database;
+        $this->Tools 	= $Tools;
+        $this->_params 	= $params;
+        $this->Response = $Response;
+        // init required objects
+        $this->init_object ("Admin", $Database);
+        $this->init_object ("Subnets", $Database);
+        // set valid keys
+        $this->set_valid_keys ("vrf");
+    }
+
+
+
+
+
+
+    /**
+     * Returns json encoded options
+     *
+     * @access public
+     * @return void
+     */
+    public function OPTIONS () {
+        // validate
+        $this->validate_options_request ();
+
+        // methods
+        $result['methods'] = array(
+                                array("href"=>"/api/".$this->_params->app_id."/vrfs/", 		"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
+                                array("href"=>"/api/".$this->_params->app_id."/vrfs/{id}/", "methods"=>array(array("rel"=>"read", 	"method"=>"GET"),
+                                                                                                                array("rel"=>"create", "method"=>"POST"),
+                                                                                                                array("rel"=>"update", "method"=>"PATCH"),
+                                                                                                                array("rel"=>"delete", "method"=>"DELETE"))),
+                            );
+        # result
+        return array("code"=>200, "data"=>$result);
+    }
+
+
+
+
+
+
+    /**
+     * Read vrf
+     *
+     *	identifiers:
+     *		- NONE				// returns all VRFs
+     *		- {id}				// returns VRF by id
+     *		- {id}/subnets/		// subnets inside vrf
+     *
+     *
+     * @access public
+     * @return void
+     */
+    public function GET () {
+        // all
+        if (!isset($this->_params->id)) {
+            $result = $this->Tools->fetch_all_objects ("vrf", 'vrfId');
+            // check result
+            if($result===false)						{ $this->Response->throw_exception(404, 'No vrfs configured'); }
+            else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+        }
+        // subnets
+        elseif (isset($this->_params->id2)) {
+            // subnets
+            if ($this->_params->id2 == "subnets") {
+                // validate
+                $this->validate_vrf ();
+                // fetch
+                $result = $this->Tools->fetch_multiple_objects ("subnets", "vrfId", $this->_params->id, 'subnet', true);
+                // add gateway if present
+                if($result!=false) {
+                    foreach ($result as $k=>$r) {
+                        $gateway = $this->read_subnet_gateway ($r->id);
+                        if ( $gateway!== false) {
+                            $result[$k]->gatewayId = $gateway->id;
+                        }
+                    }
+                }
+
+                // check result
+                if($result===false)					{ $this->Response->throw_exception(404, 'No subnets belonging to this vrf'); }
+                else								{ return array("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
+            }
+            // error
+            else {
+                                                    { $this->Response->throw_exception(400, "Invalid identifier"); }
+            }
+        }
+        // by id
+        else {
+            // validate
+            $this->validate_vrf ();
+            // fetch
+            $result = $this->Tools->fetch_object ("vrf", "vrfId", $this->_params->id);
+            // check result
+            if($result==NULL)						{ $this->Response->throw_exception(404, "VRF not found"); }
+            else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+        }
+    }
+
+
+
+
+
+    /**
+     * HEAD, no response
+     *
+     * @access public
+     * @return void
+     */
+    public function HEAD () {
+        return $this->GET ();
+    }
+
+
 
 
 
-	/**
-	 * Creates new VRF
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function POST () {
-		# check for valid keys
-		$values = $this->validate_keys ();
-
-		# validate input
-		$this->validate_vrf_edit ();
+    /**
+     * Creates new VRF
+     *
+     * @access public
+     * @return void
+     */
+    public function POST () {
+        # check for valid keys
+        $values = $this->validate_keys ();
+
+        # validate input
+        $this->validate_vrf_edit ();
 
-		# execute update
-		if(!$this->Admin->object_modify ("vrf", "add", "vrfId", $values))
-													{ $this->Response->throw_exception(500, "VRF creation failed"); }
-		else {
-			//set result
-			return array("code"=>201, "data"=>"VRF created", "location"=>"/api/".$this->_params->app_id."/vrfs/".$this->Admin->lastId."/");
-		}
-	}
-
-
-
-
-
-	/**
-	 * Updates existing vrf
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function PATCH () {
-		# verify
-		$this->validate_vrf ();
-		# check that it exists
-		$this->validate_vrf_edit ();
-
-		# rewrite id
-		$this->_params->vrfId = $this->_params->id;
-		unset($this->_params->id);
-
-		# validate and prepare keys
-		$values = $this->validate_keys ();
-
-		# execute update
-		if(!$this->Admin->object_modify ("vrf", "edit", "vrfId", $values))
-													{ $this->Response->throw_exception(500, "Vrf edit failed"); }
-		else {
-			//set result
-			return array("code"=>200, "data"=>"VRF updated");
-		}
-	}
-
-
-
-
-
-
-	/**
-	 * Deletes existing vrf
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function DELETE () {
-		# check that vrf exists
-		$this->validate_vrf ();
+        # execute update
+        if(!$this->Admin->object_modify ("vrf", "add", "vrfId", $values))
+                                                    { $this->Response->throw_exception(500, "VRF creation failed"); }
+        else {
+            //set result
+            return array("code"=>201, "data"=>"VRF created", "location"=>"/api/".$this->_params->app_id."/vrfs/".$this->Admin->lastId."/");
+        }
+    }
+
+
+
+
+
+    /**
+     * Updates existing vrf
+     *
+     * @access public
+     * @return void
+     */
+    public function PATCH () {
+        # verify
+        $this->validate_vrf ();
+        # check that it exists
+        $this->validate_vrf_edit ();
+
+        # rewrite id
+        $this->_params->vrfId = $this->_params->id;
+        unset($this->_params->id);
+
+        # validate and prepare keys
+        $values = $this->validate_keys ();
+
+        # execute update
+        if(!$this->Admin->object_modify ("vrf", "edit", "vrfId", $values))
+                                                    { $this->Response->throw_exception(500, "Vrf edit failed"); }
+        else {
+            //set result
+            return array("code"=>200, "data"=>"VRF updated");
+        }
+    }
+
+
+
+
+
+
+    /**
+     * Deletes existing vrf
+     *
+     * @access public
+     * @return void
+     */
+    public function DELETE () {
+        # check that vrf exists
+        $this->validate_vrf ();
 
-		# set variables for update
-		$values = array();
-		$values["vrfId"] = $this->_params->id;
+        # set variables for update
+        $values = array();
+        $values["vrfId"] = $this->_params->id;
 
-		# execute delete
-		if(!$this->Admin->object_modify ("vrf", "delete", "vrfId", $values))
-													{ $this->Response->throw_exception(500, "Vrf delete failed"); }
-		else {
-			// delete all references
-			$this->Admin->remove_object_references ("subnets", "vrfId", $this->_params->id);
+        # execute delete
+        if(!$this->Admin->object_modify ("vrf", "delete", "vrfId", $values))
+                                                    { $this->Response->throw_exception(500, "Vrf delete failed"); }
+        else {
+            // delete all references
+            $this->Admin->remove_object_references ("subnets", "vrfId", $this->_params->id);
 
-			// set result
-			return array("code"=>200, "data"=>"VRF deleted");
-		}
-	}
+            // set result
+            return array("code"=>200, "data"=>"VRF deleted");
+        }
+    }
 
 
 
@@ -282,63 +282,63 @@ 
 
 
 
-	/* @validations ---------- */
+    /* @validations ---------- */
 
 
 
-	/**
-	 * Validates VRF - checks if it exists
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_vrf () {
-		// validate id
-		if(!isset($this->_params->id))														{ $this->Response->throw_exception(400, "Vrf Id is required");  }
-		// validate number
-		if(!is_numeric($this->_params->id))													{ $this->Response->throw_exception(400, "Vrf Id must be numeric"); }
-		// check that it exists
-		if($this->Tools->fetch_object ("vrf", "vrfId", $this->_params->id) === false )		{ $this->Response->throw_exception(400, "Invalid VRF id"); }
-	}
+    /**
+     * Validates VRF - checks if it exists
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_vrf () {
+        // validate id
+        if(!isset($this->_params->id))														{ $this->Response->throw_exception(400, "Vrf Id is required");  }
+        // validate number
+        if(!is_numeric($this->_params->id))													{ $this->Response->throw_exception(400, "Vrf Id must be numeric"); }
+        // check that it exists
+        if($this->Tools->fetch_object ("vrf", "vrfId", $this->_params->id) === false )		{ $this->Response->throw_exception(400, "Invalid VRF id"); }
+    }
 
 
-	/**
-	 * Validates VRF on add and edit
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_vrf_edit () {
-		// check for POST method
-		if($_SERVER['REQUEST_METHOD']=="POST") {
-			// check name
-			if(strlen($this->_params->name)==0)												{ $this->Response->throw_exception(400, "VRF name is required"); }
-			// check that it exists
-			if($this->Tools->fetch_object ("vrf", "name", $this->_params->name) !== false )	{ $this->Response->throw_exception(400, "VRF with that name already exists"); }
-		}
-		// update check
-		else {
-			// old values
-			$vrf_old = $this->Tools->fetch_object ("vrf", "vrfId", $this->_params->id);
+    /**
+     * Validates VRF on add and edit
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_vrf_edit () {
+        // check for POST method
+        if($_SERVER['REQUEST_METHOD']=="POST") {
+            // check name
+            if(strlen($this->_params->name)==0)												{ $this->Response->throw_exception(400, "VRF name is required"); }
+            // check that it exists
+            if($this->Tools->fetch_object ("vrf", "name", $this->_params->name) !== false )	{ $this->Response->throw_exception(400, "VRF with that name already exists"); }
+        }
+        // update check
+        else {
+            // old values
+            $vrf_old = $this->Tools->fetch_object ("vrf", "vrfId", $this->_params->id);
 
-			if(isset($this->_params->name)) {
-				if ($this->_params->name != $vrf_old->name) {
-					if($this->Tools->fetch_object ("vrf", "name", $this->_params->name))	{ $this->Response->throw_exception(400, "VRF with that name already exists"); }
-				}
-			}
-		}
-	}
+            if(isset($this->_params->name)) {
+                if ($this->_params->name != $vrf_old->name) {
+                    if($this->Tools->fetch_object ("vrf", "name", $this->_params->name))	{ $this->Response->throw_exception(400, "VRF with that name already exists"); }
+                }
+            }
+        }
+    }
 
-	/**
-	 * Returns id of subnet gateay
-	 *
-	 * @access private
-	 * @params mixed $subnetId
-	 * @return void
-	 */
-	private function read_subnet_gateway ($subnetId) {
-    	return $this->Subnets->find_gateway ($subnetId);
-	}
+    /**
+     * Returns id of subnet gateay
+     *
+     * @access private
+     * @params mixed $subnetId
+     * @return void
+     */
+    private function read_subnet_gateway ($subnetId) {
+        return $this->Subnets->find_gateway ($subnetId);
+    }
 
 }
 

Spacing +36 added lines, -36 removed lines

@@ -67,9 +67,9 @@ 
 	 * @param mixed $params		// post/get values
 	 * @param class $Response
 	 */
-	public function __construct($Database, $Tools, $params, $Response) {
+	public function __construct ($Database, $Tools, $params, $Response) {
 		$this->Database = $Database;
-		$this->Tools 	= $Tools;
+		$this->Tools = $Tools;
 		$this->_params 	= $params;
 		$this->Response = $Response;
 		// init required objects
@@ -95,15 +95,15 @@ 
 		$this->validate_options_request ();
 
 		// methods
-		$result['methods'] = array(
-								array("href"=>"/api/".$this->_params->app_id."/vrfs/", 		"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
-								array("href"=>"/api/".$this->_params->app_id."/vrfs/{id}/", "methods"=>array(array("rel"=>"read", 	"method"=>"GET"),
-																											 array("rel"=>"create", "method"=>"POST"),
-																											 array("rel"=>"update", "method"=>"PATCH"),
-																											 array("rel"=>"delete", "method"=>"DELETE"))),
+		$result['methods'] = array (
+								array ("href"=>"/api/".$this->_params->app_id."/vrfs/", "methods"=>array (array ("rel"=>"options", "method"=>"OPTIONS"))),
+								array ("href"=>"/api/".$this->_params->app_id."/vrfs/{id}/", "methods"=>array (array ("rel"=>"read", "method"=>"GET"),
+																											 array ("rel"=>"create", "method"=>"POST"),
+																											 array ("rel"=>"update", "method"=>"PATCH"),
+																											 array ("rel"=>"delete", "method"=>"DELETE"))),
 							);
 		# result
-		return array("code"=>200, "data"=>$result);
+		return array ("code"=>200, "data"=>$result);
 	}
 
 
@@ -128,8 +128,8 @@ 
 		if (!isset($this->_params->id)) {
 			$result = $this->Tools->fetch_all_objects ("vrf", 'vrfId');
 			// check result
-			if($result===false)						{ $this->Response->throw_exception(404, 'No vrfs configured'); }
-			else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+			if ($result === false) { $this->Response->throw_exception (404, 'No vrfs configured'); }
+			else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 		}
 		// subnets
 		elseif (isset($this->_params->id2)) {
@@ -140,22 +140,22 @@ 
 				// fetch
 				$result = $this->Tools->fetch_multiple_objects ("subnets", "vrfId", $this->_params->id, 'subnet', true);
 				// add gateway if present
-    			if($result!=false) {
+    			if ($result != false) {
     				foreach ($result as $k=>$r) {
                 		$gateway = $this->read_subnet_gateway ($r->id);
-                		if ( $gateway!== false) {
+                		if ($gateway !== false) {
                     		$result[$k]->gatewayId = $gateway->id;
                 		}
     				}
     			}
 
 				// check result
-				if($result===false)					{ $this->Response->throw_exception(404, 'No subnets belonging to this vrf'); }
-				else								{ return array("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
+				if ($result === false) { $this->Response->throw_exception (404, 'No subnets belonging to this vrf'); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
 			}
 			// error
 			else {
-													{ $this->Response->throw_exception(400, "Invalid identifier"); }
+													{ $this->Response->throw_exception (400, "Invalid identifier"); }
 			}
 		}
 		// by id
@@ -165,8 +165,8 @@ 
 			// fetch
 			$result = $this->Tools->fetch_object ("vrf", "vrfId", $this->_params->id);
 			// check result
-			if($result==NULL)						{ $this->Response->throw_exception(404, "VRF not found"); }
-			else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+			if ($result == NULL) { $this->Response->throw_exception (404, "VRF not found"); }
+			else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 		}
 	}
 
@@ -202,11 +202,11 @@ 
 		$this->validate_vrf_edit ();
 
 		# execute update
-		if(!$this->Admin->object_modify ("vrf", "add", "vrfId", $values))
-													{ $this->Response->throw_exception(500, "VRF creation failed"); }
+		if (!$this->Admin->object_modify ("vrf", "add", "vrfId", $values))
+													{ $this->Response->throw_exception (500, "VRF creation failed"); }
 		else {
 			//set result
-			return array("code"=>201, "data"=>"VRF created", "location"=>"/api/".$this->_params->app_id."/vrfs/".$this->Admin->lastId."/");
+			return array ("code"=>201, "data"=>"VRF created", "location"=>"/api/".$this->_params->app_id."/vrfs/".$this->Admin->lastId."/");
 		}
 	}
 
@@ -234,11 +234,11 @@ 
 		$values = $this->validate_keys ();
 
 		# execute update
-		if(!$this->Admin->object_modify ("vrf", "edit", "vrfId", $values))
-													{ $this->Response->throw_exception(500, "Vrf edit failed"); }
+		if (!$this->Admin->object_modify ("vrf", "edit", "vrfId", $values))
+													{ $this->Response->throw_exception (500, "Vrf edit failed"); }
 		else {
 			//set result
-			return array("code"=>200, "data"=>"VRF updated");
+			return array ("code"=>200, "data"=>"VRF updated");
 		}
 	}
 
@@ -258,18 +258,18 @@ 
 		$this->validate_vrf ();
 
 		# set variables for update
-		$values = array();
+		$values = array ();
 		$values["vrfId"] = $this->_params->id;
 
 		# execute delete
-		if(!$this->Admin->object_modify ("vrf", "delete", "vrfId", $values))
-													{ $this->Response->throw_exception(500, "Vrf delete failed"); }
+		if (!$this->Admin->object_modify ("vrf", "delete", "vrfId", $values))
+													{ $this->Response->throw_exception (500, "Vrf delete failed"); }
 		else {
 			// delete all references
 			$this->Admin->remove_object_references ("subnets", "vrfId", $this->_params->id);
 
 			// set result
-			return array("code"=>200, "data"=>"VRF deleted");
+			return array ("code"=>200, "data"=>"VRF deleted");
 		}
 	}
 
@@ -294,11 +294,11 @@ 
 	 */
 	private function validate_vrf () {
 		// validate id
-		if(!isset($this->_params->id))														{ $this->Response->throw_exception(400, "Vrf Id is required");  }
+		if (!isset($this->_params->id)) { $this->Response->throw_exception (400, "Vrf Id is required"); }
 		// validate number
-		if(!is_numeric($this->_params->id))													{ $this->Response->throw_exception(400, "Vrf Id must be numeric"); }
+		if (!is_numeric ($this->_params->id)) { $this->Response->throw_exception (400, "Vrf Id must be numeric"); }
 		// check that it exists
-		if($this->Tools->fetch_object ("vrf", "vrfId", $this->_params->id) === false )		{ $this->Response->throw_exception(400, "Invalid VRF id"); }
+		if ($this->Tools->fetch_object ("vrf", "vrfId", $this->_params->id) === false) { $this->Response->throw_exception (400, "Invalid VRF id"); }
 	}
 
 
@@ -310,20 +310,20 @@ 
 	 */
 	private function validate_vrf_edit () {
 		// check for POST method
-		if($_SERVER['REQUEST_METHOD']=="POST") {
+		if ($_SERVER['REQUEST_METHOD'] == "POST") {
 			// check name
-			if(strlen($this->_params->name)==0)												{ $this->Response->throw_exception(400, "VRF name is required"); }
+			if (strlen ($this->_params->name) == 0) { $this->Response->throw_exception (400, "VRF name is required"); }
 			// check that it exists
-			if($this->Tools->fetch_object ("vrf", "name", $this->_params->name) !== false )	{ $this->Response->throw_exception(400, "VRF with that name already exists"); }
+			if ($this->Tools->fetch_object ("vrf", "name", $this->_params->name) !== false) { $this->Response->throw_exception (400, "VRF with that name already exists"); }
 		}
 		// update check
 		else {
 			// old values
 			$vrf_old = $this->Tools->fetch_object ("vrf", "vrfId", $this->_params->id);
 
-			if(isset($this->_params->name)) {
+			if (isset($this->_params->name)) {
 				if ($this->_params->name != $vrf_old->name) {
-					if($this->Tools->fetch_object ("vrf", "name", $this->_params->name))	{ $this->Response->throw_exception(400, "VRF with that name already exists"); }
+					if ($this->Tools->fetch_object ("vrf", "name", $this->_params->name)) { $this->Response->throw_exception (400, "VRF with that name already exists"); }
 				}
 			}
 		}

api/controllers/Subnets.php

Braces +5 added lines, -4 removed lines

@@ -248,7 +248,7 @@ 
 			# execute update
 			if(!$this->Subnets->modify_subnet ("edit", $values))
 														{ $this->Response->throw_exception(500, 'Subnet update failed'); }
-			else {
+														else {
 				return array("code"=>200, "data"=>"Subnet updated");
 			}
 		}
@@ -288,7 +288,7 @@ 
 			# execute update
 			if(!$this->Subnets->modify_subnet ("delete", $values))
 														{ $this->Response->throw_exception(500, "Failed to delete subnet"); }
-			else {
+														else {
 				//set result
 				return array("code"=>200, "data"=>"Subnet deleted");
 			}
@@ -413,7 +413,8 @@ 
 		# fetch all addresses and calculate usage
 		if($slaves) {
 			$addresses = $this->Addresses->fetch_subnet_addresses_recursive ($this->_params->id, false);
-		} else {
+		}
+		else {
 			$addresses = $this->Addresses->fetch_subnet_addresses ($this->_params->id);
 		}
 		// calculate
@@ -726,7 +727,7 @@ 
 		$this->settings = $this->Tools->fetch_object ("settings", "id", 1);
 
 		# get master subnet details for folder overrides
-		if($this->_params->masterSubnetId!=0)	{
+		if($this->_params->masterSubnetId!=0) {
 			$master_section = $this->Subnets->fetch_subnet(null, $this->_params->masterSubnetId);
 			if($master_section->isFolder==1)	{ $parent_is_folder = true; }
 			else								{ $parent_is_folder = false; }

Indentation +789 added lines, -789 removed lines

@@ -8,519 +8,519 @@ 
 class Subnets_controller extends Common_api_functions {
 
 
-	/**
-	 * _params provided
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $_params;
-
-	/**
-	 * custom_fields
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	public $custom_fields;
-
-	/**
-	 * settings
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $settings;
-
-	/**
-	 * Database object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Database;
-
-	/**
-	 * Response handler
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Response;
-
-	/**
-	 * Master Subnets object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Subnets;
-
-	/**
-	 * Master  Addresses object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Addresses;
-
-	/**
-	 * Master Tools object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Tools;
-
-
-	/**
-	 * __construct function
-	 *
-	 * @access public
-	 * @param class $Database
-	 * @param class $Tools
-	 * @param mixed $params		// post/get values
-	 */
-	public function __construct($Database, $Tools, $params, $Response) {
-		$this->Database = $Database;
-		$this->Tools 	= $Tools;
-		$this->_params 	= $params;
-		$this->Response = $Response;
-		// init required objects
-		$this->init_object ("Subnets", $Database);
-		$this->init_object ("Addresses", $Database);
-		// set valid keys
-		$this->set_valid_keys ("subnets");
-	}
-
-
-
-
-
-	/**
-	 * Returns json encoded options
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function OPTIONS () {
-		// validate
-		$this->validate_options_request ();
-
-		// methods
-		$result = array();
-		$result['methods'] = array(
-								array("href"=>"/api/".$this->_params->app_id."/subnets/", 		"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
-								array("href"=>"/api/".$this->_params->app_id."/subnets/{id}/", 	"methods"=>array(array("rel"=>"read", 	"method"=>"GET"),
-																												 array("rel"=>"create", "method"=>"POST"),
-																												 array("rel"=>"update", "method"=>"PATCH"),
-																												 array("rel"=>"delete", "method"=>"DELETE"))),
-							);
-		# result
-		return array("code"=>200, "data"=>$result);
-	}
-
-
-
-
-	/**
-	 * Creates new subnet
-	 *
-	 *	required params : subnet, mask, name
-	 *	optional params : all subnet values
-	 *
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function POST () {
-		# add required parameters
-		if(!isset($this->_params->isFolder)) { $this->_params->isFolder = "0"; }
-		elseif($this->_params->isFolder==1)	 { unset($this->_params->subnet, $this->_params->mask); }
-
-		# validate parameters
-		$this->validate_create_parameters ();
-
-		# check for valid keys
-		$values = $this->validate_keys ();
-
-		# transform subnet to decimal format
-		$values['subnet'] = $this->Addresses->transform_address($values['subnet'] ,"decimal");
-
-		# execute
-		if(!$this->Subnets->modify_subnet ("add", $values)) {
-			$this->Response->throw_exception(500, "Failed to create subnet");
-		}
-		else {
-			//set result
-			return array("code"=>201, "data"=>"Subnet created", "location"=>"/api/".$this->_params->app_id."/subnets/".$this->Subnets->lastInsertId."/");
-		}
-	}
-
-
-
-
-
-	/**
-	 * Reads subnet functions
-	 *
-	 *	Identifier can be:
-	 *		- {id}
-	 *		- custom_fields				// returns custom fields
-	 *		- {subnet}					// subnets in CIDR format
-	 *		- {id}/usage/				// returns subnet usage
-	 *		- {id}/first_free/			// returns first available address in subnet
-	 *		- {id}/slaves/ 				// returns all immediate slave subnets
-	 *		- {id}/slaves_recursive/ 	// returns all slave subnets recursively
-	 *		- {id}/addresses/			// returns all IP addresses in subnet
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function GET () {
-		// cidr check
-		// check if id2 is set ?
-		if(isset($this->_params->id2)) {
-			// is IP address provided
-			if($this->_params->id=="cidr") {
-				$result = $this->read_search_subnet ();
-				// check result
-				if($result==NULL)						{ $this->Response->throw_exception(404, "No subnets found"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
-			}
-			else {
-				// validate id
-				$this->validate_subnet_id ();
-			}
-
-			// addresses in subnet
-			if($this->_params->id2=="addresses") {
-				$result = $this->read_subnet_addresses ();
-				// check result
-				if($result===false)						{ $this->Response->throw_exception(404, "No addresses found"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, "addresses", true, true)); }
-			}
-			// slaves
-			elseif($this->_params->id2=="slaves") {
-				$result = $this->read_subnet_slaves ();
-				// check result
-				if($result==NULL)						{ $this->Response->throw_exception(404, "No slaves"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
-			}
-			// slaves-recursive
-			elseif ($this->_params->id2=="slaves_recursive") {
-				$result = $this->read_subnet_slaves_recursive ();
-				// check result
-				if($result==NULL)						{ $this->Response->throw_exception(404, "No slaves"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
-			}
-			// usage
-			elseif ($this->_params->id2=="usage") 		{ return array("code"=>200, "data"=>$this->subnet_usage ()); }
-			// first available address
-			elseif ($this->_params->id2=="first_free") 	{ return array("code"=>200, "data"=>$this->subnet_first_free ());  }
-			// fail
-			else										{ $this->Response->throw_exception(400, 'Invalid request'); }
-		}
-		// custom fields
-		elseif ($this->_params->id=="custom_fields") {
-			// check result
-			if(sizeof($this->custom_fields)==0)			{ $this->Response->throw_exception(404, 'No custom fields defined'); }
-			else										{ return array("code"=>200, "data"=>$this->custom_fields); }
-		}
-		// id
-		elseif (is_numeric($this->_params->id)) {
-			$result = $this->read_subnet ();
-			// check result
-			if($result==NULL)							{ $this->Response->throw_exception(404, "Invalid Id"); }
-			else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
-		}
-		// false
-		else 											{ $this->Response->throw_exception(404, 'Invalid Id'); }
-	}
-
-
-
-
-
-	/**
-	 * HEAD, no response
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function HEAD () {
-		return $this->GET ();
-	}
-
-
-
-
-
-
-	/**
-	 * Updates existing subnet
-	 *
-	 *	required params : id
-	 *	forbidden params : subnet, mask
-	 *
-	 *	if id2 is present than execute:
-	 *		- {id}/resize/
-	 *		- {id}/split/
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function PATCH () {
-		// Check for id
-		$this->validate_subnet_id ();
-
-		// check if id2 is set > additional methods
-		if(isset($this->_params->id2)) {
-			// resize
-			if($this->_params->id2=="resize") 			{ return $this->subnet_resize (); }
-			// split
-			elseif($this->_params->id2=="split") 		{ return $this->subnet_split (); }
-			// error
-			else										{ $this->Response->throw_exception(400, 'Invalid parameters'); }
-		}
-		// ok, normal update
-		else {
-			// new section
-			if(isset($this->_params->sectionId)) 		{ $this->validate_section (); }
-
-			// validate vlan and vrf
-			$this->validate_vlan ();
-			$this->validate_vrf ();
-
-			// if subnet is provided die
-			if(isset($this->_params->subnet))			{ $this->Response->throw_exception(400, 'Subnet cannot be changed'); }
-			if(isset($this->_params->mask))				{ $this->Response->throw_exception(400, 'To change mask use resize method'); }
-
-			# check for valid keys
-			$values = $this->validate_keys ();
-			// add id
-			$values["id"] = $this->_params->id;
-
-			# execute update
-			if(!$this->Subnets->modify_subnet ("edit", $values))
-														{ $this->Response->throw_exception(500, 'Subnet update failed'); }
-			else {
-				return array("code"=>200, "data"=>"Subnet updated");
-			}
-		}
-	}
-
-
-
-
-
-	/**
-	 * Deletes existing subnet along with and addresses
-	 *
-	 *	required params : id
-	 *
-	 *	if id2 is present than execute:
-	 *		- {id}/truncate/
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function DELETE () {
-		// Check for id
-		$this->validate_subnet_id ();
-
-		// check if id2 is set > additional methods
-		if(isset($this->_params->id2)) {
-			// truncate
-			if($this->_params->id2=="truncate") 		{ return $this->subnet_truncate (); }
-			// error
-			else										{ $this->Response->throw_exception(400, 'Invalid parameters'); }
-		}
-		// ok, delete subnet
-		else {
-			# set variables for delete
-			$values = array();
-			$values["id"] = $this->_params->id;
-
-			# execute update
-			if(!$this->Subnets->modify_subnet ("delete", $values))
-														{ $this->Response->throw_exception(500, "Failed to delete subnet"); }
-			else {
-				//set result
-				return array("code"=>200, "data"=>"Subnet deleted");
-			}
-		}
-	}
-
-
-
-
-
-	/**
-	 * Truncates subnet
-	 *
-	 *	required params : id
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function subnet_truncate () {
-		// Check for id
-		$this->validate_subnet_id ();
-		// ok, try to truncate
-		$this->Subnets->modify_subnet ("truncate", (array) $this->_params);
-		//set result
-		return array("code"=>200, "data"=>"Subnet truncated");
-	}
-
-
-
-
-
-	/**
-	 * Resize subnet
-	 *
-	 *	required params : id, mask
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function subnet_resize () {
-		// Check for id
-		$this->validate_subnet_id ();
-
-		// validate input parmeters
-		if(!isset($this->_params->mask))				{ $this->Response->throw_exception(400, "Subnet mask not provided"); }
-
-		// fetch old subnet
-		$old_subnet = $this->Subnets->fetch_subnet ("id", $this->_params->id);
-
-		// validate resizing
-		$this->Subnets->verify_subnet_resize ($old_subnet->subnet, $this->_params->mask, $this->_params->id, $old_subnet->vrfId, $old_subnet->masterSubnetId, $old_subnet->mask, $old_subnet->sectionId);
-
-		// regenerate subnet if needed
-		if ($old_subnet->mask < $this->_params->mask) {
-			$subnet_new = $old_subnet->subnet;
-		}
-		else {
-			$new_boundaries = $this->Subnets->get_network_boundaries ($this->Subnets->transform_address($old_subnet->subnet, "dotted"), $this->_params->mask);
-			$subnet_new 	= $this->Subnets->transform_address($new_boundaries['network'], "decimal");
-		}
+    /**
+     * _params provided
+     *
+     * @var mixed
+     * @access public
+     */
+    public $_params;
+
+    /**
+     * custom_fields
+     *
+     * @var mixed
+     * @access protected
+     */
+    public $custom_fields;
+
+    /**
+     * settings
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $settings;
+
+    /**
+     * Database object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Database;
+
+    /**
+     * Response handler
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Response;
+
+    /**
+     * Master Subnets object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Subnets;
+
+    /**
+     * Master  Addresses object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Addresses;
+
+    /**
+     * Master Tools object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Tools;
+
+
+    /**
+     * __construct function
+     *
+     * @access public
+     * @param class $Database
+     * @param class $Tools
+     * @param mixed $params		// post/get values
+     */
+    public function __construct($Database, $Tools, $params, $Response) {
+        $this->Database = $Database;
+        $this->Tools 	= $Tools;
+        $this->_params 	= $params;
+        $this->Response = $Response;
+        // init required objects
+        $this->init_object ("Subnets", $Database);
+        $this->init_object ("Addresses", $Database);
+        // set valid keys
+        $this->set_valid_keys ("subnets");
+    }
+
+
+
+
+
+    /**
+     * Returns json encoded options
+     *
+     * @access public
+     * @return void
+     */
+    public function OPTIONS () {
+        // validate
+        $this->validate_options_request ();
+
+        // methods
+        $result = array();
+        $result['methods'] = array(
+                                array("href"=>"/api/".$this->_params->app_id."/subnets/", 		"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
+                                array("href"=>"/api/".$this->_params->app_id."/subnets/{id}/", 	"methods"=>array(array("rel"=>"read", 	"method"=>"GET"),
+                                                                                                                    array("rel"=>"create", "method"=>"POST"),
+                                                                                                                    array("rel"=>"update", "method"=>"PATCH"),
+                                                                                                                    array("rel"=>"delete", "method"=>"DELETE"))),
+                            );
+        # result
+        return array("code"=>200, "data"=>$result);
+    }
+
+
+
+
+    /**
+     * Creates new subnet
+     *
+     *	required params : subnet, mask, name
+     *	optional params : all subnet values
+     *
+     *
+     * @access public
+     * @return void
+     */
+    public function POST () {
+        # add required parameters
+        if(!isset($this->_params->isFolder)) { $this->_params->isFolder = "0"; }
+        elseif($this->_params->isFolder==1)	 { unset($this->_params->subnet, $this->_params->mask); }
+
+        # validate parameters
+        $this->validate_create_parameters ();
+
+        # check for valid keys
+        $values = $this->validate_keys ();
+
+        # transform subnet to decimal format
+        $values['subnet'] = $this->Addresses->transform_address($values['subnet'] ,"decimal");
+
+        # execute
+        if(!$this->Subnets->modify_subnet ("add", $values)) {
+            $this->Response->throw_exception(500, "Failed to create subnet");
+        }
+        else {
+            //set result
+            return array("code"=>201, "data"=>"Subnet created", "location"=>"/api/".$this->_params->app_id."/subnets/".$this->Subnets->lastInsertId."/");
+        }
+    }
+
+
+
+
+
+    /**
+     * Reads subnet functions
+     *
+     *	Identifier can be:
+     *		- {id}
+     *		- custom_fields				// returns custom fields
+     *		- {subnet}					// subnets in CIDR format
+     *		- {id}/usage/				// returns subnet usage
+     *		- {id}/first_free/			// returns first available address in subnet
+     *		- {id}/slaves/ 				// returns all immediate slave subnets
+     *		- {id}/slaves_recursive/ 	// returns all slave subnets recursively
+     *		- {id}/addresses/			// returns all IP addresses in subnet
+     *
+     * @access public
+     * @return void
+     */
+    public function GET () {
+        // cidr check
+        // check if id2 is set ?
+        if(isset($this->_params->id2)) {
+            // is IP address provided
+            if($this->_params->id=="cidr") {
+                $result = $this->read_search_subnet ();
+                // check result
+                if($result==NULL)						{ $this->Response->throw_exception(404, "No subnets found"); }
+                else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+            }
+            else {
+                // validate id
+                $this->validate_subnet_id ();
+            }
+
+            // addresses in subnet
+            if($this->_params->id2=="addresses") {
+                $result = $this->read_subnet_addresses ();
+                // check result
+                if($result===false)						{ $this->Response->throw_exception(404, "No addresses found"); }
+                else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, "addresses", true, true)); }
+            }
+            // slaves
+            elseif($this->_params->id2=="slaves") {
+                $result = $this->read_subnet_slaves ();
+                // check result
+                if($result==NULL)						{ $this->Response->throw_exception(404, "No slaves"); }
+                else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+            }
+            // slaves-recursive
+            elseif ($this->_params->id2=="slaves_recursive") {
+                $result = $this->read_subnet_slaves_recursive ();
+                // check result
+                if($result==NULL)						{ $this->Response->throw_exception(404, "No slaves"); }
+                else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+            }
+            // usage
+            elseif ($this->_params->id2=="usage") 		{ return array("code"=>200, "data"=>$this->subnet_usage ()); }
+            // first available address
+            elseif ($this->_params->id2=="first_free") 	{ return array("code"=>200, "data"=>$this->subnet_first_free ());  }
+            // fail
+            else										{ $this->Response->throw_exception(400, 'Invalid request'); }
+        }
+        // custom fields
+        elseif ($this->_params->id=="custom_fields") {
+            // check result
+            if(sizeof($this->custom_fields)==0)			{ $this->Response->throw_exception(404, 'No custom fields defined'); }
+            else										{ return array("code"=>200, "data"=>$this->custom_fields); }
+        }
+        // id
+        elseif (is_numeric($this->_params->id)) {
+            $result = $this->read_subnet ();
+            // check result
+            if($result==NULL)							{ $this->Response->throw_exception(404, "Invalid Id"); }
+            else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
+        }
+        // false
+        else 											{ $this->Response->throw_exception(404, 'Invalid Id'); }
+    }
+
+
+
+
 
-		# set update values
-		$values = array("id"=>$this->_params->id,
-						"subnet"=>$subnet_new,
-						"mask"=>$this->_params->mask
-						);
-		$this->Subnets->modify_subnet ("resize", $values);
-
-		//set result
-		return array("code"=>200, "data"=>"Subnet truncated");
-	}
-
-
-
-
-
-	/**
-	 * Splits existing network into new networks
-	 *
-	 *	required params : id, number
-	 *	optional params : group (default yes), strict (default yes), prefix
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function subnet_split () {
-		// Check for id
-		$this->validate_subnet_id ();
+    /**
+     * HEAD, no response
+     *
+     * @access public
+     * @return void
+     */
+    public function HEAD () {
+        return $this->GET ();
+    }
 
-		// validate input parmeters
-		if(!is_numeric($this->_params->number))			{ $this->Response->throw_exception(400, "Invalid number of new subnets"); }
-		if(!isset($this->_params->group))				{ $this->_params->group = "yes"; }
-		if(!isset($this->_params->strict))				{ $this->_params->strict = "yes"; }
 
-		// fetch old subnet
-		$subnet_old = $this->Subnets->fetch_subnet ("id", $this->_params->id);
-		// create new subnets and move addresses
-		$this->Subnets->subnet_split ($subnet_old, $this->_params->number, $this->_params->prefix, $this->_params->group, $this->_params->strict);
 
-		//set result
-		return array("code"=>200, "data"=>"Subnet splitted");
-	}
 
 
 
+    /**
+     * Updates existing subnet
+     *
+     *	required params : id
+     *	forbidden params : subnet, mask
+     *
+     *	if id2 is present than execute:
+     *		- {id}/resize/
+     *		- {id}/split/
+     *
+     * @access public
+     * @return void
+     */
+    public function PATCH () {
+        // Check for id
+        $this->validate_subnet_id ();
+
+        // check if id2 is set > additional methods
+        if(isset($this->_params->id2)) {
+            // resize
+            if($this->_params->id2=="resize") 			{ return $this->subnet_resize (); }
+            // split
+            elseif($this->_params->id2=="split") 		{ return $this->subnet_split (); }
+            // error
+            else										{ $this->Response->throw_exception(400, 'Invalid parameters'); }
+        }
+        // ok, normal update
+        else {
+            // new section
+            if(isset($this->_params->sectionId)) 		{ $this->validate_section (); }
+
+            // validate vlan and vrf
+            $this->validate_vlan ();
+            $this->validate_vrf ();
+
+            // if subnet is provided die
+            if(isset($this->_params->subnet))			{ $this->Response->throw_exception(400, 'Subnet cannot be changed'); }
+            if(isset($this->_params->mask))				{ $this->Response->throw_exception(400, 'To change mask use resize method'); }
+
+            # check for valid keys
+            $values = $this->validate_keys ();
+            // add id
+            $values["id"] = $this->_params->id;
+
+            # execute update
+            if(!$this->Subnets->modify_subnet ("edit", $values))
+                                                        { $this->Response->throw_exception(500, 'Subnet update failed'); }
+            else {
+                return array("code"=>200, "data"=>"Subnet updated");
+            }
+        }
+    }
+
 
 
-	/**
-	 * Calculates subnet usage
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function subnet_usage () {
-		# check that section exists
-		if(sizeof($subnet = $this->Subnets->fetch_subnet ("id", $this->_params->id))==0)
-														{ $this->Response->throw_exception(400, "Subnet does not exist"); }
 
-		# set slaves
-		$slaves = $this->Subnets->has_slaves ($this->_params->id) ? true : false;
 
-		# fetch all addresses and calculate usage
-		if($slaves) {
-			$addresses = $this->Addresses->fetch_subnet_addresses_recursive ($this->_params->id, false);
-		} else {
-			$addresses = $this->Addresses->fetch_subnet_addresses ($this->_params->id);
-		}
-		// calculate
-		$subnet_usage  = $this->Subnets->calculate_subnet_usage (gmp_strval(sizeof($addresses)), $subnet->mask, $subnet->subnet, $subnet->isFull );		//Calculate free/used etc
+    /**
+     * Deletes existing subnet along with and addresses
+     *
+     *	required params : id
+     *
+     *	if id2 is present than execute:
+     *		- {id}/truncate/
+     *
+     * @access public
+     * @return void
+     */
+    public function DELETE () {
+        // Check for id
+        $this->validate_subnet_id ();
 
-		# return
-		return $subnet_usage;
-	}
+        // check if id2 is set > additional methods
+        if(isset($this->_params->id2)) {
+            // truncate
+            if($this->_params->id2=="truncate") 		{ return $this->subnet_truncate (); }
+            // error
+            else										{ $this->Response->throw_exception(400, 'Invalid parameters'); }
+        }
+        // ok, delete subnet
+        else {
+            # set variables for delete
+            $values = array();
+            $values["id"] = $this->_params->id;
+
+            # execute update
+            if(!$this->Subnets->modify_subnet ("delete", $values))
+                                                        { $this->Response->throw_exception(500, "Failed to delete subnet"); }
+            else {
+                //set result
+                return array("code"=>200, "data"=>"Subnet deleted");
+            }
+        }
+    }
+
+
+
+
+
+    /**
+     * Truncates subnet
+     *
+     *	required params : id
+     *
+     * @access private
+     * @return void
+     */
+    private function subnet_truncate () {
+        // Check for id
+        $this->validate_subnet_id ();
+        // ok, try to truncate
+        $this->Subnets->modify_subnet ("truncate", (array) $this->_params);
+        //set result
+        return array("code"=>200, "data"=>"Subnet truncated");
+    }
+
+
+
+
+
+    /**
+     * Resize subnet
+     *
+     *	required params : id, mask
+     *
+     * @access private
+     * @return void
+     */
+    private function subnet_resize () {
+        // Check for id
+        $this->validate_subnet_id ();
+
+        // validate input parmeters
+        if(!isset($this->_params->mask))				{ $this->Response->throw_exception(400, "Subnet mask not provided"); }
+
+        // fetch old subnet
+        $old_subnet = $this->Subnets->fetch_subnet ("id", $this->_params->id);
+
+        // validate resizing
+        $this->Subnets->verify_subnet_resize ($old_subnet->subnet, $this->_params->mask, $this->_params->id, $old_subnet->vrfId, $old_subnet->masterSubnetId, $old_subnet->mask, $old_subnet->sectionId);
+
+        // regenerate subnet if needed
+        if ($old_subnet->mask < $this->_params->mask) {
+            $subnet_new = $old_subnet->subnet;
+        }
+        else {
+            $new_boundaries = $this->Subnets->get_network_boundaries ($this->Subnets->transform_address($old_subnet->subnet, "dotted"), $this->_params->mask);
+            $subnet_new 	= $this->Subnets->transform_address($new_boundaries['network'], "decimal");
+        }
 
+        # set update values
+        $values = array("id"=>$this->_params->id,
+                        "subnet"=>$subnet_new,
+                        "mask"=>$this->_params->mask
+                        );
+        $this->Subnets->modify_subnet ("resize", $values);
 
+        //set result
+        return array("code"=>200, "data"=>"Subnet truncated");
+    }
 
 
 
-	/**
-	 * Returns first available address in subnet
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function subnet_first_free () {
-		// Check for id
-		$this->validate_subnet_id ();
-		// fetch
-		$first = $this->Addresses->get_first_available_address ($this->_params->id, $this->Subnets);
-		// available?
-		if($first===false)	{ $first = null; }
-		else				{ $first = $this->Addresses->transform_to_dotted($first); }
 
-		# return
-		return $first;
-	}
 
+    /**
+     * Splits existing network into new networks
+     *
+     *	required params : id, number
+     *	optional params : group (default yes), strict (default yes), prefix
+     *
+     * @access private
+     * @return void
+     */
+    private function subnet_split () {
+        // Check for id
+        $this->validate_subnet_id ();
 
+        // validate input parmeters
+        if(!is_numeric($this->_params->number))			{ $this->Response->throw_exception(400, "Invalid number of new subnets"); }
+        if(!isset($this->_params->group))				{ $this->_params->group = "yes"; }
+        if(!isset($this->_params->strict))				{ $this->_params->strict = "yes"; }
 
+        // fetch old subnet
+        $subnet_old = $this->Subnets->fetch_subnet ("id", $this->_params->id);
+        // create new subnets and move addresses
+        $this->Subnets->subnet_split ($subnet_old, $this->_params->number, $this->_params->prefix, $this->_params->group, $this->_params->strict);
 
+        //set result
+        return array("code"=>200, "data"=>"Subnet splitted");
+    }
 
 
-	/* @helper methods ---------- */
 
-	/**
-	 * Fetches subnet by id
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function read_subnet ($subnetId = null) {
-		// null
-		$subnetId = is_null($subnetId) ? $this->_params->id : $subnetId;
-		// fetch
-		$result = $this->Subnets->fetch_subnet ("id", $subnetId);
+
+
+    /**
+     * Calculates subnet usage
+     *
+     * @access private
+     * @return void
+     */
+    private function subnet_usage () {
+        # check that section exists
+        if(sizeof($subnet = $this->Subnets->fetch_subnet ("id", $this->_params->id))==0)
+                                                        { $this->Response->throw_exception(400, "Subnet does not exist"); }
+
+        # set slaves
+        $slaves = $this->Subnets->has_slaves ($this->_params->id) ? true : false;
+
+        # fetch all addresses and calculate usage
+        if($slaves) {
+            $addresses = $this->Addresses->fetch_subnet_addresses_recursive ($this->_params->id, false);
+        } else {
+            $addresses = $this->Addresses->fetch_subnet_addresses ($this->_params->id);
+        }
+        // calculate
+        $subnet_usage  = $this->Subnets->calculate_subnet_usage (gmp_strval(sizeof($addresses)), $subnet->mask, $subnet->subnet, $subnet->isFull );		//Calculate free/used etc
+
+        # return
+        return $subnet_usage;
+    }
+
+
+
+
+
+    /**
+     * Returns first available address in subnet
+     *
+     * @access public
+     * @return void
+     */
+    public function subnet_first_free () {
+        // Check for id
+        $this->validate_subnet_id ();
+        // fetch
+        $first = $this->Addresses->get_first_available_address ($this->_params->id, $this->Subnets);
+        // available?
+        if($first===false)	{ $first = null; }
+        else				{ $first = $this->Addresses->transform_to_dotted($first); }
+
+        # return
+        return $first;
+    }
+
+
+
+
+
+
+    /* @helper methods ---------- */
+
+    /**
+     * Fetches subnet by id
+     *
+     * @access private
+     * @return void
+     */
+    private function read_subnet ($subnetId = null) {
+        // null
+        $subnetId = is_null($subnetId) ? $this->_params->id : $subnetId;
+        // fetch
+        $result = $this->Subnets->fetch_subnet ("id", $subnetId);
         // add nameservers
         if($result!==false) {
             $ns = $this->read_subnet_nameserver($result->nameserverId);
@@ -528,307 +528,307 @@ 
                 $result->nameservers = $ns;
             }
         }
-		// fetch gateway
-		if(sizeof($result)>0) {
-    		$gateway = $this->read_subnet_gateway ();
-    		if ( $gateway!== false) {
-        		$result->gatewayId = $gateway->id;
-    		}
-		}
-		# result
-		return sizeof($result)==0 ? false : $result;
-	}
-
-	/**
-	 * Fetches all addresses in subnet
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function read_subnet_addresses () {
-		// fetch
-		$result = $this->Addresses->fetch_subnet_addresses ($this->_params->id);
-		# result
-		return sizeof($result)==0 ? false : $result;
-	}
-
-	/**
-	 * Returns id of subnet gateay
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function read_subnet_gateway () {
-    	return $this->Subnets->find_gateway ($this->_params->id);
-	}
-
-	/**
-	 * Returns nameserver details
-	 *
-	 * @access private
-	 * @param mixed $nsid
-	 * @return void
-	 */
-	private function read_subnet_nameserver ($nsid) {
-    	return $this->Tools->fetch_object ("nameservers", "id", $nsid);
-	}
-
-	/**
-	 * Returns all immediate subnet slaves
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function read_subnet_slaves () {
-		// fetch
-		$result = $this->Subnets->fetch_subnet_slaves ($this->_params->id);
-		# result
-		return $result===false ? NULL : $result;
-	}
-
-	/**
-	 * Returns all subnet slaves (recursive)
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function read_subnet_slaves_recursive () {
-		// get array of ids
-		$this->Subnets->fetch_subnet_slaves_recursive ($this->_params->id);
-		// fetch all;
-		foreach($this->Subnets->slaves as $s) {
-			$result[] = $this->read_subnet ($s);
-		}
-		# result
-		return $result===false ? NULL : $result;
-	}
-
-	/**
-	 * Searches for subnet in database
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function read_search_subnet () {
-		// transform
-		$this->_params->id2 = $this->Subnets->transform_address ($this->_params->id2, "decimal");
-		// check
-		$subnet = $this->Tools->fetch_multiple_objects ("subnets", "subnet", $this->_params->id2);
-		// validate mask
-		if($subnet!==false) {
-			foreach($subnet as $s) {
-				if($s->mask == $this->_params->id3) {
-					$result[] = $s;
-				}
-			}
-		}
-		# result
-		return !isset($result) ? false : $result;
-	}
-
-
-
-
-
-
-	/* @validations ---------- */
-
-	/**
-	 * Validates create parameters before adding new subnet
-	 *
-	 *	checks and validations - cidr check, issubnet, mastersubnet, sectionId
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_create_parameters () {
-		# make sure subnet is in dotted format for checks
-		$this->_params->subnet = $this->Addresses->transform_address($this->_params->subnet ,"dotted");
-
-		# cidr check
-		$this->validate_cidr ();
-		# verify that it is subnet
-		$this->validate_network ();
-		# verify that master subnet exists
-		$this->validate_master_subnet ();
-		# verify section
-		$this->validate_section ();
-		# verify folder
-		$this->validate_folder ();
-		# verify overlapping
-		$this->validate_overlapping ();
-		# verify vlan
-		$this->validate_vlan ();
-		# verify vrf
-		$this->validate_vrf ();
-	}
-
-	/**
-	 * Validates provided CIDR address
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_cidr () {
-		// not for folder
-		if($this->_params->isFolder!=1) {
-			// check
-			if(strlen($err = $this->Subnets->verify_cidr_address($this->_params->subnet."/".$this->_params->mask))>1)
-																									{ $this->Response->throw_exception(400, $err); }
-		}
-	}
-
-	/**
-	 * Validates that provided subnet is network and not host
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_network () {
-		// not for folder
-		if($this->_params->isFolder!=1) {
-			if(!$this->Addresses->is_network ($this->_params->subnet, $this->_params->mask))		{ $this->Response->throw_exception(400, "Address is not subnet"); }
-		}
-	}
-
-	/**
-	 * Validates master subnet
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_master_subnet () {
-		// set 0 if not set
-		if(!isset($this->_params->masterSubnetId) || $this->_params->masterSubnetId=="0") 			{ $this->_params->masterSubnetId = 0; }
-		else {
-			// validate subnet
-			if(sizeof($this->Subnets->fetch_subnet ("id", $this->_params->masterSubnetId))==0)		{ $this->Response->throw_exception(400, "Master Subnet does not exist (id=".$this->_params->masterSubnetId.")"); }
-			// check that it is inside subnet
-			else {
-				// not fr folders
-				if(@$this->_params->isFolder!=1) {
-					if(!$this->Subnets->verify_subnet_nesting ($this->_params->masterSubnetId, $this->_params->subnet."/".$this->_params->mask))
-																									{ $this->Response->throw_exception(400, "Subnet is not within boundaries of its master subnet"); }
-				}
-			}
-		}
-	}
-
-	/**
-	 * Validates section
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_section () {
-		// Section Id must be present and numeric
-		if(!isset($this->_params->sectionId))														{ $this->Response->throw_exception(400, "Invalid Section (".$this->_params->sectionId.")"); }
-		elseif(!is_numeric($this->_params->sectionId))												{ $this->Response->throw_exception(400, "Section Id must be numeric (".$this->_params->sectionId.")"); }
-		else {
-			if($this->Tools->fetch_object("sections", "id", $this->_params->sectionId)===false)		{ $this->Response->throw_exception(400, "Section id (".$this->_params->sectionId.") does not exist"); }
-		}
-	}
-
-	/**
-	 * Validates subnet by Id
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_subnet_id () {
-		// numberic
-		if(!is_numeric($this->_params->id))															{ $this->Response->throw_exception(400, "Subnet Id must be numeric (".$this->_params->id.")"); }
-		// check subnet
-		if(is_null($this->Subnets->fetch_subnet ("id", $this->_params->id)))						{ $this->Response->throw_exception(400, "Invalid subnet Id (".$this->_params->id.")"); }
-	}
-
-	/**
-	 * Folder validation
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_folder () {
-		// only fo folders
-		if(@$this->_params->isFolder==1) {
-			// if parent is set it must be a folder!
-			if($this->_params->masterSubnetId!=0) {
-				$parent = $this->Subnets->fetch_subnet ("id", $this->_params->masterSubnetId);
-				if($parent->isFolder!=1) 															{ $this->Response->throw_exception(400, "Parent is not a folder"); }
-			}
-		}
-	}
-
-	/**
-	 * Validates overlapping for newly created subnet
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_overlapping () {
-		// section details
-		$section = $this->Tools->fetch_object ("sections", "id", $this->_params->sectionId);
-		if($section===false)																		{ $this->Response->throw_exception(400, "Invalid section Id"); }
-		// settings
-		$this->settings = $this->Tools->fetch_object ("settings", "id", 1);
-
-		# get master subnet details for folder overrides
-		if($this->_params->masterSubnetId!=0)	{
-			$master_section = $this->Subnets->fetch_subnet(null, $this->_params->masterSubnetId);
-			if($master_section->isFolder==1)	{ $parent_is_folder = true; }
-			else								{ $parent_is_folder = false; }
-		}
-		else 									{ $parent_is_folder = false; }
-
-		// create cidr address
-		$cidr = $this->Addresses->transform_address($this->_params->subnet,"dotted")."/".$this->_params->mask;
-
-		// root subnet
-		if($this->_params->masterSubnetId==0) {
-			// check overlapping
-			if($section->strictMode==1 && !$parent_is_folder) {
-		    	/* verify that no overlapping occurs if we are adding root subnet only check for overlapping if vrf is empty or not exists! */
-		    	$overlap = $this->Subnets->verify_subnet_overlapping ($this->_params->sectionId, $cidr, $this->_params->vrfId);
-		    	if($overlap!==false) 																{ $this->Response->throw_exception(400, $overlap); }
-			}
-		}
-		// not root
-		else {
-		    //disable checks for folders and if strict check enabled
-		    if($section->strictMode==1 && !$parent_is_folder ) {
-			    //verify that nested subnet is inside root subnet
-		        if (!$this->Subnets->verify_subnet_nesting($this->_params->masterSubnetId, $cidr)) 	{ $this->Response->throw_exception(400, "Nested subnet not in root subnet"); }
-
-			    //nested?
-		        $overlap = $this->Subnets->verify_nested_subnet_overlapping($this->_params->sectionId, $cidr, $this->_params->vrfId, $this->_params->masterSubnetId);
-				if($overlap!==false) 																{ $this->Response->throw_exception(400, $overlap); }
-		    }
-		}
-	}
-
-	/**
-	 * Validates VLAN id
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_vlan () {
-		if(isset($this->_params->vlanId)) {
-			if($this->Tools->fetch_object("vlans", "vlanId", $this->_params->vlanId)===false)		{ $this->Response->throw_exception(400, "Vlan does not exist"); }
-		}
-	}
-
-	/**
-	 * Validates VRF id
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_vrf () {
-		if(isset($this->_params->vrfId)) {
-			if($this->Tools->fetch_object("vrf", "vrfId", $this->_params->vrfId)===false)			{ $this->Response->throw_exception(400, "VRF does not exist"); }
-		}
-	}
+        // fetch gateway
+        if(sizeof($result)>0) {
+            $gateway = $this->read_subnet_gateway ();
+            if ( $gateway!== false) {
+                $result->gatewayId = $gateway->id;
+            }
+        }
+        # result
+        return sizeof($result)==0 ? false : $result;
+    }
+
+    /**
+     * Fetches all addresses in subnet
+     *
+     * @access private
+     * @return void
+     */
+    private function read_subnet_addresses () {
+        // fetch
+        $result = $this->Addresses->fetch_subnet_addresses ($this->_params->id);
+        # result
+        return sizeof($result)==0 ? false : $result;
+    }
+
+    /**
+     * Returns id of subnet gateay
+     *
+     * @access private
+     * @return void
+     */
+    private function read_subnet_gateway () {
+        return $this->Subnets->find_gateway ($this->_params->id);
+    }
+
+    /**
+     * Returns nameserver details
+     *
+     * @access private
+     * @param mixed $nsid
+     * @return void
+     */
+    private function read_subnet_nameserver ($nsid) {
+        return $this->Tools->fetch_object ("nameservers", "id", $nsid);
+    }
+
+    /**
+     * Returns all immediate subnet slaves
+     *
+     * @access private
+     * @return void
+     */
+    private function read_subnet_slaves () {
+        // fetch
+        $result = $this->Subnets->fetch_subnet_slaves ($this->_params->id);
+        # result
+        return $result===false ? NULL : $result;
+    }
+
+    /**
+     * Returns all subnet slaves (recursive)
+     *
+     * @access private
+     * @return void
+     */
+    private function read_subnet_slaves_recursive () {
+        // get array of ids
+        $this->Subnets->fetch_subnet_slaves_recursive ($this->_params->id);
+        // fetch all;
+        foreach($this->Subnets->slaves as $s) {
+            $result[] = $this->read_subnet ($s);
+        }
+        # result
+        return $result===false ? NULL : $result;
+    }
+
+    /**
+     * Searches for subnet in database
+     *
+     * @access private
+     * @return void
+     */
+    private function read_search_subnet () {
+        // transform
+        $this->_params->id2 = $this->Subnets->transform_address ($this->_params->id2, "decimal");
+        // check
+        $subnet = $this->Tools->fetch_multiple_objects ("subnets", "subnet", $this->_params->id2);
+        // validate mask
+        if($subnet!==false) {
+            foreach($subnet as $s) {
+                if($s->mask == $this->_params->id3) {
+                    $result[] = $s;
+                }
+            }
+        }
+        # result
+        return !isset($result) ? false : $result;
+    }
+
+
+
+
+
+
+    /* @validations ---------- */
+
+    /**
+     * Validates create parameters before adding new subnet
+     *
+     *	checks and validations - cidr check, issubnet, mastersubnet, sectionId
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_create_parameters () {
+        # make sure subnet is in dotted format for checks
+        $this->_params->subnet = $this->Addresses->transform_address($this->_params->subnet ,"dotted");
+
+        # cidr check
+        $this->validate_cidr ();
+        # verify that it is subnet
+        $this->validate_network ();
+        # verify that master subnet exists
+        $this->validate_master_subnet ();
+        # verify section
+        $this->validate_section ();
+        # verify folder
+        $this->validate_folder ();
+        # verify overlapping
+        $this->validate_overlapping ();
+        # verify vlan
+        $this->validate_vlan ();
+        # verify vrf
+        $this->validate_vrf ();
+    }
+
+    /**
+     * Validates provided CIDR address
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_cidr () {
+        // not for folder
+        if($this->_params->isFolder!=1) {
+            // check
+            if(strlen($err = $this->Subnets->verify_cidr_address($this->_params->subnet."/".$this->_params->mask))>1)
+                                                                                                    { $this->Response->throw_exception(400, $err); }
+        }
+    }
+
+    /**
+     * Validates that provided subnet is network and not host
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_network () {
+        // not for folder
+        if($this->_params->isFolder!=1) {
+            if(!$this->Addresses->is_network ($this->_params->subnet, $this->_params->mask))		{ $this->Response->throw_exception(400, "Address is not subnet"); }
+        }
+    }
+
+    /**
+     * Validates master subnet
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_master_subnet () {
+        // set 0 if not set
+        if(!isset($this->_params->masterSubnetId) || $this->_params->masterSubnetId=="0") 			{ $this->_params->masterSubnetId = 0; }
+        else {
+            // validate subnet
+            if(sizeof($this->Subnets->fetch_subnet ("id", $this->_params->masterSubnetId))==0)		{ $this->Response->throw_exception(400, "Master Subnet does not exist (id=".$this->_params->masterSubnetId.")"); }
+            // check that it is inside subnet
+            else {
+                // not fr folders
+                if(@$this->_params->isFolder!=1) {
+                    if(!$this->Subnets->verify_subnet_nesting ($this->_params->masterSubnetId, $this->_params->subnet."/".$this->_params->mask))
+                                                                                                    { $this->Response->throw_exception(400, "Subnet is not within boundaries of its master subnet"); }
+                }
+            }
+        }
+    }
+
+    /**
+     * Validates section
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_section () {
+        // Section Id must be present and numeric
+        if(!isset($this->_params->sectionId))														{ $this->Response->throw_exception(400, "Invalid Section (".$this->_params->sectionId.")"); }
+        elseif(!is_numeric($this->_params->sectionId))												{ $this->Response->throw_exception(400, "Section Id must be numeric (".$this->_params->sectionId.")"); }
+        else {
+            if($this->Tools->fetch_object("sections", "id", $this->_params->sectionId)===false)		{ $this->Response->throw_exception(400, "Section id (".$this->_params->sectionId.") does not exist"); }
+        }
+    }
+
+    /**
+     * Validates subnet by Id
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_subnet_id () {
+        // numberic
+        if(!is_numeric($this->_params->id))															{ $this->Response->throw_exception(400, "Subnet Id must be numeric (".$this->_params->id.")"); }
+        // check subnet
+        if(is_null($this->Subnets->fetch_subnet ("id", $this->_params->id)))						{ $this->Response->throw_exception(400, "Invalid subnet Id (".$this->_params->id.")"); }
+    }
+
+    /**
+     * Folder validation
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_folder () {
+        // only fo folders
+        if(@$this->_params->isFolder==1) {
+            // if parent is set it must be a folder!
+            if($this->_params->masterSubnetId!=0) {
+                $parent = $this->Subnets->fetch_subnet ("id", $this->_params->masterSubnetId);
+                if($parent->isFolder!=1) 															{ $this->Response->throw_exception(400, "Parent is not a folder"); }
+            }
+        }
+    }
+
+    /**
+     * Validates overlapping for newly created subnet
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_overlapping () {
+        // section details
+        $section = $this->Tools->fetch_object ("sections", "id", $this->_params->sectionId);
+        if($section===false)																		{ $this->Response->throw_exception(400, "Invalid section Id"); }
+        // settings
+        $this->settings = $this->Tools->fetch_object ("settings", "id", 1);
+
+        # get master subnet details for folder overrides
+        if($this->_params->masterSubnetId!=0)	{
+            $master_section = $this->Subnets->fetch_subnet(null, $this->_params->masterSubnetId);
+            if($master_section->isFolder==1)	{ $parent_is_folder = true; }
+            else								{ $parent_is_folder = false; }
+        }
+        else 									{ $parent_is_folder = false; }
+
+        // create cidr address
+        $cidr = $this->Addresses->transform_address($this->_params->subnet,"dotted")."/".$this->_params->mask;
+
+        // root subnet
+        if($this->_params->masterSubnetId==0) {
+            // check overlapping
+            if($section->strictMode==1 && !$parent_is_folder) {
+                /* verify that no overlapping occurs if we are adding root subnet only check for overlapping if vrf is empty or not exists! */
+                $overlap = $this->Subnets->verify_subnet_overlapping ($this->_params->sectionId, $cidr, $this->_params->vrfId);
+                if($overlap!==false) 																{ $this->Response->throw_exception(400, $overlap); }
+            }
+        }
+        // not root
+        else {
+            //disable checks for folders and if strict check enabled
+            if($section->strictMode==1 && !$parent_is_folder ) {
+                //verify that nested subnet is inside root subnet
+                if (!$this->Subnets->verify_subnet_nesting($this->_params->masterSubnetId, $cidr)) 	{ $this->Response->throw_exception(400, "Nested subnet not in root subnet"); }
+
+                //nested?
+                $overlap = $this->Subnets->verify_nested_subnet_overlapping($this->_params->sectionId, $cidr, $this->_params->vrfId, $this->_params->masterSubnetId);
+                if($overlap!==false) 																{ $this->Response->throw_exception(400, $overlap); }
+            }
+        }
+    }
+
+    /**
+     * Validates VLAN id
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_vlan () {
+        if(isset($this->_params->vlanId)) {
+            if($this->Tools->fetch_object("vlans", "vlanId", $this->_params->vlanId)===false)		{ $this->Response->throw_exception(400, "Vlan does not exist"); }
+        }
+    }
+
+    /**
+     * Validates VRF id
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_vrf () {
+        if(isset($this->_params->vrfId)) {
+            if($this->Tools->fetch_object("vrf", "vrfId", $this->_params->vrfId)===false)			{ $this->Response->throw_exception(400, "VRF does not exist"); }
+        }
+    }
 
 }
 

Spacing +123 added lines, -123 removed lines

@@ -81,9 +81,9 @@ 
 	 * @param class $Tools
 	 * @param mixed $params		// post/get values
 	 */
-	public function __construct($Database, $Tools, $params, $Response) {
+	public function __construct ($Database, $Tools, $params, $Response) {
 		$this->Database = $Database;
-		$this->Tools 	= $Tools;
+		$this->Tools = $Tools;
 		$this->_params 	= $params;
 		$this->Response = $Response;
 		// init required objects
@@ -108,16 +108,16 @@ 
 		$this->validate_options_request ();
 
 		// methods
-		$result = array();
-		$result['methods'] = array(
-								array("href"=>"/api/".$this->_params->app_id."/subnets/", 		"methods"=>array(array("rel"=>"options", "method"=>"OPTIONS"))),
-								array("href"=>"/api/".$this->_params->app_id."/subnets/{id}/", 	"methods"=>array(array("rel"=>"read", 	"method"=>"GET"),
-																												 array("rel"=>"create", "method"=>"POST"),
-																												 array("rel"=>"update", "method"=>"PATCH"),
-																												 array("rel"=>"delete", "method"=>"DELETE"))),
+		$result = array ();
+		$result['methods'] = array (
+								array ("href"=>"/api/".$this->_params->app_id."/subnets/", "methods"=>array (array ("rel"=>"options", "method"=>"OPTIONS"))),
+								array ("href"=>"/api/".$this->_params->app_id."/subnets/{id}/", "methods"=>array (array ("rel"=>"read", "method"=>"GET"),
+																												 array ("rel"=>"create", "method"=>"POST"),
+																												 array ("rel"=>"update", "method"=>"PATCH"),
+																												 array ("rel"=>"delete", "method"=>"DELETE"))),
 							);
 		# result
-		return array("code"=>200, "data"=>$result);
+		return array ("code"=>200, "data"=>$result);
 	}
 
 
@@ -135,8 +135,8 @@ 
 	 */
 	public function POST () {
 		# add required parameters
-		if(!isset($this->_params->isFolder)) { $this->_params->isFolder = "0"; }
-		elseif($this->_params->isFolder==1)	 { unset($this->_params->subnet, $this->_params->mask); }
+		if (!isset($this->_params->isFolder)) { $this->_params->isFolder = "0"; }
+		elseif ($this->_params->isFolder == 1) { unset($this->_params->subnet, $this->_params->mask); }
 
 		# validate parameters
 		$this->validate_create_parameters ();
@@ -145,15 +145,15 @@ 
 		$values = $this->validate_keys ();
 
 		# transform subnet to decimal format
-		$values['subnet'] = $this->Addresses->transform_address($values['subnet'] ,"decimal");
+		$values['subnet'] = $this->Addresses->transform_address ($values['subnet'], "decimal");
 
 		# execute
-		if(!$this->Subnets->modify_subnet ("add", $values)) {
-			$this->Response->throw_exception(500, "Failed to create subnet");
+		if (!$this->Subnets->modify_subnet ("add", $values)) {
+			$this->Response->throw_exception (500, "Failed to create subnet");
 		}
 		else {
 			//set result
-			return array("code"=>201, "data"=>"Subnet created", "location"=>"/api/".$this->_params->app_id."/subnets/".$this->Subnets->lastInsertId."/");
+			return array ("code"=>201, "data"=>"Subnet created", "location"=>"/api/".$this->_params->app_id."/subnets/".$this->Subnets->lastInsertId."/");
 		}
 	}
 
@@ -180,13 +180,13 @@ 
 	public function GET () {
 		// cidr check
 		// check if id2 is set ?
-		if(isset($this->_params->id2)) {
+		if (isset($this->_params->id2)) {
 			// is IP address provided
-			if($this->_params->id=="cidr") {
+			if ($this->_params->id == "cidr") {
 				$result = $this->read_search_subnet ();
 				// check result
-				if($result==NULL)						{ $this->Response->throw_exception(404, "No subnets found"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+				if ($result == NULL) { $this->Response->throw_exception (404, "No subnets found"); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 			}
 			else {
 				// validate id
@@ -194,48 +194,48 @@ 
 			}
 
 			// addresses in subnet
-			if($this->_params->id2=="addresses") {
+			if ($this->_params->id2 == "addresses") {
 				$result = $this->read_subnet_addresses ();
 				// check result
-				if($result===false)						{ $this->Response->throw_exception(404, "No addresses found"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, "addresses", true, true)); }
+				if ($result === false) { $this->Response->throw_exception (404, "No addresses found"); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, "addresses", true, true)); }
 			}
 			// slaves
-			elseif($this->_params->id2=="slaves") {
+			elseif ($this->_params->id2 == "slaves") {
 				$result = $this->read_subnet_slaves ();
 				// check result
-				if($result==NULL)						{ $this->Response->throw_exception(404, "No slaves"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+				if ($result == NULL) { $this->Response->throw_exception (404, "No slaves"); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 			}
 			// slaves-recursive
-			elseif ($this->_params->id2=="slaves_recursive") {
+			elseif ($this->_params->id2 == "slaves_recursive") {
 				$result = $this->read_subnet_slaves_recursive ();
 				// check result
-				if($result==NULL)						{ $this->Response->throw_exception(404, "No slaves"); }
-				else									{ return array("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
+				if ($result == NULL) { $this->Response->throw_exception (404, "No slaves"); }
+				else { return array ("code"=>200, "data"=>$this->prepare_result ($result, null, true, true)); }
 			}
 			// usage
-			elseif ($this->_params->id2=="usage") 		{ return array("code"=>200, "data"=>$this->subnet_usage ()); }
+			elseif ($this->_params->id2 == "usage") { return array ("code"=>200, "data"=>$this->subnet_usage ()); }
 			// first available address
-			elseif ($this->_params->id2=="first_free") 	{ return array("code"=>200, "data"=>$this->subnet_first_free ());  }
+			elseif ($this->_params->id2 == "first_free") { return array ("code"=>200, "data"=>$this->subnet_first_free ()); }
 			// fail
-			else										{ $this->Response->throw_exception(400, 'Invalid request'); }
+			else { $this->Response->throw_exception (400, 'Invalid request'); }
 		}
 		// custom fields
-		elseif ($this->_params->id=="custom_fields") {
+		elseif ($this->_params->id == "custom_fields") {
 			// check result
-			if(sizeof($this->custom_fields)==0)			{ $this->Response->throw_exception(404, 'No custom fields defined'); }
-			else										{ return array("code"=>200, "data"=>$this->custom_fields); }
+			if (sizeof ($this->custom_fields) == 0) { $this->Response->throw_exception (404, 'No custom fields defined'); }
+			else { return array ("code"=>200, "data"=>$this->custom_fields); }
 		}
 		// id
-		elseif (is_numeric($this->_params->id)) {
+		elseif (is_numeric ($this->_params->id)) {
 			$result = $this->read_subnet ();
 			// check result
-			if($result==NULL)							{ $this->Response->throw_exception(404, "Invalid Id"); }
-			else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
+			if ($result == NULL) { $this->Response->throw_exception (404, "Invalid Id"); }
+			else { return array ("code"=>200, "data"=>$this->prepare_result ($result, "subnets", true, true)); }
 		}
 		// false
-		else 											{ $this->Response->throw_exception(404, 'Invalid Id'); }
+		else { $this->Response->throw_exception (404, 'Invalid Id'); }
 	}
 
 
@@ -275,26 +275,26 @@ 
 		$this->validate_subnet_id ();
 
 		// check if id2 is set > additional methods
-		if(isset($this->_params->id2)) {
+		if (isset($this->_params->id2)) {
 			// resize
-			if($this->_params->id2=="resize") 			{ return $this->subnet_resize (); }
+			if ($this->_params->id2 == "resize") { return $this->subnet_resize (); }
 			// split
-			elseif($this->_params->id2=="split") 		{ return $this->subnet_split (); }
+			elseif ($this->_params->id2 == "split") { return $this->subnet_split (); }
 			// error
-			else										{ $this->Response->throw_exception(400, 'Invalid parameters'); }
+			else { $this->Response->throw_exception (400, 'Invalid parameters'); }
 		}
 		// ok, normal update
 		else {
 			// new section
-			if(isset($this->_params->sectionId)) 		{ $this->validate_section (); }
+			if (isset($this->_params->sectionId)) { $this->validate_section (); }
 
 			// validate vlan and vrf
 			$this->validate_vlan ();
 			$this->validate_vrf ();
 
 			// if subnet is provided die
-			if(isset($this->_params->subnet))			{ $this->Response->throw_exception(400, 'Subnet cannot be changed'); }
-			if(isset($this->_params->mask))				{ $this->Response->throw_exception(400, 'To change mask use resize method'); }
+			if (isset($this->_params->subnet)) { $this->Response->throw_exception (400, 'Subnet cannot be changed'); }
+			if (isset($this->_params->mask)) { $this->Response->throw_exception (400, 'To change mask use resize method'); }
 
 			# check for valid keys
 			$values = $this->validate_keys ();
@@ -302,10 +302,10 @@ 
 			$values["id"] = $this->_params->id;
 
 			# execute update
-			if(!$this->Subnets->modify_subnet ("edit", $values))
-														{ $this->Response->throw_exception(500, 'Subnet update failed'); }
+			if (!$this->Subnets->modify_subnet ("edit", $values))
+														{ $this->Response->throw_exception (500, 'Subnet update failed'); }
 			else {
-				return array("code"=>200, "data"=>"Subnet updated");
+				return array ("code"=>200, "data"=>"Subnet updated");
 			}
 		}
 	}
@@ -330,24 +330,24 @@ 
 		$this->validate_subnet_id ();
 
 		// check if id2 is set > additional methods
-		if(isset($this->_params->id2)) {
+		if (isset($this->_params->id2)) {
 			// truncate
-			if($this->_params->id2=="truncate") 		{ return $this->subnet_truncate (); }
+			if ($this->_params->id2 == "truncate") { return $this->subnet_truncate (); }
 			// error
-			else										{ $this->Response->throw_exception(400, 'Invalid parameters'); }
+			else { $this->Response->throw_exception (400, 'Invalid parameters'); }
 		}
 		// ok, delete subnet
 		else {
 			# set variables for delete
-			$values = array();
+			$values = array ();
 			$values["id"] = $this->_params->id;
 
 			# execute update
-			if(!$this->Subnets->modify_subnet ("delete", $values))
-														{ $this->Response->throw_exception(500, "Failed to delete subnet"); }
+			if (!$this->Subnets->modify_subnet ("delete", $values))
+														{ $this->Response->throw_exception (500, "Failed to delete subnet"); }
 			else {
 				//set result
-				return array("code"=>200, "data"=>"Subnet deleted");
+				return array ("code"=>200, "data"=>"Subnet deleted");
 			}
 		}
 	}
@@ -370,7 +370,7 @@ 
 		// ok, try to truncate
 		$this->Subnets->modify_subnet ("truncate", (array) $this->_params);
 		//set result
-		return array("code"=>200, "data"=>"Subnet truncated");
+		return array ("code"=>200, "data"=>"Subnet truncated");
 	}
 
 
@@ -390,7 +390,7 @@ 
 		$this->validate_subnet_id ();
 
 		// validate input parmeters
-		if(!isset($this->_params->mask))				{ $this->Response->throw_exception(400, "Subnet mask not provided"); }
+		if (!isset($this->_params->mask)) { $this->Response->throw_exception (400, "Subnet mask not provided"); }
 
 		// fetch old subnet
 		$old_subnet = $this->Subnets->fetch_subnet ("id", $this->_params->id);
@@ -403,19 +403,19 @@ 
 			$subnet_new = $old_subnet->subnet;
 		}
 		else {
-			$new_boundaries = $this->Subnets->get_network_boundaries ($this->Subnets->transform_address($old_subnet->subnet, "dotted"), $this->_params->mask);
-			$subnet_new 	= $this->Subnets->transform_address($new_boundaries['network'], "decimal");
+			$new_boundaries = $this->Subnets->get_network_boundaries ($this->Subnets->transform_address ($old_subnet->subnet, "dotted"), $this->_params->mask);
+			$subnet_new = $this->Subnets->transform_address ($new_boundaries['network'], "decimal");
 		}
 
 		# set update values
-		$values = array("id"=>$this->_params->id,
+		$values = array ("id"=>$this->_params->id,
 						"subnet"=>$subnet_new,
 						"mask"=>$this->_params->mask
 						);
 		$this->Subnets->modify_subnet ("resize", $values);
 
 		//set result
-		return array("code"=>200, "data"=>"Subnet truncated");
+		return array ("code"=>200, "data"=>"Subnet truncated");
 	}
 
 
@@ -436,9 +436,9 @@ 
 		$this->validate_subnet_id ();
 
 		// validate input parmeters
-		if(!is_numeric($this->_params->number))			{ $this->Response->throw_exception(400, "Invalid number of new subnets"); }
-		if(!isset($this->_params->group))				{ $this->_params->group = "yes"; }
-		if(!isset($this->_params->strict))				{ $this->_params->strict = "yes"; }
+		if (!is_numeric ($this->_params->number)) { $this->Response->throw_exception (400, "Invalid number of new subnets"); }
+		if (!isset($this->_params->group)) { $this->_params->group = "yes"; }
+		if (!isset($this->_params->strict)) { $this->_params->strict = "yes"; }
 
 		// fetch old subnet
 		$subnet_old = $this->Subnets->fetch_subnet ("id", $this->_params->id);
@@ -446,7 +446,7 @@ 
 		$this->Subnets->subnet_split ($subnet_old, $this->_params->number, $this->_params->prefix, $this->_params->group, $this->_params->strict);
 
 		//set result
-		return array("code"=>200, "data"=>"Subnet splitted");
+		return array ("code"=>200, "data"=>"Subnet splitted");
 	}
 
 
@@ -461,20 +461,20 @@ 
 	 */
 	private function subnet_usage () {
 		# check that section exists
-		if(sizeof($subnet = $this->Subnets->fetch_subnet ("id", $this->_params->id))==0)
-														{ $this->Response->throw_exception(400, "Subnet does not exist"); }
+		if (sizeof ($subnet = $this->Subnets->fetch_subnet ("id", $this->_params->id)) == 0)
+														{ $this->Response->throw_exception (400, "Subnet does not exist"); }
 
 		# set slaves
 		$slaves = $this->Subnets->has_slaves ($this->_params->id) ? true : false;
 
 		# fetch all addresses and calculate usage
-		if($slaves) {
+		if ($slaves) {
 			$addresses = $this->Addresses->fetch_subnet_addresses_recursive ($this->_params->id, false);
 		} else {
 			$addresses = $this->Addresses->fetch_subnet_addresses ($this->_params->id);
 		}
 		// calculate
-		$subnet_usage  = $this->Subnets->calculate_subnet_usage (gmp_strval(sizeof($addresses)), $subnet->mask, $subnet->subnet, $subnet->isFull );		//Calculate free/used etc
+		$subnet_usage = $this->Subnets->calculate_subnet_usage (gmp_strval (sizeof ($addresses)), $subnet->mask, $subnet->subnet, $subnet->isFull); //Calculate free/used etc
 
 		# return
 		return $subnet_usage;
@@ -496,8 +496,8 @@ 
 		// fetch
 		$first = $this->Addresses->get_first_available_address ($this->_params->id, $this->Subnets);
 		// available?
-		if($first===false)	{ $first = null; }
-		else				{ $first = $this->Addresses->transform_to_dotted($first); }
+		if ($first === false) { $first = null; }
+		else { $first = $this->Addresses->transform_to_dotted ($first); }
 
 		# return
 		return $first;
@@ -518,25 +518,25 @@ 
 	 */
 	private function read_subnet ($subnetId = null) {
 		// null
-		$subnetId = is_null($subnetId) ? $this->_params->id : $subnetId;
+		$subnetId = is_null ($subnetId) ? $this->_params->id : $subnetId;
 		// fetch
 		$result = $this->Subnets->fetch_subnet ("id", $subnetId);
         // add nameservers
-        if($result!==false) {
-            $ns = $this->read_subnet_nameserver($result->nameserverId);
-            if ($ns!==false) {
+        if ($result !== false) {
+            $ns = $this->read_subnet_nameserver ($result->nameserverId);
+            if ($ns !== false) {
                 $result->nameservers = $ns;
             }
         }
 		// fetch gateway
-		if(sizeof($result)>0) {
+		if (sizeof ($result) > 0) {
     		$gateway = $this->read_subnet_gateway ();
-    		if ( $gateway!== false) {
+    		if ($gateway !== false) {
         		$result->gatewayId = $gateway->id;
     		}
 		}
 		# result
-		return sizeof($result)==0 ? false : $result;
+		return sizeof ($result) == 0 ? false : $result;
 	}
 
 	/**
@@ -549,7 +549,7 @@ 
 		// fetch
 		$result = $this->Addresses->fetch_subnet_addresses ($this->_params->id);
 		# result
-		return sizeof($result)==0 ? false : $result;
+		return sizeof ($result) == 0 ? false : $result;
 	}
 
 	/**
@@ -583,7 +583,7 @@ 
 		// fetch
 		$result = $this->Subnets->fetch_subnet_slaves ($this->_params->id);
 		# result
-		return $result===false ? NULL : $result;
+		return $result === false ? NULL : $result;
 	}
 
 	/**
@@ -596,11 +596,11 @@ 
 		// get array of ids
 		$this->Subnets->fetch_subnet_slaves_recursive ($this->_params->id);
 		// fetch all;
-		foreach($this->Subnets->slaves as $s) {
+		foreach ($this->Subnets->slaves as $s) {
 			$result[] = $this->read_subnet ($s);
 		}
 		# result
-		return $result===false ? NULL : $result;
+		return $result === false ? NULL : $result;
 	}
 
 	/**
@@ -615,9 +615,9 @@ 
 		// check
 		$subnet = $this->Tools->fetch_multiple_objects ("subnets", "subnet", $this->_params->id2);
 		// validate mask
-		if($subnet!==false) {
-			foreach($subnet as $s) {
-				if($s->mask == $this->_params->id3) {
+		if ($subnet !== false) {
+			foreach ($subnet as $s) {
+				if ($s->mask == $this->_params->id3) {
 					$result[] = $s;
 				}
 			}
@@ -643,7 +643,7 @@ 
 	 */
 	private function validate_create_parameters () {
 		# make sure subnet is in dotted format for checks
-		$this->_params->subnet = $this->Addresses->transform_address($this->_params->subnet ,"dotted");
+		$this->_params->subnet = $this->Addresses->transform_address ($this->_params->subnet, "dotted");
 
 		# cidr check
 		$this->validate_cidr ();
@@ -671,10 +671,10 @@ 
 	 */
 	private function validate_cidr () {
 		// not for folder
-		if($this->_params->isFolder!=1) {
+		if ($this->_params->isFolder != 1) {
 			// check
-			if(strlen($err = $this->Subnets->verify_cidr_address($this->_params->subnet."/".$this->_params->mask))>1)
-																									{ $this->Response->throw_exception(400, $err); }
+			if (strlen ($err = $this->Subnets->verify_cidr_address ($this->_params->subnet."/".$this->_params->mask)) > 1)
+																									{ $this->Response->throw_exception (400, $err); }
 		}
 	}
 
@@ -686,8 +686,8 @@ 
 	 */
 	private function validate_network () {
 		// not for folder
-		if($this->_params->isFolder!=1) {
-			if(!$this->Addresses->is_network ($this->_params->subnet, $this->_params->mask))		{ $this->Response->throw_exception(400, "Address is not subnet"); }
+		if ($this->_params->isFolder != 1) {
+			if (!$this->Addresses->is_network ($this->_params->subnet, $this->_params->mask)) { $this->Response->throw_exception (400, "Address is not subnet"); }
 		}
 	}
 
@@ -699,16 +699,16 @@ 
 	 */
 	private function validate_master_subnet () {
 		// set 0 if not set
-		if(!isset($this->_params->masterSubnetId) || $this->_params->masterSubnetId=="0") 			{ $this->_params->masterSubnetId = 0; }
+		if (!isset($this->_params->masterSubnetId) || $this->_params->masterSubnetId == "0") { $this->_params->masterSubnetId = 0; }
 		else {
 			// validate subnet
-			if(sizeof($this->Subnets->fetch_subnet ("id", $this->_params->masterSubnetId))==0)		{ $this->Response->throw_exception(400, "Master Subnet does not exist (id=".$this->_params->masterSubnetId.")"); }
+			if (sizeof ($this->Subnets->fetch_subnet ("id", $this->_params->masterSubnetId)) == 0) { $this->Response->throw_exception (400, "Master Subnet does not exist (id=".$this->_params->masterSubnetId.")"); }
 			// check that it is inside subnet
 			else {
 				// not fr folders
-				if(@$this->_params->isFolder!=1) {
-					if(!$this->Subnets->verify_subnet_nesting ($this->_params->masterSubnetId, $this->_params->subnet."/".$this->_params->mask))
-																									{ $this->Response->throw_exception(400, "Subnet is not within boundaries of its master subnet"); }
+				if (@$this->_params->isFolder != 1) {
+					if (!$this->Subnets->verify_subnet_nesting ($this->_params->masterSubnetId, $this->_params->subnet."/".$this->_params->mask))
+																									{ $this->Response->throw_exception (400, "Subnet is not within boundaries of its master subnet"); }
 				}
 			}
 		}
@@ -722,10 +722,10 @@ 
 	 */
 	private function validate_section () {
 		// Section Id must be present and numeric
-		if(!isset($this->_params->sectionId))														{ $this->Response->throw_exception(400, "Invalid Section (".$this->_params->sectionId.")"); }
-		elseif(!is_numeric($this->_params->sectionId))												{ $this->Response->throw_exception(400, "Section Id must be numeric (".$this->_params->sectionId.")"); }
+		if (!isset($this->_params->sectionId)) { $this->Response->throw_exception (400, "Invalid Section (".$this->_params->sectionId.")"); }
+		elseif (!is_numeric ($this->_params->sectionId)) { $this->Response->throw_exception (400, "Section Id must be numeric (".$this->_params->sectionId.")"); }
 		else {
-			if($this->Tools->fetch_object("sections", "id", $this->_params->sectionId)===false)		{ $this->Response->throw_exception(400, "Section id (".$this->_params->sectionId.") does not exist"); }
+			if ($this->Tools->fetch_object ("sections", "id", $this->_params->sectionId) === false) { $this->Response->throw_exception (400, "Section id (".$this->_params->sectionId.") does not exist"); }
 		}
 	}
 
@@ -737,9 +737,9 @@ 
 	 */
 	private function validate_subnet_id () {
 		// numberic
-		if(!is_numeric($this->_params->id))															{ $this->Response->throw_exception(400, "Subnet Id must be numeric (".$this->_params->id.")"); }
+		if (!is_numeric ($this->_params->id)) { $this->Response->throw_exception (400, "Subnet Id must be numeric (".$this->_params->id.")"); }
 		// check subnet
-		if(is_null($this->Subnets->fetch_subnet ("id", $this->_params->id)))						{ $this->Response->throw_exception(400, "Invalid subnet Id (".$this->_params->id.")"); }
+		if (is_null ($this->Subnets->fetch_subnet ("id", $this->_params->id))) { $this->Response->throw_exception (400, "Invalid subnet Id (".$this->_params->id.")"); }
 	}
 
 	/**
@@ -750,11 +750,11 @@ 
 	 */
 	private function validate_folder () {
 		// only fo folders
-		if(@$this->_params->isFolder==1) {
+		if (@$this->_params->isFolder == 1) {
 			// if parent is set it must be a folder!
-			if($this->_params->masterSubnetId!=0) {
+			if ($this->_params->masterSubnetId != 0) {
 				$parent = $this->Subnets->fetch_subnet ("id", $this->_params->masterSubnetId);
-				if($parent->isFolder!=1) 															{ $this->Response->throw_exception(400, "Parent is not a folder"); }
+				if ($parent->isFolder != 1) { $this->Response->throw_exception (400, "Parent is not a folder"); }
 			}
 		}
 	}
@@ -768,40 +768,40 @@ 
 	private function validate_overlapping () {
 		// section details
 		$section = $this->Tools->fetch_object ("sections", "id", $this->_params->sectionId);
-		if($section===false)																		{ $this->Response->throw_exception(400, "Invalid section Id"); }
+		if ($section === false) { $this->Response->throw_exception (400, "Invalid section Id"); }
 		// settings
 		$this->settings = $this->Tools->fetch_object ("settings", "id", 1);
 
 		# get master subnet details for folder overrides
-		if($this->_params->masterSubnetId!=0)	{
-			$master_section = $this->Subnets->fetch_subnet(null, $this->_params->masterSubnetId);
-			if($master_section->isFolder==1)	{ $parent_is_folder = true; }
-			else								{ $parent_is_folder = false; }
+		if ($this->_params->masterSubnetId != 0) {
+			$master_section = $this->Subnets->fetch_subnet (null, $this->_params->masterSubnetId);
+			if ($master_section->isFolder == 1) { $parent_is_folder = true; }
+			else { $parent_is_folder = false; }
 		}
-		else 									{ $parent_is_folder = false; }
+		else { $parent_is_folder = false; }
 
 		// create cidr address
-		$cidr = $this->Addresses->transform_address($this->_params->subnet,"dotted")."/".$this->_params->mask;
+		$cidr = $this->Addresses->transform_address ($this->_params->subnet, "dotted")."/".$this->_params->mask;
 
 		// root subnet
-		if($this->_params->masterSubnetId==0) {
+		if ($this->_params->masterSubnetId == 0) {
 			// check overlapping
-			if($section->strictMode==1 && !$parent_is_folder) {
+			if ($section->strictMode == 1 && !$parent_is_folder) {
 		    	/* verify that no overlapping occurs if we are adding root subnet only check for overlapping if vrf is empty or not exists! */
 		    	$overlap = $this->Subnets->verify_subnet_overlapping ($this->_params->sectionId, $cidr, $this->_params->vrfId);
-		    	if($overlap!==false) 																{ $this->Response->throw_exception(400, $overlap); }
+		    	if ($overlap !== false) { $this->Response->throw_exception (400, $overlap); }
 			}
 		}
 		// not root
 		else {
 		    //disable checks for folders and if strict check enabled
-		    if($section->strictMode==1 && !$parent_is_folder ) {
+		    if ($section->strictMode == 1 && !$parent_is_folder) {
 			    //verify that nested subnet is inside root subnet
-		        if (!$this->Subnets->verify_subnet_nesting($this->_params->masterSubnetId, $cidr)) 	{ $this->Response->throw_exception(400, "Nested subnet not in root subnet"); }
+		        if (!$this->Subnets->verify_subnet_nesting ($this->_params->masterSubnetId, $cidr)) { $this->Response->throw_exception (400, "Nested subnet not in root subnet"); }
 
 			    //nested?
-		        $overlap = $this->Subnets->verify_nested_subnet_overlapping($this->_params->sectionId, $cidr, $this->_params->vrfId, $this->_params->masterSubnetId);
-				if($overlap!==false) 																{ $this->Response->throw_exception(400, $overlap); }
+		        $overlap = $this->Subnets->verify_nested_subnet_overlapping ($this->_params->sectionId, $cidr, $this->_params->vrfId, $this->_params->masterSubnetId);
+				if ($overlap !== false) { $this->Response->throw_exception (400, $overlap); }
 		    }
 		}
 	}
@@ -813,8 +813,8 @@ 
 	 * @return void
 	 */
 	private function validate_vlan () {
-		if(isset($this->_params->vlanId)) {
-			if($this->Tools->fetch_object("vlans", "vlanId", $this->_params->vlanId)===false)		{ $this->Response->throw_exception(400, "Vlan does not exist"); }
+		if (isset($this->_params->vlanId)) {
+			if ($this->Tools->fetch_object ("vlans", "vlanId", $this->_params->vlanId) === false) { $this->Response->throw_exception (400, "Vlan does not exist"); }
 		}
 	}
 
@@ -825,8 +825,8 @@ 
 	 * @return void
 	 */
 	private function validate_vrf () {
-		if(isset($this->_params->vrfId)) {
-			if($this->Tools->fetch_object("vrf", "vrfId", $this->_params->vrfId)===false)			{ $this->Response->throw_exception(400, "VRF does not exist"); }
+		if (isset($this->_params->vrfId)) {
+			if ($this->Tools->fetch_object ("vrf", "vrfId", $this->_params->vrfId) === false) { $this->Response->throw_exception (400, "VRF does not exist"); }
 		}
 	}