Added code to fetch the user's location, and send it as a GET/POST variable

index.html

@@ -18,8 +18,22 @@
 
         <span role="alert" id="error" aria-hidden="true">Invalid URL</span>
 
+	<br><br>
+	<label for="restricted">Geo-restricted?: </label><input type="checkbox" name="restricted" id="restricted">
+	<br><br>
+	<label for="radius">Radius: </label>
+	<select name="radius" id="radius">
+		<option value="5">5 mi</option>
+		<option value="10">10 mi</option>
+		<option value="15">15 mi</option>
+		<option value="20">20 mi</option>
+	</select>
         <br><br>
         <input type="submit" id="button" value="Zip It!">
+
+
+	<input type="hidden" name="latitude" id="latitude">
+	<input type="hidden" name="longitude" id="longitude">
     </form>
     <hr>
     <div>

index.js

@@ -1,16 +1,46 @@
 // const submit = document.getElementById("button");
 // submit.addEventListener('click', validate);
+
+mycheckbox = document.getElementById("restricted");
+mycheckbox.addEventListener('change',checkboxCallback);
+
+function checkboxCallback(event) {
+	if (event.currentTarget.checked) {
+		getLocation();
+	}
+}
+
+function getLocation() {
+	if (navigator.geolocation) {
+		navigator.geolocation.getCurrentPosition(showPosition);
+	  } else {
+		  console.log("Your browser does not support geolocation.");
+	  }
+}
+
+function showPosition(position) {
+	console.log(position.coords.latitude);
+	console.log(position.coords.longitude);
+
+	document.getElementById("latitude").value = position.coords.latitude;
+	document.getElementById("longitude").value = position.coords.longitude;
+}
+
+
 function validate() {
 	//e.preventDefault();
 
 	const url = document.getElementById("URL");
-    const glink = document.getElementById("GLink");
+	let glink = document.getElementById("GLink");
+	const error = document.getElementById("error");
 	// if (!url) {
 	//     /* Flag */
 	// }
 	let valid = true;
-    const domainExp = new RegExp("http(s)*:\\/\\/[a-zA-Z0-9\\-]+(\\.[a-zA-Z0-9\\-]+)+");
-    const filepathExp = new RegExp("[a-zA-Z]+");
+	const domainExp = new RegExp("^http(s)*:\\/\\/[a-zA-Z0-9\\-]+(\\.[a-zA-Z0-9\\-]+)+$");
+	const filepathExp = new RegExp("^[a-zA-Z]+$");
+        const glinkExp = new RegExp("^[a-zA-Z]*$");
+        let glinkStr = glink.value;
         let count = 0;
         let index = -1;
         let domain = "";
@@ -36,8 +66,18 @@ function validate() {
             domain = url.value;
         }
         console.log(domain);
-    if (domain.match(domainExp)) /** and is available? */{
-        const error = document.getElementById("error");
+
+        if (glinkStr === "") {
+            var result = window.confirm("You have left the glink field blank. A random one will be generated for you.");
+            if (result === false) {
+                return false;
+            } else {
+                glinkStr = getRandomGLink();
+            }
+        }
+
+
+        if (domain.match(domainExp) && glinkStr.match(glinkExp))/** and is available? */{
             if (error.classList.contains("visible")) {
                 error.classList.remove("visible");
             }
@@ -45,30 +85,43 @@ function validate() {
                 url.classList.remove("invalid");
             }
             url.classList.add("valid");
+            if (glink.classList.contains("invalid")) {
+                glink.classList.remove("invalid");
+            }
+            glink.classList.add("valid");
             error.setAttribute('aria-hidden', true);
             error.setAttribute('aria-invalid', false);
-        console.log("Valid");
-
+            console.log("Valid with url= " +url.value+ " glink=" +glink);
             return valid;
-
-/*	var xmlhttp = new XMLHttpRequest();
-	xmlhttp.open('GET','result.php',true);
-	xmlhttp.send();
-	console.log(xmlhttp.responseText);*/
         } else {
-
             /*flag*/
-        const error = document.getElementById("error");
             error.classList.add("visible");
 
             //error.classList.add("hidden");
+            if (!domain.match(domainExp)) {
                 if (url.classList.contains("valid")) {
                     url.classList.remove("valid");
                 }
                 url.classList.add("invalid");
+            } else {
+                if (url.classList.contains("invalid")) {
+                    url.classList.remove("invalid");
+                }
+                url.classList.add("valid");
+            }
+            if (!glinkStr.match(glinkExp)) {
+                if (glink.classList.contains("valid")) {
+                    glink.classList.remove("valid");
+                }
+                glink.classList.add("invalid");
+            } else {
+                if (glink.classList.contains("invalid")) {
+                    glink.classList.remove("invalid");
+                }
+                glink.classList.add("valid");
+            }
             error.setAttribute('aria-hidden', false);
             error.setAttribute('aria-invalid', true);
             return false;
         }
-
 }

result.php

@@ -32,6 +32,7 @@ use Casssandra;
 
 $cluster = Cassandra::cluster()->withPersistentSessions(true)->build();
 $keyspace = 'glink';
+$session = $cluster->connect($keyspace);
 
 $url = $_GET["url"];
 $matches = preg_match('/^http(s)*:\\/\\/[a-zA-Z0-9\\-]+(\\.[a-zA-Z0-9\\-]+)+$/',$url);
@@ -55,7 +56,7 @@ if ($shortlink != '') {
 		$shortlink = $rand_string;
 
 		/* Check if shortlink is already taken by querying the database */
-		$statement = $session->prepare('SELECT url FROM data WHERE id=?');
+		$statement = $session->prepare('SELECT url FROM data WHERE shortlink=? ALLOW FILTERING');
 		$result = $session->execute($statement,array('arguments' => array($shortlink)));
 
 		if ($result->count() != 0) {
@@ -64,8 +65,6 @@ if ($shortlink != '') {
 
 }
 
-$session = $cluster->connect($keyspace);
-
 //$statement = new Cassandra\SimpleStatement('SELECT name FROM data WHERE id=5');
 
 $statement = $session->prepare('SELECT url FROM data WHERE shortlink=? ALLOW FILTERING');