phpipam / phpipam

functions/classes/class.Radius.php

Doc Comments +34 added lines

@@ -355,30 +355,45 @@ 
     }

 

 

+    /**
+     * @param integer $packet_code
+     */
     function SetPacketCodeToSend($packet_code)

     {

         $this->_radius_packet_to_send = $packet_code;

     }

 

 

+    /**
+     * @param boolean $debug_mode
+     */
     function SetDebugMode($debug_mode)

     {

         $this->_debug_mode = (TRUE === $debug_mode);

     }

 

 

+    /**
+     * @param string $ip_radius_server
+     */
     function SetIpRadiusServer($ip_radius_server)

     {

         $this->_ip_radius_server = gethostbyname($ip_radius_server);

     }

 

 

+    /**
+     * @param string $shared_secret
+     */
     function SetSharedSecret($shared_secret)

     {

         $this->_shared_secret = $shared_secret;

     }

 

 

+    /**
+     * @param string $radius_suffix
+     */
     function SetRadiusSuffix($radius_suffix)

     {

         $this->_radius_suffix = $radius_suffix;

@@ -468,6 +483,9 @@ 
     }

 

 

+    /**
+     * @param integer $authentication_port
+     */
     function SetAuthenticationPort($authentication_port)

     {

         if ((intval($authentication_port) > 0) && (intval($authentication_port) < 65536))

@@ -477,6 +495,9 @@ 
     }

 

 

+    /**
+     * @param integer $accounting_port
+     */
     function SetAccountingPort($accounting_port)

     {

         if ((intval($accounting_port) > 0) && (intval($accounting_port) < 65536))

@@ -541,6 +562,9 @@ 
     }

 

 

+    /**
+     * @param integer $info_index
+     */
     function GetRadiusPacketInfo($info_index)

     {

         if (isset($this->_radius_packet_info[intval($info_index)]))

@@ -567,6 +591,9 @@ 
     }

 

 

+    /**
+     * @param string $debug_info
+     */
     function DebugInfo($debug_info)

     {

         if ($this->_debug_mode)

@@ -577,6 +604,9 @@ 
     }

 

 

+    /**
+     * @param integer $type
+     */
     function SetAttribute($type, $value)

     {

         $attribute_index = -1;

@@ -631,6 +661,10 @@ 
     }

 

 

+    /**
+     * @param string $attribute_raw_value
+     * @param integer $attribute_format
+     */
     function DecodeAttribute($attribute_raw_value, $attribute_format)

     {

         $attribute_value = NULL;

Indentation +2 added lines, -2 removed lines

@@ -571,8 +571,8 @@
     {
         if ($this->_debug_mode)
         {
-	        //save debugging
-	        $this->debug_text[] = date('Y-m-d H:i:s').' DEBUG: '.$debug_info;
+            //save debugging
+            $this->debug_text[] = date('Y-m-d H:i:s').' DEBUG: '.$debug_info;
         }
     }
 

functions/classes/class.Result.php

Doc Comments +7 added lines, -7 removed lines

@@ -71,7 +71,7 @@ 
 	 *
 	 * @access public
 	 * @param string $text (default: "No value provided")
-	 * @return void
+	 * @return string
 	 */
 	public function show_cli_message ($text="No value provided") {
 		// array - join
@@ -95,11 +95,11 @@ 
 	 * Show GUI result
 	 *
 	 * @access public
-	 * @param mixed $class
-	 * @param mixed $text
-	 * @param mixed $popup
-	 * @param mixed $popup2
-	 * @return void
+	 * @param string $class
+	 * @param string $text
+	 * @param boolean $popup
+	 * @param boolean $popup2
+	 * @return string
 	 */
 	public function show_message ($class, $text, $popup, $popup2) {
 		// format if array
@@ -144,7 +144,7 @@ 
 	 * Exists with exception for API
 	 *
 	 * @access public
-	 * @param mixed $content
+	 * @param string $content
 	 * @return void
 	 */
 	public function throw_exception ($content) {

Indentation +170 added lines, -170 removed lines

@@ -13,176 +13,176 @@
 
 class Result extends Common_functions {
 
-	/**
-	 *  what to do when failed - result shows result, exception throws exception (for API)
-	 *
-	 * (default value: "result")
-	 *
-	 * @var string
-	 * @access public
-	 */
-	public $exit_method = "result";
-
-	/**
-	 * Die flag
-	 *
-	 * (default value: false)
-	 *
-	 * @var bool
-	 * @access public
-	 */
-	public $die = false;
-
-	/**
-	 * Show result
-	 *
-	 * @access public
-	 * @param string $class (default: "muted")				result class - danger, success, warning, info
-	 * @param string $text (default: "No value provided")	text to display
-	 * @param bool $die (default: false)					controls stop of php execution
-	 * @param bool $popup (default: false)					print result as popup
-	 * @param bool $inline (default: false)					return, not print
-	 * @param bool $popup2 (default: false)					close for JS for popup2
-	 * @return void
-	 */
-	public function show($class="muted", $text="No value provided", $die=false, $popup=false, $inline = false, $popup2 = false) {
-
-		# set die
-		$this->die = $die;
-
-		# API - throw exception
-		if($this->exit_method == "exception")  {
-			# ok, just return success
-			if ($class=="success") 		{ return true; }
-			else						{ return $this->throw_exception ($text); }
-		}
-		else {
-			# cli or GUI
-			if (php_sapi_name()=="cli") { print $this->show_cli_message ($text); }
-			else {
-				# return or print
-				if ($inline) 			{ return $this->show_message ($class, $text, $popup, $popup2); }
-				else					{ print  $this->show_message ($class, $text, $popup, $popup2); }
-			}
-
-			# die
-			if($this->die===true)	{die(); }
-		}
-	}
-
-	/**
-	 * Alias for show method for backwards compatibility
-	 *
-	 * @access public
-	 * @param string $text (default: "No value provided")
-	 * @param bool $die (default: false)
-	 * @return void
-	 */
-	public function show_cli ($text="No value provided", $die=false) {
-		$this->show(false, $text, $die, false, false, false);
-	}
-
-	/**
-	 * Shows result for cli functions
-	 *
-	 * @access public
-	 * @param string $text (default: "No value provided")
-	 * @return void
-	 */
-	public function show_cli_message ($text="No value provided") {
-		// array - join
-		if (is_array($text) && sizeof($text)>0) {
-			// 1 element
-			if(sizeof( $text )==1) {
-				$text = $text[0];
-			}
-			// multiple - format
-			else {
-				foreach( $text as $l ) { $out[] = "\t* $l"; }
-				// join
-				$text = implode("\n", $out);
-			}
-		}
-		# print
-		return $text."\n";
-	}
-
-	/**
-	 * Show GUI result
-	 *
-	 * @access public
-	 * @param mixed $class
-	 * @param mixed $text
-	 * @param mixed $popup
-	 * @param mixed $popup2
-	 * @return void
-	 */
-	public function show_message ($class, $text, $popup, $popup2) {
-    	// to array if object
-    	if (is_object($text))   { $text = (array) $text; }
-		// format if array
-		if(is_array($text)) {
-			// single value
-			if(sizeof( $text )==1) {
-				$out = $text;
-			}
-			// multiple values
-			else {
-				$out[] = "<ul>";
-				foreach( $text as $l ) { $out[] = "<li>$l</li>"; }
-				$out[] = "</ul>";
-			}
-			// join
-			$text = implode("\n", $out);
-		}
-
-		# print popup or normal
-		if($popup===false) {
-			return "<div class='alert alert-".$class."'>".$text."</div>";
-		}
-		else {
-			// set close class for JS
-			$pclass = $popup2===false ? "hidePopups" : "hidePopup2";
-			// change danger to error for popup
-			$htext = $class==="danger" ? "error" : $class;
-
-			$out[] = '<div class="pHeader">'._(ucwords($htext)).'</div>';
-			$out[] = '<div class="pContent">';
-			$out[] = '<div class="alert alert-'.$class.'">'.$text.'</div>';
-			$out[] = '</div>';
-			$out[] = '<div class="pFooter"><button class="btn btn-sm btn-default '.$pclass.'">'._('Close').'</button></div>';
-
-			// return
-			return implode("\n", $out);
-		}
-	}
-
-	/**
-	 * Exists with exception for API
-	 *
-	 * @access public
-	 * @param mixed $content
-	 * @return void
-	 */
-	public function throw_exception ($content) {
-		// include Exceptions class for API
-		include_once( dirname(__FILE__) . '../../../api/controllers/Responses.php' );
-		// initialize exceptions
-		$Exceptions = new Responses ();
-		// throw error
-		$Exceptions->throw_exception(500, $content);
-	}
-
-	/**
-	 * __destruct function
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function __destruct() {
-		// exit if required
-		if ($this->die === true)	{ die(); }
-	}
+    /**
+     *  what to do when failed - result shows result, exception throws exception (for API)
+     *
+     * (default value: "result")
+     *
+     * @var string
+     * @access public
+     */
+    public $exit_method = "result";
+
+    /**
+     * Die flag
+     *
+     * (default value: false)
+     *
+     * @var bool
+     * @access public
+     */
+    public $die = false;
+
+    /**
+     * Show result
+     *
+     * @access public
+     * @param string $class (default: "muted")				result class - danger, success, warning, info
+     * @param string $text (default: "No value provided")	text to display
+     * @param bool $die (default: false)					controls stop of php execution
+     * @param bool $popup (default: false)					print result as popup
+     * @param bool $inline (default: false)					return, not print
+     * @param bool $popup2 (default: false)					close for JS for popup2
+     * @return void
+     */
+    public function show($class="muted", $text="No value provided", $die=false, $popup=false, $inline = false, $popup2 = false) {
+
+        # set die
+        $this->die = $die;
+
+        # API - throw exception
+        if($this->exit_method == "exception")  {
+            # ok, just return success
+            if ($class=="success") 		{ return true; }
+            else						{ return $this->throw_exception ($text); }
+        }
+        else {
+            # cli or GUI
+            if (php_sapi_name()=="cli") { print $this->show_cli_message ($text); }
+            else {
+                # return or print
+                if ($inline) 			{ return $this->show_message ($class, $text, $popup, $popup2); }
+                else					{ print  $this->show_message ($class, $text, $popup, $popup2); }
+            }
+
+            # die
+            if($this->die===true)	{die(); }
+        }
+    }
+
+    /**
+     * Alias for show method for backwards compatibility
+     *
+     * @access public
+     * @param string $text (default: "No value provided")
+     * @param bool $die (default: false)
+     * @return void
+     */
+    public function show_cli ($text="No value provided", $die=false) {
+        $this->show(false, $text, $die, false, false, false);
+    }
+
+    /**
+     * Shows result for cli functions
+     *
+     * @access public
+     * @param string $text (default: "No value provided")
+     * @return void
+     */
+    public function show_cli_message ($text="No value provided") {
+        // array - join
+        if (is_array($text) && sizeof($text)>0) {
+            // 1 element
+            if(sizeof( $text )==1) {
+                $text = $text[0];
+            }
+            // multiple - format
+            else {
+                foreach( $text as $l ) { $out[] = "\t* $l"; }
+                // join
+                $text = implode("\n", $out);
+            }
+        }
+        # print
+        return $text."\n";
+    }
+
+    /**
+     * Show GUI result
+     *
+     * @access public
+     * @param mixed $class
+     * @param mixed $text
+     * @param mixed $popup
+     * @param mixed $popup2
+     * @return void
+     */
+    public function show_message ($class, $text, $popup, $popup2) {
+        // to array if object
+        if (is_object($text))   { $text = (array) $text; }
+        // format if array
+        if(is_array($text)) {
+            // single value
+            if(sizeof( $text )==1) {
+                $out = $text;
+            }
+            // multiple values
+            else {
+                $out[] = "<ul>";
+                foreach( $text as $l ) { $out[] = "<li>$l</li>"; }
+                $out[] = "</ul>";
+            }
+            // join
+            $text = implode("\n", $out);
+        }
+
+        # print popup or normal
+        if($popup===false) {
+            return "<div class='alert alert-".$class."'>".$text."</div>";
+        }
+        else {
+            // set close class for JS
+            $pclass = $popup2===false ? "hidePopups" : "hidePopup2";
+            // change danger to error for popup
+            $htext = $class==="danger" ? "error" : $class;
+
+            $out[] = '<div class="pHeader">'._(ucwords($htext)).'</div>';
+            $out[] = '<div class="pContent">';
+            $out[] = '<div class="alert alert-'.$class.'">'.$text.'</div>';
+            $out[] = '</div>';
+            $out[] = '<div class="pFooter"><button class="btn btn-sm btn-default '.$pclass.'">'._('Close').'</button></div>';
+
+            // return
+            return implode("\n", $out);
+        }
+    }
+
+    /**
+     * Exists with exception for API
+     *
+     * @access public
+     * @param mixed $content
+     * @return void
+     */
+    public function throw_exception ($content) {
+        // include Exceptions class for API
+        include_once( dirname(__FILE__) . '../../../api/controllers/Responses.php' );
+        // initialize exceptions
+        $Exceptions = new Responses ();
+        // throw error
+        $Exceptions->throw_exception(500, $content);
+    }
+
+    /**
+     * __destruct function
+     *
+     * @access public
+     * @return void
+     */
+    public function __destruct() {
+        // exit if required
+        if ($this->die === true)	{ die(); }
+    }
 }
 
 ?>
\ No newline at end of file

functions/classes/class.Scan.php

Doc Comments +8 added lines, -9 removed lines

@@ -62,7 +62,7 @@ 
 	 * Returns all possible ping types / apps
 	 *
 	 * @access public
-	 * @return array
+	 * @return string[]
 	 */
 	public function ping_fetch_types () {
 		return array("ping", "pear", "fping");
@@ -152,7 +152,6 @@ 
 	 * @param mixed $address
 	 * @param int $count (default: 1)
 	 * @param int $timeout (default: 1)
-	 * @param bool $exit (default: false)
 	 * @return void
 	 */
 	public function ping_address ($address, $count=1, $timeout = 1) {
@@ -178,7 +177,7 @@ 
 	 *
 	 * @access protected
 	 * @param ip $address
-	 * @return void
+	 * @return null|integer
 	 */
 	protected function ping_address_method_ping ($address) {
 		# verify ping path
@@ -276,8 +275,7 @@ 
 	 *	fping cannot be run from web, it needs root privileges to be able to open raw socket :/
 	 *
 	 * @access public
-	 * @param mixed $subnet 	//CIDR
-	 * @return void
+	 * @return null|integer
 	 */
 	public function ping_address_method_fping ($address) {
 		# verify ping path
@@ -329,7 +327,7 @@ 
 	 *	fping cannot be run from web, it needs root privileges to be able to open raw socket :/
 	 *
 	 * @access public
-	 * @param mixed $subnet 	//CIDR
+	 * @param mixed $subnet_cidr 	//CIDR
 	 * @return void
 	 */
 	public function ping_address_method_fping_subnet ($subnet_cidr, $return_result = false) {
@@ -377,8 +375,8 @@ 
 	 * Explains invalid error codes
 	 *
 	 * @access public
-	 * @param mixed $code
-	 * @return void
+	 * @param null|integer $code
+	 * @return string|false
 	 */
 	public function ping_exit_explain ($code) {
 		# fetch explain codes
@@ -396,7 +394,7 @@ 
 	 *	extend if needed for future scripts
 	 *
 	 * @access public
-	 * @return void
+	 * @return string[]
 	 */
 	public function ping_set_exit_code_explains () {
 		$explain_codes[0]  = "SUCCESS";
@@ -523,6 +521,7 @@ 
 	 *
 	 * @access public
 	 * @param mixed $subnetId
+	 * @param boolean $die
 	 * @return void
 	 */
 	public function prepare_addresses_to_discover_subnetId ($subnetId, $die) {

Indentation +744 added lines, -744 removed lines

@@ -6,276 +6,276 @@ 
 
 class Scan extends Common_functions {
 
-	/**
-	 * (array of objects) to store addresses, address ID is array index
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $addresses;
-
-	/**
-	 * php executable file
-	 *
-	 * (default value: null)
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $php_exec = null;
-
-	/**
-	 * debugging flag
-	 *
-	 * (default value: false)
-	 *
-	 * @var bool
-	 * @access public
-	 */
-	public $debugging = false;
-
-	/**
-	 * default icmp type
-	 *
-	 * (default value: "ping")
-	 *
-	 * @var string
-	 * @access public
-	 */
-	public $icmp_type = "ping";
-
-	/**
-	 * icmp timeout
-	 *
-	 * (default value: 1)
-	 *
-	 * @var int
-	 * @access protected
-	 */
-	protected $icmp_timeout = 1;
-
-	/**
-	 * icmp retries
-	 *
-	 * (default value: 1)
-	 *
-	 * @var int
-	 * @access protected
-	 */
-	protected $icmp_count = 1;
-
-	/**
-	 *  exit or return icmp status
-	 *
-	 * (default value: false)
-	 *
-	 * @var bool
-	 * @access protected
-	 */
-	protected $icmp_exit = false;
-
-	/**
-	 * Result
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $Result;
-
-	/**
-	 * Database
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Database;
-
-	/**
-	 * Subnets
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Subnets;
-
-	/**
-	 * Addresses
-	 *
-	 * @var mixed
-	 * @access protected
-	 */
-	protected $Addresses;
-
-	/**
-	 * Log
-	 *
-	 * @var mixed
-	 * @access public
-	 */
-	public $Log;
-
-
-
-
-
-	/**
-	 * __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;
-		# initialize Result
-		$this->Result = new Result ();
-		# debugging
-		$this->set_debugging();
-		# fetch settings
-		is_null($this->settings) ? $this->get_settings() : (object) $this->settings;
-		# set type
-		$this->reset_scan_method ($this->settings->scanPingType);
-		# set php exec
-		$this->set_php_exec ();
-		# Log object
-		$this->Log = new Logging ($this->Database, $this->settings);
-	}
-
-	/**
-	 * Returns all possible ping types / apps
-	 *
-	 * @access public
-	 * @return array
-	 */
-	public function ping_fetch_types () {
-		return array("ping", "pear", "fping");
-	}
-
-	/**
-	 * This functin resets the scan method, for cron scripts
-	 *
-	 * @access public
-	 * @param mixed $method
-	 * @return void
-	 */
-	public function reset_scan_method ($method) {
-		// fetch possible methods
-		$possible = $this->ping_fetch_types ();
-		//check
-		if(!in_array($method, $possible)) {
-			//die or print?
-			if($this->icmp_exit)				{ die(json_encode(array("status"=>1, "error"=>"Invalid scan method"))); }
-			else								{ $this->Result->show("danger", "Invalid scan method", true); }
-		}
-		//ok
-		else {
-			$this->icmp_type = $method;
-		}
-	}
-
-	/**
-	 * Resets debugging
-	 *
-	 * @access public
-	 * @param bool $debug (default: false)
-	 * @return void
-	 */
-	public function reset_debugging ($debug = false) {
-		$this->debugging = $debug;
-	}
-
-	/**
-	 * Sets php exec
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function set_php_exec () {
-		$this->php_exec = PHP_BINDIR."/php";
-	}
-
-	/**
-	 * Set weather the code should exit or return
-	 *
-	 *	Default is return
-	 *
-	 * @access public
-	 * @param bool $exit (default: false)
-	 * @return void
-	 */
-	public function ping_set_exit ($exit = false) {
-		$this->icmp_exit = $exit;
-	}
-
-
-
-
-
-
-
-
-
-	/**
-	 *	@ping @icmp methods
-	 *	--------------------------------
-	 */
-
-	/**
-	 * Function that pings address and checks if it responds
-	 *
-	 *	any script can be used by extension, important are results
-	 *
-	 *	0 = Alive
-	 *	1 = Offline
-	 *	2 = Offline
-	 *
-	 *	all other codes can be explained in ping_exit_explain method
-	 *
-	 * @access public
-	 * @param mixed $address
-	 * @param int $count (default: 1)
-	 * @param int $timeout (default: 1)
-	 * @param bool $exit (default: false)
-	 * @return void
-	 */
-	public function ping_address ($address, $count=1, $timeout = 1) {
-		#set parameters
-		$this->icmp_timeout = $timeout;
-		$this->icmp_count = $count;
-
-		# escape address
-		$address = escapeshellarg($address);
-
-		# make sure it is in right format
-		$address = $this->transform_address ($address, "dotted");
-		# set method name variable
-		$ping_method = "ping_address_method_".$this->icmp_type;
-		# ping with selected method
-		return $this->$ping_method ($address);
-	}
-
-	/**
-	 * Ping selected address and return response
-	 *
-	 *	timeout value: for miliseconds multiplyy by 1000
-	 *
-	 * @access protected
-	 * @param ip $address
-	 * @return void
-	 */
-	protected function ping_address_method_ping ($address) {
-		# verify ping path
-		$this->ping_verify_path ($this->settings->scanPingPath);
-
-		# if ipv6 append 6
-		if ($this->identify_address ($address)=="IPv6")	{ $this->settings->scanPingPath = $this->settings->scanPingPath."6"; }
-
-		# set ping command based on OS type
-		if	(PHP_OS == "FreeBSD" || PHP_OS == "NetBSD")                         { $cmd = $this->settings->scanPingPath." -c $this->icmp_count -W ".($this->icmp_timeout*1000)." $address 1>/dev/null 2>&1"; }
-		elseif(PHP_OS == "Linux" || PHP_OS == "OpenBSD")                        { $cmd = $this->settings->scanPingPath." -c $this->icmp_count -w $this->icmp_timeout $address 1>/dev/null 2>&1"; }
-		elseif(PHP_OS == "WIN32" || PHP_OS == "Windows" || PHP_OS == "WINNT")	{ $cmd = $this->settings->scanPingPath." -n $this->icmp_count -I ".($this->icmp_timeout*1000)." $address 1>/dev/null 2>&1"; }
-		else																	{ $cmd = $this->settings->scanPingPath." -c $this->icmp_count -n $address 1>/dev/null 2>&1"; }
+    /**
+     * (array of objects) to store addresses, address ID is array index
+     *
+     * @var mixed
+     * @access public
+     */
+    public $addresses;
+
+    /**
+     * php executable file
+     *
+     * (default value: null)
+     *
+     * @var mixed
+     * @access public
+     */
+    public $php_exec = null;
+
+    /**
+     * debugging flag
+     *
+     * (default value: false)
+     *
+     * @var bool
+     * @access public
+     */
+    public $debugging = false;
+
+    /**
+     * default icmp type
+     *
+     * (default value: "ping")
+     *
+     * @var string
+     * @access public
+     */
+    public $icmp_type = "ping";
+
+    /**
+     * icmp timeout
+     *
+     * (default value: 1)
+     *
+     * @var int
+     * @access protected
+     */
+    protected $icmp_timeout = 1;
+
+    /**
+     * icmp retries
+     *
+     * (default value: 1)
+     *
+     * @var int
+     * @access protected
+     */
+    protected $icmp_count = 1;
+
+    /**
+     *  exit or return icmp status
+     *
+     * (default value: false)
+     *
+     * @var bool
+     * @access protected
+     */
+    protected $icmp_exit = false;
+
+    /**
+     * Result
+     *
+     * @var mixed
+     * @access public
+     */
+    public $Result;
+
+    /**
+     * Database
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Database;
+
+    /**
+     * Subnets
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Subnets;
+
+    /**
+     * Addresses
+     *
+     * @var mixed
+     * @access protected
+     */
+    protected $Addresses;
+
+    /**
+     * Log
+     *
+     * @var mixed
+     * @access public
+     */
+    public $Log;
+
+
+
+
+
+    /**
+     * __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;
+        # initialize Result
+        $this->Result = new Result ();
+        # debugging
+        $this->set_debugging();
+        # fetch settings
+        is_null($this->settings) ? $this->get_settings() : (object) $this->settings;
+        # set type
+        $this->reset_scan_method ($this->settings->scanPingType);
+        # set php exec
+        $this->set_php_exec ();
+        # Log object
+        $this->Log = new Logging ($this->Database, $this->settings);
+    }
+
+    /**
+     * Returns all possible ping types / apps
+     *
+     * @access public
+     * @return array
+     */
+    public function ping_fetch_types () {
+        return array("ping", "pear", "fping");
+    }
+
+    /**
+     * This functin resets the scan method, for cron scripts
+     *
+     * @access public
+     * @param mixed $method
+     * @return void
+     */
+    public function reset_scan_method ($method) {
+        // fetch possible methods
+        $possible = $this->ping_fetch_types ();
+        //check
+        if(!in_array($method, $possible)) {
+            //die or print?
+            if($this->icmp_exit)				{ die(json_encode(array("status"=>1, "error"=>"Invalid scan method"))); }
+            else								{ $this->Result->show("danger", "Invalid scan method", true); }
+        }
+        //ok
+        else {
+            $this->icmp_type = $method;
+        }
+    }
+
+    /**
+     * Resets debugging
+     *
+     * @access public
+     * @param bool $debug (default: false)
+     * @return void
+     */
+    public function reset_debugging ($debug = false) {
+        $this->debugging = $debug;
+    }
+
+    /**
+     * Sets php exec
+     *
+     * @access private
+     * @return void
+     */
+    private function set_php_exec () {
+        $this->php_exec = PHP_BINDIR."/php";
+    }
+
+    /**
+     * Set weather the code should exit or return
+     *
+     *	Default is return
+     *
+     * @access public
+     * @param bool $exit (default: false)
+     * @return void
+     */
+    public function ping_set_exit ($exit = false) {
+        $this->icmp_exit = $exit;
+    }
+
+
+
+
+
+
+
+
+
+    /**
+     *	@ping @icmp methods
+     *	--------------------------------
+     */
+
+    /**
+     * Function that pings address and checks if it responds
+     *
+     *	any script can be used by extension, important are results
+     *
+     *	0 = Alive
+     *	1 = Offline
+     *	2 = Offline
+     *
+     *	all other codes can be explained in ping_exit_explain method
+     *
+     * @access public
+     * @param mixed $address
+     * @param int $count (default: 1)
+     * @param int $timeout (default: 1)
+     * @param bool $exit (default: false)
+     * @return void
+     */
+    public function ping_address ($address, $count=1, $timeout = 1) {
+        #set parameters
+        $this->icmp_timeout = $timeout;
+        $this->icmp_count = $count;
+
+        # escape address
+        $address = escapeshellarg($address);
+
+        # make sure it is in right format
+        $address = $this->transform_address ($address, "dotted");
+        # set method name variable
+        $ping_method = "ping_address_method_".$this->icmp_type;
+        # ping with selected method
+        return $this->$ping_method ($address);
+    }
+
+    /**
+     * Ping selected address and return response
+     *
+     *	timeout value: for miliseconds multiplyy by 1000
+     *
+     * @access protected
+     * @param ip $address
+     * @return void
+     */
+    protected function ping_address_method_ping ($address) {
+        # verify ping path
+        $this->ping_verify_path ($this->settings->scanPingPath);
+
+        # if ipv6 append 6
+        if ($this->identify_address ($address)=="IPv6")	{ $this->settings->scanPingPath = $this->settings->scanPingPath."6"; }
+
+        # set ping command based on OS type
+        if	(PHP_OS == "FreeBSD" || PHP_OS == "NetBSD")                         { $cmd = $this->settings->scanPingPath." -c $this->icmp_count -W ".($this->icmp_timeout*1000)." $address 1>/dev/null 2>&1"; }
+        elseif(PHP_OS == "Linux" || PHP_OS == "OpenBSD")                        { $cmd = $this->settings->scanPingPath." -c $this->icmp_count -w $this->icmp_timeout $address 1>/dev/null 2>&1"; }
+        elseif(PHP_OS == "WIN32" || PHP_OS == "Windows" || PHP_OS == "WINNT")	{ $cmd = $this->settings->scanPingPath." -n $this->icmp_count -I ".($this->icmp_timeout*1000)." $address 1>/dev/null 2>&1"; }
+        else																	{ $cmd = $this->settings->scanPingPath." -c $this->icmp_count -n $address 1>/dev/null 2>&1"; }
 
         # for IPv6 remove wait
         if ($this->identify_address ($address)=="IPv6") {
@@ -284,471 +284,471 @@ 
             $cmd = implode(" ", $cmd);
         }
 
-		# execute command, return $retval
-	    exec($cmd, $output, $retval);
-
-		# return result for web or cmd
-		if($this->icmp_exit)	{ exit  ($retval); }
-		else					{ return $retval; }
-	}
-
-	/**
-	 * Ping selected address with PEAR ping package
-	 *
-	 * @access protected
-	 * @param ip $address
-	 * @return void
-	 */
-	protected function ping_address_method_pear ($address) {
-		# we need pear ping package
-		require_once(dirname(__FILE__) . '/../../functions/PEAR/Net/Ping.php');
-		$ping = Net_Ping::factory();
-
-		# ipv6 not supported
-		if ($this->identify_address ($address)=="IPv6") {
-    		//return result for web or cmd
-    		if($this->icmp_exit) 	{ exit	(255); }
-    		else	  				{ return 255; }
-		}
-
-		# check for errors
-		if($ping->pear->isError($ping)) {
-			if($this->icmp_exit)	{ exit  ($ping->getMessage()); }
-			else					{ return $ping->getMessage(); }
-		}
-		else {
-			//set count and timeout
-			$ping->setArgs(array('count' => $this->icmp_timeout, 'timeout' => $this->icmp_timeout));
-			//execute
-			$ping_response = $ping->ping($address);
-			//check response for error
-			if($ping->pear->isError($ping_response)) {
-				$result['code'] = 2;
-			}
-			else {
-				//all good
-				if($ping_response->_transmitted == $ping_response->_received) {
-					$result['code'] = 0;
-					$this->rtt = "RTT: ". strstr($ping_response->_round_trip['avg'], ".", true);
-				}
-				//ping loss
-				elseif($ping_response->_received == 0) {
-					$result['code'] = 1;
-				}
-				//failed
-				else {
-					$result['code'] = 3;
-				}
-			}
-		}
-
-		//return result for web or cmd
-		if($this->icmp_exit) 	{ exit	($result['code']); }
-		else	  				{ return $result['code']; }
-	}
-
-	/**
-	 * Ping selected address with fping function
-	 *
-	 *	Exit status is:
-	 *		0 if all the hosts are reachable,
-	 *		1 if some hosts were unreachable,
-	 *		2 if any IP addresses were not found,
-	 *		3 for invalid command line arguments,
-	 *		4 for a system call failure.
-	 *
-	 *	fping cannot be run from web, it needs root privileges to be able to open raw socket :/
-	 *
-	 * @access public
-	 * @param mixed $subnet 	//CIDR
-	 * @return void
-	 */
-	public function ping_address_method_fping ($address) {
-		# verify ping path
-		$this->ping_verify_path ($this->settings->scanFPingPath);
-
-		# if ipv6 append 6
-		if ($this->identify_address ($address)=="IPv6")	{ $this->settings->scanFPingPath = $this->settings->scanFPingPath."6"; }
-
-		# set command
-		$cmd = $this->settings->scanFPingPath." -c $this->icmp_count -t ".($this->icmp_timeout*1000)." $address";
-		# execute command, return $retval
-	    exec($cmd, $output, $retval);
-
-	    # save result
-	    if($retval==0) {
-	    	$this->save_fping_rtt ($output[0]);
-		}
-
-		# return result for web or cmd
-		if($this->icmp_exit)	{ exit  ($retval); }
-		else					{ return $retval; }
-	}
-
-	/**
-	 * Saves RTT for fping
-	 *
-	 * @access private
-	 * @param mixed $line
-	 * @return void
-	 */
-	private function save_fping_rtt ($line) {
-		// 173.192.112.30 : xmt/rcv/%loss = 1/1/0%, min/avg/max = 160/160/160
- 		$tmp = explode(" ",$line);
-
- 		# save rtt
-		@$this->rtt	= "RTT: ".str_replace("(", "", $tmp[7]);
-	}
-
-	/**
-	 * Ping selected address with fping function
-	 *
-	 *	Exit status is:
-	 *		0 if all the hosts are reachable,
-	 *		1 if some hosts were unreachable,
-	 *		2 if any IP addresses were not found,
-	 *		3 for invalid command line arguments,
-	 *		4 for a system call failure.
-	 *
-	 *	fping cannot be run from web, it needs root privileges to be able to open raw socket :/
-	 *
-	 * @access public
-	 * @param mixed $subnet 	//CIDR
-	 * @return void
-	 */
-	public function ping_address_method_fping_subnet ($subnet_cidr, $return_result = false) {
-		# verify ping path
-		$this->ping_verify_path ($this->settings->scanFPingPath);
-		# set command
-		$cmd = $this->settings->scanFPingPath." -c $this->icmp_count -t ".($this->icmp_timeout*1000)." -Ag $subnet_cidr";
-		# execute command, return $retval
-	    exec($cmd, $output, $retval);
-
-	    # save result
-	    if(sizeof($output)>0) {
-	    	foreach($output as $line) {
-		    	$tmp = explode(" ",$line);
-		    	$out[] = $tmp[0];
-	    	}
-	    }
-
-	    # save to var
-	    $this->fping_result = $out;
-
-	    # return result?
-	    if($return_result)		{ return $out; }
-
-		# return result for web or cmd
-		if($this->icmp_exit)	{ exit  ($retval); }
-		else					{ return $retval; }
-	}
-
-	/**
-	 * Verifies that ping file exists
-	 *
-	 * @access private
-	 * @param mixed $path
-	 * @return void
-	 */
-	private function ping_verify_path ($path) {
-		if(!file_exists($path)) {
-			if($this->icmp_exit)	{ exit  ($this->ping_exit_explain(1000)); }
-			else					{ return $this->Result->show("danger", _($this->ping_exit_explain(1000)), true);  }
-		}
-	}
-
-	/**
-	 * Explains invalid error codes
-	 *
-	 * @access public
-	 * @param mixed $code
-	 * @return void
-	 */
-	public function ping_exit_explain ($code) {
-		# fetch explain codes
-		$explain_codes = $this->ping_set_exit_code_explains ();
-
-		# return code
-		return isset($explain_codes[$code]) ? $explain_codes[$code] : false;
-	}
-
-	/**
-	 * This function sets ping exit code and message mappings
-	 *
-	 *	http://www.freebsd.org/cgi/man.cgi?query=sysexits&apropos=0&sektion=0&manpath=FreeBSD+4.3-RELEASE&arch=default&format=ascii
-	 *
-	 *	extend if needed for future scripts
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function ping_set_exit_code_explains () {
-		$explain_codes[0]  = "SUCCESS";
-		$explain_codes[1]  = "OFFLINE";
-		$explain_codes[2]  = "ERROR";
-		$explain_codes[3]  = "UNKNOWN ERROR";
-		$explain_codes[64] = "EX_USAGE";
-		$explain_codes[65] = "EX_DATAERR";
-		$explain_codes[68] = "EX_NOHOST";
-		$explain_codes[70] = "EX_SOFTWARE";
-		$explain_codes[71] = "EX_OSERR";
-		$explain_codes[72] = "EX_OSFILE";
-		$explain_codes[73] = "EX_CANTCREAT";
-		$explain_codes[74] = "EX_IOERR";
-		$explain_codes[75] = "EX_TEMPFAIL";
-		$explain_codes[77] = "EX_NOPERM";
-		$explain_codes[255] = "EX_NOT_SUPPORTED";
-		$explain_codes[1000] = "Invalid ping path";
-		# return codes
-		return $explain_codes;
-	}
-
-	/**
-	 * Update lastseen field for specific IP address
-	 *
-	 * @access public
-	 * @param int $id
-	 * @param datetime $datetime
-	 * @return void
-	 */
-	public function ping_update_lastseen ($id, $datetime = null) {
-    	# set datetime
-    	$datetime = is_null($datetime) ? date("Y-m-d H:i:s") : $datetime;
-		# execute
-		try { $this->Database->updateObject("ipaddresses", array("id"=>$id, "lastSeen"=>$datetime), "id"); }
-		catch (Exception $e) {
-			!$this->debugging ? : $this->Result->show("danger", $e->getMessage(), false);
-			# log
-			!$this->debugging ? : $this->Log->write ("status_update", _('Failed to update address status'), 0 );
-		}
-	}
-
-	/**
-	 * Update last check time for agent
-	 *
-	 * @access public
-	 * @param int $id
-	 * @param datetime $date
-	 * @return void
-	 */
-	public function ping_update_scanagent_checktime ($id, $date = false) {
-    	# set time
-    	if ($date === false)    { $date = date("Y-m-d H:i:s"); }
-    	else                    { $date = $date; }
-		# execute
-		try { $this->Database->updateObject("scanAgents", array("id"=>$id, "last_access"=>date("Y-m-d H:i:s")), "id"); }
-		catch (Exception $e) {
-		}
-	}
-
-	/**
-	 * Opens socket connection on specified TCP ports, if at least one is available host is alive
-	 *
-	 * @access public
-	 * @param mixed $address
-	 * @param mixed $port
-	 * @return void
-	 */
-	public function telnet_address ($address, $port) {
-		# set all ports
-		$ports = explode(",", str_replace(";",",",$port));
-		# default response is dead
-		$retval = 1;
-		//try each port untill one is alive
-		foreach($ports as $p) {
-			// open socket
-			$conn = @fsockopen($address, $p, $errno, $errstr, $this->icmp_timeout);
-			//failed
-			if (!$conn) {}
-			//success
-			else 		{
-				$retval = 0;	//set return as port if alive
-				fclose($conn);
-				break;			//end foreach if success
-			}
-		}
-	    # exit with result
-	    exit($retval);
-	}
-
-
-
-
-
-
-
-
-
-	/**
-	 *	@prepare addresses methods
-	 *	--------------------------------
-	 */
-
-	/**
-	 * Returns all addresses to be scanned or updated
-	 *
-	 * @access public
-	 * @param mixed $type		//discovery, update
-	 * @param mixed $subnet
-	 * @param bool $type
-	 * @return void
-	 */
-	public function prepare_addresses_to_scan ($type, $subnet, $die = true) {
-		# discover new addresses
-		if($type=="discovery") 	{ return is_numeric($subnet) ? $this->prepare_addresses_to_discover_subnetId ($subnet, $die) : $this->prepare_addresses_to_discover_subnet ($subnet, $die); }
-		# update addresses statuses
-		elseif($type=="update") { return $this->prepare_addresses_to_update ($subnet); }
-		# fail
-		else 					{ die(json_encode(array("status"=>1, "error"=>"Invalid scan type provided"))); }
-	}
-
-	/**
-	 * Returns array of all addresses to be scanned inside subnet defined with subnetId
-	 *
-	 * @access public
-	 * @param mixed $subnetId
-	 * @return void
-	 */
-	public function prepare_addresses_to_discover_subnetId ($subnetId, $die) {
-		# initialize classes
-		$Subnets   = new Subnets ($this->Database);
-
-		//subnet ID is provided, fetch subnet
-		$subnet = $Subnets->fetch_subnet(null, $subnetId);
-		if($subnet===false)	{
-			 if ($die)											{ die(json_encode(array("status"=>1, "error"=>"Invalid subnet ID provided"))); }
-			 else												{ return array(); }
-		}
-
-		// we should support only up to 4094 hosts!
-		if($Subnets->get_max_hosts ($subnet->mask, "IPv4")>4094 && php_sapi_name()!="cli")
-		if ($die)												{ die(json_encode(array("status"=>1, "error"=>"Scanning from GUI is only available for subnets up to /20 or 4094 hosts!"))); }
-		else													{ return array(); }
-
-		# set array of addresses to scan, exclude existing!
-		$ip = $this->get_all_possible_subnet_addresses ($subnet->subnet, $subnet->mask);
-
-		# remove existing
-		$ip = $this->remove_existing_subnet_addresses ($ip, $subnetId);
-
-		//none to scan?
-		if(sizeof($ip)==0)	{
-			if ($die)											{ die(json_encode(array("status"=>1, "error"=>"Didn't find any address to scan!"))); }
-			else												{ return array(); }
-		}
-
-		//return
-		return $ip;
-	}
-
-	/**
-	 * Fetches all possible subnet addresses
-	 *
-	 * @access private
-	 * @param $subnet		//subnet in decimal format
-	 * @param int $mask		//subnet mask
-	 * @return void			//array of ip addresses in decimal format
-	 */
-	private function get_all_possible_subnet_addresses ($subnet, $mask) {
-		# initialize classes
-		$Subnets   = new Subnets ($this->Database);
-		# make sure we have proper subnet format
-		$subnet    = $Subnets->transform_address($subnet, "decimal");
-		//fetch start and stop addresses
-		$boundaries = (object) $Subnets->get_network_boundaries ($subnet, $mask);
-		//create array
-		if($mask==32) {
-			$ip[] = $Subnets->transform_to_decimal($boundaries->network);
-		}
-		elseif($mask==31) {
-			$ip[] = $Subnets->transform_to_decimal($boundaries->network);
-			$ip[] = $Subnets->transform_to_decimal($boundaries->broadcast);
-		}
-		else {
-			//set loop limits
-			$start = gmp_strval(gmp_add($Subnets->transform_to_decimal($boundaries->network),1));
-			$stop  = gmp_strval($Subnets->transform_to_decimal($boundaries->broadcast));
-			//loop
-			for($m=$start; $m<$stop; $m++) {
-				$ip[] = $m;
-			}
-		}
-		//return
-		return $ip;
-	}
-
-	/**
-	 * Removes existing addresses from
-	 *
-	 * @access private
-	 * @param mixed $ip				//array of ip addresses in decimal format
-	 * @param mixed $subnetId		//id of subnet
-	 * @return void
-	 */
-	private function remove_existing_subnet_addresses ($ip, $subnetId) {
-		# first fetch all addresses
-		$Addresses = new Addresses ($this->Database);
-		// get all existing IP addresses in subnet
-		$addresses  = $Addresses->fetch_subnet_addresses($subnetId);
-		// if some exist remove them
-		if(sizeof($addresses)>0 && sizeof(@$ip)>0) {
-			foreach($addresses as $a) {
-				$key = array_search($a->ip_addr, $ip);
-				if($key !== false) {
-					unset($ip[$key]);
-				}
-			}
-			//reindex array for pinging
-			$ip = array_values(@$ip);
-		}
-		//return
-		return is_array(@$ip) ? $ip : array();
-	}
-
-	/**
-	 * Returns array of all addresses in subnet
-	 *
-	 * @access public
-	 * @param mixed $subnet
-	 * @return void
-	 */
-	public function prepare_addresses_to_discover_subnet ($subnet) {
-		//set subnet / mask
-		$subnet_parsed = explode("/", $subnet);
-		# result
-		$ip = $this->get_all_possible_subnet_addresses ($subnet_parsed[0], $subnet_parsed[1]);
-		//none to scan?
-		if(sizeof($ip)==0)									{ die(json_encode(array("status"=>1, "error"=>"Didn't find any address to scan!"))); }
-		//result
-		return $ip;
-	}
-
-	/**
-	 * Returns array of all addresses to be scanned
-	 *
-	 * @access public
-	 * @param mixed $subnetId
-	 * @return void
-	 */
-	public function prepare_addresses_to_update ($subnetId) {
-		# first fetch all addresses
-		$Addresses = new Addresses ($this->Database);
-		// get all existing IP addresses in subnet
-		$subnet_addresses = $Addresses->fetch_subnet_addresses($subnetId);
-		//create array
-		if(sizeof($subnet_addresses)>0) {
-			foreach($subnet_addresses as $a) {
-				$scan_addresses[$a->id] = $a->ip_addr;
-			}
-			//reindex
-			$scan_addresses = array_values(@$scan_addresses);
-			//return
-			return $scan_addresses;
-		}
-		else {
-			return array();
-		}
-	}
+        # execute command, return $retval
+        exec($cmd, $output, $retval);
+
+        # return result for web or cmd
+        if($this->icmp_exit)	{ exit  ($retval); }
+        else					{ return $retval; }
+    }
+
+    /**
+     * Ping selected address with PEAR ping package
+     *
+     * @access protected
+     * @param ip $address
+     * @return void
+     */
+    protected function ping_address_method_pear ($address) {
+        # we need pear ping package
+        require_once(dirname(__FILE__) . '/../../functions/PEAR/Net/Ping.php');
+        $ping = Net_Ping::factory();
+
+        # ipv6 not supported
+        if ($this->identify_address ($address)=="IPv6") {
+            //return result for web or cmd
+            if($this->icmp_exit) 	{ exit	(255); }
+            else	  				{ return 255; }
+        }
+
+        # check for errors
+        if($ping->pear->isError($ping)) {
+            if($this->icmp_exit)	{ exit  ($ping->getMessage()); }
+            else					{ return $ping->getMessage(); }
+        }
+        else {
+            //set count and timeout
+            $ping->setArgs(array('count' => $this->icmp_timeout, 'timeout' => $this->icmp_timeout));
+            //execute
+            $ping_response = $ping->ping($address);
+            //check response for error
+            if($ping->pear->isError($ping_response)) {
+                $result['code'] = 2;
+            }
+            else {
+                //all good
+                if($ping_response->_transmitted == $ping_response->_received) {
+                    $result['code'] = 0;
+                    $this->rtt = "RTT: ". strstr($ping_response->_round_trip['avg'], ".", true);
+                }
+                //ping loss
+                elseif($ping_response->_received == 0) {
+                    $result['code'] = 1;
+                }
+                //failed
+                else {
+                    $result['code'] = 3;
+                }
+            }
+        }
+
+        //return result for web or cmd
+        if($this->icmp_exit) 	{ exit	($result['code']); }
+        else	  				{ return $result['code']; }
+    }
+
+    /**
+     * Ping selected address with fping function
+     *
+     *	Exit status is:
+     *		0 if all the hosts are reachable,
+     *		1 if some hosts were unreachable,
+     *		2 if any IP addresses were not found,
+     *		3 for invalid command line arguments,
+     *		4 for a system call failure.
+     *
+     *	fping cannot be run from web, it needs root privileges to be able to open raw socket :/
+     *
+     * @access public
+     * @param mixed $subnet 	//CIDR
+     * @return void
+     */
+    public function ping_address_method_fping ($address) {
+        # verify ping path
+        $this->ping_verify_path ($this->settings->scanFPingPath);
+
+        # if ipv6 append 6
+        if ($this->identify_address ($address)=="IPv6")	{ $this->settings->scanFPingPath = $this->settings->scanFPingPath."6"; }
+
+        # set command
+        $cmd = $this->settings->scanFPingPath." -c $this->icmp_count -t ".($this->icmp_timeout*1000)." $address";
+        # execute command, return $retval
+        exec($cmd, $output, $retval);
+
+        # save result
+        if($retval==0) {
+            $this->save_fping_rtt ($output[0]);
+        }
+
+        # return result for web or cmd
+        if($this->icmp_exit)	{ exit  ($retval); }
+        else					{ return $retval; }
+    }
+
+    /**
+     * Saves RTT for fping
+     *
+     * @access private
+     * @param mixed $line
+     * @return void
+     */
+    private function save_fping_rtt ($line) {
+        // 173.192.112.30 : xmt/rcv/%loss = 1/1/0%, min/avg/max = 160/160/160
+            $tmp = explode(" ",$line);
+
+            # save rtt
+        @$this->rtt	= "RTT: ".str_replace("(", "", $tmp[7]);
+    }
+
+    /**
+     * Ping selected address with fping function
+     *
+     *	Exit status is:
+     *		0 if all the hosts are reachable,
+     *		1 if some hosts were unreachable,
+     *		2 if any IP addresses were not found,
+     *		3 for invalid command line arguments,
+     *		4 for a system call failure.
+     *
+     *	fping cannot be run from web, it needs root privileges to be able to open raw socket :/
+     *
+     * @access public
+     * @param mixed $subnet 	//CIDR
+     * @return void
+     */
+    public function ping_address_method_fping_subnet ($subnet_cidr, $return_result = false) {
+        # verify ping path
+        $this->ping_verify_path ($this->settings->scanFPingPath);
+        # set command
+        $cmd = $this->settings->scanFPingPath." -c $this->icmp_count -t ".($this->icmp_timeout*1000)." -Ag $subnet_cidr";
+        # execute command, return $retval
+        exec($cmd, $output, $retval);
+
+        # save result
+        if(sizeof($output)>0) {
+            foreach($output as $line) {
+                $tmp = explode(" ",$line);
+                $out[] = $tmp[0];
+            }
+        }
+
+        # save to var
+        $this->fping_result = $out;
+
+        # return result?
+        if($return_result)		{ return $out; }
+
+        # return result for web or cmd
+        if($this->icmp_exit)	{ exit  ($retval); }
+        else					{ return $retval; }
+    }
+
+    /**
+     * Verifies that ping file exists
+     *
+     * @access private
+     * @param mixed $path
+     * @return void
+     */
+    private function ping_verify_path ($path) {
+        if(!file_exists($path)) {
+            if($this->icmp_exit)	{ exit  ($this->ping_exit_explain(1000)); }
+            else					{ return $this->Result->show("danger", _($this->ping_exit_explain(1000)), true);  }
+        }
+    }
+
+    /**
+     * Explains invalid error codes
+     *
+     * @access public
+     * @param mixed $code
+     * @return void
+     */
+    public function ping_exit_explain ($code) {
+        # fetch explain codes
+        $explain_codes = $this->ping_set_exit_code_explains ();
+
+        # return code
+        return isset($explain_codes[$code]) ? $explain_codes[$code] : false;
+    }
+
+    /**
+     * This function sets ping exit code and message mappings
+     *
+     *	http://www.freebsd.org/cgi/man.cgi?query=sysexits&apropos=0&sektion=0&manpath=FreeBSD+4.3-RELEASE&arch=default&format=ascii
+     *
+     *	extend if needed for future scripts
+     *
+     * @access public
+     * @return void
+     */
+    public function ping_set_exit_code_explains () {
+        $explain_codes[0]  = "SUCCESS";
+        $explain_codes[1]  = "OFFLINE";
+        $explain_codes[2]  = "ERROR";
+        $explain_codes[3]  = "UNKNOWN ERROR";
+        $explain_codes[64] = "EX_USAGE";
+        $explain_codes[65] = "EX_DATAERR";
+        $explain_codes[68] = "EX_NOHOST";
+        $explain_codes[70] = "EX_SOFTWARE";
+        $explain_codes[71] = "EX_OSERR";
+        $explain_codes[72] = "EX_OSFILE";
+        $explain_codes[73] = "EX_CANTCREAT";
+        $explain_codes[74] = "EX_IOERR";
+        $explain_codes[75] = "EX_TEMPFAIL";
+        $explain_codes[77] = "EX_NOPERM";
+        $explain_codes[255] = "EX_NOT_SUPPORTED";
+        $explain_codes[1000] = "Invalid ping path";
+        # return codes
+        return $explain_codes;
+    }
+
+    /**
+     * Update lastseen field for specific IP address
+     *
+     * @access public
+     * @param int $id
+     * @param datetime $datetime
+     * @return void
+     */
+    public function ping_update_lastseen ($id, $datetime = null) {
+        # set datetime
+        $datetime = is_null($datetime) ? date("Y-m-d H:i:s") : $datetime;
+        # execute
+        try { $this->Database->updateObject("ipaddresses", array("id"=>$id, "lastSeen"=>$datetime), "id"); }
+        catch (Exception $e) {
+            !$this->debugging ? : $this->Result->show("danger", $e->getMessage(), false);
+            # log
+            !$this->debugging ? : $this->Log->write ("status_update", _('Failed to update address status'), 0 );
+        }
+    }
+
+    /**
+     * Update last check time for agent
+     *
+     * @access public
+     * @param int $id
+     * @param datetime $date
+     * @return void
+     */
+    public function ping_update_scanagent_checktime ($id, $date = false) {
+        # set time
+        if ($date === false)    { $date = date("Y-m-d H:i:s"); }
+        else                    { $date = $date; }
+        # execute
+        try { $this->Database->updateObject("scanAgents", array("id"=>$id, "last_access"=>date("Y-m-d H:i:s")), "id"); }
+        catch (Exception $e) {
+        }
+    }
+
+    /**
+     * Opens socket connection on specified TCP ports, if at least one is available host is alive
+     *
+     * @access public
+     * @param mixed $address
+     * @param mixed $port
+     * @return void
+     */
+    public function telnet_address ($address, $port) {
+        # set all ports
+        $ports = explode(",", str_replace(";",",",$port));
+        # default response is dead
+        $retval = 1;
+        //try each port untill one is alive
+        foreach($ports as $p) {
+            // open socket
+            $conn = @fsockopen($address, $p, $errno, $errstr, $this->icmp_timeout);
+            //failed
+            if (!$conn) {}
+            //success
+            else 		{
+                $retval = 0;	//set return as port if alive
+                fclose($conn);
+                break;			//end foreach if success
+            }
+        }
+        # exit with result
+        exit($retval);
+    }
+
+
+
+
+
+
+
+
+
+    /**
+     *	@prepare addresses methods
+     *	--------------------------------
+     */
+
+    /**
+     * Returns all addresses to be scanned or updated
+     *
+     * @access public
+     * @param mixed $type		//discovery, update
+     * @param mixed $subnet
+     * @param bool $type
+     * @return void
+     */
+    public function prepare_addresses_to_scan ($type, $subnet, $die = true) {
+        # discover new addresses
+        if($type=="discovery") 	{ return is_numeric($subnet) ? $this->prepare_addresses_to_discover_subnetId ($subnet, $die) : $this->prepare_addresses_to_discover_subnet ($subnet, $die); }
+        # update addresses statuses
+        elseif($type=="update") { return $this->prepare_addresses_to_update ($subnet); }
+        # fail
+        else 					{ die(json_encode(array("status"=>1, "error"=>"Invalid scan type provided"))); }
+    }
+
+    /**
+     * Returns array of all addresses to be scanned inside subnet defined with subnetId
+     *
+     * @access public
+     * @param mixed $subnetId
+     * @return void
+     */
+    public function prepare_addresses_to_discover_subnetId ($subnetId, $die) {
+        # initialize classes
+        $Subnets   = new Subnets ($this->Database);
+
+        //subnet ID is provided, fetch subnet
+        $subnet = $Subnets->fetch_subnet(null, $subnetId);
+        if($subnet===false)	{
+                if ($die)											{ die(json_encode(array("status"=>1, "error"=>"Invalid subnet ID provided"))); }
+                else												{ return array(); }
+        }
+
+        // we should support only up to 4094 hosts!
+        if($Subnets->get_max_hosts ($subnet->mask, "IPv4")>4094 && php_sapi_name()!="cli")
+        if ($die)												{ die(json_encode(array("status"=>1, "error"=>"Scanning from GUI is only available for subnets up to /20 or 4094 hosts!"))); }
+        else													{ return array(); }
+
+        # set array of addresses to scan, exclude existing!
+        $ip = $this->get_all_possible_subnet_addresses ($subnet->subnet, $subnet->mask);
+
+        # remove existing
+        $ip = $this->remove_existing_subnet_addresses ($ip, $subnetId);
+
+        //none to scan?
+        if(sizeof($ip)==0)	{
+            if ($die)											{ die(json_encode(array("status"=>1, "error"=>"Didn't find any address to scan!"))); }
+            else												{ return array(); }
+        }
+
+        //return
+        return $ip;
+    }
+
+    /**
+     * Fetches all possible subnet addresses
+     *
+     * @access private
+     * @param $subnet		//subnet in decimal format
+     * @param int $mask		//subnet mask
+     * @return void			//array of ip addresses in decimal format
+     */
+    private function get_all_possible_subnet_addresses ($subnet, $mask) {
+        # initialize classes
+        $Subnets   = new Subnets ($this->Database);
+        # make sure we have proper subnet format
+        $subnet    = $Subnets->transform_address($subnet, "decimal");
+        //fetch start and stop addresses
+        $boundaries = (object) $Subnets->get_network_boundaries ($subnet, $mask);
+        //create array
+        if($mask==32) {
+            $ip[] = $Subnets->transform_to_decimal($boundaries->network);
+        }
+        elseif($mask==31) {
+            $ip[] = $Subnets->transform_to_decimal($boundaries->network);
+            $ip[] = $Subnets->transform_to_decimal($boundaries->broadcast);
+        }
+        else {
+            //set loop limits
+            $start = gmp_strval(gmp_add($Subnets->transform_to_decimal($boundaries->network),1));
+            $stop  = gmp_strval($Subnets->transform_to_decimal($boundaries->broadcast));
+            //loop
+            for($m=$start; $m<$stop; $m++) {
+                $ip[] = $m;
+            }
+        }
+        //return
+        return $ip;
+    }
+
+    /**
+     * Removes existing addresses from
+     *
+     * @access private
+     * @param mixed $ip				//array of ip addresses in decimal format
+     * @param mixed $subnetId		//id of subnet
+     * @return void
+     */
+    private function remove_existing_subnet_addresses ($ip, $subnetId) {
+        # first fetch all addresses
+        $Addresses = new Addresses ($this->Database);
+        // get all existing IP addresses in subnet
+        $addresses  = $Addresses->fetch_subnet_addresses($subnetId);
+        // if some exist remove them
+        if(sizeof($addresses)>0 && sizeof(@$ip)>0) {
+            foreach($addresses as $a) {
+                $key = array_search($a->ip_addr, $ip);
+                if($key !== false) {
+                    unset($ip[$key]);
+                }
+            }
+            //reindex array for pinging
+            $ip = array_values(@$ip);
+        }
+        //return
+        return is_array(@$ip) ? $ip : array();
+    }
+
+    /**
+     * Returns array of all addresses in subnet
+     *
+     * @access public
+     * @param mixed $subnet
+     * @return void
+     */
+    public function prepare_addresses_to_discover_subnet ($subnet) {
+        //set subnet / mask
+        $subnet_parsed = explode("/", $subnet);
+        # result
+        $ip = $this->get_all_possible_subnet_addresses ($subnet_parsed[0], $subnet_parsed[1]);
+        //none to scan?
+        if(sizeof($ip)==0)									{ die(json_encode(array("status"=>1, "error"=>"Didn't find any address to scan!"))); }
+        //result
+        return $ip;
+    }
+
+    /**
+     * Returns array of all addresses to be scanned
+     *
+     * @access public
+     * @param mixed $subnetId
+     * @return void
+     */
+    public function prepare_addresses_to_update ($subnetId) {
+        # first fetch all addresses
+        $Addresses = new Addresses ($this->Database);
+        // get all existing IP addresses in subnet
+        $subnet_addresses = $Addresses->fetch_subnet_addresses($subnetId);
+        //create array
+        if(sizeof($subnet_addresses)>0) {
+            foreach($subnet_addresses as $a) {
+                $scan_addresses[$a->id] = $a->ip_addr;
+            }
+            //reindex
+            $scan_addresses = array_values(@$scan_addresses);
+            //return
+            return $scan_addresses;
+        }
+        else {
+            return array();
+        }
+    }
 }
 
 
@@ -769,25 +769,25 @@ 
 function ping_address ($address) {
 //	$Database = new Database_PDO;
 //	$Scan = new Scan ($Database);
- 	global $Scan;
-	//scan
-	return $Scan->ping_address ($address);
+        global $Scan;
+    //scan
+    return $Scan->ping_address ($address);
 }
 
 /**
  *	Telnet address helper for CLI threading
  */
 function telnet_address ($address, $port) {
-	global $Scan;
-	//scan
-	return $Scan->telnet_address ($address, $port);
+    global $Scan;
+    //scan
+    return $Scan->telnet_address ($address, $port);
 }
 
 /**
  *	fping subnet helper for fping threading, all methods
  */
 function fping_subnet ($subnet_cidr, $return = true) {
-	global $Scan;
-	//scan
-	return $Scan->ping_address_method_fping_subnet ($subnet_cidr, $return);
+    global $Scan;
+    //scan
+    return $Scan->ping_address_method_fping_subnet ($subnet_cidr, $return);
 }
\ No newline at end of file

functions/checks/check_db_structure.php

Indentation +18 added lines, -18 removed lines

@@ -22,26 +22,26 @@
 
 # print result
 if( (!isset($errors['tableError'])) && (!isset($errors['fieldError'])) ) {
-	print 'All tables and fields are installed properly'. "\n";
+    print 'All tables and fields are installed properly'. "\n";
 }
 else {
-	# missing tables
-	if (isset($errors['tableError'])) {
-		print 'Missing tables:'. "\n";
-
-		foreach ($errors['tableError'] as $table) {
-			print " - ".$table."\n";
-		}
-	}
-
-	# missing fields
-	if (isset($errors['fieldError'])) {
-		print "\n".'Missing fields'. "\n";
-
-		foreach ($errors['fieldError'] as $table=>$field) {
-			print 'Table `'. $table .'`: missing field `'. $field .'`;'."\n";
-		}
-	}
+    # missing tables
+    if (isset($errors['tableError'])) {
+        print 'Missing tables:'. "\n";
+
+        foreach ($errors['tableError'] as $table) {
+            print " - ".$table."\n";
+        }
+    }
+
+    # missing fields
+    if (isset($errors['fieldError'])) {
+        print "\n".'Missing fields'. "\n";
+
+        foreach ($errors['fieldError'] as $table=>$field) {
+            print 'Table `'. $table .'`: missing field `'. $field .'`;'."\n";
+        }
+    }
 }
 print "\n";
 ?>
\ No newline at end of file

functions/checks/check_db_upgrade.php

Indentation +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@
 
 /* redirect */
 if($User->settings->version < VERSION) {
-	header("Location: ".create_link("upgrade"));
-	die();
+    header("Location: ".create_link("upgrade"));
+    die();
 }
 ?>
\ No newline at end of file

functions/scripts/find_untranslated_files.php

Indentation +27 added lines, -27 removed lines

@@ -14,23 +14,23 @@ 
 $untranslated = explode("\n",shell_exec("cd ".dirname(__FILE__)."/../../ && grep -r '_(' * "));
 // loop and search
 foreach ($untranslated as $u) {
-	// find string
-	$str = get_string_between($u, "_('", "')");
-	// remove "" and '
-	$str = trim($str, "',\"");
-	// search for invalud content and remove
-	if (substr($str, 0, 1)!="$") {
-		$all_translations[] = $str;
-	}
+    // find string
+    $str = get_string_between($u, "_('", "')");
+    // remove "" and '
+    $str = trim($str, "',\"");
+    // search for invalud content and remove
+    if (substr($str, 0, 1)!="$") {
+        $all_translations[] = $str;
+    }
 
-	// find string
-	$str = get_string_between($u, '_("', '")');
-	// remove "" and '
-	$str = trim($str, "',\"");
-	// search for invalud content and remove
-	if (substr($str, 0, 1)!="$") {
-		$all_translations[] = $str;
-	}
+    // find string
+    $str = get_string_between($u, '_("', '")');
+    // remove "" and '
+    $str = trim($str, "',\"");
+    // search for invalud content and remove
+    if (substr($str, 0, 1)!="$") {
+        $all_translations[] = $str;
+    }
 }
 //unique
 $all_translations = array_unique($all_translations);
@@ -40,25 +40,25 @@ 
 $untranslated = explode("\n",shell_exec("cd ".dirname(__FILE__)."/../../ && more functions/locale/en/LC_MESSAGES/phpipam.po"));
 // loop and create
 foreach ($untranslated as $u) {
-	// search for string
-	if (substr($u, 0, 7)=='msgid "') {
-		$u = str_replace("msgid ", "", $u);
-		$u = trim($u, '"');
-		$translated[] = $u;
-	}
+    // search for string
+    if (substr($u, 0, 7)=='msgid "') {
+        $u = str_replace("msgid ", "", $u);
+        $u = trim($u, '"');
+        $translated[] = $u;
+    }
 }
 
 // remove existing from unique
 foreach ($all_translations as $tr) {
-	if (!in_array($tr, $translated)) {
-		$new[] = $tr;
-	}
+    if (!in_array($tr, $translated)) {
+        $new[] = $tr;
+    }
 }
 
 // format
 foreach ($new as $tr) {
-	$text[] = "msgid \"$tr\"";
-	$text[] = "msgstr \"\"\n";
+    $text[] = "msgid \"$tr\"";
+    $text[] = "msgstr \"\"\n";
 }
 // join text
 $text = implode("\n",$text);

functions/scripts/resolveIPaddresses.php

Indentation +51 added lines, -51 removed lines

@@ -15,9 +15,9 @@ 
 /* settings */
 $resolve_config['emptyonly'] = true;			# if true it will only update the ones without DNS entry!
 $resolve_config['subnets']	 = array();			# which subnets to check - by id
-												# example -> array(1,3,5)	will only update subnets with id 1,3,5
-												# 	you can get id's and descriptions with following MySQL query:
-												#	select `id`,`description` from `subnets`;
+                                                # example -> array(1,3,5)	will only update subnets with id 1,3,5
+                                                # 	you can get id's and descriptions with following MySQL query:
+                                                #	select `id`,`description` from `subnets`;
 $resolve_config['verbose']  = true;				# verbose response - prints results, cron will email it to you!
 
 # include required scripts
@@ -39,13 +39,13 @@ 
 
 # set subnet
 if (isset($argv[1])) {
-	$req_subnets = explode(",", $argv[1]);
-	foreach ($req_subnets as $s) {
-		if (!is_numeric($s)) { $Result->show_cli("Invalid subnetId provided - $s\n", true); }
-		else {
-			$resolve_config['subnets'][] = $s;
-		}
-	}
+    $req_subnets = explode(",", $argv[1]);
+    foreach ($req_subnets as $s) {
+        if (!is_numeric($s)) { $Result->show_cli("Invalid subnetId provided - $s\n", true); }
+        else {
+            $resolve_config['subnets'][] = $s;
+        }
+    }
 }
 
 
@@ -56,29 +56,29 @@ 
 
 # check all subnets
 if(sizeof($resolve_config['subnets']) == 0) {
-	# get ony ip's with empty DNS
-	if($resolve_config['emptyonly'] == 1) 	{ $query = 'select `id`,`ip_addr`,`dns_name`,`subnetId` from `ipaddresses` where `dns_name` = "" or `dns_name` is NULL order by `ip_addr` ASC;'; }
-	else 									{ $query = 'select `id`,`ip_addr`,`dns_name`,`subnetId` from `ipaddresses` order by `ip_addr` ASC;'; }
+    # get ony ip's with empty DNS
+    if($resolve_config['emptyonly'] == 1) 	{ $query = 'select `id`,`ip_addr`,`dns_name`,`subnetId` from `ipaddresses` where `dns_name` = "" or `dns_name` is NULL order by `ip_addr` ASC;'; }
+    else 									{ $query = 'select `id`,`ip_addr`,`dns_name`,`subnetId` from `ipaddresses` order by `ip_addr` ASC;'; }
 }
 # check selected subnets
 else {
-	$query[] = "select `id`,`ip_addr`,`dns_name`,`subnetId` from `ipaddresses` where ";
-	//go through subnets
-	$m=1;
-	foreach($resolve_config['subnets'] as $k=>$subnetId) {
-		// last
-		if($m==sizeof($resolve_config['subnets']))	{ $query[] = '`subnetId` = "'. $subnetId .'" '; }
-		else										{ $query[] = '`subnetId` = "'. $subnetId .'" or '; }
-		$m++;
-	}
-	# get ony ip's with empty DNS
-	if($resolve_config['emptyonly'] == 1) {
-		$query[] = ' and (`dns_name` = "" or `dns_name` is NULL ) ';
-	}
-	$query[] = 'order by `ip_addr` ASC;';
-
-	//join
-	$query = implode("\n", $query);
+    $query[] = "select `id`,`ip_addr`,`dns_name`,`subnetId` from `ipaddresses` where ";
+    //go through subnets
+    $m=1;
+    foreach($resolve_config['subnets'] as $k=>$subnetId) {
+        // last
+        if($m==sizeof($resolve_config['subnets']))	{ $query[] = '`subnetId` = "'. $subnetId .'" '; }
+        else										{ $query[] = '`subnetId` = "'. $subnetId .'" or '; }
+        $m++;
+    }
+    # get ony ip's with empty DNS
+    if($resolve_config['emptyonly'] == 1) {
+        $query[] = ' and (`dns_name` = "" or `dns_name` is NULL ) ';
+    }
+    $query[] = 'order by `ip_addr` ASC;';
+
+    //join
+    $query = implode("\n", $query);
 }
 
 # fetch records
@@ -86,31 +86,31 @@ 
 
 # try to update dns records
 if (sizeof($ipaddresses)>0) {
-	foreach($ipaddresses as $ip) {
-		# fetch subnet
-		$subnet = $Subnets->fetch_subnet ("id", $ip->subnetId);
-		$nsid = $subnet===false ? false : $subnet->nameserverId;
-		# try to resolve
-		$hostname = $DNS->resolve_address ($ip->ip_addr, null, true, $nsid);
-
-		# update if change
-		if($hostname['class']=="resolved") {
-			# values
-			$values = array("dns_name"=>$hostname['name'],
-							"id"=>$ip->id
-							);
-			# execute
-			if(!$Admin->object_modify("ipaddresses", "edit", "id", $values))	{ $Result->show_cli("Failed to update address ".$Subnets->transform_to_dotted($ip->ip_addr)); }
-
-			# set text
-			$res[] = 'updated ip address '. $Subnets->transform_to_dotted($ip->ip_addr) . ' with hostname '. $hostname['name'];
-		}
-	}
+    foreach($ipaddresses as $ip) {
+        # fetch subnet
+        $subnet = $Subnets->fetch_subnet ("id", $ip->subnetId);
+        $nsid = $subnet===false ? false : $subnet->nameserverId;
+        # try to resolve
+        $hostname = $DNS->resolve_address ($ip->ip_addr, null, true, $nsid);
+
+        # update if change
+        if($hostname['class']=="resolved") {
+            # values
+            $values = array("dns_name"=>$hostname['name'],
+                            "id"=>$ip->id
+                            );
+            # execute
+            if(!$Admin->object_modify("ipaddresses", "edit", "id", $values))	{ $Result->show_cli("Failed to update address ".$Subnets->transform_to_dotted($ip->ip_addr)); }
+
+            # set text
+            $res[] = 'updated ip address '. $Subnets->transform_to_dotted($ip->ip_addr) . ' with hostname '. $hostname['name'];
+        }
+    }
 }
 
 
 # if verbose print result so it can be emailed via cron!
 if($resolve_config['verbose'] == true && isset($res)) {
-	print implode("\n", $res);
+    print implode("\n", $res);
 }
 ?>
\ No newline at end of file

functions/scripts/discoveryCheck.php

Indentation +182 added lines, -182 removed lines

@@ -78,18 +78,18 @@ 
     $addresses_tmp = array();
     // loop
     foreach($scan_subnets as $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 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);
+        }
     }
 
     //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);
+            }
         }
     }
 }
@@ -110,101 +110,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 Thread( '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 Thread( '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 Thread( '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 Thread( 'ping_address' );
+                $threads[$z]->start( $Subnets->transform_to_dotted($addresses[$z]['ip_addr']) );
+                $z++;			//next index
+            }
         }
 
         // wait for all the threads to finish
         while( !empty( $threads ) ) {
             foreach( $threads as $index => $thread ) {
                 if( ! $thread->isAlive() ) {
-					//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];
+        }
+    }
 }
 
 
@@ -226,31 +226,31 @@ 
 $discovered = 0;				//for mailing
 
 foreach($scan_subnets as $s) {
-	if(sizeof(@$s->discovered)>0) {
-		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);
-
-			//set update query
-			$values = array("subnetId"=>$s->id,
-							"ip_addr"=>$Subnets->transform_address($ip, "decimal"),
-							"dns_name"=>$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(sizeof(@$s->discovered)>0) {
+        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);
+
+            //set update query
+            $values = array("subnetId"=>$s->id,
+                            "ip_addr"=>$Subnets->transform_address($ip, "decimal"),
+                            "dns_name"=>$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
@@ -261,84 +261,84 @@ 
 # send mail
 if($discovered>0 && $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(); }
-
-	# fetch mailer settings
-	$mail_settings = $Admin->fetch_object("settingsMail", "id", 1);
-	# fake user object, needed for create_link
-	$User = new StdClass();
-	@$User->settings->prettyLinks = $Scan->settings->prettyLinks;
-
-	# initialize mailer
-	$phpipam_mail = new phpipam_mail($Scan->settings, $mail_settings);
-	$phpipam_mail->initialize_mailer();
-
-
-
-	// set subject
-	$subject	= "phpIPAM 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;'>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;'><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);
-
-	# try to send
-	try {
-		$phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
-		//add all admins to CC
-		foreach($recepients as $admin) {
-			$phpipam_mail->Php_mailer->addAddress(addslashes($admin['email']), addslashes($admin['name']));
-		}
-		$phpipam_mail->Php_mailer->Subject = $subject;
-		$phpipam_mail->Php_mailer->msgHTML($content);
-		$phpipam_mail->Php_mailer->AltBody = $content_plain;
-		//send
-		$phpipam_mail->Php_mailer->send();
-	} catch (phpmailerException $e) {
-		$Result->show_cli("Mailer Error: ".$e->errorMessage(), true);
-	} catch (Exception $e) {
-		$Result->show_cli("Mailer Error: ".$e->errorMessage(), true);
-	}
+    # 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(); }
+
+    # fetch mailer settings
+    $mail_settings = $Admin->fetch_object("settingsMail", "id", 1);
+    # fake user object, needed for create_link
+    $User = new StdClass();
+    @$User->settings->prettyLinks = $Scan->settings->prettyLinks;
+
+    # initialize mailer
+    $phpipam_mail = new phpipam_mail($Scan->settings, $mail_settings);
+    $phpipam_mail->initialize_mailer();
+
+
+
+    // set subject
+    $subject	= "phpIPAM 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;'>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;'><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);
+
+    # try to send
+    try {
+        $phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
+        //add all admins to CC
+        foreach($recepients as $admin) {
+            $phpipam_mail->Php_mailer->addAddress(addslashes($admin['email']), addslashes($admin['name']));
+        }
+        $phpipam_mail->Php_mailer->Subject = $subject;
+        $phpipam_mail->Php_mailer->msgHTML($content);
+        $phpipam_mail->Php_mailer->AltBody = $content_plain;
+        //send
+        $phpipam_mail->Php_mailer->send();
+    } catch (phpmailerException $e) {
+        $Result->show_cli("Mailer Error: ".$e->errorMessage(), true);
+    } catch (Exception $e) {
+        $Result->show_cli("Mailer Error: ".$e->errorMessage(), true);
+    }
 }
 
 ?>

config.dist.php

Indentation +3 added lines, -3 removed lines

@@ -70,9 +70,9 @@
 elseif ($proxy_enabled == true && proxy_use_auth == true) {
     stream_context_set_default(
         array('http' => array(
-              'proxy' => "tcp://$proxy_server:$proxy_port",
-              'request_fulluri' => true,
-              'header' => "Proxy-Authorization: Basic $proxy_auth"
+                'proxy' => "tcp://$proxy_server:$proxy_port",
+                'request_fulluri' => true,
+                'header' => "Proxy-Authorization: Basic $proxy_auth"
         )));
 }