From 46a8ab54fd0d6a6d8303b05945784267c77aafd7 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Sun, 22 Aug 2010 16:20:21 +0200
Subject: fixes, 2nd icon

---
 icons/pyload2.ico                      | Bin 0 -> 9662 bytes
 module/plugins/Plugin.py               |   2 +-
 module/web/templates/default/home.html |   2 +-
 pyLoadCore.py                          |  11 ++++++++---
 4 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 icons/pyload2.ico

diff --git a/icons/pyload2.ico b/icons/pyload2.ico
new file mode 100644
index 000000000..c2b497986
Binary files /dev/null and b/icons/pyload2.ico differ
diff --git a/module/plugins/Plugin.py b/module/plugins/Plugin.py
index 42809b248..cdce7671d 100644
--- a/module/plugins/Plugin.py
+++ b/module/plugins/Plugin.py
@@ -252,7 +252,7 @@ class Plugin(object):
 
         download_folder = self.config['general']['download_folder']
         
-        location = join(download_folder, self.pyfile.package().folder.decode(sys.getfilesystemencoding()))
+        location = join(download_folder, self.pyfile.package().folder.decode(sys.getfilesystemencoding().replace(":", ""))) # remove : for win compability
 
         if not exists(location): 
             makedirs(location)
diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html
index 6d77b4619..bbc196fe1 100644
--- a/module/web/templates/default/home.html
+++ b/module/web/templates/default/home.html
@@ -116,7 +116,7 @@ var LinkEntry = new Class({
                 'html': item.name
                 }),
                 status: new Element('td', {
-                'html': item.status
+                'html': item.statusmsg
                 }),
                 info: new Element('td', {
                 'html': item.info
diff --git a/pyLoadCore.py b/pyLoadCore.py
index 79fc7d565..e140b42a3 100755
--- a/pyLoadCore.py
+++ b/pyLoadCore.py
@@ -160,7 +160,7 @@ class Core(object):
                 print "Setup failed"
             if not res:
                 remove("pyload.conf")
-            exit()
+                exit()
         
         try: signal.signal(signal.SIGQUIT, self.quit)
         except: pass
@@ -257,8 +257,13 @@ class Core(object):
             server_addr = (self.config['remote']['listenaddr'], int(self.config['remote']['port']))
             usermap = {self.config.username: self.config.password}
             if self.config['ssl']['activated']:
-                self.server = Server.SecureXMLRPCServer(server_addr, self.config['ssl']['cert'], self.config['ssl']['key'], usermap)
-                self.log.info(_("Secure XMLRPC Server Started"))
+                if exists(self.config['ssl']['cert']) and exists(self.config['ssl']['key']):
+                    self.server = Server.SecureXMLRPCServer(server_addr, self.config['ssl']['cert'], self.config['ssl']['key'], usermap)
+                    self.log.info(_("Secure XMLRPC Server Started"))
+                else:
+                    self.log.warning(_("SSL Certificates not found, fallback to auth XMLRPC server"))
+                    self.server = Server.AuthXMLRPCServer(server_addr, usermap)
+                    self.log.info(_("Auth XMLRPC Server Started"))
             else:
                 self.server = Server.AuthXMLRPCServer(server_addr, usermap)
                 self.log.info(_("Auth XMLRPC Server Started"))
-- 
cgit v1.2.3