switched to intent

gates.php

@@ -19,8 +19,7 @@ if(!$select->execute($array))
 $gates = array();
 while($gate = $select->fetch())
 	$gates[] = array("id" => intval($gate['id']), "name" => $gate['name'],
-		"number" => $gate['number'], "address" => $gate['address'],
-		"lastSeen" => intval(time()));
+		"number" => $gate['number'], "lastSeen" => intval(time()));
 
 echo json_encode(array("timestamp" => time(), "gateTimeout" => $gateTimeout, "gates" => $gates));
 ?>

register.php

@@ -1,48 +0,0 @@
-<?php
-require_once "sql.php";
-if(isset($_GET['name']))
-	$name = $_GET['name'];
-else
-	$name = "";
-if(isset($_GET['number']))
-	$number = $_GET['number'];
-else
-	$number = "";
-if(isset($_GET['port']))
-	$port = $_GET['port'];
-else
-	$port = "";
-
-if($name == "")
-	error("Empty name");
-if($number == "")
-	error("Empty number");
-if($port == "")
-	error("Empty port");
-$port = intval($port);
-if($port < 1 || $port > 65535)
-	error("Invalid port (1 <= port <= 65535)");
-
-$select = $db->prepare("SELECT id FROM gates WHERE number=:number");
-if($select->execute(array(":number" => $number)))
-{
-	if($g = $select->fetch())
-	{
-		$update = $db->prepare("UPDATE gates SET name=:name, address=:address, port=:port, lastSeen=NULL WHERE id=:id");
-		if($update->execute(array(":name" => $name, ":address" => $_SERVER['REMOTE_ADDR'], ":port" => $port, ":id" => $g['id'])))
-			echo json_encode(array("id" => intval($g['id']), "gateTimeout" => $gateTimeout));
-		else
-			error("Failed to update database");
-	}
-	else
-	{
-		$insert = $db->prepare("INSERT INTO gates (name, number, address, port) VALUES (:name, :number, :address, :port) ON DUPLICATE KEY UPDATE lastSeen=NULL");
-		if($insert->execute(array(":name" => $name, ":number" => $number, ":address" => $_SERVER['REMOTE_ADDR'], ":port" => $port)))
-			echo json_encode(array("id" => intval($db->lastInsertId()), "gateTimeout" => $gateTimeout));
-		else
-			error("Failed to insert into database");
-	}
-}
-else
-	error("Failed to query gates");
-?>

send.php

@@ -44,61 +44,44 @@ $maxWait = intval($maxWait);
 if($maxWait < 0 || !is_numeric($_GET['maxWait']))
 	error("Invalid max wait");
 
-$select = $db->prepare("SELECT address, port, lastSeen FROM gates WHERE id=:gate");
+$select = $db->prepare("SELECT address, adb FROM gates WHERE id=:gate");
 if(!$select->execute(array(":gate" => $gate)))
 	error("Unable to retrieve gate details");
 
 if($g = $select->fetch())
 {
-	if(intval(strtotime($g['lastSeen'])) < time() - $gateTimeout)
-		error("Gate is down");
-
 	$insert = $db->prepare("INSERT INTO `sent` (`recipient`, `text`, `status`, `gate`) VALUES (:recipient, :text, :status, :gate)");
 	if(!$insert->execute(array(":recipient" => $to, ":text" => $text, ":status" => 0, ":gate" => $gate)))
 		error("Failed to save message");
 	else
 	{
 		$id = intval($db->lastInsertId());
-		$out = http_get("http:/"."/".$g['address'].":".$g['port']."/send.php?to=".urlencode($to)."&text=".urlencode($text)."&id=".$id,
-				array("timeout" => 10, "connecttimeout" => 10));
-		if($out == "")
+		$text = escapeshellarg($text);
+		$to = escapeshellarg($to);
+		if ($g["adb"] == null || $g["adb"] == "")
 		{
-			$update = $db->prepare("UPDATE sent SET `status`=2, `timeStatus`=NOW() WHERE `id`=:id");
-			if(!$update->execute(array(":id" => $id)))
-				error("Failed to update database after failed to contact gate (general failure)");
-			else
-				echo json_encode(array("id" => $id, "status" => 2));
+			$device = escapeshellarg($g["address"] . ":5555");
+			exec("adb connect $device");
 		}
 		else
+			$device = escapeshellarg($g["adb"]);
+		exec("adb -s $device shell am broadcast -a com.rob57530.smsserver.ADB --es text $text --es number $to --ei id $id");
+		$id = intval($db->lastInsertId());
+		$status = 0;
+		$maxWait *= 1000;
+		do
 		{
-			$out = json_decode(http_parse_message($out)->body);
-			if(isset($out->error))
-			{
-				$update = $db->prepare("UPDATE sent SET `status`=7, `timeStatus`=NOW() WHERE `id`=:id");
-				if(!$update->execute(array(":id" => $id)))
-					error("Failed to update database after failed to contact gate (general failure)");
-				else
-					echo json_encode(array("id" => $id, "status" => 7, "error" => $out->error));
-			}
-			else
-			{
-				$status = 0;
-				$maxWait *= 1000;
-				do
-				{
-					$select = $db->prepare("SELECT status FROM sent WHERE id=:id");
-					if($select->execute(array(":id" => $id)))
-						if($f = $select->fetch())
-							$status = $f['status'];
-					$maxWait -= 100;
-					if($maxWait > 0)
-						usleep(100000);
-				} while($maxWait > 0 && $status == 0);
-				echo json_encode(array("id" => $id, "status" => $status));
-			}
-		}
+			$select = $db->prepare("SELECT status FROM sent WHERE id=:id");
+			if($select->execute(array(":id" => $id)))
+				if($f = $select->fetch())
+					$status = $f['status'];
+			$maxWait -= 100;
+			if($maxWait > 0)
+				usleep(100000);
+		} while($maxWait > 0 && $status == 0);
+		echo json_encode(array("id" => $id, "status" => $status));
 	}
 }
 else
-	error("Gate not found");
+error("Gate not found");
 ?>