Browse Source

digest: add ARTICLE_LABELS

Andrew Dolgov 7 months ago
parent
commit
da1b3e3ba1
3 changed files with 17 additions and 4 deletions
  1. 4 3
      classes/backend.php
  2. 11 0
      classes/digest.php
  3. 2 1
      templates/digest_template_html.txt

+ 4 - 3
classes/backend.php

@@ -11,9 +11,10 @@ class Backend extends Handler {
 
 		$rv = Digest::prepare_headlines_digest($_SESSION['uid'], 1, 1000);
 
-		$rv[3] = "<pre>" . $rv[3] . "</pre>";
-
-		print_r($rv);
+		print "<h1>HTML</h1>";
+		print $rv[0];
+		print "<h1>Plain text</h1>";
+		print "<pre>".$rv[3]."</pre>";
 	}
 
 	private function display_main_help() {

+ 11 - 0
classes/digest.php

@@ -166,6 +166,15 @@ class Digest
 				$line['feed_title'] = $line['cat_title'] . " / " . $line['feed_title'];
 			}
 
+			$article_labels = Article::get_article_labels($line["ref_id"], $user_id);
+			$article_labels_formatted = "";
+
+			if (is_array($article_labels) && count($article_labels) > 0) {
+				$article_labels_formatted = implode(", ", array_map(function($a) {
+					return $a[1];
+				}, $article_labels));
+			}
+
 			$tpl->setVariable('FEED_TITLE', $line["feed_title"]);
 			$tpl->setVariable('ARTICLE_TITLE', $line["title"]);
 			$tpl->setVariable('ARTICLE_LINK', $line["link"]);
@@ -174,6 +183,7 @@ class Digest
 				truncate_string(strip_tags($line["content"]), 300));
 //			$tpl->setVariable('ARTICLE_CONTENT',
 //				strip_tags($article_content));
+			$tpl->setVariable('ARTICLE_LABELS', $article_labels_formatted, true);
 
 			$tpl->addBlock('article');
 
@@ -181,6 +191,7 @@ class Digest
 			$tpl_t->setVariable('ARTICLE_TITLE', $line["title"]);
 			$tpl_t->setVariable('ARTICLE_LINK', $line["link"]);
 			$tpl_t->setVariable('ARTICLE_UPDATED', $updated);
+			$tpl_t->setVariable('ARTICLE_LABELS', $article_labels_formatted, true);
 //			$tpl_t->setVariable('ARTICLE_EXCERPT',
 //				truncate_string(strip_tags($line["excerpt"]), 100));
 

+ 2 - 1
templates/digest_template_html.txt

@@ -6,7 +6,8 @@
 
 <ul>
 <!-- $BeginBlock article -->
-<li><a href="${ARTICLE_LINK}">${ARTICLE_TITLE}</a> - ${ARTICLE_UPDATED}
+<li><a href="${ARTICLE_LINK}">${ARTICLE_TITLE}</a> &mdash; <strong>${ARTICLE_UPDATED}</strong>
+<div style='font-style : italic'>${ARTICLE_LABELS}</div>
 <div style='color : gray'>${ARTICLE_EXCERPT}</div>
 <!-- $EndBlock article -->
 </ul>