Merge branch 'no-flash-uploader' of git://github.com/sembrestels/Tidypics

1 files changed, 0 insertions, 57 deletions

diff --git a/actions/photos/image/ajax_upload.php b/actions/photos/image/ajax_upload.php
deleted file mode 100644
index 312bc598c..000000000
--- a/actions/photos/image/ajax_upload.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Elgg single upload action for flash/ajax uploaders
- */
-
-elgg_load_library('tidypics:upload');
-
-$album_guid = (int) get_input('album_guid');
-$file_var_name = get_input('file_var_name', 'Image');
-$batch = get_input('batch');
-
-$album = get_entity($album_guid);
-if (!$album) {
-	echo elgg_echo('tidypics:baduploadform');
-	exit;
-}
-
-// probably POST limit exceeded
-if (empty($_FILES)) {
-	trigger_error('Tidypics warning: user exceeded post limit on image upload', E_USER_WARNING);
-	register_error(elgg_echo('tidypics:exceedpostlimit'));
-	exit;
-}
-
-$file = $_FILES[$file_var_name];
-
-$mime = tp_upload_get_mimetype($file['name']);
-if ($mime == 'unknown') {
-	echo 'Not an image';
-	exit;
-}
-
-// we have to override the mime type because uploadify sends everything as application/octet-string
-$file['type'] = $mime;
-
-$image = new TidypicsImage();
-$image->container_guid = $album->getGUID();
-$image->setMimeType($mime);
-$image->access_id = $album->access_id;
-$image->batch = $batch;
-
-try {
-	$image->save($file);
-	$album->prependImageList(array($image->guid));
-
-	if (elgg_get_plugin_setting('img_river_view', 'tidypics') === "all") {
-		add_to_river('river/object/image/create', 'create', $image->getOwnerGUID(), $image->getGUID());
-	}
-
-	echo elgg_echo('success');
-} catch (Exception $e) {
-	// remove the bits that were saved
-	$image->delete();
-	echo $e->getMessage();
-}
-
-exit;
\ No newline at end of file