made some improvements to image uploading

diff --git a/actions/upload.php b/actions/upload.php
index 2e33d67db49f865aedb42ee036a52ac0a2dcef23..a297128c41bf078c24c9f9c68d0d02bb04fe26db 100644 (file)
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -115,16 +115,7 @@
                $mem_avail = ini_get('memory_limit');\r
                $mem_avail = rtrim($mem_avail, 'M');\r
                $mem_avail = $mem_avail * 1024 * 1024;\r
-               if ($image_lib === 'GD') {\r
-                       $mem_required = 5 * $imginfo[0] * $imginfo[1];\r
-                       $mem_avail = $mem_avail - memory_get_peak_usage() - 4194304; // 4 MB buffer\r
-                       if ($mem_required > $mem_avail) {\r
-                               array_push($not_uploaded, $sent_file['name']);\r
-                               array_push($error_msgs, elgg_echo('tidypics:image_pixels'));\r
-                               trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING);\r
-                               continue;\r
-                       }\r
-               } else if ($image_lib === 'ImageMagickPHP') {  \r
+               if ($image_lib == 'GD') {\r
                        $mem_required = 5 * $imginfo[0] * $imginfo[1];\r
                        $mem_avail = $mem_avail - memory_get_peak_usage() - 4194304; // 4 MB buffer\r
                        if ($mem_required > $mem_avail) {\r
@@ -133,6 +124,8 @@
                                trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING);\r
                                continue;\r
                        }\r
+               } else if ($image_lib == 'ImageMagickPHP') {\r
+                       // haven't been able to determine a limit like there is for GD\r
                }\r
 \r
                //this will save to users folder in /image/ and organize by photo album\r
@@ -160,13 +153,13 @@
                }\r
                \r
 \r
-               if ($image_lib === 'GD') {\r
+               if ($image_lib == 'GD') {\r
 \r
                        if (tp_create_gd_thumbnails($file, $prefix, $filestorename) != true) {\r
                                trigger_error('Tidypics warning: failed to create thumbnails', E_USER_WARNING);\r
                        }\r
                        \r
-               } else if ($image_lib === 'ImageMagickPHP') {  // ImageMagick PHP \r
+               } else if ($image_lib == 'ImageMagickPHP') {  // ImageMagick PHP \r
 \r
                        if (tp_create_imagick_thumbnails($file, $prefix, $filestorename) != true) {\r
                                trigger_error('Tidypics warning: failed to create thumbnails', E_USER_WARNING);\r

diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php
index ec33ca9332bf6ff0f2441f0b1107da9983fd30ba..1d83cf311eddc93d8f3b4beaf4355629e7404b14 100644 (file)
--- a/views/default/tidypics/forms/upload.php
+++ b/views/default/tidypics/forms/upload.php
@@ -11,58 +11,35 @@
                $maxfilesize = 5;
 
 ?>
-<script language="javascript">
-<!--
-
-var state = 'none';
-
-function showhide(layer_ref) {
-       if (state == 'block') {
-       state = 'none';
-       }
-       else {
-       state = 'block';
-       }
-       if (document.all) { //IS IE 4 or 5 (or 6 beta)
-       eval( "document.all." + layer_ref + ".style.display = state");
-       }
-       if (document.layers) { //IS NETSCAPE 4 or below
-       document.layers[layer_ref].display = state;
-       }
-       if (document.getElementById &&!document.all) {
-       hza = document.getElementById(layer_ref);
-       hza.style.display = state;
-       }
-       return false;
-}
-//-->
-</script>
+<div id="tidypics_ref"></div>
 <div class="contentWrapper">
 <?php
        ob_start();
 ?>
-       <p style="line-height:1.6em;">
-               <label><?php echo elgg_echo("images:upload"); ?></label><br />
-               <i><?php echo elgg_echo("tidypics:settings:maxfilesize") . ' ' . $maxfilesize; ?></i><br />
-               <div align="center" class="tidypics_loader" id="tidypics_loader" name="tidypics_loader" style="display:none;"><center><img alt="..." border="0" src="<?php echo $vars['url'].'mod/tidypics/graphics/loader.gif' ?>" /></center></div>
-         <ol id="tidypics_image_upload_list">
+<p style="line-height:1.6em;">
+       <label><?php echo elgg_echo("images:upload"); ?></label><br />
+       <i><?php echo elgg_echo("tidypics:settings:maxfilesize") . ' ' . $maxfilesize; ?></i><br />
+       <div id="delete_tag_menu">
+               Uploading images<br />
+               <div style="margin:20px 0px 20px 80px;"><img alt="..." border="0" src="<?php echo $vars['url'].'mod/tidypics/graphics/loader.gif' ?>" /></div>
+       </div>
+       <ol id="tidypics_image_upload_list">
 <?php
-               for($x = 0; $x < 10; $x++){
-                       echo '<li>' . elgg_view("input/file",array('internalname' => "upload_$x")) . "</li>\n";
-               }         
+               for ($x = 0; $x < 10; $x++) {
+                       echo '<li>' . elgg_view("input/file",array('internalname' => "upload_$x")) . '</li>';
+               } 
 ?>
-               </ol>
-       </p>            
-               
-               <p>
-                       <?php                           
-                               if ($container_guid)
-                                       echo '<input type="hidden" name="container_guid" value="' . $container_guid . '" />';
-                               if ($access_id)
-                                       echo '<input type="hidden" name="access_id" value="' . $access_id . '" />';
-                       ?>
-                       <input type="submit" value="<?php echo elgg_echo("save"); ?>" onclick="showhide('tidypics_loader');" />
-               </p>
+       </ol>
+</p>
+<p>
+<?php
+               if ($container_guid)
+                       echo '<input type="hidden" name="container_guid" value="' . $container_guid . '" />';
+               if ($access_id)
+                       echo '<input type="hidden" name="access_id" value="' . $access_id . '" />';
+?>
+       <input type="submit" value="<?php echo elgg_echo("save"); ?>" onclick="displayProgress();" />
+</p>
 <?php
        $form_body = ob_get_clean();
        
@@ -72,4 +49,25 @@ function showhide(layer_ref) {
                                                                                'enctype' => 'multipart/form-data',
                                                                                'method' => 'post',));
 ?>
-</div>
\ No newline at end of file
+</div>
+<script type="text/javascript">
+
+       function displayProgress()
+       {
+               offsetY = 60;
+               offsetX = 120;
+               
+               divWidth = $('#tidypics_ref').width();
+               imgOffset = $('#tidypics_ref').offset();
+               imgWidth  = $('#tidypics_ref').width();
+               
+               _top = imgOffset.top + offsetY;
+               _left = imgOffset.left + offsetX;
+
+               $('#delete_tag_menu').show().css({
+                       "top": _top + "px",
+                       "left": _left + "px"
+               });
+               
+       }
+</script>
\ No newline at end of file