From 0524b2a7cdc406dddc6adb456c9c6c69fde744a3 Mon Sep 17 00:00:00 2001
From: nullius <nullius@nym.zone>
Date: Tue, 2 Jan 2018 04:42:22 +0000
Subject: Import 1.0.8.6 from a.m.o. Closes #10.

---
 src/setwhitelist.js | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'src/setwhitelist.js')

diff --git a/src/setwhitelist.js b/src/setwhitelist.js
index 33148cc5..a0e7305d 100644
--- a/src/setwhitelist.js
+++ b/src/setwhitelist.js
@@ -5,7 +5,7 @@ e.preventDefault();
 // check each line and remove bad fqdn (simple check)
 var cf_tmpdata=document.querySelector("#myset_cfwhite").value.split("\n");
 for (var i=0;i<cf_tmpdata.length;i++){
-if (!/^([0-9a-z.-]{1,})\.([a-z]{2,20})$/.test(cf_tmpdata[i])||cf_tmpdata[i].startsWith(".")||cf_tmpdata[i].includes("..")||
+if (!/^([0-9a-z.-]{1,})\.([a-z]{2,20})$/.test(cf_tmpdata[i])||cf_tmpdata[i].includes("..")||
 cf_tmpdata[i].endsWith(".cloudflare.com")||cf_tmpdata[i]=='cloudflare.com'||
 cf_tmpdata[i].endsWith(".incapsula.com")||cf_tmpdata[i]=='incapsula.com'||
 cf_tmpdata[i].endsWith(".withgoogle.com")||cf_tmpdata[i].endsWith(".google.com")){cf_tmpdata[i]='';}
@@ -13,17 +13,18 @@ cf_tmpdata[i].endsWith(".withgoogle.com")||cf_tmpdata[i].endsWith(".google.com")
 cf_tmpdata=cf_tmpdata.slice().sort(function(a,b){return a>b}).reduce(function(a,b){if (a.slice(-1)[0]!==b){a.push(b);};return a;},[]);// -duplicate
 cf_tmpdata=cf_tmpdata.filter(v=>v!='');// -empty
 cf_tmpdata=cf_tmpdata.join("\n");
-browser.storage.local.set({myset_cfwhite: cf_tmpdata});
-document.querySelector("#myset_cfwhite").value=cf_tmpdata;
-//workaround - simplewarn didn't work as expected if igncj is active
-if (document.querySelector("#myset_xsimplewarn").checked){document.querySelector("#myset_xigncj").checked=false;}
+browser.storage.local.set({myset_cfwhite: cf_tmpdata});document.querySelector("#myset_cfwhite").value=cf_tmpdata;
+//workaround - simplewarn didn't work as expected if ign3p is active
+if (document.querySelector("#myset_xsimplewarn_1").checked){document.querySelector("#myset_xign3p").checked=false;}
 //ADVANCED
 if (document.querySelector("#myset_xincapsula").checked){browser.storage.local.set({myset_xincapsula: "y"});}else{browser.storage.local.set({myset_xincapsula: "n"});}
 if (document.querySelector("#myset_xgshield").checked){browser.storage.local.set({myset_xgshield: "y"});}else{browser.storage.local.set({myset_xgshield: "n"});}
 if (document.querySelector("#myset_xsucuri").checked){browser.storage.local.set({myset_xsucuri: "y"});}else{browser.storage.local.set({myset_xsucuri: "n"});}
-if (document.querySelector("#myset_xignhttp").checked){browser.storage.local.set({myset_xignhttp: "y"});}else{browser.storage.local.set({myset_xignhttp: "n"});}
-if (document.querySelector("#myset_xigncj").checked){browser.storage.local.set({myset_xigncj: "y"});}else{browser.storage.local.set({myset_xigncj: "n"});}
-if (document.querySelector("#myset_xsimplewarn").checked){browser.storage.local.set({myset_xsimplewarn: "y"});}else{browser.storage.local.set({myset_xsimplewarn: "n"});}
+if (document.querySelector("#myset_xign3p").checked){browser.storage.local.set({myset_xign3p: "y"});}else{browser.storage.local.set({myset_xign3p: "n"});}
+//ACTION
+if (document.querySelector("#myset_xsimplewarn_0").checked){browser.storage.local.set({myset_xsimplewarn:0});}
+if (document.querySelector("#myset_xsimplewarn_1").checked){browser.storage.local.set({myset_xsimplewarn:1});}
+if (document.querySelector("#myset_xsimplewarn_2").checked){browser.storage.local.set({myset_xsimplewarn:2});}
 browser.runtime.sendMessage({relnow:'go'}).then(function(r){},onError);
 }
 function loadWhitelist(){
@@ -34,9 +35,12 @@ document.querySelector("#myset_cfwhite").value = r.myset_cfwhite||"";
 if (r.myset_xincapsula=='y'){document.querySelector("#myset_xincapsula").checked=true;}else{document.querySelector("#myset_xincapsula").checked=false;}
 if (r.myset_xgshield=='y'){document.querySelector("#myset_xgshield").checked=true;}else{document.querySelector("#myset_xgshield").checked=false;}
 if (r.myset_xsucuri=='y'){document.querySelector("#myset_xsucuri").checked=true;}else{document.querySelector("#myset_xsucuri").checked=false;}
-if (r.myset_xignhttp=='y'){document.querySelector("#myset_xignhttp").checked=true;}else{document.querySelector("#myset_xignhttp").checked=false;}
-if (r.myset_xigncj=='y'){document.querySelector("#myset_xigncj").checked=true;}else{document.querySelector("#myset_xigncj").checked=false;}
-if (r.myset_xsimplewarn=='y'){document.querySelector("#myset_xsimplewarn").checked=true;}else{document.querySelector("#myset_xsimplewarn").checked=false;}
+if (r.myset_xign3p=='y'){document.querySelector("#myset_xign3p").checked=true;}else{document.querySelector("#myset_xign3p").checked=false;}
+if (r.myset_xsimplewarn){switch(r.myset_xsimplewarn){
+case 1:document.querySelector("#myset_xsimplewarn_1").checked=true;break;
+case 2:document.querySelector("#myset_xsimplewarn_2").checked=true;break;
+default:document.querySelector("#myset_xsimplewarn_0").checked=true;break;
+}}else{document.querySelector("#myset_xsimplewarn_0").checked=true;}
 }
 var getting=browser.storage.local.get();
 getting.then(setCurrentChoice, onError);
-- 
cgit v1.2.3