--- alx-src/branches/alx-web-050/index.php	2010/12/02 19:56:40	1600
+++ alx-src/branches/alx-web-050/index.php	2010/12/02 22:13:04	1608
@@ -27,7 +27,7 @@
  	if(!isset($comps[$dat['serial']])) return false;
 
  	//passthru("/bin/ping -I eth0 -c 1 -W 1 -q ".$dat['ip']." &> /dev/null && exit 0 || exit 1",$retval);
-	passthru("/usr/sbin/fping -c 1 -t 50 -q ".$dat['ip']." &> /dev/null && exit 0 || exit 1",$retval);
+	passthru($pingcmd." ".$dat['ip']." &> /dev/null && exit 0 || exit 1",$retval);
  	if($retval==0)
  	{
  		$comps[$dat['serial']]['online'] = true;
@@ -136,8 +136,6 @@
 		{
 			$pubkey = mysql_query('select public_key from ssh_auth_clients where serial='.$c['serial'].'');
 			while ($row = mysql_fetch_row ($pubkey)) {
-				$sshcmd = "/usr/bin/ssh";
-				$home = "/var/www";
 
 				# schreiben der .ssh/known_hosts file mit dem public rsa key des client,
 				# um die "yes" abfrage zu vermeiden
@@ -145,7 +143,7 @@
 				fwrite($hostfile,$c['ip']." ".$row[0],strlen($row[0])+strlen($c['ip'])+1);
 				fclose($hostfile);
 
-				$osver = exec($sshcmd.' -l root '.$c['ip'].' \'os_ver=$(</etc/mageversion);cfg_ver=$(/sbin/magequery -n alxconfig-ng-alx|cut -d" " -f5);pname=${cfg_ver%-*-*};cfg_ver=${cfg_ver/${pname}-};echo "${os_ver}:${cfg_ver}"\'');
+				$osver = exec($sshcmd.' '.$c['ip'].' \'os_ver=$(</etc/mageversion);cfg_ver=$(/sbin/magequery -n alxconfig-ng-alx|cut -d" " -f5);pname=${cfg_ver%-*-*};cfg_ver=${cfg_ver/${pname}-};echo "${os_ver}:${cfg_ver}"\'');
 				$osver = explode(':',$osver);
 			}
 			if($osver[0] == '') $osver[0]='unkown';