convert line endings to Unix

3 files changed, 92 insertions, 92 deletions

diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php
index a9b261566..20f9293d7 100644
--- a/views/default/river/object/album/create.php
+++ b/views/default/river/object/album/create.php
@@ -1,42 +1,42 @@
-<?php

-

-	$performed_by = get_entity($vars['item']->subject_guid);

-	$album = get_entity($vars['item']->object_guid);

-	

-	$group_album = ($album->owner_guid != $album->container_guid);

-	if ($group_album) {

-		$group = get_entity($album->container_guid);

-		$group_name = $group->name;

-		$group_link = $group->getURL();

-	}

-	

-	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";

-	$string = sprintf(elgg_echo("album:river:created"),$url) . " ";

-	$string .= "<a href=\"" . $album->getURL() . "\">" . $album->title . "</a>";

-	if ($group_album)

-		$string .= ' ' . elgg_echo('album:river:group') . ' ' . "<a href=\"{$group_link}\" >{$group_name}</a>";

-

-	$album_river_view = get_plugin_setting('album_river_view', 'tidypics');

-	

-	if ($album_river_view == "cover") {

-		if ($album->cover) {

-			$string .= "<div class=\"river_content\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/>' . "</div>";

-		}

-	} else {

-

-		$string .= "<div class=\"river_content\">";

-		

-		$images = get_entities("object", "image", $album->guid, 'time_created desc', 7);

-

-		if (count($images)) {

-			foreach($images as $image){

-				$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;

-

-?>

+<?php
+
+	$performed_by = get_entity($vars['item']->subject_guid);
+	$album = get_entity($vars['item']->object_guid);
+	
+	$group_album = ($album->owner_guid != $album->container_guid);
+	if ($group_album) {
+		$group = get_entity($album->container_guid);
+		$group_name = $group->name;
+		$group_link = $group->getURL();
+	}
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("album:river:created"),$url) . " ";
+	$string .= "<a href=\"" . $album->getURL() . "\">" . $album->title . "</a>";
+	if ($group_album)
+		$string .= ' ' . elgg_echo('album:river:group') . ' ' . "<a href=\"{$group_link}\" >{$group_name}</a>";
+
+	$album_river_view = get_plugin_setting('album_river_view', 'tidypics');
+	
+	if ($album_river_view == "cover") {
+		if ($album->cover) {
+			$string .= "<div class=\"river_content\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/>' . "</div>";
+		}
+	} else {
+
+		$string .= "<div class=\"river_content\">";
+		
+		$images = get_entities("object", "image", $album->guid, 'time_created desc', 7);
+
+		if (count($images)) {
+			foreach($images as $image){
+				$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;
+
+?>
diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index 5229e109a..2f1777f64 100644
--- a/views/default/river/object/image/create.php
+++ b/views/default/river/object/image/create.php
@@ -1,29 +1,29 @@
-<?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";

-	}

-

-	$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"),$performed_by->name, $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;

-

+<?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";
+	}
+
+	$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"),$performed_by->name, $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;
+
 ?>
\ No newline at end of file
diff --git a/views/default/river/object/image/tag.php b/views/default/river/object/image/tag.php
index 6e60d5af3..1b3589afb 100644
--- a/views/default/river/object/image/tag.php
+++ b/views/default/river/object/image/tag.php
@@ -1,23 +1,23 @@
-<?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;

-

+<?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;
+
 ?>
\ No newline at end of file