Merge pull request #41 from cash/embed-lightbox

Fixes #3564 Embed rewrite using new lightbox

3 files changed, 13 insertions, 57 deletions

diff --git a/mod/file/actions/file/upload.php b/mod/file/actions/file/upload.php
index c5fe763cb..88a01745d 100644
--- a/mod/file/actions/file/upload.php
+++ b/mod/file/actions/file/upload.php
@@ -13,8 +13,6 @@ $container_guid = (int) get_input('container_guid', 0);
 $guid = (int) get_input('file_guid');
 $tags = get_input("tags");
 
-$ajax = get_input('ajax', FALSE);
-
 if ($container_guid == 0) {
 	$container_guid = elgg_get_logged_in_user_guid();
 }
@@ -33,17 +31,8 @@ if ($new_file) {
 	if (empty($_FILES['upload']['name'])) {
 
 		$error = elgg_echo('file:nofile');
-
-		if ($ajax) {
-			echo json_encode(array(
-				'status' => 'error',
-				'message' => $error
-			));
-			exit;
-		} else {
-			register_error($error);
-			forward(REFERER);
-		}
+		register_error($error);
+		forward(REFERER);
 	}
 
 	$file = new FilePluginFile();
@@ -159,44 +148,22 @@ elgg_clear_sticky_form('file');
 
 
 // handle results differently for new files and file updates
-// ajax is only for new files from embed right now.
 if ($new_file) {
 	if ($guid) {
 		$message = elgg_echo("file:saved");
-		if ($ajax) {
-			echo json_encode(array(
-				'status' => 'success',
-				'message' => $message
-			));
-			exit;
-
-		} else {
-			system_message($message);
-			add_to_river('river/object/file/create', 'create', elgg_get_logged_in_user_guid(), $file->guid);
-		}
+		system_message($message);
+		add_to_river('river/object/file/create', 'create', elgg_get_logged_in_user_guid(), $file->guid);
 	} else {
 		// failed to save file object - nothing we can do about this
 		$error = elgg_echo("file:uploadfailed");
-
-		if ($ajax) {
-			echo json_encode(array(
-				'status' => 'error',
-				'message' => $error
-			));
-			exit;
-
-		} else {
-			register_error($error);
-		}
+		register_error($error);
 	}
 
-	if (!$ajax) {
-		$container = get_entity($container_guid);
-		if (elgg_instanceof($container, 'group')) {
-			forward("file/group/$container->guid/all");
-		} else {
-			forward("file/owner/$container->username");
-		}
+	$container = get_entity($container_guid);
+	if (elgg_instanceof($container, 'group')) {
+		forward("file/group/$container->guid/all");
+	} else {
+		forward("file/owner/$container->username");
 	}
 
 } else {
diff --git a/mod/file/views/default/file/embed_upload.php b/mod/file/views/default/file/embed_upload.php
deleted file mode 100644
index e5076b052..000000000
--- a/mod/file/views/default/file/embed_upload.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/**
- * Files upload form for embed
- */
-
-echo elgg_view_form('file/upload', array('id' => 'file_embed_upload'), array('ajax' => TRUE));
-
-
diff --git a/mod/file/views/default/forms/file/upload.php b/mod/file/views/default/forms/file/upload.php
index b8a7a1668..98b7d9f05 100644
--- a/mod/file/views/default/forms/file/upload.php
+++ b/mod/file/views/default/forms/file/upload.php
@@ -11,8 +11,10 @@ $desc = elgg_extract('description', $vars, '');
 $tags = elgg_extract('tags', $vars, '');
 $access_id = elgg_extract('access_id', $vars, ACCESS_DEFAULT);
 $container_guid = elgg_extract('container_guid', $vars);
+if (!$container_guid) {
+	$container_guid = elgg_get_logged_in_user_guid();
+}
 $guid = elgg_extract('guid', $vars, null);
-$ajax = elgg_extract('ajax', $vars, FALSE);
 
 if ($guid) {
 	$file_label = elgg_echo("file:replace");
@@ -56,11 +58,6 @@ if ($categories) {
 
 echo elgg_view('input/hidden', array('name' => 'container_guid', 'value' => $container_guid));
 
-//@todo this should not be necessary in 1.8... -- ajax actions can be auto-detected
-if ($ajax) {
-	echo elgg_view('input/hidden', array('name' => 'ajax', 'value' => 1));
-}
-
 if ($guid) {
 	echo elgg_view('input/hidden', array('name' => 'file_guid', 'value' => $guid));
 }