rewrite per-feed/global strip images to strip media

[tt-rss.git] / classes / pref / feeds.php

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 459fbbe2ac05e47943816ed99011d47cdf43f4e3..817966e11f895d09f8c06fca8cf27946f611c90c 100755 (executable)
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -513,8 +513,6 @@ class Pref_Feeds extends Handler_Protected {
                        print '<div dojoType="dijit.layout.TabContainer" style="height : 450px">
                        <div dojoType="dijit.layout.ContentPane" title="'.__('General').'">';
 
-                       $auth_pass_encrypted = $row["auth_pass_encrypted"];
-
                        $title = htmlspecialchars($row["title"]);
 
                        print_hidden("id", "$feed_id");
@@ -615,14 +613,8 @@ class Pref_Feeds extends Handler_Protected {
                        print "</div>";
 
                        $auth_login = htmlspecialchars($row["auth_login"]);
-                       $auth_pass = $row["auth_pass"];
-
-                       if ($auth_pass_encrypted && function_exists("mcrypt_decrypt")) {
-                               require_once "crypt.php";
-                               $auth_pass = decrypt_string($auth_pass);
-                       }
+                       $auth_pass = htmlspecialchars($row["auth_pass"]);
 
-                       $auth_pass = htmlspecialchars($auth_pass);
                        $auth_enabled = $auth_login !== '' || $auth_pass !== '';
 
                        $auth_style = $auth_enabled ? '' : 'display: none';
@@ -705,7 +697,7 @@ class Pref_Feeds extends Handler_Protected {
                        print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"hide_images\"
                name=\"hide_images\"
                        $checked>&nbsp;<label for=\"hide_images\">".
-                               __('Do not embed images')."</label>";
+                               __('Do not embed media')."</label>";
 
                        $cache_images = $row["cache_images"];
 
@@ -896,7 +888,7 @@ class Pref_Feeds extends Handler_Protected {
                        name=\"hide_images\"
                        dojoType=\"dijit.form.CheckBox\">&nbsp;<label class='insensitive' id=\"hide_images_l\"
                        for=\"hide_images\">".
-               __('Do not embed images')."</label>";
+               __('Do not embed media')."</label>";
 
                print "&nbsp;"; $this->batch_edit_cbox("hide_images", "hide_images_l");