Fix color message

xingdong · Feb 25, 2015 · 8987f28 · 8987f28
1 parent 58c8d56
commit 8987f28
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/Linux/src/config/color.py b/Linux/src/config/color.py
@@ -3,6 +3,8 @@ class bcolors():
 	HEADER = '\033[95m'
 	OKBLUE = '\033[94m'
 	OK = '\033[92m'
-	WARNING = '\033[93m'
+	WARNING = '\033[96m'
 	FAIL = '\033[91m'
+	TITLE = '\033[93m'
 	ENDC = '\033[0m'
+
diff --git a/Linux/src/config/header.py b/Linux/src/config/header.py
@@ -3,7 +3,7 @@
 
 class Header():
 	def first_title(self):
-		print bcolors().WARNING
+		print bcolors().TITLE
 		print '|====================================================================|'
 		print '|                                                                    |'
 		print '|                        The LaZagne Project                         |'
@@ -15,16 +15,16 @@ def first_title(self):
 
 
 	def title(self, title):
-		print bcolors().WARNING
+		print bcolors().TITLE
 		print "------------------- " +  title + " passwords -----------------"
 		print bcolors().ENDC
 
 	# info option for the logging
 	def title_info(self, title):
 		b = bcolors()
-		logging.info(b.WARNING + "------------------- " + title + " passwords -----------------\n" + b.ENDC)
+		logging.info(b.TITLE + "------------------- " + title + " passwords -----------------\n" + b.ENDC)
 
 	# debug option for the logging
 	def title_debug(self, title):
 		b = bcolors()
-		logging.debug(b.WARNING + "------------------- " + title + " passwords -----------------\n" + b.ENDC )
+		logging.debug(b.TITLE + "------------------- " + title + " passwords -----------------\n" + b.ENDC )
diff --git a/Linux/src/config/write_output.py b/Linux/src/config/write_output.py
@@ -93,7 +93,7 @@ def print_debug(error_level, message):
 		logging.debug(b.FAIL + '[ERROR] ' + message + '\n' + b.ENDC)
 
 	elif error_level == 'WARNING':
-		logging.debug(b.FAIL + '[WARNING] ' + message + '\n' + b.ENDC)
+		logging.debug(b.WARNING + '[WARNING] ' + message + '\n' + b.ENDC)
 
 	elif error_level == 'INFO':
 		logging.debug('[INFO] ' + message + '\n')

diff --git a/Linux/src/softwares/browsers/mozilla.py b/Linux/src/softwares/browsers/mozilla.py
@@ -312,20 +312,20 @@ def retrieve_password(self):
 		software_name = constant.mozilla_software
 		specific_path = constant.specific_path
 
+		# print the title
+		Header().title_debug(software_name)
+
 		# get the installation path
 		path = self.get_path(software_name)
 		if not path:
-			print_debug('ERROR', 'Installation path not found')
+			print_debug('WARNING', 'Installation path not found')
 			return
 
-		# print the title
-		Header().title_debug(software_name)
-
 		list_libnss = self.found_libnss()
 
 		# Check if the libnss could be initialized well
 		if not list_libnss:
-			print_debug('ERROR', 'The libnss have not been initialized because the libnss3.so has not been found')
+			print_debug('WARNING', 'The libnss have not been initialized because the libnss3.so has not been found')
 
 		#Check if mozilla folder has been found
 		elif not os.path.exists(path):
@@ -336,7 +336,7 @@ def retrieve_password(self):
 				if os.path.exists(specific_path):
 					profile_list = [specific_path]
 				else:
-					print_debug('ERROR', 'The following file does not exist: %s' % specific_path)
+					print_debug('WARNING', 'The following file does not exist: %s' % specific_path)
 					return
 			else:
 				profile_list = self.get_firefox_profiles(path)

diff --git a/Linux/src/softwares/databases/sqldeveloper.py b/Linux/src/softwares/databases/sqldeveloper.py
@@ -125,7 +125,7 @@ def get_infos(self, path, passphrase, salt):
 			# print the results
 			print_output('SQL Developer', pwdFound)
 		else:
-			print_debug('ERROR', 'The xml file containing the passwords has not been found.')
+			print_debug('WARNING', 'The xml file containing the passwords has not been found.')
 
 	def retrieve_password(self):
 
@@ -142,10 +142,10 @@ def retrieve_password(self):
 			passphrase = self.get_passphrase(mainPath)
 
 			if passphrase == 'Not_Found':
-				print_debug('ERROR', 'The passphrase used to encrypt has not been found.')
+				print_debug('WARNING', 'The passphrase used to encrypt has not been found.')
 
 			elif passphrase == 'xml_Not_Found':
-				print_debug('ERROR', 'The xml file containing the passphrase has not been found.')
+				print_debug('WARNING', 'The xml file containing the passphrase has not been found.')
 
 			else:
 				salt = self.get_salt()

diff --git a/Linux/src/softwares/wifi/wifi.py b/Linux/src/softwares/wifi/wifi.py
@@ -35,4 +35,4 @@ def retrieve_password(self):
 			# print the results
 			print_output('Wifi', pwdFound)
 		else:
-			print_debug('ERROR', 'the path "%s" does not exist' %(directory))
+			print_debug('WARNING', 'the path "%s" does not exist' %(directory))
diff --git a/Linux/standalone/LaZagne b/Linux/standalone/LaZagne