fix: required fonction

gaulliath · Jul 15, 2017 · f66c162 · f66c162
1 parent 6d1e5f3
commit f66c162
Show file tree

Hide file tree

Showing 20 changed files with 84 additions and 88 deletions.
diff --git a/core/modules/cms_gathering.py b/core/modules/cms_gathering.py
@@ -26,16 +26,16 @@ def set_agv(self, argv):
 		self.argv = argv
 
         def show_options(self):
-                load.show_options(self.require)
+            return load.show_options(self.require)
 
 	def export_data(self, argv=False):
-                load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
+            return load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
 
 	def set_options(self,name,value):
-	        load.set_options(self.require, name, value)
+	        return load.set_options(self.require, name, value)
 
 	def check_require(self):
-                load.check_require(self.require)
+            return load.check_require(self.require)
 
 	def get_options(self,name):
 		if name in self.require:

diff --git a/core/modules/domain_search.py b/core/modules/domain_search.py
@@ -20,16 +20,16 @@ def set_agv(self, argv):
 		self.argv = argv
 
 	def show_options(self):
-                load.show_options(self.require)
+                return load.show_options(self.require)
 
 	def export_data(self, argv=False):
-                load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
+                return load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
 
 	def set_options(self,name,value):
-	        load.set_options(self.require, name, value)
+	        return load.set_options(self.require, name, value)
 
 	def check_require(self):
-                load.check_require(self.require)
+            return load.check_require(self.require)
 
 	def get_options(self,name):
 		if name in self.require:

diff --git a/core/modules/email_to_domain.py b/core/modules/email_to_domain.py
@@ -22,16 +22,16 @@ def set_agv(self, argv):
 		self.argv = argv
 
 	def show_options(self):
-                load.show_options(self.require)
+                return load.show_options(self.require)
 
 	def export_data(self, argv=False):
-                load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
+                return load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
 
 	def set_options(self,name,value):
-	        load.set_options(self.require, name, value)
+	        return load.set_options(self.require, name, value)
 
 	def check_require(self):
-                load.check_require(self.require)
+            return load.check_require(self.require)
 
 	def get_options(self,name):
 		if name in self.require:

diff --git a/core/modules/file_common.py b/core/modules/file_common.py
@@ -21,16 +21,16 @@ def set_agv(self, argv):
 		self.argv = argv
 
 	def show_options(self):
-                load.show_options(self.require)
+                return load.show_options(self.require)
 
 	def export_data(self, argv=False):
-                load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
+                return load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
 
 	def set_options(self,name,value):
-	        load.set_options(self.require, name, value)
+	        return load.set_options(self.require, name, value)
 
 	def check_require(self):
-                load.check_require(self.require)
+                return load.check_require(self.require)
 
 	def get_options(self,name):
 		if name in self.require:
@@ -53,6 +53,8 @@ def main(self):
 			website = website.replace('http//','http://')
 			if website[-1:] == "/":
 				website = website[:-1]
+		elif "http" not in website or "https" not in website:
+			website = "http://"+website
 		try:
 			requests.get(website)
 			action = 1

diff --git a/core/modules/generate_email.py b/core/modules/generate_email.py
@@ -23,16 +23,16 @@ def set_agv(self, argv):
 		self.argv = argv
 
 	def show_options(self):
-                load.show_options(self.require)
+                return load.show_options(self.require)
 
 	def export_data(self, argv=False):
-                load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
+                return load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
 
 	def set_options(self,name,value):
-	        load.set_options(self.require, name, value)
+	        return load.set_options(self.require, name, value)
 
 	def check_require(self):
-                load.check_require(self.require)
+            return load.check_require(self.require)
 
 	def get_options(self,name):
 		if name in self.require:

diff --git a/core/modules/get_websiteurl.py b/core/modules/get_websiteurl.py
@@ -25,16 +25,16 @@ def set_agv(self, argv):
 		self.argv = argv
 
 	def show_options(self):
-                load.show_options(self.require)
+                return load.show_options(self.require)
 
 	def export_data(self, argv=False):
-                load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
+                return load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
 
 	def set_options(self,name,value):
-	        load.set_options(self.require, name, value)
+	        return load.set_options(self.require, name, value)
 
 	def check_require(self):
-                load.check_require(self.require)
+                return load.check_require(self.require)
 
 	def get_options(self,name):
 		if name in self.require:

diff --git a/core/modules/getform_data.py b/core/modules/getform_data.py
@@ -22,16 +22,16 @@ def set_agv(self, argv):
 		self.argv = argv
 
 	def show_options(self):
-                load.show_options(self.require)
+                return load.show_options(self.require)
 
 	def export_data(self, argv=False):
-                load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
+                return load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
 
 	def set_options(self,name,value):
-	        load.set_options(self.require, name, value)
+	        return load.set_options(self.require, name, value)
 
 	def check_require(self):
-                load.check_require(self.require)
+		return load.check_require(self.require)
 
 	def get_options(self,name):
 		if name in self.require:

diff --git a/core/modules/header_retrieval.py b/core/modules/header_retrieval.py
@@ -20,16 +20,16 @@ def set_agv(self, argv):
 		self.argv = argv
 
 	def show_options(self):
-                load.show_options(self.require)
+                return load.show_options(self.require)
 
 	def export_data(self, argv=False):
-                load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
+                return load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
 
 	def set_options(self,name,value):
-	        load.set_options(self.require, name, value)
+	        return load.set_options(self.require, name, value)
 
 	def check_require(self):
-                load.check_require(self.require)
+                return load.check_require(self.require)
 
 	def get_options(self,name):
 		if name in self.require:

diff --git a/core/modules/https_gathering.py b/core/modules/https_gathering.py
@@ -21,16 +21,16 @@ def set_agv(self, argv):
 		self.argv = argv
 
 	def show_options(self):
-                load.show_options(self.require)
+                return load.show_options(self.require)
 
 	def export_data(self, argv=False):
-                load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
+                return load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
 
 	def set_options(self,name,value):
-	        load.set_options(self.require, name, value)
+	        return load.set_options(self.require, name, value)
 
 	def check_require(self):
-                load.check_require(self.require)
+                return load.check_require(self.require)
 
 	def get_options(self,name):
 		if name in self.require:

diff --git a/core/modules/linkedin_search.py b/core/modules/linkedin_search.py
@@ -19,16 +19,16 @@ def __init__(self):
 		self.export_status = False
 
 	def show_options(self):
-                load.show_options(self.require)
+                return load.show_options(self.require)
 
 	def export_data(self, argv=False):
-                load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
+                return load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
 
 	def set_options(self,name,value):
-	        load.set_options(self.require, name, value)
+	        return load.set_options(self.require, name, value)
 
 	def check_require(self):
-                load.check_require(self.require)
+                return load.check_require(self.require)
 
 	def get_options(self,name):
 		if name in self.require:

diff --git a/core/modules/metatag_look.py b/core/modules/metatag_look.py
@@ -21,16 +21,16 @@ def set_agv(self, argv):
 		self.argv = argv
 
 	def show_options(self):
-                load.show_options(self.require)
+                return load.show_options(self.require)
 
 	def export_data(self, argv=False):
-                load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
+                return load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
 
 	def set_options(self,name,value):
-	        load.set_options(self.require, name, value)
+	        return load.set_options(self.require, name, value)
 
 	def check_require(self):
-                load.check_require(self.require)
+                return load.check_require(self.require)
 
 	def get_options(self,name):
 		if name in self.require:

diff --git a/core/modules/reverse_ipdomain.py b/core/modules/reverse_ipdomain.py
@@ -22,16 +22,16 @@ def set_agv(self, argv):
 		self.argv = argv
 
 	def show_options(self):
-                load.show_options(self.require)
+                return load.show_options(self.require)
 
 	def export_data(self, argv=False):
-                load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
+                return load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
 
 	def set_options(self,name,value):
-	        load.set_options(self.require, name, value)
+	        return load.set_options(self.require, name, value)
 
 	def check_require(self):
-                load.check_require(self.require)
+                return load.check_require(self.require)
 
 	def get_options(self,name):
 		if name in self.require:

diff --git a/core/modules/sample_module.py b/core/modules/sample_module.py
@@ -20,16 +20,16 @@ def set_agv(self, argv):
 		self.argv = argv
 
 	def show_options(self):
-                load.show_options(self.require)
+                return load.show_options(self.require)
 
 	def export_data(self, argv=False):
-                load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
+                return load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
 
 	def set_options(self,name,value):
-	        load.set_options(self.require, name, value)
+	        return load.set_options(self.require, name, value)
 
 	def check_require(self):
-                load.check_require(self.require)
+                return load.check_require(self.require)
 
 	def get_options(self,name):
 		if name in self.require:

diff --git a/core/modules/search_db.py b/core/modules/search_db.py
@@ -28,16 +28,16 @@ def set_agv(self, argv):
 		self.argv = argv
 
 	def show_options(self):
-                load.show_options(self.require)
+                return load.show_options(self.require)
 
 	def export_data(self):
-                load.export_data_search_db(self.export, self.export_file, self.export_status, self.title)
+                return load.export_data_search_db(self.export, self.export_file, self.export_status, self.title)
 
 	def set_options(self,name,value):
-	        load.set_options(self.require, name, value)
+	        return load.set_options(self.require, name, value)
 
 	def check_require(self):
-                load.check_require(self.require)
+                return load.check_require(self.require)
 
 	def get_options(self,name):
 		if name in self.require:

diff --git a/core/modules/subdomain_search.py b/core/modules/subdomain_search.py
@@ -22,16 +22,16 @@ def set_agv(self, argv):
 		self.argv = argv
 
 	def show_options(self):
-                load.show_options(self.require)
+                return load.show_options(self.require)
 
 	def export_data(self, argv=False):
-                load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
+                return load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
 
 	def set_options(self,name,value):
-	        load.set_options(self.require, name, value)
+	        return load.set_options(self.require, name, value)
 
 	def check_require(self):
-                load.check_require(self.require)
+                return load.check_require(self.require)
 
 	def get_options(self,name):
 		if name in self.require:

diff --git a/core/modules/tools_suggester.py b/core/modules/tools_suggester.py
@@ -38,24 +38,16 @@ def set_agv(self, argv):
 		self.argv = argv
 
 	def show_options(self):
-                load.show_options(self.require)
+                return load.show_options(self.require)
 
 	def export_data(self, argv=False):
-                load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
+                return load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
 
 	def set_options(self,name,value):
-		if name in self.require:
-			self.require[name][0]["value"] = value
-		else:
-			print Fore.RED + "Option not found" + Style.RESET_ALL
+		return load.set_options(self.require, name, value)
 
 	def check_require(self):
-		for line in self.require:
-			for option in self.require[line]:
-				if option["required"] == "yes":
-					if option["value"] == "":
-						return False
-		return True
+		return load.check_require(self.require)
 
 	def get_options(self,name):
 		if name in self.require:
@@ -75,6 +67,8 @@ def main(self):
 		website = self.get_options('website')
 		if website[-1] == "/":
 			website = website[:-1]
+		if "http" not in website or "https" not in website:
+			website = "http://"+website
 		for element in self.directory:
 			complet = website + element['file']
 			req = requests.get(complet)

diff --git a/core/modules/vhost_IPchecker.py b/core/modules/vhost_IPchecker.py
@@ -22,16 +22,16 @@ def set_agv(self, argv):
 		self.argv = argv
 
 	def show_options(self):
-                load.show_options(self.require)
+                return load.show_options(self.require)
 
 	def export_data(self, argv=False):
-                load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
+                return load.export_data(self.export, self.export_file, self.export_status, self.title, argv)
 
 	def set_options(self,name,value):
-	        load.set_options(self.require, name, value)
+	        return load.set_options(self.require, name, value)
 
 	def check_require(self):
-                load.check_require(self.require)
+                return load.check_require(self.require)
 
 	def get_options(self,name):
 		if name in self.require: