extern cnl

H: Bitte gib eine Versions-Meldung ein. Zeilen beginnend mit 'HG:' werden entfernt.

2 files changed, 14 insertions, 5 deletions

diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py
index cdce7671d..1f680032a 100644
--- a/module/plugins/Plugin.py
+++ b/module/plugins/Plugin.py
@@ -234,7 +234,10 @@ class Plugin(object):
             task.removeTask()
 
         if not self.core.debug:
-          remove(temp.name)
+          try:
+            remove(temp.name)
+          except:
+            pass
         
         return result
 
diff --git a/module/plugins/hooks/ClickAndLoad.py b/module/plugins/hooks/ClickAndLoad.py
index d4d280618..b9824b863 100644
--- a/module/plugins/hooks/ClickAndLoad.py
+++ b/module/plugins/hooks/ClickAndLoad.py
@@ -27,7 +27,8 @@ class ClickAndLoad(Hook):
     __name__ = "ClickAndLoad"
     __version__ = "0.2"
     __description__ = """Gives abillity to use jd's click and load. depends on webinterface"""
-    __config__ = [ ("activated", "bool", "Activated" , "True") ]
+    __config__ = [ ("activated", "bool", "Activated" , "True"),
+                   ("extern", "bool", "Allow external link adding", "False") ]
     __author_name__ = ("RaNaN", "mkaay")
     __author_mail__ = ("RaNaN@pyload.de", "mkaay@mkaay.de")
     
@@ -35,7 +36,12 @@ class ClickAndLoad(Hook):
     	self.port = int(self.core.config['webinterface']['port'])
         if self.core.config['webinterface']['activated']:
             try:
-                thread.start_new_thread(proxy, ("127.0.0.1", self.port, 9666))
+		if self.getConfig("extern"):
+		    ip = "0.0.0.0"
+		else:
+		    ip = "127.0.0.1"
+		
+                thread.start_new_thread(proxy, (ip, self.port, 9666))
             except:
                 self.logger.error("ClickAndLoad port already in use.")
 
@@ -49,12 +55,12 @@ def proxy(*settings):
 def server(*settings):
     try:
         dock_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        dock_socket.bind(("127.0.0.1", settings[2]))
+        dock_socket.bind((settings[0], settings[2]))
         dock_socket.listen(5)
         while True:
             client_socket = dock_socket.accept()[0]
             server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            server_socket.connect((settings[0], settings[1]))
+            server_socket.connect(("127.0.0.1", settings[1]))
             thread.start_new_thread(forward, (client_socket, server_socket))
             thread.start_new_thread(forward, (server_socket, client_socket))
     except: