Improved attachment error messaging, reverted change that removes att…

…achment name field. Fixes issues #1 and #21
ndlibersa · Mar 6, 2012 · 2d1e0af · 2d1e0af
1 parent ad92dad
commit 2d1e0af
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 43 deletions.
diff --git a/ajax_forms.php b/ajax_forms.php
@@ -2114,6 +2114,14 @@
 			<table class='noBorder' style='width:310px; margin:10px 15px;'>
 
 			<tr>
+			<td style='vertical-align:top;text-align:left;'><label for='shortName'><b>Name:</b></label></td>
+			<td>
+			<input type='text' class='changeInput' id='shortName' name='shortName' value = '<?php echo $attachment->shortName; ?>' style='width:230px' /><span id='span_error_shortName' class='smallDarkRedText'></span>
+			</td>
+			</tr>
+
+			<tr>
+
 			<td style='vertical-align:top;text-align:left;border:0px;'><label for='attachmentTypeID'><b>Type:</b></label></td>
 			<td style='vertical-align:top;text-align:left;border:0px;'>
 

diff --git a/ajax_processing.php b/ajax_processing.php
@@ -658,7 +658,13 @@
 		$attachment = new Attachment();
 
 		$exists = 0;
-
+
+    if (!is_writable("attachments")) {
+      echo 3;
+      break;
+    }
+
+
 		//first check that it doesn't have any offending characters
 		if ((strpos($uploadAttachment,"'") > 0) || (strpos($uploadAttachment,'"') > 0) || (strpos($uploadAttachment,"&") > 0) || (strpos($uploadAttachment,"<") > 0) || (strpos($uploadAttachment,">") > 0)){
 			echo "2";
@@ -703,6 +709,9 @@
 				//this way we can edit the attachment directly on the server
 				chmod ($target_path, 0766);
 				echo "success uploading!";
+			} else {
+			  header('HTTP/1.1 500 Internal Server Error');
+			  echo "<div id=\"error\">There was a problem saving your file to $target_path.  Please ensure your attachments directory is writable.</div>";
 			}
 
 		}

diff --git a/js/forms/attachmentForm.js b/js/forms/attachmentForm.js
@@ -69,7 +69,6 @@
 
 
 
-	createUploader();
 
  });
 
@@ -82,67 +81,49 @@ var exists = '';
 //verify filename isn't already used
 function checkUploadAttachment (file, extension){
 	$("#div_file_message").html("");
-	 $.ajax({
-		 type:       "GET",
-		 url:        "ajax_processing.php",
-		 cache:      false,
-		 async: 	 false,
-		 data:       "action=checkUploadAttachment&uploadAttachment=" + file,
-		 success:    function(response) {
+	$.ajax({
+		type:       "GET",
+		url:        "ajax_processing.php",
+		cache:      false,
+		async: 	 false,
+		data:       "action=checkUploadAttachment&uploadAttachment=" + file,
+		success:    function(response) {
+		  exists = "";
 			if (response == "1"){
 				exists = "1";
-				fileName="";
 				$("#div_file_message").html("  <font color='red'>File name is already being used...</font>");
 				return false;
-			}else if (response == "2"){
+			} else if (response == "2"){
 				exists = "2";
-				fileName="";
 				$("#div_file_message").html("  <font color='red'>File name may not contain special characters - ampersand, single quote, double quote or less than/greater than characters</font>");
 				return false;				
-			}else{
-				exists = "";
+			} else if (response == "3"){
+				exists = "3";
+				$("#div_file_message").html("  <font color='red'>The attachments directory is not writable.</font>");
+				return false;
 			}
-		 }
-
+			
+		}
 
 	});
 }
 
-
-
-
-
-        function createUploader(){            
-            var uploader = new qq.FileUploader({
-                element: document.getElementById('div_uploadFile'),
-                action: 'ajax_processing.php?action=uploadAttachment',
-                debug: true
-            });           
-        }
-
-
-
-
-
-
-
 //do actual upload
 new AjaxUpload('upload_button',
 	{action: 'ajax_processing.php?action=uploadAttachment',
 			name: 'myfile',
 			onChange : function (file, extension){checkUploadAttachment(file, extension);},
-			onComplete : function(data){
+			onComplete : function(data,response){
 				fileName=data;
 
-				//passed test
-				if ((exists == "") && (data != "")){
-					$("#div_file_message").html("<img src='images/paperclip.gif'>" + fileName + " successfully uploaded.");
-					$("#div_uploadFile").html("");
-				}else{
-					$("#div_file_message").html("<font color='red'>" . fileName + " was not successfully uploaded.  Please make sure the /attachments/ directory exists and is writable.</font>");
-					fileName='';
+				if (exists == ""){
+          var errorMessage = $(response).filter('#error');
+          if (errorMessage.size() > 0) {
+            $("#div_file_message").html("<font color='red'>" + errorMessage.html() + "</font>");
+          } else {
+            $("#div_file_message").html("<img src='images/paperclip.gif'>" + fileName + " successfully uploaded.");
 				}
-
+      }
 		}
 });