first go at brining tidypics up to code standards

2 files changed, 37 insertions, 40 deletions

diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index cd2351a2e..188fc6ff1 100644
--- a/views/default/river/object/image/create.php
+++ b/views/default/river/object/image/create.php
@@ -1,29 +1,27 @@
 <?php
 
-	$performed_by = get_entity($vars['item']->subject_guid);
-	$image = get_entity($vars['item']->object_guid);
-	if($image->title) {
-		$title = $image->title;
-	} else {
-		$title = "untitled";
-	}
+$performed_by = get_entity($vars['item']->subject_guid);
+$image = get_entity($vars['item']->object_guid);
+if ($image->title) {
+	$title = $image->title;
+} else {
+	$title = "untitled";
+}
 
-	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-	$album = get_entity($image->container_guid);
+$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+$album = get_entity($image->container_guid);
 
-	$album_link = "<a href='". $album->getURL() . "'>" . $album->title . "</a>";
-	$image_link = "<a href=\"" . $image->getURL() . "\">" . $title . "</a>";
-	
-	$string = sprintf(elgg_echo("image:river:created"), $url, $image_link, $album_link);
-		
-	$string .= "<div class=\"river_content\">";
+$album_link = "<a href='". $album->getURL() . "'>" . $album->title . "</a>";
+$image_link = "<a href=\"" . $image->getURL() . "\">" . $title . "</a>";
+
+$string = sprintf(elgg_echo("image:river:created"), $url, $image_link, $album_link);
+
+$string .= "<div class=\"river_content\">";
 
 /*	// this adds the album cover to the river display 
 	$string .= "<a href=\"" . $album->getURL() . "\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> </a>';
 */
-	$string .= "<a href=\"" . $image->getURL() . "\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> </a>';
-	$string .= "</div>";
-	
-	echo $string;
+$string .= "<a href=\"" . $image->getURL() . "\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> </a>';
+$string .= "</div>";
 
-?>
\ No newline at end of file
+echo $string;
diff --git a/views/default/river/object/image/tag.php b/views/default/river/object/image/tag.php
index 1b3589afb..961761c99 100644
--- a/views/default/river/object/image/tag.php
+++ b/views/default/river/object/image/tag.php
@@ -1,23 +1,22 @@
 <?php
 
-	$image = get_entity($vars['item']->subject_guid);
-	$person_tagged = get_entity($vars['item']->object_guid);
-	if($image->title) {
-		$title = $image->title;
-	} else {
-		$title = "untitled";
-	}
-	
-	// viewer may not have permission to view image
-	if (!$image)
-		return;
-	
-	
-	$image_url = "<a href=\"{$image->getURL()}\">{$title}</a>";
-	$person_url = "<a href=\"{$person_tagged->getURL()}\">{$person_tagged->name}</a>";
-	
-	$string = $person_url . ' ' . elgg_echo('image:river:tagged') . ' ' . $image_url;
-	
-	echo $string;
+$image = get_entity($vars['item']->subject_guid);
+$person_tagged = get_entity($vars['item']->object_guid);
+if ($image->title) {
+	$title = $image->title;
+} else {
+	$title = "untitled";
+}
 
-?>
\ No newline at end of file
+// viewer may not have permission to view image
+if (!$image) {
+	return;
+}
+
+
+$image_url = "<a href=\"{$image->getURL()}\">{$title}</a>";
+$person_url = "<a href=\"{$person_tagged->getURL()}\">{$person_tagged->name}</a>";
+
+$string = $person_url . ' ' . elgg_echo('image:river:tagged') . ' ' . $image_url;
+
+echo $string;