Working version yay!
This commit is contained in:
		
							parent
							
								
									0e0e4161c5
								
							
						
					
					
						commit
						7f18e0614b
					
				@ -1,5 +1,8 @@
 | 
				
			|||||||
<?php
 | 
					<?php
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ob_start();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
$config = parse_ini_file("config.ini");
 | 
					$config = parse_ini_file("config.ini");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
$conn = mysqli_connect($config["db_host"], $config["db_user"], $config["db_password"], "blomzt");
 | 
					$conn = mysqli_connect($config["db_host"], $config["db_user"], $config["db_password"], "blomzt");
 | 
				
			||||||
@ -18,6 +21,73 @@ if (!TableExists($config["db_table"], $conn)) {
 | 
				
			|||||||
?>
 | 
					?>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					<?php
 | 
				
			||||||
 | 
					if ($_SERVER["REQUEST_METHOD"] == "POST") {
 | 
				
			||||||
 | 
						if ($_POST["Latitude"] == NULL || $_POST["Longtitude"] == NULL) {
 | 
				
			||||||
 | 
							echo "Please don't leave any fields blank";
 | 
				
			||||||
 | 
							die();
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						$target_dir = "images/";
 | 
				
			||||||
 | 
						$target_file = $target_dir . basename($_FILES["fileToUpload"]["name"]);
 | 
				
			||||||
 | 
						$uploadOk = 1;
 | 
				
			||||||
 | 
						$imageFileType = pathinfo($target_file,PATHINFO_EXTENSION);
 | 
				
			||||||
 | 
						// Check if image file is a actual image or fake image
 | 
				
			||||||
 | 
						if(isset($_POST["submit"])) {
 | 
				
			||||||
 | 
						    $check = getimagesize($_FILES["fileToUpload"]["tmp_name"]);
 | 
				
			||||||
 | 
						    if($check !== false) {
 | 
				
			||||||
 | 
						        echo "File is an image - " . $check["mime"] . ".";
 | 
				
			||||||
 | 
						        $uploadOk = 1;
 | 
				
			||||||
 | 
						    } else {
 | 
				
			||||||
 | 
						        echo "File is not an image.";
 | 
				
			||||||
 | 
						        $uploadOk = 0;
 | 
				
			||||||
 | 
						    }
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						// Check if file already exists
 | 
				
			||||||
 | 
						if (file_exists($target_file)) {
 | 
				
			||||||
 | 
						    echo "Sorry, file already exists.";
 | 
				
			||||||
 | 
						    $uploadOk = 0;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						// Check file size
 | 
				
			||||||
 | 
						if ($_FILES["fileToUpload"]["size"] > 5000000) {
 | 
				
			||||||
 | 
						    echo "Sorry, your file is too large.";
 | 
				
			||||||
 | 
						    $uploadOk = 0;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						// Allow certain file formats
 | 
				
			||||||
 | 
						if($imageFileType != "jpg" && $imageFileType != "png" && $imageFileType != "jpeg"
 | 
				
			||||||
 | 
						&& $imageFileType != "gif" ) {
 | 
				
			||||||
 | 
						    echo "Sorry, only JPG, JPEG, PNG & GIF files are allowed.";
 | 
				
			||||||
 | 
						    $uploadOk = 0;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						// Check if $uploadOk is set to 0 by an error
 | 
				
			||||||
 | 
						if ($uploadOk == 0) {
 | 
				
			||||||
 | 
						    echo "Sorry, your file was not uploaded.";
 | 
				
			||||||
 | 
						    die();
 | 
				
			||||||
 | 
						// if everything is ok, try to upload file
 | 
				
			||||||
 | 
						} else {
 | 
				
			||||||
 | 
						    if (move_uploaded_file($_FILES["fileToUpload"]["tmp_name"], $target_file)) {
 | 
				
			||||||
 | 
						        echo "The file ". basename( $_FILES["fileToUpload"]["name"]). " has been uploaded.";
 | 
				
			||||||
 | 
						    } else {
 | 
				
			||||||
 | 
						        echo "Sorry, there was an error uploading your file.";
 | 
				
			||||||
 | 
						    }
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if(addToTable($_POST["Latitude"], $_POST["Longtitude"], basename($_FILES["fileToUpload"]["name"]), $config["db_table"], $conn) == false)
 | 
				
			||||||
 | 
						{
 | 
				
			||||||
 | 
							echo "Please enter a valid coordinate";
 | 
				
			||||||
 | 
							die();
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						header("Location: main.php#13/".$_POST["Latitude"]."/".$_POST["Longtitude"]);
 | 
				
			||||||
 | 
						die();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					?>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<html>
 | 
					<html>
 | 
				
			||||||
<head>
 | 
					<head>
 | 
				
			||||||
	<title>Blomzt - Add</title>
 | 
						<title>Blomzt - Add</title>
 | 
				
			||||||
@ -27,31 +97,15 @@ if (!TableExists($config["db_table"], $conn)) {
 | 
				
			|||||||
	<link rel="stylesheet" href="https://code.getmdl.io/1.1.3/material.indigo-pink.min.css">
 | 
						<link rel="stylesheet" href="https://code.getmdl.io/1.1.3/material.indigo-pink.min.css">
 | 
				
			||||||
	<link rel="stylesheet" type="text/css" href="/Resources/leaflet/leaflet.css">
 | 
						<link rel="stylesheet" type="text/css" href="/Resources/leaflet/leaflet.css">
 | 
				
			||||||
	<script defer src="https://code.getmdl.io/1.1.3/material.min.js"></script>
 | 
						<script defer src="https://code.getmdl.io/1.1.3/material.min.js"></script>
 | 
				
			||||||
 | 
					 | 
				
			||||||
	<link rel="stylesheet" type="text/css" href="main.css">
 | 
					 | 
				
			||||||
	<link rel="stylesheet" type="text/css" href="add.css">
 | 
					 | 
				
			||||||
</head>
 | 
					</head>
 | 
				
			||||||
<body>
 | 
					<body>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<?php
 | 
					 | 
				
			||||||
if ($_SERVER["REQUEST_METHOD"] == "POST") {
 | 
					 | 
				
			||||||
	if ($_POST["Latitude"] == NULL || $_POST["Longtitude"] == NULL) {
 | 
					 | 
				
			||||||
		echo "Please don't leave any fields blank";
 | 
					 | 
				
			||||||
		exit();
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if(addToTable($_POST["Latitude"], $_POST["Longtitude"], "test", $config["db_table"], $conn) == false)
 | 
					 | 
				
			||||||
	{
 | 
					 | 
				
			||||||
		echo "Please enter a valid coordinate";
 | 
					 | 
				
			||||||
		exit();
 | 
					 | 
				
			||||||
	}	
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
?>
 | 
					<form action="add.php" method="post" enctype="multipart/form-data">
 | 
				
			||||||
 | 
					 | 
				
			||||||
<form action="main.php" method="post">
 | 
					 | 
				
			||||||
	<input type="text" name="Latitude" placeholder="Latitude">
 | 
						<input type="text" name="Latitude" placeholder="Latitude">
 | 
				
			||||||
	<input type="text" name="Longtitude" placeholder="Longtitude">
 | 
						<input type="text" name="Longtitude" placeholder="Longtitude">
 | 
				
			||||||
 | 
						<input type="file" name="fileToUpload" id="fileToUpload">
 | 
				
			||||||
	<input type="submit">
 | 
						<input type="submit">
 | 
				
			||||||
</form>
 | 
					</form>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -81,8 +135,8 @@ function addToTable($lat, $lon, $url, $table, $conn) {
 | 
				
			|||||||
		return false;
 | 
							return false;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	$sql = "INSERT INTO `" . $table . "` (`id`, `location`, `url`, `date_added`) VALUES (NULL, GeomFromText('POINT(" . $lon ." " . $lat . ")',4326), 'test', CURRENT_TIMESTAMP)";
 | 
						$sql = "INSERT INTO `" . $table . "` (`id`, `location`, `url`, `date_added`) VALUES (NULL, GeomFromText('POINT(" . $lon ." " . $lat . ")',4326), " . "\"$url\"" . ", CURRENT_TIMESTAMP)";
 | 
				
			||||||
	//printf($sql);
 | 
						printf($sql);
 | 
				
			||||||
	$res = mysqli_query($conn, $sql);
 | 
						$res = mysqli_query($conn, $sql);
 | 
				
			||||||
	//($res) ? printf("true") : printf("false");
 | 
						//($res) ? printf("true") : printf("false");
 | 
				
			||||||
	return $res;
 | 
						return $res;
 | 
				
			||||||
 | 
				
			|||||||
@ -19,6 +19,7 @@ if (mysqli_connect_errno()) {
 | 
				
			|||||||
	<link rel="stylesheet" type="text/css" href="/Resources/leaflet/leaflet.css">
 | 
						<link rel="stylesheet" type="text/css" href="/Resources/leaflet/leaflet.css">
 | 
				
			||||||
	<script defer src="https://code.getmdl.io/1.1.3/material.min.js"></script>
 | 
						<script defer src="https://code.getmdl.io/1.1.3/material.min.js"></script>
 | 
				
			||||||
	<script type="text/javascript" src="/Resources/leaflet/leaflet.js"></script>
 | 
						<script type="text/javascript" src="/Resources/leaflet/leaflet.js"></script>
 | 
				
			||||||
 | 
						<script type="text/javascript" src="/Resources/leaflet-hash/leaflet-hash.js"></script>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
</head>
 | 
					</head>
 | 
				
			||||||
<body>
 | 
					<body>
 | 
				
			||||||
@ -26,13 +27,12 @@ if (mysqli_connect_errno()) {
 | 
				
			|||||||
	<div id="mapid" style="height: 100%;"></div>
 | 
						<div id="mapid" style="height: 100%;"></div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	<script type="text/javascript">
 | 
						<script type="text/javascript">
 | 
				
			||||||
		var map = L.map('mapid').setView([51.505, -0.09], 13);
 | 
							var map = L.map('mapid').setView([51.505, -0.09], 2);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={access token}', {
 | 
							L.tileLayer('https://api.mapbox.com/styles/v1/mapbox/streets-v9/tiles/256/{z}/{x}/{y}?access_token={accessToken}', {
 | 
				
			||||||
		    attribution: 'Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a>',
 | 
							    attribution: 'Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a>',
 | 
				
			||||||
		    maxZoom: 18,
 | 
							    maxZoom: 18,
 | 
				
			||||||
		    id:,
 | 
							    accessToken: "pk.eyJ1IjoiZGFsaTk5IiwiYSI6ImNpc2RueWJ0NTAwMW0yenBmaXg5OWhiZXQifQ.WCB3-xcQxEpBf6SHGKG94Q"
 | 
				
			||||||
		    accessToken:
 | 
					 | 
				
			||||||
		}).addTo(map);
 | 
							}).addTo(map);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		var markers = [
 | 
							var markers = [
 | 
				
			||||||
@ -41,7 +41,7 @@ if (mysqli_connect_errno()) {
 | 
				
			|||||||
				echo "{
 | 
									echo "{
 | 
				
			||||||
					\"type\": \"Feature\",
 | 
										\"type\": \"Feature\",
 | 
				
			||||||
					\"properties\": {
 | 
										\"properties\": {
 | 
				
			||||||
						\"popupContent\": \"<b>" . $row["date_added"] . "</b> <br><img src=\\\"images/" . $row["url"] . "\\\"/>\"
 | 
											\"popupContent\": \"<b>" . $row["date_added"] . "</b> <br><img style=\\\"max-width:240px\\\" src=\\\"images/" . $row["url"] . "\\\"/>\"
 | 
				
			||||||
					},
 | 
										},
 | 
				
			||||||
					\"geometry\": {
 | 
										\"geometry\": {
 | 
				
			||||||
						\"type\": \"Point\",
 | 
											\"type\": \"Point\",
 | 
				
			||||||
@ -67,9 +67,16 @@ if (mysqli_connect_errno()) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
		markerlayer.addData(markers);
 | 
							markerlayer.addData(markers);
 | 
				
			||||||
		markerlayer.addTo(map);
 | 
							markerlayer.addTo(map);
 | 
				
			||||||
 | 
							var hash = new L.Hash(map);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	</script>
 | 
						</script>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						<a href="add.php" class="mdl-button mdl-js-button mdl-button--fab mdl-button--colored mdl-button--raised" style="position: absolute; bottom:30px; right: 10px; z-index: 999; background-color: #257eca">
 | 
				
			||||||
 | 
							<i class=material-icons>add</i>
 | 
				
			||||||
 | 
						</a>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
</body>
 | 
					</body>
 | 
				
			||||||
</html>
 | 
					</html>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user