[Salsa Labs] Cosmetics

EFForg · Jan 25, 2014 · 5505d17 · 5505d17
1 parent 33bd6d9
commit 5505d17
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/src/chrome/content/rules/Salsa-Labs.xml b/src/chrome/content/rules/Salsa-Labs.xml
@@ -5,29 +5,26 @@
 
 -->
 <ruleset name="Salsa Labs">
-	<target host="salsalabs.com" />
-	<target host="*.salsalabs.com" />
+
 	<target host="salsacommons.org" />
 	<target host="www.salsacommons.org" />
+	<target host="salsalabs.com" />
+	<target host="*.salsalabs.com" />
 	<target host="wiredforchange.com" />
 	<target host="*.wiredforchange.com" />
 
-	<securecookie host="(?:.+\.)?(salsalabs|wiredforchange)\.com$"
-			name=".*" />
 
-	<rule from="^http://(www\.)?salsalabs\.com/"
-		to="https://$1salsalabs.com/" />
-	<rule from="^http://([a-zA-Z0-9\-]+)\.salsalabs\.com/"
-		to="https://$1.salsalabs.com/" />
+	<securecookie host="^(?:.+\.)?(?:salsalabs|wiredforchange)\.com$"
+			name=".+" />
+
+
+	<rule from="^http://([\w-]+\.)?(salsalabs|wiredforchange)\.com/"
+		to="https://$1$2.com/" />
 
 	<rule from="^http://(?:www\.)?salsacommons\.org/+(?=$|\?)"
 		to="https://www.salsalabs.com/commons" />
 
 	<rule from="^http://(?:www\.)?salsacommons\.org/+"
 		to="https://www.salsalabs.com/" />
 
-	<rule from="^http://([a-zA-Z0-9\-]+)\.wiredforchange\.com/"
-		to="https://$1.wiredforchange.com/" />
-	<rule from="^http://(www\.)?wiredforchange\.com/"
-		to="https://$1wiredforchange.com/" />
 </ruleset>