/[alx-svn]/alx-src/branches/alx-web-070/show.php

Diff of /alx-src/branches/alx-web-070/show.php

Parent Directory | Revision Log | View Patch Patch

-revision 7125 by niro,
Mon Sep 14 07:23:07 2015 UTC
+revision 7140 by niro,
Tue Sep 15 08:33:39 2015 UTC
 Line 6 
 include('include/common-functions.php');
  // 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');
+ $tabs = array('cfg_graphic', 'cfg_network', 'cfg_input', 'client_auth', 'cfg_autostart', 'client_serials', 'cfg_comments', 'cfg_printers', 'cfg_sessions_citrix', 'cfg_sessions_storefront', 'cfg_modules', 'cfg_other_menuitems', 'cfg_screensaver', 'client_version');
- $multi= array(	0,		 0,		0,		0,		1,		0,		1,		1,		1,		1,		1,		0,	0);
+ $multi= array(	0,		 0,		0,		0,		1,		0,		1,		1,		1,		1,		1,		1,		0,	0);
  $data = array();
  // get alx version info for
 Line 61 
 $drop['monitorid'] = 'ignore';
  $drop['refresh_rate'] = sqlarr('SELECT value FROM values_graphic_refresh_rate where enabled=1', '', 'value');
  $drop['hostname'] = 'bold';
  $drop['session'] = 'bold';
- $drop['cfg_autostart_session'] = sqlarr('SELECT filename FROM cfg_sessions where serial='.$id, '', 'filename');
+ $drop['cfg_autostart_session'] = sqlarr('SELECT filename FROM cfg_sessions_citrix where serial='.$id, '', 'filename');
  array_unshift($drop['cfg_autostart_session'], "");
  $drop['mtime'] = 'showtime';
  $drop['mac'] = 'show';
 Line 80 
 $drop['client_version_os'] = 'show';
  $drop['client_version_utils'] = 'show';
  $drop['hwdetected'] = 'ignore';
- // ACHTUNG!!! wlan_-Felder heißen eigentlich wireless_
+ // ACHTUNG!!! wlan_-Felder heiÃŸen eigentlich wireless_
  $drop['wireless_mode'] = array('', 'managed', 'ad-hoc', 'master', 'repeater', 'secondary', 'monitor', 'auto');
  $drop['wireless_auth_mode'] = array('', 'wep', 'wpa', 'wpa2', 'off');
  $drop['wireless_key_length'] = array('', '64', '128', '256');
 Line 90 
 $drop['wireless_frequency'] = array('',
  $drop['wireless_key'] = 'password';
  $drop['wireless_key_ascii'] = 'password';
- // get current citrix sessions
+ // get current citrix apps
- // split all citrix server into an array to get the first server from list
+ $citrix_apps = sqlarr('SELECT session FROM values_citrix_session where enabled=1', '', 'session');
- $citrix_query_browser = split(";", $citrix_browseradrs);
+ // add an empty value add the first position of the array as session-default
- exec($wwwroot.'/pnabrowse-wrapper -A '.$citrix_query_browser[0], $returned_citrix_sessions, $retval);
+ array_unshift($citrix_apps, "");
- if ($retval == 0)
+ // hackish, fix me
- {
+ for ($i=0; $i<999; $i++) { $drop['cfg_sessions_citrix_'.$i.'_session'] = $citrix_apps; }
- 	$citrix_public_applications = str_replace("'", "", $returned_citrix_sessions);
- 	// add an empty value add the first position of the array as session-default
+ // get current storefront apps
- 	array_unshift($citrix_public_applications, "");
+ $storefront_apps = sqlarr('SELECT session FROM values_storefront_session where enabled=1', '', 'session');
- 	for ($i=0; $i<999; $i++) { $drop['cfg_sessions_'.$i.'_session'] = $citrix_public_applications; }
+ // add an empty value add the first position of the array as session-default
- }
+ array_unshift($storefront_apps, "");
+ // hackish, fix me
+ for ($i=0; $i<999; $i++) { $drop['cfg_sessions_storefront_'.$i.'_session'] = $storefront_apps; }
- // GGF. NEUEN DATENSATZ EINFÜGEN
+ // GGF. NEUEN DATENSATZ EINFÃœGEN
  if(isset($_POST['do_add']))
  {
  	list($bla,$what) = explode(' ',$_POST['do_add']);
  	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'=>$citrix_domain_name, 'browseradrs'=>$citrix_browseradrs, 'serial'=>$id));
+ 	else if($what=='SESSION-CITRIX')	sqladd('cfg_sessions_citrix', array('domain'=>$citrix_domain_name, 'browseradrs'=>$citrix_browseradrs, 'serial'=>$id));
+ 	else if($what=='SESSION-STOREFRONT')	sqladd('cfg_sessions_storefront', array('domain'=>$storefront_domain_name, 'store'=>$storefront_store, 'serial'=>$id));
  	else if($what=='MENUITEM')	sqladd('cfg_other_menuitems', array('serial'=>$id));
+ 	else if($what=='AUTOSTART')	sqladd('cfg_autostart', array('serial'=>$id));
  }
-Line 165 
 function openabs($heading, $helpfile='')
+Line 169 
 function openabs($heading, $helpfile='')
  {
  	global $absnames;
  	$absnames[] = $heading;
  	// <AufZuLink> <Bild/> <Heading/> </AufZuLink><BR/> <Absatz>
  	if( $_SESSION['openclose'][$heading] )
  	{
  		echo '<a href="JavaScript:openclose(\''.$heading.'\',1);"><img border="0" src="pics/minus.gif" title="CLOSE" id="sch_bild_'.$heading.'"> <b>['.$heading.']</b></a>';
  		if($helpfile!='')	echo ' <a href="JavaScript:showhelp(\''.$helpfile.'\')" title="HELP">[?]</a>';
  		echo '<br><div id="sch_absatz_'.$heading.'" style="top:0px; visibility:visible">';
  	}
  	else
  	{
-Line 185 
 function openabs($heading, $helpfile='')
+Line 189 
 function openabs($heading, $helpfile='')
  function closeabs()
  {
  	// </Absatz> <BR/>
  	echo '</div><br>';
  }
+ // ANZEIGEN
- // ANZEIGEN
  function parsearr($name, $arr, $del=false, $wireless=false)
  {
-Line 205 
 function parsearr($name, $arr, $del=fals
+Line 207 
 function parsearr($name, $arr, $del=fals
  	foreach($arr as $k=>$v)
  	{
  		if( (substr($k,0,9)=='wireless_') xor $wireless )	Continue;
  		$d = $drop[$name.'_'.$k]; if($d==null) $d = $drop[$k];
  		$k = str_replace('wireless_', '', $k);
  		$k2 = $k;
-Line 266 
 function parsearrs($name, $arr)
+Line 268 
 function parsearrs($name, $arr)
  /* ignore this atm, not always working, sometime open does not work
  	function openclose(nummer, act)
  	{
  		var bild = document.images['sch_bild_'+nummer];
  		var absatz = document.all['sch_absatz_'+nummer].style;
  		var senden = false;
-Line 278 
 function parsearrs($name, $arr)
+Line 280 
 function parsearrs($name, $arr)
  	}
  */
  	function openclose(nummer, act)
  	{
  		var bild = document.images['sch_bild_'+nummer];
  		var absatz = document.all['sch_absatz_'+nummer].style;
  		var senden = false;
  		if(bild.title == 'OPEN')
  		{
  			if(act<=1)
-Line 307 
 function parsearrs($name, $arr)
+Line 309 
 function parsearrs($name, $arr)
  				act = 2;
  			}
  		}
  		if(senden)	sendopenclose(nummer,act);
  	}
-Line 370 
 echo '</td><td valign=top>';
+Line 371 
 echo '</td><td valign=top>';
  	echo '<input class="but" type=submit value="SAVE" style="width:150px"><br><br>';
- 	echo '<input class="but" type=submit name="do_add" value="SAVE+ADD COMMENT" style="width:150px"><br>';
+ 	echo '<input class="but" type=submit name="do_add" value="ADD COMMENT" style="width:150px"><br>';
- 	echo '<input class="but" type=submit name="do_add" value="SAVE+ADD PRINTER" style="width:150px"><br>';
+ 	echo '<input class="but" type=submit name="do_add" value="ADD PRINTER" style="width:150px"><br>';
- 	echo '<input class="but" type=submit name="do_add" value="SAVE+ADD SESSION" style="width:150px"><br>';
+ 	echo '<input class="but" type=submit name="do_add" value="ADD SESSION-CITRIX" style="width:150px"><br>';
- 	echo '<input class="but" type=submit name="do_add" value="SAVE+ADD MODULE" style="width:150px"><br>';
+ 	echo '<input class="but" type=submit name="do_add" value="ADD SESSION-STOREFRONT" style="width:150px"><br>';
- 	echo '<input class="but" type=submit name="do_add" value="SAVE+ADD MENUITEM" style="width:150px"><br>';
+ 	echo '<input class="but" type=submit name="do_add" value="ADD MODULE" style="width:150px"><br>';
- 	echo '<input class="but" type=submit name="do_add" value="SAVE+ADD AUTOSTART" style="width:150px"><br>';
+ 	echo '<input class="but" type=submit name="do_add" value="ADD MENUITEM" style="width:150px"><br>';
+ 	echo '<input class="but" type=submit name="do_add" value="ADD AUTOSTART" style="width:150px"><br>';
  	echo '<br>';
  	if($id>0) $KILLCAP='DEACTIVATE'; else $KILLCAP='ACTIVATE';

 Legend:



Removed from v.7125
 


changed lines


 
Added in v.7140
 Legend:



Removed from v.7125
 


changed lines


 
Added in v.7140
-Removed from v.7125
+Added in v.7140