From bbc7b1bb87ca4ed58b801c12ca4a6ee405f0558c Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 22 Aug 2009 15:34:45 +0000
Subject: forgot to move edit_multiple.php

---
 actions/upload.php      |  2 +-
 edit_multi.php          | 46 ----------------------------------------------
 pages/edit_multiple.php | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 47 deletions(-)
 delete mode 100644 edit_multi.php
 create mode 100644 pages/edit_multiple.php

diff --git a/actions/upload.php b/actions/upload.php
index d5fb7d802..f189e3777 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -242,6 +242,6 @@
 	
 	
 	//forward to multi-image edit page
-	forward($CONFIG->wwwroot . 'mod/tidypics/edit_multi.php?files=' . implode('-', $uploaded_images)); 
+	forward($CONFIG->wwwroot . 'mod/tidypics/pages/edit_multiple.php?files=' . implode('-', $uploaded_images)); 
 
 ?>
diff --git a/edit_multi.php b/edit_multi.php
deleted file mode 100644
index 570245595..000000000
--- a/edit_multi.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-	/**
-	 * Tidypics: Edit the properties of multiple images 
-	 * 
-	 */
-
-	include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
-	gatekeeper();
-	set_context('photos');
-
-	// parse out photo guids
-	$file_string = get_input('files');
-	$file_array_sent = explode('-', $file_string);
-	$new_file_array = array();
-
-	// set owner of page based on first photo guid
-	$photo_guid = (int)$file_array_sent[0];
-	$photo = get_entity($photo_guid);
-
-	// set page owner based on owner of photo album
-	set_page_owner($photo->owner_guid);
-	$album = get_entity($photo->container_guid);
-	if ($album) {
-		$owner_guid = $album->container_guid;
-		if ($owner_guid)
-			set_page_owner($owner_guid);
-	}
-
-	foreach ($file_array_sent as $file_guid) {
-		if ($entity = get_entity($file_guid)) {
-			if ($entity->canEdit()){
-				array_push($new_file_array, $file_guid);
-			}
-			if (!$album_guid) 
-				$album_guid = $entity->container_guid;
-			
-		}
-	}
-
-	$title = elgg_echo('tidypics:editprops');
-	$area2 .= elgg_view_title($title);
-	$area2 .= elgg_view("tidypics/forms/edit_multi", array('file_array' => $new_file_array, 'album_guid' => $album_guid));
-	$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
-	page_draw($title, $body);
-?>
diff --git a/pages/edit_multiple.php b/pages/edit_multiple.php
new file mode 100644
index 000000000..0c9295054
--- /dev/null
+++ b/pages/edit_multiple.php
@@ -0,0 +1,47 @@
+<?php
+	/**
+	 * Tidypics: Edit the properties of multiple images 
+	 * 
+	 * Called after upload only
+	 */
+
+	include_once dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php";
+
+	gatekeeper();
+	set_context('photos');
+
+	// parse out photo guids
+	$file_string = get_input('files');
+	$file_array_sent = explode('-', $file_string);
+	$new_file_array = array();
+
+	// set owner of page based on first photo guid
+	$photo_guid = (int)$file_array_sent[0];
+	$photo = get_entity($photo_guid);
+
+	// set page owner based on owner of photo album
+	set_page_owner($photo->owner_guid);
+	$album = get_entity($photo->container_guid);
+	if ($album) {
+		$owner_guid = $album->container_guid;
+		if ($owner_guid)
+			set_page_owner($owner_guid);
+	}
+
+	foreach ($file_array_sent as $file_guid) {
+		if ($entity = get_entity($file_guid)) {
+			if ($entity->canEdit()){
+				array_push($new_file_array, $file_guid);
+			}
+			if (!$album_guid) 
+				$album_guid = $entity->container_guid;
+			
+		}
+	}
+
+	$title = elgg_echo('tidypics:editprops');
+	$area2 .= elgg_view_title($title);
+	$area2 .= elgg_view("tidypics/forms/edit_multi", array('file_array' => $new_file_array, 'album_guid' => $album_guid));
+	$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+	page_draw($title, $body);
+?>
-- 
cgit v1.2.3