From 7373d784ae0a6a99259c137c15c308b2ed2ffad7 Mon Sep 17 00:00:00 2001
From: Phyks <webmaster@phyks.me>
Date: Sun, 4 Aug 2013 20:53:49 +0200
Subject: [PATCH] Continuing settings page, now handling flash_list and
 img_list and mobiles_only option

---
 adblock.plugin.disabled.php | 33 ++++++++++++++++++++++++---------
 adblock_constants.php       |  2 +-
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/adblock.plugin.disabled.php b/adblock.plugin.disabled.php
index 1e9f6b3..04a6f69 100755
--- a/adblock.plugin.disabled.php
+++ b/adblock.plugin.disabled.php
@@ -22,9 +22,9 @@ function adblock_plugin_setting_link(&$myUser) {
 
 function adblock_plugin_setting_bloc(&$myUser) {
     $adblock_constants = file_get_contents('plugins/adblock/adblock_constants.php');
-
     $adblock_constants = explode("\n", $adblock_constants);
 
+    $adblock_params = array();
     foreach($adblock_constants as $adblock_constant) {
         if(trim($adblock_constant) != "") {
             $adblock_constant = explode("=", $adblock_constant);
@@ -32,17 +32,27 @@ function adblock_plugin_setting_bloc(&$myUser) {
         }
     }
 
-    $flash_enabled = ($adblock_params["flash_enabled"] == "1") ? true : false;
-    $flash_block = ($adblock_params["flash_block"] == "1") ? true : false;
-    $flash_list = "";
-    $img_enabled = ($adblock_params["img_enabled"] == "1") ? true : false;
-    $img_block = ($adblock_params["img_block"] == "1") ? true : false;
-    $img_list = "";
+
+    $flash_enabled = (isset($adblock_params["flash_enabled"]) && $adblock_params["flash_enabled"] == "1") ? true : false;
+    $flash_block = (isset($adblock_params["flash_block"]) && $adblock_params["flash_block"] == "1") ? true : false;
+    if(isset($adblock_params["flash_list"]))
+        $flash_list = str_replace(",", "\n", $adblock_params["flash_list"]);
+    else
+        $flash_list = "";
+    $img_enabled = (isset($adblock_params["img_enabled"]) && $adblock_params["img_enabled"] == "1") ? true : false;
+    $img_only_mobiles = (isset($adblock_params["img_only_mobiles"]) && $adblock_params["img_only_mobiles"] == 1) ? true : false;
+    $img_block = (isset($adblock_params["img_block"]) && $adblock_params["img_block"] == "1") ? true : false;
+    if(isset($adblock_params["img_list"]))
+        $img_list = str_replace(",", "\n", $adblock_params["img_list"]);
+    else
+        $img_list = "";
 
     echo '
         <section id="adblockSettingsBloc">
             <form action="action.php?action=adblock_update" method="POST">
                 <h2>Plugin Adblock</h2>
+                <p><em>Note : </em><br/>
+                    You must enter a list of id of feeds in the blacklist / whitelist fields. This list must be one id per line. You can find the id of the feed you want in the address bar on the page of the feed in Leed  (http://LEED_URL/index.php?action=selectedFeed&feed=ID).</p>
                 <fieldset>
                     <div class="flash_adblockSettingsBlock">
                         <h3>Flash embedded contents :</h3>
@@ -76,6 +86,11 @@ function adblock_plugin_setting_bloc(&$myUser) {
                             <input type="radio" name="img_adblock_default_behavior" value="0" id="img_adblock_allowall" onchange="adblock_whitelist_blacklist(\'adblock_img_whitelist_blacklist\', 0);" '.((!$img_block) ? 'checked="checked"' : '').'/><label for="img_adblock_allowall">Allow all contents (and use a blacklist)</label>
                         </p>
 
+                        <p>Block images only on mobile devices ?<br/>
+                            <input type="radio" name="img_adblock_only_mobiles" value="1" id="img_adblock_only_mobiles_yes" '.(($img_only_mobiles) ? 'checked="checked"' : '').'/><label for="img_adblock_only_mobiles_yes">Only block images on mobile devices</label><br/>
+                            <input type="radio" name="img_adblock_only_mobiles" value="0" id="img_adblock_only_mobiles_no" '.((!$img_only_mobiles) ? 'checked="checked"' : '').'/><label for="img_adblock_only_mobiles_no">Block images on all devices</label>
+                        </p>
+
                         <p><span id="adblock_img_whitelist_blacklist">'.(($img_block) ? 'Blacklist :' : 'Whitelist :').'</span></br>
                         <textarea name="img_adblock_list" rows="7">'.$img_list.'</textarea>
                     </div>
@@ -90,11 +105,11 @@ function adblock_plugin_setting_bloc(&$myUser) {
 function adblock_plugin_setting_update($_) {
     if($_['action'] == 'adblock_update') {
         $flash_enabled = int($_['flash_adblock_enable']);
-        $flash_block = int($_['flash_adblock_default_behavior'])
+        $flash_block = int($_['flash_adblock_default_behavior']);
         $flash_list = '';
 
         $img_enabled = int($_['img_adblock_enable']);
-        $img_block = int($_['img_adblock_default_behavior'])
+        $img_block = int($_['img_adblock_default_behavior']);
         $img_list = '';
 
         if(file_put_contents("plugins/adblock/adblock_constants.php", 'flash_enabled = '.$flash_enabled.'\nflash_block = '.$flash_block.'\nflash_list = '.$flash_list.'\nimg_enabled = '.$img_enabled.'\nimg_block = '.$img_block.'\nimg_list = '.$img_list))
diff --git a/adblock_constants.php b/adblock_constants.php
index f8ac677..db8870b 100644
--- a/adblock_constants.php
+++ b/adblock_constants.php
@@ -1,6 +1,6 @@
 flash_enabled = 1
 flash_block = 1
-flash_list = 
+flash_list = 1,2,3
 img_enabled = 1
 img_block = 1
 img_only_mobiles =