oops, remove useless db_escape_string() in article class (and nsfw plugin)

[tt-rss.git] / classes / article.php
diff --git a/classes/article.php b/classes/article.php

old mode 100644 (file)

new mode 100755 (executable)

index 7430fac..075da19
--- a/classes/article.php
+++ b/classes/article.php
@@ -126,7 +126,7 @@ class Article extends Handler_Protected {
                 if (filter_var($url, FILTER_VALIDATE_URL) === FALSE) return false;
  
                 $pdo = Db::pdo();
-               
+
                 $pdo->beginTransaction();
  
                 // only check for our user data here, others might have shared this with different content etc
@@ -309,7 +309,7 @@ class Article extends Handler_Protected {
  
                                 if ($tag != '') {
                                         $sth = $this->pdo->prepare("INSERT INTO ttrss_tags
-                                                               (post_int_id, owner_uid, tag_name) 
+                                                               (post_int_id, owner_uid, tag_name)
                                                                 VALUES (?, ?, ?)");
  
                                         $sth->execute([$int_id, $_SESSION['uid'], $tag]);
@@ -372,8 +372,7 @@ class Article extends Handler_Protected {
                 $ids = explode(",", clean($_REQUEST["ids"]));
                 $label_id = clean($_REQUEST["lid"]);
  
-               $label = db_escape_string(Labels::find_caption($label_id,
-               $_SESSION["uid"]));
+               $label = Labels::find_caption($label_id, $_SESSION["uid"]);
  
                 $reply["info-for-headlines"] = array();
  
@@ -610,6 +609,8 @@ class Article extends Handler_Protected {
                                 $line = $p->hook_render_article($line);
                         }
  
+                       $line['content'] = rewrite_cached_urls($line['content']);
+
                         $num_comments = (int) $line["num_comments"];
                         $entry_comments = "";
  
@@ -629,16 +630,52 @@ class Article extends Handler_Protected {
                                 }
                         }
  
+                       $enclosures = self::get_article_enclosures($line["id"]);
+
                         if ($zoom_mode) {
                                 header("Content-Type: text/html");
-                               $rv['content'] .= "<html><head>
+                               $rv['content'] .= "<!DOCTYPE html>
+                                               <html><head>
                                                 <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
                                                 <title>".$line["title"]."</title>".
                                                 stylesheet_tag("css/default.css")."
                                                 <link rel=\"shortcut icon\" type=\"image/png\" href=\"images/favicon.png\">
-                                               <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">
+                                               <link rel=\"icon\" type=\"image/png\" sizes=\"72x72\" href=\"images/favicon-72px.png\">";
+
+                               $rv['content'] .= "<meta property=\"og:title\" content=\"".htmlspecialchars($line["title"])."\"/>\n";
+                               $rv['content'] .= "<meta property=\"og:site_name\" content=\"".htmlspecialchars($line["feed_title"])."\"/>\n";
+                               $rv['content'] .= "<meta property=\"og:description\" content=\"".
+                                       htmlspecialchars(truncate_string(strip_tags($line["content"]), 500, "..."))."\"/>\n";
+
+                               $rv['content'] .= "</head>";
+
+                               $og_image = false;
+
+                               foreach ($enclosures as $enc) {
+                                       if (strpos($enc["content_type"], "image/") !== FALSE) {
+                                               $og_image = $enc["content_url"];
+                                               break;
+                                       }
+                               }
+
+                               if (!$og_image) {
+                                       $tmpdoc = new DOMDocument();
  
-                                       </head><body class=\"claro ttrss_utility ttrss_zoom\">";
+                                       if (@$tmpdoc->loadHTML(mb_substr($line["content"], 0, 131070))) {
+                                               $tmpxpath = new DOMXPath($tmpdoc);
+                                               $first_img = $tmpxpath->query("//img")->item(0);
+
+                                               if ($first_img) {
+                                                       $og_image = $first_img->getAttribute("src");
+                                               }
+                                       }
+                               }
+
+                               if ($og_image) {
+                                       $rv['content'] .= "<meta property=\"og:image\" content=\"" . htmlspecialchars($og_image) . "\"/>";
+                               }
+
+                               $rv['content'] .= "<body class=\"claro ttrss_utility ttrss_zoom\">";
                         }
  
                         $rv['content'] .= "<div class=\"postReply\" id=\"POST-$id\">";
@@ -791,7 +828,7 @@ class Article extends Handler_Protected {
                 $pdo = Db::pdo();
  
                 $sth = $pdo->prepare("SELECT DISTINCT tag_name,
-                       owner_uid as owner FROM ttrss_tags 
+                       owner_uid as owner FROM ttrss_tags
                         WHERE post_int_id = (SELECT int_id FROM ttrss_user_entries WHERE
                         ref_id = ? AND owner_uid = ? LIMIT 1) ORDER BY tag_name");
  
@@ -903,9 +940,14 @@ class Article extends Handler_Protected {
  
                 // purge orphaned posts in main content table
  
+               if (DB_TYPE == "mysql")
+                       $limit_qpart = "LIMIT 5000";
+               else
+                       $limit_qpart = "";
+
                 $pdo = Db::pdo();
                 $res = $pdo->query("DELETE FROM ttrss_entries WHERE
-                       NOT EXISTS (SELECT ref_id FROM ttrss_user_entries WHERE ref_id = id) LIMIT 5000");
+                       NOT EXISTS (SELECT ref_id FROM ttrss_user_entries WHERE ref_id = id) $limit_qpart");
  
                 if ($do_output) {
                         $rows = $res->rowCount();