smaller optimizations

MatrixConnection.php

@@ -107,7 +107,6 @@ class MatrixConnection
 
 	function exec_curl_request($handle) {
 		$response = curl_exec($handle);
-
 		if ($response === false) {
 			$errno = curl_errno($handle);
 			$error = curl_error($handle);
@@ -115,7 +114,6 @@ class MatrixConnection
 			curl_close($handle);
 			return false;
 		}
-
 		$http_code = intval(curl_getinfo($handle, CURLINFO_HTTP_CODE));
 		curl_close($handle);
 
@@ -132,7 +130,6 @@ class MatrixConnection
 		} else {
 			$response = json_decode($response, true);
 		}
-
 		return $response;
 	}
 }

database.php

@@ -215,7 +215,6 @@ class mxDatabase
 		$sql = "SELECT COUNT(*) FROM registrations WHERE admin_token = '" . $admin_token . "'"
 			. " AND state = " . RegisterState::PendingAdminVerify . " LIMIT 1;";
 		$res = $this->db->query($sql);
-		$first_name = NULL; $last_name = NULL; $username = NULL; $note = NULL; $email = NULL;
 
 		if ($res->fetchColumn() > 0) {
 			$sql = "SELECT first_name, last_name, username, note, email FROM registrations"
@@ -240,7 +239,6 @@ class mxDatabase
 		$sql = "SELECT COUNT(*) FROM registrations WHERE verify_token = '" . $verify_token . "'"
 			. " AND state = " . RegisterState::PendingEmailVerify . " LIMIT 1;";
 		$res = $this->db->query($sql);
-		$first_name = NULL; $last_name = NULL; $username = NULL; $note = NULL; $email = NULL;
 
 		if ($res->fetchColumn() > 0) {
 			$sql = "SELECT first_name, last_name, note, email, admin_token FROM registrations "

internal/directory_search.php

@@ -39,7 +39,7 @@ try {
             $response["result"] = $mx_db->searchUserByEmail($input["search_term"]);
             break;
         default:
-            throw new Exception("unknown type for \"by\" param");
+            throw new Exception('unknown type for "by" param');
     }
     
 } catch (Exception $e) {

internal/identity_bulk.php

@@ -37,7 +37,7 @@ try {
         if (!isset($lookup["address"])) {
             throw new Exception('"lookup.address" is not defined');
         }
-        $res2 = array();
+        $res2 = NULL;
         switch ($lookup["medium"]) {
             case "email":
                 $res2 = $mx_db->searchUserByEmail($lookup["address"]);
@@ -54,9 +54,11 @@ try {
                 }
 		break;
             case "msisdn":
+                // This is reserved for number lookups
+                throw new Exception("unimplemented lookup medium");
                 break;
             default:
-                throw new Exception("unknown type for \"by\" param");
+                throw new Exception("unknown lookup medium");
         }
     }
 } catch (Exception $e) {

internal/identity_single.php

@@ -30,7 +30,7 @@ try {
     if (!isset($input["lookup"]["address"])) {
         throw new Exception('"lookup.address" is not defined');
     }
-    $res2 = array();
+    $res2 = NULL;
     switch ($input["lookup"]["medium"]) {
         case "email":
             $res2 = $mx_db->searchUserByEmail($input["lookup"]["address"]);
@@ -46,15 +46,19 @@ try {
                     ]
                 ];
             }
-            
+            break;
-
+        case "msisdn":
+            // This is reserved for number lookups
+            throw new Exception("unimplemented lookup medium");
             break;
         default:
-            throw new Exception("unknown type for \"by\" param");
+            throw new Exception("unknown lookup medium");
     }
 } catch (Exception $e) {
-    error_log("ídentity_bulk failed with error: " . $e->getMessage());
+    error_log("ídentity_single failed with error: " . $e->getMessage());
-    $response["error"] = $e->getMessage();
+    $response = [
+        "error" => $e->getMessage()
+    ];
 }
 print (json_encode($response, JSON_PRETTY_PRINT) . "\n");
 ?>

internal/intercept_change_password.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2018 Matthias Kesler
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 // URL for this: /_matrix/client/r0/account/password?access_token=$ACCESS_TOKEN
 
 header('Access-Control-Allow-Origin: *');
@@ -24,7 +24,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
 	// return with success
 	exit();
 }
-$response= new stdClass;
+$response = new stdClass;
 try {
 	$inputJSON = file_get_contents('php://input');
 	$input = json_decode($inputJSON, TRUE);
@@ -48,7 +48,7 @@ try {
 	$localpart = stripLocalpart($input["auth"]["user"]);
 
 	if (empty($localpart)) {
-		throw new Exception ("localpart cannot be identified");
+		throw new Exception("localpart cannot be identified");
 	}
 
 	require_once("../database.php");
@@ -59,7 +59,6 @@ try {
 	)) {
 		throw new Exception("invalid credentials or another error while updating");
 	}
-
 } catch (Exception $e) {
 	header("HTTP/1.0 500 Internal Error");
 	error_log("failed with error: " . $e->getMessage());

internal/login.php

@@ -30,8 +30,7 @@ $loginRequester = LoginRequester::UNDEFINED;
 try {
     $inputJSON = file_get_contents('php://input');
     $input = json_decode($inputJSON, TRUE);
-    $mxid = NULL;
+    $mxid = $localpart = NULL;
-    $localpart = NULL;
     if (isset($input["user"])) {
         if (isset($input["user"]["localpart"])) {
             $localpart = $input["user"]["localpart"];
@@ -45,6 +44,8 @@ try {
             $mxid = $input["user"]["mxid"];
             $loginRequester = LoginRequester::MXISD;
         }
+    } else {
+        throw new Exception('"user" not in request body');
     }
 
     // prefer the localpart attribute of mxisd. But in case of matrix-synapse-rest-auth
@@ -59,7 +60,7 @@ try {
     }
 
     $password = NULL;
-    if (isset($input["user"]) && isset($input["user"]["password"])) {
+    if (isset($input["user"]["password"])) {
         $password = $input["user"]["password"];
     }
     if (empty($password)) {
@@ -95,6 +96,7 @@ try {
             // only return that it was successful.
             // we do not know how the data shall be transmitted so we do nothing with it
             $response["auth"]["success"] = false;
+            $response["auth"]["error"] = "unidentified requester";
             break;
     }
 } catch (Exception $e) {