PR

2021-09-13 05:07:52 +00:00 · 2021-09-13 05:07:52 +00:00 · fda2fd5445
parent 7e6758032d 1ab9f532c7
commit fda2fd5445
24 changed files with 258 additions and 219 deletions
--- a/addons/code/bcma/cf.js
+++ b/addons/code/bcma/cf.js
@ -12,14 +12,6 @@ let my_cf_collection = [],
 	my_xcs_a1 = false,
 	my_xcs_a2 = false,
 	my_nfo_lang = 'eo';
-const trans = {
-	'eo': {
-		'detemi': 'Minaco Detektita',
-		'cflrmi': 'Cloudflare Detektita',
-		'virus': "Atentivelo: Severa\nAgo: Blokita\nDomajno: ",
-		'redir': "Redirektu al alternativa URL.\n\nDomajno: "
-	}
-};
 function get_realdomain(w) {
 	let wa = w.split('.');
 	let wa_l = wa.length;
@ -1105,14 +1097,14 @@ function update_icon(tid, url) {
 	});
 	return;
 }
-function tell_me(ok, mgT, mgD) {
+function notify_me(ok, hn) {
 	if (ok) {
 		browser.notifications.clear(infobox);
 		browser.notifications.create(infobox, {
 			'type': 'basic',
 			'iconUrl': browser.runtime.getURL('icons/cf_1.png'),
-			'title': mgT + '  [' + ((new Date()).toLocaleString()) + ']',
-			'message': mgD
+			'title': 'Cloudflare!  [' + ((new Date()).toLocaleString()) + ']',
+			'message': hn
 		});
 	}
 }
@ -1178,7 +1170,7 @@ browser.webRequest.onHeadersReceived.addListener(function (wr) {
 		}
 		console.log('BCMA: Block Cloudflare RH', wr_hostname);
 		if (my_action == 0 || my_action == 1) {
-			tell_me(my_nfo_cfd, trans['eo']['detemi'], trans['eo']['virus'] + wr_hostname);
+			notify_me(my_nfo_cfd, wr_hostname);
 			if (wr.type == 'image') {
 				return {
 					redirectUrl: 'data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgAAACwAAAAAAQABAAACAkQBADs='
@ -1190,13 +1182,13 @@ browser.webRequest.onHeadersReceived.addListener(function (wr) {
 			}
 		}
 		if (my_action == 2) {
-			tell_me(my_nfo_alu, trans['eo']['cflrmi'], trans['eo']['redir'] + wr_hostname);
+			notify_me(my_nfo_alu, wr_hostname);
 			return {
 				redirectUrl: 'https://web.archive.org/web/' + wr.url
 			};
 		}
 		if (my_action == 4) {
-			tell_me(my_nfo_alu, trans['eo']['cflrmi'], trans['eo']['redir'] + wr_hostname);
+			notify_me(my_nfo_alu, wr_hostname);
 			return {
 				redirectUrl: my_customurl.replace('%%URL%%', wr.url).replace('%%ERL%%', encodeURIComponent(wr.url))
 			};
@ -1239,7 +1231,7 @@ browser.webRequest.onBeforeRequest.addListener(function (wr) {
 	if (cf_is) {
 		console.log('BCMA: Block Cloudflare BR', wr_hostname);
 		if (my_action == 0 || my_action == 1) {
-			tell_me(my_nfo_cfd, trans['eo']['detemi'], trans['eo']['virus'] + wr_hostname);
+			notify_me(my_nfo_cfd, wr_hostname);
 			if (wr.type == 'image') {
 				return {
 					redirectUrl: 'data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgAAACwAAAAAAQABAAACAkQBADs='
@ -1251,13 +1243,13 @@ browser.webRequest.onBeforeRequest.addListener(function (wr) {
 			}
 		}
 		if (my_action == 2) {
-			tell_me(my_nfo_alu, trans['eo']['cflrmi'], trans['eo']['redir'] + wr_hostname);
+			notify_me(my_nfo_alu, wr_hostname);
 			return {
 				redirectUrl: 'https://web.archive.org/web/' + wr.url
 			};
 		}
 		if (my_action == 4) {
-			tell_me(my_nfo_alu, trans['eo']['cflrmi'], trans['eo']['redir'] + wr_hostname);
+			notify_me(my_nfo_alu, wr_hostname);
 			return {
 				redirectUrl: my_customurl.replace('%%URL%%', wr.url).replace('%%ERL%%', encodeURIComponent(wr.url))
 			};
--- a/addons/code/bcma/cg.html
+++ b/addons/code/bcma/cg.html
@ -20,7 +20,7 @@
      <input type="text" id="vau" spellcheck="false" value="" placeholder="ekz. https://mia.ekzemplo.net/proxy?url=%%URL%%">
      <button type="button" id="aus">  <span transk="apply"></span>  </button>
      &nbsp;<br>&nbsp;<br>
-      <b>&#128276; <span transk="notify"></span> (Esperanto)</b><br>
+      <b>&#128276; <span transk="notify"></span></b><br>
      <label><input type="checkbox" id="nnf1"> <span transk="notif1"></span></label><br>
      <label><input type="checkbox" id="nnf2"> <span transk="notif2"></span></label>
      &nbsp;<br>&nbsp;<br>
@ -144,14 +144,15 @@
         <option value="xh">xh | isiXhosa</option>
         <option value="yi">yi | אידיש</option>
         <option value="yo">yo | Èdè Yorùbá</option>
-         <option value="zh">zh | 汉语</option>
-         <option value="zt">zt | 漢語</option>
+         <option value="zh">zh | 简体</option>
+         <option value="zt">zt | 繁體</option>
         <option value="zu">zu | isiZulu</option>
      </select>
      &nbsp;<br>&nbsp;<br>
      <b>&#128218; <span transk="useflik"></span></b><br>
      <ul>
         <li><a id="toolim" target="_blank"><span transk="tsmitm"></span></a></li>
+         <li><a href="http://altlink.crimeflare.eu.org/" target="_blank">🙅🌩🔗</a></li>
      </ul>
      &nbsp;<br>
      <script src="cg.js"></script>
--- a/addons/code/bcma/cg.js
+++ b/addons/code/bcma/cg.js
@ -7,7 +7,7 @@ document.addEventListener('DOMContentLoaded', () => {
 				x.innerText = j[x.getAttribute('transk')];
 			});
 		});
-		document.getElementById('toolim').href = 'https://sercxi.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/ss/tool_qdb.php?ul=' + r[5];
+		document.getElementById('toolim').href = 'https://sercxi.eu.org/ss/tool_qdb.php?ul=' + r[5];
 		document.getElementById('t').value = JSON.parse(r[0]).join("\n");
 		document.getElementById('g').value = JSON.parse(r[1]).join("\n");
 		document.getElementById('vau').value = r[3];
--- a/addons/code/bcma/manifest.json
+++ b/addons/code/bcma/manifest.json
@ -1,56 +1,56 @@
 {
-   "manifest_version": 2,
-   "name": "Bloku Cloudflaron MITM-Atakon",
-   "description": "Submetiĝu al tutmonda gvatado aŭ rezistu",
-   "version": "1.0.6",
-   "homepage_url": "http://crimeflare.eu.org/",
-   "author": "Crimeflare #Addon",
-   "permissions": [
-      "<all_urls>",
-      "activeTab",
-      "tabs",
-      "webRequest",
-      "webRequestBlocking",
-      "webNavigation",
-      "notifications",
-      "storage",
-      "unlimitedStorage"
-   ],
-   "icons": {
-      "72": "icons/72.png"
-   },
-   "background": {
-      "scripts": [
-         "cf.js"
-      ]
-   },
-   "content_scripts": [
-      {
-         "matches": [
-            "http://*/*",
-            "https://*/*"
-         ],
-         "js": [
-            "cs.js"
-         ],
-         "run_at": "document_end"
-      }
-   ],
-   "options_ui": {
-      "browser_style": true,
-      "page": "cg.html"
-   },
-   "browser_action": {
-      "browser_style": true,
-      "default_icon": {
-         "32": "icons/cf_0.png"
-      }
-   },
-   "applications": {
-      "gecko": {
-         "id": "bcma@searxes.eu.org",
-         "strict_min_version": "78.0",
-         "update_url": "https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/addon.php?for=bcma"
-      }
-   }
+  "manifest_version": 2,
+  "name": "Bloku Cloudflaron MITM-Atakon",
+  "description": "Submeti\u011du al tutmonda gvatado a\u016d rezistu",
+  "version": "1.0.7",
+  "homepage_url": "http://crimeflare.eu.org/",
+  "author": "Crimeflare",
+  "permissions": [
+    "<all_urls>",
+    "activeTab",
+    "tabs",
+    "webRequest",
+    "webRequestBlocking",
+    "webNavigation",
+    "notifications",
+    "storage",
+    "unlimitedStorage"
+  ],
+  "icons": {
+    "72": "icons/72.png"
+  },
+  "background": {
+    "scripts": [
+      "cf.js"
+    ]
+  },
+  "content_scripts": [
+    {
+      "matches": [
+        "http://*/*",
+        "https://*/*"
+      ],
+      "js": [
+        "cs.js"
+      ],
+      "run_at": "document_end"
+    }
+  ],
+  "options_ui": {
+    "browser_style": true,
+    "page": "cg.html"
+  },
+  "browser_action": {
+    "browser_style": true,
+    "default_icon": {
+      "32": "icons/cf_0.png"
+    }
+  },
+  "applications": {
+    "gecko": {
+      "id": "bcma@searxes.eu.org",
+      "strict_min_version": "78.0",
+      "update_url": "https://api.sercxi.eu.org/_/addon.php?for=bcma"
+    }
+  }
 }
--- a/addons/code/isattlink/bg.js
+++ b/addons/code/isattlink/bg.js
@ -2,7 +2,7 @@ let localUse = false,
 	localDB = [],
 	timr, memcache = {},
 	forcePurge = false,
-	apiurl = 'https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/is_antitor.php';
+	apiurl = 'https://0.0.0.0/';
 function is_hostile(f) {
 	if (localUse) {
 		return new Promise((g, b) => {
@ -74,7 +74,7 @@ function forget_cache() {
 			'alt': (g.alt == 'y' ? 'y' : 'n')
 		});
 		browser.storage.local.set({
-			'cep': (g.cep != undefined ? g.cep : '2')
+			'cep': (g.cep != undefined ? g.cep : '3')
 		});
 		browser.storage.local.set({
 			'mul': (g.mul != undefined ? g.mul : 'eo')
@ -107,6 +107,9 @@ browser.storage.local.get(['lastU', 'lastV', 'ldb', 'opd', 'cep']).then(g => {
 		case '2':
 			apiurl = 'http://im5wixghmfmt7gf7wb4xrgdm6byx2gj26zn47da6nwo7xvybgxnqryid.onion/api/is_at.php';
 			break;
+		case '3':
+			apiurl = 'https://karma.clearnetonion.eu.org/api/is_at.php';
+			break;
 		default:
 			apiurl = 'https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/is_antitor.php';
 			break;
@ -129,7 +132,7 @@ browser.storage.local.get(['lastU', 'lastV', 'ldb', 'opd', 'cep']).then(g => {
 					'alt': (g.alt == 'y' ? 'y' : 'n')
 				});
 				browser.storage.local.set({
-					'cep': (g.cep != undefined ? g.cep : '2')
+					'cep': (g.cep != undefined ? g.cep : '3')
 				});
 				browser.storage.local.set({
 					'mul': (g.mul != undefined ? g.mul : 'eo')
@ -169,7 +172,7 @@ browser.storage.local.get(['lastU', 'lastV', 'ldb', 'opd', 'cep']).then(g => {
 				'alt': (g.alt == 'y' ? 'y' : 'n')
 			});
 			browser.storage.local.set({
-				'cep': (g.cep != undefined ? g.cep : '2')
+				'cep': (g.cep != undefined ? g.cep : '3')
 			});
 			browser.storage.local.set({
 				'mul': (g.mul != undefined ? g.mul : 'eo')
@ -246,6 +249,12 @@ browser.runtime.onMessage.addListener((requests, sender, sendResponse) => {
 					});
 					apiurl = 'http://im5wixghmfmt7gf7wb4xrgdm6byx2gj26zn47da6nwo7xvybgxnqryid.onion/api/is_at.php';
 					break;
+				case 'urltype,3':
+					browser.storage.local.set({
+						'cep': '3'
+					});
+					apiurl = 'https://karma.clearnetonion.eu.org/api/is_at.php';
+					break;
 			}
 			return;
 		}
--- a/addons/code/isattlink/cfg.html
+++ b/addons/code/isattlink/cfg.html
@ -13,7 +13,8 @@
      <label><input type="radio" name="opm" id="opon"> <span tek="opmon"></span></label><br>
      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut0"> api.~.onion</label>  [ &rarr; <a id="apinfo0" target="_blank">Ss API</a> ]<br>
      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut1"> api.sercxi.eu.org</label>  [ &rarr; <a id="apinfo1" target="_blank">Ss API</a> ]<br>
-      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut2"> karma.onion</label>  [ &rarr; <a id="apinfo2" target="_blank">Karma API</a> ]<br>
+      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut2"> karma.onion</label>  [ &rarr; <a href="http://im5wixghmfmt7gf7wb4xrgdm6byx2gj26zn47da6nwo7xvybgxnqryid.onion/api/is_at.php" target="_blank">Karma API</a> ]<br>
+      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut3"> karma.clearnetonion.eu.org</label>  [ &rarr; <a href="https://karma.clearnetonion.eu.org/api/is_at.php" target="_blank">Karma API</a> ]<br>
      <label><input type="radio" name="opm" id="opoff"> <span tek="opmoff"></span></label>  [ &rarr; <a href="./localdb.html" target="_blank"><span tek="opmode"></span></a> ]<br>
      <br>&nbsp;<br>
      &#128172; 
@ -125,8 +126,8 @@
         <option value="xh">xh | isiXhosa</option>
         <option value="yi">yi | אידיש</option>
         <option value="yo">yo | Èdè Yorùbá</option>
-         <option value="zh">zh | 汉语</option>
-         <option value="zt">zt | 漢語</option>
+         <option value="zh">zh | 简体</option>
+         <option value="zt">zt | 繁體</option>
         <option value="zu">zu | isiZulu</option>
      </select>
      <br>&nbsp;<br>&nbsp;<br>
--- a/addons/code/isattlink/cg.js
+++ b/addons/code/isattlink/cg.js
@ -11,22 +11,30 @@ document.addEventListener('DOMContentLoaded', () => {
 				document.getElementById('ut0').checked = false;
 				document.getElementById('ut1').checked = true;
 				document.getElementById('ut2').checked = false;
+				document.getElementById('ut3').checked = false;
 				break;
 			case '2':
 				document.getElementById('ut0').checked = false;
 				document.getElementById('ut1').checked = false;
 				document.getElementById('ut2').checked = true;
+				document.getElementById('ut3').checked = false;
+				break;
+			case '3':
+				document.getElementById('ut0').checked = false;
+				document.getElementById('ut1').checked = false;
+				document.getElementById('ut2').checked = false;
+				document.getElementById('ut3').checked = true;
 				break;
 			default:
 				document.getElementById('ut0').checked = true;
 				document.getElementById('ut1').checked = false;
 				document.getElementById('ut2').checked = false;
+				document.getElementById('ut3').checked = false;
 				break;
 		}
 		let ul = g.mul || 'eo';
 		document.getElementById('apinfo0').href = 'https://sercxi.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/?ul=' + ul + '#!op=info/api';
 		document.getElementById('apinfo1').href = 'https://sercxi.eu.org/?ul=' + ul + '#!op=info/api';
-		document.getElementById('apinfo2').href = 'http://im5wixghmfmt7gf7wb4xrgdm6byx2gj26zn47da6nwo7xvybgxnqryid.onion/api/is_at.php';
 		fetch('i18n/' + ul + '.json', {
 			method: 'GET'
 		}).then(j => j.json()).then(j => {
@ -96,6 +104,11 @@ document.getElementById('ut2').addEventListener('click', () => {
 		location.reload();
 	});
 });
+document.getElementById('ut3').addEventListener('click', () => {
+	browser.runtime.sendMessage('urltype,3').then(() => {
+		location.reload();
+	});
+});
 document.getElementById('sms').addEventListener('click', () => {
 	document.getElementById('smsa').style.display = 'none';
 	browser.storage.local.get().then(g => {
--- a/addons/code/isattlink/cs.js
+++ b/addons/code/isattlink/cs.js
@ -1,4 +1,4 @@
-if (document.body && !['sercxi.eu.org', 'api.sercxi.eu.org', 'ansero.eu.org'].includes(location.hostname) && !location.hostname.endsWith('.onion')) {
+if (document.body && !/((sercxi|ansero|crimeflare|clearnetonion)\.eu\.org|\.onion)$/.test(location.hostname)) {
 	let cs = (function () {
 		let s = document.createElement('style');
 		document.head.appendChild(s);
@ -1067,7 +1067,7 @@ if (document.body && !['sercxi.eu.org', 'api.sercxi.eu.org', 'ansero.eu.org'].in
 			return wa[1] + '.' + wa[0];
 		}
 		let bdom = get_realdomain(location.hostname),
-			asked = ['', 'sercxi.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion', 'sercxi.eu.org', 'api.sercxi.eu.org', 'ansero.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion', 'ansero.eu.org', 'addons.mozilla.org', 'addons.thunderbird.net', 'web.archive.org', 't.co'];
+			asked = ['', 'addons.mozilla.org', 'addons.thunderbird.net', 'web.archive.org', 'twitter.com','t.co','youtube.com','youtu.be'];
 		if (g.ign1 == 'y') {
 			asked.push(location.hostname);
 		}
@ -1081,7 +1081,7 @@ if (document.body && !['sercxi.eu.org', 'api.sercxi.eu.org', 'ansero.eu.org'].in
 					a.dataset.iatt = aF;
 					if (!asked.includes(aF)) {
 						asked.push(aF);
-						if (!/^(.*)\.(wikipedia\.org|onion|i2p|invalid|test|local|localhost|([0-9]{1,3})|bbs|chan|cyb|dyn|geek|gopher|indy|libre|neo|null|o|oss|oz|parody|pirate|bit|lib|coin|emc|bazar|fur)$/.test(aF) && get_realdomain(aF) != bdom && aF.length >= 4) {
+						if (!/\.(eu\.org|onion|i2p|invalid|test|local|localhost|([0-9]{1,3})|bbs|chan|cyb|dyn|geek|gopher|indy|libre|neo|null|o|oss|oz|parody|pirate|bit|lib|coin|emc|bazar|fur)$/.test(aF) && get_realdomain(aF) != bdom && aF.length >= 4) {
 							unknown.push(aF);
 						}
 					}
--- a/addons/code/isattlink/manifest.json
+++ b/addons/code/isattlink/manifest.json
@ -1,43 +1,43 @@
 {
-   "manifest_version": 2,
-   "name": "Ĉu ĉi tiuj ligoj blokos Tor-uzanton?",
-   "description": "Skanu FQDN uzante la API",
-   "version": "1.0.4.6",
-   "homepage_url": "http://crimeflare.eu.org/",
-   "author": "Crimeflare #Addon",
-   "permissions": [
-      "storage",
-      "unlimitedStorage"
-   ],
-   "icons": {
-      "72": "icons/72.png"
-   },
-   "background": {
-      "scripts": [
-         "bg.js"
-      ]
-   },
-   "content_scripts": [
-      {
-         "matches": [
-            "http://*/*",
-            "https://*/*"
-         ],
-         "js": [
-            "cs.js"
-         ],
-         "run_at": "document_end"
-      }
-   ],
-   "options_ui": {
-      "browser_style": true,
-      "page": "cfg.html"
-   },
-   "applications": {
-      "gecko": {
-         "id": "torwatch@searxes.eu.org",
-         "strict_min_version": "78.0",
-         "update_url": "https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/addon.php?for=isattlink"
-      }
-   }
+  "manifest_version": 2,
+  "name": "\u0108u \u0109i tiuj ligoj blokos Tor-uzanton?",
+  "description": "Skanu FQDN uzante la API",
+  "version": "1.0.5",
+  "homepage_url": "http://crimeflare.eu.org/",
+  "author": "Crimeflare",
+  "permissions": [
+    "storage",
+    "unlimitedStorage"
+  ],
+  "icons": {
+    "72": "icons/72.png"
+  },
+  "background": {
+    "scripts": [
+      "bg.js"
+    ]
+  },
+  "content_scripts": [
+    {
+      "matches": [
+        "http://*/*",
+        "https://*/*"
+      ],
+      "js": [
+        "cs.js"
+      ],
+      "run_at": "document_end"
+    }
+  ],
+  "options_ui": {
+    "browser_style": true,
+    "page": "cfg.html"
+  },
+  "applications": {
+    "gecko": {
+      "id": "torwatch@searxes.eu.org",
+      "strict_min_version": "78.0",
+      "update_url": "https://api.sercxi.eu.org/_/addon.php?for=isattlink"
+    }
+  }
 }
--- a/addons/code/ismitmlink/bg.js
+++ b/addons/code/ismitmlink/bg.js
@ -2,7 +2,7 @@ let localUse = -1,
 	localDB = [],
 	timr, memcache = {},
 	forcePurge = false,
-	apiurl = 'https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/is_mitm.php';
+	apiurl = 'https://0.0.0.0/';
 function get_realdomain(w) {
 	let wa = w.split('.');
 	let wa_l = wa.length;
@ -1141,7 +1141,7 @@ function forget_cache() {
 			'alt': (g.alt == 'y' ? 'y' : 'n')
 		});
 		browser.storage.local.set({
-			'cep': (g.cep != undefined ? g.cep : '2')
+			'cep': (g.cep != undefined ? g.cep : '3')
 		});
 		browser.storage.local.set({
 			'mul': (g.mul != undefined ? g.mul : 'eo')
@ -1183,6 +1183,9 @@ browser.storage.local.get(['lastU', 'lastV', 'ldb', 'opd', 'cep']).then(g => {
 		case '2':
 			apiurl = 'http://im5wixghmfmt7gf7wb4xrgdm6byx2gj26zn47da6nwo7xvybgxnqryid.onion/api/is_cf.php';
 			break;
+		case '3':
+			apiurl = 'https://karma.clearnetonion.eu.org/api/is_cf.php';
+			break;
 		default:
 			apiurl = 'https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/is_mitm.php';
 			break;
@ -1209,7 +1212,7 @@ browser.storage.local.get(['lastU', 'lastV', 'ldb', 'opd', 'cep']).then(g => {
 					'alt': (g.alt == 'y' ? 'y' : 'n')
 				});
 				browser.storage.local.set({
-					'cep': (g.cep != undefined ? g.cep : '2')
+					'cep': (g.cep != undefined ? g.cep : '3')
 				});
 				browser.storage.local.set({
 					'mul': (g.mul != undefined ? g.mul : 'eo')
@ -1252,7 +1255,7 @@ browser.storage.local.get(['lastU', 'lastV', 'ldb', 'opd', 'cep']).then(g => {
 				'alt': (g.alt == 'y' ? 'y' : 'n')
 			});
 			browser.storage.local.set({
-				'cep': (g.cep != undefined ? g.cep : '2')
+				'cep': (g.cep != undefined ? g.cep : '3')
 			});
 			browser.storage.local.set({
 				'mul': (g.mul != undefined ? g.mul : 'eo')
@ -1363,6 +1366,12 @@ browser.runtime.onMessage.addListener((requests, sender, sendResponse) => {
 					});
 					apiurl = 'http://im5wixghmfmt7gf7wb4xrgdm6byx2gj26zn47da6nwo7xvybgxnqryid.onion/api/is_cf.php';
 					break;
+				case 'urltype,3':
+					browser.storage.local.set({
+						'cep': '3'
+					});
+					apiurl = 'https://karma.clearnetonion.eu.org/api/is_cf.php';
+					break;
 			}
 			return;
 		}
--- a/addons/code/ismitmlink/cfg.html
+++ b/addons/code/ismitmlink/cfg.html
@ -14,7 +14,8 @@
      <label><input type="radio" name="opm" id="opon"> <span tek="opmon"></span></label><br>
      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut0"> api.~.onion</label>  [ &rarr; <a id="apinfo0" target="_blank">Ss API</a> ]<br>
      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut1"> api.sercxi.eu.org</label>  [ &rarr; <a id="apinfo1" target="_blank">Ss API</a> ]<br>
-      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut2"> karma.onion</label>  [ &rarr; <a id="apinfo2" target="_blank">Karma API</a> ]<br>
+      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut2"> karma.onion</label>  [ &rarr; <a href="http://im5wixghmfmt7gf7wb4xrgdm6byx2gj26zn47da6nwo7xvybgxnqryid.onion/api/is_cf.php" target="_blank">Karma API</a> ]<br>
+      &nbsp;&nbsp;&nbsp;&nbsp;<label><input type="radio" name="ut" id="ut3"> karma.clearnetonion.eu.org</label>  [ &rarr; <a href="https://karma.clearnetonion.eu.org/api/is_cf.php" target="_blank">Karma API</a> ]<br>
      <label><input type="radio" name="opm" id="opoff"> <span tek="opmoff"></span></label>  [ &rarr; <a href="./localdb.html" target="_blank"><span tek="opmode"></span></a> ]<br>
      <label><input type="radio" name="opm" id="opol"> <span tek="opmoff"></span></label>  (<span tek="opmlrn"></span>)<br>
      <br>&nbsp;<br>
@ -127,8 +128,8 @@
         <option value="xh">xh | isiXhosa</option>
         <option value="yi">yi | אידיש</option>
         <option value="yo">yo | Èdè Yorùbá</option>
-         <option value="zh">zh | 汉语</option>
-         <option value="zt">zt | 漢語</option>
+         <option value="zh">zh | 简体</option>
+         <option value="zt">zt | 繁體</option>
         <option value="zu">zu | isiZulu</option>
      </select>
      <br>&nbsp;<br>&nbsp;<br>
--- a/addons/code/ismitmlink/cg.js
+++ b/addons/code/ismitmlink/cg.js
@ -13,22 +13,30 @@ document.addEventListener('DOMContentLoaded', () => {
 				document.getElementById('ut0').checked = false;
 				document.getElementById('ut1').checked = true;
 				document.getElementById('ut2').checked = false;
+				document.getElementById('ut3').checked = false;
 				break;
 			case '2':
 				document.getElementById('ut0').checked = false;
 				document.getElementById('ut1').checked = false;
 				document.getElementById('ut2').checked = true;
+				document.getElementById('ut3').checked = false;
+				break;
+			case '3':
+				document.getElementById('ut0').checked = false;
+				document.getElementById('ut1').checked = false;
+				document.getElementById('ut2').checked = false;
+				document.getElementById('ut3').checked = true;
 				break;
 			default:
 				document.getElementById('ut0').checked = true;
 				document.getElementById('ut1').checked = false;
 				document.getElementById('ut2').checked = false;
+				document.getElementById('ut3').checked = false;
 				break;
 		}
 		let ul = g.mul || 'eo';
 		document.getElementById('apinfo0').href = 'https://sercxi.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/?ul=' + ul + '#!op=info/api';
 		document.getElementById('apinfo1').href = 'https://sercxi.eu.org/?ul=' + ul + '#!op=info/api';
-		document.getElementById('apinfo2').href = 'http://im5wixghmfmt7gf7wb4xrgdm6byx2gj26zn47da6nwo7xvybgxnqryid.onion/api/is_cf.php';
 		fetch('i18n/' + ul + '.json', {
 			method: 'GET'
 		}).then(j => j.json()).then(j => {
@ -108,6 +116,11 @@ document.getElementById('ut2').addEventListener('click', () => {
 		location.reload();
 	});
 });
+document.getElementById('ut3').addEventListener('click', () => {
+	browser.runtime.sendMessage('urltype,3').then(() => {
+		location.reload();
+	});
+});
 function get_realdomain(w) {
 	let wa = w.split('.');
 	let wa_l = wa.length;
--- a/addons/code/ismitmlink/cs.js
+++ b/addons/code/ismitmlink/cs.js
@ -1,4 +1,4 @@
-if (document.body && !['sercxi.eu.org', 'api.sercxi.eu.org', 'ansero.eu.org'].includes(location.hostname) && !location.hostname.endsWith('.onion')) {
+if (document.body && !/((sercxi|ansero|crimeflare|clearnetonion)\.eu\.org|\.onion)$/.test(location.hostname)) {
 	let cs = (function () {
 		let s = document.createElement('style');
 		document.head.appendChild(s);
@ -13,7 +13,7 @@ if (document.body && !['sercxi.eu.org', 'api.sercxi.eu.org', 'ansero.eu.org'].in
 		cs.insertRule("img[data-mitm=y]:hover{filter:sepia(20%)}", 5);
 	}
 	browser.storage.local.get(['ign1', 'ign2', 'obs', 'dbg', 'alt']).then(g => {
-		let asked = ['', 'sercxi.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion', 'sercxi.eu.org', 'api.sercxi.eu.org', 'ansero.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion', 'ansero.eu.org', 'addons.mozilla.org', 'addons.thunderbird.net', 'web.archive.org', 't.co'];
+		let asked = ['', 'addons.mozilla.org', 'addons.thunderbird.net', 'web.archive.org', 'twitter.com','t.co','youtube.com','youtu.be'];
 		if (g.ign1 == 'y') {
 			asked.push(location.hostname);
 		}
@ -28,7 +28,7 @@ if (document.body && !['sercxi.eu.org', 'api.sercxi.eu.org', 'ansero.eu.org'].in
 					a.dataset.mitm = aF;
 					if (!asked.includes(aF)) {
 						asked.push(aF);
-						if (!/^(.*)\.(wikipedia\.org|onion|i2p|invalid|test|local|localhost|([0-9]{1,3})|bbs|chan|cyb|dyn|geek|gopher|indy|libre|neo|null|o|oss|oz|parody|pirate|bit|lib|coin|emc|bazar|fur)$/.test(aF) && aF.length >= 4) {
+						if (!/\.(eu\.org|onion|i2p|invalid|test|local|localhost|([0-9]{1,3})|bbs|chan|cyb|dyn|geek|gopher|indy|libre|neo|null|o|oss|oz|parody|pirate|bit|lib|coin|emc|bazar|fur)$/.test(aF) && aF.length >= 4) {
 							unknown.push(aF);
 						}
 					}
--- a/addons/code/ismitmlink/manifest.json
+++ b/addons/code/ismitmlink/manifest.json
@ -1,45 +1,45 @@
 {
-   "manifest_version": 2,
-   "name": "Ĉu ligoj estas vundeblaj al MITM-atako?",
-   "description": "Skanu FQDN uzante la API",
-   "version": "1.0.23.6",
-   "homepage_url": "http://crimeflare.eu.org/",
-   "author": "Crimeflare #Addon",
-   "permissions": [
-      "storage",
-      "unlimitedStorage",
-      "webRequest",
-      "<all_urls>"
-   ],
-   "icons": {
-      "72": "icons/72.png"
-   },
-   "background": {
-      "scripts": [
-         "bg.js"
-      ]
-   },
-   "content_scripts": [
-      {
-         "matches": [
-            "http://*/*",
-            "https://*/*"
-         ],
-         "js": [
-            "cs.js"
-         ],
-         "run_at": "document_end"
-      }
-   ],
-   "options_ui": {
-      "browser_style": true,
-      "page": "cfg.html"
-   },
-   "applications": {
-      "gecko": {
-         "id": "ismitmlink@searxes.danwin1210.me",
-         "strict_min_version": "78.0",
-         "update_url": "https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/addon.php?for=ismitmlink"
-      }
-   }
+  "manifest_version": 2,
+  "name": "\u0108u ligoj estas vundeblaj al MITM-atako?",
+  "description": "Skanu FQDN uzante la API",
+  "version": "1.0.24",
+  "homepage_url": "http://crimeflare.eu.org/",
+  "author": "Crimeflare",
+  "permissions": [
+    "storage",
+    "unlimitedStorage",
+    "webRequest",
+    "<all_urls>"
+  ],
+  "icons": {
+    "72": "icons/72.png"
+  },
+  "background": {
+    "scripts": [
+      "bg.js"
+    ]
+  },
+  "content_scripts": [
+    {
+      "matches": [
+        "http://*/*",
+        "https://*/*"
+      ],
+      "js": [
+        "cs.js"
+      ],
+      "run_at": "document_end"
+    }
+  ],
+  "options_ui": {
+    "browser_style": true,
+    "page": "cfg.html"
+  },
+  "applications": {
+    "gecko": {
+      "id": "ismitmlink@searxes.danwin1210.me",
+      "strict_min_version": "78.0",
+      "update_url": "https://api.sercxi.eu.org/_/addon.php?for=ismitmlink"
+    }
+  }
 }
--- a/addons/code/ureject/log.html
+++ b/addons/code/ureject/log.html
@ -125,8 +125,8 @@
         <option value="xh">xh | isiXhosa</option>
         <option value="yi">yi | אידיש</option>
         <option value="yo">yo | Èdè Yorùbá</option>
-         <option value="zh">zh | 汉语</option>
-         <option value="zt">zt | 漢語</option>
+         <option value="zh">zh | 简体</option>
+         <option value="zt">zt | 繁體</option>
         <option value="zu">zu | isiZulu</option>
      </select>
      <script src="log.js"></script>
--- a/addons/code/ureject/manifest.json
+++ b/addons/code/ureject/manifest.json
@ -1,39 +1,39 @@
 {
-   "manifest_version": 2,
-   "name": "Kiu retejo malakceptis min?",
-   "description": "Via retejo malakceptis min, sed mi scias ke mi fartos bone.",
-   "version": "1.0.5.4",
-   "homepage_url": "http://crimeflare.eu.org/",
-   "author": "Crimeflare #Addon",
-   "permissions": [
-      "storage",
-      "webRequest",
-      "<all_urls>"
-   ],
-   "icons": {
+  "manifest_version": 2,
+  "name": "Kiu retejo malakceptis min?",
+  "description": "Via retejo malakceptis min, sed mi scias ke mi fartos bone.",
+  "version": "1.0.6",
+  "homepage_url": "http://crimeflare.eu.org/",
+  "author": "Crimeflare",
+  "permissions": [
+    "storage",
+    "webRequest",
+    "<all_urls>"
+  ],
+  "icons": {
+    "72": "icons/72.png"
+  },
+  "background": {
+    "scripts": [
+      "bg.js"
+    ]
+  },
+  "options_ui": {
+    "browser_style": false,
+    "open_in_tab": true,
+    "page": "log.html"
+  },
+  "browser_action": {
+    "browser_style": true,
+    "default_icon": {
      "72": "icons/72.png"
-   },
-   "background": {
-      "scripts": [
-         "bg.js"
-      ]
-   },
-   "options_ui": {
-      "browser_style": false,
-      "open_in_tab": true,
-      "page": "log.html"
-   },
-   "browser_action": {
-      "browser_style": true,
-      "default_icon": {
-         "72": "icons/72.png"
-      }
-   },
-   "applications": {
-      "gecko": {
-         "id": "urejectme@searxes.eu.org",
-         "strict_min_version": "78.0",
-         "update_url": "https://api.nnpaefp7pkadbxxkhz2agtbv2a4g5sgo2fbmv3i7czaua354334uqqad.onion/_/addon.php?for=ureject"
-      }
-   }
+    }
+  },
+  "applications": {
+    "gecko": {
+      "id": "urejectme@searxes.eu.org",
+      "strict_min_version": "78.0",
+      "update_url": "https://api.sercxi.eu.org/_/addon.php?for=ureject"
+    }
+  }
 }
--- a/addons/releases/bcma.crx
+++ b/addons/releases/bcma.crx
--- a/addons/releases/bcma.xpi
+++ b/addons/releases/bcma.xpi
--- a/addons/releases/isat.crx
+++ b/addons/releases/isat.crx
--- a/addons/releases/isat.xpi
+++ b/addons/releases/isat.xpi
--- a/addons/releases/ismm.crx
+++ b/addons/releases/ismm.crx
--- a/addons/releases/ismm.xpi
+++ b/addons/releases/ismm.xpi
--- a/addons/releases/urjm.crx
+++ b/addons/releases/urjm.crx
--- a/addons/releases/urjm.xpi
+++ b/addons/releases/urjm.xpi