From ee733ee32b08e062ab868a3b26c3cbe73852a28e Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Thu, 4 Jun 2009 11:38:54 +0000
Subject: 1. only supporting Elgg 1.5 and greater now - river code 2. fixed a
 bug with river code and adding single images to activity

---
 actions/upload.php                            | 16 ++++++++--------
 lib/watermark.php                             |  4 +++-
 views/default/river/object/album/annotate.php | 13 -------------
 views/default/river/object/album/create.php   | 13 +------------
 views/default/river/object/image/annotate.php | 13 -------------
 views/default/river/object/image/create.php   | 13 -------------
 6 files changed, 12 insertions(+), 60 deletions(-)
 delete mode 100644 views/default/river/object/album/annotate.php
 delete mode 100644 views/default/river/object/image/annotate.php

diff --git a/actions/upload.php b/actions/upload.php
index 6a941fa66..11290a1d8 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -6,9 +6,9 @@
 	 */
 
 	global $CONFIG;
-	include_once dirname(dirname(__FILE__)) . "/lib/resize.php";
-	include_once dirname(dirname(__FILE__)) . "/lib/watermark.php";
-	include_once dirname(dirname(__FILE__)) . "/lib/exif.php";
+	include dirname(dirname(__FILE__)) . "/lib/resize.php";
+	include dirname(dirname(__FILE__)) . "/lib/watermark.php";
+	include dirname(dirname(__FILE__)) . "/lib/exif.php";
 
 	// Get common variables
 	$access_id = (int) get_input("access_id");
@@ -158,13 +158,13 @@
 			
 			tp_watermark($thumbs);
 			
-			//keep one file handy so we can add a notice to the river
-			if(!$file_for_river) {
-				$file_for_river = $file;
-			}
-
 		} // end of image library selector
 
+		//keep one file handy so we can add a notice to the river if single image option selected
+		if(!$file_for_river) {
+			$file_for_river = $file;
+		}
+
 		//get and store the exif data
 		td_get_exif($file);	
 		array_push($uploaded_images, $file->guid);
diff --git a/lib/watermark.php b/lib/watermark.php
index 64385ae4a..4aa719aea 100644
--- a/lib/watermark.php
+++ b/lib/watermark.php
@@ -1,7 +1,9 @@
 <?php
 
+include_once dirname(__FILE__) . "/tidypics.php";
+
+
 function tp_watermark($thumbs) {
-	include_once dirname(__FILE__) . "/tidypics.php";
 	global $CONFIG;
 	
 	$user = get_user_entity_as_row($album->owner_guid);
diff --git a/views/default/river/object/album/annotate.php b/views/default/river/object/album/annotate.php
deleted file mode 100644
index 691b0c7ec..000000000
--- a/views/default/river/object/album/annotate.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-	$statement = $vars['statement'];
-	$performed_by = $statement->getSubject();
-	$object = $statement->getObject();
-	
-	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-	$string = sprintf(elgg_echo("album:river:annotate"),$url) . " ";
-	$string .= "<a href=\"" . $object->getURL() . "\">" . elgg_echo("album:river:item") . "</a>";
-
-	echo $string; 
-	
-?>
\ No newline at end of file
diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php
index 300062b5a..40f847c78 100644
--- a/views/default/river/object/album/create.php
+++ b/views/default/river/object/album/create.php
@@ -1,6 +1,5 @@
 <?php
 
-if (function_exists('add_to_river')) { // Elgg 1.5
 	$performed_by = get_entity($vars['item']->subject_guid);
 	$album = get_entity($vars['item']->object_guid);
 	
@@ -11,17 +10,7 @@ if (function_exists('add_to_river')) { // Elgg 1.5
 	if ($album->cover) {
 		$string .= "<div class=\"river_content\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/>' . "</div>";
 	}
-	
-} else {  // Elgg 1.2
-	$statement = $vars['statement'];
-	$performed_by = $statement->getSubject();
-	$object = $statement->getObject();
-        
-	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-	$string = sprintf(elgg_echo("album:river:created"),$url) . " ";
-	$string .= "<a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
-}
 
 echo $string;
-	
+
 ?>
diff --git a/views/default/river/object/image/annotate.php b/views/default/river/object/image/annotate.php
deleted file mode 100644
index b0b1b8719..000000000
--- a/views/default/river/object/image/annotate.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-	$statement = $vars['statement'];
-	$performed_by = $statement->getSubject();
-	$object = $statement->getObject();
-	
-	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-	$string = sprintf(elgg_echo("image:river:annotate"),$url) . " ";
-	$string .= "<a href=\"" . $object->getURL() . "\">" . elgg_echo("image:river:item") . "</a>";
-
-	echo $string; 
-	
-?>
\ No newline at end of file
diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index bf6d2acbb..09320080b 100644
--- a/views/default/river/object/image/create.php
+++ b/views/default/river/object/image/create.php
@@ -1,6 +1,5 @@
 <?php
 
-if (function_exists('add_to_river')) { // Elgg 1.5
 	$performed_by = get_entity($vars['item']->subject_guid);
 	$image = get_entity($vars['item']->object_guid);
 	if($image->title) {
@@ -23,17 +22,5 @@ if (function_exists('add_to_river')) { // Elgg 1.5
 	$string .= "</div>";
 	
 	echo $string;
-	
-} else {
-	$statement = $vars['statement'];
-	$performed_by = $statement->getSubject();
-	$object = $statement->getObject();
-	
-	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-	$string = sprintf(elgg_echo("image:river:created"),$url) . " ";
-	$string .= "<a href=\"" . $object->getURL() . "\">" . elgg_echo("image:river:item") . "</a>";
 
-	echo $string;
-}
-	
 ?>
\ No newline at end of file
-- 
cgit v1.2.3