phpipam / phpipam

functions/scan/subnet-scan-telnet-execute.php

Indentation +11 added lines, -11 removed lines

@@ -61,9 +61,9 @@ 
 
 //reset array, set each IP together with port
 foreach($scan_addresses as $k=>$v) {
-	foreach($ports as $p) {
-		$addresses[] = array("ip"=>$v, "port"=>$p);
-	}
+    foreach($ports as $p) {
+        $addresses[] = array("ip"=>$v, "port"=>$p);
+    }
 }
 
 
@@ -73,22 +73,22 @@ 
     $threads = array();
     //fork processes
     for ($i = 0; $i <= $Scan->settings->scanMaxThreads && $i <= sizeof($addresses); $i++) {
-    	//only if index exists!
-    	if(isset($addresses[$z])) {
-			//start new thread
+        //only if index exists!
+        if(isset($addresses[$z])) {
+            //start new thread
             $threads[$z] = new Thread( 'telnet_address' );
             $threads[$z]->start( $Subnets->transform_to_dotted($addresses[$z]['ip']), $addresses[$z]['port'], 2);
             $z++;				//next index
-		}
+        }
     }
     //wait for all the threads to finish
     while( !empty( $threads ) ) {
         foreach( $threads as $index => $thread ) {
             if( ! $thread->isAlive() ) {
-            	//online, save to array
-            	if($thread->getExitCode() == 0) { $out['alive'][$addresses[$index]['ip']][] = $addresses[$index]['port']; }
-            	//ok, but offline
-            	else 							{ $out['dead'][$addresses[$index]['ip']][]  = $addresses[$index]['port'];}
+                //online, save to array
+                if($thread->getExitCode() == 0) { $out['alive'][$addresses[$index]['ip']][] = $addresses[$index]['port']; }
+                //ok, but offline
+                else 							{ $out['dead'][$addresses[$index]['ip']][]  = $addresses[$index]['port'];}
                 //remove thread
                 unset( $threads[$index] );
             }

functions/scripts/pingCheck.php

Indentation +256 added lines, -256 removed lines

@@ -84,32 +84,32 @@ 
 //fetch all addresses that need to be checked
 foreach($scan_subnets as $s) {
 
-	// if subnet has slaves dont check it
-	if ($Subnets->has_slaves ($s->id) === false) {
-
-		$subnet_addresses = $Addresses->fetch_subnet_addresses ($s->id);
-		//set array for fping
-		if($Scan->icmp_type=="fping")	{
-			$subnets[] = array("id"=>$s->id, "cidr"=>$Subnets->transform_to_dotted($s->subnet)."/".$s->mask);
-		}
-		//save addresses
-		if(sizeof($subnet_addresses)>1) {
-			foreach($subnet_addresses as $a) {
-				//ignore excludePing
-				if($a->excludePing!=1) {
-					//create different array for fping
-					if($Scan->icmp_type=="fping")	{
-						$addresses2[$s->id][$a->id] = array("id"=>$a->id, "ip_addr"=>$a->ip_addr, "description"=>$a->description, "dns_name"=>$a->dns_name, "subnetId"=>$a->subnetId, "lastSeenOld"=>$a->lastSeen, "lastSeen"=>$a->lastSeen);	//used for status check
-						$addresses[$s->id][$a->id]  = $a->ip_addr;																												//used for alive check
-					}
-					else {
-						$addresses[] 		 		= array("id"=>$a->id, "ip_addr"=>$a->ip_addr, "description"=>$a->description, "dns_name"=>$a->dns_name, "subnetId"=>$a->subnetId, "lastSeenOld"=>$a->lastSeen, "lastSeen"=>$a->lastSeen);
-					}
-				}
-			}
-		}
-
-	}
+    // if subnet has slaves dont check it
+    if ($Subnets->has_slaves ($s->id) === false) {
+
+        $subnet_addresses = $Addresses->fetch_subnet_addresses ($s->id);
+        //set array for fping
+        if($Scan->icmp_type=="fping")	{
+            $subnets[] = array("id"=>$s->id, "cidr"=>$Subnets->transform_to_dotted($s->subnet)."/".$s->mask);
+        }
+        //save addresses
+        if(sizeof($subnet_addresses)>1) {
+            foreach($subnet_addresses as $a) {
+                //ignore excludePing
+                if($a->excludePing!=1) {
+                    //create different array for fping
+                    if($Scan->icmp_type=="fping")	{
+                        $addresses2[$s->id][$a->id] = array("id"=>$a->id, "ip_addr"=>$a->ip_addr, "description"=>$a->description, "dns_name"=>$a->dns_name, "subnetId"=>$a->subnetId, "lastSeenOld"=>$a->lastSeen, "lastSeen"=>$a->lastSeen);	//used for status check
+                        $addresses[$s->id][$a->id]  = $a->ip_addr;																												//used for alive check
+                    }
+                    else {
+                        $addresses[] 		 		= array("id"=>$a->id, "ip_addr"=>$a->ip_addr, "description"=>$a->description, "dns_name"=>$a->dns_name, "subnetId"=>$a->subnetId, "lastSeenOld"=>$a->lastSeen, "lastSeen"=>$a->lastSeen);
+                    }
+                }
+            }
+        }
+
+    }
 }
 
 
@@ -124,126 +124,126 @@ 
 
 //different scan for fping
 if($Scan->icmp_type=="fping") {
-	//run per MAX_THREADS
-	for ($m=0; $m<=sizeof($subnets); $m += $Scan->settings->scanMaxThreads) {
-	    // create threads
-	    $threads = array();
-	    //fork processes
-	    for ($i = 0; $i <= $Scan->settings->scanMaxThreads && $i <= sizeof($subnets); $i++) {
-	    	//only if index exists!
-	    	if(isset($subnets[$z])) {
-				//start new thread
-	            $threads[$z] = new Thread( 'fping_subnet' );
-	            $threads[$z]->start_fping( $subnets[$z]['cidr'] );
-	            $z++;				//next index
-			}
-	    }
-	    // wait for all the threads to finish
-	    while( !empty( $threads ) ) {
-			foreach($threads as $index => $thread) {
-				$child_pipe = "/tmp/pipe_".$thread->getPid();
-
-				if (file_exists($child_pipe)) {
-					$file_descriptor = fopen( $child_pipe, "r");
-					$child_response = "";
-					while (!feof($file_descriptor)) {
-						$child_response .= fread($file_descriptor, 8192);
-					}
-					//we have the child data in the parent, but serialized:
-					$child_response = unserialize( $child_response );
-					//store
-					$subnets[$index]['result'] = $child_response;
-
-					//now, child is dead, and parent close the pipe
-					unlink( $child_pipe );
-					unset($threads[$index]);
-				}
-			}
-	        usleep(200000);
-	    }
-	}
-
-	//now we must remove all non-existing hosts
-	foreach($subnets as $sk=>$s) {
-		if(sizeof(@$s['result'])>0 && isset($addresses[$s['id']])) {
-			//loop addresses
-			foreach($addresses[$s['id']] as $ak=>$a) {
-				//offline host
-				if(array_search($Subnets->transform_to_dotted($a), $subnets[$sk]['result'])===false) {
-    				// new change = null
-    				$addresses2[$s['id']][$ak]['lastSeenNew'] = NULL;
-					//save to out array
+    //run per MAX_THREADS
+    for ($m=0; $m<=sizeof($subnets); $m += $Scan->settings->scanMaxThreads) {
+        // create threads
+        $threads = array();
+        //fork processes
+        for ($i = 0; $i <= $Scan->settings->scanMaxThreads && $i <= sizeof($subnets); $i++) {
+            //only if index exists!
+            if(isset($subnets[$z])) {
+                //start new thread
+                $threads[$z] = new Thread( 'fping_subnet' );
+                $threads[$z]->start_fping( $subnets[$z]['cidr'] );
+                $z++;				//next index
+            }
+        }
+        // wait for all the threads to finish
+        while( !empty( $threads ) ) {
+            foreach($threads as $index => $thread) {
+                $child_pipe = "/tmp/pipe_".$thread->getPid();
+
+                if (file_exists($child_pipe)) {
+                    $file_descriptor = fopen( $child_pipe, "r");
+                    $child_response = "";
+                    while (!feof($file_descriptor)) {
+                        $child_response .= fread($file_descriptor, 8192);
+                    }
+                    //we have the child data in the parent, but serialized:
+                    $child_response = unserialize( $child_response );
+                    //store
+                    $subnets[$index]['result'] = $child_response;
+
+                    //now, child is dead, and parent close the pipe
+                    unlink( $child_pipe );
+                    unset($threads[$index]);
+                }
+            }
+            usleep(200000);
+        }
+    }
+
+    //now we must remove all non-existing hosts
+    foreach($subnets as $sk=>$s) {
+        if(sizeof(@$s['result'])>0 && isset($addresses[$s['id']])) {
+            //loop addresses
+            foreach($addresses[$s['id']] as $ak=>$a) {
+                //offline host
+                if(array_search($Subnets->transform_to_dotted($a), $subnets[$sk]['result'])===false) {
+                    // new change = null
+                    $addresses2[$s['id']][$ak]['lastSeenNew'] = NULL;
+                    //save to out array
                     $address_change[] = $addresses2[$s['id']][$ak];
-				}
-				//online host
-				else {
-    				// new change = now
-    				$addresses2[$s['id']][$ak]['lastSeenNew'] = $nowdate;
-					//save to out array
+                }
+                //online host
+                else {
+                    // new change = now
+                    $addresses2[$s['id']][$ak]['lastSeenNew'] = $nowdate;
+                    //save to out array
                     $address_change[] = $addresses2[$s['id']][$ak];
                     //update status
                     $Scan->ping_update_lastseen ($addresses2[$s['id']][$ak]['id'], $nowdate);
-				}
-			}
-		}
-	}
+                }
+            }
+        }
+    }
 }
 //ping, pear
 else {
-	//run per MAX_THREADS
-	for ($m=0; $m<=sizeof($addresses); $m += $Scan->settings->scanMaxThreads) {
-	    // create threads
-	    $threads = array();
-	    //fork processes
-	    for ($i = 0; $i <= $Scan->settings->scanMaxThreads && $i <= sizeof($addresses); $i++) {
-	    	//only if index exists!
-	    	if(isset($addresses[$z])) {
-				//start new thread
-	            $threads[$z] = new Thread( 'ping_address' );
-	            $threads[$z]->start($Subnets->transform_to_dotted($addresses[$z]['ip_addr']));
-	            $z++;				//next index
-			}
-	    }
-	    // wait for all the threads to finish
-	    while( !empty( $threads ) ) {
-	        foreach( $threads as $index => $thread ) {
-	            if( ! $thread->isAlive() ) {
-	            	//online
-	            	if($thread->getExitCode() == 0) {
-    	            	// set new available time
-    	            	$addresses[$index]['lastSeenNew'] =  $nowdate;
+    //run per MAX_THREADS
+    for ($m=0; $m<=sizeof($addresses); $m += $Scan->settings->scanMaxThreads) {
+        // create threads
+        $threads = array();
+        //fork processes
+        for ($i = 0; $i <= $Scan->settings->scanMaxThreads && $i <= sizeof($addresses); $i++) {
+            //only if index exists!
+            if(isset($addresses[$z])) {
+                //start new thread
+                $threads[$z] = new Thread( 'ping_address' );
+                $threads[$z]->start($Subnets->transform_to_dotted($addresses[$z]['ip_addr']));
+                $z++;				//next index
+            }
+        }
+        // wait for all the threads to finish
+        while( !empty( $threads ) ) {
+            foreach( $threads as $index => $thread ) {
+                if( ! $thread->isAlive() ) {
+                    //online
+                    if($thread->getExitCode() == 0) {
+                        // set new available time
+                        $addresses[$index]['lastSeenNew'] =  $nowdate;
                         $address_change[$index] = $addresses[$index];	 				//change to online
-	            	}
-	            	//offline
-	            	else {
-    	            	// set nw online
-    	            	$addresses[$index]['lastSeenNew'] =  NULL;
+                    }
+                    //offline
+                    else {
+                        // set nw online
+                        $addresses[$index]['lastSeenNew'] =  NULL;
                         $address_change[$index] = $addresses[$index];	 				//change to online
-					}
-	            	//save exit code for host
-	                $addresses[$index]['newStatus'] = $thread->getExitCode();
-	                //remove thread
-	                unset( $threads[$index] );
-	            }
-	        }
-	        usleep(200000);
-	    }
-	}
-
-	//update statuses for online
-
-	# re-initialize classes
-	$Database = new Database_PDO;
-	$Scan = new Scan ($Database, $Subnets->settings);
-	// reset debugging
-	$Scan->reset_debugging(false);
-
-	# update all active statuses
-	foreach($addresses as $k=>$a) {
-		if($a['newStatus']==0) {
-			$Scan->ping_update_lastseen ($a['id'], $nowdate);
-		}
-	}
+                    }
+                    //save exit code for host
+                    $addresses[$index]['newStatus'] = $thread->getExitCode();
+                    //remove thread
+                    unset( $threads[$index] );
+                }
+            }
+            usleep(200000);
+        }
+    }
+
+    //update statuses for online
+
+    # re-initialize classes
+    $Database = new Database_PDO;
+    $Scan = new Scan ($Database, $Subnets->settings);
+    // reset debugging
+    $Scan->reset_debugging(false);
+
+    # update all active statuses
+    foreach($addresses as $k=>$a) {
+        if($a['newStatus']==0) {
+            $Scan->ping_update_lastseen ($a['id'], $nowdate);
+        }
+    }
 }
 
 
@@ -293,125 +293,125 @@ 
 # all done, mail diff?
 if(sizeof($address_change)>0 && $send_mail) {
 
-	# remove old classes
-	unset($Database, $Subnets, $Addresses, $Tools, $Scan, $Result);
-
-	$Database 	= new Database_PDO;
-	$Subnets	= new Subnets ($Database);
-	$Addresses	= new Addresses ($Database);
-	$Tools		= new Tools ($Database);
-	$Scan		= new Scan ($Database);
-	$Result		= new Result();
-
-	// set exit flag to true
-	$Scan->ping_set_exit(true);
-	// set debugging
-	$Scan->reset_debugging(false);
-
-
-	# check for recipients
-	foreach($Tools->fetch_multiple_objects ("users", "role", "Administrator") as $admin) {
-		if($admin->mailNotify=="Yes") {
-			$recepients[] = array("name"=>$admin->real_name, "email"=>$admin->email);
-		}
-	}
-	# none?
-	if(!isset($recepients))	{ die(); }
-
-	# fetch mailer settings
-	$mail_settings = $Tools->fetch_object("settingsMail", "id", 1);
-	# fake user object, needed for create_link
-	$User = new StdClass();
-	@$User->settings->prettyLinks = $Scan->settings->prettyLinks;
-
-	# initialize mailer
-	$phpipam_mail = new phpipam_mail($Scan->settings, $mail_settings);
-	$phpipam_mail->initialize_mailer();
-
-	// set subject
-	$subject	= "phpIPAM IP state change ".$nowdate;
-
-	//html
-	$content[] = "<h3>phpIPAM host changes</h3>";
-	$content[] = "<table style='margin-left:10px;margin-top:5px;width:auto;padding:0px;border-collapse:collapse;border:1px solid gray;'>";
-	$content[] = "<tr>";
-	$content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>IP</th>";
-	$content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>Description</th>";
-	$content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>Hostname</th>";
-	$content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>Subnet</th>";
-	$content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>Section</th>";
-	$content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>last seen</th>";
-	$content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>old status</th>";
-	$content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>new status</th>";
-	$content[] = "</tr>";
-
-	//plain
-	$content_plain[] = "phpIPAM host changes \r\n------------------------------";
-
-	//Changes
-	foreach($address_change as $change) {
-		//reformat statuses
-		if($change['oldStatus'] == 0) {
-			$oldStatus = "<font style='color:#04B486'>Online</font>";
-			$newStatus = "<font style='color:#DF0101'>Offline</font>";
-		}
-		else {
-			$oldStatus = "<font style='color:#DF0101'>Offline</font>";
-			$newStatus = "<font style='color:#04B486'>Online</font>";
-		}
-
-		//set subnet
-		$subnet 	 = $Subnets->fetch_subnet(null, $change['subnetId']);
-		//set section
-		$section 	 = $Tools->fetch_object("sections", "id", $subnet->sectionId);
-		//ago
-		if(is_null($change['lastSeen']) || $change['lastSeen']=="0000-00-00 00:00:00") {
-			$ago	  = "never";
-		} else {
-			$timeDiff = $now - strtotime($change['lastSeen']);
-			$ago 	  = $change['lastSeen']." (".$Result->sec2hms($timeDiff)." ago)";
-		}
-
-		//content
-		$content[] = "<tr>";
-		$content[] = "	<td style='padding:3px 8px;border:1px solid silver;'><a href='".rtrim($Scan->settings->siteURL, "/")."".create_link("subnets",$section->id,$subnet->id)."'>".$Subnets->transform_to_dotted($change['ip_addr'])."</a></td>";
-		$content[] = "	<td style='padding:3px 8px;border:1px solid silver;'>$change[description]</td>";
-		$content[] = "	<td style='padding:3px 8px;border:1px solid silver;'>$change[dns_name]</td>";
-		$content[] = "	<td style='padding:3px 8px;border:1px solid silver;'><a href='".rtrim($Scan->settings->siteURL, "/")."".create_link("subnets",$section->id,$subnet->id)."'>".$Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask." - ".$subnet->description."</a></td>";
-		$content[] = "	<td style='padding:3px 8px;border:1px solid silver;'><a href='".rtrim($Scan->settings->siteURL, "/")."".create_link("subnets",$section->id)."'>$section->name $section->description</a></td>";
-		$content[] = "	<td style='padding:3px 8px;border:1px solid silver;'>$ago</td>";
-		$content[] = "	<td style='padding:3px 8px;border:1px solid silver;'>$oldStatus</td>";
-		$content[] = "	<td style='padding:3px 8px;border:1px solid silver;'>$newStatus</td>";
-		$content[] = "</tr>";
-
-		//plain content
-		$content_plain[] = "\t * ".$Subnets->transform_to_dotted($change['ip_addr'])." (".$Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask.")\r\n \t  ".strip_tags($oldStatus)." => ".strip_tags($newStatus);
-
-	}
-	$content[] = "</table>";
-
-
-	# set content
-	$content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
-	$content_plain 	= implode("\r\n",$content_plain);
-
-	# try to send
-	try {
-		$phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
-		//add all admins to CC
-		foreach($recepients as $admin) {
-			$phpipam_mail->Php_mailer->addAddress(addslashes($admin['email']), addslashes($admin['name']));
-		}
-		$phpipam_mail->Php_mailer->Subject = $subject;
-		$phpipam_mail->Php_mailer->msgHTML($content);
-		$phpipam_mail->Php_mailer->AltBody = $content_plain;
-		//send
-		$phpipam_mail->Php_mailer->send();
-	} catch (phpmailerException $e) {
-		$Result->show_cli("Mailer Error: ".$e->errorMessage(), true);
-	} catch (Exception $e) {
-		$Result->show_cli("Mailer Error: ".$e->errorMessage(), true);
-	}
+    # remove old classes
+    unset($Database, $Subnets, $Addresses, $Tools, $Scan, $Result);
+
+    $Database 	= new Database_PDO;
+    $Subnets	= new Subnets ($Database);
+    $Addresses	= new Addresses ($Database);
+    $Tools		= new Tools ($Database);
+    $Scan		= new Scan ($Database);
+    $Result		= new Result();
+
+    // set exit flag to true
+    $Scan->ping_set_exit(true);
+    // set debugging
+    $Scan->reset_debugging(false);
+
+
+    # check for recipients
+    foreach($Tools->fetch_multiple_objects ("users", "role", "Administrator") as $admin) {
+        if($admin->mailNotify=="Yes") {
+            $recepients[] = array("name"=>$admin->real_name, "email"=>$admin->email);
+        }
+    }
+    # none?
+    if(!isset($recepients))	{ die(); }
+
+    # fetch mailer settings
+    $mail_settings = $Tools->fetch_object("settingsMail", "id", 1);
+    # fake user object, needed for create_link
+    $User = new StdClass();
+    @$User->settings->prettyLinks = $Scan->settings->prettyLinks;
+
+    # initialize mailer
+    $phpipam_mail = new phpipam_mail($Scan->settings, $mail_settings);
+    $phpipam_mail->initialize_mailer();
+
+    // set subject
+    $subject	= "phpIPAM IP state change ".$nowdate;
+
+    //html
+    $content[] = "<h3>phpIPAM host changes</h3>";
+    $content[] = "<table style='margin-left:10px;margin-top:5px;width:auto;padding:0px;border-collapse:collapse;border:1px solid gray;'>";
+    $content[] = "<tr>";
+    $content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>IP</th>";
+    $content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>Description</th>";
+    $content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>Hostname</th>";
+    $content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>Subnet</th>";
+    $content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>Section</th>";
+    $content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>last seen</th>";
+    $content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>old status</th>";
+    $content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>new status</th>";
+    $content[] = "</tr>";
+
+    //plain
+    $content_plain[] = "phpIPAM host changes \r\n------------------------------";
+
+    //Changes
+    foreach($address_change as $change) {
+        //reformat statuses
+        if($change['oldStatus'] == 0) {
+            $oldStatus = "<font style='color:#04B486'>Online</font>";
+            $newStatus = "<font style='color:#DF0101'>Offline</font>";
+        }
+        else {
+            $oldStatus = "<font style='color:#DF0101'>Offline</font>";
+            $newStatus = "<font style='color:#04B486'>Online</font>";
+        }
+
+        //set subnet
+        $subnet 	 = $Subnets->fetch_subnet(null, $change['subnetId']);
+        //set section
+        $section 	 = $Tools->fetch_object("sections", "id", $subnet->sectionId);
+        //ago
+        if(is_null($change['lastSeen']) || $change['lastSeen']=="0000-00-00 00:00:00") {
+            $ago	  = "never";
+        } else {
+            $timeDiff = $now - strtotime($change['lastSeen']);
+            $ago 	  = $change['lastSeen']." (".$Result->sec2hms($timeDiff)." ago)";
+        }
+
+        //content
+        $content[] = "<tr>";
+        $content[] = "	<td style='padding:3px 8px;border:1px solid silver;'><a href='".rtrim($Scan->settings->siteURL, "/")."".create_link("subnets",$section->id,$subnet->id)."'>".$Subnets->transform_to_dotted($change['ip_addr'])."</a></td>";
+        $content[] = "	<td style='padding:3px 8px;border:1px solid silver;'>$change[description]</td>";
+        $content[] = "	<td style='padding:3px 8px;border:1px solid silver;'>$change[dns_name]</td>";
+        $content[] = "	<td style='padding:3px 8px;border:1px solid silver;'><a href='".rtrim($Scan->settings->siteURL, "/")."".create_link("subnets",$section->id,$subnet->id)."'>".$Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask." - ".$subnet->description."</a></td>";
+        $content[] = "	<td style='padding:3px 8px;border:1px solid silver;'><a href='".rtrim($Scan->settings->siteURL, "/")."".create_link("subnets",$section->id)."'>$section->name $section->description</a></td>";
+        $content[] = "	<td style='padding:3px 8px;border:1px solid silver;'>$ago</td>";
+        $content[] = "	<td style='padding:3px 8px;border:1px solid silver;'>$oldStatus</td>";
+        $content[] = "	<td style='padding:3px 8px;border:1px solid silver;'>$newStatus</td>";
+        $content[] = "</tr>";
+
+        //plain content
+        $content_plain[] = "\t * ".$Subnets->transform_to_dotted($change['ip_addr'])." (".$Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask.")\r\n \t  ".strip_tags($oldStatus)." => ".strip_tags($newStatus);
+
+    }
+    $content[] = "</table>";
+
+
+    # set content
+    $content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
+    $content_plain 	= implode("\r\n",$content_plain);
+
+    # try to send
+    try {
+        $phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
+        //add all admins to CC
+        foreach($recepients as $admin) {
+            $phpipam_mail->Php_mailer->addAddress(addslashes($admin['email']), addslashes($admin['name']));
+        }
+        $phpipam_mail->Php_mailer->Subject = $subject;
+        $phpipam_mail->Php_mailer->msgHTML($content);
+        $phpipam_mail->Php_mailer->AltBody = $content_plain;
+        //send
+        $phpipam_mail->Php_mailer->send();
+    } catch (phpmailerException $e) {
+        $Result->show_cli("Mailer Error: ".$e->errorMessage(), true);
+    } catch (Exception $e) {
+        $Result->show_cli("Mailer Error: ".$e->errorMessage(), true);
+    }
 }
 
 ?>
\ No newline at end of file

functions/scripts/reset-admin-password.php

Indentation +30 added lines, -30 removed lines

@@ -27,17 +27,17 @@ 
 // check if argv[1] provided, if not check readline support and wait for user pass
 if (isset($argv[1]))	{ $password = $argv[1]; }
 else {
-	// get available extensions
-	$available_extensions = get_loaded_extensions();
-	// not in array
-	if (!in_array("readline", $available_extensions)) 		{ $Result->show_cli("readline php extension is required.\nOr provide password as first argument", true); }
-	else {
-		// read password
-		$line = readline("Enter password: ");
-		readline_add_history($line);
-		// save
-		$password = array_pop(readline_list_history());
-	}
+    // get available extensions
+    $available_extensions = get_loaded_extensions();
+    // not in array
+    if (!in_array("readline", $available_extensions)) 		{ $Result->show_cli("readline php extension is required.\nOr provide password as first argument", true); }
+    else {
+        // read password
+        $line = readline("Enter password: ");
+        readline_add_history($line);
+        // save
+        $password = array_pop(readline_list_history());
+    }
 }
 
 // validate password
@@ -50,8 +50,8 @@ 
 
 // set update array
 $values = array("id"=>1,
-				"password"=>$password_crypted
-				);
+                "password"=>$password_crypted
+                );
 
 // update password
 if(!$Admin->object_modify("users", "edit", "id", $values))	{ $Result->show_cli("Failed to update Admin password", false); }
@@ -60,10 +60,10 @@ 
 
 // debug ?
 if ($debugging || $fail) {
-	$Result->show_cli("---------");
-	$Result->show_cli("Crypt type: ".$crypt_type);
-	$Result->show_cli("Password: ".$password_crypted);
-	$Result->show_cli("---------");
+    $Result->show_cli("---------");
+    $Result->show_cli("Crypt type: ".$crypt_type);
+    $Result->show_cli("Password: ".$password_crypted);
+    $Result->show_cli("---------");
 }
 
 // fail
@@ -73,7 +73,7 @@ 
 
 # check for recipients
 foreach($Admin->fetch_multiple_objects ("users", "role", "Administrator") as $admin) {
-	$recepients[] = array("name"=>$admin->real_name, "email"=>$admin->email);
+    $recepients[] = array("name"=>$admin->real_name, "email"=>$admin->email);
 }
 # none?
 if(!isset($recepients))	{ die(); }
@@ -104,20 +104,20 @@ 
 
 # try to send
 try {
-	$phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
-	//add all admins to CC
-	foreach($recepients as $admin) {
-		$phpipam_mail->Php_mailer->addAddress(addslashes($admin['email']), addslashes($admin['name']));
-	}
-	$phpipam_mail->Php_mailer->Subject = $subject;
-	$phpipam_mail->Php_mailer->msgHTML($content);
-	$phpipam_mail->Php_mailer->AltBody = $content_plain;
-	//send
-	$phpipam_mail->Php_mailer->send();
+    $phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
+    //add all admins to CC
+    foreach($recepients as $admin) {
+        $phpipam_mail->Php_mailer->addAddress(addslashes($admin['email']), addslashes($admin['name']));
+    }
+    $phpipam_mail->Php_mailer->Subject = $subject;
+    $phpipam_mail->Php_mailer->msgHTML($content);
+    $phpipam_mail->Php_mailer->AltBody = $content_plain;
+    //send
+    $phpipam_mail->Php_mailer->send();
 } catch (phpmailerException $e) {
-	$Result->show_cli("Mailer Error: ".$e->errorMessage(), true);
+    $Result->show_cli("Mailer Error: ".$e->errorMessage(), true);
 } catch (Exception $e) {
-	$Result->show_cli("Mailer Error: ".$e->errorMessage(), true);
+    $Result->show_cli("Mailer Error: ".$e->errorMessage(), true);
 }
 
 ?>
\ No newline at end of file

api/index.php

Indentation +106 added lines, -106 removed lines

@@ -37,60 +37,60 @@ 
 
 # set empty controller for options
 if($_SERVER['REQUEST_METHOD']=="OPTIONS") {
-	if( !isset($_GET['controller']) || $_GET['controller']=="")	{ $_GET['controller'] = "Tools"; }
+    if( !isset($_GET['controller']) || $_GET['controller']=="")	{ $_GET['controller'] = "Tools"; }
 }
 
 /* wrap in a try-catch block to catch exceptions */
 try {
 
-	/* Validate application ---------- */
-
-	// verify that API is enabled on server
-	if($settings->api!=1) 									{ $Response->throw_exception(503, "API server disabled");}
-
-	# fetch app
-	$app = $Tools->fetch_object ("api", "app_id", $_GET['app_id']);
-
-	// verify app_id
-	if($app === false) 										{ $Response->throw_exception(400, "Invalid application id"); }
-	// check that app is enabled
-	if($app->app_permissions==="0") 						{ $Response->throw_exception(503, "Application disabled"); }
-
-
-	/* Check app security and prepare request parameters ---------- */
-
-	// crypt check
-	if($app->app_security=="crypt") {
-		// verify php extensions
-		foreach (array("mcrypt") as $extension) {
-	    	if (!in_array($extension, get_loaded_extensions()))
-	    													{ $Response->throw_exception(500, 'php extension '.$extension.' missing'); }
-		}
-		// decrypt request - to JSON
-		$params = json_decode(trim(mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $app->app_code, base64_decode($_GET['enc_request']), MCRYPT_MODE_ECB)));
-	}
-	// SSL checks
-	elseif($app->app_security=="ssl") {
-		// verify SSL
-		if (!((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') || $_SERVER['SERVER_PORT'] == 443)) {
-															{ $Response->throw_exception(503, 'App requires SSL connection'); }
-		}
-		// save request parameters
-		$params = (object) $_GET;
-	}
-	// no security
-	elseif($app->app_security=="none") {
-		$params = (object) $_GET;
-	}
-	// error, invalid security
-	else {
-		$Response->throw_exception(503, 'Invalid app security');
-	}
-
-
-	// append POST parameters if POST or PATCH
-	if($_SERVER['REQUEST_METHOD']=="POST" || $_SERVER['REQUEST_METHOD']=="PATCH"){
-		// if application tupe is JSON (application/json)
+    /* Validate application ---------- */
+
+    // verify that API is enabled on server
+    if($settings->api!=1) 									{ $Response->throw_exception(503, "API server disabled");}
+
+    # fetch app
+    $app = $Tools->fetch_object ("api", "app_id", $_GET['app_id']);
+
+    // verify app_id
+    if($app === false) 										{ $Response->throw_exception(400, "Invalid application id"); }
+    // check that app is enabled
+    if($app->app_permissions==="0") 						{ $Response->throw_exception(503, "Application disabled"); }
+
+
+    /* Check app security and prepare request parameters ---------- */
+
+    // crypt check
+    if($app->app_security=="crypt") {
+        // verify php extensions
+        foreach (array("mcrypt") as $extension) {
+            if (!in_array($extension, get_loaded_extensions()))
+                                                            { $Response->throw_exception(500, 'php extension '.$extension.' missing'); }
+        }
+        // decrypt request - to JSON
+        $params = json_decode(trim(mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $app->app_code, base64_decode($_GET['enc_request']), MCRYPT_MODE_ECB)));
+    }
+    // SSL checks
+    elseif($app->app_security=="ssl") {
+        // verify SSL
+        if (!((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') || $_SERVER['SERVER_PORT'] == 443)) {
+                                                            { $Response->throw_exception(503, 'App requires SSL connection'); }
+        }
+        // save request parameters
+        $params = (object) $_GET;
+    }
+    // no security
+    elseif($app->app_security=="none") {
+        $params = (object) $_GET;
+    }
+    // error, invalid security
+    else {
+        $Response->throw_exception(503, 'Invalid app security');
+    }
+
+
+    // append POST parameters if POST or PATCH
+    if($_SERVER['REQUEST_METHOD']=="POST" || $_SERVER['REQUEST_METHOD']=="PATCH"){
+        // if application tupe is JSON (application/json)
         if($_SERVER['CONTENT_TYPE']=="application/json"){
                 $rawPostData = file_get_contents('php://input');
                 $json = json_decode($rawPostData,true);
@@ -98,7 +98,7 @@ 
                 $params = array_merge((array) $params, $json);
                 $params = (object) $params;
         }
-		// if application tupe is XML (application/json)
+        // if application tupe is XML (application/json)
         elseif($_SERVER['CONTENT_TYPE']=="application/xml"){
                 $rawPostData = file_get_contents('php://input');
                 $xml = $Response->xml_to_array($rawPostData);
@@ -106,7 +106,7 @@ 
                 $params = array_merge((array) $params, $xml);
                 $params = (object) $params;
         }
-		//if application type is default (application/x-www-form-urlencoded)
+        //if application type is default (application/x-www-form-urlencoded)
         elseif(sizeof(@$_POST)>0) {
                 $params = array_merge((array) $params, $_POST);
                 $params = (object) $params;
@@ -116,74 +116,74 @@ 
 
 
 
-	/* Authentication ---------- */
+    /* Authentication ---------- */
 
-	# authenticate user if required
-	if (@$params->controller != "user" && $enable_authentication) {
-		if($app->app_security=="ssl" || $app->app_security=="none") {
-			// start auth class and validate connection
-			require( dirname(__FILE__) . '/controllers/User.php');				// authentication and token handling
-			$Authentication = new User_controller ($Database, $Tools, $params, $Response);
-			$Authentication->check_auth ();
-		}
-	}
+    # authenticate user if required
+    if (@$params->controller != "user" && $enable_authentication) {
+        if($app->app_security=="ssl" || $app->app_security=="none") {
+            // start auth class and validate connection
+            require( dirname(__FILE__) . '/controllers/User.php');				// authentication and token handling
+            $Authentication = new User_controller ($Database, $Tools, $params, $Response);
+            $Authentication->check_auth ();
+        }
+    }
 
 
-	/* verify request ---------- */
+    /* verify request ---------- */
 
-	// check if the request is valid by checking if it's an array and looking for the controller and action
-	if( $params == false || isset($params->controller) == false ) {
-		$Response->throw_exception(400, 'Request is not valid');
-	}
-	// verify permissions for delete/create/edit if controller is not user (needed for auth)
-	if (@$params->controller != "user") {
-    	if( ($_SERVER['REQUEST_METHOD']=="POST" || $_SERVER['REQUEST_METHOD']=="PATCH"
-    	  || $_SERVER['REQUEST_METHOD']=="PUT"  || $_SERVER['REQUEST_METHOD']=="DELETE"
-    	  )
-    	  && $app->app_permissions<2) {
-    		$Response->throw_exception(401, 'invalid permissions');
-    	}
-	}
-	// verify content type
-	$Response->validate_content_type ();
+    // check if the request is valid by checking if it's an array and looking for the controller and action
+    if( $params == false || isset($params->controller) == false ) {
+        $Response->throw_exception(400, 'Request is not valid');
+    }
+    // verify permissions for delete/create/edit if controller is not user (needed for auth)
+    if (@$params->controller != "user") {
+        if( ($_SERVER['REQUEST_METHOD']=="POST" || $_SERVER['REQUEST_METHOD']=="PATCH"
+          || $_SERVER['REQUEST_METHOD']=="PUT"  || $_SERVER['REQUEST_METHOD']=="DELETE"
+            )
+          && $app->app_permissions<2) {
+            $Response->throw_exception(401, 'invalid permissions');
+        }
+    }
+    // verify content type
+    $Response->validate_content_type ();
 
 
-	/* Initialize controller ---------- */
+    /* Initialize controller ---------- */
 
-	//get the controller and format it correctly
-	$controller 	 = ucfirst(strtolower($params->controller))."_controller";
-	$controller_file = ucfirst(strtolower($params->controller));
+    //get the controller and format it correctly
+    $controller 	 = ucfirst(strtolower($params->controller))."_controller";
+    $controller_file = ucfirst(strtolower($params->controller));
 
-	//check if the controller exists. if not, throw an exception
-	if( file_exists( dirname(__FILE__) . "/controllers/$controller_file.php") ) {
-		require( dirname(__FILE__) . "/controllers/$controller_file.php");
-	} else {
-		$Response->throw_exception(400, 'invalid controller');
-	}
+    //check if the controller exists. if not, throw an exception
+    if( file_exists( dirname(__FILE__) . "/controllers/$controller_file.php") ) {
+        require( dirname(__FILE__) . "/controllers/$controller_file.php");
+    } else {
+        $Response->throw_exception(400, 'invalid controller');
+    }
 
-	//create a new instance of the controller, and pass
-	//it the parameters from the request and Database object
-	$controller = new $controller($Database, $Tools, $params, $Response);
+    //create a new instance of the controller, and pass
+    //it the parameters from the request and Database object
+    $controller = new $controller($Database, $Tools, $params, $Response);
 
-	//check if the action exists in the controller. if not, throw an exception.
-	if( method_exists($controller, strtolower($_SERVER['REQUEST_METHOD'])) === false ) {
-		$Response->throw_exception(501, $Response->errors[501]);
-	}
+    //check if the action exists in the controller. if not, throw an exception.
+    if( method_exists($controller, strtolower($_SERVER['REQUEST_METHOD'])) === false ) {
+        $Response->throw_exception(501, $Response->errors[501]);
+    }
 
-	//execute the action
-	$result = $controller->$_SERVER['REQUEST_METHOD'] ();
+    //execute the action
+    $result = $controller->$_SERVER['REQUEST_METHOD'] ();
 
 } catch ( Exception $e ) {
-	//catch any exceptions and report the problem
-	$result = $e->getMessage();
-
-	//set flag if it came from Result, just to be sure
-	if($Response->exception!==true) {
-		$Response->exception = true;
-		$Response->result['success'] = false;
-		$Response->result['code'] 	 = 500;
-		$Response->result['message'] = $result;
-	}
+    //catch any exceptions and report the problem
+    $result = $e->getMessage();
+
+    //set flag if it came from Result, just to be sure
+    if($Response->exception!==true) {
+        $Response->exception = true;
+        $Response->result['success'] = false;
+        $Response->result['code'] 	 = 500;
+        $Response->result['message'] = $result;
+    }
 }
 
 

functions/functions.php

Indentation +44 added lines, -44 removed lines

@@ -12,14 +12,14 @@ 
  * detect missing gettext and fake function
  */
 if(!function_exists('gettext')) {
-	function gettext ($text) 	{ return $text; }
-	function _($text) 			{ return $text; }
+    function gettext ($text) 	{ return $text; }
+    function _($text) 			{ return $text; }
 }
 
 // auto-set base if not already defined
 if(!defined('BASE')) {
-	$root = substr($_SERVER['DOCUMENT_ROOT'],-1)=="/" ? substr($_SERVER['DOCUMENT_ROOT'],0,-1) : $_SERVER['DOCUMENT_ROOT'];	// fix for missing / in some environments
-	define('BASE', substr(str_replace($root, "", dirname(__FILE__)),0,-9));
+    $root = substr($_SERVER['DOCUMENT_ROOT'],-1)=="/" ? substr($_SERVER['DOCUMENT_ROOT'],0,-1) : $_SERVER['DOCUMENT_ROOT'];	// fix for missing / in some environments
+    define('BASE', substr(str_replace($root, "", dirname(__FILE__)),0,-9));
 }
 
 /* @classes ---------------------- */
@@ -45,14 +45,14 @@ 
 
 # save settings to constant
 if($_GET['page']!="install" ) {
-	# database object
-	$Database 	= new Database_PDO;
-	# try to fetch settings
-	try { $settings = $Database->getObject("settings", 1); }
-	catch (Exception $e) { $settings = false; }
-	if ($settings!==false) {
-		define(SETTINGS, json_encode($settings));
-	}
+    # database object
+    $Database 	= new Database_PDO;
+    # try to fetch settings
+    try { $settings = $Database->getObject("settings", 1); }
+    catch (Exception $e) { $settings = false; }
+    if ($settings!==false) {
+        define(SETTINGS, json_encode($settings));
+    }
 }
 
 
@@ -64,42 +64,42 @@ 
  *	levels: $el
  */
 function create_link ($l0 = null, $l1 = null, $l2 = null, $l3 = null, $l4 = null, $l5 = null, $l6 = null ) {
-	# get settings
-	global $User;
+    # get settings
+    global $User;
 
-	# set normal link array
-	$el = array("page", "section", "subnetId", "sPage", "ipaddrid");
-	// override for search
-	if ($l0=="tools" && $l1=="search")
+    # set normal link array
+    $el = array("page", "section", "subnetId", "sPage", "ipaddrid");
+    // override for search
+    if ($l0=="tools" && $l1=="search")
     $el = array("page", "section", "addresses", "subnets", "vlans", "ip");
 
-	# set rewrite
-	if($User->settings->prettyLinks=="Yes") {
-		if(!is_null($l6))		{ $link = "$l0/$l1/$l2/$l3/$l4/$l5/$l6"; }
-		elseif(!is_null($l5))	{ $link = "$l0/$l1/$l2/$l3/$l4/$l5/"; }
-		elseif(!is_null($l4))	{ $link = "$l0/$l1/$l2/$l3/$l4/"; }
-		elseif(!is_null($l3))	{ $link = "$l0/$l1/$l2/$l3/"; }
-		elseif(!is_null($l2))	{ $link = "$l0/$l1/$l2/"; }
-		elseif(!is_null($l1))	{ $link = "$l0/$l1/"; }
-		elseif(!is_null($l0))	{ $link = "$l0/"; }
-		else					{ $link = ""; }
-	}
-	# normal
-	else {
-		if(!is_null($l6))		{ $link = "?$el[0]=$l0&$el[1]=$l1&$el[2]=$l2&$el[3]=$l3&$el[4]=$l4&$el[5]=$l5&$el[6]=$l6"; }
-		elseif(!is_null($l5))	{ $link = "?$el[0]=$l0&$el[1]=$l1&$el[2]=$l2&$el[3]=$l3&$el[4]=$l4&$el[5]=$l5"; }
-		elseif(!is_null($l4))	{ $link = "?$el[0]=$l0&$el[1]=$l1&$el[2]=$l2&$el[3]=$l3&$el[4]=$l4"; }
-		elseif(!is_null($l3))	{ $link = "?$el[0]=$l0&$el[1]=$l1&$el[2]=$l2&$el[3]=$l3"; }
-		elseif(!is_null($l2))	{ $link = "?$el[0]=$l0&$el[1]=$l1&$el[2]=$l2"; }
-		elseif(!is_null($l1))	{ $link = "?$el[0]=$l0&$el[1]=$l1"; }
-		elseif(!is_null($l0))	{ $link = "?$el[0]=$l0"; }
-		else					{ $link = ""; }
-	}
-	# prepend base
-	$link = BASE.$link;
+    # set rewrite
+    if($User->settings->prettyLinks=="Yes") {
+        if(!is_null($l6))		{ $link = "$l0/$l1/$l2/$l3/$l4/$l5/$l6"; }
+        elseif(!is_null($l5))	{ $link = "$l0/$l1/$l2/$l3/$l4/$l5/"; }
+        elseif(!is_null($l4))	{ $link = "$l0/$l1/$l2/$l3/$l4/"; }
+        elseif(!is_null($l3))	{ $link = "$l0/$l1/$l2/$l3/"; }
+        elseif(!is_null($l2))	{ $link = "$l0/$l1/$l2/"; }
+        elseif(!is_null($l1))	{ $link = "$l0/$l1/"; }
+        elseif(!is_null($l0))	{ $link = "$l0/"; }
+        else					{ $link = ""; }
+    }
+    # normal
+    else {
+        if(!is_null($l6))		{ $link = "?$el[0]=$l0&$el[1]=$l1&$el[2]=$l2&$el[3]=$l3&$el[4]=$l4&$el[5]=$l5&$el[6]=$l6"; }
+        elseif(!is_null($l5))	{ $link = "?$el[0]=$l0&$el[1]=$l1&$el[2]=$l2&$el[3]=$l3&$el[4]=$l4&$el[5]=$l5"; }
+        elseif(!is_null($l4))	{ $link = "?$el[0]=$l0&$el[1]=$l1&$el[2]=$l2&$el[3]=$l3&$el[4]=$l4"; }
+        elseif(!is_null($l3))	{ $link = "?$el[0]=$l0&$el[1]=$l1&$el[2]=$l2&$el[3]=$l3"; }
+        elseif(!is_null($l2))	{ $link = "?$el[0]=$l0&$el[1]=$l1&$el[2]=$l2"; }
+        elseif(!is_null($l1))	{ $link = "?$el[0]=$l0&$el[1]=$l1"; }
+        elseif(!is_null($l0))	{ $link = "?$el[0]=$l0"; }
+        else					{ $link = ""; }
+    }
+    # prepend base
+    $link = BASE.$link;
 
-	# result
-	return $link;
+    # result
+    return $link;
 }
 
 /* get version */

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

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;
+    }
 
 }
 

api/controllers/Folders.php

Indentation +82 added lines, -82 removed lines

@@ -8,88 +8,88 @@
  */
 class Folders_controller extends Common_api_functions {
 
-	/**
-	 * __construct function
-	 *
-	 * @access public
-	 * @param class $Database
-	 * @param class $Tools
-	 * @param mixed $params		// post/get values
-	 * @param mixed $Response
-	 */
-	public function __construct($Database, $Tools, $params, $Response) {
-		// include
-		require("Subnets.php");
-		// subnets
-		$this->Subnets_controller = new Subnets_controller ($Database, $Tools, $params, $Response);
-	}
-
-
-
-
-	/**
-	 * Options
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function OPTIONS () {
-		return $this->Subnets_controller->OPTIONS ();
-	}
-
-	/**
-	 * HEAD, no response
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function HEAD () {
-		return $this->Subnets_controller->GET ();
-	}
-
-
-	/**
-	 * Creates new folder
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function POST () {
-		return $this->Subnets_controller->POST ();
-	}
-
-
-	/**
-	 * Read folder functions
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function GET () {
-		return $this->Subnets_controller->GET ();
-	}
-
-
-	/**
-	 * Updates existing subnet
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function PATCH () {
-		return $this->Subnets_controller->PATCH ();
-	}
-
-
-	/**
-	 * Deletes existing subnet along with and addresses
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function DELETE () {
-		return $this->Subnets_controller->DELETE ();
-	}
+    /**
+     * __construct function
+     *
+     * @access public
+     * @param class $Database
+     * @param class $Tools
+     * @param mixed $params		// post/get values
+     * @param mixed $Response
+     */
+    public function __construct($Database, $Tools, $params, $Response) {
+        // include
+        require("Subnets.php");
+        // subnets
+        $this->Subnets_controller = new Subnets_controller ($Database, $Tools, $params, $Response);
+    }
+
+
+
+
+    /**
+     * Options
+     *
+     * @access public
+     * @return void
+     */
+    public function OPTIONS () {
+        return $this->Subnets_controller->OPTIONS ();
+    }
+
+    /**
+     * HEAD, no response
+     *
+     * @access public
+     * @return void
+     */
+    public function HEAD () {
+        return $this->Subnets_controller->GET ();
+    }
+
+
+    /**
+     * Creates new folder
+     *
+     * @access public
+     * @return void
+     */
+    public function POST () {
+        return $this->Subnets_controller->POST ();
+    }
+
+
+    /**
+     * Read folder functions
+     *
+     * @access public
+     * @return void
+     */
+    public function GET () {
+        return $this->Subnets_controller->GET ();
+    }
+
+
+    /**
+     * Updates existing subnet
+     *
+     * @access public
+     * @return void
+     */
+    public function PATCH () {
+        return $this->Subnets_controller->PATCH ();
+    }
+
+
+    /**
+     * Deletes existing subnet along with and addresses
+     *
+     * @access public
+     * @return void
+     */
+    public function DELETE () {
+        return $this->Subnets_controller->DELETE ();
+    }
 }
 
 ?>
\ No newline at end of file

api/controllers/Tools.php

Indentation +517 added lines, -517 removed lines

@@ -9,554 +9,554 @@
 class Tools_controller extends Common_api_functions {
 
 
-	/**
-	 * _params provided
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $_params;
-
-	/**
-	 * subcontrollers
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $subcontrollers;
-
-	/**
-	 * sort_key for database sorting
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $sort_key;
-
-	/**
-	 * identifiers
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $identifiers;
-
-	/**
-	 * Database object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Database;
-
-	/**
-	 * Response
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Response;
-
-	/**
-	 * Master Tools object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Tools;
-
-	/**
-	 * Main Admin class
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Admin;
-
-	/**
-	 * Main Subnets class
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Subnets;
-
-	/**
-	 * __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->Response = $Response;
-		$this->Tools 	= $Tools;
-		$this->_params 	= $params;
-		// init required objects
-		$this->init_object ("Admin", $Database);
-		$this->init_object ("Subnets", $Database);
-		// define controllers
-		$this->define_tools_controllers ();
-		$this->define_available_identifiers ();
-
-		// fist validate subcontroller
-		$this->validate_subcontroller ();
-		// rewrite subcontroller
-		$this->rewrite_subcontroller ();
-
-		// set valid keys
-		$this->set_valid_keys ($this->_params->id);
-
-		// set sort key
-		$this->define_sort_key ();
-	}
-
-	/**
-	 * Defines available tools (sub)controllers.
-	 *
-	 *	tools has subcontrollers, defined with id2 parameter
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function define_tools_controllers () {
-		$this->subcontrollers = array("ipTags"=>"tags",
-									  "devices"=>"devices",
-									  "deviceTypes"=>"devicetypes",
-									  "vlans"=>"vlans",
-									  "vrf"=>"vrfs",
-									  "nameservers"=>"nameservers",
-									  "scanAgents"=>"scanagents"
-									  );
-	}
-
-	/**
-	 * Defines available identifiers for subcontrollers
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function define_available_identifiers () {
-		$this->identifiers = array(
-								"ipTags"=>array("id2", "id3"),
-								"devices"=>array("id2", "id3"),
-								"deviceTypes"=>array("id2", "id3"),
-								"vlans"=>array("id2", "id3"),
-								"vrf"=>array("id2", "id3"),
-								"nameservers"=>array("id2"),
-								"scanAgents"=>array("id2")
-								);
-	}
-
-	/**
-	 * define_sort_key function
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function define_sort_key () {
-		// deviceTypes
-		if ($this->_params->id == "deviceTypes")	{ $this->sort_key = "tid"; }
-		elseif ($this->_params->id == "vlans")		{ $this->sort_key = "vlanId"; }
-		elseif ($this->_params->id == "vrf")		{ $this->sort_key = "vrfId"; }
-		else										{ $this->sort_key = "id"; }
-	}
-
-
-
-
-
-
-
-	/**
-	 * returns general Controllers and supported methods
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function OPTIONS () {
-		// validate
-		$this->validate_options_request ();
-
-		// get api
-		$app = $this->Tools->fetch_object ("api", "app_id", $this->_params->app_id);
-
-		// controllers
-		$controllers = array(
-						array("rel"=>"sections",	"href"=>"/api/".$_GET['app_id']."/sections/"),
-						array("rel"=>"subnets",		"href"=>"/api/".$_GET['app_id']."/subnets/"),
-						array("rel"=>"folders",		"href"=>"/api/".$_GET['app_id']."/folders/"),
-						array("rel"=>"addresses",	"href"=>"/api/".$_GET['app_id']."/addresses/"),
-						array("rel"=>"vlans",		"href"=>"/api/".$_GET['app_id']."/vlans/"),
-						array("rel"=>"vrfs",		"href"=>"/api/".$_GET['app_id']."/vrfs/"),
-						array("rel"=>"nameservers",	"href"=>"/api/".$_GET['app_id']."/nameservers/"),
-						array("rel"=>"scanAgents",	"href"=>"/api/".$_GET['app_id']."/scanagents/"),
-						array("rel"=>"tools",		"href"=>"/api/".$_GET['app_id']."/tools/")
-					);
-		# Response
-		return array("code"=>200, "data"=>array("permissions"=>$this->Subnets->parse_permissions($app->app_permissions), "controllers"=>$controllers));
-	}
-
-
-
-
-
-	/**
-	 * fetch tools object
-	 *
-	 *	structure:
-	 *		/tools/{subcontroller}/{identifier}/{parameter}/
-	 *
-	 *		/{tools}/id/id2/id3/
-	 *
-	 *		- {subcontroller}	- defines which tools object to work on
-	 *		- {identifier}		- defines id for that object (optional)
-	 *		- {parameter}		- additional parameter (optional)
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function GET () {
-		# validate identifiers
-		$this->validate_subcontroller_identifier ();
-
-		# all ?
-		if (!isset($this->_params->id2)) {
-			$result = $this->Tools->fetch_all_objects ($this->_params->id,  $this->sort_key);
-			// result
-			if($result===false)							{ $this->Response->throw_exception(404, 'No objects found'); }
-			else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, "tools/".$this->_params->id, true, false)); }
-		}
-		# by parameter
-		elseif (isset($this->_params->id3)) {
-			// devices (for deviceTypes)
-			if ($this->_params->id == "deviceTypes" && $this->_params->id3=="devices") {
-				// fetch
-				$result = $this->Tools->fetch_multiple_objects ("devices", "type", $this->_params->id2, "id", true);
-			}
-			// vlans
-			elseif ($this->_params->id == "vlans" && $this->_params->id3=="subnets") {
-				// fetch
-				$result = $this->Tools->fetch_multiple_objects ("subnets", "vlanId", $this->_params->id2, "id", true);
+    /**
+     * _params provided
+     *
+     * @var mixed
+     * @access public
+     */
+    public $_params;
+
+    /**
+     * subcontrollers
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $subcontrollers;
+
+    /**
+     * sort_key for database sorting
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $sort_key;
+
+    /**
+     * identifiers
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $identifiers;
+
+    /**
+     * Database object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Database;
+
+    /**
+     * Response
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Response;
+
+    /**
+     * Master Tools object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Tools;
+
+    /**
+     * Main Admin class
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Admin;
+
+    /**
+     * Main Subnets class
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Subnets;
+
+    /**
+     * __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->Response = $Response;
+        $this->Tools 	= $Tools;
+        $this->_params 	= $params;
+        // init required objects
+        $this->init_object ("Admin", $Database);
+        $this->init_object ("Subnets", $Database);
+        // define controllers
+        $this->define_tools_controllers ();
+        $this->define_available_identifiers ();
+
+        // fist validate subcontroller
+        $this->validate_subcontroller ();
+        // rewrite subcontroller
+        $this->rewrite_subcontroller ();
+
+        // set valid keys
+        $this->set_valid_keys ($this->_params->id);
+
+        // set sort key
+        $this->define_sort_key ();
+    }
+
+    /**
+     * Defines available tools (sub)controllers.
+     *
+     *	tools has subcontrollers, defined with id2 parameter
+     *
+     * @access private
+     * @return void
+     */
+    private function define_tools_controllers () {
+        $this->subcontrollers = array("ipTags"=>"tags",
+                                        "devices"=>"devices",
+                                        "deviceTypes"=>"devicetypes",
+                                        "vlans"=>"vlans",
+                                        "vrf"=>"vrfs",
+                                        "nameservers"=>"nameservers",
+                                        "scanAgents"=>"scanagents"
+                                        );
+    }
+
+    /**
+     * Defines available identifiers for subcontrollers
+     *
+     * @access private
+     * @return void
+     */
+    private function define_available_identifiers () {
+        $this->identifiers = array(
+                                "ipTags"=>array("id2", "id3"),
+                                "devices"=>array("id2", "id3"),
+                                "deviceTypes"=>array("id2", "id3"),
+                                "vlans"=>array("id2", "id3"),
+                                "vrf"=>array("id2", "id3"),
+                                "nameservers"=>array("id2"),
+                                "scanAgents"=>array("id2")
+                                );
+    }
+
+    /**
+     * define_sort_key function
+     *
+     * @access private
+     * @return void
+     */
+    private function define_sort_key () {
+        // deviceTypes
+        if ($this->_params->id == "deviceTypes")	{ $this->sort_key = "tid"; }
+        elseif ($this->_params->id == "vlans")		{ $this->sort_key = "vlanId"; }
+        elseif ($this->_params->id == "vrf")		{ $this->sort_key = "vrfId"; }
+        else										{ $this->sort_key = "id"; }
+    }
+
+
+
+
+
+
+
+    /**
+     * returns general Controllers and supported methods
+     *
+     * @access public
+     * @return void
+     */
+    public function OPTIONS () {
+        // validate
+        $this->validate_options_request ();
+
+        // get api
+        $app = $this->Tools->fetch_object ("api", "app_id", $this->_params->app_id);
+
+        // controllers
+        $controllers = array(
+                        array("rel"=>"sections",	"href"=>"/api/".$_GET['app_id']."/sections/"),
+                        array("rel"=>"subnets",		"href"=>"/api/".$_GET['app_id']."/subnets/"),
+                        array("rel"=>"folders",		"href"=>"/api/".$_GET['app_id']."/folders/"),
+                        array("rel"=>"addresses",	"href"=>"/api/".$_GET['app_id']."/addresses/"),
+                        array("rel"=>"vlans",		"href"=>"/api/".$_GET['app_id']."/vlans/"),
+                        array("rel"=>"vrfs",		"href"=>"/api/".$_GET['app_id']."/vrfs/"),
+                        array("rel"=>"nameservers",	"href"=>"/api/".$_GET['app_id']."/nameservers/"),
+                        array("rel"=>"scanAgents",	"href"=>"/api/".$_GET['app_id']."/scanagents/"),
+                        array("rel"=>"tools",		"href"=>"/api/".$_GET['app_id']."/tools/")
+                    );
+        # Response
+        return array("code"=>200, "data"=>array("permissions"=>$this->Subnets->parse_permissions($app->app_permissions), "controllers"=>$controllers));
+    }
+
+
+
+
+
+    /**
+     * fetch tools object
+     *
+     *	structure:
+     *		/tools/{subcontroller}/{identifier}/{parameter}/
+     *
+     *		/{tools}/id/id2/id3/
+     *
+     *		- {subcontroller}	- defines which tools object to work on
+     *		- {identifier}		- defines id for that object (optional)
+     *		- {parameter}		- additional parameter (optional)
+     *
+     * @access public
+     * @return void
+     */
+    public function GET () {
+        # validate identifiers
+        $this->validate_subcontroller_identifier ();
+
+        # all ?
+        if (!isset($this->_params->id2)) {
+            $result = $this->Tools->fetch_all_objects ($this->_params->id,  $this->sort_key);
+            // result
+            if($result===false)							{ $this->Response->throw_exception(404, 'No objects found'); }
+            else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, "tools/".$this->_params->id, true, false)); }
+        }
+        # by parameter
+        elseif (isset($this->_params->id3)) {
+            // devices (for deviceTypes)
+            if ($this->_params->id == "deviceTypes" && $this->_params->id3=="devices") {
+                // fetch
+                $result = $this->Tools->fetch_multiple_objects ("devices", "type", $this->_params->id2, "id", true);
+            }
+            // vlans
+            elseif ($this->_params->id == "vlans" && $this->_params->id3=="subnets") {
+                // fetch
+                $result = $this->Tools->fetch_multiple_objects ("subnets", "vlanId", $this->_params->id2, "id", true);
                 // add gateway
-    			if($result!=false) {
-    				foreach ($result as $k=>$r) {
-        				//gateway
-                		$gateway = $this->read_subnet_gateway ($r->id);
-                		if ( $gateway!== false) {
-                    		$result[$k]->gatewayId = $gateway->id;
-                		}
-                    	//nameservers
-                		$ns = $this->read_subnet_nameserver ();
+                if($result!=false) {
+                    foreach ($result as $k=>$r) {
+                        //gateway
+                        $gateway = $this->read_subnet_gateway ($r->id);
+                        if ( $gateway!== false) {
+                            $result[$k]->gatewayId = $gateway->id;
+                        }
+                        //nameservers
+                        $ns = $this->read_subnet_nameserver ();
                         if ($ns!==false) {
                             $result[$k]->nameservers = $ns;
                         }
-    				}
-    			}
-			}
-			// vrfs
-			elseif ($this->_params->id == "vrf" && $this->_params->id3=="subnets") {
-				// fetch
-				$result = $this->Tools->fetch_multiple_objects ("subnets", "vrfId", $this->_params->id2, "id", true);
+                    }
+                }
+            }
+            // vrfs
+            elseif ($this->_params->id == "vrf" && $this->_params->id3=="subnets") {
+                // fetch
+                $result = $this->Tools->fetch_multiple_objects ("subnets", "vrfId", $this->_params->id2, "id", true);
                 // add gateway
-    			if($result!=false) {
-    				foreach ($result as $k=>$r) {
-                		$gateway = $this->read_subnet_gateway ($r->id);
-                		if ( $gateway!== false) {
-                    		$result[$k]->gatewayId = $gateway->id;
-                		}
-    				}
-    			}
-			}
-			else {
-    			$field = string;
-				// id3 can only be addresses
-				if ($this->_params->id3 != "addresses")	{ $this->Response->throw_exception(400, 'Invalid parameter'); }
-				// define identifier
-				if ($this->_params->id == "ipTags") 	{ $field = "state"; }
-				elseif ($this->_params->id == "devices"){ $field = "switch"; }
-				else									{ $this->Response->throw_exception(400, 'Invalid parameter'); }
-				// fetch
-				$result = $this->Tools->fetch_multiple_objects ("ipaddresses", $field, $this->_params->id2, $this->sort_key, true);
-			}
-			// result
-			if($result===false)							{ $this->Response->throw_exception(404, 'No objects found'); }
-			else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, "tools/".$this->_params->id, true, true)); }
-
-		}
-		# by id
-		else {
-			// numeric
-			if(!is_numeric($this->_params->id2)) 		{ $this->Response->throw_exception(404, 'Identifier must be numeric'); }
-
-			$result = $this->Tools->fetch_object ($this->_params->id, $this->sort_key, $this->_params->id2);
-			// result
-			if($result===false)							{ $this->Response->throw_exception(404, 'No objects found'); }
-			else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, "tools/".$this->_params->id, true, false)); }
-		}
-	}
+                if($result!=false) {
+                    foreach ($result as $k=>$r) {
+                        $gateway = $this->read_subnet_gateway ($r->id);
+                        if ( $gateway!== false) {
+                            $result[$k]->gatewayId = $gateway->id;
+                        }
+                    }
+                }
+            }
+            else {
+                $field = string;
+                // id3 can only be addresses
+                if ($this->_params->id3 != "addresses")	{ $this->Response->throw_exception(400, 'Invalid parameter'); }
+                // define identifier
+                if ($this->_params->id == "ipTags") 	{ $field = "state"; }
+                elseif ($this->_params->id == "devices"){ $field = "switch"; }
+                else									{ $this->Response->throw_exception(400, 'Invalid parameter'); }
+                // fetch
+                $result = $this->Tools->fetch_multiple_objects ("ipaddresses", $field, $this->_params->id2, $this->sort_key, true);
+            }
+            // result
+            if($result===false)							{ $this->Response->throw_exception(404, 'No objects found'); }
+            else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, "tools/".$this->_params->id, true, true)); }
+
+        }
+        # by id
+        else {
+            // numeric
+            if(!is_numeric($this->_params->id2)) 		{ $this->Response->throw_exception(404, 'Identifier must be numeric'); }
+
+            $result = $this->Tools->fetch_object ($this->_params->id, $this->sort_key, $this->_params->id2);
+            // result
+            if($result===false)							{ $this->Response->throw_exception(404, 'No objects found'); }
+            else										{ return array("code"=>200, "data"=>$this->prepare_result ($result, "tools/".$this->_params->id, true, false)); }
+        }
+    }
+
+
+
 
 
+    /**
+     * Creates new tools object
+     *
+     *	required parameters:
+     *		id {subcontroller}
+     *
+     *		/tools/{subcontroller}/
+     *
+     * @access public
+     * @return void
+     */
+    public function POST () {
+        # vlans, vrfs
+        if ($this->_params->id=="vlans" || $this->_params->id=="vrf")
+                                                    { $this->Response->throw_exception(400, 'Please use '.$this->_params->id.' controller'); }
 
+        # check for valid keys
+        $values = $this->validate_keys ();
+
+        # validations
+        $this->validate_post_patch ();
+
+        # only 1 parameter ?
+        if (sizeof($values)==1)						{ $this->Response->throw_exception(400, 'No parameters'); }
+
+        # execute update
+        if(!$this->Admin->object_modify ($this->_params->id, "add", "", $values))
+                                                    { $this->Response->throw_exception(500, $this->_params->id." object creation failed"); }
+        else {
+            //set result
+            return array("code"=>201, "data"=>$this->_params->id." object created", "location"=>"/api/".$this->_params->app_id."/tools/".$this->_params->id."/".$this->Admin->lastId."/");
+        }
 
-
-	/**
-	 * Creates new tools object
-	 *
-	 *	required parameters:
-	 *		id {subcontroller}
-	 *
-	 *		/tools/{subcontroller}/
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function POST () {
-		# vlans, vrfs
-		if ($this->_params->id=="vlans" || $this->_params->id=="vrf")
-													{ $this->Response->throw_exception(400, 'Please use '.$this->_params->id.' controller'); }
-
-		# check for valid keys
-		$values = $this->validate_keys ();
-
-		# validations
-		$this->validate_post_patch ();
-
-		# only 1 parameter ?
-		if (sizeof($values)==1)						{ $this->Response->throw_exception(400, 'No parameters'); }
-
-		# execute update
-		if(!$this->Admin->object_modify ($this->_params->id, "add", "", $values))
-													{ $this->Response->throw_exception(500, $this->_params->id." object creation failed"); }
-		else {
-			//set result
-			return array("code"=>201, "data"=>$this->_params->id." object created", "location"=>"/api/".$this->_params->app_id."/tools/".$this->_params->id."/".$this->Admin->lastId."/");
-		}
-
-	}
+    }
 
 
 
 
 
 
-	/**
-	 * HEAD, no response
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function HEAD () {
-		return $this->GET ();
-	}
+    /**
+     * HEAD, no response
+     *
+     * @access public
+     * @return void
+     */
+    public function HEAD () {
+        return $this->GET ();
+    }
 
 
 
 
 
-	/**
-	 * Updates tools object
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function PATCH () {
-		# vlans, vrfs
-		if ($this->_params->id=="vlans" || $this->_params->id=="vrf")
-													{ $this->Response->throw_exception(400, 'Please use '.$this->_params->id.' controller'); }
+    /**
+     * Updates tools object
+     *
+     * @access public
+     * @return void
+     */
+    public function PATCH () {
+        # vlans, vrfs
+        if ($this->_params->id=="vlans" || $this->_params->id=="vrf")
+                                                    { $this->Response->throw_exception(400, 'Please use '.$this->_params->id.' controller'); }
 
-		# verify object
-		$this->validate_tools_object ();
+        # verify object
+        $this->validate_tools_object ();
 
-		# validations
-		$this->validate_post_patch ();
+        # validations
+        $this->validate_post_patch ();
 
-		# rewrite keys - id2 must become id and unset
-		$table_name = $this->_params->id;
-		$this->_params->id = $this->_params->id2;
-		unset($this->_params->id2);
+        # rewrite keys - id2 must become id and unset
+        $table_name = $this->_params->id;
+        $this->_params->id = $this->_params->id2;
+        unset($this->_params->id2);
 
-		# validate and prepare keys
-		$values = $this->validate_keys ();
+        # validate and prepare keys
+        $values = $this->validate_keys ();
 
-		# only 1 parameter ?
-		if (sizeof($values)==1)						{ $this->Response->throw_exception(400, 'No parameters'); }
+        # only 1 parameter ?
+        if (sizeof($values)==1)						{ $this->Response->throw_exception(400, 'No parameters'); }
 
-		# execute update
-		if(!$this->Admin->object_modify ($table_name, "edit",  $this->sort_key, $values))
-													{ $this->Response->throw_exception(500, $table_name." object edit failed"); }
-		else {
-			//set result
-			return array("code"=>200, "data"=>$table_name." object updated");
-		}
-	}
+        # execute update
+        if(!$this->Admin->object_modify ($table_name, "edit",  $this->sort_key, $values))
+                                                    { $this->Response->throw_exception(500, $table_name." object edit failed"); }
+        else {
+            //set result
+            return array("code"=>200, "data"=>$table_name." object updated");
+        }
+    }
 
 
 
 
 
-	/**
-	 * Deletes existing vlan
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function DELETE () {
-		# vlans, vrfs
-		if ($this->_params->id=="vlans" || $this->_params->id=="vrf")
-													{ $this->Response->throw_exception(400, 'Please use '.$this->_params->id.' controller'); }
-
-		# verify object
-		$this->validate_tools_object ();
-
-		# set variables for delete
-		$values = array();
-		$values[$this->sort_key] = $this->_params->id2;
-
-		# execute delete
-		if(!$this->Admin->object_modify ($this->_params->id, "delete",  $this->sort_key, $values))
-													{ $this->Response->throw_exception(500, $this->_params->id." object delete failed"); }
-		else {
-			// set update field
-			if ($this->_params->id == "devices")	{ $update_field = "switch"; }
-			elseif ($this->_params->id == "ipTags")	{ $update_field = "state"; }
-
-			// delete all references
-			if (isset($update_field))
-			$this->Admin->remove_object_references ("ipaddresses", $update_field, $this->_params->id2);
-
-			// set result
-			return array("code"=>200, "data"=>$this->_params->id." object deleted");
-		}
-	}
-
-
-
-
-
-
-
-
-
-
-	/* @validations ---------- */
-
-	/**
-	 * Validates subcontroller
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_subcontroller () {
-		// not options
-		if($this->_params->controller !== "options")
-		if (!in_array($this->_params->id, @$this->subcontrollers))			{ $this->Response->throw_exception(400, "Invalid subcontroller"); }
-	}
-
-	/**
-	 * Validates identifier for subcontroller
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_subcontroller_identifier () {
-		// id3
-		if (isset($this->_params->id3)) {
-			if(!in_array("id3", $this->identifiers[$this->_params->id]))	{ $this->Response->throw_exception(400, "Invalid subcontroller identifier"); }
-		}
-		// id2
-		if (isset($this->_params->id2)) {
-			if(!in_array("id2", $this->identifiers[$this->_params->id]))	{ $this->Response->throw_exception(400, "Invalid subcontroller identifier"); }
-		}
-	}
-
-	/**
-	 * Rewrites id (tags -> ipTags) to match database fields
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function rewrite_subcontroller () {
-		$this->_params->id = array_search($this->_params->id, $this->subcontrollers);
-	}
-
-	/**
-	 * Validates that tools object exists.
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_tools_object () {
-		if ($this->Tools->fetch_object ($this->_params->id, $this->sort_key, $this->_params->id2)===false)
-																			{ $this->Response->throw_exception(400, "Invalid identifier"); }
-	}
-
-	/**
-	 * Validations for post and patch
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_post_patch () {
-		$this->validate_device_type ();
-		$this->validate_ip ();
-	}
-
-	/**
-	 * Validates device type
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_device_type () {
-		if ($this->_params->id == "devices" && isset($this->_params->type)) {
-			// numeric
-			if (!is_numeric($this->_params->type))							{ $this->Response->throw_exception(400, "Invalid devicetype identifier"); }
-			// check
-			if ($this->Tools->fetch_object ("deviceTypes", "tid", $this->_params->type)===false)
-																			{ $this->Response->throw_exception(400, "Device type does not exist"); }
-		}
-	}
-
-	/**
-	 * Validates IP address
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function validate_ip () {
-		if (isset($this->_params->ip_addr)) {
-			// check
-			if(strlen($err = $this->Subnets->verify_cidr_address($this->_params->ip_addr."/32"))>1)
-																			{ $this->Response->throw_exception(400, $err); }
-
-		}
-	}
-
-	/**
-	 * 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", $result->nameserverId);
-	}
+    /**
+     * Deletes existing vlan
+     *
+     * @access public
+     * @return void
+     */
+    public function DELETE () {
+        # vlans, vrfs
+        if ($this->_params->id=="vlans" || $this->_params->id=="vrf")
+                                                    { $this->Response->throw_exception(400, 'Please use '.$this->_params->id.' controller'); }
+
+        # verify object
+        $this->validate_tools_object ();
+
+        # set variables for delete
+        $values = array();
+        $values[$this->sort_key] = $this->_params->id2;
+
+        # execute delete
+        if(!$this->Admin->object_modify ($this->_params->id, "delete",  $this->sort_key, $values))
+                                                    { $this->Response->throw_exception(500, $this->_params->id." object delete failed"); }
+        else {
+            // set update field
+            if ($this->_params->id == "devices")	{ $update_field = "switch"; }
+            elseif ($this->_params->id == "ipTags")	{ $update_field = "state"; }
+
+            // delete all references
+            if (isset($update_field))
+            $this->Admin->remove_object_references ("ipaddresses", $update_field, $this->_params->id2);
+
+            // set result
+            return array("code"=>200, "data"=>$this->_params->id." object deleted");
+        }
+    }
+
+
+
+
+
+
+
+
+
+
+    /* @validations ---------- */
+
+    /**
+     * Validates subcontroller
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_subcontroller () {
+        // not options
+        if($this->_params->controller !== "options")
+        if (!in_array($this->_params->id, @$this->subcontrollers))			{ $this->Response->throw_exception(400, "Invalid subcontroller"); }
+    }
+
+    /**
+     * Validates identifier for subcontroller
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_subcontroller_identifier () {
+        // id3
+        if (isset($this->_params->id3)) {
+            if(!in_array("id3", $this->identifiers[$this->_params->id]))	{ $this->Response->throw_exception(400, "Invalid subcontroller identifier"); }
+        }
+        // id2
+        if (isset($this->_params->id2)) {
+            if(!in_array("id2", $this->identifiers[$this->_params->id]))	{ $this->Response->throw_exception(400, "Invalid subcontroller identifier"); }
+        }
+    }
+
+    /**
+     * Rewrites id (tags -> ipTags) to match database fields
+     *
+     * @access private
+     * @return void
+     */
+    private function rewrite_subcontroller () {
+        $this->_params->id = array_search($this->_params->id, $this->subcontrollers);
+    }
+
+    /**
+     * Validates that tools object exists.
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_tools_object () {
+        if ($this->Tools->fetch_object ($this->_params->id, $this->sort_key, $this->_params->id2)===false)
+                                                                            { $this->Response->throw_exception(400, "Invalid identifier"); }
+    }
+
+    /**
+     * Validations for post and patch
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_post_patch () {
+        $this->validate_device_type ();
+        $this->validate_ip ();
+    }
+
+    /**
+     * Validates device type
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_device_type () {
+        if ($this->_params->id == "devices" && isset($this->_params->type)) {
+            // numeric
+            if (!is_numeric($this->_params->type))							{ $this->Response->throw_exception(400, "Invalid devicetype identifier"); }
+            // check
+            if ($this->Tools->fetch_object ("deviceTypes", "tid", $this->_params->type)===false)
+                                                                            { $this->Response->throw_exception(400, "Device type does not exist"); }
+        }
+    }
+
+    /**
+     * Validates IP address
+     *
+     * @access private
+     * @return void
+     */
+    private function validate_ip () {
+        if (isset($this->_params->ip_addr)) {
+            // check
+            if(strlen($err = $this->Subnets->verify_cidr_address($this->_params->ip_addr."/32"))>1)
+                                                                            { $this->Response->throw_exception(400, $err); }
+
+        }
+    }
+
+    /**
+     * 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", $result->nameserverId);
+    }
 }
 
 ?>
\ No newline at end of file