--- alx-src/branches/alx-web-060/show.php 2011/07/12 15:10:27 2705
+++ alx-src/branches/alx-web-060/show.php 2013/05/28 13:55:52 4897
@@ -16,6 +16,9 @@
$alxos = $alxinfo[os];
$alxutils = $alxinfo[utils];
+// get gfxdriver
+$gfxinfo = sqlfirst('SELECT * FROM cfg_graphic WHERE serial='.$id);
+
if($kill==1)
{
foreach($tabs as $t) mysql_query('UPDATE '.$t.' SET serial=-serial WHERE serial='.$id);
@@ -34,15 +37,32 @@
$drop = array();
if($alxos >= '0.6.0')
{
- $drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i710', 'intel', 'nv', 'mach64', 'mga', 'openchrome', 'radeon', 's3', 's3virge', 'savage', 'sis', 'trident', 'tseng', 'vmware');
+ if($alxos >= '0.6.2')
+ {
+ $drop['cfg_graphic_module'] = array('vesa', 'ati', 'cirrus', 'i710', 'intel', 'nv', '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';
}
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');
@@ -66,7 +86,7 @@
}
else
{
- $drop['cfg_printers_port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2', 'lpd', 'socket', 'ipp');
+ $drop['port'] = array('lpt1', 'usb1', 'usb2', 'com1', 'com2', 'lpd', 'socket', 'ipp');
}
$drop['location'] = sqlarr('SELECT location FROM client_locations', '', 'location');
$drop['id'] = 'hidden';
@@ -156,8 +176,11 @@
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."'
";
+ 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
@@ -289,7 +312,20 @@
$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!
';
@@ -322,7 +358,7 @@
else if($d=='showtime') echo '