From d63d11e06d0e0559c3f8ea6f6fe31a7fb9b220eb Mon Sep 17 00:00:00 2001
From: psohm <philippe.sohm@gmail.com>
Date: Wed, 3 May 2017 21:51:48 +0200
Subject: [PATCH] Improve the error if there is no controller

PHP can be configured to show errors when $this->map[$this->method] is called
In this case, the user can see the name of the lib
It shouldn't show it for security reason :)
---
 source/Jacwright/RestServer/RestServer.php | 86 +++++++++++-----------
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/source/Jacwright/RestServer/RestServer.php b/source/Jacwright/RestServer/RestServer.php
index 877afc4..c340415 100755
--- a/source/Jacwright/RestServer/RestServer.php
+++ b/source/Jacwright/RestServer/RestServer.php
@@ -256,54 +256,56 @@ protected function loadCache()
 
 	protected function findUrl()
 	{
-		$urls = $this->map[$this->method];
-		if (!$urls) return null;
-
-		foreach ($urls as $url => $call) {
-			$args = $call[2];
-
-			if (!strstr($url, '$')) {
-				if ($url == $this->url) {
-					if (isset($args['data'])) {
-						$params = array_fill(0, $args['data'] + 1, null);
-						$params[$args['data']] = $this->data;   //@todo data is not a property of this class
-						$call[2] = $params;
-					} else {
-						$call[2] = array();
-					}
-					return $call;
-				}
-			} else {
-				$regex = preg_replace('/\\\\\$([\w\d]+)\.\.\./', '(?P<$1>.+)', str_replace('\.\.\.', '...', preg_quote($url)));
-				$regex = preg_replace('/\\\\\$([\w\d]+)/', '(?P<$1>[^\/]+)', $regex);
-				if (preg_match(":^$regex$:", urldecode($this->url), $matches)) {
-					$params = array();
-					$paramMap = array();
-					if (isset($args['data'])) {
-						$params[$args['data']] = $this->data;
+		if ($this->map[$this->method]) {
+			$urls = $this->map[$this->method];
+			if (!$urls) return null;
+
+			foreach ($urls as $url => $call) {
+				$args = $call[2];
+
+				if (!strstr($url, '$')) {
+					if ($url == $this->url) {
+						if (isset($args['data'])) {
+							$params = array_fill(0, $args['data'] + 1, null);
+							$params[$args['data']] = $this->data;   //@todo data is not a property of this class
+							$call[2] = $params;
+						} else {
+							$call[2] = array();
+						}
+						return $call;
 					}
+				} else {
+					$regex = preg_replace('/\\\\\$([\w\d]+)\.\.\./', '(?P<$1>.+)', str_replace('\.\.\.', '...', preg_quote($url)));
+					$regex = preg_replace('/\\\\\$([\w\d]+)/', '(?P<$1>[^\/]+)', $regex);
+					if (preg_match(":^$regex$:", urldecode($this->url), $matches)) {
+						$params = array();
+						$paramMap = array();
+						if (isset($args['data'])) {
+							$params[$args['data']] = $this->data;
+						}
 
-					foreach ($matches as $arg => $match) {
-						if (is_numeric($arg)) continue;
-						$paramMap[$arg] = $match;
+						foreach ($matches as $arg => $match) {
+							if (is_numeric($arg)) continue;
+							$paramMap[$arg] = $match;
 
-						if (isset($args[$arg])) {
-							$params[$args[$arg]] = $match;
+							if (isset($args[$arg])) {
+								$params[$args[$arg]] = $match;
+							}
 						}
-					}
-					ksort($params);
-					// make sure we have all the params we need
-					end($params);
-					$max = key($params);
-					for ($i = 0; $i < $max; $i++) {
-						if (!array_key_exists($i, $params)) {
-							$params[$i] = null;
+						ksort($params);
+						// make sure we have all the params we need
+						end($params);
+						$max = key($params);
+						for ($i = 0; $i < $max; $i++) {
+							if (!array_key_exists($i, $params)) {
+								$params[$i] = null;
+							}
 						}
+						ksort($params);
+						$call[2] = $params;
+						$call[3] = $paramMap;
+						return $call;
 					}
-					ksort($params);
-					$call[2] = $params;
-					$call[3] = $paramMap;
-					return $call;
 				}
 			}
 		}