--- alx-src/branches/alx-web-060/show.php 2011/07/07 19:49:18 2636
+++ alx-src/branches/alx-web-060/show.php 2011/07/12 15:03:34 2704
@@ -6,8 +6,8 @@
// INCLUDE CURRENT-PROBLEMS
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');
-$multi= array( 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0);
+$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);
$data = array();
@@ -32,7 +32,11 @@
// FELD-DEFINITIONEN (ARRAY=>DROPDOWN / HIDDEN / IGNORE / 1 / BOLD / PASSWORD / SHOW / SHOWTIME / MONITORID)
$drop = array();
-if($alxos >= '0.5.3')
+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');
+}
+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');
}
@@ -82,8 +86,8 @@
$drop['session'] = 'bold';
if($alxos>='0.6.0')
{
- $drop['cfg_autostart_session'] = array('');
- $drop['cfg_autostart_session'] += sqlarr('SELECT filename FROM cfg_sessions where serial='.$id, 'array', 'filename');
+ $drop['cfg_autostart_session'] = sqlarr('SELECT filename FROM cfg_sessions where serial='.$id, '', 'filename');
+ array_unshift($drop['cfg_autostart_session'], "");
}
else
{
@@ -122,17 +126,39 @@
$drop['wireless_key'] = 'password';
$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.'_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'; }
+}
+
// get current citrix sessions
-// 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)
+if($alxos>='0.6.0')
{
- $citrix_public_applications = str_replace("'", "", $returned_citrix_sessions);
- for ($i=0; $i<999; $i++) { $drop['cfg_sessions_'.$i.'_session'] = $citrix_public_applications; }
+ // 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."'
";
}
-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']))
@@ -143,6 +169,7 @@
else if($what=='MODULE') sqladd('cfg_modules', array('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));
+ else if($what=='PLUGIN') sqladd('cfg_plugins', array('serial'=>$id));
}
@@ -284,6 +311,19 @@
else if($d=='password') echo '