From e5dd9906d16d97aed7ba3511b7e1132bd4da3761 Mon Sep 17 00:00:00 2001
From: capo <capo@riseup.net>
Date: Mon, 16 Dec 2013 00:12:26 +0100
Subject: Added feature to be able to use simplepie rss module in the groups

---
 views/default/forms/simplepie/group_module.php     |  35 +++++++
 views/default/simplepie/group_module.php           | 113 +++++++++++++++++++++
 views/default/widgets/feed_reader/content.php.save |  81 +++++++++++++++
 3 files changed, 229 insertions(+)
 create mode 100644 views/default/forms/simplepie/group_module.php
 create mode 100644 views/default/simplepie/group_module.php
 create mode 100644 views/default/widgets/feed_reader/content.php.save

(limited to 'views/default')
diff --git a/views/default/forms/simplepie/group_module.php b/views/default/forms/simplepie/group_module.php
new file mode 100644
index 000000000..a7c1f6858
--- /dev/null
+++ b/views/default/forms/simplepie/group_module.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Simplepie feed reader widget settings
+ */
+
+// set default value
+
+$url_label = elgg_echo("simplepie:feed_url");
+$url_textbox = elgg_view('input/text', array(
+	'name' => 'feed_url',
+	'value' => $vars['entity']->feed_url,
+));
+
+$group_field = elgg_view('input/hidden', array(
+	'name' => 'group_guid',
+	'value' => $vars['entity']->guid,
+));
+
+$save_button = elgg_view('input/submit', array(
+	'value' => elgg_echo('save'),
+));
+
+
+
+
+echo <<<HTML
+<div>
+	$url_label
+	$url_textbox
+	$group_field
+</div>
+<div>
+	$save_button
+</div>
+HTML;
diff --git a/views/default/simplepie/group_module.php b/views/default/simplepie/group_module.php
new file mode 100644
index 000000000..7d0a7bc2f
--- /dev/null
+++ b/views/default/simplepie/group_module.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Group simplepie:rss module
+ */
+elgg_load_library('simplepie');
+
+$group = elgg_get_page_owner_entity();
+
+if ($group->rss_enable != "yes") {
+	return true;
+}
+
+elgg_push_context('widgets');
+
+$allowed_tags = '<a><p><br><b><i><em><del><pre><strong><ul><ol><li><img>';
+$feed_url = $group->feed_url;
+$content = '';
+
+if ($group->canEdit()) {
+	$content .= elgg_view_form("simplepie/group_module", array(
+		'id' => 'simplepie-form',
+		'class' => $feed_url ? 'hidden' : '',
+	), $vars);
+}
+
+if ($feed_url) {
+
+        // get widget settings
+        $excerpt   = true;
+        $post_date = true;
+	$num_items = 7;
+
+        $cache_location = elgg_get_data_path() . '/simplepie_cache/';
+        if (!file_exists($cache_location)) {
+                mkdir($cache_location, 0777);
+        }
+
+        $feed = new SimplePie($feed_url, $cache_location);
+
+        // doubles timeout if going through a proxy
+        //$feed->set_timeout(20);
+
+        // only display errors to profile owner
+        $num_posts_in_feed = $feed->get_item_quantity();
+        if (!$num_posts_in_feed) {
+                if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
+                        $content .= '<p>' . elgg_echo('simplepie:notfind') . '</p>';
+                }
+        }
+
+        // don't display more feed items than user requested
+        if ($num_items > $num_posts_in_feed) {
+                $num_items = $num_posts_in_feed;
+        }
+
+        $feed_link = elgg_view('output/url', array(
+                'href' => $feed->get_permalink(),
+                'text' => $feed->get_title(),
+        ));
+
+        // need to center
+        $content .= "<h2 class=\"simplepie-heading\">$feed_link</h2>";
+        $content .= '<ul class="simplepie-list">';
+        foreach ($feed->get_items(0, $num_items) as $item) {
+                $item_link = elgg_view('output/url', array(
+                        'href' => $item->get_permalink(),
+                        'text' => $item->get_title(),
+                ));
+
+                if ($excerpt) {
+                        $text = strip_tags($item->get_description(true), $allowed_tags);
+                        $excerpt = elgg_get_excerpt($text);
+                }
+
+                if ($post_date) {
+                        $item_date_label = elgg_echo('simplepie:postedon');
+                        $item_date = $item->get_date('j F Y | g:i a');
+                        $post_date = "$item_date_label $item_date";
+                }
+
+                $content .= <<<HTML
+<li class="mbm elgg-item">
+        <h4 class="mbs">$item_link</h4>
+        <p class="elgg-subtext">$post_date</p>
+        <div class="elgg-content">$excerpt</div>
+</li>
+HTML;
+
+        }
+        $content .= "</ul>";
+
+}
+
+
+
+elgg_pop_context();
+
+if (!$content) {
+	$content = '<p>' . elgg_echo('simplepie:none') . '</p>';
+}
+
+$edit = elgg_view('output/url', array(
+	'href' => '#simplepie-form',
+	'text' => elgg_echo('edit'),
+	'rel' => 'toggle'
+));
+
+echo elgg_view('groups/profile/module', array(
+	'title' => elgg_echo('RSS Group'),
+	'content' => $content,
+	'all_link' => $edit,
+));
+
diff --git a/views/default/widgets/feed_reader/content.php.save b/views/default/widgets/feed_reader/content.php.save
new file mode 100644
index 000000000..f13b00fe7
--- /dev/null
+++ b/views/default/widgets/feed_reader/content.php.save
@@ -0,0 +1,81 @@
+<?php
+/**
+ * View a feed in a widget
+ */
+
+elgg_load_library('simplepie');
+
+$allowed_tags = '<a><p><br><b><i><em><del><pre><strong><ul><ol><li><img>';
+$feed_url = $vars['entity']->feed_url;
+if ($feed_url) {
+
+	// get widget settings
+	$excerpt   = $vars['entity']->excerpt;
+	$num_items = $vars['entity']->num_items;
+	$post_date = $vars['entity']->post_date;
+	
+	$cache_location = elgg_get_data_path() . '/simplepie_cache/';
+	if (!file_exists($cache_location)) {
+		mkdir($cache_location, 0777);
+	}
+	
+	$feed = new SimplePie($feed_url, $cache_location);
+	
+	// doubles timeout if going through a proxy
+	//$feed->set_timeout(20);
+		
+	// only display errors to profile owner
+	$num_posts_in_feed = $feed->get_item_quantity();
+	if (!$num_posts_in_feed) {
+		if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
+			echo '<p>' . elgg_echo('simplepie:notfind') . '</p>';
+		}
+	}
+
+	// don't display more feed items than user requested
+	if ($num_items > $num_posts_in_feed) {
+		$num_items = $num_posts_in_feed;
+	}
+	
+	$feed_link = elgg_view('output/url', array(
+		'href' => $feed->get_permalink(),
+		'text' => $feed->get_title(),
+	));
+
+	// need to center
+	echo "<h2 class=\"simplepie-heading\">$feed_link</h2>";
+	echo '<ul class="simplepie-list">';
+	foreach ($feed->get_items(0, $num_items) as $item) {
+		$item_link = elgg_view('output/url', array(
+			'href' => $item->get_permalink(),
+			'text' => $item->get_title(),
+		));
+
+		if ($excerpt) {
+			$text = strip_tags($item->get_description(true), $allowed_tags);
+			$excerpt = $text;
+		}
+
+		if ($post_date) {
+			$item_date_label = elgg_echo('simplepie:postedon');
+			$item_date = $item->get_date('j F Y | g:i a');
+			$post_date = "$item_date_label $item_date";
+		}
+
+		echo <<<HTML
+<li class="mbm">
+	<h4 class="mbs">$item_link</h4>
+	<div class="mbs clearfix">$excerpt</div>
+	<p class="elgg-subtext">$post_date</p>
+</li>
+HTML;
+
+	}
+	echo "</ul>";
+
+} else {
+	// display message only to owner
+	if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
+		echo '<p>' . elgg_echo('simplepie:notset') . '</p>';
+	}
+}
-- 
cgit v1.2.3


From 74a2c0f73100209d1c10259a3f862d3645ab5dbb Mon Sep 17 00:00:00 2001
From: capo <capo@riseup.net>
Date: Sun, 12 Jan 2014 18:21:24 +0100
Subject: review code from hellekin comments

---
 actions/simplepie/group_module.php             |   8 --
 languages/en.php                               |   4 +-
 languages/es.php                               |  24 +++---
 start.php                                      |   5 +-
 views/default/forms/simplepie/group_module.php |  35 --------
 views/default/simplepie/group_module.php       | 106 ++++++++++++-------------
 6 files changed, 75 insertions(+), 107 deletions(-)
 delete mode 100644 actions/simplepie/group_module.php
 delete mode 100644 views/default/forms/simplepie/group_module.php

(limited to 'views/default')

diff --git a/actions/simplepie/group_module.php b/actions/simplepie/group_module.php
deleted file mode 100644
index 93fe353de..000000000
--- a/actions/simplepie/group_module.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-$group = get_entity(get_input('group_guid'));
-$feed_url = get_input('feed_url');
-
-if ($group && $group->canEdit()) {
-	$group->feed_url = $feed_url;
-}
diff --git a/languages/en.php b/languages/en.php
index 07ff02905..082b4c485 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -4,12 +4,14 @@ $english = array(
 	'simplepie:widget' => 'RSS Feed',
 	'simplepie:description' => 'Add an external blog to your profile',
 	'simplepie:notset' => 'Feed url is not set',
-	'simplepie:notfind' => 'Cannot find feed. Check the feed url.',
+	'simplepie:notfound' => 'Cannot find feed. Check the feed url.',
 	'simplepie:feed_url' => 'Feed URL',
 	'simplepie:num_items' => 'Number of items',
 	'simplepie:excerpt' => 'Include excerpt',
 	'simplepie:post_date' => 'Include post date',
 	'simplepie:postedon' => 'Posted on',
+	'simplepie:invalid_url' => 'Invalid url, copy it from the navigation bar please',
+
 );
 
 add_translation("en", $english);
diff --git a/languages/es.php b/languages/es.php
index 51b53e9f2..85f24e4a5 100644
--- a/languages/es.php
+++ b/languages/es.php
@@ -1,16 +1,22 @@
 <?php
 
 $spanish = array(
-	'simplepie:widget' => 'Enlace RSS',
-	'simplepie:description' => 'Agregar un blog externo',
-	'simplepie:notset' => 'Enlace RSS no configurado',
-	'simplepie:notfind' => 'no se encontro el feed. Revisa el feed url.',
-	'simplepie:feed_url' => 'Feed URL',
-	'simplepie:num_items' => 'Numero de items',
-	'simplepie:excerpt' => 'Incluir contenido',
-	'simplepie:post_date' => 'Incluir fecha del post',
-	'simplepie:postedon' => 'Posted on',
+        'simplepie:widget' => 'Enlace RSS',
+        'simplepie:description' => 'Agregar un blog externo',
+        'simplepie:notset' => 'Enlace RSS no configurado',
+        'simplepie:notfound' => 'no se encontro el feed. Revisa el feed url.',
+        'simplepie:feed_url' => 'Feed URL',
+        'simplepie:num_items' => 'Numero de items',
+        'simplepie:excerpt' => 'Incluir contenido',
+        'simplepie:post_date' => 'Incluir fecha del post',
+        'simplepie:postedon' => 'Posted on',
+        'simplepie:invalid_url' => 'Url invalida, copiela desde la barra del navegador por favor',
 );
 
 add_translation("en", $english);
 
+
+
+
+
+
diff --git a/start.php b/start.php
index 26c2e5017..34a7ced3f 100644
--- a/start.php
+++ b/start.php
@@ -25,6 +25,9 @@ function simplepie_init() {
         add_group_tool_option('rss', elgg_echo('simplepie:enablerss'), false);
         elgg_extend_view('groups/tool_latest', 'simplepie/group_module');
 
-	elgg_register_action('simplepie/group_module', elgg_get_plugins_path() . 'simplepie/actions/simplepie/group_module.php');
+	elgg_register_action('simplepie/save_group_feed', elgg_get_plugins_path() . 'simplepie/actions/simplepie/save_group_feed.php');
 }
 
+function simplepie_is_url($url) {
+	return preg_match("/\b(?:(?:https?|ftp):\/\/|www\.)[-a-z0-9+&@#\/%?=~_|!:,.;]*[-a-z0-9+&@#\/%=~_|]/i", $url);
+}
diff --git a/views/default/forms/simplepie/group_module.php b/views/default/forms/simplepie/group_module.php
deleted file mode 100644
index a7c1f6858..000000000
--- a/views/default/forms/simplepie/group_module.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Simplepie feed reader widget settings
- */
-
-// set default value
-
-$url_label = elgg_echo("simplepie:feed_url");
-$url_textbox = elgg_view('input/text', array(
-	'name' => 'feed_url',
-	'value' => $vars['entity']->feed_url,
-));
-
-$group_field = elgg_view('input/hidden', array(
-	'name' => 'group_guid',
-	'value' => $vars['entity']->guid,
-));
-
-$save_button = elgg_view('input/submit', array(
-	'value' => elgg_echo('save'),
-));
-
-
-
-
-echo <<<HTML
-<div>
-	$url_label
-	$url_textbox
-	$group_field
-</div>
-<div>
-	$save_button
-</div>
-HTML;
diff --git a/views/default/simplepie/group_module.php b/views/default/simplepie/group_module.php
index 7d0a7bc2f..17b2dba0c 100644
--- a/views/default/simplepie/group_module.php
+++ b/views/default/simplepie/group_module.php
@@ -17,7 +17,7 @@ $feed_url = $group->feed_url;
 $content = '';
 
 if ($group->canEdit()) {
-	$content .= elgg_view_form("simplepie/group_module", array(
+	$content .= elgg_view_form("simplepie/save_group_feed", array(
 		'id' => 'simplepie-form',
 		'class' => $feed_url ? 'hidden' : '',
 	), $vars);
@@ -25,64 +25,66 @@ if ($group->canEdit()) {
 
 if ($feed_url) {
 
-        // get widget settings
-        $excerpt   = true;
-        $post_date = true;
+// get widget settings
+	$excerpt   = true;
+	$post_date = true;
 	$num_items = 7;
 
-        $cache_location = elgg_get_data_path() . '/simplepie_cache/';
-        if (!file_exists($cache_location)) {
-                mkdir($cache_location, 0777);
-        }
+	$cache_location = elgg_get_data_path() . '/simplepie_cache/';
+	if (!file_exists($cache_location)) {
+		mkdir($cache_location, 0777);
+	}
 
-        $feed = new SimplePie($feed_url, $cache_location);
+	$feed = new SimplePie($feed_url, $cache_location);
 
-        // doubles timeout if going through a proxy
-        //$feed->set_timeout(20);
+// doubles timeout if going through a proxy
+//$feed->set_timeout(20);
 
-        // only display errors to profile owner
-        $num_posts_in_feed = $feed->get_item_quantity();
-        if (!$num_posts_in_feed) {
-                if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
-                        $content .= '<p>' . elgg_echo('simplepie:notfind') . '</p>';
-                }
-        }
 
-        // don't display more feed items than user requested
-        if ($num_items > $num_posts_in_feed) {
-                $num_items = $num_posts_in_feed;
-        }
+// only display errors to profile owner
+	$num_posts_in_feed = $feed->get_item_quantity();
+if (!$num_posts_in_feed) {
+	if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
+		$content .= '<p>' . elgg_echo('simplepie:notfound') . '</p>';
+	}
+}
+
+// don't display more feed items than user requested
+	if ($num_items > $num_posts_in_feed) {
+	$num_items = $num_posts_in_feed;
+}
+
+	$feed_link = elgg_view('output/url', array(
+	'href' => $feed->get_permalink(),
+	'text' => $feed->get_title(),
+));
+
+// need to center
+	$content .= "<h2 class=\"simplepie-heading\">$feed_link</h2>";
+	$content .= '<ul class="simplepie-list">';
+	foreach ($feed->get_items(0, $num_items) as $item) {
+	$item_link = elgg_view('output/url', array(
+	'href' => $item->get_permalink(),
+	'text' => $item->get_title(),
+));
+
+if ($excerpt) {
+	$text = strip_tags($item->get_description(true), $allowed_tags);
+	$excerpt = elgg_get_excerpt($text);
+}
+
+if ($post_date) {
+	$item_date_label = elgg_echo('simplepie:postedon');
+	$item_date = $item->get_date('j F Y | g:i a');
+	$post_date = "$item_date_label $item_date";
+}
+
+	$content .= <<<HTML
 
-        $feed_link = elgg_view('output/url', array(
-                'href' => $feed->get_permalink(),
-                'text' => $feed->get_title(),
-        ));
-
-        // need to center
-        $content .= "<h2 class=\"simplepie-heading\">$feed_link</h2>";
-        $content .= '<ul class="simplepie-list">';
-        foreach ($feed->get_items(0, $num_items) as $item) {
-                $item_link = elgg_view('output/url', array(
-                        'href' => $item->get_permalink(),
-                        'text' => $item->get_title(),
-                ));
-
-                if ($excerpt) {
-                        $text = strip_tags($item->get_description(true), $allowed_tags);
-                        $excerpt = elgg_get_excerpt($text);
-                }
-
-                if ($post_date) {
-                        $item_date_label = elgg_echo('simplepie:postedon');
-                        $item_date = $item->get_date('j F Y | g:i a');
-                        $post_date = "$item_date_label $item_date";
-                }
-
-                $content .= <<<HTML
 <li class="mbm elgg-item">
-        <h4 class="mbs">$item_link</h4>
-        <p class="elgg-subtext">$post_date</p>
-        <div class="elgg-content">$excerpt</div>
+	<h4 class="mbs">$item_link</h4>
+	<p class="elgg-subtext">$post_date</p>
+	<div class="elgg-content">$excerpt</div>
 </li>
 HTML;
 
@@ -91,8 +93,6 @@ HTML;
 
 }
 
-
-
 elgg_pop_context();
 
 if (!$content) {
-- 
cgit v1.2.3


From e79633358a5165bb68f6d0e1b8fe855d84cea8cc Mon Sep 17 00:00:00 2001
From: capo <capo@riseup.net>
Date: Sun, 12 Jan 2014 18:55:35 +0100
Subject: fix identation

---
 actions/simplepie/save_group_feed.php             |  14 +++
 languages/en.php                                  |   4 -
 languages/en.php~                                 |  14 +++
 languages/es.php                                  |   8 --
 languages/es.php~                                 |  22 +++++
 views/default/forms/simplepie/save_group_feed.php |  39 ++++++++
 views/default/simplepie/group_module.php          |  66 ++++++-------
 views/default/simplepie/group_module.php~         | 108 ++++++++++++++++++++++
 8 files changed, 227 insertions(+), 48 deletions(-)
 create mode 100644 actions/simplepie/save_group_feed.php
 create mode 100644 languages/en.php~
 create mode 100644 languages/es.php~
 create mode 100644 views/default/forms/simplepie/save_group_feed.php
 create mode 100644 views/default/simplepie/group_module.php~

(limited to 'views/default')

diff --git a/actions/simplepie/save_group_feed.php b/actions/simplepie/save_group_feed.php
new file mode 100644
index 000000000..556372f98
--- /dev/null
+++ b/actions/simplepie/save_group_feed.php
@@ -0,0 +1,14 @@
+<?php
+
+$group = get_entity((int)get_input('group_guid'));
+$feed_url = get_input('feed_url');
+
+if (!simplepie_is_url($feed_url)) {
+	register_error (elgg_echo("simplepie:invalid_url"));
+	forward(REFERER);
+}
+
+if (!$group || !$group->canEdit() || !elgg_instanceof($group, 'group')) {
+	forward(REFERER);
+}
+$group->feed_url = $feed_url;
diff --git a/languages/en.php b/languages/en.php
index 082b4c485..a22316863 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -1,5 +1,4 @@
 <?php
-
 $english = array(
 	'simplepie:widget' => 'RSS Feed',
 	'simplepie:description' => 'Add an external blog to your profile',
@@ -11,8 +10,5 @@ $english = array(
 	'simplepie:post_date' => 'Include post date',
 	'simplepie:postedon' => 'Posted on',
 	'simplepie:invalid_url' => 'Invalid url, copy it from the navigation bar please',
-
 );
-
 add_translation("en", $english);
-
diff --git a/languages/en.php~ b/languages/en.php~
new file mode 100644
index 000000000..a22316863
--- /dev/null
+++ b/languages/en.php~
@@ -0,0 +1,14 @@
+<?php
+$english = array(
+	'simplepie:widget' => 'RSS Feed',
+	'simplepie:description' => 'Add an external blog to your profile',
+	'simplepie:notset' => 'Feed url is not set',
+	'simplepie:notfound' => 'Cannot find feed. Check the feed url.',
+	'simplepie:feed_url' => 'Feed URL',
+	'simplepie:num_items' => 'Number of items',
+	'simplepie:excerpt' => 'Include excerpt',
+	'simplepie:post_date' => 'Include post date',
+	'simplepie:postedon' => 'Posted on',
+	'simplepie:invalid_url' => 'Invalid url, copy it from the navigation bar please',
+);
+add_translation("en", $english);
diff --git a/languages/es.php b/languages/es.php
index 85f24e4a5..d9bd5d2d6 100644
--- a/languages/es.php
+++ b/languages/es.php
@@ -1,5 +1,4 @@
 <?php
-
 $spanish = array(
         'simplepie:widget' => 'Enlace RSS',
         'simplepie:description' => 'Agregar un blog externo',
@@ -12,11 +11,4 @@ $spanish = array(
         'simplepie:postedon' => 'Posted on',
         'simplepie:invalid_url' => 'Url invalida, copiela desde la barra del navegador por favor',
 );
-
 add_translation("en", $english);
-
-
-
-
-
-
diff --git a/languages/es.php~ b/languages/es.php~
new file mode 100644
index 000000000..85f24e4a5
--- /dev/null
+++ b/languages/es.php~
@@ -0,0 +1,22 @@
+<?php
+
+$spanish = array(
+        'simplepie:widget' => 'Enlace RSS',
+        'simplepie:description' => 'Agregar un blog externo',
+        'simplepie:notset' => 'Enlace RSS no configurado',
+        'simplepie:notfound' => 'no se encontro el feed. Revisa el feed url.',
+        'simplepie:feed_url' => 'Feed URL',
+        'simplepie:num_items' => 'Numero de items',
+        'simplepie:excerpt' => 'Incluir contenido',
+        'simplepie:post_date' => 'Incluir fecha del post',
+        'simplepie:postedon' => 'Posted on',
+        'simplepie:invalid_url' => 'Url invalida, copiela desde la barra del navegador por favor',
+);
+
+add_translation("en", $english);
+
+
+
+
+
+
diff --git a/views/default/forms/simplepie/save_group_feed.php b/views/default/forms/simplepie/save_group_feed.php
new file mode 100644
index 000000000..a3f771586
--- /dev/null
+++ b/views/default/forms/simplepie/save_group_feed.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Simplepie feed reader widget settings
+ */
+
+// set default value
+
+$url_label = elgg_echo("simplepie:feed_url");
+$url_textbox = elgg_view('input/text', array(
+	'name' => 'feed_url',
+	'id'=> 'feed_url',
+	'value' => $vars['entity']->feed_url,
+));
+
+$group_field = elgg_view('input/hidden', array(
+	'name' => 'group_guid',
+	'value' => $vars['entity']->guid,
+));
+
+$save_button = elgg_view('input/submit', array(
+	'value' => elgg_echo('save'),
+));
+
+
+
+
+echo <<<HTML
+<div>
+	<label for="feed_url">$url_label</label>
+        $url_textbox
+        $group_field
+</div>
+<div>
+        $save_button
+</div>
+HTML;
+
+
+
diff --git a/views/default/simplepie/group_module.php b/views/default/simplepie/group_module.php
index 17b2dba0c..d9860d65f 100644
--- a/views/default/simplepie/group_module.php
+++ b/views/default/simplepie/group_module.php
@@ -29,68 +29,62 @@ if ($feed_url) {
 	$excerpt   = true;
 	$post_date = true;
 	$num_items = 7;
-
 	$cache_location = elgg_get_data_path() . '/simplepie_cache/';
 	if (!file_exists($cache_location)) {
 		mkdir($cache_location, 0777);
 	}
-
 	$feed = new SimplePie($feed_url, $cache_location);
 
-// doubles timeout if going through a proxy
-//$feed->set_timeout(20);
+	// doubles timeout if going through a proxy
+	//$feed->set_timeout(20);
+	// only display errors to profile owner
 
-
-// only display errors to profile owner
 	$num_posts_in_feed = $feed->get_item_quantity();
-if (!$num_posts_in_feed) {
-	if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
-		$content .= '<p>' . elgg_echo('simplepie:notfound') . '</p>';
+	if (!$num_posts_in_feed) {
+		if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
+			$content .= '<p>' . elgg_echo('simplepie:notfound') . '</p>';
+		}
 	}
-}
 
-// don't display more feed items than user requested
+	// don't display more feed items than user requested
 	if ($num_items > $num_posts_in_feed) {
 	$num_items = $num_posts_in_feed;
 }
 
 	$feed_link = elgg_view('output/url', array(
-	'href' => $feed->get_permalink(),
-	'text' => $feed->get_title(),
-));
+		'href' => $feed->get_permalink(),
+		'text' => $feed->get_title(),
+	));
 
-// need to center
+	// need to center
 	$content .= "<h2 class=\"simplepie-heading\">$feed_link</h2>";
 	$content .= '<ul class="simplepie-list">';
 	foreach ($feed->get_items(0, $num_items) as $item) {
-	$item_link = elgg_view('output/url', array(
-	'href' => $item->get_permalink(),
-	'text' => $item->get_title(),
-));
-
-if ($excerpt) {
-	$text = strip_tags($item->get_description(true), $allowed_tags);
-	$excerpt = elgg_get_excerpt($text);
-}
-
-if ($post_date) {
-	$item_date_label = elgg_echo('simplepie:postedon');
-	$item_date = $item->get_date('j F Y | g:i a');
-	$post_date = "$item_date_label $item_date";
-}
-
-	$content .= <<<HTML
-
+		$item_link = elgg_view('output/url', array(
+			'href' => $item->get_permalink(),
+			'text' => $item->get_title(),
+		));
+
+		if ($excerpt) {
+			$text = strip_tags($item->get_description(true), $allowed_tags);
+			$excerpt = elgg_get_excerpt($text);
+		}
+
+		if ($post_date) {
+			$item_date_label = elgg_echo('simplepie:postedon');
+			$item_date = $item->get_date('j F Y | g:i a');
+			$post_date = "$item_date_label $item_date";
+		}	
+
+		$content .= <<<HTML
 <li class="mbm elgg-item">
 	<h4 class="mbs">$item_link</h4>
 	<p class="elgg-subtext">$post_date</p>
 	<div class="elgg-content">$excerpt</div>
 </li>
 HTML;
-
-        }
+	}
         $content .= "</ul>";
-
 }
 
 elgg_pop_context();
diff --git a/views/default/simplepie/group_module.php~ b/views/default/simplepie/group_module.php~
new file mode 100644
index 000000000..bfba96f06
--- /dev/null
+++ b/views/default/simplepie/group_module.php~
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Group simplepie:rss module
+ */
+elgg_load_library('simplepie');
+
+$group = elgg_get_page_owner_entity();
+
+if ($group->rss_enable != "yes") {
+	return true;
+}
+
+elgg_push_context('widgets');
+
+$allowed_tags = '<a><p><br><b><i><em><del><pre><strong><ul><ol><li><img>';
+$feed_url = $group->feed_url;
+$content = '';
+
+if ($group->canEdit()) {
+	$content .= elgg_view_form("simplepie/save_group_feed", array(
+		'id' => 'simplepie-form',
+		'class' => $feed_url ? 'hidden' : '',
+	), $vars);
+}
+
+if ($feed_url) {
+
+// get widget settings
+	$excerpt   = true;
+	$post_date = true;
+	$num_items = 7;
+	$cache_location = elgg_get_data_path() . '/simplepie_cache/';
+	if (!file_exists($cache_location)) {
+		mkdir($cache_location, 0777);
+	}
+	$feed = new SimplePie($feed_url, $cache_location);
+
+	// doubles timeout if going through a proxy
+	//$feed->set_timeout(20);
+	// only display errors to profile owner
+
+	$num_posts_in_feed = $feed->get_item_quantity();
+	if (!$num_posts_in_feed) {
+		if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
+			$content .= '<p>' . elgg_echo('simplepie:notfound') . '</p>';
+		}
+	}
+
+	// don't display more feed items than user requested
+	if ($num_items > $num_posts_in_feed) {
+	$num_items = $num_posts_in_feed;
+}
+
+	$feed_link = elgg_view('output/url', array(
+	'href' => $feed->get_permalink(),
+	'text' => $feed->get_title(),
+));
+
+// need to center
+	$content .= "<h2 class=\"simplepie-heading\">$feed_link</h2>";
+	$content .= '<ul class="simplepie-list">';
+	foreach ($feed->get_items(0, $num_items) as $item) {
+	$item_link = elgg_view('output/url', array(
+	'href' => $item->get_permalink(),
+	'text' => $item->get_title(),
+));
+
+if ($excerpt) {
+	$text = strip_tags($item->get_description(true), $allowed_tags);
+	$excerpt = elgg_get_excerpt($text);
+}
+
+if ($post_date) {
+	$item_date_label = elgg_echo('simplepie:postedon');
+	$item_date = $item->get_date('j F Y | g:i a');
+	$post_date = "$item_date_label $item_date";
+}
+
+	$content .= <<<HTML
+
+<li class="mbm elgg-item">
+	<h4 class="mbs">$item_link</h4>
+	<p class="elgg-subtext">$post_date</p>
+	<div class="elgg-content">$excerpt</div>
+</li>
+HTML;
+	}
+        $content .= "</ul>";
+}
+
+elgg_pop_context();
+
+if (!$content) {
+	$content = '<p>' . elgg_echo('simplepie:none') . '</p>';
+}
+
+$edit = elgg_view('output/url', array(
+	'href' => '#simplepie-form',
+	'text' => elgg_echo('edit'),
+	'rel' => 'toggle'
+));
+
+echo elgg_view('groups/profile/module', array(
+	'title' => elgg_echo('RSS Group'),
+	'content' => $content,
+	'all_link' => $edit,
+));
+
-- 
cgit v1.2.3


From e30ab4e309edcad41c2fef9147db1b1325497984 Mon Sep 17 00:00:00 2001
From: capo <capo@riseup.net>
Date: Sun, 12 Jan 2014 23:07:20 +0100
Subject: edit link only show when you can edit

---
 views/default/simplepie/group_module.php  | 24 ++++++++++---------
 views/default/simplepie/group_module.php~ | 39 +++++++++++++++----------------
 2 files changed, 32 insertions(+), 31 deletions(-)

(limited to 'views/default')

diff --git a/views/default/simplepie/group_module.php b/views/default/simplepie/group_module.php
index d9860d65f..90c017a86 100644
--- a/views/default/simplepie/group_module.php
+++ b/views/default/simplepie/group_module.php
@@ -90,18 +90,20 @@ HTML;
 elgg_pop_context();
 
 if (!$content) {
-	$content = '<p>' . elgg_echo('simplepie:none') . '</p>';
+        $content = '<p>' . elgg_echo('simplepie:none') . '</p>';
+}
+if ($group->canEdit()) {
+        $edit = elgg_view('output/url', array(
+                'href' => '#simplepie-form',
+                'text' => elgg_echo('edit'),
+                'rel' => 'toggle'
+        ));
+} else {
+        $edit = false;
 }
-
-$edit = elgg_view('output/url', array(
-	'href' => '#simplepie-form',
-	'text' => elgg_echo('edit'),
-	'rel' => 'toggle'
-));
 
 echo elgg_view('groups/profile/module', array(
-	'title' => elgg_echo('RSS Group'),
-	'content' => $content,
-	'all_link' => $edit,
+        'title' => elgg_echo('RSS Group'),
+        'content' => $content,
+        'all_link' => $edit,
 ));
-
diff --git a/views/default/simplepie/group_module.php~ b/views/default/simplepie/group_module.php~
index bfba96f06..d9860d65f 100644
--- a/views/default/simplepie/group_module.php~
+++ b/views/default/simplepie/group_module.php~
@@ -52,32 +52,31 @@ if ($feed_url) {
 }
 
 	$feed_link = elgg_view('output/url', array(
-	'href' => $feed->get_permalink(),
-	'text' => $feed->get_title(),
-));
+		'href' => $feed->get_permalink(),
+		'text' => $feed->get_title(),
+	));
 
-// need to center
+	// need to center
 	$content .= "<h2 class=\"simplepie-heading\">$feed_link</h2>";
 	$content .= '<ul class="simplepie-list">';
 	foreach ($feed->get_items(0, $num_items) as $item) {
-	$item_link = elgg_view('output/url', array(
-	'href' => $item->get_permalink(),
-	'text' => $item->get_title(),
-));
-
-if ($excerpt) {
-	$text = strip_tags($item->get_description(true), $allowed_tags);
-	$excerpt = elgg_get_excerpt($text);
-}
-
-if ($post_date) {
-	$item_date_label = elgg_echo('simplepie:postedon');
-	$item_date = $item->get_date('j F Y | g:i a');
-	$post_date = "$item_date_label $item_date";
-}
+		$item_link = elgg_view('output/url', array(
+			'href' => $item->get_permalink(),
+			'text' => $item->get_title(),
+		));
+
+		if ($excerpt) {
+			$text = strip_tags($item->get_description(true), $allowed_tags);
+			$excerpt = elgg_get_excerpt($text);
+		}
 
-	$content .= <<<HTML
+		if ($post_date) {
+			$item_date_label = elgg_echo('simplepie:postedon');
+			$item_date = $item->get_date('j F Y | g:i a');
+			$post_date = "$item_date_label $item_date";
+		}	
 
+		$content .= <<<HTML
 <li class="mbm elgg-item">
 	<h4 class="mbs">$item_link</h4>
 	<p class="elgg-subtext">$post_date</p>
-- 
cgit v1.2.3


From ca9d45d86bdba004877c4e386423f8347908280b Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Mon, 13 Jan 2014 00:08:00 +0100
Subject: Delete gedit automatically generated files

---
 languages/en.php~                         |  14 ----
 languages/es.php~                         |  22 ------
 views/default/simplepie/group_module.php~ | 107 ------------------------------
 3 files changed, 143 deletions(-)
 delete mode 100644 languages/en.php~
 delete mode 100644 languages/es.php~
 delete mode 100644 views/default/simplepie/group_module.php~

(limited to 'views/default')

diff --git a/languages/en.php~ b/languages/en.php~
deleted file mode 100644
index a22316863..000000000
--- a/languages/en.php~
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$english = array(
-	'simplepie:widget' => 'RSS Feed',
-	'simplepie:description' => 'Add an external blog to your profile',
-	'simplepie:notset' => 'Feed url is not set',
-	'simplepie:notfound' => 'Cannot find feed. Check the feed url.',
-	'simplepie:feed_url' => 'Feed URL',
-	'simplepie:num_items' => 'Number of items',
-	'simplepie:excerpt' => 'Include excerpt',
-	'simplepie:post_date' => 'Include post date',
-	'simplepie:postedon' => 'Posted on',
-	'simplepie:invalid_url' => 'Invalid url, copy it from the navigation bar please',
-);
-add_translation("en", $english);
diff --git a/languages/es.php~ b/languages/es.php~
deleted file mode 100644
index 85f24e4a5..000000000
--- a/languages/es.php~
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-$spanish = array(
-        'simplepie:widget' => 'Enlace RSS',
-        'simplepie:description' => 'Agregar un blog externo',
-        'simplepie:notset' => 'Enlace RSS no configurado',
-        'simplepie:notfound' => 'no se encontro el feed. Revisa el feed url.',
-        'simplepie:feed_url' => 'Feed URL',
-        'simplepie:num_items' => 'Numero de items',
-        'simplepie:excerpt' => 'Incluir contenido',
-        'simplepie:post_date' => 'Incluir fecha del post',
-        'simplepie:postedon' => 'Posted on',
-        'simplepie:invalid_url' => 'Url invalida, copiela desde la barra del navegador por favor',
-);
-
-add_translation("en", $english);
-
-
-
-
-
-
diff --git a/views/default/simplepie/group_module.php~ b/views/default/simplepie/group_module.php~
deleted file mode 100644
index d9860d65f..000000000
--- a/views/default/simplepie/group_module.php~
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * Group simplepie:rss module
- */
-elgg_load_library('simplepie');
-
-$group = elgg_get_page_owner_entity();
-
-if ($group->rss_enable != "yes") {
-	return true;
-}
-
-elgg_push_context('widgets');
-
-$allowed_tags = '<a><p><br><b><i><em><del><pre><strong><ul><ol><li><img>';
-$feed_url = $group->feed_url;
-$content = '';
-
-if ($group->canEdit()) {
-	$content .= elgg_view_form("simplepie/save_group_feed", array(
-		'id' => 'simplepie-form',
-		'class' => $feed_url ? 'hidden' : '',
-	), $vars);
-}
-
-if ($feed_url) {
-
-// get widget settings
-	$excerpt   = true;
-	$post_date = true;
-	$num_items = 7;
-	$cache_location = elgg_get_data_path() . '/simplepie_cache/';
-	if (!file_exists($cache_location)) {
-		mkdir($cache_location, 0777);
-	}
-	$feed = new SimplePie($feed_url, $cache_location);
-
-	// doubles timeout if going through a proxy
-	//$feed->set_timeout(20);
-	// only display errors to profile owner
-
-	$num_posts_in_feed = $feed->get_item_quantity();
-	if (!$num_posts_in_feed) {
-		if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
-			$content .= '<p>' . elgg_echo('simplepie:notfound') . '</p>';
-		}
-	}
-
-	// don't display more feed items than user requested
-	if ($num_items > $num_posts_in_feed) {
-	$num_items = $num_posts_in_feed;
-}
-
-	$feed_link = elgg_view('output/url', array(
-		'href' => $feed->get_permalink(),
-		'text' => $feed->get_title(),
-	));
-
-	// need to center
-	$content .= "<h2 class=\"simplepie-heading\">$feed_link</h2>";
-	$content .= '<ul class="simplepie-list">';
-	foreach ($feed->get_items(0, $num_items) as $item) {
-		$item_link = elgg_view('output/url', array(
-			'href' => $item->get_permalink(),
-			'text' => $item->get_title(),
-		));
-
-		if ($excerpt) {
-			$text = strip_tags($item->get_description(true), $allowed_tags);
-			$excerpt = elgg_get_excerpt($text);
-		}
-
-		if ($post_date) {
-			$item_date_label = elgg_echo('simplepie:postedon');
-			$item_date = $item->get_date('j F Y | g:i a');
-			$post_date = "$item_date_label $item_date";
-		}	
-
-		$content .= <<<HTML
-<li class="mbm elgg-item">
-	<h4 class="mbs">$item_link</h4>
-	<p class="elgg-subtext">$post_date</p>
-	<div class="elgg-content">$excerpt</div>
-</li>
-HTML;
-	}
-        $content .= "</ul>";
-}
-
-elgg_pop_context();
-
-if (!$content) {
-	$content = '<p>' . elgg_echo('simplepie:none') . '</p>';
-}
-
-$edit = elgg_view('output/url', array(
-	'href' => '#simplepie-form',
-	'text' => elgg_echo('edit'),
-	'rel' => 'toggle'
-));
-
-echo elgg_view('groups/profile/module', array(
-	'title' => elgg_echo('RSS Group'),
-	'content' => $content,
-	'all_link' => $edit,
-));
-
-- 
cgit v1.2.3

