From 8638f1211f760f26f5926ced4d133d5dea7b6937 Mon Sep 17 00:00:00 2001
From: J0WI <sjw@gmx.ch>
Date: Mon, 20 Jul 2015 04:24:50 +0200
Subject: [PATCH 1/3] buch.ch => Thalia_Holding

---
 src/chrome/content/rules/Thalia_Holding.xml | 72 +++++++++++++++++++++
 src/chrome/content/rules/buch.ch.xml        |  7 --
 2 files changed, 72 insertions(+), 7 deletions(-)
 create mode 100644 src/chrome/content/rules/Thalia_Holding.xml
 delete mode 100644 src/chrome/content/rules/buch.ch.xml

diff --git a/src/chrome/content/rules/Thalia_Holding.xml b/src/chrome/content/rules/Thalia_Holding.xml
new file mode 100644
index 000000000000..1d3506a6d533
--- /dev/null
+++ b/src/chrome/content/rules/Thalia_Holding.xml
@@ -0,0 +1,72 @@
+<!--
+ 	Missmatch:
+		- images.bol.de *
+		- images.buch.de *
+		- images.thalia.de *
+		- media.buch.de *
+
+		* Rewrite to www.buch.de fails sometimes:
+
+	Refused:
+		- blog.buch.de
+		- unternehmen.thalia.de
+		- ^buch.de
+		
+
+	Wrong content:
+		- ^thalia.ch
+-->
+<ruleset name="Thalia Holding">
+	<target host="bol.de"/>
+	<target host="www.bol.de"/>
+	<target host="images.bol.de"/>
+	<target host="img.bol.de"/>
+	<target host="books.ch"/>
+	<target host="www.books.ch"/>
+	<target host="img.books.ch"/>
+	<target host="buch.ch"/>
+	<target host="www.buch.ch"/>
+	<target host="img.buch.ch"/>
+	<target host="buch.de"/>
+	<target host="www.buch.de"/>
+	<target host="images.buch.de"/>
+	<target host="img.buch.de"/>
+	<target host="leseprobe.buch.de"/>
+	<target host="media.buch.de"/>
+	<target host="ssl.buch.de"/>
+	<target host="thalia.at"/>
+	<target host="www.thalia.at"/>
+	<target host="img.thalia.at"/>
+	<target host="thalia.ch"/>
+	<target host="www.thalia.ch"/>
+	<target host="img.thalia.ch"/>
+	<target host="thalia.de"/>
+	<target host="www.thalia.de"/>
+	<target host="images.thalia.de"/>
+	<target host="img.thalia.de"/>
+
+	<exclusion pattern="^http://media\.buch\.de/alexandria/"/>
+	<exclusion pattern="^http://images\.buch\.de/leseproben/"/>
+	<exclusion pattern="^http://images\.buch\.de/md21/"/>
+	<exclusion pattern="^http://images\.thalia\.de/md37/"/>
+
+	<test url="http://media.buch.de/alexandria/thalia_test/000008951137-00-1.jpg"/>
+	<test url="http://images.buch.de/leseproben/874/541/12_9783442541874.pdf"/>
+	<test url="http://images.buch.de/md21/Pix2015/Portalseite/miles-and-more-logo-startseite.png"/>
+	<test url="http://images.thalia.de/md37/lp2015/Sommer/sommer_stempel_thalia_10.png"/>
+
+	<rule from="^http://images.bol.de/"
+		to="https://www.bol.de/"/>
+	<rule from="^http://images.buch.de/"
+		to="https://www.buch.de/"/>
+	<rule from="^http://media.buch.de/"
+		to="https://www.buch.de/"/>
+	<rule from="^http://images.thalia.de/"
+		to="https://www.buch.de/"/>
+	<rule from="^http://buch.de/"
+		to="https://www.buch.de/"/>
+	<rule from="^http://thalia.ch/"
+		to="https://www.thalia.ch/"/>
+	<rule from="^http:"
+		to="https:"/>
+</ruleset>
diff --git a/src/chrome/content/rules/buch.ch.xml b/src/chrome/content/rules/buch.ch.xml
deleted file mode 100644
index 0a9beffa8dd7..000000000000
--- a/src/chrome/content/rules/buch.ch.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<ruleset name="buch.ch">
-	<target host="buch.ch"/>
-	<target host="www.buch.ch"/>
-
-	<rule from="^http://(?:www\.)?buch\.ch/"
-		to="https://www.buch.ch/"/>
-</ruleset>

From a946ec605f9ffb24d257ebd87e554680559ec3d8 Mon Sep 17 00:00:00 2001
From: jowi <sjw@gmx.ch>
Date: Mon, 3 Aug 2015 16:48:58 +0200
Subject: [PATCH 2/3] coment out critical part

---
 src/chrome/content/rules/Thalia_Holding.xml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/chrome/content/rules/Thalia_Holding.xml b/src/chrome/content/rules/Thalia_Holding.xml
index 1d3506a6d533..8b0dff29704e 100644
--- a/src/chrome/content/rules/Thalia_Holding.xml
+++ b/src/chrome/content/rules/Thalia_Holding.xml
@@ -15,11 +15,13 @@
 
 	Wrong content:
 		- ^thalia.ch
+
+	Mixed content:
+		- various images served from images.*
 -->
-<ruleset name="Thalia Holding">
+<ruleset name="Thalia Holding" platform="mixedcontent">
 	<target host="bol.de"/>
 	<target host="www.bol.de"/>
-	<target host="images.bol.de"/>
 	<target host="img.bol.de"/>
 	<target host="books.ch"/>
 	<target host="www.books.ch"/>
@@ -29,10 +31,8 @@
 	<target host="img.buch.ch"/>
 	<target host="buch.de"/>
 	<target host="www.buch.de"/>
-	<target host="images.buch.de"/>
 	<target host="img.buch.de"/>
 	<target host="leseprobe.buch.de"/>
-	<target host="media.buch.de"/>
 	<target host="ssl.buch.de"/>
 	<target host="thalia.at"/>
 	<target host="www.thalia.at"/>
@@ -42,9 +42,16 @@
 	<target host="img.thalia.ch"/>
 	<target host="thalia.de"/>
 	<target host="www.thalia.de"/>
-	<target host="images.thalia.de"/>
 	<target host="img.thalia.de"/>
 
+	<!--
+	Trying to rewrite mismatched domains to buch.de, but this
+	fails for some images. Commented out for future work.
+
+	<target host="images.bol.de"/>
+	<target host="images.buch.de"/>
+	<target host="images.thalia.de"/>
+	<target host="media.buch.de"/>
 	<exclusion pattern="^http://media\.buch\.de/alexandria/"/>
 	<exclusion pattern="^http://images\.buch\.de/leseproben/"/>
 	<exclusion pattern="^http://images\.buch\.de/md21/"/>
@@ -63,6 +70,8 @@
 		to="https://www.buch.de/"/>
 	<rule from="^http://images.thalia.de/"
 		to="https://www.buch.de/"/>
+	-->
+
 	<rule from="^http://buch.de/"
 		to="https://www.buch.de/"/>
 	<rule from="^http://thalia.ch/"

From d1f0bef6e5aabdd1549a48823d4fd723a00a5efe Mon Sep 17 00:00:00 2001
From: J0WI <sjw@gmx.ch>
Date: Mon, 3 Aug 2015 18:54:45 +0200
Subject: [PATCH 3/3] Update Thalia_Holding.xml

---
 src/chrome/content/rules/Thalia_Holding.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/chrome/content/rules/Thalia_Holding.xml b/src/chrome/content/rules/Thalia_Holding.xml
index 8b0dff29704e..0727acbeac22 100644
--- a/src/chrome/content/rules/Thalia_Holding.xml
+++ b/src/chrome/content/rules/Thalia_Holding.xml
@@ -62,19 +62,19 @@
 	<test url="http://images.buch.de/md21/Pix2015/Portalseite/miles-and-more-logo-startseite.png"/>
 	<test url="http://images.thalia.de/md37/lp2015/Sommer/sommer_stempel_thalia_10.png"/>
 
-	<rule from="^http://images.bol.de/"
+	<rule from="^http://images\.bol\.de/"
 		to="https://www.bol.de/"/>
-	<rule from="^http://images.buch.de/"
+	<rule from="^http://images\.buch\.de/"
 		to="https://www.buch.de/"/>
-	<rule from="^http://media.buch.de/"
+	<rule from="^http://media\.buch\.de/"
 		to="https://www.buch.de/"/>
-	<rule from="^http://images.thalia.de/"
+	<rule from="^http://images\.thalia\.de/"
 		to="https://www.buch.de/"/>
 	-->
 
-	<rule from="^http://buch.de/"
+	<rule from="^http://buch\.de/"
 		to="https://www.buch.de/"/>
-	<rule from="^http://thalia.ch/"
+	<rule from="^http://thalia\.ch/"
 		to="https://www.thalia.ch/"/>
 	<rule from="^http:"
 		to="https:"/>