diff --git a/daemon/run.sh b/daemon/run.sh new file mode 100755 index 0000000000000000000000000000000000000000..328c647f9d2bd5bbf4db0d1a4aad2013a80ad626 --- /dev/null +++ b/daemon/run.sh @@ -0,0 +1,19 @@ +while true; do + + if [ -f ../webroot/tmp/facepalm ] + then + rm -f ../webroot/tmp/facepalm > /dev/null + mplayer -display :0 -fs facepalm.flv > /dev/null & + sleep 3 + killall mplayer + fi + + if [ -f ../webroot/tmp/say ] + then + cat ../webroot/tmp/say | espeak -v german-mbrola-2 > /dev/null + rm -f ../webroot/tmp/say > /dev/null + fi + + sleep 1 +done + diff --git a/webroot/ajax.php b/webroot/ajax.php new file mode 100755 index 0000000000000000000000000000000000000000..ba543284c94610c527811e052215a9d93adebfec --- /dev/null +++ b/webroot/ajax.php @@ -0,0 +1,13 @@ +<?php + + if(isset($_GET["facepalm"])) + { + exec('touch tmp/facepalm'); + } + + if(isset($_GET["say"])) + { + exec('echo "'.$_GET["say"].'" > tmp/say'); + } + +?> diff --git a/webroot/js/marvin.js b/webroot/js/marvin.js index da646d5f966c3b26e8bebf9bdddeea10e332b060..8260edc4c345d30709a4d98f8f8008468d748099 100755 --- a/webroot/js/marvin.js +++ b/webroot/js/marvin.js @@ -18,3 +18,13 @@ $(document).ready(function() { minuteTimer = setInterval(executeMinuteTimer, 60*1000); }); + +function facepalm() +{ + $.get("ajax.php?facepalm=1"); +} + +function say(text) +{ + $.get("ajax.php?say="+text); +} diff --git a/webroot/widgets/Logo/Logo.php b/webroot/widgets/Logo/Logo.php old mode 100644 new mode 100755 index 27657430b74780deb78c7e44eba24e0e7b134a63..6cca233fb7dc55ee9117eccd17456b7772781610 --- a/webroot/widgets/Logo/Logo.php +++ b/webroot/widgets/Logo/Logo.php @@ -10,7 +10,7 @@ class Logo implements iWidget public function giveOutput() { - $widgetOutput = '<img src="widgets/Logo/img/warpzone.png">'."\n"; + $widgetOutput = '<img onclick="say(\'Ich bin nur das Logo. Ich kann ja sonst nichts.\')" src="widgets/Logo/img/warpzone.png">'."\n"; return $widgetOutput; } } diff --git a/webroot/widgets/Logo/img/warpzone.png b/webroot/widgets/Logo/img/warpzone.png old mode 100644 new mode 100755 diff --git a/webroot/widgets/Marvin/Marvin.php b/webroot/widgets/Marvin/Marvin.php old mode 100644 new mode 100755 index 36662911def752bfdf2c148a85fc8d6ffef5df4e..db71919e154649f5f75dc2f06999faab8d6c18b0 --- a/webroot/widgets/Marvin/Marvin.php +++ b/webroot/widgets/Marvin/Marvin.php @@ -11,7 +11,7 @@ class Marvin implements iWidget public function giveOutput() { $widgetOutput = '<script src="widgets/Marvin/Marvin.js" type="text/javascript"></script>'."\n"; - $widgetOutput .= '<img id="MarvinImg" src="widgets/Marvin/img/marvin.jpg">'."\n"; + $widgetOutput .= '<img id="MarvinImg" onclick="say(\'Wie deprimierend.\')" src="widgets/Marvin/img/marvin.jpg">'."\n"; return $widgetOutput; } } diff --git a/webroot/widgets/Marvin/img/marvin.jpg b/webroot/widgets/Marvin/img/marvin.jpg old mode 100644 new mode 100755 diff --git a/webroot/widgets/Prepaid/Prepaid.js b/webroot/widgets/Prepaid/Prepaid.js old mode 100644 new mode 100755 index dfc174af028b316f1a52bd27037377028394448f..9ce09d2405b0fe6f2afbc587c7634fca5effd92f --- a/webroot/widgets/Prepaid/Prepaid.js +++ b/webroot/widgets/Prepaid/Prepaid.js @@ -8,7 +8,7 @@ function fillPrepaid(response) { content += '<table><tr>'; for(var i=0; i<v; i++) { if(i == 5) content += '</tr><tr>'; - content += '<td class="button" style="background-image:url(widgets/Prepaid/img/cross.png);background-position:center center;">50c</td>'; + content += '<td class="button" onclick="facepalm()" style="background-image:url(widgets/Prepaid/img/cross.png);background-position:center center;">50c</td>'; } for(var i=v; i<10; i++) { if(i == 5) content += '</tr><tr>'; @@ -37,6 +37,7 @@ function setPrepaid(k,v) { $.getJSON("widgets/Prepaid/ajax.php?name="+k+"&value="+v, function (response) { fillPrepaid(response); + say("om nom nom"); }); } diff --git a/webroot/widgets/Prepaid/Prepaid.php b/webroot/widgets/Prepaid/Prepaid.php old mode 100644 new mode 100755 diff --git a/webroot/widgets/Prepaid/ajax.php b/webroot/widgets/Prepaid/ajax.php old mode 100644 new mode 100755 diff --git a/webroot/widgets/Prepaid/img/cross.png b/webroot/widgets/Prepaid/img/cross.png old mode 100644 new mode 100755 diff --git a/webroot/widgets/Prepaid/karten.txt b/webroot/widgets/Prepaid/karten.txt old mode 100755 new mode 100644 index 433b535cb9b3e182bec62b91ecbbbfc9a65da920..31e81fb2c713282fb1c8017a1adcb67bf529d6c1 --- a/webroot/widgets/Prepaid/karten.txt +++ b/webroot/widgets/Prepaid/karten.txt @@ -1,29 +1,29 @@ SuperVirus -2 +4 crnf -8 -da1l6 10 +da1l6 +6 Philipp -3 +2 Commander1024 -6 +2 ElliotDenk 0 ands -8 +2 StuC -0 +8 Deaddy -0 +6 phryk 0 fenkt 0 shell -0 +6 Mitch -0 +8 Cpt.Charisma 0 blueling @@ -32,3 +32,11 @@ Fusselkater 0 MrFischer 0 +Oliver +10 +raichoo +10 +alios +4 +zeroskillor +4