Roundup of issues reported by PHPStorm

Mostly redundant checks, logic errors, dead code, etc.

1 files changed, 14 insertions, 13 deletions

diff --git a/modules-available/dnbd3/page.inc.php b/modules-available/dnbd3/page.inc.php
index d60b3dfa..35f03199 100644
--- a/modules-available/dnbd3/page.inc.php
+++ b/modules-available/dnbd3/page.inc.php
@@ -34,7 +34,7 @@ class Page_Dnbd3 extends Page
 
 	private function editServer()
 	{
-		$server = $this->getServerById();
+		$server = $this->getServerFromQuery();
 		if (!isset($server['machineuuid'])) {
 			Message::addError('not-automatic-server', $server['ip']);
 			return;
@@ -45,12 +45,15 @@ class Page_Dnbd3 extends Page
 		$overrideIp = false;
 		$sip = Request::post('fixedip', null, 'string');
 		if (empty($sip)) {
+			// Reset IP override
 			$overrideIp = null;
-		} elseif ($server['fixedip'] !== $overrideIp) {
+		} elseif ($server['fixedip'] !== $sip) {
+			// IP override is set and different from current value
 			if (Dnbd3Util::matchAddress($sip) === false) {
 				Message::addError('invalid-ip', $sip);
 				return;
 			}
+			// Dupcheck
 			$res = Database::queryFirst('SELECT serverid FROM dnbd3_server s
 					LEFT JOIN machine m USING (machineuuid)
 					WHERE s.fixedip = :ip OR m.clientip = :ip', ['ip' => $sip]);
@@ -90,7 +93,7 @@ class Page_Dnbd3 extends Page
 
 	private function saveServerLocations()
 	{
-		$server = $this->getServerById();
+		$server = $this->getServerFromQuery();
 		$this->assertPermission($server);
 		$locids = Request::post('location', [], 'array');
 		if (empty($locids)) {
@@ -131,7 +134,7 @@ class Page_Dnbd3 extends Page
 
 	private function deleteServer()
 	{
-		$server = $this->getServerById();
+		$server = $this->getServerFromQuery();
 		$this->assertPermission($server);
 		if ($server['fixedip'] === '<self>')
 			return;
@@ -264,7 +267,7 @@ class Page_Dnbd3 extends Page
 	{
 		User::assertPermission('view.details');
 		Module::isAvailable('js_stupidtable');
-		$server = $this->getServerById();
+		$server = $this->getServerFromQuery();
 		Render::addTemplate('page-proxy-header', $server);
 		$stats = Dnbd3Rpc::query($server['ip'], [Dnbd3Rpc::QUERY_STATS, Dnbd3Rpc::QUERY_CLIENTS,
 			Dnbd3Rpc::QUERY_IMAGES, Dnbd3Rpc::QUERY_SPACE, Dnbd3Rpc::QUERY_CONFIG, Dnbd3Rpc::QUERY_ALTSERVERS]);
@@ -411,7 +414,7 @@ class Page_Dnbd3 extends Page
 
 	private function showServerLocationEdit()
 	{
-		$server = $this->getServerById();
+		$server = $this->getServerFromQuery();
 		$this->assertPermission($server);
 		// Get selected ones
 		$res = Database::simpleQuery('SELECT locationid FROM dnbd3_server_x_location WHERE serverid = :serverid',
@@ -437,11 +440,9 @@ class Page_Dnbd3 extends Page
 		Render::addTemplate('page-server-locations', $server);
 	}
 
-	private function getServerById($serverId = false)
+	private function getServerFromQuery(): array
 	{
-		if ($serverId === false) {
-			$serverId = Request::any('server', false, 'int');
-		}
+		$serverId = Request::any('server', false, 'int');
 		if ($serverId === false) {
 			if (AJAX)
 				die('Missing parameter');
@@ -533,7 +534,7 @@ class Page_Dnbd3 extends Page
 
 	private function ajaxEditServer()
 	{
-		$server = $this->getServerById();
+		$server = $this->getServerFromQuery();
 		if (!isset($server['machineuuid'])) {
 			echo 'Not automatic server.';
 			return;
@@ -565,7 +566,7 @@ class Page_Dnbd3 extends Page
 
 	private function ajaxReboot()
 	{
-		$server = $this->getServerById();
+		$server = $this->getServerFromQuery();
 		if (!isset($server['machineuuid'])) {
 			die('Not automatic server.');
 		}
@@ -604,7 +605,7 @@ class Page_Dnbd3 extends Page
 
 	private function ajaxCacheMap()
 	{
-		$server = $this->getServerById();
+		$server = $this->getServerFromQuery();
 		$imgId = Request::any('id', 0, 'int');
 		if ($imgId <= 0) {
 			Header('HTTP/1.1 400 Bad Request');