public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-19 00:41:30 +00:00
Code Issues Releases Wiki Activity

remove FEED_CRYPT_KEY and everything related to it

Browse Source 
always assume auth_pass_encrypted is false
This commit is contained in:
Andrew Dolgov
2018-08-13 15:59:24 +03:00
parent eb43d9f4a8
commit 069aea5989
7 changed files with 5 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
classes/rssutils.php
View File

@@ -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';