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

functions/checks/check_db_upgrade.php

Indentation +2 added lines, -2 removed lines

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

functions/scripts/find_untranslated_files.php

Indentation +27 added lines, -27 removed lines

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

Braces +3 added lines, -1 removed lines

@@ -72,7 +72,9 @@
 function get_string_between($string, $start, $end){
     $string = " ".$string;
     $ini = strpos($string,$start);
-    if ($ini == 0) return "";
+    if ($ini == 0) {
+        return "";
+    }
     $ini += strlen($start);
     $len = strpos($string,$end,$ini) - $ini;
     return substr($string,$ini,$len);

functions/scripts/resolveIPaddresses.php

Indentation +51 added lines, -51 removed lines

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

functions/scripts/discoveryCheck.php

Indentation +182 added lines, -182 removed lines

@@ -78,18 +78,18 @@ 
     $addresses_tmp = array();
     // loop
     foreach($scan_subnets as $s) {
-    	// if subnet has slaves dont check it
-    	if ($Subnets->has_slaves ($s->id) === false) {
-    		$addresses_tmp[$s->id] = $Scan-> prepare_addresses_to_scan ("discovery", $s->id, false);
-    	}
+        // if subnet has slaves dont check it
+        if ($Subnets->has_slaves ($s->id) === false) {
+            $addresses_tmp[$s->id] = $Scan-> prepare_addresses_to_scan ("discovery", $s->id, false);
+        }
     }
 
     //reindex
     if(sizeof($addresses_tmp)>0) {
         foreach($addresses_tmp as $s_id=>$a) {
-        	foreach($a as $ip) {
-        		$addresses[] = array("subnetId"=>$s_id, "ip_addr"=>$ip);
-        	}
+            foreach($a as $ip) {
+                $addresses[] = array("subnetId"=>$s_id, "ip_addr"=>$ip);
+            }
         }
     }
 }
@@ -110,101 +110,101 @@ 
 
 //different scan for fping
 if($Scan->icmp_type=="fping") {
-	//run per MAX_THREADS
-	for ($m=0; $m<=$size_subnets; $m += $Scan->settings->scanMaxThreads) {
-	    // create threads
-	    $threads = array();
-	    //fork processes
-	    for ($i = 0; $i <= $Scan->settings->scanMaxThreads && $i <= $size_subnets; $i++) {
-	    	//only if index exists!
-	    	if(isset($scan_subnets[$z])) {
-				//start new thread
-	            $threads[$z] = new Thread( 'fping_subnet' );
-				$threads[$z]->start_fping( $Subnets->transform_to_dotted($scan_subnets[$z]->subnet)."/".$scan_subnets[$z]->mask );
-	            $z++;				//next index
-			}
-	    }
-	    // wait for all the threads to finish
-	    while( !empty( $threads ) ) {
-			foreach($threads as $index => $thread) {
-				$child_pipe = "/tmp/pipe_".$thread->getPid();
-
-				if (file_exists($child_pipe)) {
-					$file_descriptor = fopen( $child_pipe, "r");
-					$child_response = "";
-					while (!feof($file_descriptor)) {
-						$child_response .= fread($file_descriptor, 8192);
-					}
-					//we have the child data in the parent, but serialized:
-					$child_response = unserialize( $child_response );
-					//store
-					$scan_subnets[$index]->discovered = $child_response;
-					//now, child is dead, and parent close the pipe
-					unlink( $child_pipe );
-					unset($threads[$index]);
-				}
-			}
-	        usleep(200000);
-	    }
-	}
-
-	//fping finds all subnet addresses, we must remove existing ones !
-	foreach($scan_subnets as $sk=>$s) {
-    	if(isset($s->discovered)) {
-    		foreach($s->discovered as $rk=>$result) {
-    			if(!in_array($Subnets->transform_to_decimal($result), $addresses_tmp[$s->id])) {
-    				unset($scan_subnets[$sk]->discovered[$rk]);
-    			}
-    		}
+    //run per MAX_THREADS
+    for ($m=0; $m<=$size_subnets; $m += $Scan->settings->scanMaxThreads) {
+        // create threads
+        $threads = array();
+        //fork processes
+        for ($i = 0; $i <= $Scan->settings->scanMaxThreads && $i <= $size_subnets; $i++) {
+            //only if index exists!
+            if(isset($scan_subnets[$z])) {
+                //start new thread
+                $threads[$z] = new Thread( 'fping_subnet' );
+                $threads[$z]->start_fping( $Subnets->transform_to_dotted($scan_subnets[$z]->subnet)."/".$scan_subnets[$z]->mask );
+                $z++;				//next index
+            }
+        }
+        // wait for all the threads to finish
+        while( !empty( $threads ) ) {
+            foreach($threads as $index => $thread) {
+                $child_pipe = "/tmp/pipe_".$thread->getPid();
+
+                if (file_exists($child_pipe)) {
+                    $file_descriptor = fopen( $child_pipe, "r");
+                    $child_response = "";
+                    while (!feof($file_descriptor)) {
+                        $child_response .= fread($file_descriptor, 8192);
+                    }
+                    //we have the child data in the parent, but serialized:
+                    $child_response = unserialize( $child_response );
+                    //store
+                    $scan_subnets[$index]->discovered = $child_response;
+                    //now, child is dead, and parent close the pipe
+                    unlink( $child_pipe );
+                    unset($threads[$index]);
+                }
+            }
+            usleep(200000);
+        }
+    }
+
+    //fping finds all subnet addresses, we must remove existing ones !
+    foreach($scan_subnets as $sk=>$s) {
+        if(isset($s->discovered)) {
+            foreach($s->discovered as $rk=>$result) {
+                if(!in_array($Subnets->transform_to_decimal($result), $addresses_tmp[$s->id])) {
+                    unset($scan_subnets[$sk]->discovered[$rk]);
+                }
+            }
             //rekey
             $scan_subnets[$sk]->discovered = array_values($scan_subnets[$sk]->discovered);
-		}
-	}
+        }
+    }
 }
 //ping, pear
 else {
-	//run per MAX_THREADS
+    //run per MAX_THREADS
     for ($m=0; $m<=$size_addresses; $m += $Scan->settings->scanMaxThreads) {
         // create threads
         $threads = array();
 
         //fork processes
         for ($i = 0; $i <= $Scan->settings->scanMaxThreads && $i <= $size_addresses; $i++) {
-        	//only if index exists!
-        	if(isset($addresses[$z])) {
-				//start new thread
-	            $threads[$z] = new Thread( 'ping_address' );
-	            $threads[$z]->start( $Subnets->transform_to_dotted($addresses[$z]['ip_addr']) );
-				$z++;			//next index
-			}
+            //only if index exists!
+            if(isset($addresses[$z])) {
+                //start new thread
+                $threads[$z] = new Thread( 'ping_address' );
+                $threads[$z]->start( $Subnets->transform_to_dotted($addresses[$z]['ip_addr']) );
+                $z++;			//next index
+            }
         }
 
         // wait for all the threads to finish
         while( !empty( $threads ) ) {
             foreach( $threads as $index => $thread ) {
                 if( ! $thread->isAlive() ) {
-					//unset dead hosts
-					if($thread->getExitCode() != 0) {
-						unset($addresses[$index]);
-					}
+                    //unset dead hosts
+                    if($thread->getExitCode() != 0) {
+                        unset($addresses[$index]);
+                    }
                     //remove thread
                     unset( $threads[$index]);
                 }
             }
             usleep(200000);
         }
-	}
-
-	//ok, we have all available addresses, rekey them
-	foreach($addresses as $a) {
-		$add_tmp[$a['subnetId']][] = $Subnets->transform_to_dotted($a['ip_addr']);
-	}
-	//add to scan_subnets as result
-	foreach($scan_subnets as $sk=>$s) {
-		if(isset($add_tmp[$s->id])) {
-			$scan_subnets[$sk]->discovered = $add_tmp[$s->id];
-		}
-	}
+    }
+
+    //ok, we have all available addresses, rekey them
+    foreach($addresses as $a) {
+        $add_tmp[$a['subnetId']][] = $Subnets->transform_to_dotted($a['ip_addr']);
+    }
+    //add to scan_subnets as result
+    foreach($scan_subnets as $sk=>$s) {
+        if(isset($add_tmp[$s->id])) {
+            $scan_subnets[$sk]->discovered = $add_tmp[$s->id];
+        }
+    }
 }
 
 
@@ -226,31 +226,31 @@ 
 $discovered = 0;				//for mailing
 
 foreach($scan_subnets as $s) {
-	if(sizeof(@$s->discovered)>0) {
-		foreach($s->discovered as $ip) {
-			// fetch subnet
-			$subnet = $Subnets->fetch_subnet ("id", $s->id);
-			$nsid = $subnet===false ? false : $subnet->nameserverId;
-			// try to resolve hostname
-			$hostname = $DNS->resolve_address ($ip, false, true, $nsid);
-
-			//set update query
-			$values = array("subnetId"=>$s->id,
-							"ip_addr"=>$Subnets->transform_address($ip, "decimal"),
-							"dns_name"=>$hostname['name'],
-							"description"=>"-- autodiscovered --",
-							"note"=>"This host was autodiscovered on ".$nowdate,
-							"lastSeen"=>$nowdate,
-							"state"=>"2",
-							"action"=>"add"
-							);
-			//insert
-			$Addresses->modify_address($values);
-
-			//set discovered
-			$discovered++;
-		}
-	}
+    if(sizeof(@$s->discovered)>0) {
+        foreach($s->discovered as $ip) {
+            // fetch subnet
+            $subnet = $Subnets->fetch_subnet ("id", $s->id);
+            $nsid = $subnet===false ? false : $subnet->nameserverId;
+            // try to resolve hostname
+            $hostname = $DNS->resolve_address ($ip, false, true, $nsid);
+
+            //set update query
+            $values = array("subnetId"=>$s->id,
+                            "ip_addr"=>$Subnets->transform_address($ip, "decimal"),
+                            "dns_name"=>$hostname['name'],
+                            "description"=>"-- autodiscovered --",
+                            "note"=>"This host was autodiscovered on ".$nowdate,
+                            "lastSeen"=>$nowdate,
+                            "state"=>"2",
+                            "action"=>"add"
+                            );
+            //insert
+            $Addresses->modify_address($values);
+
+            //set discovered
+            $discovered++;
+        }
+    }
 }
 
 # update scan time
@@ -261,84 +261,84 @@ 
 # send mail
 if($discovered>0 && $send_mail) {
 
-	# check for recipients
-	foreach($Admin->fetch_multiple_objects ("users", "role", "Administrator") as $admin) {
-		if($admin->mailNotify=="Yes") {
-			$recepients[] = array("name"=>$admin->real_name, "email"=>$admin->email);
-		}
-	}
-	# none?
-	if(!isset($recepients))	{ die(); }
-
-	# fetch mailer settings
-	$mail_settings = $Admin->fetch_object("settingsMail", "id", 1);
-	# fake user object, needed for create_link
-	$User = new StdClass();
-	@$User->settings->prettyLinks = $Scan->settings->prettyLinks;
-
-	# initialize mailer
-	$phpipam_mail = new phpipam_mail($Scan->settings, $mail_settings);
-	$phpipam_mail->initialize_mailer();
-
-
-
-	// set subject
-	$subject	= "phpIPAM new addresses detected ".date("Y-m-d H:i:s");
-
-	//html
-	$content[] = "<h3>phpIPAM found $discovered new hosts</h3>";
-	$content[] = "<table style='margin-left:10px;margin-top:5px;width:auto;padding:0px;border-collapse:collapse;border:1px solid gray;'>";
-	$content[] = "<tr>";
-	$content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>IP</th>";
-	$content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>Subnet</th>";
-	$content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>Section</th>";
-	$content[] = "</tr>";
-	//plain
-	$content_plain[] = "phpIPAM found $discovered new hosts\r\n------------------------------";
-	//Changes
-	foreach($scan_subnets as $s) {
-		if(sizeof(@$s->discovered)>0) {
-			foreach($s->discovered as $ip) {
-				//set subnet
-				$subnet 	 = $Subnets->fetch_subnet(null, $s->id);
-				//set section
-				$section 	 = $Admin->fetch_object("sections", "id", $s->sectionId);
-
-				$content[] = "<tr>";
-				$content[] = "	<td style='padding:3px 8px;border:1px solid silver;'>$ip</td>";
-				$content[] = "	<td style='padding:3px 8px;border:1px solid silver;'><a href='".rtrim($Scan->settings->siteURL, "/")."".create_link("subnets",$section->id,$subnet->id)."'>".$Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask." - ".$subnet->description."</a></td>";
-				$content[] = "	<td style='padding:3px 8px;border:1px solid silver;'><a href='".rtrim($Scan->settings->siteURL, "/")."".create_link("subnets",$section->id)."'>$section->name $section->description</a></td>";
-				$content[] = "</tr>";
-
-				//plain content
-				$content_plain[] = "\t * $ip (".$Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask.")";
-			}
-		}
-	}
-	$content[] = "</table>";
-
-
-	# set content
-	$content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
-	$content_plain 	= implode("\r\n",$content_plain);
-
-	# try to send
-	try {
-		$phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
-		//add all admins to CC
-		foreach($recepients as $admin) {
-			$phpipam_mail->Php_mailer->addAddress(addslashes($admin['email']), addslashes($admin['name']));
-		}
-		$phpipam_mail->Php_mailer->Subject = $subject;
-		$phpipam_mail->Php_mailer->msgHTML($content);
-		$phpipam_mail->Php_mailer->AltBody = $content_plain;
-		//send
-		$phpipam_mail->Php_mailer->send();
-	} catch (phpmailerException $e) {
-		$Result->show_cli("Mailer Error: ".$e->errorMessage(), true);
-	} catch (Exception $e) {
-		$Result->show_cli("Mailer Error: ".$e->errorMessage(), true);
-	}
+    # check for recipients
+    foreach($Admin->fetch_multiple_objects ("users", "role", "Administrator") as $admin) {
+        if($admin->mailNotify=="Yes") {
+            $recepients[] = array("name"=>$admin->real_name, "email"=>$admin->email);
+        }
+    }
+    # none?
+    if(!isset($recepients))	{ die(); }
+
+    # fetch mailer settings
+    $mail_settings = $Admin->fetch_object("settingsMail", "id", 1);
+    # fake user object, needed for create_link
+    $User = new StdClass();
+    @$User->settings->prettyLinks = $Scan->settings->prettyLinks;
+
+    # initialize mailer
+    $phpipam_mail = new phpipam_mail($Scan->settings, $mail_settings);
+    $phpipam_mail->initialize_mailer();
+
+
+
+    // set subject
+    $subject	= "phpIPAM new addresses detected ".date("Y-m-d H:i:s");
+
+    //html
+    $content[] = "<h3>phpIPAM found $discovered new hosts</h3>";
+    $content[] = "<table style='margin-left:10px;margin-top:5px;width:auto;padding:0px;border-collapse:collapse;border:1px solid gray;'>";
+    $content[] = "<tr>";
+    $content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>IP</th>";
+    $content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>Subnet</th>";
+    $content[] = "	<th style='padding:3px 8px;border:1px solid silver;border-bottom:2px solid gray;'>Section</th>";
+    $content[] = "</tr>";
+    //plain
+    $content_plain[] = "phpIPAM found $discovered new hosts\r\n------------------------------";
+    //Changes
+    foreach($scan_subnets as $s) {
+        if(sizeof(@$s->discovered)>0) {
+            foreach($s->discovered as $ip) {
+                //set subnet
+                $subnet 	 = $Subnets->fetch_subnet(null, $s->id);
+                //set section
+                $section 	 = $Admin->fetch_object("sections", "id", $s->sectionId);
+
+                $content[] = "<tr>";
+                $content[] = "	<td style='padding:3px 8px;border:1px solid silver;'>$ip</td>";
+                $content[] = "	<td style='padding:3px 8px;border:1px solid silver;'><a href='".rtrim($Scan->settings->siteURL, "/")."".create_link("subnets",$section->id,$subnet->id)."'>".$Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask." - ".$subnet->description."</a></td>";
+                $content[] = "	<td style='padding:3px 8px;border:1px solid silver;'><a href='".rtrim($Scan->settings->siteURL, "/")."".create_link("subnets",$section->id)."'>$section->name $section->description</a></td>";
+                $content[] = "</tr>";
+
+                //plain content
+                $content_plain[] = "\t * $ip (".$Subnets->transform_to_dotted($subnet->subnet)."/".$subnet->mask.")";
+            }
+        }
+    }
+    $content[] = "</table>";
+
+
+    # set content
+    $content 		= $phpipam_mail->generate_message (implode("\r\n", $content));
+    $content_plain 	= implode("\r\n",$content_plain);
+
+    # try to send
+    try {
+        $phpipam_mail->Php_mailer->setFrom($mail_settings->mAdminMail, $mail_settings->mAdminName);
+        //add all admins to CC
+        foreach($recepients as $admin) {
+            $phpipam_mail->Php_mailer->addAddress(addslashes($admin['email']), addslashes($admin['name']));
+        }
+        $phpipam_mail->Php_mailer->Subject = $subject;
+        $phpipam_mail->Php_mailer->msgHTML($content);
+        $phpipam_mail->Php_mailer->AltBody = $content_plain;
+        //send
+        $phpipam_mail->Php_mailer->send();
+    } catch (phpmailerException $e) {
+        $Result->show_cli("Mailer Error: ".$e->errorMessage(), true);
+    } catch (Exception $e) {
+        $Result->show_cli("Mailer Error: ".$e->errorMessage(), true);
+    }
 }
 
 ?>

config.dist.php

Indentation +3 added lines, -3 removed lines

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

Braces +6 added lines, -4 removed lines

@@ -47,14 +47,16 @@
  *  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

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

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

Braces +55 added lines, -84 removed lines

@@ -330,11 +330,10 @@ 
 
     function GetLastError()
     {
-        if (0 < $this->_last_error_code)
-        {
+        if (0 < $this->_last_error_code) {
             return $this->_last_error_message.' ('.$this->_last_error_code.')';
-        } else
-        {
+        }
+        else {
             return '';
         }
     }
@@ -387,8 +386,7 @@ 
     function SetUsername($username = '')
     {
         $temp_username = $username;
-        if (false === strpos($temp_username, '@'))
-        {
+        if (false === strpos($temp_username, '@')) {
             $temp_username .= $this->_radius_suffix;
         }
 
@@ -403,8 +401,7 @@ 
         $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));
         }
 
@@ -432,11 +429,10 @@ 
 
     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);
-        } else
-        {
+        }
+        else {
             $this->_nas_ip_address = gethostbyname(isset($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : '0.0.0.0');
         }
         $this->SetAttribute(4, $this->_nas_ip_address);
@@ -452,8 +448,7 @@ 
 
     function SetUdpTimeout($udp_timeout = 5)
     {
-        if (intval($udp_timeout) > 0)
-        {
+        if (intval($udp_timeout) > 0) {
             $this->_udp_timeout = intval($udp_timeout);
         }
     }
@@ -468,8 +463,7 @@ 
 
     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);
         }
     }
@@ -477,8 +471,7 @@ 
 
     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);
         }
     }
@@ -499,21 +492,19 @@ 
     function GetReadableReceivedAttributes()
     {
         $readable_attributes = '';
-        if (isset($this->_attributes_received))
-        {
+        if (isset($this->_attributes_received)) {
             foreach ($this->_attributes_received as $one_received_attribute)
             {
                 $attributes_info = $this->GetAttributesInfo($one_received_attribute[0]);
                 $readable_attributes .= $attributes_info[0].": ";
-                if (26 == $one_received_attribute[0])
-                {
+                if (26 == $one_received_attribute[0]) {
                     $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];
                     }
-                } else
-                {
+                }
+                else {
                     $readable_attributes .= $one_received_attribute[1];
                 }
                 $readable_attributes .= "<br />\n";
@@ -528,8 +519,7 @@ 
         $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;
             }
@@ -540,11 +530,10 @@ 
 
     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)];
-        } else
-        {
+        }
+        else {
             return '';
         }
     }
@@ -552,11 +541,10 @@ 
 
     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)];
-        } else
-        {
+        }
+        else {
             return array('', '');
         }
     }
@@ -564,8 +552,7 @@ 
 
     function DebugInfo($debug_info)
     {
-        if ($this->_debug_mode)
-        {
+        if ($this->_debug_mode) {
 	        //save debugging
 	        $this->debug_text[] = date('Y-m-d H:i:s').' DEBUG: '.$debug_info;
         }
@@ -577,8 +564,7 @@ 
         $attribute_index = -1;
         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;
             }
@@ -586,10 +572,8 @@ 
 
         $temp_attribute = NULL;
 
-        if (isset($this->_attributes_info[$type]))
-        {
-            switch ($this->_attributes_info[$type][1])
-            {
+        if (isset($this->_attributes_info[$type])) {
+            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;
                     break;
@@ -611,12 +595,11 @@ 
             }
         }
 
-        if ($attribute_index > -1)
-        {
+        if ($attribute_index > -1) {
             $this->_attributes_to_send[$attribute_index] = $temp_attribute;
             $additional_debug = 'Modified';
-        } else
-        {
+        }
+        else {
             $this->_attributes_to_send[] = $temp_attribute;
             $additional_debug = 'Added';
         }
@@ -629,10 +612,8 @@ 
     {
         $attribute_value = NULL;
 
-        if (isset($this->_attributes_info[$attribute_format]))
-        {
-            switch ($this->_attributes_info[$attribute_format][1])
-            {
+        if (isset($this->_attributes_info[$attribute_format])) {
+            switch ($this->_attributes_info[$attribute_format][1]) {
                 case 'T': // Text, 1-253 octets containing UTF-8 encoded ISO 10646 characters (RFC 2279).
                     $attribute_value = $attribute_raw_value;
                     break;
@@ -690,26 +671,22 @@ 
 
         $this->SetPacketCodeToSend(1); // Access-Request
 
-        if (0 < strlen($username))
-        {
+        if (0 < strlen($username)) {
             $this->SetUsername($username);
         }
 
-        if (0 < strlen($password))
-        {
+        if (0 < strlen($password)) {
             $this->SetPassword($password);
         }
 
-        if ($state !== NULL)
-        {
+        if ($state !== NULL) {
             $this->SetAttribute(24, $state);
-        } else
-        {
+        }
+        else {
             $this->SetAttribute(6, 1); // 1=Login
         }
 
-        if (intval($udp_timeout) > 0)
-        {
+        if (intval($udp_timeout) > 0) {
             $this->SetUdpTimeout($udp_timeout);
         }
 
@@ -732,23 +709,21 @@ 
 
         $_socket_to_server = socket_create(AF_INET, SOCK_DGRAM, 17); // UDP packet = 17
 
-        if ($_socket_to_server === FALSE)
-        {
+        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))
-        {
+        }
+        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))
-        {
+        }
+        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);
-        } else
-        {
+        }
+        else {
             $this->DebugInfo('<b>Packet type '.$this->_radius_packet_to_send.' ('.$this->GetRadiusPacketInfo($this->_radius_packet_to_send).')'.' sent</b>');
-            if ($this->_debug_mode)
-            {
+            if ($this->_debug_mode) {
                 $readable_attributes = '';
                 foreach ($this->_attributes_to_send as $one_attribute_to_send)
                 {
@@ -762,10 +737,8 @@ 
 
             $received_packet = chr(0);
 
-            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 (!(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 (FALSE === ($received_packet = @socket_read($_socket_to_server, 1024))) {
                         // @ used, than no error is displayed if the connection is closed by the remote host
                     {
@@ -773,13 +746,13 @@ 
                     }
                         $this->_last_error_code    = socket_last_error();
                         $this->_last_error_message = socket_strerror($this->_last_error_code);
-                    } else
-                    {
+                    }
+                    else {
                         socket_close($_socket_to_server);
                     }
                 }
-            } else
-            {
+            }
+            else {
                 socket_close($_socket_to_server);
             }
         }
@@ -788,8 +761,7 @@ 
 
         $this->DebugInfo('<b>Packet type '.$this->_radius_packet_received.' ('.$this->GetRadiusPacketInfo($this->_radius_packet_received).')'.' received</b>');
 
-        if ($this->_radius_packet_received > 0)
-        {
+        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);
@@ -804,15 +776,14 @@ 
                 $attribute_value = $this->DecodeAttribute($attribute_raw_value, $attribute_type);
 
                 $attribute_info = $this->GetAttributesInfo($attribute_type);
-                if (26 == $attribute_type)
-                {
+                if (26 == $attribute_type) {
                     $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]);
                     }
-                } else
-                {
+                }
+                else {
                     $this->DebugInfo('Attribute '.$attribute_type.' ('.$attribute_info[0].'), length '.($attribute_length - 2).', format '.$attribute_info[1].', value <em>'.$attribute_value.'</em>');
                 }
 

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:

Braces +18 added lines, -8 removed lines

@@ -133,10 +133,13 @@ 
     public function isAlive() {
         $pid = pcntl_waitpid( $this->pid, $status, WNOHANG );
 
-        if ($pid === 0) { // child is still alive
+        if ($pid === 0) {
+// child is still alive
             return true;
-        } else {
-            if (pcntl_wifexited($status) && $this->exitCode == -1) { // normal exit
+        }
+        else {
+            if (pcntl_wifexited($status) && $this->exitCode == -1) {
+// normal exit
                 $this->exitCode = pcntl_wexitstatus($status);
             }
             return false;
@@ -196,12 +199,17 @@ 
 		$results = null;
 		$pid = pcntl_fork();
 
-		if( $pid == -1 ) { //error forking, no child is created
+		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
+		}
+		else if ( $pid ) {
+// parent
 			$this->pid = $pid;
 
-		} else { // child
+		}
+		else {
+// child
 			$this->pid = posix_getpid();//pid (child)
 			$this->ppid = posix_getppid();//pid (parent)
 
@@ -209,13 +217,15 @@ 
 			$array_args = func_get_args();
 			if ( !empty( $array_args ) ) {
 				$results = call_user_func_array( $this->runnable, $array_args );
-			}else{
+			}
+			else {
 				$results = call_user_func( $this->runnable );
 			}
 
 			$pipe = "/tmp/pipe_".$this->pid;//pid is known by parent
 
-			if(!file_exists($pipe)) {//child talks to parent using this pipe
+			if(!file_exists($pipe)) {
+//child talks to parent using this pipe
 				umask(0);
 				posix_mkfifo($pipe, 0600);
 			}