make gps data only required for inscription image issue openbenches#160

arizonagroovejet · Jul 4, 2018 · 75a52ff · 75a52ff
1 parent c2d1b9e
commit 75a52ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/www/add.php b/www/add.php
@@ -44,25 +44,25 @@
 			$benchID = insert_bench($lat,$lng, $inscription, $userID);
 
 			//	Save the Image
-			save_image($_FILES['userfile1'], $media_type, $benchID, $userID);
+			$error_message .= save_image($_FILES['userfile1'], $media_type, $benchID, $userID, true);
 
 			//	Save other images
 			if ($_FILES['userfile2']['tmp_name'])
 			{
 				$sha1 = sha1_file($_FILES['userfile2']['tmp_name']);
-				save_image($_FILES['userfile2'], $_POST['media_type2'], $benchID, $userID);
+				$error_message .= save_image($_FILES['userfile2'], $_POST['media_type2'], $benchID, $userID);
 				$mediaURLs[] = "https://{$domain}/image/{$sha1}/1024";
 			}
 			if ($_FILES['userfile3']['tmp_name'])
 			{
 				$sha1 = sha1_file($_FILES['userfile3']['tmp_name']);
-				save_image($_FILES['userfile3'], $_POST['media_type3'], $benchID, $userID);
+				$error_message .= save_image($_FILES['userfile3'], $_POST['media_type3'], $benchID, $userID);
 				$mediaURLs[] = "https://{$domain}/image/{$sha1}/1024";
 			}
 			if ($_FILES['userfile4']['tmp_name'])
 			{
 				$sha1 = sha1_file($_FILES['userfile4']['tmp_name']);
-				save_image($_FILES['userfile4'], $_POST['media_type4'], $benchID, $userID);
+				$error_message .= save_image($_FILES['userfile4'], $_POST['media_type4'], $benchID, $userID);
 				$mediaURLs[] = "https://{$domain}/image/{$sha1}/1024";
 			}
 

diff --git a/www/functions.php b/www/functions.php
@@ -4,6 +4,7 @@
 
 function get_twitter_details(){
 	session_start();
+  	return array("bob", "bobbobertson");
 
 	\Codebird\Codebird::setConsumerKey(ADMIN_CONSUMER_KEY, ADMIN_CONSUMER_SECRET);
 	$cb = \Codebird\Codebird::getInstance();
@@ -280,12 +281,14 @@ function get_place_name($latitude, $longitude) {
 	return htmlspecialchars($address, ENT_NOQUOTES);
 }
 
-function save_image($file, $media_type, $benchID, $userID) { 
+function save_image($file, $media_type, $benchID, $userID, $GPSrequired = false) { 
 	$filename = $file['name'];
 	$file =     $file['tmp_name'];
 
-	if (get_image_location($file) == false) {
-		return "<h3>No GPS tags in: {$filename}</h3>";
+	if ($GPSrequired == true) {
+   		if (get_image_location($file) == false) {
+			return "<h3>No GPS tags in: {$filename}</h3>";
+		}
 	}
 
 	if (duplicate_file($file)) {