From 230d0941f30298130f03cb823a0186acf694a955 Mon Sep 17 00:00:00 2001
From: Phyks <webmaster@phyks.me>
Date: Mon, 5 Aug 2013 14:41:48 +0200
Subject: [PATCH] Images filtering now working + elegant degradation (Tested
 with some feeds)

TODO : Flash filtering
---
 adblock/adblock.plugin.disabled.php | 15 +++++++++------
 adblock/adblock_constants.php       |  2 +-
 adblock/js/adblock_plugin_js.js     |  9 +++++++++
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/adblock/adblock.plugin.disabled.php b/adblock/adblock.plugin.disabled.php
index 88de155..0f08e8a 100755
--- a/adblock/adblock.plugin.disabled.php
+++ b/adblock/adblock.plugin.disabled.php
@@ -75,6 +75,7 @@ function adblock_plugin_treat_events(&$events) {
 
     foreach($events as $event) {
         $filtered_content = ($partial) ? $event->getDescription : $event->getContent();
+        $modified = false;
 
         // Flash handling
         if($filter_flash) {
@@ -104,25 +105,27 @@ function adblock_plugin_treat_events(&$events) {
                 foreach($img_list_in_event as $img) {
                     if(!$elegant_degradation) {
                         $replacement_content = '
-                                <span class="blocked_image">X</span>
+                                <span class="blocked_image" onclick="return adblock_unblock_img(this, \''.$img[1].'\');">X</span>
                             ';
                         $filtered_content = str_replace($img[0], $replacement_content, $filtered_content);
                     }
                     else {
                         $content_size = getimagesize($img[1]); //Index 0 is width, index 1 is height
                         $replacement_content = '
-                                <span class="blocked_image" style="width:'.(int) $content_size[0].'px; height:'.(int) $content_size[1].'px;"></span>
+                                <span class="blocked_image" style="width:'.(int) $content_size[0].'px; height:'.(int) $content_size[1].'px; max-width: 100%;" onclick="return adblock_unblock_img(this, \''.$img[1].'\'):"></span>
                             ';
                         $filtered_content = str_replace($img[0], $replacement_content, $filtered_content);
                     }
                 }
 
-                if($partial)
-                    $event->setDescription($filtered_content);
-                else
-                    $event->setContent($filtered_content);
+                $modified = true;
             }
         }
+
+        if($partial)
+            $event->setDescription($filtered_content);
+        else
+            $event->setContent($filtered_content);
     }
 }
 
diff --git a/adblock/adblock_constants.php b/adblock/adblock_constants.php
index 5e77d8c..f9c8699 100755
--- a/adblock/adblock_constants.php
+++ b/adblock/adblock_constants.php
@@ -5,4 +5,4 @@ img_enabled = 1
 img_block = 1
 img_only_mobiles = 0
 img_list = 
-elegant_degradation = 0
+elegant_degradation = 1
diff --git a/adblock/js/adblock_plugin_js.js b/adblock/js/adblock_plugin_js.js
index ff5e6ab..d6f289a 100644
--- a/adblock/js/adblock_plugin_js.js
+++ b/adblock/js/adblock_plugin_js.js
@@ -4,3 +4,12 @@ function adblock_whitelist_blacklist(id, whitelist_blacklist) {
     else
         document.getElementById(id).innerHTML = "Blacklist :";
 }
+
+function adblock_unblock_img(span, url) {
+    if($(span).html() != "X")
+        return true;
+
+    $(span).html("<img src='"+url+"'/>");
+    $(span).removeClass("blocked_image");
+    return false;
+}