chore: run formatter tools against PHP code

Run formatting tools against the PHP source code to meet PSR12 standards

The tools used to format the code (for anyone interested in validating
the changes are:
* [PHP-CS-FIXER](https://github.com/FriendsOfPHP/PHP-CS-Fixer)
* [PHPCS](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Fixing-Errors-Automatically)

DynmapCore/src/main/resources/extracted/web/gettiles.php

@@ -1,5 +1,6 @@
 <?php
-define ('TILESPATH', 'tiles/');
+
+define('TILESPATH', 'tiles/');
 
 $path = $_SERVER['PATH_INFO'];
 
@@ -9,13 +10,13 @@ if (!file_exists($fname)) {
     $fname = "images/blank.png";
 }
 $fp = fopen($fname, 'rb');
-if (strstr($path, ".png"))
+if (strstr($path, ".png")) {
     header("Content-Type: image/png");
-else
+} else {
     header("Content-Type: image/jpeg");
+}
 
 header("Content-Length: " . filesize($fname));
 
 fpassthru($fp);
 exit;
-?>

DynmapCore/src/main/resources/extracted/web/standalone/MySQL_access.php

@@ -1,8 +1,8 @@
 <?php
-require_once('MySQL_funcs.php');
+
+require_once 'MySQL_funcs.php';
 
 if ($loginenabled) {
     $rslt = getStandaloneFile('dynmap_access.php');
     eval($rslt);
 }
-?>

DynmapCore/src/main/resources/extracted/web/standalone/MySQL_configuration.php

@@ -1,21 +1,21 @@
 <?php
+
 ob_start();
-require_once('MySQL_funcs.php');
+require_once 'MySQL_funcs.php';
-include('MySQL_config.php');
+require 'MySQL_config.php';
-include('MySQL_access.php');
+require 'MySQL_access.php';
 ob_end_clean();
 
 session_start();
 
-if(isset($_SESSION['userid'])) {
+if (isset($_SESSION['userid'])) {
     $userid = $_SESSION['userid'];
-}
+} else {
-else {
     $userid = '-guest-';
 }
 
 $loggedin = false;
-if(strcmp($userid, '-guest-')) {
+if (strcmp($userid, '-guest-')) {
     $loggedin = true;
 }
 
@@ -27,41 +27,36 @@ $json = json_decode($content);
 
 if (!$loginenabled) {
     echo $content;
-}
+} elseif ($json->loginrequired && !$loggedin) {
-else if($json->loginrequired && !$loggedin) {
     echo "{ \"error\": \"login-required\" }";
-}
+} else {
-else {
     $uid = '[' . strtolower($userid) . ']';
     $json->loggedin = $loggedin;
     $wcnt = count($json->worlds);
     $newworlds = array();
-	for($i = 0; $i < $wcnt; $i++) {
+    for ($i = 0; $i < $wcnt; $i++) {
         $w = $json->worlds[$i];
-		if($w->protected) {
+        if ($w->protected) {
             $ss = stristr($worldaccess[$w->name], $uid);
-			if($ss !== false) {
+            if ($ss !== false) {
                 $newworlds[] = $w;
-			}
+            } else {
-			else {
                 $w = null;
             }
-		}
+        } else {
-		else {
             $newworlds[] = $w;
         }
-		if($w != null) {
+        if ($w != null) {
             $mcnt = count($w->maps);
             $newmaps = array();
-			for($j = 0; $j < $mcnt; $j++) {
+            for ($j = 0; $j < $mcnt; $j++) {
                 $m = $w->maps[$j];
-				if($m->protected) {
+                if ($m->protected) {
                     $ss = stristr($mapaccess[$w->name . '.' . $m->prefix], $uid);
-					if($ss !== false) {
+                    if ($ss !== false) {
                         $newmaps[] = $m;
                     }
-				}
+                } else {
-				else {
                     $newmaps[] = $m;
                 }
             }
@@ -73,6 +68,3 @@ else {
     echo json_encode($json);
 }
 cleanupDb();
- 
-?>
-

DynmapCore/src/main/resources/extracted/web/standalone/MySQL_funcs.php

@@ -1,13 +1,15 @@
 <?php
 
-function cleanupDb() {
+function cleanupDb()
+{
     if (isset($db)) {
         $db->close();
-      $db = NULL;
+        $db = null;
     }
 }
 
-function abortDb($errormsg) {
+function abortDb($errormsg)
+{
     header('HTTP/1.0 500 Error');
     echo "<h1>500 Error</h1>";
     echo $errormsg;
@@ -15,7 +17,8 @@ function abortDb($errormsg) {
     exit;
 }
 
-function initDbIfNeeded() {
+function initDbIfNeeded()
+{
     global $db, $dbhost, $dbuserid, $dbpassword, $dbname, $dbport;
 
     $pos = strpos($dbname, '?');
@@ -32,7 +35,8 @@ function initDbIfNeeded() {
     }
 }
 
-function getStandaloneFileByServerId($fname, $sid) {
+function getStandaloneFileByServerId($fname, $sid)
+{
     global $db, $dbprefix;
 
     initDbIfNeeded();
@@ -43,27 +47,28 @@ function getStandaloneFileByServerId($fname, $sid) {
     $stmt->bind_result($content);
     if ($stmt->fetch()) {
         $rslt = $content;
-   }
+    } else {
-   else {
+        $rslt = null;
-        $rslt = NULL;
     }
     $stmt->close();
     return $rslt;
 }
 
-function getStandaloneFile($fname) {
+function getStandaloneFile($fname)
+{
     global $serverid;
 
     if (!isset($serverid)) {
         $serverid = 0;
-      if(isset($_REQUEST['serverid'])) {
+        if (isset($_REQUEST['serverid'])) {
             $serverid = $_REQUEST['serverid'];
         }
     }
     return getStandaloneFileByServerId($fname, $serverid);
 }
 
-function updateStandaloneFileByServerId($fname, $sid, $content) {
+function updateStandaloneFileByServerId($fname, $sid, $content)
+{
     global $db, $dbprefix;
 
     initDbIfNeeded();
@@ -77,19 +82,21 @@ function updateStandaloneFileByServerId($fname, $sid, $content) {
     return $res;
 }
 
-function updateStandaloneFile($fname, $content) {
+function updateStandaloneFile($fname, $content)
+{
     global $serverid;
 
     if (!isset($serverid)) {
         $serverid = 0;
-      if(isset($_REQUEST['serverid'])) {
+        if (isset($_REQUEST['serverid'])) {
             $serverid = $_REQUEST['serverid'];
         }
     }
     return updateStandaloneFileByServerId($fname, $serverid, $content);
 }
 
-function insertStandaloneFileByServerId($fname, $sid, $content) {
+function insertStandaloneFileByServerId($fname, $sid, $content)
+{
     global $db, $dbprefix;
 
     initDbIfNeeded();
@@ -100,16 +107,15 @@ function insertStandaloneFileByServerId($fname, $sid, $content) {
     return $res;
 }
 
-function insertStandaloneFile($fname, $content) {
+function insertStandaloneFile($fname, $content)
+{
     global $serverid;
 
     if (!isset($serverid)) {
         $serverid = 0;
-      if(isset($_REQUEST['serverid'])) {
+        if (isset($_REQUEST['serverid'])) {
             $serverid = $_REQUEST['serverid'];
         }
     }
     return insertStandaloneFileByServerId($fname, $serverid, $content);
 }
-
-?>

DynmapCore/src/main/resources/extracted/web/standalone/MySQL_getlogin.php

@@ -1,8 +1,8 @@
 <?php
-require_once('MySQL_funcs.php');
+
+require_once 'MySQL_funcs.php';
 
 if ($loginenabled) {
     $rslt = getStandaloneFile("dynmap_login.php");
     eval($rslt);
 }
-?>

DynmapCore/src/main/resources/extracted/web/standalone/MySQL_login.php

@@ -1,25 +1,24 @@
 <?php
+
 ob_start();
-require_once('MySQL_funcs.php');
+require_once 'MySQL_funcs.php';
-include('MySQL_config.php');
+require 'MySQL_config.php';
-include('MySQL_getlogin.php');
+require 'MySQL_getlogin.php';
 ob_end_clean();
 
 session_start();
 
-if(isset($_POST['j_username'])) {
+if (isset($_POST['j_username'])) {
     $userid = $_POST['j_username'];
-}
+} else {
-else {
     $userid = '-guest-';
 }
 $good = false;
 
-if(strcmp($userid, '-guest-')) {
+if (strcmp($userid, '-guest-')) {
-  if(isset($_POST['j_password'])) {
+    if (isset($_POST['j_password'])) {
         $password = $_POST['j_password'];
-  }
+    } else {
-  else {
         $password = '';
     }
     $ctx = hash_init('sha256');
@@ -30,12 +29,10 @@ if(strcmp($userid, '-guest-')) {
     if (strcasecmp($hash, $pwdhash[$useridlc]) == 0) {
         $_SESSION['userid'] = $userid;
         $good = true;
-  }
+    } else {
-  else {
         $_SESSION['userid'] = '-guest-';
     }
-}
+} else {
-else {
     $_SESSION['userid'] = '-guest-';
     $good = true;
 }
@@ -44,32 +41,29 @@ $content = getStandaloneFile('dynmap_reg.php');
 /* Prune pending registrations, if needed */
 $lines = explode('\n', $content);
 $newlines[] = array();
-if(!empty($lines)) {
+if (!empty($lines)) {
     $cnt = count($lines) - 1;
     $changed = false;
-	for($i=1; $i < $cnt; $i++) {
+    for ($i = 1; $i < $cnt; $i++) {
         list($uid, $pc, $hsh) = explode('=', rtrim($lines[$i]));
-		if($uid == $useridlc) continue;
+        if ($uid == $useridlc) {
-		if(array_key_exists($uid, $pendingreg)) {
+            continue;
-			$newlines[] = $uid . '=' . $pc . '=' . $hsh;
         }
-		else {
+        if (array_key_exists($uid, $pendingreg)) {
+            $newlines[] = $uid . '=' . $pc . '=' . $hsh;
+        } else {
             $changed = true;
         }
     }
-	if($changed) {
+    if ($changed) {
         updateStandaloneFile('dynmap_reg.php', implode("\n", $newlines));
     }
 }
 
-if($good) {
+if ($good) {
     echo "{ \"result\": \"success\" }";
-}
+} else {
-else {
     echo "{ \"result\": \"loginfailed\" }";
 }
 
 cleanupDb();
- 
-?>
-

DynmapCore/src/main/resources/extracted/web/standalone/MySQL_markers.php

@@ -1,21 +1,21 @@
 <?php
+
 ob_start();
-require_once('MySQL_funcs.php');
+require_once 'MySQL_funcs.php';
-include('MySQL_config.php');
+require 'MySQL_config.php';
-include('MySQL_access.php');
+require 'MySQL_access.php';
 ob_end_clean();
 
 session_start();
 
-if(isset($_SESSION['userid'])) {
+if (isset($_SESSION['userid'])) {
     $userid = $_SESSION['userid'];
-}
+} else {
-else {
     $userid = '-guest-';
 }
 
 $loggedin = false;
-if(strcmp($userid, '-guest-')) {
+if (strcmp($userid, '-guest-')) {
     $loggedin = true;
 }
 
@@ -29,7 +29,7 @@ if ((!isset($path)) || strstr($path, "..")) {
 
 $parts = explode("/", $path);
 
-if(($parts[0] != "faces") && ($parts[0] != "_markers_")) {
+if (($parts[0] != "faces") && ($parts[0] != "_markers_")) {
     header('HTTP/1.0 500 Error');
     echo "<h1>500 Error</h1>";
     echo "Bad marker: " . $path;
@@ -49,14 +49,11 @@ if ($parts[0] == "faces") {
     $ft = 0;
     if ($parts[1] == "8x8") {
         $ft = 0;
-	}
+    } elseif ($parts[1] == '16x16') {
-	else if ($parts[1] == '16x16') {
         $ft = 1;
-   	}
+    } elseif ($parts[1] == '32x32') {
-   	else if ($parts[1] == '32x32') {
         $ft = 2;
-	}
+    } elseif ($parts[1] == 'body') {
-	else if ($parts[1] == 'body') {
         $ft = 3;
     }
     $pn = explode(".", $parts[2]);
@@ -67,12 +64,10 @@ if ($parts[0] == "faces") {
     if ($stmt->fetch()) {
         header('Content-Type: image/png');
         echo $timage;
-	}
+    } else {
-	else {
         header('Location: ../images/blank.png');
     }
-}
+} else { // _markers_
-else { // _markers_
     $in = explode(".", $parts[1]);
     $name = implode(".", array_slice($in, 0, count($in) - 1));
     $ext = $in[count($in) - 1];
@@ -85,12 +80,10 @@ else { // _markers_
         header('Content-Type: application/json');
         if ($stmt->fetch()) {
             echo $timage;
-		}
+        } else {
-		else {
             echo "{ }";
         }
-	}
+    } else {
-	else {
         $stmt = $db->prepare('SELECT Image from ' . $dbprefix . 'MarkerIcons WHERE IconName=?');
         $stmt->bind_param('s', $name);
         $res = $stmt->execute();
@@ -98,8 +91,7 @@ else { // _markers_
         if ($stmt->fetch()) {
             header('Content-Type: image/png');
             echo $timage;
-		}
+        } else {
-		else {
             header('Location: ../images/blank.png');
         }
     }
@@ -110,4 +102,3 @@ $stmt->close();
 cleanupDb();
 
 exit;
-?>

DynmapCore/src/main/resources/extracted/web/standalone/MySQL_register.php

@@ -1,39 +1,36 @@
 <?php
+
 ob_start();
-require_once('MySQL_funcs.php');
+require_once 'MySQL_funcs.php';
-include('MySQL_config.php');
+require 'MySQL_config.php';
-require('MySQL_getlogin.php');
+require 'MySQL_getlogin.php';
 ob_end_clean();
 
 session_start();
 
-if(isset($_POST['j_password'])) {
+if (isset($_POST['j_password'])) {
     $password = $_POST['j_password'];
-}
+} else {
-else {
     $password = '';
 }
-if(isset($_POST['j_verify_password'])) {
+if (isset($_POST['j_verify_password'])) {
     $verify = $_POST['j_verify_password'];
-}
+} else {
-else {
     $verify = '';
 }
-if(strcmp($password, $verify)) {
+if (strcmp($password, $verify)) {
     echo "{ \"result\": \"verifyfailed\" }";
     return;
 }
 
-if(isset($_POST['j_username'])) {
+if (isset($_POST['j_username'])) {
     $userid = $_POST['j_username'];
-}
+} else {
-else {
     $userid = '-guest-';
 }
-if(isset($_POST['j_passcode'])) {
+if (isset($_POST['j_passcode'])) {
     $passcode = $_POST['j_passcode'];
-}
+} else {
-else {
     $passcode = '';
 }
 $good = false;
@@ -44,9 +41,9 @@ $_SESSION['userid'] = '-guest-';
 
 $good = false;
 
-if(strcmp($useridlc, '-guest-')) {
+if (strcmp($useridlc, '-guest-')) {
-  if(isset($pendingreg[$useridlc])) {
+    if (isset($pendingreg[$useridlc])) {
-     if(!strcmp($passcode, $pendingreg[$useridlc])) {
+        if (!strcmp($passcode, $pendingreg[$useridlc])) {
             $ctx = hash_init('sha256');
             hash_update($ctx, $pwdsalt);
             hash_update($ctx, $password);
@@ -58,17 +55,18 @@ if(strcmp($useridlc, '-guest-')) {
             if (isset($content)) {
                 $lines = explode('\n', $content);
                 $isnew = false;
-		}
+            } else {
-		else {
                 $lines = array();
                 $isnew = true;
             }
-		if(!empty($lines)) {
+            if (!empty($lines)) {
                 $cnt = count($lines) - 1;
-			for($i=1; $i < $cnt; $i++) {
+                for ($i = 1; $i < $cnt; $i++) {
                     list($uid, $pc, $hsh) = explode('=', rtrim($lines[$i]));
-				if($uid == $useridlc) continue;
+                    if ($uid == $useridlc) {
-				if(array_key_exists($uid, $pendingreg)) {
+                        continue;
+                    }
+                    if (array_key_exists($uid, $pendingreg)) {
                         $newlines[] = $uid . '=' . $pc . '=' . $hsh;
                     }
                 }
@@ -76,19 +74,15 @@ if(strcmp($useridlc, '-guest-')) {
             $newlines[] = $useridlc . '=' . $passcode . '=' . $hash;
             if ($isnew) {
                 insertStandaloneFile('dynmap_reg.php', implode("\n", $newlines));
-		}
+            } else {
-		else {		
                 updateStandaloneFile('dynmap_reg.php', implode("\n", $newlines));
             }
         }
     }
 }
-if($good) {
+if ($good) {
     echo "{ \"result\": \"success\" }";
-}
+} else {
-else {
     echo "{ \"result\": \"registerfailed\" }";
 }
 cleanupDb();
-   
-?>

DynmapCore/src/main/resources/extracted/web/standalone/MySQL_sendmessage.php

@@ -1,7 +1,8 @@
 <?php
+
 ob_start();
-require_once('MySQL_funcs.php');
+require_once 'MySQL_funcs.php';
-include('MySQL_config.php');
+require 'MySQL_config.php';
 ob_end_clean();
 
 session_start();
@@ -10,32 +11,32 @@ $content = getStandaloneFile('dynmap_config.json');
 if (isset($content)) {
     $config = json_decode($content, true);
     $msginterval = $config['webchat-interval'];
-}
+} else {
-else {
     $msginterval = 2000;
 }
 
-if(isset($_SESSION['lastchat']))
+if (isset($_SESSION['lastchat'])) {
     $lastchat = $_SESSION['lastchat'];
-else
+} else {
     $lastchat = 0;
+}
 
-if($_SERVER['REQUEST_METHOD'] == 'POST' && $lastchat < time())
+if ($_SERVER['REQUEST_METHOD'] == 'POST' && $lastchat < time()) {
-{
     $micro = microtime(true);
-	$timestamp = round($micro*1000.0);
+    $timestamp = round($micro * 1000.0);
 
     $data = json_decode(trim(file_get_contents('php://input')));
     $data->timestamp = $timestamp;
     $data->ip = $_SERVER['REMOTE_ADDR'];
-	if(isset($_SESSION['userid'])) {
+    if (isset($_SESSION['userid'])) {
         $uid = $_SESSION['userid'];
-		if(strcmp($uid, '-guest-')) {
+        if (strcmp($uid, '-guest-')) {
             $data->userid = $uid;
         }
     }
-	if(isset($_SERVER['HTTP_X_FORWARDED_FOR']))
+    if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
         $data->ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+    }
     $content = getStandaloneFile('dynmap_webchat.json');
     $gotold = false;
     if (isset($content)) {
@@ -43,33 +44,26 @@ if($_SERVER['REQUEST_METHOD'] == 'POST' && $lastchat < time())
         $gotold = true;
     }
 
-	if(!empty($old_messages))
+    if (!empty($old_messages)) {
-	{
+        foreach ($old_messages as $message) {
-		foreach($old_messages as $message)
+            if (($timestamp - $config['updaterate'] - 10000) < $message['timestamp']) {
-		{
-			if(($timestamp - $config['updaterate'] - 10000) < $message['timestamp'])
                 $new_messages[] = $message;
             }
         }
+    }
     $new_messages[] = $data;
 
     if ($gotold) {
         updateStandaloneFile('dynmap_webchat.json', json_encode($new_messages));
-	}
+    } else {
-	else {
         insertStandaloneFile('dynmap_webchat.json', json_encode($new_messages));
     }
 
-	$_SESSION['lastchat'] = time()+$msginterval;
+    $_SESSION['lastchat'] = time() + $msginterval;
     echo "{ \"error\" : \"none\" }";
-}
+} elseif ($_SERVER['REQUEST_METHOD'] == 'POST' && $lastchat > time()) {
-elseif($_SERVER['REQUEST_METHOD'] == 'POST' && $lastchat > time())
-{
     header('HTTP/1.1 403 Forbidden');
-}
+} else {
-else {
     echo "{ \"error\" : \"none\" }";
 }
 cleanupDb();
-
-?>

DynmapCore/src/main/resources/extracted/web/standalone/MySQL_tiles.php

@@ -1,21 +1,21 @@
 <?php
+
 ob_start();
-require_once('MySQL_funcs.php');
+require_once 'MySQL_funcs.php';
-include('MySQL_config.php');
+require 'MySQL_config.php';
-include('MySQL_access.php');
+require 'MySQL_access.php';
 ob_end_clean();
 
 session_start();
 
-if(isset($_SESSION['userid'])) {
+if (isset($_SESSION['userid'])) {
     $userid = $_SESSION['userid'];
-}
+} else {
-else {
     $userid = '-guest-';
 }
 
 $loggedin = false;
-if(strcmp($userid, '-guest-')) {
+if (strcmp($userid, '-guest-')) {
     $loggedin = true;
 }
 
@@ -39,44 +39,42 @@ $uid = '[' . strtolower($userid) . ']';
 
 $world = $parts[0];
 
-if(isset($worldaccess[$world])) {
+if (isset($worldaccess[$world])) {
     $ss = stristr($worldaccess[$world], $uid);
-	if($ss === false) {
+    if ($ss === false) {
         header('Location: ../images/blank.png');
         cleanupDb();
         exit;
     }
 }
-$variant='STANDARD';
+$variant = 'STANDARD';
 
-  $prefix = $parts[1];
+$prefix = $parts[1];
-  $plen = strlen($prefix);
+$plen = strlen($prefix);
-  if(($plen > 4) && (substr($prefix, $plen - 4) === "_day")) {
+if (($plen > 4) && (substr($prefix, $plen - 4) === "_day")) {
     $prefix = substr($prefix, 0, $plen - 4);
     $variant = 'DAY';
-  }
+}
-  $mapid = $world . "." . $prefix;
+$mapid = $world . "." . $prefix;
-  if(isset($mapaccess[$mapid])) {
+if (isset($mapaccess[$mapid])) {
     $ss = stristr($mapaccess[$mapid], $uid);
-	if($ss === false) {
+    if ($ss === false) {
         header('Location: ../images/blank.png');
         cleanupDb();
         exit;
     }
-  }
+}
 
 $fparts = explode("_", $parts[3]);
 if (count($fparts) == 3) { // zoom_x_y
     $zoom = strlen($fparts[0]);
     $x = intval($fparts[1]);
     $y = intval($fparts[2]);
-}
+} elseif (count($fparts) == 2) { // x_y
-else if (count($fparts) == 2) { // x_y
     $zoom = 0;
     $x = intval($fparts[0]);
     $y = intval($fparts[1]);
-}
+} else {
-else {
     header('Location: ../images/blank.png');
     cleanupDb();
     exit;
@@ -90,15 +88,13 @@ $stmt->bind_result($timage, $format, $thash, $tlast);
 if ($stmt->fetch()) {
     if ($format == 0) {
         header('Content-Type: image/png');
-   }
+    } else {
-   else {
         header('Content-Type: image/jpeg');
     }
     header('ETag: \'' . $thash . '\'');
-   header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $tlast/1000) . ' GMT'); 
+    header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $tlast / 1000) . ' GMT');
     echo $timage;
-}
+} else {
-else {
     header('Location: ../images/blank.png');
 }
 
@@ -106,4 +102,3 @@ $stmt->close();
 cleanupDb();
 
 exit;
-?>

DynmapCore/src/main/resources/extracted/web/standalone/MySQL_update.php

@@ -1,51 +1,52 @@
 <?php
+
 ob_start();
-require_once('MySQL_funcs.php');
+require_once 'MySQL_funcs.php';
-include('MySQL_config.php');
+require 'MySQL_config.php';
-include('MySQL_access.php');
+require 'MySQL_access.php';
 ob_end_clean();
 
 $world = $_REQUEST['world'];
 
 session_start();
 
-if(isset($_SESSION['userid'])) {
+if (isset($_SESSION['userid'])) {
     $userid = $_SESSION['userid'];
-}
+} else {
-else {
     $userid = '-guest-';
 }
 
 $loggedin = false;
-if(strcmp($userid, '-guest-')) {
+if (strcmp($userid, '-guest-')) {
     $loggedin = true;
 }
 
 header('Content-type: application/json; charset=utf-8');
 
-if(strpos($world, '/') || strpos($world, '\\')) {
+if (strpos($world, '/') || strpos($world, '\\')) {
     echo "{ \"error\": \"invalid-world\" }";
     return;
 }
 
-if ($loginenabled)
+if ($loginenabled) {
     $fname = 'updates_' . $world . '.php';
-else
+} else {
     $fname = 'updates_' . $world . '.json';
+}
 
 $useridlc = strtolower($userid);
 $uid = '[' . $useridlc . ']';
 
-if(isset($worldaccess[$world])) {
+if (isset($worldaccess[$world])) {
     $ss = stristr($worldaccess[$world], $uid);
-	if($ss === false) {
+    if ($ss === false) {
         echo "{ \"error\": \"access-denied\" }";
         return;
     }
 }
 
 $serverid = 0;
-if(isset($_REQUEST['serverid'])) {
+if (isset($_REQUEST['serverid'])) {
     $serverid = $_REQUEST['serverid'];
 }
 
@@ -61,34 +62,31 @@ if (!isset($content)) {
 
 if (!$loginenabled) {
     echo $content;
-}
+} elseif (isset($json->loginrequired) && $json->loginrequired && !$loggedin) {
-else if(isset($json->loginrequired) && $json->loginrequired && !$loggedin) {
     echo "{ \"error\": \"login-required\" }";
-}
+} else {
-else {
     $json = json_decode($content);
     $json->loggedin = $loggedin;
     if (isset($json->protected) && $json->protected) {
         $ss = stristr($seeallmarkers, $uid);
-		if($ss === false) {
+        if ($ss === false) {
-			if(isset($playervisible[$useridlc])) {
+            if (isset($playervisible[$useridlc])) {
                 $plist = $playervisible[$useridlc];
                 $pcnt = count($json->players);
-				for($i = 0; $i < $pcnt; $i++) {
+                for ($i = 0; $i < $pcnt; $i++) {
                     $p = $json->players[$i];
-					if(!stristr($plist, '[' . $p->account . ']')) { 
+                    if (!stristr($plist, '[' . $p->account . ']')) {
                         $p->world = "-some-other-bogus-world-";
                         $p->x = 0.0;
                         $p->y = 64.0;
                         $p->z = 0.0;
                     }
                 }
-			}
+            } else {
-			else {
                 $pcnt = count($json->players);
-				for($i = 0; $i < $pcnt; $i++) {
+                for ($i = 0; $i < $pcnt; $i++) {
                     $p = $json->players[$i];
-					if(strcasecmp($userid, $p->account) != 0) {
+                    if (strcasecmp($userid, $p->account) != 0) {
                         $p->world = "-some-other-bogus-world-";
                         $p->x = 0.0;
                         $p->y = 64.0;
@@ -101,7 +99,3 @@ else {
     echo json_encode($json);
 }
 cleanupDb();
-
- 
-?>
-

DynmapCore/src/main/resources/extracted/web/standalone/PostgreSQL_access.php

@@ -1,9 +1,9 @@
 <?php
-require_once('PostgreSQL_funcs.php');
+
+require_once 'PostgreSQL_funcs.php';
 
 if ($loginenabled) {
     $rslt = getStandaloneFile('dynmap_access.php');
     var_dump($rslt);
     eval($rslt);
 }
-?>

DynmapCore/src/main/resources/extracted/web/standalone/PostgreSQL_configuration.php

@@ -1,21 +1,21 @@
 <?php
+
 ob_start();
-require_once('PostgreSQL_funcs.php');
+require_once 'PostgreSQL_funcs.php';
-include('PostgreSQL_config.php');
+require 'PostgreSQL_config.php';
-include('PostgreSQL_access.php');
+require 'PostgreSQL_access.php';
 ob_end_clean();
 
 session_start();
 
-if(isset($_SESSION['userid'])) {
+if (isset($_SESSION['userid'])) {
     $userid = $_SESSION['userid'];
-}
+} else {
-else {
     $userid = '-guest-';
 }
 
 $loggedin = false;
-if(strcmp($userid, '-guest-')) {
+if (strcmp($userid, '-guest-')) {
     $loggedin = true;
 }
 
@@ -27,41 +27,36 @@ $json = json_decode($content);
 
 if (!$loginenabled) {
     echo $content;
-}
+} elseif ($json->loginrequired && !$loggedin) {
-else if($json->loginrequired && !$loggedin) {
     echo "{ \"error\": \"login-required\" }";
-}
+} else {
-else {
     $uid = '[' . strtolower($userid) . ']';
     $json->loggedin = $loggedin;
     $wcnt = count($json->worlds);
     $newworlds = array();
-	for($i = 0; $i < $wcnt; $i++) {
+    for ($i = 0; $i < $wcnt; $i++) {
         $w = $json->worlds[$i];
-		if($w->protected) {
+        if ($w->protected) {
             $ss = stristr($worldaccess[$w->name], $uid);
-			if($ss !== false) {
+            if ($ss !== false) {
                 $newworlds[] = $w;
-			}
+            } else {
-			else {
                 $w = null;
             }
-		}
+        } else {
-		else {
             $newworlds[] = $w;
         }
-		if($w != null) {
+        if ($w != null) {
             $mcnt = count($w->maps);
             $newmaps = array();
-			for($j = 0; $j < $mcnt; $j++) {
+            for ($j = 0; $j < $mcnt; $j++) {
                 $m = $w->maps[$j];
-				if($m->protected) {
+                if ($m->protected) {
                     $ss = stristr($mapaccess[$w->name . '.' . $m->prefix], $uid);
-					if($ss !== false) {
+                    if ($ss !== false) {
                         $newmaps[] = $m;
                     }
-				}
+                } else {
-				else {
                     $newmaps[] = $m;
                 }
             }
@@ -73,6 +68,3 @@ else {
     echo json_encode($json);
 }
 cleanupDb();
- 
-?>
-

DynmapCore/src/main/resources/extracted/web/standalone/PostgreSQL_funcs.php

@@ -1,13 +1,15 @@
 <?php
 
-function cleanupDb() {
+function cleanupDb()
+{
     if (isset($db)) {
         $db->close();
-      $db = NULL;
+        $db = null;
     }
 }
 
-function abortDb($errormsg) {
+function abortDb($errormsg)
+{
     header('HTTP/1.0 500 Error');
     echo "<h1>500 Error</h1>";
     echo $errormsg;
@@ -15,7 +17,8 @@ function abortDb($errormsg) {
     exit;
 }
 
-function initDbIfNeeded() {
+function initDbIfNeeded()
+{
     global $db, $dbhost, $dbuserid, $dbpassword, $dbname, $dbport;
 
     $pos = strpos($dbname, '?');
@@ -25,7 +28,7 @@ function initDbIfNeeded() {
     }
 
     if (!$db) {
-      $db = new PDO("pgsql:host=$dbhost;port=$dbport;dbname=$dbname", $dbuserid , $dbpassword, array(PDO::ATTR_PERSISTENT => true));
+        $db = new PDO("pgsql:host=$dbhost;port=$dbport;dbname=$dbname", $dbuserid, $dbpassword, array(PDO::ATTR_PERSISTENT => true));
         $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         if (!$db) {
             abortDb("Error opening database");
@@ -34,7 +37,8 @@ function initDbIfNeeded() {
 }
 
 
-function getStandaloneFileByServerId($fname, $sid) {
+function getStandaloneFileByServerId($fname, $sid)
+{
     global $db, $dbprefix;
 
     initDbIfNeeded();
@@ -45,27 +49,28 @@ function getStandaloneFileByServerId($fname, $sid) {
     $content = $stmt->fetch(PDO::FETCH_BOTH);
     if ($res && $content) {
         $rslt = stream_get_contents($content[0]); //stupid streams...
-   }
+    } else {
-   else {
+        $rslt = null;
-        $rslt = NULL;
     }
     $stmt->closeCursor();
     return $rslt;
 }
 
-function getStandaloneFile($fname) {
+function getStandaloneFile($fname)
+{
     global $serverid;
 
     if (!isset($serverid)) {
         $serverid = 0;
-      if(isset($_REQUEST['serverid'])) {
+        if (isset($_REQUEST['serverid'])) {
             $serverid = $_REQUEST['serverid'];
         }
     }
     return getStandaloneFileByServerId($fname, $serverid);
 }
 
-function updateStandaloneFileByServerId($fname, $sid, $content) {
+function updateStandaloneFileByServerId($fname, $sid, $content)
+{
     global $db, $dbprefix;
 
     initDbIfNeeded();
@@ -81,19 +86,21 @@ function updateStandaloneFileByServerId($fname, $sid, $content) {
     return $res;
 }
 
-function updateStandaloneFile($fname, $content) {
+function updateStandaloneFile($fname, $content)
+{
     global $serverid;
 
     if (!isset($serverid)) {
         $serverid = 0;
-      if(isset($_REQUEST['serverid'])) {
+        if (isset($_REQUEST['serverid'])) {
             $serverid = $_REQUEST['serverid'];
         }
     }
     return updateStandaloneFileByServerId($fname, $serverid, $content);
 }
 
-function insertStandaloneFileByServerId($fname, $sid, $content) {
+function insertStandaloneFileByServerId($fname, $sid, $content)
+{
     global $db, $dbprefix;
 
     initDbIfNeeded();
@@ -103,16 +110,15 @@ function insertStandaloneFileByServerId($fname, $sid, $content) {
     return $res;
 }
 
-function insertStandaloneFile($fname, $content) {
+function insertStandaloneFile($fname, $content)
+{
     global $serverid;
 
     if (!isset($serverid)) {
         $serverid = 0;
-      if(isset($_REQUEST['serverid'])) {
+        if (isset($_REQUEST['serverid'])) {
             $serverid = $_REQUEST['serverid'];
         }
     }
     return insertStandaloneFileByServerId($fname, $serverid, $content);
 }
-
-?>

DynmapCore/src/main/resources/extracted/web/standalone/PostgreSQL_getlogin.php

@@ -1,8 +1,8 @@
 <?php
-require_once('PostgreSQL_funcs.php');
+
+require_once 'PostgreSQL_funcs.php';
 
 if ($loginenabled) {
     $rslt = getStandaloneFile("dynmap_login.php");
     eval($rslt);
 }
-?>

DynmapCore/src/main/resources/extracted/web/standalone/PostgreSQL_login.php

@@ -1,25 +1,24 @@
 <?php
+
 ob_start();
-require_once('PostgreSQL_funcs.php');
+require_once 'PostgreSQL_funcs.php';
-include('PostgreSQL_config.php');
+require 'PostgreSQL_config.php';
-include('PostgreSQL_getlogin.php');
+require 'PostgreSQL_getlogin.php';
 ob_end_clean();
 
 session_start();
 
-if(isset($_POST['j_username'])) {
+if (isset($_POST['j_username'])) {
     $userid = $_POST['j_username'];
-}
+} else {
-else {
     $userid = '-guest-';
 }
 $good = false;
 
-if(strcmp($userid, '-guest-')) {
+if (strcmp($userid, '-guest-')) {
-  if(isset($_POST['j_password'])) {
+    if (isset($_POST['j_password'])) {
         $password = $_POST['j_password'];
-  }
+    } else {
-  else {
         $password = '';
     }
     $ctx = hash_init('sha256');
@@ -30,12 +29,10 @@ if(strcmp($userid, '-guest-')) {
     if (strcasecmp($hash, $pwdhash[$useridlc]) == 0) {
         $_SESSION['userid'] = $userid;
         $good = true;
-  }
+    } else {
-  else {
         $_SESSION['userid'] = '-guest-';
     }
-}
+} else {
-else {
     $_SESSION['userid'] = '-guest-';
     $good = true;
 }
@@ -44,32 +41,29 @@ $content = getStandaloneFile('dynmap_reg.php');
 /* Prune pending registrations, if needed */
 $lines = explode('\n', $content);
 $newlines[] = array();
-if(!empty($lines)) {
+if (!empty($lines)) {
     $cnt = count($lines) - 1;
     $changed = false;
-	for($i=1; $i < $cnt; $i++) {
+    for ($i = 1; $i < $cnt; $i++) {
         list($uid, $pc, $hsh) = explode('=', rtrim($lines[$i]));
-		if($uid == $useridlc) continue;
+        if ($uid == $useridlc) {
-		if(array_key_exists($uid, $pendingreg)) {
+            continue;
-			$newlines[] = $uid . '=' . $pc . '=' . $hsh;
         }
-		else {
+        if (array_key_exists($uid, $pendingreg)) {
+            $newlines[] = $uid . '=' . $pc . '=' . $hsh;
+        } else {
             $changed = true;
         }
     }
-	if($changed) {
+    if ($changed) {
         updateStandaloneFile('dynmap_reg.php', implode("\n", $newlines));
     }
 }
 
-if($good) {
+if ($good) {
     echo "{ \"result\": \"success\" }";
-}
+} else {
-else {
     echo "{ \"result\": \"loginfailed\" }";
 }
 
 cleanupDb();
- 
-?>
-

DynmapCore/src/main/resources/extracted/web/standalone/PostgreSQL_markers.php

@@ -1,21 +1,21 @@
 <?php
+
 ob_start();
-require_once('PostgreSQL_funcs.php');
+require_once 'PostgreSQL_funcs.php';
-include('PostgreSQL_config.php');
+require 'PostgreSQL_config.php';
-include('PostgreSQL_access.php');
+require 'PostgreSQL_access.php';
 ob_end_clean();
 
 session_start();
 
-if(isset($_SESSION['userid'])) {
+if (isset($_SESSION['userid'])) {
     $userid = $_SESSION['userid'];
-}
+} else {
-else {
     $userid = '-guest-';
 }
 
 $loggedin = false;
-if(strcmp($userid, '-guest-')) {
+if (strcmp($userid, '-guest-')) {
     $loggedin = true;
 }
 
@@ -29,7 +29,7 @@ if ((!isset($path)) || strstr($path, "..")) {
 
 $parts = explode("/", $path);
 
-if(($parts[0] != "faces") && ($parts[0] != "_markers_")) {
+if (($parts[0] != "faces") && ($parts[0] != "_markers_")) {
     header('HTTP/1.0 500 Error');
     echo "<h1>500 Error</h1>";
     echo "Bad marker: " . $path;
@@ -49,14 +49,11 @@ if ($parts[0] == "faces") {
     $ft = 0;
     if ($parts[1] == "8x8") {
         $ft = 0;
-	}
+    } elseif ($parts[1] == '16x16') {
-	else if ($parts[1] == '16x16') {
         $ft = 1;
-   	}
+    } elseif ($parts[1] == '32x32') {
-   	else if ($parts[1] == '32x32') {
         $ft = 2;
-	}
+    } elseif ($parts[1] == 'body') {
-	else if ($parts[1] == 'body') {
         $ft = 3;
     }
     $pn = explode(".", $parts[2]);
@@ -66,12 +63,10 @@ if ($parts[0] == "faces") {
     if ($res && $timage) {
         header('Content-Type: image/png');
         echo stream_get_contents($timage[0]);
-	}
+    } else {
-	else {
         header('Location: ../images/blank.png');
     }
-}
+} else { // _markers_
-else { // _markers_
     $in = explode(".", $parts[1]);
     $name = implode(".", array_slice($in, 0, count($in) - 1));
     $ext = $in[count($in) - 1];
@@ -83,20 +78,17 @@ else { // _markers_
         header('Content-Type: application/json');
         if ($res && $timage) {
             echo stream_get_contents($timage[0]); //PDO returns arrays, even for single colums, and bytea is returned as stream.
-		}
+        } else {
-		else {
             echo "{ }";
         }
-	}
+    } else {
-	else {
         $stmt = $db->prepare('SELECT Image from ' . $dbprefix . 'MarkerIcons WHERE IconName=?');
         $res = $stmt->execute(array($name));
         $timage = $stmt->fetch();
         if ($res && $timage) {
             header('Content-Type: image/png');
             echo stream_get_contents($timage[0]);
-		}
+        } else {
-		else {
             header('Location: ../images/blank.png');
         }
     }
@@ -107,4 +99,3 @@ $stmt->closeCursor();
 cleanupDb();
 
 exit;
-?>

DynmapCore/src/main/resources/extracted/web/standalone/PostgreSQL_sendmessage.php

@@ -1,7 +1,8 @@
 <?php
+
 ob_start();
-require_once('PostgreSQL_funcs.php');
+require_once 'PostgreSQL_funcs.php';
-include('PostgreSQL_config.php');
+require 'PostgreSQL_config.php';
 ob_end_clean();
 
 session_start();
@@ -10,32 +11,32 @@ $content = getStandaloneFile('dynmap_config.json');
 if (isset($content)) {
     $config = json_decode($content, true);
     $msginterval = $config['webchat-interval'];
-}
+} else {
-else {
     $msginterval = 2000;
 }
 
-if(isset($_SESSION['lastchat']))
+if (isset($_SESSION['lastchat'])) {
     $lastchat = $_SESSION['lastchat'];
-else
+} else {
     $lastchat = 0;
+}
 
-if($_SERVER['REQUEST_METHOD'] == 'POST' && $lastchat < time())
+if ($_SERVER['REQUEST_METHOD'] == 'POST' && $lastchat < time()) {
-{
     $micro = microtime(true);
-	$timestamp = round($micro*1000.0);
+    $timestamp = round($micro * 1000.0);
 
     $data = json_decode(trim(file_get_contents('php://input')));
     $data->timestamp = $timestamp;
     $data->ip = $_SERVER['REMOTE_ADDR'];
-	if(isset($_SESSION['userid'])) {
+    if (isset($_SESSION['userid'])) {
         $uid = $_SESSION['userid'];
-		if(strcmp($uid, '-guest-')) {
+        if (strcmp($uid, '-guest-')) {
             $data->userid = $uid;
         }
     }
-	if(isset($_SERVER['HTTP_X_FORWARDED_FOR']))
+    if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
         $data->ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+    }
     $content = getStandaloneFile('dynmap_webchat.json');
     $gotold = false;
     if (isset($content)) {
@@ -43,33 +44,26 @@ if($_SERVER['REQUEST_METHOD'] == 'POST' && $lastchat < time())
         $gotold = true;
     }
 
-	if(!empty($old_messages))
+    if (!empty($old_messages)) {
-	{
+        foreach ($old_messages as $message) {
-		foreach($old_messages as $message)
+            if (($timestamp - $config['updaterate'] - 10000) < $message['timestamp']) {
-		{
-			if(($timestamp - $config['updaterate'] - 10000) < $message['timestamp'])
                 $new_messages[] = $message;
             }
         }
+    }
     $new_messages[] = $data;
 
     if ($gotold) {
         updateStandaloneFile('dynmap_webchat.json', json_encode($new_messages));
-	}
+    } else {
-	else {
         insertStandaloneFile('dynmap_webchat.json', json_encode($new_messages));
     }
 
-	$_SESSION['lastchat'] = time()+$msginterval;
+    $_SESSION['lastchat'] = time() + $msginterval;
     echo "{ \"error\" : \"none\" }";
-}
+} elseif ($_SERVER['REQUEST_METHOD'] == 'POST' && $lastchat > time()) {
-elseif($_SERVER['REQUEST_METHOD'] == 'POST' && $lastchat > time())
-{
     header('HTTP/1.1 403 Forbidden');
-}
+} else {
-else {
     echo "{ \"error\" : \"none\" }";
 }
 cleanupDb();
-
-?>

DynmapCore/src/main/resources/extracted/web/standalone/PostgreSQL_tiles.php

@@ -1,21 +1,21 @@
 <?php
+
 ob_start();
-require_once('PostgreSQL_funcs.php');
+require_once 'PostgreSQL_funcs.php';
-include('PostgreSQL_config.php');
+require 'PostgreSQL_config.php';
-include('PostgreSQL_access.php');
+require 'PostgreSQL_access.php';
 ob_end_clean();
 
 session_start();
 
-if(isset($_SESSION['userid'])) {
+if (isset($_SESSION['userid'])) {
     $userid = $_SESSION['userid'];
-}
+} else {
-else {
     $userid = '-guest-';
 }
 
 $loggedin = false;
-if(strcmp($userid, '-guest-')) {
+if (strcmp($userid, '-guest-')) {
     $loggedin = true;
 }
 
@@ -39,44 +39,42 @@ $uid = '[' . strtolower($userid) . ']';
 
 $world = $parts[0];
 
-if(isset($worldaccess[$world])) {
+if (isset($worldaccess[$world])) {
     $ss = stristr($worldaccess[$world], $uid);
-	if($ss === false) {
+    if ($ss === false) {
         header('Location: ../images/blank.png');
         cleanupDb();
         exit;
     }
 }
-$variant='STANDARD';
+$variant = 'STANDARD';
 
-  $prefix = $parts[1];
+$prefix = $parts[1];
-  $plen = strlen($prefix);
+$plen = strlen($prefix);
-  if(($plen > 4) && (substr($prefix, $plen - 4) === "_day")) {
+if (($plen > 4) && (substr($prefix, $plen - 4) === "_day")) {
     $prefix = substr($prefix, 0, $plen - 4);
     $variant = 'DAY';
-  }
+}
-  $mapid = $world . "." . $prefix;
+$mapid = $world . "." . $prefix;
-  if(isset($mapaccess[$mapid])) {
+if (isset($mapaccess[$mapid])) {
     $ss = stristr($mapaccess[$mapid], $uid);
-	if($ss === false) {
+    if ($ss === false) {
         header('Location: ../images/blank.png');
         cleanupDb();
         exit;
     }
-  }
+}
 
 $fparts = explode("_", $parts[3]);
 if (count($fparts) == 3) { // zoom_x_y
     $zoom = strlen($fparts[0]);
     $x = intval($fparts[1]);
     $y = intval($fparts[2]);
-}
+} elseif (count($fparts) == 2) { // x_y
-else if (count($fparts) == 2) { // x_y
     $zoom = 0;
     $x = intval($fparts[0]);
     $y = intval($fparts[1]);
-}
+} else {
-else {
     header('Location: ../images/blank.png');
     cleanupDb();
     exit;
@@ -84,26 +82,24 @@ else {
 initDbIfNeeded();
 
 $stmt = $db->prepare('SELECT t.Image,t.Format,t.HashCode,t.LastUpdate FROM ' . $dbprefix . 'Maps m JOIN ' . $dbprefix . 'Tiles t ON m.ID=t.MapID WHERE m.WorldID=? AND m.MapID=? AND m.Variant=? AND t.x=? AND t.y=? and t.zoom=?');
-$stmt->bindParam(1,$world, PDO::PARAM_STR);
+$stmt->bindParam(1, $world, PDO::PARAM_STR);
-$stmt->bindParam(2,$prefix, PDO::PARAM_STR);
+$stmt->bindParam(2, $prefix, PDO::PARAM_STR);
-$stmt->bindParam(3,$variant, PDO::PARAM_STR);
+$stmt->bindParam(3, $variant, PDO::PARAM_STR);
-$stmt->bindParam(4,$x, PDO::PARAM_INT);
+$stmt->bindParam(4, $x, PDO::PARAM_INT);
-$stmt->bindParam(5,$y, PDO::PARAM_INT);
+$stmt->bindParam(5, $y, PDO::PARAM_INT);
-$stmt->bindParam(6,$zoom, PDO::PARAM_INT);
+$stmt->bindParam(6, $zoom, PDO::PARAM_INT);
 $res = $stmt->execute();
 list($timage, $format, $thash, $tlast) = $stmt->fetch();
 if ($res && $timage) {
     if ($format == 0) {
         header('Content-Type: image/png');
-   }
+    } else {
-   else {
         header('Content-Type: image/jpeg');
     }
     header('ETag: \'' . $thash . '\'');
-   header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $tlast/1000) . ' GMT'); 
+    header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $tlast / 1000) . ' GMT');
     echo stream_get_contents($timage);
-}
+} else {
-else {
     header('Location: ../images/blank.png');
 }
 
@@ -111,4 +107,3 @@ $stmt->closeCursor();
 cleanupDb();
 
 exit;
-?>

DynmapCore/src/main/resources/extracted/web/standalone/PostgreSQL_update.php

@@ -1,51 +1,52 @@
 <?php
+
 ob_start();
-require_once('PostgreSQL_funcs.php');
+require_once 'PostgreSQL_funcs.php';
-include('PostgreSQL_config.php');
+require 'PostgreSQL_config.php';
-include('PostgreSQL_access.php');
+require 'PostgreSQL_access.php';
 ob_end_clean();
 
 $world = $_REQUEST['world'];
 
 session_start();
 
-if(isset($_SESSION['userid'])) {
+if (isset($_SESSION['userid'])) {
     $userid = $_SESSION['userid'];
-}
+} else {
-else {
     $userid = '-guest-';
 }
 
 $loggedin = false;
-if(strcmp($userid, '-guest-')) {
+if (strcmp($userid, '-guest-')) {
     $loggedin = true;
 }
 
 header('Content-type: application/json; charset=utf-8');
 
-if(strpos($world, '/') || strpos($world, '\\') || empty($world)) {
+if (strpos($world, '/') || strpos($world, '\\') || empty($world)) {
     echo "{ \"error\": \"invalid-world\" }";
     return;
 }
 
-if ($loginenabled)
+if ($loginenabled) {
     $fname = 'updates_' . $world . '.php';
-else
+} else {
     $fname = 'updates_' . $world . '.json';
+}
 
 $useridlc = strtolower($userid);
 $uid = '[' . $useridlc . ']';
 
-if(isset($worldaccess[$world])) {
+if (isset($worldaccess[$world])) {
     $ss = stristr($worldaccess[$world], $uid);
-	if($ss === false) {
+    if ($ss === false) {
         echo "{ \"error\": \"access-denied\" }";
         return;
     }
 }
 
 $serverid = 0;
-if(isset($_REQUEST['serverid'])) {
+if (isset($_REQUEST['serverid'])) {
     $serverid = $_REQUEST['serverid'];
 }
 
@@ -61,34 +62,31 @@ if (!isset($content)) {
 
 if (!$loginenabled) {
     echo $content;
-}
+} elseif (isset($json->loginrequired) && $json->loginrequired && !$loggedin) {
-else if(isset($json->loginrequired) && $json->loginrequired && !$loggedin) {
     echo "{ \"error\": \"login-required\" }";
-}
+} else {
-else {
     $json = json_decode($content);
     $json->loggedin = $loggedin;
     if (isset($json->protected) && $json->protected) {
         $ss = stristr($seeallmarkers, $uid);
-		if($ss === false) {
+        if ($ss === false) {
-			if(isset($playervisible[$useridlc])) {
+            if (isset($playervisible[$useridlc])) {
                 $plist = $playervisible[$useridlc];
                 $pcnt = count($json->players);
-				for($i = 0; $i < $pcnt; $i++) {
+                for ($i = 0; $i < $pcnt; $i++) {
                     $p = $json->players[$i];
-					if(!stristr($plist, '[' . $p->account . ']')) { 
+                    if (!stristr($plist, '[' . $p->account . ']')) {
                         $p->world = "-some-other-bogus-world-";
                         $p->x = 0.0;
                         $p->y = 64.0;
                         $p->z = 0.0;
                     }
                 }
-			}
+            } else {
-			else {
                 $pcnt = count($json->players);
-				for($i = 0; $i < $pcnt; $i++) {
+                for ($i = 0; $i < $pcnt; $i++) {
                     $p = $json->players[$i];
-					if(strcasecmp($userid, $p->account) != 0) {
+                    if (strcasecmp($userid, $p->account) != 0) {
                         $p->world = "-some-other-bogus-world-";
                         $p->x = 0.0;
                         $p->y = 64.0;
@@ -101,7 +99,3 @@ else {
     echo json_encode($json);
 }
 cleanupDb();
-
- 
-?>
-

DynmapCore/src/main/resources/extracted/web/standalone/SQLite_markers.php

@@ -1,19 +1,19 @@
 <?php
+
 ob_start();
-include('dynmap_access.php');
+require 'dynmap_access.php';
 ob_end_clean();
 
 session_start();
 
-if(isset($_SESSION['userid'])) {
+if (isset($_SESSION['userid'])) {
     $userid = $_SESSION['userid'];
-}
+} else {
-else {
     $userid = '-guest-';
 }
 
 $loggedin = false;
-if(strcmp($userid, '-guest-')) {
+if (strcmp($userid, '-guest-')) {
     $loggedin = true;
 }
 
@@ -27,7 +27,7 @@ if ((!isset($path)) || strstr($path, "..")) {
 
 $parts = explode("/", $path);
 
-if(($parts[0] != "faces") && ($parts[0] != "_markers_")) {
+if (($parts[0] != "faces") && ($parts[0] != "_markers_")) {
     header('HTTP/1.0 500 Error');
     echo "<h1>500 Error</h1>";
     echo "Bad marker: " . $path;
@@ -46,14 +46,11 @@ if ($parts[0] == "faces") {
     $ft = 0;
     if ($parts[1] == "8x8") {
         $ft = 0;
-	}
+    } elseif ($parts[1] == '16x16') {
-	else if ($parts[1] == '16x16') {
         $ft = 1;
-   	}
+    } elseif ($parts[1] == '32x32') {
-   	else if ($parts[1] == '32x32') {
         $ft = 2;
-	}
+    } elseif ($parts[1] == 'body') {
-	else if ($parts[1] == 'body') {
         $ft = 3;
     }
     $pn = explode(".", $parts[2]);
@@ -65,13 +62,11 @@ if ($parts[0] == "faces") {
     if (isset($row[0])) {
         header('Content-Type: image/png');
         echo $row[0];
-	}
+    } else {
-	else {
         header('Location: ../images/blank.png');
         exit;
     }
-}
+} else { // _markers_
-else { // _markers_
     $in = explode(".", $parts[1]);
     $name = implode(".", array_slice($in, 0, count($in) - 1));
     $ext = $in[count($in) - 1];
@@ -84,12 +79,10 @@ else { // _markers_
         header('Content-Type: application/json');
         if (isset($row[0])) {
             echo $row[0];
-		}
+        } else {
-		else {
             echo "{ }";
         }
-	}
+    } else {
-	else {
         $stmt = $db->prepare('SELECT Image from MarkerIcons WHERE IconName=:in');
         $stmt->bindValue(":in", $name, SQLITE3_TEXT);
         $res = $stmt->execute();
@@ -97,8 +90,7 @@ else { // _markers_
         if (isset($row[0])) {
             header('Content-Type: image/png');
             echo $row[0];
-		}
+        } else {
-		else {
             header('Location: ../images/blank.png');
             exit;
         }
@@ -111,4 +103,3 @@ $db->close();
 
 
 exit;
-?>

DynmapCore/src/main/resources/extracted/web/standalone/SQLite_tiles.php

@@ -1,19 +1,19 @@
 <?php
+
 ob_start();
-include('dynmap_access.php');
+require 'dynmap_access.php';
 ob_end_clean();
 
 session_start();
 
-if(isset($_SESSION['userid'])) {
+if (isset($_SESSION['userid'])) {
     $userid = $_SESSION['userid'];
-}
+} else {
-else {
     $userid = '-guest-';
 }
 
 $loggedin = false;
-if(strcmp($userid, '-guest-')) {
+if (strcmp($userid, '-guest-')) {
     $loggedin = true;
 }
 
@@ -36,42 +36,40 @@ $uid = '[' . strtolower($userid) . ']';
 
 $world = $parts[0];
 
-if(isset($worldaccess[$world])) {
+if (isset($worldaccess[$world])) {
     $ss = stristr($worldaccess[$world], $uid);
-	if($ss === false) {
+    if ($ss === false) {
         header('Location: ../images/blank.png');
         exit;
     }
 }
-$variant='STANDARD';
+$variant = 'STANDARD';
 
-  $prefix = $parts[1];
+$prefix = $parts[1];
-  $plen = strlen($prefix);
+$plen = strlen($prefix);
-  if(($plen > 4) && (substr($prefix, $plen - 4) === "_day")) {
+if (($plen > 4) && (substr($prefix, $plen - 4) === "_day")) {
     $prefix = substr($prefix, 0, $plen - 4);
     $variant = 'DAY';
-  }
+}
-  $mapid = $world . "." . $prefix;
+$mapid = $world . "." . $prefix;
-  if(isset($mapaccess[$mapid])) {
+if (isset($mapaccess[$mapid])) {
     $ss = stristr($mapaccess[$mapid], $uid);
-	if($ss === false) {
+    if ($ss === false) {
         header('Location: ../images/blank.png');
         exit;
     }
-  }
+}
 
 $fparts = explode("_", $parts[3]);
 if (count($fparts) == 3) { // zoom_x_y
     $zoom = strlen($fparts[0]);
     $x = intval($fparts[1]);
     $y = intval($fparts[2]);
-}
+} elseif (count($fparts) == 2) { // x_y
-else if (count($fparts) == 2) { // x_y
     $zoom = 0;
     $x = intval($fparts[0]);
     $y = intval($fparts[1]);
-}
+} else {
-else {
     header('Location: ../images/blank.png');
     exit;
 }
@@ -91,12 +89,11 @@ if (isset($row[1])) {
     $format = $row[1];
     if ($format == 0) {
         header('Content-Type: image/png');
-   }
+    } else {
-   else {
         header('Content-Type: image/jpeg');
     }
     header('ETag: \'' . $row[2] . '\'');
-   header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $row[3]/1000) . ' GMT'); 
+    header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $row[3] / 1000) . ' GMT');
     if ($row[4] > 0) {
         $v = substr($row[0], 0, $row[4]);
     } else {
@@ -104,8 +101,7 @@ if (isset($row[1])) {
     }
     header('Content-Length: ' . strlen($v));
     echo $v;
-}
+} else {
-else {
     header('Location: ../images/blank.png');
 }
 
@@ -114,4 +110,3 @@ $stmt->close();
 $db->close();
 
 exit;
-?>

DynmapCore/src/main/resources/extracted/web/standalone/configuration.php

@@ -1,62 +1,58 @@
 <?php
+
 ob_start();
-include('dynmap_access.php');
+require 'dynmap_access.php';
 ob_end_clean();
 
 session_start();
 
-if(isset($_SESSION['userid'])) {
+if (isset($_SESSION['userid'])) {
     $userid = $_SESSION['userid'];
-}
+} else {
-else {
     $userid = '-guest-';
 }
 
 $loggedin = false;
-if(strcmp($userid, '-guest-')) {
+if (strcmp($userid, '-guest-')) {
     $loggedin = true;
 }
 
 $lines = file('dynmap_config.php');
 array_shift($lines);
 array_pop($lines);
-$json = json_decode(implode(' ',$lines));
+$json = json_decode(implode(' ', $lines));
 
 header('Content-type: text/plain; charset=utf-8');
 
-if($json->loginrequired && !$loggedin) {
+if ($json->loginrequired && !$loggedin) {
     echo "{ \"error\": \"login-required\" }";
-}
+} else {
-else {
     $uid = '[' . strtolower($userid) . ']';
     $json->loggedin = $loggedin;
     $wcnt = count($json->worlds);
-	for($i = 0; $i < $wcnt; $i++) {
+    for ($i = 0; $i < $wcnt; $i++) {
         $w = $json->worlds[$i];
-		if($w->protected) {
+        if ($w->protected) {
             $ss = stristr($worldaccess[$w->name], $uid);
-			if($ss !== false) {
+            if ($ss !== false) {
                 $newworlds[] = $w;
-			}
+            } else {
-			else {
                 $w = null;
             }
-		}
+        } else {
-		else {
             $newworlds[] = $w;
         }
-		if($w != null) {
+        if ($w != null) {
             $mcnt = count($w->maps);
             $newmaps = array();
-			for($j = 0; $j < $mcnt; $j++) {
+            for ($j = 0; $j < $mcnt; $j++) {
                 $m = $w->maps[$j];
-				if($m->protected) {
+                if ($m->protected) {
                     $ss = stristr($mapaccess[$w->name . '.' . $m->prefix], $uid);
-					if($ss !== false) {
+                    if ($ss !== false) {
                         $newmaps[] = $m;
                     }
-				}
+                } else {
-				else {
                     $newmaps[] = $m;
                 }
             }
@@ -67,8 +63,3 @@ else {
 
     echo json_encode($json);
 }
-
-
- 
-?>
-

DynmapCore/src/main/resources/extracted/web/standalone/login.php

@@ -1,23 +1,22 @@
 <?php
+
 ob_start();
-include('dynmap_login.php');
+require 'dynmap_login.php';
 ob_end_clean();
 
 session_start();
 
-if(isset($_POST['j_username'])) {
+if (isset($_POST['j_username'])) {
     $userid = $_POST['j_username'];
-}
+} else {
-else {
     $userid = '-guest-';
 }
 $good = false;
 
-if(strcmp($userid, '-guest-')) {
+if (strcmp($userid, '-guest-')) {
-  if(isset($_POST['j_password'])) {
+    if (isset($_POST['j_password'])) {
         $password = $_POST['j_password'];
-  }
+    } else {
-  else {
         $password = '';
     }
     $ctx = hash_init('sha256');
@@ -28,51 +27,46 @@ if(strcmp($userid, '-guest-')) {
     if (strcasecmp($hash, $pwdhash[$useridlc]) == 0) {
         $_SESSION['userid'] = $userid;
         $good = true;
-  }
+    } else {
-  else {
         $_SESSION['userid'] = '-guest-';
     }
-}
+} else {
-else {
     $_SESSION['userid'] = '-guest-';
     $good = true;
 }
 /* Prune pending registrations, if needed */
 $newlines[] = '<?php /*';
-if(is_readable('dynmap_reg.php'))
+if (is_readable('dynmap_reg.php')) {
     $lines = file('dynmap_reg.php');
-else
+} else {
     $lines = array();
-if(!empty($lines)) {
+}
+if (!empty($lines)) {
     $cnt = count($lines) - 1;
     $changed = false;
-	for($i=1; $i < $cnt; $i++) {
+    for ($i = 1; $i < $cnt; $i++) {
         list($uid, $pc, $hsh) = explode('=', rtrim($lines[$i]));
-		if($uid == $useridlc) continue;
+        if ($uid == $useridlc) {
-		if(array_key_exists($uid, $pendingreg)) {
+            continue;
-			$newlines[] = $uid . '=' . $pc . '=' . $hsh;
         }
-		else {
+        if (array_key_exists($uid, $pendingreg)) {
+            $newlines[] = $uid . '=' . $pc . '=' . $hsh;
+        } else {
             $changed = true;
         }
     }
-	if($changed) {
+    if ($changed) {
-		if(count($newlines) < 2) {	/* Nothing? */
+        if (count($newlines) < 2) {    /* Nothing? */
             unlink('dynmap_reg.php');
-		}
+        } else {
-		else {
             $newlines[] = '*/ ?>';
             file_put_contents('dynmap_reg.php', implode("\n", $newlines));
         }
     }
 }
 
-if($good) {
+if ($good) {
     echo "{ \"result\": \"success\" }";
-}
+} else {
-else {
     echo "{ \"result\": \"loginfailed\" }";
 }
- 
-?>
-

DynmapCore/src/main/resources/extracted/web/standalone/markers.php

@@ -1,9 +1,10 @@
 <?php
+
 ob_start();
-include('dynmap_access.php');
+require 'dynmap_access.php';
 ob_end_clean();
 
-if(!isset($markerspath)) {
+if (!isset($markerspath)) {
     $markerspath = "../tiles/";
 }
 
@@ -12,15 +13,14 @@ if(!isset($markerspath)) {
 
 session_start();
 
-if(isset($_SESSION['userid'])) {
+if (isset($_SESSION['userid'])) {
     $userid = $_SESSION['userid'];
-}
+} else {
-else {
     $userid = '-guest-';
 }
 
 $loggedin = false;
-if(strcmp($userid, '-guest-')) {
+if (strcmp($userid, '-guest-')) {
     $loggedin = true;
 }
 
@@ -36,7 +36,7 @@ $fname = $markerspath . $path;
 
 $parts = explode("/", $path);
 
-if(($parts[0] != "faces") && ($parts[0] != "_markers_")) {
+if (($parts[0] != "faces") && ($parts[0] != "_markers_")) {
     header('HTTP/1.0 500 Error');
     echo "<h1>500 Error</h1>";
     echo "Bad marker: " . $path;
@@ -46,10 +46,9 @@ if(($parts[0] != "faces") && ($parts[0] != "_markers_")) {
 $uid = '[' . strtolower($userid) . ']';
 
 if (!is_readable($fname)) {
-  if(strstr($path, ".jpg") || strstr($path, ".png")) {
+    if (strstr($path, ".jpg") || strstr($path, ".png")) {
         $fname = "../images/blank.png";
-  }
+    } else {
-  else {
         header('HTTP/1.0 404 Not Found');
         echo "<h1>404 Not Found</h1>";
         echo "Not found: " . $path;
@@ -57,15 +56,15 @@ if (!is_readable($fname)) {
     }
 }
 $fp = fopen($fname, 'rb');
-if (strstr($path, ".png"))
+if (strstr($path, ".png")) {
     header("Content-Type: image/png");
-else if (strstr($path, ".jpg"))
+} elseif (strstr($path, ".jpg")) {
     header("Content-Type: image/jpeg");
-else
+} else {
     header("Content-Type: application/text");
+}
 
 header("Content-Length: " . filesize($fname));
 
 fpassthru($fp);
 exit;
-?>

DynmapCore/src/main/resources/extracted/web/standalone/register.php

@@ -1,37 +1,34 @@
 <?php
+
 ob_start();
-require('dynmap_login.php');
+require 'dynmap_login.php';
 ob_end_clean();
 
 session_start();
 
-if(isset($_POST['j_password'])) {
+if (isset($_POST['j_password'])) {
     $password = $_POST['j_password'];
-}
+} else {
-else {
     $password = '';
 }
-if(isset($_POST['j_verify_password'])) {
+if (isset($_POST['j_verify_password'])) {
     $verify = $_POST['j_verify_password'];
-}
+} else {
-else {
     $verify = '';
 }
-if(strcmp($password, $verify)) {
+if (strcmp($password, $verify)) {
     echo "{ \"result\": \"verifyfailed\" }";
     return;
 }
 
-if(isset($_POST['j_username'])) {
+if (isset($_POST['j_username'])) {
     $userid = $_POST['j_username'];
-}
+} else {
-else {
     $userid = '-guest-';
 }
-if(isset($_POST['j_passcode'])) {
+if (isset($_POST['j_passcode'])) {
     $passcode = $_POST['j_passcode'];
-}
+} else {
-else {
     $passcode = '';
 }
 $good = false;
@@ -42,9 +39,9 @@ $_SESSION['userid'] = '-guest-';
 
 $good = false;
 
-if(strcmp($useridlc, '-guest-')) {
+if (strcmp($useridlc, '-guest-')) {
-  if(isset($pendingreg[$useridlc])) {
+    if (isset($pendingreg[$useridlc])) {
-     if(!strcmp($passcode, $pendingreg[$useridlc])) {
+        if (!strcmp($passcode, $pendingreg[$useridlc])) {
             $ctx = hash_init('sha256');
             hash_update($ctx, $pwdsalt);
             hash_update($ctx, $password);
@@ -54,12 +51,14 @@ if(strcmp($useridlc, '-guest-')) {
 
             $newlines[] = '<?php /*';
             $lines = file('dynmap_reg.php');
-		if(!empty($lines)) {
+            if (!empty($lines)) {
                 $cnt = count($lines) - 1;
-			for($i=1; $i < $cnt; $i++) {
+                for ($i = 1; $i < $cnt; $i++) {
                     list($uid, $pc, $hsh) = explode('=', rtrim($lines[$i]));
-				if($uid == $useridlc) continue;
+                    if ($uid == $useridlc) {
-				if(array_key_exists($uid, $pendingreg)) {
+                        continue;
+                    }
+                    if (array_key_exists($uid, $pendingreg)) {
                         $newlines[] = $uid . '=' . $pc . '=' . $hsh;
                     }
                 }
@@ -70,11 +69,8 @@ if(strcmp($useridlc, '-guest-')) {
         }
     }
 }
-if($good) {
+if ($good) {
     echo "{ \"result\": \"success\" }";
-}
+} else {
-else {
     echo "{ \"result\": \"registerfailed\" }";
 }
-   
-?>

DynmapCore/src/main/resources/extracted/web/standalone/sendmessage.php

@@ -1,63 +1,58 @@
 <?php
+
 session_start();
 
-if(is_readable('dynmap_config.json')) {
+if (is_readable('dynmap_config.json')) {
     $config =  json_decode(file_get_contents('dynmap_config.json'), true);
     $msginterval = $config['webchat-interval'];
-}
+} elseif (is_readable('dynmap_config.php')) {
-else if(is_readable('dynmap_config.php')) {
     $lines = file('dynmap_config.php');
     array_shift($lines);
     array_pop($lines);
-   $config = json_decode(implode(' ',$lines), true);
+    $config = json_decode(implode(' ', $lines), true);
     $msginterval = $config['webchat-interval'];
-}
+} else {
-else {
     $msginterval = 2000;
 }
 
-if(isset($_SESSION['lastchat']))
+if (isset($_SESSION['lastchat'])) {
     $lastchat = $_SESSION['lastchat'];
-else
+} else {
     $lastchat = 0;
+}
 
-if($_SERVER['REQUEST_METHOD'] == 'POST' && $lastchat < time())
+if ($_SERVER['REQUEST_METHOD'] == 'POST' && $lastchat < time()) {
-{
     $micro = microtime(true);
-	$timestamp = round($micro*1000.0);
+    $timestamp = round($micro * 1000.0);
 
     $data = json_decode(trim(file_get_contents('php://input')));
     $data->timestamp = $timestamp;
     $data->ip = $_SERVER['REMOTE_ADDR'];
-	if(isset($_SESSION['userid'])) {
+    if (isset($_SESSION['userid'])) {
         $uid = $_SESSION['userid'];
-		if(strcmp($uid, '-guest-')) {
+        if (strcmp($uid, '-guest-')) {
             $data->userid = $uid;
         }
     }
-	if(isset($_SERVER['HTTP_X_FORWARDED_FOR']))
+    if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
         $data->ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
-	if(is_readable('dynmap_webchat.json')) {
+    }
+    if (is_readable('dynmap_webchat.json')) {
         $old_messages = json_decode(file_get_contents('dynmap_webchat.json'), true);
     }
-	if(!empty($old_messages))
+    if (!empty($old_messages)) {
-	{
+        foreach ($old_messages as $message) {
-		foreach($old_messages as $message)
+            if (($timestamp - $config['updaterate'] - 10000) < $message['timestamp']) {
-		{
-			if(($timestamp - $config['updaterate'] - 10000) < $message['timestamp'])
                 $new_messages[] = $message;
             }
         }
+    }
     $new_messages[] = $data;
     file_put_contents('dynmap_webchat.json', json_encode($new_messages));
-	$_SESSION['lastchat'] = time()+$msginterval;
+    $_SESSION['lastchat'] = time() + $msginterval;
     echo "{ \"error\" : \"none\" }";
-}
+} elseif ($_SERVER['REQUEST_METHOD'] == 'POST' && $lastchat > time()) {
-elseif($_SERVER['REQUEST_METHOD'] == 'POST' && $lastchat > time())
-{
     header('HTTP/1.1 403 Forbidden');
-}
+} else {
-else {
     echo "{ \"error\" : \"none\" }";
 }
-?>

DynmapCore/src/main/resources/extracted/web/standalone/tiles.php

@@ -1,9 +1,10 @@
 <?php
+
 ob_start();
-include('dynmap_access.php');
+require 'dynmap_access.php';
 ob_end_clean();
 
-if(!isset($tilespath)) {
+if (!isset($tilespath)) {
     $tilespath = "../tiles/";
 }
 
@@ -12,15 +13,14 @@ if(!isset($tilespath)) {
 
 session_start();
 
-if(isset($_SESSION['userid'])) {
+if (isset($_SESSION['userid'])) {
     $userid = $_SESSION['userid'];
-}
+} else {
-else {
     $userid = '-guest-';
 }
 
 $loggedin = false;
-if(strcmp($userid, '-guest-')) {
+if (strcmp($userid, '-guest-')) {
     $loggedin = true;
 }
 
@@ -40,46 +40,45 @@ $uid = '[' . strtolower($userid) . ']';
 
 $world = $parts[0];
 
-if(isset($worldaccess[$world])) {
+if (isset($worldaccess[$world])) {
     $ss = stristr($worldaccess[$world], $uid);
-	if($ss === false) {
+    if ($ss === false) {
         $fname = "../images/blank.png";
     }
 }
-if(count($parts) > 2) {
+if (count($parts) > 2) {
     $prefix = $parts[1];
     $plen = strlen($prefix);
-  if(($plen > 4) && (substr($prefix, $plen - 4) === "_day")) {
+    if (($plen > 4) && (substr($prefix, $plen - 4) === "_day")) {
         $prefix = substr($prefix, 0, $plen - 4);
     }
     $mapid = $world . "." . $prefix;
-  if(isset($mapaccess[$mapid])) {
+    if (isset($mapaccess[$mapid])) {
         $ss = stristr($mapaccess[$mapid], $uid);
-	if($ss === false) {
+        if ($ss === false) {
             $fname = "../images/blank.png";
         }
     }
 }
 
 if (!is_readable($fname)) {
-  if(strstr($path, ".jpg") || strstr($path, ".png")) {
+    if (strstr($path, ".jpg") || strstr($path, ".png")) {
         $fname = "../images/blank.png";
-  }
+    } else {
-  else {
         echo "{ \"result\": \"bad-tile\" }";
         exit;
     }
 }
 $fp = fopen($fname, 'rb');
-if (strstr($path, ".png"))
+if (strstr($path, ".png")) {
     header("Content-Type: image/png");
-else if (strstr($path, ".jpg"))
+} elseif (strstr($path, ".jpg")) {
     header("Content-Type: image/jpeg");
-else
+} else {
     header("Content-Type: application/text");
+}
 
 header("Content-Length: " . filesize($fname));
 
 fpassthru($fp);
 exit;
-?>

DynmapCore/src/main/resources/extracted/web/standalone/update.php

@@ -1,38 +1,38 @@
 <?php
 
 ob_start();
-include('dynmap_access.php');
+require 'dynmap_access.php';
 ob_end_clean();
 
 $world = $_REQUEST['world'];
 
 session_start();
 
-if(isset($_SESSION['userid'])) {
+if (isset($_SESSION['userid'])) {
     $userid = $_SESSION['userid'];
-}
+} else {
-else {
     $userid = '-guest-';
 }
 
 $loggedin = false;
-if(strcmp($userid, '-guest-')) {
+if (strcmp($userid, '-guest-')) {
     $loggedin = true;
 }
 
 header('Content-type: text/plain; charset=utf-8');
 
-if(strpos($world, '/') || strpos($world, '\\')) {
+if (strpos($world, '/') || strpos($world, '\\')) {
     echo "{ \"error\": \"invalid-world\" }";
     return;
 }
 
-if(isset($webpath))
+if (isset($webpath)) {
     $fname = $webpath . '/standalone/updates_' . $world . '.php';
-else
+} else {
     $fname = 'updates_' . $world . '.php';
+}
 
-if(!is_readable($fname)) {
+if (!is_readable($fname)) {
     header('HTTP/1.0 404 Not Found');
     return;
 }
@@ -40,50 +40,48 @@ if(!is_readable($fname)) {
 $useridlc = strtolower($userid);
 $uid = '[' . $useridlc . ']';
 
-if(isset($worldaccess[$world])) {
+if (isset($worldaccess[$world])) {
     $ss = stristr($worldaccess[$world], $uid);
-	if($ss === false) {
+    if ($ss === false) {
         echo "{ \"error\": \"access-denied\" }";
         return;
     }
 }
 
 $lines = file($fname);
-if(!$lines) {
+if (!$lines) {
     header('HTTP/1.0 404 Not Found');
     return;
 }
 array_shift($lines);
 array_pop($lines);
-$json = json_decode(implode(' ',$lines));
+$json = json_decode(implode(' ', $lines));
 
 
-if(isset($json->loginrequired) && $json->loginrequired && !$loggedin) {
+if (isset($json->loginrequired) && $json->loginrequired && !$loggedin) {
     echo "{ \"error\": \"login-required\" }";
-}
+} else {
-else {
     $json->loggedin = $loggedin;
     if (isset($json->protected) && $json->protected) {
         $ss = stristr($seeallmarkers, $uid);
-		if($ss === false) {
+        if ($ss === false) {
-			if(isset($playervisible[$useridlc])) {
+            if (isset($playervisible[$useridlc])) {
                 $plist = $playervisible[$useridlc];
                 $pcnt = count($json->players);
-				for($i = 0; $i < $pcnt; $i++) {
+                for ($i = 0; $i < $pcnt; $i++) {
                     $p = $json->players[$i];
-					if(!stristr($plist, '[' . $p->account . ']')) { 
+                    if (!stristr($plist, '[' . $p->account . ']')) {
                         $p->world = "-some-other-bogus-world-";
                         $p->x = 0.0;
                         $p->y = 64.0;
                         $p->z = 0.0;
                     }
                 }
-			}
+            } else {
-			else {
                 $pcnt = count($json->players);
-				for($i = 0; $i < $pcnt; $i++) {
+                for ($i = 0; $i < $pcnt; $i++) {
                     $p = $json->players[$i];
-					if(strcasecmp($userid, $p->account) != 0) {
+                    if (strcasecmp($userid, $p->account) != 0) {
                         $p->world = "-some-other-bogus-world-";
                         $p->x = 0.0;
                         $p->y = 64.0;
@@ -95,8 +93,3 @@ else {
     }
     echo json_encode($json);
 }
-
-
- 
-?>
-

DynmapCore/src/main/resources/extracted/web/up.php

@@ -1,6 +1,6 @@
 <?php
 
-define ('HOSTNAME', 'http://localhost:8123/up/');
+define('HOSTNAME', 'http://localhost:8123/up/');
 
 session_start();
 
@@ -12,52 +12,50 @@ $valid_url_regex = '/.*/';
 // ############################################################################
 
 $path = $_GET['path'];
-$url = HOSTNAME.$path;
+$url = HOSTNAME . $path;
 
 
-$ch = curl_init( $url );
+$ch = curl_init($url);
 
 $client_headers = array();
-$client_headers[] = 'X-Forwarded-For: '.$_SERVER['REMOTE_ADDR'];
+$client_headers[] = 'X-Forwarded-For: ' . $_SERVER['REMOTE_ADDR'];
 curl_setopt($ch, CURLOPT_HTTPHEADER, $client_headers);
 
-if ( strtolower($_SERVER['REQUEST_METHOD']) == 'post' ) {
+if (strtolower($_SERVER['REQUEST_METHOD']) == 'post') {
     $postText = trim(file_get_contents('php://input'));
-  curl_setopt( $ch, CURLOPT_POST, true );
+    curl_setopt($ch, CURLOPT_POST, true);
-  curl_setopt( $ch, CURLOPT_POSTFIELDS, $postText );
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $postText);
 }
 
 
 $cookie = array();
-foreach ( $_COOKIE as $key => $value ) {
+foreach ($_COOKIE as $key => $value) {
     $cookie[] = $key . '=' . $value;
 }
 $cookie[] = SID;
-$cookie = implode( '; ', $cookie );
+$cookie = implode('; ', $cookie);
-curl_setopt( $ch, CURLOPT_COOKIE, $cookie );
+curl_setopt($ch, CURLOPT_COOKIE, $cookie);
 
 //curl_setopt( $ch, CURLOPT_FOLLOWLOCATION, true );
-curl_setopt( $ch, CURLOPT_HEADER, true );
+curl_setopt($ch, CURLOPT_HEADER, true);
-curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 
-curl_setopt( $ch, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT'] );
+curl_setopt($ch, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']);
 
-list( $header, $contents ) = preg_split( '/([\r\n][\r\n])\\1/', curl_exec( $ch ), 2 );
+list($header, $contents) = preg_split('/([\r\n][\r\n])\\1/', curl_exec($ch), 2);
 
-$status = curl_getinfo( $ch );
+$status = curl_getinfo($ch);
 
-curl_close( $ch );
+curl_close($ch);
 
 // Split header text into an array.
-$header_text = preg_split( '/[\r\n]+/', $header );
+$header_text = preg_split('/[\r\n]+/', $header);
 
 // Propagate headers to response.
-foreach ( $header_text as $header ) {
+foreach ($header_text as $header) {
-  if ( preg_match( '/^(?:Content-Type|Content-Language|Set-Cookie):/i', $header ) ) {
+    if (preg_match('/^(?:Content-Type|Content-Language|Set-Cookie):/i', $header)) {
-    header( $header );
+        header($header);
     }
 }
 
 print $contents;
-
-?>