now handling max file size of less than 1 MB

diff --git a/actions/upload.php b/actions/upload.php
index f189e3777be3ef702e7713eba227fbcd4a25d4f1..70480a498fbad90e81379ca37f83da174350fa4f 100644 (file)
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -17,7 +17,7 @@
 \r
        $album = get_entity($container_guid);\r
 \r
-       $maxfilesize = get_plugin_setting('maxfilesize','tidypics'); \r
+       $maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics'); \r
        if (!$maxfilesize)\r
                $maxfilesize = 5; // default to 5 MB if not set \r
        $maxfilesize = 1024 * 1024 * $maxfilesize; // convert to bytes from MBs\r

diff --git a/views/default/tidypics/forms/admin.php b/views/default/tidypics/forms/admin.php
index 1685f7791baffa50d96d31b5924def98bbbfad2e..c52348ecca5df1dccbeaf2dc69df5ab589fdbb7d 100644 (file)
--- a/views/default/tidypics/forms/admin.php
+++ b/views/default/tidypics/forms/admin.php
@@ -70,8 +70,10 @@
        $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>";\r
 
        // Watermark Text\r
+/*\r
        $form_body .= "<p>" . elgg_echo('tidypics:settings:watermark') . "<br />";\r
        $form_body .= elgg_view("input/text",array('internalname' => 'params[watermark_text]', 'value' => $plugin->watermark_text)) . "</p>";\r
+*/\r
 
        // Max Image Size\r
        $maxfilesize = $plugin->maxfilesize;\r

diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php
index d3fc7828d7dd27840a467e24e03cdc67a4cb7027..522a51c4b95792878eb4ebc73d27247aca703083 100644 (file)
--- a/views/default/tidypics/forms/upload.php
+++ b/views/default/tidypics/forms/upload.php
@@ -7,7 +7,7 @@
        $album = get_entity($vars['album']);
        $access_id = $album->access_id;
 
-       $maxfilesize = (int) get_plugin_setting('maxfilesize','tidypics');
+       $maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics');
        if (!$maxfilesize)
                $maxfilesize = 5;