Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

14 files changed, 110 insertions, 89 deletions

diff --git a/mod/thewire/activate.php b/mod/thewire/activate.php
new file mode 100644
index 000000000..1cc64ceb1
--- /dev/null
+++ b/mod/thewire/activate.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Register the ElggWire class for the object/thewire subtype
+ */
+
+if (get_subtype_id('object', 'thewire')) {
+	update_subtype('object', 'thewire', 'ElggWire');
+} else {
+	add_subtype('object', 'thewire', 'ElggWire');
+}
diff --git a/mod/thewire/deactivate.php b/mod/thewire/deactivate.php
new file mode 100644
index 000000000..3e20207a1
--- /dev/null
+++ b/mod/thewire/deactivate.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Deregister the ElggWire class
+ */
+
+update_subtype('object', 'thewire');
\ No newline at end of file
diff --git a/mod/thewire/languages/en.php b/mod/thewire/languages/en.php
index 9716fc060..3c83d145f 100644
--- a/mod/thewire/languages/en.php
+++ b/mod/thewire/languages/en.php
@@ -20,6 +20,7 @@ $english = array(
 	'thewire:noposts' => "No wire posts yet",
 	'item:object:thewire' => "Wire posts",
 	'thewire:update' => 'Update',
+	'thewire:by' => 'Wire post by %s',
 
 	'thewire:previous' => "Previous",
 	'thewire:hide' => "Hide",
diff --git a/mod/thewire/manifest.xml b/mod/thewire/manifest.xml
index 27dd5732d..962ed12f1 100644
--- a/mod/thewire/manifest.xml
+++ b/mod/thewire/manifest.xml
@@ -8,11 +8,10 @@
 	<description>Microblogging for Elgg</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
-	<admin_interface>simple</admin_interface>
 	<activate_on_install>true</activate_on_install>
 </plugin_manifest>
diff --git a/mod/thewire/pages/thewire/everyone.php b/mod/thewire/pages/thewire/everyone.php
index e78395c31..4e88d17af 100644
--- a/mod/thewire/pages/thewire/everyone.php
+++ b/mod/thewire/pages/thewire/everyone.php
@@ -14,7 +14,7 @@ if (elgg_is_logged_in()) {
 	$content .= elgg_view('input/urlshortener');
 }
 
-$content .= elgg_list_entities(array(
+$content = elgg_list_entities(array(
 	'type' => 'object',
 	'subtype' => 'thewire',
 	'limit' => 15,
diff --git a/mod/thewire/pages/thewire/friends.php b/mod/thewire/pages/thewire/friends.php
index 265b73eab..26ad03da6 100644
--- a/mod/thewire/pages/thewire/friends.php
+++ b/mod/thewire/pages/thewire/friends.php
@@ -4,6 +4,9 @@
  */
 
 $owner = elgg_get_page_owner_entity();
+if (!$owner) {
+	forward('thewire/all');
+}
 
 $title = elgg_echo('thewire:friends');
 
diff --git a/mod/thewire/pages/thewire/owner.php b/mod/thewire/pages/thewire/owner.php
index b6449b217..a95786b0a 100644
--- a/mod/thewire/pages/thewire/owner.php
+++ b/mod/thewire/pages/thewire/owner.php
@@ -5,6 +5,9 @@
  */
 
 $owner = elgg_get_page_owner_entity();
+if (!$owner) {
+	forward('thewire/all');
+}
 
 $title = elgg_echo('thewire:user', array($owner->name));
 
diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index 9d3993b6f..c0890344f 100644
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -20,12 +20,14 @@ elgg_register_event_handler('init', 'system', 'thewire_init');
 function thewire_init() {
 	global $CONFIG;
 
+	// this can be removed in favor of activate/deactivate scripts
 	if (!update_subtype('object', 'thewire', 'ElggWire')) {
 		add_subtype('object', 'thewire', 'ElggWire');
 	}
 
 	// register the wire's JavaScript
 	$thewire_js = elgg_get_simplecache_url('js', 'thewire');
+	elgg_register_simplecache_view('js/thewire');
 	elgg_register_js('elgg.thewire', $thewire_js, 'footer');
 
 	// add a site navigation item
@@ -83,57 +85,60 @@ function thewire_init() {
  * thewire/tag/<tag>            View wire posts tagged with <tag>
  *
  * @param array $page From the page_handler function
- * @return true|false Depending on success
+ * @return bool
  */
 function thewire_page_handler($page) {
 
 	$base_dir = elgg_get_plugins_path() . 'thewire/pages/thewire';
 
-	// if just /thewire go to global view in the else statement
-	if (isset($page[0]) && $page[0]) {
-
-		switch ($page[0]) {
-			case "all":
-				include "$base_dir/everyone.php";
-				break;
-
-			case "friends":
-				include "$base_dir/friends.php";
-				break;
-
-			case "owner":
-				include "$base_dir/owner.php";
-				break;
-
-			case "thread":
-				if (isset($page[1])) {
-					set_input('thread_id', $page[1]);
-				}
-				include "$base_dir/thread.php";
-				break;
-			case "reply":
-				if (isset($page[1])) {
-					set_input('guid', $page[1]);
-				}
-				include "$base_dir/reply.php";
-				break;
-			case "tag":
-				if (isset($page[1])) {
-					set_input('tag', $page[1]);
-				}
-				include "$base_dir/tag.php";
-				break;
-			case "previous":
-				if (isset($page[1])) {
-					set_input('guid', $page[1]);
-				}
-				include "$base_dir/previous.php";
-				break;
-		}
-	} else {
-		include "$base_dir/everyone.php";
+	if (!isset($page[0])) {
+		$page = array('all');
 	}
 
+	switch ($page[0]) {
+		case "all":
+			include "$base_dir/everyone.php";
+			break;
+
+		case "friends":
+			include "$base_dir/friends.php";
+			break;
+
+		case "owner":
+			include "$base_dir/owner.php";
+			break;
+
+		case "thread":
+			if (isset($page[1])) {
+				set_input('thread_id', $page[1]);
+			}
+			include "$base_dir/thread.php";
+			break;
+
+		case "reply":
+			if (isset($page[1])) {
+				set_input('guid', $page[1]);
+			}
+			include "$base_dir/reply.php";
+			break;
+
+		case "tag":
+			if (isset($page[1])) {
+				set_input('tag', $page[1]);
+			}
+			include "$base_dir/tag.php";
+			break;
+
+		case "previous":
+			if (isset($page[1])) {
+				set_input('guid', $page[1]);
+			}
+			include "$base_dir/previous.php";
+			break;
+
+		default:
+			return false;
+	}
 	return true;
 }
 
diff --git a/mod/thewire/views/default/js/thewire.php b/mod/thewire/views/default/js/thewire.php
index d9bf6d10e..0a6eba134 100644
--- a/mod/thewire/views/default/js/thewire.php
+++ b/mod/thewire/views/default/js/thewire.php
@@ -18,7 +18,7 @@ elgg.thewire.init = function() {
 	});
 
 	$(".thewire-previous").live('click', elgg.thewire.viewPrevious);
-}
+};
 
 /**
  * Update the number of characters left with every keystroke
@@ -42,7 +42,7 @@ elgg.thewire.textCounter = function(textarea, status, limit) {
 		$("#thewire-submit-button").removeAttr('disabled', 'disabled');
 		$("#thewire-submit-button").removeClass('elgg-state-disabled');
 	}
-}
+};
 
 /**
  * Display the previous wire post
@@ -81,6 +81,6 @@ elgg.thewire.viewPrevious = function(event) {
 	}
 
 	event.preventDefault();
-}
+};
 
 elgg.register_hook_handler('init', 'system', elgg.thewire.init);
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index 2727df60d..134c87243 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -26,6 +26,7 @@ $owner_icon = elgg_view_entity_icon($owner, 'tiny');
 $owner_link = elgg_view('output/url', array(
 	'href' => "thewire/owner/$owner->username",
 	'text' => $owner->name,
+	'is_trusted' => true,
 ));
 $author_text = elgg_echo('byline', array($owner_link));
 $date = elgg_view_friendly_time($post->time_created);
diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index c3c434858..c75a42b3f 100644
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -12,17 +12,19 @@ $subject_link = elgg_view('output/url', array(
 	'href' => $subject->getURL(),
 	'text' => $subject->name,
 	'class' => 'elgg-river-subject',
+	'is_trusted' => true,
 ));
 
 $object_link = elgg_view('output/url', array(
 	'href' => "thewire/owner/$subject->username",
 	'text' => elgg_echo('thewire:wire'),
 	'class' => 'elgg-river-object',
+	'is_trusted' => true,
 ));
 
 $summary = elgg_echo("river:create:object:thewire", array($subject_link, $object_link));
 
-echo elgg_view('river/item', array(
+echo elgg_view('river/elements/layout', array(
 	'item' => $vars['item'],
 	'message' => $excerpt,
 	'summary' => $summary,
diff --git a/mod/thewire/views/default/thewire/profile_status.php b/mod/thewire/views/default/thewire/profile_status.php
index 6ab47bccb..b5d9dbd80 100644
--- a/mod/thewire/views/default/thewire/profile_status.php
+++ b/mod/thewire/views/default/thewire/profile_status.php
@@ -27,7 +27,8 @@ if ($latest_wire && count($latest_wire) > 0) {
 		$button = elgg_view('output/url', array(
 			'text' => elgg_echo('thewire:update'),
 			'href' => $url_to_wire,
-			'class' => 'elgg-button elgg-button-action right',
+			'class' => 'elgg-button elgg-button-action float-alt',
+			'is_trusted' => true,
 		));
 	}
 
diff --git a/mod/thewire/views/default/widgets/thewire/content.php b/mod/thewire/views/default/widgets/thewire/content.php
index 835a328b0..7212d4397 100644
--- a/mod/thewire/views/default/widgets/thewire/content.php
+++ b/mod/thewire/views/default/widgets/thewire/content.php
@@ -22,6 +22,7 @@ if ($content) {
 	$more_link = elgg_view('output/url', array(
 		'href' => $owner_url,
 		'text' => elgg_echo('thewire:moreposts'),
+		'is_trusted' => true,
 	));
 	echo "<span class=\"elgg-widget-more\">$more_link</span>";
 } else {
diff --git a/mod/thewire/views/rss/object/thewire.php b/mod/thewire/views/rss/object/thewire.php
index 8229f46f1..494c2c8dc 100644
--- a/mod/thewire/views/rss/object/thewire.php
+++ b/mod/thewire/views/rss/object/thewire.php
@@ -2,46 +2,35 @@
 /**
  * Elgg thewire rss view
  *
- * @package Elgg
- * @subpackage Core
+ * @package ElggTheWire
  */
 
 $owner = $vars['entity']->getOwnerEntity();
-if ($owner) {
-	$title = elgg_echo('thewire:by', array($owner->name));
-} else {
-	$subtitle = strip_tags($vars['entity']->description);
-	$title = elgg_get_excerpt($subtitle, 32);
+if (!$owner) {
+	return true;
 }
 
-?>
+$title = elgg_echo('thewire:by', array($owner->name));
 
+$permalink = htmlspecialchars($vars['entity']->getURL(), ENT_NOQUOTES, 'UTF-8');
+$pubdate = date('r', $vars['entity']->getTimeCreated());
+
+$description = autop($vars['entity']->description);
+
+$creator = elgg_view('page/components/creator', $vars);
+$georss = elgg_view('page/components/georss', $vars);
+$extension = elgg_view('extensions/item', $vars);
+
+$item = <<<__HTML
 <item>
-<guid isPermaLink='false'><?php echo $vars['entity']->getGUID(); ?></guid>
-<pubDate><?php echo date("r", $vars['entity']->time_created) ?></pubDate>
-<link><?php echo htmlspecialchars($vars['entity']->getURL()); ?></link>
-<title><![CDATA[<?php echo $title; ?>]]></title>
-<description><![CDATA[<?php echo (autop($vars['entity']->description)); ?>]]></description>
-<?php
-$owner = $vars['entity']->getOwnerEntity();
-if ($owner) {
-	?>
-	<dc:creator><?php echo $owner->name; ?></dc:creator>
-	<?php
-}
-?>
-<?php
-if (
-	($vars['entity'] instanceof Locatable) &&
-	($vars['entity']->getLongitude()) &&
-	($vars['entity']->getLatitude())
-) {
-	?>
-	<georss:point>
-		<?php echo $vars['entity']->getLatitude(); ?> <?php echo $vars['entity']->getLongitude(); ?>
-	</georss:point>
-	<?php
-}
-?>
-<?php echo elgg_view('extensions/item'); ?>
+	<guid isPermaLink="true">$permalink</guid>
+	<pubDate>$pubdate</pubDate>
+	<link>$permalink</link>
+	<title><![CDATA[$title]]></title>
+	<description><![CDATA[$description]]></description>
+	$creator$georss$extension
 </item>
+
+__HTML;
+
+echo $item;