admins can turn off flash uploader

diff --git a/actions/admin/settings.php b/actions/admin/settings.php
index 2c529d950571cd432999161cf8f19d502a614272..d3801f655bcf9fdd8ff40a09a5e829d0615ab2e6 100644 (file)
--- a/actions/admin/settings.php
+++ b/actions/admin/settings.php
@@ -51,6 +51,12 @@ if (is_array(get_input('view_count'))) {
        set_plugin_setting('view_count', 'disabled', 'tidypics');
 }
 
+if (is_array(get_input('uploader'))) {
+       set_plugin_setting('uploader', 'enabled', 'tidypics');
+} else {
+       set_plugin_setting('uploader', 'disabled', 'tidypics');
+}
+
 if (is_array(get_input('grp_perm_override'))) {
        set_plugin_setting('grp_perm_override', 'enabled', 'tidypics');
 } else {

diff --git a/languages/en.php b/languages/en.php
index fce4b392ac26a232483d5436121cdcb82077f1b2..d9c9a302b4d7b2ff15eb9dc8ca6bd3437003c7b3 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -71,6 +71,7 @@ $english = array(
                        'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or compatible)",
                        'tidypics:settings:exif' => "Show EXIF data",
                        'tidypics:settings:view_count' => "View counter",
+                       'tidypics:settings:uploader' => "Use Flash uploader",
                        'tidypics:settings:grp_perm_override' => "Allow group members full access to group albums",
                        'tidypics:settings:maxfilesize' => "Maximum image size in megabytes (MB):",
                        'tidypics:settings:quota' => "User/Group Quota (MB) - 0 equals no quota",

diff --git a/pages/upload.php b/pages/upload.php
index b6a828cf9714adc8236e949cc95c722be7d75030..7ac4930b51253627704d6e96ef1c167089cc8e3a 100644 (file)
--- a/pages/upload.php
+++ b/pages/upload.php
@@ -14,7 +14,12 @@ if (!$album_guid) {
        forward();
 }
 
-$uploader = get_input('uploader', 'ajax');
+if (get_plugin_setting('uploader', 'tidypics') != "disabled") {
+       $uploader = get_input('uploader', 'ajax');
+} else {
+       $uploader = 'basic';
+}
+
 
 $album = get_entity($album_guid);
 

diff --git a/views/default/tidypics/forms/settings.php b/views/default/tidypics/forms/settings.php
index c8a1b4bd90beda1dbfa71d3dbf1be6a06567dc23..5eae9becc78f1ef4f7aab09e9ba8f7a1c8cc0e0c 100644 (file)
--- a/views/default/tidypics/forms/settings.php
+++ b/views/default/tidypics/forms/settings.php
@@ -48,6 +48,13 @@ if (!$view_count) {
 }
 $form_body .= '<p class="admin_debug">' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:view_count') => 'enabled'), 'internalname' => 'view_count', 'value' => $view_count )) . "</p>";
 
+// Use flash uploader
+$uploader = $plugin->uploader;
+if (!$uploader) {
+       $uploader = "enabled";
+}
+$form_body .= '<p class="admin_debug">' . elgg_view("input/checkboxes", array('options' => array(elgg_echo('tidypics:settings:uploader') => 'enabled'), 'internalname' => 'uploader', 'value' => $uploader )) . "</p>";
+
 // Watermark Text
 $form_body .= "<p>" . elgg_echo('tidypics:settings:watermark') . "<br />";
 $form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "</p>";