phpipam / phpipam

functions/scripts/reset-admin-password.php

Indentation +47 added lines, -47 removed lines

@@ -30,14 +30,14 @@ 
 // 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
-		$password = trim( readline("Enter new admin password: ") );
-	}
+    // 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
+        $password = trim( readline("Enter new admin password: ") );
+    }
 }
 
 // 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); }
@@ -59,10 +59,10 @@ 
 
 // debug ?
 if ($debugging) {
-	$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
@@ -70,7 +70,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(); }
@@ -80,38 +80,38 @@ 
 
 # try to send
 try {
-	// fetch mailer settings
-	$mail_settings = $Admin->fetch_object("settingsMail", "id", 1);
-	# initialize mailer
-	$phpipam_mail = new phpipam_mail($settings, $mail_settings);
-
-	// set subject
-	$subject	= "phpIPAM Administrator password updated";
-	//html
-	$content[] = "<h3>phpIPAM Administrator password updated</h3>";
-	$content[] = "<hr>";
-	$content[] = "Administrator password was updated via cli script";
-	//plain
-	$content_plain[] = "phpIPAM Administrator password updated \r\n------------------------------";
-	$content_plain[] = "Administrator password was updated via cli script";
-
-
-	# set content
-	$content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
-	$content_plain 	= implode("\r\n",$content_plain);
-
-	$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();
+    // fetch mailer settings
+    $mail_settings = $Admin->fetch_object("settingsMail", "id", 1);
+    # initialize mailer
+    $phpipam_mail = new phpipam_mail($settings, $mail_settings);
+
+    // set subject
+    $subject	= "phpIPAM Administrator password updated";
+    //html
+    $content[] = "<h3>phpIPAM Administrator password updated</h3>";
+    $content[] = "<hr>";
+    $content[] = "Administrator password was updated via cli script";
+    //plain
+    $content_plain[] = "phpIPAM Administrator password updated \r\n------------------------------";
+    $content_plain[] = "Administrator password was updated via cli script";
+
+
+    # set content
+    $content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
+    $content_plain 	= implode("\r\n",$content_plain);
+
+    $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->getMessage(), true);
+    $Result->show_cli("Mailer Error: ".$e->getMessage(), true);
 }
\ No newline at end of file

Spacing +20 added lines, -20 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 # include required scripts
-require_once( dirname(__FILE__) . '/../functions.php' );
+require_once(dirname(__FILE__).'/../functions.php');
 
 # Set php warnign levels
 error_reporting(E_ERROR | E_WARNING | E_PARSE | E_NOTICE);
@@ -18,35 +18,35 @@ 
 $disable_email_notification = false;
 
 # initialize objects
-$Database 	= new Database_PDO;
-$Admin		= new Admin ($Database, false);
-$User		= new User ($Database, true);
-$Result		= new Result();
+$Database = new Database_PDO;
+$Admin = new Admin($Database, false);
+$User = new User($Database, true);
+$Result = new Result();
 
 
 // script can only be run from cli
-if(php_sapi_name()!="cli") 									{ $Result->show_cli("This script can only be run from cli", true); }
+if (php_sapi_name() != "cli") { $Result->show_cli("This script can only be run from cli", true); }
 
 // check if argv[1] provided, if not check readline support and wait for user pass
-if (isset($argv[1]))	{ $password = $argv[1]; }
+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); }
+	if (!in_array("readline", $available_extensions)) { $Result->show_cli("readline php extension is required.\nOr provide password as first argument", true); }
 	else {
 		// read password
-		$password = trim( readline("Enter new admin password: ") );
+		$password = trim(readline("Enter new admin password: "));
 	}
 }
 
 // validate password
-if(strlen($password)<8)										{ $Result->show_cli("Password must be at least 8 characters long", true); }
+if (strlen($password) < 8) { $Result->show_cli("Password must be at least 8 characters long", true); }
 
 // hash passowrd
-$password_crypted = $User->crypt_user_pass ($password);
+$password_crypted = $User->crypt_user_pass($password);
 // save type
-$crypt_type = $User->return_crypt_type ();
+$crypt_type = $User->return_crypt_type();
 
 // set update array
 $values = array("id"=>1,
@@ -54,8 +54,8 @@ 
 				);
 
 // update password
-if(!$Admin->object_modify("users", "edit", "id", $values))	{ $Result->show_cli("Failed to update Admin password", false); }
-else														{ $Result->show_cli("Admin password updated", false); }
+if (!$Admin->object_modify("users", "edit", "id", $values)) { $Result->show_cli("Failed to update Admin password", false); }
+else { $Result->show_cli("Admin password updated", false); }
 
 // debug ?
 if ($debugging) {
@@ -69,11 +69,11 @@ 
 if ($disable_email_notification) { die(); }
 
 # check for recipients
-foreach($Admin->fetch_multiple_objects ("users", "role", "Administrator") as $admin) {
+foreach ($Admin->fetch_multiple_objects("users", "role", "Administrator") as $admin) {
 	$recepients[] = array("name"=>$admin->real_name, "email"=>$admin->email);
 }
 # none?
-if(!isset($recepients))	{ die(); }
+if (!isset($recepients)) { die(); }
 
 // fetch settings
 $settings = $Admin->fetch_object("settings", "id", 1);
@@ -86,7 +86,7 @@ 
 	$phpipam_mail = new phpipam_mail($settings, $mail_settings);
 
 	// set subject
-	$subject	= "phpIPAM Administrator password updated";
+	$subject = "phpIPAM Administrator password updated";
 	//html
 	$content[] = "<h3>phpIPAM Administrator password updated</h3>";
 	$content[] = "<hr>";
@@ -97,12 +97,12 @@ 
 
 
 	# set content
-	$content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
-	$content_plain 	= implode("\r\n",$content_plain);
+	$content = $phpipam_mail->generate_message(implode("\r\n", $content));
+	$content_plain = implode("\r\n", $content_plain);
 
 	$phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
 	//add all admins to CC
-	foreach($recepients as $admin) {
+	foreach ($recepients as $admin) {
 		$phpipam_mail->Php_mailer->addAddress(addslashes($admin['email']), addslashes($admin['name']));
 	}
 	$phpipam_mail->Php_mailer->Subject = $subject;

functions/scripts/discoveryCheck.php

Indentation +187 added lines, -187 removed lines

@@ -46,7 +46,7 @@ 
 $statuses = explode(";", $Scan->settings->pingStatus);
 // set mail override flag
 if(!isset($config['discovery_check_send_mail'])) {
-	$config['discovery_check_send_mail'] = true;
+    $config['discovery_check_send_mail'] = true;
 }
 
 // set now for whole script
@@ -80,22 +80,22 @@ 
     $addresses_tmp = array();
     // loop
     foreach($scan_subnets as $i => $s) {
-    	// if subnet has slaves dont check it
-    	if ($Subnets->has_slaves ($s->id) === false) {
-    		$addresses_tmp[$s->id] = $Scan-> prepare_addresses_to_scan ("discovery", $s->id, false);
-			// save discovery time
-			$Scan->update_subnet_discoverytime ($s->id, $nowdate);
+        // if subnet has slaves dont check it
+        if ($Subnets->has_slaves ($s->id) === false) {
+            $addresses_tmp[$s->id] = $Scan-> prepare_addresses_to_scan ("discovery", $s->id, false);
+            // save discovery time
+            $Scan->update_subnet_discoverytime ($s->id, $nowdate);
         } else {
             unset( $scan_subnets[$i] );
-    	}
+        }
     }
 
     //reindex
     if(sizeof($addresses_tmp)>0) {
         foreach($addresses_tmp as $s_id=>$a) {
-        	foreach($a as $ip) {
-        		$addresses[] = array("subnetId"=>$s_id, "ip_addr"=>$ip);
-        	}
+            foreach($a as $ip) {
+                $addresses[] = array("subnetId"=>$s_id, "ip_addr"=>$ip);
+            }
         }
     }
 }
@@ -118,101 +118,101 @@ 
 
 //different scan for fping
 if($Scan->icmp_type=="fping") {
-	//run per MAX_THREADS
-	for ($m=0; $m<=$size_subnets; $m += $Scan->settings->scanMaxThreads) {
-	    // create threads
-	    $threads = array();
-	    //fork processes
-	    for ($i = 0; $i <= $Scan->settings->scanMaxThreads && $i <= $size_subnets; $i++) {
-	    	//only if index exists!
-	    	if(isset($scan_subnets[$z])) {
-				//start new thread
-	            $threads[$z] = new PingThread( 'fping_subnet' );
-				$threads[$z]->start_fping( $Subnets->transform_to_dotted($scan_subnets[$z]->subnet)."/".$scan_subnets[$z]->mask );
-	            $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
-					$scan_subnets[$index]->discovered = $child_response;
-					//now, child is dead, and parent close the pipe
-					unlink( $child_pipe );
-					unset($threads[$index]);
-				}
-			}
-	        usleep(200000);
-	    }
-	}
-
-	//fping finds all subnet addresses, we must remove existing ones !
-	foreach($scan_subnets as $sk=>$s) {
-    	if(isset($s->discovered)) {
-    		foreach($s->discovered as $rk=>$result) {
-    			if(!in_array($Subnets->transform_to_decimal($result), $addresses_tmp[$s->id])) {
-    				unset($scan_subnets[$sk]->discovered[$rk]);
-    			}
-    		}
+    //run per MAX_THREADS
+    for ($m=0; $m<=$size_subnets; $m += $Scan->settings->scanMaxThreads) {
+        // create threads
+        $threads = array();
+        //fork processes
+        for ($i = 0; $i <= $Scan->settings->scanMaxThreads && $i <= $size_subnets; $i++) {
+            //only if index exists!
+            if(isset($scan_subnets[$z])) {
+                //start new thread
+                $threads[$z] = new PingThread( 'fping_subnet' );
+                $threads[$z]->start_fping( $Subnets->transform_to_dotted($scan_subnets[$z]->subnet)."/".$scan_subnets[$z]->mask );
+                $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
+                    $scan_subnets[$index]->discovered = $child_response;
+                    //now, child is dead, and parent close the pipe
+                    unlink( $child_pipe );
+                    unset($threads[$index]);
+                }
+            }
+            usleep(200000);
+        }
+    }
+
+    //fping finds all subnet addresses, we must remove existing ones !
+    foreach($scan_subnets as $sk=>$s) {
+        if(isset($s->discovered)) {
+            foreach($s->discovered as $rk=>$result) {
+                if(!in_array($Subnets->transform_to_decimal($result), $addresses_tmp[$s->id])) {
+                    unset($scan_subnets[$sk]->discovered[$rk]);
+                }
+            }
             //rekey
             $scan_subnets[$sk]->discovered = array_values($scan_subnets[$sk]->discovered);
-		}
-	}
+        }
+    }
 }
 //ping, pear
 else {
-	//run per MAX_THREADS
+    //run per MAX_THREADS
     for ($m=0; $m<=$size_addresses; $m += $Scan->settings->scanMaxThreads) {
         // create threads
         $threads = array();
 
         //fork processes
         for ($i = 0; $i <= $Scan->settings->scanMaxThreads && $i <= $size_addresses; $i++) {
-        	//only if index exists!
-        	if(isset($addresses[$z])) {
-				//start new thread
-	            $threads[$z] = new PingThread( 'ping_address' );
-	            $threads[$z]->start( $Subnets->transform_to_dotted($addresses[$z]['ip_addr']) );
-				$z++;			//next index
-			}
+            //only if index exists!
+            if(isset($addresses[$z])) {
+                //start new thread
+                $threads[$z] = new PingThread( '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() ) {
-					//unset dead hosts
-					if($thread->getExitCode() != 0) {
-						unset($addresses[$index]);
-					}
+                    //unset dead hosts
+                    if($thread->getExitCode() != 0) {
+                        unset($addresses[$index]);
+                    }
                     //remove thread
                     unset( $threads[$index]);
                 }
             }
             usleep(200000);
         }
-	}
-
-	//ok, we have all available addresses, rekey them
-	foreach($addresses as $a) {
-		$add_tmp[$a['subnetId']][] = $Subnets->transform_to_dotted($a['ip_addr']);
-	}
-	//add to scan_subnets as result
-	foreach($scan_subnets as $sk=>$s) {
-		if(isset($add_tmp[$s->id])) {
-			$scan_subnets[$sk]->discovered = $add_tmp[$s->id];
-		}
-	}
+    }
+
+    //ok, we have all available addresses, rekey them
+    foreach($addresses as $a) {
+        $add_tmp[$a['subnetId']][] = $Subnets->transform_to_dotted($a['ip_addr']);
+    }
+    //add to scan_subnets as result
+    foreach($scan_subnets as $sk=>$s) {
+        if(isset($add_tmp[$s->id])) {
+            $scan_subnets[$sk]->discovered = $add_tmp[$s->id];
+        }
+    }
 }
 
 
@@ -234,34 +234,34 @@ 
 $discovered = 0;				//for mailing
 
 foreach($scan_subnets as $s) {
-	if(isset($s->discovered)) {
-		foreach($s->discovered as $ip) {
-			// fetch subnet
-			$subnet = $Subnets->fetch_subnet ("id", $s->id);
-			$nsid = $subnet===false ? false : $subnet->nameserverId;
-			// try to resolve hostname
-			$hostname = $DNS->resolve_address ($ip, false, true, $nsid);
-			// save to hostnames
-			$hostnames[$ip] = $hostname['name']==$ip ? "" : $hostname['name'];
-
-			//set update query
-			$values = array(
-							"subnetId"    =>$s->id,
-							"ip_addr"     =>$ip,
-							"hostname"    =>$hostname['name'],
-							"description" =>"-- autodiscovered --",
-							"note"        =>"This host was autodiscovered on ".$nowdate,
-							"lastSeen"    =>$nowdate,
-							"state"       =>"2",
-							"action"      =>"add"
-							);
-			//insert
-			$Addresses->modify_address($values);
-
-			//set discovered
-			$discovered++;
-		}
-	}
+    if(isset($s->discovered)) {
+        foreach($s->discovered as $ip) {
+            // fetch subnet
+            $subnet = $Subnets->fetch_subnet ("id", $s->id);
+            $nsid = $subnet===false ? false : $subnet->nameserverId;
+            // try to resolve hostname
+            $hostname = $DNS->resolve_address ($ip, false, true, $nsid);
+            // save to hostnames
+            $hostnames[$ip] = $hostname['name']==$ip ? "" : $hostname['name'];
+
+            //set update query
+            $values = array(
+                            "subnetId"    =>$s->id,
+                            "ip_addr"     =>$ip,
+                            "hostname"    =>$hostname['name'],
+                            "description" =>"-- autodiscovered --",
+                            "note"        =>"This host was autodiscovered on ".$nowdate,
+                            "lastSeen"    =>$nowdate,
+                            "state"       =>"2",
+                            "action"      =>"add"
+                            );
+            //insert
+            $Addresses->modify_address($values);
+
+            //set discovered
+            $discovered++;
+        }
+    }
 }
 
 # update scan time
@@ -272,81 +272,81 @@ 
 # send mail
 if($discovered>0 && $config['discovery_check_send_mail']) {
 
-	# check for recipients
-	foreach($Admin->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(); }
-
-	# fake user object, needed for create_link
-	$User = new StdClass();
-	@$User->settings->prettyLinks = $Scan->settings->prettyLinks;
-
-	# try to send
-	try {
-		# fetch mailer settings
-		$mail_settings = $Admin->fetch_object("settingsMail", "id", 1);
-		# initialize mailer
-		$phpipam_mail = new phpipam_mail($Scan->settings, $mail_settings);
-
-		// set subject
-		$subject	= "phpIPAM new addresses detected ".date("Y-m-d H:i:s");
-
-		//html
-		$content[] = "<h3>phpIPAM found $discovered new hosts</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;'>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[] = "</tr>";
-		//plain
-		$content_plain[] = "phpIPAM found $discovered new hosts\r\n------------------------------";
-		//Changes
-		foreach($scan_subnets as $s) {
-			if(sizeof(@$s->discovered)>0) {
-				foreach($s->discovered as $ip) {
-					//set subnet
-					$subnet 	 = $Subnets->fetch_subnet(null, $s->id);
-					//set section
-					$section 	 = $Admin->fetch_object("sections", "id", $s->sectionId);
-
-					$content[] = "<tr>";
-					$content[] = "	<td style='padding:3px 8px;border:1px solid silver;'>$ip</td>";
-					$content[] = "	<td style='padding:3px 8px;border:1px solid silver;'>".$hostnames[$ip]."</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[] = "</tr>";
-
-					//plain content
-					$content_plain[] = "\t * $ip (".$Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask.")";
-				}
-			}
-		}
-		$content[] = "</table>";
-
-
-		# set content
-		$content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
-		$content_plain 	= implode("\r\n",$content_plain);
-
-		$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->getMessage(), true);
-	}
+    # check for recipients
+    foreach($Admin->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(); }
+
+    # fake user object, needed for create_link
+    $User = new StdClass();
+    @$User->settings->prettyLinks = $Scan->settings->prettyLinks;
+
+    # try to send
+    try {
+        # fetch mailer settings
+        $mail_settings = $Admin->fetch_object("settingsMail", "id", 1);
+        # initialize mailer
+        $phpipam_mail = new phpipam_mail($Scan->settings, $mail_settings);
+
+        // set subject
+        $subject	= "phpIPAM new addresses detected ".date("Y-m-d H:i:s");
+
+        //html
+        $content[] = "<h3>phpIPAM found $discovered new hosts</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;'>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[] = "</tr>";
+        //plain
+        $content_plain[] = "phpIPAM found $discovered new hosts\r\n------------------------------";
+        //Changes
+        foreach($scan_subnets as $s) {
+            if(sizeof(@$s->discovered)>0) {
+                foreach($s->discovered as $ip) {
+                    //set subnet
+                    $subnet 	 = $Subnets->fetch_subnet(null, $s->id);
+                    //set section
+                    $section 	 = $Admin->fetch_object("sections", "id", $s->sectionId);
+
+                    $content[] = "<tr>";
+                    $content[] = "	<td style='padding:3px 8px;border:1px solid silver;'>$ip</td>";
+                    $content[] = "	<td style='padding:3px 8px;border:1px solid silver;'>".$hostnames[$ip]."</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[] = "</tr>";
+
+                    //plain content
+                    $content_plain[] = "\t * $ip (".$Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask.")";
+                }
+            }
+        }
+        $content[] = "</table>";
+
+
+        # set content
+        $content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
+        $content_plain 	= implode("\r\n",$content_plain);
+
+        $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->getMessage(), true);
+    }
 }
\ No newline at end of file

Spacing +91 added lines, -91 removed lines

@@ -23,77 +23,77 @@ 
  */
 
 # include required scripts
-require_once( dirname(__FILE__) . '/../functions.php' );
-require( dirname(__FILE__) . '/../../functions/classes/class.Thread.php');
+require_once(dirname(__FILE__).'/../functions.php');
+require(dirname(__FILE__).'/../../functions/classes/class.Thread.php');
 
 # initialize objects
 $Database 	= new Database_PDO;
-$Subnets	= new Subnets ($Database);
-$Addresses	= new Addresses ($Database);
-$Tools		= new Tools ($Database);
-$Scan		= new Scan ($Database);
-$DNS		= new DNS ($Database);
-$Result		= new Result();
+$Subnets = new Subnets($Database);
+$Addresses	= new Addresses($Database);
+$Tools = new Tools($Database);
+$Scan = new Scan($Database);
+$DNS = new DNS($Database);
+$Result = new Result();
 
 // set exit flag to true
 $Scan->ping_set_exit(true);
 // set debugging
 $Scan->reset_debugging(false);
 // change scan type?
-if(@$config['discovery_check_method'])
-$Scan->reset_scan_method ($config['discovery_check_method']);
+if (@$config['discovery_check_method'])
+$Scan->reset_scan_method($config['discovery_check_method']);
 // set ping statuses
 $statuses = explode(";", $Scan->settings->pingStatus);
 // set mail override flag
-if(!isset($config['discovery_check_send_mail'])) {
+if (!isset($config['discovery_check_send_mail'])) {
 	$config['discovery_check_send_mail'] = true;
 }
 
 // set now for whole script
 $now     = time();
-$nowdate = date ("Y-m-d H:i:s");
+$nowdate = date("Y-m-d H:i:s");
 
 // response for mailing
-$address_change = array();			// Array with differences, can be used to email to admins
-$hostnames      = array();			// Array with detected hostnames
+$address_change = array(); // Array with differences, can be used to email to admins
+$hostnames      = array(); // Array with detected hostnames
 
 
 // script can only be run from cli
-if(php_sapi_name()!="cli") 						{ die("This script can only be run from cli!"); }
+if (php_sapi_name() != "cli") { die("This script can only be run from cli!"); }
 // test to see if threading is available
-if(!PingThread::available()) 						{ die("Threading is required for scanning subnets. Please recompile PHP with pcntl extension"); }
+if (!PingThread::available()) { die("Threading is required for scanning subnets. Please recompile PHP with pcntl extension"); }
 // verify ping path
-if ($Scan->icmp_type=="ping") {
-if(!file_exists($Scan->settings->scanPingPath)) { die("Invalid ping path!"); }
+if ($Scan->icmp_type == "ping") {
+if (!file_exists($Scan->settings->scanPingPath)) { die("Invalid ping path!"); }
 }
 // verify fping path
-if ($Scan->icmp_type=="fping") {
-if(!file_exists($Scan->settings->scanFPingPath)){ die("Invalid fping path!"); }
+if ($Scan->icmp_type == "fping") {
+if (!file_exists($Scan->settings->scanFPingPath)) { die("Invalid fping path!"); }
 }
 
 
 //first fetch all subnets to be scanned
-$scan_subnets = $Subnets->fetch_all_subnets_for_discoveryCheck (1);
+$scan_subnets = $Subnets->fetch_all_subnets_for_discoveryCheck(1);
 //set addresses
-if ($scan_subnets!==false) {
+if ($scan_subnets !== false) {
     // initial array
     $addresses_tmp = array();
     // loop
-    foreach($scan_subnets as $i => $s) {
+    foreach ($scan_subnets as $i => $s) {
     	// if subnet has slaves dont check it
-    	if ($Subnets->has_slaves ($s->id) === false) {
-    		$addresses_tmp[$s->id] = $Scan-> prepare_addresses_to_scan ("discovery", $s->id, false);
+    	if ($Subnets->has_slaves($s->id) === false) {
+    		$addresses_tmp[$s->id] = $Scan-> prepare_addresses_to_scan("discovery", $s->id, false);
 			// save discovery time
-			$Scan->update_subnet_discoverytime ($s->id, $nowdate);
+			$Scan->update_subnet_discoverytime($s->id, $nowdate);
         } else {
-            unset( $scan_subnets[$i] );
+            unset($scan_subnets[$i]);
     	}
     }
 
     //reindex
-    if(sizeof($addresses_tmp)>0) {
-        foreach($addresses_tmp as $s_id=>$a) {
-        	foreach($a as $ip) {
+    if (sizeof($addresses_tmp) > 0) {
+        foreach ($addresses_tmp as $s_id=>$a) {
+        	foreach ($a as $ip) {
         		$addresses[] = array("subnetId"=>$s_id, "ip_addr"=>$ip);
         	}
         }
@@ -101,15 +101,15 @@ 
 }
 
 
-if($Scan->debugging)							{ print_r($scan_subnets); }
-if($scan_subnets===false || !count($scan_subnets)) { die("No subnets are marked for new hosts checking\n"); }
+if ($Scan->debugging) { print_r($scan_subnets); }
+if ($scan_subnets === false || !count($scan_subnets)) { die("No subnets are marked for new hosts checking\n"); }
 
 
 //scan
-if($Scan->debugging)							{ print "Using $Scan->icmp_type\n--------------------\n\n"; }
+if ($Scan->debugging) { print "Using $Scan->icmp_type\n--------------------\n\n"; }
 
 
-$z = 0;			//addresses array index
+$z = 0; //addresses array index
 
 // let's just reindex the subnets array to save future issues
 $scan_subnets   = array_values($scan_subnets);
@@ -117,38 +117,38 @@ 
 $size_addresses = max(array_keys($addresses));
 
 //different scan for fping
-if($Scan->icmp_type=="fping") {
+if ($Scan->icmp_type == "fping") {
 	//run per MAX_THREADS
-	for ($m=0; $m<=$size_subnets; $m += $Scan->settings->scanMaxThreads) {
+	for ($m = 0; $m <= $size_subnets; $m += $Scan->settings->scanMaxThreads) {
 	    // create threads
 	    $threads = array();
 	    //fork processes
 	    for ($i = 0; $i <= $Scan->settings->scanMaxThreads && $i <= $size_subnets; $i++) {
 	    	//only if index exists!
-	    	if(isset($scan_subnets[$z])) {
+	    	if (isset($scan_subnets[$z])) {
 				//start new thread
-	            $threads[$z] = new PingThread( 'fping_subnet' );
-				$threads[$z]->start_fping( $Subnets->transform_to_dotted($scan_subnets[$z]->subnet)."/".$scan_subnets[$z]->mask );
-	            $z++;				//next index
+	            $threads[$z] = new PingThread('fping_subnet');
+				$threads[$z]->start_fping($Subnets->transform_to_dotted($scan_subnets[$z]->subnet)."/".$scan_subnets[$z]->mask);
+	            $z++; //next index
 			}
 	    }
 	    // wait for all the threads to finish
-	    while( !empty( $threads ) ) {
-			foreach($threads as $index => $thread) {
+	    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");
+					$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 );
+					$child_response = unserialize($child_response);
 					//store
 					$scan_subnets[$index]->discovered = $child_response;
 					//now, child is dead, and parent close the pipe
-					unlink( $child_pipe );
+					unlink($child_pipe);
 					unset($threads[$index]);
 				}
 			}
@@ -157,10 +157,10 @@ 
 	}
 
 	//fping finds all subnet addresses, we must remove existing ones !
-	foreach($scan_subnets as $sk=>$s) {
-    	if(isset($s->discovered)) {
-    		foreach($s->discovered as $rk=>$result) {
-    			if(!in_array($Subnets->transform_to_decimal($result), $addresses_tmp[$s->id])) {
+	foreach ($scan_subnets as $sk=>$s) {
+    	if (isset($s->discovered)) {
+    		foreach ($s->discovered as $rk=>$result) {
+    			if (!in_array($Subnets->transform_to_decimal($result), $addresses_tmp[$s->id])) {
     				unset($scan_subnets[$sk]->discovered[$rk]);
     			}
     		}
@@ -172,31 +172,31 @@ 
 //ping, pear
 else {
 	//run per MAX_THREADS
-    for ($m=0; $m<=$size_addresses; $m += $Scan->settings->scanMaxThreads) {
+    for ($m = 0; $m <= $size_addresses; $m += $Scan->settings->scanMaxThreads) {
         // create threads
         $threads = array();
 
         //fork processes
         for ($i = 0; $i <= $Scan->settings->scanMaxThreads && $i <= $size_addresses; $i++) {
         	//only if index exists!
-        	if(isset($addresses[$z])) {
+        	if (isset($addresses[$z])) {
 				//start new thread
-	            $threads[$z] = new PingThread( 'ping_address' );
-	            $threads[$z]->start( $Subnets->transform_to_dotted($addresses[$z]['ip_addr']) );
-				$z++;			//next index
+	            $threads[$z] = new PingThread('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() ) {
+        while (!empty($threads)) {
+            foreach ($threads as $index => $thread) {
+                if (!$thread->isAlive()) {
 					//unset dead hosts
-					if($thread->getExitCode() != 0) {
+					if ($thread->getExitCode() != 0) {
 						unset($addresses[$index]);
 					}
                     //remove thread
-                    unset( $threads[$index]);
+                    unset($threads[$index]);
                 }
             }
             usleep(200000);
@@ -204,12 +204,12 @@ 
 	}
 
 	//ok, we have all available addresses, rekey them
-	foreach($addresses as $a) {
+	foreach ($addresses as $a) {
 		$add_tmp[$a['subnetId']][] = $Subnets->transform_to_dotted($a['ip_addr']);
 	}
 	//add to scan_subnets as result
-	foreach($scan_subnets as $sk=>$s) {
-		if(isset($add_tmp[$s->id])) {
+	foreach ($scan_subnets as $sk=>$s) {
+		if (isset($add_tmp[$s->id])) {
 			$scan_subnets[$sk]->discovered = $add_tmp[$s->id];
 		}
 	}
@@ -217,32 +217,32 @@ 
 
 
 # print change
-if($Scan->debugging)							{ "\nDiscovered addresses:\n----------\n"; print_r($scan_subnets); }
+if ($Scan->debugging) { "\nDiscovered addresses:\n----------\n"; print_r($scan_subnets); }
 
 
 
 # reinitialize objects
 $Database 	= new Database_PDO;
-$Admin		= new Admin ($Database, false);
-$Addresses	= new Addresses ($Database);
-$Subnets	= new Subnets ($Database);
-$DNS		= new DNS ($Database);
-$Scan		= new Scan ($Database);
+$Admin = new Admin($Database, false);
+$Addresses	= new Addresses($Database);
+$Subnets	= new Subnets($Database);
+$DNS = new DNS($Database);
+$Scan = new Scan($Database);
 $Result		= new Result();
 
 # insert to database
-$discovered = 0;				//for mailing
+$discovered = 0; //for mailing
 
-foreach($scan_subnets as $s) {
-	if(isset($s->discovered)) {
-		foreach($s->discovered as $ip) {
+foreach ($scan_subnets as $s) {
+	if (isset($s->discovered)) {
+		foreach ($s->discovered as $ip) {
 			// fetch subnet
-			$subnet = $Subnets->fetch_subnet ("id", $s->id);
-			$nsid = $subnet===false ? false : $subnet->nameserverId;
+			$subnet = $Subnets->fetch_subnet("id", $s->id);
+			$nsid = $subnet === false ? false : $subnet->nameserverId;
 			// try to resolve hostname
-			$hostname = $DNS->resolve_address ($ip, false, true, $nsid);
+			$hostname = $DNS->resolve_address($ip, false, true, $nsid);
 			// save to hostnames
-			$hostnames[$ip] = $hostname['name']==$ip ? "" : $hostname['name'];
+			$hostnames[$ip] = $hostname['name'] == $ip ? "" : $hostname['name'];
 
 			//set update query
 			$values = array(
@@ -265,21 +265,21 @@ 
 }
 
 # update scan time
-$Scan->ping_update_scanagent_checktime (1, $nowdate);
+$Scan->ping_update_scanagent_checktime(1, $nowdate);
 
 
 
 # send mail
-if($discovered>0 && $config['discovery_check_send_mail']) {
+if ($discovered > 0 && $config['discovery_check_send_mail']) {
 
 	# check for recipients
-	foreach($Admin->fetch_multiple_objects ("users", "role", "Administrator") as $admin) {
-		if($admin->mailNotify=="Yes") {
+	foreach ($Admin->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(); }
+	if (!isset($recepients)) { die(); }
 
 	# fake user object, needed for create_link
 	$User = new StdClass();
@@ -293,7 +293,7 @@ 
 		$phpipam_mail = new phpipam_mail($Scan->settings, $mail_settings);
 
 		// set subject
-		$subject	= "phpIPAM new addresses detected ".date("Y-m-d H:i:s");
+		$subject = "phpIPAM new addresses detected ".date("Y-m-d H:i:s");
 
 		//html
 		$content[] = "<h3>phpIPAM found $discovered new hosts</h3>";
@@ -307,19 +307,19 @@ 
 		//plain
 		$content_plain[] = "phpIPAM found $discovered new hosts\r\n------------------------------";
 		//Changes
-		foreach($scan_subnets as $s) {
-			if(sizeof(@$s->discovered)>0) {
-				foreach($s->discovered as $ip) {
+		foreach ($scan_subnets as $s) {
+			if (sizeof(@$s->discovered) > 0) {
+				foreach ($s->discovered as $ip) {
 					//set subnet
-					$subnet 	 = $Subnets->fetch_subnet(null, $s->id);
+					$subnet = $Subnets->fetch_subnet(null, $s->id);
 					//set section
 					$section 	 = $Admin->fetch_object("sections", "id", $s->sectionId);
 
 					$content[] = "<tr>";
 					$content[] = "	<td style='padding:3px 8px;border:1px solid silver;'>$ip</td>";
 					$content[] = "	<td style='padding:3px 8px;border:1px solid silver;'>".$hostnames[$ip]."</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;'><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[] = "</tr>";
 
 					//plain content
@@ -331,12 +331,12 @@ 
 
 
 		# set content
-		$content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
-		$content_plain 	= implode("\r\n",$content_plain);
+		$content = $phpipam_mail->generate_message(implode("\r\n", $content));
+		$content_plain = implode("\r\n", $content_plain);
 
 		$phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
 		//add all admins to CC
-		foreach($recepients as $admin) {
+		foreach ($recepients as $admin) {
 			$phpipam_mail->Php_mailer->addAddress(addslashes($admin['email']), addslashes($admin['name']));
 		}
 		$phpipam_mail->Php_mailer->Subject = $subject;

functions/scripts/pingCheck.php

Indentation +337 added lines, -337 removed lines

@@ -59,7 +59,7 @@ 
 $statuses = explode(";", $Scan->settings->pingStatus);
 // set mail override flag
 if(!isset($config['ping_check_send_mail'])) {
-	$config['ping_check_send_mail'] = true;
+    $config['ping_check_send_mail'] = true;
 }
 
 // response for mailing
@@ -91,60 +91,60 @@ 
 //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,
-								"nsid"       =>$s->nameserverId,
-								"resolveDNS" =>$s->resolveDNS
-			                   );
-		}
-		//save addresses
-		if(sizeof($subnet_addresses)>0) {
-			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,
-															"hostname"    =>$a->hostname,
-															"subnetId"    =>$a->subnetId,
-															"lastSeenOld" =>$a->lastSeen,
-															"lastSeen"    =>$a->lastSeen,
-															"state"       =>$a->state,
-															"resolveDNS"  =>$s->resolveDNS,
-															"nsid"        =>$s->nsid
-															);
-						$addresses[$s->id][$a->id]  = $a->ip_addr;
-					}
-					else {
-						$addresses[] 		 		= array(
-															"id"          =>$a->id,
-															"ip_addr"     =>$a->ip_addr,
-															"description" =>$a->description,
-															"hostname"    =>$a->hostname,
-															"subnetId"    =>$a->subnetId,
-															"lastSeenOld" =>$a->lastSeen,
-															"lastSeen"    =>$a->lastSeen,
-															"state"       =>$a->state,
-															"resolveDNS"  =>$s->resolveDNS,
-															"nsid"        =>$s->nsid
-						                          			);
-					}
-				}
-			}
-		}
-		// save update time
-		$Scan->update_subnet_scantime ($s->id, $nowdate);
-	}
+    // 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,
+                                "nsid"       =>$s->nameserverId,
+                                "resolveDNS" =>$s->resolveDNS
+                                );
+        }
+        //save addresses
+        if(sizeof($subnet_addresses)>0) {
+            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,
+                                                            "hostname"    =>$a->hostname,
+                                                            "subnetId"    =>$a->subnetId,
+                                                            "lastSeenOld" =>$a->lastSeen,
+                                                            "lastSeen"    =>$a->lastSeen,
+                                                            "state"       =>$a->state,
+                                                            "resolveDNS"  =>$s->resolveDNS,
+                                                            "nsid"        =>$s->nsid
+                                                            );
+                        $addresses[$s->id][$a->id]  = $a->ip_addr;
+                    }
+                    else {
+                        $addresses[] 		 		= array(
+                                                            "id"          =>$a->id,
+                                                            "ip_addr"     =>$a->ip_addr,
+                                                            "description" =>$a->description,
+                                                            "hostname"    =>$a->hostname,
+                                                            "subnetId"    =>$a->subnetId,
+                                                            "lastSeenOld" =>$a->lastSeen,
+                                                            "lastSeen"    =>$a->lastSeen,
+                                                            "state"       =>$a->state,
+                                                            "resolveDNS"  =>$s->resolveDNS,
+                                                            "nsid"        =>$s->nsid
+                                                                );
+                    }
+                }
+            }
+        }
+        // save update time
+        $Scan->update_subnet_scantime ($s->id, $nowdate);
+    }
 }
 
 
@@ -159,152 +159,152 @@ 
 
 //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 PingThread( '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 && sizeof($addresses[$s['id']])>0) {
-			//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 PingThread( '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 && sizeof($addresses[$s['id']])>0) {
+            //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);
-				}
-
-		        //resolve hostnames
-				if($subnets[$sk]['resolveDNS']=="1") {
-					$old_hostname_save = $addresses2[$s['id']][$ak]['hostname'];	// save old hostname to detect change
-					$old_hostname = $config['resolve_emptyonly']===false ? false : $addresses2[$s['id']][$ak]['hostname'];
-			        $hostname = $DNS->resolve_address ($Subnets->transform_to_dotted($addresses2[$s['id']][$ak]['ip_addr']), $old_hostname, true, $subnets[$sk]['nsid']);
-					if($hostname['class']=="resolved") {
-						if ($hostname['name']!=$old_hostname_save) {
-							$Addresses->update_address_hostname ($Subnets->transform_to_dotted($addresses2[$s['id']][$ak]['ip_addr']), $addresses2[$s['id']][$ak]['id'], $hostname['name']);
-						}
-					}
-				}
-			}
-		}
-	}
+                }
+
+                //resolve hostnames
+                if($subnets[$sk]['resolveDNS']=="1") {
+                    $old_hostname_save = $addresses2[$s['id']][$ak]['hostname'];	// save old hostname to detect change
+                    $old_hostname = $config['resolve_emptyonly']===false ? false : $addresses2[$s['id']][$ak]['hostname'];
+                    $hostname = $DNS->resolve_address ($Subnets->transform_to_dotted($addresses2[$s['id']][$ak]['ip_addr']), $old_hostname, true, $subnets[$sk]['nsid']);
+                    if($hostname['class']=="resolved") {
+                        if ($hostname['name']!=$old_hostname_save) {
+                            $Addresses->update_address_hostname ($Subnets->transform_to_dotted($addresses2[$s['id']][$ak]['ip_addr']), $addresses2[$s['id']][$ak]['id'], $hostname['name']);
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
 //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 PingThread( '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 PingThread( '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);
-	$Addresses = new Addresses ($Database);
-
-	// 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);
+    $Addresses = new Addresses ($Database);
+
+    // 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);
+        }
 
         //resolve hostnames
-		if($a['resolveDNS']=="1") {
-			$old_hostname_save = $a['hostname'];	// save old hostname to detect change
-			$old_hostname = $config['resolve_emptyonly']===false ? false : $a['hostname'];
-	        $hostname = $DNS->resolve_address ($Subnets->transform_to_dotted($a['ip_addr']), $old_hostname, true, $a['nsid']);
-			if($hostname['class']=="resolved") {
-				if ($hostname['name']!=$old_hostname_save) {
-					$Addresses->update_address_hostname ($Subnets->transform_to_dotted($a['ip_addr']), $a['id'], $hostname['name']);
-				}
-			}
-		}
-	}
+        if($a['resolveDNS']=="1") {
+            $old_hostname_save = $a['hostname'];	// save old hostname to detect change
+            $old_hostname = $config['resolve_emptyonly']===false ? false : $a['hostname'];
+            $hostname = $DNS->resolve_address ($Subnets->transform_to_dotted($a['ip_addr']), $old_hostname, true, $a['nsid']);
+            if($hostname['class']=="resolved") {
+                if ($hostname['name']!=$old_hostname_save) {
+                    $Addresses->update_address_hostname ($Subnets->transform_to_dotted($a['ip_addr']), $a['id'], $hostname['name']);
+                }
+            }
+        }
+    }
 }
 
 
@@ -329,8 +329,8 @@ 
         // update tag if not already online
         // tags have different indexes than script exit code is - 1=offline, 2=online
         if($address_change[$k]['state']!=2 && $Scan->settings->updateTags==1 && $Tools->address_types[$address_change[$k]['state']]['updateTag']==1) {
-	        $Scan->update_address_tag ($address_change[$k]['id'], 2, $address_change[$k]['state'], $change['lastSeenOld']);
-    	}
+            $Scan->update_address_tag ($address_change[$k]['id'], 2, $address_change[$k]['state'], $change['lastSeenOld']);
+        }
     }
     // now offline, and diff > offline period, do checks
     elseif($change['lastSeenNew']==NULL && $deviceDiff >= (int) $statuses[1]) {
@@ -338,38 +338,38 @@ 
         if ($deviceDiff <= ((int) $statuses[1] + $agentDiff))  {
             $address_change[$k]['oldStatus'] = 0;
             $address_change[$k]['newStatus'] = 2;
-	        // update tag if not already offline
-	        // tags have different indexes than script exit code is - 1=offline, 2=online
-	        if($address_change[$k]['state']!=1 && $Scan->settings->updateTags==1 && $Tools->address_types[$address_change[$k]['state']]['updateTag']==1) {
-		        $Scan->update_address_tag ($address_change[$k]['id'], 1, $address_change[$k]['state'], $change['lastSeenOld']);
-		    }
+            // update tag if not already offline
+            // tags have different indexes than script exit code is - 1=offline, 2=online
+            if($address_change[$k]['state']!=1 && $Scan->settings->updateTags==1 && $Tools->address_types[$address_change[$k]['state']]['updateTag']==1) {
+                $Scan->update_address_tag ($address_change[$k]['id'], 1, $address_change[$k]['state'], $change['lastSeenOld']);
+            }
         }
         else {
-        	// already reported, check tag
-	        if($address_change[$k]['state']!=1 && $Scan->settings->updateTags==1 && $Tools->address_types[$address_change[$k]['state']]['updateTag']==1) {
-		        $Scan->update_address_tag ($address_change[$k]['id'], 1, $address_change[$k]['state'], $change['lastSeenOld']);
-		    }
-        	// remove from change array
+            // already reported, check tag
+            if($address_change[$k]['state']!=1 && $Scan->settings->updateTags==1 && $Tools->address_types[$address_change[$k]['state']]['updateTag']==1) {
+                $Scan->update_address_tag ($address_change[$k]['id'], 1, $address_change[$k]['state'], $change['lastSeenOld']);
+            }
+            // remove from change array
             unset ($address_change[$k]);
         }
     }
     // remove
     else {
-    	// check tag
-    	if ($change['lastSeenNew']!=NULL) {
-	        // update tag if not already online
-	        // tags have different indexes than script exit code is - 1=offline, 2=online
-	        if($address_change[$k]['state']!=2 && $Scan->settings->updateTags==1 && $Tools->address_types[$address_change[$k]['state']]['updateTag']==1) {
-		        $Scan->update_address_tag ($address_change[$k]['id'], 2, $address_change[$k]['state'], $change['lastSeenOld']);
-	    	}
-    	}
-    	else {
-    		// update tag if not already offline
-	        // tags have different indexes than script exit code is - 1=offline, 2=online
-	        if($address_change[$k]['state']!=1 && $Scan->settings->updateTags==1 && $Tools->address_types[$address_change[$k]['state']]['updateTag']==1) {
-		        $Scan->update_address_tag ($address_change[$k]['id'], 1, $address_change[$k]['state'], $change['lastSeenOld']);
-		    }
-    	}
+        // check tag
+        if ($change['lastSeenNew']!=NULL) {
+            // update tag if not already online
+            // tags have different indexes than script exit code is - 1=offline, 2=online
+            if($address_change[$k]['state']!=2 && $Scan->settings->updateTags==1 && $Tools->address_types[$address_change[$k]['state']]['updateTag']==1) {
+                $Scan->update_address_tag ($address_change[$k]['id'], 2, $address_change[$k]['state'], $change['lastSeenOld']);
+            }
+        }
+        else {
+            // update tag if not already offline
+            // tags have different indexes than script exit code is - 1=offline, 2=online
+            if($address_change[$k]['state']!=1 && $Scan->settings->updateTags==1 && $Tools->address_types[$address_change[$k]['state']]['updateTag']==1) {
+                $Scan->update_address_tag ($address_change[$k]['id'], 1, $address_change[$k]['state'], $change['lastSeenOld']);
+            }
+        }
 
         unset ($address_change[$k]);
     }
@@ -385,124 +385,124 @@ 
 # all done, mail diff?
 if(sizeof($address_change)>0 && $config['ping_check_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(); }
-
-	# fake user object, needed for create_link
-	$User = new StdClass();
-	@$User->settings->prettyLinks = $Scan->settings->prettyLinks;
-
-	# try to send
-	try {
-		# fetch mailer settings
-		$mail_settings = $Tools->fetch_object("settingsMail", "id", 1);
-		# initialize mailer
-		$phpipam_mail = new phpipam_mail($Scan->settings, $mail_settings);
-
-		// set subject
-		$subject	= "phpIPAM IP state change ".$nowdate;
-
-		//html
-		$content[] = "<p style='margin-left:10px;'>$Subnets->mail_font_style <font style='font-size:16px;size:16px;'>phpIPAM host changes</font></font></p><br>";
-
-		$content[] = "<table style='margin-left:10px;margin-top:5px;width:auto;padding:0px;border-collapse:collapse;border:1px solid #ccc;'>";
-		$content[] = "<tr>";
-		$content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;white-space:nowrap;'>$Subnets->mail_font_style IP</font></th>";
-		$content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;'>$Subnets->mail_font_style Description</font></th>";
-		$content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;'>$Subnets->mail_font_style Hostname</font></th>";
-		$content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;'>$Subnets->mail_font_style Subnet</font></th>";
-		$content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;'>$Subnets->mail_font_style Last seen</font></th>";
-		$content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;'>$Subnets->mail_font_style Status</font></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']);
-			//ago
-			if(is_null($change['lastSeen']) || $change['lastSeen']=="1970-01-01 00:00:01" || $change['lastSeen']=="0000-00-00 00:00:00") {
-				$ago	  = "never";
-			} else {
-				$timeDiff = $now - strtotime($change['lastSeen']);
-
-	    		// reformat
-	    		$lastSeen = date("m/d H:i", strtotime($change['lastSeen']) );
-				$ago 	  = $lastSeen." (".$Result->sec2hms($timeDiff)." ago)";
-			}
-	        // desc
-			$change['description'] = strlen($change['description'])>0 ? "$Subnets->mail_font_style $change[description]</font>" : "$Subnets->mail_font_style / </font>";
-			// subnet desc
-			$subnet->description = strlen($subnet->description)>0 ? "$Subnets->mail_font_style $subnet->description</font>" : "$Subnets->mail_font_style / </font>";
-
-			//content
-			$content[] = "<tr>";
-			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'><a href='".rtrim(str_replace(BASE, "",$Scan->settings->siteURL), "/")."".create_link("subnets",$subnet->sectionId,$subnet->id)."'>$Subnets->mail_font_style_href ".$Subnets->transform_to_dotted($change['ip_addr'])."</font></a></td>";
-			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style $change[description]</font></td>";
-			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style_href $change[hostname]</font></td>";
-			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'><a href='".rtrim(str_replace(BASE, "",$Scan->settings->siteURL), "/")."".create_link("subnets",$subnet->sectionId,$subnet->id)."'>$Subnets->mail_font_style_href ".$Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask."</font></a>".$subnet->description."</td>";
-			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style $ago</td>";
-			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style $oldStatus > $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);
-
-		$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->getMessage(), 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(); }
+
+    # fake user object, needed for create_link
+    $User = new StdClass();
+    @$User->settings->prettyLinks = $Scan->settings->prettyLinks;
+
+    # try to send
+    try {
+        # fetch mailer settings
+        $mail_settings = $Tools->fetch_object("settingsMail", "id", 1);
+        # initialize mailer
+        $phpipam_mail = new phpipam_mail($Scan->settings, $mail_settings);
+
+        // set subject
+        $subject	= "phpIPAM IP state change ".$nowdate;
+
+        //html
+        $content[] = "<p style='margin-left:10px;'>$Subnets->mail_font_style <font style='font-size:16px;size:16px;'>phpIPAM host changes</font></font></p><br>";
+
+        $content[] = "<table style='margin-left:10px;margin-top:5px;width:auto;padding:0px;border-collapse:collapse;border:1px solid #ccc;'>";
+        $content[] = "<tr>";
+        $content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;white-space:nowrap;'>$Subnets->mail_font_style IP</font></th>";
+        $content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;'>$Subnets->mail_font_style Description</font></th>";
+        $content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;'>$Subnets->mail_font_style Hostname</font></th>";
+        $content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;'>$Subnets->mail_font_style Subnet</font></th>";
+        $content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;'>$Subnets->mail_font_style Last seen</font></th>";
+        $content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;'>$Subnets->mail_font_style Status</font></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']);
+            //ago
+            if(is_null($change['lastSeen']) || $change['lastSeen']=="1970-01-01 00:00:01" || $change['lastSeen']=="0000-00-00 00:00:00") {
+                $ago	  = "never";
+            } else {
+                $timeDiff = $now - strtotime($change['lastSeen']);
+
+                // reformat
+                $lastSeen = date("m/d H:i", strtotime($change['lastSeen']) );
+                $ago 	  = $lastSeen." (".$Result->sec2hms($timeDiff)." ago)";
+            }
+            // desc
+            $change['description'] = strlen($change['description'])>0 ? "$Subnets->mail_font_style $change[description]</font>" : "$Subnets->mail_font_style / </font>";
+            // subnet desc
+            $subnet->description = strlen($subnet->description)>0 ? "$Subnets->mail_font_style $subnet->description</font>" : "$Subnets->mail_font_style / </font>";
+
+            //content
+            $content[] = "<tr>";
+            $content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'><a href='".rtrim(str_replace(BASE, "",$Scan->settings->siteURL), "/")."".create_link("subnets",$subnet->sectionId,$subnet->id)."'>$Subnets->mail_font_style_href ".$Subnets->transform_to_dotted($change['ip_addr'])."</font></a></td>";
+            $content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style $change[description]</font></td>";
+            $content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style_href $change[hostname]</font></td>";
+            $content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'><a href='".rtrim(str_replace(BASE, "",$Scan->settings->siteURL), "/")."".create_link("subnets",$subnet->sectionId,$subnet->id)."'>$Subnets->mail_font_style_href ".$Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask."</font></a>".$subnet->description."</td>";
+            $content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style $ago</td>";
+            $content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style $oldStatus > $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);
+
+        $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->getMessage(), true);
+    }
 }
\ No newline at end of file

Spacing +129 added lines, -129 removed lines

@@ -30,18 +30,18 @@ 
  */
 
 # include required scripts
-require_once( dirname(__FILE__) . '/../functions.php' );
-require( dirname(__FILE__) . '/../../functions/classes/class.Thread.php');
+require_once(dirname(__FILE__).'/../functions.php');
+require(dirname(__FILE__).'/../../functions/classes/class.Thread.php');
 
 # initialize objects
 $Database 	= new Database_PDO;
-$Subnets	= new Subnets ($Database);
-$Addresses	= new Addresses ($Database);
-$Tools		= new Tools ($Database);
-$Admin		= new Admin ($Database, false);
-$Scan		= new Scan ($Database);
-$DNS		= new DNS ($Database);
-$Result		= new Result();
+$Subnets = new Subnets($Database);
+$Addresses	= new Addresses($Database);
+$Tools		= new Tools($Database);
+$Admin		= new Admin($Database, false);
+$Scan = new Scan($Database);
+$DNS = new DNS($Database);
+$Result = new Result();
 
 // set exit flag to true
 $Scan->ping_set_exit(true);
@@ -50,53 +50,53 @@ 
 // fetch agent
 $agent = $Tools->fetch_object("scanAgents", "id", 1);
 // set address types array
-$Tools->get_addresses_types ();
+$Tools->get_addresses_types();
 // change scan type?
-if(@$config['ping_check_method'])
-$Scan->reset_scan_method ($config['ping_check_method']);
+if (@$config['ping_check_method'])
+$Scan->reset_scan_method($config['ping_check_method']);
 
 // set ping statuses
 $statuses = explode(";", $Scan->settings->pingStatus);
 // set mail override flag
-if(!isset($config['ping_check_send_mail'])) {
+if (!isset($config['ping_check_send_mail'])) {
 	$config['ping_check_send_mail'] = true;
 }
 
 // response for mailing
-$address_change = array();			// Array with differences, can be used to email to admins
+$address_change = array(); // Array with differences, can be used to email to admins
 
 // set now for whole script
 $now     = time();
-$nowdate = date ("Y-m-d H:i:s");
+$nowdate = date("Y-m-d H:i:s");
 
 
 // script can only be run from cli
-if(php_sapi_name()!="cli") 						{ die("This script can only be run from cli!"); }
+if (php_sapi_name() != "cli") { die("This script can only be run from cli!"); }
 // test to see if threading is available
-if(!PingThread::available()) 					{ die("Threading is required for scanning subnets. Please recompile PHP with pcntl extension"); }
+if (!PingThread::available()) { die("Threading is required for scanning subnets. Please recompile PHP with pcntl extension"); }
 // verify ping path
-if ($Scan->icmp_type=="ping") {
-if(!file_exists($Scan->settings->scanPingPath)) { die("Invalid ping path!"); }
+if ($Scan->icmp_type == "ping") {
+if (!file_exists($Scan->settings->scanPingPath)) { die("Invalid ping path!"); }
 }
 // verify fping path
-if ($Scan->icmp_type=="fping") {
-if(!file_exists($Scan->settings->scanFPingPath)){ die("Invalid fping path!"); }
+if ($Scan->icmp_type == "fping") {
+if (!file_exists($Scan->settings->scanFPingPath)) { die("Invalid fping path!"); }
 }
 
 
 //first fetch all subnets to be scanned
-$scan_subnets = $Subnets->fetch_all_subnets_for_pingCheck (1);
-if($Scan->debugging)							{ print_r($scan_subnets); }
-if($scan_subnets===false) 						{ die("No subnets are marked for checking status updates\n"); }
+$scan_subnets = $Subnets->fetch_all_subnets_for_pingCheck(1);
+if ($Scan->debugging) { print_r($scan_subnets); }
+if ($scan_subnets === false) { die("No subnets are marked for checking status updates\n"); }
 //fetch all addresses that need to be checked
-foreach($scan_subnets as $s) {
+foreach ($scan_subnets as $s) {
 
 	// if subnet has slaves dont check it
-	if ($Subnets->has_slaves ($s->id) === false) {
+	if ($Subnets->has_slaves($s->id) === false) {
 
-		$subnet_addresses = $Addresses->fetch_subnet_addresses ($s->id);
+		$subnet_addresses = $Addresses->fetch_subnet_addresses($s->id);
 		//set array for fping
-		if($Scan->icmp_type=="fping")	{
+		if ($Scan->icmp_type == "fping") {
 			$subnets[] = array(
 								"id"         =>$s->id,
 								"cidr"       =>$Subnets->transform_to_dotted($s->subnet)."/".$s->mask,
@@ -105,12 +105,12 @@ 
 			                   );
 		}
 		//save addresses
-		if(sizeof($subnet_addresses)>0) {
-			foreach($subnet_addresses as $a) {
+		if (sizeof($subnet_addresses) > 0) {
+			foreach ($subnet_addresses as $a) {
 				//ignore excludePing
-				if($a->excludePing!=1) {
+				if ($a->excludePing != 1) {
 					//create different array for fping
-					if($Scan->icmp_type=="fping")	{
+					if ($Scan->icmp_type == "fping") {
 						$addresses2[$s->id][$a->id] = array(
 															"id"          =>$a->id,
 															"ip_addr"     =>$a->ip_addr,
@@ -123,10 +123,10 @@ 
 															"resolveDNS"  =>$s->resolveDNS,
 															"nsid"        =>$s->nsid
 															);
-						$addresses[$s->id][$a->id]  = $a->ip_addr;
+						$addresses[$s->id][$a->id] = $a->ip_addr;
 					}
 					else {
-						$addresses[] 		 		= array(
+						$addresses[] = array(
 															"id"          =>$a->id,
 															"ip_addr"     =>$a->ip_addr,
 															"description" =>$a->description,
@@ -143,54 +143,54 @@ 
 			}
 		}
 		// save update time
-		$Scan->update_subnet_scantime ($s->id, $nowdate);
+		$Scan->update_subnet_scantime($s->id, $nowdate);
 	}
 }
 
 
-if($Scan->debugging)							{ print "Using $Scan->icmp_type\n--------------------\n\n";print_r($addresses); }
+if ($Scan->debugging) { print "Using $Scan->icmp_type\n--------------------\n\n"; print_r($addresses); }
 //if none die
-if(!isset($addresses))							{ die("No addresses to check"); }
+if (!isset($addresses)) { die("No addresses to check"); }
 
 
 /* scan */
 
-$z = 0;			//addresses array index
+$z = 0; //addresses array index
 
 //different scan for fping
-if($Scan->icmp_type=="fping") {
+if ($Scan->icmp_type == "fping") {
 	//run per MAX_THREADS
-	for ($m=0; $m<=sizeof($subnets); $m += $Scan->settings->scanMaxThreads) {
+	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])) {
+	    	if (isset($subnets[$z])) {
 				//start new thread
-	            $threads[$z] = new PingThread( 'fping_subnet' );
-	            $threads[$z]->start_fping( $subnets[$z]['cidr'] );
-	            $z++;				//next index
+	            $threads[$z] = new PingThread('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) {
+	    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");
+					$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 );
+					$child_response = unserialize($child_response);
 					//store
 					$subnets[$index]['result'] = $child_response;
 
 					//now, child is dead, and parent close the pipe
-					unlink( $child_pipe );
+					unlink($child_pipe);
 					unset($threads[$index]);
 				}
 			}
@@ -199,12 +199,12 @@ 
 	}
 
 	//now we must remove all non-existing hosts
-	foreach($subnets as $sk=>$s) {
-		if(sizeof(@$s['result'])>0 && sizeof($addresses[$s['id']])>0) {
+	foreach ($subnets as $sk=>$s) {
+		if (sizeof(@$s['result']) > 0 && sizeof($addresses[$s['id']]) > 0) {
 			//loop addresses
-			foreach($addresses[$s['id']] as $ak=>$a) {
+			foreach ($addresses[$s['id']] as $ak=>$a) {
 				//offline host
-				if(array_search($Subnets->transform_to_dotted($a), $subnets[$sk]['result'])===false) {
+				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
@@ -217,17 +217,17 @@ 
 					//save to out array
                     $address_change[] = $addresses2[$s['id']][$ak];
                     //update status
-                    $Scan->ping_update_lastseen ($addresses2[$s['id']][$ak]['id'], $nowdate);
+                    $Scan->ping_update_lastseen($addresses2[$s['id']][$ak]['id'], $nowdate);
 				}
 
 		        //resolve hostnames
-				if($subnets[$sk]['resolveDNS']=="1") {
-					$old_hostname_save = $addresses2[$s['id']][$ak]['hostname'];	// save old hostname to detect change
-					$old_hostname = $config['resolve_emptyonly']===false ? false : $addresses2[$s['id']][$ak]['hostname'];
-			        $hostname = $DNS->resolve_address ($Subnets->transform_to_dotted($addresses2[$s['id']][$ak]['ip_addr']), $old_hostname, true, $subnets[$sk]['nsid']);
-					if($hostname['class']=="resolved") {
-						if ($hostname['name']!=$old_hostname_save) {
-							$Addresses->update_address_hostname ($Subnets->transform_to_dotted($addresses2[$s['id']][$ak]['ip_addr']), $addresses2[$s['id']][$ak]['id'], $hostname['name']);
+				if ($subnets[$sk]['resolveDNS'] == "1") {
+					$old_hostname_save = $addresses2[$s['id']][$ak]['hostname']; // save old hostname to detect change
+					$old_hostname = $config['resolve_emptyonly'] === false ? false : $addresses2[$s['id']][$ak]['hostname'];
+			        $hostname = $DNS->resolve_address($Subnets->transform_to_dotted($addresses2[$s['id']][$ak]['ip_addr']), $old_hostname, true, $subnets[$sk]['nsid']);
+					if ($hostname['class'] == "resolved") {
+						if ($hostname['name'] != $old_hostname_save) {
+							$Addresses->update_address_hostname($Subnets->transform_to_dotted($addresses2[$s['id']][$ak]['ip_addr']), $addresses2[$s['id']][$ak]['id'], $hostname['name']);
 						}
 					}
 				}
@@ -238,39 +238,39 @@ 
 //ping, pear
 else {
 	//run per MAX_THREADS
-	for ($m=0; $m<=sizeof($addresses); $m += $Scan->settings->scanMaxThreads) {
+	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])) {
+	    	if (isset($addresses[$z])) {
 				//start new thread
-	            $threads[$z] = new PingThread( 'ping_address' );
+	            $threads[$z] = new PingThread('ping_address');
 	            $threads[$z]->start($Subnets->transform_to_dotted($addresses[$z]['ip_addr']));
-	            $z++;				//next index
+	            $z++; //next index
 			}
 	    }
 	    // wait for all the threads to finish
-	    while( !empty( $threads ) ) {
-	        foreach( $threads as $index => $thread ) {
-	            if( ! $thread->isAlive() ) {
+	    while (!empty($threads)) {
+	        foreach ($threads as $index => $thread) {
+	            if (!$thread->isAlive()) {
 	            	//online
-	            	if($thread->getExitCode() == 0) {
+	            	if ($thread->getExitCode() == 0) {
     	            	// set new available time
-    	            	$addresses[$index]['lastSeenNew'] =  $nowdate;
-                        $address_change[$index] = $addresses[$index];	 				//change to online
+    	            	$addresses[$index]['lastSeenNew'] = $nowdate;
+                        $address_change[$index] = $addresses[$index]; //change to online
 	            	}
 	            	//offline
 	            	else {
     	            	// set nw online
-    	            	$addresses[$index]['lastSeenNew'] =  NULL;
-                        $address_change[$index] = $addresses[$index];	 				//change to 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] );
+	                unset($threads[$index]);
 	            }
 	        }
 	        usleep(200000);
@@ -281,26 +281,26 @@ 
 
 	# re-initialize classes
 	$Database  = new Database_PDO;
-	$Scan      = new Scan ($Database, $Subnets->settings);
-	$Addresses = new Addresses ($Database);
+	$Scan      = new Scan($Database, $Subnets->settings);
+	$Addresses = new Addresses($Database);
 
 	// 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);
+	foreach ($addresses as $k=>$a) {
+		if ($a['newStatus'] == 0) {
+			$Scan->ping_update_lastseen($a['id'], $nowdate);
 		}
 
         //resolve hostnames
-		if($a['resolveDNS']=="1") {
-			$old_hostname_save = $a['hostname'];	// save old hostname to detect change
-			$old_hostname = $config['resolve_emptyonly']===false ? false : $a['hostname'];
-	        $hostname = $DNS->resolve_address ($Subnets->transform_to_dotted($a['ip_addr']), $old_hostname, true, $a['nsid']);
-			if($hostname['class']=="resolved") {
-				if ($hostname['name']!=$old_hostname_save) {
-					$Addresses->update_address_hostname ($Subnets->transform_to_dotted($a['ip_addr']), $a['id'], $hostname['name']);
+		if ($a['resolveDNS'] == "1") {
+			$old_hostname_save = $a['hostname']; // save old hostname to detect change
+			$old_hostname = $config['resolve_emptyonly'] === false ? false : $a['hostname'];
+	        $hostname = $DNS->resolve_address($Subnets->transform_to_dotted($a['ip_addr']), $old_hostname, true, $a['nsid']);
+			if ($hostname['class'] == "resolved") {
+				if ($hostname['name'] != $old_hostname_save) {
+					$Addresses->update_address_hostname($Subnets->transform_to_dotted($a['ip_addr']), $a['id'], $hostname['name']);
 				}
 			}
 		}
@@ -316,38 +316,38 @@ 
 // loop
 foreach ($address_change as $k=>$change) {
     // null old - set to epoch time
-    if (strtotime($change['lastSeenOld'])===false)  { $change['lastSeenOld'] = date("Y-m-d H:i:s", 0); }
+    if (strtotime($change['lastSeenOld']) === false) { $change['lastSeenOld'] = date("Y-m-d H:i:s", 0); }
 
     // set general diffs
-    $deviceDiff = $now - strtotime($change['lastSeenOld']);	        // now - device last seen
-    $agentDiff  = $now - strtotime($agent->last_access);	        // now - last agent check
+    $deviceDiff = $now - strtotime($change['lastSeenOld']); // now - device last seen
+    $agentDiff  = $now - strtotime($agent->last_access); // now - last agent check
 
     // if now online and old offline send mail
-    if ($change['lastSeenNew']!=NULL && $deviceDiff >= (int) $statuses[1]) {
+    if ($change['lastSeenNew'] != NULL && $deviceDiff >= (int) $statuses[1]) {
         $address_change[$k]['oldStatus'] = 2;
         $address_change[$k]['newStatus'] = 0;
         // update tag if not already online
         // tags have different indexes than script exit code is - 1=offline, 2=online
-        if($address_change[$k]['state']!=2 && $Scan->settings->updateTags==1 && $Tools->address_types[$address_change[$k]['state']]['updateTag']==1) {
-	        $Scan->update_address_tag ($address_change[$k]['id'], 2, $address_change[$k]['state'], $change['lastSeenOld']);
+        if ($address_change[$k]['state'] != 2 && $Scan->settings->updateTags == 1 && $Tools->address_types[$address_change[$k]['state']]['updateTag'] == 1) {
+	        $Scan->update_address_tag($address_change[$k]['id'], 2, $address_change[$k]['state'], $change['lastSeenOld']);
     	}
     }
     // now offline, and diff > offline period, do checks
-    elseif($change['lastSeenNew']==NULL && $deviceDiff >= (int) $statuses[1]) {
+    elseif ($change['lastSeenNew'] == NULL && $deviceDiff >= (int) $statuses[1]) {
         // if not already reported
-        if ($deviceDiff <= ((int) $statuses[1] + $agentDiff))  {
+        if ($deviceDiff <= ((int) $statuses[1] + $agentDiff)) {
             $address_change[$k]['oldStatus'] = 0;
             $address_change[$k]['newStatus'] = 2;
 	        // update tag if not already offline
 	        // tags have different indexes than script exit code is - 1=offline, 2=online
-	        if($address_change[$k]['state']!=1 && $Scan->settings->updateTags==1 && $Tools->address_types[$address_change[$k]['state']]['updateTag']==1) {
-		        $Scan->update_address_tag ($address_change[$k]['id'], 1, $address_change[$k]['state'], $change['lastSeenOld']);
+	        if ($address_change[$k]['state'] != 1 && $Scan->settings->updateTags == 1 && $Tools->address_types[$address_change[$k]['state']]['updateTag'] == 1) {
+		        $Scan->update_address_tag($address_change[$k]['id'], 1, $address_change[$k]['state'], $change['lastSeenOld']);
 		    }
         }
         else {
         	// already reported, check tag
-	        if($address_change[$k]['state']!=1 && $Scan->settings->updateTags==1 && $Tools->address_types[$address_change[$k]['state']]['updateTag']==1) {
-		        $Scan->update_address_tag ($address_change[$k]['id'], 1, $address_change[$k]['state'], $change['lastSeenOld']);
+	        if ($address_change[$k]['state'] != 1 && $Scan->settings->updateTags == 1 && $Tools->address_types[$address_change[$k]['state']]['updateTag'] == 1) {
+		        $Scan->update_address_tag($address_change[$k]['id'], 1, $address_change[$k]['state'], $change['lastSeenOld']);
 		    }
         	// remove from change array
             unset ($address_change[$k]);
@@ -356,18 +356,18 @@ 
     // remove
     else {
     	// check tag
-    	if ($change['lastSeenNew']!=NULL) {
+    	if ($change['lastSeenNew'] != NULL) {
 	        // update tag if not already online
 	        // tags have different indexes than script exit code is - 1=offline, 2=online
-	        if($address_change[$k]['state']!=2 && $Scan->settings->updateTags==1 && $Tools->address_types[$address_change[$k]['state']]['updateTag']==1) {
-		        $Scan->update_address_tag ($address_change[$k]['id'], 2, $address_change[$k]['state'], $change['lastSeenOld']);
+	        if ($address_change[$k]['state'] != 2 && $Scan->settings->updateTags == 1 && $Tools->address_types[$address_change[$k]['state']]['updateTag'] == 1) {
+		        $Scan->update_address_tag($address_change[$k]['id'], 2, $address_change[$k]['state'], $change['lastSeenOld']);
 	    	}
     	}
     	else {
     		// update tag if not already offline
 	        // tags have different indexes than script exit code is - 1=offline, 2=online
-	        if($address_change[$k]['state']!=1 && $Scan->settings->updateTags==1 && $Tools->address_types[$address_change[$k]['state']]['updateTag']==1) {
-		        $Scan->update_address_tag ($address_change[$k]['id'], 1, $address_change[$k]['state'], $change['lastSeenOld']);
+	        if ($address_change[$k]['state'] != 1 && $Scan->settings->updateTags == 1 && $Tools->address_types[$address_change[$k]['state']]['updateTag'] == 1) {
+		        $Scan->update_address_tag($address_change[$k]['id'], 1, $address_change[$k]['state'], $change['lastSeenOld']);
 		    }
     	}
 
@@ -376,24 +376,24 @@ 
 }
 
 # update scan time
-$Scan->ping_update_scanagent_checktime (1, $nowdate);
+$Scan->ping_update_scanagent_checktime(1, $nowdate);
 
 
 # print change
-if($Scan->debugging)							{ print "\nAddress changes:\n----------\n"; print_r($address_change); }
+if ($Scan->debugging) { print "\nAddress changes:\n----------\n"; print_r($address_change); }
 
 # all done, mail diff?
-if(sizeof($address_change)>0 && $config['ping_check_send_mail']) {
+if (sizeof($address_change) > 0 && $config['ping_check_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();
+	$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);
@@ -402,13 +402,13 @@ 
 
 
 	# check for recipients
-	foreach($Tools->fetch_multiple_objects ("users", "role", "Administrator") as $admin) {
-		if($admin->mailNotify=="Yes") {
+	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(); }
+	if (!isset($recepients)) { die(); }
 
 	# fake user object, needed for create_link
 	$User = new StdClass();
@@ -422,7 +422,7 @@ 
 		$phpipam_mail = new phpipam_mail($Scan->settings, $mail_settings);
 
 		// set subject
-		$subject	= "phpIPAM IP state change ".$nowdate;
+		$subject = "phpIPAM IP state change ".$nowdate;
 
 		//html
 		$content[] = "<p style='margin-left:10px;'>$Subnets->mail_font_style <font style='font-size:16px;size:16px;'>phpIPAM host changes</font></font></p><br>";
@@ -441,9 +441,9 @@ 
 		$content_plain[] = "phpIPAM host changes \r\n------------------------------";
 
 		//Changes
-		foreach($address_change as $change) {
+		foreach ($address_change as $change) {
 			//reformat statuses
-			if($change['oldStatus'] == 0) {
+			if ($change['oldStatus'] == 0) {
 				$oldStatus = "<font style='color:#04B486'>Online</font>";
 				$newStatus = "<font style='color:#DF0101'>Offline</font>";
 			}
@@ -453,28 +453,28 @@ 
 			}
 
 			//set subnet
-			$subnet 	 = $Subnets->fetch_subnet(null, $change['subnetId']);
+			$subnet = $Subnets->fetch_subnet(null, $change['subnetId']);
 			//ago
-			if(is_null($change['lastSeen']) || $change['lastSeen']=="1970-01-01 00:00:01" || $change['lastSeen']=="0000-00-00 00:00:00") {
-				$ago	  = "never";
+			if (is_null($change['lastSeen']) || $change['lastSeen'] == "1970-01-01 00:00:01" || $change['lastSeen'] == "0000-00-00 00:00:00") {
+				$ago = "never";
 			} else {
 				$timeDiff = $now - strtotime($change['lastSeen']);
 
 	    		// reformat
-	    		$lastSeen = date("m/d H:i", strtotime($change['lastSeen']) );
-				$ago 	  = $lastSeen." (".$Result->sec2hms($timeDiff)." ago)";
+	    		$lastSeen = date("m/d H:i", strtotime($change['lastSeen']));
+				$ago = $lastSeen." (".$Result->sec2hms($timeDiff)." ago)";
 			}
 	        // desc
-			$change['description'] = strlen($change['description'])>0 ? "$Subnets->mail_font_style $change[description]</font>" : "$Subnets->mail_font_style / </font>";
+			$change['description'] = strlen($change['description']) > 0 ? "$Subnets->mail_font_style $change[description]</font>" : "$Subnets->mail_font_style / </font>";
 			// subnet desc
-			$subnet->description = strlen($subnet->description)>0 ? "$Subnets->mail_font_style $subnet->description</font>" : "$Subnets->mail_font_style / </font>";
+			$subnet->description = strlen($subnet->description) > 0 ? "$Subnets->mail_font_style $subnet->description</font>" : "$Subnets->mail_font_style / </font>";
 
 			//content
 			$content[] = "<tr>";
-			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'><a href='".rtrim(str_replace(BASE, "",$Scan->settings->siteURL), "/")."".create_link("subnets",$subnet->sectionId,$subnet->id)."'>$Subnets->mail_font_style_href ".$Subnets->transform_to_dotted($change['ip_addr'])."</font></a></td>";
+			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'><a href='".rtrim(str_replace(BASE, "", $Scan->settings->siteURL), "/")."".create_link("subnets", $subnet->sectionId, $subnet->id)."'>$Subnets->mail_font_style_href ".$Subnets->transform_to_dotted($change['ip_addr'])."</font></a></td>";
 			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style $change[description]</font></td>";
 			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style_href $change[hostname]</font></td>";
-			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'><a href='".rtrim(str_replace(BASE, "",$Scan->settings->siteURL), "/")."".create_link("subnets",$subnet->sectionId,$subnet->id)."'>$Subnets->mail_font_style_href ".$Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask."</font></a>".$subnet->description."</td>";
+			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'><a href='".rtrim(str_replace(BASE, "", $Scan->settings->siteURL), "/")."".create_link("subnets", $subnet->sectionId, $subnet->id)."'>$Subnets->mail_font_style_href ".$Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask."</font></a>".$subnet->description."</td>";
 			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style $ago</td>";
 			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style $oldStatus > $newStatus</td>";
 			$content[] = "</tr>";
@@ -487,12 +487,12 @@ 
 
 
 		# set content
-		$content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
-		$content_plain 	= implode("\r\n",$content_plain);
+		$content = $phpipam_mail->generate_message(implode("\r\n", $content));
+		$content_plain = implode("\r\n", $content_plain);
 
 		$phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
 		//add all admins to CC
-		foreach($recepients as $admin) {
+		foreach ($recepients as $admin) {
 			$phpipam_mail->Php_mailer->addAddress(addslashes($admin['email']), addslashes($admin['name']));
 		}
 		$phpipam_mail->Php_mailer->Subject = $subject;

Braces +8 added lines, -6 removed lines

@@ -52,8 +52,9 @@ 
 // set address types array
 $Tools->get_addresses_types ();
 // change scan type?
-if(@$config['ping_check_method'])
-$Scan->reset_scan_method ($config['ping_check_method']);
+if(@$config['ping_check_method']) {
+    $Scan->reset_scan_method ($config['ping_check_method']);
+}
 
 // set ping statuses
 $statuses = explode(";", $Scan->settings->pingStatus);
@@ -96,7 +97,7 @@ 
 
 		$subnet_addresses = $Addresses->fetch_subnet_addresses ($s->id);
 		//set array for fping
-		if($Scan->icmp_type=="fping")	{
+		if($Scan->icmp_type=="fping") {
 			$subnets[] = array(
 								"id"         =>$s->id,
 								"cidr"       =>$Subnets->transform_to_dotted($s->subnet)."/".$s->mask,
@@ -110,7 +111,7 @@ 
 				//ignore excludePing
 				if($a->excludePing!=1) {
 					//create different array for fping
-					if($Scan->icmp_type=="fping")	{
+					if($Scan->icmp_type=="fping") {
 						$addresses2[$s->id][$a->id] = array(
 															"id"          =>$a->id,
 															"ip_addr"     =>$a->ip_addr,
@@ -335,7 +336,7 @@ 
     // now offline, and diff > offline period, do checks
     elseif($change['lastSeenNew']==NULL && $deviceDiff >= (int) $statuses[1]) {
         // if not already reported
-        if ($deviceDiff <= ((int) $statuses[1] + $agentDiff))  {
+        if ($deviceDiff <= ((int) $statuses[1] + $agentDiff)) {
             $address_change[$k]['oldStatus'] = 0;
             $address_change[$k]['newStatus'] = 2;
 	        // update tag if not already offline
@@ -457,7 +458,8 @@ 
 			//ago
 			if(is_null($change['lastSeen']) || $change['lastSeen']=="1970-01-01 00:00:01" || $change['lastSeen']=="0000-00-00 00:00:00") {
 				$ago	  = "never";
-			} else {
+			}
+			else {
 				$timeDiff = $now - strtotime($change['lastSeen']);
 
 	    		// reformat

functions/scripts/remove_offline_addresses.php

Indentation +92 added lines, -92 removed lines

@@ -49,110 +49,110 @@
 # fetch
 try { $offline_addresses = $Database->getObjectsQuery($query); }
 catch (Exception $e) {
-	$Result->show("danger", _("Error: ").$e->getMessage());
-	die();
+    $Result->show("danger", _("Error: ").$e->getMessage());
+    die();
 }
 
 # if none die, none to remove
 if (sizeof($offline_addresses)==0) {
-	die();
+    die();
 }
 # remove
 else {
-	foreach ($offline_addresses as $a) {
-		// save
-		$removed_addresses[] = $a;
-		// remove
-		$Addresses->modify_address ($a);
-	}
+    foreach ($offline_addresses as $a) {
+        // save
+        $removed_addresses[] = $a;
+        // remove
+        $Addresses->modify_address ($a);
+    }
 }
 
 
 # all done, mail diff?
 if(sizeof($removed_addresses)>0 && $config['removed_addresses_send_mail']) {
-	# settings
-	$Subnets->get_settings ();
-	# check for recipients
-	foreach($Subnets->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(); }
-
-	# fake user object, needed for create_link
-	$User = new StdClass();
-	# try to send
-	try {
-		# fetch mailer settings
-		$mail_settings = $Subnets->fetch_object("settingsMail", "id", 1);
-		# initialize mailer
-		$phpipam_mail = new phpipam_mail($Subnets->settings, $mail_settings);
-
-		// set subject
-		$subject	= "phpipam deleted offline addresses at ".$nowdate;
-
-		//html
-		$content[] = "<p style='margin-left:10px;'>$Subnets->mail_font_style <font style='font-size:16px;size:16px;'>phpipam removed inactive addresses at ".$nowdate."</font></font></p><br>";
-
-		$content[] = "<table style='margin-left:10px;margin-top:5px;width:auto;padding:0px;border-collapse:collapse;border:1px solid #ccc;'>";
-		$content[] = "<tr>";
-		$content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;white-space:nowrap;'>$Subnets->mail_font_style IP</font></th>";
-		$content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;'>$Subnets->mail_font_style Description</font></th>";
-		$content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;'>$Subnets->mail_font_style Hostname</font></th>";
-		$content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;'>$Subnets->mail_font_style Subnet</font></th>";
-		$content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;'>$Subnets->mail_font_style Last seen</font></th>";
-		$content[] = "</tr>";
-
-		//plain
-		$content_plain[] = "phpipam deleted offline addresses at ".$nowdate."\r\n------------------------------";
-
-		//Changes
-		foreach($removed_addresses as $change) {
-			// to array
-			$change = (array) $change;
-			//set subnet
-			$subnet = $Subnets->fetch_subnet(null, $change['subnetId']);
-
-	        // desc
-			$change['description'] = strlen($change['description'])>0 ? "$Subnets->mail_font_style $change[description]</font>" : "$Subnets->mail_font_style / </font>";
-			// subnet desc
-			$subnet->description = strlen($subnet->description)>0 ? "$Subnets->mail_font_style $subnet->description</font>" : "$Subnets->mail_font_style / </font>";
-
-			//content
-			$content[] = "<tr>";
-			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style ".$Subnets->transform_to_dotted($change['ip_addr'])."</font></td>";
-			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style $change[description]</font></td>";
-			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style_href $change[hostname]</font></td>";
-			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'><a href='".rtrim(str_replace(BASE, "",$Subnets->settings->siteURL), "/")."".create_link("subnets",$subnet->sectionId,$subnet->id)."'>$Subnets->mail_font_style_href ".$Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask."</font></a>".$subnet->description."</td>";
-			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style $change[lastSeen]</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";
-		}
-		$content[] = "</table>";
-
-		# set content
-		$content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
-		$content_plain 	= implode("\r\n",$content_plain);
-
-		$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->getMessage(), true);
-	}
+    # settings
+    $Subnets->get_settings ();
+    # check for recipients
+    foreach($Subnets->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(); }
+
+    # fake user object, needed for create_link
+    $User = new StdClass();
+    # try to send
+    try {
+        # fetch mailer settings
+        $mail_settings = $Subnets->fetch_object("settingsMail", "id", 1);
+        # initialize mailer
+        $phpipam_mail = new phpipam_mail($Subnets->settings, $mail_settings);
+
+        // set subject
+        $subject	= "phpipam deleted offline addresses at ".$nowdate;
+
+        //html
+        $content[] = "<p style='margin-left:10px;'>$Subnets->mail_font_style <font style='font-size:16px;size:16px;'>phpipam removed inactive addresses at ".$nowdate."</font></font></p><br>";
+
+        $content[] = "<table style='margin-left:10px;margin-top:5px;width:auto;padding:0px;border-collapse:collapse;border:1px solid #ccc;'>";
+        $content[] = "<tr>";
+        $content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;white-space:nowrap;'>$Subnets->mail_font_style IP</font></th>";
+        $content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;'>$Subnets->mail_font_style Description</font></th>";
+        $content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;'>$Subnets->mail_font_style Hostname</font></th>";
+        $content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;'>$Subnets->mail_font_style Subnet</font></th>";
+        $content[] = "	<th style='padding:3px 8px;border:1px solid #ccc;border-bottom:2px solid gray;'>$Subnets->mail_font_style Last seen</font></th>";
+        $content[] = "</tr>";
+
+        //plain
+        $content_plain[] = "phpipam deleted offline addresses at ".$nowdate."\r\n------------------------------";
+
+        //Changes
+        foreach($removed_addresses as $change) {
+            // to array
+            $change = (array) $change;
+            //set subnet
+            $subnet = $Subnets->fetch_subnet(null, $change['subnetId']);
+
+            // desc
+            $change['description'] = strlen($change['description'])>0 ? "$Subnets->mail_font_style $change[description]</font>" : "$Subnets->mail_font_style / </font>";
+            // subnet desc
+            $subnet->description = strlen($subnet->description)>0 ? "$Subnets->mail_font_style $subnet->description</font>" : "$Subnets->mail_font_style / </font>";
+
+            //content
+            $content[] = "<tr>";
+            $content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style ".$Subnets->transform_to_dotted($change['ip_addr'])."</font></td>";
+            $content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style $change[description]</font></td>";
+            $content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style_href $change[hostname]</font></td>";
+            $content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'><a href='".rtrim(str_replace(BASE, "",$Subnets->settings->siteURL), "/")."".create_link("subnets",$subnet->sectionId,$subnet->id)."'>$Subnets->mail_font_style_href ".$Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask."</font></a>".$subnet->description."</td>";
+            $content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style $change[lastSeen]</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";
+        }
+        $content[] = "</table>";
+
+        # set content
+        $content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
+        $content_plain 	= implode("\r\n",$content_plain);
+
+        $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->getMessage(), true);
+    }
 }
 
 ?>

Spacing +23 added lines, -23 removed lines

@@ -9,28 +9,28 @@ 
  */
 
 # script can only be run from cli
-if(php_sapi_name()!="cli") 						{ die("This script can only be run from cli!"); }
+if (php_sapi_name() != "cli") { die("This script can only be run from cli!"); }
 
 # include required scripts
-require_once( dirname(__FILE__) . '/../functions.php' );
+require_once(dirname(__FILE__).'/../functions.php');
 
 # initialize objects
 $Database 	= new Database_PDO;
-$Addresses	= new Addresses ($Database);
-$Subnets	= new Subnets ($Database);
+$Addresses	= new Addresses($Database);
+$Subnets	= new Subnets($Database);
 $Result		= new Result();
 
 
 // response for mailing
-$removed_addresses = array();			// Array with differences, can be used to email to admins
+$removed_addresses = array(); // Array with differences, can be used to email to admins
 
 // if config is not set die
-if(!isset($config['removed_addresses_timelimit'])) { die("Please set timelimit for address removal!"); }
+if (!isset($config['removed_addresses_timelimit'])) { die("Please set timelimit for address removal!"); }
 
 // set now for whole script
 $now     = time();
-$nowdate = date ("Y-m-d H:i:s");
-$beforetime = date ("Y-m-d H:i:s", (time()-$config['removed_addresses_timelimit']));
+$nowdate = date("Y-m-d H:i:s");
+$beforetime = date("Y-m-d H:i:s", (time() - $config['removed_addresses_timelimit']));
 
 // set query to fetch addresses and belongign subnets
 $query = "select
@@ -54,7 +54,7 @@ 
 }
 
 # if none die, none to remove
-if (sizeof($offline_addresses)==0) {
+if (sizeof($offline_addresses) == 0) {
 	die();
 }
 # remove
@@ -63,23 +63,23 @@ 
 		// save
 		$removed_addresses[] = $a;
 		// remove
-		$Addresses->modify_address ($a);
+		$Addresses->modify_address($a);
 	}
 }
 
 
 # all done, mail diff?
-if(sizeof($removed_addresses)>0 && $config['removed_addresses_send_mail']) {
+if (sizeof($removed_addresses) > 0 && $config['removed_addresses_send_mail']) {
 	# settings
-	$Subnets->get_settings ();
+	$Subnets->get_settings();
 	# check for recipients
-	foreach($Subnets->fetch_multiple_objects ("users", "role", "Administrator") as $admin) {
-		if($admin->mailNotify=="Yes") {
+	foreach ($Subnets->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(); }
+	if (!isset($recepients)) { die(); }
 
 	# fake user object, needed for create_link
 	$User = new StdClass();
@@ -91,7 +91,7 @@ 
 		$phpipam_mail = new phpipam_mail($Subnets->settings, $mail_settings);
 
 		// set subject
-		$subject	= "phpipam deleted offline addresses at ".$nowdate;
+		$subject = "phpipam deleted offline addresses at ".$nowdate;
 
 		//html
 		$content[] = "<p style='margin-left:10px;'>$Subnets->mail_font_style <font style='font-size:16px;size:16px;'>phpipam removed inactive addresses at ".$nowdate."</font></font></p><br>";
@@ -109,23 +109,23 @@ 
 		$content_plain[] = "phpipam deleted offline addresses at ".$nowdate."\r\n------------------------------";
 
 		//Changes
-		foreach($removed_addresses as $change) {
+		foreach ($removed_addresses as $change) {
 			// to array
 			$change = (array) $change;
 			//set subnet
 			$subnet = $Subnets->fetch_subnet(null, $change['subnetId']);
 
 	        // desc
-			$change['description'] = strlen($change['description'])>0 ? "$Subnets->mail_font_style $change[description]</font>" : "$Subnets->mail_font_style / </font>";
+			$change['description'] = strlen($change['description']) > 0 ? "$Subnets->mail_font_style $change[description]</font>" : "$Subnets->mail_font_style / </font>";
 			// subnet desc
-			$subnet->description = strlen($subnet->description)>0 ? "$Subnets->mail_font_style $subnet->description</font>" : "$Subnets->mail_font_style / </font>";
+			$subnet->description = strlen($subnet->description) > 0 ? "$Subnets->mail_font_style $subnet->description</font>" : "$Subnets->mail_font_style / </font>";
 
 			//content
 			$content[] = "<tr>";
 			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style ".$Subnets->transform_to_dotted($change['ip_addr'])."</font></td>";
 			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style $change[description]</font></td>";
 			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style_href $change[hostname]</font></td>";
-			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'><a href='".rtrim(str_replace(BASE, "",$Subnets->settings->siteURL), "/")."".create_link("subnets",$subnet->sectionId,$subnet->id)."'>$Subnets->mail_font_style_href ".$Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask."</font></a>".$subnet->description."</td>";
+			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'><a href='".rtrim(str_replace(BASE, "", $Subnets->settings->siteURL), "/")."".create_link("subnets", $subnet->sectionId, $subnet->id)."'>$Subnets->mail_font_style_href ".$Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask."</font></a>".$subnet->description."</td>";
 			$content[] = "	<td style='padding:3px 8px;border:1px solid #ccc;'>$Subnets->mail_font_style $change[lastSeen]</td>";
 			$content[] = "</tr>";
 
@@ -135,12 +135,12 @@ 
 		$content[] = "</table>";
 
 		# set content
-		$content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
-		$content_plain 	= implode("\r\n",$content_plain);
+		$content 		= $phpipam_mail->generate_message(implode("\r\n", $content));
+		$content_plain = implode("\r\n", $content_plain);
 
 		$phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
 		//add all admins to CC
-		foreach($recepients as $admin) {
+		foreach ($recepients as $admin) {
 			$phpipam_mail->Php_mailer->addAddress(addslashes($admin['email']), addslashes($admin['name']));
 		}
 		$phpipam_mail->Php_mailer->Subject = $subject;

functions/classes/class.Log.php

Indentation +1823 added lines, -1823 removed lines

@@ -13,1525 +13,1525 @@ 
 class Logging extends Common_functions {
 
 
-	/**
-	 * debugging flag
-	 *
-	 * (default value: false)
-	 *
-	 * @var bool
-	 * @access public
-	 */
-	public $debugging = false;
-
-	/**
-	 * log_type
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $log_type;
-
-	/**
-	 * log_command
-	 *
-	 * (default value: null)
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $log_command = null;
-
-	/**
-	 * log_details
-	 *
-	 * (default value: null)
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $log_details = null;
-
-	/**
-	 * Syslog facility
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $syslog_facility;
-
-	/**
-	 * syslog_priority
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $syslog_priority;
-
-	/**
-	 * log severity
-	 *
-	 *  0: informational
-	 *  1: warning
-	 *  2: error
-	 *
-	 * (default value: 0)
-	 *
-	 * @var int
-	 * @access protected
-	 */
-	protected $log_severity = 0;
-
-	/**
-	 * New object (changed)
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $object_new;
-
-	/**
-	 * Old object (before change)
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $object_old;
-
-	/**
-	 * Original Object (before logging modifications)
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $object_orig;
-
-	/**
-	 * object_type
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $object_type;
-
-	/**
-	 * Object action
-	 *
-	 *  add, edit, delete
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $object_action;
-
-	/**
-	 * Result - success, failure
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $object_result;
-
-	/**
-	 * mail_changelog
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $mail_changelog;
-
-	/**
-	 * log_username
-	 *
-	 * (default value: null)
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $log_username	= null;
-
-	/**
-	 * user details
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $user;
-
-	/**
-	 * id of user
-	 *
-	 * (default value: null)
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $user_id	= null;
-
-	/**
-	 * Changelog keys for nicer display fo changelog
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	public $changelog_keys = array(
-    	"section" => array(
-						"id"             => "index",
-						"name"           => "Subnet name",
-						"description"    => "Description",
-						"masterSection"  => "Parent section index",
-						"strictMode"     => "Enforce strict checks",
-						"subnetOrdering" => "Order of subnets",
-						"order"          => "Order of display",
-						"showVLAN"       => "Show VLANs in side menu",
-						"showVRF"        => "Show VRF in side menu"
-    	),
-    	"subnet" => array(
-						"id"                    => "Subnet id",
-						"subnet"                => "Subnet",
-						"masterSubnetId"        => "Master subnet",
-						"mask"                  => "Netmask",
-						"sectionId"             => "Section",
-						"description"           => "Description",
-						"firewallAddressObject" => "Firewall object index",
-						"vrfId"                 => "VRF",
-						"vlanId"                => "VLAN",
-						"showName"              => "Show name instead of subnet",
-						"device"                => "Device",
-						"pingSubnet"            => "ICMP check for online hosts",
-						"discoverSubnet"        => "Discover new hosts for this subnet",
-						"allowRequests"         => "Allow IP requests for subnet",
-						"DNSrecursive"          => "Create recursive PowerDNS records",
-						"DNSrecords"            => "Show PowerDNS records",
-						"nameserverId"          => "Nameserver",
-						"scanAgent"             => "Scan agent index",
-						"isFolder"              => "Object is folder",
-						"isFull"                => "Subnet is marked as full",
-						"state"                 => "Subnet state index",
-						"NAT"                   => "NAT object index",
-						"threshold"             => "Usage alert threshold",
-						"linked_subnet"         => "Linked IPv6 subnet",
-						"location"              => "Subnet location",
-						"lastScan"              => "Last scan date"
-    	            ),
-    	"folder" => array(
-						"id"             => "Folder id",
-						"masterSubnetId" => "Master folder index",
-						"sectionId"      => "Section index",
-						"description"    => "Description",
-						"isFolder"       => "Object is folder"
-    	            ),
+    /**
+     * debugging flag
+     *
+     * (default value: false)
+     *
+     * @var bool
+     * @access public
+     */
+    public $debugging = false;
+
+    /**
+     * log_type
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $log_type;
+
+    /**
+     * log_command
+     *
+     * (default value: null)
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $log_command = null;
+
+    /**
+     * log_details
+     *
+     * (default value: null)
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $log_details = null;
+
+    /**
+     * Syslog facility
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $syslog_facility;
+
+    /**
+     * syslog_priority
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $syslog_priority;
+
+    /**
+     * log severity
+     *
+     *  0: informational
+     *  1: warning
+     *  2: error
+     *
+     * (default value: 0)
+     *
+     * @var int
+     * @access protected
+     */
+    protected $log_severity = 0;
+
+    /**
+     * New object (changed)
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $object_new;
+
+    /**
+     * Old object (before change)
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $object_old;
+
+    /**
+     * Original Object (before logging modifications)
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $object_orig;
+
+    /**
+     * object_type
+     *
+     * @var mixed
+     * @access public
+     */
+    public $object_type;
+
+    /**
+     * Object action
+     *
+     *  add, edit, delete
+     *
+     * @var mixed
+     * @access public
+     */
+    public $object_action;
+
+    /**
+     * Result - success, failure
+     *
+     * @var mixed
+     * @access public
+     */
+    public $object_result;
+
+    /**
+     * mail_changelog
+     *
+     * @var mixed
+     * @access public
+     */
+    public $mail_changelog;
+
+    /**
+     * log_username
+     *
+     * (default value: null)
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $log_username	= null;
+
+    /**
+     * user details
+     *
+     * @var mixed
+     * @access public
+     */
+    public $user;
+
+    /**
+     * id of user
+     *
+     * (default value: null)
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $user_id	= null;
+
+    /**
+     * Changelog keys for nicer display fo changelog
+     *
+     * @var mixed
+     * @access protected
+     */
+    public $changelog_keys = array(
+        "section" => array(
+                        "id"             => "index",
+                        "name"           => "Subnet name",
+                        "description"    => "Description",
+                        "masterSection"  => "Parent section index",
+                        "strictMode"     => "Enforce strict checks",
+                        "subnetOrdering" => "Order of subnets",
+                        "order"          => "Order of display",
+                        "showVLAN"       => "Show VLANs in side menu",
+                        "showVRF"        => "Show VRF in side menu"
+        ),
+        "subnet" => array(
+                        "id"                    => "Subnet id",
+                        "subnet"                => "Subnet",
+                        "masterSubnetId"        => "Master subnet",
+                        "mask"                  => "Netmask",
+                        "sectionId"             => "Section",
+                        "description"           => "Description",
+                        "firewallAddressObject" => "Firewall object index",
+                        "vrfId"                 => "VRF",
+                        "vlanId"                => "VLAN",
+                        "showName"              => "Show name instead of subnet",
+                        "device"                => "Device",
+                        "pingSubnet"            => "ICMP check for online hosts",
+                        "discoverSubnet"        => "Discover new hosts for this subnet",
+                        "allowRequests"         => "Allow IP requests for subnet",
+                        "DNSrecursive"          => "Create recursive PowerDNS records",
+                        "DNSrecords"            => "Show PowerDNS records",
+                        "nameserverId"          => "Nameserver",
+                        "scanAgent"             => "Scan agent index",
+                        "isFolder"              => "Object is folder",
+                        "isFull"                => "Subnet is marked as full",
+                        "state"                 => "Subnet state index",
+                        "NAT"                   => "NAT object index",
+                        "threshold"             => "Usage alert threshold",
+                        "linked_subnet"         => "Linked IPv6 subnet",
+                        "location"              => "Subnet location",
+                        "lastScan"              => "Last scan date"
+                    ),
+        "folder" => array(
+                        "id"             => "Folder id",
+                        "masterSubnetId" => "Master folder index",
+                        "sectionId"      => "Section index",
+                        "description"    => "Description",
+                        "isFolder"       => "Object is folder"
+                    ),
         "address" => array(
-						"id"                    => "Address id",
-						"subnetId"              => "Subnet",
-						"ip_addr"               => "IP address",
-						"is_gayeway"            => "Gateway",
-						"description"           => "Description",
-						"hostname"              => "Hostname",
-						"mac"                   => "MAC address",
-						"owner"                 => "Address owner",
-						"state"                 => "Address state index",
-						"switch"                => "Device",
-						"port"                  => "Port",
-						"note"                  => "Note",
-						"lastSeen"              => "Device last online",
-						"excludePing"           => "Exclude from ICMP check",
-						"PTRignore"             => "Dont create PTR records",
-						"PTR"                   => "PTR object index",
-						"NAT"                   => "NAT object index",
-						"firewallAddressObject" => "Firewall object index",
-						"is_gateway"            => "Address is subnet gateway",
-						"location"              => "Address location",
-						"location_item"			=> "Address location",
-						"section"				=> "Section"
+                        "id"                    => "Address id",
+                        "subnetId"              => "Subnet",
+                        "ip_addr"               => "IP address",
+                        "is_gayeway"            => "Gateway",
+                        "description"           => "Description",
+                        "hostname"              => "Hostname",
+                        "mac"                   => "MAC address",
+                        "owner"                 => "Address owner",
+                        "state"                 => "Address state index",
+                        "switch"                => "Device",
+                        "port"                  => "Port",
+                        "note"                  => "Note",
+                        "lastSeen"              => "Device last online",
+                        "excludePing"           => "Exclude from ICMP check",
+                        "PTRignore"             => "Dont create PTR records",
+                        "PTR"                   => "PTR object index",
+                        "NAT"                   => "NAT object index",
+                        "firewallAddressObject" => "Firewall object index",
+                        "is_gateway"            => "Address is subnet gateway",
+                        "location"              => "Address location",
+                        "location_item"			=> "Address location",
+                        "section"				=> "Section"
                     )
-	);
-
-	/**
-	 * Database object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Database;
-
-	/**
-	 * Result object
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $Result;
-
-	/**
-	 * Addresses object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Addresses;
-
-	/**
-	 * Sections object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Sections;
-
-	/**
-	 * Subnets object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Subnets;
-
-	/**
-	 * Tools object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Tools;
-
-	/**
-	 * settings
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $settings;
-
-
-
-
-
-	/**
-	 * __construct function.
-	 *
-	 * @access public
-	 * @param Database_PDO $database
-	 * @param mixed $settings (default: null)
-	 */
-	public function __construct (Database_PDO $database, $settings = null) {
-		# Save database object
-		$this->Database = $database;
-		# Result
-		$this->Result = new Result ();
-		# User
-		$this->log_username = @$_SESSION['ipamusername'];
-
-		# settings
-		if ($settings===null || $settings===false) {
-			$this->get_settings(); #assigns $this->settings internally
-		}
-		else {
-			$this->settings = (object) $settings;
-		}
-		# debugging
-		$this->set_debugging();
-		# set log type
-		$this->set_log_type ();
-	}
-
-
-
-
-
-
-	/**
-	 * Sets log type based on phpipam settings
-	 *
-	 *	available options:
-	 *		Database (default)
-	 *		syslog
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function set_log_type () {
-		# check settings
-		$this->log_type = $this->settings->log;
-	}
-
-	/**
-	 * Gets id of active user
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function get_active_user_id () {
-		# cache
-		if ($this->user_id===null) {
-			# null
-			$user_id = null;
-			if (!isset($_SESSION['ipamusername'])) {
-				// when API calls subnet_create we get:
-				// Error: SQLSTATE[23000]: Integrity constraint violation: 1048 Column 'cuser' cannot be null
-				// so let's get a user_id
-				if (array_key_exists("HTTP_PHPIPAM_TOKEN", $_SERVER)) {
-					$admin = new Admin($this->Database, False);
-					$token = $admin->fetch_object ("users", "token", $_SERVER['HTTP_PHPIPAM_TOKEN']);
-					if ($token === False) {
-						$this->user_id = null;
-					}
-					else {
-						$user_id = $token;
-					}
-				}
-				else {
-					$this->user_id = null;
-				}
-			}
-			else {
-				try { $user_id = $this->Database->getObjectQuery("select * from `users` where `username` = ? limit 1", array($_SESSION['ipamusername'])); }
-				catch (Exception $e) { $this->Result->show("danger", _("Database error: ").$e->getMessage()); }
-			}
-			# save id
-			$this->user_id = $user_id->id;
-			# save user
-			$this->user = $user_id;
-		}
-	}
-
-
-
-
-
-
-	/**
-	 * write log function
-	 *
-	 * @access public
-	 * @param mixed $command
-	 * @param mixed $details (default: NULL)
-	 * @param int $severity (default: 0)
-	 * @param mixed $username (default: NULL)
-	 * @return void
-	 */
-	public function write ($command, $details = NULL, $severity = 0, $username = null) {
-		// save provided values
-		$this->log_command = $command;
-		$this->log_details = $details;
-		$this->log_severity = $severity;
-		$this->log_username	= $username===null ? $this->log_username : $username;
-
-		// validate
-		!is_null($this->log_command) ? : $this->Result->show("danger", _("Invalid log command"));
-
-		// execute
-		if ($this->log_type == "syslog")	{ $this->syslog_write (); }
-		elseif ($this->log_type == "both")	{ $this->database_write_log (); $this->syslog_write (); }
-		else								{ $this->database_write_log (); }
-	}
-
-
-
-
-
-
-	/**
-	 *	@syslog log methods
-	 *	--------------------------------
-	 */
-
-	/**
-	 * Generates new syslog message
-	 *
-	 *		# > syslogd example:
-	 *
-	 *		# phpipam syslog messages setup
-	 *		# user.alert;user.warning;user.debug            /var/log/messages
-	 *		auth.alert;auth.warning;auth.debug              /var/log/auth.log
-	 *
-	 *		# log all phpipam messages
-	 *		!phpipam
-	 *		*.*                                             /var/log/phpipam.log
-	 *		!*
-	 *
-	 *		# changelog
-	 *		!phpipam-changelog
-	 *		*.*                                             /var/log/phpipam-changelog.log
-	 *		!*
-	 *
-	 *		# > rysylog example
-	 *		auth.alert;auth.warning;auth.debug              /var/log/auth.log
-	 *		if $programname == 'phpipam' then /var/log/phpipam.log
-	 *		if $programname == 'phpipam-changelog' then /var/log/phpipam-changelog.log
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function syslog_write () {
-		# set facility
-		$this->syslog_set_facility ();
-		# set priority
-		$this->syslog_set_priority ();
-		# format details
-		$this->syslog_format_details ();
-
-		# add username if present
-		$username = $this->log_username!==null ? $this->log_username." | " : "";
-
-		# open syslog and write log
-		openlog('phpipam', LOG_NDELAY | LOG_PID, $this->syslog_facility);
-		syslog($this->syslog_priority, $_SERVER['REMOTE_ADDR']." | ".$username.$this->log_command." | ".$this->log_details);
-
-		# close
-		closelog();
-	}
-
-	/**
-	 * Sets facility for syslog
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function syslog_set_facility () {
-		# for windows we can only use LOG_USER
-		if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')		{ $facility = "LOG_USER"; }
-		else {
-			//login, logout
-			if (strpos($this->log_command, "login")>0 ||
-				strpos($this->log_command, "logged out")>0) { $facility = "LOG_AUTH"; }
-			else 											{ $facility = "LOG_USER"; }
-		}
-		# save
-		$this->syslog_facility = constant($facility);
-	}
-
-	/**
-	 * Sets priority
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function syslog_set_priority () {
-    	// init
-    	$priorities = array();
-		# definitions
-		$priorities[] = "LOG_EMERG";
-		$priorities[] = "LOG_ALERT";
-		$priorities[] = "LOG_CRIT";
-		$priorities[] = "LOG_ERR";
-		$priorities[] = "LOG_WARNING";
-		$priorities[] = "LOG_NOTICE";
-		$priorities[] = "LOG_INFO";
-		$priorities[] = "LOG_DEBUG";
-		# set
-		if ($this->log_severity == "2")		{ $priority = "LOG_ALERT"; }
-		elseif ($this->log_severity == "1")	{ $priority = "LOG_WARNING"; }
-		else								{ $priority = "LOG_DEBUG"; }
-		# set
-		$this->syslog_priority = constant($priority);
-	}
-
-	/**
-	 * Reformat syslog details
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function syslog_format_details () {
-		// replace <br>
-		$this->log_details = str_replace("<br>", ",",$this->log_details);
-		$this->log_details = str_replace("<hr>", ",",$this->log_details);
-		// replace spaces
-		$this->log_details = trim($this->log_details, ",");
-	}
-
-	/**
-	 * Writes changelog to syslog
-	 *
-	 * @access private
-	 * @param mixed $changelog
-	 * @return void
-	 */
-	private function syslog_write_changelog ($changelog) {
-		# fetch user id
-		$this->get_active_user_id ();
-		# set update id based on action
-		if ($this->object_action=="add")	{ $obj_id = $this->object_new['id']; }
-		else								{ $obj_id = $this->object_old['id']; }
-
-		# format
-		$changelog = str_replace("<br>", ",",$changelog);
-		$changelog = str_replace("<hr>", ",",$changelog);
-
-		# formulate
-		$log = array();
+    );
+
+    /**
+     * Database object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Database;
+
+    /**
+     * Result object
+     *
+     * @var mixed
+     * @access public
+     */
+    public $Result;
+
+    /**
+     * Addresses object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Addresses;
+
+    /**
+     * Sections object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Sections;
+
+    /**
+     * Subnets object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Subnets;
+
+    /**
+     * Tools object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Tools;
+
+    /**
+     * settings
+     *
+     * @var mixed
+     * @access public
+     */
+    public $settings;
+
+
+
+
+
+    /**
+     * __construct function.
+     *
+     * @access public
+     * @param Database_PDO $database
+     * @param mixed $settings (default: null)
+     */
+    public function __construct (Database_PDO $database, $settings = null) {
+        # Save database object
+        $this->Database = $database;
+        # Result
+        $this->Result = new Result ();
+        # User
+        $this->log_username = @$_SESSION['ipamusername'];
+
+        # settings
+        if ($settings===null || $settings===false) {
+            $this->get_settings(); #assigns $this->settings internally
+        }
+        else {
+            $this->settings = (object) $settings;
+        }
+        # debugging
+        $this->set_debugging();
+        # set log type
+        $this->set_log_type ();
+    }
+
+
+
+
+
+
+    /**
+     * Sets log type based on phpipam settings
+     *
+     *	available options:
+     *		Database (default)
+     *		syslog
+     *
+     * @access private
+     * @return void
+     */
+    private function set_log_type () {
+        # check settings
+        $this->log_type = $this->settings->log;
+    }
+
+    /**
+     * Gets id of active user
+     *
+     * @access private
+     * @return void
+     */
+    private function get_active_user_id () {
+        # cache
+        if ($this->user_id===null) {
+            # null
+            $user_id = null;
+            if (!isset($_SESSION['ipamusername'])) {
+                // when API calls subnet_create we get:
+                // Error: SQLSTATE[23000]: Integrity constraint violation: 1048 Column 'cuser' cannot be null
+                // so let's get a user_id
+                if (array_key_exists("HTTP_PHPIPAM_TOKEN", $_SERVER)) {
+                    $admin = new Admin($this->Database, False);
+                    $token = $admin->fetch_object ("users", "token", $_SERVER['HTTP_PHPIPAM_TOKEN']);
+                    if ($token === False) {
+                        $this->user_id = null;
+                    }
+                    else {
+                        $user_id = $token;
+                    }
+                }
+                else {
+                    $this->user_id = null;
+                }
+            }
+            else {
+                try { $user_id = $this->Database->getObjectQuery("select * from `users` where `username` = ? limit 1", array($_SESSION['ipamusername'])); }
+                catch (Exception $e) { $this->Result->show("danger", _("Database error: ").$e->getMessage()); }
+            }
+            # save id
+            $this->user_id = $user_id->id;
+            # save user
+            $this->user = $user_id;
+        }
+    }
+
+
+
+
+
+
+    /**
+     * write log function
+     *
+     * @access public
+     * @param mixed $command
+     * @param mixed $details (default: NULL)
+     * @param int $severity (default: 0)
+     * @param mixed $username (default: NULL)
+     * @return void
+     */
+    public function write ($command, $details = NULL, $severity = 0, $username = null) {
+        // save provided values
+        $this->log_command = $command;
+        $this->log_details = $details;
+        $this->log_severity = $severity;
+        $this->log_username	= $username===null ? $this->log_username : $username;
+
+        // validate
+        !is_null($this->log_command) ? : $this->Result->show("danger", _("Invalid log command"));
+
+        // execute
+        if ($this->log_type == "syslog")	{ $this->syslog_write (); }
+        elseif ($this->log_type == "both")	{ $this->database_write_log (); $this->syslog_write (); }
+        else								{ $this->database_write_log (); }
+    }
+
+
+
+
+
+
+    /**
+     *	@syslog log methods
+     *	--------------------------------
+     */
+
+    /**
+     * Generates new syslog message
+     *
+     *		# > syslogd example:
+     *
+     *		# phpipam syslog messages setup
+     *		# user.alert;user.warning;user.debug            /var/log/messages
+     *		auth.alert;auth.warning;auth.debug              /var/log/auth.log
+     *
+     *		# log all phpipam messages
+     *		!phpipam
+     *		*.*                                             /var/log/phpipam.log
+     *		!*
+     *
+     *		# changelog
+     *		!phpipam-changelog
+     *		*.*                                             /var/log/phpipam-changelog.log
+     *		!*
+     *
+     *		# > rysylog example
+     *		auth.alert;auth.warning;auth.debug              /var/log/auth.log
+     *		if $programname == 'phpipam' then /var/log/phpipam.log
+     *		if $programname == 'phpipam-changelog' then /var/log/phpipam-changelog.log
+     *
+     * @access private
+     * @return void
+     */
+    private function syslog_write () {
+        # set facility
+        $this->syslog_set_facility ();
+        # set priority
+        $this->syslog_set_priority ();
+        # format details
+        $this->syslog_format_details ();
+
+        # add username if present
+        $username = $this->log_username!==null ? $this->log_username." | " : "";
+
+        # open syslog and write log
+        openlog('phpipam', LOG_NDELAY | LOG_PID, $this->syslog_facility);
+        syslog($this->syslog_priority, $_SERVER['REMOTE_ADDR']." | ".$username.$this->log_command." | ".$this->log_details);
+
+        # close
+        closelog();
+    }
+
+    /**
+     * Sets facility for syslog
+     *
+     * @access private
+     * @return void
+     */
+    private function syslog_set_facility () {
+        # for windows we can only use LOG_USER
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')		{ $facility = "LOG_USER"; }
+        else {
+            //login, logout
+            if (strpos($this->log_command, "login")>0 ||
+                strpos($this->log_command, "logged out")>0) { $facility = "LOG_AUTH"; }
+            else 											{ $facility = "LOG_USER"; }
+        }
+        # save
+        $this->syslog_facility = constant($facility);
+    }
+
+    /**
+     * Sets priority
+     *
+     * @access private
+     * @return void
+     */
+    private function syslog_set_priority () {
+        // init
+        $priorities = array();
+        # definitions
+        $priorities[] = "LOG_EMERG";
+        $priorities[] = "LOG_ALERT";
+        $priorities[] = "LOG_CRIT";
+        $priorities[] = "LOG_ERR";
+        $priorities[] = "LOG_WARNING";
+        $priorities[] = "LOG_NOTICE";
+        $priorities[] = "LOG_INFO";
+        $priorities[] = "LOG_DEBUG";
+        # set
+        if ($this->log_severity == "2")		{ $priority = "LOG_ALERT"; }
+        elseif ($this->log_severity == "1")	{ $priority = "LOG_WARNING"; }
+        else								{ $priority = "LOG_DEBUG"; }
+        # set
+        $this->syslog_priority = constant($priority);
+    }
+
+    /**
+     * Reformat syslog details
+     *
+     * @access private
+     * @return void
+     */
+    private function syslog_format_details () {
+        // replace <br>
+        $this->log_details = str_replace("<br>", ",",$this->log_details);
+        $this->log_details = str_replace("<hr>", ",",$this->log_details);
+        // replace spaces
+        $this->log_details = trim($this->log_details, ",");
+    }
+
+    /**
+     * Writes changelog to syslog
+     *
+     * @access private
+     * @param mixed $changelog
+     * @return void
+     */
+    private function syslog_write_changelog ($changelog) {
+        # fetch user id
+        $this->get_active_user_id ();
+        # set update id based on action
+        if ($this->object_action=="add")	{ $obj_id = $this->object_new['id']; }
+        else								{ $obj_id = $this->object_old['id']; }
+
+        # format
+        $changelog = str_replace("<br>", ",",$changelog);
+        $changelog = str_replace("<hr>", ",",$changelog);
+
+        # formulate
+        $log = array();
         if(isset($changelog)) {
             if (is_array($changelog)) {
-        		foreach($changelog as $k=>$l) {
-    	    		$log[] = "$k: $l";
-    		    }
-		    }
-
-    		# open syslog and write log
-    		openlog('phpipam-changelog', LOG_NDELAY | LOG_PID, LOG_USER);
-    		syslog(LOG_DEBUG, "changelog | $this->log_username | $this->object_type | $obj_id | $this->object_action | ".date("Y-m-d H:i:s")." | ".implode(", ",$log));
-    		# close
-    		closelog();
-        }
-	}
-
-
-
-
-
-
-
-
-
-
-
-	/**
-	 *	@database log methods
-	 *	--------------------------------
-	 */
-
-	/**
-	 * Writes log to local database
-	 *
-	 * @access private
-	 * @return boolean
-	 */
-	private function database_write_log () {
-	    # set values
-	    $values = array(
-	    			"command"=>$this->log_command,
-	    			"severity"=>$this->log_severity,
-	    			"date"=>$this->Database->toDate(),
-	    			"username"=>$this->log_username,
-	    			"ipaddr"=> array_key_exists('HTTP_X_REAL_IP', $_SERVER) ? $_SERVER['HTTP_X_REAL_IP'] : @$_SERVER['REMOTE_ADDR'],
-	    			"details"=>$this->log_details
-					);
-		# null empty values
-		$values = $this->reformat_empty_array_fields($values, null);
-		$values = $this->strip_input_tags($values);
-
-		# execute
-		try { $this->Database->insertObject("logs", $values); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			return false;
-		}
-		# ok
-		return true;
-	}
-
-	/**
-	 * fetches logs for specified parameters
-	 *
-	 * @access public
-	 * @param mixed $logCount
-	 * @param mixed $direction (default: NULL)
-	 * @param mixed $lastId (default: NULL)
-	 * @param mixed $highestId (default: NULL)
-	 * @param mixed $informational (default: Off)
-	 * @param mixed $notice (default: Off)
-	 * @param mixed $warning (default: Off)
-	 * @return void
-	 */
-	public function fetch_logs ($logCount, $direction = NULL, $lastId = NULL, $highestId = NULL, $informational = "off", $notice = "off", $warning = "off") {
-
-    	# check for lastId - must be numeric
-    	if(!is_numeric($logCount))      { $this->Result->show("danger", "Invalid logcount value", true);	return false; }
-    	if($direction!==NULL) {
+                foreach($changelog as $k=>$l) {
+                    $log[] = "$k: $l";
+                }
+            }
+
+            # open syslog and write log
+            openlog('phpipam-changelog', LOG_NDELAY | LOG_PID, LOG_USER);
+            syslog(LOG_DEBUG, "changelog | $this->log_username | $this->object_type | $obj_id | $this->object_action | ".date("Y-m-d H:i:s")." | ".implode(", ",$log));
+            # close
+            closelog();
+        }
+    }
+
+
+
+
+
+
+
+
+
+
+
+    /**
+     *	@database log methods
+     *	--------------------------------
+     */
+
+    /**
+     * Writes log to local database
+     *
+     * @access private
+     * @return boolean
+     */
+    private function database_write_log () {
+        # set values
+        $values = array(
+                    "command"=>$this->log_command,
+                    "severity"=>$this->log_severity,
+                    "date"=>$this->Database->toDate(),
+                    "username"=>$this->log_username,
+                    "ipaddr"=> array_key_exists('HTTP_X_REAL_IP', $_SERVER) ? $_SERVER['HTTP_X_REAL_IP'] : @$_SERVER['REMOTE_ADDR'],
+                    "details"=>$this->log_details
+                    );
+        # null empty values
+        $values = $this->reformat_empty_array_fields($values, null);
+        $values = $this->strip_input_tags($values);
+
+        # execute
+        try { $this->Database->insertObject("logs", $values); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+            return false;
+        }
+        # ok
+        return true;
+    }
+
+    /**
+     * fetches logs for specified parameters
+     *
+     * @access public
+     * @param mixed $logCount
+     * @param mixed $direction (default: NULL)
+     * @param mixed $lastId (default: NULL)
+     * @param mixed $highestId (default: NULL)
+     * @param mixed $informational (default: Off)
+     * @param mixed $notice (default: Off)
+     * @param mixed $warning (default: Off)
+     * @return void
+     */
+    public function fetch_logs ($logCount, $direction = NULL, $lastId = NULL, $highestId = NULL, $informational = "off", $notice = "off", $warning = "off") {
+
+        # check for lastId - must be numeric
+        if(!is_numeric($logCount))      { $this->Result->show("danger", "Invalid logcount value", true);	return false; }
+        if($direction!==NULL) {
             if($direction!="next" && $direction!="prev" && $direction!="") {
                                         { $this->Result->show("danger", "Invalid direction", true);	return false; }
             }
-    	}
+        }
 
-		# query
-		$query = array();               // query
-		$query_severities = array();    // severities
-		$params = array();              // sql bind parameters
+        # query
+        $query = array();               // query
+        $query_severities = array();    // severities
+        $params = array();              // sql bind parameters
 
         $query[] = "select * from (";
-		$query[] = "select * from logs ";
-		$query[] = "where (";
-		// severities
-		if($informational=="on")
-		$query_severities[] = "`severity` = 0";
-		if($notice=="on")
-		$query_severities[] = "`severity` = 1";
-		if($warning=="on")
-		$query_severities[] = "`severity` = 2";
+        $query[] = "select * from logs ";
+        $query[] = "where (";
+        // severities
+        if($informational=="on")
+        $query_severities[] = "`severity` = 0";
+        if($notice=="on")
+        $query_severities[] = "`severity` = 1";
+        if($warning=="on")
+        $query_severities[] = "`severity` = 2";
         // join severities
         $query[] = implode(" or ", $query_severities);
         $query[] = ")";
 
-		// direction
-		if( ($direction=="next") && ($lastId!=$highestId) ) {
-			$query[] = "and `id` < :lastId";
-			$query[] = "order by `id` desc limit $logCount";
-			$params['lastId'] = $lastId;
-		}
-		elseif( $direction=="prev" && $lastId!=$highestId) {
-			$query[] = "and `id` > :lastId";
-			$query[] = "order by `id` asc limit $logCount";
-			$params['lastId'] = $lastId;
-		}
-		else {
-			$query[] = "order by `id` desc limit $logCount";
-		}
+        // direction
+        if( ($direction=="next") && ($lastId!=$highestId) ) {
+            $query[] = "and `id` < :lastId";
+            $query[] = "order by `id` desc limit $logCount";
+            $params['lastId'] = $lastId;
+        }
+        elseif( $direction=="prev" && $lastId!=$highestId) {
+            $query[] = "and `id` > :lastId";
+            $query[] = "order by `id` asc limit $logCount";
+            $params['lastId'] = $lastId;
+        }
+        else {
+            $query[] = "order by `id` desc limit $logCount";
+        }
         $query[] = ") as test ";
         $query[] = "order by `id` desc limit $logCount ;";
 
-	    # fetch
-	    try { $logs = $this->Database->getObjectsQuery(implode("\n", $query), $params); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
-
-	    # return results
-	    return $logs;
-	}
-
-	/**
-	 * Returns highest (last) log id
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function log_fetch_highest_id () {
-		# fetch
-	    try { $id = $this->Database->getObjectQuery("select id from logs order by id desc limit 1;"); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
-		# return result
-		return $id->id;
-	}
-
-
-
-
-
-
-
-
-
-
-	/**
-	 *	@changelog methods
-	 *	--------------------------------
-	 */
-
-	/**
-	 * Write new changelog to db or send to syslog
-	 *
-	 * @access public
-	 * @param string $object_type
-	 * @param string $action
-	 * @param string $result
-	 * @param array $old (default: array())
-	 * @param array $new (default: array())
-	 * @param bool $mail_changelog (default: true)
-	 * @return boolean|null
-	 */
-	public function write_changelog ($object_type, $action, $result, $old = array(), $new = array(), $mail_changelog = true) {
-		//set values
-		$this->object_type 	  = $object_type;
-		$this->object_action  = $action;
-		$this->object_result  = $result;
-		$this->mail_changelog = $mail_changelog;
-		//cast diff objects as array
-		$this->object_old = (array) $old;		// new object
-		$this->object_new = (array) $new;		// old object
-		// Save original unmodified values to construct URLs.
-		$this->object_orig = ($action == "add") ? $this->object_new : $this->object_old;
-
-		// validate - if object should write changelog or not
-		if ($this->changelog_validate_object () === false) {
-			return true;
-		}
-
-		// folder
-		if($this->object_type == "subnet") {
-			if ($this->object_old['isFolder'] || $this->object_new['isFolder']) {
-				$this->object_type = "folder";
-			}
-		}
-
-		// make sure we have settings
-		$this->get_settings ();
-
-		# default log
-		$log = array();
-
-		// check if syslog globally enabled and write log
-	    if($this->settings->enableChangelog==1) {
-		    # get user details and initialize required objects
-		    if (!is_object($this->Addresses)) $this->Addresses = new Addresses ($this->Database);
-		    if (!is_object($this->Subnets))   $this->Subnets   = new Subnets ($this->Database);
-		    if (!is_object($this->Sections))  $this->Sections  = new Sections ($this->Database);
-		    if (!is_object($this->Tools))     $this->Tools     = new Tools ($this->Database);
-
-		    # unset unneeded values and format
-		    $this->changelog_unset_unneeded_values ();
-
-		    # calculate diff
-		    if($action == "edit") {
-				$log = $this->changelog_calculate_edit_diff ();
-			}
-			elseif($action == "add") {
-				// format
-				$this->changelog_reformat_add_diff ();
-				//booleans
-				foreach ($this->object_new as $k=>$v) {
-					$this->object_new[$k] = $this->changelog_make_booleans ($k, $v);
-				}
-				$log['details'] = "<br>".$this->array_to_log ($this->object_new, true);
-			}
-			elseif($action == "delete") {
-				// format
-				$this->changelog_reformat_delete_diff ();
-				//booleans
-				foreach ($this->object_old as $k=>$v) {
-					$this->changelog_make_booleans ($k, $v);
-				}
-				$log['details'] = "<br>".$this->array_to_log ($this->object_old, true);
-			}
-			elseif($action == "truncate") {
-				$log['truncate'] = "Subnet truncated";
-			}
-			elseif($action == "resize") {
-				$log['resize'] = "Subnet Resized";
-				$log['mask'] = $this->object_old['mask']."/".$this->object_new['mask'];
-			}
-			elseif($action == "perm_change") {
-				$log = $this->changelog_format_permission_change ();
-			}
-
-			# if change happened write it!
-			if(is_array($log) && sizeof($log)>0) {
-				// reformat null
-				foreach ($log as $k=>$v) {
-					$log[$k] = str_replace(": <br>", ": / <br>", $v);
-				}
-				// execute
-				if ($this->log_type == "syslog")	{ $this->syslog_write_changelog ($log); }
-				elseif ($this->log_type == "both")	{ $this->changelog_write_to_db ($log); $this->syslog_write_changelog ($log); }
-				else								{ $this->changelog_write_to_db ($log); }
-			}
-		}
-		# not enabled
-		else {
-			return true;
-		}
-	}
-
-	/**
-	 * Writes changelog to database
-	 *
-	 * @access private
-	 * @param mixed $changelog
-	 * @return void
-	 */
-	private function changelog_write_to_db ($changelog) {
-		# log to array
-		$changelog = str_replace("<br>", "\r\n", $this->array_to_log ($changelog, true));
-		# fetch user id
-		$this->get_active_user_id ();
-
-		# null and from cli, set admin user
-		if ($this->user===null && php_sapi_name()=="cli") { $this->user_id = 1; }
+        # fetch
+        try { $logs = $this->Database->getObjectsQuery(implode("\n", $query), $params); }
+        catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
+
+        # return results
+        return $logs;
+    }
+
+    /**
+     * Returns highest (last) log id
+     *
+     * @access public
+     * @return void
+     */
+    public function log_fetch_highest_id () {
+        # fetch
+        try { $id = $this->Database->getObjectQuery("select id from logs order by id desc limit 1;"); }
+        catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
+        # return result
+        return $id->id;
+    }
+
+
+
+
+
+
+
+
+
+
+    /**
+     *	@changelog methods
+     *	--------------------------------
+     */
+
+    /**
+     * Write new changelog to db or send to syslog
+     *
+     * @access public
+     * @param string $object_type
+     * @param string $action
+     * @param string $result
+     * @param array $old (default: array())
+     * @param array $new (default: array())
+     * @param bool $mail_changelog (default: true)
+     * @return boolean|null
+     */
+    public function write_changelog ($object_type, $action, $result, $old = array(), $new = array(), $mail_changelog = true) {
+        //set values
+        $this->object_type 	  = $object_type;
+        $this->object_action  = $action;
+        $this->object_result  = $result;
+        $this->mail_changelog = $mail_changelog;
+        //cast diff objects as array
+        $this->object_old = (array) $old;		// new object
+        $this->object_new = (array) $new;		// old object
+        // Save original unmodified values to construct URLs.
+        $this->object_orig = ($action == "add") ? $this->object_new : $this->object_old;
+
+        // validate - if object should write changelog or not
+        if ($this->changelog_validate_object () === false) {
+            return true;
+        }
+
+        // folder
+        if($this->object_type == "subnet") {
+            if ($this->object_old['isFolder'] || $this->object_new['isFolder']) {
+                $this->object_type = "folder";
+            }
+        }
+
+        // make sure we have settings
+        $this->get_settings ();
+
+        # default log
+        $log = array();
+
+        // check if syslog globally enabled and write log
+        if($this->settings->enableChangelog==1) {
+            # get user details and initialize required objects
+            if (!is_object($this->Addresses)) $this->Addresses = new Addresses ($this->Database);
+            if (!is_object($this->Subnets))   $this->Subnets   = new Subnets ($this->Database);
+            if (!is_object($this->Sections))  $this->Sections  = new Sections ($this->Database);
+            if (!is_object($this->Tools))     $this->Tools     = new Tools ($this->Database);
+
+            # unset unneeded values and format
+            $this->changelog_unset_unneeded_values ();
+
+            # calculate diff
+            if($action == "edit") {
+                $log = $this->changelog_calculate_edit_diff ();
+            }
+            elseif($action == "add") {
+                // format
+                $this->changelog_reformat_add_diff ();
+                //booleans
+                foreach ($this->object_new as $k=>$v) {
+                    $this->object_new[$k] = $this->changelog_make_booleans ($k, $v);
+                }
+                $log['details'] = "<br>".$this->array_to_log ($this->object_new, true);
+            }
+            elseif($action == "delete") {
+                // format
+                $this->changelog_reformat_delete_diff ();
+                //booleans
+                foreach ($this->object_old as $k=>$v) {
+                    $this->changelog_make_booleans ($k, $v);
+                }
+                $log['details'] = "<br>".$this->array_to_log ($this->object_old, true);
+            }
+            elseif($action == "truncate") {
+                $log['truncate'] = "Subnet truncated";
+            }
+            elseif($action == "resize") {
+                $log['resize'] = "Subnet Resized";
+                $log['mask'] = $this->object_old['mask']."/".$this->object_new['mask'];
+            }
+            elseif($action == "perm_change") {
+                $log = $this->changelog_format_permission_change ();
+            }
+
+            # if change happened write it!
+            if(is_array($log) && sizeof($log)>0) {
+                // reformat null
+                foreach ($log as $k=>$v) {
+                    $log[$k] = str_replace(": <br>", ": / <br>", $v);
+                }
+                // execute
+                if ($this->log_type == "syslog")	{ $this->syslog_write_changelog ($log); }
+                elseif ($this->log_type == "both")	{ $this->changelog_write_to_db ($log); $this->syslog_write_changelog ($log); }
+                else								{ $this->changelog_write_to_db ($log); }
+            }
+        }
+        # not enabled
+        else {
+            return true;
+        }
+    }
+
+    /**
+     * Writes changelog to database
+     *
+     * @access private
+     * @param mixed $changelog
+     * @return void
+     */
+    private function changelog_write_to_db ($changelog) {
+        # log to array
+        $changelog = str_replace("<br>", "\r\n", $this->array_to_log ($changelog, true));
+        # fetch user id
+        $this->get_active_user_id ();
+
+        # null and from cli, set admin user
+        if ($this->user===null && php_sapi_name()=="cli") { $this->user_id = 1; }
 
         # if user is not specify dont write changelog
         if (!isset($this->user) || $this->user == false || $this->user == null) {
             return true;
         }
 
-		# set update id based on action
-		if ($this->object_action=="add")	{ $obj_id = $this->object_new['id']; }
-		else								{ $obj_id = $this->object_old['id']; }
-
-		# set object type
-		$object_type = $this->object_type=="folder" ? "subnet" : $this->object_type;
-
-		# if required values are missing dont save changelog
-		if(is_null($obj_id) || $obj_id=="NULL")	{ return false; }
-
-	    # set values
-	    $values = array(
-	    			"ctype"	 => $object_type,
-	    			"coid"	 => $obj_id,
-	    			"cuser"	 => $this->user_id,
-	    			"caction"=> $this->object_action,
-	    			"cresult"=> $this->object_result,
-	    			"cdate"	 => date("Y-m-d H:i:s"),
-	    			"cdiff"	 => $changelog
-					);
-		# null empty values
-		$values = $this->reformat_empty_array_fields ($values, null);
-
-		# execute
-		try { $this->Database->insertObject("changelog", $values); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			return false;
-		}
-		# mail
-		if ($this->mail_changelog && strlen($changelog)>0) {
-			$this->changelog_send_mail ($changelog);
-		}
-		# ok
-		return true;
-	}
-
-	/**
-	 * Checks if object should write changelog
-	 *
-	 * @access private
-	 * @return boolean
-	 */
-	private function changelog_validate_object () {
-		# set valid objects
-		$objects = array(
-						"ip_addr",
-						"subnet",
-						"folder",
-						"section"
-						);
-		# check
-		return in_array($this->object_type, $objects) ? true : false;
-	}
-
-	/**
-	 * Formats values on creation
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function changelog_reformat_add_diff () {
-		foreach ($this->object_new as $k=>$v) {
-			//tag change
-			if($k == 'state') 				{ $this->object_new[$k] = $this->changelog_format_tag_diff ($k, $v); }
-			//section change
-			elseif($k == 'sectionId') 		{ $this->object_new[$k] = $this->changelog_format_section_diff ($k, $v); }
-			//section change
-			elseif($k == 'section') 		{ $this->object_new[$k] = $this->changelog_format_section_diff ($k, $v); }
-			//master subnet change
-			elseif($k == "subnetId") 		{ $this->object_new[$k] = $this->changelog_format_master_subnet_diff ($k, $v); }
-			//master subnet change
-			elseif($k == "masterSubnetId") 	{ $this->object_new[$k] = $this->changelog_format_master_subnet_diff ($k, $v); }
-			//device change
-			elseif($k == 'switch') 			{ $this->object_new[$k] = $this->changelog_format_device_diff ($k, $v); }
-			//device change
-			elseif($k == 'device') 			{ $this->object_new[$k] = $this->changelog_format_device_diff ($k, $v); }
-			//vlan
-			elseif($k == 'vlanId') 			{ $this->object_new[$k] = $this->changelog_format_vlan_diff ($k, $v); }
-			//vrf
-			elseif($k == 'vrfId') 			{ $this->object_new[$k] = $this->changelog_format_vrf_diff ($k, $v); }
-			//location
-			elseif($k == 'location_item')   { $this->object_new[$k] = $this->changelog_format_location_diff ($k, $v); }
-			//location
-			elseif($k == 'location') 	    { $this->object_new[$k] = $this->changelog_format_location_diff ($k, $v); }
-			//master section change
-			elseif($k == 'masterSection') 	{ $this->object_new[$k] = $this->changelog_format_master_section_diff ($k, $v); }
-			//permission change
-			elseif($k == "permissions") 	{ $this->object_new[$k] = $this->changelog_format_permission_diff ($k, $v); }
-			// nameserver index
-			elseif($k == "nameserverId") 	{ $this->object_new[$k] = $this->changelog_format_ns_diff ($k, $v); }
-		}
-	}
-
-
-	/**
-	 * Formats values on delete
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function changelog_reformat_delete_diff () {
-		foreach ($this->object_old as $k=>$v) {
-			//tag change
-			if($k == 'state') 				{ $this->object_old[$k] = $this->changelog_format_tag_diff ($k, $v); }
-			//section change
-			elseif($k == 'section') 		{ $this->object_old[$k] = $this->changelog_format_section_diff ($k, $v); }
-			//section change
-			elseif($k == 'sectionId') 		{ $this->object_old[$k] = $this->changelog_format_section_diff ($k, $v); }
-			//subnet change
-			elseif($k == "subnetId") 		{ $this->object_old[$k] = $this->changelog_format_master_subnet_diff ($k, $v); }
-			//master subnet change
-			elseif($k == "masterSubnetId") 	{ $this->object_old[$k] = $this->changelog_format_master_subnet_diff ($k, $v); }
-			//device change
-			elseif($k == 'switch') 			{ $this->object_old[$k] = $this->changelog_format_device_diff ($k, $v); }
-			//device change
-			elseif($k == 'device') 			{ $this->object_old[$k] = $this->changelog_format_device_diff ($k, $v); }
-			//vlan
-			elseif($k == 'vlanId') 			{ $this->object_old[$k] = $this->changelog_format_vlan_diff ($k, $v); }
-			//vrf
-			elseif($k == 'vrfId') 			{ $this->object_old[$k] = $this->changelog_format_vrf_diff ($k, $v); }
-			//location
-			elseif($k == 'location_item') 	{ $this->object_old[$k] = $this->changelog_format_location_diff ($k, $v); }
-			//location
-			elseif($k == 'location') 	    { $this->object_old[$k] = $this->changelog_format_location_diff ($k, $v); }
-			//master section change
-			elseif($k == 'masterSection') 	{ $this->object_old[$k] = $this->changelog_format_master_section_diff ($k, $v); }
-			//permission change
-			elseif($k == "permissions") 	{ $this->object_old[$k] = $this->changelog_format_permission_diff ($k, $v); }
-			// nameserver index
-			elseif($k == "nameserverId") 	{ $this->object_old[$k] = $this->changelog_format_ns_diff ($k, $v); }
-		}
-	}
-
-	/**
-	 * Calculate possible chages on edit
-	 *
-	 * @access private
-	 * @return array
-	 */
-	private function changelog_calculate_edit_diff () {
-		//old object - checkboxes that are not present, set them as 0
-		foreach($this->object_old as $k=>$v) {
-			if(!isset($this->object_new[$k]) && $v=="1") {
-				$this->object_new[$k] = 0;
-			}
-		}
-		foreach ($this->object_new as $k=>$v) {
-			if(!isset($this->object_old[$k]) && $v=="1") {
-				$this->object_old[$k] = 0;
-			}
-		}
-		// ip address - old needs to be transformed to dotted format
-		$this->object_old['ip_addr'] = $this->Subnets->transform_address($this->object_old['ip_addr'], "dotted");
-		$this->object_new['ip_addr'] = $this->Subnets->transform_address($this->object_new['ip_addr'], "dotted");
-
-		// check each value
-		foreach($this->object_new as $k=>$v) {
-			//change
-			if($this->object_old[$k]!=$v && ($this->object_old[$k] != str_replace("\'", "'", $v)))	{
-				//empty
-				if(strlen(@$this->object_old[$k])==0)	{ $this->object_old[$k] = "NULL"; }
-				if(strlen(@$v)==0)						{ $v = "NULL"; }
-
-				//tag change
-				if($k == 'state') 				{ $v = $this->changelog_format_tag_diff ($k, $v); }
-				//section change
-				elseif($k == 'sectionIdNew') 	{ $v = $this->changelog_format_section_diff ($k, $v); }
-				//section change
-				elseif($k == 'sectionId') 		{ $v = $this->changelog_format_section_diff ($k, $v); }
-				//subnet change
-				elseif($k == "subnet") 			{ $v = $this->changelog_format_master_subnet_diff ($k, $v); }
-				//master subnet change
-				elseif($k == "masterSubnetId") 	{ $v = $this->changelog_format_master_subnet_diff ($k, $v); }
-				//device change
-				elseif($k == 'switch') 			{ $v = $this->changelog_format_device_diff ($k, $v); }
-				//device change
-				elseif($k == 'device') 			{ $v = $this->changelog_format_device_diff ($k, $v); }
-				//vlan
-				elseif($k == 'vlanId') 			{ $v = $this->changelog_format_vlan_diff ($k, $v); }
-				//vrf
-				elseif($k == 'vrfId') 			{ $v = $this->changelog_format_vrf_diff ($k, $v); }
-				//location
-				elseif($k == 'location_item') 	{ $v = $this->changelog_format_location_diff ($k, $v); }
-				//location
-				elseif($k == 'location') 	    { $v = $this->changelog_format_location_diff ($k, $v); }
-				//master section change
-				elseif($k == 'masterSection') 	{ $v = $this->changelog_format_master_section_diff ($k, $v); }
-				//permission change
-				elseif($k == "permissions") 	{ $v = $this->changelog_format_permission_diff ($k, $v); }
-				// nameserver index
-				elseif($k == "nameserverId") 	{ $v = $this->changelog_format_ns_diff ($k, $v); }
-				// make booleans
-				$v = $this->changelog_make_booleans ($k, $v);
-				//set log
-				if ($k!=="id")
-				$log["$k"] = $this->object_old[$k]." => $v";
-			}
-		}
-		// result
-		return $log;
-	}
-
-	/**
-	 * Removes unneeded values from changelog based on log type
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function changelog_unset_unneeded_values () {
-		# remove ip address fields
-		if($this->object_type == "ip_addr") {
-			unset(	$this->object_new['subnet'],
-					$this->object_new['type'],
-					$this->object_new['ip_addr_old'],
-					$this->object_new['nostrict'],
-					$this->object_new['start'],
-					$this->object_new['stop'],
-					$this->object_new['ip'],
-					$this->object_new['subnetvlan'],
-					$this->object_new['addressId']
-					);
-			unset(	$this->object_old['subnet'],
-					$this->object_old['type'],
-					$this->object_old['ip_addr_old'],
-					$this->object_old['nostrict'],
-					$this->object_old['start'],
-					$this->object_old['stop'],
-					$this->object_old['ip'],
-					$this->object_old['subnetvlan'],
-					$this->object_old['addressId']
-					);
+        # set update id based on action
+        if ($this->object_action=="add")	{ $obj_id = $this->object_new['id']; }
+        else								{ $obj_id = $this->object_old['id']; }
+
+        # set object type
+        $object_type = $this->object_type=="folder" ? "subnet" : $this->object_type;
+
+        # if required values are missing dont save changelog
+        if(is_null($obj_id) || $obj_id=="NULL")	{ return false; }
+
+        # set values
+        $values = array(
+                    "ctype"	 => $object_type,
+                    "coid"	 => $obj_id,
+                    "cuser"	 => $this->user_id,
+                    "caction"=> $this->object_action,
+                    "cresult"=> $this->object_result,
+                    "cdate"	 => date("Y-m-d H:i:s"),
+                    "cdiff"	 => $changelog
+                    );
+        # null empty values
+        $values = $this->reformat_empty_array_fields ($values, null);
+
+        # execute
+        try { $this->Database->insertObject("changelog", $values); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+            return false;
+        }
+        # mail
+        if ($this->mail_changelog && strlen($changelog)>0) {
+            $this->changelog_send_mail ($changelog);
+        }
+        # ok
+        return true;
+    }
+
+    /**
+     * Checks if object should write changelog
+     *
+     * @access private
+     * @return boolean
+     */
+    private function changelog_validate_object () {
+        # set valid objects
+        $objects = array(
+                        "ip_addr",
+                        "subnet",
+                        "folder",
+                        "section"
+                        );
+        # check
+        return in_array($this->object_type, $objects) ? true : false;
+    }
+
+    /**
+     * Formats values on creation
+     *
+     * @access private
+     * @return void
+     */
+    private function changelog_reformat_add_diff () {
+        foreach ($this->object_new as $k=>$v) {
+            //tag change
+            if($k == 'state') 				{ $this->object_new[$k] = $this->changelog_format_tag_diff ($k, $v); }
+            //section change
+            elseif($k == 'sectionId') 		{ $this->object_new[$k] = $this->changelog_format_section_diff ($k, $v); }
+            //section change
+            elseif($k == 'section') 		{ $this->object_new[$k] = $this->changelog_format_section_diff ($k, $v); }
+            //master subnet change
+            elseif($k == "subnetId") 		{ $this->object_new[$k] = $this->changelog_format_master_subnet_diff ($k, $v); }
+            //master subnet change
+            elseif($k == "masterSubnetId") 	{ $this->object_new[$k] = $this->changelog_format_master_subnet_diff ($k, $v); }
+            //device change
+            elseif($k == 'switch') 			{ $this->object_new[$k] = $this->changelog_format_device_diff ($k, $v); }
+            //device change
+            elseif($k == 'device') 			{ $this->object_new[$k] = $this->changelog_format_device_diff ($k, $v); }
+            //vlan
+            elseif($k == 'vlanId') 			{ $this->object_new[$k] = $this->changelog_format_vlan_diff ($k, $v); }
+            //vrf
+            elseif($k == 'vrfId') 			{ $this->object_new[$k] = $this->changelog_format_vrf_diff ($k, $v); }
+            //location
+            elseif($k == 'location_item')   { $this->object_new[$k] = $this->changelog_format_location_diff ($k, $v); }
+            //location
+            elseif($k == 'location') 	    { $this->object_new[$k] = $this->changelog_format_location_diff ($k, $v); }
+            //master section change
+            elseif($k == 'masterSection') 	{ $this->object_new[$k] = $this->changelog_format_master_section_diff ($k, $v); }
+            //permission change
+            elseif($k == "permissions") 	{ $this->object_new[$k] = $this->changelog_format_permission_diff ($k, $v); }
+            // nameserver index
+            elseif($k == "nameserverId") 	{ $this->object_new[$k] = $this->changelog_format_ns_diff ($k, $v); }
+        }
+    }
+
+
+    /**
+     * Formats values on delete
+     *
+     * @access private
+     * @return void
+     */
+    private function changelog_reformat_delete_diff () {
+        foreach ($this->object_old as $k=>$v) {
+            //tag change
+            if($k == 'state') 				{ $this->object_old[$k] = $this->changelog_format_tag_diff ($k, $v); }
+            //section change
+            elseif($k == 'section') 		{ $this->object_old[$k] = $this->changelog_format_section_diff ($k, $v); }
+            //section change
+            elseif($k == 'sectionId') 		{ $this->object_old[$k] = $this->changelog_format_section_diff ($k, $v); }
+            //subnet change
+            elseif($k == "subnetId") 		{ $this->object_old[$k] = $this->changelog_format_master_subnet_diff ($k, $v); }
+            //master subnet change
+            elseif($k == "masterSubnetId") 	{ $this->object_old[$k] = $this->changelog_format_master_subnet_diff ($k, $v); }
+            //device change
+            elseif($k == 'switch') 			{ $this->object_old[$k] = $this->changelog_format_device_diff ($k, $v); }
+            //device change
+            elseif($k == 'device') 			{ $this->object_old[$k] = $this->changelog_format_device_diff ($k, $v); }
+            //vlan
+            elseif($k == 'vlanId') 			{ $this->object_old[$k] = $this->changelog_format_vlan_diff ($k, $v); }
+            //vrf
+            elseif($k == 'vrfId') 			{ $this->object_old[$k] = $this->changelog_format_vrf_diff ($k, $v); }
+            //location
+            elseif($k == 'location_item') 	{ $this->object_old[$k] = $this->changelog_format_location_diff ($k, $v); }
+            //location
+            elseif($k == 'location') 	    { $this->object_old[$k] = $this->changelog_format_location_diff ($k, $v); }
+            //master section change
+            elseif($k == 'masterSection') 	{ $this->object_old[$k] = $this->changelog_format_master_section_diff ($k, $v); }
+            //permission change
+            elseif($k == "permissions") 	{ $this->object_old[$k] = $this->changelog_format_permission_diff ($k, $v); }
+            // nameserver index
+            elseif($k == "nameserverId") 	{ $this->object_old[$k] = $this->changelog_format_ns_diff ($k, $v); }
+        }
+    }
+
+    /**
+     * Calculate possible chages on edit
+     *
+     * @access private
+     * @return array
+     */
+    private function changelog_calculate_edit_diff () {
+        //old object - checkboxes that are not present, set them as 0
+        foreach($this->object_old as $k=>$v) {
+            if(!isset($this->object_new[$k]) && $v=="1") {
+                $this->object_new[$k] = 0;
+            }
+        }
+        foreach ($this->object_new as $k=>$v) {
+            if(!isset($this->object_old[$k]) && $v=="1") {
+                $this->object_old[$k] = 0;
+            }
+        }
+        // ip address - old needs to be transformed to dotted format
+        $this->object_old['ip_addr'] = $this->Subnets->transform_address($this->object_old['ip_addr'], "dotted");
+        $this->object_new['ip_addr'] = $this->Subnets->transform_address($this->object_new['ip_addr'], "dotted");
+
+        // check each value
+        foreach($this->object_new as $k=>$v) {
+            //change
+            if($this->object_old[$k]!=$v && ($this->object_old[$k] != str_replace("\'", "'", $v)))	{
+                //empty
+                if(strlen(@$this->object_old[$k])==0)	{ $this->object_old[$k] = "NULL"; }
+                if(strlen(@$v)==0)						{ $v = "NULL"; }
+
+                //tag change
+                if($k == 'state') 				{ $v = $this->changelog_format_tag_diff ($k, $v); }
+                //section change
+                elseif($k == 'sectionIdNew') 	{ $v = $this->changelog_format_section_diff ($k, $v); }
+                //section change
+                elseif($k == 'sectionId') 		{ $v = $this->changelog_format_section_diff ($k, $v); }
+                //subnet change
+                elseif($k == "subnet") 			{ $v = $this->changelog_format_master_subnet_diff ($k, $v); }
+                //master subnet change
+                elseif($k == "masterSubnetId") 	{ $v = $this->changelog_format_master_subnet_diff ($k, $v); }
+                //device change
+                elseif($k == 'switch') 			{ $v = $this->changelog_format_device_diff ($k, $v); }
+                //device change
+                elseif($k == 'device') 			{ $v = $this->changelog_format_device_diff ($k, $v); }
+                //vlan
+                elseif($k == 'vlanId') 			{ $v = $this->changelog_format_vlan_diff ($k, $v); }
+                //vrf
+                elseif($k == 'vrfId') 			{ $v = $this->changelog_format_vrf_diff ($k, $v); }
+                //location
+                elseif($k == 'location_item') 	{ $v = $this->changelog_format_location_diff ($k, $v); }
+                //location
+                elseif($k == 'location') 	    { $v = $this->changelog_format_location_diff ($k, $v); }
+                //master section change
+                elseif($k == 'masterSection') 	{ $v = $this->changelog_format_master_section_diff ($k, $v); }
+                //permission change
+                elseif($k == "permissions") 	{ $v = $this->changelog_format_permission_diff ($k, $v); }
+                // nameserver index
+                elseif($k == "nameserverId") 	{ $v = $this->changelog_format_ns_diff ($k, $v); }
+                // make booleans
+                $v = $this->changelog_make_booleans ($k, $v);
+                //set log
+                if ($k!=="id")
+                $log["$k"] = $this->object_old[$k]." => $v";
+            }
+        }
+        // result
+        return $log;
+    }
+
+    /**
+     * Removes unneeded values from changelog based on log type
+     *
+     * @access private
+     * @return void
+     */
+    private function changelog_unset_unneeded_values () {
+        # remove ip address fields
+        if($this->object_type == "ip_addr") {
+            unset(	$this->object_new['subnet'],
+                    $this->object_new['type'],
+                    $this->object_new['ip_addr_old'],
+                    $this->object_new['nostrict'],
+                    $this->object_new['start'],
+                    $this->object_new['stop'],
+                    $this->object_new['ip'],
+                    $this->object_new['subnetvlan'],
+                    $this->object_new['addressId']
+                    );
+            unset(	$this->object_old['subnet'],
+                    $this->object_old['type'],
+                    $this->object_old['ip_addr_old'],
+                    $this->object_old['nostrict'],
+                    $this->object_old['start'],
+                    $this->object_old['stop'],
+                    $this->object_old['ip'],
+                    $this->object_old['subnetvlan'],
+                    $this->object_old['addressId']
+                    );
             # remove mac
             if ($this->object_action=="add") {
                 unset ($this->object_new['mac_old'], $this->object_new['addressId']);
             }
-			# reformat ip
-			if (isset($this->object_old['ip_addr']))	{ $this->object_old['ip_addr'] = $this->Subnets->transform_address ($this->object_old['ip_addr'],"dotted"); }
-			if (isset($this->object_new['ip_addr']))	{ $this->object_new['ip_addr'] = $this->Subnets->transform_address ($this->object_new['ip_addr'],"dotted"); }
-
-		}
-		# remove subnet fields
-		elseif($this->object_type == "subnet" || $this->object_type == "folder")	{
-			// remove unneeded values
-			unset(	$this->object_new['subnetId'],
-					$this->object_new['vrfIdOld'],
-					$this->object_new['permissions'],
-					$this->object_new['state'],
-					$this->object_new['ip']
-				);
-			unset(	$this->object_old['subnetId'],
-					$this->object_old['vrfIdOld'],
-					$this->object_old['permissions'],
-					$this->object_old['state'],
-					$this->object_old['ip']
-				);
-
-			# folder
-			if($this->object_type == "folder") {
-				unset(
-					$this->object_new['linked_subnet'],
-					$this->object_new['firewallAddressObject'],
-					$this->object_new['vrfId'],
-					$this->object_new['allowRequests'],
-					$this->object_new['vlanId'],
-					$this->object_new['showName'],
-					$this->object_new['device'],
-					$this->object_new['pingSubnet'],
-					$this->object_new['discoverSubnet'],
-					$this->object_new['DNSrecursive'],
-					$this->object_new['DNSrecords'],
-					$this->object_new['nameserverId'],
-					$this->object_new['scanAgent'],
-					$this->object_new['isFull'],
-					$this->object_new['threshold'],
-					$this->object_new['lastScan'],
-					$this->object_new['lastDiscovery']
-				);
-				unset(
-					$this->object_old['linked_subnet'],
-					$this->object_old['firewallAddressObject'],
-					$this->object_old['vrfId'],
-					$this->object_old['allowRequests'],
-					$this->object_old['vlanId'],
-					$this->object_old['showName'],
-					$this->object_old['device'],
-					$this->object_old['pingSubnet'],
-					$this->object_old['discoverSubnet'],
-					$this->object_old['DNSrecursive'],
-					$this->object_old['DNSrecords'],
-					$this->object_old['nameserverId'],
-					$this->object_old['scanAgent'],
-					$this->object_old['isFull'],
-					$this->object_old['threshold'],
-					$this->object_old['lastScan'],
-					$this->object_old['lastDiscovery']
-				);
-			}
-
-			# if section does not change
-			if($this->object_new['sectionId']==$this->object_new['sectionIdNew']) {
-				unset(	$this->object_new['sectionIdNew']);
-			}
-			else {
-				$this->object_old['sectionIdNew'] = $this->object_old['sectionId'];
-			}
-
-			//transform subnet to IP address format
-			if(strlen($this->object_new['subnet'])>0) 	{ $this->object_new['subnet'] = $this->Subnets->transform_address ($this->object_new['subnet'], "dotted");}
-			if(strlen($this->object_old['subnet'])>0) 	{ $this->object_old['subnet'] = $this->Subnets->transform_address ($this->object_old['subnet'], "dotted");}
-
-			//remove subnet/mask for folders
-			if (@$this->object_new['isFolder']=="1")	{ unset($this->object_new['subnet'], $this->object_new['mask']); }
-			if (@$this->object_old['isFolder']=="1")	{ unset($this->object_old['subnet'], $this->object_old['mask']); }
-		}
-		# remove order fields
-		elseif($this->object_type == "section") {
-			unset($this->object_old['order']);
-		}
-
-		# common
-		unset($this->object_new['action']);
-		unset($this->object_new['editDate'], $this->object_old['editDate']);
-		unset($this->object_new['csrf_cookie']);
-	}
-
-	/**
-	 * Formats tag from int to nam.
-	 *
-	 * @access private
-	 * @param string $k
-	 * @param mixed $v
-	 * @return void
-	 */
-	private function changelog_format_tag_diff ($k, $v) {
-		$this->object_old[$k] = $this->Addresses->address_type_index_to_type($this->object_old[$k]);
-		$v 					  = $this->Addresses->address_type_index_to_type($v);
-		//result
-		return $v;
-	}
-
-	/**
-	 * Formats section if change
-	 *
-	 * @access private
-	 * @param string $k
-	 * @param mixed $v
-	 * @return void
-	 */
-	private function changelog_format_section_diff ($k, $v) {
-		//get old and new device
-		if($this->object_old[$k] != "NULL") {
-			$section = $this->Sections->fetch_section ("id", $this->object_old[$k]);
-			$this->object_old[$k] = $section->name." (id ".$section->id.")";
-		}
-		if($v != "NULL")	{
-			$section = $this->Sections->fetch_section ("id", $v);
-			$v = $section->name." (id ".$section->id.")";
-		}
-		//result
-		return $v;
-	}
-
-	/**
-	 * Formats master subnet if change
-	 *
-	 * @access private
-	 * @param string $k
-	 * @param mixed $v
-	 * @return string
-	 */
-	private function changelog_format_master_subnet_diff ($k, $v) {
-		//Old root or not
-		if($this->object_old[$k]==0){
-			$this->object_old[$k] = "Root";
-		}
-		else {
-			$subnet = $this->Subnets->fetch_subnet("id", $this->object_old[$k]);
-			$this->object_old[$k] = strlen($subnet->description)>0 ? $this->Subnets->transform_address($subnet->subnet, "dotted")."/$subnet->mask [$subnet->description]" : $this->Subnets->transform_address($subnet->subnet, "dotted")."/".$subnet->mask;
-			$this->object_old[$k] .= " (id ".$subnet->id.")";
-		}
-		//New root or not
-		if($v==0) {
-			$v = "Root";
-		}
-		else {
-			$subnet = $this->Subnets->fetch_subnet("id", $v);
-			$v  = strlen($subnet->description)>0 ? $this->Subnets->transform_address($subnet->subnet, "dotted")."/$subnet->mask [$subnet->description]" : $this->Subnets->transform_address($subnet->subnet, "dotted")."/".$subnet->mask;
-			$v .= " (id ".$subnet->id.")";
-		}
-		//result
-		return $v;
-	}
-
-	/**
-	 * Format device if change
-	 *
-	 * @access private
-	 * @param string $k
-	 * @param mixed $v
-	 * @return void
-	 */
-	private function changelog_format_device_diff ($k, $v) {
-		// old none
-		if($this->object_old[$k] == 0)	{
-			$this->object_old[$k] = "None";
-		}
-		elseif($this->object_old[$k] != "NULL") {
-			$dev = $this->Tools->fetch_object("devices", "id", $this->object_old[$k]);
-			$this->object_old[$k] = $dev->hostname;
-		}
-		// new none
-		if($v == 0)	{
-			$v = "None";
-		}
-		if($v != "NULL") {
-			$dev = $this->Tools->fetch_object("devices", "id", $v);
-			$v = $dev->hostname;
-		}
-		//result
-		return $v;
-	}
-
-	/**
-	 * Format vlan if change
-	 *
-	 * @access private
-	 * @param string $k
-	 * @param mixed $v
-	 * @return void
-	 */
-	private function changelog_format_vlan_diff ($k, $v) {
-		//old none
-		if($this->object_old[$k] == 0)	{
-			$this->object_old[$k] = "None";
-		}
-		elseif($this->object_old[$k] != "NULL") {
-			$vlan = $this->Tools->fetch_object("vlans", "vlanId", $this->object_old[$k]);
-			$this->object_old[$k] = $vlan->name." [$vlan->number]";
-		}
-		//new none
-		if($v == 0)	{
-			$v = "None";
-		}
-		elseif($v != "NULL") {
-			$vlan = $this->Tools->fetch_object("vlans", "vlanId", $v);
-			$v = $vlan->name." [$vlan->number]";
-		}
-		//result
-		return $v;
-	}
-
-	/**
-	 * Format vrf if change
-	 *
-	 * @access private
-	 * @param string $k
-	 * @param mixed $v
-	 * @return void
-	 */
-	private function changelog_format_vrf_diff ($k, $v) {
-		//old none
-		if($this->object_old[$k] == 0)	{
-			$this->object_old[$k] = "None";
-		}
-		elseif($this->object_old[$k] != "NULL") {
-			$vrf = $this->Tools->fetch_object("vrf", "vrfId", $this->object_old[$k]);
-			$this->object_old[$k] = $vrf->name." [$vrf->description]";
-		}
-		// new none
-		if($v == 0)	{
-			$v = "None";
-		}
-		elseif($v != "NULL") {
-			$vrf = $this->Tools->fetch_object("vrf", "vrfId", $v);
-			$v = $vrf->name." [$vrf->description]";
-		}
-		//result
-		return $v;
-	}
-
-	/**
-	 * Format NS if change
-	 *
-	 * @access private
-	 * @param string $k
-	 * @param mixed $v
-	 * @return void
-	 */
-	private function changelog_format_ns_diff ($k, $v) {
-		//old none
-		if($this->object_old[$k] == 0)	{
-			$this->object_old[$k] = "None";
-		}
-		elseif($this->object_old[$k] != "NULL") {
-			$ns = $this->Tools->fetch_object("nameservers", "id", $this->object_old[$k]);
-			$this->object_old[$k] = $ns->name." [".$ns->namesrv1."]";
-		}
-		// new none
-		if($v == 0)	{
-			$v = "None";
-		}
-		elseif($v != "NULL") {
-			$ns = $this->Tools->fetch_object("nameservers", "id", $v);
-			$v = $ns->name." [".$ns->namesrv1."]";
-		}
-		//result
-		return $v;
-	}
-
-	/**
-	 * Format location change
-	 *
-	 * @access private
-	 * @param string $k
-	 * @param mixed $v
-	 * @return void
-	 */
-	private function changelog_format_location_diff ($k, $v) {
-		//old none
-		if($this->object_old[$k] == 0)	{
-			$this->object_old[$k] = "None";
-		}
-		elseif($this->object_old[$k] != "NULL") {
-			$location = $this->Tools->fetch_object("locations", "id", $this->object_old[$k]);
-			$this->object_old[$k] = strlen($location->description>0) ? $location->name." [$location->description]" : $location->name;
-		}
-		// new none
-		if($v == 0)	{
-			$v = "None";
-		}
-		elseif($v != "NULL") {
-			$location = $this->Tools->fetch_object("locations", "id", $v);
-			$v = strlen($location->description>0) ? $location->name." [$location->description]" : $location->name;
-		}
-		//result
-		return $v;
-	}
-
-	/**
-	 * Format master section ifchange
-	 *
-	 * @access private
-	 * @param string $k
-	 * @param mixed $v
-	 * @return void
-	 */
-	private function changelog_format_master_section_diff ($k, $v) {
-		// old root
-		if($this->object_old[$k]==0) {
-			$this->object_old[$k] = "Root";
-		}
-		else {
-			$section = $this->Sections->fetch_section ("id", $this->object_old[$k]);
-			$this->object_old[$k] = $section->name;
-		}
-		// new root
-		if($v==0) {
-			$v = "Root";
-		}
-		else {
-			$section = $this->Sections->fetch_section ("id", $v);
-			$v = $section->name;
-		}
-		//result
-		return $v;
-	}
-
-	/**
-	 * Format permissions on change - EDIT
-	 *
-	 * @access private
-	 * @param string $k
-	 * @param mixed $v
-	 * @return string
-	 */
-	private function changelog_format_permission_diff ($k, $v) {
-		// get old and compare
-		$this->object_new['permissions'] = json_decode(str_replace("\\", "", $this->object_new['permissions']), true);		//Remove /
-		$this->object_old['permissions'] = json_decode(str_replace("\\", "", $this->object_old['permissions']), true);		//Remove /
-
-		# Get all groups:
-		$groups = (array) $this->Tools->fetch_all_objects("userGroups", "g_id");
-		// rekey
-		$out = array();
-		foreach($groups as $g) {
-			$out[$g->g_id]['g_name'] = $g->g_name;
-		}
-		$groups = $out;
-
-		// loop
-		$val = array();
-		if(is_array($this->object_new['permissions'])) {
-			foreach($this->object_new['permissions'] as $group_id=>$p) {
-				$val[] = $groups[$group_id]['g_name'] ." : ".$this->Subnets->parse_permissions($p);
-			}
-		}
-		$this->object_old[$k] = "";
-
-		//result
-		return implode(" ; ", $val);
-	}
-
-	/**
-	 * Make true / false from 0/1
-	 *
-	 * @access private
-	 * @param mixed $k
-	 * @param mixed $v
-	 * @return void
-	 */
-	private function changelog_make_booleans ($k, $v) {
-    	// init
-    	$keys = array();
-		// list of keys to be changed per object
-		$keys['section'] = array("strictMode", "showVLAN", "showVRF");
-		$keys['subnet']  = array("allowRequests", "showName", "pingSubnet", "discoverSubnet", "DNSrecursive", "DNSrecords", "isFull");
-		$keys['ip_addr'] = array("is_gateway", "excludePing", "PTRignore");
-
-		// check
-		if (array_key_exists($this->object_type, $keys)) {
-			if (in_array($k, $keys[$this->object_type])) {
-				if ($v=="0") { $this->object_old[$k] = "True";	return "False"; }
-				else 		 { $this->object_old[$k] = "False"; return "True"; }
-			}
-			else {
-				return $v;
-			}
-		}
-		else {
-			return $v;
-		}
-	}
-
-	/**
-	 * Format permission on permission only change
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function changelog_format_permission_change () {
-		# get old and compare
-		$this->object_new['permissions_change'] = json_decode(str_replace("\\", "", $this->object_new['permissions_change']), true);		//Remove /
-
-		# Get all groups:
-		$groups = (array) $this->Tools->fetch_all_objects("userGroups", "g_id");
-		// rekey
-		$out = array();
-		$log = array();
-
-		foreach($groups as $k=>$g) {
-			// save
-			$out[$g->g_id]['g_name'] = $g->g_name;
-		}
-		$groups = $out;
-
-		# reformat
-		if($this->object_new['permissions_change']!="null") {
-			$new_permissions = json_decode($this->object_new['permissions_change']);
-			foreach($new_permissions as $group_id=>$p) {
-				$log['Permissions'] .= "<br>". $groups[$group_id]['g_name'] ." : ".$this->Subnets->parse_permissions($p);
-			}
-		}
-		//result
-		return $log;
-	}
-
-	/**
-	 * fetches all changelogs
-	 *
-	 * @access public
-	 * @param bool $filter (default: false)
-	 * @param mixed $expr
-	 * @param int $limit (default: 100)
-	 * @return void
-	 */
-	public function fetch_all_changelogs ($filter = false, $expr, $limit = 100) {
-    	# limit check
-    	if(!is_numeric($limit))        { $this->Result->show("danger", "Invalid limit", true);	return false; }
-
-    	# begin query
-			$subquery_filter1 = ""; $subquery_filter2 ="";
-			if($filter) {
-				/* replace * with % */
-				if(substr($expr, 0, 1)=="*")								{ $expr[0] = "%"; }
-				if(substr($expr, -1, 1)=="*")								{ $expr = substr_replace($expr, "%", -1);  }
-				if(substr($expr, 0, 1)!="*" && substr($expr, -1, 1)!="*")	{ $expr = "%".$expr."%"; }
-
-				$subquery_filter1 = "AND (`coid`=:expr or `ctype`=:expr or `real_name` like :expr or `cdate` like :expr or `cdiff` like :expr or INET_NTOA(`ip_addr`) like :expr)";
-				$subquery_filter2 = "AND (`coid`=:expr or `ctype`=:expr or `real_name` like :expr or `cdate` like :expr or `cdiff` like :expr)";
-			}
-			$query = "
+            # reformat ip
+            if (isset($this->object_old['ip_addr']))	{ $this->object_old['ip_addr'] = $this->Subnets->transform_address ($this->object_old['ip_addr'],"dotted"); }
+            if (isset($this->object_new['ip_addr']))	{ $this->object_new['ip_addr'] = $this->Subnets->transform_address ($this->object_new['ip_addr'],"dotted"); }
+
+        }
+        # remove subnet fields
+        elseif($this->object_type == "subnet" || $this->object_type == "folder")	{
+            // remove unneeded values
+            unset(	$this->object_new['subnetId'],
+                    $this->object_new['vrfIdOld'],
+                    $this->object_new['permissions'],
+                    $this->object_new['state'],
+                    $this->object_new['ip']
+                );
+            unset(	$this->object_old['subnetId'],
+                    $this->object_old['vrfIdOld'],
+                    $this->object_old['permissions'],
+                    $this->object_old['state'],
+                    $this->object_old['ip']
+                );
+
+            # folder
+            if($this->object_type == "folder") {
+                unset(
+                    $this->object_new['linked_subnet'],
+                    $this->object_new['firewallAddressObject'],
+                    $this->object_new['vrfId'],
+                    $this->object_new['allowRequests'],
+                    $this->object_new['vlanId'],
+                    $this->object_new['showName'],
+                    $this->object_new['device'],
+                    $this->object_new['pingSubnet'],
+                    $this->object_new['discoverSubnet'],
+                    $this->object_new['DNSrecursive'],
+                    $this->object_new['DNSrecords'],
+                    $this->object_new['nameserverId'],
+                    $this->object_new['scanAgent'],
+                    $this->object_new['isFull'],
+                    $this->object_new['threshold'],
+                    $this->object_new['lastScan'],
+                    $this->object_new['lastDiscovery']
+                );
+                unset(
+                    $this->object_old['linked_subnet'],
+                    $this->object_old['firewallAddressObject'],
+                    $this->object_old['vrfId'],
+                    $this->object_old['allowRequests'],
+                    $this->object_old['vlanId'],
+                    $this->object_old['showName'],
+                    $this->object_old['device'],
+                    $this->object_old['pingSubnet'],
+                    $this->object_old['discoverSubnet'],
+                    $this->object_old['DNSrecursive'],
+                    $this->object_old['DNSrecords'],
+                    $this->object_old['nameserverId'],
+                    $this->object_old['scanAgent'],
+                    $this->object_old['isFull'],
+                    $this->object_old['threshold'],
+                    $this->object_old['lastScan'],
+                    $this->object_old['lastDiscovery']
+                );
+            }
+
+            # if section does not change
+            if($this->object_new['sectionId']==$this->object_new['sectionIdNew']) {
+                unset(	$this->object_new['sectionIdNew']);
+            }
+            else {
+                $this->object_old['sectionIdNew'] = $this->object_old['sectionId'];
+            }
+
+            //transform subnet to IP address format
+            if(strlen($this->object_new['subnet'])>0) 	{ $this->object_new['subnet'] = $this->Subnets->transform_address ($this->object_new['subnet'], "dotted");}
+            if(strlen($this->object_old['subnet'])>0) 	{ $this->object_old['subnet'] = $this->Subnets->transform_address ($this->object_old['subnet'], "dotted");}
+
+            //remove subnet/mask for folders
+            if (@$this->object_new['isFolder']=="1")	{ unset($this->object_new['subnet'], $this->object_new['mask']); }
+            if (@$this->object_old['isFolder']=="1")	{ unset($this->object_old['subnet'], $this->object_old['mask']); }
+        }
+        # remove order fields
+        elseif($this->object_type == "section") {
+            unset($this->object_old['order']);
+        }
+
+        # common
+        unset($this->object_new['action']);
+        unset($this->object_new['editDate'], $this->object_old['editDate']);
+        unset($this->object_new['csrf_cookie']);
+    }
+
+    /**
+     * Formats tag from int to nam.
+     *
+     * @access private
+     * @param string $k
+     * @param mixed $v
+     * @return void
+     */
+    private function changelog_format_tag_diff ($k, $v) {
+        $this->object_old[$k] = $this->Addresses->address_type_index_to_type($this->object_old[$k]);
+        $v 					  = $this->Addresses->address_type_index_to_type($v);
+        //result
+        return $v;
+    }
+
+    /**
+     * Formats section if change
+     *
+     * @access private
+     * @param string $k
+     * @param mixed $v
+     * @return void
+     */
+    private function changelog_format_section_diff ($k, $v) {
+        //get old and new device
+        if($this->object_old[$k] != "NULL") {
+            $section = $this->Sections->fetch_section ("id", $this->object_old[$k]);
+            $this->object_old[$k] = $section->name." (id ".$section->id.")";
+        }
+        if($v != "NULL")	{
+            $section = $this->Sections->fetch_section ("id", $v);
+            $v = $section->name." (id ".$section->id.")";
+        }
+        //result
+        return $v;
+    }
+
+    /**
+     * Formats master subnet if change
+     *
+     * @access private
+     * @param string $k
+     * @param mixed $v
+     * @return string
+     */
+    private function changelog_format_master_subnet_diff ($k, $v) {
+        //Old root or not
+        if($this->object_old[$k]==0){
+            $this->object_old[$k] = "Root";
+        }
+        else {
+            $subnet = $this->Subnets->fetch_subnet("id", $this->object_old[$k]);
+            $this->object_old[$k] = strlen($subnet->description)>0 ? $this->Subnets->transform_address($subnet->subnet, "dotted")."/$subnet->mask [$subnet->description]" : $this->Subnets->transform_address($subnet->subnet, "dotted")."/".$subnet->mask;
+            $this->object_old[$k] .= " (id ".$subnet->id.")";
+        }
+        //New root or not
+        if($v==0) {
+            $v = "Root";
+        }
+        else {
+            $subnet = $this->Subnets->fetch_subnet("id", $v);
+            $v  = strlen($subnet->description)>0 ? $this->Subnets->transform_address($subnet->subnet, "dotted")."/$subnet->mask [$subnet->description]" : $this->Subnets->transform_address($subnet->subnet, "dotted")."/".$subnet->mask;
+            $v .= " (id ".$subnet->id.")";
+        }
+        //result
+        return $v;
+    }
+
+    /**
+     * Format device if change
+     *
+     * @access private
+     * @param string $k
+     * @param mixed $v
+     * @return void
+     */
+    private function changelog_format_device_diff ($k, $v) {
+        // old none
+        if($this->object_old[$k] == 0)	{
+            $this->object_old[$k] = "None";
+        }
+        elseif($this->object_old[$k] != "NULL") {
+            $dev = $this->Tools->fetch_object("devices", "id", $this->object_old[$k]);
+            $this->object_old[$k] = $dev->hostname;
+        }
+        // new none
+        if($v == 0)	{
+            $v = "None";
+        }
+        if($v != "NULL") {
+            $dev = $this->Tools->fetch_object("devices", "id", $v);
+            $v = $dev->hostname;
+        }
+        //result
+        return $v;
+    }
+
+    /**
+     * Format vlan if change
+     *
+     * @access private
+     * @param string $k
+     * @param mixed $v
+     * @return void
+     */
+    private function changelog_format_vlan_diff ($k, $v) {
+        //old none
+        if($this->object_old[$k] == 0)	{
+            $this->object_old[$k] = "None";
+        }
+        elseif($this->object_old[$k] != "NULL") {
+            $vlan = $this->Tools->fetch_object("vlans", "vlanId", $this->object_old[$k]);
+            $this->object_old[$k] = $vlan->name." [$vlan->number]";
+        }
+        //new none
+        if($v == 0)	{
+            $v = "None";
+        }
+        elseif($v != "NULL") {
+            $vlan = $this->Tools->fetch_object("vlans", "vlanId", $v);
+            $v = $vlan->name." [$vlan->number]";
+        }
+        //result
+        return $v;
+    }
+
+    /**
+     * Format vrf if change
+     *
+     * @access private
+     * @param string $k
+     * @param mixed $v
+     * @return void
+     */
+    private function changelog_format_vrf_diff ($k, $v) {
+        //old none
+        if($this->object_old[$k] == 0)	{
+            $this->object_old[$k] = "None";
+        }
+        elseif($this->object_old[$k] != "NULL") {
+            $vrf = $this->Tools->fetch_object("vrf", "vrfId", $this->object_old[$k]);
+            $this->object_old[$k] = $vrf->name." [$vrf->description]";
+        }
+        // new none
+        if($v == 0)	{
+            $v = "None";
+        }
+        elseif($v != "NULL") {
+            $vrf = $this->Tools->fetch_object("vrf", "vrfId", $v);
+            $v = $vrf->name." [$vrf->description]";
+        }
+        //result
+        return $v;
+    }
+
+    /**
+     * Format NS if change
+     *
+     * @access private
+     * @param string $k
+     * @param mixed $v
+     * @return void
+     */
+    private function changelog_format_ns_diff ($k, $v) {
+        //old none
+        if($this->object_old[$k] == 0)	{
+            $this->object_old[$k] = "None";
+        }
+        elseif($this->object_old[$k] != "NULL") {
+            $ns = $this->Tools->fetch_object("nameservers", "id", $this->object_old[$k]);
+            $this->object_old[$k] = $ns->name." [".$ns->namesrv1."]";
+        }
+        // new none
+        if($v == 0)	{
+            $v = "None";
+        }
+        elseif($v != "NULL") {
+            $ns = $this->Tools->fetch_object("nameservers", "id", $v);
+            $v = $ns->name." [".$ns->namesrv1."]";
+        }
+        //result
+        return $v;
+    }
+
+    /**
+     * Format location change
+     *
+     * @access private
+     * @param string $k
+     * @param mixed $v
+     * @return void
+     */
+    private function changelog_format_location_diff ($k, $v) {
+        //old none
+        if($this->object_old[$k] == 0)	{
+            $this->object_old[$k] = "None";
+        }
+        elseif($this->object_old[$k] != "NULL") {
+            $location = $this->Tools->fetch_object("locations", "id", $this->object_old[$k]);
+            $this->object_old[$k] = strlen($location->description>0) ? $location->name." [$location->description]" : $location->name;
+        }
+        // new none
+        if($v == 0)	{
+            $v = "None";
+        }
+        elseif($v != "NULL") {
+            $location = $this->Tools->fetch_object("locations", "id", $v);
+            $v = strlen($location->description>0) ? $location->name." [$location->description]" : $location->name;
+        }
+        //result
+        return $v;
+    }
+
+    /**
+     * Format master section ifchange
+     *
+     * @access private
+     * @param string $k
+     * @param mixed $v
+     * @return void
+     */
+    private function changelog_format_master_section_diff ($k, $v) {
+        // old root
+        if($this->object_old[$k]==0) {
+            $this->object_old[$k] = "Root";
+        }
+        else {
+            $section = $this->Sections->fetch_section ("id", $this->object_old[$k]);
+            $this->object_old[$k] = $section->name;
+        }
+        // new root
+        if($v==0) {
+            $v = "Root";
+        }
+        else {
+            $section = $this->Sections->fetch_section ("id", $v);
+            $v = $section->name;
+        }
+        //result
+        return $v;
+    }
+
+    /**
+     * Format permissions on change - EDIT
+     *
+     * @access private
+     * @param string $k
+     * @param mixed $v
+     * @return string
+     */
+    private function changelog_format_permission_diff ($k, $v) {
+        // get old and compare
+        $this->object_new['permissions'] = json_decode(str_replace("\\", "", $this->object_new['permissions']), true);		//Remove /
+        $this->object_old['permissions'] = json_decode(str_replace("\\", "", $this->object_old['permissions']), true);		//Remove /
+
+        # Get all groups:
+        $groups = (array) $this->Tools->fetch_all_objects("userGroups", "g_id");
+        // rekey
+        $out = array();
+        foreach($groups as $g) {
+            $out[$g->g_id]['g_name'] = $g->g_name;
+        }
+        $groups = $out;
+
+        // loop
+        $val = array();
+        if(is_array($this->object_new['permissions'])) {
+            foreach($this->object_new['permissions'] as $group_id=>$p) {
+                $val[] = $groups[$group_id]['g_name'] ." : ".$this->Subnets->parse_permissions($p);
+            }
+        }
+        $this->object_old[$k] = "";
+
+        //result
+        return implode(" ; ", $val);
+    }
+
+    /**
+     * Make true / false from 0/1
+     *
+     * @access private
+     * @param mixed $k
+     * @param mixed $v
+     * @return void
+     */
+    private function changelog_make_booleans ($k, $v) {
+        // init
+        $keys = array();
+        // list of keys to be changed per object
+        $keys['section'] = array("strictMode", "showVLAN", "showVRF");
+        $keys['subnet']  = array("allowRequests", "showName", "pingSubnet", "discoverSubnet", "DNSrecursive", "DNSrecords", "isFull");
+        $keys['ip_addr'] = array("is_gateway", "excludePing", "PTRignore");
+
+        // check
+        if (array_key_exists($this->object_type, $keys)) {
+            if (in_array($k, $keys[$this->object_type])) {
+                if ($v=="0") { $this->object_old[$k] = "True";	return "False"; }
+                else 		 { $this->object_old[$k] = "False"; return "True"; }
+            }
+            else {
+                return $v;
+            }
+        }
+        else {
+            return $v;
+        }
+    }
+
+    /**
+     * Format permission on permission only change
+     *
+     * @access private
+     * @return void
+     */
+    private function changelog_format_permission_change () {
+        # get old and compare
+        $this->object_new['permissions_change'] = json_decode(str_replace("\\", "", $this->object_new['permissions_change']), true);		//Remove /
+
+        # Get all groups:
+        $groups = (array) $this->Tools->fetch_all_objects("userGroups", "g_id");
+        // rekey
+        $out = array();
+        $log = array();
+
+        foreach($groups as $k=>$g) {
+            // save
+            $out[$g->g_id]['g_name'] = $g->g_name;
+        }
+        $groups = $out;
+
+        # reformat
+        if($this->object_new['permissions_change']!="null") {
+            $new_permissions = json_decode($this->object_new['permissions_change']);
+            foreach($new_permissions as $group_id=>$p) {
+                $log['Permissions'] .= "<br>". $groups[$group_id]['g_name'] ." : ".$this->Subnets->parse_permissions($p);
+            }
+        }
+        //result
+        return $log;
+    }
+
+    /**
+     * fetches all changelogs
+     *
+     * @access public
+     * @param bool $filter (default: false)
+     * @param mixed $expr
+     * @param int $limit (default: 100)
+     * @return void
+     */
+    public function fetch_all_changelogs ($filter = false, $expr, $limit = 100) {
+        # limit check
+        if(!is_numeric($limit))        { $this->Result->show("danger", "Invalid limit", true);	return false; }
+
+        # begin query
+            $subquery_filter1 = ""; $subquery_filter2 ="";
+            if($filter) {
+                /* replace * with % */
+                if(substr($expr, 0, 1)=="*")								{ $expr[0] = "%"; }
+                if(substr($expr, -1, 1)=="*")								{ $expr = substr_replace($expr, "%", -1);  }
+                if(substr($expr, 0, 1)!="*" && substr($expr, -1, 1)!="*")	{ $expr = "%".$expr."%"; }
+
+                $subquery_filter1 = "AND (`coid`=:expr or `ctype`=:expr or `real_name` like :expr or `cdate` like :expr or `cdiff` like :expr or INET_NTOA(`ip_addr`) like :expr)";
+                $subquery_filter2 = "AND (`coid`=:expr or `ctype`=:expr or `real_name` like :expr or `cdate` like :expr or `cdiff` like :expr)";
+            }
+            $query = "
 					select * from (
 					(select `cid`, `coid`,`ctype`,`real_name`,`caction`,`cresult`,`cdate`,`cdiff`,`ip_addr`,'mask',`sectionId`,`subnetId`,`ipaddresses`.`id` as `tid`,`users`.`id` as `userid`,`subnets`.`isFolder` as `isFolder`,`subnets`.`description` as `sDescription`
 					FROM `changelog`
@@ -1564,27 +1564,27 @@ 
 
 					) as `ips` order by `cid` desc limit $limit;";
 
-	    # fetch
-	    try { $logs = $this->Database->getObjectsQuery($query, array("expr"=>$expr)); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
-
-	    # return results
-	    return $logs;
-	}
-
-	/**
-	 * fetches single changelog
-	 *
-	 * @access public
-	 * @param int $id
-	 * @return void
-	 */
-	public function fetch_changelog ($id) {
-    	# limit check
-    	if(!is_numeric($id))        { $this->Result->show("danger", "Invalid ID", true);	return false; }
-
-	    # set query
-	    $query = "select * from (
+        # fetch
+        try { $logs = $this->Database->getObjectsQuery($query, array("expr"=>$expr)); }
+        catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
+
+        # return results
+        return $logs;
+    }
+
+    /**
+     * fetches single changelog
+     *
+     * @access public
+     * @param int $id
+     * @return void
+     */
+    public function fetch_changelog ($id) {
+        # limit check
+        if(!is_numeric($id))        { $this->Result->show("danger", "Invalid ID", true);	return false; }
+
+        # set query
+        $query = "select * from (
 					select `cid`, `coid`,`ctype`,`real_name`,`caction`,`cresult`,`cdate`,`cdiff`,`ip_addr`,'mask',`sectionId`,`subnetId`,`ipaddresses`.`id` as `tid`,`users`.`id` as `userid`,`subnets`.`isFolder` as `isFolder`,`subnets`.`description` as `sDescription`
 					FROM `changelog`
 					LEFT JOIN `users` ON `users`.`id`=`changelog`.`cuser`
@@ -1608,330 +1608,330 @@ 
 					LEFT JOIN `sections` ON `sections`.`id`=`changelog`.`coid`
 					where `changelog`.`ctype` = 'section' and `changelog`.`cid` = :id
 				) as `ips`  order by `cid` desc limit 1;";
-	    # fetch
-	    try { $logs = $this->Database->getObjectQuery($query, array("id"=>$id)); }
-		catch (Exception $e) {
-			$this->Result->show("danger", $e->getMessage(), false);
-			return false;
-		}
-
-	    # return results
-	    return $logs;
-	}
-
-	/**
-	 * Fetches changelog for addresses in subnet for all slave subnets
-	 *
-	 * @access public
-	 * @param mixed $subnetId
-	 * @param int $limit (default: 50)
-	 * @return void
-	 */
-	public function fetch_subnet_addresses_changelog_recursive ($subnetId, $limit = 50) {
-	    # get all addresses ids
-	    $ips  = array();
-	    if (!is_object($this->Addresses)) $this->Addresses = new Addresses ($this->Database);
-	    $ips = $this->Addresses->fetch_subnet_addresses_recursive ($subnetId, false);
-
-	    # fetch changelog for IPs
-	    if(sizeof($ips) > 0) {
-		    # query
-		    $query  = "select
+        # fetch
+        try { $logs = $this->Database->getObjectQuery($query, array("id"=>$id)); }
+        catch (Exception $e) {
+            $this->Result->show("danger", $e->getMessage(), false);
+            return false;
+        }
+
+        # return results
+        return $logs;
+    }
+
+    /**
+     * Fetches changelog for addresses in subnet for all slave subnets
+     *
+     * @access public
+     * @param mixed $subnetId
+     * @param int $limit (default: 50)
+     * @return void
+     */
+    public function fetch_subnet_addresses_changelog_recursive ($subnetId, $limit = 50) {
+        # get all addresses ids
+        $ips  = array();
+        if (!is_object($this->Addresses)) $this->Addresses = new Addresses ($this->Database);
+        $ips = $this->Addresses->fetch_subnet_addresses_recursive ($subnetId, false);
+
+        # fetch changelog for IPs
+        if(sizeof($ips) > 0) {
+            # query
+            $query  = "select
 		    			`u`.`real_name`,`o`.`id`,`o`.`ip_addr`,`o`.`description`,`o`.`id`,`o`.`subnetId`,`c`.`caction`,`c`.`cresult`,`c`.`cdate`,`c`.`cdiff`
 						from `changelog` as `c`, `users` as `u`, `ipaddresses` as `o`
 						where `c`.`cuser` = `u`.`id` and `c`.`coid`=`o`.`id`
 						and (";
 
             $args = array();
-			foreach($ips as $ip) {
-			$query .= "`c`.`coid` = ? or ";
-			$args[] = $ip->id;
-			}
-			$query  = substr($query, 0, -3);
-			$query .= ") and `c`.`ctype` = 'ip_addr' order by `c`.`cid` desc limit $limit;";
-
-			# fetch
-		    try { $logs = $this->Database->getObjectsQuery($query, array_filter($args)); }
-			catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
-
-		    # return result
-		    return $logs;
-	    }
-		else {
-			return false;
-		}
-	}
-
-	/**
-	 * fetch changelog entries for specified type entry
-	 *
-	 * @param $object_type = 'ip_addr','subnet','section'
-	 * @param $coid = objectId from ctype definition
-	 * @param $long (default: false)
-	 * @param $limit (default: 50)
-	 */
-	public function fetch_changlog_entries ($object_type, $coid, $long = false, $limit = 50) {
-    	# limit check
-    	if(!is_numeric($limit))        { $this->Result->show("danger", "Invalid limit", true);	return false; }
-
-	    # change ctype to match table
-	    switch ($object_type) {
-    	    // ip
-    	    case "ip_addr":
-    	        $object_typeTable = "ipaddresses";
-    	        break;
-    	    // section
-     	    case "section":
-    	        $object_typeTable = "sections";
-    	        break;
-    	    // subnet
-     	    case "subnet":
-    	        $object_typeTable = "subnets";
-    	        break;
-    	    // error
-    	    default:
-    	        $this->Result->show("danger", "Invalid object type", true);	return false;
-	    }
-
-	    # query
-	    if($long) {
-		    $query = "select *
+            foreach($ips as $ip) {
+            $query .= "`c`.`coid` = ? or ";
+            $args[] = $ip->id;
+            }
+            $query  = substr($query, 0, -3);
+            $query .= ") and `c`.`ctype` = 'ip_addr' order by `c`.`cid` desc limit $limit;";
+
+            # fetch
+            try { $logs = $this->Database->getObjectsQuery($query, array_filter($args)); }
+            catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
+
+            # return result
+            return $logs;
+        }
+        else {
+            return false;
+        }
+    }
+
+    /**
+     * fetch changelog entries for specified type entry
+     *
+     * @param $object_type = 'ip_addr','subnet','section'
+     * @param $coid = objectId from ctype definition
+     * @param $long (default: false)
+     * @param $limit (default: 50)
+     */
+    public function fetch_changlog_entries ($object_type, $coid, $long = false, $limit = 50) {
+        # limit check
+        if(!is_numeric($limit))        { $this->Result->show("danger", "Invalid limit", true);	return false; }
+
+        # change ctype to match table
+        switch ($object_type) {
+            // ip
+            case "ip_addr":
+                $object_typeTable = "ipaddresses";
+                break;
+            // section
+                case "section":
+                $object_typeTable = "sections";
+                break;
+            // subnet
+                case "subnet":
+                $object_typeTable = "subnets";
+                break;
+            // error
+            default:
+                $this->Result->show("danger", "Invalid object type", true);	return false;
+        }
+
+        # query
+        if($long) {
+            $query = "select *
 						from `changelog` as `c`, `users` as `u`, `$object_typeTable` as `o`
 						where `c`.`cuser` = `u`.`id` and `c`.`coid`=`o`.`id`
 						and `c`.`coid` = ? and `c`.`ctype` = ? order by `c`.`cid` desc limit $limit;";
-		}
-		else {
-		    $query = "select *
+        }
+        else {
+            $query = "select *
 						from `changelog` as `c`, `users` as `u`
 						where `c`.`cuser` = `u`.`id`
 						and `c`.`coid` = ? and `c`.`ctype` = ? order by `c`.`cid` desc limit $limit;";
-		}
-	    # fetch
-	    try { $logs = $this->Database->getObjectsQuery($query, array($coid, $object_type)); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false); return false; }
-
-	    # return result
-	    return $logs;
-	}
-
-	/**
-	 * Fetches changelog entries for all slave subnets recursive
-	 *
-	 * @access public
-	 * @param mixed $subnetId
-	 * @param int $limit (default: 50)
-	 * @return void
-	 */
-	public function fetch_subnet_slaves_changlog_entries_recursive($subnetId, $limit = 50) {
-    	# limit check
-    	if(!is_numeric($limit))        { $this->Result->show("danger", "Invalid limit", true);	return false; }
-    	# $subnetId check
-    	if(!is_numeric($subnetId))     { $this->Result->show("danger", "Invalid subnet Id", true);	return false; }
-
-		# fetch all slave subnet ids
-		if (!is_object($this->Subnets)) $this->Subnets = new Subnets ($this->Database);
-		$this->Subnets->reset_subnet_slaves_recursive ();
-		$this->Subnets->fetch_subnet_slaves_recursive ($subnetId);
-		# remove master subnet ID
-		$key = array_search($subnetId, $this->Subnets->slaves);
-		unset($this->Subnets->slaves[$key]);
-		$this->Subnets->slaves = array_unique($this->Subnets->slaves);
-
-	    # if some slaves are present get changelog
-	    if(sizeof($this->Subnets->slaves) > 0) {
-		    # set query
-		    $query  = "select
+        }
+        # fetch
+        try { $logs = $this->Database->getObjectsQuery($query, array($coid, $object_type)); }
+        catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false); return false; }
+
+        # return result
+        return $logs;
+    }
+
+    /**
+     * Fetches changelog entries for all slave subnets recursive
+     *
+     * @access public
+     * @param mixed $subnetId
+     * @param int $limit (default: 50)
+     * @return void
+     */
+    public function fetch_subnet_slaves_changlog_entries_recursive($subnetId, $limit = 50) {
+        # limit check
+        if(!is_numeric($limit))        { $this->Result->show("danger", "Invalid limit", true);	return false; }
+        # $subnetId check
+        if(!is_numeric($subnetId))     { $this->Result->show("danger", "Invalid subnet Id", true);	return false; }
+
+        # fetch all slave subnet ids
+        if (!is_object($this->Subnets)) $this->Subnets = new Subnets ($this->Database);
+        $this->Subnets->reset_subnet_slaves_recursive ();
+        $this->Subnets->fetch_subnet_slaves_recursive ($subnetId);
+        # remove master subnet ID
+        $key = array_search($subnetId, $this->Subnets->slaves);
+        unset($this->Subnets->slaves[$key]);
+        $this->Subnets->slaves = array_unique($this->Subnets->slaves);
+
+        # if some slaves are present get changelog
+        if(sizeof($this->Subnets->slaves) > 0) {
+            # set query
+            $query  = "select
 						`u`.`real_name`,`o`.`sectionId`,`o`.`subnet`,`o`.`mask`,`o`.`isFolder`,`o`.`description`,`o`.`id`,`c`.`caction`,`c`.`cresult`,`c`.`cdate`,`c`.`cdiff`  from `changelog` as `c`, `users` as `u`, `subnets` as `o`
 						where `c`.`cuser` = `u`.`id` and `c`.`coid`=`o`.`id`
 						and (";
-			foreach($this->Subnets->slaves as $slaveId) {
-			if(!isset($args)) $args = array();
-			$query .= "`c`.`coid` = ? or ";
-			$args[] = $slaveId;							//set keys
-			}
-			$query  = substr($query, 0, -3);
-			$query .= ") and `c`.`ctype` = 'subnet' order by `c`.`cid` desc limit $limit;";
+            foreach($this->Subnets->slaves as $slaveId) {
+            if(!isset($args)) $args = array();
+            $query .= "`c`.`coid` = ? or ";
+            $args[] = $slaveId;							//set keys
+            }
+            $query  = substr($query, 0, -3);
+            $query .= ") and `c`.`ctype` = 'subnet' order by `c`.`cid` desc limit $limit;";
+
+            # fetch
+            try { $logs = $this->Database->getObjectsQuery($query, $args); }
+            catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
+
+            # return result
+            return $logs;
+        }
+        else {
+            return false;
+        }
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+    /**
+     *	@changelog mail methods
+     *	--------------------------------
+     */
+
+    /**
+     * Send mail on new changelog
+     *
+     * @access public
+     * @param string $changelog
+     * @return boolean
+     */
+    public function changelog_send_mail ($changelog) {
+
+        # initialize tools class
+        if (!is_object($this->Tools)) $this->Tools = new Tools ($this->Database);
+
+        # set object
+        $obj_details = $this->object_action == "add" ? $this->object_new : $this->object_old;
+
+        # change ip_addr
+        $this->object_type = str_replace("ip_addr", "address", $this->object_type);
+        $this->object_type = str_replace("ip_range", "address range", $this->object_type);
+
+        # folder
+        if ( $this->object_new['isFolder']=="1" || $this->object_old['isFolder']=="1" )	{ $this->object_type = "folder"; }
+
+        # set subject
+        $subject = "";
+        if($this->object_action == "add") 		{ $subject = ucwords($this->object_type)." create notification"; }
+        elseif($this->object_action == "edit") 	{ $subject = ucwords($this->object_type)." change notification"; }
+        elseif($this->object_action == "delete"){ $subject = ucwords($this->object_type)." delete notification"; }
+
+        // if address we need subnet details !
+        $address_subnet = array();
+        if ($this->object_type=="address")		{ $address_subnet = (array) $this->Tools->fetch_object("subnets", "id", $obj_details['subnetId']); }
+
+        # set object details
+        $details = "";
+        if ($this->object_type=="section") 		{ $details = "<a style='font-family:Helvetica, Verdana, Arial, sans-serif; font-size:12px;color:#a0ce4e;' href='".$this->createURL().create_link("subnets",$obj_details['id'])."'>".$obj_details['name'] . "(".$obj_details['description'].") - id ".$obj_details['id']."</a>"; }
+        elseif ($this->object_type=="subnet")	{ $details = "<a style='font-family:Helvetica, Verdana, Arial, sans-serif; font-size:12px;color:#a0ce4e;' href='".$this->createURL().create_link("subnets",$this->object_orig['sectionId'],$obj_details['id'])."'>".$this->Subnets->transform_address ($obj_details['subnet'], "dotted")."/".$obj_details['mask']." (".$obj_details['description'].") - id ".$obj_details['id']."</a>"; }
+        elseif ($this->object_type=="folder")	{ $details = "<a style='font-family:Helvetica, Verdana, Arial, sans-serif; font-size:12px;color:#a0ce4e;' href='".$this->createURL().create_link("folder",$this->object_orig['sectionId'],$obj_details['id'])."'>".$obj_details['description']." - id ".$obj_details['id']."</a>"; }
+        elseif ($this->object_type=="address")	{ $details = "<a style='font-family:Helvetica, Verdana, Arial, sans-serif; font-size:12px;color:#a0ce4e;' href='".$this->createURL().create_link("subnets",$this->object_orig['section'],$this->object_orig['subnetId'],"address-details",$this->object_orig['id'])."'>".$this->Subnets->transform_address ($obj_details['ip_addr'], "dotted")." ( hostname ".$obj_details['hostname'].", subnet: ".$this->Subnets->transform_address ($address_subnet['subnet'], "dotted")."/".$address_subnet['mask'].")- id ".$obj_details['id']."</a>"; }
+        elseif ($this->object_type=="address range")	{ $details = $changelog; }
+
+        # remove subnet sectionId
+        if($this->object_type=="subnet" && $this->object_action == "edit") {
+            unset($obj_details['sectionId']);
+        }
+
+        # set content
+        $content = array();
+        $content[] = "<div style='padding:10px;'>";
+        $content[] = "<table>";
+        $content[] = "<tr><td colspan='2'>$this->mail_font_style<strong>The following change was made on ipam:</strong></font></td></tr>";
+        $content[] = "<tr><td colspan='2'>&nbsp;</td></tr>";
+        $content[] = "<tr><td>$this->mail_font_style Object type:</font><td>$this->mail_font_style".ucwords($this->object_type)."</font></td></tr>";
+        $content[] = "<tr><td>$this->mail_font_style Object details:</font><td>$this->mail_font_style_href".$details."</font></td></tr>";
+        $content[] = "<tr><td>$this->mail_font_style User:</font><td>$this->mail_font_style".$this->user->real_name." (".$this->user->username.")"."</font></td></tr>";
+        $content[] = "<tr><td>$this->mail_font_style Action:</font><td>$this->mail_font_style".$this->object_action."</font></td></tr>";
+        $content[] = "<tr><td>$this->mail_font_style Date:</font><td>$this->mail_font_style".date("Y-m-d H:i:s")."</font></td></tr>";
+        $content[] = "<tr><td colspan='2'><hr style='height:0px;border-top:0px;border-bottom:1px solid #ddd;'></td></tr>";
+        $content[] = "<tr><td style='vertical-align:top;'>$this->mail_font_style Changes:</td>";
+        $content[] = "<td>";
+        // add changelog
+        $changelog = str_replace("\r\n", "<br>",$changelog);
+        $changelog = array_filter(explode("<br>", $changelog));
+        $content[] = "<table>";
+
+        foreach ($changelog as $c) {
+            // field
+            $field = explode(":", $c);
+            $value = explode("=>", $field[1]);
+
+            // format field
+            $field = trim(str_replace(array("[","]"), "", $field[0]));
+
+            // no isFolder
+            if($field!=="isFolder") {
+                if(is_array($this->changelog_keys[$this->object_type])) {
+                    if (array_key_exists($field, $this->changelog_keys[$this->object_type])) {
+                        $field = $this->changelog_keys[$this->object_type][$field];
+                    }
+                }
+
+                $content[] = "<tr>";
+                $content[] = "  <td>$this->mail_font_style<strong> $field</strong>: </font></td>";
+                $content[] = "  <td>$this->mail_font_style ".trim($value[0])." </font></td>";
+                if($this->object_action=="edit") {
+                $content[] = "  <td>$this->mail_font_style => </font></td>";
+                $content[] = "  <td>$this->mail_font_style ".trim($value[1])." </font></td>";
+                }
+                $content[] = "</tr>";
+            }
+        }
+        $content[] = "</table>";
+
+        $content[] = "</font></td></tr>";
+        $content[] = "</table>";
+        $content[] = "</div>";
+
+        # set plain content
+        $content_plain = array();
+        $content_plain[] = "Object type: ".$this->object_type;
+        $content_plain[] = "Object details: ".strip_tags($details);
+        $content_plain[] = "User: ".$this->user->real_name." (".$this->user->username.")";
+        $content_plain[] = "Action: ".$this->object_action;
+        $content_plain[] = "Date: ".date("Y-m-d H:i:s");
+        $content_plain[] = "\r\n--------------------\r\n";
+        $content_plain[] = implode("\r\n", (array) $changelog);
+
+
+        # get all admins and check who to end mail to
+        //subnets, addresses - send mail to normal users also
+        if ($this->object_type=="subnet" || $this->object_type=="address") {
+            if($this->object_type=="subnet") {
+                $recipients = $this->changelog_mail_get_recipients ($obj_details['id']);
+            }
+            else {
+                $recipients = $this->changelog_mail_get_recipients ($obj_details['subnetId']);
+            }
+        }
+        else {
+            $recipients = $this->changelog_mail_get_recipients (false);
+        }
+        if($recipients ===false) {
+            return true;
+        }
+
+        # try to send
+        try {
+            # fetch mailer settings
+            $mail_settings = $this->Tools->fetch_object("settingsMail", "id", 1);
+
+            # initialize mailer
+            $phpipam_mail = new phpipam_mail($this->settings, $mail_settings);
+
+            // set content
+            $content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
+            $content_plain = implode("\r\n",$content_plain);
+
+            $phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
+            foreach($recipients as $r) {
+            $phpipam_mail->Php_mailer->addAddress(addslashes(trim($r->email)));
+            }
+            $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) {
+            $this->Result->show("danger", "Mailer Error: ".$e->errorMessage(), true);
+        } catch (Exception $e) {
+            $this->Result->show("danger", "Mailer Error: ".$e->getMessage(), true);
+        }
 
-			# fetch
-		    try { $logs = $this->Database->getObjectsQuery($query, $args); }
-			catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
-
-		    # return result
-		    return $logs;
-	    }
-		else {
-			return false;
-		}
-	}
-
-
-
-
-
-
-
-
-
-
-
-
-	/**
-	 *	@changelog mail methods
-	 *	--------------------------------
-	 */
-
-	/**
-	 * Send mail on new changelog
-	 *
-	 * @access public
-	 * @param string $changelog
-	 * @return boolean
-	 */
-	public function changelog_send_mail ($changelog) {
-
-		# initialize tools class
-		if (!is_object($this->Tools)) $this->Tools = new Tools ($this->Database);
-
-		# set object
-		$obj_details = $this->object_action == "add" ? $this->object_new : $this->object_old;
-
-		# change ip_addr
-		$this->object_type = str_replace("ip_addr", "address", $this->object_type);
-		$this->object_type = str_replace("ip_range", "address range", $this->object_type);
-
-		# folder
-		if ( $this->object_new['isFolder']=="1" || $this->object_old['isFolder']=="1" )	{ $this->object_type = "folder"; }
-
-		# set subject
-		$subject = "";
-		if($this->object_action == "add") 		{ $subject = ucwords($this->object_type)." create notification"; }
-		elseif($this->object_action == "edit") 	{ $subject = ucwords($this->object_type)." change notification"; }
-		elseif($this->object_action == "delete"){ $subject = ucwords($this->object_type)." delete notification"; }
-
-		// if address we need subnet details !
-		$address_subnet = array();
-		if ($this->object_type=="address")		{ $address_subnet = (array) $this->Tools->fetch_object("subnets", "id", $obj_details['subnetId']); }
-
-		# set object details
-		$details = "";
-		if ($this->object_type=="section") 		{ $details = "<a style='font-family:Helvetica, Verdana, Arial, sans-serif; font-size:12px;color:#a0ce4e;' href='".$this->createURL().create_link("subnets",$obj_details['id'])."'>".$obj_details['name'] . "(".$obj_details['description'].") - id ".$obj_details['id']."</a>"; }
-		elseif ($this->object_type=="subnet")	{ $details = "<a style='font-family:Helvetica, Verdana, Arial, sans-serif; font-size:12px;color:#a0ce4e;' href='".$this->createURL().create_link("subnets",$this->object_orig['sectionId'],$obj_details['id'])."'>".$this->Subnets->transform_address ($obj_details['subnet'], "dotted")."/".$obj_details['mask']." (".$obj_details['description'].") - id ".$obj_details['id']."</a>"; }
-		elseif ($this->object_type=="folder")	{ $details = "<a style='font-family:Helvetica, Verdana, Arial, sans-serif; font-size:12px;color:#a0ce4e;' href='".$this->createURL().create_link("folder",$this->object_orig['sectionId'],$obj_details['id'])."'>".$obj_details['description']." - id ".$obj_details['id']."</a>"; }
-		elseif ($this->object_type=="address")	{ $details = "<a style='font-family:Helvetica, Verdana, Arial, sans-serif; font-size:12px;color:#a0ce4e;' href='".$this->createURL().create_link("subnets",$this->object_orig['section'],$this->object_orig['subnetId'],"address-details",$this->object_orig['id'])."'>".$this->Subnets->transform_address ($obj_details['ip_addr'], "dotted")." ( hostname ".$obj_details['hostname'].", subnet: ".$this->Subnets->transform_address ($address_subnet['subnet'], "dotted")."/".$address_subnet['mask'].")- id ".$obj_details['id']."</a>"; }
-		elseif ($this->object_type=="address range")	{ $details = $changelog; }
-
-		# remove subnet sectionId
-		if($this->object_type=="subnet" && $this->object_action == "edit") {
-			unset($obj_details['sectionId']);
-		}
-
-		# set content
-		$content = array();
-		$content[] = "<div style='padding:10px;'>";
-		$content[] = "<table>";
-		$content[] = "<tr><td colspan='2'>$this->mail_font_style<strong>The following change was made on ipam:</strong></font></td></tr>";
-		$content[] = "<tr><td colspan='2'>&nbsp;</td></tr>";
-		$content[] = "<tr><td>$this->mail_font_style Object type:</font><td>$this->mail_font_style".ucwords($this->object_type)."</font></td></tr>";
-		$content[] = "<tr><td>$this->mail_font_style Object details:</font><td>$this->mail_font_style_href".$details."</font></td></tr>";
-		$content[] = "<tr><td>$this->mail_font_style User:</font><td>$this->mail_font_style".$this->user->real_name." (".$this->user->username.")"."</font></td></tr>";
-		$content[] = "<tr><td>$this->mail_font_style Action:</font><td>$this->mail_font_style".$this->object_action."</font></td></tr>";
-		$content[] = "<tr><td>$this->mail_font_style Date:</font><td>$this->mail_font_style".date("Y-m-d H:i:s")."</font></td></tr>";
-		$content[] = "<tr><td colspan='2'><hr style='height:0px;border-top:0px;border-bottom:1px solid #ddd;'></td></tr>";
-		$content[] = "<tr><td style='vertical-align:top;'>$this->mail_font_style Changes:</td>";
-		$content[] = "<td>";
-		// add changelog
-		$changelog = str_replace("\r\n", "<br>",$changelog);
-		$changelog = array_filter(explode("<br>", $changelog));
-		$content[] = "<table>";
-
-		foreach ($changelog as $c) {
-    		// field
-    		$field = explode(":", $c);
-    	    $value = explode("=>", $field[1]);
-
-    	    // format field
-    	    $field = trim(str_replace(array("[","]"), "", $field[0]));
-
-    	    // no isFolder
-    	    if($field!=="isFolder") {
-	    	    if(is_array($this->changelog_keys[$this->object_type])) {
-	        	    if (array_key_exists($field, $this->changelog_keys[$this->object_type])) {
-	            	    $field = $this->changelog_keys[$this->object_type][$field];
-	        	    }
-	    	    }
-
-	    		$content[] = "<tr>";
-	    		$content[] = "  <td>$this->mail_font_style<strong> $field</strong>: </font></td>";
-	    		$content[] = "  <td>$this->mail_font_style ".trim($value[0])." </font></td>";
-	    		if($this->object_action=="edit") {
-	    		$content[] = "  <td>$this->mail_font_style => </font></td>";
-	    		$content[] = "  <td>$this->mail_font_style ".trim($value[1])." </font></td>";
-	    		}
-	    		$content[] = "</tr>";
-	    	}
-		}
-		$content[] = "</table>";
-
-		$content[] = "</font></td></tr>";
-		$content[] = "</table>";
-		$content[] = "</div>";
-
-		# set plain content
-		$content_plain = array();
-		$content_plain[] = "Object type: ".$this->object_type;
-		$content_plain[] = "Object details: ".strip_tags($details);
-		$content_plain[] = "User: ".$this->user->real_name." (".$this->user->username.")";
-		$content_plain[] = "Action: ".$this->object_action;
-		$content_plain[] = "Date: ".date("Y-m-d H:i:s");
-		$content_plain[] = "\r\n--------------------\r\n";
-		$content_plain[] = implode("\r\n", (array) $changelog);
-
-
-		# get all admins and check who to end mail to
-		//subnets, addresses - send mail to normal users also
-		if ($this->object_type=="subnet" || $this->object_type=="address") {
-    		if($this->object_type=="subnet") {
-        		$recipients = $this->changelog_mail_get_recipients ($obj_details['id']);
-    		}
-    		else {
-        		$recipients = $this->changelog_mail_get_recipients ($obj_details['subnetId']);
-    		}
-		}
-		else {
-    		$recipients = $this->changelog_mail_get_recipients (false);
-		}
-		if($recipients ===false) {
-    		return true;
-        }
-
-		# try to send
-		try {
-			# fetch mailer settings
-			$mail_settings = $this->Tools->fetch_object("settingsMail", "id", 1);
-
-			# initialize mailer
-			$phpipam_mail = new phpipam_mail($this->settings, $mail_settings);
-
-			// set content
-			$content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
-			$content_plain = implode("\r\n",$content_plain);
-
-			$phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
-			foreach($recipients as $r) {
-			$phpipam_mail->Php_mailer->addAddress(addslashes(trim($r->email)));
-			}
-			$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) {
-			$this->Result->show("danger", "Mailer Error: ".$e->errorMessage(), true);
-		} catch (Exception $e) {
-			$this->Result->show("danger", "Mailer Error: ".$e->getMessage(), true);
-		}
-
-		# ok
-		return true;
-	}
+        # ok
+        return true;
+    }
 }

Spacing +293 added lines, -293 removed lines

@@ -147,7 +147,7 @@ 
 	 * @var mixed
 	 * @access protected
 	 */
-	protected $log_username	= null;
+	protected $log_username = null;
 
 	/**
 	 * user details
@@ -165,7 +165,7 @@ 
 	 * @var mixed
 	 * @access protected
 	 */
-	protected $user_id	= null;
+	protected $user_id = null;
 
 	/**
 	 * Changelog keys for nicer display fo changelog
@@ -313,16 +313,16 @@ 
 	 * @param Database_PDO $database
 	 * @param mixed $settings (default: null)
 	 */
-	public function __construct (Database_PDO $database, $settings = null) {
+	public function __construct(Database_PDO $database, $settings = null) {
 		# Save database object
 		$this->Database = $database;
 		# Result
-		$this->Result = new Result ();
+		$this->Result = new Result();
 		# User
 		$this->log_username = @$_SESSION['ipamusername'];
 
 		# settings
-		if ($settings===null || $settings===false) {
+		if ($settings === null || $settings === false) {
 			$this->get_settings(); #assigns $this->settings internally
 		}
 		else {
@@ -331,7 +331,7 @@ 
 		# debugging
 		$this->set_debugging();
 		# set log type
-		$this->set_log_type ();
+		$this->set_log_type();
 	}
 
 
@@ -349,7 +349,7 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function set_log_type () {
+	private function set_log_type() {
 		# check settings
 		$this->log_type = $this->settings->log;
 	}
@@ -360,9 +360,9 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function get_active_user_id () {
+	private function get_active_user_id() {
 		# cache
-		if ($this->user_id===null) {
+		if ($this->user_id === null) {
 			# null
 			$user_id = null;
 			if (!isset($_SESSION['ipamusername'])) {
@@ -371,7 +371,7 @@ 
 				// so let's get a user_id
 				if (array_key_exists("HTTP_PHPIPAM_TOKEN", $_SERVER)) {
 					$admin = new Admin($this->Database, False);
-					$token = $admin->fetch_object ("users", "token", $_SERVER['HTTP_PHPIPAM_TOKEN']);
+					$token = $admin->fetch_object("users", "token", $_SERVER['HTTP_PHPIPAM_TOKEN']);
 					if ($token === False) {
 						$this->user_id = null;
 					}
@@ -409,20 +409,20 @@ 
 	 * @param mixed $username (default: NULL)
 	 * @return void
 	 */
-	public function write ($command, $details = NULL, $severity = 0, $username = null) {
+	public function write($command, $details = NULL, $severity = 0, $username = null) {
 		// save provided values
 		$this->log_command = $command;
 		$this->log_details = $details;
 		$this->log_severity = $severity;
-		$this->log_username	= $username===null ? $this->log_username : $username;
+		$this->log_username	= $username === null ? $this->log_username : $username;
 
 		// validate
-		!is_null($this->log_command) ? : $this->Result->show("danger", _("Invalid log command"));
+		!is_null($this->log_command) ?: $this->Result->show("danger", _("Invalid log command"));
 
 		// execute
-		if ($this->log_type == "syslog")	{ $this->syslog_write (); }
-		elseif ($this->log_type == "both")	{ $this->database_write_log (); $this->syslog_write (); }
-		else								{ $this->database_write_log (); }
+		if ($this->log_type == "syslog") { $this->syslog_write(); }
+		elseif ($this->log_type == "both") { $this->database_write_log(); $this->syslog_write(); }
+		else { $this->database_write_log(); }
 	}
 
 
@@ -462,16 +462,16 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function syslog_write () {
+	private function syslog_write() {
 		# set facility
-		$this->syslog_set_facility ();
+		$this->syslog_set_facility();
 		# set priority
-		$this->syslog_set_priority ();
+		$this->syslog_set_priority();
 		# format details
-		$this->syslog_format_details ();
+		$this->syslog_format_details();
 
 		# add username if present
-		$username = $this->log_username!==null ? $this->log_username." | " : "";
+		$username = $this->log_username !== null ? $this->log_username." | " : "";
 
 		# open syslog and write log
 		openlog('phpipam', LOG_NDELAY | LOG_PID, $this->syslog_facility);
@@ -487,14 +487,14 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function syslog_set_facility () {
+	private function syslog_set_facility() {
 		# for windows we can only use LOG_USER
-		if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')		{ $facility = "LOG_USER"; }
+		if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { $facility = "LOG_USER"; }
 		else {
 			//login, logout
-			if (strpos($this->log_command, "login")>0 ||
-				strpos($this->log_command, "logged out")>0) { $facility = "LOG_AUTH"; }
-			else 											{ $facility = "LOG_USER"; }
+			if (strpos($this->log_command, "login") > 0 ||
+				strpos($this->log_command, "logged out") > 0) { $facility = "LOG_AUTH"; }
+			else { $facility = "LOG_USER"; }
 		}
 		# save
 		$this->syslog_facility = constant($facility);
@@ -506,7 +506,7 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function syslog_set_priority () {
+	private function syslog_set_priority() {
     	// init
     	$priorities = array();
 		# definitions
@@ -519,9 +519,9 @@ 
 		$priorities[] = "LOG_INFO";
 		$priorities[] = "LOG_DEBUG";
 		# set
-		if ($this->log_severity == "2")		{ $priority = "LOG_ALERT"; }
-		elseif ($this->log_severity == "1")	{ $priority = "LOG_WARNING"; }
-		else								{ $priority = "LOG_DEBUG"; }
+		if ($this->log_severity == "2") { $priority = "LOG_ALERT"; }
+		elseif ($this->log_severity == "1") { $priority = "LOG_WARNING"; }
+		else { $priority = "LOG_DEBUG"; }
 		# set
 		$this->syslog_priority = constant($priority);
 	}
@@ -532,10 +532,10 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function syslog_format_details () {
+	private function syslog_format_details() {
 		// replace <br>
-		$this->log_details = str_replace("<br>", ",",$this->log_details);
-		$this->log_details = str_replace("<hr>", ",",$this->log_details);
+		$this->log_details = str_replace("<br>", ",", $this->log_details);
+		$this->log_details = str_replace("<hr>", ",", $this->log_details);
 		// replace spaces
 		$this->log_details = trim($this->log_details, ",");
 	}
@@ -547,29 +547,29 @@ 
 	 * @param mixed $changelog
 	 * @return void
 	 */
-	private function syslog_write_changelog ($changelog) {
+	private function syslog_write_changelog($changelog) {
 		# fetch user id
-		$this->get_active_user_id ();
+		$this->get_active_user_id();
 		# set update id based on action
-		if ($this->object_action=="add")	{ $obj_id = $this->object_new['id']; }
-		else								{ $obj_id = $this->object_old['id']; }
+		if ($this->object_action == "add") { $obj_id = $this->object_new['id']; }
+		else { $obj_id = $this->object_old['id']; }
 
 		# format
-		$changelog = str_replace("<br>", ",",$changelog);
-		$changelog = str_replace("<hr>", ",",$changelog);
+		$changelog = str_replace("<br>", ",", $changelog);
+		$changelog = str_replace("<hr>", ",", $changelog);
 
 		# formulate
 		$log = array();
-        if(isset($changelog)) {
+        if (isset($changelog)) {
             if (is_array($changelog)) {
-        		foreach($changelog as $k=>$l) {
+        		foreach ($changelog as $k=>$l) {
     	    		$log[] = "$k: $l";
     		    }
 		    }
 
     		# open syslog and write log
     		openlog('phpipam-changelog', LOG_NDELAY | LOG_PID, LOG_USER);
-    		syslog(LOG_DEBUG, "changelog | $this->log_username | $this->object_type | $obj_id | $this->object_action | ".date("Y-m-d H:i:s")." | ".implode(", ",$log));
+    		syslog(LOG_DEBUG, "changelog | $this->log_username | $this->object_type | $obj_id | $this->object_action | ".date("Y-m-d H:i:s")." | ".implode(", ", $log));
     		# close
     		closelog();
         }
@@ -596,7 +596,7 @@ 
 	 * @access private
 	 * @return boolean
 	 */
-	private function database_write_log () {
+	private function database_write_log() {
 	    # set values
 	    $values = array(
 	    			"command"=>$this->log_command,
@@ -633,42 +633,42 @@ 
 	 * @param mixed $warning (default: Off)
 	 * @return void
 	 */
-	public function fetch_logs ($logCount, $direction = NULL, $lastId = NULL, $highestId = NULL, $informational = "off", $notice = "off", $warning = "off") {
+	public function fetch_logs($logCount, $direction = NULL, $lastId = NULL, $highestId = NULL, $informational = "off", $notice = "off", $warning = "off") {
 
     	# check for lastId - must be numeric
-    	if(!is_numeric($logCount))      { $this->Result->show("danger", "Invalid logcount value", true);	return false; }
-    	if($direction!==NULL) {
-            if($direction!="next" && $direction!="prev" && $direction!="") {
-                                        { $this->Result->show("danger", "Invalid direction", true);	return false; }
+    	if (!is_numeric($logCount)) { $this->Result->show("danger", "Invalid logcount value", true); return false; }
+    	if ($direction !== NULL) {
+            if ($direction != "next" && $direction != "prev" && $direction != "") {
+                                        { $this->Result->show("danger", "Invalid direction", true); return false; }
             }
     	}
 
 		# query
-		$query = array();               // query
-		$query_severities = array();    // severities
-		$params = array();              // sql bind parameters
+		$query = array(); // query
+		$query_severities = array(); // severities
+		$params = array(); // sql bind parameters
 
         $query[] = "select * from (";
 		$query[] = "select * from logs ";
 		$query[] = "where (";
 		// severities
-		if($informational=="on")
+		if ($informational == "on")
 		$query_severities[] = "`severity` = 0";
-		if($notice=="on")
+		if ($notice == "on")
 		$query_severities[] = "`severity` = 1";
-		if($warning=="on")
+		if ($warning == "on")
 		$query_severities[] = "`severity` = 2";
         // join severities
         $query[] = implode(" or ", $query_severities);
         $query[] = ")";
 
 		// direction
-		if( ($direction=="next") && ($lastId!=$highestId) ) {
+		if (($direction == "next") && ($lastId != $highestId)) {
 			$query[] = "and `id` < :lastId";
 			$query[] = "order by `id` desc limit $logCount";
 			$params['lastId'] = $lastId;
 		}
-		elseif( $direction=="prev" && $lastId!=$highestId) {
+		elseif ($direction == "prev" && $lastId != $highestId) {
 			$query[] = "and `id` > :lastId";
 			$query[] = "order by `id` asc limit $logCount";
 			$params['lastId'] = $lastId;
@@ -681,7 +681,7 @@ 
 
 	    # fetch
 	    try { $logs = $this->Database->getObjectsQuery(implode("\n", $query), $params); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
+		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false); return false; }
 
 	    # return results
 	    return $logs;
@@ -693,10 +693,10 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function log_fetch_highest_id () {
+	public function log_fetch_highest_id() {
 		# fetch
 	    try { $id = $this->Database->getObjectQuery("select id from logs order by id desc limit 1;"); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
+		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false); return false; }
 		# return result
 		return $id->id;
 	}
@@ -727,90 +727,90 @@ 
 	 * @param bool $mail_changelog (default: true)
 	 * @return boolean|null
 	 */
-	public function write_changelog ($object_type, $action, $result, $old = array(), $new = array(), $mail_changelog = true) {
+	public function write_changelog($object_type, $action, $result, $old = array(), $new = array(), $mail_changelog = true) {
 		//set values
 		$this->object_type 	  = $object_type;
 		$this->object_action  = $action;
 		$this->object_result  = $result;
 		$this->mail_changelog = $mail_changelog;
 		//cast diff objects as array
-		$this->object_old = (array) $old;		// new object
-		$this->object_new = (array) $new;		// old object
+		$this->object_old = (array) $old; // new object
+		$this->object_new = (array) $new; // old object
 		// Save original unmodified values to construct URLs.
 		$this->object_orig = ($action == "add") ? $this->object_new : $this->object_old;
 
 		// validate - if object should write changelog or not
-		if ($this->changelog_validate_object () === false) {
+		if ($this->changelog_validate_object() === false) {
 			return true;
 		}
 
 		// folder
-		if($this->object_type == "subnet") {
+		if ($this->object_type == "subnet") {
 			if ($this->object_old['isFolder'] || $this->object_new['isFolder']) {
 				$this->object_type = "folder";
 			}
 		}
 
 		// make sure we have settings
-		$this->get_settings ();
+		$this->get_settings();
 
 		# default log
 		$log = array();
 
 		// check if syslog globally enabled and write log
-	    if($this->settings->enableChangelog==1) {
+	    if ($this->settings->enableChangelog == 1) {
 		    # get user details and initialize required objects
-		    if (!is_object($this->Addresses)) $this->Addresses = new Addresses ($this->Database);
-		    if (!is_object($this->Subnets))   $this->Subnets   = new Subnets ($this->Database);
-		    if (!is_object($this->Sections))  $this->Sections  = new Sections ($this->Database);
-		    if (!is_object($this->Tools))     $this->Tools     = new Tools ($this->Database);
+		    if (!is_object($this->Addresses)) $this->Addresses = new Addresses($this->Database);
+		    if (!is_object($this->Subnets))   $this->Subnets   = new Subnets($this->Database);
+		    if (!is_object($this->Sections))  $this->Sections  = new Sections($this->Database);
+		    if (!is_object($this->Tools))     $this->Tools     = new Tools($this->Database);
 
 		    # unset unneeded values and format
-		    $this->changelog_unset_unneeded_values ();
+		    $this->changelog_unset_unneeded_values();
 
 		    # calculate diff
-		    if($action == "edit") {
-				$log = $this->changelog_calculate_edit_diff ();
+		    if ($action == "edit") {
+				$log = $this->changelog_calculate_edit_diff();
 			}
-			elseif($action == "add") {
+			elseif ($action == "add") {
 				// format
-				$this->changelog_reformat_add_diff ();
+				$this->changelog_reformat_add_diff();
 				//booleans
 				foreach ($this->object_new as $k=>$v) {
-					$this->object_new[$k] = $this->changelog_make_booleans ($k, $v);
+					$this->object_new[$k] = $this->changelog_make_booleans($k, $v);
 				}
-				$log['details'] = "<br>".$this->array_to_log ($this->object_new, true);
+				$log['details'] = "<br>".$this->array_to_log($this->object_new, true);
 			}
-			elseif($action == "delete") {
+			elseif ($action == "delete") {
 				// format
-				$this->changelog_reformat_delete_diff ();
+				$this->changelog_reformat_delete_diff();
 				//booleans
 				foreach ($this->object_old as $k=>$v) {
-					$this->changelog_make_booleans ($k, $v);
+					$this->changelog_make_booleans($k, $v);
 				}
-				$log['details'] = "<br>".$this->array_to_log ($this->object_old, true);
+				$log['details'] = "<br>".$this->array_to_log($this->object_old, true);
 			}
-			elseif($action == "truncate") {
+			elseif ($action == "truncate") {
 				$log['truncate'] = "Subnet truncated";
 			}
-			elseif($action == "resize") {
+			elseif ($action == "resize") {
 				$log['resize'] = "Subnet Resized";
 				$log['mask'] = $this->object_old['mask']."/".$this->object_new['mask'];
 			}
-			elseif($action == "perm_change") {
-				$log = $this->changelog_format_permission_change ();
+			elseif ($action == "perm_change") {
+				$log = $this->changelog_format_permission_change();
 			}
 
 			# if change happened write it!
-			if(is_array($log) && sizeof($log)>0) {
+			if (is_array($log) && sizeof($log) > 0) {
 				// reformat null
 				foreach ($log as $k=>$v) {
 					$log[$k] = str_replace(": <br>", ": / <br>", $v);
 				}
 				// execute
-				if ($this->log_type == "syslog")	{ $this->syslog_write_changelog ($log); }
-				elseif ($this->log_type == "both")	{ $this->changelog_write_to_db ($log); $this->syslog_write_changelog ($log); }
-				else								{ $this->changelog_write_to_db ($log); }
+				if ($this->log_type == "syslog") { $this->syslog_write_changelog($log); }
+				elseif ($this->log_type == "both") { $this->changelog_write_to_db($log); $this->syslog_write_changelog($log); }
+				else { $this->changelog_write_to_db($log); }
 			}
 		}
 		# not enabled
@@ -826,14 +826,14 @@ 
 	 * @param mixed $changelog
 	 * @return void
 	 */
-	private function changelog_write_to_db ($changelog) {
+	private function changelog_write_to_db($changelog) {
 		# log to array
-		$changelog = str_replace("<br>", "\r\n", $this->array_to_log ($changelog, true));
+		$changelog = str_replace("<br>", "\r\n", $this->array_to_log($changelog, true));
 		# fetch user id
-		$this->get_active_user_id ();
+		$this->get_active_user_id();
 
 		# null and from cli, set admin user
-		if ($this->user===null && php_sapi_name()=="cli") { $this->user_id = 1; }
+		if ($this->user === null && php_sapi_name() == "cli") { $this->user_id = 1; }
 
         # if user is not specify dont write changelog
         if (!isset($this->user) || $this->user == false || $this->user == null) {
@@ -841,14 +841,14 @@ 
         }
 
 		# set update id based on action
-		if ($this->object_action=="add")	{ $obj_id = $this->object_new['id']; }
-		else								{ $obj_id = $this->object_old['id']; }
+		if ($this->object_action == "add") { $obj_id = $this->object_new['id']; }
+		else { $obj_id = $this->object_old['id']; }
 
 		# set object type
-		$object_type = $this->object_type=="folder" ? "subnet" : $this->object_type;
+		$object_type = $this->object_type == "folder" ? "subnet" : $this->object_type;
 
 		# if required values are missing dont save changelog
-		if(is_null($obj_id) || $obj_id=="NULL")	{ return false; }
+		if (is_null($obj_id) || $obj_id == "NULL") { return false; }
 
 	    # set values
 	    $values = array(
@@ -861,7 +861,7 @@ 
 	    			"cdiff"	 => $changelog
 					);
 		# null empty values
-		$values = $this->reformat_empty_array_fields ($values, null);
+		$values = $this->reformat_empty_array_fields($values, null);
 
 		# execute
 		try { $this->Database->insertObject("changelog", $values); }
@@ -870,8 +870,8 @@ 
 			return false;
 		}
 		# mail
-		if ($this->mail_changelog && strlen($changelog)>0) {
-			$this->changelog_send_mail ($changelog);
+		if ($this->mail_changelog && strlen($changelog) > 0) {
+			$this->changelog_send_mail($changelog);
 		}
 		# ok
 		return true;
@@ -883,7 +883,7 @@ 
 	 * @access private
 	 * @return boolean
 	 */
-	private function changelog_validate_object () {
+	private function changelog_validate_object() {
 		# set valid objects
 		$objects = array(
 						"ip_addr",
@@ -901,36 +901,36 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function changelog_reformat_add_diff () {
+	private function changelog_reformat_add_diff() {
 		foreach ($this->object_new as $k=>$v) {
 			//tag change
-			if($k == 'state') 				{ $this->object_new[$k] = $this->changelog_format_tag_diff ($k, $v); }
+			if ($k == 'state') { $this->object_new[$k] = $this->changelog_format_tag_diff($k, $v); }
 			//section change
-			elseif($k == 'sectionId') 		{ $this->object_new[$k] = $this->changelog_format_section_diff ($k, $v); }
+			elseif ($k == 'sectionId') { $this->object_new[$k] = $this->changelog_format_section_diff($k, $v); }
 			//section change
-			elseif($k == 'section') 		{ $this->object_new[$k] = $this->changelog_format_section_diff ($k, $v); }
+			elseif ($k == 'section') { $this->object_new[$k] = $this->changelog_format_section_diff($k, $v); }
 			//master subnet change
-			elseif($k == "subnetId") 		{ $this->object_new[$k] = $this->changelog_format_master_subnet_diff ($k, $v); }
+			elseif ($k == "subnetId") { $this->object_new[$k] = $this->changelog_format_master_subnet_diff($k, $v); }
 			//master subnet change
-			elseif($k == "masterSubnetId") 	{ $this->object_new[$k] = $this->changelog_format_master_subnet_diff ($k, $v); }
+			elseif ($k == "masterSubnetId") { $this->object_new[$k] = $this->changelog_format_master_subnet_diff($k, $v); }
 			//device change
-			elseif($k == 'switch') 			{ $this->object_new[$k] = $this->changelog_format_device_diff ($k, $v); }
+			elseif ($k == 'switch') { $this->object_new[$k] = $this->changelog_format_device_diff($k, $v); }
 			//device change
-			elseif($k == 'device') 			{ $this->object_new[$k] = $this->changelog_format_device_diff ($k, $v); }
+			elseif ($k == 'device') { $this->object_new[$k] = $this->changelog_format_device_diff($k, $v); }
 			//vlan
-			elseif($k == 'vlanId') 			{ $this->object_new[$k] = $this->changelog_format_vlan_diff ($k, $v); }
+			elseif ($k == 'vlanId') { $this->object_new[$k] = $this->changelog_format_vlan_diff($k, $v); }
 			//vrf
-			elseif($k == 'vrfId') 			{ $this->object_new[$k] = $this->changelog_format_vrf_diff ($k, $v); }
+			elseif ($k == 'vrfId') { $this->object_new[$k] = $this->changelog_format_vrf_diff($k, $v); }
 			//location
-			elseif($k == 'location_item')   { $this->object_new[$k] = $this->changelog_format_location_diff ($k, $v); }
+			elseif ($k == 'location_item') { $this->object_new[$k] = $this->changelog_format_location_diff($k, $v); }
 			//location
-			elseif($k == 'location') 	    { $this->object_new[$k] = $this->changelog_format_location_diff ($k, $v); }
+			elseif ($k == 'location') { $this->object_new[$k] = $this->changelog_format_location_diff($k, $v); }
 			//master section change
-			elseif($k == 'masterSection') 	{ $this->object_new[$k] = $this->changelog_format_master_section_diff ($k, $v); }
+			elseif ($k == 'masterSection') { $this->object_new[$k] = $this->changelog_format_master_section_diff($k, $v); }
 			//permission change
-			elseif($k == "permissions") 	{ $this->object_new[$k] = $this->changelog_format_permission_diff ($k, $v); }
+			elseif ($k == "permissions") { $this->object_new[$k] = $this->changelog_format_permission_diff($k, $v); }
 			// nameserver index
-			elseif($k == "nameserverId") 	{ $this->object_new[$k] = $this->changelog_format_ns_diff ($k, $v); }
+			elseif ($k == "nameserverId") { $this->object_new[$k] = $this->changelog_format_ns_diff($k, $v); }
 		}
 	}
 
@@ -941,36 +941,36 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function changelog_reformat_delete_diff () {
+	private function changelog_reformat_delete_diff() {
 		foreach ($this->object_old as $k=>$v) {
 			//tag change
-			if($k == 'state') 				{ $this->object_old[$k] = $this->changelog_format_tag_diff ($k, $v); }
+			if ($k == 'state') { $this->object_old[$k] = $this->changelog_format_tag_diff($k, $v); }
 			//section change
-			elseif($k == 'section') 		{ $this->object_old[$k] = $this->changelog_format_section_diff ($k, $v); }
+			elseif ($k == 'section') { $this->object_old[$k] = $this->changelog_format_section_diff($k, $v); }
 			//section change
-			elseif($k == 'sectionId') 		{ $this->object_old[$k] = $this->changelog_format_section_diff ($k, $v); }
+			elseif ($k == 'sectionId') { $this->object_old[$k] = $this->changelog_format_section_diff($k, $v); }
 			//subnet change
-			elseif($k == "subnetId") 		{ $this->object_old[$k] = $this->changelog_format_master_subnet_diff ($k, $v); }
+			elseif ($k == "subnetId") { $this->object_old[$k] = $this->changelog_format_master_subnet_diff($k, $v); }
 			//master subnet change
-			elseif($k == "masterSubnetId") 	{ $this->object_old[$k] = $this->changelog_format_master_subnet_diff ($k, $v); }
+			elseif ($k == "masterSubnetId") { $this->object_old[$k] = $this->changelog_format_master_subnet_diff($k, $v); }
 			//device change
-			elseif($k == 'switch') 			{ $this->object_old[$k] = $this->changelog_format_device_diff ($k, $v); }
+			elseif ($k == 'switch') { $this->object_old[$k] = $this->changelog_format_device_diff($k, $v); }
 			//device change
-			elseif($k == 'device') 			{ $this->object_old[$k] = $this->changelog_format_device_diff ($k, $v); }
+			elseif ($k == 'device') { $this->object_old[$k] = $this->changelog_format_device_diff($k, $v); }
 			//vlan
-			elseif($k == 'vlanId') 			{ $this->object_old[$k] = $this->changelog_format_vlan_diff ($k, $v); }
+			elseif ($k == 'vlanId') { $this->object_old[$k] = $this->changelog_format_vlan_diff($k, $v); }
 			//vrf
-			elseif($k == 'vrfId') 			{ $this->object_old[$k] = $this->changelog_format_vrf_diff ($k, $v); }
+			elseif ($k == 'vrfId') { $this->object_old[$k] = $this->changelog_format_vrf_diff($k, $v); }
 			//location
-			elseif($k == 'location_item') 	{ $this->object_old[$k] = $this->changelog_format_location_diff ($k, $v); }
+			elseif ($k == 'location_item') { $this->object_old[$k] = $this->changelog_format_location_diff($k, $v); }
 			//location
-			elseif($k == 'location') 	    { $this->object_old[$k] = $this->changelog_format_location_diff ($k, $v); }
+			elseif ($k == 'location') { $this->object_old[$k] = $this->changelog_format_location_diff($k, $v); }
 			//master section change
-			elseif($k == 'masterSection') 	{ $this->object_old[$k] = $this->changelog_format_master_section_diff ($k, $v); }
+			elseif ($k == 'masterSection') { $this->object_old[$k] = $this->changelog_format_master_section_diff($k, $v); }
 			//permission change
-			elseif($k == "permissions") 	{ $this->object_old[$k] = $this->changelog_format_permission_diff ($k, $v); }
+			elseif ($k == "permissions") { $this->object_old[$k] = $this->changelog_format_permission_diff($k, $v); }
 			// nameserver index
-			elseif($k == "nameserverId") 	{ $this->object_old[$k] = $this->changelog_format_ns_diff ($k, $v); }
+			elseif ($k == "nameserverId") { $this->object_old[$k] = $this->changelog_format_ns_diff($k, $v); }
 		}
 	}
 
@@ -980,15 +980,15 @@ 
 	 * @access private
 	 * @return array
 	 */
-	private function changelog_calculate_edit_diff () {
+	private function changelog_calculate_edit_diff() {
 		//old object - checkboxes that are not present, set them as 0
-		foreach($this->object_old as $k=>$v) {
-			if(!isset($this->object_new[$k]) && $v=="1") {
+		foreach ($this->object_old as $k=>$v) {
+			if (!isset($this->object_new[$k]) && $v == "1") {
 				$this->object_new[$k] = 0;
 			}
 		}
 		foreach ($this->object_new as $k=>$v) {
-			if(!isset($this->object_old[$k]) && $v=="1") {
+			if (!isset($this->object_old[$k]) && $v == "1") {
 				$this->object_old[$k] = 0;
 			}
 		}
@@ -997,45 +997,45 @@ 
 		$this->object_new['ip_addr'] = $this->Subnets->transform_address($this->object_new['ip_addr'], "dotted");
 
 		// check each value
-		foreach($this->object_new as $k=>$v) {
+		foreach ($this->object_new as $k=>$v) {
 			//change
-			if($this->object_old[$k]!=$v && ($this->object_old[$k] != str_replace("\'", "'", $v)))	{
+			if ($this->object_old[$k] != $v && ($this->object_old[$k] != str_replace("\'", "'", $v))) {
 				//empty
-				if(strlen(@$this->object_old[$k])==0)	{ $this->object_old[$k] = "NULL"; }
-				if(strlen(@$v)==0)						{ $v = "NULL"; }
+				if (strlen(@$this->object_old[$k]) == 0) { $this->object_old[$k] = "NULL"; }
+				if (strlen(@$v) == 0) { $v = "NULL"; }
 
 				//tag change
-				if($k == 'state') 				{ $v = $this->changelog_format_tag_diff ($k, $v); }
+				if ($k == 'state') { $v = $this->changelog_format_tag_diff($k, $v); }
 				//section change
-				elseif($k == 'sectionIdNew') 	{ $v = $this->changelog_format_section_diff ($k, $v); }
+				elseif ($k == 'sectionIdNew') { $v = $this->changelog_format_section_diff($k, $v); }
 				//section change
-				elseif($k == 'sectionId') 		{ $v = $this->changelog_format_section_diff ($k, $v); }
+				elseif ($k == 'sectionId') { $v = $this->changelog_format_section_diff($k, $v); }
 				//subnet change
-				elseif($k == "subnet") 			{ $v = $this->changelog_format_master_subnet_diff ($k, $v); }
+				elseif ($k == "subnet") { $v = $this->changelog_format_master_subnet_diff($k, $v); }
 				//master subnet change
-				elseif($k == "masterSubnetId") 	{ $v = $this->changelog_format_master_subnet_diff ($k, $v); }
+				elseif ($k == "masterSubnetId") { $v = $this->changelog_format_master_subnet_diff($k, $v); }
 				//device change
-				elseif($k == 'switch') 			{ $v = $this->changelog_format_device_diff ($k, $v); }
+				elseif ($k == 'switch') { $v = $this->changelog_format_device_diff($k, $v); }
 				//device change
-				elseif($k == 'device') 			{ $v = $this->changelog_format_device_diff ($k, $v); }
+				elseif ($k == 'device') { $v = $this->changelog_format_device_diff($k, $v); }
 				//vlan
-				elseif($k == 'vlanId') 			{ $v = $this->changelog_format_vlan_diff ($k, $v); }
+				elseif ($k == 'vlanId') { $v = $this->changelog_format_vlan_diff($k, $v); }
 				//vrf
-				elseif($k == 'vrfId') 			{ $v = $this->changelog_format_vrf_diff ($k, $v); }
+				elseif ($k == 'vrfId') { $v = $this->changelog_format_vrf_diff($k, $v); }
 				//location
-				elseif($k == 'location_item') 	{ $v = $this->changelog_format_location_diff ($k, $v); }
+				elseif ($k == 'location_item') { $v = $this->changelog_format_location_diff($k, $v); }
 				//location
-				elseif($k == 'location') 	    { $v = $this->changelog_format_location_diff ($k, $v); }
+				elseif ($k == 'location') { $v = $this->changelog_format_location_diff($k, $v); }
 				//master section change
-				elseif($k == 'masterSection') 	{ $v = $this->changelog_format_master_section_diff ($k, $v); }
+				elseif ($k == 'masterSection') { $v = $this->changelog_format_master_section_diff($k, $v); }
 				//permission change
-				elseif($k == "permissions") 	{ $v = $this->changelog_format_permission_diff ($k, $v); }
+				elseif ($k == "permissions") { $v = $this->changelog_format_permission_diff($k, $v); }
 				// nameserver index
-				elseif($k == "nameserverId") 	{ $v = $this->changelog_format_ns_diff ($k, $v); }
+				elseif ($k == "nameserverId") { $v = $this->changelog_format_ns_diff($k, $v); }
 				// make booleans
-				$v = $this->changelog_make_booleans ($k, $v);
+				$v = $this->changelog_make_booleans($k, $v);
 				//set log
-				if ($k!=="id")
+				if ($k !== "id")
 				$log["$k"] = $this->object_old[$k]." => $v";
 			}
 		}
@@ -1049,10 +1049,10 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function changelog_unset_unneeded_values () {
+	private function changelog_unset_unneeded_values() {
 		# remove ip address fields
-		if($this->object_type == "ip_addr") {
-			unset(	$this->object_new['subnet'],
+		if ($this->object_type == "ip_addr") {
+			unset($this->object_new['subnet'],
 					$this->object_new['type'],
 					$this->object_new['ip_addr_old'],
 					$this->object_new['nostrict'],
@@ -1062,7 +1062,7 @@ 
 					$this->object_new['subnetvlan'],
 					$this->object_new['addressId']
 					);
-			unset(	$this->object_old['subnet'],
+			unset($this->object_old['subnet'],
 					$this->object_old['type'],
 					$this->object_old['ip_addr_old'],
 					$this->object_old['nostrict'],
@@ -1073,24 +1073,24 @@ 
 					$this->object_old['addressId']
 					);
             # remove mac
-            if ($this->object_action=="add") {
+            if ($this->object_action == "add") {
                 unset ($this->object_new['mac_old'], $this->object_new['addressId']);
             }
 			# reformat ip
-			if (isset($this->object_old['ip_addr']))	{ $this->object_old['ip_addr'] = $this->Subnets->transform_address ($this->object_old['ip_addr'],"dotted"); }
-			if (isset($this->object_new['ip_addr']))	{ $this->object_new['ip_addr'] = $this->Subnets->transform_address ($this->object_new['ip_addr'],"dotted"); }
+			if (isset($this->object_old['ip_addr'])) { $this->object_old['ip_addr'] = $this->Subnets->transform_address($this->object_old['ip_addr'], "dotted"); }
+			if (isset($this->object_new['ip_addr'])) { $this->object_new['ip_addr'] = $this->Subnets->transform_address($this->object_new['ip_addr'], "dotted"); }
 
 		}
 		# remove subnet fields
-		elseif($this->object_type == "subnet" || $this->object_type == "folder")	{
+		elseif ($this->object_type == "subnet" || $this->object_type == "folder") {
 			// remove unneeded values
-			unset(	$this->object_new['subnetId'],
+			unset($this->object_new['subnetId'],
 					$this->object_new['vrfIdOld'],
 					$this->object_new['permissions'],
 					$this->object_new['state'],
 					$this->object_new['ip']
 				);
-			unset(	$this->object_old['subnetId'],
+			unset($this->object_old['subnetId'],
 					$this->object_old['vrfIdOld'],
 					$this->object_old['permissions'],
 					$this->object_old['state'],
@@ -1098,7 +1098,7 @@ 
 				);
 
 			# folder
-			if($this->object_type == "folder") {
+			if ($this->object_type == "folder") {
 				unset(
 					$this->object_new['linked_subnet'],
 					$this->object_new['firewallAddressObject'],
@@ -1140,23 +1140,23 @@ 
 			}
 
 			# if section does not change
-			if($this->object_new['sectionId']==$this->object_new['sectionIdNew']) {
-				unset(	$this->object_new['sectionIdNew']);
+			if ($this->object_new['sectionId'] == $this->object_new['sectionIdNew']) {
+				unset($this->object_new['sectionIdNew']);
 			}
 			else {
 				$this->object_old['sectionIdNew'] = $this->object_old['sectionId'];
 			}
 
 			//transform subnet to IP address format
-			if(strlen($this->object_new['subnet'])>0) 	{ $this->object_new['subnet'] = $this->Subnets->transform_address ($this->object_new['subnet'], "dotted");}
-			if(strlen($this->object_old['subnet'])>0) 	{ $this->object_old['subnet'] = $this->Subnets->transform_address ($this->object_old['subnet'], "dotted");}
+			if (strlen($this->object_new['subnet']) > 0) { $this->object_new['subnet'] = $this->Subnets->transform_address($this->object_new['subnet'], "dotted"); }
+			if (strlen($this->object_old['subnet']) > 0) { $this->object_old['subnet'] = $this->Subnets->transform_address($this->object_old['subnet'], "dotted"); }
 
 			//remove subnet/mask for folders
-			if (@$this->object_new['isFolder']=="1")	{ unset($this->object_new['subnet'], $this->object_new['mask']); }
-			if (@$this->object_old['isFolder']=="1")	{ unset($this->object_old['subnet'], $this->object_old['mask']); }
+			if (@$this->object_new['isFolder'] == "1") { unset($this->object_new['subnet'], $this->object_new['mask']); }
+			if (@$this->object_old['isFolder'] == "1") { unset($this->object_old['subnet'], $this->object_old['mask']); }
 		}
 		# remove order fields
-		elseif($this->object_type == "section") {
+		elseif ($this->object_type == "section") {
 			unset($this->object_old['order']);
 		}
 
@@ -1174,9 +1174,9 @@ 
 	 * @param mixed $v
 	 * @return void
 	 */
-	private function changelog_format_tag_diff ($k, $v) {
+	private function changelog_format_tag_diff($k, $v) {
 		$this->object_old[$k] = $this->Addresses->address_type_index_to_type($this->object_old[$k]);
-		$v 					  = $this->Addresses->address_type_index_to_type($v);
+		$v = $this->Addresses->address_type_index_to_type($v);
 		//result
 		return $v;
 	}
@@ -1189,14 +1189,14 @@ 
 	 * @param mixed $v
 	 * @return void
 	 */
-	private function changelog_format_section_diff ($k, $v) {
+	private function changelog_format_section_diff($k, $v) {
 		//get old and new device
-		if($this->object_old[$k] != "NULL") {
-			$section = $this->Sections->fetch_section ("id", $this->object_old[$k]);
+		if ($this->object_old[$k] != "NULL") {
+			$section = $this->Sections->fetch_section("id", $this->object_old[$k]);
 			$this->object_old[$k] = $section->name." (id ".$section->id.")";
 		}
-		if($v != "NULL")	{
-			$section = $this->Sections->fetch_section ("id", $v);
+		if ($v != "NULL") {
+			$section = $this->Sections->fetch_section("id", $v);
 			$v = $section->name." (id ".$section->id.")";
 		}
 		//result
@@ -1211,23 +1211,23 @@ 
 	 * @param mixed $v
 	 * @return string
 	 */
-	private function changelog_format_master_subnet_diff ($k, $v) {
+	private function changelog_format_master_subnet_diff($k, $v) {
 		//Old root or not
-		if($this->object_old[$k]==0){
+		if ($this->object_old[$k] == 0) {
 			$this->object_old[$k] = "Root";
 		}
 		else {
 			$subnet = $this->Subnets->fetch_subnet("id", $this->object_old[$k]);
-			$this->object_old[$k] = strlen($subnet->description)>0 ? $this->Subnets->transform_address($subnet->subnet, "dotted")."/$subnet->mask [$subnet->description]" : $this->Subnets->transform_address($subnet->subnet, "dotted")."/".$subnet->mask;
+			$this->object_old[$k] = strlen($subnet->description) > 0 ? $this->Subnets->transform_address($subnet->subnet, "dotted")."/$subnet->mask [$subnet->description]" : $this->Subnets->transform_address($subnet->subnet, "dotted")."/".$subnet->mask;
 			$this->object_old[$k] .= " (id ".$subnet->id.")";
 		}
 		//New root or not
-		if($v==0) {
+		if ($v == 0) {
 			$v = "Root";
 		}
 		else {
 			$subnet = $this->Subnets->fetch_subnet("id", $v);
-			$v  = strlen($subnet->description)>0 ? $this->Subnets->transform_address($subnet->subnet, "dotted")."/$subnet->mask [$subnet->description]" : $this->Subnets->transform_address($subnet->subnet, "dotted")."/".$subnet->mask;
+			$v  = strlen($subnet->description) > 0 ? $this->Subnets->transform_address($subnet->subnet, "dotted")."/$subnet->mask [$subnet->description]" : $this->Subnets->transform_address($subnet->subnet, "dotted")."/".$subnet->mask;
 			$v .= " (id ".$subnet->id.")";
 		}
 		//result
@@ -1242,20 +1242,20 @@ 
 	 * @param mixed $v
 	 * @return void
 	 */
-	private function changelog_format_device_diff ($k, $v) {
+	private function changelog_format_device_diff($k, $v) {
 		// old none
-		if($this->object_old[$k] == 0)	{
+		if ($this->object_old[$k] == 0) {
 			$this->object_old[$k] = "None";
 		}
-		elseif($this->object_old[$k] != "NULL") {
+		elseif ($this->object_old[$k] != "NULL") {
 			$dev = $this->Tools->fetch_object("devices", "id", $this->object_old[$k]);
 			$this->object_old[$k] = $dev->hostname;
 		}
 		// new none
-		if($v == 0)	{
+		if ($v == 0) {
 			$v = "None";
 		}
-		if($v != "NULL") {
+		if ($v != "NULL") {
 			$dev = $this->Tools->fetch_object("devices", "id", $v);
 			$v = $dev->hostname;
 		}
@@ -1271,20 +1271,20 @@ 
 	 * @param mixed $v
 	 * @return void
 	 */
-	private function changelog_format_vlan_diff ($k, $v) {
+	private function changelog_format_vlan_diff($k, $v) {
 		//old none
-		if($this->object_old[$k] == 0)	{
+		if ($this->object_old[$k] == 0) {
 			$this->object_old[$k] = "None";
 		}
-		elseif($this->object_old[$k] != "NULL") {
+		elseif ($this->object_old[$k] != "NULL") {
 			$vlan = $this->Tools->fetch_object("vlans", "vlanId", $this->object_old[$k]);
 			$this->object_old[$k] = $vlan->name." [$vlan->number]";
 		}
 		//new none
-		if($v == 0)	{
+		if ($v == 0) {
 			$v = "None";
 		}
-		elseif($v != "NULL") {
+		elseif ($v != "NULL") {
 			$vlan = $this->Tools->fetch_object("vlans", "vlanId", $v);
 			$v = $vlan->name." [$vlan->number]";
 		}
@@ -1300,20 +1300,20 @@ 
 	 * @param mixed $v
 	 * @return void
 	 */
-	private function changelog_format_vrf_diff ($k, $v) {
+	private function changelog_format_vrf_diff($k, $v) {
 		//old none
-		if($this->object_old[$k] == 0)	{
+		if ($this->object_old[$k] == 0) {
 			$this->object_old[$k] = "None";
 		}
-		elseif($this->object_old[$k] != "NULL") {
+		elseif ($this->object_old[$k] != "NULL") {
 			$vrf = $this->Tools->fetch_object("vrf", "vrfId", $this->object_old[$k]);
 			$this->object_old[$k] = $vrf->name." [$vrf->description]";
 		}
 		// new none
-		if($v == 0)	{
+		if ($v == 0) {
 			$v = "None";
 		}
-		elseif($v != "NULL") {
+		elseif ($v != "NULL") {
 			$vrf = $this->Tools->fetch_object("vrf", "vrfId", $v);
 			$v = $vrf->name." [$vrf->description]";
 		}
@@ -1329,20 +1329,20 @@ 
 	 * @param mixed $v
 	 * @return void
 	 */
-	private function changelog_format_ns_diff ($k, $v) {
+	private function changelog_format_ns_diff($k, $v) {
 		//old none
-		if($this->object_old[$k] == 0)	{
+		if ($this->object_old[$k] == 0) {
 			$this->object_old[$k] = "None";
 		}
-		elseif($this->object_old[$k] != "NULL") {
+		elseif ($this->object_old[$k] != "NULL") {
 			$ns = $this->Tools->fetch_object("nameservers", "id", $this->object_old[$k]);
 			$this->object_old[$k] = $ns->name." [".$ns->namesrv1."]";
 		}
 		// new none
-		if($v == 0)	{
+		if ($v == 0) {
 			$v = "None";
 		}
-		elseif($v != "NULL") {
+		elseif ($v != "NULL") {
 			$ns = $this->Tools->fetch_object("nameservers", "id", $v);
 			$v = $ns->name." [".$ns->namesrv1."]";
 		}
@@ -1358,22 +1358,22 @@ 
 	 * @param mixed $v
 	 * @return void
 	 */
-	private function changelog_format_location_diff ($k, $v) {
+	private function changelog_format_location_diff($k, $v) {
 		//old none
-		if($this->object_old[$k] == 0)	{
+		if ($this->object_old[$k] == 0) {
 			$this->object_old[$k] = "None";
 		}
-		elseif($this->object_old[$k] != "NULL") {
+		elseif ($this->object_old[$k] != "NULL") {
 			$location = $this->Tools->fetch_object("locations", "id", $this->object_old[$k]);
-			$this->object_old[$k] = strlen($location->description>0) ? $location->name." [$location->description]" : $location->name;
+			$this->object_old[$k] = strlen($location->description > 0) ? $location->name." [$location->description]" : $location->name;
 		}
 		// new none
-		if($v == 0)	{
+		if ($v == 0) {
 			$v = "None";
 		}
-		elseif($v != "NULL") {
+		elseif ($v != "NULL") {
 			$location = $this->Tools->fetch_object("locations", "id", $v);
-			$v = strlen($location->description>0) ? $location->name." [$location->description]" : $location->name;
+			$v = strlen($location->description > 0) ? $location->name." [$location->description]" : $location->name;
 		}
 		//result
 		return $v;
@@ -1387,21 +1387,21 @@ 
 	 * @param mixed $v
 	 * @return void
 	 */
-	private function changelog_format_master_section_diff ($k, $v) {
+	private function changelog_format_master_section_diff($k, $v) {
 		// old root
-		if($this->object_old[$k]==0) {
+		if ($this->object_old[$k] == 0) {
 			$this->object_old[$k] = "Root";
 		}
 		else {
-			$section = $this->Sections->fetch_section ("id", $this->object_old[$k]);
+			$section = $this->Sections->fetch_section("id", $this->object_old[$k]);
 			$this->object_old[$k] = $section->name;
 		}
 		// new root
-		if($v==0) {
+		if ($v == 0) {
 			$v = "Root";
 		}
 		else {
-			$section = $this->Sections->fetch_section ("id", $v);
+			$section = $this->Sections->fetch_section("id", $v);
 			$v = $section->name;
 		}
 		//result
@@ -1416,25 +1416,25 @@ 
 	 * @param mixed $v
 	 * @return string
 	 */
-	private function changelog_format_permission_diff ($k, $v) {
+	private function changelog_format_permission_diff($k, $v) {
 		// get old and compare
-		$this->object_new['permissions'] = json_decode(str_replace("\\", "", $this->object_new['permissions']), true);		//Remove /
-		$this->object_old['permissions'] = json_decode(str_replace("\\", "", $this->object_old['permissions']), true);		//Remove /
+		$this->object_new['permissions'] = json_decode(str_replace("\\", "", $this->object_new['permissions']), true); //Remove /
+		$this->object_old['permissions'] = json_decode(str_replace("\\", "", $this->object_old['permissions']), true); //Remove /
 
 		# Get all groups:
 		$groups = (array) $this->Tools->fetch_all_objects("userGroups", "g_id");
 		// rekey
 		$out = array();
-		foreach($groups as $g) {
+		foreach ($groups as $g) {
 			$out[$g->g_id]['g_name'] = $g->g_name;
 		}
 		$groups = $out;
 
 		// loop
 		$val = array();
-		if(is_array($this->object_new['permissions'])) {
-			foreach($this->object_new['permissions'] as $group_id=>$p) {
-				$val[] = $groups[$group_id]['g_name'] ." : ".$this->Subnets->parse_permissions($p);
+		if (is_array($this->object_new['permissions'])) {
+			foreach ($this->object_new['permissions'] as $group_id=>$p) {
+				$val[] = $groups[$group_id]['g_name']." : ".$this->Subnets->parse_permissions($p);
 			}
 		}
 		$this->object_old[$k] = "";
@@ -1451,7 +1451,7 @@ 
 	 * @param mixed $v
 	 * @return void
 	 */
-	private function changelog_make_booleans ($k, $v) {
+	private function changelog_make_booleans($k, $v) {
     	// init
     	$keys = array();
 		// list of keys to be changed per object
@@ -1462,8 +1462,8 @@ 
 		// check
 		if (array_key_exists($this->object_type, $keys)) {
 			if (in_array($k, $keys[$this->object_type])) {
-				if ($v=="0") { $this->object_old[$k] = "True";	return "False"; }
-				else 		 { $this->object_old[$k] = "False"; return "True"; }
+				if ($v == "0") { $this->object_old[$k] = "True"; return "False"; }
+				else { $this->object_old[$k] = "False"; return "True"; }
 			}
 			else {
 				return $v;
@@ -1480,9 +1480,9 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function changelog_format_permission_change () {
+	private function changelog_format_permission_change() {
 		# get old and compare
-		$this->object_new['permissions_change'] = json_decode(str_replace("\\", "", $this->object_new['permissions_change']), true);		//Remove /
+		$this->object_new['permissions_change'] = json_decode(str_replace("\\", "", $this->object_new['permissions_change']), true); //Remove /
 
 		# Get all groups:
 		$groups = (array) $this->Tools->fetch_all_objects("userGroups", "g_id");
@@ -1490,17 +1490,17 @@ 
 		$out = array();
 		$log = array();
 
-		foreach($groups as $k=>$g) {
+		foreach ($groups as $k=>$g) {
 			// save
 			$out[$g->g_id]['g_name'] = $g->g_name;
 		}
 		$groups = $out;
 
 		# reformat
-		if($this->object_new['permissions_change']!="null") {
+		if ($this->object_new['permissions_change'] != "null") {
 			$new_permissions = json_decode($this->object_new['permissions_change']);
-			foreach($new_permissions as $group_id=>$p) {
-				$log['Permissions'] .= "<br>". $groups[$group_id]['g_name'] ." : ".$this->Subnets->parse_permissions($p);
+			foreach ($new_permissions as $group_id=>$p) {
+				$log['Permissions'] .= "<br>".$groups[$group_id]['g_name']." : ".$this->Subnets->parse_permissions($p);
 			}
 		}
 		//result
@@ -1516,17 +1516,17 @@ 
 	 * @param int $limit (default: 100)
 	 * @return void
 	 */
-	public function fetch_all_changelogs ($filter = false, $expr, $limit = 100) {
+	public function fetch_all_changelogs($filter = false, $expr, $limit = 100) {
     	# limit check
-    	if(!is_numeric($limit))        { $this->Result->show("danger", "Invalid limit", true);	return false; }
+    	if (!is_numeric($limit)) { $this->Result->show("danger", "Invalid limit", true); return false; }
 
     	# begin query
-			$subquery_filter1 = ""; $subquery_filter2 ="";
-			if($filter) {
+			$subquery_filter1 = ""; $subquery_filter2 = "";
+			if ($filter) {
 				/* replace * with % */
-				if(substr($expr, 0, 1)=="*")								{ $expr[0] = "%"; }
-				if(substr($expr, -1, 1)=="*")								{ $expr = substr_replace($expr, "%", -1);  }
-				if(substr($expr, 0, 1)!="*" && substr($expr, -1, 1)!="*")	{ $expr = "%".$expr."%"; }
+				if (substr($expr, 0, 1) == "*") { $expr[0] = "%"; }
+				if (substr($expr, -1, 1) == "*") { $expr = substr_replace($expr, "%", -1); }
+				if (substr($expr, 0, 1) != "*" && substr($expr, -1, 1) != "*") { $expr = "%".$expr."%"; }
 
 				$subquery_filter1 = "AND (`coid`=:expr or `ctype`=:expr or `real_name` like :expr or `cdate` like :expr or `cdiff` like :expr or INET_NTOA(`ip_addr`) like :expr)";
 				$subquery_filter2 = "AND (`coid`=:expr or `ctype`=:expr or `real_name` like :expr or `cdate` like :expr or `cdiff` like :expr)";
@@ -1566,7 +1566,7 @@ 
 
 	    # fetch
 	    try { $logs = $this->Database->getObjectsQuery($query, array("expr"=>$expr)); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
+		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false); return false; }
 
 	    # return results
 	    return $logs;
@@ -1579,9 +1579,9 @@ 
 	 * @param int $id
 	 * @return void
 	 */
-	public function fetch_changelog ($id) {
+	public function fetch_changelog($id) {
     	# limit check
-    	if(!is_numeric($id))        { $this->Result->show("danger", "Invalid ID", true);	return false; }
+    	if (!is_numeric($id)) { $this->Result->show("danger", "Invalid ID", true); return false; }
 
 	    # set query
 	    $query = "select * from (
@@ -1627,23 +1627,23 @@ 
 	 * @param int $limit (default: 50)
 	 * @return void
 	 */
-	public function fetch_subnet_addresses_changelog_recursive ($subnetId, $limit = 50) {
+	public function fetch_subnet_addresses_changelog_recursive($subnetId, $limit = 50) {
 	    # get all addresses ids
-	    $ips  = array();
-	    if (!is_object($this->Addresses)) $this->Addresses = new Addresses ($this->Database);
-	    $ips = $this->Addresses->fetch_subnet_addresses_recursive ($subnetId, false);
+	    $ips = array();
+	    if (!is_object($this->Addresses)) $this->Addresses = new Addresses($this->Database);
+	    $ips = $this->Addresses->fetch_subnet_addresses_recursive($subnetId, false);
 
 	    # fetch changelog for IPs
-	    if(sizeof($ips) > 0) {
+	    if (sizeof($ips) > 0) {
 		    # query
-		    $query  = "select
+		    $query = "select
 		    			`u`.`real_name`,`o`.`id`,`o`.`ip_addr`,`o`.`description`,`o`.`id`,`o`.`subnetId`,`c`.`caction`,`c`.`cresult`,`c`.`cdate`,`c`.`cdiff`
 						from `changelog` as `c`, `users` as `u`, `ipaddresses` as `o`
 						where `c`.`cuser` = `u`.`id` and `c`.`coid`=`o`.`id`
 						and (";
 
             $args = array();
-			foreach($ips as $ip) {
+			foreach ($ips as $ip) {
 			$query .= "`c`.`coid` = ? or ";
 			$args[] = $ip->id;
 			}
@@ -1652,7 +1652,7 @@ 
 
 			# fetch
 		    try { $logs = $this->Database->getObjectsQuery($query, array_filter($args)); }
-			catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
+			catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false); return false; }
 
 		    # return result
 		    return $logs;
@@ -1670,9 +1670,9 @@ 
 	 * @param $long (default: false)
 	 * @param $limit (default: 50)
 	 */
-	public function fetch_changlog_entries ($object_type, $coid, $long = false, $limit = 50) {
+	public function fetch_changlog_entries($object_type, $coid, $long = false, $limit = 50) {
     	# limit check
-    	if(!is_numeric($limit))        { $this->Result->show("danger", "Invalid limit", true);	return false; }
+    	if (!is_numeric($limit)) { $this->Result->show("danger", "Invalid limit", true); return false; }
 
 	    # change ctype to match table
 	    switch ($object_type) {
@@ -1690,11 +1690,11 @@ 
     	        break;
     	    // error
     	    default:
-    	        $this->Result->show("danger", "Invalid object type", true);	return false;
+    	        $this->Result->show("danger", "Invalid object type", true); return false;
 	    }
 
 	    # query
-	    if($long) {
+	    if ($long) {
 		    $query = "select *
 						from `changelog` as `c`, `users` as `u`, `$object_typeTable` as `o`
 						where `c`.`cuser` = `u`.`id` and `c`.`coid`=`o`.`id`
@@ -1724,37 +1724,37 @@ 
 	 */
 	public function fetch_subnet_slaves_changlog_entries_recursive($subnetId, $limit = 50) {
     	# limit check
-    	if(!is_numeric($limit))        { $this->Result->show("danger", "Invalid limit", true);	return false; }
+    	if (!is_numeric($limit)) { $this->Result->show("danger", "Invalid limit", true); return false; }
     	# $subnetId check
-    	if(!is_numeric($subnetId))     { $this->Result->show("danger", "Invalid subnet Id", true);	return false; }
+    	if (!is_numeric($subnetId)) { $this->Result->show("danger", "Invalid subnet Id", true); return false; }
 
 		# fetch all slave subnet ids
-		if (!is_object($this->Subnets)) $this->Subnets = new Subnets ($this->Database);
-		$this->Subnets->reset_subnet_slaves_recursive ();
-		$this->Subnets->fetch_subnet_slaves_recursive ($subnetId);
+		if (!is_object($this->Subnets)) $this->Subnets = new Subnets($this->Database);
+		$this->Subnets->reset_subnet_slaves_recursive();
+		$this->Subnets->fetch_subnet_slaves_recursive($subnetId);
 		# remove master subnet ID
 		$key = array_search($subnetId, $this->Subnets->slaves);
 		unset($this->Subnets->slaves[$key]);
 		$this->Subnets->slaves = array_unique($this->Subnets->slaves);
 
 	    # if some slaves are present get changelog
-	    if(sizeof($this->Subnets->slaves) > 0) {
+	    if (sizeof($this->Subnets->slaves) > 0) {
 		    # set query
-		    $query  = "select
+		    $query = "select
 						`u`.`real_name`,`o`.`sectionId`,`o`.`subnet`,`o`.`mask`,`o`.`isFolder`,`o`.`description`,`o`.`id`,`c`.`caction`,`c`.`cresult`,`c`.`cdate`,`c`.`cdiff`  from `changelog` as `c`, `users` as `u`, `subnets` as `o`
 						where `c`.`cuser` = `u`.`id` and `c`.`coid`=`o`.`id`
 						and (";
-			foreach($this->Subnets->slaves as $slaveId) {
-			if(!isset($args)) $args = array();
+			foreach ($this->Subnets->slaves as $slaveId) {
+			if (!isset($args)) $args = array();
 			$query .= "`c`.`coid` = ? or ";
-			$args[] = $slaveId;							//set keys
+			$args[] = $slaveId; //set keys
 			}
 			$query  = substr($query, 0, -3);
 			$query .= ") and `c`.`ctype` = 'subnet' order by `c`.`cid` desc limit $limit;";
 
 			# fetch
 		    try { $logs = $this->Database->getObjectsQuery($query, $args); }
-			catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
+			catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false); return false; }
 
 		    # return result
 		    return $logs;
@@ -1787,10 +1787,10 @@ 
 	 * @param string $changelog
 	 * @return boolean
 	 */
-	public function changelog_send_mail ($changelog) {
+	public function changelog_send_mail($changelog) {
 
 		# initialize tools class
-		if (!is_object($this->Tools)) $this->Tools = new Tools ($this->Database);
+		if (!is_object($this->Tools)) $this->Tools = new Tools($this->Database);
 
 		# set object
 		$obj_details = $this->object_action == "add" ? $this->object_new : $this->object_old;
@@ -1800,28 +1800,28 @@ 
 		$this->object_type = str_replace("ip_range", "address range", $this->object_type);
 
 		# folder
-		if ( $this->object_new['isFolder']=="1" || $this->object_old['isFolder']=="1" )	{ $this->object_type = "folder"; }
+		if ($this->object_new['isFolder'] == "1" || $this->object_old['isFolder'] == "1") { $this->object_type = "folder"; }
 
 		# set subject
 		$subject = "";
-		if($this->object_action == "add") 		{ $subject = ucwords($this->object_type)." create notification"; }
-		elseif($this->object_action == "edit") 	{ $subject = ucwords($this->object_type)." change notification"; }
-		elseif($this->object_action == "delete"){ $subject = ucwords($this->object_type)." delete notification"; }
+		if ($this->object_action == "add") { $subject = ucwords($this->object_type)." create notification"; }
+		elseif ($this->object_action == "edit") { $subject = ucwords($this->object_type)." change notification"; }
+		elseif ($this->object_action == "delete") { $subject = ucwords($this->object_type)." delete notification"; }
 
 		// if address we need subnet details !
 		$address_subnet = array();
-		if ($this->object_type=="address")		{ $address_subnet = (array) $this->Tools->fetch_object("subnets", "id", $obj_details['subnetId']); }
+		if ($this->object_type == "address") { $address_subnet = (array) $this->Tools->fetch_object("subnets", "id", $obj_details['subnetId']); }
 
 		# set object details
 		$details = "";
-		if ($this->object_type=="section") 		{ $details = "<a style='font-family:Helvetica, Verdana, Arial, sans-serif; font-size:12px;color:#a0ce4e;' href='".$this->createURL().create_link("subnets",$obj_details['id'])."'>".$obj_details['name'] . "(".$obj_details['description'].") - id ".$obj_details['id']."</a>"; }
-		elseif ($this->object_type=="subnet")	{ $details = "<a style='font-family:Helvetica, Verdana, Arial, sans-serif; font-size:12px;color:#a0ce4e;' href='".$this->createURL().create_link("subnets",$this->object_orig['sectionId'],$obj_details['id'])."'>".$this->Subnets->transform_address ($obj_details['subnet'], "dotted")."/".$obj_details['mask']." (".$obj_details['description'].") - id ".$obj_details['id']."</a>"; }
-		elseif ($this->object_type=="folder")	{ $details = "<a style='font-family:Helvetica, Verdana, Arial, sans-serif; font-size:12px;color:#a0ce4e;' href='".$this->createURL().create_link("folder",$this->object_orig['sectionId'],$obj_details['id'])."'>".$obj_details['description']." - id ".$obj_details['id']."</a>"; }
-		elseif ($this->object_type=="address")	{ $details = "<a style='font-family:Helvetica, Verdana, Arial, sans-serif; font-size:12px;color:#a0ce4e;' href='".$this->createURL().create_link("subnets",$this->object_orig['section'],$this->object_orig['subnetId'],"address-details",$this->object_orig['id'])."'>".$this->Subnets->transform_address ($obj_details['ip_addr'], "dotted")." ( hostname ".$obj_details['hostname'].", subnet: ".$this->Subnets->transform_address ($address_subnet['subnet'], "dotted")."/".$address_subnet['mask'].")- id ".$obj_details['id']."</a>"; }
-		elseif ($this->object_type=="address range")	{ $details = $changelog; }
+		if ($this->object_type == "section") { $details = "<a style='font-family:Helvetica, Verdana, Arial, sans-serif; font-size:12px;color:#a0ce4e;' href='".$this->createURL().create_link("subnets", $obj_details['id'])."'>".$obj_details['name']."(".$obj_details['description'].") - id ".$obj_details['id']."</a>"; }
+		elseif ($this->object_type == "subnet") { $details = "<a style='font-family:Helvetica, Verdana, Arial, sans-serif; font-size:12px;color:#a0ce4e;' href='".$this->createURL().create_link("subnets", $this->object_orig['sectionId'], $obj_details['id'])."'>".$this->Subnets->transform_address($obj_details['subnet'], "dotted")."/".$obj_details['mask']." (".$obj_details['description'].") - id ".$obj_details['id']."</a>"; }
+		elseif ($this->object_type == "folder") { $details = "<a style='font-family:Helvetica, Verdana, Arial, sans-serif; font-size:12px;color:#a0ce4e;' href='".$this->createURL().create_link("folder", $this->object_orig['sectionId'], $obj_details['id'])."'>".$obj_details['description']." - id ".$obj_details['id']."</a>"; }
+		elseif ($this->object_type == "address") { $details = "<a style='font-family:Helvetica, Verdana, Arial, sans-serif; font-size:12px;color:#a0ce4e;' href='".$this->createURL().create_link("subnets", $this->object_orig['section'], $this->object_orig['subnetId'], "address-details", $this->object_orig['id'])."'>".$this->Subnets->transform_address($obj_details['ip_addr'], "dotted")." ( hostname ".$obj_details['hostname'].", subnet: ".$this->Subnets->transform_address($address_subnet['subnet'], "dotted")."/".$address_subnet['mask'].")- id ".$obj_details['id']."</a>"; }
+		elseif ($this->object_type == "address range") { $details = $changelog; }
 
 		# remove subnet sectionId
-		if($this->object_type=="subnet" && $this->object_action == "edit") {
+		if ($this->object_type == "subnet" && $this->object_action == "edit") {
 			unset($obj_details['sectionId']);
 		}
 
@@ -1840,7 +1840,7 @@ 
 		$content[] = "<tr><td style='vertical-align:top;'>$this->mail_font_style Changes:</td>";
 		$content[] = "<td>";
 		// add changelog
-		$changelog = str_replace("\r\n", "<br>",$changelog);
+		$changelog = str_replace("\r\n", "<br>", $changelog);
 		$changelog = array_filter(explode("<br>", $changelog));
 		$content[] = "<table>";
 
@@ -1850,11 +1850,11 @@ 
     	    $value = explode("=>", $field[1]);
 
     	    // format field
-    	    $field = trim(str_replace(array("[","]"), "", $field[0]));
+    	    $field = trim(str_replace(array("[", "]"), "", $field[0]));
 
     	    // no isFolder
-    	    if($field!=="isFolder") {
-	    	    if(is_array($this->changelog_keys[$this->object_type])) {
+    	    if ($field !== "isFolder") {
+	    	    if (is_array($this->changelog_keys[$this->object_type])) {
 	        	    if (array_key_exists($field, $this->changelog_keys[$this->object_type])) {
 	            	    $field = $this->changelog_keys[$this->object_type][$field];
 	        	    }
@@ -1863,7 +1863,7 @@ 
 	    		$content[] = "<tr>";
 	    		$content[] = "  <td>$this->mail_font_style<strong> $field</strong>: </font></td>";
 	    		$content[] = "  <td>$this->mail_font_style ".trim($value[0])." </font></td>";
-	    		if($this->object_action=="edit") {
+	    		if ($this->object_action == "edit") {
 	    		$content[] = "  <td>$this->mail_font_style => </font></td>";
 	    		$content[] = "  <td>$this->mail_font_style ".trim($value[1])." </font></td>";
 	    		}
@@ -1889,18 +1889,18 @@ 
 
 		# get all admins and check who to end mail to
 		//subnets, addresses - send mail to normal users also
-		if ($this->object_type=="subnet" || $this->object_type=="address") {
-    		if($this->object_type=="subnet") {
-        		$recipients = $this->changelog_mail_get_recipients ($obj_details['id']);
+		if ($this->object_type == "subnet" || $this->object_type == "address") {
+    		if ($this->object_type == "subnet") {
+        		$recipients = $this->changelog_mail_get_recipients($obj_details['id']);
     		}
     		else {
-        		$recipients = $this->changelog_mail_get_recipients ($obj_details['subnetId']);
+        		$recipients = $this->changelog_mail_get_recipients($obj_details['subnetId']);
     		}
 		}
 		else {
-    		$recipients = $this->changelog_mail_get_recipients (false);
+    		$recipients = $this->changelog_mail_get_recipients(false);
 		}
-		if($recipients ===false) {
+		if ($recipients === false) {
     		return true;
         }
 
@@ -1913,11 +1913,11 @@ 
 			$phpipam_mail = new phpipam_mail($this->settings, $mail_settings);
 
 			// set content
-			$content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
-			$content_plain = implode("\r\n",$content_plain);
+			$content = $phpipam_mail->generate_message(implode("\r\n", $content));
+			$content_plain = implode("\r\n", $content_plain);
 
 			$phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
-			foreach($recipients as $r) {
+			foreach ($recipients as $r) {
 			$phpipam_mail->Php_mailer->addAddress(addslashes(trim($r->email)));
 			}
 			$phpipam_mail->Php_mailer->Subject = $subject;

functions/classes/class.Tools.php

Indentation +2970 added lines, -2970 removed lines

@@ -6,1692 +6,1692 @@ 
 
 class Tools extends Common_functions {
 
-	/**
-	 * settings
-	 *
-	 * (default value: null)
-	 *
-	 * @var object
-	 * @access public
-	 */
-	public $settings = null;
-
-	/**
-	 * (array) IP address types from Addresses object
-	 *
-	 * (default value: null)
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $address_types = null;
-
-	/**
-	 * CSV delimiter
-	 *
-	 * @var string
-	 */
-	public $csv_delimiter = ",";
-
-	/**
-	 * PEAR NET IPv4 object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Net_IPv4;
-
-	/**
-	 * PEAR NET IPv6 object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Net_IPv6;
-
-	/**
-	 * Addresses object
-	 *
-	 * (default value: false)
-	 *
-	 * @var bool|object
-	 * @access protected
-	 */
-	protected $Addresses = false;
-
-	/**
-	 * for Result printing
-	 *
-	 * @var object
-	 * @access public
-	 */
-	public $Result;
-
-	/**
-	 * debugging flag
-	 *
-	 * (default value: false)
-	 *
-	 * @var bool
-	 * @access protected
-	 */
-	protected $debugging = false;
-
-	/**
-	 * Database connection
-	 *
-	 * @var object
-	 * @access protected
-	 */
-	protected $Database;
-
-
-
-
-
-	/**
-	 * __construct method
-	 *
-	 * @access public
-	 */
-	public function __construct (Database_PDO $database) {
-		# set database object
-		$this->Database = $database;
-		# initialize Result
-		$this->Result = new Result ();
-		# set debugging
-		$this->set_debugging ();
-	}
-
-
-
-
-
-
-
-
-
-
-
-	/**
-	 *	@VLAN specific methods
-	 *	--------------------------------
-	 */
-
-	/**
-	 * Fetch vlans and subnets for tools vlan display. Joined query
-	 *
-	 * @access public
-	 * @param int $domainId (default: 1)
-	 * @return array|bool
-	 */
-	public function fetch_vlans_and_subnets ($domainId=1) {
-	    # custom fields
-	    $custom_fields = $this->fetch_custom_fields("vlans");
-		# if set add to query
-		$custom_fields_query = "";
-	    if(sizeof($custom_fields)>0) {
-			foreach($custom_fields as $myField) {
-				$custom_fields_query  .= ',`vlans`.`'.$myField['name'].'`';
-			}
-		}
-	    # set query
-	    $query = 'SELECT vlans.vlanId,vlans.number,vlans.name,vlans.description,vlans.customer_id,subnets.subnet,subnets.mask,subnets.id AS subnetId,subnets.sectionId'.@$custom_fields_query.' FROM vlans LEFT JOIN subnets ON subnets.vlanId = vlans.vlanId where vlans.`domainId` = ? ORDER BY vlans.number ASC;';
-		# fetch
-		try { $vlans = $this->Database->getObjectsQuery($query, array($domainId)); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-
-		# reorder
-		$out = array();
-		foreach ($vlans as $vlan) {
-			$out[$vlan->vlanId][] = $vlan;
-		}
-		# result
-		return is_array($out) ? array_values($out) : false;
-	}
-
-	/**
-	 * Validates VLAN
-	 *
-	 *	not 1
-	 *	integer
-	 *	not higher that maxVLAN from settings
-	 *
-	 * @access public
-	 * @param int $number
-	 * @return mixed|bool
-	 */
-	public function validate_vlan ($number) {
-		# fetch highest vlan id
-		$settings = $this->get_settings();
-
-		if(empty($number)) 							{ return true; }
-		elseif(!is_numeric($number)) 				{ return _('VLAN must be numeric value!'); }
-		elseif ($number > $settings['vlanMax']) 	{ return _('Vlan number can be max '.$settings['vlanMax']); }
-		else 										{ return true; }
-	}
-
-
-
-
-
-
-
-	/**
-	 *	@search methods
-	 *	--------------------------------
-	 */
-
-
-	/**
-	 * Search database for addresses
-	 *
-	 * @access public
-	 * @param mixed $search_term
-	 * @param string $high (default: "")
-	 * @param string $low (default: "")
-	 * @param array $custom_fields (default: array())
-	 * @return array
-	 */
-	public function search_addresses($search_term, $high = "", $low = "", $custom_fields = array()) {
-
-    	$tags = $this->fetch_all_objects ("ipTags", "id");
-    	foreach ($tags as $t) {
-        	if(strtolower($t->type)==strtolower($search_term)) {
-            	$tags = $t->id;
-            	break;
-        	}
-        	$tags = false;
-    	}
-
-		# set search query
-		$query[] = "select * from `ipaddresses` ";
-		$query[] = "where `ip_addr` between :low and :high ";	//ip range
-		$query[] = "or `hostname` like :search_term ";			//hostname
-		$query[] = "or `owner` like :search_term ";				//owner
-		# custom fields
-		if(sizeof($custom_fields) > 0) {
-			foreach($custom_fields as $myField) {
-				$myField['name'] = $this->Database->escape($myField['name']);
-				$query[] = "or `$myField[name]` like :search_term ";
-			}
-		}
-		$query[] = "or `switch` like :search_term ";
-		$query[] = "or `port` like :search_term ";				//port search
-		$query[] = "or `description` like :search_term ";		//descriptions
-		$query[] = "or `note` like :search_term ";				//note
-		$query[] = "or `mac` like :search_term ";				//mac
-		//tag
-		if($tags!==false)
-		$query[] = "or `state` like :tags ";				//tag
-		$query[] = "order by `ip_addr` asc;";
-
-		# join query
-		$query = implode("\n", $query);
-
-		# fetch
-		try { $result = $this->Database->getObjectsQuery($query, array("low"=>$low, "high"=>$high, "search_term"=>"%$search_term%", "tags"=>$tags)); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-		# result
-		return $result;
-	}
-
-	/**
-	 * Search subnets for provided range
-	 *
-	 *	First search range
-	 *	If host provided search also inside subnet ranges
-	 *
-	 * @access public
-	 * @param mixed $search_term
-	 * @param string $high (default: "")
-	 * @param string $low (default: "")
-	 * @param mixed $search_req
-	 * @param mixed $custom_fields (default: array())
-	 * @return array
-	 */
-	public function search_subnets($search_term, $high = "", $low = "", $search_req, $custom_fields = array()) {
-		# first search if range provided
-		$result1 = $this->search_subnets_range  ($search_term, $high, $low, $custom_fields);
-		# search inside subnets even if IP does not exist!
-		$result2 = $this->search_subnets_inside ($high, $low);
-		# search inside subnets even if IP does not exist - IPv6
-		$result3 = $this->search_subnets_inside_v6 ($high, $low, $search_req);
-		# merge arrays
-		$result = array_merge($result1, $result2, $result3);
-	    # result
-	    return array_filter($result);
-	}
-
-	/**
-	 * Search for subnets inside range
-	 *
-	 * @access private
-	 * @param mixed $search_term
-	 * @param string $high
-	 * @param string $low
-	 * @param mixed $custom_fields (default: array())
-	 * @return array
-	 */
-	private function search_subnets_range ($search_term, $high, $low, $custom_fields = array()) {
-		# reformat low/high
-		if($high==0 && $low==0)	{ $high = "1"; $low="1"; }
-
-		# set search query
-		$query[] = "select * from `subnets` where `description` like :search_term ";
-		$query[] = "or `subnet` between :low and :high ";
-		# custom
-	    if(sizeof($custom_fields) > 0) {
-			foreach($custom_fields as $myField) {
-				$myField['name'] = $this->Database->escape($myField['name']);
-				$query[] = " or `$myField[name]` like :search_term ";
-			}
-		}
-		$query[] = "order by `subnet` asc, `mask` asc;";
-
-		# join query
-		$query = implode("\n", $query);
-
-		# fetch
-		try { $result = $this->Database->getObjectsQuery($query, array("low"=>$low, "high"=>$high, "search_term"=>"%$search_term%")); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-		# result
-		return $result;
-	}
-
-	/**
-	 * Search inside subnets if host address is provided!
-	 *
-	 * @access private
-	 * @param string $high
-	 * @param string $low
-	 * @return array
-	 */
-	private function search_subnets_inside ($high, $low) {
-		if($low==$high) {
-			# subnets class
-			$Subnets = new Subnets ($this->Database);
-			# fetch all subnets
-			$subnets = $Subnets->fetch_all_subnets_search();
-			# loop and search
-			$ids = array();
-			foreach($subnets as $s) {
-				# cast
-				$s = (array) $s;
-
-				//first verify address type
-				$type = $this->identify_address($s['subnet']);
-
-				if($type == "IPv4") {
-					# Initialize PEAR NET object
-					$this->initialize_pear_net_IPv4 ();
-					# parse address
-					$net = $this->Net_IPv4->parseAddress($this->transform_address($s['subnet']).'/'.$s['mask'], "dotted");
-
-					if($low>$this->transform_to_decimal(@$net->network) && $low<$this->transform_address($net->broadcast, "decimal")) {
-						$ids[] = $s['id'];
-					}
-				}
-			}
-			# filter
-			$ids = sizeof(@$ids)>0 ? array_filter($ids) : array();
-
-			$result = array();
-
-			# search
-			if(sizeof($ids)>0) {
-				foreach($ids as $id) {
-					$result[] = $Subnets->fetch_subnet(null, $id);
-				}
-			}
-			# return
-			return sizeof(@$result)>0 ? array_filter($result) : array();
-		}
-		else {
-			return array();
-		}
-	}
-
-
-	/**
-	 * Search inside subnets if host address is provided! ipv6
-	 *
-	 * @access private
-	 * @param string $high
-	 * @param string $low
-	 * @return array
-	 */
-	private function search_subnets_inside_v6 ($high, $low, $search_req) {
-		// same
-		if($low==$high) {
-			# Initialize PEAR NET object
-			$this->initialize_pear_net_IPv6 ();
-
-			// validate
-			if ($this->Net_IPv6->checkIPv6($search_req)) {
-				# subnets class
-				$Subnets = new Subnets ($this->Database);
-				# fetch all subnets
-				$subnets = $Subnets->fetch_all_subnets_search("IPv6");
-				# loop and search
-				$ids = array();
-				foreach($subnets as $s) {
-					# cast
-					$s = (array) $s;
-					# parse address
-					$net = $this->Net_IPv6->parseAddress($this->transform_address($s['subnet'], "dotted").'/'.$s['mask']);
-
-					if(gmp_cmp($low, $this->transform_address(@$net['start'], "decimal")) == 1 && gmp_cmp($low, $this->transform_address(@$net['end'], "decimal")) == -1) {
-						$ids[] = $s['id'];
-
-					}
-				}
-				# filter
-				$ids = sizeof(@$ids)>0 ? array_filter($ids) : array();
-				# search
-				$result = array();
-				if(sizeof($ids)>0) {
-					foreach($ids as $id) {
-						$result[] = $Subnets->fetch_subnet(null, $id);
-					}
-				}
-				# return
-				return sizeof(@$result)>0 ? array_filter($result) : array();
-			}
-			// empty
-			else {
-				return array();
-			}
-		}
-		else {
-			return array();
-		}
-	}
-
-	/**
-	 * Function to search vlans
-	 *
-	 * @access public
-	 * @param mixed $search_term
-	 * @param array $custom_fields (default: array())
-	 * @return array
-	 */
-	public function search_vlans($search_term, $custom_fields = array()) {
-		# query
-		$query[] = "select * from `vlans` where `name` like :search_term or `description` like :search_term or `number` like :search_term ";
-		# custom
-	    if(sizeof($custom_fields) > 0) {
-			foreach($custom_fields as $myField) {
-				$myField['name'] = $this->Database->escape($myField['name']);
-				$query[] = " or `$myField[name]` like :search_term ";
-			}
-		}
-		$query[] = ";";
-		# join query
-		$query = implode("\n", $query);
-
-		# fetch
-		try { $search = $this->Database->getObjectsQuery($query, array("search_term"=>"%$search_term%")); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-
-	    # return result
-	    return $search;
-	}
-
-
-	/**
-	 * Function to search vrf
-	 *
-	 * @access public
-	 * @param mixed $search_term
-	 * @param array $custom_fields (default: array())
-	 * @return array
-	 */
-	public function search_vrfs ($search_term, $custom_fields = array()) {
-		# query
-		$query[] = "select * from `vrf` where `name` like :search_term or `description` like :search_term or `rd` like :search_term ";
-		# custom
-	    if(sizeof($custom_fields) > 0) {
-			foreach($custom_fields as $myField) {
-				$myField['name'] = $this->Database->escape($myField['name']);
-				$query[] = " or `$myField[name]` like :search_term ";
-			}
-		}
-		$query[] = ";";
-		# join query
-		$query = implode("\n", $query);
-
-		# fetch
-		try { $search = $this->Database->getObjectsQuery($query, array("search_term"=>"%$search_term%")); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-
-	    # return result
-	    return $search;
-	}
-
-	/**
-	 * Search for PSTN prefixes.
-	 *
-	 * @access public
-	 * @param mixed $search_term
-	 * @param array $custom_prefix_fields (default: array())
-	 * @return array
-	 */
-	public function search_pstn_refixes ($search_term, $custom_prefix_fields = array()) {
-		# query
-		$query[] = "select *,concat(prefix,start) as raw from `pstnPrefixes` where `prefix` like :search_term or `name` like :search_term or `description` like :search_term ";
-		# custom
-	    if(sizeof($custom_prefix_fields) > 0) {
-			foreach($custom_prefix_fields as $myField) {
-				$myField['name'] = $this->Database->escape($myField['name']);
-				$query[] = " or `$myField[name]` like :search_term ";
-			}
-		}
-		$query[] = "order by  raw asc;";
-		# join query
-		$query = implode("\n", $query);
-
-		# fetch
-		try { $search = $this->Database->getObjectsQuery($query, array("search_term"=>"%$search_term%")); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-
-	    # return result
-	    return $search;
-	}
-
-	/**
-	 * Search for PSTN numbers.
-	 *
-	 * @access public
-	 * @param mixed $search_term
-	 * @param array $custom_prefix_fields (default: array())
-	 * @return array
-	 */
-	public function search_pstn_numbers ($search_term, $custom_prefix_fields = array()) {
-		# query
-		$query[] = "select * from `pstnNumbers` where `number` like :search_term or `name` like :search_term or `description` like :search_term or `owner` like :search_term ";
-		# custom
-	    if(sizeof($custom_prefix_fields) > 0) {
-			foreach($custom_prefix_fields as $myField) {
-				$myField['name'] = $this->Database->escape($myField['name']);
-				$query[] = " or `$myField[name]` like :search_term ";
-			}
-		}
-		$query[] = "order by number asc;";
-		# join query
-		$query = implode("\n", $query);
-
-		# fetch
-		try { $search = $this->Database->getObjectsQuery($query, array("search_term"=>"%$search_term%")); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-
-	    # return result
-	    return $search;
-	}
-
-	/**
-	 * Search for circuits.
-	 *
-	 * @access public
-	 * @param mixed $search_term
-	 * @param array $custom_circuit_fields (default: array())
-	 * @return array
-	 */
-	public function search_circuits ($search_term, $custom_circuit_fields = array()) {
-		# query
-		$query[] = "select c.id,c.cid,c.type,c.device1,c.location1,c.device2,c.location2,p.name,p.description,p.contact,c.capacity,p.id as pid,c.status ";
-		$query[] = "from circuits as c, circuitProviders as p ";
-		$query[] = "where c.provider = p.id";
-		$query[] = "and (`cid` like :search_term or `type` like :search_term or `capacity` like :search_term or `comment` like :search_term or `name` like :search_term)";
-		# custom
-	    if(sizeof($custom_circuit_fields) > 0) {
-			foreach($custom_circuit_fields as $myField) {
-				$myField['name'] = $this->Database->escape($myField['name']);
-				$query[] = " or `$myField[name]` like :search_term ";
-			}
-		}
-
-		$query[] = "order by c.cid asc;";
-		# join query
-		$query = implode("\n", $query);
-
-		# fetch
-		try { $search = $this->Database->getObjectsQuery($query, array("search_term"=>"%$search_term%")); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-
-	    # return result
-	    return $search;
-	}
-
-
-	/**
-	 * Search for circuit providers
-	 *
-	 * @access public
-	 * @param mixed $search_term
-	 * @param array $custom_circuit_fields (default: array())
-	 * @return array
-	 */
-	public function search_circuit_providers ($search_term, $custom_circuit_fields = array()) {
-		# query
-		$query[] = "select * from `circuitProviders` where `name` like :search_term or `description` like :search_term or `contact` like :search_term ";
-		# custom
-	    if(sizeof($custom_circuit_fields) > 0) {
-			foreach($custom_circuit_fields as $myField) {
-				$myField['name'] = $this->Database->escape($myField['name']);
-				$query[] = " or `$myField[name]` like :search_term ";
-			}
-		}
-		$query[] = "order by name asc;";
-		# join query
-		$query = implode("\n", $query);
-
-		# fetch
-		try { $search = $this->Database->getObjectsQuery($query, array("search_term"=>"%$search_term%")); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-
-	    # return result
-	    return $search;
-	}
-
-	/**
-	 * Reformat possible nun-full IPv4 address for search
-	 *
-	 *	e.g. 10.10.10 -> 10.10.10.0 - 10.10.10.255
-	 *
-	 * @access public
-	 * @param mixed $address
-	 * @return array high/low decimal address
-	 */
-	public function reformat_IPv4_for_search ($address) {
-		# remove % sign if present
-		$address = str_replace("%", "", $address);
-		# we need Addresses class
-		$Addresses = new Addresses ($this->Database);
-
-		# if subnet is provided we have all data
-		if(strpos($address, "/")>0) {
-			# Initialize PEAR NET object
-			$this->initialize_pear_net_IPv4 ();
-			$net = $this->Net_IPv4->parseAddress($address);
-
-			$result['low']   = $Addresses->transform_to_decimal($net->network);
-			$result['high']	 = $Addresses->transform_to_decimal($net->broadcast);
-		}
-		# else calculate options
-		else {
-			# if subnet is not provided maybe wildcard is, so explode it to array
-			$address = explode(".", $address);
+    /**
+     * settings
+     *
+     * (default value: null)
+     *
+     * @var object
+     * @access public
+     */
+    public $settings = null;
+
+    /**
+     * (array) IP address types from Addresses object
+     *
+     * (default value: null)
+     *
+     * @var mixed
+     * @access public
+     */
+    public $address_types = null;
+
+    /**
+     * CSV delimiter
+     *
+     * @var string
+     */
+    public $csv_delimiter = ",";
+
+    /**
+     * PEAR NET IPv4 object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Net_IPv4;
+
+    /**
+     * PEAR NET IPv6 object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Net_IPv6;
+
+    /**
+     * Addresses object
+     *
+     * (default value: false)
+     *
+     * @var bool|object
+     * @access protected
+     */
+    protected $Addresses = false;
+
+    /**
+     * for Result printing
+     *
+     * @var object
+     * @access public
+     */
+    public $Result;
+
+    /**
+     * debugging flag
+     *
+     * (default value: false)
+     *
+     * @var bool
+     * @access protected
+     */
+    protected $debugging = false;
+
+    /**
+     * Database connection
+     *
+     * @var object
+     * @access protected
+     */
+    protected $Database;
+
+
+
+
+
+    /**
+     * __construct method
+     *
+     * @access public
+     */
+    public function __construct (Database_PDO $database) {
+        # set database object
+        $this->Database = $database;
+        # initialize Result
+        $this->Result = new Result ();
+        # set debugging
+        $this->set_debugging ();
+    }
+
+
+
+
+
+
+
+
+
+
+
+    /**
+     *	@VLAN specific methods
+     *	--------------------------------
+     */
+
+    /**
+     * Fetch vlans and subnets for tools vlan display. Joined query
+     *
+     * @access public
+     * @param int $domainId (default: 1)
+     * @return array|bool
+     */
+    public function fetch_vlans_and_subnets ($domainId=1) {
+        # custom fields
+        $custom_fields = $this->fetch_custom_fields("vlans");
+        # if set add to query
+        $custom_fields_query = "";
+        if(sizeof($custom_fields)>0) {
+            foreach($custom_fields as $myField) {
+                $custom_fields_query  .= ',`vlans`.`'.$myField['name'].'`';
+            }
+        }
+        # set query
+        $query = 'SELECT vlans.vlanId,vlans.number,vlans.name,vlans.description,vlans.customer_id,subnets.subnet,subnets.mask,subnets.id AS subnetId,subnets.sectionId'.@$custom_fields_query.' FROM vlans LEFT JOIN subnets ON subnets.vlanId = vlans.vlanId where vlans.`domainId` = ? ORDER BY vlans.number ASC;';
+        # fetch
+        try { $vlans = $this->Database->getObjectsQuery($query, array($domainId)); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+
+        # reorder
+        $out = array();
+        foreach ($vlans as $vlan) {
+            $out[$vlan->vlanId][] = $vlan;
+        }
+        # result
+        return is_array($out) ? array_values($out) : false;
+    }
+
+    /**
+     * Validates VLAN
+     *
+     *	not 1
+     *	integer
+     *	not higher that maxVLAN from settings
+     *
+     * @access public
+     * @param int $number
+     * @return mixed|bool
+     */
+    public function validate_vlan ($number) {
+        # fetch highest vlan id
+        $settings = $this->get_settings();
+
+        if(empty($number)) 							{ return true; }
+        elseif(!is_numeric($number)) 				{ return _('VLAN must be numeric value!'); }
+        elseif ($number > $settings['vlanMax']) 	{ return _('Vlan number can be max '.$settings['vlanMax']); }
+        else 										{ return true; }
+    }
+
+
+
+
+
+
+
+    /**
+     *	@search methods
+     *	--------------------------------
+     */
+
+
+    /**
+     * Search database for addresses
+     *
+     * @access public
+     * @param mixed $search_term
+     * @param string $high (default: "")
+     * @param string $low (default: "")
+     * @param array $custom_fields (default: array())
+     * @return array
+     */
+    public function search_addresses($search_term, $high = "", $low = "", $custom_fields = array()) {
+
+        $tags = $this->fetch_all_objects ("ipTags", "id");
+        foreach ($tags as $t) {
+            if(strtolower($t->type)==strtolower($search_term)) {
+                $tags = $t->id;
+                break;
+            }
+            $tags = false;
+        }
+
+        # set search query
+        $query[] = "select * from `ipaddresses` ";
+        $query[] = "where `ip_addr` between :low and :high ";	//ip range
+        $query[] = "or `hostname` like :search_term ";			//hostname
+        $query[] = "or `owner` like :search_term ";				//owner
+        # custom fields
+        if(sizeof($custom_fields) > 0) {
+            foreach($custom_fields as $myField) {
+                $myField['name'] = $this->Database->escape($myField['name']);
+                $query[] = "or `$myField[name]` like :search_term ";
+            }
+        }
+        $query[] = "or `switch` like :search_term ";
+        $query[] = "or `port` like :search_term ";				//port search
+        $query[] = "or `description` like :search_term ";		//descriptions
+        $query[] = "or `note` like :search_term ";				//note
+        $query[] = "or `mac` like :search_term ";				//mac
+        //tag
+        if($tags!==false)
+        $query[] = "or `state` like :tags ";				//tag
+        $query[] = "order by `ip_addr` asc;";
+
+        # join query
+        $query = implode("\n", $query);
+
+        # fetch
+        try { $result = $this->Database->getObjectsQuery($query, array("low"=>$low, "high"=>$high, "search_term"=>"%$search_term%", "tags"=>$tags)); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+        # result
+        return $result;
+    }
+
+    /**
+     * Search subnets for provided range
+     *
+     *	First search range
+     *	If host provided search also inside subnet ranges
+     *
+     * @access public
+     * @param mixed $search_term
+     * @param string $high (default: "")
+     * @param string $low (default: "")
+     * @param mixed $search_req
+     * @param mixed $custom_fields (default: array())
+     * @return array
+     */
+    public function search_subnets($search_term, $high = "", $low = "", $search_req, $custom_fields = array()) {
+        # first search if range provided
+        $result1 = $this->search_subnets_range  ($search_term, $high, $low, $custom_fields);
+        # search inside subnets even if IP does not exist!
+        $result2 = $this->search_subnets_inside ($high, $low);
+        # search inside subnets even if IP does not exist - IPv6
+        $result3 = $this->search_subnets_inside_v6 ($high, $low, $search_req);
+        # merge arrays
+        $result = array_merge($result1, $result2, $result3);
+        # result
+        return array_filter($result);
+    }
+
+    /**
+     * Search for subnets inside range
+     *
+     * @access private
+     * @param mixed $search_term
+     * @param string $high
+     * @param string $low
+     * @param mixed $custom_fields (default: array())
+     * @return array
+     */
+    private function search_subnets_range ($search_term, $high, $low, $custom_fields = array()) {
+        # reformat low/high
+        if($high==0 && $low==0)	{ $high = "1"; $low="1"; }
+
+        # set search query
+        $query[] = "select * from `subnets` where `description` like :search_term ";
+        $query[] = "or `subnet` between :low and :high ";
+        # custom
+        if(sizeof($custom_fields) > 0) {
+            foreach($custom_fields as $myField) {
+                $myField['name'] = $this->Database->escape($myField['name']);
+                $query[] = " or `$myField[name]` like :search_term ";
+            }
+        }
+        $query[] = "order by `subnet` asc, `mask` asc;";
+
+        # join query
+        $query = implode("\n", $query);
+
+        # fetch
+        try { $result = $this->Database->getObjectsQuery($query, array("low"=>$low, "high"=>$high, "search_term"=>"%$search_term%")); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+        # result
+        return $result;
+    }
+
+    /**
+     * Search inside subnets if host address is provided!
+     *
+     * @access private
+     * @param string $high
+     * @param string $low
+     * @return array
+     */
+    private function search_subnets_inside ($high, $low) {
+        if($low==$high) {
+            # subnets class
+            $Subnets = new Subnets ($this->Database);
+            # fetch all subnets
+            $subnets = $Subnets->fetch_all_subnets_search();
+            # loop and search
+            $ids = array();
+            foreach($subnets as $s) {
+                # cast
+                $s = (array) $s;
+
+                //first verify address type
+                $type = $this->identify_address($s['subnet']);
+
+                if($type == "IPv4") {
+                    # Initialize PEAR NET object
+                    $this->initialize_pear_net_IPv4 ();
+                    # parse address
+                    $net = $this->Net_IPv4->parseAddress($this->transform_address($s['subnet']).'/'.$s['mask'], "dotted");
+
+                    if($low>$this->transform_to_decimal(@$net->network) && $low<$this->transform_address($net->broadcast, "decimal")) {
+                        $ids[] = $s['id'];
+                    }
+                }
+            }
+            # filter
+            $ids = sizeof(@$ids)>0 ? array_filter($ids) : array();
+
+            $result = array();
+
+            # search
+            if(sizeof($ids)>0) {
+                foreach($ids as $id) {
+                    $result[] = $Subnets->fetch_subnet(null, $id);
+                }
+            }
+            # return
+            return sizeof(@$result)>0 ? array_filter($result) : array();
+        }
+        else {
+            return array();
+        }
+    }
+
+
+    /**
+     * Search inside subnets if host address is provided! ipv6
+     *
+     * @access private
+     * @param string $high
+     * @param string $low
+     * @return array
+     */
+    private function search_subnets_inside_v6 ($high, $low, $search_req) {
+        // same
+        if($low==$high) {
+            # Initialize PEAR NET object
+            $this->initialize_pear_net_IPv6 ();
+
+            // validate
+            if ($this->Net_IPv6->checkIPv6($search_req)) {
+                # subnets class
+                $Subnets = new Subnets ($this->Database);
+                # fetch all subnets
+                $subnets = $Subnets->fetch_all_subnets_search("IPv6");
+                # loop and search
+                $ids = array();
+                foreach($subnets as $s) {
+                    # cast
+                    $s = (array) $s;
+                    # parse address
+                    $net = $this->Net_IPv6->parseAddress($this->transform_address($s['subnet'], "dotted").'/'.$s['mask']);
+
+                    if(gmp_cmp($low, $this->transform_address(@$net['start'], "decimal")) == 1 && gmp_cmp($low, $this->transform_address(@$net['end'], "decimal")) == -1) {
+                        $ids[] = $s['id'];
+
+                    }
+                }
+                # filter
+                $ids = sizeof(@$ids)>0 ? array_filter($ids) : array();
+                # search
+                $result = array();
+                if(sizeof($ids)>0) {
+                    foreach($ids as $id) {
+                        $result[] = $Subnets->fetch_subnet(null, $id);
+                    }
+                }
+                # return
+                return sizeof(@$result)>0 ? array_filter($result) : array();
+            }
+            // empty
+            else {
+                return array();
+            }
+        }
+        else {
+            return array();
+        }
+    }
+
+    /**
+     * Function to search vlans
+     *
+     * @access public
+     * @param mixed $search_term
+     * @param array $custom_fields (default: array())
+     * @return array
+     */
+    public function search_vlans($search_term, $custom_fields = array()) {
+        # query
+        $query[] = "select * from `vlans` where `name` like :search_term or `description` like :search_term or `number` like :search_term ";
+        # custom
+        if(sizeof($custom_fields) > 0) {
+            foreach($custom_fields as $myField) {
+                $myField['name'] = $this->Database->escape($myField['name']);
+                $query[] = " or `$myField[name]` like :search_term ";
+            }
+        }
+        $query[] = ";";
+        # join query
+        $query = implode("\n", $query);
+
+        # fetch
+        try { $search = $this->Database->getObjectsQuery($query, array("search_term"=>"%$search_term%")); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+
+        # return result
+        return $search;
+    }
+
+
+    /**
+     * Function to search vrf
+     *
+     * @access public
+     * @param mixed $search_term
+     * @param array $custom_fields (default: array())
+     * @return array
+     */
+    public function search_vrfs ($search_term, $custom_fields = array()) {
+        # query
+        $query[] = "select * from `vrf` where `name` like :search_term or `description` like :search_term or `rd` like :search_term ";
+        # custom
+        if(sizeof($custom_fields) > 0) {
+            foreach($custom_fields as $myField) {
+                $myField['name'] = $this->Database->escape($myField['name']);
+                $query[] = " or `$myField[name]` like :search_term ";
+            }
+        }
+        $query[] = ";";
+        # join query
+        $query = implode("\n", $query);
+
+        # fetch
+        try { $search = $this->Database->getObjectsQuery($query, array("search_term"=>"%$search_term%")); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+
+        # return result
+        return $search;
+    }
+
+    /**
+     * Search for PSTN prefixes.
+     *
+     * @access public
+     * @param mixed $search_term
+     * @param array $custom_prefix_fields (default: array())
+     * @return array
+     */
+    public function search_pstn_refixes ($search_term, $custom_prefix_fields = array()) {
+        # query
+        $query[] = "select *,concat(prefix,start) as raw from `pstnPrefixes` where `prefix` like :search_term or `name` like :search_term or `description` like :search_term ";
+        # custom
+        if(sizeof($custom_prefix_fields) > 0) {
+            foreach($custom_prefix_fields as $myField) {
+                $myField['name'] = $this->Database->escape($myField['name']);
+                $query[] = " or `$myField[name]` like :search_term ";
+            }
+        }
+        $query[] = "order by  raw asc;";
+        # join query
+        $query = implode("\n", $query);
+
+        # fetch
+        try { $search = $this->Database->getObjectsQuery($query, array("search_term"=>"%$search_term%")); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+
+        # return result
+        return $search;
+    }
+
+    /**
+     * Search for PSTN numbers.
+     *
+     * @access public
+     * @param mixed $search_term
+     * @param array $custom_prefix_fields (default: array())
+     * @return array
+     */
+    public function search_pstn_numbers ($search_term, $custom_prefix_fields = array()) {
+        # query
+        $query[] = "select * from `pstnNumbers` where `number` like :search_term or `name` like :search_term or `description` like :search_term or `owner` like :search_term ";
+        # custom
+        if(sizeof($custom_prefix_fields) > 0) {
+            foreach($custom_prefix_fields as $myField) {
+                $myField['name'] = $this->Database->escape($myField['name']);
+                $query[] = " or `$myField[name]` like :search_term ";
+            }
+        }
+        $query[] = "order by number asc;";
+        # join query
+        $query = implode("\n", $query);
+
+        # fetch
+        try { $search = $this->Database->getObjectsQuery($query, array("search_term"=>"%$search_term%")); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+
+        # return result
+        return $search;
+    }
+
+    /**
+     * Search for circuits.
+     *
+     * @access public
+     * @param mixed $search_term
+     * @param array $custom_circuit_fields (default: array())
+     * @return array
+     */
+    public function search_circuits ($search_term, $custom_circuit_fields = array()) {
+        # query
+        $query[] = "select c.id,c.cid,c.type,c.device1,c.location1,c.device2,c.location2,p.name,p.description,p.contact,c.capacity,p.id as pid,c.status ";
+        $query[] = "from circuits as c, circuitProviders as p ";
+        $query[] = "where c.provider = p.id";
+        $query[] = "and (`cid` like :search_term or `type` like :search_term or `capacity` like :search_term or `comment` like :search_term or `name` like :search_term)";
+        # custom
+        if(sizeof($custom_circuit_fields) > 0) {
+            foreach($custom_circuit_fields as $myField) {
+                $myField['name'] = $this->Database->escape($myField['name']);
+                $query[] = " or `$myField[name]` like :search_term ";
+            }
+        }
+
+        $query[] = "order by c.cid asc;";
+        # join query
+        $query = implode("\n", $query);
+
+        # fetch
+        try { $search = $this->Database->getObjectsQuery($query, array("search_term"=>"%$search_term%")); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+
+        # return result
+        return $search;
+    }
+
+
+    /**
+     * Search for circuit providers
+     *
+     * @access public
+     * @param mixed $search_term
+     * @param array $custom_circuit_fields (default: array())
+     * @return array
+     */
+    public function search_circuit_providers ($search_term, $custom_circuit_fields = array()) {
+        # query
+        $query[] = "select * from `circuitProviders` where `name` like :search_term or `description` like :search_term or `contact` like :search_term ";
+        # custom
+        if(sizeof($custom_circuit_fields) > 0) {
+            foreach($custom_circuit_fields as $myField) {
+                $myField['name'] = $this->Database->escape($myField['name']);
+                $query[] = " or `$myField[name]` like :search_term ";
+            }
+        }
+        $query[] = "order by name asc;";
+        # join query
+        $query = implode("\n", $query);
+
+        # fetch
+        try { $search = $this->Database->getObjectsQuery($query, array("search_term"=>"%$search_term%")); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+
+        # return result
+        return $search;
+    }
+
+    /**
+     * Reformat possible nun-full IPv4 address for search
+     *
+     *	e.g. 10.10.10 -> 10.10.10.0 - 10.10.10.255
+     *
+     * @access public
+     * @param mixed $address
+     * @return array high/low decimal address
+     */
+    public function reformat_IPv4_for_search ($address) {
+        # remove % sign if present
+        $address = str_replace("%", "", $address);
+        # we need Addresses class
+        $Addresses = new Addresses ($this->Database);
+
+        # if subnet is provided we have all data
+        if(strpos($address, "/")>0) {
+            # Initialize PEAR NET object
+            $this->initialize_pear_net_IPv4 ();
+            $net = $this->Net_IPv4->parseAddress($address);
+
+            $result['low']   = $Addresses->transform_to_decimal($net->network);
+            $result['high']	 = $Addresses->transform_to_decimal($net->broadcast);
+        }
+        # else calculate options
+        else {
+            # if subnet is not provided maybe wildcard is, so explode it to array
+            $address = explode(".", $address);
             # remove empty
             foreach($address as $k=>$a) {
                 if (strlen($a)==0)  unset($address[$k]);
             }
-
-			# 4 pieces is ok, host
-			if (sizeof($address) == 4) {
-				$result['low'] = $result['high'] = $Addresses->transform_to_decimal(implode(".", $address));
-			}
-			# 3 pieces, we need to modify > check whole subnet
-			elseif (sizeof($address) == 3) {
-				$result['low']  = $Addresses->transform_to_decimal(implode(".", array_merge($address, array(0))));
-				$result['high'] = $Addresses->transform_to_decimal(implode(".", array_merge($address, array(255))));
-			}
-			# 2 pieces also
-			elseif (sizeof($address) == 2) {
-				$result['low']  = $Addresses->transform_to_decimal(implode(".", array_merge($address, array(0,0))));
-				$result['high'] = $Addresses->transform_to_decimal(implode(".", array_merge($address, array(255,255))));
-			}
-			# 1 piece also
-			elseif (sizeof($address) == 1) {
-				$result['low']  = $Addresses->transform_to_decimal(implode(".", array_merge($address, array(0,0,0))));
-				$result['high'] = $Addresses->transform_to_decimal(implode(".", array_merge($address, array(255,255,255))));
-			}
-			# else return same value
-			else {
-				$result['low']  = implode(".", $address);
-				$result['high'] = implode(".", $address);
-			}
-		}
-		# return result array low/high
-		return $result;
-	}
-
-	/**
-	 * Reformat possible non-full IPv6 address for search - set lowest and highest IPs
-	 *
-	 *	we can have
-	 *		a:a:a:a:a:a:a
-	 *		a:a:a::a
-	 *		a:a:a:a:a:a:a:a/mask
-	 *
-	 * @access public
-	 * @param mixed $address
-	 * @return array
-	 */
-	public function reformat_IPv6_for_search ($address) {
-		# parse address
-		$this->initialize_pear_net_IPv6 ();
-
-		$return = array();
-
-		# validate
-		if ($this->Net_IPv6->checkIPv6($address)==false) {
-			// return 0
-			return array("high"=>0, "low"=>0);
-		}
-		else {
-			# fake mask
-			if (strpos($address, "/")==0)	{ $address .= "/128"; }
-
-			# parse address
-			$parsed = $this->Net_IPv6->parseAddress($address);
-
-			# result
-			$return['low']  = gmp_strval($this->transform_address($parsed['start'], "decimal"));
-			$return['high'] = gmp_strval($this->transform_address($parsed['end'], "decimal"));
-
-			# return result array low/high
-			return $return;
-		}
-	}
-
-
-
-
-
-
-
-
-
-
-
-
-
-	/**
-	 *	@custom fields methods
-	 *	--------------------------------
-	 */
-
-	/**
-	 * Fetches all custom fields
-	 *
-	 * @access public
-	 * @param mixed $table
-	 * @return array
-	 */
-	public function fetch_custom_fields ($table) {
-    	# fetch columns
-		$fields = $this->fetch_columns ($table);
-
-		$res = array();
-
-		# save Field values only
-		foreach($fields as $field) {
-			# cast
-			$field = (array) $field;
-
-			$res[$field['Field']]['name'] 	 = $field['Field'];
-			$res[$field['Field']]['type'] 	 = $field['Type'];
-			$res[$field['Field']]['Comment'] = $field['Comment'];
-			$res[$field['Field']]['Null'] 	 = $field['Null'];
-			$res[$field['Field']]['Default'] = $field['Default'];
-		}
-
-		# fetch standard fields
-		$standard = $this->fetch_standard_fields ($table);
-
-		# remove them
-		foreach($standard as $st) {
-			unset($res[$st]);
-		}
-		# return array
-		return sizeof($res)==0 ? array() : $res;
-	}
-
-	/**
-	 * Fetches all custom fields and reorders them into numeric array
-	 *
-	 * @access public
-	 * @param mixed $table
-	 * @return array
-	 */
-	public function fetch_custom_fields_numeric ($table) {
-		# fetch all custom fields
-		$custom_fields = $this->fetch_custom_fields ($table);
-		# make numberic array
-		if(sizeof($custom_fields)>0) {
-			foreach($custom_fields as $f) {
-				$out[] = $f;
-			}
-			# result
-			return isset($out) ? $out : array();
-		}
-		else {
-			return array();
-		}
-	}
-
-	/**
-	 * Fetch all fields configured in table - standard + custom
-	 *
-	 * @access private
-	 * @param mixed $table
-	 * @return array
-	 */
-	private function fetch_columns ($table) {
-		# escape method/table
-		$table = $this->Database->escape($table);
-    	# fetch columns
-		$query    = "show full columns from `$table`;";
-		# fetch
-	    try { $fields = $this->Database->getObjectsQuery($query); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
-
-		return (array) $fields;
-	}
-
-	/**
-	 * Read the SCHEMA.sql file and enforce UNIX LF
-	 *
-	 * @access private
-	 * @return array
-	 */
-	private function read_db_schema() {
-		$fh = fopen(dirname(__FILE__) . '/../../db/SCHEMA.sql', 'r');
-		$schema = str_replace("\r\n", "\n", fread($fh, 100000));
-		return $schema;
-	}
-
-	/**
-	 * Fetches standard database fields from SCHEMA.sql file
-	 *
-	 * @access public
-	 * @param mixed $table
-	 * @return array
-	 */
-	public function fetch_standard_fields ($table) {
-		# get SCHEMA.SQL file
-		$schema = $this->read_db_schema();
-
-		# get definition
-		$definition = strstr($schema, "CREATE TABLE `$table` (");
-		$definition = trim(strstr($definition, ";" . "\n", true));
-
-		# get each line to array
-		$definition = explode("\n", $definition);
-
-		# go through,if it begins with ` use it !
-		$out = array();
-		foreach($definition as $d) {
-			$d = trim($d);
-			if(strpos(trim($d), "`")==0) {
-				$d = strstr(trim($d, "`"), "`", true);
-				$out[] = substr($d, strpos($d, "`"));
-			}
-		}
-		# return array of fields
-		return is_array($out) ? array_filter($out) : array();
-	}
-
-	/**
-	 * Fetches standard tables from SCHEMA.sql file
-	 *
-	 * @return array
-	 */
-	public function fetch_standard_tables () {
-		# get SCHEMA.SQL file
-		$schema = $this->read_db_schema();
-
-		# get definitions to array, explode with CREATE TABLE `
-		$creates = explode("CREATE TABLE `", $schema);
-		# fill tables array
-		$tables = array();
-		foreach($creates as $k=>$c) {
-			if($k>0)	{ $tables[] = strstr($c, "`", true); }	//we exclude first !
-		}
-
-		# return array of tables
-		return $tables;
-	}
-
-	/**
-	 * This functions fetches all columns for specified Field
-	 *
-	 * Array (Field, Type, Collation, Null, Comment)
-	 *
-	 * @access public
-	 * @param mixed $table
-	 * @param mixed $field
-	 * @return array
-	 */
-	public function fetch_full_field_definition ($table, $field) {
-		# escape field
-		$table = $this->Database->escape($table);
-		# fetch
-	    try { $field_data = $this->Database->getObjectQuery("show full columns from `$table` where `Field` = ?;", array($field)); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
-		# result
-	    return($field_data);
-	}
-
-
-
-
-
-
-
-
-
-
-
-
-	/**
-	 *	@widget methods
-	 *	--------------------------------
-	 */
-
-	/**
-	 * Fetches all widgets
-	 *
-	 * @access public
-	 * @param bool $admin (default: false)
-	 * @param bool $inactive (default: false)
-	 * @return array
-	 */
-	public function fetch_widgets ($admin = false, $inactive = false) {
-
-		# inactive also - only for administration
-		if($inactive) 			{ $query = "select * from `widgets`; "; }
-		else {
-			# admin?
-			if($admin) 			{ $query = "select * from `widgets` where `wactive` = 'yes'; "; }
-			else				{ $query = "select * from `widgets` where `wadminonly` = 'no' and `wactive` = 'yes'; "; }
-		}
-	    # fetch
-	    try { $widgets = $this->Database->getObjectsQuery($query); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
-
-	    # reindex
-	    $wout = array();
-	    foreach($widgets as $w) {
-			$wout[$w->wfile] = $w;
-	    }
-
-	    # return results
-	    return $wout;
-	}
-
-	/**
-	 * Verify that widget file exists
-	 *
-	 * @access public
-	 * @return bool
-	 */
-	public function verify_widget ($file) {
-		return file_exists(dirname(__FILE__)."/../../app/dashboard/widgets/$file.php")||file_exists(dirname(__FILE__)."/../../app/dashboard/widgets/custom/$file.php") ? true : false;
-	}
-
-
-
-
-
-
-
-
-
-
-	/**
-	 *	@request methods (for IP request)
-	 *	--------------------------------
-	 */
-
-	/**
-	 * fetches all IP requests and saves them to $requests
-	 *
-	 * @access public
-	 * @return int|array
-	 */
-	public function requests_fetch ($num = true) {
-		return $num ? $this->requests_fetch_num () : $this->requests_fetch_objects ();
-	}
-
-	/**
-	 * Fetches number of active IP requests
-	 *
-	 * @access private
-	 * @return int
-	 */
-	private function requests_fetch_num () {
-    	return $this->count_database_objects ("requests", "processed", 0);
-	}
-
-	/**
-	 * Fetches all requests and saves them to $requests
-	 *
-	 * @access private
-	 * @return array
-	 */
-	private function requests_fetch_objects () {
-    	return $this->fetch_multiple_objects ("requests", "processed", 0);
-	}
-
-	/**
-	 * Fetches all subnets that are set to allow requests
-	 *
-	 * @access public
-	 * @return array|null
-	 */
-	public function requests_fetch_available_subnets () {
-		try { $subnets = $this->Database->getObjectsQuery("SELECT * FROM `subnets` where `allowRequests`=1 and `isFull` != 1 ORDER BY `subnet`;"); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
-
-		# save
-		return sizeof($subnets)>0 ? (array) $subnets : NULL;
-	}
-
-	/**
-	 * Sends mail for IP request
-	 *
-	 * @access public
-	 * @param string $action (default: "new")
-	 * @param mixed $values
-	 * @return bool
-	 */
-	public function ip_request_send_mail ($action="new", $values) {
-
-		$this->get_settings ();
-
-		# try to send
-		try {
-			# fetch mailer settings
-			$mail_settings = $this->fetch_object("settingsMail", "id", 1);
-
-			# initialize mailer
-			$phpipam_mail = new phpipam_mail($this->settings, $mail_settings);
-
-			# get all users and check who to end mail to
-			$recipients = $this->ip_request_get_mail_recipients ($values['subnetId']);
-
-			# add requester to cc
-			$recipients_requester = $values['requester'];
-
-			# reformat key / vaues
-			$values = $this->ip_request_reformat_mail_values ($values);
-			#reformat empty
-			$values = $this->reformat_empty_array_fields ($values, "/");
-
-			# generate content
-			if ($action=="new")			{ $subject	= "New IP address request"; }
-			elseif ($action=="accept")	{ $subject	= "IP address request accepted"; }
-			elseif ($action=="reject")	{ $subject	= "IP address request rejected"; }
-			else						{ $this->Result->show("danger", _("Invalid request action"), true); }
-
-			// set html content
-			$content[] = "<table style='margin-left:10px;margin-top:20px;width:auto;padding:0px;border-collapse:collapse;'>";
-			$content[] = "<tr><td colspan='2' style='margin:0px;>$this->mail_font_style <strong>$subject</strong></font></td></tr>";
-			foreach($values as $k=>$v) {
-			// title search
-			if (preg_match("/s_title_/", $k)) {
-			$content[] = "<tr><td colspan='2' style='margin:0px;border-bottom:1px solid #eeeeee;'>$this->mail_font_style<strong>$v</strong></font></td></tr>";
-			}
-			else {
-			//content
-			$content[] = "<tr>";
-			$content[] = "<td style='padding-left:15px;margin:0px;'>$this->mail_font_style $k</font></td>";
-			$content[] = "<td style='padding-left:15px;margin:0px;'>$this->mail_font_style $v</font></td>";
-			$content[] = "</tr>";
-			}
-			}
-			$content[] = "<tr><td style='padding-top:15px;padding-bottom:3px;text-align:right;color:#ccc;'>$this->mail_font_style Sent at ".date('Y/m/d H:i')."</font></td></tr>";
-			//set alt content
-			$content_plain[] = "$subject"."\r\n------------------------------\r\n";
-			foreach($values as $k=>$v) {
-			$content_plain[] = $k." => ".$v;
-			}
-			$content_plain[] = "\r\n\r\nSent at ".date('Y/m/d H:i');
-			$content[] = "</table>";
-
-			// set content
-			$content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
-			$content_plain 	= implode("\r\n",$content_plain);
-
-			$phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
-			if ($recipients!==false) {
-			foreach($recipients as $r) {
-			$phpipam_mail->Php_mailer->addAddress(addslashes(trim($r->email)));
-			}
-			$phpipam_mail->Php_mailer->AddCC(addslashes(trim($recipients_requester)));
-			}
-			else {
-			$phpipam_mail->Php_mailer->addAddress(addslashes(trim($recipients_requester)));
-			}
-			$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) {
-			$this->Result->show("danger", "Mailer Error: ".$e->errorMessage(), true);
-		} catch (Exception $e) {
-			$this->Result->show("danger", "Mailer Error: ".$e->getMessage(), true);
-		}
-
-		# ok
-		return true;
-
-	}
-
-	/**
-	 * Returns list of recipients to get new
-	 *
-	 * @access private
-	 * @param bool|mixed $subnetId
-	 * @return array|bool
-	 */
-	private function ip_request_get_mail_recipients ($subnetId = false) {
-    	// fetch all users with mailNotify
-        $notification_users = $this->fetch_multiple_objects ("users", "mailNotify", "Yes", "id", true);
-        // recipients array
-        $recipients = array();
-        // any ?
-        if ($notification_users!==false) {
-         	// if subnetId is set check who has permissions
-        	if (isset($subnetId)) {
-             	foreach ($notification_users as $u) {
-                	// inti object
-                	$Subnets = new Subnets ($this->Database);
-                	//check permissions
-                	$subnet_permission = $Subnets->check_permission($u, $subnetId);
-                	// if 3 than add
-                	if ($subnet_permission==3) {
-                    	$recipients[] = $u;
-                	}
-            	}
-        	}
-        	else {
-            	foreach ($notification_users as $u) {
-                	if($u->role=="Administrator") {
-                    	$recipients[] = $u;
-                	}
-            	}
-        	}
-        	return sizeof($recipients)>0 ? $recipients : false;
+
+            # 4 pieces is ok, host
+            if (sizeof($address) == 4) {
+                $result['low'] = $result['high'] = $Addresses->transform_to_decimal(implode(".", $address));
+            }
+            # 3 pieces, we need to modify > check whole subnet
+            elseif (sizeof($address) == 3) {
+                $result['low']  = $Addresses->transform_to_decimal(implode(".", array_merge($address, array(0))));
+                $result['high'] = $Addresses->transform_to_decimal(implode(".", array_merge($address, array(255))));
+            }
+            # 2 pieces also
+            elseif (sizeof($address) == 2) {
+                $result['low']  = $Addresses->transform_to_decimal(implode(".", array_merge($address, array(0,0))));
+                $result['high'] = $Addresses->transform_to_decimal(implode(".", array_merge($address, array(255,255))));
+            }
+            # 1 piece also
+            elseif (sizeof($address) == 1) {
+                $result['low']  = $Addresses->transform_to_decimal(implode(".", array_merge($address, array(0,0,0))));
+                $result['high'] = $Addresses->transform_to_decimal(implode(".", array_merge($address, array(255,255,255))));
+            }
+            # else return same value
+            else {
+                $result['low']  = implode(".", $address);
+                $result['high'] = implode(".", $address);
+            }
+        }
+        # return result array low/high
+        return $result;
+    }
+
+    /**
+     * Reformat possible non-full IPv6 address for search - set lowest and highest IPs
+     *
+     *	we can have
+     *		a:a:a:a:a:a:a
+     *		a:a:a::a
+     *		a:a:a:a:a:a:a:a/mask
+     *
+     * @access public
+     * @param mixed $address
+     * @return array
+     */
+    public function reformat_IPv6_for_search ($address) {
+        # parse address
+        $this->initialize_pear_net_IPv6 ();
+
+        $return = array();
+
+        # validate
+        if ($this->Net_IPv6->checkIPv6($address)==false) {
+            // return 0
+            return array("high"=>0, "low"=>0);
+        }
+        else {
+            # fake mask
+            if (strpos($address, "/")==0)	{ $address .= "/128"; }
+
+            # parse address
+            $parsed = $this->Net_IPv6->parseAddress($address);
+
+            # result
+            $return['low']  = gmp_strval($this->transform_address($parsed['start'], "decimal"));
+            $return['high'] = gmp_strval($this->transform_address($parsed['end'], "decimal"));
+
+            # return result array low/high
+            return $return;
+        }
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+    /**
+     *	@custom fields methods
+     *	--------------------------------
+     */
+
+    /**
+     * Fetches all custom fields
+     *
+     * @access public
+     * @param mixed $table
+     * @return array
+     */
+    public function fetch_custom_fields ($table) {
+        # fetch columns
+        $fields = $this->fetch_columns ($table);
+
+        $res = array();
+
+        # save Field values only
+        foreach($fields as $field) {
+            # cast
+            $field = (array) $field;
+
+            $res[$field['Field']]['name'] 	 = $field['Field'];
+            $res[$field['Field']]['type'] 	 = $field['Type'];
+            $res[$field['Field']]['Comment'] = $field['Comment'];
+            $res[$field['Field']]['Null'] 	 = $field['Null'];
+            $res[$field['Field']]['Default'] = $field['Default'];
+        }
+
+        # fetch standard fields
+        $standard = $this->fetch_standard_fields ($table);
+
+        # remove them
+        foreach($standard as $st) {
+            unset($res[$st]);
+        }
+        # return array
+        return sizeof($res)==0 ? array() : $res;
+    }
+
+    /**
+     * Fetches all custom fields and reorders them into numeric array
+     *
+     * @access public
+     * @param mixed $table
+     * @return array
+     */
+    public function fetch_custom_fields_numeric ($table) {
+        # fetch all custom fields
+        $custom_fields = $this->fetch_custom_fields ($table);
+        # make numberic array
+        if(sizeof($custom_fields)>0) {
+            foreach($custom_fields as $f) {
+                $out[] = $f;
+            }
+            # result
+            return isset($out) ? $out : array();
+        }
+        else {
+            return array();
+        }
+    }
+
+    /**
+     * Fetch all fields configured in table - standard + custom
+     *
+     * @access private
+     * @param mixed $table
+     * @return array
+     */
+    private function fetch_columns ($table) {
+        # escape method/table
+        $table = $this->Database->escape($table);
+        # fetch columns
+        $query    = "show full columns from `$table`;";
+        # fetch
+        try { $fields = $this->Database->getObjectsQuery($query); }
+        catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
+
+        return (array) $fields;
+    }
+
+    /**
+     * Read the SCHEMA.sql file and enforce UNIX LF
+     *
+     * @access private
+     * @return array
+     */
+    private function read_db_schema() {
+        $fh = fopen(dirname(__FILE__) . '/../../db/SCHEMA.sql', 'r');
+        $schema = str_replace("\r\n", "\n", fread($fh, 100000));
+        return $schema;
+    }
+
+    /**
+     * Fetches standard database fields from SCHEMA.sql file
+     *
+     * @access public
+     * @param mixed $table
+     * @return array
+     */
+    public function fetch_standard_fields ($table) {
+        # get SCHEMA.SQL file
+        $schema = $this->read_db_schema();
+
+        # get definition
+        $definition = strstr($schema, "CREATE TABLE `$table` (");
+        $definition = trim(strstr($definition, ";" . "\n", true));
+
+        # get each line to array
+        $definition = explode("\n", $definition);
+
+        # go through,if it begins with ` use it !
+        $out = array();
+        foreach($definition as $d) {
+            $d = trim($d);
+            if(strpos(trim($d), "`")==0) {
+                $d = strstr(trim($d, "`"), "`", true);
+                $out[] = substr($d, strpos($d, "`"));
+            }
+        }
+        # return array of fields
+        return is_array($out) ? array_filter($out) : array();
+    }
+
+    /**
+     * Fetches standard tables from SCHEMA.sql file
+     *
+     * @return array
+     */
+    public function fetch_standard_tables () {
+        # get SCHEMA.SQL file
+        $schema = $this->read_db_schema();
+
+        # get definitions to array, explode with CREATE TABLE `
+        $creates = explode("CREATE TABLE `", $schema);
+        # fill tables array
+        $tables = array();
+        foreach($creates as $k=>$c) {
+            if($k>0)	{ $tables[] = strstr($c, "`", true); }	//we exclude first !
+        }
+
+        # return array of tables
+        return $tables;
+    }
+
+    /**
+     * This functions fetches all columns for specified Field
+     *
+     * Array (Field, Type, Collation, Null, Comment)
+     *
+     * @access public
+     * @param mixed $table
+     * @param mixed $field
+     * @return array
+     */
+    public function fetch_full_field_definition ($table, $field) {
+        # escape field
+        $table = $this->Database->escape($table);
+        # fetch
+        try { $field_data = $this->Database->getObjectQuery("show full columns from `$table` where `Field` = ?;", array($field)); }
+        catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
+        # result
+        return($field_data);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+    /**
+     *	@widget methods
+     *	--------------------------------
+     */
+
+    /**
+     * Fetches all widgets
+     *
+     * @access public
+     * @param bool $admin (default: false)
+     * @param bool $inactive (default: false)
+     * @return array
+     */
+    public function fetch_widgets ($admin = false, $inactive = false) {
+
+        # inactive also - only for administration
+        if($inactive) 			{ $query = "select * from `widgets`; "; }
+        else {
+            # admin?
+            if($admin) 			{ $query = "select * from `widgets` where `wactive` = 'yes'; "; }
+            else				{ $query = "select * from `widgets` where `wadminonly` = 'no' and `wactive` = 'yes'; "; }
+        }
+        # fetch
+        try { $widgets = $this->Database->getObjectsQuery($query); }
+        catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
+
+        # reindex
+        $wout = array();
+        foreach($widgets as $w) {
+            $wout[$w->wfile] = $w;
+        }
+
+        # return results
+        return $wout;
+    }
+
+    /**
+     * Verify that widget file exists
+     *
+     * @access public
+     * @return bool
+     */
+    public function verify_widget ($file) {
+        return file_exists(dirname(__FILE__)."/../../app/dashboard/widgets/$file.php")||file_exists(dirname(__FILE__)."/../../app/dashboard/widgets/custom/$file.php") ? true : false;
+    }
+
+
+
+
+
+
+
+
+
+
+    /**
+     *	@request methods (for IP request)
+     *	--------------------------------
+     */
+
+    /**
+     * fetches all IP requests and saves them to $requests
+     *
+     * @access public
+     * @return int|array
+     */
+    public function requests_fetch ($num = true) {
+        return $num ? $this->requests_fetch_num () : $this->requests_fetch_objects ();
+    }
+
+    /**
+     * Fetches number of active IP requests
+     *
+     * @access private
+     * @return int
+     */
+    private function requests_fetch_num () {
+        return $this->count_database_objects ("requests", "processed", 0);
+    }
+
+    /**
+     * Fetches all requests and saves them to $requests
+     *
+     * @access private
+     * @return array
+     */
+    private function requests_fetch_objects () {
+        return $this->fetch_multiple_objects ("requests", "processed", 0);
+    }
+
+    /**
+     * Fetches all subnets that are set to allow requests
+     *
+     * @access public
+     * @return array|null
+     */
+    public function requests_fetch_available_subnets () {
+        try { $subnets = $this->Database->getObjectsQuery("SELECT * FROM `subnets` where `allowRequests`=1 and `isFull` != 1 ORDER BY `subnet`;"); }
+        catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
+
+        # save
+        return sizeof($subnets)>0 ? (array) $subnets : NULL;
+    }
+
+    /**
+     * Sends mail for IP request
+     *
+     * @access public
+     * @param string $action (default: "new")
+     * @param mixed $values
+     * @return bool
+     */
+    public function ip_request_send_mail ($action="new", $values) {
+
+        $this->get_settings ();
+
+        # try to send
+        try {
+            # fetch mailer settings
+            $mail_settings = $this->fetch_object("settingsMail", "id", 1);
+
+            # initialize mailer
+            $phpipam_mail = new phpipam_mail($this->settings, $mail_settings);
+
+            # get all users and check who to end mail to
+            $recipients = $this->ip_request_get_mail_recipients ($values['subnetId']);
+
+            # add requester to cc
+            $recipients_requester = $values['requester'];
+
+            # reformat key / vaues
+            $values = $this->ip_request_reformat_mail_values ($values);
+            #reformat empty
+            $values = $this->reformat_empty_array_fields ($values, "/");
+
+            # generate content
+            if ($action=="new")			{ $subject	= "New IP address request"; }
+            elseif ($action=="accept")	{ $subject	= "IP address request accepted"; }
+            elseif ($action=="reject")	{ $subject	= "IP address request rejected"; }
+            else						{ $this->Result->show("danger", _("Invalid request action"), true); }
+
+            // set html content
+            $content[] = "<table style='margin-left:10px;margin-top:20px;width:auto;padding:0px;border-collapse:collapse;'>";
+            $content[] = "<tr><td colspan='2' style='margin:0px;>$this->mail_font_style <strong>$subject</strong></font></td></tr>";
+            foreach($values as $k=>$v) {
+            // title search
+            if (preg_match("/s_title_/", $k)) {
+            $content[] = "<tr><td colspan='2' style='margin:0px;border-bottom:1px solid #eeeeee;'>$this->mail_font_style<strong>$v</strong></font></td></tr>";
+            }
+            else {
+            //content
+            $content[] = "<tr>";
+            $content[] = "<td style='padding-left:15px;margin:0px;'>$this->mail_font_style $k</font></td>";
+            $content[] = "<td style='padding-left:15px;margin:0px;'>$this->mail_font_style $v</font></td>";
+            $content[] = "</tr>";
+            }
+            }
+            $content[] = "<tr><td style='padding-top:15px;padding-bottom:3px;text-align:right;color:#ccc;'>$this->mail_font_style Sent at ".date('Y/m/d H:i')."</font></td></tr>";
+            //set alt content
+            $content_plain[] = "$subject"."\r\n------------------------------\r\n";
+            foreach($values as $k=>$v) {
+            $content_plain[] = $k." => ".$v;
+            }
+            $content_plain[] = "\r\n\r\nSent at ".date('Y/m/d H:i');
+            $content[] = "</table>";
+
+            // set content
+            $content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
+            $content_plain 	= implode("\r\n",$content_plain);
+
+            $phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
+            if ($recipients!==false) {
+            foreach($recipients as $r) {
+            $phpipam_mail->Php_mailer->addAddress(addslashes(trim($r->email)));
+            }
+            $phpipam_mail->Php_mailer->AddCC(addslashes(trim($recipients_requester)));
+            }
+            else {
+            $phpipam_mail->Php_mailer->addAddress(addslashes(trim($recipients_requester)));
+            }
+            $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) {
+            $this->Result->show("danger", "Mailer Error: ".$e->errorMessage(), true);
+        } catch (Exception $e) {
+            $this->Result->show("danger", "Mailer Error: ".$e->getMessage(), true);
+        }
+
+        # ok
+        return true;
+
+    }
+
+    /**
+     * Returns list of recipients to get new
+     *
+     * @access private
+     * @param bool|mixed $subnetId
+     * @return array|bool
+     */
+    private function ip_request_get_mail_recipients ($subnetId = false) {
+        // fetch all users with mailNotify
+        $notification_users = $this->fetch_multiple_objects ("users", "mailNotify", "Yes", "id", true);
+        // recipients array
+        $recipients = array();
+        // any ?
+        if ($notification_users!==false) {
+                // if subnetId is set check who has permissions
+            if (isset($subnetId)) {
+                    foreach ($notification_users as $u) {
+                    // inti object
+                    $Subnets = new Subnets ($this->Database);
+                    //check permissions
+                    $subnet_permission = $Subnets->check_permission($u, $subnetId);
+                    // if 3 than add
+                    if ($subnet_permission==3) {
+                        $recipients[] = $u;
+                    }
+                }
+            }
+            else {
+                foreach ($notification_users as $u) {
+                    if($u->role=="Administrator") {
+                        $recipients[] = $u;
+                    }
+                }
+            }
+            return sizeof($recipients)>0 ? $recipients : false;
+        }
+        else {
+            return false;
+        }
+    }
+
+    /**
+     * Reformats request value/key pairs for request mailing
+     *
+     * @access private
+     * @param mixed $values
+     * @return array
+     */
+    private function ip_request_reformat_mail_values ($values) {
+        // no array
+        if (!is_array($values)) { return $values; }
+
+        // addresses
+        $this->Addresses = new Addresses ($this->Database);
+
+        $mail = array();
+
+        // change fields for mailings
+        foreach ($values as $k=>$v) {
+            // subnetId
+            if ($k=="subnetId")	{
+                // add title
+                $mail["s_title_1"] = "<br>Subnet details";
+
+                $subnet = $this->fetch_object("subnets", "id", $v);
+                $mail["Subnet"]  = $this->transform_address ($subnet->subnet, "dotted")."/".$subnet->mask;
+                $mail["Subnet"] .= strlen($subnet->description)>0 ? " - ".$subnet->description : "";
+            }
+            // ip_addr
+            elseif ($k=="ip_addr") {
+                // add title
+                $mail["s_title_2"] = "<br>Address details";
+
+                if (strlen($v)>0) {
+                    $mail['IP address'] = $this->transform_address($v, "dotted");
+                } else {
+                    $mail['IP address'] = "Automatic";
+                }
+            }
+            // state
+            elseif ($k=="state") {
+                $mail['State'] = $this->Addresses-> address_type_index_to_type ($v);
+            }
+            // description
+            elseif ($k=="descriotion") {
+                $mail['Description'] = $v;
+            }
+            // hostname
+            elseif ($k=="hostname") {
+                $mail['Hostname'] = $v;
+            }
+            // owner
+            elseif ($k=="owner") {
+                $mail['Address owner'] = $v;
+            }
+            // requester
+            elseif ($k=="requester") {
+                $mail['Requested by'] = $v;
+            }
+            // comment
+            elseif ($k=="comment") {
+                $mail['Request comment'] = $v;
+            }
+            // admin comment
+            elseif ($k=="adminComment") {
+                // add title
+                $mail["s_title_3"] = "<br>Admin comment";
+
+                $mail['Admin comment'] = $v;
+            }
+            // admin comment
+            elseif ($k=="gateway") {
+                $mail['Gateway'] = $v;
+            }
+            // nameservers
+            elseif ($k=="dns") {
+                if (strlen($v)>0) {
+                $mail['DNS servers'] = $v;
+                }
+            }
+            // vlans
+            elseif ($k=="vlan") {
+                if (strlen($v)>0) {
+                $mail['VLAN'] = $v;
+                }
+            }
+        }
+        // response
+        return $mail;
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+    /**
+     *	@database verification methods
+     *	------------------------------
+     */
+
+    /**
+     * Checks if all database fields are installed ok
+     *
+     * @access public
+     * @return array
+     */
+    public function verify_database () {
+
+        # required tables from SCHEMA.sql
+        $tables = $this->fetch_standard_tables();
+
+        # fetch required fields
+        foreach($tables as $t) {
+            $fields[$t] = $this->fetch_standard_fields ($t);
+        }
+
+        /**
+         * check that each database exist - if it does check also fields
+         *		2 errors -> $tableError, $fieldError[table] = field
+         ****************************************************************/
+        foreach($tables as $table) {
+
+            //check if table exists
+            if(!$this->table_exists($table)) {
+                $error['tableError'][] = $table;
+            }
+            //check for each field
+            else {
+                foreach($fields[$table] as $field) {
+                    //if it doesnt exist store error
+                    if(!$this->field_exists($table, $field)) {
+                        $error['fieldError'][$table][] = $field;
+                    }
+                }
+            }
+        }
+
+        # return array
+        if(isset($error)) {
+            return $error;
+        } else 	{
+            # update check field
+            $this->update_db_verify_field ();
+            # return empty array
+            return array();
+        }
+    }
+
+    /**
+     * Checks if specified table exists in database
+     *
+     *	true = exists
+     *	false = doesnt exist
+     *
+     * @access public
+     * @param mixed $tablename
+     * @param bool $quit
+     * @return bool
+     */
+    public function table_exists ($tablename, $quit = false) {
+        # query
+        $query = 'SELECT COUNT(*) AS count FROM information_schema.tables WHERE table_schema = "'.$this->Database->dbname.'" AND table_name = ?;';
+        try { $count = $this->Database->getObjectQuery($query, array($tablename)); }
+        catch (Exception $e) { !$quit ? : $this->Result->show("danger", $e->getMessage(), true);	return false; }
+        # return
+        return $count->count ==1 ? true : false;
+    }
+
+    /**
+     * Checks if specified field exists in table
+     *
+     *	true = exists
+     *	false = doesnt exist
+     *
+     * @access public
+     * @param mixed $fieldname
+     * @return bool
+     */
+    public function field_exists ($tablename, $fieldname) {
+        # escape
+        $tablename = $this->Database->escape($tablename);
+        # check
+        $query = "DESCRIBE `$tablename` `$fieldname`;";
+        try { $count = $this->Database->getObjectQuery($query); }
+        catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), true);	return false; }
+        # return true if it exists
+        return $count!== null ? true : false;
+    }
+
+    /**
+     * Updates DB check flag in database
+     *
+     * @access private
+     */
+    private function update_db_verify_field () {
+        # query
+        $query = "update `settings` set `dbverified`=1 where `id` = 1; ";
+        try { $this->Database->runQuery($query); }
+        catch (Exception $e) { !$this->debugging ? : $this->Result->show("danger", $e->getMessage(), false); }
+    }
+
+    /**
+     * Get fix for missing table.
+     *
+     * @access public
+     * @param mixed $table
+     * @return false|string
+     */
+    public function get_table_fix ($table) {
+        $file = $this->read_db_schema();
+
+        //go from delimiter on
+        $file = strstr($file, "DROP TABLE IF EXISTS `$table`;");
+        $file = trim(strstr($file, "# Dump of table", true));
+
+        # check
+        if(strpos($file, "DROP TABLE IF EXISTS `$table`;") > 0 )	return false;
+        else														return $file;
+    }
+
+    /**
+     * Get fix for missing field.
+     *
+     * @access public
+     * @param mixed $table
+     * @param mixed $field
+     * @return string|false
+     */
+    public function get_field_fix ($table, $field) {
+        $file = $this->read_db_schema();
+
+        //go from delimiter on
+        $file = strstr($file, "DROP TABLE IF EXISTS `$table`;");
+        $file = trim(strstr($file, "# Dump of table", true));
+
+        //get proper line
+        $file = explode("\n", $file);
+        foreach($file as $k=>$l) {
+            if(strpos(trim($l), "$field`")==1) {
+                $res = trim($l, ",");
+                $res .= ";";
+
+                return $res;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Fix missing table - create
+     *
+     * @access public
+     * @param mixed $table
+     * @return bool
+     */
+    public function fix_table ($table) {
+        # first fetch fix query
+        $query = $this->get_table_fix($table);
+        # fix
+        try { $this->Database->runQuery($query); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Update: ").$e->getMessage()."<br>query: ".$query, true);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Fix missing field in table
+     *
+     * @access public
+     * @param mixed $table
+     * @param mixed $field
+     * @return bool
+     */
+    public function fix_field ($table, $field) {
+        # set fix query
+        $query  = "alter table `$table` add ";
+        $query .= trim($this->get_field_fix ($table, $field), ",");
+        $query .= ";";
+
+        # fix
+        try { $this->Database->runQuery($query); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Update: ").$e->getMessage()."<br>query: ".$query, true);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Verify that all required indexes are present in database
+     *
+     * @method verify_database_indexes
+     * @return bool
+     */
+    public function verify_database_indexes () {
+        // get indexes from schema
+        $schema_indexes = $this->get_schema_indexes();
+        // get existing indexes
+        $missing = $this->get_missing_database_indexes($schema_indexes);
+
+        // if false all indexes are ok, otherwise fix
+        if ($missing===false) {
+            return true;
+        }
+        else {
+            foreach ($missing as $table=>$index_id) {
+                foreach ($index_id as $index_name) {
+                    $this->fix_missing_index ($table, $index_name);
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Get all indexes required for phpipam
+     *
+     * ignoring primary keys
+     *
+     * @method get_schema_indexes
+     * @return array
+     */
+    private function get_schema_indexes () {
+        // Discover indexes required for phpipam
+        $schema = $this->read_db_schema();
+
+        # get definitions to array, explode with CREATE TABLE `
+        $creates = explode("CREATE TABLE `", $schema);
+
+        $indexes = array ();
+        foreach($creates as $k=>$c) {
+            if($k == 0) continue;
+            $c = trim(strstr($c, ";" . "\n", true));
+
+            $table = strstr($c, "`", true);
+
+            $definitions = explode("\n", $c);
+            foreach($definitions as $definition) {
+                if (preg_match('/(KEY|UNIQUE KEY) +`(.*)` +\(/', $definition, $matches)) {
+                    $indexes[$table][] = $matches[2];
+                }
+            }
+        }
+        return $indexes;
+    }
+
+    /**
+     * Using required database indexes remove all that are existing and return array of missing indexes
+     *
+     * @method get_missing_database_indexes
+     * @param array $schema_indexes
+     * @return array|null
+     */
+    private function get_missing_database_indexes ($schema_indexes) {
+        // loop
+        foreach ($schema_indexes as $table=>$index) {
+            try { $indexes = $this->Database->getObjectsQuery("SHOW INDEX from `$table` where `Key_name` != 'PRIMARY';"); }
+            catch (Exception $e) {
+                $this->Result->show("danger", _("Invalid query for `$table` database index check : ").$e->getMessage(), true);
+            }
+            // remove existing
+            if ($indexes!==false) {
+                foreach ($indexes as $i) {
+                    // remove indexes
+                    if(($key = array_search($i->Key_name, $schema_indexes[$table])) !== false) {
+                        unset($schema_indexes[$table][$key]);
+                    }
+                }
+            }
+            // remove also empty table
+            if(sizeof($schema_indexes[$table])==0) {
+                unset($schema_indexes[$table]);
+            }
+        }
+        // return diff
+        return sizeof($schema_indexes)==0 ? false : $schema_indexes;
+    }
+
+    /**
+     * Fix missing indexes
+     *
+     * @method fix_missing_index
+     * @param  string $table
+     * @param  string $index_name
+     * @return void
+     */
+    private function fix_missing_index ($table, $index_name) {
+        // get definition
+        $file = $this->read_db_schema();
+
+        //go from delimiter on
+        $file = strstr($file, "DROP TABLE IF EXISTS `$table`;");
+        $file = trim(strstr($file, "# Dump of table", true));
+
+        //get proper line
+        $file = explode("\n", $file);
+
+        $line = false;
+        foreach($file as $k=>$l) {
+            // trim
+            $l = trim($l);
+            if(strpos($l, "KEY `".$index_name."`")!==false) {
+                // remove last ,
+                if(substr($l, -1)==",") {
+                    $l = substr($l, 0, -1);
+                }
+                // set query and run
+                $query = "ALTER TABLE `$table` ADD ".$l;
+
+                try { $this->Database->runQuery($query); }
+                catch (Exception $e) {
+                    $this->Result->show("danger", _("Creating index failed: ").$e->getMessage()."<br><pre>".$query."</pre>", true);
+                    return false;
+                }
+                // add warning that index was created
+                $this->Result->show("warning", _("Created index for table `$table` named `$index_name`."), false);
+            }
+        }
+    }
+
+
+
+
+
+
+
+
+
+
+
+    /**
+     *	@version check methods
+     *	------------------------------
+     */
+
+    /**
+     * Check for latest version on gitHub
+     *
+     * @access public
+     * @param bool $print_error (default: false)
+     * @return string|bool
+     */
+    public function check_latest_phpipam_version ($print_error = false) {
+        # fetch settings
+        $this->get_settings ();
+        # check for release
+        # try to fetch
+        $release_gh = @file('https://github.com/phpipam/phpipam/releases.atom');
+        # check
+        if ($release_gh===false) {
+            if($print_error) {
+                $this->Result->show("danger", "Cannot fetch https://github.com/phpipam/phpipam/releases.atom", false);
+            }
+            return false;
+        }
+        # set releases href
+        $feed = implode($release_gh);
+        // fetch
+        $xml = simplexml_load_string($feed);
+
+        // if ok
+        if ($xml!==false) {
+            // encode to json
+            $json = json_decode(json_encode($xml));
+            // save all releases
+            $this->phpipam_releases = $json->entry;
+            // check for latest release
+            foreach ($json->entry as $e) {
+                // releases will be named with numberic values
+                if (is_numeric(str_replace(array("Version", "."), "", $e->title))) {
+                    // save
+                    $this->phpipam_latest_release = $e;
+                    // return
+                    return str_replace("Version", "", $e->title);
+                }
+            }
+            // none
+            return false;
         }
         else {
             return false;
         }
-	}
-
-	/**
-	 * Reformats request value/key pairs for request mailing
-	 *
-	 * @access private
-	 * @param mixed $values
-	 * @return array
-	 */
-	private function ip_request_reformat_mail_values ($values) {
-		// no array
-		if (!is_array($values)) { return $values; }
-
-		// addresses
-		$this->Addresses = new Addresses ($this->Database);
-
-		$mail = array();
-
-		// change fields for mailings
-		foreach ($values as $k=>$v) {
-			// subnetId
-			if ($k=="subnetId")	{
-				// add title
-				$mail["s_title_1"] = "<br>Subnet details";
-
-				$subnet = $this->fetch_object("subnets", "id", $v);
-				$mail["Subnet"]  = $this->transform_address ($subnet->subnet, "dotted")."/".$subnet->mask;
-				$mail["Subnet"] .= strlen($subnet->description)>0 ? " - ".$subnet->description : "";
-			}
-			// ip_addr
-			elseif ($k=="ip_addr") {
-				// add title
-				$mail["s_title_2"] = "<br>Address details";
-
-				if (strlen($v)>0) {
-					$mail['IP address'] = $this->transform_address($v, "dotted");
-				} else {
-					$mail['IP address'] = "Automatic";
-				}
-			}
-			// state
-			elseif ($k=="state") {
-				$mail['State'] = $this->Addresses-> address_type_index_to_type ($v);
-			}
-			// description
-			elseif ($k=="descriotion") {
-				$mail['Description'] = $v;
-			}
-			// hostname
-			elseif ($k=="hostname") {
-				$mail['Hostname'] = $v;
-			}
-			// owner
-			elseif ($k=="owner") {
-				$mail['Address owner'] = $v;
-			}
-			// requester
-			elseif ($k=="requester") {
-				$mail['Requested by'] = $v;
-			}
-			// comment
-			elseif ($k=="comment") {
-				$mail['Request comment'] = $v;
-			}
-			// admin comment
-			elseif ($k=="adminComment") {
-				// add title
-				$mail["s_title_3"] = "<br>Admin comment";
-
-				$mail['Admin comment'] = $v;
-			}
-			// admin comment
-			elseif ($k=="gateway") {
-				$mail['Gateway'] = $v;
-			}
-			// nameservers
-			elseif ($k=="dns") {
-				if (strlen($v)>0) {
-				$mail['DNS servers'] = $v;
-				}
-			}
-			// vlans
-			elseif ($k=="vlan") {
-				if (strlen($v)>0) {
-				$mail['VLAN'] = $v;
-				}
-			}
-		}
-		// response
-		return $mail;
-	}
-
-
-
-
-
-
-
-
-
-
-
-
-	/**
-	 *	@database verification methods
-	 *	------------------------------
-	 */
-
-	/**
-	 * Checks if all database fields are installed ok
-	 *
-	 * @access public
-	 * @return array
-	 */
-	public function verify_database () {
-
-		# required tables from SCHEMA.sql
-		$tables = $this->fetch_standard_tables();
-
-		# fetch required fields
-		foreach($tables as $t) {
-			$fields[$t] = $this->fetch_standard_fields ($t);
-		}
-
-		/**
-		 * check that each database exist - if it does check also fields
-		 *		2 errors -> $tableError, $fieldError[table] = field
-		 ****************************************************************/
-		foreach($tables as $table) {
-
-			//check if table exists
-			if(!$this->table_exists($table)) {
-				$error['tableError'][] = $table;
-			}
-			//check for each field
-			else {
-				foreach($fields[$table] as $field) {
-					//if it doesnt exist store error
-					if(!$this->field_exists($table, $field)) {
-						$error['fieldError'][$table][] = $field;
-					}
-				}
-			}
-		}
-
-		# return array
-		if(isset($error)) {
-			return $error;
-		} else 	{
-			# update check field
-			$this->update_db_verify_field ();
-			# return empty array
-			return array();
-		}
-	}
-
-	/**
-	 * Checks if specified table exists in database
-	 *
-	 *	true = exists
-	 *	false = doesnt exist
-	 *
-	 * @access public
-	 * @param mixed $tablename
-	 * @param bool $quit
-	 * @return bool
-	 */
-	public function table_exists ($tablename, $quit = false) {
-	    # query
-	    $query = 'SELECT COUNT(*) AS count FROM information_schema.tables WHERE table_schema = "'.$this->Database->dbname.'" AND table_name = ?;';
-		try { $count = $this->Database->getObjectQuery($query, array($tablename)); }
-		catch (Exception $e) { !$quit ? : $this->Result->show("danger", $e->getMessage(), true);	return false; }
-		# return
-		return $count->count ==1 ? true : false;
-	}
-
-	/**
-	 * Checks if specified field exists in table
-	 *
-	 *	true = exists
-	 *	false = doesnt exist
-	 *
-	 * @access public
-	 * @param mixed $fieldname
-	 * @return bool
-	 */
-	public function field_exists ($tablename, $fieldname) {
-	    # escape
-	    $tablename = $this->Database->escape($tablename);
-		# check
-	    $query = "DESCRIBE `$tablename` `$fieldname`;";
-		try { $count = $this->Database->getObjectQuery($query); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), true);	return false; }
-		# return true if it exists
-		return $count!== null ? true : false;
-	}
-
-	/**
-	 * Updates DB check flag in database
-	 *
-	 * @access private
-	 */
-	private function update_db_verify_field () {
-		# query
-		$query = "update `settings` set `dbverified`=1 where `id` = 1; ";
-		try { $this->Database->runQuery($query); }
-		catch (Exception $e) { !$this->debugging ? : $this->Result->show("danger", $e->getMessage(), false); }
-	}
-
-	/**
-	 * Get fix for missing table.
-	 *
-	 * @access public
-	 * @param mixed $table
-	 * @return false|string
-	 */
-	public function get_table_fix ($table) {
-		$file = $this->read_db_schema();
-
-		//go from delimiter on
-		$file = strstr($file, "DROP TABLE IF EXISTS `$table`;");
-		$file = trim(strstr($file, "# Dump of table", true));
-
-		# check
-		if(strpos($file, "DROP TABLE IF EXISTS `$table`;") > 0 )	return false;
-		else														return $file;
-	}
-
-	/**
-	 * Get fix for missing field.
-	 *
-	 * @access public
-	 * @param mixed $table
-	 * @param mixed $field
-	 * @return string|false
-	 */
-	public function get_field_fix ($table, $field) {
-		$file = $this->read_db_schema();
-
-		//go from delimiter on
-		$file = strstr($file, "DROP TABLE IF EXISTS `$table`;");
-		$file = trim(strstr($file, "# Dump of table", true));
-
-		//get proper line
-		$file = explode("\n", $file);
-		foreach($file as $k=>$l) {
-			if(strpos(trim($l), "$field`")==1) {
-				$res = trim($l, ",");
-				$res .= ";";
-
-				return $res;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Fix missing table - create
-	 *
-	 * @access public
-	 * @param mixed $table
-	 * @return bool
-	 */
-	public function fix_table ($table) {
-		# first fetch fix query
-		$query = $this->get_table_fix($table);
-		# fix
-		try { $this->Database->runQuery($query); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Update: ").$e->getMessage()."<br>query: ".$query, true);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Fix missing field in table
-	 *
-	 * @access public
-	 * @param mixed $table
-	 * @param mixed $field
-	 * @return bool
-	 */
-	public function fix_field ($table, $field) {
-		# set fix query
-		$query  = "alter table `$table` add ";
-		$query .= trim($this->get_field_fix ($table, $field), ",");
-		$query .= ";";
-
-		# fix
-		try { $this->Database->runQuery($query); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Update: ").$e->getMessage()."<br>query: ".$query, true);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Verify that all required indexes are present in database
-	 *
-	 * @method verify_database_indexes
-	 * @return bool
-	 */
-	public function verify_database_indexes () {
-		// get indexes from schema
-		$schema_indexes = $this->get_schema_indexes();
-		// get existing indexes
-		$missing = $this->get_missing_database_indexes($schema_indexes);
-
-		// if false all indexes are ok, otherwise fix
-		if ($missing===false) {
-			return true;
-		}
-		else {
-			foreach ($missing as $table=>$index_id) {
-				foreach ($index_id as $index_name) {
-					$this->fix_missing_index ($table, $index_name);
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Get all indexes required for phpipam
-	 *
-	 * ignoring primary keys
-	 *
-	 * @method get_schema_indexes
-	 * @return array
-	 */
-	private function get_schema_indexes () {
-		// Discover indexes required for phpipam
-		$schema = $this->read_db_schema();
-
-		# get definitions to array, explode with CREATE TABLE `
-		$creates = explode("CREATE TABLE `", $schema);
-
-		$indexes = array ();
-		foreach($creates as $k=>$c) {
-			if($k == 0) continue;
-			$c = trim(strstr($c, ";" . "\n", true));
-
-			$table = strstr($c, "`", true);
-
-			$definitions = explode("\n", $c);
-			foreach($definitions as $definition) {
-				if (preg_match('/(KEY|UNIQUE KEY) +`(.*)` +\(/', $definition, $matches)) {
-					$indexes[$table][] = $matches[2];
-				}
-			}
-		}
-		return $indexes;
-	}
-
-	/**
-	 * Using required database indexes remove all that are existing and return array of missing indexes
-	 *
-	 * @method get_missing_database_indexes
-	 * @param array $schema_indexes
-	 * @return array|null
-	 */
-	private function get_missing_database_indexes ($schema_indexes) {
-		// loop
-		foreach ($schema_indexes as $table=>$index) {
-			try { $indexes = $this->Database->getObjectsQuery("SHOW INDEX from `$table` where `Key_name` != 'PRIMARY';"); }
-			catch (Exception $e) {
-				$this->Result->show("danger", _("Invalid query for `$table` database index check : ").$e->getMessage(), true);
-			}
-			// remove existing
-			if ($indexes!==false) {
-				foreach ($indexes as $i) {
-					// remove indexes
-					if(($key = array_search($i->Key_name, $schema_indexes[$table])) !== false) {
-						unset($schema_indexes[$table][$key]);
-					}
-				}
-			}
-			// remove also empty table
-			if(sizeof($schema_indexes[$table])==0) {
-				unset($schema_indexes[$table]);
-			}
-		}
-		// return diff
-		return sizeof($schema_indexes)==0 ? false : $schema_indexes;
-	}
-
-	/**
-	 * Fix missing indexes
-	 *
-	 * @method fix_missing_index
-	 * @param  string $table
-	 * @param  string $index_name
-	 * @return void
-	 */
-	private function fix_missing_index ($table, $index_name) {
-		// get definition
-		$file = $this->read_db_schema();
-
-		//go from delimiter on
-		$file = strstr($file, "DROP TABLE IF EXISTS `$table`;");
-		$file = trim(strstr($file, "# Dump of table", true));
-
-		//get proper line
-		$file = explode("\n", $file);
-
-		$line = false;
-		foreach($file as $k=>$l) {
-			// trim
-			$l = trim($l);
-			if(strpos($l, "KEY `".$index_name."`")!==false) {
-				// remove last ,
-				if(substr($l, -1)==",") {
-					$l = substr($l, 0, -1);
-				}
-				// set query and run
-				$query = "ALTER TABLE `$table` ADD ".$l;
-
-				try { $this->Database->runQuery($query); }
-				catch (Exception $e) {
-					$this->Result->show("danger", _("Creating index failed: ").$e->getMessage()."<br><pre>".$query."</pre>", true);
-					return false;
-				}
-				// add warning that index was created
-				$this->Result->show("warning", _("Created index for table `$table` named `$index_name`."), false);
-			}
-		}
-	}
-
-
-
-
-
-
-
-
-
-
-
-	/**
-	 *	@version check methods
-	 *	------------------------------
-	 */
-
-	/**
-	 * Check for latest version on gitHub
-	 *
-	 * @access public
-	 * @param bool $print_error (default: false)
-	 * @return string|bool
-	 */
-	public function check_latest_phpipam_version ($print_error = false) {
-		# fetch settings
-		$this->get_settings ();
-		# check for release
-    	# try to fetch
-    	$release_gh = @file('https://github.com/phpipam/phpipam/releases.atom');
-    	# check
-    	if ($release_gh===false) {
-        	if($print_error) {
-            	$this->Result->show("danger", "Cannot fetch https://github.com/phpipam/phpipam/releases.atom", false);
-            }
-        	return false;
-    	}
-		# set releases href
-		$feed = implode($release_gh);
-		// fetch
-		$xml = simplexml_load_string($feed);
-
-		// if ok
-		if ($xml!==false) {
-			// encode to json
-			$json = json_decode(json_encode($xml));
-			// save all releases
-			$this->phpipam_releases = $json->entry;
-			// check for latest release
-			foreach ($json->entry as $e) {
-				// releases will be named with numberic values
-				if (is_numeric(str_replace(array("Version", "."), "", $e->title))) {
-					// save
-					$this->phpipam_latest_release = $e;
-					// return
-					return str_replace("Version", "", $e->title);
-				}
-			}
-			// none
-			return false;
-		}
-		else {
-			return false;
-		}
-	}
-
-	/**
-	 * Updates DB version check flag in database
-	 *
-	 * @access public
-	 */
-	public function update_phpipam_checktime () {
-		# query
-		$query = "update `settings` set `vcheckDate`='".date("Y-m-d H:i:s")."';";
-		try { $this->Database->runQuery($query); }
-		catch (Exception $e) { !$this->debugging ? : $this->Result->show("danger", $e->getMessage(), false); }
-	}
-
-
-
-
-
-
-
-
-
-	/**
-	 * @ipcalc @calculator methods
-	 * ------------------------------
-	 */
-
-	/**
-	 * Calculates IP calculator result per IP type
-	 *
-	 * @access public
-	 * @param mixed $cidr
-	 * @return mixed
-	 */
-	public function calculate_ip_calc_results ($cidr) {
-		# detect address and calculate
-		return $this->identify_address($cidr)=="IPv6" ? $this->calculate_IPv6_calc_results($cidr) : $this->calculate_IPv4_calc_results($cidr);
-	}
-
-	/**
-	 * Calculates IPv4 results from provided CIDR address
-	 *
-	 * @access private
-	 * @param mixed $cidr
-	 * @return array
-	 */
-	private function calculate_IPv4_calc_results ($cidr) {
-		# initialize subnets Class
-		$Subnets = new Subnets($this->Database);
-		# Initialize PEAR NET object
-		$this->initialize_pear_net_IPv4 ();
-
-		# parse address
+    }
+
+    /**
+     * Updates DB version check flag in database
+     *
+     * @access public
+     */
+    public function update_phpipam_checktime () {
+        # query
+        $query = "update `settings` set `vcheckDate`='".date("Y-m-d H:i:s")."';";
+        try { $this->Database->runQuery($query); }
+        catch (Exception $e) { !$this->debugging ? : $this->Result->show("danger", $e->getMessage(), false); }
+    }
+
+
+
+
+
+
+
+
+
+    /**
+     * @ipcalc @calculator methods
+     * ------------------------------
+     */
+
+    /**
+     * Calculates IP calculator result per IP type
+     *
+     * @access public
+     * @param mixed $cidr
+     * @return mixed
+     */
+    public function calculate_ip_calc_results ($cidr) {
+        # detect address and calculate
+        return $this->identify_address($cidr)=="IPv6" ? $this->calculate_IPv6_calc_results($cidr) : $this->calculate_IPv4_calc_results($cidr);
+    }
+
+    /**
+     * Calculates IPv4 results from provided CIDR address
+     *
+     * @access private
+     * @param mixed $cidr
+     * @return array
+     */
+    private function calculate_IPv4_calc_results ($cidr) {
+        # initialize subnets Class
+        $Subnets = new Subnets($this->Database);
+        # Initialize PEAR NET object
+        $this->initialize_pear_net_IPv4 ();
+
+        # parse address
         $net = $this->Net_IPv4->parseAddress( $cidr );
 
         # set ip address type
@@ -1720,76 +1720,76 @@ 
         }
         # /32 and /32 fixes
         if($net->bitmask==31 || $net->bitmask==32) {
-			$out['Min host IP'] = $out['Network'];
-			$out['Max host IP'] = $out['Broadcast'];
-        }
-		# result
-		return $out;
-	}
-
-	/**
-	 * Returns IPv4 address type from cidr
-	 *
-	 * @access private
-	 * @param $network
-	 * @param $broadcast
-	 * @return string|false
-	 */
-	private function get_ipv4_address_type ($network, $broadcast) {
-		# get all possible classes
-		$classes = $this->define_ipv4_address_types ();
-		# Initialize PEAR NET object
-		$this->initialize_pear_net_IPv4 ();
-		# check for each if member
-	    foreach( $classes as $key=>$class ) {
-	        if ($this->Net_IPv4->ipInNetwork($network, $class)) {
-	            if ($this->Net_IPv4->ipInNetwork($broadcast, $class)) {
-	                return($key);
-	            }
-	        }
-	    }
-	    # no match
-	    return false;
-	}
-
-	/**
-	 * Defines all possible IPv4 address types
-	 *
-	 * @access private
-	 * @return array
-	 */
-	private function define_ipv4_address_types () {
-	    # define classes
-	    $classes = array();
-	    $classes['private A']          = '10.0.0.0/8';
-	    $classes['private B']          = '172.16.0.0/12';
-	    $classes['private C']          = '192.168.0.0/16';
-	    $classes['Loopback']           = '127.0.0.0/8';
-	    $classes['Link-local']         = '169.254.0.0/16';
-	    $classes['Reserved (IANA)']    = '192.0.0.0/24';
-	    $classes['TEST-NET-1']         = '192.0.2.0/24';
-	    $classes['IPv6 to IPv4 relay'] = '192.88.99.0/24';
-	    $classes['Network benchmark']  = '198.18.0.0/15';
-	    $classes['TEST-NET-2']         = '198.51.100.0/24';
-	    $classes['TEST-NET-3']         = '203.0.113.0/24';
-	    $classes['Multicast']          = '224.0.0.0/4';
-	    $classes['Reserved']           = '240.0.0.0/4';
-	    # result
-	    return $classes;
-	}
-
-	/**
-	 * Calculates IPv6 from cidr
-	 *
-	 * @access private
-	 * @param mixed $cidr
-	 * @return array
-	 */
-	private function calculate_IPv6_calc_results ($cidr) {
-		# initialize subnets Class
-		$Subnets = new Subnets($this->Database);
-		# Initialize PEAR NET object
-		$this->initialize_pear_net_IPv6 ();
+            $out['Min host IP'] = $out['Network'];
+            $out['Max host IP'] = $out['Broadcast'];
+        }
+        # result
+        return $out;
+    }
+
+    /**
+     * Returns IPv4 address type from cidr
+     *
+     * @access private
+     * @param $network
+     * @param $broadcast
+     * @return string|false
+     */
+    private function get_ipv4_address_type ($network, $broadcast) {
+        # get all possible classes
+        $classes = $this->define_ipv4_address_types ();
+        # Initialize PEAR NET object
+        $this->initialize_pear_net_IPv4 ();
+        # check for each if member
+        foreach( $classes as $key=>$class ) {
+            if ($this->Net_IPv4->ipInNetwork($network, $class)) {
+                if ($this->Net_IPv4->ipInNetwork($broadcast, $class)) {
+                    return($key);
+                }
+            }
+        }
+        # no match
+        return false;
+    }
+
+    /**
+     * Defines all possible IPv4 address types
+     *
+     * @access private
+     * @return array
+     */
+    private function define_ipv4_address_types () {
+        # define classes
+        $classes = array();
+        $classes['private A']          = '10.0.0.0/8';
+        $classes['private B']          = '172.16.0.0/12';
+        $classes['private C']          = '192.168.0.0/16';
+        $classes['Loopback']           = '127.0.0.0/8';
+        $classes['Link-local']         = '169.254.0.0/16';
+        $classes['Reserved (IANA)']    = '192.0.0.0/24';
+        $classes['TEST-NET-1']         = '192.0.2.0/24';
+        $classes['IPv6 to IPv4 relay'] = '192.88.99.0/24';
+        $classes['Network benchmark']  = '198.18.0.0/15';
+        $classes['TEST-NET-2']         = '198.51.100.0/24';
+        $classes['TEST-NET-3']         = '203.0.113.0/24';
+        $classes['Multicast']          = '224.0.0.0/4';
+        $classes['Reserved']           = '240.0.0.0/4';
+        # result
+        return $classes;
+    }
+
+    /**
+     * Calculates IPv6 from cidr
+     *
+     * @access private
+     * @param mixed $cidr
+     * @return array
+     */
+    private function calculate_IPv6_calc_results ($cidr) {
+        # initialize subnets Class
+        $Subnets = new Subnets($this->Database);
+        # Initialize PEAR NET object
+        $this->initialize_pear_net_IPv6 ();
 
         # set ip address type
         $out = array();
@@ -1810,15 +1810,15 @@ 
         $out['Subnet Reverse DNS'] = $this->reverse_IPv6($subnet, $mask);
 
         # if IP == subnet clear the Host fields and Host Reverse DNS
-         if ($out['Host address'] == $out['Subnet prefix']) {
-             $out['Host address']                = '/';
-             $out['Host address (uncompressed)'] = '/';
-             unset($out['Host Reverse DNS']);
+            if ($out['Host address'] == $out['Subnet prefix']) {
+                $out['Host address']                = '/';
+                $out['Host address (uncompressed)'] = '/';
+                unset($out['Host Reverse DNS']);
         }
 
         # /min / max hosts
         $maxIp = gmp_strval(gmp_add(gmp_pow(2, 128 - $mask),$this->ip2long6 ($subnet)));
-		$maxIp = gmp_strval(gmp_sub($maxIp, 1));
+        $maxIp = gmp_strval(gmp_sub($maxIp, 1));
 
         $out['Min host IP']               = $subnet;
         $out['Max host IP']               = $this->long2ip6 ($maxIp);
@@ -1826,63 +1826,63 @@ 
 
         # set address type
         $out['Address type']              = $this->get_ipv6_address_type( $cidr );
-		# result
-		return $out;
-	}
-
-	/**
-	 * Calculate reverse DNS entry for IPv6 addresses
-	 *
-	 *	If a prefix length is given, generate only up to this length (ie. for zone definitions)
-	 *
-	 * @access public
-	 * @param mixed $addresses
-	 * @param int $pflen (default: 128)
-	 * @return string
-	 */
-	public function reverse_IPv6 ($addresses, $pflen=128) {
-		# Initialize PEAR NET object
-		$this->initialize_pear_net_IPv6 ();
-		//uncompress
-	    $uncompressed = $this->Net_IPv6->removeNetmaskSpec($this->Net_IPv6->uncompress($addresses));
-	    $len = $pflen / 4;
-	    $parts = explode(':', $uncompressed);
-	    $res = '';
-	    foreach($parts as $part) {
-	        $res .= str_pad($part, 4, '0', STR_PAD_LEFT);
-	    }
-	    $res = implode('.', str_split(strrev(substr($res, 0, $len)))) . '.ip6.arpa';
-	    if ($pflen % 4 != 0) {
-	        $res .= " "._("(closest parent)");
-	    }
-	    return $res;
-	}
-
-	/**
-	 * Returns IPv6 address type from cidr
-	 *
-	 * @access private
-	 * @param CIDR $cidr
-	 * @return string|false
-	 */
-	private function get_ipv6_address_type ($cidr) {
-		# Initialize PEAR NET object
-		$this->initialize_pear_net_IPv6 ();
-		# get type in number
-		$type = $this->Net_IPv6->getAddressType($cidr);
-		# fetch types
-		$all_types = $this->define_ipv6_address_types ();
-		# translate
-		return array_key_exists($type, $all_types) ? $all_types[$type] : false;
-	}
-
-	/**
-	 * Defines all IPv6 address types
-	 *
-	 * @access private
-	 * @return string[]
-	 */
-	private function define_ipv6_address_types () {
+        # result
+        return $out;
+    }
+
+    /**
+     * Calculate reverse DNS entry for IPv6 addresses
+     *
+     *	If a prefix length is given, generate only up to this length (ie. for zone definitions)
+     *
+     * @access public
+     * @param mixed $addresses
+     * @param int $pflen (default: 128)
+     * @return string
+     */
+    public function reverse_IPv6 ($addresses, $pflen=128) {
+        # Initialize PEAR NET object
+        $this->initialize_pear_net_IPv6 ();
+        //uncompress
+        $uncompressed = $this->Net_IPv6->removeNetmaskSpec($this->Net_IPv6->uncompress($addresses));
+        $len = $pflen / 4;
+        $parts = explode(':', $uncompressed);
+        $res = '';
+        foreach($parts as $part) {
+            $res .= str_pad($part, 4, '0', STR_PAD_LEFT);
+        }
+        $res = implode('.', str_split(strrev(substr($res, 0, $len)))) . '.ip6.arpa';
+        if ($pflen % 4 != 0) {
+            $res .= " "._("(closest parent)");
+        }
+        return $res;
+    }
+
+    /**
+     * Returns IPv6 address type from cidr
+     *
+     * @access private
+     * @param CIDR $cidr
+     * @return string|false
+     */
+    private function get_ipv6_address_type ($cidr) {
+        # Initialize PEAR NET object
+        $this->initialize_pear_net_IPv6 ();
+        # get type in number
+        $type = $this->Net_IPv6->getAddressType($cidr);
+        # fetch types
+        $all_types = $this->define_ipv6_address_types ();
+        # translate
+        return array_key_exists($type, $all_types) ? $all_types[$type] : false;
+    }
+
+    /**
+     * Defines all IPv6 address types
+     *
+     * @access private
+     * @return string[]
+     */
+    private function define_ipv6_address_types () {
         $all_types[10] = "NET_IPV6_NO_NETMASK";
         $all_types[1]  = "NET_IPV6";
         $all_types[11] = "NET_IPV6_RESERVED";
@@ -1897,9 +1897,9 @@ 
         $all_types[51] = "NET_IPV6_UNSPECIFIED";
         $all_types[51] = "NET_IPV6_LOOPBACK";
         $all_types[51] = "NET_IPV6_UNKNOWN_TYPE";
-		# response
+        # response
         return $all_types;
-	}
+    }
 
 
 
@@ -1914,10 +1914,10 @@ 
 
 
 
-	/**
-	 *	@nat methods
-	 *	------------------------------
-	 */
+    /**
+     *	@nat methods
+     *	------------------------------
+     */
 
     /**
      * Translates NAT objects to be shown on page
@@ -2155,12 +2155,12 @@ 
 
 
 
-	/**
-	 *	@pstn methods
-	 *	------------------------------
-	 *
-	 *  !pstn
-	 */
+    /**
+     *	@pstn methods
+     *	------------------------------
+     *
+     *  !pstn
+     */
 
     /**
      * Returns all prefixes in correct order
@@ -2172,522 +2172,522 @@ 
      * @return array|bool
      */
     public function fetch_all_prefixes ($master = false, $recursive = false) {
-	    if($master && !$recursive) {
-    	    $query = 'select *,concat(prefix,start) as raw from pstnPrefixes where master = ? order by raw asc;';
-    	    $params = array($master);
-	    }
-	    else {
-    	    $query = 'select *,concat(prefix,start) as raw from pstnPrefixes order by raw asc;';
-    	    $params = array();
-        }
-		# fetch
-		try { $prefixes = $this->Database->getObjectsQuery($query, $params); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
+        if($master && !$recursive) {
+            $query = 'select *,concat(prefix,start) as raw from pstnPrefixes where master = ? order by raw asc;';
+            $params = array($master);
+        }
+        else {
+            $query = 'select *,concat(prefix,start) as raw from pstnPrefixes order by raw asc;';
+            $params = array();
+        }
+        # fetch
+        try { $prefixes = $this->Database->getObjectsQuery($query, $params); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
         // for master + recursive we need to go from master id to next 0 (root
         if($master && $recursive && $prefixes) {
             $master_set = false;
             $out = array();
 
             foreach ($prefixes as $k=>$p) {
-        	    if($p->id == $master) {
-            	    $out[] = $p;
-            	    $master_set = true;
-        	    }
-        	    elseif ($master_set && $p->master!=0) {
-            	    $out[] = $p;
-        	    }
-        	    elseif ($master_set && $p->master!=0) {
-            	    break;
-        	    }
+                if($p->id == $master) {
+                    $out[] = $p;
+                    $master_set = true;
+                }
+                elseif ($master_set && $p->master!=0) {
+                    $out[] = $p;
+                }
+                elseif ($master_set && $p->master!=0) {
+                    break;
+                }
+            }
+            $prefixes = $out;
+        }
+        # result
+        return sizeof($prefixes)>0 ? array_values($prefixes) : false;
+    }
+
+    /**
+     * Normalize prefix / number.
+     *
+     * @access public
+     * @param mixed $number
+     * @return mixed
+     */
+    public function prefix_normalize ($number) {
+        return str_replace(array("+", " ", "-"), "", $number);
+    }
+
+    /**
+     * fetch whole tree path for prefix - from slave to parents
+     *
+     * @access public
+     * @param mixed $id
+     * @return array
+     */
+    public function fetch_prefix_parents_recursive ($id) {
+        $parents = array();
+        $root = false;
+
+        while($root === false) {
+            $subd = $this->fetch_object("pstnPrefixes", "id", $id);		# get subnet details
+
+            if($subd!==false) {
+                $subd = (array) $subd;
+                # not root yet
+                if(@$subd['master']!=0) {
+                    array_unshift($parents, $subd['master']);
+                    $id  = $subd['master'];
+                }
+                # root
+                else {
+                    array_unshift($parents, $subd['master']);
+                    $root = true;
+                }
+            }
+            else {
+                $root = true;
+            }
+        }
+        # remove 0
+        unset($parents[0]);
+        # return array
+        return $parents;
+    }
+
+    /**
+     * Fetch parents recursive - generic function
+     *
+     * Fetches all parents for specific table in id / parent relations
+     *
+     * It will return array, keys will be id's and values as defined in return_field
+     *
+     * @param string $table
+     * @param string $parent_field
+     * @param string $return_field
+     * @param int $false
+     * @param bool $reverse (default: true)
+     *
+     * @return array
+     */
+    public function fetch_parents_recursive ($table, $parent_field, $return_field, $id, $reverse = false) {
+        $parents = array();
+        $root = false;
+
+        while($root === false) {
+            $subd = $this->fetch_object($table, "id", $id);
+
+            if($subd!==false) {
+                $subd = (array) $subd;
+                # not root yet
+                if(@$subd[$parent_field]!=0) {
+                    // array_unshift($parents, $subd[$parent_field]);
+                    $parents[$subd['id']] = $subd[$return_field];
+                    $id  = $subd[$parent_field];
+                }
+                # root
+                else {
+                    $parents[$subd['id']] = $subd[$return_field];
+                    $root = true;
+                }
+            }
+            else {
+                $root = true;
+            }
+        }
+        # return array
+        return $reverse ? array_reverse($parents, truetrue) :$parents;
+    }
+
+    /**
+     * Checks for duplicate number.
+     *
+     * @access public
+     * @param bool $prefix (default: false)
+     * @param bool $number (default: false)
+     * @return null|boolean
+     */
+    public function check_number_duplicates ($prefix = false, $number = false) {
+        if($prefix===false && $number===false) {
+            $this->Result->show("danger", "Duplicate chck failed", true);
+        }
+        else {
+            $query = "select count(*) as cnt from pstnNumbers where prefix = ? and number = ?;";
+            # fetch
+            try { $cnt = $this->Database->getObjectQuery($query, array($prefix, $number)); }
+            catch (Exception $e) {
+                $this->Result->show("danger", _("Error: ").$e->getMessage());
+                return false;
+            }
+            # result
+            return $cnt->cnt>0 ? true : false;
+        }
+    }
+
+    /**
+     * Checks permission for specified prefix
+     *
+     *	we provide user details and subnetId
+     *
+     * @access public
+     * @param object $user
+     * @return int
+     */
+    public function check_prefix_permission ($user) {
+        return $user->role=="Administrator" ? 3 : $user->pstn;
+    }
+
+    /**
+     * Prints structured menu of prefixes
+     *
+     * @access public
+     * @param mixed $user
+     * @param mixed $prefixes
+     * @param mixed $custom_fields
+     * @return mixed
+     */
+    public function print_menu_prefixes ( $user, $prefixes, $custom_fields ) {
+
+        # set hidden fields
+        $this->get_settings ();
+        $hidden_fields = json_decode($this->settings->hiddenCustomFields, true);
+        $hidden_fields = is_array($hidden_fields['subnets']) ? $hidden_fields['subnets'] : array();
+
+        # set html array
+        $html = array();
+        # root is 0
+        $rootId = 0;
+
+        # remove all not permitted!
+        if(sizeof($prefixes)>0) {
+        foreach($prefixes as $k=>$s) {
+            $permission = $this->check_prefix_permission ($user);
+            if($permission == 0) { unset($prefixes[$k]); }
+        }
+        }
+
+        # create loop array
+        if(sizeof($prefixes) > 0) {
+        $children_prefixes = array();
+        foreach ( $prefixes as $item ) {
+            $item = (array) $item;
+            $children_prefixes[$item['master']][] = $item;
+        }
+        }
+        else {
+            return false;
+        }
+
+        # loop will be false if the root has no children (i.e., an empty menu!)
+        $loop = !empty( $children_prefixes[$rootId] );
+
+        # initializing $parent as the root
+        $parent = $rootId;
+        $parent_stack = array();
+
+        # old count
+        $old_count = 0;
+
+        # return table content (tr and td's)
+        reset( $children_prefixes[$parent] );
+        while ( $loop && ( ( $option = current( $children_prefixes[$parent] ) ) || ( $parent > $rootId ) ) )
+        {
+            next( $children_prefixes[$parent] );
+
+            if(count($parent_stack) == 0) {
+                $margin = "0px";
+                $padding = "0px";
+            }
+            else {
+                # padding
+                $padding = "10px";
+
+                # margin
+                $margin  = (count($parent_stack) * 10) -10;
+                $margin  = $margin *1.5;
+                $margin  = $margin."px";
+            }
+
+            # count levels
+            $count = count( $parent_stack ) + 1;
+
+            # description
+            $name = strlen($option['name'])==0 ? "/" : $option['name'];
+
+            # print table line
+            if(strlen($option['prefix']) > 0) {
+                # count change?
+                $html[] = "<tr class='level$count'>";
+
+                //which level?
+                if($count==1) {
+                    # last?
+                    if(!empty( $children_prefixes[$option['id']])) {
+                        $html[] = "	<td class='level$count'><span class='structure-last' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-folder-open-o'></i><a href='".create_link($_GET['page'],"pstn-prefixes",$option['id'])."'>".$option['prefix']." </a></td>";
+                        $html[] = "	<td class='level$count'><span class='structure-last' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-folder-open-o'></i> <strong>$name</strong></td>";
+                    } else {
+                        $html[] = "	<td class='level$count'><span class='structure' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-angle-right'></i><a href='".create_link($_GET['page'],"pstn-prefixes",$option['id'])."'>".$option['prefix']." </a></td>";
+                        $html[] = "	<td class='level$count'><span class='structure' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-angle-right'></i> <strong>$name</strong></td>";
+                    }
+                }
+                else {
+                    # last?
+                    if(!empty( $children_prefixes[$option['id']])) {
+                        $html[] = "	<td class='level$count'><span class='structure-last' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-folder-open-o'></i> <a href='".create_link($_GET['page'],"pstn-prefixes",$option['id'])."'>  ".$option['prefix']."</a></td>";
+                        $html[] = "	<td class='level$count'><span class='structure-last' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-folder-open-o'></i> <strong>$name</strong></td>";
+                    }
+                    else {
+                        $html[] = "	<td class='level$count'><span class='structure' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-angle-right'></i> <a href='".create_link($_GET['page'],"pstn-prefixes",$option['id'])."'>  ".$option['prefix']."</a></td>";
+                        $html[] = "	<td class='level$count'><span class='structure' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-angle-right'></i> <strong>$name</strong></td>";
+                    }
+                }
+
+                // range
+                $html[] = " <td class='level$count'><span class='structure-last' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-angle-right'></i> ".$option['prefix'].$option['start']." ".$option['prefix'].$option['stop']."</td>";
+
+                //start/stop
+                $html[] = "	<td>".$option['start']."</td>";
+                $html[] = "	<td>".$option['stop']."</td>";
+
+                //count
+                $cnt = $this->count_database_objects("pstnNumbers", "prefix", $option['id']);
+
+                $html[] = "	<td><span class='badge badge1 badge5'>".$cnt."</span></td>";
+
+                //device
+                $device = ( $option['deviceId']==0 || empty($option['deviceId']) ) ? false : true;
+
+                if($device===false) { $html[] ='	<td>/</td>' . "\n"; }
+                else {
+                    $device = $this->fetch_object ("devices", "id", $option['deviceId']);
+                    if ($device!==false) {
+                        $html[] = "	<td><a href='".create_link("tools","devices",$device->id)."'>".$device->hostname .'</a></td>' . "\n";
+                    }
+                    else {
+                        $html[] ='	<td>/</td>' . "\n";
+                    }
+                }
+
+                //custom
+                if(sizeof($custom_fields) > 0) {
+                        foreach($custom_fields as $field) {
+                            # hidden?
+                            if(!in_array($field['name'], $hidden_fields)) {
+
+                                $html[] =  "<td class='hidden-xs hidden-sm hidden-md'>";
+
+                                //booleans
+                            if($field['type']=="tinyint(1)")	{
+                                if($option[$field['name']] == "0")			{ $html[] = _("No"); }
+                                elseif($option[$field['name']] == "1")		{ $html[] = _("Yes"); }
+                            }
+                            //text
+                            elseif($field['type']=="text") {
+                                if(strlen($option[$field['name']])>0)		{ $html[] = "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace("\n", "<br>", $option[$field['name']])."'>"; }
+                                else												{ $html[] = ""; }
+                            }
+                            else {
+                                $html[] = $option[$field['name']];
+
+                            }
+
+                                $html[] =  "</td>";
+                            }
+                    }
+                }
+
+                # set permission
+                $permission = $this->check_prefix_permission ($user);
+
+                $html[] = "	<td class='actions' style='padding:0px;'>";
+                $html[] = "	<div class='btn-group'>";
+
+                if($permission>2) {
+                    $html[] = "		<button class='btn btn-xs btn-default editPSTN' data-action='edit'   data-id='".$option['id']."'><i class='fa fa-pencil'></i></button>";
+                    $html[] = "		<button class='btn btn-xs btn-default editPSTN' data-action='delete' data-id='".$option['id']."'><i class='fa fa-times'></i></button>";
+                }
+                else {
+                    $html[] = "		<button class='btn btn-xs btn-default disabled'><i class='fa fa-gray fa-pencil'></i></button>";
+                    $html[] = "		<button class='btn btn-xs btn-default disabled'><i class='fa fa-gray fa-times'></i></button>";
+                }
+                $html[] = "	</div>";
+                $html[] = "	</td>";
+
+                $html[] = "</tr>";
+
+                # save old level count
+                $old_count = $count;
+            }
+
+            if ( $option === false ) { $parent = array_pop( $parent_stack ); }
+            # Has slave subnets
+            elseif ( !empty( $children_prefixes[$option['id']] ) ) {
+                array_push( $parent_stack, $option['master'] );
+                $parent = $option['id'];
+            }
+        }
+        # print
+        return $html;
+    }
+
+
+
+
+    /**
+     * Prints dropdown menu for master prefix selection in prefix editing
+     *
+     * @access public
+     * @param bool $prefixId (default: false)
+     * @return mixed
+     */
+    public function print_masterprefix_dropdown_menu ($prefixId = false) {
+
+        # initialize vars
+        $children_prefixes = array();
+        $parent_stack_prefixes = array();
+        $html = array();
+        $rootId = 0;			// root is 0
+        $parent = $rootId;      // initializing $parent as the root
+
+        # fetch all prefixes in section
+        $all_prefixes = $this->fetch_all_prefixes ();
+        if (!is_array($all_prefixes)) $all_prefixes = array();
+        # folder or subnet?
+        foreach($all_prefixes as $s) {
+            $children_prefixes[$s->master][] = (array) $s;
+        }
+
+        # loop will be false if the root has no children (i.e., an empty menu!)
+        $loop  = !empty( $children_prefixes[$rootId] );
+
+        # structure
+        $html[] = "<select name='master' class='form-control input-sm input-w-auto input-max-200'>";
+
+        # root subnet
+        $html[] = "<option value='0'>"._("Root subnet")."</option>";
+
+        # return table content (tr and td's) - subnets
+        if(sizeof($children_prefixes)>0) {
+        reset( $children_prefixes[$parent] );
+        while ( $loop && ( ( $option = current( $children_prefixes[$parent] ) ) || ( $parent > $rootId ) ) )
+        {
+            next( $children_prefixes[$parent] );
+            # repeat
+            $repeat  = str_repeat( " &nbsp;&nbsp; ", ( count($parent_stack_prefixes)) );
+
+            # selected
+            $selected = $option['id'] == $prefixId ? "selected='selected'" : "";
+            if($option['id'])
+            $html[] = "<option value='".$option['id']."' $selected>$repeat ".$option['prefix']." (".$option['name'].")</option>";
+
+            if ( $option === false ) { $parent = array_pop( $parent_stack_prefixes ); }
+            # Has slave subnets
+            elseif ( !empty( $children_prefixes[$option['id']] ) ) {
+                array_push( $parent_stack_prefixes, $option['master'] );
+                $parent = $option['id'];
+            }		}
+        }
+        $html[] = "</select>";
+        # join and print
+        print implode( "\n", $html );
+    }
+
+
+
+
+    /**
+     * This function compresses all pstn
+     *
+     *	input is array of pstn ranges
+     *	output compresses pstn range
+     *
+     * @access public
+     * @param array $numbers
+     * @return array
+     */
+    public function compress_pstn_ranges ($numbers, $state=4) {
+        # set size
+        $size = sizeof($numbers);
+        // vars
+        $numbers_formatted = array();
+
+        # loop through IP addresses
+        for($c=0; $c<$size; $c++) {
+            # ignore already comressed range
+            if($numbers[$c]->class!="compressed-range") {
+                # gap between this and previous
+                if(gmp_strval( @gmp_sub($numbers[$c]->number, $numbers[$c-1]->number)) != 1) {
+                    # remove index flag
+                    unset($fIndex);
+                    # save IP address
+                    $numbers_formatted[$c] = $numbers[$c];
+                    $numbers_formatted[$c]->class = "ip";
+
+                    # no gap this -> next
+                    if(gmp_strval( @gmp_sub($numbers[$c]->number, $numbers[$c+1]->number)) == -1 && $numbers[$c]->state==$state) {
+                        //is state the same?
+                        if($numbers[$c]->state==$numbers[$c+1]->state) {
+                            $fIndex = $c;
+                            $numbers_formatted[$fIndex]->startIP = $numbers[$c]->number;
+                            $numbers_formatted[$c]->class = "compressed-range";
+                        }
+                    }
+                }
+                # no gap between this and previous
+                else {
+                    # is state same as previous?
+                    if($numbers[$c]->state==$numbers[$c-1]->state && $numbers[$c]->state==$state) {
+                        $numbers_formatted[$fIndex]->stopIP = $numbers[$c]->number;	//adds dhcp state
+                        $numbers_formatted[$fIndex]->numHosts = gmp_strval( gmp_add(@gmp_sub($numbers[$c]->number, $numbers_formatted[$fIndex]->number),1));	//add number of hosts
+                    }
+                    # different state
+                    else {
+                        # remove index flag
+                        unset($fIndex);
+                        # save IP address
+                        $numbers_formatted[$c] = $numbers[$c];
+                        $numbers_formatted[$c]->class = "ip";
+                        # check if state is same as next to start range
+                        if($numbers[$c]->state==@$numbers[$c+1]->state &&  gmp_strval( @gmp_sub($numbers[$c]->number, $numbers[$c+1]->number)) == -1 && $numbers[$c]->state==$state) {
+                            $fIndex = $c;
+                            $numbers_formatted[$fIndex]->startIP = $numbers[$c]->number;
+                            $numbers_formatted[$c]->class = "compressed-range";
+                        }
+                    }
+                }
+            }
+            else {
+                # save already compressed
+                $numbers_formatted[$c] = $numbers[$c];
             }
-            $prefixes = $out;
         }
-		# result
-		return sizeof($prefixes)>0 ? array_values($prefixes) : false;
+        # overrwrite ipaddresses and rekey
+        $addresses = @array_values($numbers_formatted);
+        # return
+        return $addresses;
     }
 
     /**
-     * Normalize prefix / number.
+     * Calculates pstn usage - dhcp, active, ...
      *
      * @access public
-     * @param mixed $number
-     * @return mixed
+     * @param obj $prefix        //subnet in decimal format
+     * @param obj $numbers	     //netmask in decimal format
+     * @return array
      */
-    public function prefix_normalize ($number) {
-        return str_replace(array("+", " ", "-"), "", $number);
-    }
-
-	/**
-	 * fetch whole tree path for prefix - from slave to parents
-	 *
-	 * @access public
-	 * @param mixed $id
-	 * @return array
-	 */
-	public function fetch_prefix_parents_recursive ($id) {
-		$parents = array();
-		$root = false;
-
-		while($root === false) {
-			$subd = $this->fetch_object("pstnPrefixes", "id", $id);		# get subnet details
-
-			if($subd!==false) {
-    			$subd = (array) $subd;
-				# not root yet
-				if(@$subd['master']!=0) {
-					array_unshift($parents, $subd['master']);
-					$id  = $subd['master'];
-				}
-				# root
-				else {
-					array_unshift($parents, $subd['master']);
-					$root = true;
-				}
-			}
-			else {
-				$root = true;
-			}
-		}
-		# remove 0
-		unset($parents[0]);
-		# return array
-		return $parents;
-	}
-
-	/**
-	 * Fetch parents recursive - generic function
-	 *
-	 * Fetches all parents for specific table in id / parent relations
-	 *
-	 * It will return array, keys will be id's and values as defined in return_field
-	 *
-	 * @param string $table
-	 * @param string $parent_field
-	 * @param string $return_field
-	 * @param int $false
-	 * @param bool $reverse (default: true)
-	 *
-	 * @return array
-	 */
-	public function fetch_parents_recursive ($table, $parent_field, $return_field, $id, $reverse = false) {
-		$parents = array();
-		$root = false;
-
-		while($root === false) {
-			$subd = $this->fetch_object($table, "id", $id);
-
-			if($subd!==false) {
-    			$subd = (array) $subd;
-				# not root yet
-				if(@$subd[$parent_field]!=0) {
-					// array_unshift($parents, $subd[$parent_field]);
-					$parents[$subd['id']] = $subd[$return_field];
-					$id  = $subd[$parent_field];
-				}
-				# root
-				else {
-					$parents[$subd['id']] = $subd[$return_field];
-					$root = true;
-				}
-			}
-			else {
-				$root = true;
-			}
-		}
-		# return array
-		return $reverse ? array_reverse($parents, truetrue) :$parents;
-	}
-
-	/**
-	 * Checks for duplicate number.
-	 *
-	 * @access public
-	 * @param bool $prefix (default: false)
-	 * @param bool $number (default: false)
-	 * @return null|boolean
-	 */
-	public function check_number_duplicates ($prefix = false, $number = false) {
-    	if($prefix===false && $number===false) {
-        	$this->Result->show("danger", "Duplicate chck failed", true);
-    	}
-    	else {
-        	$query = "select count(*) as cnt from pstnNumbers where prefix = ? and number = ?;";
-    		# fetch
-    		try { $cnt = $this->Database->getObjectQuery($query, array($prefix, $number)); }
-    		catch (Exception $e) {
-    			$this->Result->show("danger", _("Error: ").$e->getMessage());
-    			return false;
-    		}
-    		# result
-    		return $cnt->cnt>0 ? true : false;
-    	}
-	}
-
-	/**
-	 * Checks permission for specified prefix
-	 *
-	 *	we provide user details and subnetId
-	 *
-	 * @access public
-	 * @param object $user
-	 * @return int
-	 */
-	public function check_prefix_permission ($user) {
-        return $user->role=="Administrator" ? 3 : $user->pstn;
-	}
-
-	/**
-	 * Prints structured menu of prefixes
-	 *
-	 * @access public
-	 * @param mixed $user
-	 * @param mixed $prefixes
-	 * @param mixed $custom_fields
-	 * @return mixed
-	 */
-	public function print_menu_prefixes ( $user, $prefixes, $custom_fields ) {
-
-		# set hidden fields
-		$this->get_settings ();
-		$hidden_fields = json_decode($this->settings->hiddenCustomFields, true);
-		$hidden_fields = is_array($hidden_fields['subnets']) ? $hidden_fields['subnets'] : array();
-
-		# set html array
-		$html = array();
-		# root is 0
-		$rootId = 0;
-
-		# remove all not permitted!
-		if(sizeof($prefixes)>0) {
-		foreach($prefixes as $k=>$s) {
-			$permission = $this->check_prefix_permission ($user);
-			if($permission == 0) { unset($prefixes[$k]); }
-		}
-		}
-
-		# create loop array
-		if(sizeof($prefixes) > 0) {
-        $children_prefixes = array();
-		foreach ( $prefixes as $item ) {
-			$item = (array) $item;
-			$children_prefixes[$item['master']][] = $item;
-		}
-		}
-		else {
-			return false;
-		}
-
-		# loop will be false if the root has no children (i.e., an empty menu!)
-		$loop = !empty( $children_prefixes[$rootId] );
-
-		# initializing $parent as the root
-		$parent = $rootId;
-		$parent_stack = array();
-
-		# old count
-		$old_count = 0;
-
-		# return table content (tr and td's)
-		reset( $children_prefixes[$parent] );
-		while ( $loop && ( ( $option = current( $children_prefixes[$parent] ) ) || ( $parent > $rootId ) ) )
-		{
-			next( $children_prefixes[$parent] );
-
-			if(count($parent_stack) == 0) {
-				$margin = "0px";
-				$padding = "0px";
-			}
-			else {
-				# padding
-				$padding = "10px";
-
-				# margin
-				$margin  = (count($parent_stack) * 10) -10;
-				$margin  = $margin *1.5;
-				$margin  = $margin."px";
-			}
-
-			# count levels
-			$count = count( $parent_stack ) + 1;
-
-			# description
-			$name = strlen($option['name'])==0 ? "/" : $option['name'];
-
-			# print table line
-			if(strlen($option['prefix']) > 0) {
-    			# count change?
-				$html[] = "<tr class='level$count'>";
-
-				//which level?
-				if($count==1) {
-					# last?
-					if(!empty( $children_prefixes[$option['id']])) {
-						$html[] = "	<td class='level$count'><span class='structure-last' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-folder-open-o'></i><a href='".create_link($_GET['page'],"pstn-prefixes",$option['id'])."'>".$option['prefix']." </a></td>";
-						$html[] = "	<td class='level$count'><span class='structure-last' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-folder-open-o'></i> <strong>$name</strong></td>";
-					} else {
-						$html[] = "	<td class='level$count'><span class='structure' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-angle-right'></i><a href='".create_link($_GET['page'],"pstn-prefixes",$option['id'])."'>".$option['prefix']." </a></td>";
-						$html[] = "	<td class='level$count'><span class='structure' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-angle-right'></i> <strong>$name</strong></td>";
-					}
-				}
-				else {
-					# last?
-					if(!empty( $children_prefixes[$option['id']])) {
-						$html[] = "	<td class='level$count'><span class='structure-last' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-folder-open-o'></i> <a href='".create_link($_GET['page'],"pstn-prefixes",$option['id'])."'>  ".$option['prefix']."</a></td>";
-						$html[] = "	<td class='level$count'><span class='structure-last' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-folder-open-o'></i> <strong>$name</strong></td>";
-					}
-					else {
-						$html[] = "	<td class='level$count'><span class='structure' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-angle-right'></i> <a href='".create_link($_GET['page'],"pstn-prefixes",$option['id'])."'>  ".$option['prefix']."</a></td>";
-						$html[] = "	<td class='level$count'><span class='structure' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-angle-right'></i> <strong>$name</strong></td>";
-					}
-				}
-
-				// range
-				$html[] = " <td class='level$count'><span class='structure-last' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-angle-right'></i> ".$option['prefix'].$option['start']." ".$option['prefix'].$option['stop']."</td>";
-
-				//start/stop
-				$html[] = "	<td>".$option['start']."</td>";
-				$html[] = "	<td>".$option['stop']."</td>";
-
-				//count
-                $cnt = $this->count_database_objects("pstnNumbers", "prefix", $option['id']);
-
-                $html[] = "	<td><span class='badge badge1 badge5'>".$cnt."</span></td>";
-
-				//device
-				$device = ( $option['deviceId']==0 || empty($option['deviceId']) ) ? false : true;
-
-				if($device===false) { $html[] ='	<td>/</td>' . "\n"; }
-				else {
-					$device = $this->fetch_object ("devices", "id", $option['deviceId']);
-					if ($device!==false) {
-						$html[] = "	<td><a href='".create_link("tools","devices",$device->id)."'>".$device->hostname .'</a></td>' . "\n";
-					}
-					else {
-						$html[] ='	<td>/</td>' . "\n";
-					}
-				}
-
-				//custom
-				if(sizeof($custom_fields) > 0) {
-			   		foreach($custom_fields as $field) {
-				   		# hidden?
-				   		if(!in_array($field['name'], $hidden_fields)) {
-
-				   			$html[] =  "<td class='hidden-xs hidden-sm hidden-md'>";
-
-				   			//booleans
-							if($field['type']=="tinyint(1)")	{
-								if($option[$field['name']] == "0")			{ $html[] = _("No"); }
-								elseif($option[$field['name']] == "1")		{ $html[] = _("Yes"); }
-							}
-							//text
-							elseif($field['type']=="text") {
-								if(strlen($option[$field['name']])>0)		{ $html[] = "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace("\n", "<br>", $option[$field['name']])."'>"; }
-								else												{ $html[] = ""; }
-							}
-							else {
-								$html[] = $option[$field['name']];
-
-							}
-
-				   			$html[] =  "</td>";
-			   			}
-			    	}
-			    }
-
-				# set permission
-				$permission = $this->check_prefix_permission ($user);
-
-				$html[] = "	<td class='actions' style='padding:0px;'>";
-				$html[] = "	<div class='btn-group'>";
-
-				if($permission>2) {
-					$html[] = "		<button class='btn btn-xs btn-default editPSTN' data-action='edit'   data-id='".$option['id']."'><i class='fa fa-pencil'></i></button>";
-					$html[] = "		<button class='btn btn-xs btn-default editPSTN' data-action='delete' data-id='".$option['id']."'><i class='fa fa-times'></i></button>";
-				}
-				else {
-					$html[] = "		<button class='btn btn-xs btn-default disabled'><i class='fa fa-gray fa-pencil'></i></button>";
-					$html[] = "		<button class='btn btn-xs btn-default disabled'><i class='fa fa-gray fa-times'></i></button>";
-				}
-				$html[] = "	</div>";
-				$html[] = "	</td>";
-
-				$html[] = "</tr>";
-
-                # save old level count
-                $old_count = $count;
-			}
-
-			if ( $option === false ) { $parent = array_pop( $parent_stack ); }
-			# Has slave subnets
-			elseif ( !empty( $children_prefixes[$option['id']] ) ) {
-				array_push( $parent_stack, $option['master'] );
-				$parent = $option['id'];
-			}
-		}
-		# print
-		return $html;
-	}
-
-
-
-
-	/**
-	 * Prints dropdown menu for master prefix selection in prefix editing
-	 *
-	 * @access public
-	 * @param bool $prefixId (default: false)
-	 * @return mixed
-	 */
-	public function print_masterprefix_dropdown_menu ($prefixId = false) {
-
-		# initialize vars
-		$children_prefixes = array();
-		$parent_stack_prefixes = array();
-		$html = array();
-		$rootId = 0;			// root is 0
-		$parent = $rootId;      // initializing $parent as the root
-
-		# fetch all prefixes in section
-		$all_prefixes = $this->fetch_all_prefixes ();
-		if (!is_array($all_prefixes)) $all_prefixes = array();
-		# folder or subnet?
-		foreach($all_prefixes as $s) {
-			$children_prefixes[$s->master][] = (array) $s;
-		}
-
-		# loop will be false if the root has no children (i.e., an empty menu!)
-		$loop  = !empty( $children_prefixes[$rootId] );
-
-		# structure
-		$html[] = "<select name='master' class='form-control input-sm input-w-auto input-max-200'>";
-
-		# root subnet
-		$html[] = "<option value='0'>"._("Root subnet")."</option>";
-
-		# return table content (tr and td's) - subnets
-		if(sizeof($children_prefixes)>0) {
-		reset( $children_prefixes[$parent] );
-		while ( $loop && ( ( $option = current( $children_prefixes[$parent] ) ) || ( $parent > $rootId ) ) )
-		{
-			next( $children_prefixes[$parent] );
-			# repeat
-			$repeat  = str_repeat( " &nbsp;&nbsp; ", ( count($parent_stack_prefixes)) );
-
-			# selected
-			$selected = $option['id'] == $prefixId ? "selected='selected'" : "";
-			if($option['id'])
-            $html[] = "<option value='".$option['id']."' $selected>$repeat ".$option['prefix']." (".$option['name'].")</option>";
-
-			if ( $option === false ) { $parent = array_pop( $parent_stack_prefixes ); }
-			# Has slave subnets
-			elseif ( !empty( $children_prefixes[$option['id']] ) ) {
-				array_push( $parent_stack_prefixes, $option['master'] );
-				$parent = $option['id'];
-			}		}
-		}
-		$html[] = "</select>";
-		# join and print
-		print implode( "\n", $html );
-	}
-
-
-
-
-	/**
-	 * This function compresses all pstn
-	 *
-	 *	input is array of pstn ranges
-	 *	output compresses pstn range
-	 *
-	 * @access public
-	 * @param array $numbers
-	 * @return array
-	 */
-	public function compress_pstn_ranges ($numbers, $state=4) {
-    	# set size
-    	$size = sizeof($numbers);
-    	// vars
-    	$numbers_formatted = array();
-
-		# loop through IP addresses
-		for($c=0; $c<$size; $c++) {
-			# ignore already comressed range
-			if($numbers[$c]->class!="compressed-range") {
-				# gap between this and previous
-				if(gmp_strval( @gmp_sub($numbers[$c]->number, $numbers[$c-1]->number)) != 1) {
-					# remove index flag
-					unset($fIndex);
-					# save IP address
-					$numbers_formatted[$c] = $numbers[$c];
-					$numbers_formatted[$c]->class = "ip";
-
-					# no gap this -> next
-					if(gmp_strval( @gmp_sub($numbers[$c]->number, $numbers[$c+1]->number)) == -1 && $numbers[$c]->state==$state) {
-						//is state the same?
-						if($numbers[$c]->state==$numbers[$c+1]->state) {
-							$fIndex = $c;
-							$numbers_formatted[$fIndex]->startIP = $numbers[$c]->number;
-							$numbers_formatted[$c]->class = "compressed-range";
-						}
-					}
-				}
-				# no gap between this and previous
-				else {
-					# is state same as previous?
-					if($numbers[$c]->state==$numbers[$c-1]->state && $numbers[$c]->state==$state) {
-						$numbers_formatted[$fIndex]->stopIP = $numbers[$c]->number;	//adds dhcp state
-						$numbers_formatted[$fIndex]->numHosts = gmp_strval( gmp_add(@gmp_sub($numbers[$c]->number, $numbers_formatted[$fIndex]->number),1));	//add number of hosts
-					}
-					# different state
-					else {
-						# remove index flag
-						unset($fIndex);
-						# save IP address
-						$numbers_formatted[$c] = $numbers[$c];
-						$numbers_formatted[$c]->class = "ip";
-						# check if state is same as next to start range
-						if($numbers[$c]->state==@$numbers[$c+1]->state &&  gmp_strval( @gmp_sub($numbers[$c]->number, $numbers[$c+1]->number)) == -1 && $numbers[$c]->state==$state) {
-							$fIndex = $c;
-							$numbers_formatted[$fIndex]->startIP = $numbers[$c]->number;
-							$numbers_formatted[$c]->class = "compressed-range";
-						}
-					}
-				}
-			}
-			else {
-				# save already compressed
-				$numbers_formatted[$c] = $numbers[$c];
-			}
-		}
-		# overrwrite ipaddresses and rekey
-		$addresses = @array_values($numbers_formatted);
-		# return
-		return $addresses;
-	}
-
-	/**
-	 * Calculates pstn usage - dhcp, active, ...
-	 *
-	 * @access public
-	 * @param obj $prefix        //subnet in decimal format
-	 * @param obj $numbers	     //netmask in decimal format
-	 * @return array
-	 */
-	public function calculate_prefix_usege ($prefix, $numbers) {
-	    # calculate max number of hosts
-	    $details = array();
-	    $details['maxhosts'] = ($prefix->stop - $prefix->start + 1);
-
-		# get IP address count per address type
-		if($numbers!==false) {
-		    $details_p = $this->calculate_prefix_usage_sort_numbers ($numbers);
-    	    foreach($this->address_types as $t) {
-    		    $details[$t['type']."_percent"] = round( ( ($details_p[$t['type']] * 100) / $details['maxhosts']), 2 );
-    	    }
+    public function calculate_prefix_usege ($prefix, $numbers) {
+        # calculate max number of hosts
+        $details = array();
+        $details['maxhosts'] = ($prefix->stop - $prefix->start + 1);
+
+        # get IP address count per address type
+        if($numbers!==false) {
+            $details_p = $this->calculate_prefix_usage_sort_numbers ($numbers);
+            foreach($this->address_types as $t) {
+                $details[$t['type']."_percent"] = round( ( ($details_p[$t['type']] * 100) / $details['maxhosts']), 2 );
+            }
 
             # calculate free hosts
             $details['freehosts'] =  $details['maxhosts'] - sizeof($numbers);
@@ -2695,76 +2695,76 @@ 
         else {
             $details['freehosts'] =  $details['maxhosts'];
         }
-	    # calculate use percentage for each type
-	    $details['freehosts_percent'] = round( ( ($details['freehosts'] * 100) / $details['maxhosts']), 2 );
-
-	    # result
-	    return $details;
-	}
-
-	/**
-	 * Calculates number usage per host type
-	 *
-	 * @access public
-	 * @param mixed $numbers
-	 * @return array
-	 */
-	public function calculate_prefix_usage_sort_numbers ($numbers) {
-		$count = array();
-		$count['used'] = 0;				//initial sum count
-		# fetch address types
-		$this->get_addresses_types();
-		# create array of keys with initial value of 0
-		foreach($this->address_types as $a) {
-			$count[$a['type']] = 0;
-		}
-		# count
-		if($numbers!==false) {
-			foreach($numbers as $n) {
-				$count[$this->translate_address_type($n->state)]++;
-				$count['used'] = gmp_strval(gmp_add($count['used'], 1));
-			}
-		}
-		# result
-		return $count;
-	}
-
-	/**
-	 * Returns array of address types
-	 *
-	 * @access public
-	 */
-	public function get_addresses_types () {
-		# from cache
-		if($this->address_types == null) {
-        	# fetch
-        	$types = $this->fetch_all_objects ("ipTags", "id");
+        # calculate use percentage for each type
+        $details['freehosts_percent'] = round( ( ($details['freehosts'] * 100) / $details['maxhosts']), 2 );
+
+        # result
+        return $details;
+    }
+
+    /**
+     * Calculates number usage per host type
+     *
+     * @access public
+     * @param mixed $numbers
+     * @return array
+     */
+    public function calculate_prefix_usage_sort_numbers ($numbers) {
+        $count = array();
+        $count['used'] = 0;				//initial sum count
+        # fetch address types
+        $this->get_addresses_types();
+        # create array of keys with initial value of 0
+        foreach($this->address_types as $a) {
+            $count[$a['type']] = 0;
+        }
+        # count
+        if($numbers!==false) {
+            foreach($numbers as $n) {
+                $count[$this->translate_address_type($n->state)]++;
+                $count['used'] = gmp_strval(gmp_add($count['used'], 1));
+            }
+        }
+        # result
+        return $count;
+    }
+
+    /**
+     * Returns array of address types
+     *
+     * @access public
+     */
+    public function get_addresses_types () {
+        # from cache
+        if($this->address_types == null) {
+            # fetch
+            $types = $this->fetch_all_objects ("ipTags", "id");
 
             # save to array
-			$types_out = array();
-			foreach($types as $t) {
-				$types_out[$t->id] = (array) $t;
-			}
-			# save to cache
-			$this->address_types = $types_out;
-		}
-	}
+            $types_out = array();
+            foreach($types as $t) {
+                $types_out[$t->id] = (array) $t;
+            }
+            # save to cache
+            $this->address_types = $types_out;
+        }
+    }
 
-	/**
-	 * Translates address type from index (int) to type
-	 *
-	 *	e.g.: 0 > offline
-	 *
-	 * @access public
-	 * @param mixed $index
-	 * @return array
-	 */
-	public function translate_address_type ($index) {
-		# fetch
-		$this->get_addresses_types();
-		# return
-		return $this->address_types[$index]["type"];
-	}
+    /**
+     * Translates address type from index (int) to type
+     *
+     *	e.g.: 0 > offline
+     *
+     * @access public
+     * @param mixed $index
+     * @return array
+     */
+    public function translate_address_type ($index) {
+        # fetch
+        $this->get_addresses_types();
+        # return
+        return $this->address_types[$index]["type"];
+    }
 
 
 
@@ -2776,12 +2776,12 @@ 
 
 
 
-	/**
-	 *	@location methods
-	 *	------------------------------
-	 *
-	 *  !location
-	 */
+    /**
+     *	@location methods
+     *	------------------------------
+     *
+     *  !location
+     */
 
     /**
      * Fetches all location objects.
@@ -2843,12 +2843,12 @@ 
                         )
                         as linked;";
 
-     		// fetch
-    		try { $objects = $this->Database->getObjectsQuery($query); }
-    		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), true); }
+                // fetch
+            try { $objects = $this->Database->getObjectsQuery($query); }
+            catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), true); }
 
-    		// return
-    		return sizeof($objects)>0 ? $objects : false;
+            // return
+            return sizeof($objects)>0 ? $objects : false;
         }
         else {
             return false;
@@ -2857,340 +2857,340 @@ 
 
 
 
-	/**
-	 *	@misc methods
-	 *	------------------------------
-	 */
-
-	/**
-	 * Fetches all circuits from database
-	 *
-	 * @method fetch_all_circuits
-	 *
-	 * @param  array $custom_circuit_fields
-	 *
-	 * @return false|array
-	 */
-	public function fetch_all_circuits ($custom_circuit_fields = array ()) {
-		// set query
-		$query[] = "select";
-		$query[] = "c.id,c.cid,c.type,c.device1,c.location1,c.device2,c.location2,c.customer_id,p.name,p.description,p.contact,c.capacity,p.id as pid,c.status";
-		// custom fields
-		if(is_array($custom_circuit_fields)) {
-			if(sizeof($custom_circuit_fields)>0) {
-				foreach ($custom_circuit_fields as $f) {
-					$query[] = ",c.`".$f['name']."`";
-				}
-			}
-		}
-		$query[] = "from circuits as c, circuitProviders as p where c.provider = p.id";
-		$query[] = "order by c.cid asc;";
-		// fetch
-		try { $circuits = $this->Database->getObjectsQuery(implode("\n", $query), array()); }
-		catch (Exception $e) {
-			$this->Result->show("danger", $e->getMessage(), true);
-		}
-		// return
-		return sizeof($circuits)>0 ? $circuits : false;
-	}
-
-	/**
-	 * Fetches all logical circuits belonging to circuit
-	 *
-	 * @method fetch_all_logical_circuits_using_circuit
-	 * @param  int $circuit_id
-	 * @return array|false
-	 */
-	public function fetch_all_logical_circuits_using_circuit ($circuit_id) {
-		// set query
-		$query[] = "select";
-		$query[] = "lc.*";
-		$query[] = "from circuitsLogical as lc";
-		$query[] = "join `circuitsLogicalMapping` mapping on mapping.logicalCircuit_id=lc.id";
-		$query[] = "WHERE mapping.circuit_id = ?";
-		$query[] = "order by lc.logical_cid asc;";
-		// fetch
-		try { $circuits = $this->Database->getObjectsQuery(implode("\n", $query), [$circuit_id]); }
-		catch (Exception $e) {
-			$this->Result->show("danger", $e->getMessage(), true);
-		}
-		// return
-		return sizeof($circuits)>0 ? $circuits : false;
-	}
-
-	/**
-	 * Fetch all members of logical circuit
-	 *
-	 * @method fetch_all_logical_circuit_members
-	 * @param  int $logical_circuit_id
-	 * @return array|false
-	 */
-  	public function fetch_all_logical_circuit_members ($logical_circuit_id) {
-  		// set query
-		$query2[] = "SELECT";
-		$query2[] = "c.*";
-		$query2[] = "FROM `circuits` c";
-		$query2[] = "join `circuitsLogicalMapping` mapping on mapping.circuit_id=c.id";
-		$query2[] = "where mapping.logicalCircuit_id = ?";
-		$query2[] = "order by mapping.`order`;";
-		// fetch
-		try { $circuits = $this->Database->getObjectsQuery(implode("\n", $query2), $logical_circuit_id); }
-		catch (Exception $e) {
-			$this->Result->show("danger", $e->getMessage(), true);
-		}
-		return sizeof($circuits)>0 ? $circuits : false;
-	}
-
-	/**
-	 * Fetches all circuits for specific provider
-	 *
-	 * @method fetch_all_circuits
-	 *
-	 * @param  int $provider_id
-	 * @param  array $custom_circuit_fields
-	 *
-	 * @return false|array
-	 */
-	public function fetch_all_provider_circuits ($provider_id, $custom_circuit_fields = array ()) {
-		// set query
-		$query[] = "select";
-		$query[] = "c.id,c.cid,c.type,c.device1,c.location1,c.device2,c.location2,p.name,p.description,p.contact,c.capacity,p.id as pid,c.status";
-		// custom fields
-		if(is_array($custom_circuit_fields)) {
-			if(sizeof($custom_circuit_fields)>0) {
-				foreach ($custom_circuit_fields as $f) {
-					$query[] = ",c.`".$f['name']."`";
-				}
-			}
-		}
-		$query[] = "from circuits as c, circuitProviders as p where c.provider = p.id and c.provider = ?";
-		$query[] = "order by c.cid asc;";
-		// fetch
-		try { $circuits = $this->Database->getObjectsQuery(implode("\n", $query), array($provider_id)); }
-		catch (Exception $e) {
-			$this->Result->show("danger", $e->getMessage(), true);
-		}
-		// return
-		return sizeof($circuits)>0 ? $circuits : false;
-	}
-
-
-	/**
-	 * Fetches all circuits for specific device
-	 *
-	 * @method fetch_all_circuits
-	 *
-	 * @param  int $device_id
-	 *
-	 * @return false|array
-	 */
-	public function fetch_all_device_circuits ($device_id) {
-		// set query
-		$query = "select
+    /**
+     *	@misc methods
+     *	------------------------------
+     */
+
+    /**
+     * Fetches all circuits from database
+     *
+     * @method fetch_all_circuits
+     *
+     * @param  array $custom_circuit_fields
+     *
+     * @return false|array
+     */
+    public function fetch_all_circuits ($custom_circuit_fields = array ()) {
+        // set query
+        $query[] = "select";
+        $query[] = "c.id,c.cid,c.type,c.device1,c.location1,c.device2,c.location2,c.customer_id,p.name,p.description,p.contact,c.capacity,p.id as pid,c.status";
+        // custom fields
+        if(is_array($custom_circuit_fields)) {
+            if(sizeof($custom_circuit_fields)>0) {
+                foreach ($custom_circuit_fields as $f) {
+                    $query[] = ",c.`".$f['name']."`";
+                }
+            }
+        }
+        $query[] = "from circuits as c, circuitProviders as p where c.provider = p.id";
+        $query[] = "order by c.cid asc;";
+        // fetch
+        try { $circuits = $this->Database->getObjectsQuery(implode("\n", $query), array()); }
+        catch (Exception $e) {
+            $this->Result->show("danger", $e->getMessage(), true);
+        }
+        // return
+        return sizeof($circuits)>0 ? $circuits : false;
+    }
+
+    /**
+     * Fetches all logical circuits belonging to circuit
+     *
+     * @method fetch_all_logical_circuits_using_circuit
+     * @param  int $circuit_id
+     * @return array|false
+     */
+    public function fetch_all_logical_circuits_using_circuit ($circuit_id) {
+        // set query
+        $query[] = "select";
+        $query[] = "lc.*";
+        $query[] = "from circuitsLogical as lc";
+        $query[] = "join `circuitsLogicalMapping` mapping on mapping.logicalCircuit_id=lc.id";
+        $query[] = "WHERE mapping.circuit_id = ?";
+        $query[] = "order by lc.logical_cid asc;";
+        // fetch
+        try { $circuits = $this->Database->getObjectsQuery(implode("\n", $query), [$circuit_id]); }
+        catch (Exception $e) {
+            $this->Result->show("danger", $e->getMessage(), true);
+        }
+        // return
+        return sizeof($circuits)>0 ? $circuits : false;
+    }
+
+    /**
+     * Fetch all members of logical circuit
+     *
+     * @method fetch_all_logical_circuit_members
+     * @param  int $logical_circuit_id
+     * @return array|false
+     */
+        public function fetch_all_logical_circuit_members ($logical_circuit_id) {
+            // set query
+        $query2[] = "SELECT";
+        $query2[] = "c.*";
+        $query2[] = "FROM `circuits` c";
+        $query2[] = "join `circuitsLogicalMapping` mapping on mapping.circuit_id=c.id";
+        $query2[] = "where mapping.logicalCircuit_id = ?";
+        $query2[] = "order by mapping.`order`;";
+        // fetch
+        try { $circuits = $this->Database->getObjectsQuery(implode("\n", $query2), $logical_circuit_id); }
+        catch (Exception $e) {
+            $this->Result->show("danger", $e->getMessage(), true);
+        }
+        return sizeof($circuits)>0 ? $circuits : false;
+    }
+
+    /**
+     * Fetches all circuits for specific provider
+     *
+     * @method fetch_all_circuits
+     *
+     * @param  int $provider_id
+     * @param  array $custom_circuit_fields
+     *
+     * @return false|array
+     */
+    public function fetch_all_provider_circuits ($provider_id, $custom_circuit_fields = array ()) {
+        // set query
+        $query[] = "select";
+        $query[] = "c.id,c.cid,c.type,c.device1,c.location1,c.device2,c.location2,p.name,p.description,p.contact,c.capacity,p.id as pid,c.status";
+        // custom fields
+        if(is_array($custom_circuit_fields)) {
+            if(sizeof($custom_circuit_fields)>0) {
+                foreach ($custom_circuit_fields as $f) {
+                    $query[] = ",c.`".$f['name']."`";
+                }
+            }
+        }
+        $query[] = "from circuits as c, circuitProviders as p where c.provider = p.id and c.provider = ?";
+        $query[] = "order by c.cid asc;";
+        // fetch
+        try { $circuits = $this->Database->getObjectsQuery(implode("\n", $query), array($provider_id)); }
+        catch (Exception $e) {
+            $this->Result->show("danger", $e->getMessage(), true);
+        }
+        // return
+        return sizeof($circuits)>0 ? $circuits : false;
+    }
+
+
+    /**
+     * Fetches all circuits for specific device
+     *
+     * @method fetch_all_circuits
+     *
+     * @param  int $device_id
+     *
+     * @return false|array
+     */
+    public function fetch_all_device_circuits ($device_id) {
+        // set query
+        $query = "select
 					c.id,c.cid,c.type,c.device1,c.location1,c.device2,c.location2,p.name,p.description,p.contact,c.capacity,p.id as pid,c.status
 					from circuits as c, circuitProviders as p where c.provider = p.id and (c.device1 = :deviceid or c.device2 = :deviceid)
 					order by c.cid asc;";
-		// fetch
-		try { $circuits = $this->Database->getObjectsQuery($query, array("deviceid"=>$device_id)); }
-		catch (Exception $e) {
-			$this->Result->show("danger", $e->getMessage(), true);
-		}
-		// return
-		return sizeof($circuits)>0 ? $circuits : false;
-	}
-
-	/**
-	 * Reformat circuit location
-	 *
-	 * If device is provided return device
-	 * If location return location
-	 *
-	 * result will be false or array of:
-	 * 	- type => "devices" / "locations"
-	 *  - icon => "fa-desktop / fa-map"
-	 *  - id => $id
-	 *  - name => "location or device name"
-	 *  - location => "location index or NULL"
-	 *  - rack => "NULL if location, rack_id if device is set with rack otherwise NULL"
-	 *
-	 * @method reformat_circuit_location
-	 *
-	 * @param  int $deviceId
-	 * @param  int $locationId
-	 *
-	 * @return false|array
-	 */
-	public function reformat_circuit_location ($deviceId = null, $locationId = null) {
-		// check device
-		if(is_numeric($deviceId) && $deviceId!=0) {
-			// fetch device
-			$device = $this->fetch_object ("devices", "id", $deviceId);
-			// check
-			if ($device === false) {
-				return false;
-			}
-			else {
-				$array = array (
-								"type"     => "devices",
-								"id"       => $device->id,
-								"name"     => $device->hostname,
-								"icon" 	   => "",
-								"location" => is_null($device->location)||$device->location==0 ? NULL : $device->location,
-								"rack"     => is_null($device->rack)||$device->rack==0 ? NULL : $device->rack
-				                );
-				// check rack location if not configured
-				if ($array['location']==NULL && $array['rack']!=NULL) {
-					$rack_location = $this->fetch_object ("racks", "id", $array['rack']);
-					$array['location'] = $rack_location!==false ? $rack_location->location : NULL;
-				}
-				// result
-				return $array;
-			}
-		}
-		// check location
-		elseif (is_numeric($locationId) && $locationId!=0) {
-			// fetch location
-			$location = $this->fetch_object ("locations", "id", $locationId);
-			// check
-			if ($device === false) {
-				return false;
-			}
-			else {
-				$array = array (
-								"type"     => "locations",
-								"id"       => $location->id,
-								"name"     => $location->name,
-								"icon" 	   => "fa-map",
-								"location" => $location->id,
-								"rack"     => NULL
-				                );
-				return $array;
-			}
-		}
-		else {
-			return false;
-		}
-	}
-
-	/**
-	 * Fetch all l2 domans and vlans
-	 *
-	 * @access public
-	 * @param string $search (default: false)
-	 * @return array|bool
-	 */
-	public function fetch_all_domains_and_vlans ($search = false) {
-		// set query
-		$query[] = "select `d`.`name` as `domainName`,";
-		$query[] = "	`d`.`description` as `domainDescription`,";
-		$query[] = "	`v`.`domainId` as `domainId`,";
-		$query[] = "	`v`.`name` as `name`,";
-		$query[] = "	`d`.`name` as `domainName`,";
-		$query[] = "	`v`.`number` as `number`,";
-		$query[] = "	`v`.`description` as `description`,";
-		$query[] = "	`v`.`customer_id` as `customer_id`,";
-		// fetch custom fields
-		$custom_vlan_fields = $this->fetch_custom_fields ("vlans");
-		if ($custom_vlan_fields != false) {
-    		foreach ($custom_vlan_fields as $f) {
-        		$query[] = "  `v`.`$f[name]` as `$f[name]`,";
-    		}
-
-		}
-		$query[] = "	`v`.`vlanId` as `id`";
-		$query[] = "	from";
-		$query[] = "	`vlans` as `v`,";
-		$query[] = "	`vlanDomains` as `d`";
-		$query[] = "	where `v`.`domainId` = `d`.`id`";
-		$query[] = "	order by `v`.`number` asc;";
-
-		// fetch
-		try { $domains = $this->Database->getObjectsQuery(implode("\n",$query)); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), true); }
-		// filter if requested
-		if ($search !== false && sizeof($domains)>0) {
-			foreach ($domains as $k=>$d) {
-				if (strpos($d->number, $search)===false && strpos($d->name, $search)===false && strpos($d->description, $search)===false) {
-					unset($domains[$k]);
-				}
-			}
-		}
-		// return
-		return sizeof($domains)>0 ? $domains : false;
-	}
-
-	/**
-	 * Fetch all objects belonging to customer
-	 *
-	 * @method fetch_customer_objects
-	 * @param  int $customer_id
-	 * @return void
-	 */
-	public function fetch_customer_objects ($customer_id) {
-		// out
-		$out = [];
-		// fetch
-		if(is_numeric($customer_id)) {
-			foreach ($this->get_customer_object_types() as $table=>$name) {
-				$objects = $this->fetch_multiple_objects ($table, "customer_id", $customer_id, $this->get_customer_object_types_sorts ($table));
-				if ($objects!==false) {
-					$out[$table] = $objects;
-				}
-			}
-		}
-		// return
-		return $out;
-	}
-
-	/**
-	 * Return all possible customer object relations
-	 *
-	 * @method get_customer_object_types
-	 * @return array
-	 */
-	public function get_customer_object_types () {
-		return [
-				"subnets"     => "Subnets",
-				"ipaddresses" => "Addresses",
-				"vlans"       => "VLAN",
-				"vrf"         => "VRF",
-				"circuits"    => "Circuits",
-				"racks"       => "Racks"
-				];
-	}
-
-	/**
-	 * Return sorting for fetch_multiple_objects
-	 *
-	 * @method get_customer_object_types_sorts
-	 * @param  string $type
-	 * @return string
-	 */
-	private function get_customer_object_types_sorts ($type) {
-		switch ($type) {
-			case "subnets"     : return "subnet";
-			case "ipaddresses" : return "ip_addr";
-			case "vlans"       : return "number";
-			case "vrf"         : return "name";
-			case "circuits"    : return "cid";
-			case "racks"       : return "name";
-			default            : return "id";
-		}
-	}
-
-	/**
-	 * Parses import file
-	 *
-	 * @access public
-	 * @param string $filetype (default: "xls")
-	 * @param object $subnet
-	 * @param array $custom_address_fields
-	 * @return array
-	 */
-	public function parse_import_file ($filetype = "xls", $subnet = object, $custom_address_fields) {
-    	# start object and get settings
-    	$this->settings ();
-    	$this->Subnets = new Subnets ($this->Database);
+        // fetch
+        try { $circuits = $this->Database->getObjectsQuery($query, array("deviceid"=>$device_id)); }
+        catch (Exception $e) {
+            $this->Result->show("danger", $e->getMessage(), true);
+        }
+        // return
+        return sizeof($circuits)>0 ? $circuits : false;
+    }
+
+    /**
+     * Reformat circuit location
+     *
+     * If device is provided return device
+     * If location return location
+     *
+     * result will be false or array of:
+     * 	- type => "devices" / "locations"
+     *  - icon => "fa-desktop / fa-map"
+     *  - id => $id
+     *  - name => "location or device name"
+     *  - location => "location index or NULL"
+     *  - rack => "NULL if location, rack_id if device is set with rack otherwise NULL"
+     *
+     * @method reformat_circuit_location
+     *
+     * @param  int $deviceId
+     * @param  int $locationId
+     *
+     * @return false|array
+     */
+    public function reformat_circuit_location ($deviceId = null, $locationId = null) {
+        // check device
+        if(is_numeric($deviceId) && $deviceId!=0) {
+            // fetch device
+            $device = $this->fetch_object ("devices", "id", $deviceId);
+            // check
+            if ($device === false) {
+                return false;
+            }
+            else {
+                $array = array (
+                                "type"     => "devices",
+                                "id"       => $device->id,
+                                "name"     => $device->hostname,
+                                "icon" 	   => "",
+                                "location" => is_null($device->location)||$device->location==0 ? NULL : $device->location,
+                                "rack"     => is_null($device->rack)||$device->rack==0 ? NULL : $device->rack
+                                );
+                // check rack location if not configured
+                if ($array['location']==NULL && $array['rack']!=NULL) {
+                    $rack_location = $this->fetch_object ("racks", "id", $array['rack']);
+                    $array['location'] = $rack_location!==false ? $rack_location->location : NULL;
+                }
+                // result
+                return $array;
+            }
+        }
+        // check location
+        elseif (is_numeric($locationId) && $locationId!=0) {
+            // fetch location
+            $location = $this->fetch_object ("locations", "id", $locationId);
+            // check
+            if ($device === false) {
+                return false;
+            }
+            else {
+                $array = array (
+                                "type"     => "locations",
+                                "id"       => $location->id,
+                                "name"     => $location->name,
+                                "icon" 	   => "fa-map",
+                                "location" => $location->id,
+                                "rack"     => NULL
+                                );
+                return $array;
+            }
+        }
+        else {
+            return false;
+        }
+    }
+
+    /**
+     * Fetch all l2 domans and vlans
+     *
+     * @access public
+     * @param string $search (default: false)
+     * @return array|bool
+     */
+    public function fetch_all_domains_and_vlans ($search = false) {
+        // set query
+        $query[] = "select `d`.`name` as `domainName`,";
+        $query[] = "	`d`.`description` as `domainDescription`,";
+        $query[] = "	`v`.`domainId` as `domainId`,";
+        $query[] = "	`v`.`name` as `name`,";
+        $query[] = "	`d`.`name` as `domainName`,";
+        $query[] = "	`v`.`number` as `number`,";
+        $query[] = "	`v`.`description` as `description`,";
+        $query[] = "	`v`.`customer_id` as `customer_id`,";
+        // fetch custom fields
+        $custom_vlan_fields = $this->fetch_custom_fields ("vlans");
+        if ($custom_vlan_fields != false) {
+            foreach ($custom_vlan_fields as $f) {
+                $query[] = "  `v`.`$f[name]` as `$f[name]`,";
+            }
+
+        }
+        $query[] = "	`v`.`vlanId` as `id`";
+        $query[] = "	from";
+        $query[] = "	`vlans` as `v`,";
+        $query[] = "	`vlanDomains` as `d`";
+        $query[] = "	where `v`.`domainId` = `d`.`id`";
+        $query[] = "	order by `v`.`number` asc;";
+
+        // fetch
+        try { $domains = $this->Database->getObjectsQuery(implode("\n",$query)); }
+        catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), true); }
+        // filter if requested
+        if ($search !== false && sizeof($domains)>0) {
+            foreach ($domains as $k=>$d) {
+                if (strpos($d->number, $search)===false && strpos($d->name, $search)===false && strpos($d->description, $search)===false) {
+                    unset($domains[$k]);
+                }
+            }
+        }
+        // return
+        return sizeof($domains)>0 ? $domains : false;
+    }
+
+    /**
+     * Fetch all objects belonging to customer
+     *
+     * @method fetch_customer_objects
+     * @param  int $customer_id
+     * @return void
+     */
+    public function fetch_customer_objects ($customer_id) {
+        // out
+        $out = [];
+        // fetch
+        if(is_numeric($customer_id)) {
+            foreach ($this->get_customer_object_types() as $table=>$name) {
+                $objects = $this->fetch_multiple_objects ($table, "customer_id", $customer_id, $this->get_customer_object_types_sorts ($table));
+                if ($objects!==false) {
+                    $out[$table] = $objects;
+                }
+            }
+        }
+        // return
+        return $out;
+    }
+
+    /**
+     * Return all possible customer object relations
+     *
+     * @method get_customer_object_types
+     * @return array
+     */
+    public function get_customer_object_types () {
+        return [
+                "subnets"     => "Subnets",
+                "ipaddresses" => "Addresses",
+                "vlans"       => "VLAN",
+                "vrf"         => "VRF",
+                "circuits"    => "Circuits",
+                "racks"       => "Racks"
+                ];
+    }
+
+    /**
+     * Return sorting for fetch_multiple_objects
+     *
+     * @method get_customer_object_types_sorts
+     * @param  string $type
+     * @return string
+     */
+    private function get_customer_object_types_sorts ($type) {
+        switch ($type) {
+            case "subnets"     : return "subnet";
+            case "ipaddresses" : return "ip_addr";
+            case "vlans"       : return "number";
+            case "vrf"         : return "name";
+            case "circuits"    : return "cid";
+            case "racks"       : return "name";
+            default            : return "id";
+        }
+    }
+
+    /**
+     * Parses import file
+     *
+     * @access public
+     * @param string $filetype (default: "xls")
+     * @param object $subnet
+     * @param array $custom_address_fields
+     * @return array
+     */
+    public function parse_import_file ($filetype = "xls", $subnet = object, $custom_address_fields) {
+        # start object and get settings
+        $this->settings ();
+        $this->Subnets = new Subnets ($this->Database);
 
         # CSV
         if (strtolower($filetype) == "csv")     { $outFile = $this->parse_import_file_csv (); }
@@ -3201,163 +3201,163 @@ 
 
         # validate
         return $this->parse_validate_file ($outFile, $subnet);
-	}
-
-	/**
-	 * Parses xls import file
-	 *
-	 * @access private
-	 * @param object $subnet
-	 * @param array $custom_address_fields
-	 * @return mixed
-	 */
-	private function parse_import_file_xls ($subnet, $custom_address_fields) {
-     	# get excel object
-    	require_once(dirname(__FILE__).'/../../functions/php-excel-reader/excel_reader2.php');				//excel reader 2.21
-    	$data = new Spreadsheet_Excel_Reader(dirname(__FILE__) . '/../../app/subnets/import-subnet/upload/import.xls', false, 'utf-8');
-
-    	//get number of rows
-    	$numRows = $data->rowcount(0);
-    	$numRows++;
-
-    	$outFile = array();
-
-    	// set delimiter
-    	$this->csv_delimiter = ";";
-
-    	//get all to array!
-    	for($m=0; $m < $numRows; $m++) {
-
-    		//IP must be present!
-    		if(filter_var($data->val($m,'A'), FILTER_VALIDATE_IP)) {
-        		//for multicast
-        		$mac = $data->val($m,'F');
-        		if ($this->settings->enableMulticast=="1") {
-            		if (strlen($data->val($m,'F'))==0 && $this->Subnets->is_multicast($data->val($m,'A')))    {
-                		$mac = $this->Subnets->create_multicast_mac ($data->val($m,'A'));
+    }
+
+    /**
+     * Parses xls import file
+     *
+     * @access private
+     * @param object $subnet
+     * @param array $custom_address_fields
+     * @return mixed
+     */
+    private function parse_import_file_xls ($subnet, $custom_address_fields) {
+            # get excel object
+        require_once(dirname(__FILE__).'/../../functions/php-excel-reader/excel_reader2.php');				//excel reader 2.21
+        $data = new Spreadsheet_Excel_Reader(dirname(__FILE__) . '/../../app/subnets/import-subnet/upload/import.xls', false, 'utf-8');
+
+        //get number of rows
+        $numRows = $data->rowcount(0);
+        $numRows++;
+
+        $outFile = array();
+
+        // set delimiter
+        $this->csv_delimiter = ";";
+
+        //get all to array!
+        for($m=0; $m < $numRows; $m++) {
+
+            //IP must be present!
+            if(filter_var($data->val($m,'A'), FILTER_VALIDATE_IP)) {
+                //for multicast
+                $mac = $data->val($m,'F');
+                if ($this->settings->enableMulticast=="1") {
+                    if (strlen($data->val($m,'F'))==0 && $this->Subnets->is_multicast($data->val($m,'A')))    {
+                        $mac = $this->Subnets->create_multicast_mac ($data->val($m,'A'));
+                    }
+                }
+
+                $outFile[$m]  = $data->val($m,'A').$this->csv_delimiter.$data->val($m,'B').$this->csv_delimiter.$data->val($m,'C').$this->csv_delimiter.$data->val($m,'D').$this->csv_delimiter;
+                $outFile[$m] .= $data->val($m,'E').$this->csv_delimiter.$mac.$this->csv_delimiter.$data->val($m,'G').$this->csv_delimiter.$data->val($m,'H').$this->csv_delimiter;
+                $outFile[$m] .= $data->val($m,'I').$this->csv_delimiter.$data->val($m,'J').$this->csv_delimiter.$data->val($m,'K');
+                //add custom fields
+                if(sizeof($custom_address_fields) > 0) {
+                    $currLett = "L";
+                    foreach($custom_address_fields as $field) {
+                        $outFile[$m] .= $this->csv_delimiter.$data->val($m,$currLett++);
                     }
                 }
+                $outFile[$m] = $this->convert_encoding_to_UTF8($outFile[$m]);
+            }
+        };
+        // return
+        return $outFile;
+    }
+
+    /**
+     * Parses CSV import file
+     *
+     * @access private
+     * @return array
+     */
+    private function parse_import_file_csv () {
+        // get file to string
+        $handle = fopen(dirname(__FILE__) . '/../../app/subnets/import-subnet/upload/import.csv', "r");
+        if ($handle) {
+            while (($outFile[] = fgets($handle)) !== false) {}
+            fclose($handle);
+        } else {
+            $this->Result->show("danger", _('Cannot open upload/import.csv'), true);
+        }
+
+        // delimiter
+        if(isset($outFile[0]))
+        $this->set_csv_delimiter ($outFile[0]);
 
-    			$outFile[$m]  = $data->val($m,'A').$this->csv_delimiter.$data->val($m,'B').$this->csv_delimiter.$data->val($m,'C').$this->csv_delimiter.$data->val($m,'D').$this->csv_delimiter;
-    			$outFile[$m] .= $data->val($m,'E').$this->csv_delimiter.$mac.$this->csv_delimiter.$data->val($m,'G').$this->csv_delimiter.$data->val($m,'H').$this->csv_delimiter;
-    			$outFile[$m] .= $data->val($m,'I').$this->csv_delimiter.$data->val($m,'J').$this->csv_delimiter.$data->val($m,'K');
-    			//add custom fields
-    			if(sizeof($custom_address_fields) > 0) {
-    				$currLett = "L";
-    				foreach($custom_address_fields as $field) {
-    					$outFile[$m] .= $this->csv_delimiter.$data->val($m,$currLett++);
-    				}
-    			}
-    			$outFile[$m] = $this->convert_encoding_to_UTF8($outFile[$m]);
-    		}
-    	};
-    	// return
-    	return $outFile;
-	}
-
-	/**
-	 * Parses CSV import file
-	 *
-	 * @access private
-	 * @return array
-	 */
-	private function parse_import_file_csv () {
-    	// get file to string
-		$handle = fopen(dirname(__FILE__) . '/../../app/subnets/import-subnet/upload/import.csv', "r");
-		if ($handle) {
-		    while (($outFile[] = fgets($handle)) !== false) {}
-		    fclose($handle);
-		} else {
-		    $this->Result->show("danger", _('Cannot open upload/import.csv'), true);
-		}
-
-    	// delimiter
-    	if(isset($outFile[0]))
-    	$this->set_csv_delimiter ($outFile[0]);
-
-    	/* validate IP */
-    	foreach($outFile as $k=>$v) {
-        	//put it to array
-        	$field = str_getcsv ($v, $this->csv_delimiter);
-
-        	if(!filter_var($field[0], FILTER_VALIDATE_IP)) {
-            	unset($outFile[$k]);
-            	unset($field);
-        	}
-        	else {
-            	# mac
-        		if ($this->settings->enableMulticast=="1") {
-            		if (strlen($field[5])==0 && $this->Subnets->is_multicast($field[0]))  {
-                		$field[5] = $this->Subnets->create_multicast_mac ($field[0]);
+        /* validate IP */
+        foreach($outFile as $k=>$v) {
+            //put it to array
+            $field = str_getcsv ($v, $this->csv_delimiter);
+
+            if(!filter_var($field[0], FILTER_VALIDATE_IP)) {
+                unset($outFile[$k]);
+                unset($field);
+            }
+            else {
+                # mac
+                if ($this->settings->enableMulticast=="1") {
+                    if (strlen($field[5])==0 && $this->Subnets->is_multicast($field[0]))  {
+                        $field[5] = $this->Subnets->create_multicast_mac ($field[0]);
                     }
-        		}
-        	}
-
-        	# save
-        	if(isset($field)) {
-	        	$outFile[$k] = implode($this->csv_delimiter, $field);
-    		}
-    	}
-
-    	# return
-    	return $outFile;
-	}
-
-	/**
-	 * Detects CSV delimiter
-	 *
-	 * @method set_csv_delimiter
-	 * @param  string $outFile
-	 * @return string
-	 */
-	public function set_csv_delimiter ($outFile) {
-		// must be string
-		if(is_string($outFile)) {
-			// count occurences
-			$cnt_coma  = substr_count($outFile, ",");
-			$cnt_colon = substr_count($outFile, ";");
-			// set higher
-			$this->csv_delimiter = $cnt_coma > $cnt_colon ? "," : ";";
-		}
-		else {
-			$this->csv_delimiter = ",";
-		}
-	}
-
-	/**
-	 * Validates each import line from provided array
-	 *
-	 *      append class to array
-	 *
-	 * @access private
-	 * @param mixed $outFile
-	 * @param object $subnet
-	 * @return void
-	 */
-	private function parse_validate_file ($outFile = array(), $subnet = object) {
-    	$result = array();
-    	# present ?
-    	if (sizeof($outFile)>0) {
+                }
+            }
+
+            # save
+            if(isset($field)) {
+                $outFile[$k] = implode($this->csv_delimiter, $field);
+            }
+        }
+
+        # return
+        return $outFile;
+    }
+
+    /**
+     * Detects CSV delimiter
+     *
+     * @method set_csv_delimiter
+     * @param  string $outFile
+     * @return string
+     */
+    public function set_csv_delimiter ($outFile) {
+        // must be string
+        if(is_string($outFile)) {
+            // count occurences
+            $cnt_coma  = substr_count($outFile, ",");
+            $cnt_colon = substr_count($outFile, ";");
+            // set higher
+            $this->csv_delimiter = $cnt_coma > $cnt_colon ? "," : ";";
+        }
+        else {
+            $this->csv_delimiter = ",";
+        }
+    }
+
+    /**
+     * Validates each import line from provided array
+     *
+     *      append class to array
+     *
+     * @access private
+     * @param mixed $outFile
+     * @param object $subnet
+     * @return void
+     */
+    private function parse_validate_file ($outFile = array(), $subnet = object) {
+        $result = array();
+        # present ?
+        if (sizeof($outFile)>0) {
             foreach($outFile as $k=>$line) {
 
-            	//convert encoding if necessary
-            	$line = $this->convert_encoding_to_UTF8($line);
+                //convert encoding if necessary
+                $line = $this->convert_encoding_to_UTF8($line);
 
-            	//put it to array
-            	$field = str_getcsv ($line, $this->csv_delimiter);
+                //put it to array
+                $field = str_getcsv ($line, $this->csv_delimiter);
 
-            	//verify IP address
-            	if(!filter_var($field[0], FILTER_VALIDATE_IP)) 	{ $class = "danger";	$errors++; }
-            	else											{ $class = ""; }
+                //verify IP address
+                if(!filter_var($field[0], FILTER_VALIDATE_IP)) 	{ $class = "danger";	$errors++; }
+                else											{ $class = ""; }
 
-            	// verify that address is in subnet for subnets
-            	if($subnet->isFolder!="1") {
-					// check if IP is IPv4 or IPv6
-					$ipsm = "32";
-                	if (!filter_var($field[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false) { $ipsm = "128"; }
+                // verify that address is in subnet for subnets
+                if($subnet->isFolder!="1") {
+                    // check if IP is IPv4 or IPv6
+                    $ipsm = "32";
+                    if (!filter_var($field[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false) { $ipsm = "128"; }
                     if ($this->Subnets->is_subnet_inside_subnet ($field[0]."/" . $ipsm, $this->transform_address($subnet->subnet, "dotted")."/".$subnet->mask)==false)    { $class = "danger"; $errors++; }
                 }
-            	// make sure mac does not exist
+                // make sure mac does not exist
                 if ($this->settings->enableMulticast=="1" && strlen($class)==0) {
                     if (strlen($field[5])>0 && $this->Subnets->is_multicast($field[0])) {
                         if($this->Subnets->validate_multicast_mac ($field[5], $subnet->sectionId, $subnet->vlanId, MCUNIQUE)!==true) {
@@ -3376,106 +3376,106 @@ 
 
         # return
         return $result;
-	}
-
-	/**
-	 * Counts number of IP addresses for statistics
-	 *
-	 * @access public
-	 * @param string $type (default: "IPv4")
-	 * @return int
-	 */
-	public function count_subnets ($type="IPv4") {
-		# set proper query
-		if($type=="IPv4")		{ $query = 'select count(*) as count from `ipaddresses` where cast(`ip_addr` as UNSIGNED) <= 4294967295;'; }
-		elseif($type=="IPv6")	{ $query = 'select count(*) as count from `ipaddresses` where cast(`ip_addr` as UNSIGNED) >  4294967295;'; }
-
-		try { $count = $this->Database->getObjectQuery($query); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), true); }
-
-		/* return true if it exists */
-		return $count->count;
-	}
-
-	/**
-	 * Fetches top subnets for dashboard graphs
-	 *
-	 * @access public
-	 * @param mixed $type
-	 * @param string $limit (default: "10")
-	 * @param bool $perc (default: false)
-	 * @return array
-	 */
-	public function fetch_top_subnets ($type, $limit = "10", $perc = false) {
-		# set limit & IPv4/IPv6 selector
-		$limit = $limit<=0 ? '' : 'LIMIT '. (int) $limit;
-		$type_operator = ($type === 'IPv6') ? '>' : '<=';
-		$type_max_mask = ($type === 'IPv6') ? '128' : '32';
-		$strict_mode   = ($type === 'IPv6') ? '0' : '2';
-
-		if($perc) {
-			$query = "SELECT SQL_CACHE s.sectionId,s.id,s.subnet,mask,IF(char_length(s.description)>0,s.description,'No description') AS description,
+    }
+
+    /**
+     * Counts number of IP addresses for statistics
+     *
+     * @access public
+     * @param string $type (default: "IPv4")
+     * @return int
+     */
+    public function count_subnets ($type="IPv4") {
+        # set proper query
+        if($type=="IPv4")		{ $query = 'select count(*) as count from `ipaddresses` where cast(`ip_addr` as UNSIGNED) <= 4294967295;'; }
+        elseif($type=="IPv6")	{ $query = 'select count(*) as count from `ipaddresses` where cast(`ip_addr` as UNSIGNED) >  4294967295;'; }
+
+        try { $count = $this->Database->getObjectQuery($query); }
+        catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), true); }
+
+        /* return true if it exists */
+        return $count->count;
+    }
+
+    /**
+     * Fetches top subnets for dashboard graphs
+     *
+     * @access public
+     * @param mixed $type
+     * @param string $limit (default: "10")
+     * @param bool $perc (default: false)
+     * @return array
+     */
+    public function fetch_top_subnets ($type, $limit = "10", $perc = false) {
+        # set limit & IPv4/IPv6 selector
+        $limit = $limit<=0 ? '' : 'LIMIT '. (int) $limit;
+        $type_operator = ($type === 'IPv6') ? '>' : '<=';
+        $type_max_mask = ($type === 'IPv6') ? '128' : '32';
+        $strict_mode   = ($type === 'IPv6') ? '0' : '2';
+
+        if($perc) {
+            $query = "SELECT SQL_CACHE s.sectionId,s.id,s.subnet,mask,IF(char_length(s.description)>0,s.description,'No description') AS description,
 					COUNT(*) AS `usage`,ROUND(COUNT(*)/(POW(2,$type_max_mask-`mask`)-$strict_mode)*100,2) AS `percentage` FROM `ipaddresses` AS `i`
 					LEFT JOIN `subnets` AS `s` ON i.subnetId = s.id
 					WHERE s.mask < ($type_max_mask-1) AND CAST(s.subnet AS UNSIGNED) $type_operator 4294967295
 					GROUP BY i.subnetId
 					ORDER BY `percentage` DESC $limit;";
-		} else {
-			$query = "SELECT SQL_CACHE s.sectionId,s.id,s.subnet,mask,IF(char_length(s.description)>0,s.description,'No description') AS description,
+        } else {
+            $query = "SELECT SQL_CACHE s.sectionId,s.id,s.subnet,mask,IF(char_length(s.description)>0,s.description,'No description') AS description,
 					COUNT(*) AS `usage` FROM `ipaddresses` AS `i`
 					LEFT JOIN `subnets` AS `s` ON i.subnetId = s.id
 					WHERE CAST(s.subnet AS UNSIGNED) $type_operator 4294967295
 					GROUP BY i.subnetId
 					ORDER BY `usage` DESC $limit;";
-		}
-
-		try { $stats = $this->Database->getObjectsQuery($query); }
-		catch (Exception $e) { !$this->debugging ? : $this->Result->show("danger", $e->getMessage(), true);	return false; }
-
-		# return subnets array
-		return (array) $stats;
-	}
-
-	/**
-	 * Fetches all addresses to export to hosts file
-	 *
-	 * @access public
-	 * @return array
-	 */
-	public function fetch_addresses_for_export () {
-		# fetch
-	    try { $addresses = $this->Database->getObjectsQuery("select `id`,`subnetId`,`ip_addr`,`hostname` from `ipaddresses` where length(`hostname`)>1 order by `subnetId` asc;"); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
-		# return result
-		return $addresses;
-	}
-
-	/**
-	 * Verify that translation exists
-	 *
-	 * @access public
-	 * @param mixed $code		//lang code
-	 * @return bool
-	 */
-	public function verify_translation ($code) {
-		//verify that proper files exist
-		return !file_exists("functions/locale/$code/LC_MESSAGES/phpipam.mo") ? false : true;
-	}
-
-	/**
-	 * Fetches translation version from code
-	 *
-	 * @access public
-	 * @param mixed $code		//lang code
-	 * @return string
-	 */
-	public function get_translation_version ($code) {
-		//check for version
-		$ver = shell_exec("grep 'Project-Id-Version:' ".dirname(__FILE__)."/../locale/$code/LC_MESSAGES/phpipam.po");
-		//parse
-		$ver = str_replace(array("Project-Id-Version:", " ", '"', "#",'\n', ":"), "", $ver);
-		//return version
-		return $ver;
-	}
+        }
+
+        try { $stats = $this->Database->getObjectsQuery($query); }
+        catch (Exception $e) { !$this->debugging ? : $this->Result->show("danger", $e->getMessage(), true);	return false; }
+
+        # return subnets array
+        return (array) $stats;
+    }
+
+    /**
+     * Fetches all addresses to export to hosts file
+     *
+     * @access public
+     * @return array
+     */
+    public function fetch_addresses_for_export () {
+        # fetch
+        try { $addresses = $this->Database->getObjectsQuery("select `id`,`subnetId`,`ip_addr`,`hostname` from `ipaddresses` where length(`hostname`)>1 order by `subnetId` asc;"); }
+        catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
+        # return result
+        return $addresses;
+    }
+
+    /**
+     * Verify that translation exists
+     *
+     * @access public
+     * @param mixed $code		//lang code
+     * @return bool
+     */
+    public function verify_translation ($code) {
+        //verify that proper files exist
+        return !file_exists("functions/locale/$code/LC_MESSAGES/phpipam.mo") ? false : true;
+    }
+
+    /**
+     * Fetches translation version from code
+     *
+     * @access public
+     * @param mixed $code		//lang code
+     * @return string
+     */
+    public function get_translation_version ($code) {
+        //check for version
+        $ver = shell_exec("grep 'Project-Id-Version:' ".dirname(__FILE__)."/../locale/$code/LC_MESSAGES/phpipam.po");
+        //parse
+        $ver = str_replace(array("Project-Id-Version:", " ", '"', "#",'\n', ":"), "", $ver);
+        //return version
+        return $ver;
+    }
 
 }

Spacing +511 added lines, -511 removed lines

@@ -94,13 +94,13 @@ 
 	 *
 	 * @access public
 	 */
-	public function __construct (Database_PDO $database) {
+	public function __construct(Database_PDO $database) {
 		# set database object
 		$this->Database = $database;
 		# initialize Result
-		$this->Result = new Result ();
+		$this->Result = new Result();
 		# set debugging
-		$this->set_debugging ();
+		$this->set_debugging();
 	}
 
 
@@ -125,14 +125,14 @@ 
 	 * @param int $domainId (default: 1)
 	 * @return array|bool
 	 */
-	public function fetch_vlans_and_subnets ($domainId=1) {
+	public function fetch_vlans_and_subnets($domainId = 1) {
 	    # custom fields
 	    $custom_fields = $this->fetch_custom_fields("vlans");
 		# if set add to query
 		$custom_fields_query = "";
-	    if(sizeof($custom_fields)>0) {
-			foreach($custom_fields as $myField) {
-				$custom_fields_query  .= ',`vlans`.`'.$myField['name'].'`';
+	    if (sizeof($custom_fields) > 0) {
+			foreach ($custom_fields as $myField) {
+				$custom_fields_query .= ',`vlans`.`'.$myField['name'].'`';
 			}
 		}
 	    # set query
@@ -164,14 +164,14 @@ 
 	 * @param int $number
 	 * @return mixed|bool
 	 */
-	public function validate_vlan ($number) {
+	public function validate_vlan($number) {
 		# fetch highest vlan id
 		$settings = $this->get_settings();
 
-		if(empty($number)) 							{ return true; }
-		elseif(!is_numeric($number)) 				{ return _('VLAN must be numeric value!'); }
-		elseif ($number > $settings['vlanMax']) 	{ return _('Vlan number can be max '.$settings['vlanMax']); }
-		else 										{ return true; }
+		if (empty($number)) { return true; }
+		elseif (!is_numeric($number)) { return _('VLAN must be numeric value!'); }
+		elseif ($number > $settings['vlanMax']) { return _('Vlan number can be max '.$settings['vlanMax']); }
+		else { return true; }
 	}
 
 
@@ -198,9 +198,9 @@ 
 	 */
 	public function search_addresses($search_term, $high = "", $low = "", $custom_fields = array()) {
 
-    	$tags = $this->fetch_all_objects ("ipTags", "id");
+    	$tags = $this->fetch_all_objects("ipTags", "id");
     	foreach ($tags as $t) {
-        	if(strtolower($t->type)==strtolower($search_term)) {
+        	if (strtolower($t->type) == strtolower($search_term)) {
             	$tags = $t->id;
             	break;
         	}
@@ -209,24 +209,24 @@ 
 
 		# set search query
 		$query[] = "select * from `ipaddresses` ";
-		$query[] = "where `ip_addr` between :low and :high ";	//ip range
-		$query[] = "or `hostname` like :search_term ";			//hostname
-		$query[] = "or `owner` like :search_term ";				//owner
+		$query[] = "where `ip_addr` between :low and :high "; //ip range
+		$query[] = "or `hostname` like :search_term "; //hostname
+		$query[] = "or `owner` like :search_term "; //owner
 		# custom fields
-		if(sizeof($custom_fields) > 0) {
-			foreach($custom_fields as $myField) {
+		if (sizeof($custom_fields) > 0) {
+			foreach ($custom_fields as $myField) {
 				$myField['name'] = $this->Database->escape($myField['name']);
 				$query[] = "or `$myField[name]` like :search_term ";
 			}
 		}
 		$query[] = "or `switch` like :search_term ";
-		$query[] = "or `port` like :search_term ";				//port search
-		$query[] = "or `description` like :search_term ";		//descriptions
-		$query[] = "or `note` like :search_term ";				//note
-		$query[] = "or `mac` like :search_term ";				//mac
+		$query[] = "or `port` like :search_term "; //port search
+		$query[] = "or `description` like :search_term "; //descriptions
+		$query[] = "or `note` like :search_term "; //note
+		$query[] = "or `mac` like :search_term "; //mac
 		//tag
-		if($tags!==false)
-		$query[] = "or `state` like :tags ";				//tag
+		if ($tags !== false)
+		$query[] = "or `state` like :tags "; //tag
 		$query[] = "order by `ip_addr` asc;";
 
 		# join query
@@ -258,11 +258,11 @@ 
 	 */
 	public function search_subnets($search_term, $high = "", $low = "", $search_req, $custom_fields = array()) {
 		# first search if range provided
-		$result1 = $this->search_subnets_range  ($search_term, $high, $low, $custom_fields);
+		$result1 = $this->search_subnets_range($search_term, $high, $low, $custom_fields);
 		# search inside subnets even if IP does not exist!
-		$result2 = $this->search_subnets_inside ($high, $low);
+		$result2 = $this->search_subnets_inside($high, $low);
 		# search inside subnets even if IP does not exist - IPv6
-		$result3 = $this->search_subnets_inside_v6 ($high, $low, $search_req);
+		$result3 = $this->search_subnets_inside_v6($high, $low, $search_req);
 		# merge arrays
 		$result = array_merge($result1, $result2, $result3);
 	    # result
@@ -279,16 +279,16 @@ 
 	 * @param mixed $custom_fields (default: array())
 	 * @return array
 	 */
-	private function search_subnets_range ($search_term, $high, $low, $custom_fields = array()) {
+	private function search_subnets_range($search_term, $high, $low, $custom_fields = array()) {
 		# reformat low/high
-		if($high==0 && $low==0)	{ $high = "1"; $low="1"; }
+		if ($high == 0 && $low == 0) { $high = "1"; $low = "1"; }
 
 		# set search query
 		$query[] = "select * from `subnets` where `description` like :search_term ";
 		$query[] = "or `subnet` between :low and :high ";
 		# custom
-	    if(sizeof($custom_fields) > 0) {
-			foreach($custom_fields as $myField) {
+	    if (sizeof($custom_fields) > 0) {
+			foreach ($custom_fields as $myField) {
 				$myField['name'] = $this->Database->escape($myField['name']);
 				$query[] = " or `$myField[name]` like :search_term ";
 			}
@@ -316,45 +316,45 @@ 
 	 * @param string $low
 	 * @return array
 	 */
-	private function search_subnets_inside ($high, $low) {
-		if($low==$high) {
+	private function search_subnets_inside($high, $low) {
+		if ($low == $high) {
 			# subnets class
-			$Subnets = new Subnets ($this->Database);
+			$Subnets = new Subnets($this->Database);
 			# fetch all subnets
 			$subnets = $Subnets->fetch_all_subnets_search();
 			# loop and search
 			$ids = array();
-			foreach($subnets as $s) {
+			foreach ($subnets as $s) {
 				# cast
 				$s = (array) $s;
 
 				//first verify address type
 				$type = $this->identify_address($s['subnet']);
 
-				if($type == "IPv4") {
+				if ($type == "IPv4") {
 					# Initialize PEAR NET object
-					$this->initialize_pear_net_IPv4 ();
+					$this->initialize_pear_net_IPv4();
 					# parse address
 					$net = $this->Net_IPv4->parseAddress($this->transform_address($s['subnet']).'/'.$s['mask'], "dotted");
 
-					if($low>$this->transform_to_decimal(@$net->network) && $low<$this->transform_address($net->broadcast, "decimal")) {
+					if ($low > $this->transform_to_decimal(@$net->network) && $low < $this->transform_address($net->broadcast, "decimal")) {
 						$ids[] = $s['id'];
 					}
 				}
 			}
 			# filter
-			$ids = sizeof(@$ids)>0 ? array_filter($ids) : array();
+			$ids = sizeof(@$ids) > 0 ? array_filter($ids) : array();
 
 			$result = array();
 
 			# search
-			if(sizeof($ids)>0) {
-				foreach($ids as $id) {
+			if (sizeof($ids) > 0) {
+				foreach ($ids as $id) {
 					$result[] = $Subnets->fetch_subnet(null, $id);
 				}
 			}
 			# return
-			return sizeof(@$result)>0 ? array_filter($result) : array();
+			return sizeof(@$result) > 0 ? array_filter($result) : array();
 		}
 		else {
 			return array();
@@ -370,42 +370,42 @@ 
 	 * @param string $low
 	 * @return array
 	 */
-	private function search_subnets_inside_v6 ($high, $low, $search_req) {
+	private function search_subnets_inside_v6($high, $low, $search_req) {
 		// same
-		if($low==$high) {
+		if ($low == $high) {
 			# Initialize PEAR NET object
-			$this->initialize_pear_net_IPv6 ();
+			$this->initialize_pear_net_IPv6();
 
 			// validate
 			if ($this->Net_IPv6->checkIPv6($search_req)) {
 				# subnets class
-				$Subnets = new Subnets ($this->Database);
+				$Subnets = new Subnets($this->Database);
 				# fetch all subnets
 				$subnets = $Subnets->fetch_all_subnets_search("IPv6");
 				# loop and search
 				$ids = array();
-				foreach($subnets as $s) {
+				foreach ($subnets as $s) {
 					# cast
 					$s = (array) $s;
 					# parse address
 					$net = $this->Net_IPv6->parseAddress($this->transform_address($s['subnet'], "dotted").'/'.$s['mask']);
 
-					if(gmp_cmp($low, $this->transform_address(@$net['start'], "decimal")) == 1 && gmp_cmp($low, $this->transform_address(@$net['end'], "decimal")) == -1) {
+					if (gmp_cmp($low, $this->transform_address(@$net['start'], "decimal")) == 1 && gmp_cmp($low, $this->transform_address(@$net['end'], "decimal")) == -1) {
 						$ids[] = $s['id'];
 
 					}
 				}
 				# filter
-				$ids = sizeof(@$ids)>0 ? array_filter($ids) : array();
+				$ids = sizeof(@$ids) > 0 ? array_filter($ids) : array();
 				# search
 				$result = array();
-				if(sizeof($ids)>0) {
-					foreach($ids as $id) {
+				if (sizeof($ids) > 0) {
+					foreach ($ids as $id) {
 						$result[] = $Subnets->fetch_subnet(null, $id);
 					}
 				}
 				# return
-				return sizeof(@$result)>0 ? array_filter($result) : array();
+				return sizeof(@$result) > 0 ? array_filter($result) : array();
 			}
 			// empty
 			else {
@@ -429,8 +429,8 @@ 
 		# query
 		$query[] = "select * from `vlans` where `name` like :search_term or `description` like :search_term or `number` like :search_term ";
 		# custom
-	    if(sizeof($custom_fields) > 0) {
-			foreach($custom_fields as $myField) {
+	    if (sizeof($custom_fields) > 0) {
+			foreach ($custom_fields as $myField) {
 				$myField['name'] = $this->Database->escape($myField['name']);
 				$query[] = " or `$myField[name]` like :search_term ";
 			}
@@ -459,12 +459,12 @@ 
 	 * @param array $custom_fields (default: array())
 	 * @return array
 	 */
-	public function search_vrfs ($search_term, $custom_fields = array()) {
+	public function search_vrfs($search_term, $custom_fields = array()) {
 		# query
 		$query[] = "select * from `vrf` where `name` like :search_term or `description` like :search_term or `rd` like :search_term ";
 		# custom
-	    if(sizeof($custom_fields) > 0) {
-			foreach($custom_fields as $myField) {
+	    if (sizeof($custom_fields) > 0) {
+			foreach ($custom_fields as $myField) {
 				$myField['name'] = $this->Database->escape($myField['name']);
 				$query[] = " or `$myField[name]` like :search_term ";
 			}
@@ -492,12 +492,12 @@ 
 	 * @param array $custom_prefix_fields (default: array())
 	 * @return array
 	 */
-	public function search_pstn_refixes ($search_term, $custom_prefix_fields = array()) {
+	public function search_pstn_refixes($search_term, $custom_prefix_fields = array()) {
 		# query
 		$query[] = "select *,concat(prefix,start) as raw from `pstnPrefixes` where `prefix` like :search_term or `name` like :search_term or `description` like :search_term ";
 		# custom
-	    if(sizeof($custom_prefix_fields) > 0) {
-			foreach($custom_prefix_fields as $myField) {
+	    if (sizeof($custom_prefix_fields) > 0) {
+			foreach ($custom_prefix_fields as $myField) {
 				$myField['name'] = $this->Database->escape($myField['name']);
 				$query[] = " or `$myField[name]` like :search_term ";
 			}
@@ -525,12 +525,12 @@ 
 	 * @param array $custom_prefix_fields (default: array())
 	 * @return array
 	 */
-	public function search_pstn_numbers ($search_term, $custom_prefix_fields = array()) {
+	public function search_pstn_numbers($search_term, $custom_prefix_fields = array()) {
 		# query
 		$query[] = "select * from `pstnNumbers` where `number` like :search_term or `name` like :search_term or `description` like :search_term or `owner` like :search_term ";
 		# custom
-	    if(sizeof($custom_prefix_fields) > 0) {
-			foreach($custom_prefix_fields as $myField) {
+	    if (sizeof($custom_prefix_fields) > 0) {
+			foreach ($custom_prefix_fields as $myField) {
 				$myField['name'] = $this->Database->escape($myField['name']);
 				$query[] = " or `$myField[name]` like :search_term ";
 			}
@@ -558,15 +558,15 @@ 
 	 * @param array $custom_circuit_fields (default: array())
 	 * @return array
 	 */
-	public function search_circuits ($search_term, $custom_circuit_fields = array()) {
+	public function search_circuits($search_term, $custom_circuit_fields = array()) {
 		# query
 		$query[] = "select c.id,c.cid,c.type,c.device1,c.location1,c.device2,c.location2,p.name,p.description,p.contact,c.capacity,p.id as pid,c.status ";
 		$query[] = "from circuits as c, circuitProviders as p ";
 		$query[] = "where c.provider = p.id";
 		$query[] = "and (`cid` like :search_term or `type` like :search_term or `capacity` like :search_term or `comment` like :search_term or `name` like :search_term)";
 		# custom
-	    if(sizeof($custom_circuit_fields) > 0) {
-			foreach($custom_circuit_fields as $myField) {
+	    if (sizeof($custom_circuit_fields) > 0) {
+			foreach ($custom_circuit_fields as $myField) {
 				$myField['name'] = $this->Database->escape($myField['name']);
 				$query[] = " or `$myField[name]` like :search_term ";
 			}
@@ -596,12 +596,12 @@ 
 	 * @param array $custom_circuit_fields (default: array())
 	 * @return array
 	 */
-	public function search_circuit_providers ($search_term, $custom_circuit_fields = array()) {
+	public function search_circuit_providers($search_term, $custom_circuit_fields = array()) {
 		# query
 		$query[] = "select * from `circuitProviders` where `name` like :search_term or `description` like :search_term or `contact` like :search_term ";
 		# custom
-	    if(sizeof($custom_circuit_fields) > 0) {
-			foreach($custom_circuit_fields as $myField) {
+	    if (sizeof($custom_circuit_fields) > 0) {
+			foreach ($custom_circuit_fields as $myField) {
 				$myField['name'] = $this->Database->escape($myField['name']);
 				$query[] = " or `$myField[name]` like :search_term ";
 			}
@@ -630,16 +630,16 @@ 
 	 * @param mixed $address
 	 * @return array high/low decimal address
 	 */
-	public function reformat_IPv4_for_search ($address) {
+	public function reformat_IPv4_for_search($address) {
 		# remove % sign if present
 		$address = str_replace("%", "", $address);
 		# we need Addresses class
-		$Addresses = new Addresses ($this->Database);
+		$Addresses = new Addresses($this->Database);
 
 		# if subnet is provided we have all data
-		if(strpos($address, "/")>0) {
+		if (strpos($address, "/") > 0) {
 			# Initialize PEAR NET object
-			$this->initialize_pear_net_IPv4 ();
+			$this->initialize_pear_net_IPv4();
 			$net = $this->Net_IPv4->parseAddress($address);
 
 			$result['low']   = $Addresses->transform_to_decimal($net->network);
@@ -650,8 +650,8 @@ 
 			# if subnet is not provided maybe wildcard is, so explode it to array
 			$address = explode(".", $address);
             # remove empty
-            foreach($address as $k=>$a) {
-                if (strlen($a)==0)  unset($address[$k]);
+            foreach ($address as $k=>$a) {
+                if (strlen($a) == 0)  unset($address[$k]);
             }
 
 			# 4 pieces is ok, host
@@ -665,13 +665,13 @@ 
 			}
 			# 2 pieces also
 			elseif (sizeof($address) == 2) {
-				$result['low']  = $Addresses->transform_to_decimal(implode(".", array_merge($address, array(0,0))));
-				$result['high'] = $Addresses->transform_to_decimal(implode(".", array_merge($address, array(255,255))));
+				$result['low']  = $Addresses->transform_to_decimal(implode(".", array_merge($address, array(0, 0))));
+				$result['high'] = $Addresses->transform_to_decimal(implode(".", array_merge($address, array(255, 255))));
 			}
 			# 1 piece also
 			elseif (sizeof($address) == 1) {
-				$result['low']  = $Addresses->transform_to_decimal(implode(".", array_merge($address, array(0,0,0))));
-				$result['high'] = $Addresses->transform_to_decimal(implode(".", array_merge($address, array(255,255,255))));
+				$result['low']  = $Addresses->transform_to_decimal(implode(".", array_merge($address, array(0, 0, 0))));
+				$result['high'] = $Addresses->transform_to_decimal(implode(".", array_merge($address, array(255, 255, 255))));
 			}
 			# else return same value
 			else {
@@ -695,20 +695,20 @@ 
 	 * @param mixed $address
 	 * @return array
 	 */
-	public function reformat_IPv6_for_search ($address) {
+	public function reformat_IPv6_for_search($address) {
 		# parse address
-		$this->initialize_pear_net_IPv6 ();
+		$this->initialize_pear_net_IPv6();
 
 		$return = array();
 
 		# validate
-		if ($this->Net_IPv6->checkIPv6($address)==false) {
+		if ($this->Net_IPv6->checkIPv6($address) == false) {
 			// return 0
 			return array("high"=>0, "low"=>0);
 		}
 		else {
 			# fake mask
-			if (strpos($address, "/")==0)	{ $address .= "/128"; }
+			if (strpos($address, "/") == 0) { $address .= "/128"; }
 
 			# parse address
 			$parsed = $this->Net_IPv6->parseAddress($address);
@@ -746,14 +746,14 @@ 
 	 * @param mixed $table
 	 * @return array
 	 */
-	public function fetch_custom_fields ($table) {
+	public function fetch_custom_fields($table) {
     	# fetch columns
-		$fields = $this->fetch_columns ($table);
+		$fields = $this->fetch_columns($table);
 
 		$res = array();
 
 		# save Field values only
-		foreach($fields as $field) {
+		foreach ($fields as $field) {
 			# cast
 			$field = (array) $field;
 
@@ -765,14 +765,14 @@ 
 		}
 
 		# fetch standard fields
-		$standard = $this->fetch_standard_fields ($table);
+		$standard = $this->fetch_standard_fields($table);
 
 		# remove them
-		foreach($standard as $st) {
+		foreach ($standard as $st) {
 			unset($res[$st]);
 		}
 		# return array
-		return sizeof($res)==0 ? array() : $res;
+		return sizeof($res) == 0 ? array() : $res;
 	}
 
 	/**
@@ -782,12 +782,12 @@ 
 	 * @param mixed $table
 	 * @return array
 	 */
-	public function fetch_custom_fields_numeric ($table) {
+	public function fetch_custom_fields_numeric($table) {
 		# fetch all custom fields
-		$custom_fields = $this->fetch_custom_fields ($table);
+		$custom_fields = $this->fetch_custom_fields($table);
 		# make numberic array
-		if(sizeof($custom_fields)>0) {
-			foreach($custom_fields as $f) {
+		if (sizeof($custom_fields) > 0) {
+			foreach ($custom_fields as $f) {
 				$out[] = $f;
 			}
 			# result
@@ -805,14 +805,14 @@ 
 	 * @param mixed $table
 	 * @return array
 	 */
-	private function fetch_columns ($table) {
+	private function fetch_columns($table) {
 		# escape method/table
 		$table = $this->Database->escape($table);
     	# fetch columns
-		$query    = "show full columns from `$table`;";
+		$query = "show full columns from `$table`;";
 		# fetch
 	    try { $fields = $this->Database->getObjectsQuery($query); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
+		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false); return false; }
 
 		return (array) $fields;
 	}
@@ -824,7 +824,7 @@ 
 	 * @return array
 	 */
 	private function read_db_schema() {
-		$fh = fopen(dirname(__FILE__) . '/../../db/SCHEMA.sql', 'r');
+		$fh = fopen(dirname(__FILE__).'/../../db/SCHEMA.sql', 'r');
 		$schema = str_replace("\r\n", "\n", fread($fh, 100000));
 		return $schema;
 	}
@@ -836,22 +836,22 @@ 
 	 * @param mixed $table
 	 * @return array
 	 */
-	public function fetch_standard_fields ($table) {
+	public function fetch_standard_fields($table) {
 		# get SCHEMA.SQL file
 		$schema = $this->read_db_schema();
 
 		# get definition
 		$definition = strstr($schema, "CREATE TABLE `$table` (");
-		$definition = trim(strstr($definition, ";" . "\n", true));
+		$definition = trim(strstr($definition, ";"."\n", true));
 
 		# get each line to array
 		$definition = explode("\n", $definition);
 
 		# go through,if it begins with ` use it !
 		$out = array();
-		foreach($definition as $d) {
+		foreach ($definition as $d) {
 			$d = trim($d);
-			if(strpos(trim($d), "`")==0) {
+			if (strpos(trim($d), "`") == 0) {
 				$d = strstr(trim($d, "`"), "`", true);
 				$out[] = substr($d, strpos($d, "`"));
 			}
@@ -865,7 +865,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function fetch_standard_tables () {
+	public function fetch_standard_tables() {
 		# get SCHEMA.SQL file
 		$schema = $this->read_db_schema();
 
@@ -873,8 +873,8 @@ 
 		$creates = explode("CREATE TABLE `", $schema);
 		# fill tables array
 		$tables = array();
-		foreach($creates as $k=>$c) {
-			if($k>0)	{ $tables[] = strstr($c, "`", true); }	//we exclude first !
+		foreach ($creates as $k=>$c) {
+			if ($k > 0) { $tables[] = strstr($c, "`", true); }	//we exclude first !
 		}
 
 		# return array of tables
@@ -891,12 +891,12 @@ 
 	 * @param mixed $field
 	 * @return array
 	 */
-	public function fetch_full_field_definition ($table, $field) {
+	public function fetch_full_field_definition($table, $field) {
 		# escape field
 		$table = $this->Database->escape($table);
 		# fetch
 	    try { $field_data = $this->Database->getObjectQuery("show full columns from `$table` where `Field` = ?;", array($field)); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
+		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false); return false; }
 		# result
 	    return($field_data);
 	}
@@ -925,22 +925,22 @@ 
 	 * @param bool $inactive (default: false)
 	 * @return array
 	 */
-	public function fetch_widgets ($admin = false, $inactive = false) {
+	public function fetch_widgets($admin = false, $inactive = false) {
 
 		# inactive also - only for administration
-		if($inactive) 			{ $query = "select * from `widgets`; "; }
+		if ($inactive) { $query = "select * from `widgets`; "; }
 		else {
 			# admin?
-			if($admin) 			{ $query = "select * from `widgets` where `wactive` = 'yes'; "; }
-			else				{ $query = "select * from `widgets` where `wadminonly` = 'no' and `wactive` = 'yes'; "; }
+			if ($admin) { $query = "select * from `widgets` where `wactive` = 'yes'; "; }
+			else { $query = "select * from `widgets` where `wadminonly` = 'no' and `wactive` = 'yes'; "; }
 		}
 	    # fetch
 	    try { $widgets = $this->Database->getObjectsQuery($query); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
+		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false); return false; }
 
 	    # reindex
 	    $wout = array();
-	    foreach($widgets as $w) {
+	    foreach ($widgets as $w) {
 			$wout[$w->wfile] = $w;
 	    }
 
@@ -954,8 +954,8 @@ 
 	 * @access public
 	 * @return bool
 	 */
-	public function verify_widget ($file) {
-		return file_exists(dirname(__FILE__)."/../../app/dashboard/widgets/$file.php")||file_exists(dirname(__FILE__)."/../../app/dashboard/widgets/custom/$file.php") ? true : false;
+	public function verify_widget($file) {
+		return file_exists(dirname(__FILE__)."/../../app/dashboard/widgets/$file.php") || file_exists(dirname(__FILE__)."/../../app/dashboard/widgets/custom/$file.php") ? true : false;
 	}
 
 
@@ -978,8 +978,8 @@ 
 	 * @access public
 	 * @return int|array
 	 */
-	public function requests_fetch ($num = true) {
-		return $num ? $this->requests_fetch_num () : $this->requests_fetch_objects ();
+	public function requests_fetch($num = true) {
+		return $num ? $this->requests_fetch_num() : $this->requests_fetch_objects();
 	}
 
 	/**
@@ -988,8 +988,8 @@ 
 	 * @access private
 	 * @return int
 	 */
-	private function requests_fetch_num () {
-    	return $this->count_database_objects ("requests", "processed", 0);
+	private function requests_fetch_num() {
+    	return $this->count_database_objects("requests", "processed", 0);
 	}
 
 	/**
@@ -998,8 +998,8 @@ 
 	 * @access private
 	 * @return array
 	 */
-	private function requests_fetch_objects () {
-    	return $this->fetch_multiple_objects ("requests", "processed", 0);
+	private function requests_fetch_objects() {
+    	return $this->fetch_multiple_objects("requests", "processed", 0);
 	}
 
 	/**
@@ -1008,12 +1008,12 @@ 
 	 * @access public
 	 * @return array|null
 	 */
-	public function requests_fetch_available_subnets () {
+	public function requests_fetch_available_subnets() {
 		try { $subnets = $this->Database->getObjectsQuery("SELECT * FROM `subnets` where `allowRequests`=1 and `isFull` != 1 ORDER BY `subnet`;"); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
+		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false); return false; }
 
 		# save
-		return sizeof($subnets)>0 ? (array) $subnets : NULL;
+		return sizeof($subnets) > 0 ? (array) $subnets : NULL;
 	}
 
 	/**
@@ -1024,9 +1024,9 @@ 
 	 * @param mixed $values
 	 * @return bool
 	 */
-	public function ip_request_send_mail ($action="new", $values) {
+	public function ip_request_send_mail($action = "new", $values) {
 
-		$this->get_settings ();
+		$this->get_settings();
 
 		# try to send
 		try {
@@ -1037,26 +1037,26 @@ 
 			$phpipam_mail = new phpipam_mail($this->settings, $mail_settings);
 
 			# get all users and check who to end mail to
-			$recipients = $this->ip_request_get_mail_recipients ($values['subnetId']);
+			$recipients = $this->ip_request_get_mail_recipients($values['subnetId']);
 
 			# add requester to cc
 			$recipients_requester = $values['requester'];
 
 			# reformat key / vaues
-			$values = $this->ip_request_reformat_mail_values ($values);
+			$values = $this->ip_request_reformat_mail_values($values);
 			#reformat empty
-			$values = $this->reformat_empty_array_fields ($values, "/");
+			$values = $this->reformat_empty_array_fields($values, "/");
 
 			# generate content
-			if ($action=="new")			{ $subject	= "New IP address request"; }
-			elseif ($action=="accept")	{ $subject	= "IP address request accepted"; }
-			elseif ($action=="reject")	{ $subject	= "IP address request rejected"; }
-			else						{ $this->Result->show("danger", _("Invalid request action"), true); }
+			if ($action == "new") { $subject = "New IP address request"; }
+			elseif ($action == "accept") { $subject	= "IP address request accepted"; }
+			elseif ($action == "reject") { $subject	= "IP address request rejected"; }
+			else { $this->Result->show("danger", _("Invalid request action"), true); }
 
 			// set html content
 			$content[] = "<table style='margin-left:10px;margin-top:20px;width:auto;padding:0px;border-collapse:collapse;'>";
 			$content[] = "<tr><td colspan='2' style='margin:0px;>$this->mail_font_style <strong>$subject</strong></font></td></tr>";
-			foreach($values as $k=>$v) {
+			foreach ($values as $k=>$v) {
 			// title search
 			if (preg_match("/s_title_/", $k)) {
 			$content[] = "<tr><td colspan='2' style='margin:0px;border-bottom:1px solid #eeeeee;'>$this->mail_font_style<strong>$v</strong></font></td></tr>";
@@ -1072,19 +1072,19 @@ 
 			$content[] = "<tr><td style='padding-top:15px;padding-bottom:3px;text-align:right;color:#ccc;'>$this->mail_font_style Sent at ".date('Y/m/d H:i')."</font></td></tr>";
 			//set alt content
 			$content_plain[] = "$subject"."\r\n------------------------------\r\n";
-			foreach($values as $k=>$v) {
+			foreach ($values as $k=>$v) {
 			$content_plain[] = $k." => ".$v;
 			}
 			$content_plain[] = "\r\n\r\nSent at ".date('Y/m/d H:i');
 			$content[] = "</table>";
 
 			// set content
-			$content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
-			$content_plain 	= implode("\r\n",$content_plain);
+			$content 		= $phpipam_mail->generate_message(implode("\r\n", $content));
+			$content_plain = implode("\r\n", $content_plain);
 
 			$phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
-			if ($recipients!==false) {
-			foreach($recipients as $r) {
+			if ($recipients !== false) {
+			foreach ($recipients as $r) {
 			$phpipam_mail->Php_mailer->addAddress(addslashes(trim($r->email)));
 			}
 			$phpipam_mail->Php_mailer->AddCC(addslashes(trim($recipients_requester)));
@@ -1115,34 +1115,34 @@ 
 	 * @param bool|mixed $subnetId
 	 * @return array|bool
 	 */
-	private function ip_request_get_mail_recipients ($subnetId = false) {
+	private function ip_request_get_mail_recipients($subnetId = false) {
     	// fetch all users with mailNotify
-        $notification_users = $this->fetch_multiple_objects ("users", "mailNotify", "Yes", "id", true);
+        $notification_users = $this->fetch_multiple_objects("users", "mailNotify", "Yes", "id", true);
         // recipients array
         $recipients = array();
         // any ?
-        if ($notification_users!==false) {
+        if ($notification_users !== false) {
          	// if subnetId is set check who has permissions
         	if (isset($subnetId)) {
              	foreach ($notification_users as $u) {
                 	// inti object
-                	$Subnets = new Subnets ($this->Database);
+                	$Subnets = new Subnets($this->Database);
                 	//check permissions
                 	$subnet_permission = $Subnets->check_permission($u, $subnetId);
                 	// if 3 than add
-                	if ($subnet_permission==3) {
+                	if ($subnet_permission == 3) {
                     	$recipients[] = $u;
                 	}
             	}
         	}
         	else {
             	foreach ($notification_users as $u) {
-                	if($u->role=="Administrator") {
+                	if ($u->role == "Administrator") {
                     	$recipients[] = $u;
                 	}
             	}
         	}
-        	return sizeof($recipients)>0 ? $recipients : false;
+        	return sizeof($recipients) > 0 ? $recipients : false;
         }
         else {
             return false;
@@ -1156,81 +1156,81 @@ 
 	 * @param mixed $values
 	 * @return array
 	 */
-	private function ip_request_reformat_mail_values ($values) {
+	private function ip_request_reformat_mail_values($values) {
 		// no array
 		if (!is_array($values)) { return $values; }
 
 		// addresses
-		$this->Addresses = new Addresses ($this->Database);
+		$this->Addresses = new Addresses($this->Database);
 
 		$mail = array();
 
 		// change fields for mailings
 		foreach ($values as $k=>$v) {
 			// subnetId
-			if ($k=="subnetId")	{
+			if ($k == "subnetId") {
 				// add title
 				$mail["s_title_1"] = "<br>Subnet details";
 
 				$subnet = $this->fetch_object("subnets", "id", $v);
-				$mail["Subnet"]  = $this->transform_address ($subnet->subnet, "dotted")."/".$subnet->mask;
-				$mail["Subnet"] .= strlen($subnet->description)>0 ? " - ".$subnet->description : "";
+				$mail["Subnet"]  = $this->transform_address($subnet->subnet, "dotted")."/".$subnet->mask;
+				$mail["Subnet"] .= strlen($subnet->description) > 0 ? " - ".$subnet->description : "";
 			}
 			// ip_addr
-			elseif ($k=="ip_addr") {
+			elseif ($k == "ip_addr") {
 				// add title
 				$mail["s_title_2"] = "<br>Address details";
 
-				if (strlen($v)>0) {
+				if (strlen($v) > 0) {
 					$mail['IP address'] = $this->transform_address($v, "dotted");
 				} else {
 					$mail['IP address'] = "Automatic";
 				}
 			}
 			// state
-			elseif ($k=="state") {
-				$mail['State'] = $this->Addresses-> address_type_index_to_type ($v);
+			elseif ($k == "state") {
+				$mail['State'] = $this->Addresses-> address_type_index_to_type($v);
 			}
 			// description
-			elseif ($k=="descriotion") {
+			elseif ($k == "descriotion") {
 				$mail['Description'] = $v;
 			}
 			// hostname
-			elseif ($k=="hostname") {
+			elseif ($k == "hostname") {
 				$mail['Hostname'] = $v;
 			}
 			// owner
-			elseif ($k=="owner") {
+			elseif ($k == "owner") {
 				$mail['Address owner'] = $v;
 			}
 			// requester
-			elseif ($k=="requester") {
+			elseif ($k == "requester") {
 				$mail['Requested by'] = $v;
 			}
 			// comment
-			elseif ($k=="comment") {
+			elseif ($k == "comment") {
 				$mail['Request comment'] = $v;
 			}
 			// admin comment
-			elseif ($k=="adminComment") {
+			elseif ($k == "adminComment") {
 				// add title
 				$mail["s_title_3"] = "<br>Admin comment";
 
 				$mail['Admin comment'] = $v;
 			}
 			// admin comment
-			elseif ($k=="gateway") {
+			elseif ($k == "gateway") {
 				$mail['Gateway'] = $v;
 			}
 			// nameservers
-			elseif ($k=="dns") {
-				if (strlen($v)>0) {
+			elseif ($k == "dns") {
+				if (strlen($v) > 0) {
 				$mail['DNS servers'] = $v;
 				}
 			}
 			// vlans
-			elseif ($k=="vlan") {
-				if (strlen($v)>0) {
+			elseif ($k == "vlan") {
+				if (strlen($v) > 0) {
 				$mail['VLAN'] = $v;
 				}
 			}
@@ -1261,31 +1261,31 @@ 
 	 * @access public
 	 * @return array
 	 */
-	public function verify_database () {
+	public function verify_database() {
 
 		# required tables from SCHEMA.sql
 		$tables = $this->fetch_standard_tables();
 
 		# fetch required fields
-		foreach($tables as $t) {
-			$fields[$t] = $this->fetch_standard_fields ($t);
+		foreach ($tables as $t) {
+			$fields[$t] = $this->fetch_standard_fields($t);
 		}
 
 		/**
 		 * check that each database exist - if it does check also fields
 		 *		2 errors -> $tableError, $fieldError[table] = field
 		 ****************************************************************/
-		foreach($tables as $table) {
+		foreach ($tables as $table) {
 
 			//check if table exists
-			if(!$this->table_exists($table)) {
+			if (!$this->table_exists($table)) {
 				$error['tableError'][] = $table;
 			}
 			//check for each field
 			else {
-				foreach($fields[$table] as $field) {
+				foreach ($fields[$table] as $field) {
 					//if it doesnt exist store error
-					if(!$this->field_exists($table, $field)) {
+					if (!$this->field_exists($table, $field)) {
 						$error['fieldError'][$table][] = $field;
 					}
 				}
@@ -1293,11 +1293,11 @@ 
 		}
 
 		# return array
-		if(isset($error)) {
+		if (isset($error)) {
 			return $error;
-		} else 	{
+		} else {
 			# update check field
-			$this->update_db_verify_field ();
+			$this->update_db_verify_field();
 			# return empty array
 			return array();
 		}
@@ -1314,13 +1314,13 @@ 
 	 * @param bool $quit
 	 * @return bool
 	 */
-	public function table_exists ($tablename, $quit = false) {
+	public function table_exists($tablename, $quit = false) {
 	    # query
 	    $query = 'SELECT COUNT(*) AS count FROM information_schema.tables WHERE table_schema = "'.$this->Database->dbname.'" AND table_name = ?;';
 		try { $count = $this->Database->getObjectQuery($query, array($tablename)); }
-		catch (Exception $e) { !$quit ? : $this->Result->show("danger", $e->getMessage(), true);	return false; }
+		catch (Exception $e) { !$quit ?: $this->Result->show("danger", $e->getMessage(), true); return false; }
 		# return
-		return $count->count ==1 ? true : false;
+		return $count->count == 1 ? true : false;
 	}
 
 	/**
@@ -1333,15 +1333,15 @@ 
 	 * @param mixed $fieldname
 	 * @return bool
 	 */
-	public function field_exists ($tablename, $fieldname) {
+	public function field_exists($tablename, $fieldname) {
 	    # escape
 	    $tablename = $this->Database->escape($tablename);
 		# check
 	    $query = "DESCRIBE `$tablename` `$fieldname`;";
 		try { $count = $this->Database->getObjectQuery($query); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), true);	return false; }
+		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), true); return false; }
 		# return true if it exists
-		return $count!== null ? true : false;
+		return $count !== null ? true : false;
 	}
 
 	/**
@@ -1349,11 +1349,11 @@ 
 	 *
 	 * @access private
 	 */
-	private function update_db_verify_field () {
+	private function update_db_verify_field() {
 		# query
 		$query = "update `settings` set `dbverified`=1 where `id` = 1; ";
 		try { $this->Database->runQuery($query); }
-		catch (Exception $e) { !$this->debugging ? : $this->Result->show("danger", $e->getMessage(), false); }
+		catch (Exception $e) { !$this->debugging ?: $this->Result->show("danger", $e->getMessage(), false); }
 	}
 
 	/**
@@ -1363,7 +1363,7 @@ 
 	 * @param mixed $table
 	 * @return false|string
 	 */
-	public function get_table_fix ($table) {
+	public function get_table_fix($table) {
 		$file = $this->read_db_schema();
 
 		//go from delimiter on
@@ -1371,7 +1371,7 @@ 
 		$file = trim(strstr($file, "# Dump of table", true));
 
 		# check
-		if(strpos($file, "DROP TABLE IF EXISTS `$table`;") > 0 )	return false;
+		if (strpos($file, "DROP TABLE IF EXISTS `$table`;") > 0)	return false;
 		else														return $file;
 	}
 
@@ -1383,7 +1383,7 @@ 
 	 * @param mixed $field
 	 * @return string|false
 	 */
-	public function get_field_fix ($table, $field) {
+	public function get_field_fix($table, $field) {
 		$file = $this->read_db_schema();
 
 		//go from delimiter on
@@ -1392,8 +1392,8 @@ 
 
 		//get proper line
 		$file = explode("\n", $file);
-		foreach($file as $k=>$l) {
-			if(strpos(trim($l), "$field`")==1) {
+		foreach ($file as $k=>$l) {
+			if (strpos(trim($l), "$field`") == 1) {
 				$res = trim($l, ",");
 				$res .= ";";
 
@@ -1410,7 +1410,7 @@ 
 	 * @param mixed $table
 	 * @return bool
 	 */
-	public function fix_table ($table) {
+	public function fix_table($table) {
 		# first fetch fix query
 		$query = $this->get_table_fix($table);
 		# fix
@@ -1430,10 +1430,10 @@ 
 	 * @param mixed $field
 	 * @return bool
 	 */
-	public function fix_field ($table, $field) {
+	public function fix_field($table, $field) {
 		# set fix query
 		$query  = "alter table `$table` add ";
-		$query .= trim($this->get_field_fix ($table, $field), ",");
+		$query .= trim($this->get_field_fix($table, $field), ",");
 		$query .= ";";
 
 		# fix
@@ -1451,20 +1451,20 @@ 
 	 * @method verify_database_indexes
 	 * @return bool
 	 */
-	public function verify_database_indexes () {
+	public function verify_database_indexes() {
 		// get indexes from schema
 		$schema_indexes = $this->get_schema_indexes();
 		// get existing indexes
 		$missing = $this->get_missing_database_indexes($schema_indexes);
 
 		// if false all indexes are ok, otherwise fix
-		if ($missing===false) {
+		if ($missing === false) {
 			return true;
 		}
 		else {
 			foreach ($missing as $table=>$index_id) {
 				foreach ($index_id as $index_name) {
-					$this->fix_missing_index ($table, $index_name);
+					$this->fix_missing_index($table, $index_name);
 				}
 			}
 		}
@@ -1479,22 +1479,22 @@ 
 	 * @method get_schema_indexes
 	 * @return array
 	 */
-	private function get_schema_indexes () {
+	private function get_schema_indexes() {
 		// Discover indexes required for phpipam
 		$schema = $this->read_db_schema();
 
 		# get definitions to array, explode with CREATE TABLE `
 		$creates = explode("CREATE TABLE `", $schema);
 
-		$indexes = array ();
-		foreach($creates as $k=>$c) {
-			if($k == 0) continue;
-			$c = trim(strstr($c, ";" . "\n", true));
+		$indexes = array();
+		foreach ($creates as $k=>$c) {
+			if ($k == 0) continue;
+			$c = trim(strstr($c, ";"."\n", true));
 
 			$table = strstr($c, "`", true);
 
 			$definitions = explode("\n", $c);
-			foreach($definitions as $definition) {
+			foreach ($definitions as $definition) {
 				if (preg_match('/(KEY|UNIQUE KEY) +`(.*)` +\(/', $definition, $matches)) {
 					$indexes[$table][] = $matches[2];
 				}
@@ -1510,7 +1510,7 @@ 
 	 * @param array $schema_indexes
 	 * @return array|null
 	 */
-	private function get_missing_database_indexes ($schema_indexes) {
+	private function get_missing_database_indexes($schema_indexes) {
 		// loop
 		foreach ($schema_indexes as $table=>$index) {
 			try { $indexes = $this->Database->getObjectsQuery("SHOW INDEX from `$table` where `Key_name` != 'PRIMARY';"); }
@@ -1518,21 +1518,21 @@ 
 				$this->Result->show("danger", _("Invalid query for `$table` database index check : ").$e->getMessage(), true);
 			}
 			// remove existing
-			if ($indexes!==false) {
+			if ($indexes !== false) {
 				foreach ($indexes as $i) {
 					// remove indexes
-					if(($key = array_search($i->Key_name, $schema_indexes[$table])) !== false) {
+					if (($key = array_search($i->Key_name, $schema_indexes[$table])) !== false) {
 						unset($schema_indexes[$table][$key]);
 					}
 				}
 			}
 			// remove also empty table
-			if(sizeof($schema_indexes[$table])==0) {
+			if (sizeof($schema_indexes[$table]) == 0) {
 				unset($schema_indexes[$table]);
 			}
 		}
 		// return diff
-		return sizeof($schema_indexes)==0 ? false : $schema_indexes;
+		return sizeof($schema_indexes) == 0 ? false : $schema_indexes;
 	}
 
 	/**
@@ -1543,7 +1543,7 @@ 
 	 * @param  string $index_name
 	 * @return void
 	 */
-	private function fix_missing_index ($table, $index_name) {
+	private function fix_missing_index($table, $index_name) {
 		// get definition
 		$file = $this->read_db_schema();
 
@@ -1555,12 +1555,12 @@ 
 		$file = explode("\n", $file);
 
 		$line = false;
-		foreach($file as $k=>$l) {
+		foreach ($file as $k=>$l) {
 			// trim
 			$l = trim($l);
-			if(strpos($l, "KEY `".$index_name."`")!==false) {
+			if (strpos($l, "KEY `".$index_name."`") !== false) {
 				// remove last ,
-				if(substr($l, -1)==",") {
+				if (substr($l, -1) == ",") {
 					$l = substr($l, 0, -1);
 				}
 				// set query and run
@@ -1599,15 +1599,15 @@ 
 	 * @param bool $print_error (default: false)
 	 * @return string|bool
 	 */
-	public function check_latest_phpipam_version ($print_error = false) {
+	public function check_latest_phpipam_version($print_error = false) {
 		# fetch settings
-		$this->get_settings ();
+		$this->get_settings();
 		# check for release
     	# try to fetch
     	$release_gh = @file('https://github.com/phpipam/phpipam/releases.atom');
     	# check
-    	if ($release_gh===false) {
-        	if($print_error) {
+    	if ($release_gh === false) {
+        	if ($print_error) {
             	$this->Result->show("danger", "Cannot fetch https://github.com/phpipam/phpipam/releases.atom", false);
             }
         	return false;
@@ -1618,7 +1618,7 @@ 
 		$xml = simplexml_load_string($feed);
 
 		// if ok
-		if ($xml!==false) {
+		if ($xml !== false) {
 			// encode to json
 			$json = json_decode(json_encode($xml));
 			// save all releases
@@ -1646,11 +1646,11 @@ 
 	 *
 	 * @access public
 	 */
-	public function update_phpipam_checktime () {
+	public function update_phpipam_checktime() {
 		# query
 		$query = "update `settings` set `vcheckDate`='".date("Y-m-d H:i:s")."';";
 		try { $this->Database->runQuery($query); }
-		catch (Exception $e) { !$this->debugging ? : $this->Result->show("danger", $e->getMessage(), false); }
+		catch (Exception $e) { !$this->debugging ?: $this->Result->show("danger", $e->getMessage(), false); }
 	}
 
 
@@ -1673,9 +1673,9 @@ 
 	 * @param mixed $cidr
 	 * @return mixed
 	 */
-	public function calculate_ip_calc_results ($cidr) {
+	public function calculate_ip_calc_results($cidr) {
 		# detect address and calculate
-		return $this->identify_address($cidr)=="IPv6" ? $this->calculate_IPv6_calc_results($cidr) : $this->calculate_IPv4_calc_results($cidr);
+		return $this->identify_address($cidr) == "IPv6" ? $this->calculate_IPv6_calc_results($cidr) : $this->calculate_IPv4_calc_results($cidr);
 	}
 
 	/**
@@ -1685,31 +1685,31 @@ 
 	 * @param mixed $cidr
 	 * @return array
 	 */
-	private function calculate_IPv4_calc_results ($cidr) {
+	private function calculate_IPv4_calc_results($cidr) {
 		# initialize subnets Class
 		$Subnets = new Subnets($this->Database);
 		# Initialize PEAR NET object
-		$this->initialize_pear_net_IPv4 ();
+		$this->initialize_pear_net_IPv4();
 
 		# parse address
-        $net = $this->Net_IPv4->parseAddress( $cidr );
+        $net = $this->Net_IPv4->parseAddress($cidr);
 
         # set ip address type
         $out = array();
         $out['Type']            = 'IPv4';
 
         # calculate network details
-        $out['IP address']      = $net->ip;        // 192.168.0.50
-        $out['Network']         = $net->network;   // 192.168.0.0
+        $out['IP address']      = $net->ip; // 192.168.0.50
+        $out['Network']         = $net->network; // 192.168.0.0
         $out['Broadcast']       = $net->broadcast; // 192.168.255.255
-        $out['Subnet bitmask']  = $net->bitmask;   // 16
-        $out['Subnet netmask']  = $net->netmask;   // 255.255.0.0
-        $out['Subnet wildcard'] = long2ip(~ip2long($net->netmask));	//0.0.255.255
+        $out['Subnet bitmask']  = $net->bitmask; // 16
+        $out['Subnet netmask']  = $net->netmask; // 255.255.0.0
+        $out['Subnet wildcard'] = long2ip(~ip2long($net->netmask)); //0.0.255.255
 
         # calculate min/max IP address
         $out['Min host IP']     = long2ip(ip2long($net->network) + 1);
         $out['Max host IP']     = long2ip(ip2long($net->broadcast) - 1);
-        $out['Number of hosts'] = $Subnets->get_max_hosts ($net->bitmask, "IPv4");;
+        $out['Number of hosts'] = $Subnets->get_max_hosts($net->bitmask, "IPv4"); ;
 
         # subnet class
         $out['Subnet Class']    = $this->get_ipv4_address_type($net->network, $net->broadcast);
@@ -1719,7 +1719,7 @@ 
             $out['IP address'] = "/";
         }
         # /32 and /32 fixes
-        if($net->bitmask==31 || $net->bitmask==32) {
+        if ($net->bitmask == 31 || $net->bitmask == 32) {
 			$out['Min host IP'] = $out['Network'];
 			$out['Max host IP'] = $out['Broadcast'];
         }
@@ -1735,13 +1735,13 @@ 
 	 * @param $broadcast
 	 * @return string|false
 	 */
-	private function get_ipv4_address_type ($network, $broadcast) {
+	private function get_ipv4_address_type($network, $broadcast) {
 		# get all possible classes
-		$classes = $this->define_ipv4_address_types ();
+		$classes = $this->define_ipv4_address_types();
 		# Initialize PEAR NET object
-		$this->initialize_pear_net_IPv4 ();
+		$this->initialize_pear_net_IPv4();
 		# check for each if member
-	    foreach( $classes as $key=>$class ) {
+	    foreach ($classes as $key=>$class) {
 	        if ($this->Net_IPv4->ipInNetwork($network, $class)) {
 	            if ($this->Net_IPv4->ipInNetwork($broadcast, $class)) {
 	                return($key);
@@ -1758,7 +1758,7 @@ 
 	 * @access private
 	 * @return array
 	 */
-	private function define_ipv4_address_types () {
+	private function define_ipv4_address_types() {
 	    # define classes
 	    $classes = array();
 	    $classes['private A']          = '10.0.0.0/8';
@@ -1785,11 +1785,11 @@ 
 	 * @param mixed $cidr
 	 * @return array
 	 */
-	private function calculate_IPv6_calc_results ($cidr) {
+	private function calculate_IPv6_calc_results($cidr) {
 		# initialize subnets Class
 		$Subnets = new Subnets($this->Database);
 		# Initialize PEAR NET object
-		$this->initialize_pear_net_IPv6 ();
+		$this->initialize_pear_net_IPv6();
 
         # set ip address type
         $out = array();
@@ -1797,13 +1797,13 @@ 
 
         # calculate network details
         $out['Host address']              = $cidr;
-        $out['Host address']              = $this->Net_IPv6->compress ( $out['Host address'], 1 );
-        $out['Host address (uncompressed)'] = $this->Net_IPv6->uncompress ( $out['Host address'] );
+        $out['Host address']              = $this->Net_IPv6->compress($out['Host address'], 1);
+        $out['Host address (uncompressed)'] = $this->Net_IPv6->uncompress($out['Host address']);
 
-        $mask                             = $this->Net_IPv6->getNetmaskSpec( $cidr );
-        $subnet                           = $this->Net_IPv6->getNetmask( $cidr );
-        $out['Subnet prefix']             = $this->Net_IPv6->compress ( $subnet ) .'/'. $mask;
-        $out['Prefix length']             = $this->Net_IPv6->getNetmaskSpec( $cidr );
+        $mask                             = $this->Net_IPv6->getNetmaskSpec($cidr);
+        $subnet                           = $this->Net_IPv6->getNetmask($cidr);
+        $out['Subnet prefix']             = $this->Net_IPv6->compress($subnet).'/'.$mask;
+        $out['Prefix length']             = $this->Net_IPv6->getNetmaskSpec($cidr);
 
         # get reverse DNS entries
         $out['Host Reverse DNS']   = $this->reverse_IPv6($out['Host address (uncompressed)']);
@@ -1817,15 +1817,15 @@ 
         }
 
         # /min / max hosts
-        $maxIp = gmp_strval(gmp_add(gmp_pow(2, 128 - $mask),$this->ip2long6 ($subnet)));
+        $maxIp = gmp_strval(gmp_add(gmp_pow(2, 128 - $mask), $this->ip2long6($subnet)));
 		$maxIp = gmp_strval(gmp_sub($maxIp, 1));
 
         $out['Min host IP']               = $subnet;
-        $out['Max host IP']               = $this->long2ip6 ($maxIp);
-        $out['Number of hosts']           = $Subnets->get_max_hosts ($mask, "IPv6");
+        $out['Max host IP']               = $this->long2ip6($maxIp);
+        $out['Number of hosts']           = $Subnets->get_max_hosts($mask, "IPv6");
 
         # set address type
-        $out['Address type']              = $this->get_ipv6_address_type( $cidr );
+        $out['Address type']              = $this->get_ipv6_address_type($cidr);
 		# result
 		return $out;
 	}
@@ -1840,18 +1840,18 @@ 
 	 * @param int $pflen (default: 128)
 	 * @return string
 	 */
-	public function reverse_IPv6 ($addresses, $pflen=128) {
+	public function reverse_IPv6($addresses, $pflen = 128) {
 		# Initialize PEAR NET object
-		$this->initialize_pear_net_IPv6 ();
+		$this->initialize_pear_net_IPv6();
 		//uncompress
 	    $uncompressed = $this->Net_IPv6->removeNetmaskSpec($this->Net_IPv6->uncompress($addresses));
 	    $len = $pflen / 4;
 	    $parts = explode(':', $uncompressed);
 	    $res = '';
-	    foreach($parts as $part) {
+	    foreach ($parts as $part) {
 	        $res .= str_pad($part, 4, '0', STR_PAD_LEFT);
 	    }
-	    $res = implode('.', str_split(strrev(substr($res, 0, $len)))) . '.ip6.arpa';
+	    $res = implode('.', str_split(strrev(substr($res, 0, $len)))).'.ip6.arpa';
 	    if ($pflen % 4 != 0) {
 	        $res .= " "._("(closest parent)");
 	    }
@@ -1865,13 +1865,13 @@ 
 	 * @param CIDR $cidr
 	 * @return string|false
 	 */
-	private function get_ipv6_address_type ($cidr) {
+	private function get_ipv6_address_type($cidr) {
 		# Initialize PEAR NET object
-		$this->initialize_pear_net_IPv6 ();
+		$this->initialize_pear_net_IPv6();
 		# get type in number
 		$type = $this->Net_IPv6->getAddressType($cidr);
 		# fetch types
-		$all_types = $this->define_ipv6_address_types ();
+		$all_types = $this->define_ipv6_address_types();
 		# translate
 		return array_key_exists($type, $all_types) ? $all_types[$type] : false;
 	}
@@ -1882,7 +1882,7 @@ 
 	 * @access private
 	 * @return string[]
 	 */
-	private function define_ipv6_address_types () {
+	private function define_ipv6_address_types() {
         $all_types[10] = "NET_IPV6_NO_NETMASK";
         $all_types[1]  = "NET_IPV6";
         $all_types[11] = "NET_IPV6_RESERVED";
@@ -1930,7 +1930,7 @@ 
      * @param int|bool object_id (default: false) - to bold it
      * @return array|bool
      */
-    public function translate_nat_objects_for_display ($json_objects, $nat_id = false, $admin = false, $object_type = false, $object_id=false) {
+    public function translate_nat_objects_for_display($json_objects, $nat_id = false, $admin = false, $object_type = false, $object_id = false) {
         // to array "subnets"=>array(1,2,3)
         $objects = json_decode($json_objects, true);
         // init out array
@@ -1939,20 +1939,20 @@ 
         $this->get_settings();
         $statuses = explode(";", $this->settings->pingStatus);
         // check
-        if(is_array($objects)) {
-            if(sizeof($objects)>0) {
+        if (is_array($objects)) {
+            if (sizeof($objects) > 0) {
                 foreach ($objects as $ot=>$ids) {
-                    if (sizeof($ids)>0) {
+                    if (sizeof($ids) > 0) {
                         foreach ($ids as $id) {
                             // fetch
                             $item = $this->fetch_object($ot, "id", $id);
-                            if($item!==false) {
+                            if ($item !== false) {
                                 // bold
-                                $bold = $item->id==$object_id && $ot==$object_type ? "<span class='strong'>" : "<span>";
+                                $bold = $item->id == $object_id && $ot == $object_type ? "<span class='strong'>" : "<span>";
                                 // remove
-                                $remove = $admin&&$nat_id ? "<span class='remove-nat-item-wrapper_".$ot."_".$item->id."'><a class='btn btn-xs btn-danger removeNatItem' data-id='$nat_id' data-type='$ot' data-item-id='$item->id' rel='tooltip' title='"._('Remove')."'><i class='fa fa-times'></i></a>" : "<span>";
+                                $remove = $admin && $nat_id ? "<span class='remove-nat-item-wrapper_".$ot."_".$item->id."'><a class='btn btn-xs btn-danger removeNatItem' data-id='$nat_id' data-type='$ot' data-item-id='$item->id' rel='tooltip' title='"._('Remove')."'><i class='fa fa-times'></i></a>" : "<span>";
                                 // subnets
-                                if ($ot=="subnets") {
+                                if ($ot == "subnets") {
                                     $out[] = "$remove $bold<a href='".create_link("subnets", $item->sectionId, $item->id)."'>".$this->transform_address($item->subnet, "dotted")."/".$item->mask."</a></span></span>";
                                 }
                                 // addresses
@@ -1960,23 +1960,23 @@ 
                                     // subnet
                                     $snet = $this->fetch_object("subnets", "id", $item->subnetId);
                                     // append status
-                                    if ($snet->pingSubnet=="1") {
+                                    if ($snet->pingSubnet == "1") {
                                         //calculate
                                         $tDiff = time() - strtotime($item->lastSeen);
-                                        if($item->excludePing=="1" )    { $hStatus = "padded"; $hTooltip = ""; }
-                                        elseif(is_null($item->lastSeen)) { $hStatus = "neutral"; $hTooltip = "rel='tooltip' data-container='body' data-html='true' data-placement='left' title='"._("Address was never online")."'"; }
-                                        elseif($tDiff < $statuses[0])	{ $hStatus = "success";	$hTooltip = "rel='tooltip' data-container='body' data-html='true' data-placement='left' title='"._("Address is alive")."<hr>"._("Last seen").": ".$item->lastSeen."'"; }
-                                        elseif($tDiff < $statuses[1])	{ $hStatus = "warning"; $hTooltip = "rel='tooltip' data-container='body' data-html='true' data-placement='left' title='"._("Address warning")."<hr>"._("Last seen").": ".$item->lastSeen."'"; }
-                                        elseif($tDiff > $statuses[1])	{ $hStatus = "error"; 	$hTooltip = "rel='tooltip' data-container='body' data-html='true' data-placement='left' title='"._("Address is offline")."<hr>"._("Last seen").": ".$item->lastSeen."'";}
-                                        elseif($item->lastSeen == "0000-00-00 00:00:00") { $hStatus = "neutral"; 	$hTooltip = "rel='tooltip' data-container='body' data-html='true' data-placement='left' title='"._("Address is offline")."<hr>"._("Last seen").": "._("Never")."'";}
-                                        elseif($item->lastSeen == "1970-01-01 00:00:01") { $hStatus = "neutral"; 	$hTooltip = "rel='tooltip' data-container='body' data-html='true' data-placement='left' title='"._("Address is offline")."<hr>"._("Last seen").": "._("Never")."'";}
-                                        else							{ $hStatus = "neutral"; $hTooltip = "rel='tooltip' data-container='body' data-html='true' data-placement='left' title='"._("Address status unknown")."'";}
+                                        if ($item->excludePing == "1") { $hStatus = "padded"; $hTooltip = ""; }
+                                        elseif (is_null($item->lastSeen)) { $hStatus = "neutral"; $hTooltip = "rel='tooltip' data-container='body' data-html='true' data-placement='left' title='"._("Address was never online")."'"; }
+                                        elseif ($tDiff < $statuses[0]) { $hStatus = "success"; $hTooltip = "rel='tooltip' data-container='body' data-html='true' data-placement='left' title='"._("Address is alive")."<hr>"._("Last seen").": ".$item->lastSeen."'"; }
+                                        elseif ($tDiff < $statuses[1]) { $hStatus = "warning"; $hTooltip = "rel='tooltip' data-container='body' data-html='true' data-placement='left' title='"._("Address warning")."<hr>"._("Last seen").": ".$item->lastSeen."'"; }
+                                        elseif ($tDiff > $statuses[1]) { $hStatus = "error"; $hTooltip = "rel='tooltip' data-container='body' data-html='true' data-placement='left' title='"._("Address is offline")."<hr>"._("Last seen").": ".$item->lastSeen."'"; }
+                                        elseif ($item->lastSeen == "0000-00-00 00:00:00") { $hStatus = "neutral"; $hTooltip = "rel='tooltip' data-container='body' data-html='true' data-placement='left' title='"._("Address is offline")."<hr>"._("Last seen").": "._("Never")."'"; }
+                                        elseif ($item->lastSeen == "1970-01-01 00:00:01") { $hStatus = "neutral"; $hTooltip = "rel='tooltip' data-container='body' data-html='true' data-placement='left' title='"._("Address is offline")."<hr>"._("Last seen").": "._("Never")."'"; }
+                                        else { $hStatus = "neutral"; $hTooltip = "rel='tooltip' data-container='body' data-html='true' data-placement='left' title='"._("Address status unknown")."'"; }
                                     }
                                     else {
                                         $hStatus = "hidden";
                                         $hTooltip = "";
                                     }
-                                    if($remove=="<span>") {
+                                    if ($remove == "<span>") {
                                         $remove .= "<span class='status status-$hStatus' $hTooltip></span>";
                                     }
 
@@ -1989,7 +1989,7 @@ 
             }
         }
         // result
-        return sizeof($out)>0 ? $out : false;
+        return sizeof($out) > 0 ? $out : false;
     }
 
     /**
@@ -2006,40 +2006,40 @@ 
      * @param array $all_nats (default: array())
      * @return array
      */
-    public function reindex_nat_objects ($all_nats = array()) {
+    public function reindex_nat_objects($all_nats = array()) {
         // out array
         $out = array(
             "ipaddresses"=>array(),
             "subnets"=>array()
         );
         // loop
-        if(is_array($all_nats)) {
-            if (sizeof($all_nats)>0) {
+        if (is_array($all_nats)) {
+            if (sizeof($all_nats) > 0) {
                 foreach ($all_nats as $n) {
                     $src = json_decode($n->src, true);
                     $dst = json_decode($n->dst, true);
 
                     // src
-                    if(is_array($src)) {
-                        if(is_array(@$src['subnets'])) {
+                    if (is_array($src)) {
+                        if (is_array(@$src['subnets'])) {
                             foreach ($src['subnets'] as $s) {
                                 $out['subnets'][$s][] = $n->id;
                             }
                         }
-                        if(is_array(@$src['ipaddresses'])) {
+                        if (is_array(@$src['ipaddresses'])) {
                             foreach ($src['ipaddresses'] as $s) {
                                 $out['ipaddresses'][$s][] = $n->id;
                             }
                         }
                     }
                     // dst
-                    if(is_array($dst)) {
-                        if(is_array(@$dst['subnets'])) {
+                    if (is_array($dst)) {
+                        if (is_array(@$dst['subnets'])) {
                             foreach ($dst['subnets'] as $s) {
                                 $out['subnets'][$s][] = $n->id;
                             }
                         }
-                        if(is_array(@$dst['ipaddresses'])) {
+                        if (is_array(@$dst['ipaddresses'])) {
                             foreach ($dst['ipaddresses'] as $s) {
                                 $out['ipaddresses'][$s][] = $n->id;
                             }
@@ -2064,30 +2064,30 @@ 
      * @param bool $object_id (default: false)
      * @return string
      */
-    public function print_nat_table ($n, $is_admin = false, $nat_id = false, $admin = false, $object_type = false, $object_id=false) {
+    public function print_nat_table($n, $is_admin = false, $nat_id = false, $admin = false, $object_type = false, $object_id = false) {
         // cast to object to be sure if array provided
         $n = (object) $n;
 
         // translate json to array, links etc
-        $sources      = $this->translate_nat_objects_for_display ($n->src, $nat_id, $admin, $object_type, $object_id);
-        $destinations = $this->translate_nat_objects_for_display ($n->dst, $nat_id, $admin, $object_type, $object_id);
+        $sources      = $this->translate_nat_objects_for_display($n->src, $nat_id, $admin, $object_type, $object_id);
+        $destinations = $this->translate_nat_objects_for_display($n->dst, $nat_id, $admin, $object_type, $object_id);
 
         // no src/dst
-        if ($sources===false)
+        if ($sources === false)
             $sources = array("<span class='badge badge1 badge5 alert-danger'>"._("None")."</span>");
-        if ($destinations===false)
+        if ($destinations === false)
             $destinations = array("<span class='badge badge1 badge5 alert-danger'>"._("None")."</span>");
 
         // description
         $n->description = str_replace("\n", "<br>", $n->description);
-        $n->description = strlen($n->description)>0 ? "<br>$n->description" : "";
+        $n->description = strlen($n->description) > 0 ? "<br>$n->description" : "";
 
         // device
         if (strlen($n->device)) {
-            if($n->device !== 0) {
-                $device = $this->fetch_object ("devices", "id", $n->device);
-                $description = strlen($device->description)>0 ? " ($device->description)" : "";
-                $n->device = $device===false ? "/" : "<a href='".create_link("tools", "devices", $device->id)."'>$device->hostname</a> ($device->ip_addr) <span class='text-muted'>$description</span>";
+            if ($n->device !== 0) {
+                $device = $this->fetch_object("devices", "id", $n->device);
+                $description = strlen($device->description) > 0 ? " ($device->description)" : "";
+                $n->device = $device === false ? "/" : "<a href='".create_link("tools", "devices", $device->id)."'>$device->hostname</a> ($device->ip_addr) <span class='text-muted'>$description</span>";
             }
         }
         else {
@@ -2095,7 +2095,7 @@ 
         }
 
         // icon
-        $icon =  $n->type=="static" ? "fa-arrows-h" : "fa-long-arrow-right";
+        $icon = $n->type == "static" ? "fa-arrows-h" : "fa-long-arrow-right";
 
         // to html
         $html = array();
@@ -2110,7 +2110,7 @@ 
         $html[] = "</tr>";
 
         // append ports
-        if(($n->type=="static" || $n->type=="destination") && (strlen($n->src_port)>0 && strlen($n->dst_port)>0)) {
+        if (($n->type == "static" || $n->type == "destination") && (strlen($n->src_port) > 0 && strlen($n->dst_port) > 0)) {
             $sources      = implode("<br>", $sources)." /".$n->src_port;
             $destinations = implode("<br>", $destinations)." /".$n->dst_port;
         }
@@ -2134,7 +2134,7 @@ 
         $html[] = "</tr>";
 
         // actions
-        if($is_admin) {
+        if ($is_admin) {
         $html[] = "<tr>";
         $html[] = "<td colspan='4'><hr></td>";
         $html[] = "</tr>";
@@ -2171,8 +2171,8 @@ 
      * @param bool $recursive (default: false)
      * @return array|bool
      */
-    public function fetch_all_prefixes ($master = false, $recursive = false) {
-	    if($master && !$recursive) {
+    public function fetch_all_prefixes($master = false, $recursive = false) {
+	    if ($master && !$recursive) {
     	    $query = 'select *,concat(prefix,start) as raw from pstnPrefixes where master = ? order by raw asc;';
     	    $params = array($master);
 	    }
@@ -2187,26 +2187,26 @@ 
 			return false;
 		}
         // for master + recursive we need to go from master id to next 0 (root
-        if($master && $recursive && $prefixes) {
+        if ($master && $recursive && $prefixes) {
             $master_set = false;
             $out = array();
 
             foreach ($prefixes as $k=>$p) {
-        	    if($p->id == $master) {
+        	    if ($p->id == $master) {
             	    $out[] = $p;
             	    $master_set = true;
         	    }
-        	    elseif ($master_set && $p->master!=0) {
+        	    elseif ($master_set && $p->master != 0) {
             	    $out[] = $p;
         	    }
-        	    elseif ($master_set && $p->master!=0) {
+        	    elseif ($master_set && $p->master != 0) {
             	    break;
         	    }
             }
             $prefixes = $out;
         }
 		# result
-		return sizeof($prefixes)>0 ? array_values($prefixes) : false;
+		return sizeof($prefixes) > 0 ? array_values($prefixes) : false;
     }
 
     /**
@@ -2216,7 +2216,7 @@ 
      * @param mixed $number
      * @return mixed
      */
-    public function prefix_normalize ($number) {
+    public function prefix_normalize($number) {
         return str_replace(array("+", " ", "-"), "", $number);
     }
 
@@ -2227,19 +2227,19 @@ 
 	 * @param mixed $id
 	 * @return array
 	 */
-	public function fetch_prefix_parents_recursive ($id) {
+	public function fetch_prefix_parents_recursive($id) {
 		$parents = array();
 		$root = false;
 
-		while($root === false) {
-			$subd = $this->fetch_object("pstnPrefixes", "id", $id);		# get subnet details
+		while ($root === false) {
+			$subd = $this->fetch_object("pstnPrefixes", "id", $id); # get subnet details
 
-			if($subd!==false) {
+			if ($subd !== false) {
     			$subd = (array) $subd;
 				# not root yet
-				if(@$subd['master']!=0) {
+				if (@$subd['master'] != 0) {
 					array_unshift($parents, $subd['master']);
-					$id  = $subd['master'];
+					$id = $subd['master'];
 				}
 				# root
 				else {
@@ -2272,20 +2272,20 @@ 
 	 *
 	 * @return array
 	 */
-	public function fetch_parents_recursive ($table, $parent_field, $return_field, $id, $reverse = false) {
+	public function fetch_parents_recursive($table, $parent_field, $return_field, $id, $reverse = false) {
 		$parents = array();
 		$root = false;
 
-		while($root === false) {
+		while ($root === false) {
 			$subd = $this->fetch_object($table, "id", $id);
 
-			if($subd!==false) {
+			if ($subd !== false) {
     			$subd = (array) $subd;
 				# not root yet
-				if(@$subd[$parent_field]!=0) {
+				if (@$subd[$parent_field] != 0) {
 					// array_unshift($parents, $subd[$parent_field]);
 					$parents[$subd['id']] = $subd[$return_field];
-					$id  = $subd[$parent_field];
+					$id = $subd[$parent_field];
 				}
 				# root
 				else {
@@ -2298,7 +2298,7 @@ 
 			}
 		}
 		# return array
-		return $reverse ? array_reverse($parents, truetrue) :$parents;
+		return $reverse ? array_reverse($parents, truetrue) : $parents;
 	}
 
 	/**
@@ -2309,8 +2309,8 @@ 
 	 * @param bool $number (default: false)
 	 * @return null|boolean
 	 */
-	public function check_number_duplicates ($prefix = false, $number = false) {
-    	if($prefix===false && $number===false) {
+	public function check_number_duplicates($prefix = false, $number = false) {
+    	if ($prefix === false && $number === false) {
         	$this->Result->show("danger", "Duplicate chck failed", true);
     	}
     	else {
@@ -2322,7 +2322,7 @@ 
     			return false;
     		}
     		# result
-    		return $cnt->cnt>0 ? true : false;
+    		return $cnt->cnt > 0 ? true : false;
     	}
 	}
 
@@ -2335,8 +2335,8 @@ 
 	 * @param object $user
 	 * @return int
 	 */
-	public function check_prefix_permission ($user) {
-        return $user->role=="Administrator" ? 3 : $user->pstn;
+	public function check_prefix_permission($user) {
+        return $user->role == "Administrator" ? 3 : $user->pstn;
 	}
 
 	/**
@@ -2348,10 +2348,10 @@ 
 	 * @param mixed $custom_fields
 	 * @return mixed
 	 */
-	public function print_menu_prefixes ( $user, $prefixes, $custom_fields ) {
+	public function print_menu_prefixes($user, $prefixes, $custom_fields) {
 
 		# set hidden fields
-		$this->get_settings ();
+		$this->get_settings();
 		$hidden_fields = json_decode($this->settings->hiddenCustomFields, true);
 		$hidden_fields = is_array($hidden_fields['subnets']) ? $hidden_fields['subnets'] : array();
 
@@ -2361,17 +2361,17 @@ 
 		$rootId = 0;
 
 		# remove all not permitted!
-		if(sizeof($prefixes)>0) {
-		foreach($prefixes as $k=>$s) {
-			$permission = $this->check_prefix_permission ($user);
-			if($permission == 0) { unset($prefixes[$k]); }
+		if (sizeof($prefixes) > 0) {
+		foreach ($prefixes as $k=>$s) {
+			$permission = $this->check_prefix_permission($user);
+			if ($permission == 0) { unset($prefixes[$k]); }
 		}
 		}
 
 		# create loop array
-		if(sizeof($prefixes) > 0) {
+		if (sizeof($prefixes) > 0) {
         $children_prefixes = array();
-		foreach ( $prefixes as $item ) {
+		foreach ($prefixes as $item) {
 			$item = (array) $item;
 			$children_prefixes[$item['master']][] = $item;
 		}
@@ -2381,7 +2381,7 @@ 
 		}
 
 		# loop will be false if the root has no children (i.e., an empty menu!)
-		$loop = !empty( $children_prefixes[$rootId] );
+		$loop = !empty($children_prefixes[$rootId]);
 
 		# initializing $parent as the root
 		$parent = $rootId;
@@ -2391,12 +2391,12 @@ 
 		$old_count = 0;
 
 		# return table content (tr and td's)
-		reset( $children_prefixes[$parent] );
-		while ( $loop && ( ( $option = current( $children_prefixes[$parent] ) ) || ( $parent > $rootId ) ) )
+		reset($children_prefixes[$parent]);
+		while ($loop && (($option = current($children_prefixes[$parent])) || ($parent > $rootId)))
 		{
-			next( $children_prefixes[$parent] );
+			next($children_prefixes[$parent]);
 
-			if(count($parent_stack) == 0) {
+			if (count($parent_stack) == 0) {
 				$margin = "0px";
 				$padding = "0px";
 			}
@@ -2405,41 +2405,41 @@ 
 				$padding = "10px";
 
 				# margin
-				$margin  = (count($parent_stack) * 10) -10;
-				$margin  = $margin *1.5;
+				$margin  = (count($parent_stack) * 10) - 10;
+				$margin  = $margin * 1.5;
 				$margin  = $margin."px";
 			}
 
 			# count levels
-			$count = count( $parent_stack ) + 1;
+			$count = count($parent_stack) + 1;
 
 			# description
-			$name = strlen($option['name'])==0 ? "/" : $option['name'];
+			$name = strlen($option['name']) == 0 ? "/" : $option['name'];
 
 			# print table line
-			if(strlen($option['prefix']) > 0) {
+			if (strlen($option['prefix']) > 0) {
     			# count change?
 				$html[] = "<tr class='level$count'>";
 
 				//which level?
-				if($count==1) {
+				if ($count == 1) {
 					# last?
-					if(!empty( $children_prefixes[$option['id']])) {
-						$html[] = "	<td class='level$count'><span class='structure-last' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-folder-open-o'></i><a href='".create_link($_GET['page'],"pstn-prefixes",$option['id'])."'>".$option['prefix']." </a></td>";
+					if (!empty($children_prefixes[$option['id']])) {
+						$html[] = "	<td class='level$count'><span class='structure-last' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-folder-open-o'></i><a href='".create_link($_GET['page'], "pstn-prefixes", $option['id'])."'>".$option['prefix']." </a></td>";
 						$html[] = "	<td class='level$count'><span class='structure-last' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-folder-open-o'></i> <strong>$name</strong></td>";
 					} else {
-						$html[] = "	<td class='level$count'><span class='structure' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-angle-right'></i><a href='".create_link($_GET['page'],"pstn-prefixes",$option['id'])."'>".$option['prefix']." </a></td>";
+						$html[] = "	<td class='level$count'><span class='structure' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-angle-right'></i><a href='".create_link($_GET['page'], "pstn-prefixes", $option['id'])."'>".$option['prefix']." </a></td>";
 						$html[] = "	<td class='level$count'><span class='structure' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-angle-right'></i> <strong>$name</strong></td>";
 					}
 				}
 				else {
 					# last?
-					if(!empty( $children_prefixes[$option['id']])) {
-						$html[] = "	<td class='level$count'><span class='structure-last' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-folder-open-o'></i> <a href='".create_link($_GET['page'],"pstn-prefixes",$option['id'])."'>  ".$option['prefix']."</a></td>";
+					if (!empty($children_prefixes[$option['id']])) {
+						$html[] = "	<td class='level$count'><span class='structure-last' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-folder-open-o'></i> <a href='".create_link($_GET['page'], "pstn-prefixes", $option['id'])."'>  ".$option['prefix']."</a></td>";
 						$html[] = "	<td class='level$count'><span class='structure-last' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-folder-open-o'></i> <strong>$name</strong></td>";
 					}
 					else {
-						$html[] = "	<td class='level$count'><span class='structure' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-angle-right'></i> <a href='".create_link($_GET['page'],"pstn-prefixes",$option['id'])."'>  ".$option['prefix']."</a></td>";
+						$html[] = "	<td class='level$count'><span class='structure' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-angle-right'></i> <a href='".create_link($_GET['page'], "pstn-prefixes", $option['id'])."'>  ".$option['prefix']."</a></td>";
 						$html[] = "	<td class='level$count'><span class='structure' style='padding-left:$padding; margin-left:$margin;'></span><i class='fa fa-gray fa-pad-right-3 fa-angle-right'></i> <strong>$name</strong></td>";
 					}
 				}
@@ -2457,54 +2457,54 @@ 
                 $html[] = "	<td><span class='badge badge1 badge5'>".$cnt."</span></td>";
 
 				//device
-				$device = ( $option['deviceId']==0 || empty($option['deviceId']) ) ? false : true;
+				$device = ($option['deviceId'] == 0 || empty($option['deviceId'])) ? false : true;
 
-				if($device===false) { $html[] ='	<td>/</td>' . "\n"; }
+				if ($device === false) { $html[] = '	<td>/</td>'."\n"; }
 				else {
-					$device = $this->fetch_object ("devices", "id", $option['deviceId']);
-					if ($device!==false) {
-						$html[] = "	<td><a href='".create_link("tools","devices",$device->id)."'>".$device->hostname .'</a></td>' . "\n";
+					$device = $this->fetch_object("devices", "id", $option['deviceId']);
+					if ($device !== false) {
+						$html[] = "	<td><a href='".create_link("tools", "devices", $device->id)."'>".$device->hostname.'</a></td>'."\n";
 					}
 					else {
-						$html[] ='	<td>/</td>' . "\n";
+						$html[] = '	<td>/</td>'."\n";
 					}
 				}
 
 				//custom
-				if(sizeof($custom_fields) > 0) {
-			   		foreach($custom_fields as $field) {
+				if (sizeof($custom_fields) > 0) {
+			   		foreach ($custom_fields as $field) {
 				   		# hidden?
-				   		if(!in_array($field['name'], $hidden_fields)) {
+				   		if (!in_array($field['name'], $hidden_fields)) {
 
-				   			$html[] =  "<td class='hidden-xs hidden-sm hidden-md'>";
+				   			$html[] = "<td class='hidden-xs hidden-sm hidden-md'>";
 
 				   			//booleans
-							if($field['type']=="tinyint(1)")	{
-								if($option[$field['name']] == "0")			{ $html[] = _("No"); }
-								elseif($option[$field['name']] == "1")		{ $html[] = _("Yes"); }
+							if ($field['type'] == "tinyint(1)") {
+								if ($option[$field['name']] == "0") { $html[] = _("No"); }
+								elseif ($option[$field['name']] == "1") { $html[] = _("Yes"); }
 							}
 							//text
-							elseif($field['type']=="text") {
-								if(strlen($option[$field['name']])>0)		{ $html[] = "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace("\n", "<br>", $option[$field['name']])."'>"; }
-								else												{ $html[] = ""; }
+							elseif ($field['type'] == "text") {
+								if (strlen($option[$field['name']]) > 0) { $html[] = "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace("\n", "<br>", $option[$field['name']])."'>"; }
+								else { $html[] = ""; }
 							}
 							else {
 								$html[] = $option[$field['name']];
 
 							}
 
-				   			$html[] =  "</td>";
+				   			$html[] = "</td>";
 			   			}
 			    	}
 			    }
 
 				# set permission
-				$permission = $this->check_prefix_permission ($user);
+				$permission = $this->check_prefix_permission($user);
 
 				$html[] = "	<td class='actions' style='padding:0px;'>";
 				$html[] = "	<div class='btn-group'>";
 
-				if($permission>2) {
+				if ($permission > 2) {
 					$html[] = "		<button class='btn btn-xs btn-default editPSTN' data-action='edit'   data-id='".$option['id']."'><i class='fa fa-pencil'></i></button>";
 					$html[] = "		<button class='btn btn-xs btn-default editPSTN' data-action='delete' data-id='".$option['id']."'><i class='fa fa-times'></i></button>";
 				}
@@ -2521,10 +2521,10 @@ 
                 $old_count = $count;
 			}
 
-			if ( $option === false ) { $parent = array_pop( $parent_stack ); }
+			if ($option === false) { $parent = array_pop($parent_stack); }
 			# Has slave subnets
-			elseif ( !empty( $children_prefixes[$option['id']] ) ) {
-				array_push( $parent_stack, $option['master'] );
+			elseif (!empty($children_prefixes[$option['id']])) {
+				array_push($parent_stack, $option['master']);
 				$parent = $option['id'];
 			}
 		}
@@ -2542,25 +2542,25 @@ 
 	 * @param bool $prefixId (default: false)
 	 * @return mixed
 	 */
-	public function print_masterprefix_dropdown_menu ($prefixId = false) {
+	public function print_masterprefix_dropdown_menu($prefixId = false) {
 
 		# initialize vars
 		$children_prefixes = array();
 		$parent_stack_prefixes = array();
 		$html = array();
-		$rootId = 0;			// root is 0
-		$parent = $rootId;      // initializing $parent as the root
+		$rootId = 0; // root is 0
+		$parent = $rootId; // initializing $parent as the root
 
 		# fetch all prefixes in section
-		$all_prefixes = $this->fetch_all_prefixes ();
+		$all_prefixes = $this->fetch_all_prefixes();
 		if (!is_array($all_prefixes)) $all_prefixes = array();
 		# folder or subnet?
-		foreach($all_prefixes as $s) {
+		foreach ($all_prefixes as $s) {
 			$children_prefixes[$s->master][] = (array) $s;
 		}
 
 		# loop will be false if the root has no children (i.e., an empty menu!)
-		$loop  = !empty( $children_prefixes[$rootId] );
+		$loop = !empty($children_prefixes[$rootId]);
 
 		# structure
 		$html[] = "<select name='master' class='form-control input-sm input-w-auto input-max-200'>";
@@ -2569,29 +2569,29 @@ 
 		$html[] = "<option value='0'>"._("Root subnet")."</option>";
 
 		# return table content (tr and td's) - subnets
-		if(sizeof($children_prefixes)>0) {
-		reset( $children_prefixes[$parent] );
-		while ( $loop && ( ( $option = current( $children_prefixes[$parent] ) ) || ( $parent > $rootId ) ) )
+		if (sizeof($children_prefixes) > 0) {
+		reset($children_prefixes[$parent]);
+		while ($loop && (($option = current($children_prefixes[$parent])) || ($parent > $rootId)))
 		{
-			next( $children_prefixes[$parent] );
+			next($children_prefixes[$parent]);
 			# repeat
-			$repeat  = str_repeat( " &nbsp;&nbsp; ", ( count($parent_stack_prefixes)) );
+			$repeat = str_repeat(" &nbsp;&nbsp; ", (count($parent_stack_prefixes)));
 
 			# selected
 			$selected = $option['id'] == $prefixId ? "selected='selected'" : "";
-			if($option['id'])
+			if ($option['id'])
             $html[] = "<option value='".$option['id']."' $selected>$repeat ".$option['prefix']." (".$option['name'].")</option>";
 
-			if ( $option === false ) { $parent = array_pop( $parent_stack_prefixes ); }
+			if ($option === false) { $parent = array_pop($parent_stack_prefixes); }
 			# Has slave subnets
-			elseif ( !empty( $children_prefixes[$option['id']] ) ) {
-				array_push( $parent_stack_prefixes, $option['master'] );
+			elseif (!empty($children_prefixes[$option['id']])) {
+				array_push($parent_stack_prefixes, $option['master']);
 				$parent = $option['id'];
 			}		}
 		}
 		$html[] = "</select>";
 		# join and print
-		print implode( "\n", $html );
+		print implode("\n", $html);
 	}
 
 
@@ -2607,18 +2607,18 @@ 
 	 * @param array $numbers
 	 * @return array
 	 */
-	public function compress_pstn_ranges ($numbers, $state=4) {
+	public function compress_pstn_ranges($numbers, $state = 4) {
     	# set size
     	$size = sizeof($numbers);
     	// vars
     	$numbers_formatted = array();
 
 		# loop through IP addresses
-		for($c=0; $c<$size; $c++) {
+		for ($c = 0; $c < $size; $c++) {
 			# ignore already comressed range
-			if($numbers[$c]->class!="compressed-range") {
+			if ($numbers[$c]->class != "compressed-range") {
 				# gap between this and previous
-				if(gmp_strval( @gmp_sub($numbers[$c]->number, $numbers[$c-1]->number)) != 1) {
+				if (gmp_strval(@gmp_sub($numbers[$c]->number, $numbers[$c - 1]->number)) != 1) {
 					# remove index flag
 					unset($fIndex);
 					# save IP address
@@ -2626,9 +2626,9 @@ 
 					$numbers_formatted[$c]->class = "ip";
 
 					# no gap this -> next
-					if(gmp_strval( @gmp_sub($numbers[$c]->number, $numbers[$c+1]->number)) == -1 && $numbers[$c]->state==$state) {
+					if (gmp_strval(@gmp_sub($numbers[$c]->number, $numbers[$c + 1]->number)) == -1 && $numbers[$c]->state == $state) {
 						//is state the same?
-						if($numbers[$c]->state==$numbers[$c+1]->state) {
+						if ($numbers[$c]->state == $numbers[$c + 1]->state) {
 							$fIndex = $c;
 							$numbers_formatted[$fIndex]->startIP = $numbers[$c]->number;
 							$numbers_formatted[$c]->class = "compressed-range";
@@ -2638,9 +2638,9 @@ 
 				# no gap between this and previous
 				else {
 					# is state same as previous?
-					if($numbers[$c]->state==$numbers[$c-1]->state && $numbers[$c]->state==$state) {
-						$numbers_formatted[$fIndex]->stopIP = $numbers[$c]->number;	//adds dhcp state
-						$numbers_formatted[$fIndex]->numHosts = gmp_strval( gmp_add(@gmp_sub($numbers[$c]->number, $numbers_formatted[$fIndex]->number),1));	//add number of hosts
+					if ($numbers[$c]->state == $numbers[$c - 1]->state && $numbers[$c]->state == $state) {
+						$numbers_formatted[$fIndex]->stopIP = $numbers[$c]->number; //adds dhcp state
+						$numbers_formatted[$fIndex]->numHosts = gmp_strval(gmp_add(@gmp_sub($numbers[$c]->number, $numbers_formatted[$fIndex]->number), 1)); //add number of hosts
 					}
 					# different state
 					else {
@@ -2650,7 +2650,7 @@ 
 						$numbers_formatted[$c] = $numbers[$c];
 						$numbers_formatted[$c]->class = "ip";
 						# check if state is same as next to start range
-						if($numbers[$c]->state==@$numbers[$c+1]->state &&  gmp_strval( @gmp_sub($numbers[$c]->number, $numbers[$c+1]->number)) == -1 && $numbers[$c]->state==$state) {
+						if ($numbers[$c]->state == @$numbers[$c + 1]->state && gmp_strval(@gmp_sub($numbers[$c]->number, $numbers[$c + 1]->number)) == -1 && $numbers[$c]->state == $state) {
 							$fIndex = $c;
 							$numbers_formatted[$fIndex]->startIP = $numbers[$c]->number;
 							$numbers_formatted[$c]->class = "compressed-range";
@@ -2677,26 +2677,26 @@ 
 	 * @param obj $numbers	     //netmask in decimal format
 	 * @return array
 	 */
-	public function calculate_prefix_usege ($prefix, $numbers) {
+	public function calculate_prefix_usege($prefix, $numbers) {
 	    # calculate max number of hosts
 	    $details = array();
 	    $details['maxhosts'] = ($prefix->stop - $prefix->start + 1);
 
 		# get IP address count per address type
-		if($numbers!==false) {
-		    $details_p = $this->calculate_prefix_usage_sort_numbers ($numbers);
-    	    foreach($this->address_types as $t) {
-    		    $details[$t['type']."_percent"] = round( ( ($details_p[$t['type']] * 100) / $details['maxhosts']), 2 );
+		if ($numbers !== false) {
+		    $details_p = $this->calculate_prefix_usage_sort_numbers($numbers);
+    	    foreach ($this->address_types as $t) {
+    		    $details[$t['type']."_percent"] = round((($details_p[$t['type']] * 100) / $details['maxhosts']), 2);
     	    }
 
             # calculate free hosts
-            $details['freehosts'] =  $details['maxhosts'] - sizeof($numbers);
+            $details['freehosts'] = $details['maxhosts'] - sizeof($numbers);
         }
         else {
-            $details['freehosts'] =  $details['maxhosts'];
+            $details['freehosts'] = $details['maxhosts'];
         }
 	    # calculate use percentage for each type
-	    $details['freehosts_percent'] = round( ( ($details['freehosts'] * 100) / $details['maxhosts']), 2 );
+	    $details['freehosts_percent'] = round((($details['freehosts'] * 100) / $details['maxhosts']), 2);
 
 	    # result
 	    return $details;
@@ -2709,18 +2709,18 @@ 
 	 * @param mixed $numbers
 	 * @return array
 	 */
-	public function calculate_prefix_usage_sort_numbers ($numbers) {
+	public function calculate_prefix_usage_sort_numbers($numbers) {
 		$count = array();
-		$count['used'] = 0;				//initial sum count
+		$count['used'] = 0; //initial sum count
 		# fetch address types
 		$this->get_addresses_types();
 		# create array of keys with initial value of 0
-		foreach($this->address_types as $a) {
+		foreach ($this->address_types as $a) {
 			$count[$a['type']] = 0;
 		}
 		# count
-		if($numbers!==false) {
-			foreach($numbers as $n) {
+		if ($numbers !== false) {
+			foreach ($numbers as $n) {
 				$count[$this->translate_address_type($n->state)]++;
 				$count['used'] = gmp_strval(gmp_add($count['used'], 1));
 			}
@@ -2734,15 +2734,15 @@ 
 	 *
 	 * @access public
 	 */
-	public function get_addresses_types () {
+	public function get_addresses_types() {
 		# from cache
-		if($this->address_types == null) {
+		if ($this->address_types == null) {
         	# fetch
-        	$types = $this->fetch_all_objects ("ipTags", "id");
+        	$types = $this->fetch_all_objects("ipTags", "id");
 
             # save to array
 			$types_out = array();
-			foreach($types as $t) {
+			foreach ($types as $t) {
 				$types_out[$t->id] = (array) $t;
 			}
 			# save to cache
@@ -2759,7 +2759,7 @@ 
 	 * @param mixed $index
 	 * @return array
 	 */
-	public function translate_address_type ($index) {
+	public function translate_address_type($index) {
 		# fetch
 		$this->get_addresses_types();
 		# return
@@ -2791,10 +2791,10 @@ 
      * @param bool count (default: false)
      * @return array|bool
      */
-    public function fetch_location_objects ($id = false, $count = false) {
+    public function fetch_location_objects($id = false, $count = false) {
         // check
-        if(is_numeric($id)) {
-            $id = $this->Database->escape ($id);
+        if (is_numeric($id)) {
+            $id = $this->Database->escape($id);
             // count ?
             $select = $count ? "count(*) as cnt " : "*";
             // query
@@ -2848,7 +2848,7 @@ 
     		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), true); }
 
     		// return
-    		return sizeof($objects)>0 ? $objects : false;
+    		return sizeof($objects) > 0 ? $objects : false;
         }
         else {
             return false;
@@ -2871,13 +2871,13 @@ 
 	 *
 	 * @return false|array
 	 */
-	public function fetch_all_circuits ($custom_circuit_fields = array ()) {
+	public function fetch_all_circuits($custom_circuit_fields = array()) {
 		// set query
 		$query[] = "select";
 		$query[] = "c.id,c.cid,c.type,c.device1,c.location1,c.device2,c.location2,c.customer_id,p.name,p.description,p.contact,c.capacity,p.id as pid,c.status";
 		// custom fields
-		if(is_array($custom_circuit_fields)) {
-			if(sizeof($custom_circuit_fields)>0) {
+		if (is_array($custom_circuit_fields)) {
+			if (sizeof($custom_circuit_fields) > 0) {
 				foreach ($custom_circuit_fields as $f) {
 					$query[] = ",c.`".$f['name']."`";
 				}
@@ -2891,7 +2891,7 @@ 
 			$this->Result->show("danger", $e->getMessage(), true);
 		}
 		// return
-		return sizeof($circuits)>0 ? $circuits : false;
+		return sizeof($circuits) > 0 ? $circuits : false;
 	}
 
 	/**
@@ -2901,7 +2901,7 @@ 
 	 * @param  int $circuit_id
 	 * @return array|false
 	 */
-	public function fetch_all_logical_circuits_using_circuit ($circuit_id) {
+	public function fetch_all_logical_circuits_using_circuit($circuit_id) {
 		// set query
 		$query[] = "select";
 		$query[] = "lc.*";
@@ -2915,7 +2915,7 @@ 
 			$this->Result->show("danger", $e->getMessage(), true);
 		}
 		// return
-		return sizeof($circuits)>0 ? $circuits : false;
+		return sizeof($circuits) > 0 ? $circuits : false;
 	}
 
 	/**
@@ -2925,7 +2925,7 @@ 
 	 * @param  int $logical_circuit_id
 	 * @return array|false
 	 */
-  	public function fetch_all_logical_circuit_members ($logical_circuit_id) {
+  	public function fetch_all_logical_circuit_members($logical_circuit_id) {
   		// set query
 		$query2[] = "SELECT";
 		$query2[] = "c.*";
@@ -2938,7 +2938,7 @@ 
 		catch (Exception $e) {
 			$this->Result->show("danger", $e->getMessage(), true);
 		}
-		return sizeof($circuits)>0 ? $circuits : false;
+		return sizeof($circuits) > 0 ? $circuits : false;
 	}
 
 	/**
@@ -2951,13 +2951,13 @@ 
 	 *
 	 * @return false|array
 	 */
-	public function fetch_all_provider_circuits ($provider_id, $custom_circuit_fields = array ()) {
+	public function fetch_all_provider_circuits($provider_id, $custom_circuit_fields = array()) {
 		// set query
 		$query[] = "select";
 		$query[] = "c.id,c.cid,c.type,c.device1,c.location1,c.device2,c.location2,p.name,p.description,p.contact,c.capacity,p.id as pid,c.status";
 		// custom fields
-		if(is_array($custom_circuit_fields)) {
-			if(sizeof($custom_circuit_fields)>0) {
+		if (is_array($custom_circuit_fields)) {
+			if (sizeof($custom_circuit_fields) > 0) {
 				foreach ($custom_circuit_fields as $f) {
 					$query[] = ",c.`".$f['name']."`";
 				}
@@ -2971,7 +2971,7 @@ 
 			$this->Result->show("danger", $e->getMessage(), true);
 		}
 		// return
-		return sizeof($circuits)>0 ? $circuits : false;
+		return sizeof($circuits) > 0 ? $circuits : false;
 	}
 
 
@@ -2984,7 +2984,7 @@ 
 	 *
 	 * @return false|array
 	 */
-	public function fetch_all_device_circuits ($device_id) {
+	public function fetch_all_device_circuits($device_id) {
 		// set query
 		$query = "select
 					c.id,c.cid,c.type,c.device1,c.location1,c.device2,c.location2,p.name,p.description,p.contact,c.capacity,p.id as pid,c.status
@@ -2996,7 +2996,7 @@ 
 			$this->Result->show("danger", $e->getMessage(), true);
 		}
 		// return
-		return sizeof($circuits)>0 ? $circuits : false;
+		return sizeof($circuits) > 0 ? $circuits : false;
 	}
 
 	/**
@@ -3020,43 +3020,43 @@ 
 	 *
 	 * @return false|array
 	 */
-	public function reformat_circuit_location ($deviceId = null, $locationId = null) {
+	public function reformat_circuit_location($deviceId = null, $locationId = null) {
 		// check device
-		if(is_numeric($deviceId) && $deviceId!=0) {
+		if (is_numeric($deviceId) && $deviceId != 0) {
 			// fetch device
-			$device = $this->fetch_object ("devices", "id", $deviceId);
+			$device = $this->fetch_object("devices", "id", $deviceId);
 			// check
 			if ($device === false) {
 				return false;
 			}
 			else {
-				$array = array (
+				$array = array(
 								"type"     => "devices",
 								"id"       => $device->id,
 								"name"     => $device->hostname,
 								"icon" 	   => "",
-								"location" => is_null($device->location)||$device->location==0 ? NULL : $device->location,
-								"rack"     => is_null($device->rack)||$device->rack==0 ? NULL : $device->rack
+								"location" => is_null($device->location) || $device->location == 0 ? NULL : $device->location,
+								"rack"     => is_null($device->rack) || $device->rack == 0 ? NULL : $device->rack
 				                );
 				// check rack location if not configured
-				if ($array['location']==NULL && $array['rack']!=NULL) {
-					$rack_location = $this->fetch_object ("racks", "id", $array['rack']);
-					$array['location'] = $rack_location!==false ? $rack_location->location : NULL;
+				if ($array['location'] == NULL && $array['rack'] != NULL) {
+					$rack_location = $this->fetch_object("racks", "id", $array['rack']);
+					$array['location'] = $rack_location !== false ? $rack_location->location : NULL;
 				}
 				// result
 				return $array;
 			}
 		}
 		// check location
-		elseif (is_numeric($locationId) && $locationId!=0) {
+		elseif (is_numeric($locationId) && $locationId != 0) {
 			// fetch location
-			$location = $this->fetch_object ("locations", "id", $locationId);
+			$location = $this->fetch_object("locations", "id", $locationId);
 			// check
 			if ($device === false) {
 				return false;
 			}
 			else {
-				$array = array (
+				$array = array(
 								"type"     => "locations",
 								"id"       => $location->id,
 								"name"     => $location->name,
@@ -3079,7 +3079,7 @@ 
 	 * @param string $search (default: false)
 	 * @return array|bool
 	 */
-	public function fetch_all_domains_and_vlans ($search = false) {
+	public function fetch_all_domains_and_vlans($search = false) {
 		// set query
 		$query[] = "select `d`.`name` as `domainName`,";
 		$query[] = "	`d`.`description` as `domainDescription`,";
@@ -3090,7 +3090,7 @@ 
 		$query[] = "	`v`.`description` as `description`,";
 		$query[] = "	`v`.`customer_id` as `customer_id`,";
 		// fetch custom fields
-		$custom_vlan_fields = $this->fetch_custom_fields ("vlans");
+		$custom_vlan_fields = $this->fetch_custom_fields("vlans");
 		if ($custom_vlan_fields != false) {
     		foreach ($custom_vlan_fields as $f) {
         		$query[] = "  `v`.`$f[name]` as `$f[name]`,";
@@ -3105,18 +3105,18 @@ 
 		$query[] = "	order by `v`.`number` asc;";
 
 		// fetch
-		try { $domains = $this->Database->getObjectsQuery(implode("\n",$query)); }
+		try { $domains = $this->Database->getObjectsQuery(implode("\n", $query)); }
 		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), true); }
 		// filter if requested
-		if ($search !== false && sizeof($domains)>0) {
+		if ($search !== false && sizeof($domains) > 0) {
 			foreach ($domains as $k=>$d) {
-				if (strpos($d->number, $search)===false && strpos($d->name, $search)===false && strpos($d->description, $search)===false) {
+				if (strpos($d->number, $search) === false && strpos($d->name, $search) === false && strpos($d->description, $search) === false) {
 					unset($domains[$k]);
 				}
 			}
 		}
 		// return
-		return sizeof($domains)>0 ? $domains : false;
+		return sizeof($domains) > 0 ? $domains : false;
 	}
 
 	/**
@@ -3126,14 +3126,14 @@ 
 	 * @param  int $customer_id
 	 * @return void
 	 */
-	public function fetch_customer_objects ($customer_id) {
+	public function fetch_customer_objects($customer_id) {
 		// out
 		$out = [];
 		// fetch
-		if(is_numeric($customer_id)) {
+		if (is_numeric($customer_id)) {
 			foreach ($this->get_customer_object_types() as $table=>$name) {
-				$objects = $this->fetch_multiple_objects ($table, "customer_id", $customer_id, $this->get_customer_object_types_sorts ($table));
-				if ($objects!==false) {
+				$objects = $this->fetch_multiple_objects($table, "customer_id", $customer_id, $this->get_customer_object_types_sorts($table));
+				if ($objects !== false) {
 					$out[$table] = $objects;
 				}
 			}
@@ -3148,7 +3148,7 @@ 
 	 * @method get_customer_object_types
 	 * @return array
 	 */
-	public function get_customer_object_types () {
+	public function get_customer_object_types() {
 		return [
 				"subnets"     => "Subnets",
 				"ipaddresses" => "Addresses",
@@ -3166,7 +3166,7 @@ 
 	 * @param  string $type
 	 * @return string
 	 */
-	private function get_customer_object_types_sorts ($type) {
+	private function get_customer_object_types_sorts($type) {
 		switch ($type) {
 			case "subnets"     : return "subnet";
 			case "ipaddresses" : return "ip_addr";
@@ -3187,20 +3187,20 @@ 
 	 * @param array $custom_address_fields
 	 * @return array
 	 */
-	public function parse_import_file ($filetype = "xls", $subnet = object, $custom_address_fields) {
+	public function parse_import_file($filetype = "xls", $subnet = object, $custom_address_fields) {
     	# start object and get settings
-    	$this->settings ();
-    	$this->Subnets = new Subnets ($this->Database);
+    	$this->settings();
+    	$this->Subnets = new Subnets($this->Database);
 
         # CSV
-        if (strtolower($filetype) == "csv")     { $outFile = $this->parse_import_file_csv (); }
+        if (strtolower($filetype) == "csv") { $outFile = $this->parse_import_file_csv(); }
         # XLS
-        elseif(strtolower($filetype) == "xls")  { $outFile = $this->parse_import_file_xls ($subnet, $custom_address_fields); }
+        elseif (strtolower($filetype) == "xls") { $outFile = $this->parse_import_file_xls($subnet, $custom_address_fields); }
         # error
-        else                                    { $this->Result->show("danger", _('Invalid filetype'), true); }
+        else { $this->Result->show("danger", _('Invalid filetype'), true); }
 
         # validate
-        return $this->parse_validate_file ($outFile, $subnet);
+        return $this->parse_validate_file($outFile, $subnet);
 	}
 
 	/**
@@ -3211,10 +3211,10 @@ 
 	 * @param array $custom_address_fields
 	 * @return mixed
 	 */
-	private function parse_import_file_xls ($subnet, $custom_address_fields) {
+	private function parse_import_file_xls($subnet, $custom_address_fields) {
      	# get excel object
-    	require_once(dirname(__FILE__).'/../../functions/php-excel-reader/excel_reader2.php');				//excel reader 2.21
-    	$data = new Spreadsheet_Excel_Reader(dirname(__FILE__) . '/../../app/subnets/import-subnet/upload/import.xls', false, 'utf-8');
+    	require_once(dirname(__FILE__).'/../../functions/php-excel-reader/excel_reader2.php'); //excel reader 2.21
+    	$data = new Spreadsheet_Excel_Reader(dirname(__FILE__).'/../../app/subnets/import-subnet/upload/import.xls', false, 'utf-8');
 
     	//get number of rows
     	$numRows = $data->rowcount(0);
@@ -3226,26 +3226,26 @@ 
     	$this->csv_delimiter = ";";
 
     	//get all to array!
-    	for($m=0; $m < $numRows; $m++) {
+    	for ($m = 0; $m < $numRows; $m++) {
 
     		//IP must be present!
-    		if(filter_var($data->val($m,'A'), FILTER_VALIDATE_IP)) {
+    		if (filter_var($data->val($m, 'A'), FILTER_VALIDATE_IP)) {
         		//for multicast
-        		$mac = $data->val($m,'F');
-        		if ($this->settings->enableMulticast=="1") {
-            		if (strlen($data->val($m,'F'))==0 && $this->Subnets->is_multicast($data->val($m,'A')))    {
-                		$mac = $this->Subnets->create_multicast_mac ($data->val($m,'A'));
+        		$mac = $data->val($m, 'F');
+        		if ($this->settings->enableMulticast == "1") {
+            		if (strlen($data->val($m, 'F')) == 0 && $this->Subnets->is_multicast($data->val($m, 'A'))) {
+                		$mac = $this->Subnets->create_multicast_mac($data->val($m, 'A'));
                     }
                 }
 
-    			$outFile[$m]  = $data->val($m,'A').$this->csv_delimiter.$data->val($m,'B').$this->csv_delimiter.$data->val($m,'C').$this->csv_delimiter.$data->val($m,'D').$this->csv_delimiter;
-    			$outFile[$m] .= $data->val($m,'E').$this->csv_delimiter.$mac.$this->csv_delimiter.$data->val($m,'G').$this->csv_delimiter.$data->val($m,'H').$this->csv_delimiter;
-    			$outFile[$m] .= $data->val($m,'I').$this->csv_delimiter.$data->val($m,'J').$this->csv_delimiter.$data->val($m,'K');
+    			$outFile[$m]  = $data->val($m, 'A').$this->csv_delimiter.$data->val($m, 'B').$this->csv_delimiter.$data->val($m, 'C').$this->csv_delimiter.$data->val($m, 'D').$this->csv_delimiter;
+    			$outFile[$m] .= $data->val($m, 'E').$this->csv_delimiter.$mac.$this->csv_delimiter.$data->val($m, 'G').$this->csv_delimiter.$data->val($m, 'H').$this->csv_delimiter;
+    			$outFile[$m] .= $data->val($m, 'I').$this->csv_delimiter.$data->val($m, 'J').$this->csv_delimiter.$data->val($m, 'K');
     			//add custom fields
-    			if(sizeof($custom_address_fields) > 0) {
+    			if (sizeof($custom_address_fields) > 0) {
     				$currLett = "L";
-    				foreach($custom_address_fields as $field) {
-    					$outFile[$m] .= $this->csv_delimiter.$data->val($m,$currLett++);
+    				foreach ($custom_address_fields as $field) {
+    					$outFile[$m] .= $this->csv_delimiter.$data->val($m, $currLett++);
     				}
     			}
     			$outFile[$m] = $this->convert_encoding_to_UTF8($outFile[$m]);
@@ -3261,9 +3261,9 @@ 
 	 * @access private
 	 * @return array
 	 */
-	private function parse_import_file_csv () {
+	private function parse_import_file_csv() {
     	// get file to string
-		$handle = fopen(dirname(__FILE__) . '/../../app/subnets/import-subnet/upload/import.csv', "r");
+		$handle = fopen(dirname(__FILE__).'/../../app/subnets/import-subnet/upload/import.csv', "r");
 		if ($handle) {
 		    while (($outFile[] = fgets($handle)) !== false) {}
 		    fclose($handle);
@@ -3272,29 +3272,29 @@ 
 		}
 
     	// delimiter
-    	if(isset($outFile[0]))
-    	$this->set_csv_delimiter ($outFile[0]);
+    	if (isset($outFile[0]))
+    	$this->set_csv_delimiter($outFile[0]);
 
     	/* validate IP */
-    	foreach($outFile as $k=>$v) {
+    	foreach ($outFile as $k=>$v) {
         	//put it to array
-        	$field = str_getcsv ($v, $this->csv_delimiter);
+        	$field = str_getcsv($v, $this->csv_delimiter);
 
-        	if(!filter_var($field[0], FILTER_VALIDATE_IP)) {
+        	if (!filter_var($field[0], FILTER_VALIDATE_IP)) {
             	unset($outFile[$k]);
             	unset($field);
         	}
         	else {
             	# mac
-        		if ($this->settings->enableMulticast=="1") {
-            		if (strlen($field[5])==0 && $this->Subnets->is_multicast($field[0]))  {
-                		$field[5] = $this->Subnets->create_multicast_mac ($field[0]);
+        		if ($this->settings->enableMulticast == "1") {
+            		if (strlen($field[5]) == 0 && $this->Subnets->is_multicast($field[0])) {
+                		$field[5] = $this->Subnets->create_multicast_mac($field[0]);
                     }
         		}
         	}
 
         	# save
-        	if(isset($field)) {
+        	if (isset($field)) {
 	        	$outFile[$k] = implode($this->csv_delimiter, $field);
     		}
     	}
@@ -3310,9 +3310,9 @@ 
 	 * @param  string $outFile
 	 * @return string
 	 */
-	public function set_csv_delimiter ($outFile) {
+	public function set_csv_delimiter($outFile) {
 		// must be string
-		if(is_string($outFile)) {
+		if (is_string($outFile)) {
 			// count occurences
 			$cnt_coma  = substr_count($outFile, ",");
 			$cnt_colon = substr_count($outFile, ";");
@@ -3334,33 +3334,33 @@ 
 	 * @param object $subnet
 	 * @return void
 	 */
-	private function parse_validate_file ($outFile = array(), $subnet = object) {
+	private function parse_validate_file($outFile = array(), $subnet = object) {
     	$result = array();
     	# present ?
-    	if (sizeof($outFile)>0) {
-            foreach($outFile as $k=>$line) {
+    	if (sizeof($outFile) > 0) {
+            foreach ($outFile as $k=>$line) {
 
             	//convert encoding if necessary
             	$line = $this->convert_encoding_to_UTF8($line);
 
             	//put it to array
-            	$field = str_getcsv ($line, $this->csv_delimiter);
+            	$field = str_getcsv($line, $this->csv_delimiter);
 
             	//verify IP address
-            	if(!filter_var($field[0], FILTER_VALIDATE_IP)) 	{ $class = "danger";	$errors++; }
-            	else											{ $class = ""; }
+            	if (!filter_var($field[0], FILTER_VALIDATE_IP)) { $class = "danger"; $errors++; }
+            	else { $class = ""; }
 
             	// verify that address is in subnet for subnets
-            	if($subnet->isFolder!="1") {
+            	if ($subnet->isFolder != "1") {
 					// check if IP is IPv4 or IPv6
 					$ipsm = "32";
                 	if (!filter_var($field[0], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false) { $ipsm = "128"; }
-                    if ($this->Subnets->is_subnet_inside_subnet ($field[0]."/" . $ipsm, $this->transform_address($subnet->subnet, "dotted")."/".$subnet->mask)==false)    { $class = "danger"; $errors++; }
+                    if ($this->Subnets->is_subnet_inside_subnet($field[0]."/".$ipsm, $this->transform_address($subnet->subnet, "dotted")."/".$subnet->mask) == false) { $class = "danger"; $errors++; }
                 }
             	// make sure mac does not exist
-                if ($this->settings->enableMulticast=="1" && strlen($class)==0) {
-                    if (strlen($field[5])>0 && $this->Subnets->is_multicast($field[0])) {
-                        if($this->Subnets->validate_multicast_mac ($field[5], $subnet->sectionId, $subnet->vlanId, MCUNIQUE)!==true) {
+                if ($this->settings->enableMulticast == "1" && strlen($class) == 0) {
+                    if (strlen($field[5]) > 0 && $this->Subnets->is_multicast($field[0])) {
+                        if ($this->Subnets->validate_multicast_mac($field[5], $subnet->sectionId, $subnet->vlanId, MCUNIQUE) !== true) {
                             $errors++; $class = "danger";
                         }
                     }
@@ -3385,10 +3385,10 @@ 
 	 * @param string $type (default: "IPv4")
 	 * @return int
 	 */
-	public function count_subnets ($type="IPv4") {
+	public function count_subnets($type = "IPv4") {
 		# set proper query
-		if($type=="IPv4")		{ $query = 'select count(*) as count from `ipaddresses` where cast(`ip_addr` as UNSIGNED) <= 4294967295;'; }
-		elseif($type=="IPv6")	{ $query = 'select count(*) as count from `ipaddresses` where cast(`ip_addr` as UNSIGNED) >  4294967295;'; }
+		if ($type == "IPv4") { $query = 'select count(*) as count from `ipaddresses` where cast(`ip_addr` as UNSIGNED) <= 4294967295;'; }
+		elseif ($type == "IPv6") { $query = 'select count(*) as count from `ipaddresses` where cast(`ip_addr` as UNSIGNED) >  4294967295;'; }
 
 		try { $count = $this->Database->getObjectQuery($query); }
 		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), true); }
@@ -3406,14 +3406,14 @@ 
 	 * @param bool $perc (default: false)
 	 * @return array
 	 */
-	public function fetch_top_subnets ($type, $limit = "10", $perc = false) {
+	public function fetch_top_subnets($type, $limit = "10", $perc = false) {
 		# set limit & IPv4/IPv6 selector
-		$limit = $limit<=0 ? '' : 'LIMIT '. (int) $limit;
+		$limit = $limit <= 0 ? '' : 'LIMIT '.(int) $limit;
 		$type_operator = ($type === 'IPv6') ? '>' : '<=';
 		$type_max_mask = ($type === 'IPv6') ? '128' : '32';
 		$strict_mode   = ($type === 'IPv6') ? '0' : '2';
 
-		if($perc) {
+		if ($perc) {
 			$query = "SELECT SQL_CACHE s.sectionId,s.id,s.subnet,mask,IF(char_length(s.description)>0,s.description,'No description') AS description,
 					COUNT(*) AS `usage`,ROUND(COUNT(*)/(POW(2,$type_max_mask-`mask`)-$strict_mode)*100,2) AS `percentage` FROM `ipaddresses` AS `i`
 					LEFT JOIN `subnets` AS `s` ON i.subnetId = s.id
@@ -3430,7 +3430,7 @@ 
 		}
 
 		try { $stats = $this->Database->getObjectsQuery($query); }
-		catch (Exception $e) { !$this->debugging ? : $this->Result->show("danger", $e->getMessage(), true);	return false; }
+		catch (Exception $e) { !$this->debugging ?: $this->Result->show("danger", $e->getMessage(), true); return false; }
 
 		# return subnets array
 		return (array) $stats;
@@ -3442,10 +3442,10 @@ 
 	 * @access public
 	 * @return array
 	 */
-	public function fetch_addresses_for_export () {
+	public function fetch_addresses_for_export() {
 		# fetch
 	    try { $addresses = $this->Database->getObjectsQuery("select `id`,`subnetId`,`ip_addr`,`hostname` from `ipaddresses` where length(`hostname`)>1 order by `subnetId` asc;"); }
-		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false);	return false; }
+		catch (Exception $e) { $this->Result->show("danger", $e->getMessage(), false); return false; }
 		# return result
 		return $addresses;
 	}
@@ -3457,7 +3457,7 @@ 
 	 * @param mixed $code		//lang code
 	 * @return bool
 	 */
-	public function verify_translation ($code) {
+	public function verify_translation($code) {
 		//verify that proper files exist
 		return !file_exists("functions/locale/$code/LC_MESSAGES/phpipam.mo") ? false : true;
 	}
@@ -3469,11 +3469,11 @@ 
 	 * @param mixed $code		//lang code
 	 * @return string
 	 */
-	public function get_translation_version ($code) {
+	public function get_translation_version($code) {
 		//check for version
 		$ver = shell_exec("grep 'Project-Id-Version:' ".dirname(__FILE__)."/../locale/$code/LC_MESSAGES/phpipam.po");
 		//parse
-		$ver = str_replace(array("Project-Id-Version:", " ", '"', "#",'\n', ":"), "", $ver);
+		$ver = str_replace(array("Project-Id-Version:", " ", '"', "#", '\n', ":"), "", $ver);
 		//return version
 		return $ver;
 	}

functions/classes/class.Addresses.php

Indentation +1983 added lines, -1983 removed lines

@@ -7,1601 +7,1601 @@ 
 class Addresses extends Common_functions {
 
 
-	/**
-	 * (array of objects) to store addresses, address ID is array index
-	 *
-	 * (default value: array)
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $addresses = array();
-
-	/**
-	 * Address types array
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $address_types = array();
-
-	/**
-	 * Mail changelog or not
-	 *
-	 * (default value: true)
-	 *
-	 * @var bool
-	 * @access public
-	 */
-	public $mail_changelog = true;
+    /**
+     * (array of objects) to store addresses, address ID is array index
+     *
+     * (default value: array)
+     *
+     * @var mixed
+     * @access public
+     */
+    public $addresses = array();
+
+    /**
+     * Address types array
+     *
+     * @var mixed
+     * @access public
+     */
+    public $address_types = array();
+
+    /**
+     * Mail changelog or not
+     *
+     * (default value: true)
+     *
+     * @var bool
+     * @access public
+     */
+    public $mail_changelog = true;
+
+    /**
+     * Last insert id
+     *
+     * (default value: false)
+     *
+     * @var bool
+     * @access public
+     */
+    public $lastId = false;
+
+    /**
+     * Debugging flag
+     *
+     * (default value: false)
+     *
+     * @var bool
+     * @access protected
+     */
+    protected $debugging = false;
+
+    /**
+     * PEAR NET IPv4 object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Net_IPv4;
+
+    /**
+     * PEAR NET IPv6 object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Net_IPv6;
+
+    /**
+     * Database conenction
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Database;
+
+    /**
+     * Subnets object
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Subnets;
+
+    /**
+     * Logging object
+     *
+     * @var mixed
+     * @access public
+     */
+    public $Log;
+
+    /**
+     * PowerDNS object
+     *
+     * @var mixed
+     * @access private
+     */
+    private $PowerDNS;
+
+
+
+
+    /**
+     * __construct function
+     *
+     * @access public
+     */
+    public function __construct (Database_PDO $Database) {
+        # Save database object
+        $this->Database = $Database;
+        # initialize Result
+        $this->Result = new Result ();
+        # debugging
+        $this->set_debugging();
+
+        # Log object
+        $this->Log = new Logging ($this->Database);
+    }
+
+
+
+
+
+
+
+
+
+    /**
+     * @address tag methods
+     * -------------------------------
+     */
+
+    /**
+     * Returns array of address types.
+     *
+     * @access public
+     * @return array of address types and parameters
+     */
+    public function addresses_types_fetch () {
+        # fetch
+        $types = $this->fetch_all_objects ("ipTags", "id");
+
+        # save to array
+        $types_out = array();
+        foreach($types as $t) {
+            $types_out[$t->id] = (array) $t;
+        }
+        # save
+        $this->address_types = $types_out;
+        # return
+        return $types_out;
+    }
+
+    /**
+     * Sets address tag
+     *
+     * @access public
+     * @param int $state
+     * @return mixed tag
+     */
+    public function address_type_format_tag ($state) {
+        # fetch address states
+        $this->addresses_types_fetch();
+        # result
+        if(!isset($this->address_types[$state]))	{
+            return "";
+        }
+        else {
+            if($this->address_types[$state]['showtag']==1) {
+                return "<i class='fa fa-".$this->address_types[$state]['type']." fa-tag state' rel='tooltip' style='color:".$this->address_types[$state]['bgcolor']."' title='"._($this->address_types[$state]['type'])."'></i>";
+            }
+        }
+    }
+
+    /**
+     * returns address type from index
+     *
+     *		1 > Offline
+     *
+     * @access public
+     * @param int $index
+     * @return mixed address type
+     */
+    public function address_type_index_to_type ($index) {
+        # fetch address states
+        $this->addresses_types_fetch();
+        # return
+        if(isset($this->address_types[$index])) {
+            return $this->address_types[$index]['type'];
+        }
+        else {
+            return $index;
+        }
+    }
+
+    /**
+     * Returns address index from type
+     *
+     *	Offline > 1
+     *
+     * @access public
+     * @param mixed $type
+     * @return void
+     */
+    public function address_type_type_to_index ($type = "Used") {
+        # null of no length
+        $type = strlen($type)==0 || is_null($type) ? "Used" : $type;
+        # fetch address states
+        $this->addresses_types_fetch();
+        # reindex
+        $states_assoc = array();
+        foreach($this->address_types as $s) {
+            $states_assoc[$s['type']] = $s;
+        }
+        # return
+        if(isset($states_assoc[$type])) {
+            return $states_assoc[$type]['id'];
+        }
+        else {
+            return $type;
+        }
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+    /**
+     * @address methods
+     * -------------------------------
+     */
+
+    /**
+     * Fetches address by specified method
+     *
+     * @access public
+     * @param string $method (default: "id")
+     * @param mixed $id
+     * @return object address
+     */
+    public function fetch_address ($method, $id) {
+        # null method
+        $method = is_null($method) ? "id" : $method;
+        # check cache first
+        if(isset($this->addresses[$id]))	{
+            return $this->addresses[$id];
+        }
+        else {
+            try { $address = $this->Database->getObjectQuery("SELECT * FROM `ipaddresses` where `$method` = ? limit 1;", array($id)); }
+            catch (Exception $e) {
+                $this->Result->show("danger", _("Error: ").$e->getMessage());
+                return false;
+            }
+            # save to addresses cache
+            if(!is_null($address)) {
+                # add decimal format
+                $address->ip = $this->transform_to_dotted ($address->ip_addr);
+                # save to subnets
+                $this->addresses[$id] = (object) $address;
+            }
+            #result
+            return !is_null($address) ? $address : false;
+        }
+    }
+
+    /**
+     * Fetch addresses on int ip_addr and subnetId
+     *
+     * @access public
+     * @param mixed $ip_addr
+     * @param mixed $subnetId
+     * @return void
+     */
+    public function fetch_address_multiple_criteria ($ip_addr, $subnetId) {
+        try { $address = $this->Database->getObjectQuery("SELECT * FROM `ipaddresses` where `ip_addr` = ? and `subnetId` = ? limit 1;", array($ip_addr, $subnetId)); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+        # save to addresses cache
+        if(sizeof($address)>0) {
+            # add decimal format
+            $address->ip = $this->transform_to_dotted ($address->ip_addr);
+            # save to subnets
+            $this->addresses[$address->id] = (object) $address;
+        }
+        #result
+        return !is_null($address) ? $address : false;
+    }
+
+    /**
+     * Searches database for similar addresses
+     *
+     * @access public
+     * @param mixed $linked_field
+     * @param mixed $value
+     * @param mixed $address_id
+     * @return void
+     */
+    public function search_similar_addresses ($linked_field, $value, $address_id) {
+        // checks
+        if(strlen($linked_field)>0 && strlen($value)>0 && is_numeric($address_id)) {
+            // search
+                try { $addresses = $this->Database->getObjectsQuery("SELECT * FROM `ipaddresses` where `$linked_field` = ? and `id` != ? and state != 4;", array($value, $address_id)); }
+            catch (Exception $e) {
+                $this->Result->show("danger", _("Error: ").$e->getMessage());
+                return false;
+            }
+            #result
+            return sizeof($addresses)>0 ? $addresses : false;
+        }
+        else {
+            return false;
+        }
+    }
+
+    /**
+     * Address modification
+     *
+     * @access public
+     * @param mixed $address
+     * @param bool $mail_changelog (default: true)
+     * @return void
+     */
+    public function modify_address ($address, $mail_changelog = true) {
+        # save changelog
+        $this->mail_changelog  = $mail_changelog;
+        # null empty values
+        $address = $this->reformat_empty_array_fields ($address, null);
+        # strip tags
+        $address = $this->strip_input_tags ($address);
+        # execute based on action
+        if($address['action']=="add")			{ return $this->modify_address_add ($address); }							//create new address
+        elseif($address['action']=="edit")		{ return $this->modify_address_edit ($address); }							//modify existing address
+        elseif($address['action']=="delete")	{ return $this->modify_address_delete ($address); }							//delete address
+        elseif($address['action']=="move")		{ return $this->modify_address_move ($address); }							//move to new subnet
+        else									{ return $this->Result->show("danger", _("Invalid action"), true); }
+    }
+
+    /**
+     * Inserts new IP address to table
+     *
+     * @access protected
+     * @param array $address
+     * @return boolean success/failure
+     */
+    protected function modify_address_add ($address) {
+        # set insert array
+        $insert = array(
+                        "ip_addr"               => $this->transform_address($address['ip_addr'],"decimal"),
+                        "subnetId"              => $address['subnetId'],
+                        "description"           => @$address['description'],
+                        "hostname"              => @$address['hostname'],
+                        "mac"                   => @$address['mac'],
+                        "owner"                 => @$address['owner'],
+                        "state"                 => @$address['state'],
+                        "switch"                => @$address['switch'],
+                        "port"                  => @$address['port'],
+                        "note"                  => @$address['note'],
+                        "is_gateway"            => @$address['is_gateway'],
+                        "excludePing"           => @$address['excludePing'],
+                        "PTRignore"             => @$address['PTRignore'],
+                        "firewallAddressObject" => @$address['firewallAddressObject'],
+                        "lastSeen"              => @$address['lastSeen']
+                        );
+        # customer
+        if(isset($address['customer_id'])) {
+            if (is_numeric($address['customer_id'])) {
+                if ($address['customer_id']!="0") {
+                    $insert['customer_id'] = $address['customer_id'];
+                }
+                else {
+                    $insert['customer_id'] = NULL;
+                }
+            }
+        }
+        # location
+        if (isset($address['location_item'])) {
+            if (!is_numeric($address['location_item'])) {
+                $this->Result->show("danger", _("Invalid location value"), true);
+            }
+            $insert['location'] = $address['location_item'];
+        }
+        # custom fields, append to array
+        foreach($this->set_custom_fields() as $c) {
+            $insert[$c['name']] = !empty($address[$c['name']]) ? $address[$c['name']] : $c['Default'];
+        }
+
+        # null empty values
+        $insert = $this->reformat_empty_array_fields ($insert, null);
+
+        # remove gateway
+        if($address['is_gateway']==1)	{ $this->remove_gateway ($address['subnetId']); }
+
+        # execute
+        try { $this->Database->insertObject("ipaddresses", $insert); }
+        catch (Exception $e) {
+            $this->Log->write( "Address create", "Failed to create new address<hr>".$e->getMessage()."<hr>".$this->array_to_log($this->reformat_empty_array_fields ($address, "NULL")), 2);
+            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+            return false;
+        }
+        # save id
+        $this->lastId = $this->Database->lastInsertId();
+
+        # log and changelog
+        $address['id'] = $this->lastId;
+        $this->Log->write( "Address created", "New address created<hr>".$this->array_to_log($this->reformat_empty_array_fields ($address, "NULL")), 0);
+        $this->Log->write_changelog('ip_addr', "add", 'success', array(), $address, $this->mail_changelog);
+
+        # edit DNS PTR record
+        $this->ptr_modify ("add", $insert);
+
+        # threshold alert
+        $this->threshold_check($address);
+
+        # ok
+        return true;
+    }
+
+    /**
+     * Modifies address in table or whole range if requested
+     *
+     * @access protected
+     * @param array $address
+     * @return boolean success/failure
+     */
+    protected function modify_address_edit ($address) {
+        # fetch old details for logging
+        $address_old = $this->fetch_address (null, $address['id']);
+        if (isset($address['section'])) $address_old->section = $address['section'];
+
+        # set update array
+        $insert = array(
+                        "id"          =>$address['id'],
+                        "subnetId"    =>$address['subnetId'],
+                        "ip_addr"     =>$this->transform_address($address['ip_addr'], "decimal"),
+                        "description" =>@$address['description'],
+                        "hostname"    =>@$address['hostname'],
+                        "mac"         =>@$address['mac'],
+                        "owner"       =>@$address['owner'],
+                        "state"       =>@$address['state'],
+                        "switch"      =>@$address['switch'],
+                        "port"        =>@$address['port'],
+                        "note"        =>@$address['note'],
+                        "is_gateway"  =>@$address['is_gateway'],
+                        "excludePing" =>@$address['excludePing'],
+                        "PTRignore"   =>@$address['PTRignore']
+                        );
+            # customer
+        if(isset($address['customer_id'])) {
+            if (is_numeric($address['customer_id'])) {
+                if ($address['customer_id']!="0") {
+                    $insert['customer_id'] = $address['customer_id'];
+                }
+                else {
+                    $insert['customer_id'] = NULL;
+                }
+            }
+        }
+        # location
+        if (isset($address['location_item'])) {
+            if (!is_numeric($address['location_item'])) {
+                $this->Result->show("danger", _("Invalid location value"), true);
+            }
+            $insert['location'] = $address['location_item'];
+        }
+        # custom fields, append to array
+        foreach($this->set_custom_fields() as $c) {
+            $insert[$c['name']] = !empty($address[$c['name']]) ? $address[$c['name']] : $c['Default'];
+        }
+
+        # set primary key for update
+        if($address['type']=="series") {
+            $id1 = "subnetId";
+            $id2 = "ip_addr";
+            unset($insert['id']);
+        } else {
+            $id1 = "id";
+            $id2 = null;
+        }
+
+        # remove gateway
+        if($address['is_gateway']==1)	{ $this->remove_gateway ($address['subnetId']); }
+
+        # execute
+        try { $this->Database->updateObject("ipaddresses", $insert, $id1, $id2); }
+        catch (Exception $e) {
+            $this->Log->write( "Address edit", "Failed to edit address $address[ip_addr]<hr>".$e->getMessage()."<hr>".$this->array_to_log($this->reformat_empty_array_fields ($address, "NULL")), 2);
+            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+            return false;
+        }
+
+        # set the firewall address object to avoid logging
+        $address['firewallAddressObject'] = $address_old->firewallAddressObject;
+
+            # log and changelog
+        $this->Log->write( "Address updated", "Address $address[ip_addr] updated<hr>".$this->array_to_log($this->reformat_empty_array_fields ($address, "NULL")), 0);
+        $this->Log->write_changelog('ip_addr', "edit", 'success', (array) $address_old, $address, $this->mail_changelog);
+
+        # edit DNS PTR record
+        $insert['PTR']=@$address['PTR'];
+        $this->ptr_modify ("edit", $insert);
+
+        # ok
+        return true;
+    }
+
+    /**
+     * Deletes address or address range.
+     *
+     * @access protected
+     * @param array $address
+     * @return boolean success/failure
+     */
+    protected function modify_address_delete ($address) {
+        # fetch old details for logging
+        $address_old = $this->fetch_address (null, $address['id']);
+        if (isset($address['section'])) $address_old->section = $address['section'];
+
+        # series?
+        if($address['type']=="series") {
+            $field  = "subnetId";	$value  = $address['subnetId'];
+            $field2 = "ip_addr";	$value2 = $this->transform_address ($address['ip_addr'], "decimal");
+        } else {
+            $field  = "id";			$value  = $address['id'];
+            $field2 = null;			$value2 = null;
+        }
+        # execute
+        try { $this->Database->deleteRow("ipaddresses", $field, $value, $field2, $value2); }
+        catch (Exception $e) {
+            $this->Log->write( "Address delete", "Failed to delete address $address[ip_addr]<hr>".$e->getMessage()."<hr>".$this->array_to_log((array) $address_old), 2);
+            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+            return false;
+        }
+
+        # log and changelog
+        $this->Log->write( "Address deleted", "Address $address[ip_addr] deleted<hr>".$this->array_to_log((array) $address_old), 0);
+        $this->Log->write_changelog('ip_addr', "delete", 'success', (array) $address_old, array(), $this->mail_changelog);
+
+        # edit DNS PTR record
+        $this->ptr_modify ("delete", $address);
+
+        # remove all referenced records
+        if(@$address['remove_all_dns_records']=="1") {
+            $this->pdns_remove_ip_and_hostname_records ($address);
+        }
+        # remove from NAT
+        $this->remove_address_nat_items ($address['id'], true);
+        # ok
+        return true;
+    }
+
+    /**
+     * Moves address to new subnet
+     *
+     * @access protected
+     * @param array $address
+     * @return boolean success/failure
+     */
+    protected function modify_address_move ($address) {
+        # execute
+        try { $this->Database->updateObject("ipaddresses", array("subnetId"=>$address['newSubnet'], "id"=>$address['id'])); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+            return false;
+        }
+        # ok
+        return true;
+    }
+
+    /**
+     * Remove item from nat when item is removed
+     *
+     * @method remove_nat_item
+     *
+     * @param  int $obj_id
+     * @param  bool $print
+     *
+     * @return int
+     */
+    public function remove_address_nat_items ($obj_id = 0, $print = true) {
+        # set found flag for returns
+        $found = 0;
+        # fetch all nats
+        try { $all_nats = $this->Database->getObjectsQuery ("select * from `nat` where `src` like :id or `dst` like :id", array ("id"=>'%"'.$obj_id.'"%')); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+        # loop and check for object ids
+        if(!empty($all_nats)) {
+            # init admin object
+            $Admin = new Admin ($this->Database, false);
+            # loop
+            foreach ($all_nats as $nat) {
+                # remove item from nat
+                $s = json_decode($nat->src, true);
+                $d = json_decode($nat->dst, true);
+
+                if(is_array($s['ipaddresses']))
+                $s['ipaddresses'] = array_diff($s['ipaddresses'], array($obj_id));
+                if(is_array($d['ipaddresses']))
+                $d['ipaddresses'] = array_diff($d['ipaddresses'], array($obj_id));
+
+                # save back and update
+                $src_new = json_encode(array_filter($s));
+                $dst_new = json_encode(array_filter($d));
+
+                # update only if diff found
+                if($s!=$src_new || $d!=$dst_new) {
+                    $found++;
+
+                    if($Admin->object_modify ("nat", "edit", "id", array("id"=>$nat->id, "src"=>$src_new, "dst"=>$dst_new))!==false) {
+                        if($print) {
+                            $this->Result->show("success", "Address removed from NAT", false);
+                        }
+                    }
+                }
+            }
+        }
+        # return
+        return $found;
+    }
+
+    /**
+     * Updates hostname for IP addresses
+     *
+     * @method update_address_hostname
+     *
+     * @param  mixed $ip
+     * @param  int $id
+     * @param  string $hostname
+     *
+     * @return void
+     */
+    public function update_address_hostname ($ip, $id, $hostname = "") {
+        if(is_numeric($id) && strlen($hostname)>0) {
+            try { $this->Database->updateObject("ipaddresses", array("id"=>$id, "hostname"=>$hostname)); }
+            catch (Exception $e) {
+                return false;
+            }
+            // save log
+            $this->Log->write( "Address DNS resolved", "Address $ip resolved<hr>".$this->array_to_log((array) $hostname), 0);
+            $this->Log->write_changelog('ip_addr', "edit", 'success', array ("id"=>$id, "hostname"=>""), array("id"=>$id, "hostname"=>$hostname), $this->mail_changelog);
+        }
+    }
+
+    /**
+     * Checks if subnet usage is over threshold and sends alert
+     *
+     * @access private
+     * @param mixed $address
+     * @return void
+     */
+    private function threshold_check ($address) {
+        $address = (object) $address;
+        $content = array();
+        $content_plain = array();
+
+        # fetch settings
+        $this->get_settings ();
+        # enabled ?
+        if ($this->settings->enableThreshold=="1") {
+            # object
+            if (!is_object($this->Subnets)) {
+                $this->Subnets = new Subnets ($this->Database);
+            }
+            # fetch subnet
+            $subnet = $this->Subnets->fetch_subnet("id", $address->subnetId);
+            # threshold set ?
+            if ($subnet->threshold>0) {
+                # calculate subnet usage
+                $subnet_usage = $this->Subnets->calculate_subnet_usage ($subnet);
+                # if over send mail
+                if (gmp_strval(gmp_sub(100,(int) round($subnet_usage['freehosts_percent'], 0))) > $subnet->threshold) {
+                    // fetch mail settings
+                    $Tools = new Tools ($this->Database);
+                    $admins        = $Tools->fetch_multiple_objects ("users", "role", "Administrator");
+                    // if some recipients
+                    if ($admins !== false) {
+                        # try to send
+                        try {
+                            // mail settings
+                            $mail_settings = $Tools->fetch_object ("settingsMail", "id", 1);
+                            // mail class
+                            $phpipam_mail = new phpipam_mail ($this->settings, $mail_settings);
+
+                            // set parameters
+                            $subject = "Subnet threshold limit reached"." (".$this->transform_address($subnet->subnet,"dotted")."/".$subnet->mask.")";
+                            $content[] = "<table style='margin-left:10px;margin-top:5px;width:auto;padding:0px;border-collapse:collapse;'>";
+                            $content[] = "<tr><td style='padding:5px;margin:0px;color:#333;font-size:16px;text-shadow:1px 1px 1px white;border-bottom:1px solid #eeeeee;' colspan='2'>$this->mail_font_style<strong>$subject</font></td></tr>";
+                            $content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;">'.$this->mail_font_style.''._('Subnet').'</a></font></td>	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;padding-top:10px;"><a href="'.$this->createURL().''.create_link("subnets",$subnet->sectionId, $subnet->id).'">'.$this->mail_font_style_href . $this->transform_address($subnet->subnet,"dotted")."/".$subnet->mask .'</font></a></td></tr>';
+                            $content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;">'.$this->mail_font_style.''._('Description').'</font></td>	  	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;">'.$this->mail_font_style.''. $subnet->description .'</font></td></tr>';
+                            $content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;">'.$this->mail_font_style.''._('Usage').' (%)</font></td>	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;">'.$this->mail_font_style.''. gmp_strval(gmp_sub(100,(int) round($subnet_usage['freehosts_percent'], 0))) .'</font></td></tr>';
+                            $content[] = "</table>";
+                            // plain
+                            $content_plain[] = "$subject"."\r\n------------------------------\r\n";
+                            $content_plain[] = _("Subnet").": ".$this->transform_address($subnet->subnet,"dotted")."/".$subnet->mask;
+                            $content_plain[] = _("Usage")." (%) : ".gmp_strval(gmp_sub(100,(int) round($subnet_usage['freehosts_percent'], 0)));
+
+                            # set content
+                            $content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
+                            $content_plain 	= implode("\r\n",$content_plain);
+
+                            $phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
+                            //add all admins to CC
+                            $recipients = $this->changelog_mail_get_recipients ($subnet->id);
+
+                            if ($recipients!==false) {
+                                foreach($recipients as $a) {
+                                    $phpipam_mail->Php_mailer->addAddress($a->email);
+                                }
+
+                                $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();
+                            }
+                            else {
+                                return true;
+                            }
+                        } catch (phpmailerException $e) {
+                            $this->Result->show("danger", "Mailer Error: ".$e->errorMessage(), true);
+                        } catch (Exception $e) {
+                            $this->Result->show("danger", "Mailer Error: ".$e->getMessage(), true);
+                        }
+                    }
+                }
+            }
+            else {
+                return true;
+            }
+        }
+        else {
+            return true;
+        }
+    }
+
+    /**
+     * Removes gateway if it exists
+     *
+     * @access public
+     * @param mixed $subnetId
+     * @return void
+     */
+    public function remove_gateway ($subnetId) {
+        try { $this->Database->updateObject("ipaddresses", array("subnetId"=>$subnetId, "is_gateway"=>0), "subnetId"); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+    }
+
+    /**
+     * Fetches custom IP address fields
+     *
+     * @access public
+     * @return object custom address fields
+     */
+    public function set_custom_fields () {
+        # Tools object
+        $Tools = new Tools ($this->Database);
+        # fetch
+        return $Tools->fetch_custom_fields ('ipaddresses');
+    }
+
+    /**
+     * Checks if address already exists in subnet
+     *
+     *	if cnt is false we will return id if it exists and false ifnot
+     *
+     * @access public
+     * @param int $address
+     * @param int $subnetId
+     * @param int $subnetId
+     * @return boolean success/failure
+     */
+    public function address_exists ($address, $subnetId, $cnt = true) {
+        # make sure it is in decimal format
+        $address = $this->transform_address($address, "decimal");
+        # check
+        if($cnt===true) { $query = "select count(*) as `cnt` from `ipaddresses` where `subnetId`=? and `ip_addr`=?;"; }
+        else			{ $query = "select `id` from `ipaddresses` where `subnetId`=? and `ip_addr`=?;";  }
+        # fetch
+        try { $count = $this->Database->getObjectQuery($query, array($subnetId, $address)); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+        # result
+        if ($cnt===true)	{ return $count->cnt==0 ? false : true; }
+        else				{ return is_null($count->id) ? false : $count->id; }
+    }
+
+    /**
+     * Calculates diff between two IP addresses
+     *
+     * @access public
+     * @param int $ip1
+     * @param int $ip2
+     * @return void
+     */
+    public function calculate_address_diff ($ip1, $ip2) {
+        return gmp_strval(gmp_sub($ip2, $ip1));
+    }
+
+
+    /**
+     * Returns first available subnet address, false if none
+     *
+     * @access public
+     * @param int $subnetId
+     * @param obj $Subnets
+     * @return int / false
+     */
+    public function get_first_available_address ($subnetId, $Subnets) {
+
+        # fetch all addresses in subnet and subnet
+        $addresses = $this->fetch_subnet_addresses ($subnetId, "ip_addr", "asc", array("ip_addr"));
+        $subnet = (array) $Subnets->fetch_subnet(null, $subnetId);
+
+        # if folder return false
+        if ($subnet['isFolder']=="1")                                                                   { return false; }
+
+        # false if slaves
+        $this->Subnets = new Subnets ($this->Database);
+        if($this->Subnets->has_slaves ($subnetId))                                                      { return false; }
+
+        # get max hosts
+        $max_hosts = $Subnets->get_max_hosts ($subnet['mask'], $this->identify_address($subnet['subnet']));
+
+        # full subnet?
+        if(sizeof($addresses)>=$max_hosts)																{ return false; } 	//full subnet
+
+        # set type
+        $ip_version = $this->identify_address ($subnet['subnet']);
+        # get first diff > 1
+        if(sizeof($addresses)>0) {
+            foreach($addresses as $k=>$ipaddress) {
+                # check subnet and first IP
+                if($k==0) {
+                    # /31 fix
+                    if($subnet['mask']==31)	{
+                        if(gmp_strval(gmp_sub($addresses[$k]->ip_addr, $subnet['subnet']))>0) 			{ return gmp_strval($subnet['subnet']); }
+                    } else {
+                        if(gmp_strval(gmp_sub($addresses[$k]->ip_addr, $subnet['subnet']))>1) 			{ return gmp_strval(gmp_add($subnet['subnet'], 1)); }
+                        elseif($ip_version=="IPv6") {
+                            if(sizeof($addresses)==1) {
+                                if(gmp_strval(gmp_sub($addresses[$k]->ip_addr, $subnet['subnet']))==0)	{ return gmp_strval(gmp_add($subnet['subnet'], 1)); }
+                            }
+                        }
+                    }
+                }
+                else {
+                    if(gmp_strval(gmp_sub($addresses[$k]->ip_addr, $addresses[$k-1]->ip_addr))>1) 		{ return gmp_strval(gmp_add($addresses[$k-1]->ip_addr, 1)); }
+                }
+            }
+            # all consecutive, last + 1
+                                                                                                        { return gmp_strval(gmp_add($addresses[$k]->ip_addr, 1)); }
+        }
+        # no addresses
+        else {
+            # /32, /31
+            if($subnet['mask']==32 || $subnet['mask']==31 || $ip_version=="IPv6") 						{ return $subnet['subnet']; }
+            else																						{ return gmp_strval(gmp_add($subnet['subnet'], 1)); }
+        }
+    }
+
+
+
+
+
+
+
+
+
+    /**
+     * @powerDNS
+     * -------------------------------
+     */
+
+    /**
+     * Modifes powerDNS PTR record
+     *
+     * @access public
+     * @param mixed $action
+     * @param mixed $address
+     * @param bool $print_error (default: true)
+     * @return void
+     */
+    public function ptr_modify ($action, $address, $print_error = true) {
+        // fetch settings
+        $this->settings ();
+        //check if powerdns enabled
+        if ($this->settings->enablePowerDNS!=1) {
+            return false;
+        }
+        //enabled, proceed
+        else {
+            // first check if subnet selected for PTR records
+            $this->initialize_subnets_object ();
+            $subnet = $this->Subnets->fetch_subnet ("id", $address['subnetId']);
+            if ($subnet->DNSrecursive!="1") { return false; }
+
+            // ignore if PTRignore set
+            if ($address['PTRignore']=="1")	{
+                // validate db
+                $this->pdns_validate_connection ();
+                // remove if it exists
+                if ($this->ptr_exists ($address['PTR'])) {
+                    $this->ptr_delete ($address, false);
+                                        { return false; }
+                }
+                else {
+                                        { return true; }
+                }
+            }
+            // validate db
+            $this->pdns_validate_connection ();
+
+            // to object
+            $address = (object) $address;
+            # execute based on action
+            if($action=="add")				{ return $this->ptr_add ($address, $print_error); }							//create new PTR
+            elseif($action=="edit")			{ return $this->ptr_edit ($address, $print_error); }						//modify existing PTR
+            elseif($action=="delete")		{ return $this->ptr_delete ($address, $print_error); }						//delete PTR
+            else							{ return $this->Result->show("danger", _("Invalid PDNS action"), true); }
+        }
+    }
+
+    /**
+     * This function removes all records - ip and hostname referenced by address.
+     *
+     * @access public
+     * @param mixed $address
+     * @return void
+     */
+    public function pdns_remove_ip_and_hostname_records ($address) {
+        // fetch settings
+        $this->settings ();
+        //check if powerdns enabled
+        if ($this->settings->enablePowerDNS!=1) {
+            return false;
+        }
+        // validate db
+        $this->pdns_validate_connection ();
+        // execute
+        return $this->PowerDNS->pdns_remove_ip_and_hostname_records ($address['hostname'], $address['ip_addr']);
+    }
+
+    /**
+     *  Validates pdns database connection
+     *
+     * @access public
+     * @param bool $die (default: false)
+     * @return void
+     */
+    public function pdns_validate_connection ($die = true) {
+        # powerDNS class
+        $this->PowerDNS = new PowerDNS ($this->Database);
+        # add API info
+        if(isset($this->api)) {
+            $this->PowerDNS->api = $this->api;
+        }
+        # check connection
+        if($this->PowerDNS->db_check()===false && $die) { $this->Result->show("danger", _("Cannot connect to powerDNS database"), true); }
+        # get settings
+        $this->get_settings ();
+    }
+
+    /**
+     * Set zone name and fetch domain details
+     *
+     * @access private
+     * @param mixed $subnet_id
+     * @return array|false
+     */
+    private function pdns_fetch_domain ($subnet_id) {
+        # initialize subnets
+        $this->initialize_subnets_object ();
+        // fetch subnet
+        $subnet = $this->Subnets->fetch_subnet ("id", $subnet_id);
+        if($subnet===false)							{  $this->Result->show("danger", _("Invalid subnet Id"), true); }
+
+        // set PTR zone name from IP/mash
+        $zone = $this->PowerDNS->get_ptr_zone_name ($this->transform_address ($subnet->subnet, "dotted"), $subnet->mask);
+        // try to fetch
+        return  $this->PowerDNS->fetch_domain_by_name ($zone);
+    }
+
+    /**
+     * Create new PTR record when adding new IP address
+     *
+     * @access public
+     * @param mixed $address
+     * @param mixed $print_error (default: true)
+     * @param mixed $id (default: NULL)
+     * @return void
+     */
+    public function ptr_add ($address, $print_error = true, $id = null) {
+        // decode values
+        $values = json_decode($this->settings->powerDNS);
+
+        // set default hostname for PTR if set
+        if (strlen($address->hostname)==0) {
+            if (strlen($values->def_ptr_domain)>0) {
+                $address->hostname = $values->def_ptr_domain;
+            }
+        }
+        // validate hostname
+        if ($this->validate_hostname ($address->hostname)===false)		{ return false; }
+        // fetch domain
+        $domain = $this->pdns_fetch_domain ($address->subnetId);
+
+        // formulate new record
+        $record = $this->PowerDNS->formulate_new_record ($domain->id, $this->PowerDNS->get_ip_ptr_name ($this->transform_address ($address->ip_addr, "dotted")), "PTR", $address->hostname, $values->ttl);
+        // insert record
+        $this->PowerDNS->add_domain_record ($record, false);
+        // link to address
+        $id = $id===null ? $this->lastId : $id;
+        $this->ptr_link ($id, $this->PowerDNS->lastId);
+        // ok
+        if ($print_error && php_sapi_name()!="cli")
+        $this->Result->show("success", "PTR record created", false);
+
+        return true;
+    }
+
+    /**
+     * Edits PTR
+     *
+     * @access public
+     * @param mixed $address
+     * @param mixed $print_error (default: true)
+     * @return void
+     */
+    public function ptr_edit ($address, $print_error = true) {
+        // validate hostname
+        if ($this->validate_hostname ($address->hostname)===false)	{
+            // remove pointer if it exists!
+            if ($this->ptr_exists ($address->PTR)===true)	{ $this->ptr_delete ($address, $print_error); }
+            else											{ return false; }
+        }
+
+        // new record
+            if ($this->ptr_exists ($address->PTR)===false) {
+                // fake lastid
+                $this->lastId = $address->id;
+                // new ptr record
+                $this->ptr_add ($address, true);
+            }
+            // update PTR
+            else {
+            // fetch domain
+            $domain = $this->pdns_fetch_domain ($address->subnetId);
+
+            // fetch old
+            $old_record = $this->PowerDNS->fetch_record ($address->PTR);
+
+            // create insert array
+            $update = $this->PowerDNS->formulate_update_record ($this->PowerDNS->get_ip_ptr_name ($this->transform_address ($address->ip_addr, "dotted")), null, $address->hostname, null, null, null, $old_record->change_date);
+            $update['id'] = $address->PTR;
+
+            // update
+            $this->PowerDNS->update_domain_record ($domain->id, $update, $print_error);
+            // ok
+            if ($print_error && php_sapi_name()!="cli")
+            $this->Result->show("success", "PTR record updated", false);
+            }
+    }
+
+    /**
+     * Remove PTR from database
+     *
+     * @access public
+     * @param mixed $address
+     * @param mixed $print_error
+     * @return void
+     */
+    public function ptr_delete ($address, $print_error) {
+        $address = (object) $address;
+
+        // remove link from ipaddresses
+        $this->ptr_unlink ($address->id);
+
+        // exists
+        if ($this->ptr_exists ($address->PTR)!==false)	{
+            // fetch domain
+            $domain = $this->pdns_fetch_domain ($address->subnetId);
+            //remove
+            $this->PowerDNS->remove_domain_record ($domain->id, $address->PTR);
+            // ok
+            if ($print_error && php_sapi_name()!="cli")
+            $this->Result->show("success", "PTR record removed", false);
+        }
+    }
+
+    /**
+     * Links PTR record with address record
+     *
+     * @access public
+     * @param mixed $address_id
+     * @param mixed $ptr_id
+     * @return void
+     */
+    public function ptr_link ($address_id, $ptr_id) {
+        # execute
+        try { $this->Database->updateObject("ipaddresses", array("id"=>$address_id, "PTR"=>$ptr_id)); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+            return false;
+        }
+    }
+
+    /**
+     * Remove PTR link if it exists
+     *
+     * @access private
+     * @param mixed $address_id
+     * @return void
+     */
+    private function ptr_unlink ($address_id) {
+        # execute
+        try { $this->Database->updateObject("ipaddresses", array("id"=>$address_id, "PTR"=>0)); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage(), false);
+            return false;
+        }
+    }
+
+    /**
+     * Removes all PTR references for all hosts in subnet
+     *
+     * @access public
+     * @param mixed $subnet_id
+     * @return void
+     */
+    public function ptr_unlink_subnet_addresses ($subnet_id) {
+        try { $this->Database->runQuery("update `ipaddresses` set `PTR` = 0 where `subnetId` = ?;", array($subnet_id)); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+        #result
+        return true;
+    }
+
+    /**
+     * Checks if PTR record exists
+     *
+     * @access private
+     * @param mixed $ptr_id (default: 0)
+     * @return void
+     */
+    private function ptr_exists ($ptr_id = 0) {
+        return $this->PowerDNS->record_id_exists ($ptr_id);
+    }
+
+    /**
+     * Returns array of all ptr indexes in surrent subnet
+     *
+     * @access public
+     * @param mixed $subnetId
+     * @return void
+     */
+    public function ptr_get_subnet_indexes ($subnetId) {
+        try { $indexes = $this->Database->getObjectsQuery("select `PTR` from `ipaddresses` where `PTR` != 0 and `subnetId` = ?;", array($subnetId)); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+        # parse
+        if (sizeof($indexes)>0) {
+            $out = array();
+            // loop
+            foreach ($indexes as $i) {
+                $out[] = $i->PTR;
+            }
+            return $out;
+        }
+        else {
+            return array();
+        }
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    /**
+     * @import address methods
+     * -------------------------------
+     */
+
+    /**
+     * Import single line from csv to database
+     *
+     * @access public
+     * @param array $address
+     * @param int $subnetId
+     * @return void
+     */
+    public function import_address_from_csv ($address, $subnetId) {
+        # Subnets object
+        $this->initialize_subnets_object ();
+
+        # fetch subnet details
+        $subnet = (array) $this->Subnets->fetch_subnet(null, $subnetId);
+
+        # verify address
+        if($this->verify_address( $address[0], $this->transform_to_dotted($subnet['subnet'])."/".$subnet['mask'], false, false)!==false) { return false; }
+        # check for duplicates
+        if ($this->address_exists($address[0], $subnetId)) { return _('IP address already exists').' - '.$address[0]; }
+
+        # format insert array
+        $address_insert = array("subnetId"=>$subnetId,
+                                "ip_addr"=>$address[0],
+                                "state"=>$address[1],
+                                "description"=>$address[2],
+                                "hostname"=>$address[3],
+                                "mac"=>$address[4],
+                                "owner"=>$address[5],
+                                "switch"=>$address[6],
+                                "port"=>$address[7],
+                                "note"=>$address[8]
+                                );
+
+        # switch to 0, state to active
+        $address_insert['switch'] = strlen($address_insert['switch'])==0 ? 0 : $address_insert['switch'];
+        $address_insert['state']  = strlen($address_insert['state'])==0 ?  1 : $address_insert['state'];
+
+        # custom fields, append to array
+        $m=9;
+        $custom_fields = $this->set_custom_fields();
+        if(sizeof($custom_fields) > 0) {
+            foreach($custom_fields as $c) {
+                $address_insert[$c['name']] = $address[$m];
+                $m++;
+            }
+        }
+
+        # insert
+        return $this->modify_address_add ($address_insert);
+    }
+
+
+
+
+
+
+
+
+
+
+    /**
+     * @address subnet methods
+     * -------------------------------
+     */
+
+    /**
+     * Opens new Subnets connection if not already opened
+     *
+     * @access private
+     * @return void
+     */
+    private function initialize_subnets_object () {
+        if(!is_object($this->Subnets)) { $this->Subnets = new Subnets ($this->Database); }
+    }
+
+    /**
+     * Fetches all IP addresses in subnet
+     *
+     * @access public
+     * @param mixed $subnetId
+     * @param mixed $order (default: null)
+     * @param mixed $order_direction (default: null)
+     * @param string $fields (default: "*")
+     * @return void
+     */
+    public function fetch_subnet_addresses ($subnetId, $order=null, $order_direction=null, $fields = "*") {
+        # set order
+        if(!is_null($order)) 	{ $order = array($order, $order_direction); }
+        else 					{ $order = array("ip_addr", "asc"); }
+
+        # fields
+        if($fields!="*") {
+            $fields = implode(",", $fields);
+        }
+
+        # escape ordering
+        $order[0] = $this->Database->escape ($order[0]);
+        $order[1] = $this->Database->escape ($order[1]);
+
+        try { $addresses = $this->Database->getObjectsQuery("SELECT $fields FROM `ipaddresses` where `subnetId` = ? order by `$order[0]` $order[1];", array($subnetId)); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+        # save to addresses cache
+        if(sizeof($addresses)>0) {
+            foreach($addresses as $k=>$address) {
+                # add decimal format
+                $address->ip = $this->transform_to_dotted ($address->ip_addr);
+                # save to subnets
+                $this->addresses[$address->id] = (object) $address;
+                $addresses[$k]->ip = $address->ip;
+            }
+        }
+        # result
+        return sizeof($addresses)>0 ? $addresses : array();
+    }
+
+    /**
+     * Count number of IP addresses in subnet
+     *
+     * Returns number of addresses in subnet
+     *
+     * @access public
+     * @param int $subnetId
+     * @return int
+     */
+    public function count_subnet_addresses ($subnetId) {
+        try { $count = $this->Database->numObjectsFilter("ipaddresses", "subnetId", $subnetId); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+        # result
+        return (int) $count;
+    }
+
+    /**
+     * Count number of addresses in multiple subnets
+     *
+     *	we provide array of all subnet ids
+     *
+     * @access public
+     * @param mixed $subnets
+     * @return void
+     */
+    public function count_addresses_in_multiple_subnets ($subnets) {
+        # empty
+        if(empty($subnets)) { return 0; }
+
+        # create query
+        $tmp = array();
+        foreach($subnets as $k=>$s) {
+            if (is_object($s))	{ $tmp[] = " `subnetId`=$s->id "; }
+            else				{ $tmp[] = " `subnetId`=$s "; }
+        }
+        $query  = "select count(*) as `cnt` from `ipaddresses` where ".implode("or", $tmp).";";
+
+        # fetch
+        try { $addresses = $this->Database->getObjectsQuery($query); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+        # return count
+        return $addresses[0]->cnt;
+    }
+
+
+    /**
+     * Fetch IP addresses for all recursive slaves
+     *
+     *	count returns count only, else whole subnets
+     *
+     * @access public
+     * @param int $subnetId
+     * @param bool $count
+     * @return void
+     */
+    public function fetch_subnet_addresses_recursive ($subnetId, $count = false, $order=null, $order_direction=null ) {
+        # initialize subnets
+        $this->initialize_subnets_object ();
+        $this->Subnets = new Subnets ($this->Database);
+        $this->Subnets->reset_subnet_slaves_recursive();				//reset array of slaves before continuing
+        $this->Subnets->fetch_subnet_slaves_recursive($subnetId);		//fetch array of slaves
+        $this->Subnets->slaves = array_unique($this->Subnets->slaves);	//remove possible duplicates
+
+        # ip address order
+        if(!is_null($order)) 	{ $order_addr = array($order, $order_direction); }
+        else 					{ $order_addr = array("ip_addr", "asc"); }
+
+        # escape ordering
+        $order_addr[0] = $this->Database->escape ($order_addr[0]);
+        $order_addr[1] = $this->Database->escape ($order_addr[1]);
+
+        $ids = array();
+        $ids[] = $subnetId;
+
+        # set query to fetch all ip addresses for specified subnets or just count
+        if($count) 	{ $query = 'select count(*) as cnt from `ipaddresses` where `subnetId` = ? '; }
+        else	 	{ $query = 'select * from `ipaddresses` where `subnetId` = ? '; }
+        foreach($this->Subnets->slaves as $subnetId2) {
+            # ignore orphaned
+            if($subnetId2 != $subnetId) {
+                $query  .= " or `subnetId` = ? ";
+                $ids[] = $subnetId2;
+            }
+        }
+
+        $query      .= "order by `$order_addr[0]` $order_addr[1];";
+        # fetch
+        try { $addresses = $this->Database->getObjectsQuery($query, $ids); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+        # return ip address array or just count
+        return $count ? (int) $addresses[0]->cnt : $addresses;
+    }
 
     /**
-     * Last insert id
+     * Search for unused address space between 2 IP addresses
      *
-     * (default value: false)
+     * possible unused addresses by type
      *
-     * @var bool
      * @access public
+     * @param int $address1
+     * @param int $address2
+     * @param int $netmask
+     * @param bool $empty (default: false)
+     * @param bool $is_subnet (default: false)
+     * @param bool $is_broadcast (default: false)
+     * @return void
      */
-    public $lastId = false;
+    public function find_unused_addresses ($address1, $address2, $netmask, $empty=false, $is_subnet=false, $is_broadcast=false) {
+        # make sure addresses are in decimal format
+        $address1 = $this->transform_address ($address1, "decimal");
+        $address2 = $this->transform_address ($address2, "decimal");
+        # check for space
+        return $this->identify_address($address1)=="IPv6" ? $this->find_unused_addresses_IPv6 ($address1, $address2, $netmask, $empty, $is_subnet, $is_broadcast) : $this->find_unused_addresses_IPv4 ($address1, $address2, $netmask, $empty);
+    }
 
-	/**
-	 * Debugging flag
-	 *
-	 * (default value: false)
-	 *
-	 * @var bool
-	 * @access protected
-	 */
-	protected $debugging = false;
-
-	/**
-	 * PEAR NET IPv4 object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Net_IPv4;
-
-	/**
-	 * PEAR NET IPv6 object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Net_IPv6;
-
-	/**
-	 * Database conenction
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Database;
-
-	/**
-	 * Subnets object
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Subnets;
-
-	/**
-	 * Logging object
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $Log;
-
-	/**
-	 * PowerDNS object
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	private $PowerDNS;
-
-
-
-
-	/**
-	 * __construct function
-	 *
-	 * @access public
-	 */
-	public function __construct (Database_PDO $Database) {
-		# Save database object
-		$this->Database = $Database;
-		# initialize Result
-		$this->Result = new Result ();
-		# debugging
-		$this->set_debugging();
-
-		# Log object
-		$this->Log = new Logging ($this->Database);
-	}
-
-
-
-
-
-
-
-
-
-	/**
-	* @address tag methods
-	* -------------------------------
-	*/
-
-	/**
-	 * Returns array of address types.
-	 *
-	 * @access public
-	 * @return array of address types and parameters
-	 */
-	public function addresses_types_fetch () {
-    	# fetch
-    	$types = $this->fetch_all_objects ("ipTags", "id");
-
-		# save to array
-		$types_out = array();
-		foreach($types as $t) {
-			$types_out[$t->id] = (array) $t;
-		}
-		# save
-		$this->address_types = $types_out;
-		# return
-		return $types_out;
-	}
-
-	/**
-	 * Sets address tag
-	 *
-	 * @access public
-	 * @param int $state
-	 * @return mixed tag
-	 */
-	public function address_type_format_tag ($state) {
-		# fetch address states
-		$this->addresses_types_fetch();
-		# result
-		if(!isset($this->address_types[$state]))	{
-			return "";
-		}
-		else {
-			if($this->address_types[$state]['showtag']==1) {
-				return "<i class='fa fa-".$this->address_types[$state]['type']." fa-tag state' rel='tooltip' style='color:".$this->address_types[$state]['bgcolor']."' title='"._($this->address_types[$state]['type'])."'></i>";
-			}
-		}
-	}
-
-	/**
-	 * returns address type from index
-	 *
-	 *		1 > Offline
-	 *
-	 * @access public
-	 * @param int $index
-	 * @return mixed address type
-	 */
-	public function address_type_index_to_type ($index) {
-		# fetch address states
-		$this->addresses_types_fetch();
-		# return
-		if(isset($this->address_types[$index])) {
-			return $this->address_types[$index]['type'];
-		}
-		else {
-			return $index;
-		}
-	}
-
-	/**
-	 * Returns address index from type
-	 *
-	 *	Offline > 1
-	 *
-	 * @access public
-	 * @param mixed $type
-	 * @return void
-	 */
-	public function address_type_type_to_index ($type = "Used") {
-		# null of no length
-		$type = strlen($type)==0 || is_null($type) ? "Used" : $type;
-		# fetch address states
-		$this->addresses_types_fetch();
-		# reindex
-		$states_assoc = array();
-		foreach($this->address_types as $s) {
-			$states_assoc[$s['type']] = $s;
-		}
-		# return
-		if(isset($states_assoc[$type])) {
-			return $states_assoc[$type]['id'];
-		}
-		else {
-			return $type;
-		}
-	}
-
-
-
-
-
-
-
-
-
-
-
-
-	/**
-	* @address methods
-	* -------------------------------
-	*/
-
-	/**
-	 * Fetches address by specified method
-	 *
-	 * @access public
-	 * @param string $method (default: "id")
-	 * @param mixed $id
-	 * @return object address
-	 */
-	public function fetch_address ($method, $id) {
-		# null method
-		$method = is_null($method) ? "id" : $method;
-		# check cache first
-		if(isset($this->addresses[$id]))	{
-			return $this->addresses[$id];
-		}
-		else {
-			try { $address = $this->Database->getObjectQuery("SELECT * FROM `ipaddresses` where `$method` = ? limit 1;", array($id)); }
-			catch (Exception $e) {
-				$this->Result->show("danger", _("Error: ").$e->getMessage());
-				return false;
-			}
-			# save to addresses cache
-			if(!is_null($address)) {
-				# add decimal format
-				$address->ip = $this->transform_to_dotted ($address->ip_addr);
-				# save to subnets
-				$this->addresses[$id] = (object) $address;
-			}
-			#result
-			return !is_null($address) ? $address : false;
-		}
-	}
-
-	/**
-	 * Fetch addresses on int ip_addr and subnetId
-	 *
-	 * @access public
-	 * @param mixed $ip_addr
-	 * @param mixed $subnetId
-	 * @return void
-	 */
-	public function fetch_address_multiple_criteria ($ip_addr, $subnetId) {
-		try { $address = $this->Database->getObjectQuery("SELECT * FROM `ipaddresses` where `ip_addr` = ? and `subnetId` = ? limit 1;", array($ip_addr, $subnetId)); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-		# save to addresses cache
-		if(sizeof($address)>0) {
-			# add decimal format
-			$address->ip = $this->transform_to_dotted ($address->ip_addr);
-			# save to subnets
-			$this->addresses[$address->id] = (object) $address;
-		}
-		#result
-		return !is_null($address) ? $address : false;
-	}
-
-	/**
-	 * Searches database for similar addresses
-	 *
-	 * @access public
-	 * @param mixed $linked_field
-	 * @param mixed $value
-	 * @param mixed $address_id
-	 * @return void
-	 */
-	public function search_similar_addresses ($linked_field, $value, $address_id) {
-    	// checks
-    	if(strlen($linked_field)>0 && strlen($value)>0 && is_numeric($address_id)) {
-        	// search
-     		try { $addresses = $this->Database->getObjectsQuery("SELECT * FROM `ipaddresses` where `$linked_field` = ? and `id` != ? and state != 4;", array($value, $address_id)); }
-    		catch (Exception $e) {
-    			$this->Result->show("danger", _("Error: ").$e->getMessage());
-    			return false;
-    		}
-    		#result
-    		return sizeof($addresses)>0 ? $addresses : false;
-        }
-        else {
-            return false;
-        }
-	}
-
-	/**
-	 * Address modification
-	 *
-	 * @access public
-	 * @param mixed $address
-	 * @param bool $mail_changelog (default: true)
-	 * @return void
-	 */
-	public function modify_address ($address, $mail_changelog = true) {
-		# save changelog
-		$this->mail_changelog  = $mail_changelog;
-		# null empty values
-		$address = $this->reformat_empty_array_fields ($address, null);
-		# strip tags
-		$address = $this->strip_input_tags ($address);
-		# execute based on action
-		if($address['action']=="add")			{ return $this->modify_address_add ($address); }							//create new address
-		elseif($address['action']=="edit")		{ return $this->modify_address_edit ($address); }							//modify existing address
-		elseif($address['action']=="delete")	{ return $this->modify_address_delete ($address); }							//delete address
-		elseif($address['action']=="move")		{ return $this->modify_address_move ($address); }							//move to new subnet
-		else									{ return $this->Result->show("danger", _("Invalid action"), true); }
-	}
-
-	/**
-	 * Inserts new IP address to table
-	 *
-	 * @access protected
-	 * @param array $address
-	 * @return boolean success/failure
-	 */
-	protected function modify_address_add ($address) {
-		# set insert array
-		$insert = array(
-						"ip_addr"               => $this->transform_address($address['ip_addr'],"decimal"),
-						"subnetId"              => $address['subnetId'],
-						"description"           => @$address['description'],
-						"hostname"              => @$address['hostname'],
-						"mac"                   => @$address['mac'],
-						"owner"                 => @$address['owner'],
-						"state"                 => @$address['state'],
-						"switch"                => @$address['switch'],
-						"port"                  => @$address['port'],
-						"note"                  => @$address['note'],
-						"is_gateway"            => @$address['is_gateway'],
-						"excludePing"           => @$address['excludePing'],
-						"PTRignore"             => @$address['PTRignore'],
-						"firewallAddressObject" => @$address['firewallAddressObject'],
-						"lastSeen"              => @$address['lastSeen']
-						);
-		# customer
-		if(isset($address['customer_id'])) {
-			if (is_numeric($address['customer_id'])) {
-				if ($address['customer_id']!="0") {
-					$insert['customer_id'] = $address['customer_id'];
-				}
-				else {
-					$insert['customer_id'] = NULL;
-				}
-			}
-		}
-        # location
-        if (isset($address['location_item'])) {
-            if (!is_numeric($address['location_item'])) {
-                $this->Result->show("danger", _("Invalid location value"), true);
+    /**
+     * Search for unused address space between 2 IPv4 addresses.
+     *
+     * unused address range or false if none available
+     *
+     * @access protected
+     * @param int $address1
+     * @param int $address2
+     * @param int $netmask
+     * @param bool $empty
+     * @return void
+     */
+    protected function find_unused_addresses_IPv4 ($address1, $address2, $netmask, $empty) {
+        # calculate diff
+        $diff = $this->calculate_address_diff ($address1, $address2);
+        # 32 subnets
+        if($netmask==32) {
+            if($empty) {
+                return array("ip"=>$this->transform_to_dotted($address1), "hosts"=>1);
+            }
+            else {
+                return false;
             }
-            $insert['location'] = $address['location_item'];
         }
-		# custom fields, append to array
-		foreach($this->set_custom_fields() as $c) {
-			$insert[$c['name']] = !empty($address[$c['name']]) ? $address[$c['name']] : $c['Default'];
-		}
-
-		# null empty values
-		$insert = $this->reformat_empty_array_fields ($insert, null);
-
-		# remove gateway
-		if($address['is_gateway']==1)	{ $this->remove_gateway ($address['subnetId']); }
-
-		# execute
-		try { $this->Database->insertObject("ipaddresses", $insert); }
-		catch (Exception $e) {
-			$this->Log->write( "Address create", "Failed to create new address<hr>".$e->getMessage()."<hr>".$this->array_to_log($this->reformat_empty_array_fields ($address, "NULL")), 2);
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			return false;
-		}
-		# save id
-		$this->lastId = $this->Database->lastInsertId();
-
-		# log and changelog
-		$address['id'] = $this->lastId;
-		$this->Log->write( "Address created", "New address created<hr>".$this->array_to_log($this->reformat_empty_array_fields ($address, "NULL")), 0);
-		$this->Log->write_changelog('ip_addr', "add", 'success', array(), $address, $this->mail_changelog);
-
-		# edit DNS PTR record
-		$this->ptr_modify ("add", $insert);
-
-		# threshold alert
-		$this->threshold_check($address);
-
-		# ok
-		return true;
-	}
-
-	/**
-	 * Modifies address in table or whole range if requested
-	 *
-	 * @access protected
-	 * @param array $address
-	 * @return boolean success/failure
-	 */
-	protected function modify_address_edit ($address) {
-		# fetch old details for logging
-		$address_old = $this->fetch_address (null, $address['id']);
-		if (isset($address['section'])) $address_old->section = $address['section'];
-
-		# set update array
-		$insert = array(
-						"id"          =>$address['id'],
-						"subnetId"    =>$address['subnetId'],
-						"ip_addr"     =>$this->transform_address($address['ip_addr'], "decimal"),
-						"description" =>@$address['description'],
-						"hostname"    =>@$address['hostname'],
-						"mac"         =>@$address['mac'],
-						"owner"       =>@$address['owner'],
-						"state"       =>@$address['state'],
-						"switch"      =>@$address['switch'],
-						"port"        =>@$address['port'],
-						"note"        =>@$address['note'],
-						"is_gateway"  =>@$address['is_gateway'],
-						"excludePing" =>@$address['excludePing'],
-						"PTRignore"   =>@$address['PTRignore']
-						);
- 		# customer
-		if(isset($address['customer_id'])) {
-			if (is_numeric($address['customer_id'])) {
-				if ($address['customer_id']!="0") {
-					$insert['customer_id'] = $address['customer_id'];
-				}
-				else {
-					$insert['customer_id'] = NULL;
-				}
-			}
-		}
-        # location
-        if (isset($address['location_item'])) {
-            if (!is_numeric($address['location_item'])) {
-                $this->Result->show("danger", _("Invalid location value"), true);
+        # 31 subnets
+        elseif($netmask==31) {
+
+            if($empty) {
+                return array("ip"=>$this->transform_to_dotted($address1), "hosts"=>2);
+            }
+            elseif($diff==1) {
+                if($this->is_network($address1, $netmask)) {
+                    return array("ip"=>$this->transform_to_dotted($address2), "hosts"=>1);
+                }
+                elseif($this->is_broadcast($address2, $netmask)) {
+                    return array("ip"=>$this->transform_to_dotted($address1), "hosts"=>1);
+                }
+                else {
+                    return false;
+                }
+            }
+            else {
+                return false;
             }
-            $insert['location'] = $address['location_item'];
         }
-		# custom fields, append to array
-		foreach($this->set_custom_fields() as $c) {
-			$insert[$c['name']] = !empty($address[$c['name']]) ? $address[$c['name']] : $c['Default'];
-		}
-
-		# set primary key for update
-		if($address['type']=="series") {
-			$id1 = "subnetId";
-			$id2 = "ip_addr";
-			unset($insert['id']);
-		} else {
-			$id1 = "id";
-			$id2 = null;
-		}
-
-		# remove gateway
-		if($address['is_gateway']==1)	{ $this->remove_gateway ($address['subnetId']); }
-
-		# execute
-		try { $this->Database->updateObject("ipaddresses", $insert, $id1, $id2); }
-		catch (Exception $e) {
-			$this->Log->write( "Address edit", "Failed to edit address $address[ip_addr]<hr>".$e->getMessage()."<hr>".$this->array_to_log($this->reformat_empty_array_fields ($address, "NULL")), 2);
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			return false;
-		}
-
-		# set the firewall address object to avoid logging
-		$address['firewallAddressObject'] = $address_old->firewallAddressObject;
-
- 		# log and changelog
-		$this->Log->write( "Address updated", "Address $address[ip_addr] updated<hr>".$this->array_to_log($this->reformat_empty_array_fields ($address, "NULL")), 0);
-		$this->Log->write_changelog('ip_addr', "edit", 'success', (array) $address_old, $address, $this->mail_changelog);
-
-		# edit DNS PTR record
-		$insert['PTR']=@$address['PTR'];
-		$this->ptr_modify ("edit", $insert);
-
-		# ok
-		return true;
-	}
-
-	/**
-	 * Deletes address or address range.
-	 *
-	 * @access protected
-	 * @param array $address
-	 * @return boolean success/failure
-	 */
-	protected function modify_address_delete ($address) {
-		# fetch old details for logging
-		$address_old = $this->fetch_address (null, $address['id']);
-		if (isset($address['section'])) $address_old->section = $address['section'];
-
-		# series?
-		if($address['type']=="series") {
-			$field  = "subnetId";	$value  = $address['subnetId'];
-			$field2 = "ip_addr";	$value2 = $this->transform_address ($address['ip_addr'], "decimal");
-		} else {
-			$field  = "id";			$value  = $address['id'];
-			$field2 = null;			$value2 = null;
-		}
-		# execute
-		try { $this->Database->deleteRow("ipaddresses", $field, $value, $field2, $value2); }
-		catch (Exception $e) {
-			$this->Log->write( "Address delete", "Failed to delete address $address[ip_addr]<hr>".$e->getMessage()."<hr>".$this->array_to_log((array) $address_old), 2);
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			return false;
-		}
-
-		# log and changelog
-		$this->Log->write( "Address deleted", "Address $address[ip_addr] deleted<hr>".$this->array_to_log((array) $address_old), 0);
-		$this->Log->write_changelog('ip_addr', "delete", 'success', (array) $address_old, array(), $this->mail_changelog);
-
-		# edit DNS PTR record
-		$this->ptr_modify ("delete", $address);
-
-		# remove all referenced records
-		if(@$address['remove_all_dns_records']=="1") {
-    		$this->pdns_remove_ip_and_hostname_records ($address);
+        # if diff is less than 2 return false */
+        elseif ( $diff < 2 ) {
+                return false;
         }
-        # remove from NAT
-        $this->remove_address_nat_items ($address['id'], true);
-		# ok
-		return true;
-	}
-
-	/**
-	 * Moves address to new subnet
-	 *
-	 * @access protected
-	 * @param array $address
-	 * @return boolean success/failure
-	 */
-	protected function modify_address_move ($address) {
-		# execute
-		try { $this->Database->updateObject("ipaddresses", array("subnetId"=>$address['newSubnet'], "id"=>$address['id'])); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			return false;
-		}
-		# ok
-		return true;
-	}
-
-	/**
-	 * Remove item from nat when item is removed
-	 *
-	 * @method remove_nat_item
-	 *
-	 * @param  int $obj_id
-	 * @param  bool $print
-	 *
-	 * @return int
-	 */
-	public function remove_address_nat_items ($obj_id = 0, $print = true) {
-		# set found flag for returns
-		$found = 0;
-		# fetch all nats
-		try { $all_nats = $this->Database->getObjectsQuery ("select * from `nat` where `src` like :id or `dst` like :id", array ("id"=>'%"'.$obj_id.'"%')); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-		# loop and check for object ids
-		if(!empty($all_nats)) {
-			# init admin object
-			$Admin = new Admin ($this->Database, false);
-			# loop
-			foreach ($all_nats as $nat) {
-			    # remove item from nat
-			    $s = json_decode($nat->src, true);
-			    $d = json_decode($nat->dst, true);
-
-			    if(is_array($s['ipaddresses']))
-			    $s['ipaddresses'] = array_diff($s['ipaddresses'], array($obj_id));
-			    if(is_array($d['ipaddresses']))
-			    $d['ipaddresses'] = array_diff($d['ipaddresses'], array($obj_id));
-
-			    # save back and update
-			    $src_new = json_encode(array_filter($s));
-			    $dst_new = json_encode(array_filter($d));
-
-			    # update only if diff found
-			    if($s!=$src_new || $d!=$dst_new) {
-			    	$found++;
-
-				    if($Admin->object_modify ("nat", "edit", "id", array("id"=>$nat->id, "src"=>$src_new, "dst"=>$dst_new))!==false) {
-				    	if($print) {
-					        $this->Result->show("success", "Address removed from NAT", false);
-						}
-				    }
-			    }
-			}
-		}
-		# return
-		return $found;
-	}
-
-	/**
-	 * Updates hostname for IP addresses
-	 *
-	 * @method update_address_hostname
-	 *
-	 * @param  mixed $ip
-	 * @param  int $id
-	 * @param  string $hostname
-	 *
-	 * @return void
-	 */
-	public function update_address_hostname ($ip, $id, $hostname = "") {
-		if(is_numeric($id) && strlen($hostname)>0) {
-			try { $this->Database->updateObject("ipaddresses", array("id"=>$id, "hostname"=>$hostname)); }
-			catch (Exception $e) {
-				return false;
-			}
-			// save log
-			$this->Log->write( "Address DNS resolved", "Address $ip resolved<hr>".$this->array_to_log((array) $hostname), 0);
-			$this->Log->write_changelog('ip_addr', "edit", 'success', array ("id"=>$id, "hostname"=>""), array("id"=>$id, "hostname"=>$hostname), $this->mail_changelog);
-		}
-	}
-
-	/**
-	 * Checks if subnet usage is over threshold and sends alert
-	 *
-	 * @access private
-	 * @param mixed $address
-	 * @return void
-	 */
-	private function threshold_check ($address) {
-    	$address = (object) $address;
-    	$content = array();
-    	$content_plain = array();
-
-        # fetch settings
-        $this->get_settings ();
-    	# enabled ?
-    	if ($this->settings->enableThreshold=="1") {
-        	# object
-        	if (!is_object($this->Subnets)) {
-            	$this->Subnets = new Subnets ($this->Database);
-        	}
-        	# fetch subnet
-        	$subnet = $this->Subnets->fetch_subnet("id", $address->subnetId);
-        	# threshold set ?
-        	if ($subnet->threshold>0) {
-            	# calculate subnet usage
-            	$subnet_usage = $this->Subnets->calculate_subnet_usage ($subnet);
-            	# if over send mail
-            	if (gmp_strval(gmp_sub(100,(int) round($subnet_usage['freehosts_percent'], 0))) > $subnet->threshold) {
-                	// fetch mail settings
-                	$Tools = new Tools ($this->Database);
-                	$admins        = $Tools->fetch_multiple_objects ("users", "role", "Administrator");
-                	// if some recipients
-                	if ($admins !== false) {
-						# try to send
-						try {
-	                    	// mail settings
-	                        $mail_settings = $Tools->fetch_object ("settingsMail", "id", 1);
-	                    	// mail class
-	                    	$phpipam_mail = new phpipam_mail ($this->settings, $mail_settings);
-
-	                        // set parameters
-	                        $subject = "Subnet threshold limit reached"." (".$this->transform_address($subnet->subnet,"dotted")."/".$subnet->mask.")";
-	                        $content[] = "<table style='margin-left:10px;margin-top:5px;width:auto;padding:0px;border-collapse:collapse;'>";
-	                        $content[] = "<tr><td style='padding:5px;margin:0px;color:#333;font-size:16px;text-shadow:1px 1px 1px white;border-bottom:1px solid #eeeeee;' colspan='2'>$this->mail_font_style<strong>$subject</font></td></tr>";
-	                        $content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;">'.$this->mail_font_style.''._('Subnet').'</a></font></td>	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;padding-top:10px;"><a href="'.$this->createURL().''.create_link("subnets",$subnet->sectionId, $subnet->id).'">'.$this->mail_font_style_href . $this->transform_address($subnet->subnet,"dotted")."/".$subnet->mask .'</font></a></td></tr>';
-	                        $content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;">'.$this->mail_font_style.''._('Description').'</font></td>	  	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;">'.$this->mail_font_style.''. $subnet->description .'</font></td></tr>';
-	                        $content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;">'.$this->mail_font_style.''._('Usage').' (%)</font></td>	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;">'.$this->mail_font_style.''. gmp_strval(gmp_sub(100,(int) round($subnet_usage['freehosts_percent'], 0))) .'</font></td></tr>';
-	                        $content[] = "</table>";
-	                        // plain
-	                        $content_plain[] = "$subject"."\r\n------------------------------\r\n";
-	                        $content_plain[] = _("Subnet").": ".$this->transform_address($subnet->subnet,"dotted")."/".$subnet->mask;
-	                        $content_plain[] = _("Usage")." (%) : ".gmp_strval(gmp_sub(100,(int) round($subnet_usage['freehosts_percent'], 0)));
-
-	                        # set content
-	                        $content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
-	                        $content_plain 	= implode("\r\n",$content_plain);
-
-                        	$phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
-                        	//add all admins to CC
-                        	$recipients = $this->changelog_mail_get_recipients ($subnet->id);
-
-                        	if ($recipients!==false) {
-                        		foreach($recipients as $a) {
-                    			    $phpipam_mail->Php_mailer->addAddress($a->email);
-                        		}
-
-                            	$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();
-                        	}
-                        	else {
-                            	return true;
-                        	}
-                        } catch (phpmailerException $e) {
-                        	$this->Result->show("danger", "Mailer Error: ".$e->errorMessage(), true);
-                        } catch (Exception $e) {
-                        	$this->Result->show("danger", "Mailer Error: ".$e->getMessage(), true);
-                        }
-                    }
-            	}
-        	}
-        	else {
-            	return true;
-        	}
-    	}
-    	else {
-        	return true;
-    	}
-	}
-
-	/**
-	 * Removes gateway if it exists
-	 *
-	 * @access public
-	 * @param mixed $subnetId
-	 * @return void
-	 */
-	public function remove_gateway ($subnetId) {
-		try { $this->Database->updateObject("ipaddresses", array("subnetId"=>$subnetId, "is_gateway"=>0), "subnetId"); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-	}
-
-	/**
-	 * Fetches custom IP address fields
-	 *
-	 * @access public
-	 * @return object custom address fields
-	 */
-	public function set_custom_fields () {
-		# Tools object
-		$Tools = new Tools ($this->Database);
-		# fetch
-		return $Tools->fetch_custom_fields ('ipaddresses');
-	}
-
-	/**
-	 * Checks if address already exists in subnet
-	 *
-	 *	if cnt is false we will return id if it exists and false ifnot
-	 *
-	 * @access public
-	 * @param int $address
-	 * @param int $subnetId
-	 * @param int $subnetId
-	 * @return boolean success/failure
-	 */
-	public function address_exists ($address, $subnetId, $cnt = true) {
-		# make sure it is in decimal format
-		$address = $this->transform_address($address, "decimal");
-		# check
-		if($cnt===true) { $query = "select count(*) as `cnt` from `ipaddresses` where `subnetId`=? and `ip_addr`=?;"; }
-		else			{ $query = "select `id` from `ipaddresses` where `subnetId`=? and `ip_addr`=?;";  }
-		# fetch
-		try { $count = $this->Database->getObjectQuery($query, array($subnetId, $address)); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-		# result
-		if ($cnt===true)	{ return $count->cnt==0 ? false : true; }
-		else				{ return is_null($count->id) ? false : $count->id; }
-	}
-
-	/**
-	 * Calculates diff between two IP addresses
-	 *
-	 * @access public
-	 * @param int $ip1
-	 * @param int $ip2
-	 * @return void
-	 */
-	public function calculate_address_diff ($ip1, $ip2) {
-		return gmp_strval(gmp_sub($ip2, $ip1));
-	}
-
-
-	/**
-	 * Returns first available subnet address, false if none
-	 *
-	 * @access public
-	 * @param int $subnetId
-	 * @param obj $Subnets
-	 * @return int / false
-	 */
-	public function get_first_available_address ($subnetId, $Subnets) {
-
-		# fetch all addresses in subnet and subnet
-		$addresses = $this->fetch_subnet_addresses ($subnetId, "ip_addr", "asc", array("ip_addr"));
-		$subnet = (array) $Subnets->fetch_subnet(null, $subnetId);
-
-		# if folder return false
-		if ($subnet['isFolder']=="1")                                                                   { return false; }
-
-		# false if slaves
-		$this->Subnets = new Subnets ($this->Database);
-		if($this->Subnets->has_slaves ($subnetId))                                                      { return false; }
-
-	    # get max hosts
-	    $max_hosts = $Subnets->get_max_hosts ($subnet['mask'], $this->identify_address($subnet['subnet']));
-
-		# full subnet?
-		if(sizeof($addresses)>=$max_hosts)																{ return false; } 	//full subnet
-
-		# set type
-		$ip_version = $this->identify_address ($subnet['subnet']);
-	    # get first diff > 1
-	    if(sizeof($addresses)>0) {
-		    foreach($addresses as $k=>$ipaddress) {
-			    # check subnet and first IP
-			    if($k==0) {
-				    # /31 fix
-				    if($subnet['mask']==31)	{
-					    if(gmp_strval(gmp_sub($addresses[$k]->ip_addr, $subnet['subnet']))>0) 			{ return gmp_strval($subnet['subnet']); }
-				    } else {
-					    if(gmp_strval(gmp_sub($addresses[$k]->ip_addr, $subnet['subnet']))>1) 			{ return gmp_strval(gmp_add($subnet['subnet'], 1)); }
-					    elseif($ip_version=="IPv6") {
-						    if(sizeof($addresses)==1) {
-							    if(gmp_strval(gmp_sub($addresses[$k]->ip_addr, $subnet['subnet']))==0)	{ return gmp_strval(gmp_add($subnet['subnet'], 1)); }
-						    }
-					    }
-				    }
-			    }
-			    else {
-				    if(gmp_strval(gmp_sub($addresses[$k]->ip_addr, $addresses[$k-1]->ip_addr))>1) 		{ return gmp_strval(gmp_add($addresses[$k-1]->ip_addr, 1)); }
-			    }
-		    }
-		    # all consecutive, last + 1
-		    																							{ return gmp_strval(gmp_add($addresses[$k]->ip_addr, 1)); }
-	    }
-	    # no addresses
-	    else {
-		    # /32, /31
-		    if($subnet['mask']==32 || $subnet['mask']==31 || $ip_version=="IPv6") 						{ return $subnet['subnet']; }
-		    else																						{ return gmp_strval(gmp_add($subnet['subnet'], 1)); }
-	    }
-	}
-
-
-
-
-
-
-
-
-
-	/**
-	 * @powerDNS
-	 * -------------------------------
-	 */
-
-	/**
-	 * Modifes powerDNS PTR record
-	 *
-	 * @access public
-	 * @param mixed $action
-	 * @param mixed $address
-	 * @param bool $print_error (default: true)
-	 * @return void
-	 */
-	public function ptr_modify ($action, $address, $print_error = true) {
-        // fetch settings
-        $this->settings ();
-        //check if powerdns enabled
-        if ($this->settings->enablePowerDNS!=1) {
-            return false;
+        # if diff is 2 return 1 IP address in the middle */
+        elseif ( $diff == 2 ) {
+                return array("ip"=>$this->transform_to_dotted($address1+1), "hosts"=>1);
         }
-        //enabled, proceed
+        # if diff is more than 2 return pool */
         else {
-    		// first check if subnet selected for PTR records
-    		$this->initialize_subnets_object ();
-    		$subnet = $this->Subnets->fetch_subnet ("id", $address['subnetId']);
-    		if ($subnet->DNSrecursive!="1") { return false; }
-
-    		// ignore if PTRignore set
-    		if ($address['PTRignore']=="1")	{
-				// validate db
-				$this->pdns_validate_connection ();
-				// remove if it exists
-				if ($this->ptr_exists ($address['PTR'])) {
-					$this->ptr_delete ($address, false);
-										{ return false; }
-				}
-				else {
-										{ return true; }
-				}
-    		}
-    		// validate db
-    		$this->pdns_validate_connection ();
-
-    		// to object
-    		$address = (object) $address;
-    		# execute based on action
-    		if($action=="add")				{ return $this->ptr_add ($address, $print_error); }							//create new PTR
-    		elseif($action=="edit")			{ return $this->ptr_edit ($address, $print_error); }						//modify existing PTR
-    		elseif($action=="delete")		{ return $this->ptr_delete ($address, $print_error); }						//delete PTR
-    		else							{ return $this->Result->show("danger", _("Invalid PDNS action"), true); }
-        }
-	}
-
-	/**
-	 * This function removes all records - ip and hostname referenced by address.
-	 *
-	 * @access public
-	 * @param mixed $address
-	 * @return void
-	 */
-	public function pdns_remove_ip_and_hostname_records ($address) {
-        // fetch settings
-        $this->settings ();
-        //check if powerdns enabled
-        if ($this->settings->enablePowerDNS!=1) {
-            return false;
+                return array("ip"=>$this->transform_to_dotted($address1+1)." - ".$this->transform_to_dotted(($address2-1)), "hosts"=>gmp_strval(gmp_sub($diff, 1)));
+        }
+        # default false
+        return false;
+    }
+
+    /**
+     * Search for unused address space between 2 IPv6 addresses
+     *
+     * Return unused address range or false if none available
+     *
+     * @access protected
+     * @param int $address1
+     * @param int $address2
+     * @param int $netmask
+     * @param bool $empty (default: false)
+     * @param bool $is_subnet (default: false)
+     * @param bool $is_broadcast (default: false)
+     * @return void
+     */
+    protected function find_unused_addresses_IPv6 ($address1, $address2, $netmask, $empty = false, $is_subnet = false, $is_broadcast = false) {
+        # Initialize PEAR NET object
+        $this->initialize_pear_net_IPv6 ();
+
+        if($empty) {
+            $Subnets = new Subnets ($this->Database);
+            return array("ip"=>$this->transform_to_dotted(gmp_strval($address1))." - ".$this->transform_to_dotted(gmp_strval($address2)), "hosts"=>$Subnets->get_max_hosts ($netmask, "IPv6"));
         }
-		// validate db
-		$this->pdns_validate_connection ();
-		// execute
-		return $this->PowerDNS->pdns_remove_ip_and_hostname_records ($address['hostname'], $address['ip_addr']);
-	}
-
-	/**
-	 *  Validates pdns database connection
-	 *
-	 * @access public
-	 * @param bool $die (default: false)
-	 * @return void
-	 */
-	public function pdns_validate_connection ($die = true) {
-		# powerDNS class
-		$this->PowerDNS = new PowerDNS ($this->Database);
-		# add API info
-		if(isset($this->api)) {
-			$this->PowerDNS->api = $this->api;
-		}
-		# check connection
-		if($this->PowerDNS->db_check()===false && $die) { $this->Result->show("danger", _("Cannot connect to powerDNS database"), true); }
-		# get settings
-		$this->get_settings ();
-	}
-
-	/**
-	 * Set zone name and fetch domain details
-	 *
-	 * @access private
-	 * @param mixed $subnet_id
-	 * @return array|false
-	 */
-	private function pdns_fetch_domain ($subnet_id) {
-		# initialize subnets
-		$this->initialize_subnets_object ();
-		// fetch subnet
-		$subnet = $this->Subnets->fetch_subnet ("id", $subnet_id);
-		if($subnet===false)							{  $this->Result->show("danger", _("Invalid subnet Id"), true); }
-
-		// set PTR zone name from IP/mash
-		$zone = $this->PowerDNS->get_ptr_zone_name ($this->transform_address ($subnet->subnet, "dotted"), $subnet->mask);
-		// try to fetch
-		return  $this->PowerDNS->fetch_domain_by_name ($zone);
-	}
-
-	/**
-	 * Create new PTR record when adding new IP address
-	 *
-	 * @access public
-	 * @param mixed $address
-	 * @param mixed $print_error (default: true)
-	 * @param mixed $id (default: NULL)
-	 * @return void
-	 */
-	public function ptr_add ($address, $print_error = true, $id = null) {
-		// decode values
-		$values = json_decode($this->settings->powerDNS);
-
-    	// set default hostname for PTR if set
-    	if (strlen($address->hostname)==0) {
-        	if (strlen($values->def_ptr_domain)>0) {
-            	$address->hostname = $values->def_ptr_domain;
-        	}
-    	}
-		// validate hostname
-		if ($this->validate_hostname ($address->hostname)===false)		{ return false; }
-		// fetch domain
-		$domain = $this->pdns_fetch_domain ($address->subnetId);
-
-		// formulate new record
-		$record = $this->PowerDNS->formulate_new_record ($domain->id, $this->PowerDNS->get_ip_ptr_name ($this->transform_address ($address->ip_addr, "dotted")), "PTR", $address->hostname, $values->ttl);
-		// insert record
-		$this->PowerDNS->add_domain_record ($record, false);
-		// link to address
-		$id = $id===null ? $this->lastId : $id;
-		$this->ptr_link ($id, $this->PowerDNS->lastId);
-		// ok
-		if ($print_error && php_sapi_name()!="cli")
-		$this->Result->show("success", "PTR record created", false);
-
-		return true;
-	}
-
-	/**
-	 * Edits PTR
-	 *
-	 * @access public
-	 * @param mixed $address
-	 * @param mixed $print_error (default: true)
-	 * @return void
-	 */
-	public function ptr_edit ($address, $print_error = true) {
-		// validate hostname
-		if ($this->validate_hostname ($address->hostname)===false)	{
-			// remove pointer if it exists!
-			if ($this->ptr_exists ($address->PTR)===true)	{ $this->ptr_delete ($address, $print_error); }
-			else											{ return false; }
-		}
-
-		// new record
- 		if ($this->ptr_exists ($address->PTR)===false) {
-	 		// fake lastid
-	 		$this->lastId = $address->id;
-	 		// new ptr record
-	 		$this->ptr_add ($address, true);
- 		}
- 		// update PTR
- 		else {
-			// fetch domain
-			$domain = $this->pdns_fetch_domain ($address->subnetId);
-
-			// fetch old
-			$old_record = $this->PowerDNS->fetch_record ($address->PTR);
-
-			// create insert array
-			$update = $this->PowerDNS->formulate_update_record ($this->PowerDNS->get_ip_ptr_name ($this->transform_address ($address->ip_addr, "dotted")), null, $address->hostname, null, null, null, $old_record->change_date);
-			$update['id'] = $address->PTR;
-
-			// update
-			$this->PowerDNS->update_domain_record ($domain->id, $update, $print_error);
-			// ok
-			if ($print_error && php_sapi_name()!="cli")
-			$this->Result->show("success", "PTR record updated", false);
- 		}
-	}
-
-	/**
-	 * Remove PTR from database
-	 *
-	 * @access public
-	 * @param mixed $address
-	 * @param mixed $print_error
-	 * @return void
-	 */
-	public function ptr_delete ($address, $print_error) {
-		$address = (object) $address;
-
-		// remove link from ipaddresses
-		$this->ptr_unlink ($address->id);
-
-		// exists
-		if ($this->ptr_exists ($address->PTR)!==false)	{
-			// fetch domain
-			$domain = $this->pdns_fetch_domain ($address->subnetId);
-			//remove
-			$this->PowerDNS->remove_domain_record ($domain->id, $address->PTR);
-    		// ok
-    		if ($print_error && php_sapi_name()!="cli")
-    		$this->Result->show("success", "PTR record removed", false);
-		}
-	}
-
-	/**
-	 * Links PTR record with address record
-	 *
-	 * @access public
-	 * @param mixed $address_id
-	 * @param mixed $ptr_id
-	 * @return void
-	 */
-	public function ptr_link ($address_id, $ptr_id) {
-		# execute
-		try { $this->Database->updateObject("ipaddresses", array("id"=>$address_id, "PTR"=>$ptr_id)); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			return false;
-		}
-	}
-
-	/**
-	 * Remove PTR link if it exists
-	 *
-	 * @access private
-	 * @param mixed $address_id
-	 * @return void
-	 */
-	private function ptr_unlink ($address_id) {
-		# execute
-		try { $this->Database->updateObject("ipaddresses", array("id"=>$address_id, "PTR"=>0)); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
-			return false;
-		}
-	}
-
-	/**
-	 * Removes all PTR references for all hosts in subnet
-	 *
-	 * @access public
-	 * @param mixed $subnet_id
-	 * @return void
-	 */
-	public function ptr_unlink_subnet_addresses ($subnet_id) {
-		try { $this->Database->runQuery("update `ipaddresses` set `PTR` = 0 where `subnetId` = ?;", array($subnet_id)); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-		#result
-		return true;
-	}
-
-	/**
-	 * Checks if PTR record exists
-	 *
-	 * @access private
-	 * @param mixed $ptr_id (default: 0)
-	 * @return void
-	 */
-	private function ptr_exists ($ptr_id = 0) {
-		return $this->PowerDNS->record_id_exists ($ptr_id);
-	}
-
-	/**
-	 * Returns array of all ptr indexes in surrent subnet
-	 *
-	 * @access public
-	 * @param mixed $subnetId
-	 * @return void
-	 */
-	public function ptr_get_subnet_indexes ($subnetId) {
-		try { $indexes = $this->Database->getObjectsQuery("select `PTR` from `ipaddresses` where `PTR` != 0 and `subnetId` = ?;", array($subnetId)); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-		# parse
-		if (sizeof($indexes)>0) {
-    		$out = array();
-    		// loop
-    		foreach ($indexes as $i) {
-        		$out[] = $i->PTR;
-    		}
-    		return $out;
-		}
-		else {
-    		return array();
-		}
-	}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-	/**
-	* @import address methods
-	* -------------------------------
-	*/
-
-	/**
-	 * Import single line from csv to database
-	 *
-	 * @access public
-	 * @param array $address
-	 * @param int $subnetId
-	 * @return void
-	 */
-	public function import_address_from_csv ($address, $subnetId) {
-		# Subnets object
-		$this->initialize_subnets_object ();
-
-	    # fetch subnet details
-	    $subnet = (array) $this->Subnets->fetch_subnet(null, $subnetId);
-
-	    # verify address
-	    if($this->verify_address( $address[0], $this->transform_to_dotted($subnet['subnet'])."/".$subnet['mask'], false, false)!==false) { return false; }
-	    # check for duplicates
-	    if ($this->address_exists($address[0], $subnetId)) { return _('IP address already exists').' - '.$address[0]; }
-
-		# format insert array
-		$address_insert = array("subnetId"=>$subnetId,
-								"ip_addr"=>$address[0],
-								"state"=>$address[1],
-								"description"=>$address[2],
-								"hostname"=>$address[3],
-								"mac"=>$address[4],
-								"owner"=>$address[5],
-								"switch"=>$address[6],
-								"port"=>$address[7],
-								"note"=>$address[8]
-								);
-
-		# switch to 0, state to active
-		$address_insert['switch'] = strlen($address_insert['switch'])==0 ? 0 : $address_insert['switch'];
-		$address_insert['state']  = strlen($address_insert['state'])==0 ?  1 : $address_insert['state'];
-
-		# custom fields, append to array
-		$m=9;
-		$custom_fields = $this->set_custom_fields();
-		if(sizeof($custom_fields) > 0) {
-			foreach($custom_fields as $c) {
-				$address_insert[$c['name']] = $address[$m];
-				$m++;
-			}
-		}
-
-		# insert
-		return $this->modify_address_add ($address_insert);
-	}
-
-
-
-
-
-
-
-
-
-
-	/**
-	* @address subnet methods
-	* -------------------------------
-	*/
-
-	/**
-	 * Opens new Subnets connection if not already opened
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function initialize_subnets_object () {
-		if(!is_object($this->Subnets)) { $this->Subnets = new Subnets ($this->Database); }
-	}
-
-	/**
-	 * Fetches all IP addresses in subnet
-	 *
-	 * @access public
-	 * @param mixed $subnetId
-	 * @param mixed $order (default: null)
-	 * @param mixed $order_direction (default: null)
-	 * @param string $fields (default: "*")
-	 * @return void
-	 */
-	public function fetch_subnet_addresses ($subnetId, $order=null, $order_direction=null, $fields = "*") {
-		# set order
-		if(!is_null($order)) 	{ $order = array($order, $order_direction); }
-		else 					{ $order = array("ip_addr", "asc"); }
-
-		# fields
-		if($fields!="*") {
-    		$fields = implode(",", $fields);
-		}
-
-		# escape ordering
-		$order[0] = $this->Database->escape ($order[0]);
-		$order[1] = $this->Database->escape ($order[1]);
-
-		try { $addresses = $this->Database->getObjectsQuery("SELECT $fields FROM `ipaddresses` where `subnetId` = ? order by `$order[0]` $order[1];", array($subnetId)); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-		# save to addresses cache
-		if(sizeof($addresses)>0) {
-			foreach($addresses as $k=>$address) {
-				# add decimal format
-				$address->ip = $this->transform_to_dotted ($address->ip_addr);
-				# save to subnets
-				$this->addresses[$address->id] = (object) $address;
-				$addresses[$k]->ip = $address->ip;
-			}
-		}
-		# result
-		return sizeof($addresses)>0 ? $addresses : array();
-	}
-
-	/**
-	 * Count number of IP addresses in subnet
-	 *
-	 * Returns number of addresses in subnet
-	 *
-	 * @access public
-	 * @param int $subnetId
-	 * @return int
-	 */
-	public function count_subnet_addresses ($subnetId) {
-		try { $count = $this->Database->numObjectsFilter("ipaddresses", "subnetId", $subnetId); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-		# result
-		return (int) $count;
-	}
-
-	/**
-	 * Count number of addresses in multiple subnets
-	 *
-	 *	we provide array of all subnet ids
-	 *
-	 * @access public
-	 * @param mixed $subnets
-	 * @return void
-	 */
-	public function count_addresses_in_multiple_subnets ($subnets) {
-		# empty
-		if(empty($subnets)) { return 0; }
-
-		# create query
-		$tmp = array();
-		foreach($subnets as $k=>$s) {
-			if (is_object($s))	{ $tmp[] = " `subnetId`=$s->id "; }
-			else				{ $tmp[] = " `subnetId`=$s "; }
-		}
-		$query  = "select count(*) as `cnt` from `ipaddresses` where ".implode("or", $tmp).";";
-
-		# fetch
-		try { $addresses = $this->Database->getObjectsQuery($query); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-		# return count
-	    return $addresses[0]->cnt;
-	}
-
-
-	/**
-	 * Fetch IP addresses for all recursive slaves
-	 *
-	 *	count returns count only, else whole subnets
-	 *
-	 * @access public
-	 * @param int $subnetId
-	 * @param bool $count
-	 * @return void
-	 */
-	public function fetch_subnet_addresses_recursive ($subnetId, $count = false, $order=null, $order_direction=null ) {
-		# initialize subnets
-		$this->initialize_subnets_object ();
-		$this->Subnets = new Subnets ($this->Database);
-		$this->Subnets->reset_subnet_slaves_recursive();				//reset array of slaves before continuing
-	    $this->Subnets->fetch_subnet_slaves_recursive($subnetId);		//fetch array of slaves
-	    $this->Subnets->slaves = array_unique($this->Subnets->slaves);	//remove possible duplicates
-
-		# ip address order
-		if(!is_null($order)) 	{ $order_addr = array($order, $order_direction); }
-		else 					{ $order_addr = array("ip_addr", "asc"); }
-
-		# escape ordering
-		$order_addr[0] = $this->Database->escape ($order_addr[0]);
-		$order_addr[1] = $this->Database->escape ($order_addr[1]);
-
-		$ids = array();
-		$ids[] = $subnetId;
-
-	    # set query to fetch all ip addresses for specified subnets or just count
-		if($count) 	{ $query = 'select count(*) as cnt from `ipaddresses` where `subnetId` = ? '; }
-		else	 	{ $query = 'select * from `ipaddresses` where `subnetId` = ? '; }
-	    foreach($this->Subnets->slaves as $subnetId2) {
-		    # ignore orphaned
-	    	if($subnetId2 != $subnetId) {
-				$query  .= " or `subnetId` = ? ";
-		    	$ids[] = $subnetId2;
-			}
-		}
-
-	    $query      .= "order by `$order_addr[0]` $order_addr[1];";
-		# fetch
-		try { $addresses = $this->Database->getObjectsQuery($query, $ids); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-	    # return ip address array or just count
-	    return $count ? (int) $addresses[0]->cnt : $addresses;
-	}
-
-	/**
-	 * Search for unused address space between 2 IP addresses
-	 *
-	 * possible unused addresses by type
-	 *
-	 * @access public
-	 * @param int $address1
-	 * @param int $address2
-	 * @param int $netmask
-	 * @param bool $empty (default: false)
-	 * @param bool $is_subnet (default: false)
-	 * @param bool $is_broadcast (default: false)
-	 * @return void
-	 */
-	public function find_unused_addresses ($address1, $address2, $netmask, $empty=false, $is_subnet=false, $is_broadcast=false) {
-		# make sure addresses are in decimal format
-		$address1 = $this->transform_address ($address1, "decimal");
-		$address2 = $this->transform_address ($address2, "decimal");
-		# check for space
-		return $this->identify_address($address1)=="IPv6" ? $this->find_unused_addresses_IPv6 ($address1, $address2, $netmask, $empty, $is_subnet, $is_broadcast) : $this->find_unused_addresses_IPv4 ($address1, $address2, $netmask, $empty);
-	}
-
-	/**
-	 * Search for unused address space between 2 IPv4 addresses.
-	 *
-	 * unused address range or false if none available
-	 *
-	 * @access protected
-	 * @param int $address1
-	 * @param int $address2
-	 * @param int $netmask
-	 * @param bool $empty
-	 * @return void
-	 */
-	protected function find_unused_addresses_IPv4 ($address1, $address2, $netmask, $empty) {
-		# calculate diff
-		$diff = $this->calculate_address_diff ($address1, $address2);
-		# 32 subnets
-		if($netmask==32) {
-			if($empty) {
-				return array("ip"=>$this->transform_to_dotted($address1), "hosts"=>1);
-			}
-			else {
-				return false;
-			}
-		}
-		# 31 subnets
-		elseif($netmask==31) {
-
-			if($empty) {
-				return array("ip"=>$this->transform_to_dotted($address1), "hosts"=>2);
-			}
-			elseif($diff==1) {
-				if($this->is_network($address1, $netmask)) {
-					return array("ip"=>$this->transform_to_dotted($address2), "hosts"=>1);
-				}
-				elseif($this->is_broadcast($address2, $netmask)) {
-					return array("ip"=>$this->transform_to_dotted($address1), "hosts"=>1);
-				}
-				else {
-					return false;
-				}
-			}
-			else {
-				return false;
-			}
-		}
-		# if diff is less than 2 return false */
-		elseif ( $diff < 2 ) {
-        		return false;
-    	}
-		# if diff is 2 return 1 IP address in the middle */
-		elseif ( $diff == 2 ) {
-				return array("ip"=>$this->transform_to_dotted($address1+1), "hosts"=>1);
-    	}
-		# if diff is more than 2 return pool */
-		else {
-            	return array("ip"=>$this->transform_to_dotted($address1+1)." - ".$this->transform_to_dotted(($address2-1)), "hosts"=>gmp_strval(gmp_sub($diff, 1)));
-    	}
-    	# default false
-    	return false;
-	}
-
-	/**
-	 * Search for unused address space between 2 IPv6 addresses
-	 *
-	 * Return unused address range or false if none available
-	 *
-	 * @access protected
-	 * @param int $address1
-	 * @param int $address2
-	 * @param int $netmask
-	 * @param bool $empty (default: false)
-	 * @param bool $is_subnet (default: false)
-	 * @param bool $is_broadcast (default: false)
-	 * @return void
-	 */
-	protected function find_unused_addresses_IPv6 ($address1, $address2, $netmask, $empty = false, $is_subnet = false, $is_broadcast = false) {
-		# Initialize PEAR NET object
-		$this->initialize_pear_net_IPv6 ();
-
-		if($empty) {
-    		$Subnets = new Subnets ($this->Database);
-    		return array("ip"=>$this->transform_to_dotted(gmp_strval($address1))." - ".$this->transform_to_dotted(gmp_strval($address2)), "hosts"=>$Subnets->get_max_hosts ($netmask, "IPv6"));
-		}
         else {
-    		# calculate diff
-    		$diff = $this->calculate_address_diff ($address1, $address2);
+            # calculate diff
+            $diff = $this->calculate_address_diff ($address1, $address2);
 
-    		# /128
-    		if($netmask == 128) {
-        		if($diff>1) {
+            # /128
+            if($netmask == 128) {
+                if($diff>1) {
                     return array("ip"=>$this->transform_to_dotted(gmp_strval($address1)), "hosts"=>1);
                 }
-        	}
-    		# /127
-    	    elseif($netmask == 127) {
-        	    if($diff==1 && $this->is_network($address1, $netmask)) {
-    				return array("ip"=>$this->transform_to_dotted($address2), "hosts"=>1);
-    			}
-    			elseif($diff==1 && $this->is_broadcast($address2, $netmask)) {
-    				return array("ip"=>$this->transform_to_dotted($address1), "hosts"=>1);
-    			}
-    			elseif($diff==0) {
-        			return false;
-    			}
-    			else {
-    				return array("ip"=>$this->transform_to_dotted($address1), "hosts"=>2);
-    			}
-    	    }
-    	    # null
-    	    elseif ($diff==0) {
-        	    return false;
-    	    }
-    	    # diff 1
-    	    elseif ($diff==1) {
-         		if($is_subnet) {
+            }
+            # /127
+            elseif($netmask == 127) {
+                if($diff==1 && $this->is_network($address1, $netmask)) {
+                    return array("ip"=>$this->transform_to_dotted($address2), "hosts"=>1);
+                }
+                elseif($diff==1 && $this->is_broadcast($address2, $netmask)) {
+                    return array("ip"=>$this->transform_to_dotted($address1), "hosts"=>1);
+                }
+                elseif($diff==0) {
+                    return false;
+                }
+                else {
+                    return array("ip"=>$this->transform_to_dotted($address1), "hosts"=>2);
+                }
+            }
+            # null
+            elseif ($diff==0) {
+                return false;
+            }
+            # diff 1
+            elseif ($diff==1) {
+                    if($is_subnet) {
                     return array("ip"=>$this->transform_to_dotted(gmp_strval($address1)), "hosts"=>1);
-        		}
-        		elseif($is_broadcast) {
+                }
+                elseif($is_broadcast) {
                     return array("ip"=>$this->transform_to_dotted(gmp_strval($address2)), "hosts"=>1);
-        		}
-        		else {
-            		return false;
                 }
-    	    }
-    	    # diff 2
-    	    elseif ($diff==2 && !$is_subnet && !$is_broadcast) {
+                else {
+                    return false;
+                }
+            }
+            # diff 2
+            elseif ($diff==2 && !$is_subnet && !$is_broadcast) {
                 return array("ip"=>$this->transform_to_dotted(gmp_strval(gmp_add($address1,1))), "hosts"=>1);
-    	    }
-    	    # default
-    	    else {
-        		if($is_subnet) {
+            }
+            # default
+            else {
+                if($is_subnet) {
                     return array("ip"=>$this->transform_to_dotted(gmp_strval($address1))." - ".$this->transform_to_dotted(gmp_strval(gmp_sub($address2,1))), "hosts"=>$this->reformat_number(gmp_strval(gmp_sub($diff,0))));
-        		}
-        		elseif($is_broadcast) {
+                }
+                elseif($is_broadcast) {
                     return array("ip"=>$this->transform_to_dotted(gmp_strval(gmp_add($address1,1)))." - ".$this->transform_to_dotted(gmp_strval($address2)), "hosts"=>$this->reformat_number(gmp_strval(gmp_sub($diff,0))));
-        		}
-        		else {
+                }
+                else {
                     return array("ip"=>$this->transform_to_dotted(gmp_strval(gmp_add($address1,1)))." - ".$this->transform_to_dotted(gmp_strval(gmp_sub($address2,1))), "hosts"=>$this->reformat_number(gmp_strval(gmp_strval(gmp_sub($diff,1)))));
                 }
-        	}
+            }
 
-        	# default false
-        	return false;
-    	}
-	}
+            # default false
+            return false;
+        }
+    }
 
 
 
@@ -1613,390 +1613,390 @@ 
 
 
 
-	/**
-	* @address verification methods
-	* -------------------------------
-	*/
+    /**
+     * @address verification methods
+     * -------------------------------
+     */
 
-	/**
-	 * Verify IP address
-	 *
-	 * @access public
-	 * @param int $address
-	 * @param mixed $subnet (CIDR)
-	 * @param bool $no_strict (default: false)
-	 * @param bool $die (default: false)
-	 * @return boolean
-	 */
-	public function verify_address( $address, $subnet, $no_strict = false, $die=true ) {
-		# subnet should be in CIDR format
-		$this->initialize_subnets_object ();
-		if(strlen($error = $this->Subnets->verify_cidr ($subnet))>1)				{ $this->Result->show("danger", $error, $die); return true; }
+    /**
+     * Verify IP address
+     *
+     * @access public
+     * @param int $address
+     * @param mixed $subnet (CIDR)
+     * @param bool $no_strict (default: false)
+     * @param bool $die (default: false)
+     * @return boolean
+     */
+    public function verify_address( $address, $subnet, $no_strict = false, $die=true ) {
+        # subnet should be in CIDR format
+        $this->initialize_subnets_object ();
+        if(strlen($error = $this->Subnets->verify_cidr ($subnet))>1)				{ $this->Result->show("danger", $error, $die); return true; }
 
-		# make checks
-		return $this->identify_address ($address)=="IPv6" ? $this->verify_address_IPv6 ($address, $subnet, $die) : $this->verify_address_IPv4 ($address, $subnet, $no_strict, $die);
-	}
+        # make checks
+        return $this->identify_address ($address)=="IPv6" ? $this->verify_address_IPv6 ($address, $subnet, $die) : $this->verify_address_IPv4 ($address, $subnet, $no_strict, $die);
+    }
 
-	/**
-	 * Verify IPv4 address
-	 *
-	 * @access public
-	 * @param int $address
-	 * @param mixed $subnet (CIDR)
-	 * @param bool $no_strict
-	 * @param bool $die
-	 * @return boolean
-	 */
-	public function verify_address_IPv4 ($address, $subnet, $no_strict, $die) {
-		# Initialize PEAR NET object
-		$this->initialize_pear_net_IPv4 ();
+    /**
+     * Verify IPv4 address
+     *
+     * @access public
+     * @param int $address
+     * @param mixed $subnet (CIDR)
+     * @param bool $no_strict
+     * @param bool $die
+     * @return boolean
+     */
+    public function verify_address_IPv4 ($address, $subnet, $no_strict, $die) {
+        # Initialize PEAR NET object
+        $this->initialize_pear_net_IPv4 ();
         # fetch mask part
         $mask = explode("/", $subnet);
 
-		# is address valid?
-		if (!$this->Net_IPv4->validateIP($address)) 						{ $this->Result->show("danger", _("IP address not valid")."! ($address)", $die); return true; }
-		# is address in provided subnet
-		elseif (!$this->Net_IPv4->ipInNetwork($address, $subnet)) 			{ $this->Result->show("danger", _("IP address not in selected subnet")."! ($address)", $die); return true; }
-		# ignore  /31 and /32 subnet broadcast and subnet checks!
-		elseif ($mask[1] == 31 || $mask[1] == 32 || $no_strict == true) 	{ }
-		# It cannot be subnet or broadcast
-		else {
+        # is address valid?
+        if (!$this->Net_IPv4->validateIP($address)) 						{ $this->Result->show("danger", _("IP address not valid")."! ($address)", $die); return true; }
+        # is address in provided subnet
+        elseif (!$this->Net_IPv4->ipInNetwork($address, $subnet)) 			{ $this->Result->show("danger", _("IP address not in selected subnet")."! ($address)", $die); return true; }
+        # ignore  /31 and /32 subnet broadcast and subnet checks!
+        elseif ($mask[1] == 31 || $mask[1] == 32 || $no_strict == true) 	{ }
+        # It cannot be subnet or broadcast
+        else {
             $net = $this->Net_IPv4->parseAddress($subnet);
 
             if ($net->network == $address) 									{ $this->Result->show("danger", _("Cannot add subnet as IP address!"), $die); return true; }
             elseif ($net->broadcast == $address)							{ $this->Result->show("danger", _("Cannot add broadcast as IP address!"), $die); return true; }
-		}
-		# default
-		return false;
-	}
-
-	/**
-	 * Verify IPv6 address
-	 *
-	 * @access public
-	 * @param int $address
-	 * @param mixed $subnet (CIDR)
-	 * @param bool $die
-	 * @return boolean
-	 */
-	public function verify_address_IPv6 ($address, $subnet, $die) {
-		# Initialize PEAR NET object
-		$this->initialize_pear_net_IPv6 ();
-
-		# is it valid?
-		if (!$this->Net_IPv6->checkIPv6($address)) 							{ $this->Result->show("danger", _("IP address not valid")."! ($address)", $die); return true; }
-		# it must be in provided subnet
-		elseif (!$this->Net_IPv6->isInNetmask($address, $subnet)) 			{ $this->Result->show("danger", _("IP address not in selected subnet")."! ($address)", $die); return true; }
-		# default
-		return false;
-	}
-
-	/**
-	 * Validates IP address
-	 *
-	 * @access public
-	 * @param mixed $address
-	 * @return void
-	 */
-	public function validate_address ($address) {
-		# Initialize PEAR NET object
-		$this->initialize_pear_net_IPv4 ();
-		$this->initialize_pear_net_IPv6 ();
-
-		// no null
-		if($this->transform_address ($address, "decimal")==0) {
-			return false;
-		}
-		// transform
-		$address = $this->transform_address ($address, "dotted");
-		// ipv6
-		if($this->identify_address ($address)=="IPv6") {
-			return $this->Net_IPv6->checkIPv6($address) ?  true : false;
-		}
-		// ipv4
-		else {
-			return $this->Net_IPv4->validateIP($address) ? true : false;
-		}
-	}
-
-	/**
-	 * Checks if address is subnet for IPv4 addresses
-	 *
-	 * @access public
-	 * @param mixed $address
-	 * @param int $netmask
-	 * @return boolean
-	 */
-	public function is_network ($address, $netmask) {
-		$this->initialize_subnets_object ();
-		$boundaries = $this->Subnets->get_network_boundaries ($address, $netmask);
-		return $this->transform_address($address,"dotted")==$boundaries['network'] ? true : false;
-	}
-
-	/**
-	 * Checks if address is broadcast for IPv4 addresses
-	 *
-	 * @access public
-	 * @param mixed $address
-	 * @param int $netmask
-	 * @return boolean
-	 */
-	public function is_broadcast ($address, $netmask) {
-		$this->initialize_subnets_object ();
-		$boundaries = $this->Subnets->get_network_boundaries ($address, $netmask);
-		return $this->transform_address($address,"dotted")==$boundaries['broadcast'] ? true : false;
-	}
-
-	/**
-	 * Checks if hostname in database is unique
-	 *
-	 * @access public
-	 * @param mixed $hostname
-	 * @return boolean
-	 */
-	public function is_hostname_unique ($hostname) {
-		try { $cnt = $this->Database->numObjectsFilter("ipaddresses", "hostname", $hostname); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-		return $cnt==0 ? true : false;
-	}
-
-
-
-
-
-
-
-
-
-
-
-
-
-	/**
-	* @transform address methods
-	* -------------------------------
-	*/
-
-	/**
-	 * This function compresses all ranges
-	 *
-	 *	input is array of ip addresses
-	 *	output compresses address range
-	 *
-	 * @access public
-	 * @param array $addresses
-	 * @return void
-	 */
-	public function compress_address_ranges ($addresses, $state=4) {
-    	# set size
-    	$size = sizeof($addresses);
-    	// vars
-    	$addresses_formatted = array();
-
-		# loop through IP addresses
-		for($c=0; $c<$size; $c++) {
-			# ignore already comressed range
-			if($addresses[$c]->class!="compressed-range") {
-				# gap between this and previous
-				if(gmp_strval( @gmp_sub($addresses[$c]->ip_addr, $addresses[$c-1]->ip_addr)) != 1) {
-					# remove index flag
-					unset($fIndex);
-					# save IP address
-					$addresses_formatted[$c] = $addresses[$c];
-					$addresses_formatted[$c]->class = "ip";
-
-					# no gap this -> next
-					if(gmp_strval( @gmp_sub($addresses[$c]->ip_addr, $addresses[$c+1]->ip_addr)) == -1 && $addresses[$c]->state==$state) {
-						//is state the same?
-						if($addresses[$c]->state==$addresses[$c+1]->state) {
-							$fIndex = $c;
-							$addresses_formatted[$fIndex]->startIP = $addresses[$c]->ip_addr;
-							$addresses_formatted[$c]->class = "compressed-range";
-						}
-					}
-				}
-				# no gap between this and previous
-				else {
-					# is state same as previous?
-					if($addresses[$c]->state==$addresses[$c-1]->state && $addresses[$c]->state==$state) {
-						$addresses_formatted[$fIndex]->stopIP = $addresses[$c]->ip_addr;	//adds dhcp state
-						$addresses_formatted[$fIndex]->numHosts = gmp_strval( gmp_add(@gmp_sub($addresses[$c]->ip_addr, $addresses_formatted[$fIndex]->ip_addr),1));	//add number of hosts
-					}
-					# different state
-					else {
-						# remove index flag
-						unset($fIndex);
-						# save IP address
-						$addresses_formatted[$c] = $addresses[$c];
-						$addresses_formatted[$c]->class = "ip";
-						# check if state is same as next to start range
-						if($addresses[$c]->state==@$addresses[$c+1]->state &&  gmp_strval( @gmp_sub($addresses[$c]->ip_addr, $addresses[$c+1]->ip_addr)) == -1 && $addresses[$c]->state==$state) {
-							$fIndex = $c;
-							$addresses_formatted[$fIndex]->startIP = $addresses[$c]->ip_addr;
-							$addresses_formatted[$c]->class = "compressed-range";
-						}
-					}
-				}
-			}
-			else {
-				# save already compressed
-				$addresses_formatted[$c] = $addresses[$c];
-			}
-		}
-		# overrwrite ipaddresses and rekey
-		$addresses = @array_values($addresses_formatted);
-		# return
-		return $addresses;
-	}
-
-	/**
-	 * Finds invalid addresses - that have subnetId that does not exist
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function find_invalid_addresses () {
-    	// init
-    	$false = array();
-		// find unique ids
-		$ids = $this->find_unique_subnetids ();
-		if ($ids===false)										{ return false; }
-
-		// validate
-		foreach ($ids as $id) {
-			if ($this->verify_subnet_id ($id->subnetId)===false) {
-				$false[] = $this->fetch_subnet_addresses ($id->subnetId);
-			}
-		}
-		// filter
-		$false = array_filter($false);
-		// return
-		return sizeof($false)>0 ? $false : false;
-	}
-
-	/**
-	 * Finds all unique master subnet ids
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function find_unique_subnetids () {
-		try { $res = $this->Database->getObjectsQuery("select distinct(`subnetId`) from `ipaddresses` order by `subnetId` asc;"); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-		# return
-		return sizeof($res)>0 ? $res : false;
-	}
-
-	/**
-	 * Verifies that subnetid exists
-	 *
-	 * @access private
-	 * @param mixed $id
-	 * @return void
-	 */
-	private function verify_subnet_id ($id) {
-		try { $res = $this->Database->numObjectsFilter("subnets", "id", $id ); }
-		catch (Exception $e) {
-			$this->Result->show("danger", _("Error: ").$e->getMessage());
-			return false;
-		}
-		# return
-		return $res==0 ? false : true;
-	}
-
-
-
-
-
-
-
-
-
-
-
-	/**
-	* @permission address methods
-	* -------------------------------
-	*/
-
-	/**
-	 * Checks permission for specified subnet
-	 *
-	 *	we provide user details and subnetId
-	 *
-	 * @access public
-	 * @param object $user
-	 * @param int $subnetId
-	 * @return int permission level
-	 */
-	public function check_permission ($user, $subnetId) {
-
-		# get all user groups
-		$groups = json_decode($user->groups);
-
-		# if user is admin then return 3, otherwise check
-		if($user->role == "Administrator")	{ return 3; }
-
-    	# object
-    	if (!is_object($this->Subnets)) {
-        	$this->Subnets = new Subnets ($this->Database);
-    	}
-        # fetch subnet
-        $subnet = $this->Subnets->fetch_subnet("id", $subnetId);
-		# set subnet permissions
-		$subnetP = json_decode($subnet->permissions);
+        }
+        # default
+        return false;
+    }
+
+    /**
+     * Verify IPv6 address
+     *
+     * @access public
+     * @param int $address
+     * @param mixed $subnet (CIDR)
+     * @param bool $die
+     * @return boolean
+     */
+    public function verify_address_IPv6 ($address, $subnet, $die) {
+        # Initialize PEAR NET object
+        $this->initialize_pear_net_IPv6 ();
+
+        # is it valid?
+        if (!$this->Net_IPv6->checkIPv6($address)) 							{ $this->Result->show("danger", _("IP address not valid")."! ($address)", $die); return true; }
+        # it must be in provided subnet
+        elseif (!$this->Net_IPv6->isInNetmask($address, $subnet)) 			{ $this->Result->show("danger", _("IP address not in selected subnet")."! ($address)", $die); return true; }
+        # default
+        return false;
+    }
+
+    /**
+     * Validates IP address
+     *
+     * @access public
+     * @param mixed $address
+     * @return void
+     */
+    public function validate_address ($address) {
+        # Initialize PEAR NET object
+        $this->initialize_pear_net_IPv4 ();
+        $this->initialize_pear_net_IPv6 ();
+
+        // no null
+        if($this->transform_address ($address, "decimal")==0) {
+            return false;
+        }
+        // transform
+        $address = $this->transform_address ($address, "dotted");
+        // ipv6
+        if($this->identify_address ($address)=="IPv6") {
+            return $this->Net_IPv6->checkIPv6($address) ?  true : false;
+        }
+        // ipv4
+        else {
+            return $this->Net_IPv4->validateIP($address) ? true : false;
+        }
+    }
+
+    /**
+     * Checks if address is subnet for IPv4 addresses
+     *
+     * @access public
+     * @param mixed $address
+     * @param int $netmask
+     * @return boolean
+     */
+    public function is_network ($address, $netmask) {
+        $this->initialize_subnets_object ();
+        $boundaries = $this->Subnets->get_network_boundaries ($address, $netmask);
+        return $this->transform_address($address,"dotted")==$boundaries['network'] ? true : false;
+    }
+
+    /**
+     * Checks if address is broadcast for IPv4 addresses
+     *
+     * @access public
+     * @param mixed $address
+     * @param int $netmask
+     * @return boolean
+     */
+    public function is_broadcast ($address, $netmask) {
+        $this->initialize_subnets_object ();
+        $boundaries = $this->Subnets->get_network_boundaries ($address, $netmask);
+        return $this->transform_address($address,"dotted")==$boundaries['broadcast'] ? true : false;
+    }
+
+    /**
+     * Checks if hostname in database is unique
+     *
+     * @access public
+     * @param mixed $hostname
+     * @return boolean
+     */
+    public function is_hostname_unique ($hostname) {
+        try { $cnt = $this->Database->numObjectsFilter("ipaddresses", "hostname", $hostname); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+        return $cnt==0 ? true : false;
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+    /**
+     * @transform address methods
+     * -------------------------------
+     */
+
+    /**
+     * This function compresses all ranges
+     *
+     *	input is array of ip addresses
+     *	output compresses address range
+     *
+     * @access public
+     * @param array $addresses
+     * @return void
+     */
+    public function compress_address_ranges ($addresses, $state=4) {
+        # set size
+        $size = sizeof($addresses);
+        // vars
+        $addresses_formatted = array();
+
+        # loop through IP addresses
+        for($c=0; $c<$size; $c++) {
+            # ignore already comressed range
+            if($addresses[$c]->class!="compressed-range") {
+                # gap between this and previous
+                if(gmp_strval( @gmp_sub($addresses[$c]->ip_addr, $addresses[$c-1]->ip_addr)) != 1) {
+                    # remove index flag
+                    unset($fIndex);
+                    # save IP address
+                    $addresses_formatted[$c] = $addresses[$c];
+                    $addresses_formatted[$c]->class = "ip";
+
+                    # no gap this -> next
+                    if(gmp_strval( @gmp_sub($addresses[$c]->ip_addr, $addresses[$c+1]->ip_addr)) == -1 && $addresses[$c]->state==$state) {
+                        //is state the same?
+                        if($addresses[$c]->state==$addresses[$c+1]->state) {
+                            $fIndex = $c;
+                            $addresses_formatted[$fIndex]->startIP = $addresses[$c]->ip_addr;
+                            $addresses_formatted[$c]->class = "compressed-range";
+                        }
+                    }
+                }
+                # no gap between this and previous
+                else {
+                    # is state same as previous?
+                    if($addresses[$c]->state==$addresses[$c-1]->state && $addresses[$c]->state==$state) {
+                        $addresses_formatted[$fIndex]->stopIP = $addresses[$c]->ip_addr;	//adds dhcp state
+                        $addresses_formatted[$fIndex]->numHosts = gmp_strval( gmp_add(@gmp_sub($addresses[$c]->ip_addr, $addresses_formatted[$fIndex]->ip_addr),1));	//add number of hosts
+                    }
+                    # different state
+                    else {
+                        # remove index flag
+                        unset($fIndex);
+                        # save IP address
+                        $addresses_formatted[$c] = $addresses[$c];
+                        $addresses_formatted[$c]->class = "ip";
+                        # check if state is same as next to start range
+                        if($addresses[$c]->state==@$addresses[$c+1]->state &&  gmp_strval( @gmp_sub($addresses[$c]->ip_addr, $addresses[$c+1]->ip_addr)) == -1 && $addresses[$c]->state==$state) {
+                            $fIndex = $c;
+                            $addresses_formatted[$fIndex]->startIP = $addresses[$c]->ip_addr;
+                            $addresses_formatted[$c]->class = "compressed-range";
+                        }
+                    }
+                }
+            }
+            else {
+                # save already compressed
+                $addresses_formatted[$c] = $addresses[$c];
+            }
+        }
+        # overrwrite ipaddresses and rekey
+        $addresses = @array_values($addresses_formatted);
+        # return
+        return $addresses;
+    }
+
+    /**
+     * Finds invalid addresses - that have subnetId that does not exist
+     *
+     * @access public
+     * @return void
+     */
+    public function find_invalid_addresses () {
+        // init
+        $false = array();
+        // find unique ids
+        $ids = $this->find_unique_subnetids ();
+        if ($ids===false)										{ return false; }
+
+        // validate
+        foreach ($ids as $id) {
+            if ($this->verify_subnet_id ($id->subnetId)===false) {
+                $false[] = $this->fetch_subnet_addresses ($id->subnetId);
+            }
+        }
+        // filter
+        $false = array_filter($false);
+        // return
+        return sizeof($false)>0 ? $false : false;
+    }
+
+    /**
+     * Finds all unique master subnet ids
+     *
+     * @access private
+     * @return void
+     */
+    private function find_unique_subnetids () {
+        try { $res = $this->Database->getObjectsQuery("select distinct(`subnetId`) from `ipaddresses` order by `subnetId` asc;"); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+        # return
+        return sizeof($res)>0 ? $res : false;
+    }
+
+    /**
+     * Verifies that subnetid exists
+     *
+     * @access private
+     * @param mixed $id
+     * @return void
+     */
+    private function verify_subnet_id ($id) {
+        try { $res = $this->Database->numObjectsFilter("subnets", "id", $id ); }
+        catch (Exception $e) {
+            $this->Result->show("danger", _("Error: ").$e->getMessage());
+            return false;
+        }
+        # return
+        return $res==0 ? false : true;
+    }
+
+
+
+
+
+
+
 
-		# set section permissions
-		$Section = new Section ($this->Database);
-		$section = $Section->fetch_section ("id", $subnet->sectionId);
-		$sectionP = json_decode($section->permissions);
 
-		# default permission
-		$out = 0;
 
-		# for each group check permissions, save highest to $out
-		if(sizeof($sectionP) > 0) {
-			foreach($sectionP as $sk=>$sp) {
-				# check each group if user is in it and if so check for permissions for that group
-				foreach($groups as $uk=>$up) {
-					if($uk == $sk) {
-						if($sp > $out) { $out = $sp; }
-					}
-				}
-			}
-		}
-		else {
-			return 0;
-		}
 
-		# if section permission == 0 then return 0
-		if($out == 0) {
-			return 0;
-		}
-		else {
-			$out = 0;
-			# ok, user has section access, check also for any higher access from subnet
-			if(sizeof($subnetP) > 0) {
-				foreach($subnetP as $sk=>$sp) {
-					# check each group if user is in it and if so check for permissions for that group
-					foreach($groups as $uk=>$up) {
-						if($uk == $sk) {
-							if($sp > $out) { $out = $sp; }
-						}
-					}
-				}
-			}
-		}
+    /**
+     * @permission address methods
+     * -------------------------------
+     */
+
+    /**
+     * Checks permission for specified subnet
+     *
+     *	we provide user details and subnetId
+     *
+     * @access public
+     * @param object $user
+     * @param int $subnetId
+     * @return int permission level
+     */
+    public function check_permission ($user, $subnetId) {
+
+        # get all user groups
+        $groups = json_decode($user->groups);
+
+        # if user is admin then return 3, otherwise check
+        if($user->role == "Administrator")	{ return 3; }
+
+        # object
+        if (!is_object($this->Subnets)) {
+            $this->Subnets = new Subnets ($this->Database);
+        }
+        # fetch subnet
+        $subnet = $this->Subnets->fetch_subnet("id", $subnetId);
+        # set subnet permissions
+        $subnetP = json_decode($subnet->permissions);
+
+        # set section permissions
+        $Section = new Section ($this->Database);
+        $section = $Section->fetch_section ("id", $subnet->sectionId);
+        $sectionP = json_decode($section->permissions);
+
+        # default permission
+        $out = 0;
+
+        # for each group check permissions, save highest to $out
+        if(sizeof($sectionP) > 0) {
+            foreach($sectionP as $sk=>$sp) {
+                # check each group if user is in it and if so check for permissions for that group
+                foreach($groups as $uk=>$up) {
+                    if($uk == $sk) {
+                        if($sp > $out) { $out = $sp; }
+                    }
+                }
+            }
+        }
+        else {
+            return 0;
+        }
+
+        # if section permission == 0 then return 0
+        if($out == 0) {
+            return 0;
+        }
+        else {
+            $out = 0;
+            # ok, user has section access, check also for any higher access from subnet
+            if(sizeof($subnetP) > 0) {
+                foreach($subnetP as $sk=>$sp) {
+                    # check each group if user is in it and if so check for permissions for that group
+                    foreach($groups as $uk=>$up) {
+                        if($uk == $sk) {
+                            if($sp > $out) { $out = $sp; }
+                        }
+                    }
+                }
+            }
+        }
 
-		# return result
-		return $out;
-	}
+        # return result
+        return $out;
+    }
 
 
 
@@ -2007,27 +2007,27 @@ 
 
 
 
-	/**
-	* @misc address methods
-	* -------------------------------
-	*/
+    /**
+     * @misc address methods
+     * -------------------------------
+     */
 
-	/**
-	 * Present numbers in pow 10, only for IPv6
-	 *
-	 * @access public
-	 * @param mixed $number
-	 * @return void
-	 */
-	public function reformat_number ($number) {
-		$length = strlen($number);
-		$pos	= $length - 3;
+    /**
+     * Present numbers in pow 10, only for IPv6
+     *
+     * @access public
+     * @param mixed $number
+     * @return void
+     */
+    public function reformat_number ($number) {
+        $length = strlen($number);
+        $pos	= $length - 3;
 
-		if ($length > 8) {
-			$number = "~". substr($number, 0, $length - $pos) . "&middot;10^<sup>". $pos ."</sup>";
-		}
-		return $number;
-	}
+        if ($length > 8) {
+            $number = "~". substr($number, 0, $length - $pos) . "&middot;10^<sup>". $pos ."</sup>";
+        }
+        return $number;
+    }
 
 
 
@@ -2038,33 +2038,33 @@ 
 
 
 
-	/**
-	* @nat methods
-	* -------------------------------
-	*/
-	/**
-	 * Prints nat link
-	 *
-	 * @access public
-	 * @param array $all_nats
-	 * @param array $all_nats_per_object
-	 * @param object $subnet
-	 * @param object $address
-	 * @param mixed $address
-	 * @return void
-	 */
-	public function print_nat_link ($all_nats, $all_nats_per_object, $subnet, $address, $type="ipaddress") {
-    	// cast
-    	$subnet = (object) $subnet;
-    	$address = (object) $address;
+    /**
+     * @nat methods
+     * -------------------------------
+     */
+    /**
+     * Prints nat link
+     *
+     * @access public
+     * @param array $all_nats
+     * @param array $all_nats_per_object
+     * @param object $subnet
+     * @param object $address
+     * @param mixed $address
+     * @return void
+     */
+    public function print_nat_link ($all_nats, $all_nats_per_object, $subnet, $address, $type="ipaddress") {
+        // cast
+        $subnet = (object) $subnet;
+        $address = (object) $address;
 
-    	// cnt
-    	$html = array();
-    	$html[] = '<table class="popover_table">';
+        // cnt
+        $html = array();
+        $html[] = '<table class="popover_table">';
 
-    	$cnt = 0;
+        $cnt = 0;
 
-    	// subnets
+        // subnets
         if(isset($all_nats_per_object['subnets'][$subnet->id])) {
             foreach ($all_nats_per_object['subnets'][$subnet->id] as $nat) {
                 // set object
@@ -2075,8 +2075,8 @@ 
             $cnt++;
         }
 
-    	// addresses
-    	if(isset($all_nats_per_object['ipaddresses'][$address->id])) {
+        // addresses
+        if(isset($all_nats_per_object['ipaddresses'][$address->id])) {
             foreach ($all_nats_per_object['ipaddresses'][$address->id] as $nat) {
                 // set object
                 $n = $all_nats[$nat];
@@ -2084,7 +2084,7 @@ 
                 $html[] = str_replace("'", "\"", $this->print_nat_link_line ($n, false, "ipaddresses", $address->id));
                 $cnt++;
             }
-    	}
+        }
 
         // print if some
         if ($cnt>0) {
@@ -2096,7 +2096,7 @@ 
                 print  " <a href='".create_link("subnets",$subnet->sectionId, $subnet->id, "address-details", $address->id, "nat")."' class='btn btn-xs btn-default show_popover fa fa-exchange' style='font-size:11px;margin-top:-3px;padding:1px 3px;' data-toggle='popover' title='"._('Object is Natted')."' data-trigger='hover' data-html='true' data-content='".implode("\n", $html)."'></a>";
             }
         }
-	}
+    }
 
     /**
      * Prints single NAT for display in devices, subnets, addresses.

Spacing +378 added lines, -378 removed lines

@@ -111,16 +111,16 @@ 
 	 *
 	 * @access public
 	 */
-	public function __construct (Database_PDO $Database) {
+	public function __construct(Database_PDO $Database) {
 		# Save database object
 		$this->Database = $Database;
 		# initialize Result
-		$this->Result = new Result ();
+		$this->Result = new Result();
 		# debugging
 		$this->set_debugging();
 
 		# Log object
-		$this->Log = new Logging ($this->Database);
+		$this->Log = new Logging($this->Database);
 	}
 
 
@@ -142,13 +142,13 @@ 
 	 * @access public
 	 * @return array of address types and parameters
 	 */
-	public function addresses_types_fetch () {
+	public function addresses_types_fetch() {
     	# fetch
-    	$types = $this->fetch_all_objects ("ipTags", "id");
+    	$types = $this->fetch_all_objects("ipTags", "id");
 
 		# save to array
 		$types_out = array();
-		foreach($types as $t) {
+		foreach ($types as $t) {
 			$types_out[$t->id] = (array) $t;
 		}
 		# save
@@ -164,15 +164,15 @@ 
 	 * @param int $state
 	 * @return mixed tag
 	 */
-	public function address_type_format_tag ($state) {
+	public function address_type_format_tag($state) {
 		# fetch address states
 		$this->addresses_types_fetch();
 		# result
-		if(!isset($this->address_types[$state]))	{
+		if (!isset($this->address_types[$state])) {
 			return "";
 		}
 		else {
-			if($this->address_types[$state]['showtag']==1) {
+			if ($this->address_types[$state]['showtag'] == 1) {
 				return "<i class='fa fa-".$this->address_types[$state]['type']." fa-tag state' rel='tooltip' style='color:".$this->address_types[$state]['bgcolor']."' title='"._($this->address_types[$state]['type'])."'></i>";
 			}
 		}
@@ -187,11 +187,11 @@ 
 	 * @param int $index
 	 * @return mixed address type
 	 */
-	public function address_type_index_to_type ($index) {
+	public function address_type_index_to_type($index) {
 		# fetch address states
 		$this->addresses_types_fetch();
 		# return
-		if(isset($this->address_types[$index])) {
+		if (isset($this->address_types[$index])) {
 			return $this->address_types[$index]['type'];
 		}
 		else {
@@ -208,18 +208,18 @@ 
 	 * @param mixed $type
 	 * @return void
 	 */
-	public function address_type_type_to_index ($type = "Used") {
+	public function address_type_type_to_index($type = "Used") {
 		# null of no length
-		$type = strlen($type)==0 || is_null($type) ? "Used" : $type;
+		$type = strlen($type) == 0 || is_null($type) ? "Used" : $type;
 		# fetch address states
 		$this->addresses_types_fetch();
 		# reindex
 		$states_assoc = array();
-		foreach($this->address_types as $s) {
+		foreach ($this->address_types as $s) {
 			$states_assoc[$s['type']] = $s;
 		}
 		# return
-		if(isset($states_assoc[$type])) {
+		if (isset($states_assoc[$type])) {
 			return $states_assoc[$type]['id'];
 		}
 		else {
@@ -251,11 +251,11 @@ 
 	 * @param mixed $id
 	 * @return object address
 	 */
-	public function fetch_address ($method, $id) {
+	public function fetch_address($method, $id) {
 		# null method
 		$method = is_null($method) ? "id" : $method;
 		# check cache first
-		if(isset($this->addresses[$id]))	{
+		if (isset($this->addresses[$id])) {
 			return $this->addresses[$id];
 		}
 		else {
@@ -265,9 +265,9 @@ 
 				return false;
 			}
 			# save to addresses cache
-			if(!is_null($address)) {
+			if (!is_null($address)) {
 				# add decimal format
-				$address->ip = $this->transform_to_dotted ($address->ip_addr);
+				$address->ip = $this->transform_to_dotted($address->ip_addr);
 				# save to subnets
 				$this->addresses[$id] = (object) $address;
 			}
@@ -284,16 +284,16 @@ 
 	 * @param mixed $subnetId
 	 * @return void
 	 */
-	public function fetch_address_multiple_criteria ($ip_addr, $subnetId) {
+	public function fetch_address_multiple_criteria($ip_addr, $subnetId) {
 		try { $address = $this->Database->getObjectQuery("SELECT * FROM `ipaddresses` where `ip_addr` = ? and `subnetId` = ? limit 1;", array($ip_addr, $subnetId)); }
 		catch (Exception $e) {
 			$this->Result->show("danger", _("Error: ").$e->getMessage());
 			return false;
 		}
 		# save to addresses cache
-		if(sizeof($address)>0) {
+		if (sizeof($address) > 0) {
 			# add decimal format
-			$address->ip = $this->transform_to_dotted ($address->ip_addr);
+			$address->ip = $this->transform_to_dotted($address->ip_addr);
 			# save to subnets
 			$this->addresses[$address->id] = (object) $address;
 		}
@@ -310,9 +310,9 @@ 
 	 * @param mixed $address_id
 	 * @return void
 	 */
-	public function search_similar_addresses ($linked_field, $value, $address_id) {
+	public function search_similar_addresses($linked_field, $value, $address_id) {
     	// checks
-    	if(strlen($linked_field)>0 && strlen($value)>0 && is_numeric($address_id)) {
+    	if (strlen($linked_field) > 0 && strlen($value) > 0 && is_numeric($address_id)) {
         	// search
      		try { $addresses = $this->Database->getObjectsQuery("SELECT * FROM `ipaddresses` where `$linked_field` = ? and `id` != ? and state != 4;", array($value, $address_id)); }
     		catch (Exception $e) {
@@ -320,7 +320,7 @@ 
     			return false;
     		}
     		#result
-    		return sizeof($addresses)>0 ? $addresses : false;
+    		return sizeof($addresses) > 0 ? $addresses : false;
         }
         else {
             return false;
@@ -335,19 +335,19 @@ 
 	 * @param bool $mail_changelog (default: true)
 	 * @return void
 	 */
-	public function modify_address ($address, $mail_changelog = true) {
+	public function modify_address($address, $mail_changelog = true) {
 		# save changelog
-		$this->mail_changelog  = $mail_changelog;
+		$this->mail_changelog = $mail_changelog;
 		# null empty values
-		$address = $this->reformat_empty_array_fields ($address, null);
+		$address = $this->reformat_empty_array_fields($address, null);
 		# strip tags
-		$address = $this->strip_input_tags ($address);
+		$address = $this->strip_input_tags($address);
 		# execute based on action
-		if($address['action']=="add")			{ return $this->modify_address_add ($address); }							//create new address
-		elseif($address['action']=="edit")		{ return $this->modify_address_edit ($address); }							//modify existing address
-		elseif($address['action']=="delete")	{ return $this->modify_address_delete ($address); }							//delete address
-		elseif($address['action']=="move")		{ return $this->modify_address_move ($address); }							//move to new subnet
-		else									{ return $this->Result->show("danger", _("Invalid action"), true); }
+		if ($address['action'] == "add") { return $this->modify_address_add($address); }							//create new address
+		elseif ($address['action'] == "edit") { return $this->modify_address_edit($address); }							//modify existing address
+		elseif ($address['action'] == "delete") { return $this->modify_address_delete($address); }							//delete address
+		elseif ($address['action'] == "move") { return $this->modify_address_move($address); }							//move to new subnet
+		else { return $this->Result->show("danger", _("Invalid action"), true); }
 	}
 
 	/**
@@ -357,10 +357,10 @@ 
 	 * @param array $address
 	 * @return boolean success/failure
 	 */
-	protected function modify_address_add ($address) {
+	protected function modify_address_add($address) {
 		# set insert array
 		$insert = array(
-						"ip_addr"               => $this->transform_address($address['ip_addr'],"decimal"),
+						"ip_addr"               => $this->transform_address($address['ip_addr'], "decimal"),
 						"subnetId"              => $address['subnetId'],
 						"description"           => @$address['description'],
 						"hostname"              => @$address['hostname'],
@@ -377,9 +377,9 @@ 
 						"lastSeen"              => @$address['lastSeen']
 						);
 		# customer
-		if(isset($address['customer_id'])) {
+		if (isset($address['customer_id'])) {
 			if (is_numeric($address['customer_id'])) {
-				if ($address['customer_id']!="0") {
+				if ($address['customer_id'] != "0") {
 					$insert['customer_id'] = $address['customer_id'];
 				}
 				else {
@@ -395,20 +395,20 @@ 
             $insert['location'] = $address['location_item'];
         }
 		# custom fields, append to array
-		foreach($this->set_custom_fields() as $c) {
+		foreach ($this->set_custom_fields() as $c) {
 			$insert[$c['name']] = !empty($address[$c['name']]) ? $address[$c['name']] : $c['Default'];
 		}
 
 		# null empty values
-		$insert = $this->reformat_empty_array_fields ($insert, null);
+		$insert = $this->reformat_empty_array_fields($insert, null);
 
 		# remove gateway
-		if($address['is_gateway']==1)	{ $this->remove_gateway ($address['subnetId']); }
+		if ($address['is_gateway'] == 1) { $this->remove_gateway($address['subnetId']); }
 
 		# execute
 		try { $this->Database->insertObject("ipaddresses", $insert); }
 		catch (Exception $e) {
-			$this->Log->write( "Address create", "Failed to create new address<hr>".$e->getMessage()."<hr>".$this->array_to_log($this->reformat_empty_array_fields ($address, "NULL")), 2);
+			$this->Log->write("Address create", "Failed to create new address<hr>".$e->getMessage()."<hr>".$this->array_to_log($this->reformat_empty_array_fields($address, "NULL")), 2);
 			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 			return false;
 		}
@@ -417,11 +417,11 @@ 
 
 		# log and changelog
 		$address['id'] = $this->lastId;
-		$this->Log->write( "Address created", "New address created<hr>".$this->array_to_log($this->reformat_empty_array_fields ($address, "NULL")), 0);
+		$this->Log->write("Address created", "New address created<hr>".$this->array_to_log($this->reformat_empty_array_fields($address, "NULL")), 0);
 		$this->Log->write_changelog('ip_addr', "add", 'success', array(), $address, $this->mail_changelog);
 
 		# edit DNS PTR record
-		$this->ptr_modify ("add", $insert);
+		$this->ptr_modify("add", $insert);
 
 		# threshold alert
 		$this->threshold_check($address);
@@ -437,9 +437,9 @@ 
 	 * @param array $address
 	 * @return boolean success/failure
 	 */
-	protected function modify_address_edit ($address) {
+	protected function modify_address_edit($address) {
 		# fetch old details for logging
-		$address_old = $this->fetch_address (null, $address['id']);
+		$address_old = $this->fetch_address(null, $address['id']);
 		if (isset($address['section'])) $address_old->section = $address['section'];
 
 		# set update array
@@ -460,9 +460,9 @@ 
 						"PTRignore"   =>@$address['PTRignore']
 						);
  		# customer
-		if(isset($address['customer_id'])) {
+		if (isset($address['customer_id'])) {
 			if (is_numeric($address['customer_id'])) {
-				if ($address['customer_id']!="0") {
+				if ($address['customer_id'] != "0") {
 					$insert['customer_id'] = $address['customer_id'];
 				}
 				else {
@@ -478,12 +478,12 @@ 
             $insert['location'] = $address['location_item'];
         }
 		# custom fields, append to array
-		foreach($this->set_custom_fields() as $c) {
+		foreach ($this->set_custom_fields() as $c) {
 			$insert[$c['name']] = !empty($address[$c['name']]) ? $address[$c['name']] : $c['Default'];
 		}
 
 		# set primary key for update
-		if($address['type']=="series") {
+		if ($address['type'] == "series") {
 			$id1 = "subnetId";
 			$id2 = "ip_addr";
 			unset($insert['id']);
@@ -493,12 +493,12 @@ 
 		}
 
 		# remove gateway
-		if($address['is_gateway']==1)	{ $this->remove_gateway ($address['subnetId']); }
+		if ($address['is_gateway'] == 1) { $this->remove_gateway($address['subnetId']); }
 
 		# execute
 		try { $this->Database->updateObject("ipaddresses", $insert, $id1, $id2); }
 		catch (Exception $e) {
-			$this->Log->write( "Address edit", "Failed to edit address $address[ip_addr]<hr>".$e->getMessage()."<hr>".$this->array_to_log($this->reformat_empty_array_fields ($address, "NULL")), 2);
+			$this->Log->write("Address edit", "Failed to edit address $address[ip_addr]<hr>".$e->getMessage()."<hr>".$this->array_to_log($this->reformat_empty_array_fields($address, "NULL")), 2);
 			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 			return false;
 		}
@@ -507,12 +507,12 @@ 
 		$address['firewallAddressObject'] = $address_old->firewallAddressObject;
 
  		# log and changelog
-		$this->Log->write( "Address updated", "Address $address[ip_addr] updated<hr>".$this->array_to_log($this->reformat_empty_array_fields ($address, "NULL")), 0);
+		$this->Log->write("Address updated", "Address $address[ip_addr] updated<hr>".$this->array_to_log($this->reformat_empty_array_fields($address, "NULL")), 0);
 		$this->Log->write_changelog('ip_addr', "edit", 'success', (array) $address_old, $address, $this->mail_changelog);
 
 		# edit DNS PTR record
-		$insert['PTR']=@$address['PTR'];
-		$this->ptr_modify ("edit", $insert);
+		$insert['PTR'] = @$address['PTR'];
+		$this->ptr_modify("edit", $insert);
 
 		# ok
 		return true;
@@ -525,40 +525,40 @@ 
 	 * @param array $address
 	 * @return boolean success/failure
 	 */
-	protected function modify_address_delete ($address) {
+	protected function modify_address_delete($address) {
 		# fetch old details for logging
-		$address_old = $this->fetch_address (null, $address['id']);
+		$address_old = $this->fetch_address(null, $address['id']);
 		if (isset($address['section'])) $address_old->section = $address['section'];
 
 		# series?
-		if($address['type']=="series") {
-			$field  = "subnetId";	$value  = $address['subnetId'];
-			$field2 = "ip_addr";	$value2 = $this->transform_address ($address['ip_addr'], "decimal");
+		if ($address['type'] == "series") {
+			$field  = "subnetId"; $value = $address['subnetId'];
+			$field2 = "ip_addr"; $value2 = $this->transform_address($address['ip_addr'], "decimal");
 		} else {
-			$field  = "id";			$value  = $address['id'];
-			$field2 = null;			$value2 = null;
+			$field  = "id"; $value  = $address['id'];
+			$field2 = null; $value2 = null;
 		}
 		# execute
 		try { $this->Database->deleteRow("ipaddresses", $field, $value, $field2, $value2); }
 		catch (Exception $e) {
-			$this->Log->write( "Address delete", "Failed to delete address $address[ip_addr]<hr>".$e->getMessage()."<hr>".$this->array_to_log((array) $address_old), 2);
+			$this->Log->write("Address delete", "Failed to delete address $address[ip_addr]<hr>".$e->getMessage()."<hr>".$this->array_to_log((array) $address_old), 2);
 			$this->Result->show("danger", _("Error: ").$e->getMessage(), false);
 			return false;
 		}
 
 		# log and changelog
-		$this->Log->write( "Address deleted", "Address $address[ip_addr] deleted<hr>".$this->array_to_log((array) $address_old), 0);
+		$this->Log->write("Address deleted", "Address $address[ip_addr] deleted<hr>".$this->array_to_log((array) $address_old), 0);
 		$this->Log->write_changelog('ip_addr', "delete", 'success', (array) $address_old, array(), $this->mail_changelog);
 
 		# edit DNS PTR record
-		$this->ptr_modify ("delete", $address);
+		$this->ptr_modify("delete", $address);
 
 		# remove all referenced records
-		if(@$address['remove_all_dns_records']=="1") {
-    		$this->pdns_remove_ip_and_hostname_records ($address);
+		if (@$address['remove_all_dns_records'] == "1") {
+    		$this->pdns_remove_ip_and_hostname_records($address);
         }
         # remove from NAT
-        $this->remove_address_nat_items ($address['id'], true);
+        $this->remove_address_nat_items($address['id'], true);
 		# ok
 		return true;
 	}
@@ -570,7 +570,7 @@ 
 	 * @param array $address
 	 * @return boolean success/failure
 	 */
-	protected function modify_address_move ($address) {
+	protected function modify_address_move($address) {
 		# execute
 		try { $this->Database->updateObject("ipaddresses", array("subnetId"=>$address['newSubnet'], "id"=>$address['id'])); }
 		catch (Exception $e) {
@@ -591,28 +591,28 @@ 
 	 *
 	 * @return int
 	 */
-	public function remove_address_nat_items ($obj_id = 0, $print = true) {
+	public function remove_address_nat_items($obj_id = 0, $print = true) {
 		# set found flag for returns
 		$found = 0;
 		# fetch all nats
-		try { $all_nats = $this->Database->getObjectsQuery ("select * from `nat` where `src` like :id or `dst` like :id", array ("id"=>'%"'.$obj_id.'"%')); }
+		try { $all_nats = $this->Database->getObjectsQuery("select * from `nat` where `src` like :id or `dst` like :id", array("id"=>'%"'.$obj_id.'"%')); }
 		catch (Exception $e) {
 			$this->Result->show("danger", _("Error: ").$e->getMessage());
 			return false;
 		}
 		# loop and check for object ids
-		if(!empty($all_nats)) {
+		if (!empty($all_nats)) {
 			# init admin object
-			$Admin = new Admin ($this->Database, false);
+			$Admin = new Admin($this->Database, false);
 			# loop
 			foreach ($all_nats as $nat) {
 			    # remove item from nat
 			    $s = json_decode($nat->src, true);
 			    $d = json_decode($nat->dst, true);
 
-			    if(is_array($s['ipaddresses']))
+			    if (is_array($s['ipaddresses']))
 			    $s['ipaddresses'] = array_diff($s['ipaddresses'], array($obj_id));
-			    if(is_array($d['ipaddresses']))
+			    if (is_array($d['ipaddresses']))
 			    $d['ipaddresses'] = array_diff($d['ipaddresses'], array($obj_id));
 
 			    # save back and update
@@ -620,11 +620,11 @@ 
 			    $dst_new = json_encode(array_filter($d));
 
 			    # update only if diff found
-			    if($s!=$src_new || $d!=$dst_new) {
+			    if ($s != $src_new || $d != $dst_new) {
 			    	$found++;
 
-				    if($Admin->object_modify ("nat", "edit", "id", array("id"=>$nat->id, "src"=>$src_new, "dst"=>$dst_new))!==false) {
-				    	if($print) {
+				    if ($Admin->object_modify("nat", "edit", "id", array("id"=>$nat->id, "src"=>$src_new, "dst"=>$dst_new)) !== false) {
+				    	if ($print) {
 					        $this->Result->show("success", "Address removed from NAT", false);
 						}
 				    }
@@ -646,15 +646,15 @@ 
 	 *
 	 * @return void
 	 */
-	public function update_address_hostname ($ip, $id, $hostname = "") {
-		if(is_numeric($id) && strlen($hostname)>0) {
+	public function update_address_hostname($ip, $id, $hostname = "") {
+		if (is_numeric($id) && strlen($hostname) > 0) {
 			try { $this->Database->updateObject("ipaddresses", array("id"=>$id, "hostname"=>$hostname)); }
 			catch (Exception $e) {
 				return false;
 			}
 			// save log
-			$this->Log->write( "Address DNS resolved", "Address $ip resolved<hr>".$this->array_to_log((array) $hostname), 0);
-			$this->Log->write_changelog('ip_addr', "edit", 'success', array ("id"=>$id, "hostname"=>""), array("id"=>$id, "hostname"=>$hostname), $this->mail_changelog);
+			$this->Log->write("Address DNS resolved", "Address $ip resolved<hr>".$this->array_to_log((array) $hostname), 0);
+			$this->Log->write_changelog('ip_addr', "edit", 'success', array("id"=>$id, "hostname"=>""), array("id"=>$id, "hostname"=>$hostname), $this->mail_changelog);
 		}
 	}
 
@@ -665,62 +665,62 @@ 
 	 * @param mixed $address
 	 * @return void
 	 */
-	private function threshold_check ($address) {
+	private function threshold_check($address) {
     	$address = (object) $address;
     	$content = array();
     	$content_plain = array();
 
         # fetch settings
-        $this->get_settings ();
+        $this->get_settings();
     	# enabled ?
-    	if ($this->settings->enableThreshold=="1") {
+    	if ($this->settings->enableThreshold == "1") {
         	# object
         	if (!is_object($this->Subnets)) {
-            	$this->Subnets = new Subnets ($this->Database);
+            	$this->Subnets = new Subnets($this->Database);
         	}
         	# fetch subnet
         	$subnet = $this->Subnets->fetch_subnet("id", $address->subnetId);
         	# threshold set ?
-        	if ($subnet->threshold>0) {
+        	if ($subnet->threshold > 0) {
             	# calculate subnet usage
-            	$subnet_usage = $this->Subnets->calculate_subnet_usage ($subnet);
+            	$subnet_usage = $this->Subnets->calculate_subnet_usage($subnet);
             	# if over send mail
-            	if (gmp_strval(gmp_sub(100,(int) round($subnet_usage['freehosts_percent'], 0))) > $subnet->threshold) {
+            	if (gmp_strval(gmp_sub(100, (int) round($subnet_usage['freehosts_percent'], 0))) > $subnet->threshold) {
                 	// fetch mail settings
-                	$Tools = new Tools ($this->Database);
-                	$admins        = $Tools->fetch_multiple_objects ("users", "role", "Administrator");
+                	$Tools = new Tools($this->Database);
+                	$admins = $Tools->fetch_multiple_objects("users", "role", "Administrator");
                 	// if some recipients
                 	if ($admins !== false) {
 						# try to send
 						try {
 	                    	// mail settings
-	                        $mail_settings = $Tools->fetch_object ("settingsMail", "id", 1);
+	                        $mail_settings = $Tools->fetch_object("settingsMail", "id", 1);
 	                    	// mail class
-	                    	$phpipam_mail = new phpipam_mail ($this->settings, $mail_settings);
+	                    	$phpipam_mail = new phpipam_mail($this->settings, $mail_settings);
 
 	                        // set parameters
-	                        $subject = "Subnet threshold limit reached"." (".$this->transform_address($subnet->subnet,"dotted")."/".$subnet->mask.")";
+	                        $subject = "Subnet threshold limit reached"." (".$this->transform_address($subnet->subnet, "dotted")."/".$subnet->mask.")";
 	                        $content[] = "<table style='margin-left:10px;margin-top:5px;width:auto;padding:0px;border-collapse:collapse;'>";
 	                        $content[] = "<tr><td style='padding:5px;margin:0px;color:#333;font-size:16px;text-shadow:1px 1px 1px white;border-bottom:1px solid #eeeeee;' colspan='2'>$this->mail_font_style<strong>$subject</font></td></tr>";
-	                        $content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;">'.$this->mail_font_style.''._('Subnet').'</a></font></td>	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;padding-top:10px;"><a href="'.$this->createURL().''.create_link("subnets",$subnet->sectionId, $subnet->id).'">'.$this->mail_font_style_href . $this->transform_address($subnet->subnet,"dotted")."/".$subnet->mask .'</font></a></td></tr>';
-	                        $content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;">'.$this->mail_font_style.''._('Description').'</font></td>	  	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;">'.$this->mail_font_style.''. $subnet->description .'</font></td></tr>';
-	                        $content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;">'.$this->mail_font_style.''._('Usage').' (%)</font></td>	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;">'.$this->mail_font_style.''. gmp_strval(gmp_sub(100,(int) round($subnet_usage['freehosts_percent'], 0))) .'</font></td></tr>';
+	                        $content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;">'.$this->mail_font_style.''._('Subnet').'</a></font></td>	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;padding-top:10px;"><a href="'.$this->createURL().''.create_link("subnets", $subnet->sectionId, $subnet->id).'">'.$this->mail_font_style_href.$this->transform_address($subnet->subnet, "dotted")."/".$subnet->mask.'</font></a></td></tr>';
+	                        $content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;">'.$this->mail_font_style.''._('Description').'</font></td>	  	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;">'.$this->mail_font_style.''.$subnet->description.'</font></td></tr>';
+	                        $content[] = '<tr><td style="padding: 0px;padding-left:10px;margin:0px;line-height:18px;text-align:left;">'.$this->mail_font_style.''._('Usage').' (%)</font></td>	<td style="padding: 0px;padding-left:15px;margin:0px;line-height:18px;text-align:left;">'.$this->mail_font_style.''.gmp_strval(gmp_sub(100, (int) round($subnet_usage['freehosts_percent'], 0))).'</font></td></tr>';
 	                        $content[] = "</table>";
 	                        // plain
 	                        $content_plain[] = "$subject"."\r\n------------------------------\r\n";
-	                        $content_plain[] = _("Subnet").": ".$this->transform_address($subnet->subnet,"dotted")."/".$subnet->mask;
-	                        $content_plain[] = _("Usage")." (%) : ".gmp_strval(gmp_sub(100,(int) round($subnet_usage['freehosts_percent'], 0)));
+	                        $content_plain[] = _("Subnet").": ".$this->transform_address($subnet->subnet, "dotted")."/".$subnet->mask;
+	                        $content_plain[] = _("Usage")." (%) : ".gmp_strval(gmp_sub(100, (int) round($subnet_usage['freehosts_percent'], 0)));
 
 	                        # set content
-	                        $content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
-	                        $content_plain 	= implode("\r\n",$content_plain);
+	                        $content = $phpipam_mail->generate_message(implode("\r\n", $content));
+	                        $content_plain = implode("\r\n", $content_plain);
 
                         	$phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
                         	//add all admins to CC
-                        	$recipients = $this->changelog_mail_get_recipients ($subnet->id);
+                        	$recipients = $this->changelog_mail_get_recipients($subnet->id);
 
-                        	if ($recipients!==false) {
-                        		foreach($recipients as $a) {
+                        	if ($recipients !== false) {
+                        		foreach ($recipients as $a) {
                     			    $phpipam_mail->Php_mailer->addAddress($a->email);
                         		}
 
@@ -757,7 +757,7 @@ 
 	 * @param mixed $subnetId
 	 * @return void
 	 */
-	public function remove_gateway ($subnetId) {
+	public function remove_gateway($subnetId) {
 		try { $this->Database->updateObject("ipaddresses", array("subnetId"=>$subnetId, "is_gateway"=>0), "subnetId"); }
 		catch (Exception $e) {
 			$this->Result->show("danger", _("Error: ").$e->getMessage());
@@ -771,11 +771,11 @@ 
 	 * @access public
 	 * @return object custom address fields
 	 */
-	public function set_custom_fields () {
+	public function set_custom_fields() {
 		# Tools object
-		$Tools = new Tools ($this->Database);
+		$Tools = new Tools($this->Database);
 		# fetch
-		return $Tools->fetch_custom_fields ('ipaddresses');
+		return $Tools->fetch_custom_fields('ipaddresses');
 	}
 
 	/**
@@ -789,12 +789,12 @@ 
 	 * @param int $subnetId
 	 * @return boolean success/failure
 	 */
-	public function address_exists ($address, $subnetId, $cnt = true) {
+	public function address_exists($address, $subnetId, $cnt = true) {
 		# make sure it is in decimal format
 		$address = $this->transform_address($address, "decimal");
 		# check
-		if($cnt===true) { $query = "select count(*) as `cnt` from `ipaddresses` where `subnetId`=? and `ip_addr`=?;"; }
-		else			{ $query = "select `id` from `ipaddresses` where `subnetId`=? and `ip_addr`=?;";  }
+		if ($cnt === true) { $query = "select count(*) as `cnt` from `ipaddresses` where `subnetId`=? and `ip_addr`=?;"; }
+		else { $query = "select `id` from `ipaddresses` where `subnetId`=? and `ip_addr`=?;"; }
 		# fetch
 		try { $count = $this->Database->getObjectQuery($query, array($subnetId, $address)); }
 		catch (Exception $e) {
@@ -802,8 +802,8 @@ 
 			return false;
 		}
 		# result
-		if ($cnt===true)	{ return $count->cnt==0 ? false : true; }
-		else				{ return is_null($count->id) ? false : $count->id; }
+		if ($cnt === true) { return $count->cnt == 0 ? false : true; }
+		else { return is_null($count->id) ? false : $count->id; }
 	}
 
 	/**
@@ -814,7 +814,7 @@ 
 	 * @param int $ip2
 	 * @return void
 	 */
-	public function calculate_address_diff ($ip1, $ip2) {
+	public function calculate_address_diff($ip1, $ip2) {
 		return gmp_strval(gmp_sub($ip2, $ip1));
 	}
 
@@ -827,46 +827,46 @@ 
 	 * @param obj $Subnets
 	 * @return int / false
 	 */
-	public function get_first_available_address ($subnetId, $Subnets) {
+	public function get_first_available_address($subnetId, $Subnets) {
 
 		# fetch all addresses in subnet and subnet
-		$addresses = $this->fetch_subnet_addresses ($subnetId, "ip_addr", "asc", array("ip_addr"));
+		$addresses = $this->fetch_subnet_addresses($subnetId, "ip_addr", "asc", array("ip_addr"));
 		$subnet = (array) $Subnets->fetch_subnet(null, $subnetId);
 
 		# if folder return false
-		if ($subnet['isFolder']=="1")                                                                   { return false; }
+		if ($subnet['isFolder'] == "1") { return false; }
 
 		# false if slaves
-		$this->Subnets = new Subnets ($this->Database);
-		if($this->Subnets->has_slaves ($subnetId))                                                      { return false; }
+		$this->Subnets = new Subnets($this->Database);
+		if ($this->Subnets->has_slaves($subnetId)) { return false; }
 
 	    # get max hosts
-	    $max_hosts = $Subnets->get_max_hosts ($subnet['mask'], $this->identify_address($subnet['subnet']));
+	    $max_hosts = $Subnets->get_max_hosts($subnet['mask'], $this->identify_address($subnet['subnet']));
 
 		# full subnet?
-		if(sizeof($addresses)>=$max_hosts)																{ return false; } 	//full subnet
+		if (sizeof($addresses) >= $max_hosts) { return false; } 	//full subnet
 
 		# set type
-		$ip_version = $this->identify_address ($subnet['subnet']);
+		$ip_version = $this->identify_address($subnet['subnet']);
 	    # get first diff > 1
-	    if(sizeof($addresses)>0) {
-		    foreach($addresses as $k=>$ipaddress) {
+	    if (sizeof($addresses) > 0) {
+		    foreach ($addresses as $k=>$ipaddress) {
 			    # check subnet and first IP
-			    if($k==0) {
+			    if ($k == 0) {
 				    # /31 fix
-				    if($subnet['mask']==31)	{
-					    if(gmp_strval(gmp_sub($addresses[$k]->ip_addr, $subnet['subnet']))>0) 			{ return gmp_strval($subnet['subnet']); }
+				    if ($subnet['mask'] == 31) {
+					    if (gmp_strval(gmp_sub($addresses[$k]->ip_addr, $subnet['subnet'])) > 0) { return gmp_strval($subnet['subnet']); }
 				    } else {
-					    if(gmp_strval(gmp_sub($addresses[$k]->ip_addr, $subnet['subnet']))>1) 			{ return gmp_strval(gmp_add($subnet['subnet'], 1)); }
-					    elseif($ip_version=="IPv6") {
-						    if(sizeof($addresses)==1) {
-							    if(gmp_strval(gmp_sub($addresses[$k]->ip_addr, $subnet['subnet']))==0)	{ return gmp_strval(gmp_add($subnet['subnet'], 1)); }
+					    if (gmp_strval(gmp_sub($addresses[$k]->ip_addr, $subnet['subnet'])) > 1) { return gmp_strval(gmp_add($subnet['subnet'], 1)); }
+					    elseif ($ip_version == "IPv6") {
+						    if (sizeof($addresses) == 1) {
+							    if (gmp_strval(gmp_sub($addresses[$k]->ip_addr, $subnet['subnet'])) == 0) { return gmp_strval(gmp_add($subnet['subnet'], 1)); }
 						    }
 					    }
 				    }
 			    }
 			    else {
-				    if(gmp_strval(gmp_sub($addresses[$k]->ip_addr, $addresses[$k-1]->ip_addr))>1) 		{ return gmp_strval(gmp_add($addresses[$k-1]->ip_addr, 1)); }
+				    if (gmp_strval(gmp_sub($addresses[$k]->ip_addr, $addresses[$k - 1]->ip_addr)) > 1) { return gmp_strval(gmp_add($addresses[$k - 1]->ip_addr, 1)); }
 			    }
 		    }
 		    # all consecutive, last + 1
@@ -875,8 +875,8 @@ 
 	    # no addresses
 	    else {
 		    # /32, /31
-		    if($subnet['mask']==32 || $subnet['mask']==31 || $ip_version=="IPv6") 						{ return $subnet['subnet']; }
-		    else																						{ return gmp_strval(gmp_add($subnet['subnet'], 1)); }
+		    if ($subnet['mask'] == 32 || $subnet['mask'] == 31 || $ip_version == "IPv6") { return $subnet['subnet']; }
+		    else { return gmp_strval(gmp_add($subnet['subnet'], 1)); }
 	    }
 	}
 
@@ -902,27 +902,27 @@ 
 	 * @param bool $print_error (default: true)
 	 * @return void
 	 */
-	public function ptr_modify ($action, $address, $print_error = true) {
+	public function ptr_modify($action, $address, $print_error = true) {
         // fetch settings
-        $this->settings ();
+        $this->settings();
         //check if powerdns enabled
-        if ($this->settings->enablePowerDNS!=1) {
+        if ($this->settings->enablePowerDNS != 1) {
             return false;
         }
         //enabled, proceed
         else {
     		// first check if subnet selected for PTR records
-    		$this->initialize_subnets_object ();
-    		$subnet = $this->Subnets->fetch_subnet ("id", $address['subnetId']);
-    		if ($subnet->DNSrecursive!="1") { return false; }
+    		$this->initialize_subnets_object();
+    		$subnet = $this->Subnets->fetch_subnet("id", $address['subnetId']);
+    		if ($subnet->DNSrecursive != "1") { return false; }
 
     		// ignore if PTRignore set
-    		if ($address['PTRignore']=="1")	{
+    		if ($address['PTRignore'] == "1") {
 				// validate db
-				$this->pdns_validate_connection ();
+				$this->pdns_validate_connection();
 				// remove if it exists
-				if ($this->ptr_exists ($address['PTR'])) {
-					$this->ptr_delete ($address, false);
+				if ($this->ptr_exists($address['PTR'])) {
+					$this->ptr_delete($address, false);
 										{ return false; }
 				}
 				else {
@@ -930,15 +930,15 @@ 
 				}
     		}
     		// validate db
-    		$this->pdns_validate_connection ();
+    		$this->pdns_validate_connection();
 
     		// to object
     		$address = (object) $address;
     		# execute based on action
-    		if($action=="add")				{ return $this->ptr_add ($address, $print_error); }							//create new PTR
-    		elseif($action=="edit")			{ return $this->ptr_edit ($address, $print_error); }						//modify existing PTR
-    		elseif($action=="delete")		{ return $this->ptr_delete ($address, $print_error); }						//delete PTR
-    		else							{ return $this->Result->show("danger", _("Invalid PDNS action"), true); }
+    		if ($action == "add") { return $this->ptr_add($address, $print_error); }							//create new PTR
+    		elseif ($action == "edit") { return $this->ptr_edit($address, $print_error); }						//modify existing PTR
+    		elseif ($action == "delete") { return $this->ptr_delete($address, $print_error); }						//delete PTR
+    		else { return $this->Result->show("danger", _("Invalid PDNS action"), true); }
         }
 	}
 
@@ -949,17 +949,17 @@ 
 	 * @param mixed $address
 	 * @return void
 	 */
-	public function pdns_remove_ip_and_hostname_records ($address) {
+	public function pdns_remove_ip_and_hostname_records($address) {
         // fetch settings
-        $this->settings ();
+        $this->settings();
         //check if powerdns enabled
-        if ($this->settings->enablePowerDNS!=1) {
+        if ($this->settings->enablePowerDNS != 1) {
             return false;
         }
 		// validate db
-		$this->pdns_validate_connection ();
+		$this->pdns_validate_connection();
 		// execute
-		return $this->PowerDNS->pdns_remove_ip_and_hostname_records ($address['hostname'], $address['ip_addr']);
+		return $this->PowerDNS->pdns_remove_ip_and_hostname_records($address['hostname'], $address['ip_addr']);
 	}
 
 	/**
@@ -969,17 +969,17 @@ 
 	 * @param bool $die (default: false)
 	 * @return void
 	 */
-	public function pdns_validate_connection ($die = true) {
+	public function pdns_validate_connection($die = true) {
 		# powerDNS class
-		$this->PowerDNS = new PowerDNS ($this->Database);
+		$this->PowerDNS = new PowerDNS($this->Database);
 		# add API info
-		if(isset($this->api)) {
+		if (isset($this->api)) {
 			$this->PowerDNS->api = $this->api;
 		}
 		# check connection
-		if($this->PowerDNS->db_check()===false && $die) { $this->Result->show("danger", _("Cannot connect to powerDNS database"), true); }
+		if ($this->PowerDNS->db_check() === false && $die) { $this->Result->show("danger", _("Cannot connect to powerDNS database"), true); }
 		# get settings
-		$this->get_settings ();
+		$this->get_settings();
 	}
 
 	/**
@@ -989,17 +989,17 @@ 
 	 * @param mixed $subnet_id
 	 * @return array|false
 	 */
-	private function pdns_fetch_domain ($subnet_id) {
+	private function pdns_fetch_domain($subnet_id) {
 		# initialize subnets
-		$this->initialize_subnets_object ();
+		$this->initialize_subnets_object();
 		// fetch subnet
-		$subnet = $this->Subnets->fetch_subnet ("id", $subnet_id);
-		if($subnet===false)							{  $this->Result->show("danger", _("Invalid subnet Id"), true); }
+		$subnet = $this->Subnets->fetch_subnet("id", $subnet_id);
+		if ($subnet === false) {  $this->Result->show("danger", _("Invalid subnet Id"), true); }
 
 		// set PTR zone name from IP/mash
-		$zone = $this->PowerDNS->get_ptr_zone_name ($this->transform_address ($subnet->subnet, "dotted"), $subnet->mask);
+		$zone = $this->PowerDNS->get_ptr_zone_name($this->transform_address($subnet->subnet, "dotted"), $subnet->mask);
 		// try to fetch
-		return  $this->PowerDNS->fetch_domain_by_name ($zone);
+		return  $this->PowerDNS->fetch_domain_by_name($zone);
 	}
 
 	/**
@@ -1011,30 +1011,30 @@ 
 	 * @param mixed $id (default: NULL)
 	 * @return void
 	 */
-	public function ptr_add ($address, $print_error = true, $id = null) {
+	public function ptr_add($address, $print_error = true, $id = null) {
 		// decode values
 		$values = json_decode($this->settings->powerDNS);
 
     	// set default hostname for PTR if set
-    	if (strlen($address->hostname)==0) {
-        	if (strlen($values->def_ptr_domain)>0) {
+    	if (strlen($address->hostname) == 0) {
+        	if (strlen($values->def_ptr_domain) > 0) {
             	$address->hostname = $values->def_ptr_domain;
         	}
     	}
 		// validate hostname
-		if ($this->validate_hostname ($address->hostname)===false)		{ return false; }
+		if ($this->validate_hostname($address->hostname) === false) { return false; }
 		// fetch domain
-		$domain = $this->pdns_fetch_domain ($address->subnetId);
+		$domain = $this->pdns_fetch_domain($address->subnetId);
 
 		// formulate new record
-		$record = $this->PowerDNS->formulate_new_record ($domain->id, $this->PowerDNS->get_ip_ptr_name ($this->transform_address ($address->ip_addr, "dotted")), "PTR", $address->hostname, $values->ttl);
+		$record = $this->PowerDNS->formulate_new_record($domain->id, $this->PowerDNS->get_ip_ptr_name($this->transform_address($address->ip_addr, "dotted")), "PTR", $address->hostname, $values->ttl);
 		// insert record
-		$this->PowerDNS->add_domain_record ($record, false);
+		$this->PowerDNS->add_domain_record($record, false);
 		// link to address
-		$id = $id===null ? $this->lastId : $id;
-		$this->ptr_link ($id, $this->PowerDNS->lastId);
+		$id = $id === null ? $this->lastId : $id;
+		$this->ptr_link($id, $this->PowerDNS->lastId);
 		// ok
-		if ($print_error && php_sapi_name()!="cli")
+		if ($print_error && php_sapi_name() != "cli")
 		$this->Result->show("success", "PTR record created", false);
 
 		return true;
@@ -1048,37 +1048,37 @@ 
 	 * @param mixed $print_error (default: true)
 	 * @return void
 	 */
-	public function ptr_edit ($address, $print_error = true) {
+	public function ptr_edit($address, $print_error = true) {
 		// validate hostname
-		if ($this->validate_hostname ($address->hostname)===false)	{
+		if ($this->validate_hostname($address->hostname) === false) {
 			// remove pointer if it exists!
-			if ($this->ptr_exists ($address->PTR)===true)	{ $this->ptr_delete ($address, $print_error); }
-			else											{ return false; }
+			if ($this->ptr_exists($address->PTR) === true) { $this->ptr_delete($address, $print_error); }
+			else { return false; }
 		}
 
 		// new record
- 		if ($this->ptr_exists ($address->PTR)===false) {
+ 		if ($this->ptr_exists($address->PTR) === false) {
 	 		// fake lastid
 	 		$this->lastId = $address->id;
 	 		// new ptr record
-	 		$this->ptr_add ($address, true);
+	 		$this->ptr_add($address, true);
  		}
  		// update PTR
  		else {
 			// fetch domain
-			$domain = $this->pdns_fetch_domain ($address->subnetId);
+			$domain = $this->pdns_fetch_domain($address->subnetId);
 
 			// fetch old
-			$old_record = $this->PowerDNS->fetch_record ($address->PTR);
+			$old_record = $this->PowerDNS->fetch_record($address->PTR);
 
 			// create insert array
-			$update = $this->PowerDNS->formulate_update_record ($this->PowerDNS->get_ip_ptr_name ($this->transform_address ($address->ip_addr, "dotted")), null, $address->hostname, null, null, null, $old_record->change_date);
+			$update = $this->PowerDNS->formulate_update_record($this->PowerDNS->get_ip_ptr_name($this->transform_address($address->ip_addr, "dotted")), null, $address->hostname, null, null, null, $old_record->change_date);
 			$update['id'] = $address->PTR;
 
 			// update
-			$this->PowerDNS->update_domain_record ($domain->id, $update, $print_error);
+			$this->PowerDNS->update_domain_record($domain->id, $update, $print_error);
 			// ok
-			if ($print_error && php_sapi_name()!="cli")
+			if ($print_error && php_sapi_name() != "cli")
 			$this->Result->show("success", "PTR record updated", false);
  		}
 	}
@@ -1091,20 +1091,20 @@ 
 	 * @param mixed $print_error
 	 * @return void
 	 */
-	public function ptr_delete ($address, $print_error) {
+	public function ptr_delete($address, $print_error) {
 		$address = (object) $address;
 
 		// remove link from ipaddresses
-		$this->ptr_unlink ($address->id);
+		$this->ptr_unlink($address->id);
 
 		// exists
-		if ($this->ptr_exists ($address->PTR)!==false)	{
+		if ($this->ptr_exists($address->PTR) !== false) {
 			// fetch domain
-			$domain = $this->pdns_fetch_domain ($address->subnetId);
+			$domain = $this->pdns_fetch_domain($address->subnetId);
 			//remove
-			$this->PowerDNS->remove_domain_record ($domain->id, $address->PTR);
+			$this->PowerDNS->remove_domain_record($domain->id, $address->PTR);
     		// ok
-    		if ($print_error && php_sapi_name()!="cli")
+    		if ($print_error && php_sapi_name() != "cli")
     		$this->Result->show("success", "PTR record removed", false);
 		}
 	}
@@ -1117,7 +1117,7 @@ 
 	 * @param mixed $ptr_id
 	 * @return void
 	 */
-	public function ptr_link ($address_id, $ptr_id) {
+	public function ptr_link($address_id, $ptr_id) {
 		# execute
 		try { $this->Database->updateObject("ipaddresses", array("id"=>$address_id, "PTR"=>$ptr_id)); }
 		catch (Exception $e) {
@@ -1133,7 +1133,7 @@ 
 	 * @param mixed $address_id
 	 * @return void
 	 */
-	private function ptr_unlink ($address_id) {
+	private function ptr_unlink($address_id) {
 		# execute
 		try { $this->Database->updateObject("ipaddresses", array("id"=>$address_id, "PTR"=>0)); }
 		catch (Exception $e) {
@@ -1149,7 +1149,7 @@ 
 	 * @param mixed $subnet_id
 	 * @return void
 	 */
-	public function ptr_unlink_subnet_addresses ($subnet_id) {
+	public function ptr_unlink_subnet_addresses($subnet_id) {
 		try { $this->Database->runQuery("update `ipaddresses` set `PTR` = 0 where `subnetId` = ?;", array($subnet_id)); }
 		catch (Exception $e) {
 			$this->Result->show("danger", _("Error: ").$e->getMessage());
@@ -1166,8 +1166,8 @@ 
 	 * @param mixed $ptr_id (default: 0)
 	 * @return void
 	 */
-	private function ptr_exists ($ptr_id = 0) {
-		return $this->PowerDNS->record_id_exists ($ptr_id);
+	private function ptr_exists($ptr_id = 0) {
+		return $this->PowerDNS->record_id_exists($ptr_id);
 	}
 
 	/**
@@ -1177,14 +1177,14 @@ 
 	 * @param mixed $subnetId
 	 * @return void
 	 */
-	public function ptr_get_subnet_indexes ($subnetId) {
+	public function ptr_get_subnet_indexes($subnetId) {
 		try { $indexes = $this->Database->getObjectsQuery("select `PTR` from `ipaddresses` where `PTR` != 0 and `subnetId` = ?;", array($subnetId)); }
 		catch (Exception $e) {
 			$this->Result->show("danger", _("Error: ").$e->getMessage());
 			return false;
 		}
 		# parse
-		if (sizeof($indexes)>0) {
+		if (sizeof($indexes) > 0) {
     		$out = array();
     		// loop
     		foreach ($indexes as $i) {
@@ -1223,15 +1223,15 @@ 
 	 * @param int $subnetId
 	 * @return void
 	 */
-	public function import_address_from_csv ($address, $subnetId) {
+	public function import_address_from_csv($address, $subnetId) {
 		# Subnets object
-		$this->initialize_subnets_object ();
+		$this->initialize_subnets_object();
 
 	    # fetch subnet details
 	    $subnet = (array) $this->Subnets->fetch_subnet(null, $subnetId);
 
 	    # verify address
-	    if($this->verify_address( $address[0], $this->transform_to_dotted($subnet['subnet'])."/".$subnet['mask'], false, false)!==false) { return false; }
+	    if ($this->verify_address($address[0], $this->transform_to_dotted($subnet['subnet'])."/".$subnet['mask'], false, false) !== false) { return false; }
 	    # check for duplicates
 	    if ($this->address_exists($address[0], $subnetId)) { return _('IP address already exists').' - '.$address[0]; }
 
@@ -1249,21 +1249,21 @@ 
 								);
 
 		# switch to 0, state to active
-		$address_insert['switch'] = strlen($address_insert['switch'])==0 ? 0 : $address_insert['switch'];
-		$address_insert['state']  = strlen($address_insert['state'])==0 ?  1 : $address_insert['state'];
+		$address_insert['switch'] = strlen($address_insert['switch']) == 0 ? 0 : $address_insert['switch'];
+		$address_insert['state']  = strlen($address_insert['state']) == 0 ? 1 : $address_insert['state'];
 
 		# custom fields, append to array
-		$m=9;
+		$m = 9;
 		$custom_fields = $this->set_custom_fields();
-		if(sizeof($custom_fields) > 0) {
-			foreach($custom_fields as $c) {
+		if (sizeof($custom_fields) > 0) {
+			foreach ($custom_fields as $c) {
 				$address_insert[$c['name']] = $address[$m];
 				$m++;
 			}
 		}
 
 		# insert
-		return $this->modify_address_add ($address_insert);
+		return $this->modify_address_add($address_insert);
 	}
 
 
@@ -1286,8 +1286,8 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function initialize_subnets_object () {
-		if(!is_object($this->Subnets)) { $this->Subnets = new Subnets ($this->Database); }
+	private function initialize_subnets_object() {
+		if (!is_object($this->Subnets)) { $this->Subnets = new Subnets($this->Database); }
 	}
 
 	/**
@@ -1300,19 +1300,19 @@ 
 	 * @param string $fields (default: "*")
 	 * @return void
 	 */
-	public function fetch_subnet_addresses ($subnetId, $order=null, $order_direction=null, $fields = "*") {
+	public function fetch_subnet_addresses($subnetId, $order = null, $order_direction = null, $fields = "*") {
 		# set order
-		if(!is_null($order)) 	{ $order = array($order, $order_direction); }
-		else 					{ $order = array("ip_addr", "asc"); }
+		if (!is_null($order)) { $order = array($order, $order_direction); }
+		else { $order = array("ip_addr", "asc"); }
 
 		# fields
-		if($fields!="*") {
+		if ($fields != "*") {
     		$fields = implode(",", $fields);
 		}
 
 		# escape ordering
-		$order[0] = $this->Database->escape ($order[0]);
-		$order[1] = $this->Database->escape ($order[1]);
+		$order[0] = $this->Database->escape($order[0]);
+		$order[1] = $this->Database->escape($order[1]);
 
 		try { $addresses = $this->Database->getObjectsQuery("SELECT $fields FROM `ipaddresses` where `subnetId` = ? order by `$order[0]` $order[1];", array($subnetId)); }
 		catch (Exception $e) {
@@ -1320,17 +1320,17 @@ 
 			return false;
 		}
 		# save to addresses cache
-		if(sizeof($addresses)>0) {
-			foreach($addresses as $k=>$address) {
+		if (sizeof($addresses) > 0) {
+			foreach ($addresses as $k=>$address) {
 				# add decimal format
-				$address->ip = $this->transform_to_dotted ($address->ip_addr);
+				$address->ip = $this->transform_to_dotted($address->ip_addr);
 				# save to subnets
 				$this->addresses[$address->id] = (object) $address;
 				$addresses[$k]->ip = $address->ip;
 			}
 		}
 		# result
-		return sizeof($addresses)>0 ? $addresses : array();
+		return sizeof($addresses) > 0 ? $addresses : array();
 	}
 
 	/**
@@ -1342,7 +1342,7 @@ 
 	 * @param int $subnetId
 	 * @return int
 	 */
-	public function count_subnet_addresses ($subnetId) {
+	public function count_subnet_addresses($subnetId) {
 		try { $count = $this->Database->numObjectsFilter("ipaddresses", "subnetId", $subnetId); }
 		catch (Exception $e) {
 			$this->Result->show("danger", _("Error: ").$e->getMessage());
@@ -1361,17 +1361,17 @@ 
 	 * @param mixed $subnets
 	 * @return void
 	 */
-	public function count_addresses_in_multiple_subnets ($subnets) {
+	public function count_addresses_in_multiple_subnets($subnets) {
 		# empty
-		if(empty($subnets)) { return 0; }
+		if (empty($subnets)) { return 0; }
 
 		# create query
 		$tmp = array();
-		foreach($subnets as $k=>$s) {
-			if (is_object($s))	{ $tmp[] = " `subnetId`=$s->id "; }
-			else				{ $tmp[] = " `subnetId`=$s "; }
+		foreach ($subnets as $k=>$s) {
+			if (is_object($s)) { $tmp[] = " `subnetId`=$s->id "; }
+			else { $tmp[] = " `subnetId`=$s "; }
 		}
-		$query  = "select count(*) as `cnt` from `ipaddresses` where ".implode("or", $tmp).";";
+		$query = "select count(*) as `cnt` from `ipaddresses` where ".implode("or", $tmp).";";
 
 		# fetch
 		try { $addresses = $this->Database->getObjectsQuery($query); }
@@ -1394,37 +1394,37 @@ 
 	 * @param bool $count
 	 * @return void
 	 */
-	public function fetch_subnet_addresses_recursive ($subnetId, $count = false, $order=null, $order_direction=null ) {
+	public function fetch_subnet_addresses_recursive($subnetId, $count = false, $order = null, $order_direction = null) {
 		# initialize subnets
-		$this->initialize_subnets_object ();
-		$this->Subnets = new Subnets ($this->Database);
-		$this->Subnets->reset_subnet_slaves_recursive();				//reset array of slaves before continuing
-	    $this->Subnets->fetch_subnet_slaves_recursive($subnetId);		//fetch array of slaves
-	    $this->Subnets->slaves = array_unique($this->Subnets->slaves);	//remove possible duplicates
+		$this->initialize_subnets_object();
+		$this->Subnets = new Subnets($this->Database);
+		$this->Subnets->reset_subnet_slaves_recursive(); //reset array of slaves before continuing
+	    $this->Subnets->fetch_subnet_slaves_recursive($subnetId); //fetch array of slaves
+	    $this->Subnets->slaves = array_unique($this->Subnets->slaves); //remove possible duplicates
 
 		# ip address order
-		if(!is_null($order)) 	{ $order_addr = array($order, $order_direction); }
-		else 					{ $order_addr = array("ip_addr", "asc"); }
+		if (!is_null($order)) { $order_addr = array($order, $order_direction); }
+		else { $order_addr = array("ip_addr", "asc"); }
 
 		# escape ordering
-		$order_addr[0] = $this->Database->escape ($order_addr[0]);
-		$order_addr[1] = $this->Database->escape ($order_addr[1]);
+		$order_addr[0] = $this->Database->escape($order_addr[0]);
+		$order_addr[1] = $this->Database->escape($order_addr[1]);
 
 		$ids = array();
 		$ids[] = $subnetId;
 
 	    # set query to fetch all ip addresses for specified subnets or just count
-		if($count) 	{ $query = 'select count(*) as cnt from `ipaddresses` where `subnetId` = ? '; }
-		else	 	{ $query = 'select * from `ipaddresses` where `subnetId` = ? '; }
-	    foreach($this->Subnets->slaves as $subnetId2) {
+		if ($count) { $query = 'select count(*) as cnt from `ipaddresses` where `subnetId` = ? '; }
+		else { $query = 'select * from `ipaddresses` where `subnetId` = ? '; }
+	    foreach ($this->Subnets->slaves as $subnetId2) {
 		    # ignore orphaned
-	    	if($subnetId2 != $subnetId) {
-				$query  .= " or `subnetId` = ? ";
+	    	if ($subnetId2 != $subnetId) {
+				$query .= " or `subnetId` = ? ";
 		    	$ids[] = $subnetId2;
 			}
 		}
 
-	    $query      .= "order by `$order_addr[0]` $order_addr[1];";
+	    $query .= "order by `$order_addr[0]` $order_addr[1];";
 		# fetch
 		try { $addresses = $this->Database->getObjectsQuery($query, $ids); }
 		catch (Exception $e) {
@@ -1449,12 +1449,12 @@ 
 	 * @param bool $is_broadcast (default: false)
 	 * @return void
 	 */
-	public function find_unused_addresses ($address1, $address2, $netmask, $empty=false, $is_subnet=false, $is_broadcast=false) {
+	public function find_unused_addresses($address1, $address2, $netmask, $empty = false, $is_subnet = false, $is_broadcast = false) {
 		# make sure addresses are in decimal format
-		$address1 = $this->transform_address ($address1, "decimal");
-		$address2 = $this->transform_address ($address2, "decimal");
+		$address1 = $this->transform_address($address1, "decimal");
+		$address2 = $this->transform_address($address2, "decimal");
 		# check for space
-		return $this->identify_address($address1)=="IPv6" ? $this->find_unused_addresses_IPv6 ($address1, $address2, $netmask, $empty, $is_subnet, $is_broadcast) : $this->find_unused_addresses_IPv4 ($address1, $address2, $netmask, $empty);
+		return $this->identify_address($address1) == "IPv6" ? $this->find_unused_addresses_IPv6($address1, $address2, $netmask, $empty, $is_subnet, $is_broadcast) : $this->find_unused_addresses_IPv4($address1, $address2, $netmask, $empty);
 	}
 
 	/**
@@ -1469,12 +1469,12 @@ 
 	 * @param bool $empty
 	 * @return void
 	 */
-	protected function find_unused_addresses_IPv4 ($address1, $address2, $netmask, $empty) {
+	protected function find_unused_addresses_IPv4($address1, $address2, $netmask, $empty) {
 		# calculate diff
-		$diff = $this->calculate_address_diff ($address1, $address2);
+		$diff = $this->calculate_address_diff($address1, $address2);
 		# 32 subnets
-		if($netmask==32) {
-			if($empty) {
+		if ($netmask == 32) {
+			if ($empty) {
 				return array("ip"=>$this->transform_to_dotted($address1), "hosts"=>1);
 			}
 			else {
@@ -1482,16 +1482,16 @@ 
 			}
 		}
 		# 31 subnets
-		elseif($netmask==31) {
+		elseif ($netmask == 31) {
 
-			if($empty) {
+			if ($empty) {
 				return array("ip"=>$this->transform_to_dotted($address1), "hosts"=>2);
 			}
-			elseif($diff==1) {
-				if($this->is_network($address1, $netmask)) {
+			elseif ($diff == 1) {
+				if ($this->is_network($address1, $netmask)) {
 					return array("ip"=>$this->transform_to_dotted($address2), "hosts"=>1);
 				}
-				elseif($this->is_broadcast($address2, $netmask)) {
+				elseif ($this->is_broadcast($address2, $netmask)) {
 					return array("ip"=>$this->transform_to_dotted($address1), "hosts"=>1);
 				}
 				else {
@@ -1503,16 +1503,16 @@ 
 			}
 		}
 		# if diff is less than 2 return false */
-		elseif ( $diff < 2 ) {
+		elseif ($diff < 2) {
         		return false;
     	}
 		# if diff is 2 return 1 IP address in the middle */
-		elseif ( $diff == 2 ) {
-				return array("ip"=>$this->transform_to_dotted($address1+1), "hosts"=>1);
+		elseif ($diff == 2) {
+				return array("ip"=>$this->transform_to_dotted($address1 + 1), "hosts"=>1);
     	}
 		# if diff is more than 2 return pool */
 		else {
-            	return array("ip"=>$this->transform_to_dotted($address1+1)." - ".$this->transform_to_dotted(($address2-1)), "hosts"=>gmp_strval(gmp_sub($diff, 1)));
+            	return array("ip"=>$this->transform_to_dotted($address1 + 1)." - ".$this->transform_to_dotted(($address2 - 1)), "hosts"=>gmp_strval(gmp_sub($diff, 1)));
     	}
     	# default false
     	return false;
@@ -1532,33 +1532,33 @@ 
 	 * @param bool $is_broadcast (default: false)
 	 * @return void
 	 */
-	protected function find_unused_addresses_IPv6 ($address1, $address2, $netmask, $empty = false, $is_subnet = false, $is_broadcast = false) {
+	protected function find_unused_addresses_IPv6($address1, $address2, $netmask, $empty = false, $is_subnet = false, $is_broadcast = false) {
 		# Initialize PEAR NET object
-		$this->initialize_pear_net_IPv6 ();
+		$this->initialize_pear_net_IPv6();
 
-		if($empty) {
-    		$Subnets = new Subnets ($this->Database);
-    		return array("ip"=>$this->transform_to_dotted(gmp_strval($address1))." - ".$this->transform_to_dotted(gmp_strval($address2)), "hosts"=>$Subnets->get_max_hosts ($netmask, "IPv6"));
+		if ($empty) {
+    		$Subnets = new Subnets($this->Database);
+    		return array("ip"=>$this->transform_to_dotted(gmp_strval($address1))." - ".$this->transform_to_dotted(gmp_strval($address2)), "hosts"=>$Subnets->get_max_hosts($netmask, "IPv6"));
 		}
         else {
     		# calculate diff
-    		$diff = $this->calculate_address_diff ($address1, $address2);
+    		$diff = $this->calculate_address_diff($address1, $address2);
 
     		# /128
-    		if($netmask == 128) {
-        		if($diff>1) {
+    		if ($netmask == 128) {
+        		if ($diff > 1) {
                     return array("ip"=>$this->transform_to_dotted(gmp_strval($address1)), "hosts"=>1);
                 }
         	}
     		# /127
-    	    elseif($netmask == 127) {
-        	    if($diff==1 && $this->is_network($address1, $netmask)) {
+    	    elseif ($netmask == 127) {
+        	    if ($diff == 1 && $this->is_network($address1, $netmask)) {
     				return array("ip"=>$this->transform_to_dotted($address2), "hosts"=>1);
     			}
-    			elseif($diff==1 && $this->is_broadcast($address2, $netmask)) {
+    			elseif ($diff == 1 && $this->is_broadcast($address2, $netmask)) {
     				return array("ip"=>$this->transform_to_dotted($address1), "hosts"=>1);
     			}
-    			elseif($diff==0) {
+    			elseif ($diff == 0) {
         			return false;
     			}
     			else {
@@ -1566,15 +1566,15 @@ 
     			}
     	    }
     	    # null
-    	    elseif ($diff==0) {
+    	    elseif ($diff == 0) {
         	    return false;
     	    }
     	    # diff 1
-    	    elseif ($diff==1) {
-         		if($is_subnet) {
+    	    elseif ($diff == 1) {
+         		if ($is_subnet) {
                     return array("ip"=>$this->transform_to_dotted(gmp_strval($address1)), "hosts"=>1);
         		}
-        		elseif($is_broadcast) {
+        		elseif ($is_broadcast) {
                     return array("ip"=>$this->transform_to_dotted(gmp_strval($address2)), "hosts"=>1);
         		}
         		else {
@@ -1582,19 +1582,19 @@ 
                 }
     	    }
     	    # diff 2
-    	    elseif ($diff==2 && !$is_subnet && !$is_broadcast) {
-                return array("ip"=>$this->transform_to_dotted(gmp_strval(gmp_add($address1,1))), "hosts"=>1);
+    	    elseif ($diff == 2 && !$is_subnet && !$is_broadcast) {
+                return array("ip"=>$this->transform_to_dotted(gmp_strval(gmp_add($address1, 1))), "hosts"=>1);
     	    }
     	    # default
     	    else {
-        		if($is_subnet) {
-                    return array("ip"=>$this->transform_to_dotted(gmp_strval($address1))." - ".$this->transform_to_dotted(gmp_strval(gmp_sub($address2,1))), "hosts"=>$this->reformat_number(gmp_strval(gmp_sub($diff,0))));
+        		if ($is_subnet) {
+                    return array("ip"=>$this->transform_to_dotted(gmp_strval($address1))." - ".$this->transform_to_dotted(gmp_strval(gmp_sub($address2, 1))), "hosts"=>$this->reformat_number(gmp_strval(gmp_sub($diff, 0))));
         		}
-        		elseif($is_broadcast) {
-                    return array("ip"=>$this->transform_to_dotted(gmp_strval(gmp_add($address1,1)))." - ".$this->transform_to_dotted(gmp_strval($address2)), "hosts"=>$this->reformat_number(gmp_strval(gmp_sub($diff,0))));
+        		elseif ($is_broadcast) {
+                    return array("ip"=>$this->transform_to_dotted(gmp_strval(gmp_add($address1, 1)))." - ".$this->transform_to_dotted(gmp_strval($address2)), "hosts"=>$this->reformat_number(gmp_strval(gmp_sub($diff, 0))));
         		}
         		else {
-                    return array("ip"=>$this->transform_to_dotted(gmp_strval(gmp_add($address1,1)))." - ".$this->transform_to_dotted(gmp_strval(gmp_sub($address2,1))), "hosts"=>$this->reformat_number(gmp_strval(gmp_strval(gmp_sub($diff,1)))));
+                    return array("ip"=>$this->transform_to_dotted(gmp_strval(gmp_add($address1, 1)))." - ".$this->transform_to_dotted(gmp_strval(gmp_sub($address2, 1))), "hosts"=>$this->reformat_number(gmp_strval(gmp_strval(gmp_sub($diff, 1)))));
                 }
         	}
 
@@ -1628,13 +1628,13 @@ 
 	 * @param bool $die (default: false)
 	 * @return boolean
 	 */
-	public function verify_address( $address, $subnet, $no_strict = false, $die=true ) {
+	public function verify_address($address, $subnet, $no_strict = false, $die = true) {
 		# subnet should be in CIDR format
-		$this->initialize_subnets_object ();
-		if(strlen($error = $this->Subnets->verify_cidr ($subnet))>1)				{ $this->Result->show("danger", $error, $die); return true; }
+		$this->initialize_subnets_object();
+		if (strlen($error = $this->Subnets->verify_cidr($subnet)) > 1) { $this->Result->show("danger", $error, $die); return true; }
 
 		# make checks
-		return $this->identify_address ($address)=="IPv6" ? $this->verify_address_IPv6 ($address, $subnet, $die) : $this->verify_address_IPv4 ($address, $subnet, $no_strict, $die);
+		return $this->identify_address($address) == "IPv6" ? $this->verify_address_IPv6($address, $subnet, $die) : $this->verify_address_IPv4($address, $subnet, $no_strict, $die);
 	}
 
 	/**
@@ -1647,24 +1647,24 @@ 
 	 * @param bool $die
 	 * @return boolean
 	 */
-	public function verify_address_IPv4 ($address, $subnet, $no_strict, $die) {
+	public function verify_address_IPv4($address, $subnet, $no_strict, $die) {
 		# Initialize PEAR NET object
-		$this->initialize_pear_net_IPv4 ();
+		$this->initialize_pear_net_IPv4();
         # fetch mask part
         $mask = explode("/", $subnet);
 
 		# is address valid?
-		if (!$this->Net_IPv4->validateIP($address)) 						{ $this->Result->show("danger", _("IP address not valid")."! ($address)", $die); return true; }
+		if (!$this->Net_IPv4->validateIP($address)) { $this->Result->show("danger", _("IP address not valid")."! ($address)", $die); return true; }
 		# is address in provided subnet
-		elseif (!$this->Net_IPv4->ipInNetwork($address, $subnet)) 			{ $this->Result->show("danger", _("IP address not in selected subnet")."! ($address)", $die); return true; }
+		elseif (!$this->Net_IPv4->ipInNetwork($address, $subnet)) { $this->Result->show("danger", _("IP address not in selected subnet")."! ($address)", $die); return true; }
 		# ignore  /31 and /32 subnet broadcast and subnet checks!
-		elseif ($mask[1] == 31 || $mask[1] == 32 || $no_strict == true) 	{ }
+		elseif ($mask[1] == 31 || $mask[1] == 32 || $no_strict == true) { }
 		# It cannot be subnet or broadcast
 		else {
             $net = $this->Net_IPv4->parseAddress($subnet);
 
-            if ($net->network == $address) 									{ $this->Result->show("danger", _("Cannot add subnet as IP address!"), $die); return true; }
-            elseif ($net->broadcast == $address)							{ $this->Result->show("danger", _("Cannot add broadcast as IP address!"), $die); return true; }
+            if ($net->network == $address) { $this->Result->show("danger", _("Cannot add subnet as IP address!"), $die); return true; }
+            elseif ($net->broadcast == $address) { $this->Result->show("danger", _("Cannot add broadcast as IP address!"), $die); return true; }
 		}
 		# default
 		return false;
@@ -1679,14 +1679,14 @@ 
 	 * @param bool $die
 	 * @return boolean
 	 */
-	public function verify_address_IPv6 ($address, $subnet, $die) {
+	public function verify_address_IPv6($address, $subnet, $die) {
 		# Initialize PEAR NET object
-		$this->initialize_pear_net_IPv6 ();
+		$this->initialize_pear_net_IPv6();
 
 		# is it valid?
-		if (!$this->Net_IPv6->checkIPv6($address)) 							{ $this->Result->show("danger", _("IP address not valid")."! ($address)", $die); return true; }
+		if (!$this->Net_IPv6->checkIPv6($address)) { $this->Result->show("danger", _("IP address not valid")."! ($address)", $die); return true; }
 		# it must be in provided subnet
-		elseif (!$this->Net_IPv6->isInNetmask($address, $subnet)) 			{ $this->Result->show("danger", _("IP address not in selected subnet")."! ($address)", $die); return true; }
+		elseif (!$this->Net_IPv6->isInNetmask($address, $subnet)) { $this->Result->show("danger", _("IP address not in selected subnet")."! ($address)", $die); return true; }
 		# default
 		return false;
 	}
@@ -1698,19 +1698,19 @@ 
 	 * @param mixed $address
 	 * @return void
 	 */
-	public function validate_address ($address) {
+	public function validate_address($address) {
 		# Initialize PEAR NET object
-		$this->initialize_pear_net_IPv4 ();
-		$this->initialize_pear_net_IPv6 ();
+		$this->initialize_pear_net_IPv4();
+		$this->initialize_pear_net_IPv6();
 
 		// no null
-		if($this->transform_address ($address, "decimal")==0) {
+		if ($this->transform_address($address, "decimal") == 0) {
 			return false;
 		}
 		// transform
-		$address = $this->transform_address ($address, "dotted");
+		$address = $this->transform_address($address, "dotted");
 		// ipv6
-		if($this->identify_address ($address)=="IPv6") {
+		if ($this->identify_address($address) == "IPv6") {
 			return $this->Net_IPv6->checkIPv6($address) ?  true : false;
 		}
 		// ipv4
@@ -1727,10 +1727,10 @@ 
 	 * @param int $netmask
 	 * @return boolean
 	 */
-	public function is_network ($address, $netmask) {
-		$this->initialize_subnets_object ();
-		$boundaries = $this->Subnets->get_network_boundaries ($address, $netmask);
-		return $this->transform_address($address,"dotted")==$boundaries['network'] ? true : false;
+	public function is_network($address, $netmask) {
+		$this->initialize_subnets_object();
+		$boundaries = $this->Subnets->get_network_boundaries($address, $netmask);
+		return $this->transform_address($address, "dotted") == $boundaries['network'] ? true : false;
 	}
 
 	/**
@@ -1741,10 +1741,10 @@ 
 	 * @param int $netmask
 	 * @return boolean
 	 */
-	public function is_broadcast ($address, $netmask) {
-		$this->initialize_subnets_object ();
-		$boundaries = $this->Subnets->get_network_boundaries ($address, $netmask);
-		return $this->transform_address($address,"dotted")==$boundaries['broadcast'] ? true : false;
+	public function is_broadcast($address, $netmask) {
+		$this->initialize_subnets_object();
+		$boundaries = $this->Subnets->get_network_boundaries($address, $netmask);
+		return $this->transform_address($address, "dotted") == $boundaries['broadcast'] ? true : false;
 	}
 
 	/**
@@ -1754,13 +1754,13 @@ 
 	 * @param mixed $hostname
 	 * @return boolean
 	 */
-	public function is_hostname_unique ($hostname) {
+	public function is_hostname_unique($hostname) {
 		try { $cnt = $this->Database->numObjectsFilter("ipaddresses", "hostname", $hostname); }
 		catch (Exception $e) {
 			$this->Result->show("danger", _("Error: ").$e->getMessage());
 			return false;
 		}
-		return $cnt==0 ? true : false;
+		return $cnt == 0 ? true : false;
 	}
 
 
@@ -1790,18 +1790,18 @@ 
 	 * @param array $addresses
 	 * @return void
 	 */
-	public function compress_address_ranges ($addresses, $state=4) {
+	public function compress_address_ranges($addresses, $state = 4) {
     	# set size
     	$size = sizeof($addresses);
     	// vars
     	$addresses_formatted = array();
 
 		# loop through IP addresses
-		for($c=0; $c<$size; $c++) {
+		for ($c = 0; $c < $size; $c++) {
 			# ignore already comressed range
-			if($addresses[$c]->class!="compressed-range") {
+			if ($addresses[$c]->class != "compressed-range") {
 				# gap between this and previous
-				if(gmp_strval( @gmp_sub($addresses[$c]->ip_addr, $addresses[$c-1]->ip_addr)) != 1) {
+				if (gmp_strval(@gmp_sub($addresses[$c]->ip_addr, $addresses[$c - 1]->ip_addr)) != 1) {
 					# remove index flag
 					unset($fIndex);
 					# save IP address
@@ -1809,9 +1809,9 @@ 
 					$addresses_formatted[$c]->class = "ip";
 
 					# no gap this -> next
-					if(gmp_strval( @gmp_sub($addresses[$c]->ip_addr, $addresses[$c+1]->ip_addr)) == -1 && $addresses[$c]->state==$state) {
+					if (gmp_strval(@gmp_sub($addresses[$c]->ip_addr, $addresses[$c + 1]->ip_addr)) == -1 && $addresses[$c]->state == $state) {
 						//is state the same?
-						if($addresses[$c]->state==$addresses[$c+1]->state) {
+						if ($addresses[$c]->state == $addresses[$c + 1]->state) {
 							$fIndex = $c;
 							$addresses_formatted[$fIndex]->startIP = $addresses[$c]->ip_addr;
 							$addresses_formatted[$c]->class = "compressed-range";
@@ -1821,9 +1821,9 @@ 
 				# no gap between this and previous
 				else {
 					# is state same as previous?
-					if($addresses[$c]->state==$addresses[$c-1]->state && $addresses[$c]->state==$state) {
-						$addresses_formatted[$fIndex]->stopIP = $addresses[$c]->ip_addr;	//adds dhcp state
-						$addresses_formatted[$fIndex]->numHosts = gmp_strval( gmp_add(@gmp_sub($addresses[$c]->ip_addr, $addresses_formatted[$fIndex]->ip_addr),1));	//add number of hosts
+					if ($addresses[$c]->state == $addresses[$c - 1]->state && $addresses[$c]->state == $state) {
+						$addresses_formatted[$fIndex]->stopIP = $addresses[$c]->ip_addr; //adds dhcp state
+						$addresses_formatted[$fIndex]->numHosts = gmp_strval(gmp_add(@gmp_sub($addresses[$c]->ip_addr, $addresses_formatted[$fIndex]->ip_addr), 1)); //add number of hosts
 					}
 					# different state
 					else {
@@ -1833,7 +1833,7 @@ 
 						$addresses_formatted[$c] = $addresses[$c];
 						$addresses_formatted[$c]->class = "ip";
 						# check if state is same as next to start range
-						if($addresses[$c]->state==@$addresses[$c+1]->state &&  gmp_strval( @gmp_sub($addresses[$c]->ip_addr, $addresses[$c+1]->ip_addr)) == -1 && $addresses[$c]->state==$state) {
+						if ($addresses[$c]->state == @$addresses[$c + 1]->state && gmp_strval(@gmp_sub($addresses[$c]->ip_addr, $addresses[$c + 1]->ip_addr)) == -1 && $addresses[$c]->state == $state) {
 							$fIndex = $c;
 							$addresses_formatted[$fIndex]->startIP = $addresses[$c]->ip_addr;
 							$addresses_formatted[$c]->class = "compressed-range";
@@ -1858,23 +1858,23 @@ 
 	 * @access public
 	 * @return void
 	 */
-	public function find_invalid_addresses () {
+	public function find_invalid_addresses() {
     	// init
     	$false = array();
 		// find unique ids
-		$ids = $this->find_unique_subnetids ();
-		if ($ids===false)										{ return false; }
+		$ids = $this->find_unique_subnetids();
+		if ($ids === false) { return false; }
 
 		// validate
 		foreach ($ids as $id) {
-			if ($this->verify_subnet_id ($id->subnetId)===false) {
-				$false[] = $this->fetch_subnet_addresses ($id->subnetId);
+			if ($this->verify_subnet_id($id->subnetId) === false) {
+				$false[] = $this->fetch_subnet_addresses($id->subnetId);
 			}
 		}
 		// filter
 		$false = array_filter($false);
 		// return
-		return sizeof($false)>0 ? $false : false;
+		return sizeof($false) > 0 ? $false : false;
 	}
 
 	/**
@@ -1883,14 +1883,14 @@ 
 	 * @access private
 	 * @return void
 	 */
-	private function find_unique_subnetids () {
+	private function find_unique_subnetids() {
 		try { $res = $this->Database->getObjectsQuery("select distinct(`subnetId`) from `ipaddresses` order by `subnetId` asc;"); }
 		catch (Exception $e) {
 			$this->Result->show("danger", _("Error: ").$e->getMessage());
 			return false;
 		}
 		# return
-		return sizeof($res)>0 ? $res : false;
+		return sizeof($res) > 0 ? $res : false;
 	}
 
 	/**
@@ -1900,14 +1900,14 @@ 
 	 * @param mixed $id
 	 * @return void
 	 */
-	private function verify_subnet_id ($id) {
-		try { $res = $this->Database->numObjectsFilter("subnets", "id", $id ); }
+	private function verify_subnet_id($id) {
+		try { $res = $this->Database->numObjectsFilter("subnets", "id", $id); }
 		catch (Exception $e) {
 			$this->Result->show("danger", _("Error: ").$e->getMessage());
 			return false;
 		}
 		# return
-		return $res==0 ? false : true;
+		return $res == 0 ? false : true;
 	}
 
 
@@ -1935,17 +1935,17 @@ 
 	 * @param int $subnetId
 	 * @return int permission level
 	 */
-	public function check_permission ($user, $subnetId) {
+	public function check_permission($user, $subnetId) {
 
 		# get all user groups
 		$groups = json_decode($user->groups);
 
 		# if user is admin then return 3, otherwise check
-		if($user->role == "Administrator")	{ return 3; }
+		if ($user->role == "Administrator") { return 3; }
 
     	# object
     	if (!is_object($this->Subnets)) {
-        	$this->Subnets = new Subnets ($this->Database);
+        	$this->Subnets = new Subnets($this->Database);
     	}
         # fetch subnet
         $subnet = $this->Subnets->fetch_subnet("id", $subnetId);
@@ -1953,20 +1953,20 @@ 
 		$subnetP = json_decode($subnet->permissions);
 
 		# set section permissions
-		$Section = new Section ($this->Database);
-		$section = $Section->fetch_section ("id", $subnet->sectionId);
+		$Section = new Section($this->Database);
+		$section = $Section->fetch_section("id", $subnet->sectionId);
 		$sectionP = json_decode($section->permissions);
 
 		# default permission
 		$out = 0;
 
 		# for each group check permissions, save highest to $out
-		if(sizeof($sectionP) > 0) {
-			foreach($sectionP as $sk=>$sp) {
+		if (sizeof($sectionP) > 0) {
+			foreach ($sectionP as $sk=>$sp) {
 				# check each group if user is in it and if so check for permissions for that group
-				foreach($groups as $uk=>$up) {
-					if($uk == $sk) {
-						if($sp > $out) { $out = $sp; }
+				foreach ($groups as $uk=>$up) {
+					if ($uk == $sk) {
+						if ($sp > $out) { $out = $sp; }
 					}
 				}
 			}
@@ -1976,18 +1976,18 @@ 
 		}
 
 		# if section permission == 0 then return 0
-		if($out == 0) {
+		if ($out == 0) {
 			return 0;
 		}
 		else {
 			$out = 0;
 			# ok, user has section access, check also for any higher access from subnet
-			if(sizeof($subnetP) > 0) {
-				foreach($subnetP as $sk=>$sp) {
+			if (sizeof($subnetP) > 0) {
+				foreach ($subnetP as $sk=>$sp) {
 					# check each group if user is in it and if so check for permissions for that group
-					foreach($groups as $uk=>$up) {
-						if($uk == $sk) {
-							if($sp > $out) { $out = $sp; }
+					foreach ($groups as $uk=>$up) {
+						if ($uk == $sk) {
+							if ($sp > $out) { $out = $sp; }
 						}
 					}
 				}
@@ -2019,12 +2019,12 @@ 
 	 * @param mixed $number
 	 * @return void
 	 */
-	public function reformat_number ($number) {
+	public function reformat_number($number) {
 		$length = strlen($number);
-		$pos	= $length - 3;
+		$pos = $length - 3;
 
 		if ($length > 8) {
-			$number = "~". substr($number, 0, $length - $pos) . "&middot;10^<sup>". $pos ."</sup>";
+			$number = "~".substr($number, 0, $length - $pos)."&middot;10^<sup>".$pos."</sup>";
 		}
 		return $number;
 	}
@@ -2053,7 +2053,7 @@ 
 	 * @param mixed $address
 	 * @return void
 	 */
-	public function print_nat_link ($all_nats, $all_nats_per_object, $subnet, $address, $type="ipaddress") {
+	public function print_nat_link($all_nats, $all_nats_per_object, $subnet, $address, $type = "ipaddress") {
     	// cast
     	$subnet = (object) $subnet;
     	$address = (object) $address;
@@ -2065,35 +2065,35 @@ 
     	$cnt = 0;
 
     	// subnets
-        if(isset($all_nats_per_object['subnets'][$subnet->id])) {
+        if (isset($all_nats_per_object['subnets'][$subnet->id])) {
             foreach ($all_nats_per_object['subnets'][$subnet->id] as $nat) {
                 // set object
                 $n = $all_nats[$nat];
                 // print
-                $html[] = str_replace("'", "\"", $this->print_nat_link_line ($n, false, "subnets", $subnet->id));
+                $html[] = str_replace("'", "\"", $this->print_nat_link_line($n, false, "subnets", $subnet->id));
             }
             $cnt++;
         }
 
     	// addresses
-    	if(isset($all_nats_per_object['ipaddresses'][$address->id])) {
+    	if (isset($all_nats_per_object['ipaddresses'][$address->id])) {
             foreach ($all_nats_per_object['ipaddresses'][$address->id] as $nat) {
                 // set object
                 $n = $all_nats[$nat];
                 // print
-                $html[] = str_replace("'", "\"", $this->print_nat_link_line ($n, false, "ipaddresses", $address->id));
+                $html[] = str_replace("'", "\"", $this->print_nat_link_line($n, false, "ipaddresses", $address->id));
                 $cnt++;
             }
     	}
 
         // print if some
-        if ($cnt>0) {
+        if ($cnt > 0) {
             $html[] = "</table>";
-            if($type=="subnet") {
-                print  " <a href='".create_link("subnets",$subnet->sectionId, $subnet->id, "nat")."' class='btn btn-xs btn-default show_popover fa fa-exchange' style='font-size:11px;margin-top:-3px;padding:1px 3px;' data-toggle='popover' title='"._('Object is Natted')."' data-trigger='hover' data-html='true' data-content='".implode("\n", $html)."'></a>";
+            if ($type == "subnet") {
+                print  " <a href='".create_link("subnets", $subnet->sectionId, $subnet->id, "nat")."' class='btn btn-xs btn-default show_popover fa fa-exchange' style='font-size:11px;margin-top:-3px;padding:1px 3px;' data-toggle='popover' title='"._('Object is Natted')."' data-trigger='hover' data-html='true' data-content='".implode("\n", $html)."'></a>";
             }
             else {
-                print  " <a href='".create_link("subnets",$subnet->sectionId, $subnet->id, "address-details", $address->id, "nat")."' class='btn btn-xs btn-default show_popover fa fa-exchange' style='font-size:11px;margin-top:-3px;padding:1px 3px;' data-toggle='popover' title='"._('Object is Natted')."' data-trigger='hover' data-html='true' data-content='".implode("\n", $html)."'></a>";
+                print  " <a href='".create_link("subnets", $subnet->sectionId, $subnet->id, "address-details", $address->id, "nat")."' class='btn btn-xs btn-default show_popover fa fa-exchange' style='font-size:11px;margin-top:-3px;padding:1px 3px;' data-toggle='popover' title='"._('Object is Natted')."' data-trigger='hover' data-html='true' data-content='".implode("\n", $html)."'></a>";
             }
         }
 	}
@@ -2108,23 +2108,23 @@ 
      * @param bool $object_id (default: false)
      * @return void
      */
-    public function print_nat_link_line ($n, $nat_id = false, $object_type = false, $object_id=false) {
+    public function print_nat_link_line($n, $nat_id = false, $object_type = false, $object_id = false) {
         // cast to object to be sure if array provided
         $n = (object) $n;
 
         // translate json to array, links etc
-        $sources      = $this->translate_nat_objects_for_popup ($n->src, $nat_id, false, $object_type, $object_id);
-        $destinations = $this->translate_nat_objects_for_popup ($n->dst, $nat_id, false, $object_type, $object_id);
+        $sources      = $this->translate_nat_objects_for_popup($n->src, $nat_id, false, $object_type, $object_id);
+        $destinations = $this->translate_nat_objects_for_popup($n->dst, $nat_id, false, $object_type, $object_id);
 
         // no src/dst
-        if ($sources===false)
+        if ($sources === false)
             $sources = array("<span class='badge badge1 badge5 alert-danger'>"._("None")."</span>");
-        if ($destinations===false)
+        if ($destinations === false)
             $destinations = array("<span class='badge badge1 badge5 alert-danger'>"._("None")."</span>");
 
 
         // icon
-        $icon =  $n->type=="static" ? "fa-arrows-h" : "fa-long-arrow-right";
+        $icon = $n->type == "static" ? "fa-arrows-h" : "fa-long-arrow-right";
 
         // to html
         $html = array();
@@ -2135,7 +2135,7 @@ 
         $html[] = "</tr>";
 
         // append ports
-        if(($n->type=="static" || $n->type=="destination") && (strlen($n->src_port)>0 && strlen($n->dst_port)>0)) {
+        if (($n->type == "static" || $n->type == "destination") && (strlen($n->src_port) > 0 && strlen($n->dst_port) > 0)) {
             $sources      = implode("<br>", $sources)." /".$n->src_port;
             $destinations = implode("<br>", $destinations)." /".$n->dst_port;
         }
@@ -2170,24 +2170,24 @@ 
      * @param int|bool object_id (default: false) - to bold it
      * @return void
      */
-    public function translate_nat_objects_for_popup ($json_objects, $nat_id = false, $admin = false, $object_type = false, $object_id=false) {
+    public function translate_nat_objects_for_popup($json_objects, $nat_id = false, $admin = false, $object_type = false, $object_id = false) {
         // to array "subnets"=>array(1,2,3)
         $objects = json_decode($json_objects, true);
         // init out array
         $out = array();
         // check
-        if(is_array($objects)) {
-            if(sizeof($objects)>0) {
+        if (is_array($objects)) {
+            if (sizeof($objects) > 0) {
                 foreach ($objects as $ot=>$ids) {
-                    if (sizeof($ids)>0) {
+                    if (sizeof($ids) > 0) {
                         foreach ($ids as $id) {
                             // fetch
                             $item = $this->fetch_object($ot, "id", $id);
-                            if($item!==false) {
+                            if ($item !== false) {
                                 // bold
-                                $bold = $item->id==$object_id && $ot==$object_type ? "<span class='strong'>" : "<span>";
+                                $bold = $item->id == $object_id && $ot == $object_type ? "<span class='strong'>" : "<span>";
                                 // subnets
-                                if ($ot=="subnets") {
+                                if ($ot == "subnets") {
                                     $out[] = "$bold".$this->transform_address($item->subnet, "dotted")."/".$item->mask."</span></span>";
                                 }
                                 // addresses
@@ -2201,7 +2201,7 @@ 
             }
         }
         // result
-        return sizeof($out)>0 ? $out : false;
+        return sizeof($out) > 0 ? $out : false;
     }
 
 }

functions/classes/class.Mail.php

Indentation +272 added lines, -272 removed lines

@@ -11,278 +11,278 @@
 class phpipam_mail extends Common_functions {
 
 
-	/**
-	 * phpipam settings
-	 *
-	 * (default value: null)
-	 *
-	 * @var object|bool
-	 * @access public
-	 */
-	public $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;
-
-		# we need phpmailer
-		if(file_exists(dirname(__FILE__).'/../PHPMailer/PHPMailerAutoload.php')) {
-			// legacy versions
-			require_once( dirname(__FILE__).'/../PHPMailer/PHPMailerAutoload.php');
-
-			# initialize object
-			$this->Php_mailer = new PHPMailer(true);			//localhost by default
-		}
-		elseif (file_exists(dirname(__FILE__).'/../PHPMailer/src/Exception.php')) {
-			require_once( dirname(__FILE__).'/../PHPMailer/src/Exception.php');
-			require_once( dirname(__FILE__).'/../PHPMailer/src/PHPMailer.php');
-			require_once( dirname(__FILE__).'/../PHPMailer/src/SMTP.php');
-
-			$this->Php_mailer = new PHPMailer\PHPMailer\PHPMailer();
-		} else {
-			throw new Exception(_('PHPMailer submodule is missing.'));
-		}
-
-		$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->SMTPAutoTLS = true;
-			$this->Php_mailer->SMTPSecure = $this->mail_settings->msecure=='ssl' ? 'ssl' : 'tls';
-		}
-		else {
-			$this->Php_mailer->SMTPAutoTLS = false;
-			$this->Php_mailer->SMTPSecure = '';
-		}
-		//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));
-		// uncomment this to disable AUTOTLS if security is set to none
-		$this->Php_mailer->SMTPAutoTLS = false;
-		//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 = array();
-		$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 = array();
-		$html[] = $body;						//set body
-		$html[] = $this->set_footer_plain ();	//set footer
-	}
-
-	/**
-	 * set_header function.
-	 *
-	 * @access private
-	 * @return string
-	 */
-	private function set_header () {
-    	$html = array();
-		$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 () {
-		# read config
-		require_once( dirname(__FILE__).'/../../config.php');
-
-		// set width
-		$logo_width = isset($config['logo_width']) ? $config['logo_width'] : 220;
-
-    	$html = array();
-    	$html[] = "<body style='margin:0px;padding:0px;background:#f9f9f9;border-collapse:collapse;'>";
-    	# logo
-    	if(!file_exists( dirname(__FILE__)."/../../css/images/logo/logo.png")) {
-			$img = ''; // Load built-in image
-			require( dirname(__FILE__).'/../../app/admin/settings/logo/logo-builtin.php' );
-			$html[] = $img;
-		}
-		else {
-			$html[] = "<img style='max-width:".$logo_width."px;margin-top:15px;margin-bottom:20px;' alt='phpipam' src='data:image/png;base64,".base64_encode(file_get_contents(dirname(__FILE__)."/../../css/images/logo/logo.png"))."'>";
-		}
-
-		# return
-		return implode("\n", $html);
-	}
-
-	/**
-	 * 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 = array();
-		$html[] = "<hr style='margin-left:10px;width:300px;height:0px;margin-top:40px;margin-left:0px;border-top:0px;border-bottom:1px solid #ddd;'>";
-		$html[] = "<div class='padding-left:10px;'>";
-		$html[] = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; $this->mail_font_style_light This email was automatically generated. You can change your notification settings in account details!</font><br>";
-		$html[] = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a href='".$this->settings->siteURL."' font-size:'11px;'>$this->mail_font_style_href ".$this->settings->siteURL."</font></a><br>";
-		$html[] = "</div>";
-
-		# 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;
-	}
+    /**
+     * phpipam settings
+     *
+     * (default value: null)
+     *
+     * @var object|bool
+     * @access public
+     */
+    public $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;
+
+        # we need phpmailer
+        if(file_exists(dirname(__FILE__).'/../PHPMailer/PHPMailerAutoload.php')) {
+            // legacy versions
+            require_once( dirname(__FILE__).'/../PHPMailer/PHPMailerAutoload.php');
+
+            # initialize object
+            $this->Php_mailer = new PHPMailer(true);			//localhost by default
+        }
+        elseif (file_exists(dirname(__FILE__).'/../PHPMailer/src/Exception.php')) {
+            require_once( dirname(__FILE__).'/../PHPMailer/src/Exception.php');
+            require_once( dirname(__FILE__).'/../PHPMailer/src/PHPMailer.php');
+            require_once( dirname(__FILE__).'/../PHPMailer/src/SMTP.php');
+
+            $this->Php_mailer = new PHPMailer\PHPMailer\PHPMailer();
+        } else {
+            throw new Exception(_('PHPMailer submodule is missing.'));
+        }
+
+        $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->SMTPAutoTLS = true;
+            $this->Php_mailer->SMTPSecure = $this->mail_settings->msecure=='ssl' ? 'ssl' : 'tls';
+        }
+        else {
+            $this->Php_mailer->SMTPAutoTLS = false;
+            $this->Php_mailer->SMTPSecure = '';
+        }
+        //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));
+        // uncomment this to disable AUTOTLS if security is set to none
+        $this->Php_mailer->SMTPAutoTLS = false;
+        //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 = array();
+        $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 = array();
+        $html[] = $body;						//set body
+        $html[] = $this->set_footer_plain ();	//set footer
+    }
+
+    /**
+     * set_header function.
+     *
+     * @access private
+     * @return string
+     */
+    private function set_header () {
+        $html = array();
+        $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 () {
+        # read config
+        require_once( dirname(__FILE__).'/../../config.php');
+
+        // set width
+        $logo_width = isset($config['logo_width']) ? $config['logo_width'] : 220;
+
+        $html = array();
+        $html[] = "<body style='margin:0px;padding:0px;background:#f9f9f9;border-collapse:collapse;'>";
+        # logo
+        if(!file_exists( dirname(__FILE__)."/../../css/images/logo/logo.png")) {
+            $img = ''; // Load built-in image
+            require( dirname(__FILE__).'/../../app/admin/settings/logo/logo-builtin.php' );
+            $html[] = $img;
+        }
+        else {
+            $html[] = "<img style='max-width:".$logo_width."px;margin-top:15px;margin-bottom:20px;' alt='phpipam' src='data:image/png;base64,".base64_encode(file_get_contents(dirname(__FILE__)."/../../css/images/logo/logo.png"))."'>";
+        }
+
+        # return
+        return implode("\n", $html);
+    }
+
+    /**
+     * 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 = array();
+        $html[] = "<hr style='margin-left:10px;width:300px;height:0px;margin-top:40px;margin-left:0px;border-top:0px;border-bottom:1px solid #ddd;'>";
+        $html[] = "<div class='padding-left:10px;'>";
+        $html[] = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; $this->mail_font_style_light This email was automatically generated. You can change your notification settings in account details!</font><br>";
+        $html[] = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <a href='".$this->settings->siteURL."' font-size:'11px;'>$this->mail_font_style_href ".$this->settings->siteURL."</font></a><br>";
+        $html[] = "</div>";
+
+        # 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;
+    }
 
 }
 

Spacing +31 added lines, -31 removed lines

@@ -50,34 +50,34 @@ 
 	 * @access public
 	 * @param mixed $settings
 	 */
-	public function __construct ($settings, $mail_settings) {
+	public function __construct($settings, $mail_settings) {
 		# set settings and mailsettings
 		$this->settings = $settings;
 		$this->mail_settings = $mail_settings;
 
 		# we need phpmailer
-		if(file_exists(dirname(__FILE__).'/../PHPMailer/PHPMailerAutoload.php')) {
+		if (file_exists(dirname(__FILE__).'/../PHPMailer/PHPMailerAutoload.php')) {
 			// legacy versions
-			require_once( dirname(__FILE__).'/../PHPMailer/PHPMailerAutoload.php');
+			require_once(dirname(__FILE__).'/../PHPMailer/PHPMailerAutoload.php');
 
 			# initialize object
-			$this->Php_mailer = new PHPMailer(true);			//localhost by default
+			$this->Php_mailer = new PHPMailer(true); //localhost by default
 		}
 		elseif (file_exists(dirname(__FILE__).'/../PHPMailer/src/Exception.php')) {
-			require_once( dirname(__FILE__).'/../PHPMailer/src/Exception.php');
-			require_once( dirname(__FILE__).'/../PHPMailer/src/PHPMailer.php');
-			require_once( dirname(__FILE__).'/../PHPMailer/src/SMTP.php');
+			require_once(dirname(__FILE__).'/../PHPMailer/src/Exception.php');
+			require_once(dirname(__FILE__).'/../PHPMailer/src/PHPMailer.php');
+			require_once(dirname(__FILE__).'/../PHPMailer/src/SMTP.php');
 
 			$this->Php_mailer = new PHPMailer\PHPMailer\PHPMailer();
 		} else {
 			throw new Exception(_('PHPMailer submodule is missing.'));
 		}
 
-		$this->Php_mailer->CharSet="UTF-8";					//set utf8
-		$this->Php_mailer->SMTPDebug = 0;					//default no debugging
+		$this->Php_mailer->CharSet = "UTF-8"; //set utf8
+		$this->Php_mailer->SMTPDebug = 0; //default no debugging
 
 		# localhost or smtp?
-		if ($this->mail_settings->mtype=="smtp")    { $this->set_smtp(); }
+		if ($this->mail_settings->mtype == "smtp") { $this->set_smtp(); }
 	}
 
 	/**
@@ -90,9 +90,9 @@ 
 		//set smtp
 		$this->Php_mailer->isSMTP();
 		//tls, ssl?
-		if($this->mail_settings->msecure!='none') {
+		if ($this->mail_settings->msecure != 'none') {
 			$this->Php_mailer->SMTPAutoTLS = true;
-			$this->Php_mailer->SMTPSecure = $this->mail_settings->msecure=='ssl' ? 'ssl' : 'tls';
+			$this->Php_mailer->SMTPSecure = $this->mail_settings->msecure == 'ssl' ? 'ssl' : 'tls';
 		}
 		else {
 			$this->Php_mailer->SMTPAutoTLS = false;
@@ -145,7 +145,7 @@ 
 	 * @param int $level (default: 2)
 	 * @return void
 	 */
-	public function set_debugging ($level = 2) {
+	public function set_debugging($level = 2) {
 		$this->Php_mailer->SMTPDebug = $level == 1 ? 1 : 2;
 		// output
 		$this->Php_mailer->Debugoutput = 'html';
@@ -165,13 +165,13 @@ 
 	 * @param string $body
 	 * @return string
 	 */
-	public function generate_message ($body) {
+	public function generate_message($body) {
     	$html = array();
-		$html[] = $this->set_header ();			//set header
-		$html[] = $this->set_body_start ();		//start body
-		$html[] = $body;						//set body
-		$html[] = $this->set_footer ();			//set footer
-		$html[] = $this->set_body_end ();		//end
+		$html[] = $this->set_header(); //set header
+		$html[] = $this->set_body_start(); //start body
+		$html[] = $body; //set body
+		$html[] = $this->set_footer(); //set footer
+		$html[] = $this->set_body_end(); //end
 		# return
 		return implode("\n", $html);
 	}
@@ -183,10 +183,10 @@ 
 	 * @param mixed $body
 	 * @return void
 	 */
-	public function generate_message_plain ($body) {
+	public function generate_message_plain($body) {
     	$html = array();
-		$html[] = $body;						//set body
-		$html[] = $this->set_footer_plain ();	//set footer
+		$html[] = $body; //set body
+		$html[] = $this->set_footer_plain(); //set footer
 	}
 
 	/**
@@ -195,7 +195,7 @@ 
 	 * @access private
 	 * @return string
 	 */
-	private function set_header () {
+	private function set_header() {
     	$html = array();
 		$html[] = "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>";
 		$html[] = "<html><head>";
@@ -212,9 +212,9 @@ 
 	 * @access private
 	 * @return string
 	 */
-	private function set_body_start () {
+	private function set_body_start() {
 		# read config
-		require_once( dirname(__FILE__).'/../../config.php');
+		require_once(dirname(__FILE__).'/../../config.php');
 
 		// set width
 		$logo_width = isset($config['logo_width']) ? $config['logo_width'] : 220;
@@ -222,9 +222,9 @@ 
     	$html = array();
     	$html[] = "<body style='margin:0px;padding:0px;background:#f9f9f9;border-collapse:collapse;'>";
     	# logo
-    	if(!file_exists( dirname(__FILE__)."/../../css/images/logo/logo.png")) {
+    	if (!file_exists(dirname(__FILE__)."/../../css/images/logo/logo.png")) {
 			$img = ''; // Load built-in image
-			require( dirname(__FILE__).'/../../app/admin/settings/logo/logo-builtin.php' );
+			require(dirname(__FILE__).'/../../app/admin/settings/logo/logo-builtin.php');
 			$html[] = $img;
 		}
 		else {
@@ -242,7 +242,7 @@ 
 	 * @param mixed $body
 	 * @return void
 	 */
-	public function set_body ($body) {
+	public function set_body($body) {
 		return is_array($body) ? implode("\n", $body) : $body;
 	}
 
@@ -252,7 +252,7 @@ 
 	 * @access private
 	 * @return string
 	 */
-	private function set_body_end () {
+	private function set_body_end() {
 		return "</body></html>";
 	}
 
@@ -262,7 +262,7 @@ 
 	 * @access public
 	 * @return string
 	 */
-	public function set_footer () {
+	public function set_footer() {
     	$html = array();
 		$html[] = "<hr style='margin-left:10px;width:300px;height:0px;margin-top:40px;margin-left:0px;border-top:0px;border-bottom:1px solid #ddd;'>";
 		$html[] = "<div class='padding-left:10px;'>";
@@ -280,7 +280,7 @@ 
 	 * @access public
 	 * @return string
 	 */
-	public function set_footer_plain () {
+	public function set_footer_plain() {
 		return "\r\n------------------------------\r\n".$this->settings->siteAdminName." (".$this->settings->siteAdminMail.") :: ".$this->settings->siteURL;
 	}
 

Braces +4 added lines, -2 removed lines

@@ -69,7 +69,8 @@ 
 			require_once( dirname(__FILE__).'/../PHPMailer/src/SMTP.php');
 
 			$this->Php_mailer = new PHPMailer\PHPMailer\PHPMailer();
-		} else {
+		}
+		else {
 			throw new Exception(_('PHPMailer submodule is missing.'));
 		}
 
@@ -120,7 +121,8 @@ 
 			$this->Php_mailer->SMTPAuth = true;
 			$this->Php_mailer->Username = $this->mail_settings->muser;
 			$this->Php_mailer->Password = $this->mail_settings->mpass;
-		} else {
+		}
+		else {
 			$this->Php_mailer->SMTPAuth = false;
 		}
 	}

app/subnets/addresses/mail-notify-check.php

Indentation +35 added lines, -35 removed lines

@@ -20,54 +20,54 @@
 
 # verify each recipient
 foreach (explode(",", $_POST['recipients']) as $rec) {
-	if(!filter_var(trim($rec), FILTER_VALIDATE_EMAIL)) {
-		$Result->show("danger", _("Invalid email address")." - ".$rec, true);
-	}
+    if(!filter_var(trim($rec), FILTER_VALIDATE_EMAIL)) {
+        $Result->show("danger", _("Invalid email address")." - ".$rec, true);
+    }
 }
 # strip html tags
 $_POST = $Tools->strip_input_tags($_POST);
 
 # try to send
 try {
-	# fetch mailer settings
-	$mail_settings = $Tools->fetch_object("settingsMail", "id", 1);
+    # fetch mailer settings
+    $mail_settings = $Tools->fetch_object("settingsMail", "id", 1);
 
-	# initialize mailer
-	$phpipam_mail = new phpipam_mail($User->settings, $mail_settings);
+    # initialize mailer
+    $phpipam_mail = new phpipam_mail($User->settings, $mail_settings);
 
-	// set subject
-	$subject	= $_POST['subject'];
+    // set subject
+    $subject	= $_POST['subject'];
 
-	// set html content
-	$content[] = "<table style='margin-left:10px;margin-top:5px;width:auto;padding:0px;border-collapse:collapse;'>";
-	$content[] = "<tr><td style='padding:5px;margin:0px;border-bottom:1px solid #eeeeee;'>$User->mail_font_style<strong>$subject</strong></font></td></tr>";
-	foreach(explode("\r\n", $_POST['content']) as $c) {
-	$content[] = "<tr><td style='padding-left:15px;margin:0px;'>$User->mail_font_style $c</font></td></tr>";
-	}
-	$content[] = "<tr><td style='padding-left:15px;padding-top:20px;margin:0px;font-style:italic;'>$User->mail_font_style_light Sent by user ".$User->user->real_name." at ".date('Y/m/d H:i')."</font></td></tr>";
-	//set al content
-	$content_plain[] = "$subject"."\r\n------------------------------\r\n";
-	$content_plain[] = str_replace("&middot;", "\t - ", $_POST['content']);
-	$content_plain[] = "\r\n\r\n"._("Sent by user")." ".$User->user->real_name." at ".date('Y/m/d H:i');
-	$content[] = "</table>";
+    // set html content
+    $content[] = "<table style='margin-left:10px;margin-top:5px;width:auto;padding:0px;border-collapse:collapse;'>";
+    $content[] = "<tr><td style='padding:5px;margin:0px;border-bottom:1px solid #eeeeee;'>$User->mail_font_style<strong>$subject</strong></font></td></tr>";
+    foreach(explode("\r\n", $_POST['content']) as $c) {
+    $content[] = "<tr><td style='padding-left:15px;margin:0px;'>$User->mail_font_style $c</font></td></tr>";
+    }
+    $content[] = "<tr><td style='padding-left:15px;padding-top:20px;margin:0px;font-style:italic;'>$User->mail_font_style_light Sent by user ".$User->user->real_name." at ".date('Y/m/d H:i')."</font></td></tr>";
+    //set al content
+    $content_plain[] = "$subject"."\r\n------------------------------\r\n";
+    $content_plain[] = str_replace("&middot;", "\t - ", $_POST['content']);
+    $content_plain[] = "\r\n\r\n"._("Sent by user")." ".$User->user->real_name." at ".date('Y/m/d H:i');
+    $content[] = "</table>";
 
-	// set alt content
-	$content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
-	$content_plain 	= implode("\r\n",$content_plain);
+    // set alt content
+    $content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
+    $content_plain 	= implode("\r\n",$content_plain);
 
-	$phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
-	foreach(explode(",", $_POST['recipients']) as $r) {
-	$phpipam_mail->Php_mailer->addAddress(addslashes(trim($r)));
-	}
-	$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);
+    foreach(explode(",", $_POST['recipients']) as $r) {
+    $phpipam_mail->Php_mailer->addAddress(addslashes(trim($r)));
+    }
+    $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("danger", "Mailer Error: ".$e->errorMessage(), true);
+    $Result->show("danger", "Mailer Error: ".$e->errorMessage(), true);
 } catch (Exception $e) {
-	$Result->show("danger", "Mailer Error: ".$e->getMessage(), true);
+    $Result->show("danger", "Mailer Error: ".$e->getMessage(), true);
 }
 
 # all good

Spacing +13 added lines, -13 removed lines

@@ -5,22 +5,22 @@ 
  *************************************************/
 
 # include required scripts
-require_once( dirname(__FILE__) . '/../../../functions/functions.php' );
+require_once(dirname(__FILE__).'/../../../functions/functions.php');
 
 # initialize required objects
-$Database 	= new Database_PDO;
-$Result		= new Result;
-$User		= new User ($Database);
-$Tools		= new Tools ($Database);
+$Database = new Database_PDO;
+$Result = new Result;
+$User = new User($Database);
+$Tools = new Tools($Database);
 
-$User->Crypto->csrf_cookie ("validate", "mail_notify", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->Crypto->csrf_cookie("validate", "mail_notify", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
 
 # verify that user is logged in
 $User->check_user_session();
 
 # verify each recipient
 foreach (explode(",", $_POST['recipients']) as $rec) {
-	if(!filter_var(trim($rec), FILTER_VALIDATE_EMAIL)) {
+	if (!filter_var(trim($rec), FILTER_VALIDATE_EMAIL)) {
 		$Result->show("danger", _("Invalid email address")." - ".$rec, true);
 	}
 }
@@ -36,12 +36,12 @@ 
 	$phpipam_mail = new phpipam_mail($User->settings, $mail_settings);
 
 	// set subject
-	$subject	= $_POST['subject'];
+	$subject = $_POST['subject'];
 
 	// set html content
 	$content[] = "<table style='margin-left:10px;margin-top:5px;width:auto;padding:0px;border-collapse:collapse;'>";
 	$content[] = "<tr><td style='padding:5px;margin:0px;border-bottom:1px solid #eeeeee;'>$User->mail_font_style<strong>$subject</strong></font></td></tr>";
-	foreach(explode("\r\n", $_POST['content']) as $c) {
+	foreach (explode("\r\n", $_POST['content']) as $c) {
 	$content[] = "<tr><td style='padding-left:15px;margin:0px;'>$User->mail_font_style $c</font></td></tr>";
 	}
 	$content[] = "<tr><td style='padding-left:15px;padding-top:20px;margin:0px;font-style:italic;'>$User->mail_font_style_light Sent by user ".$User->user->real_name." at ".date('Y/m/d H:i')."</font></td></tr>";
@@ -52,11 +52,11 @@ 
 	$content[] = "</table>";
 
 	// set alt content
-	$content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
-	$content_plain 	= implode("\r\n",$content_plain);
+	$content 		= $phpipam_mail->generate_message(implode("\r\n", $content));
+	$content_plain = implode("\r\n", $content_plain);
 
 	$phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
-	foreach(explode(",", $_POST['recipients']) as $r) {
+	foreach (explode(",", $_POST['recipients']) as $r) {
 	$phpipam_mail->Php_mailer->addAddress(addslashes(trim($r)));
 	}
 	$phpipam_mail->Php_mailer->Subject = $subject;
@@ -71,5 +71,5 @@ 
 }
 
 # all good
-$Result->show("success", _('Sending mail succeeded')."!" , true);
+$Result->show("success", _('Sending mail succeeded')."!", true);
 ?>
\ No newline at end of file