Addresses issue #24

chrome/content/settings.js

@@ -21,6 +21,6 @@
 
 const DB_NAME = 'thundersec.sqlite';
 const API_URL = 'https://www.ilkertemir.com/thundersec/api/v1/';
-const VERSION = '2.0';
+const VERSION = '2.0.1';
 // Send generic stats every two hours
 const STAT_INTERVAL = 2*60*60*1000;

chrome/content/thundersec.js

@@ -1170,7 +1170,7 @@ function pluginMain() {
       // SURBL START
       // Extract hostnames from URLs in e-mail body
       let body = aMimeMsg.prettyString(true, undefined, true);
-      let urlMatch = body.match(/(www\.[^\/\s'"\(\)<>]+)/g);
+      let urlMatch = body.match(/(www\.[a-zA-Z0-9\.\-_]+)/g);
       if (urlMatch) {
           for (let i in urlMatch) {
               // Eliminate http://, https:// and www.
@@ -1181,7 +1181,7 @@ function pluginMain() {
               }
           }
       }
-      urlMatch = body.match(/https?:\/\/([^\/\s'"\(\)<>]+)/g);
+      urlMatch = body.match(/https?:\/\/([a-zA-Z0-9\.\-_]+)/g);
       if (urlMatch) {
           for (let i in urlMatch) {
               // Eliminate http://, https:// and www.

install.rdf

@@ -4,7 +4,7 @@
     <Description about="urn:mozilla:install-manifest">
         <em:type>2</em:type> <!-- 2 : Extension -->
         <em:id>thundersec@community</em:id>
-        <em:version>2.0</em:version>
+        <em:version>2.0.1</em:version>
         <em:name>ThunderSec</em:name>
         <em:description>Provides security features for Mozilla Thunderbird. These include DNSBL and RBL support, DKIM and SPF failure verifications. DNSBL support can be used to leverage Spamhaus, Abuse.ch and other DNSBL/RBL databases, including custom ones.</em:description>
         <em:iconURL>chrome://thundersec/content/images/thundersec.png</em:iconURL>