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

index.html

@@ -14,12 +14,26 @@
         <input type="text" name="url" id="URL" value="https://example.com" required><br><br>
 
         <label for="labels">GLink:</label><span class="mandatory">*</span>
-        <label for="GLink" id="labels" class="glink">glink.zip/</label><input type="text" name="glink" id="GLink" class="glink" value="exampleWebsite" required>
+        <label for="GLink" id="labels" class="glink">glink.zip/</label><input type="text" name="glink" id="GLink" class="glink" value="exampleWebsite">
 
         <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 domainExp = new RegExp("^http(s)*:\\/\\/[a-zA-Z0-9\\-]+(\\.[a-zA-Z0-9\\-]+)+$");
-    const filepathExp = new RegExp("[a-zA-Z]+");
+	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;
         }
-
 }

redirect.php

@@ -0,0 +1,36 @@
+<?php
+	use Cassandra;
+
+	$uri = $_SERVER['REQUEST_URI'];
+	$uri = substr($uri,1);
+
+	$matches_uri = preg_match('/^[a-zA-Z]+$/',$uri);
+
+	if (($matches_uri == 0) || ($matches_uri == false)) {
+		header("Location: http://glink.zip/");
+	        exit;
+	} else {
+
+		$cluster = Cassandra::cluster()->withPersistentSessions(true)->build();
+		$keyspace = 'glink';
+		$session = $cluster->connect($keyspace);
+
+		$statement = $session->prepare('SELECT url FROM data WHERE shortlink=? ALLOW FILTERING;');
+		$result = $session->execute($statement,array('arguments' => array($uri)));
+
+		if ($result->count() == 0) {
+			printf('The given GLink was invalid, and doesn\'t point to a specific web page.');
+			exit;
+		}
+
+		foreach($result as $row) {
+			if (is_null($row)) {
+				printf('The given GLink was invalid, and doesn\'t point to a specific web page.');
+				exit;
+			} else {
+				header("Location: " . $row['url']);
+			}
+		}
+	}
+
+?>

result.js

@@ -1,14 +0,0 @@
-console.log('Beginning database execution');
-
-const cassandra = require('cassandra-driver');
-
-const client = new cassandra.Client({
-	contactPoints: ['127.0.0.1:9042'],
-	keyspace: 'glink',
-});
-
-const query = 'SELECT name FROM data WHERE id = ?';
-
-console.log(query);
-
-client.execute(query, [5]).then(result => console.log('User name is %s',result.rows[0].name));

result.php

@@ -1,42 +1,97 @@
 <?php
+
+function gen_base62_rand_shortlink($len) {
+	$rand_bytes = random_bytes(intval(($len * 2) / 3));
+        $rand_string = base64_encode($rand_bytes);
+	$rand_string = str_replace("+","",$rand_string);
+        $rand_string = str_replace("/","",$rand_string);
+        $rand_string = str_replace("=","",$rand_string);
+
+	if (mb_strlen($rand_string) < $len) {
+		$curlen = mb_strlen($rand_string);
+		$rand_string = $rand_string . gen_rand_shortlink($len - $curlen);
+	}
+
+	return $rand_string;
+}
+
+function gen_rand_shortlink($len) {
+	$to_return = '';
+	$possible_chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+	while (mb_strlen($to_return) < $len) {
+		$to_return = $to_return . $possible_chars[rand(0, mb_strlen($possible_chars)-1)];
+	}
+
+	return $to_return;
+
+}
+
+
 ini_set('display_errors', 1);
 use Casssandra;
 
-$cluster = Cassandra::cluster()->build();
+$cluster = Cassandra::cluster()->withPersistentSessions(true)->build();
 $keyspace = 'glink';
-
-$url = $_GET["url"];
-$shortlink = $_GET["glink"];
-
 $session = $cluster->connect($keyspace);
 
+$url = $_GET["url"];
+$matches = preg_match('/^http(s)*:\\/\\/[a-zA-Z0-9\\-]+(\\.[a-zA-Z0-9\\-]+)+$/',$url);
+if (($matches == 0) || ($matches == false)) {
+	printf("The URL entered was invalid. Please try again.");
+	return;
+}
+
+$shortlink = $_GET["glink"];
+
+if ($shortlink != '') {
+	$matches_shortlink = preg_match('/^[a-zA-Z]+$/',$shortlink);
+	if (($matches_shortlink == 0) || ($matches_shortlink == false)) {
+	        printf("The GLink entered was invalid. The GLink can only contain letters. Please try again.");
+	        return;
+	}
+} else {
+	/* generate a random shortlink */
+	gen_shortlink:
+		$rand_string = gen_rand_shortlink(6);  /* the function is defined at the start of this file */
+		$shortlink = $rand_string;
+
+		/* Check if shortlink is already taken by querying the database */
+		$statement = $session->prepare('SELECT url FROM data WHERE shortlink=? ALLOW FILTERING');
+		$result = $session->execute($statement,array('arguments' => array($shortlink)));
+
+		if ($result->count() != 0) {
+			goto gen_shortlink;
+		}
+
+}
+
 //$statement = new Cassandra\SimpleStatement('SELECT name FROM data WHERE id=5');
+
+$statement = $session->prepare('SELECT url FROM data WHERE shortlink=? ALLOW FILTERING');
+$options = array('arguments' => array($shortlink));
+$result = $session->execute($statement,$options);
+
+if ($result->count() != 0) {
+	printf('That GLink is already taken. Please try another one.');
+	exit;
+}
+
 $rand_num = rand(0,99999999);
 
-$values = array(
+$statement = $session->prepare('INSERT INTO data (id, url, shortlink, when_created) VALUES (?,?,?,toTimestamp(now())) USING TTL 20');
-	'id' => $rand_num,
+$result = $session->execute($statement,array('arguments' => array($rand_num,$url,$shortlink)));
-	'url' => $url,
-	'shortlink' => $shortlink,
-);
-$statement = new Cassandra\SimpleStatement('INSERT INTO data (id, url, shortlink, when_created) VALUES (?,?,?,toTimestamp(now()))');
-$options = array('arguments' => $values);
-$result = $session->execute($statement,$options);
-
-$statement = new Cassandra\SimpleStatement('SELECT url,shortlink FROM data WHERE id=?');
-$options = array('arguments' => array('id' => $rand_num));
-$result = $session->execute($statement,$options);
 
 //$stringRepresentation= json_encode($result[0]);
 
 //printf("%s\n\n\n",$stringRepresentation);
 
-foreach($result as $row) {
+//foreach($result as $row) {
-	if (is_null($row)) {
+//	if (is_null($row)) {
-		printf('Unsuccessful');
+//		printf('Unsuccessful');
-	} else {
+//	} else {
-		printf('Successful: The URL you entered was: %s and your GLink is: https://glink.zip/%s', $row['url'],$row['shortlink']);
+		printf('Successful: The URL you entered was: %s and your GLink is: https://glink.zip/%s', $url,$shortlink);
-	}
+//	}
-}
+//}
 //printf('Done');
 
 ?>