share: markup cleanup

4 years ago · 4325c30a3f
parent 273ada7353
commit 4325c30a3f
1 changed files with 65 additions and 83 deletions
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@ -96,7 +96,7 @@ class Share extends Plugin {
 				$id = $row["ref_id"];
 				$owner_uid = $row["owner_uid"];

-				print $this->format_article($id, $owner_uid);
+				$this->format_article($id, $owner_uid);

 				return;
 			}
@ -125,8 +125,6 @@ class Share extends Plugin {
 			WHERE	id = ? AND ref_id = id AND owner_uid = ?");
 		$sth->execute([$id, $owner_uid]);

-		$rv = '';
-
 		if ($line = $sth->fetch()) {

 			$line["tags"] = Article::_get_tags($id, $owner_uid, $line["tag_cache"]);
@ -142,16 +140,24 @@ class Share extends Plugin {
 				},
 				$line);

+			$enclosures = Article::_get_enclosures($line["id"]);
+			list ($og_image, $og_stream) = Article::_get_image($enclosures, $line['content'], $line["site_url"]);
+
+			$content_decoded = html_entity_decode($line["title"], ENT_NOQUOTES | ENT_HTML401);
+			$parsed_updated = TimeHelper::make_local_datetime($line["updated"], true, $owner_uid, true);
+
 			$line['content'] = DiskCache::rewrite_urls($line['content']);

-			header("Content-Type: text/html");
+			ob_start();

-            $rv .= "<!DOCTYPE html>
-                    <html><head>
+			?>
+			<!DOCTYPE html>
+			<html>
+				<head>
 					<meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>
-                    <title>".$line["title"]."</title>".
-					javascript_tag("lib/prototype.js").
-					javascript_tag("js/utility.js")."
+					<title><?= $line["title"] ?></title>
+					<?= javascript_tag("lib/prototype.js") ?>
+					<?= javascript_tag("js/utility.js") ?>
 					<style type='text/css'>
 						@media (prefers-color-scheme: dark) {
 						body {
@ -163,76 +169,52 @@ class Share extends Plugin {
 					}
 					</style>
 					<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 .= "<meta property='og:title' content=\"".htmlspecialchars(html_entity_decode($line["title"], ENT_NOQUOTES | ENT_HTML401))."\"/>\n";
-            $rv .= "<meta property='og:description' content=\"".
-                htmlspecialchars(
+					<meta property='og:title' content="<?= htmlspecialchars($content_decoded) ?>">
+					<meta property='og:description' content="<?= htmlspecialchars(
 						truncate_string(
 							preg_replace("/[\r\n\t]/", "",
 							preg_replace("/ {1,}/", " ",
-								strip_tags(html_entity_decode($line["content"], ENT_NOQUOTES | ENT_HTML401))
+								strip_tags($content_decoded)
 							)
-					), 500, "...")
-				)."\"/>\n";
-
-            $rv .= "</head>";
-
-				$enclosures = Article::_get_enclosures($line["id"]);
-            list ($og_image, $og_stream) = Article::_get_image($enclosures, $line['content'], $line["site_url"]);
-
-            if ($og_image) {
-                $rv .= "<meta property='og:image' content=\"" . htmlspecialchars($og_image) . "\"/>";
-            }
-
-            $rv .= "<body class='flat ttrss_utility ttrss_zoom css_loading'>";
-            $rv .= "<div class='container'>";
-
-			if ($line["link"]) {
-				$rv .= "<h1><a target='_blank' rel='noopener noreferrer'
-					title=\"".htmlspecialchars($line['title'])."\"
-					href=\"" .htmlspecialchars($line["link"]) . "\">" .	$line["title"] . "</a></h1>";
-			} else {
-				$rv .= "<h1>" . $line["title"] . "</h1>";
-			}
-
-			$rv .= "<div class='content post'>";
-
-			/* header */
-
-			$rv .= "<div class='header'>";
-			$rv .= "<div class='row'>"; # row
-
-			//$entry_author = $line["author"] ? " - " . $line["author"] : "";
-			$parsed_updated = TimeHelper::make_local_datetime($line["updated"], true,
-				$owner_uid, true);
-
-			$rv .= "<div>".$line['author']."</div>";
-            $rv .= "<div>$parsed_updated</div>";
-
-			$rv .= "</div>"; # row
-
-			$rv .= "</div>"; # header
-
-			/* content */
-
-			$lang = $line['lang'] ? $line['lang'] : "en";
-			$rv .= "<div class='content' lang='$lang'>";
-
-			/* content body */
-
-			$rv .= $line["content"];
-
-         /*  $rv .= Article::format_article_enclosures($id,
-                $line["always_display_enclosures"],
-                $line["content"],
-                $line["hide_images"]); */
-
-			$rv .= "</div>"; # content
+						), 500, "...")) ?>">
+				</head>
+
+				<?php if ($og_image) { ?>
+					<meta property='og:image' content="<?= htmlspecialchars($og_image) ?>">
+				<?php } ?>
+
+				<body class='flat ttrss_utility ttrss_zoom css_loading'>
+					<div class='container'>
+
+					<?php if (!empty($line["link"])) { ?>
+						<h1>
+							<a target='_blank' rel='noopener noreferrer'
+								href="<?= htmlspecialchars($line["link"]) ?>"><?= htmlspecialchars($line["title"]) ?></a>
+						</h1>
+					<?php } else { ?>
+						<h1><?= $line["title"] ?></h1>
+					<?php } ?>
+
+					<div class='content post'>
+						<div class='header'>
+							<div class='row'>
+								<div><?= $line['author'] ?></div>
+								<div><?= $parsed_updated ?></div>
+							</div>
+						</div>

-			$rv .= "</div>"; # post
+						<div class='content' lang="<?= $line['lang'] ? $line['lang'] : "en" ?>">
+							<?= $line["content"] ?>
+						</div>
+					</div>
+				</body>
+			</html>
+			<?php

-		}
+			$rv = ob_get_contents();
+			ob_end_clean();

 			PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_FORMAT_ARTICLE,
 			function ($result) use (&$rv) {
@ -240,8 +222,8 @@ class Share extends Plugin {
 			},
 			$rv, $line);

-		return $rv;
-
+			print $rv;
+		}
 	}

 	function shareDialog() {