--- alx-src/branches/alx-web-070/show.php 2016/02/02 12:48:12 8472
+++ alx-src/branches/alx-web-070/show.php 2016/02/08 09:57:52 8523
@@ -82,12 +82,12 @@
$drop['hwdetected'] = 'ignore';
// 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');
-$drop['wireless_channel'] = array('', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14');
-$drop['wireless_frequency'] = array('', '2.412G', '2.417G', '2.422G', '2.427G', '2.432G', '2.437G', '2.442G',
- '2.447G', '2.452G', '2.457G', '2.462G', '2.467G', '2.472G', '2.484G');
+$drop['wireless_mode'] = sqlarr('SELECT value FROM values_network_wireless_mode where enabled=1', '', 'value');
+$drop['wireless_auth_mode'] = sqlarr('SELECT value FROM values_network_wireless_auth_mode where enabled=1', '', 'value');
+$drop['wireless_bitrate'] = sqlarr('SELECT value FROM values_network_wireless_bitrate where enabled=1', '', 'value');
+$drop['wireless_key_length'] = sqlarr('SELECT value FROM values_network_wireless_key_length where enabled=1', '', 'value');
+$drop['wireless_channel'] = sqlarr('SELECT value FROM values_network_wireless_channel where enabled=1', '', 'value');
+$drop['wireless_frequency'] = sqlarr('SELECT value FROM values_network_wireless_frequency where enabled=1', '', 'value');
$drop['wireless_key'] = 'password';
$drop['wireless_key_ascii'] = 'password';
@@ -221,7 +221,7 @@
$k2 = $k;
# tell something about vesa
- if ($v == 'vesa') echo '
Warning: "vesa" graphic module doesn\'t support any resolutions higher than 1024x786x16@60hz!
';
+// if ($v == 'vesa') echo '
Warning: "vesa" graphic module doesn\'t support any resolutions higher than 1024x786x16@60hz!
';
if(is_array($d))
{
@@ -274,19 +274,6 @@
$.ajax({type:""+typ+"",url:$url[0],data:$url[1],cache:false,success:function(data){ alert(data); }});
}
-/* 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;
-
- $("#sch_absatz_"+nummer).toggle(0, function(){
- if($(this).css("display")=="none"){$("#sch_bild_"+nummer).attr({title:'OPEN',src:'pics/plus.gif'});}else{$("#sch_bild_"+nummer).attr({title:'CLOSE',src:'pics/minus.gif'});}
- });
- if(act<=1){ $("#sch_bild_"+nummer).attr({title:'CLOSE',src:'pics/minus.gif'}); }else{ $("#sch_bild_"+nummer).attr({title:'OPEN',src:'pics/plus.gif'}); };
- }
-*/
function openclose(nummer, act)
{
var bild = document.images['sch_bild_'+nummer];
@@ -367,7 +354,6 @@
{
// first try mcore, then get ssh
$ping_retval = ping_host($conn['ip'],$mcore_port,$ping_timeout);
- if($ping_retval==1) $ping_retval = ping_host($dat['ip'],$ssh_port,$ping_timeout);
if($ping_retval==0)
{
$state = 'On';
@@ -427,31 +413,13 @@
echo '
';
echo '
';
echo '