closed #276

6 files changed, 54 insertions, 50 deletions

diff --git a/module/plugins/Hook.py b/module/plugins/Hook.py
index 56541f7fe..4af6a0ed4 100644
--- a/module/plugins/Hook.py
+++ b/module/plugins/Hook.py
@@ -100,5 +100,5 @@ class Hook():
     def captchaCorrect(self, task):
         pass
 
-    def captchaWrong(self, task):
+    def captchaInvalid(self, task):
         pass
\ No newline at end of file
diff --git a/module/plugins/hooks/CaptchaTrader.py b/module/plugins/hooks/CaptchaTrader.py
index de5831731..985288090 100644
--- a/module/plugins/hooks/CaptchaTrader.py
+++ b/module/plugins/hooks/CaptchaTrader.py
@@ -45,7 +45,7 @@ class CaptchaTraderException(Exception):
 
 class CaptchaTrader(Hook):
     __name__ = "CaptchaTrader"
-    __version__ = "0.1"
+    __version__ = "0.11"
     __description__ = """send captchas to captchatrader.com"""
     __config__ = [("activated", "bool", "Activated", True),
                   ("username", "str", "Username", ""),
@@ -120,7 +120,7 @@ class CaptchaTrader(Hook):
             ticket = task.data["ticket"]
             self.respond(ticket, True)
 
-    def captchaWrong(self, task):
+    def captchaInvalid(self, task):
         if task.data.has_key("ticket"):
             ticket = task.data["ticket"]
             self.respond(ticket, False)
diff --git a/module/setup.py b/module/setup.py
index 75884ea13..a8a7f9058 100644
--- a/module/setup.py
+++ b/module/setup.py
@@ -212,7 +212,7 @@ class Setup():
         self.print_dep("pycrypto", crypto)
         
         ssl = self.check_module("OpenSSL")
-        self.print_dep("OpenSSL", ssl)
+        self.print_dep("py-OpenSSL", ssl)
 
         print ""
 
diff --git a/module/web/pyload_app.py b/module/web/pyload_app.py
index a71232f2b..102638885 100644
--- a/module/web/pyload_app.py
+++ b/module/web/pyload_app.py
@@ -514,14 +514,11 @@ def info():
 
     conf = PYLOAD.get_config()
 
-    data = {}
-    data["version"] = PYLOAD.get_server_version()
-    data["folder"] = abspath(PYLOAD_DIR)
-    data["config"] = abspath("")
-    data["download"] = abspath(conf["general"]["download_folder"]["value"])
-    data["remote"] = conf["remote"]["port"]["value"]
-    data["webif"] = conf["webinterface"]["port"]["value"]
-    data["language"] = conf["general"]["language"]["value"]
-
+    data = {"version": PYLOAD.get_server_version(),
+            "folder": abspath(PYLOAD_DIR), "config": abspath(""),
+            "download": abspath(conf["general"]["download_folder"]["value"]),
+            "remote": conf["remote"]["port"]["value"],
+            "webif": conf["webinterface"]["port"]["value"],
+            "language": conf["general"]["language"]["value"]}
 
     return render_to_response("info.html", data, [pre_processor])
\ No newline at end of file
diff --git a/module/web/templates/default/info.html b/module/web/templates/default/info.html
index d1acb804c..f1ef06814 100644
--- a/module/web/templates/default/info.html
+++ b/module/web/templates/default/info.html
@@ -1,46 +1,53 @@
 {% extends 'default/base.html' %}
 
+{% block head %}
+    <script type="text/javascript">
+        window.addEvent("domready", function() {
+            var ul = new Element('ul#twitter_update_list');
+            var script1 = new Element('script[src=http://twitter.com/javascripts/blogger.js][type=text/javascript]');
+            var script2 = new Element('script[src=http://twitter.com/statuses/user_timeline/pyLoad.json?callback=twitterCallback2&count=6][type=text/javascript]');
+            $("twitter").adopt(ul, script1, script2);
+        });
+    </script>
+{% endblock %}
+
 {% block title %}{{ _("Information") }} - {{ super() }} {% endblock %}
 {% block subtitle %}{{ _("Information") }}{% endblock %}
 
-
 {% block content %}
     <h3>{{ _("News") }}</h3>
-    <div id="twitter">
-        <ul id="twitter_update_list"></ul>
-        <script type="text/javascript" src="http://twitter.com/javascripts/blogger.js"></script>
-        <script type="text/javascript" src="http://twitter.com/statuses/user_timeline/pyLoad.json?callback=twitterCallback2&count=6"></script>
-    </div>
+    <div id="twitter"></div>
+
     <h3>{{ _("System") }}</h3>
     <table class="system">
-    <tr>
-        <td>Version:</td>
-        <td>{{ version }}</td>
-    </tr>
-    <tr>
-        <td>Installation Folder:</td>
-        <td>{{ folder }}</td>
-    </tr>
-    <tr>
-        <td>Config Folder:</td>
-        <td>{{ config }}</td>
-    </tr>
-    <tr>
-        <td>Download Folder:</td>
-        <td>{{ download }}</td>
-    </tr>
-    <tr>
-        <td>Language:</td>
-        <td>{{ language }}</td>
-    </tr>
-    <tr>
-        <td>Webinterface Port:</td>
-        <td>{{ webif }}</td>
-    </tr>
-    <tr>
-        <td>Remote Interface Port:</td>
-        <td>{{ remote }}</td>
-    </tr>
+        <tr>
+            <td>{{ _("Version:") }}</td>
+            <td>{{ version }}</td>
+        </tr>
+        <tr>
+            <td>{{ _("Installation Folder:") }}</td>
+            <td>{{ folder }}</td>
+        </tr>
+        <tr>
+            <td>{{ _("Config Folder:") }}</td>
+            <td>{{ config }}</td>
+        </tr>
+        <tr>
+            <td>{{ _("Download Folder:") }}</td>
+            <td>{{ download }}</td>
+        </tr>
+        <tr>
+            <td>{{ _("Language:") }}</td>
+            <td>{{ language }}</td>
+        </tr>
+        <tr>
+            <td>{{ _("Webinterface Port:") }}</td>
+            <td>{{ webif }}</td>
+        </tr>
+        <tr>
+            <td>{{ _("Remote Interface Port:") }}</td>
+            <td>{{ remote }}</td>
+        </tr>
     </table>
 
 {% endblock %}
\ No newline at end of file
diff --git a/pyLoadCli.py b/pyLoadCli.py
index 917182b37..094b16006 100755
--- a/pyLoadCli.py
+++ b/pyLoadCli.py
@@ -35,7 +35,7 @@ from codecs import getwriter
 sys.stdout = getwriter("utf8")(sys.stdout, errors="replace")
 
 from module import InitHomeDir
-from module.utils import formatSize
+from module.utils import formatSize, decode
 from module.ConfigParser import ConfigParser
 from module.remote.thriftbackend.ThriftClient import ThriftClient, NoConnection, NoSSL, WrongLogin, PackageDoesNotExists, ConnectionClosed
 
@@ -103,7 +103,7 @@ class Cli:
               str((self.inputline if self.inputline > 0 else self.inputline + 1) - 1) + ";0H"
 
     def print_input(self):
-        self.println(self.inputline, white(" Input: ") + self.input)
+        self.println(self.inputline, white(" Input: ") + decode(self.input))
         self.println(self.inputline + 1, "")
         self.println(self.inputline + 2, "")
         self.println(self.inputline + 3, "")
@@ -514,7 +514,7 @@ def print_help():
     print "  -i, --interactive", " Start in interactive mode" 
     print 
     print "  -u, --username=", " " * 2,  "Specify Username"
-    print "  --pw=<password>", " " * 2, "Password (default=ask for it)"
+    print "  --pw=<password>", " " * 2, "Password"
     print "  -a, --address=", " "*3, "Specify address (default=127.0.0.1)"
     print "  -p, --port", " " * 7, "Specify port (default=7227)"
     print