Merge pull request #1842 from Thraxis/FIX#1292

FIX#1292 Masking NZB API Keys in logs

sickbeard/logger.py

@@ -62,7 +62,7 @@ class CensoredFormatter(logging.Formatter, object):
             if v and len(v) > 0 and v in msg:
                 msg = msg.replace(v, len(v) * '*')
         # Needed because Newznab apikey isn't stored as key=value in a section.
-        msg = re.sub('apikey\=[^\&]*\&','apikey\=**********\&', msg)
+        msg = re.sub(r'(r|apikey|api_key)=[^&]*([&\w]?)',r'\1=**********\2', msg)
         return msg