From 789ecde5248f05982466078a0bda417f8f0a5664 Mon Sep 17 00:00:00 2001
From: ChrisCalderon <calderon.christian760@gmail.com>
Date: Thu, 3 Jul 2014 23:06:26 -0700
Subject: [PATCH] Fixed RemoveColor function, README

Replaced 70 or lines of stuff with 3 lines using regular expressions,
and mentioned the PyCrypto dependency in the README.md file.
---
 README.md |  2 ++
 waidps.py | 93 ++++---------------------------------------------------
 2 files changed, 8 insertions(+), 87 deletions(-)

diff --git a/README.md b/README.md
index 907f3fa..8ad1a94 100644
--- a/README.md
+++ b/README.md
@@ -2,3 +2,5 @@ waidps
 ======
 
 Wireless Auditing, Intrusion Detection &amp; Prevention System
+
+Depends on PyCrypto, run `pip install pycrypto` to install.
diff --git a/waidps.py b/waidps.py
index e395466..d4946ba 100644
--- a/waidps.py
+++ b/waidps.py
@@ -21,21 +21,13 @@
 import shutil
 import readline
 import threading
+import re
 from signal import SIGINT, SIGTERM
 from subprocess import Popen, call, PIPE
 from math import floor
-try:
-  import hashlib
-except:
-  IMPORT_ERRMSG=IMPORT_ERRMSG + "      Error importing 'hashlib'\n"
-try:
-   from Crypto.Cipher import AES
-except:
-  IMPORT_ERRMSG=IMPORT_ERRMSG + "      Error importing 'AES'\n"
-try:
-  import base64
-except:
-  IMPORT_ERRMSG=IMPORT_ERRMSG + "      Error importing 'base64'\n"
+import hashlib
+from Crypto.Cipher import AES
+import base64
 appver="1.0, R.3"
 apptitle="WAIDPS"
 appDesc="- The Wireless Auditing, Intrusion Detection & Prevention System"
@@ -126,82 +118,9 @@ class fcolor:
     BGICyan='\033[106m'
     BGIWhite='\033[107m'
 
+color_pattern = re.compile('\033\[(\d;\d\d|\d{1,3})m')
 def RemoveColor(InText):
-    if InText!="":
-        InText=InText.replace('\033[0m','')
-        InText=InText.replace('\033[1m','')
-        InText=InText.replace('\033[2m','')
-        InText=InText.replace('\033[4m','')
-        InText=InText.replace('\033[5m','')
-        InText=InText.replace('\033[7m','')
-        InText=InText.replace('\033[8m','')
-        InText=InText.replace('\033[1;90m','')
-        InText=InText.replace('\033[0;90m','')
-        InText=InText.replace('\033[30m','')
-        InText=InText.replace('\033[31m','')
-        InText=InText.replace('\033[32m','')
-        InText=InText.replace('\033[33m','')
-        InText=InText.replace('\033[34m','')
-        InText=InText.replace('\033[35m','')
-        InText=InText.replace('\033[36m','')
-        InText=InText.replace('\033[37m','')
-        InText=InText.replace('\033[0;30m','')
-        InText=InText.replace('\033[0;31m','')
-        InText=InText.replace('\033[0;32m','')
-        InText=InText.replace('\033[0;33m','')
-        InText=InText.replace('\033[0;34m','')
-        InText=InText.replace('\033[0;35m','')
-        InText=InText.replace('\033[0;36m','')
-        InText=InText.replace('\033[0;37m','')
-        InText=InText.replace('\033[1;30m','')
-        InText=InText.replace('\033[1;31m','')
-        InText=InText.replace('\033[1;34m','')
-        InText=InText.replace('\033[1;33m','')
-        InText=InText.replace('\033[1;32m','')
-        InText=InText.replace('\033[1;35m','')
-        InText=InText.replace('\033[1;36m','')
-        InText=InText.replace('\033[1;37m','')
-        InText=InText.replace('\033[4;30m','')
-        InText=InText.replace('\033[4;31m','')
-        InText=InText.replace('\033[4;32m','')
-        InText=InText.replace('\033[4;33m','')
-        InText=InText.replace('\033[4;34m','')
-        InText=InText.replace('\033[4;35m','')
-        InText=InText.replace('\033[4;36m','')
-        InText=InText.replace('\033[4;37m','')
-        InText=InText.replace('\033[0;90m','')
-        InText=InText.replace('\033[0;91m','')
-        InText=InText.replace('\033[0;92m','')
-        InText=InText.replace('\033[0;93m','')
-        InText=InText.replace('\033[0;94m','')
-        InText=InText.replace('\033[0;95m','')
-        InText=InText.replace('\033[0;96m','')
-        InText=InText.replace('\033[0;97m','')
-        InText=InText.replace('\033[1;90m','')
-        InText=InText.replace('\033[1;91m','')
-        InText=InText.replace('\033[1;92m','')
-        InText=InText.replace('\033[1;93m','')
-        InText=InText.replace('\033[1;94m','')
-        InText=InText.replace('\033[1;95m','')
-        InText=InText.replace('\033[1;96m','')
-        InText=InText.replace('\033[1;97m','')
-        InText=InText.replace('\033[40m','')
-        InText=InText.replace('\033[41m','')
-        InText=InText.replace('\033[42m','')
-        InText=InText.replace('\033[43m','')
-        InText=InText.replace('\033[44m','')
-        InText=InText.replace('\033[45m','')
-        InText=InText.replace('\033[46m','')
-        InText=InText.replace('\033[47m','')
-        InText=InText.replace('\033[100m','')
-        InText=InText.replace('\033[101m','')
-        InText=InText.replace('\033[102m','')
-        InText=InText.replace('\033[103m','')
-        InText=InText.replace('\033[104m','')
-        InText=InText.replace('\033[105m','')
-        InText=InText.replace('\033[106m','')
-        InText=InText.replace('\033[107m','')
-    return InText;
+    return color_pattern.sub('', InText)
 
 def BeepSound():
     if __builtin__.ALERTSOUND=="Yes":