From a77a47332cd70059486e5888bc5987ce516dcf5b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 2 Dec 2017 11:42:42 +0300 Subject: [PATCH] opml host, update: use PDO --- opml.php | 12 +++++----- update.php | 65 ++++++++++++++++++++++++++++++++---------------------- 2 files changed, 46 insertions(+), 31 deletions(-) diff --git a/opml.php b/opml.php index af3694051..bdee88e08 100644 --- a/opml.php +++ b/opml.php @@ -15,14 +15,16 @@ $op = $_REQUEST['op']; if ($op == "publish"){ - $key = db_escape_string( $_REQUEST["key"]); + $key = $_REQUEST["key"]; + $pdo = Db::pdo(); - $result = db_query( "SELECT owner_uid + $sth = $pdo->prepare( "SELECT owner_uid FROM ttrss_access_keys WHERE - access_key = '$key' AND feed_id = 'OPML:Publish'"); + access_key = ? AND feed_id = 'OPML:Publish'"); + $sth->execute([$key]); - if (db_num_rows($result) == 1) { - $owner_uid = db_fetch_result($result, 0, "owner_uid"); + if ($row = $sth->fetch()) { + $owner_uid = $row['owner_uid']; $opml = new Opml($_REQUEST); $opml->opml_export("", $owner_uid, true, false); diff --git a/update.php b/update.php index 7104f760a..22dded675 100755 --- a/update.php +++ b/update.php @@ -17,6 +17,8 @@ if (!defined('PHP_EXECUTABLE')) define('PHP_EXECUTABLE', '/usr/bin/php'); + $pdo = Db::pdo(); + init_plugins(); $longopts = array("feeds", @@ -159,8 +161,8 @@ if (isset($options["force-update"])) { _debug("marking all feeds as needing update..."); - db_query( "UPDATE ttrss_feeds SET last_update_started = '1970-01-01', - last_updated = '1970-01-01'"); + $pdo->query( "UPDATE ttrss_feeds SET + last_update_started = '1970-01-01', last_updated = '1970-01-01'"); } if (isset($options["feeds"])) { @@ -218,16 +220,16 @@ _debug("clearing existing indexes..."); if (DB_TYPE == "pgsql") { - $result = db_query( "SELECT relname FROM + $sth = $pdo->query( "SELECT relname FROM pg_catalog.pg_class WHERE relname LIKE 'ttrss_%' AND relname NOT LIKE '%_pkey' AND relkind = 'i'"); } else { - $result = db_query( "SELECT index_name,table_name FROM + $sth = $pdo->query( "SELECT index_name,table_name FROM information_schema.statistics WHERE index_name LIKE 'ttrss_%'"); } - while ($line = db_fetch_assoc($result)) { + while ($line = $sth->fetch()) { if (DB_TYPE == "pgsql") { $statement = "DROP INDEX " . $line["relname"]; _debug($statement); @@ -236,7 +238,7 @@ $line['table_name']." DROP INDEX ".$line['index_name']; _debug($statement); } - db_query( $statement, false); + $pdo->query($statement); } _debug("reading indexes from schema for: " . DB_TYPE); @@ -253,7 +255,7 @@ $statement = "CREATE INDEX $index ON $table"; _debug($statement); - db_query( $statement); + $pdo->query($statement); } } fclose($fp); @@ -272,11 +274,11 @@ _debug("converting filters..."); - db_query( "DELETE FROM ttrss_filters2"); + $pdo->query("DELETE FROM ttrss_filters2"); - $result = db_query( "SELECT * FROM ttrss_filters ORDER BY id"); + $res = $pdo->query("SELECT * FROM ttrss_filters ORDER BY id"); - while ($line = db_fetch_assoc($result)) { + while ($line = $res->fetch()) { $owner_uid = $line["owner_uid"]; // date filters are removed @@ -346,28 +348,36 @@ if (isset($options["gen-search-idx"])) { echo "Generating search index (stemming set to English)...\n"; - $result = db_query("SELECT COUNT(id) AS count FROM ttrss_entries WHERE tsvector_combined IS NULL"); - $count = db_fetch_result($result, 0, "count"); + $res = $pdo->query("SELECT COUNT(id) AS count FROM ttrss_entries WHERE tsvector_combined IS NULL"); + $row = $res->fetch(); + $count = $row['count']; print "Articles to process: $count.\n"; $limit = 500; $processed = 0; + $sth = $pdo->prepare("SELECT id, title, content FROM ttrss_entries WHERE + tsvector_combined IS NULL ORDER BY id LIMIT ?"); + $sth->execute([$limit]); + + $usth = $pdo->prepare("UPDATE ttrss_entries + SET tsvector_combined = to_tsvector('english', ?) WHERE id = ?"); + while (true) { - $result = db_query("SELECT id, title, content FROM ttrss_entries WHERE tsvector_combined IS NULL ORDER BY id LIMIT $limit"); - while ($line = db_fetch_assoc($result)) { - $tsvector_combined = db_escape_string(mb_substr($line['title'] . ' ' . strip_tags(str_replace('<', ' <', $line['content'])), - 0, 1000000)); + while ($line = $sth->fetch()) { + $tsvector_combined = mb_substr($line['title'] . ' ' . strip_tags(str_replace('<', ' <', $line['content'])), + 0, 1000000); - db_query("UPDATE ttrss_entries SET tsvector_combined = to_tsvector('english', '$tsvector_combined') WHERE id = " . $line["id"]); + $usth->execute([$tsvector_combined, $line['id']]); + + $processed++; } - $processed += db_num_rows($result); print "Processed $processed articles...\n"; - if (db_num_rows($result) != $limit) { + if ($processed < $limit) { echo "All done.\n"; break; } @@ -410,31 +420,34 @@ } if (isset($options["decrypt-feeds"])) { - $result = db_query("SELECT id, auth_pass FROM ttrss_feeds WHERE auth_pass_encrypted = true"); if (!function_exists("mcrypt_decrypt")) { _debug("mcrypt functions not available."); return; } + $res = $pdo->query("SELECT id, auth_pass FROM ttrss_feeds WHERE auth_pass_encrypted = true"); + require_once "crypt.php"; $total = 0; - db_query("BEGIN"); + $pdo->beginTransaction(); - while ($line = db_fetch_assoc($result)) { + $usth = $pdo->prepare("UPDATE ttrss_feeds SET auth_pass_encrypted = false, auth_pass = ? + WHERE id = ?"); + + while ($line = $res->fetch()) { _debug("processing feed id " . $line["id"]); - $auth_pass = db_escape_string(decrypt_string($line["auth_pass"])); + $auth_pass = decrypt_string($line["auth_pass"]); - db_query("UPDATE ttrss_feeds SET auth_pass_encrypted = false, auth_pass = '$auth_pass' - WHERE id = " . $line["id"]); + $usth->execute([$auth_pass, $line['id']]); ++$total; } - db_query("COMMIT"); + $pdo->commit(); _debug("$total feeds processed."); }