From dd35cad62a6574143940f4879083d9e80f5a4e88 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 1 Feb 2018 19:52:40 -0800
Subject: some feed cleanup

---
 Zotlabs/Module/Display.php | 17 +++++++++--------
 include/feedutils.php      | 35 +++++++++--------------------------
 view/tpl/atom_feed.tpl     |  2 +-
 3 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php
index 6d895feb5..11dd0d174 100644
--- a/Zotlabs/Module/Display.php
+++ b/Zotlabs/Module/Display.php
@@ -343,14 +343,15 @@ class Display extends \Zotlabs\Web\Controller {
 		case 'atom':
 
 			$atom = replace_macros(get_markup_template('atom_feed.tpl'), array(
-				'$version'      => xmlify(\Zotlabs\Lib\System::get_project_version()),
-				'$red'          => xmlify(\Zotlabs\Lib\System::get_platform_name()),
-				'$feed_id'      => xmlify(\App::$cmd),
-				'$feed_title'   => xmlify(t('Article')),
-				'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now', ATOM_TIME)),
-				'$author'       => '',
-				'$owner'        => '',
-				'$profile_page' => xmlify(z_root() . '/display/' . $target_item['mid']),
+				'$version'       => xmlify(\Zotlabs\Lib\System::get_project_version()),
+				'$generator'     => xmlify(\Zotlabs\Lib\System::get_platform_name()),
+				'$generator_uri' => 'https://hubzilla.org',
+				'$feed_id'       => xmlify(\App::$cmd),
+				'$feed_title'    => xmlify(t('Article')),
+				'$feed_updated'  => xmlify(datetime_convert('UTC', 'UTC', 'now', ATOM_TIME)),
+				'$author'        => '',
+				'$owner'         => '',
+				'$profile_page'  => xmlify(z_root() . '/display/' . $target_item['mid']),
 			));
 				
 			$x = [ 'xml' => $atom, 'channel' => $channel, 'observer_hash' => $observer_hash, 'params' => $params ];
diff --git a/include/feedutils.php b/include/feedutils.php
index 5e48cb1ee..03124443c 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -15,15 +15,6 @@
  */
 function get_public_feed($channel, $params) {
 
-/*	$type      = 'xml';
-	$begin     = NULL_DATE;
-	$end       = '';
-	$start     = 0;
-	$records   = 40;
-	$direction = 'desc';
-	$pages     = 0;
-*/
-
 	if(! $params)
 		$params = [];
 
@@ -106,23 +97,15 @@ function get_feed_for($channel, $observer_hash, $params) {
 	$owner = atom_render_author('zot:owner',$channel);
 
 	$atom .= replace_macros($feed_template, array(
-		'$version'      => xmlify(Zotlabs\Lib\System::get_project_version()),
-		'$red'          => xmlify(Zotlabs\Lib\System::get_platform_name()),
-		'$feed_id'      => xmlify($channel['xchan_url']),
-		'$feed_title'   => xmlify($channel['channel_name']),
-		'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now', ATOM_TIME)),
-		'$author'       => $feed_author,
-		'$owner'        => $owner,
-		'$name'         => xmlify($channel['channel_name']),
-		'$profile_page' => xmlify($channel['xchan_url']),
-		'$mimephoto'    => xmlify($channel['xchan_photo_mimetype']),
-		'$photo'        => xmlify($channel['xchan_photo_l']),
-		'$thumb'        => xmlify($channel['xchan_photo_m']),
-		'$picdate'      => '',
-		'$uridate'      => '',
-		'$namdate'      => '',
-		'$birthday'     => '',
-		'$community'    => '',
+		'$version'       => xmlify(Zotlabs\Lib\System::get_project_version()),
+		'$generator'     => xmlify(Zotlabs\Lib\System::get_platform_name()),
+		'$generator_uri' => 'https://hubzilla.org',
+		'$feed_id'       => xmlify($channel['xchan_url']),
+		'$feed_title'    => xmlify($channel['channel_name']),
+		'$feed_updated'  => xmlify(datetime_convert('UTC', 'UTC', 'now', ATOM_TIME)),
+		'$author'        => $feed_author,
+		'$owner'         => $owner,
+		'$profile_page'  => xmlify($channel['xchan_url']),
 	));
 
 
diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl
index b1e92cdbf..8dc145ae9 100755
--- a/view/tpl/atom_feed.tpl
+++ b/view/tpl/atom_feed.tpl
@@ -13,7 +13,7 @@
 
   <id>{{$feed_id}}</id>
   <title>{{$feed_title}}</title>
-  <generator uri="http://hubzilla.org" version="{{$version}}">{{$red}}</generator>
+  <generator uri="{{$generator_uri}}" version="{{$version}}">{{$generator}}</generator>
   <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
   {{if $profile_page}}
   <link rel="alternate" type="text/html" href="{{$profile_page}}" />
-- 
cgit v1.2.3