Merge pull request #3101 from phl0/lotwFixing

Lotw fixing

application/controllers/Lotw.php

@@ -297,23 +297,13 @@ public function lotw_upload() {
 				//Tell cURL to return the output as a string.
 				curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 
-				//If the function curl_file_create exists
-				if(function_exists('curl_file_create')){
-					//Use the recommended way, creating a CURLFile object.
-					$filePath = curl_file_create($filePath);
-				} else{
-					//Otherwise, do it the old way.
-					//Get the canonicalized pathname of our file and prepend
-					//the @ character.
-					$filePath = '@' . realpath($filePath);
-					//Turn off SAFE UPLOAD so that it accepts files
-					//starting with an @
-					curl_setopt($ch, CURLOPT_SAFE_UPLOAD, false);
-				}
+				//Use the recommended way, creating a CURLFile object.
+				$uploadfile = curl_file_create($filePath);
+				$uploadfile->setPostFilename(basename($filePath));
 
 				//Setup our POST fields
 				$postFields = array(
-					$uploadFieldName => $filePath
+					$uploadFieldName => $uploadfile
 				);
 
 				curl_setopt($ch, CURLOPT_POSTFIELDS, $postFields);
@@ -967,7 +957,7 @@ function signlog($sign_key, $string) {
 		    openssl_free_key($pkeyid);
 		  }
 		  $signature_b64 = base64_encode($signature);
-		  return $signature_b64;
+		  return $signature_b64."\n";
 		}