X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;ds=inline;f=powersensordaemon%2Fswitch.cgi;h=19d863e27efab655de9e7ac09c2de611e580b5f3;hb=2a360666361df1c128796f02f2d86a25b6de9fcb;hp=4d99acf60a0c64de6e3e76d6420ad5d007b6077d;hpb=6f3b01fdac2a59b582a73ff289e726366e97bb5f;p=svn42.git diff --git a/powersensordaemon/switch.cgi b/powersensordaemon/switch.cgi index 4d99acf..19d863e 100755 --- a/powersensordaemon/switch.cgi +++ b/powersensordaemon/switch.cgi @@ -12,26 +12,25 @@ 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="ymhpoweron ymhpoweroff ymhpower ymhvolup ymhvoldown ymhcd ymhwdtv ymhtuner ymhaux ymhsattv ymhvolmute ymhmenu ymhplus ymhminus ymhtest ymhtimelevel ymheffect ymhprgup ymhprgdown ymhtunplus ymhtunminus ymhtunabcde ymhtape ymhvcr ymhextdec ymhsleep ymhp5 panicled blueled moviemode" -VALID_BANSHEE_IDS="playPause next prev" -VALID_CAM_MOTOR_IDS="c C w W" +VALID_SEND_IDS_CUSTOM_DISPLAY="ymhpoweroff ymhpower ymhvolup ymhvoldown" +VALID_SEND_IDS="ymhpoweron ymhcd ymhwdtv ymhtuner ymhaux ymhsattv ymhvolmute ymhmenu ymhplus ymhminus ymhtest ymhtimelevel ymheffect ymhprgup ymhprgdown ymhtunplus ymhtunminus ymhtunabcde ymhtape ymhvcr ymhextdec ymhsleep ymhp5 panicled blueled moviemode" +#VALID_BANSHEE_IDS="playPause next prev" +#VALID_CAM_MOTOR_IDS="c C w W" [ "$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" @@ -91,13 +90,13 @@ DESC_whiteboard="Whiteboard Vorne" DESC_decke="Deckenlichter" DESC_lichter="Alle Lichter" DESC_all="Alles" -DESC_ymhpoweron="Receiver On" +DESC_ymhpoweron="Receiver On (off+tgl)" DESC_ymhpoweroff="Receiver Off" DESC_ymhpower="Receiver On/Off" DESC_ymhvolup="VolumeUp" DESC_ymhvoldown="VolumeDown" DESC_ymhcd="Input CD" -DESC_ymhwdtv="Input WDlxTV" +DESC_ymhwdtv="Input S/PDIF Wuerfel" DESC_ymhtuner="Input Tuner" DESC_ymhvolmute="Mute" DESC_ymhmenu="Menu" @@ -138,94 +137,158 @@ 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 "