--- alx-src/branches/alx-web-060/show.php 2011/06/30 11:30:32 2496
+++ alx-src/branches/alx-web-060/show.php 2011/07/11 08:39:05 2640
@@ -44,13 +44,26 @@
$drop['depth'] = array('24', '16', '8');
$drop['mouse'] = array('Auto', 'IMPS/2', 'PS/2');
$drop['keyboard'] = array('PC105');
-if($alxos >= '0.6.0') {
+if($alxos >= '0.6.0')
+{
$drop['cfg_network_module'] = array('3c509', '3c59x', '8139cp', '8139too', '8390', 'amd8111e', 'atl1c', 'atl1e', 'atl1', 'atl2', 'b44', 'bnx2', 'cnic', 'e100', 'e1000', 'e1000e', 'forcedeth', 'igb', 'ipg', 'jme', 'natsemi', 'ne2k-pci', 'ns83820', 'pcnet32', 'qla3xxx', 'r8169', 'sis190', 'sis900', 'skge', 'sky2', 'tg3', 'typhoon', 'via-rhine', 'via-velocity', 'adm8211', 'airo', 'at76c50x-usb', 'ar9170usb', 'ath5k', 'ath9k', 'atmel', 'b43', 'b43legacy', 'hostap_pci', 'hostap_plx', 'ipw2100', 'ipw2200', 'iwl3945', 'usb8xxx', 'libertas_tf', 'libertas_tf_usb', 'mwl8k', 'orinoco', 'orinoco_nortel', 'orinoco_plx', 'orinoco_tmd', 'orinoco_usb', 'p54pci', 'p54usb', 'prism54', 'rndis_wlan', 'rt2400pci', 'rt2500pci', 'rt2500usb', 'rt2800pci', 'rt2800usb', 'rt61pci', 'rt73usb', 'rtl8180', 'rtl8187', 'wl1251', 'wl1271', 'zd1201', 'zd1211rw');
-} else {
+}
+else
+{
$drop['cfg_network_module'] = array('3c59x', '8139too', '8139cp', 'e100', 'ne2k-pci', 'pcnet32', 'sis900', 'via-rhine', 'zd1211', 'b44', 'bnx2', 'dl2k', 'e1000', 'forcedeth', 'r8169', 'sk98lin', 'tg3', 'via-velocity');
}
$drop['networking'] = array('dhcp', 'static');
-$drop['port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2', 'lpd', 'socket', 'ipp');
+// 0.6.0 does not support lpd, ipp and socket printing atm
+if($alxos>='0.6.0')
+{
+ $drop['port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2');
+ for ($i=0; $i<999; $i++) { $drop['cfg_printers_'.$i.'_ip'] = 'ignore'; }
+ $drop['share'] = 'ignore';
+}
+else
+{
+ $drop['cfg_printers_port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2', 'lpd', 'socket', 'ipp');
+}
$drop['location'] = sqlarr('SELECT location FROM client_locations', '', 'location');
$drop['id'] = 'hidden';
$drop['flg_modified'] = '1';
@@ -67,7 +80,15 @@
}
$drop['hostname'] = 'bold';
$drop['session'] = 'bold';
-$drop['cfg_autostart_session'] = 'filename';
+if($alxos>='0.6.0')
+{
+ $drop['cfg_autostart_session'] = sqlarr('SELECT filename FROM cfg_sessions where serial='.$id, '', 'filename');
+ array_unshift($drop['cfg_autostart_session'], "");
+}
+else
+{
+ $drop['cfg_autostart_session'] = 'filename';
+}
$drop['mtime'] = 'showtime';
$drop['mac'] = 'show';
$drop['client_serials_serial'] = 'show';
@@ -101,6 +122,23 @@
$drop['wireless_key'] = 'password';
$drop['wireless_key_ascii'] = 'password';
+// get current citrix sessions
+if($alxos>='0.6.0')
+{
+ // split all citrix server into an array to get the first server from list
+ $citrix_query_browser = split(";", $citrix_browseradrs);
+ exec($wwwroot.'/pnabrowse-wrapper -A '.$citrix_query_browser[0], $returned_citrix_sessions, $retval);
+ if ($retval == 0)
+ {
+ $citrix_public_applications = str_replace("'", "", $returned_citrix_sessions);
+ // add an empty value add the first position of the array as session-default
+ array_unshift($citrix_public_applications, "");
+ for ($i=0; $i<999; $i++) { $drop['cfg_sessions_'.$i.'_session'] = $citrix_public_applications; }
+ }
+ else if($retval = 126) echo "pnabrowser-wrapper has no execute permission! please run chmod +x on ".$wwwroot."/pnabrowser-wrapper.";
+ else echo "pnabrowse-wrapper does not run successfully! retval->'".$retval."'
";
+}
+
// GGF. NEUEN DATENSATZ EINFÜGEN
if(isset($_POST['do_add']))
{
@@ -108,7 +146,7 @@
if($what=='COMMENT') sqladd('cfg_comments', array('serial'=>$id));
else if($what=='PRINTER') sqladd('cfg_printers', array('serial'=>$id));
else if($what=='MODULE') sqladd('cfg_modules', array('serial'=>$id));
- else if($what=='SESSION') sqladd('cfg_sessions', array('domain'=>'DOM_AKA_NT', 'browseradrs'=>'128.20.50.50;128.20.50.66;128.20.50.71;128.20.50.46;128.20.100.31;128.20.100.32', 'serial'=>$id));
+ else if($what=='SESSION') sqladd('cfg_sessions', array('domain'=>$citrix_domain_name, 'browseradrs'=>$citrix_browseradrs, 'serial'=>$id));
else if($what=='MENUITEM') sqladd('cfg_other_menuitems', array('serial'=>$id));
}
@@ -145,8 +183,10 @@
}
}
}
-}
+ // reload site
+ header("location: show.php?id=".$id);
+}
// EINLESEN DER DATEN AUS SQL-TABELLEN
foreach($tabs as $k=>$t)
@@ -272,15 +312,35 @@
.keytab, input, textarea, select, option { font-size:8pt; font-family:Tahoma }
.but { font-size:10pt; font-family:Tahoma; height:23px }
+