From 8fca7cdb31f11ba6d43758d0056b63960e8f5617 Mon Sep 17 00:00:00 2001
From: fragonib <devnull@localhost>
Date: Mon, 30 May 2011 23:23:01 +0200
Subject: Serveral Plugins: Clean up

---
 module/plugins/crypter/LinkSaveIn.py   | 4 ++--
 module/plugins/crypter/NCryptIn.py     | 2 +-
 module/plugins/crypter/NetfolderIn.py  | 2 +-
 module/plugins/crypter/RelinkUs.py     | 2 +-
 module/plugins/hoster/OneFichierCom.py | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'module/plugins')

diff --git a/module/plugins/crypter/LinkSaveIn.py b/module/plugins/crypter/LinkSaveIn.py
index 33d49608c..5a72b750a 100644
--- a/module/plugins/crypter/LinkSaveIn.py
+++ b/module/plugins/crypter/LinkSaveIn.py
@@ -80,9 +80,9 @@ class LinkSaveIn(Crypter):
         return False
         
     def unlockPasswordProtection(self):
-        password = self.package.password
+        password = self.getPassword()
         self.log.debug("%s: Submitting password [%s] for protected links" % (self.__name__, password))
-        post = {"id": self.fileid, "besucherpasswort": self.package.password, 'login': 'submit'}
+        post = {"id": self.fileid, "besucherpasswort": password, 'login': 'submit'}
         self.html = self.load(self.pyfile.url, post=post)
             
     def unlockCaptchaProtection(self):
diff --git a/module/plugins/crypter/NCryptIn.py b/module/plugins/crypter/NCryptIn.py
index 785c98ba8..4d9426481 100644
--- a/module/plugins/crypter/NCryptIn.py
+++ b/module/plugins/crypter/NCryptIn.py
@@ -99,7 +99,7 @@ class NCryptIn(Crypter):
         
         # Submit package password
         if "password" in form:
-            password = self.package.password
+            password = self.getPassword()
             self.log.debug("%s: Submitting password [%s] for protected links" % (self.__name__, password))
             postData['password'] = password
         
diff --git a/module/plugins/crypter/NetfolderIn.py b/module/plugins/crypter/NetfolderIn.py
index 995eb4d4c..3a1e4e331 100644
--- a/module/plugins/crypter/NetfolderIn.py
+++ b/module/plugins/crypter/NetfolderIn.py
@@ -50,7 +50,7 @@ class NetfolderIn(Crypter):
             self.log.debug("%s: Unable to get package id from url [%s]" % (self.__name__, url))
             return
         url = "http://netfolder.in/folder.php?folder_id=" + id
-        password = self.pyfile.package().password
+        password = self.getPassword()
                    
         # Submit package password     
         post = { 'password' : password, 'save' : 'Absenden' }
diff --git a/module/plugins/crypter/RelinkUs.py b/module/plugins/crypter/RelinkUs.py
index 64fbb9214..4376a8c8d 100644
--- a/module/plugins/crypter/RelinkUs.py
+++ b/module/plugins/crypter/RelinkUs.py
@@ -75,7 +75,7 @@ class RelinkUs(Crypter):
             self.log.debug("%s: Unable to get package id from url [%s]" % (self.__name__, url))
             return
         id = m.group('id')
-        password = self.package.password
+        password = self.getPassword()
                    
         # Submit package password     
         url = "http://www.relink.us/container_password.php?id=" + id
diff --git a/module/plugins/hoster/OneFichierCom.py b/module/plugins/hoster/OneFichierCom.py
index 69d6e81c0..bc7a4542d 100644
--- a/module/plugins/hoster/OneFichierCom.py
+++ b/module/plugins/hoster/OneFichierCom.py
@@ -79,7 +79,7 @@ class OneFichierCom(Hoster):
         
         # Check for protection 
         if self.isProtected():
-            password = pyfile.package().password
+            password = self.getPassword()
             self.log.debug("%s: Submitting password [%s]" % (self.__name__, password))
             self.download(url, post={"password" : password})
         else:
-- 
cgit v1.2.3