attempting to standardize riverdashboard plugin in similar manner as 1.7 branch revision [5943]

git-svn-id: http://code.elgg.org/elgg/trunk@6021 36083f99-b078-4883-b0ff-0f9b5a30f544

3 files changed, 143 insertions, 142 deletions

diff --git a/mod/riverdashboard/views/default/river/item/list.php b/mod/riverdashboard/views/default/river/item/list.php
index e7e1a9c07..4c3e240ac 100644
--- a/mod/riverdashboard/views/default/river/item/list.php
+++ b/mod/riverdashboard/views/default/river/item/list.php
@@ -1,54 +1,53 @@
 <?php
 
-	if (isset($vars['items']) && is_array($vars['items'])) {
-
-		$i = 0;
-		if (!empty($vars['items'])) {
-			foreach($vars['items'] as $item) {
-				echo elgg_view_river_item($item);
-				$i++;
-				if ($i >= $vars['limit']) {
-					break;
-				}
+if (isset($vars['items']) && is_array($vars['items'])) {
+
+	$i = 0;
+	if (!empty($vars['items'])) {
+		foreach($vars['items'] as $item) {
+			echo elgg_view_river_item($item);
+			$i++;
+			if ($i >= $vars['limit']) {
+				break;
 			}
 		}
 	}
+}
 
-	if ($vars['pagination'] !== false) {
-		$baseurl = $_SERVER['REQUEST_URI'];
-		$baseurl = $baseurl = preg_replace('/[\&\?]offset\=[0-9]*/',"",$baseurl);
+if ($vars['pagination'] !== false) {
+	$baseurl = $_SERVER['REQUEST_URI'];
+	$baseurl = $baseurl = preg_replace('/[\&\?]offset\=[0-9]*/',"",$baseurl);
 
-		$nav = '';
+	$nav = '';
 
-		if (sizeof($vars['items']) > $vars['limit']) {
-			$newoffset = $vars['offset'] + $vars['limit'];
-			$urladdition = 'offset='.$newoffset;
-			if (substr_count($baseurl,'?')) {
-				$nexturl = $baseurl . '&' . $urladdition;
-			} else {
-				$nexturl=$baseurl . '?' . $urladdition;
-			}
-
-			$nav .= '<a class="pagination_previous" href="'.$nexturl.'">&laquo; ' . elgg_echo('previous') . '</a> ';
+	if (sizeof($vars['items']) > $vars['limit']) {
+		$newoffset = $vars['offset'] + $vars['limit'];
+		$urladdition = 'offset='.$newoffset;
+		if (substr_count($baseurl,'?')) {
+			$nexturl = $baseurl . '&' . $urladdition;
+		} else {
+			$nexturl=$baseurl . '?' . $urladdition;
 		}
 
-		if ($vars['offset'] > 0) {
-			$newoffset = $vars['offset'] - $vars['limit'];
-			if ($newoffset < 0) {
-				$newoffset = 0;
-			}
-			$urladdition = 'offset='.$newoffset;
-			if (substr_count($baseurl,'?')) {
-				$prevurl=$baseurl . '&' . $urladdition;
-			} else {
-				$prevurl=$baseurl . '?' . $urladdition;
-			}
+		$nav .= '<a class="pagination_previous" href="'.$nexturl.'">&laquo; ' . elgg_echo('previous') . '</a> ';
+	}
 
-			$nav .= '<a class="pagination_next" href="'.$prevurl.'">' . elgg_echo('next') . ' &raquo;</a> ';
+	if ($vars['offset'] > 0) {
+		$newoffset = $vars['offset'] - $vars['limit'];
+		if ($newoffset < 0) {
+			$newoffset = 0;
 		}
-
-		if (!empty($nav)) {
-			echo '<div class="pagination clearfloat">'.$nav.'</div>';
+		$urladdition = 'offset='.$newoffset;
+		if (substr_count($baseurl,'?')) {
+			$prevurl=$baseurl . '&' . $urladdition;
+		} else {
+			$prevurl=$baseurl . '?' . $urladdition;
 		}
+
+		$nav .= '<a class="pagination_next" href="'.$prevurl.'">' . elgg_echo('next') . ' &raquo;</a> ';
+	}
+
+	if (!empty($nav)) {
+		echo '<div class="pagination clearfloat">'.$nav.'</div>';
 	}
-?>
\ No newline at end of file
+}
diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php
index 7a3285382..8506262a8 100644
--- a/mod/riverdashboard/views/default/river/item/wrapper.php
+++ b/mod/riverdashboard/views/default/river/item/wrapper.php
@@ -12,10 +12,11 @@ $numoflikes = elgg_count_likes($object);
 
 //user
 //if displaying on the profile get the object owner, else the subject_guid
-if(get_context() == 'profile' && $object->getSubtype() ==  'thewire')
+if (get_context() == 'profile' && $object->getSubtype() ==  'thewire') {
 	$user = get_entity($object->owner_guid);
-else
+} else {
 	$user = get_entity($vars['item']->subject_guid);
+}
 
 //count comment annotations
 $comment_count = count_annotations($vars['item']->object_guid, $vars['item']->type, $vars['item']->subtype, $annotation_comment);
@@ -23,16 +24,17 @@ $comment_count = count_annotations($vars['item']->object_guid, $vars['item']->ty
 //get last three comments display
 $get_comments = get_annotations($vars['item']->object_guid, "", "", 'generic_comment', "", "", 3, 0, "desc");
 
-if($get_comments){
+if ($get_comments){
 	//reverse the array so we can display comments in the right order
-	$get_comments = array_reverse($get_comments);	
+	$get_comments = array_reverse($get_comments);
 }
 
 //minus 3 off the comment total as we display 3 by default
-if($comment_count < 3)
+if ($comment_count < 3) {
 	$num_comments = 0;
-else
+} else {
 	$num_comments = $comment_count - 3;
+}
 ?>
 <div class="river_item riverdashboard">
 	<span class="river_item_useravatar">
@@ -43,98 +45,98 @@ else
 		// body contents, generated by the river view in each plugin
 		echo $vars['body'];	
 	
-	//display latest 3 comments if there are any
-	if($get_comments){
-		$counter = 0;
-		//$background = "";
-			
-		echo "<div class='river_comments_tabs clearfloat'>";
-		
-		if($comment_count <= 3) {
-			echo "<a class='river_more_comments show_comments_button link'>Comments</a>";
-		}	
-		
-		//display 'more comments' if there are any
-		if($num_comments != 0){			
-			echo "<a class='river_more_comments show_comments_button link'>Comments (+{$num_comments} more)</a>";
-		}
-		
-		if($numoflikes != 0){
-			echo elgg_view('likes/forms/display', array('entity' => $object));
-		}
-		echo "</div>"; // close river_comments_tabs
-		
-		echo "<div class='river_comments'>";
+//display latest 3 comments if there are any
+if ($get_comments){
+	$counter = 0;
+	//$background = "";
+	
+	echo "<div class='river_comments_tabs clearfloat'>";
+	
+	if ($comment_count <= 3) {
+		echo "<a class='river_more_comments show_comments_button link'>Comments</a>";
+	}
+	
+	//display 'more comments' if there are any
+	if ($num_comments != 0) {
+		echo "<a class='river_more_comments show_comments_button link'>Comments (+{$num_comments} more)</a>";
+	}
+	
+	if ($numoflikes != 0) {
+		echo elgg_view('likes/forms/display', array('entity' => $object));
+	}
+	echo "</div>"; // close river_comments_tabs
+	
+	echo "<div class='river_comments'>";
 
-		if($numoflikes != 0){
-			//show the users who liked the object
-			echo "<div class='likes_list hidden'>";
-			echo list_annotations($object->getGUID(), 'likes', 99);
-			echo "</div>";
-		}
+	if ($numoflikes != 0) {
+		//show the users who liked the object
+		echo "<div class='likes_list hidden'>";
+		echo list_annotations($object->getGUID(), 'likes', 99);
+		echo "</div>";
+	}
 		
-		foreach($get_comments as $gc){
-			//get the comment owner
-			$comment_owner = get_user($gc->owner_guid);
-			//get the comment owner's profile url
-			$comment_owner_url = $comment_owner->getURL();
-			// color-code each of the 3 comments
-			if( ($counter == 2 && $comment_count >= 4) || ($counter == 1 && $comment_count == 2) || ($counter == 0 && $comment_count == 1) || ($counter == 2 && $comment_count == 3) )
-				$alt = 'latest';
-			else if( ($counter == 1 && $comment_count >= 4) || ($counter == 0 && $comment_count == 2) || ($counter == 1 && $comment_count == 3) )
+	foreach ($get_comments as $gc) {
+		//get the comment owner
+		$comment_owner = get_user($gc->owner_guid);
+		//get the comment owner's profile url
+		$comment_owner_url = $comment_owner->getURL();
+		// color-code each of the 3 comments
+		if( ($counter == 2 && $comment_count >= 4) || ($counter == 1 && $comment_count == 2) || ($counter == 0 && $comment_count == 1) || ($counter == 2 && $comment_count == 3) ) {
+			$alt = 'latest';
+		} else if( ($counter == 1 && $comment_count >= 4) || ($counter == 0 && $comment_count == 2) || ($counter == 1 && $comment_count == 3) ) {
 				$alt = 'penultimate';
-			
-			//display comment
-			echo "<div class='river_comment {$alt} clearfloat'>";
-			echo "<span class='river_comment_owner_icon'>";
-			echo elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny'));
-			echo "</span>";
-			//truncate comment to 150 characters
-			if(strlen($gc->value) > 150) {
-		        	$gc->value = substr($gc->value, 0, strpos($gc->value, ' ', 150)) . "&hellip;";
-		    }
-			$contents = strip_tags($gc->value);
-		    echo "<div class='river_comment_contents'>";
-			echo "<a href=\"{$comment_owner_url}\">" . $comment_owner->name . "</a> " . parse_urls($contents);
-			echo "<span class='entity_subtext'>" . friendly_time($gc->time_created) . "</span>";
-			echo "</div></div>";
-			$counter++;
 		}
-			echo elgg_make_river_comment($object);
-			echo "</div>"; // close river_comments
-	} else {
-		// tab bar nav - for users that liked object
-		$numoflikes = elgg_count_likes($object);
-		
-		if ($vars['item']->type != 'user' && $numoflikes != 0) {
-			echo "<div class='river_comments_tabs clearfloat'>";
-		}
-		if($numoflikes != 0){
-			echo elgg_view('likes/forms/display', array('entity' => $object));
-		}
-		if ($vars['item']->type != 'user' && $numoflikes != 0) {	
-			echo "</div>"; // close river_comments_tabs
-		}
-			
-		if ($vars['item']->type != 'user') {
-			echo "<div class='river_comments'>";
-		}
-		if($numoflikes != 0){
-			//show the users who liked the object
-			echo "<div class='likes_list hidden'>";
-			echo list_annotations($object->getGUID(), 'likes', 99);
-			echo "</div>";
-		}
-		
-		// if there are no comments to display
-		// and this is not a user or a group discussion entry - include the inline comment form
-		if($vars['item']->type != 'user' && $vars['item']->subtype != 'groupforumtopic') {
-			echo elgg_make_river_comment($object);
-		}
-		if ($vars['item']->type != 'user') {
-			echo "</div>";
+		//display comment
+		echo "<div class='river_comment {$alt} clearfloat'>";
+		echo "<span class='river_comment_owner_icon'>";
+		echo elgg_view("profile/icon", array('entity' => $comment_owner, 'size' => 'tiny'));
+		echo "</span>";
+		//truncate comment to 150 characters
+		if (strlen($gc->value) > 150) {
+			$gc->value = substr($gc->value, 0, strpos($gc->value, ' ', 150)) . "&hellip;";
 		}
+		$contents = strip_tags($gc->value);
+		echo "<div class='river_comment_contents'>";
+		echo "<a href=\"{$comment_owner_url}\">" . $comment_owner->name . "</a> " . parse_urls($contents);
+		echo "<span class='entity_subtext'>" . friendly_time($gc->time_created) . "</span>";
+		echo "</div></div>";
+		$counter++;
+	}
+	echo elgg_make_river_comment($object);
+	echo "</div>"; // close river_comments
+} else {
+	// tab bar nav - for users that liked object
+	$numoflikes = elgg_count_likes($object);
+	
+	if ($vars['item']->type != 'user' && $numoflikes != 0) {
+		echo "<div class='river_comments_tabs clearfloat'>";
+	}
+	if ($numoflikes != 0) {
+		echo elgg_view('likes/forms/display', array('entity' => $object));
 	}
+	if ($vars['item']->type != 'user' && $numoflikes != 0) {
+		echo "</div>"; // close river_comments_tabs
+	}
+	
+	if ($vars['item']->type != 'user') {
+		echo "<div class='river_comments'>";
+	}
+	if ($numoflikes != 0) {
+		//show the users who liked the object
+		echo "<div class='likes_list hidden'>";
+		echo list_annotations($object->getGUID(), 'likes', 99);
+		echo "</div>";
+	}
+	
+	// if there are no comments to display
+	// and this is not a user or a group discussion entry - include the inline comment form
+	if ($vars['item']->type != 'user' && $vars['item']->subtype != 'groupforumtopic') {
+		echo elgg_make_river_comment($object);
+	}
+	if ($vars['item']->type != 'user') {
+		echo "</div>";
+	}
+}
 echo "</div>"; // close river_item_contents
 ?>
 </div>
\ No newline at end of file
diff --git a/mod/riverdashboard/views/default/river/item/wrapper_classic.php b/mod/riverdashboard/views/default/river/item/wrapper_classic.php
index abbed46d6..0a3c1da8f 100644
--- a/mod/riverdashboard/views/default/river/item/wrapper_classic.php
+++ b/mod/riverdashboard/views/default/river/item/wrapper_classic.php
@@ -9,14 +9,14 @@
  */

 ?>

 <div class="river_item riverdashboard">

-		<span class="river_item_useravatar">

-			<?php

-				echo elgg_view("profile/icon",array('entity' => get_entity($vars['item']->subject_guid), 'size' => 'small'));

-			?>

-		</span>

-		<div class="river_item_contents clearfloat">

-			<?php

-				echo $vars['body'];

-			?>

-		</div>

+	<span class="river_item_useravatar">

+<?php

+echo elgg_view("profile/icon",array('entity' => get_entity($vars['item']->subject_guid), 'size' => 'small'));

+?>

+	</span>

+	<div class="river_item_contents clearfloat">

+<?php

+echo $vars['body'];

+?>

+	</div>

 </div>
\ No newline at end of file