--- alx-src/branches/alx-web-060/include/common-functions.php	2011/05/09 21:58:32	2021
+++ alx-src/branches/alx-web-060/include/common-functions.php	2011/05/09 22:13:37	2022
@@ -1,8 +1,9 @@
 <?
 	include("config.inc.php");
 
-	function exec_on_client($serial, $ip, $cmd, $verbose=0)
+	function exec_on_client($serial, $ip, $cmd, $failure=1, $verbose=0)
 	{
+		global $pingcmd;
 		global $sshcmd;
 
 		$pubkey = mysql_query('select public_key from ssh_auth_clients where serial='.$serial.'');
@@ -13,24 +14,31 @@
 			fwrite($hostfile,$ip." ".$row[0],strlen($row[0])+strlen($ip)+1);
 			fclose($hostfile);
 
-			# exec the cmd
-			echo "sshcmd: '".$sshcmd."'<br>";
-
-			exec($sshcmd.' '.$ip.' "source /etc/profile;'.$cmd.'"', $outarr, $err);
-			if ($verbose == 1)
+			# check if the client is online
+			passthru($pingcmd.' '.$ip.' &> /dev/null && exit 0 || exit 1', $retval);
+			if ($retval == 0)
 			{
-				echo "err: '".$err."'<br>";
-				foreach( $outarr as $i )
+				if ($verbose == 1) echo "sshcmd: '".$sshcmd."'<br>";
+
+				# exec the cmd
+				exec($sshcmd.' '.$ip.' "source /etc/profile;'.$cmd.'"', $cmdout, $err);
+				if ($verbose == 1)
 				{
-					echo "outarr: '".$i."'<br>";
+					echo "err: '".$err."'<br>";
+					foreach( $cmdout as $i )
+					{
+						echo "cmdout: '".$i."'<br>";
+					}
 				}
-			}
 
-			if($err != 0) echo '<script language="JavaScript">alert(\'Cmd "'.$cmd.'" *failed* on client #'.$serial.' .\')</script>';
-			else if ($verbose == 1) echo '<script language="JavaScript">alert(\'Cmd "'.$cmd.'" successfully run on client #'.$serial.' .\')</script>';
-
-			return $outarr;
+				if($err != 0) if ($failure == 1) echo '<script language="JavaScript">alert(\'Cmd "'.$cmd.'" *failed* on client #'.$serial.' .\')</script>';
+				else if ($verbose == 1) echo '<script language="JavaScript">alert(\'Cmd "'.$cmd.'" successfully run on client #'.$serial.' .\')</script>';
+			}
+			else if ($failure == 1) echo '<script language="JavaScript">alert(\'Client #'.$serial.' with IP "'.$ip.'" is offline. Please try again later...\')</script>';
 		}
+
+		# return the output of $cmd
+		return $cmdout;
 	}
 
 ?>