Merge pull request #30 from zero-24/patch-1

brianteeman · web-flow · commit 13793fd8f5de · 2017-02-05T20:19:22.000Z
fixes #28 and use in_array
diff --git a/haraka.php b/haraka.php
@@ -76,7 +76,7 @@ private function displayHaraka()
 		if (!$display_haraka && $whitelist)
 		{
 			$ip_whitelist   = preg_split('/\s*\n\s*/', $whitelist);
-			$display_haraka = array_search($this->app->input->server->get('REMOTE_ADDR'), $whitelist) !== false;
+			$display_haraka = in_array($this->app->input->server->get('REMOTE_ADDR'), $ip_whitelist);
 		}
 
 		if (!$display_haraka)

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ private function displayHaraka()`
`76`	`76`	`if (!$display_haraka && $whitelist)`
`77`	`77`	`{`
`78`	`78`	`$ip_whitelist = preg_split('/\s\n\s/', $whitelist);`
`79`		`- $display_haraka = array_search($this->app->input->server->get('REMOTE_ADDR'), $whitelist) !== false;`
	`79`	`+ $display_haraka = in_array($this->app->input->server->get('REMOTE_ADDR'), $ip_whitelist);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`if (!$display_haraka)`