made some improvements to image uploading

2 files changed, 50 insertions, 59 deletions

diff --git a/actions/upload.php b/actions/upload.php
index 2e33d67db..a297128c4 100644
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -115,16 +115,7 @@
 		$mem_avail = ini_get('memory_limit');

 		$mem_avail = rtrim($mem_avail, 'M');

 		$mem_avail = $mem_avail * 1024 * 1024;

-		if ($image_lib === 'GD') {

-			$mem_required = 5 * $imginfo[0] * $imginfo[1];

-			$mem_avail = $mem_avail - memory_get_peak_usage() - 4194304; // 4 MB buffer

-			if ($mem_required > $mem_avail) {

-				array_push($not_uploaded, $sent_file['name']);

-				array_push($error_msgs, elgg_echo('tidypics:image_pixels'));

-				trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING);

-				continue;

-			}

-		} else if ($image_lib === 'ImageMagickPHP') {  

+		if ($image_lib == 'GD') {

 			$mem_required = 5 * $imginfo[0] * $imginfo[1];

 			$mem_avail = $mem_avail - memory_get_peak_usage() - 4194304; // 4 MB buffer

 			if ($mem_required > $mem_avail) {

@@ -133,6 +124,8 @@
 				trigger_error('Tidypics warning: image memory size too large for resizing so rejecting', E_USER_WARNING);

 				continue;

 			}

+		} else if ($image_lib == 'ImageMagickPHP') {

+			// haven't been able to determine a limit like there is for GD

 		}

 

 		//this will save to users folder in /image/ and organize by photo album

@@ -160,13 +153,13 @@
 		}

 		

 

-		if ($image_lib === 'GD') {

+		if ($image_lib == 'GD') {

 

 			if (tp_create_gd_thumbnails($file, $prefix, $filestorename) != true) {

 				trigger_error('Tidypics warning: failed to create thumbnails', E_USER_WARNING);

 			}

 			

-		} else if ($image_lib === 'ImageMagickPHP') {  // ImageMagick PHP 

+		} else if ($image_lib == 'ImageMagickPHP') {  // ImageMagick PHP 

 

 			if (tp_create_imagick_thumbnails($file, $prefix, $filestorename) != true) {

 				trigger_error('Tidypics warning: failed to create thumbnails', E_USER_WARNING);

diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php
index ec33ca933..1d83cf311 100644
--- 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