Merge branch 'master' of https://github.com/romedius/ITSynOpen

ITS_Open_direct_2fb/ITS_Open_direct_2fb.ino

@@ -276,7 +276,7 @@ void TriggerServerReq(String s, int mode) {
 }
 
 void RequestState() {
-  TriggerServerReq("/status-s.php",0);
+  TriggerServerReq("/api/status-s.php",0);
 }
 
 // Status LED pins
@@ -319,7 +319,7 @@ void TriggerServerUpdate(boolean stat) {
     if(debug){Serial.println("making HTTP request...");}
     // make HTTP GET request to server:
     String s =(stat?"true":"false");
-    client.println("GET /update.php?open=" + s + "&apikey="+serverAPIKey+" HTTP/1.1");
+    client.println("GET /api/update.php?open=" + s + "&apikey="+serverAPIKey+" HTTP/1.1");
     client.println("HOST: it-syndikat.org");
     client.println("Connection: close");
     client.println();
@@ -344,7 +344,7 @@ void readButtons(){
 }
 
 void RequestPing() {
-  TriggerServerReq("/ping-get.php?apikey="+pingAPIKey,1);
+  TriggerServerReq("/api/ping-get.php?apikey="+pingAPIKey,1);
 }
 
 void launchUpdate(){

server/ping-get.php

@@ -0,0 +1,13 @@
+<?php
+	header('Content-type: text/plain');
+	if(isset($_GET['apikey']) && ($_GET['apikey']=='apikey1' || $_GET['apikey']=='apikey2')){
+		$str=file_get_contents('pinged.txt');
+        	echo $str;
+     		file_put_contents ( 'pinged.txt' , 'false' );
+        }else{
+		$str=file_get_contents('pinged.txt');
+		echo "API Key Missing!\n";
+        	echo $str;
+	}
+?>
+

server/ping.php

@@ -0,0 +1,12 @@
+<?php
+	header('Content-type: text/plain');
+	if(isset($_GET['apikey']) && ($_GET['apikey']=='apikey1' || $_GET['apikey']=='apikey2')){
+     		file_put_contents ( 'pinged.txt' , 'true' );
+		echo true;
+        }else{
+		$str=file_get_contents('pinged.txt');
+		echo "API Key Missing!\n";
+        	echo $str;
+	}
+?>
+

server/status.php

@@ -6,28 +6,33 @@
     $date=$arr[1]; //lastchange: upadate via file see explode/implode
     echo <<< eot
 {
-  "api":"0.12",
+  "api":"0.13",
   "space":"IT-Syndikat",
+  "logo":"http://it-syndikat.org/api/images/its_l.png",
   "url":"http://it-syndikat.org",
-  "icon":{
+  "location":{
-    "open":"http://it-syndikat.org/images/ITS_Open.png",
-    "closed":"http://it-syndikat.org/images/ITS_Closed.png"
-  },
     "address":"Tschamlerstrasse 3, 6020 Innsbruck, Austria",
+    "lat":47.2578,
+    "lon":11.3961
+  },
+  "state":{
+    "open":$open,
+    "lastchange":$date,
+    "icon":{
+      "open":"http://it-syndikat.org/api/images/ITS_Open.png",
+      "closed":"http://it-syndikat.org/api/images/ITS_Closed.png"
+    }
+  },
   "contact":{
     "phone":"+43512563468",
     "twitter":"@ItSyndikat",
     "email":"wir@it-syndikat.org",
     "ml":"its-public@lists.catbull.com"
   },
-  "open":$open,
+  "issue_report_channels":["email"],
-  "lastchange":$date,
+  "ext_ccc": "chaostreff"
-  "logo":"http://it-syndikat.org/images/its_l.png",
-  "lat":47.2578,
-  "lon":11.3961
 }
 
 eot;
 
 ?>
-

supybot/SpacePing/README.txt

@@ -0,0 +1 @@
+this plugin can be used to send a signal to the it-syndikat hackerspace in innsbruck. The implementation of the physical signal is still pending.

supybot/SpacePing/__init__.py

@@ -0,0 +1,66 @@
+###
+# Copyright (c) 2013, detlef prskavec
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright notice,
+#     this list of conditions, and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions, and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#   * Neither the name of the author of this software nor the name of
+#     contributors to this software may be used to endorse or promote products
+#     derived from this software without specific prior written consent.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+###
+
+"""
+Add a description of the plugin (to be presented to the user inside the wizard)
+here.  This should describe *what* the plugin does.
+"""
+
+import supybot
+import supybot.world as world
+
+# Use this for the version of this plugin.  You may wish to put a CVS keyword
+# in here if you're keeping the plugin in CVS or some similar system.
+__version__ = ""
+
+# XXX Replace this with an appropriate author or supybot.Author instance.
+__author__ = supybot.authors.unknown
+
+# This is a dictionary mapping supybot.Author instances to lists of
+# contributions.
+__contributors__ = {}
+
+# This is a url where the most recent plugin package can be downloaded.
+__url__ = '' # 'http://supybot.com/Members/yourname/Spaceping/download'
+
+import config
+import plugin
+reload(plugin) # In case we're being reloaded.
+# Add more reloads here if you add third-party modules and want them to be
+# reloaded when this plugin is reloaded.  Don't forget to import them as well!
+
+if world.testing:
+    import test
+
+Class = plugin.Class
+configure = config.configure
+
+
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:

supybot/SpacePing/config.py

@@ -0,0 +1,49 @@
+###
+# Copyright (c) 2013, detlef prskavec
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright notice,
+#     this list of conditions, and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions, and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#   * Neither the name of the author of this software nor the name of
+#     contributors to this software may be used to endorse or promote products
+#     derived from this software without specific prior written consent.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+###
+
+import supybot.conf as conf
+import supybot.registry as registry
+
+def configure(advanced):
+    # This will be called by supybot to configure this module.  advanced is
+    # a bool that specifies whether the user identified himself as an advanced
+    # user or not.  You should effect your configuration by manipulating the
+    # registry as appropriate.
+    from supybot.questions import expect, anything, something, yn
+    conf.registerPlugin('SpacePing', True)
+
+
+SpacePing = conf.registerPlugin('SpacePing')
+# This is where your configuration variables (if any) should go.  For example:
+# conf.registerGlobalValue(SpacePing, 'someConfigVariableName',
+#     registry.Boolean(False, """Help for someConfigVariableName."""))
+
+
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:

supybot/SpacePing/plugin.py

@@ -0,0 +1,68 @@
+##
+# Copyright (c) 2013, detlef prskavec
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright notice,
+#     this list of conditions, and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions, and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#   * Neither the name of the author of this software nor the name of
+#     contributors to this software may be used to endorse or promote products
+#     derived from this software without specific prior written consent.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+###
+
+import supybot.utils as utils
+from supybot.commands import *
+import supybot.plugins as plugins
+import supybot.ircutils as ircutils
+import supybot.callbacks as callbacks
+import urllib2
+import simplejson
+import datetime
+
+class SpacePing(callbacks.Plugin):
+    """Add the help for "@plugin help SpacePing" here
+    This should describe *how* to use this plugin."""
+    threaded = True
+    
+    
+    def _fetchJsonData(self):
+        """fetches jsondata from url"""
+        url = 'http://it-syndikat.org/ping.php?apikey=apiKey1'
+        ua = {'user-agent':'supybot-plugin/SpacePing'}
+        req = urllib2.Request(url, None, ua)
+        f = urllib2.urlopen(req)
+        data = simplejson.load(f)
+        return data
+    
+    
+    def spaceping(self, irc, msg, args):
+        """takes no argument
+        checks if the it-syndikat hackerspace is currently
+        open. that means someone pushed the button to 
+        announce that fact :)"""
+        data = self._fetchJsonData()
+        reply = 'Hello Space!'
+        irc.reply(reply, prefixNick=True)
+
+Class = SpacePing
+
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79:

supybot/SpacePing/test.py

@@ -0,0 +1,37 @@
+###
+# Copyright (c) 2013, detlef prskavec
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright notice,
+#     this list of conditions, and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions, and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#   * Neither the name of the author of this software nor the name of
+#     contributors to this software may be used to endorse or promote products
+#     derived from this software without specific prior written consent.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+###
+
+from supybot.test import *
+
+class SpacePingTestCase(PluginTestCase):
+    plugins = ('SpacePing',)
+
+
+# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79: