X-Git-Url: https://git.realraum.at/?p=svn42.git;a=blobdiff_plain;f=powersensordaemon%2Fswitch.cgi;h=c10c5fabccd9ca3000a4ee7b659b9857e788cf15;hp=bd77e61089d827a0da9a1b026e9fc586b47e6dd6;hb=a34e51d757fe52cb19de2937ae1b211894167524;hpb=2bfc092c0484a6f3c61c518205afd45b13d47743 diff --git a/powersensordaemon/switch.cgi b/powersensordaemon/switch.cgi index bd77e61..c10c5fa 100755 --- a/powersensordaemon/switch.cgi +++ b/powersensordaemon/switch.cgi @@ -12,28 +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_ONOFF_IDS="regalleinwand labortisch bluebar couchred couchwhite all lichter ambientlights cxleds mashadecke boiler" 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" == "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" @@ -76,21 +73,15 @@ if [ "$POWER" == "on" -o "$POWER" == "off" ]; then done fi -DESC_pcblueleds="Blaue Leds PC" -DESC_bikewcblue="Blaue Lichterkette WC" -DESC_weissB="WeissB" -DESC_werkzeug="Werkzeug LEDs" -DESC_stereo="Receiver On/Off" +DESC_regalleinwand="LEDs Regal Leinwand" +DESC_bluebar="Blaue LEDs Bar" +DESC_labortisch="Labortisch" +DESC_couchred="LEDs Couch Red" +DESC_couchwhite="LEDS Couch White" +DESC_cxleds="CX Leds" +DESC_mashadecke="MaSha Decke" DESC_ambientlights="Ambient Lichter" -DESC_labor="Labor Licht" -DESC_boiler="Warmwasser WC" -DESC_dart="Dart Scheibe" -DESC_logo="Logo" -DESC_spots1="Spots" -DESC_deckehinten="Decke Hinten" -DESC_deckevorne="Decke Vorne" -DESC_whiteboard="Whiteboard Vorne" -DESC_decke="Deckenlichter" +DESC_boiler="Warmwasser Küche" DESC_lichter="Alle Lichter" DESC_all="Alles" DESC_ymhpoweron="Receiver On (off+tgl)" @@ -140,7 +131,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 "

Realraum rf433ctl

" -echo "
" +#echo "
" +echo "
" +echo "
" for DISPID in $VALID_ONOFF_IDS; do NAME="$(eval echo \$DESC_$DISPID)" [ -z "$NAME" ] && NAME=$DISPID - if [ -z "$AJAX" ]; then - echo "
" - echo "" - echo "
$NAME
" - echo " " - echo " " - echo "" - echo "
" - echo "
" - - else - - echo "
" +echo "
" echo "" echo " " echo " " @@ -221,60 +204,46 @@ for DISPID in $VALID_ONOFF_IDS; do echo "
$NAME
" echo "
" - fi - if [ "$MOBILE" == "1" ]; then + if [ "$NOFLOAT" == "1" ]; then echo "
" fi done + +#Custom Buttons Start +echo "
" +echo "" +echo " " +echo " " +echo "" +echo "
Receiver Power
" echo "
" -if [ "$MOBILE" != "1" ]; then -echo "
" + if [ "$NOFLOAT" == "1" ]; then + echo "
" + fi +echo "
" +echo "" +echo " " +echo " " +echo "" +echo "
Receiver Volume
" +echo "
" + if [ "$NOFLOAT" == "1" ]; then + echo "
" + fi +#Custom Buttons End - if [ -z "$AJAX" ]; then +echo "
" - echo "
Receiver Power
" - echo "
" - echo "
" - echo "
" +if [ "$MOBILE" != "1" ]; then - echo "
Receiver Volume
" - echo "
" - echo "
" - echo "
" +echo "
" - else - - echo "
" - echo "" - echo " " - echo " " - echo "" - echo "
Receiver Power
" - echo "
" - - echo "
" - echo "" - echo " " - echo " " - echo "" - echo "
Receiver Volume
" - echo "
" - - fi +ITEMCOUNT=0 for DISPID in $VALID_SEND_IDS; do + ITEMCOUNT=$((ITEMCOUNT+1)) NAME="$(eval echo \$DESC_$DISPID)" [ -z "$NAME" ] && NAME=$DISPID - if [ -z "$AJAX" ]; then - - echo "
" - echo "" - echo "
$NAME
" - echo " " - echo "
" - echo "
" - - else echo "
" echo "" @@ -282,24 +251,24 @@ for DISPID in $VALID_SEND_IDS; do echo "" echo "
$NAME
" echo "
" - - fi + if [ "$NOFLOAT" == "1" -a $((ITEMCOUNT % 2 )) -ne 1 ]; then + echo "
" + fi + done +echo '
Goto Yamaha Receiver Remote
' echo "
" + + if [ "$NOFLOAT" == "1" ]; then + echo "
" + tail -n+107 /www/ymhremote.html | head -n 5 + echo "
" + fi + echo "
" for DISPID in $VALID_BANSHEE_IDS $VALID_CAM_MOTOR_IDS; do NAME="$(eval echo \$DESC_$DISPID)" [ -z "$NAME" ] && NAME=$DISPID - if [ -z "$AJAX" ]; then - - echo "
" - echo "" - echo "
$NAME
" - echo " " - echo "
" - echo "
" - - else echo "
" echo "" @@ -307,10 +276,13 @@ for DISPID in $VALID_BANSHEE_IDS $VALID_CAM_MOTOR_IDS; do echo "" echo "
$NAME
" echo "
" - - fi + if [ "$NOFLOAT" == "1" ]; then + echo "
" + fi + done echo "
" fi +echo "
" echo "" echo ""