diff options
author | Andrew Dolgov <[email protected]> | 2018-08-13 15:59:24 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2018-08-13 15:59:24 +0300 |
commit | 069aea5989ec7fe4090cf3f1151f99476fa038be (patch) | |
tree | 23c48c13d8baf5d9dc72e2c7fe6615e2ae32d6c6 /classes | |
parent | eb43d9f4a8a8609b7f30ef4e2add425b9c91fe00 (diff) |
remove FEED_CRYPT_KEY and everything related to it
always assume auth_pass_encrypted is false
Diffstat (limited to 'classes')
-rwxr-xr-x | classes/pref/feeds.php | 10 | ||||
-rwxr-xr-x | classes/rssutils.php | 19 |
2 files changed, 3 insertions, 26 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 459fbbe2a..4c9574cd2 100755 --- 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'; diff --git a/classes/rssutils.php b/classes/rssutils.php index af5fd057c..bd20a6b48 100755 --- a/classes/rssutils.php +++ b/classes/rssutils.php @@ -218,24 +218,15 @@ class RSSUtils { $pdo = Db::pdo(); - $sth = $pdo->prepare("SELECT owner_uid,feed_url,auth_pass,auth_login,auth_pass_encrypted + $sth = $pdo->prepare("SELECT owner_uid,feed_url,auth_pass,auth_login FROM ttrss_feeds WHERE id = ?"); $sth->execute([$feed]); if ($row = $sth->fetch()) { $owner_uid = $row["owner_uid"]; - - $auth_pass_encrypted = $row["auth_pass_encrypted"]; - $auth_login = $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); - } - $fetch_url = $row["feed_url"]; $pluginhost = new PluginHost(); @@ -347,7 +338,6 @@ class RSSUtils { $owner_uid = $row["owner_uid"]; $mark_unread_on_update = $row["mark_unread_on_update"]; - $auth_pass_encrypted = $row["auth_pass_encrypted"]; $sth = $pdo->prepare("UPDATE ttrss_feeds SET last_update_started = NOW() WHERE id = ?"); @@ -355,16 +345,11 @@ class RSSUtils { $auth_login = $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); - } - $stored_last_modified = $row["last_modified"]; $last_unconditional = $row["last_unconditional"]; $cache_images = $row["cache_images"]; $fetch_url = $row["feed_url"]; + $feed_language = mb_strtolower($row["feed_language"]); if (!$feed_language) $feed_language = 'english'; |