From 0fa29b2fd0501a2fde5e086be5da22fe1f47f040 Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Sat, 28 Jul 2012 21:12:24 +0200
Subject: Removed flash uploader.

---
 views/default/forms/photos/admin/settings/main.php |  2 +-
 views/default/forms/photos/ajax_upload.php         | 54 ----------------------
 2 files changed, 1 insertion(+), 55 deletions(-)
 delete mode 100644 views/default/forms/photos/ajax_upload.php

(limited to 'views/default/forms')

diff --git a/views/default/forms/photos/admin/settings/main.php b/views/default/forms/photos/admin/settings/main.php
index c99b9d688..f7950a7ad 100644
--- a/views/default/forms/photos/admin/settings/main.php
+++ b/views/default/forms/photos/admin/settings/main.php
@@ -5,7 +5,7 @@
 
 $plugin = $vars['plugin'];
 
-$checkboxes = array('tagging', 'view_count', 'uploader', 'exif', 'download_link');
+$checkboxes = array('tagging', 'view_count', 'exif', 'download_link');
 foreach ($checkboxes as $checkbox) {
 	echo '<div>';
 	$checked = $plugin->$checkbox ? 'checked' : false;
diff --git a/views/default/forms/photos/ajax_upload.php b/views/default/forms/photos/ajax_upload.php
deleted file mode 100644
index 3ab578a38..000000000
--- a/views/default/forms/photos/ajax_upload.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Tidypics ajax upload form body
- *
- * @uses $vars['entity']
- */
-
-$album = $vars['entity'];
-
-$ts = time();
-$batch = time();
-$tidypics_token = md5(session_id() . get_site_secret() . $ts . elgg_get_logged_in_user_entity()->salt);
-$basic_uploader_url = current_page_url() . '/basic';
-
-$maxfilesize = (float) elgg_get_plugin_setting('maxfilesize', 'tidypics');
-if (!$maxfilesize) {
-	$maxfilesize = 5;
-}
-
-?>
-
-<p>
-<?php
-	echo elgg_echo('tidypics:uploader:instructs', array($maxfilesize, $basic_uploader_url));
-?>
-</p>
-
-<ul id="tidypics-uploader-steps">
-	<li class="mbm">
-		<div id="tidypics-uploader">
-			<a id="tidypics-choose-button" href="<?php echo $basic_uploader_url; ?>">
-				1. <?php echo elgg_echo('tidypics:uploader:choose'); ?>
-			</a>
-			<div id="tidypics-flash-uploader">
-				<input type="file" id="uploadify" name="uploadify" class="hidden" />
-				<input type="hidden" name="album_guid" value="<?php echo $album->getGUID(); ?>" />
-				<input type="hidden" name="batch" value="<?php echo $batch; ?>" />
-				<input type="hidden" name="tidypics_token" value="<?php echo $tidypics_token; ?>" />
-				<input type="hidden" name="user_guid" value="<?php echo elgg_get_logged_in_user_guid(); ?>" />
-				<input type="hidden" name="Elgg" value="<?php echo session_id(); ?>" />
-			</div>
-		</div>
-	</li>
-	<li class="mbm">
-		<a id="tidypics-upload-button" class="tidypics-disable" href="#">
-			2. <?php echo elgg_echo('tidypics:uploader:upload'); ?>
-		</a>
-	</li>
-	<li class="mbm">
-		<a id="tidypics-describe-button" class="tidypics-disable" href="#">
-			3. <?php echo elgg_echo('tidypics:uploader:describe'); ?>
-		</a>
-	</li>
-</ul>
-- 
cgit v1.2.3