--- alx-src/branches/alx-web-060/show.php 2013/05/28 13:56:36 4898
+++ alx-src/branches/alx-web-070/show.php 2015/09/11 15:16:23 7120
@@ -7,10 +7,9 @@
include('include/current-problems.php');
$tabs = array('cfg_graphic', 'cfg_network', 'cfg_input', 'client_auth', 'cfg_autostart', 'client_serials', 'cfg_comments', 'cfg_printers', 'cfg_sessions', 'cfg_modules', 'cfg_other_menuitems', 'cfg_screensaver', 'client_version', 'cfg_plugins');
-$multi= array( 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1);
+$multi= array( 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1);
$data = array();
-
// get alx version info for
$alxinfo = sqlfirst('SELECT * FROM client_version WHERE serial='.$id);
$alxos = $alxinfo[os];
@@ -35,106 +34,51 @@
// FELD-DEFINITIONEN (ARRAY=>DROPDOWN / HIDDEN / IGNORE / 1 / BOLD / PASSWORD / SHOW / SHOWTIME / MONITORID)
$drop = array();
-if($alxos >= '0.6.0')
+$drop['cfg_graphic_module'] = sqlarr('SELECT value FROM values_graphic_module where enabled=1', '', 'value');
+if($gfxinfo[module] == 'intel')
{
- if($alxos >= '0.6.2')
- {
- $drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i710', 'intel', 'nv', 'nouveau', 'mach64', 'mga', 'unichrome', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng', 'vmware');
- }
- else
- {
- $drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i710', 'intel', 'nv', 'mach64', 'mga', 'openchrome', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng', 'vmware');
- }
- if($gfxinfo[module] == 'intel')
- {
- $drop['cfg_graphic_hdmi'] = array('disable', 'enable');
- }
- else
- {
- $drop['cfg_graphic_hdmi'] = 'ignore';
- }
-}
-else if($alxos >= '0.5.3')
-{
- $drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i710', 'intel', 'nv', 'mach64', 'mga', 'openchrome', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng');
- $drop['cfg_graphic_hdmi'] = 'ignore';
+ $drop['cfg_graphic_hdmi'] = array('disable', 'enable');
}
else
{
- $drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i810', 'i710', 'nv', 'mga', 'r128', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng', 'via');
$drop['cfg_graphic_hdmi'] = 'ignore';
}
-$drop['resolution'] = array('640x480', '800x600', '1024x768', '1280x960', '1280x1024', '1360x768', '1366x768', '1400x1050', '1440x900', '1600x1200', '1680x1050', '1280x720', '1920x1080');
-$drop['depth'] = array('24', '16', '8');
-$drop['mouse'] = array('Auto', 'IMPS/2', 'PS/2');
-$drop['keyboard'] = array('PC105');
-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
-{
- $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['resolution'] = sqlarr('SELECT value FROM values_graphic_resolution where enabled=1', '', 'value');
+$drop['depth'] = sqlarr('SELECT value FROM values_graphic_depth where enabled=1', '', 'value');
+//$drop['mouse'] = array('Auto', 'IMPS/2', 'PS/2');
+//$drop['keyboard'] = array('PC105');
+$drop['keymap'] = sqlarr('SELECT value FROM values_input_keymap where enabled=1', '', 'value');
+$drop['cfg_network_module'] = sqlarr('SELECT value FROM values_network_module where enabled=1', '', 'value');
$drop['networking'] = array('dhcp', 'static');
-// 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['port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2', 'lpd', 'socket', 'ipp');
-}
-$drop['location'] = sqlarr('SELECT location FROM client_locations', '', 'location');
+$drop['port'] = sqlarr('SELECT value FROM values_printers_port where enabled=1', '', 'value');
+//for ($i=0; $i<999; $i++) { $drop['cfg_printers_'.$i.'_ip'] = 'ignore'; }
+$drop['share'] = 'ignore';
+$drop['location'] = sqlarr('SELECT location FROM client_locations where enabled=1', '', 'location');
$drop['id'] = 'hidden';
$drop['flg_modified'] = '1';
$drop['serial'] = 'ignore';
-if($alxos>='0.5.3')
-{
- $drop['monitorid'] = 'ignore';
- $drop['refresh_rate'] = array('','60','75','85','100');
-}
-else
-{
- $drop['monitorid'] = 'monitorid';
- $drop['refresh_rate'] = 'ignore';
-}
+$drop['monitorid'] = 'ignore';
+$drop['refresh_rate'] = sqlarr('SELECT value FROM values_graphic_refresh_rate where enabled=1', '', 'value');
$drop['hostname'] = 'bold';
$drop['session'] = 'bold';
-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['cfg_autostart_session'] = sqlarr('SELECT filename FROM cfg_sessions where serial='.$id, '', 'filename');
+array_unshift($drop['cfg_autostart_session'], "");
$drop['mtime'] = 'showtime';
$drop['mac'] = 'show';
$drop['client_serials_serial'] = 'show';
-$drop['password'] = 'password';
-$drop['shell'] = 'password';
+//$drop['password'] = 'password';
+//$drop['shell'] = 'password';
+$drop['client_auth_user'] = 'password';
+$drop['root'] = 'password';
$drop['vnc'] = 'password';
$drop['samba'] = 'password';
$drop['station'] = 'password';
$drop['txt'] = 'txt';
-$drop['screensaver'] = array('','blank', 'random', 'ant', 'ant3d', 'apollonian', 'ball', 'bat', 'blot', 'bomb', 'bouboule',
- 'bounce', 'braid', 'bubble', 'bug', 'clock', 'coral', 'crystal', 'daisy', 'dclock', 'decay', 'deco',
- 'demon', 'dilemma', 'discrete', 'dragon', 'drift', 'euler2d', 'eyes', 'fadeplot', 'fiberlamp', 'flag',
- 'flame', 'flow', 'forest', 'galaxy', 'goop', 'grav', 'helix', 'hop', 'hyper', 'ico', 'ifs', 'image',
- 'juggle', 'julia', 'kaleid', 'kumppa', 'laser', 'life', 'life1d', 'life3d', 'lightning', 'lisa', 'lissie',
- 'loop', 'lyapunov', 'mandelbrot', 'marquee', 'matrix', 'maze', 'mountain', 'munch', 'nose', 'pacman',
- 'penrose', 'petal', 'petri', 'polyominoes', 'puzzle', 'pyro', 'qix', 'roll', 'rotor', 'scooter', 'shape',
- 'sierpinski', 'slip', 'solitare', 'space', 'sphere', 'spiral', 'spline', 'star', 'starfish', 'strange',
- 'swarm', 'swirl', 't3d', 'tetris', 'thornbird', 'tik_tak', 'toneclock', 'triangle', 'tube', 'turtle',
- 'vines', 'voters', 'wator', 'wire', 'world', 'worm', 'xcl', 'xjack');
-$drop['iface'] = array('eth0', 'wlan0');
+$drop['screensaver'] = sqlarr('SELECT value FROM values_screensaver_screensaver where enabled=1', '', 'value');
+//$drop['iface'] = array('eth0', 'wlan0');
$drop['client_version_os'] = 'show';
$drop['client_version_utils'] = 'show';
+$drop['hwdetected'] = 'ignore';
// ACHTUNG!!! wlan_-Felder heißen eigentlich wireless_
$drop['wireless_mode'] = array('', 'managed', 'ad-hoc', 'master', 'repeater', 'secondary', 'monitor', 'auto');
@@ -147,40 +91,23 @@
$drop['wireless_key_ascii'] = 'password';
// plugin support
-if($alxos>='0.6.0')
-{
- for ($i=0; $i<999; $i++) { $drop['cfg_plugins_'.$i.'_plugin'] = 'pluginconfig'; }
- for ($i=0; $i<999; $i++)
- {
- $drop['cfg_plugins_'.$i.'_plugin_array'] = sqlarr('SELECT plugin FROM avail_plugins', '', 'plugin');
- array_unshift($drop['cfg_plugins_'.$i.'_plugin_array'], "");
- }
-}
-else
+for ($i=0; $i<999; $i++) { $drop['cfg_plugins_'.$i.'_plugin'] = 'pluginconfig'; }
+for ($i=0; $i<999; $i++)
{
- for ($i=0; $i<999; $i++) { $drop['cfg_plugins_'.$i.'_id'] = 'ignore'; }
- for ($i=0; $i<999; $i++) { $drop['cfg_plugins_'.$i.'_serial'] = 'ignore'; }
- for ($i=0; $i<999; $i++) { $drop['cfg_plugins_'.$i.'_plugin'] = 'ignore'; }
+ $drop['cfg_plugins_'.$i.'_plugin_array'] = sqlarr('SELECT plugin FROM avail_plugins', '', 'plugin');
+ array_unshift($drop['cfg_plugins_'.$i.'_plugin_array'], "");
}
// 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."'
";
- }
+// 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; }
}
// GGF. NEUEN DATENSATZ EINFÜGEN
@@ -292,44 +219,9 @@
$k = str_replace('wireless_', '', $k);
$k2 = $k;
- //replace some drivers on 0.5.3 or higher
- if($alxos >= '0.5.3')
- {
- if($v == 'i810')
- {
- echo '
Replaced "i810" with "intel" - Please press SAVE!
';
- $v='intel';
- }
- if($v == 'r128')
- {
- echo '
Replaced "r128" with "vesa" - Please press SAVE!
';
- $v='vesa';
- }
-
- if($v == 'via')
- {
- echo '
Replaced "via" with "openchrome" - Please press SAVE!
';
- $v='openchrome';
- }
- }
- if($alxos >= '0.6.2')
- {
- if($v == 'via')
- {
- echo '
Replaced "via" with "unichrome" - Please press SAVE!
';
- $v='unichrome';
- }
- if($v == 'openchrome')
- {
- echo '
Replaced "openchrome" with "unichrome" - Please press SAVE!
';
- $v='unichrome';
- }
- }
-
# tell something about vesa
if ($v == 'vesa') echo '
Warning: "vesa" graphic module doesn\'t support any resolutions higher than 1024x786x16@60hz!
';
-
if(is_array($d))
{
echo '