--- alx-src/branches/alx-web-070/index.php	2016/02/08 10:02:20	8526
+++ alx-src/branches/alx-web-070/index.php	2017/08/30 14:57:46	10658
@@ -5,9 +5,12 @@
 
 session_start();
 //session_register('alx_sort_krit'); session_register('alx_sort_onfirst'); session_register('alx_sort_loc');
-$_SESSION['alx_sort_krit'] = $alx_sort_krit;
-$_SESSION['alx_sort_onfirst'] = $alx_sort_onfirst;
-$_SESSION['alx_sort_loc'] = $alx_sort_loc;
+if(isset($_SESSION['alx_sort_krit'])) $alx_sort_krit = $_SESSION['alx_sort_krit'];
+if(isset($_SESSION['alx_sort_onfirst'])) $alx_sort_onfirst = $_SESSION['alx_sort_onfirst'];
+if(isset($_SESSION['alx_sort_loc'])) $alx_sort_loc = $_SESSION['alx_sort_loc'];
+
+// fix reload php debug message
+if(!isset($reload)) $reload = 'not set';
 
 $locations = sqlarr('SELECT location FROM client_locations where enabled="1"', '', 'location');
 $locations[] = '';
@@ -53,8 +56,8 @@
 
 	if($_SESSION['alx_sort_onfirst'])
 	{
-		if($a['online'] && !$b['online']) return -1;
-		if($b['online'] && !$a['online']) return 1;
+		if(isset($a['online']) && !isset($b['online'])) return -1;
+		if(isset($b['online']) && !isset($a['online'])) return 1;
 	}
 	if($_SESSION['alx_sort_krit']=='hostname')
 	{
@@ -70,7 +73,7 @@
 	else return '';
 }
 
-$comps = sqlarr("select client_serials.serial, client_serials.enabled, client_serials.location, client_serials.mac, cfg_network.hostname, state_connected.mtime, state_connected.netboot from client_serials left join cfg_network on client_serials.serial=cfg_network.serial left join state_connected on client_serials.serial=state_connected.serial", "serial");
+$comps = sqlarr("select client_serials.serial, client_serials.enabled, client_serials.location, client_serials.mac, cfg_network.hostname, state_connected.mtime, state_connected.netboot, client_version.arch from client_serials left join cfg_network on client_serials.serial=cfg_network.serial left join state_connected on client_serials.serial=state_connected.serial left join client_version on client_serials.serial=client_version.serial", "serial");
 
 sqlforeach('SELECT state_connected.serial, state_connected.ip, cfg_network.hostname, state_connected.mac FROM state_connected left join cfg_network on cfg_network.serial=state_connected.serial', 'check_online', null);
 usort($comps, 'sortcomp');
@@ -90,7 +93,9 @@
 
 echo '<form action="index.php" method="get" style="margin:0px">';
 echo '<table width=480><tr>';
-echo '<td><img src="pics/logo.jpg"></td>';
+// print version info
+$version = file_get_contents('./VERSION', FILE_USE_INCLUDE_PATH);
+echo '<td><img src="pics/logo.jpg"><font size="1">v'.$version.'</font></td>';
 echo '<td align=right valign=top><a href="index.php" style="color:#000000;text-decoration:none; font-weight:bold">[REFRESH]</a></td>';
 echo '</tr><tr>';
 echo '<td valign=top><b>SORT BY</b> <input onclick="this.form.submit()" type="radio" name="s_krit" value="serial"'.checkif($_SESSION['alx_sort_krit']=='serial').'>serial <input onclick="this.form.submit()" type="radio" name="s_krit" value="hostname"'.checkif($_SESSION['alx_sort_krit']=='hostname').'>hostname<br>';
@@ -109,9 +114,8 @@
 
 echo '<table border="1" id="mytab">';
 echo '<thead><tr style="font-weight:bold;background-color:#d5e5ff"><th>edit</th><th colspan=3>serial</th><th width=170>hostname</th><th width=100>ip</th><th width=100>mac</th><th width=100>last connected</th>';
-//always enable showversion atm
-$showversion = "on";
-if($showversion=='on') echo '<th colspan=2>version</th>';
+echo '<th colspan=2>version</th>';
+echo '<th width=100>arch</th>';
 echo '<th width=100>boot</th>';
 echo '<th width=150>up/down</th></tr></thead><tbody>';
 
@@ -120,7 +124,7 @@
 	if(!$_SESSION['alx_sort_loc'][$c['location']]) Continue;
 	if($c['enabled']==0 && !$_SESSION['alx_sort_loc']['DEAD']) Continue;
 
-	if($c['online']) $pic='online';
+	if(isset($c['online'])) $pic='online';
 	else $pic='offline';
 
 	if($c['enabled']==0)
@@ -141,26 +145,26 @@
 	if($c['mtime']) { echo '<td><nobr>'.date('Y-m-d, H:i:s',$c['mtime']).'</nobr></td>'; }
 	else echo '<td></td>';
 
-	if($showversion=='on')
-	{
-		// get alx version info for
-		$alxinfo = sqlfirst('SELECT * FROM client_version WHERE serial='.$c['serial']);
-		$alxver = $alxinfo[os];
-		$alxutils = $alxinfo[utils];
+	// get alx version info for
+	$alxinfo = sqlfirst('SELECT * FROM client_version WHERE serial='.$c['serial']);
+	if (isset($alxinfo[os])) $alxver = $alxinfo[os];
+	else $alxver = 'unknown';
+	if (isset($alxinfo[utils])) $alxutils = $alxinfo[utils];
+	else $alxutils = 'unknown';
 
-		if($alxver == '') $alxver='unknown';
-		if($alxutils == '') $alxutils='unknown';
+	echo '<td>'.$alxver.'</td>';
+	echo '<td>'.$alxutils.'</td>';
 
-		echo '<td>'.$alxver.'</td>';
-		echo '<td>'.$alxutils.'</td>';
-	}
+	// arch
+	if($c['arch'] == 1) echo '<td>'.$c['arch'].'</td>';
+	else echo '<td></td>';
 
-	//netboot state
+	// netboot state
 	if($c['netboot'] == 1) echo '<td>Netboot (PXE)</td>';
 	else echo '<td>Local Disk</td>';
 
 	echo '<td>';
-	if($c['online'])
+	if(isset($c['online']))
 	{
 		echo '<input type=button style="width:24%" value="RB" onclick="if(confirm(\'REBOOT CLIENT #'.$c['serial'].' ?\')) window.open(\'reboot.php?client='.$c['serial'].'&ip='.$c['ip'].'&op=reboot\', \'ShutdownWin\', \'width=200,height=100\')">';
 		echo '<input type=button style="width:24%" value="SD" onclick="if(confirm(\'SHUTDOWN CLIENT #'.$c['serial'].' ?\')) window.open(\'reboot.php?client='.$c['serial'].'&ip='.$c['ip'].'&op=halt\', \'ShutdownWin\', \'width=200,height=100\')">';