X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;ds=sidebyside;f=powersensordaemon%2Fswitch.cgi;h=19d863e27efab655de9e7ac09c2de611e580b5f3;hb=7e8e5a5ba8dd7940ba01c14c218fd9dd36bb4774;hp=bd77e61089d827a0da9a1b026e9fc586b47e6dd6;hpb=2bfc092c0484a6f3c61c518205afd45b13d47743;p=svn42.git diff --git a/powersensordaemon/switch.cgi b/powersensordaemon/switch.cgi index bd77e61..19d863e 100755 --- a/powersensordaemon/switch.cgi +++ b/powersensordaemon/switch.cgi @@ -12,17 +12,15 @@ for QUERY in `echo $QUERY_STRING | tr '&' ' '`; do POWER=$VALUE elif [ "$VALUE" == "mobile" ]; then MOBILE='1' - elif [ "$POWER" == "?" ]; then - POWER=$VALUE - elif [ "$VALUE" == "ajax" ]; then - AJAX='?' - elif [ "$AJAX" == "?" ]; then - AJAX=$VALUE + NOFLOAT='1' + elif [ "$VALUE" == "nofloat" ]; then + NOFLOAT='1' fi i=$i+1 done done + UNIXSOCK=/var/run/powersensordaemon/cmd.sock VALID_ONOFF_IDS="decke ambientlights lichter all werkzeug labor dart logo spots1 deckehinten deckevorne boiler whiteboard pcblueleds bikewcblue" VALID_SEND_IDS_CUSTOM_DISPLAY="ymhpoweroff ymhpower ymhvolup ymhvoldown" @@ -30,10 +28,9 @@ VALID_SEND_IDS="ymhpoweron ymhcd ymhwdtv ymhtuner ymhaux ymhsattv ymhvolmute ymh #VALID_BANSHEE_IDS="playPause next prev" #VALID_CAM_MOTOR_IDS="c C w W" -[ "$POWER" == "Off" ] && POWER=off -[ "$POWER" != "off" ] && POWER=on +[ "$POWER" == "send" ] && POWER=on if [ "$POWER" == "on" -o "$POWER" == "off" ]; then - for CHECKID in $VALID_ONOFF_IDS $VALID_SEND_IDS; do + for CHECKID in $VALID_ONOFF_IDS $VALID_SEND_IDS $VALID_SEND_IDS_CUSTOM_DISPLAY; do if [ "$CHECKID" == "$ID" ]; then echo "power $POWER $ID" | usocket $UNIXSOCK echo "Content-type: text/html" @@ -140,7 +137,9 @@ echo ' //google chrome workaround' echo ' req.setRequestHeader("googlechromefix","");' echo ' req.send(null);' echo '}' +[ "$NOFLOAT" == "1" ] && tail -n+6 /www/ymhremote.html | head -n 58 echo '' +[ "$NOFLOAT" == "1" ] && tail -n+67 /www/ymhremote.html | head -n 37 echo '' echo "" echo "
" #echo "