From 4106d50727d5a56ec1442b16e182fbd9acc6b167 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 29 Oct 2011 15:07:43 -0400 Subject: Fixes #3201 updates rss view type for core Elgg --- views/default/annotation/generic_comment.php | 4 +-- views/rss/annotation/default.php | 34 ------------------ views/rss/annotation/generic_comment.php | 33 +++++++++++++++++ views/rss/group/default.php | 54 ++++++++++++++-------------- views/rss/object/creator.php | 8 ----- views/rss/object/default.php | 17 ++++----- views/rss/object/georss.php | 10 ------ views/rss/output/url.php | 2 +- views/rss/page/components/creator.php | 14 ++++++++ views/rss/page/components/georss.php | 15 ++++++++ views/rss/page/default.php | 17 ++++----- views/rss/page/elements/comments.php | 13 +++++++ views/rss/river/item.php | 27 +++++++------- views/rss/search/entity_list.php | 12 ------- views/rss/user/default.php | 43 ++++++++++++---------- 15 files changed, 158 insertions(+), 145 deletions(-) delete mode 100644 views/rss/annotation/default.php create mode 100644 views/rss/annotation/generic_comment.php delete mode 100644 views/rss/object/creator.php delete mode 100644 views/rss/object/georss.php create mode 100644 views/rss/page/components/creator.php create mode 100644 views/rss/page/components/georss.php create mode 100644 views/rss/page/elements/comments.php delete mode 100644 views/rss/search/entity_list.php (limited to 'views') diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php index a4fbf904e..56a06f842 100644 --- a/views/default/annotation/generic_comment.php +++ b/views/default/annotation/generic_comment.php @@ -2,8 +2,8 @@ /** * Elgg generic comment view * - * @uses $vars['annotation'] ElggAnnotation object - * @uses $vars['full_view'] Display fill view or brief view + * @uses $vars['annotation'] ElggAnnotation object + * @uses $vars['full_view'] Display fill view or brief view */ if (!isset($vars['annotation'])) { diff --git a/views/rss/annotation/default.php b/views/rss/annotation/default.php deleted file mode 100644 index 98329f132..000000000 --- a/views/rss/annotation/default.php +++ /dev/null @@ -1,34 +0,0 @@ -entity_guid); - -$title = substr($vars['annotation']->value, 0, 32); -if (strlen($vars['annotation']->value) > 32) { - $title .= " ..."; -} - -$permalink = $entity->getURL(); -$pubdate = date('r', $entity->time_created); - -$creator = elgg_view('object/creator', array('entity' => $entity)); -$georss = elgg_view('object/georss', array('entity' => $entity)); -$extensions = elgg_view('extensions/item'); - -$item = <<<__HTML - - $permalink#{$vars['annotation']->id} - $pubdate - $permalink#{$vars['annotation']->id} - <![CDATA[$title]]> - value}]]> - $creator$georss$extensions - -__HTML; - -echo $item; diff --git a/views/rss/annotation/generic_comment.php b/views/rss/annotation/generic_comment.php new file mode 100644 index 000000000..9e9107568 --- /dev/null +++ b/views/rss/annotation/generic_comment.php @@ -0,0 +1,33 @@ +getOwnerEntity(); +$poster_name = htmlspecialchars($poster->name, ENT_NOQUOTES, 'UTF-8'); +$pubdate = date('r', $annotation->getTimeCreated()); +$permalink = $annotation->getURL(); + +$title = elgg_echo('generic_comment:title', array($poster_name)); + +$creator = elgg_view('page/components/creator', array('entity' => $annotation)); +$extensions = elgg_view('extensions/item'); + +$item = <<<__HTML + + $permalink + $pubdate + $permalink + <![CDATA[$title]]> + value}]]> + $creator$extensions + + +__HTML; + +echo $item; diff --git a/views/rss/group/default.php b/views/rss/group/default.php index 4ffceba78..1276ab8f1 100644 --- a/views/rss/group/default.php +++ b/views/rss/group/default.php @@ -1,37 +1,37 @@ +$permalink = htmlspecialchars($vars['entity']->getURL(), ENT_NOQUOTES, 'UTF-8'); +$pubdate = date('r', $vars['entity']->getTimeCreated()); +$title = htmlspecialchars($vars['entity']->name, ENT_NOQUOTES, 'UTF-8'); +if ($vars['entity']->description) { + $description = autop($vars['entity']->description); +} elseif ($vars['entity']->briefdescription) { + $description = autop($vars['entity']->briefdescription); +} else { + $description = ''; +} + +$creator = elgg_view('page/components/creator', $vars); +$georss = elgg_view('page/components/georss', $vars); +$extension = elgg_view('extensions/item'); + +$item = <<<__HTML -getURL()); ?> -time_created) ?> -getURL()); ?> -<![CDATA[<?php echo (($vars['entity']->name)); ?>]]> -description)); ?>]]> -getOwnerEntity(); - if ($owner) { -?> -name; ?> - -getLongitude()) && - ($vars['entity']->getLatitude()) - ) { - ?> - getLatitude(); ?> getLongitude(); ?> - - + $permalink + $pubdate + $permalink + <![CDATA[$title]]> + + $creator$georss$extension + +__HTML; + +echo $item; diff --git a/views/rss/object/creator.php b/views/rss/object/creator.php deleted file mode 100644 index 2bc6fd57d..000000000 --- a/views/rss/object/creator.php +++ /dev/null @@ -1,8 +0,0 @@ -getOwnerEntity()) { - echo "{$owner->name}"; -} diff --git a/views/rss/object/default.php b/views/rss/object/default.php index 29e5d4591..b5d269ac7 100644 --- a/views/rss/object/default.php +++ b/views/rss/object/default.php @@ -1,6 +1,6 @@ title; if (empty($title)) { - $subtitle = strip_tags($vars['entity']->description); - $title = substr($subtitle, 0, 32); - if (strlen($subtitle) > 32) { - $title .= ' ...'; - } + $title = strip_tags($vars['entity']->description); + $title = elgg_get_excerpt($title, 32); } -$permalink = htmlspecialchars($vars['entity']->getURL()); -$pubdate = date('r', $vars['entity']->time_created); +$permalink = htmlspecialchars($vars['entity']->getURL(), ENT_NOQUOTES, 'UTF-8'); +$pubdate = date('r', $vars['entity']->getTimeCreated()); -$creator = elgg_view('object/creator', $vars); -$georss = elgg_view('object/georss', $vars); +$creator = elgg_view('page/components/creator', $vars); +$georss = elgg_view('page/components/georss', $vars); $extension = elgg_view('extensions/item'); $item = <<<__HTML diff --git a/views/rss/object/georss.php b/views/rss/object/georss.php deleted file mode 100644 index 8aa027519..000000000 --- a/views/rss/object/georss.php +++ /dev/null @@ -1,10 +0,0 @@ -getLongitude()) && ($longitude = $vars['entity']->getLatitude()) -) { - echo "$latitude $longitude"; -} \ No newline at end of file diff --git a/views/rss/output/url.php b/views/rss/output/url.php index e0b94bf8d..b0f4d9792 100644 --- a/views/rss/output/url.php +++ b/views/rss/output/url.php @@ -1,6 +1,6 @@ getOwnerEntity(); +if ($owner) { + $owner_name = htmlspecialchars($owner->name, ENT_NOQUOTES, 'UTF-8'); + echo "$owner_name"; +} diff --git a/views/rss/page/components/georss.php b/views/rss/page/components/georss.php new file mode 100644 index 000000000..d176b8cac --- /dev/null +++ b/views/rss/page/components/georss.php @@ -0,0 +1,15 @@ +getLongitude(); +$latitude = $vars['entity']->getLatitude(); + +if ($vars['entity'] instanceof Locatable && $longitude && $latitude) { + echo "$latitude $longitude"; +} diff --git a/views/rss/page/default.php b/views/rss/page/default.php index cd94b0242..246ec972e 100644 --- a/views/rss/page/default.php +++ b/views/rss/page/default.php @@ -4,7 +4,6 @@ * * @package Elgg * @subpackage Core - * */ header("Content-Type: text/xml"); @@ -12,7 +11,7 @@ header("Content-Type: text/xml"); // allow caching as required by stupid MS products for https feeds. header('Pragma: public', TRUE); -echo "\n"; +echo ""; // Set title if (empty($vars['title'])) { @@ -22,8 +21,8 @@ if (empty($vars['title'])) { } // Remove RSS from URL -$url = str_replace('?view=rss','', full_url()); -$url = str_replace('&view=rss','', $url); +$url = str_replace('?view=rss', '', full_url()); +$url = str_replace('&view=rss', '', $url); ?> @@ -32,11 +31,9 @@ $url = str_replace('&view=rss','', $url); <![CDATA[<?php echo $title; ?>]]> - - + diff --git a/views/rss/page/elements/comments.php b/views/rss/page/elements/comments.php new file mode 100644 index 000000000..9c655ffef --- /dev/null +++ b/views/rss/page/elements/comments.php @@ -0,0 +1,13 @@ + $vars['entity']->getGUID(), + 'annotation_name' => 'generic_comment', + 'order_by' => 'n_table.time_created desc', +); +echo elgg_list_annotations($options); diff --git a/views/rss/river/item.php b/views/rss/river/item.php index f84e6ccf0..fa2914eff 100644 --- a/views/rss/river/item.php +++ b/views/rss/river/item.php @@ -6,27 +6,30 @@ */ $item = $vars['item']; -$view = $item->getView(); - $name = $item->getSubjectEntity()->name; -$body = elgg_view($item->getView(), array('item' => $item), false, false, 'default'); -$body = "$name $body"; +$name = htmlspecialchars($name, ENT_NOQUOTES, 'UTF-8'); +$title = elgg_echo('river:update', array($name)); -$title = strip_tags($body); $timestamp = date('r', $item->getPostedTime()); +$body = elgg_view('river/elements/summary', $vars, false, false, 'default'); + $object = $item->getObjectEntity(); if ($object) { $url = htmlspecialchars($object->getURL()); } else { - $url = elgg_get_site_url() . 'activity'; + $url = elgg_normalize_url('activity'); } -?> +$html = <<<__HTML - - - - <![CDATA[<?php echo $title; ?>]]> - ]]> + $item->id + $timestamp + $url + <![CDATA[$title]]> + + +__HTML; + +echo $html; diff --git a/views/rss/search/entity_list.php b/views/rss/search/entity_list.php deleted file mode 100644 index 1e44adf18..000000000 --- a/views/rss/search/entity_list.php +++ /dev/null @@ -1,12 +0,0 @@ - 0) { - foreach($entities as $entity) { - echo elgg_view_entity($entity); - } -} \ No newline at end of file diff --git a/views/rss/user/default.php b/views/rss/user/default.php index a8b9d073c..1500881f8 100644 --- a/views/rss/user/default.php +++ b/views/rss/user/default.php @@ -1,29 +1,34 @@ +$permalink = htmlspecialchars($vars['entity']->getURL(), ENT_NOQUOTES, 'UTF-8'); +$pubdate = date('r', $vars['entity']->getTimeCreated()); +$title = htmlspecialchars($vars['entity']->name, ENT_NOQUOTES, 'UTF-8'); +if ($vars['entity']->description) { + $description = autop($vars['entity']->description); +} else { + $description = ''; +} + +$georss = elgg_view('page/components/georss', $vars); +$extension = elgg_view('extensions/item'); + +$item = <<<__HTML -getURL(); ?> -time_created) ?> -getURL(); ?> -<![CDATA[<?php echo (($vars['entity']->name)); ?>]]> -description)); ?>]]> -getLongitude()) && - ($vars['entity']->getLatitude()) - ) { - ?> - getLatitude(); ?> getLongitude(); ?> - - + $permalink + $pubdate + $permalink + <![CDATA[$title]]> + + $georss$extension + +__HTML; + +echo $item; -- cgit v1.2.3