little request fix

3 files changed, 11 insertions, 7 deletions

diff --git a/Core.py b/Core.py
index b7fe7d079..1d7e1e436 100644
--- a/Core.py
+++ b/Core.py
@@ -200,7 +200,7 @@ class Core(object):
         start_h, start_m = self.config['start'].split(":")
         end_h, end_m = self.config['end'].split(":")
 
-        #@todo: doesnt work at the moment
+        #@todo: little bug, when start and end time in same hour
         hour, minute  = time.localtime()[3:5]
 
         if hour > int(start_h) and hour < int(end_h):
diff --git a/module/remote/RequestHandler.py b/module/remote/RequestHandler.py
index 09ad5b548..1405fd3eb 100644
--- a/module/remote/RequestHandler.py
+++ b/module/remote/RequestHandler.py
@@ -30,7 +30,7 @@ class RequestHandler:
 
         if obj.command == "exec":
             func = getattr(self.core, obj.function)
-            obj.response = func()
+            obj.response = func(*obj.args)
         else:
             obj.response = "antwort"
         
@@ -38,11 +38,15 @@ class RequestHandler:
 
 
     def decrypt(self, dec_str):
-        dec_str = base64.standard_b64decode(dec_str)
-        dec_str = self.aes.decrypt(dec_str)
+        try:
+            dec_str = base64.standard_b64decode(dec_str)
+            dec_str = self.aes.decrypt(dec_str)
         
-        dec_str = dec_str[:-(int(dec_str[-1], 16) + 1)]
-        obj = cPickle.loads(dec_str)
+            dec_str = dec_str[:-(int(dec_str[-1], 16) + 1)]
+            obj = cPickle.loads(dec_str)
+        except:
+            obj = RequestObject()
+
         return obj
 
     def encrypt(self, obj):
diff --git a/module/remote/RequestObject.py b/module/remote/RequestObject.py
index 77322663a..86e803e9c 100644
--- a/module/remote/RequestObject.py
+++ b/module/remote/RequestObject.py
@@ -3,7 +3,7 @@
 """
 authored by:  RaNaN
 
-this module handels the incoming requests
+represents the object for interaction
 
 """