phpipam / phpipam

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

Spacing +8 added lines, -8 removed lines

@@ -8,26 +8,26 @@ 
  ****************************************/
 
 # functions
-require_once( dirname(__FILE__) . '/../functions.php' );
+require_once(dirname (__FILE__).'/../functions.php');
 
 # Classes
 $Database = new Database_PDO;
 $Tools = new Tools ($Database);
 
 # title
-print "\n".'Database structure verification'. "\n--------------------\n";
+print "\n".'Database structure verification'."\n--------------------\n";
 
 # check for errors
-$errors = $Tools->verify_database();
+$errors = $Tools->verify_database ();
 
 # print result
-if( (!isset($errors['tableError'])) && (!isset($errors['fieldError'])) ) {
-	print 'All tables and fields are installed properly'. "\n";
+if ((!isset($errors['tableError'])) && (!isset($errors['fieldError']))) {
+	print 'All tables and fields are installed properly'."\n";
 }
 else {
 	# missing tables
 	if (isset($errors['tableError'])) {
-		print 'Missing tables:'. "\n";
+		print 'Missing tables:'."\n";
 
 		foreach ($errors['tableError'] as $table) {
 			print " - ".$table."\n";
@@ -36,10 +36,10 @@ 
 
 	# missing fields
 	if (isset($errors['fieldError'])) {
-		print "\n".'Missing fields'. "\n";
+		print "\n".'Missing fields'."\n";
 
 		foreach ($errors['fieldError'] as $table=>$field) {
-			print 'Table `'. $table .'`: missing field `'. $field .'`;'."\n";
+			print 'Table `'.$table.'`: missing field `'.$field.'`;'."\n";
 		}
 	}
 }

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

Spacing +2 added lines, -2 removed lines

@@ -7,8 +7,8 @@
 # use required functions
 
 /* redirect */
-if($User->settings->version < VERSION) {
-	header("Location: ".create_link("upgrade"));
+if ($User->settings->version < VERSION) {
+	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);

Spacing +21 added lines, -21 removed lines

@@ -7,50 +7,50 @@ 
  */
 
 // only from cli
-if (php_sapi_name() != "cli")	{ die("Cli only!"); }
+if (php_sapi_name () != "cli") { die("Cli only!"); }
 
 
 // search for all translated words and put them to array
-$untranslated = explode("\n",shell_exec("cd ".dirname(__FILE__)."/../../ && grep -r '_(' * "));
+$untranslated = explode ("\n", shell_exec ("cd ".dirname (__FILE__)."/../../ && grep -r '_(' * "));
 // loop and search
 foreach ($untranslated as $u) {
 	// find string
-	$str = get_string_between($u, "_('", "')");
+	$str = get_string_between ($u, "_('", "')");
 	// remove "" and '
-	$str = trim($str, "',\"");
+	$str = trim ($str, "',\"");
 	// search for invalud content and remove
-	if (substr($str, 0, 1)!="$") {
+	if (substr ($str, 0, 1) != "$") {
 		$all_translations[] = $str;
 	}
 
 	// find string
-	$str = get_string_between($u, '_("', '")');
+	$str = get_string_between ($u, '_("', '")');
 	// remove "" and '
-	$str = trim($str, "',\"");
+	$str = trim ($str, "',\"");
 	// search for invalud content and remove
-	if (substr($str, 0, 1)!="$") {
+	if (substr ($str, 0, 1) != "$") {
 		$all_translations[] = $str;
 	}
 }
 //unique
-$all_translations = array_unique($all_translations);
+$all_translations = array_unique ($all_translations);
 
 
 // search all existing translations
-$untranslated = explode("\n",shell_exec("cd ".dirname(__FILE__)."/../../ && more functions/locale/en/LC_MESSAGES/phpipam.po"));
+$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, '"');
+	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)) {
+	if (!in_array ($tr, $translated)) {
 		$new[] = $tr;
 	}
 }
@@ -61,20 +61,20 @@ 
 	$text[] = "msgstr \"\"\n";
 }
 // join text
-$text = implode("\n",$text);
+$text = implode ("\n", $text);
 
 
 // output changes
-print_r($text);
+print_r ($text);
 
 
 // returns string between 2 separators
-function get_string_between($string, $start, $end){
+function get_string_between ($string, $start, $end) {
     $string = " ".$string;
-    $ini = strpos($string,$start);
+    $ini = strpos ($string, $start);
     if ($ini == 0) return "";
-    $ini += strlen($start);
-    $len = strpos($string,$end,$ini) - $ini;
-    return substr($string,$ini,$len);
+    $ini += strlen ($start);
+    $len = strpos ($string, $end, $ini) - $ini;
+    return substr ($string, $ini, $len);
 }
 ?>
\ No newline at end of file

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

Spacing +32 added lines, -32 removed lines

@@ -13,35 +13,35 @@ 
 
 
 /* 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
+$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`;
-$resolve_config['verbose']  = true;				# verbose response - prints results, cron will email it to you!
+$resolve_config['verbose'] = true; # verbose response - prints results, cron will email it to you!
 
 # include required scripts
-require( dirname(__FILE__) . '/../functions.php' );
+require(dirname (__FILE__).'/../functions.php');
 
 # initialize objects
-$Database 	= new Database_PDO;
-$Admin		= new Admin ($Database, false);
+$Database = new Database_PDO;
+$Admin = new Admin ($Database, false);
 $Subnets	= new Subnets ($Database);
-$DNS		= new DNS ($Database);
-$Result		= new Result();
+$DNS = new DNS ($Database);
+$Result		= new Result ();
 
 // set to 1 in case of errors
-ini_set('display_errors', 0);
-error_reporting(E_ERROR);
+ini_set ('display_errors', 0);
+error_reporting (E_ERROR);
 
 # cli required
-if( php_sapi_name()!="cli" ) { $Result->show_cli("cli only\n", true); }
+if (php_sapi_name () != "cli") { $Result->show_cli ("cli only\n", true); }
 
 # set subnet
 if (isset($argv[1])) {
-	$req_subnets = explode(",", $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); }
+		if (!is_numeric ($s)) { $Result->show_cli ("Invalid subnetId provided - $s\n", true); }
 		else {
 			$resolve_config['subnets'][] = $s;
 		}
@@ -55,62 +55,62 @@ 
 #
 
 # check all subnets
-if(sizeof($resolve_config['subnets']) == 0) {
+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;'; }
+	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) {
+	$m = 1;
+	foreach ($resolve_config['subnets'] as $k=>$subnetId) {
 		// last
-		if($m==sizeof($resolve_config['subnets']))	{ $query[] = '`subnetId` = "'. $subnetId .'" '; }
-		else										{ $query[] = '`subnetId` = "'. $subnetId .'" or '; }
+		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) {
+	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 = implode ("\n", $query);
 }
 
 # fetch records
-$ipaddresses = $Database->getObjectsQuery($query);
+$ipaddresses = $Database->getObjectsQuery ($query);
 
 # try to update dns records
-if (sizeof($ipaddresses)>0) {
-	foreach($ipaddresses as $ip) {
+if (sizeof ($ipaddresses) > 0) {
+	foreach ($ipaddresses as $ip) {
 		# fetch subnet
 		$subnet = $Subnets->fetch_subnet ("id", $ip->subnetId);
-		$nsid = $subnet===false ? false : $subnet->nameserverId;
+		$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") {
+		if ($hostname['class'] == "resolved") {
 			# values
-			$values = array("dns_name"=>$hostname['name'],
+			$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)); }
+			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'];
+			$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);
+if ($resolve_config['verbose'] == true && isset($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);
+    }
 }
 
 ?>

Spacing +109 added lines, -109 removed lines

@@ -24,60 +24,60 @@ 
 
 
 # include required scripts
-require( dirname(__FILE__) . '/../functions.php' );
-require( dirname(__FILE__) . '/../../functions/classes/class.Thread.php');
+require(dirname (__FILE__).'/../functions.php');
+require(dirname (__FILE__).'/../../functions/classes/class.Thread.php');
 
 # initialize objects
 $Database 	= new Database_PDO;
-$Subnets	= new Subnets ($Database);
+$Subnets = new Subnets ($Database);
 $Addresses	= new Addresses ($Database);
-$Tools		= new Tools ($Database);
-$Scan		= new Scan ($Database);
-$DNS		= new DNS ($Database);
-$Result		= new Result();
+$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);
+$Scan->ping_set_exit (true);
 // set debugging
-$Scan->reset_debugging(false);
+$Scan->reset_debugging (false);
 // change scan type?
 //$Scan->reset_scan_method ("pear");
 // set ping statuses
-$statuses = explode(";", $Scan->settings->pingStatus);
+$statuses = explode (";", $Scan->settings->pingStatus);
 // set mail override flag
 $send_mail = true;
 
 // set now for whole script
-$now     = time();
+$now     = time ();
 $nowdate = date ("Y-m-d H:i:s");
 
 
 // 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
 
 
 // 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(!Thread::available()) 						{ die("Threading is required for scanning subnets. Please recompile PHP with pcntl extension"); }
+if (!Thread::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);
 //set addresses
-if ($scan_subnets!==false) {
+if ($scan_subnets !== false) {
     // initial array
-    $addresses_tmp = array();
+    $addresses_tmp = array ();
     // loop
-    foreach($scan_subnets as $s) {
+    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);
@@ -85,123 +85,123 @@ 
     }
 
     //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);
+    if (sizeof ($addresses_tmp) > 0) {
+        foreach ($addresses_tmp as $s_id=>$a) {
+        	foreach ($a as $ip) {
+        		$addresses[] = array ("subnetId"=>$s_id, "ip_addr"=>$ip);
         	}
         }
     }
 }
 
 
-if($Scan->debugging)							{ print_r($scan_subnets); }
-if($scan_subnets===false) 						{ die("No subnets are marked for new hosts checking"); }
+if ($Scan->debugging) { print_r ($scan_subnets); }
+if ($scan_subnets === false) { die("No subnets are marked for new hosts checking"); }
 
 
 //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
 
-$size_subnets = max(array_keys($scan_subnets));
-$size_addresses = max(array_keys($addresses));
+$size_subnets = max (array_keys ($scan_subnets));
+$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();
+	    $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 Thread( 'fping_subnet' );
-				$threads[$z]->start_fping( $Subnets->transform_to_dotted($scan_subnets[$z]->subnet)."/".$scan_subnets[$z]->mask );
-	            $z++;				//next index
+	            $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();
+	    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");
+				if (file_exists ($child_pipe)) {
+					$file_descriptor = fopen ($child_pipe, "r");
 					$child_response = "";
-					while (!feof($file_descriptor)) {
-						$child_response .= fread($file_descriptor, 8192);
+					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]);
 				}
 			}
-	        usleep(200000);
+	        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])) {
+	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);
+            $scan_subnets[$sk]->discovered = array_values ($scan_subnets[$sk]->discovered);
 		}
 	}
 }
 //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();
+        $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 Thread( 'ping_address' );
-	            $threads[$z]->start( $Subnets->transform_to_dotted($addresses[$z]['ip_addr']) );
-				$z++;			//next index
+	            $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() ) {
+        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);
+            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']);
+	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];
 		}
 	}
@@ -209,34 +209,34 @@ 
 
 
 # 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);
+$Admin = new Admin ($Database, false);
 $Addresses	= new Addresses ($Database);
 $Subnets	= new Subnets ($Database);
-$DNS		= new DNS ($Database);
-$Scan		= new Scan ($Database);
-$Result		= new Result();
+$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(sizeof(@$s->discovered)>0) {
-		foreach($s->discovered as $ip) {
+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;
+			$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"),
+			$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,
@@ -245,7 +245,7 @@ 
 							"action"=>"add"
 							);
 			//insert
-			$Addresses->modify_address($values);
+			$Addresses->modify_address ($values);
 
 			//set discovered
 			$discovered++;
@@ -259,31 +259,31 @@ 
 
 
 # send mail
-if($discovered>0 && $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);
+	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(); }
 
 	# fetch mailer settings
-	$mail_settings = $Admin->fetch_object("settingsMail", "id", 1);
+	$mail_settings = $Admin->fetch_object ("settingsMail", "id", 1);
 	# fake user object, needed for create_link
-	$User = new StdClass();
+	$User = new StdClass ();
 	@$User->settings->prettyLinks = $Scan->settings->prettyLinks;
 
 	# initialize mailer
-	$phpipam_mail = new phpipam_mail($Scan->settings, $mail_settings);
-	$phpipam_mail->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");
+	$subject = "phpIPAM new addresses detected ".date ("Y-m-d H:i:s");
 
 	//html
 	$content[] = "<h3>phpIPAM found $discovered new hosts</h3>";
@@ -296,22 +296,22 @@ 
 	//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);
+				$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[] = "	<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_plain[] = "\t * $ip (".$Subnets->transform_to_dotted ($subnet->subnet)."/".$subnet->mask.")";
 			}
 		}
 	}
@@ -319,25 +319,25 @@ 
 
 
 	# 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);
 
 	# try to send
 	try {
-		$phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
+		$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']));
+		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->msgHTML ($content);
 		$phpipam_mail->Php_mailer->AltBody = $content_plain;
 		//send
-		$phpipam_mail->Php_mailer->send();
+		$phpipam_mail->Php_mailer->send ();
 	} catch (phpmailerException $e) {
-		$Result->show_cli("Mailer Error: ".$e->errorMessage(), true);
+		$Result->show_cli ("Mailer Error: ".$e->errorMessage (), true);
 	} catch (Exception $e) {
-		$Result->show_cli("Mailer Error: ".$e->errorMessage(), true);
+		$Result->show_cli ("Mailer Error: ".$e->errorMessage (), true);
 	}
 }
 

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"
         )));
 }
 

Spacing +19 added lines, -19 removed lines

@@ -18,11 +18,11 @@ 
 
      php 5.3.7 required
 */
-$db['ssl']        = false;                           # true/false, enable or disable SSL as a whole
-$db['ssl_key']    = "/path/to/cert.key";             # path to an SSL key file. Only makes sense combined with ssl_cert
-$db['ssl_cert']   = "/path/to/cert.crt";             # path to an SSL certificate file. Only makes sense combined with ssl_key
-$db['ssl_ca']     = "/path/to/ca.crt";               # path to a file containing SSL CA certs
-$db['ssl_capath'] = "/path/to/ca_certs";             # path to a directory containing CA certs
+$db['ssl']        = false; # true/false, enable or disable SSL as a whole
+$db['ssl_key']    = "/path/to/cert.key"; # path to an SSL key file. Only makes sense combined with ssl_cert
+$db['ssl_cert']   = "/path/to/cert.crt"; # path to an SSL certificate file. Only makes sense combined with ssl_key
+$db['ssl_ca']     = "/path/to/ca.crt"; # path to a file containing SSL CA certs
+$db['ssl_capath'] = "/path/to/ca_certs"; # path to a directory containing CA certs
 $db['ssl_cipher'] = "DHE-RSA-AES256-SHA:AES128-SHA"; # one or more SSL Ciphers
 
 /**
@@ -47,36 +47,36 @@ 
  *  Also change
  *	RewriteBase / in .htaccess
  ******************************/
-if(!defined('BASE'))
-define('BASE', "/");
+if (!defined ('BASE'))
+define ('BASE', "/");
 
 /**
  * Multicast unique mac requirement - section or vlan
  */
-if(!defined('MCUNIQUE'))
-define('MCUNIQUE', "section");
+if (!defined ('MCUNIQUE'))
+define ('MCUNIQUE', "section");
 
 
 /*  proxy connection details
  ******************************/
-$proxy_enabled  = false;                                  # Enable/Disable usage of the Proxy server
-$proxy_server   = "myproxy.something.com";                # Proxy server FQDN or IP
-$proxy_port     = "8080";                                 # Proxy server port
-$proxy_user     = "USERNAME";                             # Proxy Username
-$proxy_pass     = "PASSWORD";                             # Proxy Password
-$proxy_use_auth = false;                                  # Enable/Disable Proxy authentication
+$proxy_enabled  = false; # Enable/Disable usage of the Proxy server
+$proxy_server   = "myproxy.something.com"; # Proxy server FQDN or IP
+$proxy_port     = "8080"; # Proxy server port
+$proxy_user     = "USERNAME"; # Proxy Username
+$proxy_pass     = "PASSWORD"; # Proxy Password
+$proxy_use_auth = false; # Enable/Disable Proxy authentication
 
 /**
  * proxy to use for every internet access like update check
  */
-$proxy_auth     = base64_encode("$proxy_user:$proxy_pass");
+$proxy_auth = base64_encode ("$proxy_user:$proxy_pass");
 
 if ($proxy_enabled == true && $proxy_use_auth == false) {
-    stream_context_set_default(array('http' => array('proxy'=>'tcp://'.$proxy_server.':'.$proxy_port)));
+    stream_context_set_default (array ('http' => array ('proxy'=>'tcp://'.$proxy_server.':'.$proxy_port)));
 }
 elseif ($proxy_enabled == true && $proxy_use_auth == true) {
-    stream_context_set_default(
-        array('http' => array(
+    stream_context_set_default (
+        array ('http' => array (
               'proxy' => "tcp://$proxy_server:$proxy_port",
               'request_fulluri' => true,
               'header' => "Proxy-Authorization: Basic $proxy_auth"

functions/checks/check_php_build.php

Indentation +8 added lines, -8 removed lines

@@ -42,7 +42,7 @@ 
 
 # check for PEAR functions
 if ((@include_once 'PEAR.php') != true) {
-	$missingExt[] = "php PEAR support";
+    $missingExt[] = "php PEAR support";
 }
 
 # if db ssl = true check version
@@ -63,14 +63,14 @@ 
     $error  .= "<head>";
     $error  .= "<base href='$url' />";
     $error  .= '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap.min.css">';
-	$error  .= '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-custom.css">';
-	$error  .= "</head>";
+    $error  .= '<link rel="stylesheet" type="text/css" href="css/1.2/bootstrap/bootstrap-custom.css">';
+    $error  .= "</head>";
     $error  .= "<body style='margin:0px;'>";
-	$error  .= '<div class="row header-install" id="header"><div class="col-xs-12">';
-	$error  .= '<div class="hero-unit" style="padding:20px;margin-bottom:10px;">';
-	$error  .= '<a href="'.create_link(null,null,null,null,null,true).'">phpipam requirements error</a>';
-	$error  .= '</div>';
-	$error  .= '</div></div>';
+    $error  .= '<div class="row header-install" id="header"><div class="col-xs-12">';
+    $error  .= '<div class="hero-unit" style="padding:20px;margin-bottom:10px;">';
+    $error  .= '<a href="'.create_link(null,null,null,null,null,true).'">phpipam requirements error</a>';
+    $error  .= '</div>';
+    $error  .= '</div></div>';
 
     /* error */
     $error  .= "<div class='alert alert-danger' style='margin:auto;margin-top:20px;width:500px;'><strong>"._('The following required PHP extensions are missing').":</strong><br><hr>";

Spacing +15 added lines, -15 removed lines

@@ -17,25 +17,25 @@ 
 
 
 # Required extensions
-$requiredExt  = array("session", "sockets", "filter", "openssl", "gmp", "json", "gettext", "PDO", "pdo_mysql");
+$requiredExt  = array ("session", "sockets", "filter", "openssl", "gmp", "json", "gettext", "PDO", "pdo_mysql");
 
 # Available extensions
-$availableExt = get_loaded_extensions();
+$availableExt = get_loaded_extensions ();
 
 # Empty missing array to prevent errors
 $missingExt[0] = "";
 
 # if not all are present create array of missing ones
 foreach ($requiredExt as $extension) {
-    if (!in_array($extension, $availableExt)) {
+    if (!in_array ($extension, $availableExt)) {
         $missingExt[] = $extension;
     }
 }
 
 # check if mod_rewrite is enabled in apache
-if (function_exists("apache_get_modules")) {
-    $modules = apache_get_modules();
-    if(!in_array("mod_rewrite", $modules)) {
+if (function_exists ("apache_get_modules")) {
+    $modules = apache_get_modules ();
+    if (!in_array ("mod_rewrite", $modules)) {
         $missingExt[] = "mod_rewrite (Apache module)";
     }
 }
@@ -46,14 +46,14 @@ 
 }
 
 # if db ssl = true check version
-if (@$db['ssl']==true) {
-    if (phpversion() < "5.3.7") {
+if (@$db['ssl'] == true) {
+    if (phpversion () < "5.3.7") {
         $missingExt[] = "For SSL MySQL php version 5.3.7 is required!";
     }
 }
 
 # if any extension is missing print error and die!
-if (sizeof($missingExt) != 1) {
+if (sizeof ($missingExt) != 1) {
 
     /* remove dummy 0 line */
     unset($missingExt[0]);
@@ -68,18 +68,18 @@ 
     $error  .= "<body style='margin:0px;'>";
 	$error  .= '<div class="row header-install" id="header"><div class="col-xs-12">';
 	$error  .= '<div class="hero-unit" style="padding:20px;margin-bottom:10px;">';
-	$error  .= '<a href="'.create_link(null,null,null,null,null,true).'">phpipam requirements error</a>';
+	$error  .= '<a href="'.create_link (null, null, null, null, null, true).'">phpipam requirements error</a>';
 	$error  .= '</div>';
 	$error  .= '</div></div>';
 
     /* error */
-    $error  .= "<div class='alert alert-danger' style='margin:auto;margin-top:20px;width:500px;'><strong>"._('The following required PHP extensions are missing').":</strong><br><hr>";
-    $error  .= '<ul>' . "\n";
+    $error  .= "<div class='alert alert-danger' style='margin:auto;margin-top:20px;width:500px;'><strong>"._ ('The following required PHP extensions are missing').":</strong><br><hr>";
+    $error  .= '<ul>'."\n";
     foreach ($missingExt as $missing) {
-        $error .= '<li>'. $missing .'</li>' . "\n";
+        $error .= '<li>'.$missing.'</li>'."\n";
     }
-    $error  .= '</ul><hr>' . "\n";
-    $error  .= _('Please recompile PHP to include missing extensions and restart Apache.') . "\n";
+    $error  .= '</ul><hr>'."\n";
+    $error  .= _ ('Please recompile PHP to include missing extensions and restart Apache.')."\n";
 
     $error  .= "</body>";
     $error  .= "</html>";

functions/classes/class.Radius.php

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

Spacing +223 added lines, -223 removed lines

@@ -182,32 +182,32 @@ 
  *********************************************************************/
 class Radius
 {
-    var $_ip_radius_server;       // Radius server IP address
-    var $_shared_secret;          // Shared secret with the radius server
-    var $_radius_suffix;          // Radius suffix (default is '');
-    var $_udp_timeout;            // Timeout of the UDP connection in seconds (default value is 5)
-    var $_authentication_port;    // Authentication port (default value is 1812)
-    var $_accounting_port;        // Accouting port (default value is 1813)
-    var $_nas_ip_address;         // NAS IP address
-    var $_nas_port;               // NAS port
-    var $_encrypted_password;     // Encrypted password, as described in the RFC 2865
-    var $_user_ip_address;        // Remote IP address of the user
-    var $_request_authenticator;  // Request-Authenticator, 16 octets random number
+    var $_ip_radius_server; // Radius server IP address
+    var $_shared_secret; // Shared secret with the radius server
+    var $_radius_suffix; // Radius suffix (default is '');
+    var $_udp_timeout; // Timeout of the UDP connection in seconds (default value is 5)
+    var $_authentication_port; // Authentication port (default value is 1812)
+    var $_accounting_port; // Accouting port (default value is 1813)
+    var $_nas_ip_address; // NAS IP address
+    var $_nas_port; // NAS port
+    var $_encrypted_password; // Encrypted password, as described in the RFC 2865
+    var $_user_ip_address; // Remote IP address of the user
+    var $_request_authenticator; // Request-Authenticator, 16 octets random number
     var $_response_authenticator; // Request-Authenticator, 16 octets random number
-    var $_username;               // Username to sent to the Radius server
-    var $_password;               // Password to sent to the Radius server (clear password, must be encrypted)
-    var $_identifier_to_send;     // Identifier field for the packet to be sent
-    var $_identifier_received;    // Identifier field for the received packet
-    var $_radius_packet_to_send;  // Radius packet code (1=Access-Request, 2=Access-Accept, 3=Access-Reject, 4=Accounting-Request, 5=Accounting-Response, 11=Access-Challenge, 12=Status-Server (experimental), 13=Status-Client (experimental), 255=Reserved
+    var $_username; // Username to sent to the Radius server
+    var $_password; // Password to sent to the Radius server (clear password, must be encrypted)
+    var $_identifier_to_send; // Identifier field for the packet to be sent
+    var $_identifier_received; // Identifier field for the received packet
+    var $_radius_packet_to_send; // Radius packet code (1=Access-Request, 2=Access-Accept, 3=Access-Reject, 4=Accounting-Request, 5=Accounting-Response, 11=Access-Challenge, 12=Status-Server (experimental), 13=Status-Client (experimental), 255=Reserved
     var $_radius_packet_received; // Radius packet code (1=Access-Request, 2=Access-Accept, 3=Access-Reject, 4=Accounting-Request, 5=Accounting-Response, 11=Access-Challenge, 12=Status-Server (experimental), 13=Status-Client (experimental), 255=Reserved
-    var $_attributes_to_send;     // Radius attributes to send
-    var $_attributes_received;    // Radius attributes received
-    var $_socket_to_server;       // Socket connection
-    var $_debug_mode;             // Debug mode flag
-    var $_attributes_info;        // Attributes info array
-    var $_radius_packet_info;     // Radius packet codes info array
-    var $_last_error_code;        // Last error code
-    var $_last_error_message;     // Last error message
+    var $_attributes_to_send; // Radius attributes to send
+    var $_attributes_received; // Radius attributes received
+    var $_socket_to_server; // Socket connection
+    var $_debug_mode; // Debug mode flag
+    var $_attributes_info; // Attributes info array
+    var $_radius_packet_info; // Radius packet codes info array
+    var $_last_error_code; // Last error code
+    var $_last_error_message; // Last error message
 
 
     /*********************************************************************
@@ -227,7 +227,7 @@ 
      * @param integer accounting port
      * @return NULL
      *********************************************************************/
-    public function Radius($ip_radius_server = '127.0.0.1', $shared_secret = '', $radius_suffix = '', $udp_timeout = 5, $authentication_port = 1812, $accounting_port = 1813)
+    public function Radius ($ip_radius_server = '127.0.0.1', $shared_secret = '', $radius_suffix = '', $udp_timeout = 5, $authentication_port = 1812, $accounting_port = 1813)
     {
         $this->_radius_packet_info[1] = 'Access-Request';
         $this->_radius_packet_info[2] = 'Access-Accept';
@@ -239,96 +239,96 @@ 
         $this->_radius_packet_info[13] = 'Status-Client (experimental)';
         $this->_radius_packet_info[255] = 'Reserved';
 
-        $this->_attributes_info[1] = array('User-Name', 'S');
-        $this->_attributes_info[2] = array('User-Password', 'S');
-        $this->_attributes_info[3] = array('CHAP-Password', 'S'); // Type (1) / Length (1) / CHAP Ident (1) / String
-        $this->_attributes_info[4] = array('NAS-IP-Address', 'A');
-        $this->_attributes_info[5] = array('NAS-Port', 'I');
-        $this->_attributes_info[6] = array('Service-Type', 'I');
-        $this->_attributes_info[7] = array('Framed-Protocol', 'I');
-        $this->_attributes_info[8] = array('Framed-IP-Address', 'A');
-        $this->_attributes_info[9] = array('Framed-IP-Netmask', 'A');
-        $this->_attributes_info[10] = array('Framed-Routing', 'I');
-        $this->_attributes_info[11] = array('Filter-Id', 'T');
-        $this->_attributes_info[12] = array('Framed-MTU', 'I');
-        $this->_attributes_info[13] = array('Framed-Compression', 'I');
-        $this->_attributes_info[14] = array('Login-IP-Host', 'A');
-        $this->_attributes_info[15] = array('Login-service', 'I');
-        $this->_attributes_info[16] = array('Login-TCP-Port', 'I');
-        $this->_attributes_info[17] = array('(unassigned)', '');
-        $this->_attributes_info[18] = array('Reply-Message', 'T');
-        $this->_attributes_info[19] = array('Callback-Number', 'S');
-        $this->_attributes_info[20] = array('Callback-Id', 'S');
-        $this->_attributes_info[21] = array('(unassigned)', '');
-        $this->_attributes_info[22] = array('Framed-Route', 'T');
-        $this->_attributes_info[23] = array('Framed-IPX-Network', 'I');
-        $this->_attributes_info[24] = array('State', 'S');
-        $this->_attributes_info[25] = array('Class', 'S');
-        $this->_attributes_info[26] = array('Vendor-Specific', 'S'); // Type (1) / Length (1) / Vendor-Id (4) / Vendor type (1) / Vendor length (1) / Attribute-Specific...
-        $this->_attributes_info[27] = array('Session-Timeout', 'I');
-        $this->_attributes_info[28] = array('Idle-Timeout', 'I');
-        $this->_attributes_info[29] = array('Termination-Action', 'I');
-        $this->_attributes_info[30] = array('Called-Station-Id', 'S');
-        $this->_attributes_info[31] = array('Calling-Station-Id', 'S');
-        $this->_attributes_info[32] = array('NAS-Identifier', 'S');
-        $this->_attributes_info[33] = array('Proxy-State', 'S');
-        $this->_attributes_info[34] = array('Login-LAT-Service', 'S');
-        $this->_attributes_info[35] = array('Login-LAT-Node', 'S');
-        $this->_attributes_info[36] = array('Login-LAT-Group', 'S');
-        $this->_attributes_info[37] = array('Framed-AppleTalk-Link', 'I');
-        $this->_attributes_info[38] = array('Framed-AppleTalk-Network', 'I');
-        $this->_attributes_info[39] = array('Framed-AppleTalk-Zone', 'S');
-        $this->_attributes_info[60] = array('CHAP-Challenge', 'S');
-        $this->_attributes_info[61] = array('NAS-Port-Type', 'I');
-        $this->_attributes_info[62] = array('Port-Limit', 'I');
-        $this->_attributes_info[63] = array('Login-LAT-Port', 'S');
-        $this->_attributes_info[76] = array('Prompt', 'I');
+        $this->_attributes_info[1] = array ('User-Name', 'S');
+        $this->_attributes_info[2] = array ('User-Password', 'S');
+        $this->_attributes_info[3] = array ('CHAP-Password', 'S'); // Type (1) / Length (1) / CHAP Ident (1) / String
+        $this->_attributes_info[4] = array ('NAS-IP-Address', 'A');
+        $this->_attributes_info[5] = array ('NAS-Port', 'I');
+        $this->_attributes_info[6] = array ('Service-Type', 'I');
+        $this->_attributes_info[7] = array ('Framed-Protocol', 'I');
+        $this->_attributes_info[8] = array ('Framed-IP-Address', 'A');
+        $this->_attributes_info[9] = array ('Framed-IP-Netmask', 'A');
+        $this->_attributes_info[10] = array ('Framed-Routing', 'I');
+        $this->_attributes_info[11] = array ('Filter-Id', 'T');
+        $this->_attributes_info[12] = array ('Framed-MTU', 'I');
+        $this->_attributes_info[13] = array ('Framed-Compression', 'I');
+        $this->_attributes_info[14] = array ('Login-IP-Host', 'A');
+        $this->_attributes_info[15] = array ('Login-service', 'I');
+        $this->_attributes_info[16] = array ('Login-TCP-Port', 'I');
+        $this->_attributes_info[17] = array ('(unassigned)', '');
+        $this->_attributes_info[18] = array ('Reply-Message', 'T');
+        $this->_attributes_info[19] = array ('Callback-Number', 'S');
+        $this->_attributes_info[20] = array ('Callback-Id', 'S');
+        $this->_attributes_info[21] = array ('(unassigned)', '');
+        $this->_attributes_info[22] = array ('Framed-Route', 'T');
+        $this->_attributes_info[23] = array ('Framed-IPX-Network', 'I');
+        $this->_attributes_info[24] = array ('State', 'S');
+        $this->_attributes_info[25] = array ('Class', 'S');
+        $this->_attributes_info[26] = array ('Vendor-Specific', 'S'); // Type (1) / Length (1) / Vendor-Id (4) / Vendor type (1) / Vendor length (1) / Attribute-Specific...
+        $this->_attributes_info[27] = array ('Session-Timeout', 'I');
+        $this->_attributes_info[28] = array ('Idle-Timeout', 'I');
+        $this->_attributes_info[29] = array ('Termination-Action', 'I');
+        $this->_attributes_info[30] = array ('Called-Station-Id', 'S');
+        $this->_attributes_info[31] = array ('Calling-Station-Id', 'S');
+        $this->_attributes_info[32] = array ('NAS-Identifier', 'S');
+        $this->_attributes_info[33] = array ('Proxy-State', 'S');
+        $this->_attributes_info[34] = array ('Login-LAT-Service', 'S');
+        $this->_attributes_info[35] = array ('Login-LAT-Node', 'S');
+        $this->_attributes_info[36] = array ('Login-LAT-Group', 'S');
+        $this->_attributes_info[37] = array ('Framed-AppleTalk-Link', 'I');
+        $this->_attributes_info[38] = array ('Framed-AppleTalk-Network', 'I');
+        $this->_attributes_info[39] = array ('Framed-AppleTalk-Zone', 'S');
+        $this->_attributes_info[60] = array ('CHAP-Challenge', 'S');
+        $this->_attributes_info[61] = array ('NAS-Port-Type', 'I');
+        $this->_attributes_info[62] = array ('Port-Limit', 'I');
+        $this->_attributes_info[63] = array ('Login-LAT-Port', 'S');
+        $this->_attributes_info[76] = array ('Prompt', 'I');
 
         $this->_identifier_to_send = 0;
         $this->_user_ip_address = (isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '0.0.0.0');
 
-        $this->GenerateRequestAuthenticator();
-        $this->SetIpRadiusServer($ip_radius_server);
-        $this->SetSharedSecret($shared_secret);
-        $this->SetAuthenticationPort($authentication_port);
-        $this->SetAccountingPort($accounting_port);
-        $this->SetRadiusSuffix($radius_suffix);
-        $this->SetUdpTimeout($udp_timeout);
-        $this->SetUsername();
-        $this->SetPassword();
-        $this->SetNasIpAddress();
-        $this->SetNasPort();
-
-        $this->ClearLastError();
-        $this->ClearDataToSend();
-        $this->ClearDataReceived();
+        $this->GenerateRequestAuthenticator ();
+        $this->SetIpRadiusServer ($ip_radius_server);
+        $this->SetSharedSecret ($shared_secret);
+        $this->SetAuthenticationPort ($authentication_port);
+        $this->SetAccountingPort ($accounting_port);
+        $this->SetRadiusSuffix ($radius_suffix);
+        $this->SetUdpTimeout ($udp_timeout);
+        $this->SetUsername ();
+        $this->SetPassword ();
+        $this->SetNasIpAddress ();
+        $this->SetNasPort ();
+
+        $this->ClearLastError ();
+        $this->ClearDataToSend ();
+        $this->ClearDataReceived ();
     }
 
 
-    function GetNextIdentifier()
+    function GetNextIdentifier ()
     {
         $this->_identifier_to_send = (($this->_identifier_to_send + 1) % 256);
         return $this->_identifier_to_send;
     }
 
 
-    function GenerateRequestAuthenticator()
+    function GenerateRequestAuthenticator ()
     {
         $this->_request_authenticator = '';
         for ($ra_loop = 0; $ra_loop <= 15; $ra_loop++)
         {
-            $this->_request_authenticator .= chr(rand(1, 255));
+            $this->_request_authenticator .= chr (rand (1, 255));
         }
     }
 
 
-    function GetRequestAuthenticator()
+    function GetRequestAuthenticator ()
     {
         return $this->_request_authenticator;
     }
 
 
-    function GetLastError()
+    function GetLastError ()
     {
         if (0 < $this->_last_error_code)
         {
@@ -340,174 +340,174 @@ 
     }
 
 
-    function ClearDataToSend()
+    function ClearDataToSend ()
     {
         $this->_radius_packet_to_send = 0;
         $this->_attributes_to_send = NULL;
     }
 
 
-    function ClearDataReceived()
+    function ClearDataReceived ()
     {
         $this->_radius_packet_received = 0;
         $this->_attributes_received = NULL;
     }
 
 
-    function SetPacketCodeToSend($packet_code)
+    function SetPacketCodeToSend ($packet_code)
     {
         $this->_radius_packet_to_send = $packet_code;
     }
 
 
-    function SetDebugMode($debug_mode)
+    function SetDebugMode ($debug_mode)
     {
         $this->_debug_mode = (TRUE === $debug_mode);
     }
 
 
-    function SetIpRadiusServer($ip_radius_server)
+    function SetIpRadiusServer ($ip_radius_server)
     {
-        $this->_ip_radius_server = gethostbyname($ip_radius_server);
+        $this->_ip_radius_server = gethostbyname ($ip_radius_server);
     }
 
 
-    function SetSharedSecret($shared_secret)
+    function SetSharedSecret ($shared_secret)
     {
         $this->_shared_secret = $shared_secret;
     }
 
 
-    function SetRadiusSuffix($radius_suffix)
+    function SetRadiusSuffix ($radius_suffix)
     {
         $this->_radius_suffix = $radius_suffix;
     }
 
 
-    function SetUsername($username = '')
+    function SetUsername ($username = '')
     {
         $temp_username = $username;
-        if (false === strpos($temp_username, '@'))
+        if (false === strpos ($temp_username, '@'))
         {
             $temp_username .= $this->_radius_suffix;
         }
 
         $this->_username = $temp_username;
-        $this->SetAttribute(1, $this->_username);
+        $this->SetAttribute (1, $this->_username);
     }
 
 
-    function SetPassword($password = '')
+    function SetPassword ($password = '')
     {
         $this->_password = $password;
         $encrypted_password = '';
         $padded_password = $password;
 
-        if (0 != (strlen($password) % 16))
+        if (0 != (strlen ($password) % 16))
         {
-            $padded_password .= str_repeat(chr(0), (16 - strlen($password) % 16));
+            $padded_password .= str_repeat (chr (0), (16 - strlen ($password) % 16));
         }
 
         $previous_result = $this->_request_authenticator;
 
-        for ($full_loop = 0; $full_loop < (strlen($padded_password) / 16); $full_loop++)
+        for ($full_loop = 0; $full_loop < (strlen ($padded_password) / 16); $full_loop++)
         {
-            $xor_value = md5($this->_shared_secret.$previous_result);
+            $xor_value = md5 ($this->_shared_secret.$previous_result);
 
             $previous_result = '';
             for ($xor_loop = 0; $xor_loop <= 15; $xor_loop++)
             {
-                $value1 = ord(substr($padded_password, ($full_loop * 16) + $xor_loop, 1));
-                $value2 = hexdec(substr($xor_value, 2 * $xor_loop, 2));
-                $xor_result = $value1^$value2;
-                $previous_result .= chr($xor_result);
+                $value1 = ord (substr ($padded_password, ($full_loop * 16) + $xor_loop, 1));
+                $value2 = hexdec (substr ($xor_value, 2 * $xor_loop, 2));
+                $xor_result = $value1 ^ $value2;
+                $previous_result .= chr ($xor_result);
             }
             $encrypted_password .= $previous_result;
         }
 
         $this->_encrypted_password = $encrypted_password;
-        $this->SetAttribute(2, $this->_encrypted_password);
+        $this->SetAttribute (2, $this->_encrypted_password);
     }
 
 
-    function SetNasIPAddress($nas_ip_address = '')
+    function SetNasIPAddress ($nas_ip_address = '')
     {
-        if (0 < strlen($nas_ip_address))
+        if (0 < strlen ($nas_ip_address))
         {
-            $this->_nas_ip_address = gethostbyname($nas_ip_address);
+            $this->_nas_ip_address = gethostbyname ($nas_ip_address);
         } else
         {
-            $this->_nas_ip_address = gethostbyname(isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : '0.0.0.0');
+            $this->_nas_ip_address = gethostbyname (isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : '0.0.0.0');
         }
-        $this->SetAttribute(4, $this->_nas_ip_address);
+        $this->SetAttribute (4, $this->_nas_ip_address);
     }
 
 
-    function SetNasPort($nas_port = 0)
+    function SetNasPort ($nas_port = 0)
     {
-        $this->_nas_port = intval($nas_port);
-        $this->SetAttribute(5, $this->_nas_port);
+        $this->_nas_port = intval ($nas_port);
+        $this->SetAttribute (5, $this->_nas_port);
     }
 
 
-    function SetUdpTimeout($udp_timeout = 5)
+    function SetUdpTimeout ($udp_timeout = 5)
     {
-        if (intval($udp_timeout) > 0)
+        if (intval ($udp_timeout) > 0)
         {
-            $this->_udp_timeout = intval($udp_timeout);
+            $this->_udp_timeout = intval ($udp_timeout);
         }
     }
 
 
-    function ClearLastError()
+    function ClearLastError ()
     {
         $this->_last_error_code    = 0;
         $this->_last_error_message = '';
     }
 
 
-    function SetAuthenticationPort($authentication_port)
+    function SetAuthenticationPort ($authentication_port)
     {
-        if ((intval($authentication_port) > 0) && (intval($authentication_port) < 65536))
+        if ((intval ($authentication_port) > 0) && (intval ($authentication_port) < 65536))
         {
-            $this->_authentication_port = intval($authentication_port);
+            $this->_authentication_port = intval ($authentication_port);
         }
     }
 
 
-    function SetAccountingPort($accounting_port)
+    function SetAccountingPort ($accounting_port)
     {
-        if ((intval($accounting_port) > 0) && (intval($accounting_port) < 65536))
+        if ((intval ($accounting_port) > 0) && (intval ($accounting_port) < 65536))
         {
-            $this->_accounting_port = intval($accounting_port);
+            $this->_accounting_port = intval ($accounting_port);
         }
     }
 
 
-    function GetReceivedPacket()
+    function GetReceivedPacket ()
     {
         return $this->_radius_packet_received;
     }
 
 
-    function GetReceivedAttributes()
+    function GetReceivedAttributes ()
     {
         return $this->_attributes_received;
     }
 
 
-    function GetReadableReceivedAttributes()
+    function GetReadableReceivedAttributes ()
     {
         $readable_attributes = '';
         if (isset($this->_attributes_received))
         {
             foreach ($this->_attributes_received as $one_received_attribute)
             {
-                $attributes_info = $this->GetAttributesInfo($one_received_attribute[0]);
+                $attributes_info = $this->GetAttributesInfo ($one_received_attribute[0]);
                 $readable_attributes .= $attributes_info[0].": ";
                 if (26 == $one_received_attribute[0])
                 {
-                    $vendor_array = $this->DecodeVendorSpecificContent($one_received_attribute[1]);
+                    $vendor_array = $this->DecodeVendorSpecificContent ($one_received_attribute[1]);
                     foreach ($vendor_array as $vendor_one)
                     {
                         $readable_attributes .= 'Vendor-Id: '.$vendor_one[0].", Vendor-type: ".$vendor_one[1].",  Attribute-specific: ".$vendor_one[2];
@@ -523,12 +523,12 @@ 
     }
 
 
-    function GetAttribute($attribute_type)
+    function GetAttribute ($attribute_type)
     {
         $attribute_value = NULL;
         foreach ($this->_attributes_received as $one_received_attribute)
         {
-            if (intval($attribute_type) == $one_received_attribute[0])
+            if (intval ($attribute_type) == $one_received_attribute[0])
             {
                 $attribute_value = $one_received_attribute[1];
                 break;
@@ -538,11 +538,11 @@ 
     }
 
 
-    function GetRadiusPacketInfo($info_index)
+    function GetRadiusPacketInfo ($info_index)
     {
-        if (isset($this->_radius_packet_info[intval($info_index)]))
+        if (isset($this->_radius_packet_info[intval ($info_index)]))
         {
-            return $this->_radius_packet_info[intval($info_index)];
+            return $this->_radius_packet_info[intval ($info_index)];
         } else
         {
             return '';
@@ -550,34 +550,34 @@ 
     }
 
 
-    function GetAttributesInfo($info_index)
+    function GetAttributesInfo ($info_index)
     {
-        if (isset($this->_attributes_info[intval($info_index)]))
+        if (isset($this->_attributes_info[intval ($info_index)]))
         {
-            return $this->_attributes_info[intval($info_index)];
+            return $this->_attributes_info[intval ($info_index)];
         } else
         {
-            return array('', '');
+            return array ('', '');
         }
     }
 
 
-    function DebugInfo($debug_info)
+    function DebugInfo ($debug_info)
     {
         if ($this->_debug_mode)
         {
 	        //save debugging
-	        $this->debug_text[] = date('Y-m-d H:i:s').' DEBUG: '.$debug_info;
+	        $this->debug_text[] = date ('Y-m-d H:i:s').' DEBUG: '.$debug_info;
         }
     }
 
 
-    function SetAttribute($type, $value)
+    function SetAttribute ($type, $value)
     {
         $attribute_index = -1;
-        for ($attributes_loop = 0; $attributes_loop < count($this->_attributes_to_send); $attributes_loop++)
+        for ($attributes_loop = 0; $attributes_loop < count ($this->_attributes_to_send); $attributes_loop++)
         {
-            if ($type == ord(substr($this->_attributes_to_send[$attributes_loop], 0, 1)))
+            if ($type == ord (substr ($this->_attributes_to_send[$attributes_loop], 0, 1)))
             {
                 $attribute_index = $attributes_loop;
                 break;
@@ -591,17 +591,17 @@ 
             switch ($this->_attributes_info[$type][1])
             {
                 case 'T': // Text, 1-253 octets containing UTF-8 encoded ISO 10646 characters (RFC 2279).
-                    $temp_attribute = chr($type).chr(2 + strlen($value)).$value;
+                    $temp_attribute = chr ($type).chr (2 + strlen ($value)).$value;
                     break;
                 case 'S': // String, 1-253 octets containing binary data (values 0 through 255 decimal, inclusive).
-                    $temp_attribute = chr($type).chr(2 + strlen($value)).$value;
+                    $temp_attribute = chr ($type).chr (2 + strlen ($value)).$value;
                     break;
                 case 'A': // Address, 32 bit value, most significant octet first.
-                    $ip_array = explode(".", $value);
-                    $temp_attribute = chr($type).chr(6).chr($ip_array[0]).chr($ip_array[1]).chr($ip_array[2]).chr($ip_array[3]);
+                    $ip_array = explode (".", $value);
+                    $temp_attribute = chr ($type).chr (6).chr ($ip_array[0]).chr ($ip_array[1]).chr ($ip_array[2]).chr ($ip_array[3]);
                     break;
                 case 'I': // Integer, 32 bit unsigned value, most significant octet first.
-                    $temp_attribute = chr($type).chr(6).chr(($value / (256 * 256 * 256)) % 256).chr(($value / (256 * 256)) % 256).chr(($value / (256)) % 256).chr($value % 256);
+                    $temp_attribute = chr ($type).chr (6).chr (($value / (256 * 256 * 256)) % 256).chr (($value / (256 * 256)) % 256).chr (($value / (256)) % 256).chr ($value % 256);
                     break;
                 case 'D': // Time, 32 bit unsigned value, most significant octet first -- seconds since 00:00:00 UTC, January 1, 1970. (not used in this RFC)
                     $temp_attribute = NULL;
@@ -620,12 +620,12 @@ 
             $this->_attributes_to_send[] = $temp_attribute;
             $additional_debug = 'Added';
         }
-        $attribute_info = $this->GetAttributesInfo($type);
-        $this->DebugInfo($additional_debug.' Attribute '.$type.' ('.$attribute_info[0].'), format '.$attribute_info[1].', value <em>'.$value.'</em>');
+        $attribute_info = $this->GetAttributesInfo ($type);
+        $this->DebugInfo ($additional_debug.' Attribute '.$type.' ('.$attribute_info[0].'), format '.$attribute_info[1].', value <em>'.$value.'</em>');
     }
 
 
-    function DecodeAttribute($attribute_raw_value, $attribute_format)
+    function DecodeAttribute ($attribute_raw_value, $attribute_format)
     {
         $attribute_value = NULL;
 
@@ -640,10 +640,10 @@ 
                     $attribute_value = $attribute_raw_value;
                     break;
                 case 'A': // Address, 32 bit value, most significant octet first.
-                    $attribute_value = ord(substr($attribute_raw_value, 0, 1)).'.'.ord(substr($attribute_raw_value, 1, 1)).'.'.ord(substr($attribute_raw_value, 2, 1)).'.'.ord(substr($attribute_raw_value, 3, 1));
+                    $attribute_value = ord (substr ($attribute_raw_value, 0, 1)).'.'.ord (substr ($attribute_raw_value, 1, 1)).'.'.ord (substr ($attribute_raw_value, 2, 1)).'.'.ord (substr ($attribute_raw_value, 3, 1));
                     break;
                 case 'I': // Integer, 32 bit unsigned value, most significant octet first.
-                    $attribute_value = (ord(substr($attribute_raw_value, 0, 1)) * 256 * 256 * 256) + (ord(substr($attribute_raw_value, 1, 1)) * 256 * 256) + (ord(substr($attribute_raw_value, 2, 1)) * 256) + ord(substr($attribute_raw_value, 3, 1));
+                    $attribute_value = (ord (substr ($attribute_raw_value, 0, 1)) * 256 * 256 * 256) + (ord (substr ($attribute_raw_value, 1, 1)) * 256 * 256) + (ord (substr ($attribute_raw_value, 2, 1)) * 256) + ord (substr ($attribute_raw_value, 3, 1));
                     break;
                 case 'D': // Time, 32 bit unsigned value, most significant octet first -- seconds since 00:00:00 UTC, January 1, 1970. (not used in this RFC)
                     $attribute_value = NULL;
@@ -659,18 +659,18 @@ 
     /*********************************************************************
      * Array returned: array(array(Vendor-Id1, Vendor type1, Attribute-Specific1), ..., array(Vendor-IdN, Vendor typeN, Attribute-SpecificN)
      *********************************************************************/
-    function DecodeVendorSpecificContent($vendor_specific_raw_value)
+    function DecodeVendorSpecificContent ($vendor_specific_raw_value)
     {
-        $result = array();
+        $result = array ();
         $offset_in_raw = 0;
-        $vendor_id = (ord(substr($vendor_specific_raw_value, 0, 1)) * 256 * 256 * 256) + (ord(substr($vendor_specific_raw_value, 1, 1)) * 256 * 256) + (ord(substr($vendor_specific_raw_value, 2, 1)) * 256) + ord(substr($vendor_specific_raw_value, 3, 1));
+        $vendor_id = (ord (substr ($vendor_specific_raw_value, 0, 1)) * 256 * 256 * 256) + (ord (substr ($vendor_specific_raw_value, 1, 1)) * 256 * 256) + (ord (substr ($vendor_specific_raw_value, 2, 1)) * 256) + ord (substr ($vendor_specific_raw_value, 3, 1));
         $offset_in_raw += 4;
-        while ($offset_in_raw < strlen($vendor_specific_raw_value))
+        while ($offset_in_raw < strlen ($vendor_specific_raw_value))
         {
-            $vendor_type = (ord(substr($vendor_specific_raw_value, 0 + $offset_in_raw, 1)));
-            $vendor_length = (ord(substr($vendor_specific_raw_value, 1 + $offset_in_raw, 1)));
-            $attribute_specific = substr($vendor_specific_raw_value, 2 + $offset_in_raw, $vendor_length);
-            $result[] = array($vendor_id, $vendor_type, $attribute_specific);
+            $vendor_type = (ord (substr ($vendor_specific_raw_value, 0 + $offset_in_raw, 1)));
+            $vendor_length = (ord (substr ($vendor_specific_raw_value, 1 + $offset_in_raw, 1)));
+            $attribute_specific = substr ($vendor_specific_raw_value, 2 + $offset_in_raw, $vendor_length);
+            $result[] = array ($vendor_id, $vendor_type, $attribute_specific);
             $offset_in_raw += ($vendor_length);
         }
 
@@ -683,140 +683,140 @@ 
      *
      * Return TRUE if Access-Request is accepted, FALSE otherwise
      */
-    function AccessRequest($username = '', $password = '', $udp_timeout = 0, $state = NULL)
+    function AccessRequest ($username = '', $password = '', $udp_timeout = 0, $state = NULL)
     {
-        $this->ClearDataReceived();
-        $this->ClearLastError();
+        $this->ClearDataReceived ();
+        $this->ClearLastError ();
 
-        $this->SetPacketCodeToSend(1); // Access-Request
+        $this->SetPacketCodeToSend (1); // Access-Request
 
-        if (0 < strlen($username))
+        if (0 < strlen ($username))
         {
-            $this->SetUsername($username);
+            $this->SetUsername ($username);
         }
 
-        if (0 < strlen($password))
+        if (0 < strlen ($password))
         {
-            $this->SetPassword($password);
+            $this->SetPassword ($password);
         }
 
         if ($state !== NULL)
         {
-            $this->SetAttribute(24, $state);
+            $this->SetAttribute (24, $state);
         } else
         {
-            $this->SetAttribute(6, 1); // 1=Login
+            $this->SetAttribute (6, 1); // 1=Login
         }
 
-        if (intval($udp_timeout) > 0)
+        if (intval ($udp_timeout) > 0)
         {
-            $this->SetUdpTimeout($udp_timeout);
+            $this->SetUdpTimeout ($udp_timeout);
         }
 
         $attributes_content = '';
-        for ($attributes_loop = 0; $attributes_loop < count($this->_attributes_to_send); $attributes_loop++)
+        for ($attributes_loop = 0; $attributes_loop < count ($this->_attributes_to_send); $attributes_loop++)
         {
             $attributes_content .= $this->_attributes_to_send[$attributes_loop];
         }
 
         $packet_length  = 4; // Radius packet code + Identifier + Length high + Length low
-        $packet_length += strlen($this->_request_authenticator); // Request-Authenticator
-        $packet_length += strlen($attributes_content); // Attributes
+        $packet_length += strlen ($this->_request_authenticator); // Request-Authenticator
+        $packet_length += strlen ($attributes_content); // Attributes
 
-        $packet_data  = chr($this->_radius_packet_to_send);
-        $packet_data .= chr($this->GetNextIdentifier());
-        $packet_data .= chr(intval($packet_length / 256));
-        $packet_data .= chr(intval($packet_length % 256));
+        $packet_data  = chr ($this->_radius_packet_to_send);
+        $packet_data .= chr ($this->GetNextIdentifier ());
+        $packet_data .= chr (intval ($packet_length / 256));
+        $packet_data .= chr (intval ($packet_length % 256));
         $packet_data .= $this->_request_authenticator;
         $packet_data .= $attributes_content;
 
-        $_socket_to_server = socket_create(AF_INET, SOCK_DGRAM, 17); // UDP packet = 17
+        $_socket_to_server = socket_create (AF_INET, SOCK_DGRAM, 17); // UDP packet = 17
 
         if ($_socket_to_server === FALSE)
         {
-            $this->_last_error_code    = socket_last_error();
-            $this->_last_error_message = socket_strerror($this->_last_error_code);
-        } elseif (FALSE === socket_connect($_socket_to_server, $this->_ip_radius_server, $this->_authentication_port))
+            $this->_last_error_code    = socket_last_error ();
+            $this->_last_error_message = socket_strerror ($this->_last_error_code);
+        } elseif (FALSE === socket_connect ($_socket_to_server, $this->_ip_radius_server, $this->_authentication_port))
         {
-            $this->_last_error_code    = socket_last_error();
-            $this->_last_error_message = socket_strerror($this->_last_error_code);
-        } elseif (FALSE === socket_write($_socket_to_server, $packet_data, $packet_length))
+            $this->_last_error_code    = socket_last_error ();
+            $this->_last_error_message = socket_strerror ($this->_last_error_code);
+        } elseif (FALSE === socket_write ($_socket_to_server, $packet_data, $packet_length))
         {
-            $this->_last_error_code    = socket_last_error();
-            $this->_last_error_message = socket_strerror($this->_last_error_code);
+            $this->_last_error_code    = socket_last_error ();
+            $this->_last_error_message = socket_strerror ($this->_last_error_code);
         } else
         {
-            $this->DebugInfo('<b>Packet type '.$this->_radius_packet_to_send.' ('.$this->GetRadiusPacketInfo($this->_radius_packet_to_send).')'.' sent</b>');
+            $this->DebugInfo ('<b>Packet type '.$this->_radius_packet_to_send.' ('.$this->GetRadiusPacketInfo ($this->_radius_packet_to_send).')'.' sent</b>');
             if ($this->_debug_mode)
             {
                 $readable_attributes = '';
                 foreach ($this->_attributes_to_send as $one_attribute_to_send)
                 {
-                    $attribute_info = $this->GetAttributesInfo(ord(substr($one_attribute_to_send, 0, 1)));
-                    $this->DebugInfo('Attribute '.ord(substr($one_attribute_to_send, 0, 1)).' ('.$attribute_info[0].'), length '.(ord(substr($one_attribute_to_send, 1, 1)) - 2).', format '.$attribute_info[1].', value <em>'.$this->DecodeAttribute(substr($one_attribute_to_send, 2), ord(substr($one_attribute_to_send, 0, 1))).'</em>');
+                    $attribute_info = $this->GetAttributesInfo (ord (substr ($one_attribute_to_send, 0, 1)));
+                    $this->DebugInfo ('Attribute '.ord (substr ($one_attribute_to_send, 0, 1)).' ('.$attribute_info[0].'), length '.(ord (substr ($one_attribute_to_send, 1, 1)) - 2).', format '.$attribute_info[1].', value <em>'.$this->DecodeAttribute (substr ($one_attribute_to_send, 2), ord (substr ($one_attribute_to_send, 0, 1))).'</em>');
                 }
             }
-            $read_socket_array   = array($_socket_to_server);
+            $read_socket_array   = array ($_socket_to_server);
             $write_socket_array  = NULL;
             $except_socket_array = NULL;
 
-            $received_packet = chr(0);
+            $received_packet = chr (0);
 
-            if (!(FALSE === socket_select($read_socket_array, $write_socket_array, $except_socket_array, $this->_udp_timeout)))
+            if (!(FALSE === socket_select ($read_socket_array, $write_socket_array, $except_socket_array, $this->_udp_timeout)))
             {
-                if (in_array($_socket_to_server, $read_socket_array))
+                if (in_array ($_socket_to_server, $read_socket_array))
                 {
-                    if (FALSE === ($received_packet = @socket_read($_socket_to_server, 1024))) {
+                    if (FALSE === ($received_packet = @socket_read ($_socket_to_server, 1024))) {
                         // @ used, than no error is displayed if the connection is closed by the remote host
                     {
-                        $received_packet = chr(0);
+                        $received_packet = chr (0);
                     }
-                        $this->_last_error_code    = socket_last_error();
-                        $this->_last_error_message = socket_strerror($this->_last_error_code);
+                        $this->_last_error_code    = socket_last_error ();
+                        $this->_last_error_message = socket_strerror ($this->_last_error_code);
                     } else
                     {
-                        socket_close($_socket_to_server);
+                        socket_close ($_socket_to_server);
                     }
                 }
             } else
             {
-                socket_close($_socket_to_server);
+                socket_close ($_socket_to_server);
             }
         }
 
-        $this->_radius_packet_received = intval(ord(substr($received_packet, 0, 1)));
+        $this->_radius_packet_received = intval (ord (substr ($received_packet, 0, 1)));
 
-        $this->DebugInfo('<b>Packet type '.$this->_radius_packet_received.' ('.$this->GetRadiusPacketInfo($this->_radius_packet_received).')'.' received</b>');
+        $this->DebugInfo ('<b>Packet type '.$this->_radius_packet_received.' ('.$this->GetRadiusPacketInfo ($this->_radius_packet_received).')'.' received</b>');
 
         if ($this->_radius_packet_received > 0)
         {
-            $this->_identifier_received = intval(ord(substr($received_packet, 1, 1)));
-            $packet_length = (intval(ord(substr($received_packet, 2, 1))) * 256) + (intval(ord(substr($received_packet, 3, 1))));
-            $this->_response_authenticator = substr($received_packet, 4, 16);
-            $attributes_content = substr($received_packet, 20, ($packet_length - 4 - 16));
-            while (strlen($attributes_content) > 2)
+            $this->_identifier_received = intval (ord (substr ($received_packet, 1, 1)));
+            $packet_length = (intval (ord (substr ($received_packet, 2, 1))) * 256) + (intval (ord (substr ($received_packet, 3, 1))));
+            $this->_response_authenticator = substr ($received_packet, 4, 16);
+            $attributes_content = substr ($received_packet, 20, ($packet_length - 4 - 16));
+            while (strlen ($attributes_content) > 2)
             {
-                $attribute_type = intval(ord(substr($attributes_content, 0, 1)));
-                $attribute_length = intval(ord(substr($attributes_content, 1, 1)));
-                $attribute_raw_value = substr($attributes_content, 2, $attribute_length - 2);
-                $attributes_content = substr($attributes_content, $attribute_length);
+                $attribute_type = intval (ord (substr ($attributes_content, 0, 1)));
+                $attribute_length = intval (ord (substr ($attributes_content, 1, 1)));
+                $attribute_raw_value = substr ($attributes_content, 2, $attribute_length - 2);
+                $attributes_content = substr ($attributes_content, $attribute_length);
 
-                $attribute_value = $this->DecodeAttribute($attribute_raw_value, $attribute_type);
+                $attribute_value = $this->DecodeAttribute ($attribute_raw_value, $attribute_type);
 
-                $attribute_info = $this->GetAttributesInfo($attribute_type);
+                $attribute_info = $this->GetAttributesInfo ($attribute_type);
                 if (26 == $attribute_type)
                 {
-                    $vendor_array = $this->DecodeVendorSpecificContent($attribute_value);
+                    $vendor_array = $this->DecodeVendorSpecificContent ($attribute_value);
                     foreach ($vendor_array as $vendor_one)
                     {
-                        $this->DebugInfo('Attribute '.$attribute_type.' ('.$attribute_info[0].'), length '.($attribute_length - 2).', format '.$attribute_info[1].', Vendor-Id: '.$vendor_one[0].", Vendor-type: ".$vendor_one[1].",  Attribute-specific: ".$vendor_one[2]);
+                        $this->DebugInfo ('Attribute '.$attribute_type.' ('.$attribute_info[0].'), length '.($attribute_length - 2).', format '.$attribute_info[1].', Vendor-Id: '.$vendor_one[0].", Vendor-type: ".$vendor_one[1].",  Attribute-specific: ".$vendor_one[2]);
                     }
                 } else
                 {
-                    $this->DebugInfo('Attribute '.$attribute_type.' ('.$attribute_info[0].'), length '.($attribute_length - 2).', format '.$attribute_info[1].', value <em>'.$attribute_value.'</em>');
+                    $this->DebugInfo ('Attribute '.$attribute_type.' ('.$attribute_info[0].'), length '.($attribute_length - 2).', format '.$attribute_info[1].', value <em>'.$attribute_value.'</em>');
                 }
 
-                $this->_attributes_received[] = array($attribute_type, $attribute_value);
+                $this->_attributes_received[] = array ($attribute_type, $attribute_value);
             }
         }
 

functions/classes/class.Thread.php

Indentation +140 added lines, -140 removed lines

@@ -11,47 +11,47 @@ 
     const FUNCTION_NOT_CALLABLE = 10;
     const COULD_NOT_FORK = 15;
 
-	/**
-	* possible errors
-	*
-	* @var array
-	*/
+    /**
+     * possible errors
+     *
+     * @var array
+     */
     private $errors = array(
         Thread::FUNCTION_NOT_CALLABLE => 'You must specify a valid function name that can be called from the current scope.',
         Thread::COULD_NOT_FORK => 'pcntl_fork() returned a status of -1. No new process was created',
     );
 
-	/**
-	* callback for the function that should
-	* run as a separate thread
-	*
-	* @var callback
-	*/
+    /**
+     * callback for the function that should
+     * run as a separate thread
+     *
+     * @var callback
+     */
     protected $runnable;
 
-	/**
-	* holds the current process id
-	*
-	* @var integer
-	*/
+    /**
+     * holds the current process id
+     *
+     * @var integer
+     */
     private $pid;
 
-	/**
-	* holds the exit code after the child dies
-	*/
+    /**
+     * holds the exit code after the child dies
+     */
     private $exitCode = -1;
 
     /**
-	* holds type - needed for fping
-	*/
-	public $stype = "ping";
+     * holds type - needed for fping
+     */
+    public $stype = "ping";
 
-	/**
-	* checks if threading is supported by the current
-	* PHP configuration
-	*
-	* @return boolean
-	*/
+    /**
+     * checks if threading is supported by the current
+     * PHP configuration
+     *
+     * @return boolean
+     */
     public static function available() {
         $required_functions = array(
             'pcntl_fork',
@@ -66,24 +66,24 @@ 
         return true;
     }
 
-	/**
-	* class constructor - you can pass
-	* the callback function as an argument
-	*
-	* @param callback $_runnable
-	*/
+    /**
+     * class constructor - you can pass
+     * the callback function as an argument
+     *
+     * @param callback $_runnable
+     */
     public function __construct( $_runnable = null ) {
-		if( $_runnable !== null ) {
-			$this->setRunnable( $_runnable );
-		}
+        if( $_runnable !== null ) {
+            $this->setRunnable( $_runnable );
+        }
     }
 
-	/**
-	* sets the callback
-	*
-	* @param callback $_runnable
-	* @return callback
-	*/
+    /**
+     * sets the callback
+     *
+     * @param callback $_runnable
+     * @return callback
+     */
     public function setRunnable( $_runnable ) {
         if( self::runnableOk( $_runnable ) ) {
             $this->runnable = $_runnable;
@@ -93,43 +93,43 @@ 
         }
     }
 
-	/**
-	* gets the callback
-	*
-	* @return callback
-	*/
+    /**
+     * gets the callback
+     *
+     * @return callback
+     */
     public function getRunnable() {
         return $this->runnable;
     }
 
-	/**
-	* checks if the callback is ok (the function/method
-	* actually exists and is runnable from the current
-	* context)
-	*
-	* can be called statically
-	*
-	* @param callback $_runnable
-	* @return boolean
-	*/
+    /**
+     * checks if the callback is ok (the function/method
+     * actually exists and is runnable from the current
+     * context)
+     *
+     * can be called statically
+     *
+     * @param callback $_runnable
+     * @return boolean
+     */
     public static function runnableOk( $_runnable ) {
         return ( function_exists( $_runnable ) && is_callable( $_runnable ) );
     }
 
-	/**
-	* returns the process id (pid) of the simulated thread
-	*
-	* @return int
-	*/
+    /**
+     * returns the process id (pid) of the simulated thread
+     *
+     * @return int
+     */
     public function getPid() {
         return $this->pid;
     }
 
-	/**
-	* checks if the child thread is alive
-	*
-	* @return boolean
-	*/
+    /**
+     * checks if the child thread is alive
+     *
+     * @return boolean
+     */
     public function isAlive() {
         $pid = pcntl_waitpid( $this->pid, $status, WNOHANG );
 
@@ -143,22 +143,22 @@ 
         }
     }
 
-	/**
-	* return exit code of child (-1 if child is still alive)
-	*
-	* @return int
-	*/
+    /**
+     * return exit code of child (-1 if child is still alive)
+     *
+     * @return int
+     */
     public function getExitCode() {
         $this->isAlive();
         return $this->exitCode;
     }
 
-	/**
-	* starts the thread, all the parameters are
-	* passed to the callback function
-	*
-	* @return void
-	*/
+    /**
+     * starts the thread, all the parameters are
+     * passed to the callback function
+     *
+     * @return void
+     */
     public function start() {
         $pid = @ pcntl_fork();
         if( $pid == -1 ) {
@@ -183,59 +183,59 @@ 
         }
     }
 
-	/**
-	* starts the thread, all the parameters are
-	* passed to the callback function
-	*
-	*	modification for fping threading for cron scanning
-	*
-	* @return void
-	*/
+    /**
+     * starts the thread, all the parameters are
+     * passed to the callback function
+     *
+     *	modification for fping threading for cron scanning
+     *
+     * @return void
+     */
     public function start_fping() {
-		$status = 0;
-		$results = null;
-		$pid = pcntl_fork();
+        $status = 0;
+        $results = null;
+        $pid = pcntl_fork();
 
-		if( $pid == -1 ) { //error forking, no child is created
-			throw new Exception( $this->getError( Thread::COULD_NOT_FORK ), Thread::COULD_NOT_FORK );
-		}else if ( $pid ) {// parent
-			$this->pid = $pid;
+        if( $pid == -1 ) { //error forking, no child is created
+            throw new Exception( $this->getError( Thread::COULD_NOT_FORK ), Thread::COULD_NOT_FORK );
+        }else if ( $pid ) {// parent
+            $this->pid = $pid;
 
-		} else { // child
-			$this->pid = posix_getpid();//pid (child)
-			$this->ppid = posix_getppid();//pid (parent)
+        } else { // child
+            $this->pid = posix_getpid();//pid (child)
+            $this->ppid = posix_getppid();//pid (parent)
 
-			pcntl_signal( SIGTERM, array( $this, 'signalHandler' ) );
-			$array_args = func_get_args();
-			if ( !empty( $array_args ) ) {
-				$results = call_user_func_array( $this->runnable, $array_args );
-			}else{
-				$results = call_user_func( $this->runnable );
-			}
+            pcntl_signal( SIGTERM, array( $this, 'signalHandler' ) );
+            $array_args = func_get_args();
+            if ( !empty( $array_args ) ) {
+                $results = call_user_func_array( $this->runnable, $array_args );
+            }else{
+                $results = call_user_func( $this->runnable );
+            }
 
-			$pipe = "/tmp/pipe_".$this->pid;//pid is known by parent
+            $pipe = "/tmp/pipe_".$this->pid;//pid is known by parent
 
-			if(!file_exists($pipe)) {//child talks to parent using this pipe
-				umask(0);
-				posix_mkfifo($pipe, 0600);
-			}
-			//we have to open the pipe and send the data serialized
-			$pipe_descriptor = fopen($pipe, 'w');
-			fwrite($pipe_descriptor, serialize( $results ) );
+            if(!file_exists($pipe)) {//child talks to parent using this pipe
+                umask(0);
+                posix_mkfifo($pipe, 0600);
+            }
+            //we have to open the pipe and send the data serialized
+            $pipe_descriptor = fopen($pipe, 'w');
+            fwrite($pipe_descriptor, serialize( $results ) );
 
-			//and kill the child using posix_kill ( exit(0) duplicates headers!! )
-			posix_kill( $this->pid , SIGKILL);
-			exit(0);
-		}
+            //and kill the child using posix_kill ( exit(0) duplicates headers!! )
+            posix_kill( $this->pid , SIGKILL);
+            exit(0);
+        }
     }
 
-	/**
-	* attempts to stop the thread
-	* returns true on success and false otherwise
-	*
-	* @param integer $_signal - SIGKILL/SIGTERM
-	* @param boolean $_wait
-	*/
+    /**
+     * attempts to stop the thread
+     * returns true on success and false otherwise
+     *
+     * @param integer $_signal - SIGKILL/SIGTERM
+     * @param boolean $_wait
+     */
     public function stop( $_signal = SIGKILL, $_wait = false ) {
         if( $this->isAlive() ) {
             posix_kill( $this->pid, $_signal );
@@ -245,22 +245,22 @@ 
         }
     }
 
-	/**
-	* alias of stop();
-	*
-	* @return boolean
-	*/
+    /**
+     * alias of stop();
+     *
+     * @return boolean
+     */
     public function kill( $_signal = SIGKILL, $_wait = false ) {
         return $this->stop( $_signal, $_wait );
     }
 
-	/**
-	* gets the error's message based on
-	* its id
-	*
-	* @param integer $_code
-	* @return string
-	*/
+    /**
+     * gets the error's message based on
+     * its id
+     *
+     * @param integer $_code
+     * @return string
+     */
     public function getError( $_code ) {
         if ( isset( $this->errors[$_code] ) ) {
             return $this->errors[$_code];
@@ -270,11 +270,11 @@ 
         }
     }
 
-	/**
-	* signal handler
-	*
-	* @param integer $_signal
-	*/
+    /**
+     * signal handler
+     *
+     * @param integer $_signal
+     */
     protected function signalHandler( $_signal ) {
         switch( $_signal ) {
             case SIGTERM:

Spacing +65 added lines, -65 removed lines

@@ -16,7 +16,7 @@ 
 	*
 	* @var array
 	*/
-    private $errors = array(
+    private $errors = array (
         Thread::FUNCTION_NOT_CALLABLE => 'You must specify a valid function name that can be called from the current scope.',
         Thread::COULD_NOT_FORK => 'pcntl_fork() returned a status of -1. No new process was created',
     );
@@ -52,13 +52,13 @@ 
 	*
 	* @return boolean
 	*/
-    public static function available() {
-        $required_functions = array(
+    public static function available () {
+        $required_functions = array (
             'pcntl_fork',
         );
 
-        foreach( $required_functions as $function ) {
-            if ( !function_exists( $function ) ) {
+        foreach ($required_functions as $function) {
+            if (!function_exists ($function)) {
                 return false;
             }
         }
@@ -72,9 +72,9 @@ 
 	*
 	* @param callback $_runnable
 	*/
-    public function __construct( $_runnable = null ) {
-		if( $_runnable !== null ) {
-			$this->setRunnable( $_runnable );
+    public function __construct ($_runnable = null) {
+		if ($_runnable !== null) {
+			$this->setRunnable ($_runnable);
 		}
     }
 
@@ -84,12 +84,12 @@ 
 	* @param callback $_runnable
 	* @return callback
 	*/
-    public function setRunnable( $_runnable ) {
-        if( self::runnableOk( $_runnable ) ) {
+    public function setRunnable ($_runnable) {
+        if (self::runnableOk ($_runnable)) {
             $this->runnable = $_runnable;
         }
         else {
-            throw new Exception( $this->getError( Thread::FUNCTION_NOT_CALLABLE ), Thread::FUNCTION_NOT_CALLABLE );
+            throw new Exception ($this->getError (Thread::FUNCTION_NOT_CALLABLE), Thread::FUNCTION_NOT_CALLABLE);
         }
     }
 
@@ -98,7 +98,7 @@ 
 	*
 	* @return callback
 	*/
-    public function getRunnable() {
+    public function getRunnable () {
         return $this->runnable;
     }
 
@@ -112,8 +112,8 @@ 
 	* @param callback $_runnable
 	* @return boolean
 	*/
-    public static function runnableOk( $_runnable ) {
-        return ( function_exists( $_runnable ) && is_callable( $_runnable ) );
+    public static function runnableOk ($_runnable) {
+        return (function_exists ($_runnable) && is_callable ($_runnable));
     }
 
 	/**
@@ -121,7 +121,7 @@ 
 	*
 	* @return int
 	*/
-    public function getPid() {
+    public function getPid () {
         return $this->pid;
     }
 
@@ -130,14 +130,14 @@ 
 	*
 	* @return boolean
 	*/
-    public function isAlive() {
-        $pid = pcntl_waitpid( $this->pid, $status, WNOHANG );
+    public function isAlive () {
+        $pid = pcntl_waitpid ($this->pid, $status, WNOHANG);
 
         if ($pid === 0) { // child is still alive
             return true;
         } else {
-            if (pcntl_wifexited($status) && $this->exitCode == -1) { // normal exit
-                $this->exitCode = pcntl_wexitstatus($status);
+            if (pcntl_wifexited ($status) && $this->exitCode == -1) { // normal exit
+                $this->exitCode = pcntl_wexitstatus ($status);
             }
             return false;
         }
@@ -148,8 +148,8 @@ 
 	*
 	* @return int
 	*/
-    public function getExitCode() {
-        $this->isAlive();
+    public function getExitCode () {
+        $this->isAlive ();
         return $this->exitCode;
     }
 
@@ -159,27 +159,27 @@ 
 	*
 	* @return void
 	*/
-    public function start() {
-        $pid = @ pcntl_fork();
-        if( $pid == -1 ) {
-            throw new Exception( $this->getError( Thread::COULD_NOT_FORK ), Thread::COULD_NOT_FORK );
+    public function start () {
+        $pid = @ pcntl_fork ();
+        if ($pid == -1) {
+            throw new Exception ($this->getError (Thread::COULD_NOT_FORK), Thread::COULD_NOT_FORK);
         }
-        if( $pid ) {
+        if ($pid) {
             // parent
             $this->pid = $pid;
         }
         else {
             // child
-            pcntl_signal( SIGTERM, array( $this, 'signalHandler' ) );
-            $arguments = func_get_args();
-            if ( !empty( $arguments ) ) {
-                call_user_func_array( $this->runnable, $arguments );
+            pcntl_signal (SIGTERM, array ($this, 'signalHandler'));
+            $arguments = func_get_args ();
+            if (!empty($arguments)) {
+                call_user_func_array ($this->runnable, $arguments);
             }
             else {
-                call_user_func( $this->runnable );
+                call_user_func ($this->runnable);
             }
 
-            exit( 0 );
+            exit(0);
         }
     }
 
@@ -191,40 +191,40 @@ 
 	*
 	* @return void
 	*/
-    public function start_fping() {
+    public function start_fping () {
 		$status = 0;
 		$results = null;
-		$pid = pcntl_fork();
+		$pid = pcntl_fork ();
 
-		if( $pid == -1 ) { //error forking, no child is created
-			throw new Exception( $this->getError( Thread::COULD_NOT_FORK ), Thread::COULD_NOT_FORK );
-		}else if ( $pid ) {// parent
+		if ($pid == -1) { //error forking, no child is created
+			throw new Exception ($this->getError (Thread::COULD_NOT_FORK), Thread::COULD_NOT_FORK);
+		} else if ($pid) {// parent
 			$this->pid = $pid;
 
 		} else { // child
-			$this->pid = posix_getpid();//pid (child)
-			$this->ppid = posix_getppid();//pid (parent)
+			$this->pid = posix_getpid (); //pid (child)
+			$this->ppid = posix_getppid (); //pid (parent)
 
-			pcntl_signal( SIGTERM, array( $this, 'signalHandler' ) );
-			$array_args = func_get_args();
-			if ( !empty( $array_args ) ) {
-				$results = call_user_func_array( $this->runnable, $array_args );
-			}else{
-				$results = call_user_func( $this->runnable );
+			pcntl_signal (SIGTERM, array ($this, 'signalHandler'));
+			$array_args = func_get_args ();
+			if (!empty($array_args)) {
+				$results = call_user_func_array ($this->runnable, $array_args);
+			} else {
+				$results = call_user_func ($this->runnable);
 			}
 
-			$pipe = "/tmp/pipe_".$this->pid;//pid is known by parent
+			$pipe = "/tmp/pipe_".$this->pid; //pid is known by parent
 
-			if(!file_exists($pipe)) {//child talks to parent using this pipe
-				umask(0);
-				posix_mkfifo($pipe, 0600);
+			if (!file_exists ($pipe)) {//child talks to parent using this pipe
+				umask (0);
+				posix_mkfifo ($pipe, 0600);
 			}
 			//we have to open the pipe and send the data serialized
-			$pipe_descriptor = fopen($pipe, 'w');
-			fwrite($pipe_descriptor, serialize( $results ) );
+			$pipe_descriptor = fopen ($pipe, 'w');
+			fwrite ($pipe_descriptor, serialize ($results));
 
 			//and kill the child using posix_kill ( exit(0) duplicates headers!! )
-			posix_kill( $this->pid , SIGKILL);
+			posix_kill ($this->pid, SIGKILL);
 			exit(0);
 		}
     }
@@ -236,11 +236,11 @@ 
 	* @param integer $_signal - SIGKILL/SIGTERM
 	* @param boolean $_wait
 	*/
-    public function stop( $_signal = SIGKILL, $_wait = false ) {
-        if( $this->isAlive() ) {
-            posix_kill( $this->pid, $_signal );
-            if( $_wait ) {
-                pcntl_waitpid( $this->pid, $status = 0 );
+    public function stop ($_signal = SIGKILL, $_wait = false) {
+        if ($this->isAlive ()) {
+            posix_kill ($this->pid, $_signal);
+            if ($_wait) {
+                pcntl_waitpid ($this->pid, $status = 0);
             }
         }
     }
@@ -250,8 +250,8 @@ 
 	*
 	* @return boolean
 	*/
-    public function kill( $_signal = SIGKILL, $_wait = false ) {
-        return $this->stop( $_signal, $_wait );
+    public function kill ($_signal = SIGKILL, $_wait = false) {
+        return $this->stop ($_signal, $_wait);
     }
 
 	/**
@@ -261,12 +261,12 @@ 
 	* @param integer $_code
 	* @return string
 	*/
-    public function getError( $_code ) {
-        if ( isset( $this->errors[$_code] ) ) {
+    public function getError ($_code) {
+        if (isset($this->errors[$_code])) {
             return $this->errors[$_code];
         }
         else {
-            return 'No such error code ' . $_code . '! Quit inventing errors!!!';
+            return 'No such error code '.$_code.'! Quit inventing errors!!!';
         }
     }
 
@@ -275,10 +275,10 @@ 
 	*
 	* @param integer $_signal
 	*/
-    protected function signalHandler( $_signal ) {
-        switch( $_signal ) {
+    protected function signalHandler ($_signal) {
+        switch ($_signal) {
             case SIGTERM:
-                exit( 0 );
+                exit(0);
             break;
         }
     }