Merge pull request #669 from TheByKotik/v1.x

Author: Groruk

web/configs/version.json

@@ -1,5 +1,5 @@
 {
     "version": "1.7.0",
-    "git": "957",
+    "git": "959",
     "dev": true
 }

web/init.php

@@ -34,11 +34,12 @@
 define('SCRIPT_PATH', ROOT . 'scripts');
 define('TEMPLATES_PATH', ROOT . 'pages');
 define('INCLUDES_PATH', ROOT . 'includes');
+define('SB_MAP_LOCATION',  'images/maps');
 define('SB_DEMO_LOCATION', 'demos');
 define('SB_ICON_LOCATION', 'images/games');
-define('SB_MAP_LOCATION', ROOT . 'images/maps');
-define('SB_ICONS', ROOT . SB_ICON_LOCATION);
+define('SB_MAPS',  ROOT . SB_MAP_LOCATION);
 define('SB_DEMOS', ROOT . SB_DEMO_LOCATION);
+define('SB_ICONS', ROOT . SB_ICON_LOCATION);
 
 define('SB_THEMES', ROOT . 'themes/');
 define('SB_CACHE', ROOT . 'cache/');

web/pages/admin.uploadmapimg.php

@@ -29,7 +29,7 @@
 $message = "";
 if (isset($_POST['upload'])) {
     if (checkExtension($_FILES['mapimg_file']['name'], ['jpg'])) {
-        move_uploaded_file($_FILES['mapimg_file']['tmp_name'], SB_MAP_LOCATION . "/" . $_FILES['mapimg_file']['name']);
+        move_uploaded_file($_FILES['mapimg_file']['tmp_name'], SB_MAPS . "/" . $_FILES['mapimg_file']['name']);
         $message = "<script>window.opener.mapimg('" . $_FILES['mapimg_file']['name'] . "');self.close()</script>";
         Log::add("m", "Map Image Uploaded", "A new map image has been uploaded: $_FILES[mapimg_file][name]");
     } else {