From e28b1746e3a9db18c6704648cfdec0f6c7bbd19a Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Mon, 12 Mar 2018 09:26:35 +0100
Subject: [PATCH] Update bootstrap/autoload and constants (change and remove
 non-used constants definitions)

---
 Changelog               |  1 +
 bootstrap/autoload.php  |  8 +---
 bootstrap/constants.php | 49 +++++++-----------------
 composer.lock           | 84 +++++++++++++++++++++++++++--------------
 4 files changed, 73 insertions(+), 69 deletions(-)

diff --git a/Changelog b/Changelog
index 45e4bab35..37d3da751 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2018-03-12 DariusIII
+	* Chg: Update bootstrap/autoload and constants (change and remove non-used constants definitions)
 	* Chg: Update ReleaseImage class, try to catch more errors
 	* Chg: Remove reference to non used and non existing config folder
 	* Chg: Update config/logging with new options (bubble, permission and locking)
diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
index fefb7c142..1de47069e 100644
--- a/bootstrap/autoload.php
+++ b/bootstrap/autoload.php
@@ -1,8 +1,8 @@
 <?php
 
 require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR.'autoload.php';
-require_once 'constants.php';
 require __DIR__.DIRECTORY_SEPARATOR.'app.php';
+require_once 'constants.php';
 
 use Dotenv\Dotenv;
 use Blacklight\utility\Utility;
@@ -12,11 +12,7 @@ $dotenv->load();
 
 define('NNTMUX_START', microtime(true));
 
-define('NN_APP_PATH', dirname(__DIR__).DS.'app');
-
-if (! defined('NN_ROOT')) {
-    define('NN_ROOT', dirname(NN_APP_PATH, 2));
-}
+define('NN_APP_PATH', app_path());
 
 if (! defined('HAS_WHICH')) {
     define('HAS_WHICH', Utility::hasWhich() ? true : false);
diff --git a/bootstrap/constants.php b/bootstrap/constants.php
index 969264de5..a11613e64 100755
--- a/bootstrap/constants.php
+++ b/bootstrap/constants.php
@@ -1,6 +1,6 @@
 <?php
 
-// YOU SHOULD NOT EDIT ANYTHING IN THIS FILE, COPY .../ntmux/config/settings.example.php TO .../Blacklight/config/settings.php AND EDIT THAT FILE!
+// YOU SHOULD NOT EDIT ANYTHING IN THIS FILE!
 
 define('NN_MINIMUM_PHP_VERSION', '7.2.0');
 define('NN_MINIMUM_MYSQL_VERSION', '5.6');
@@ -9,60 +9,39 @@ define('NN_MINIMUM_MARIA_VERSION', '10.1');
 define('DS', DIRECTORY_SEPARATOR);
 
 // These are file path constants
-define('NN_ROOT', realpath(dirname(__DIR__)).DS);
+define('NN_ROOT', base_path().'/');
 
 // Used to refer to the main lib class files.
-define('NN_LIB', NN_ROOT.'Blacklight'.DS);
-define('NN_CORE', NN_LIB);
-
-define('NN_CONFIGS', NN_CORE.'config'.DS);
-
-// Used to refer to the third party library files.
-define('NN_LIBS', NN_ROOT.'libs'.DS);
+define('NN_LIB', NN_ROOT.'Blacklight/');
 
 // Used to refer to the /misc class files.
-define('NN_MISC', NN_ROOT.'misc'.DS);
+define('NN_MISC', NN_ROOT.'misc/');
 
 // /misc/update/
-define('NN_UPDATE', NN_MISC.'update'.DS);
+define('NN_UPDATE', NN_MISC.'update/');
 
 // /misc/update/multiprocessing
-define('NN_MULTI', NN_UPDATE.'multiprocessing'.DS);
+define('NN_MULTI', NN_UPDATE.'multiprocessing/');
 
 // /misc/update/tmux/
-define('NN_TMUX', NN_UPDATE.'tmux'.DS);
+define('NN_TMUX', NN_UPDATE.'tmux/');
 
 // /misc/update/multiprocessing/
-define('NN_MULTIPROCESSING', NN_UPDATE.'multiprocessing'.DS);
+define('NN_MULTIPROCESSING', NN_UPDATE.'multiprocessing/');
 
 // Refers to the web root for the Smarty lib
-define('NN_WWW', NN_ROOT.'public'.DS);
+define('NN_WWW', public_path().'/');
 
 // Used to refer to the resources folder
-define('NN_RES', NN_ROOT.'resources'.DS);
+define('NN_RES', resource_path().'/');
 
 // Used to refer to the covers folder
-define('NN_COVERS', NN_RES.'covers'.DS);
-
-// Smarty's cache.
-define('NN_SMARTY_CACHE', NN_RES.'smarty'.DS.'cache/');
-
-// Smarty's configuration files.
-define('NN_SMARTY_CONFIGS', NN_RES.'smarty'.DS.'configs/');
-
-// Smarty's compiled template cache.
-define('NN_SMARTY_TEMPLATES', NN_RES.'smarty'.DS.'templates_c/');
+define('NN_COVERS', NN_RES.'covers/');
 
 // Used to refer to the tmp folder
-define('NN_TMP', NN_RES.'tmp'.DS);
-
-// Full path is fs to the themes folder
-define('NN_THEMES', NN_WWW.'themes'.DS);
-
-// Shared theme items (pictures, scripts).
-define('NN_THEMES_SHARED', NN_THEMES.'shared'.DS);
+define('NN_TMP', NN_RES.'tmp/');
 
 // Path where log files are stored.
-define('NN_LOGS', NN_RES.'logs'.DS);
+define('NN_LOGS', storage_path().'/logs/');
 
-define('NN_VERSIONS', NN_ROOT.'build'.DS.'nntmux.xml');
+define('NN_VERSIONS', NN_ROOT.'build/nntmux.xml');
diff --git a/composer.lock b/composer.lock
index c576a4870..e3c207728 100644
--- a/composer.lock
+++ b/composer.lock
@@ -253,7 +253,8 @@
                     "Gemfile.lock",
                     "*.md"
                 ]
-            }
+            },
+            "time": "2016-06-06T17:37:52+00:00"
         },
         {
             "name": "bower-asset/autosize",
@@ -282,7 +283,8 @@
                 "form",
                 "textarea",
                 "ui"
-            ]
+            ],
+            "time": "2017-05-19T15:36:30+00:00"
         },
         {
             "name": "bower-asset/bootstrap",
@@ -331,7 +333,8 @@
                 "mobile-first",
                 "responsive",
                 "web"
-            ]
+            ],
+            "time": "2016-07-25T15:51:55+00:00"
         },
         {
             "name": "bower-asset/bootstrap-3.x",
@@ -380,7 +383,8 @@
                 "mobile-first",
                 "responsive",
                 "web"
-            ]
+            ],
+            "time": "2016-07-25T15:51:55+00:00"
         },
         {
             "name": "bower-asset/bootstrap-datepicker",
@@ -409,7 +413,8 @@
             },
             "license": [
                 "Apache-2.0"
-            ]
+            ],
+            "time": "2016-08-05T09:50:13+00:00"
         },
         {
             "name": "bower-asset/bootstrap-hover-dropdown",
@@ -439,7 +444,8 @@
                 "dropdowns",
                 "hover",
                 "twitter"
-            ]
+            ],
+            "time": "2015-12-01T23:35:57+00:00"
         },
         {
             "name": "bower-asset/bootstrap-progressbar",
@@ -473,7 +479,8 @@
             },
             "license": [
                 "MIT"
-            ]
+            ],
+            "time": "2015-05-15T18:56:17+00:00"
         },
         {
             "name": "bower-asset/bootswatch",
@@ -526,7 +533,8 @@
             "license": [
                 "MIT"
             ],
-            "description": "Bootswatch is a collection of themes for Bootstrap."
+            "description": "Bootswatch is a collection of themes for Bootstrap.",
+            "time": "2016-07-30T21:56:26+00:00"
         },
         {
             "name": "bower-asset/chosen",
@@ -603,7 +611,8 @@
                 "modal",
                 "popup",
                 "ui"
-            ]
+            ],
+            "time": "2016-05-10T22:21:33+00:00"
         },
         {
             "name": "bower-asset/datatables",
@@ -651,7 +660,8 @@
                 "jquery",
                 "library",
                 "table"
-            ]
+            ],
+            "time": "2017-08-31T13:52:17+00:00"
         },
         {
             "name": "bower-asset/fancybox",
@@ -717,7 +727,8 @@
                     "tests",
                     "examples"
                 ]
-            }
+            },
+            "time": "2015-01-26T21:19:01+00:00"
         },
         {
             "name": "bower-asset/flexboxgrid",
@@ -753,7 +764,8 @@
                 "css",
                 "flexbox",
                 "grid"
-            ]
+            ],
+            "time": "2016-08-14T16:43:18+00:00"
         },
         {
             "name": "bower-asset/font-awesome",
@@ -798,7 +810,8 @@
                     "src",
                     "build.xml"
                 ]
-            }
+            },
+            "time": "2015-07-20T20:04:00+00:00"
         },
         {
             "name": "bower-asset/icheck",
@@ -848,7 +861,8 @@
                 "replacement",
                 "skins",
                 "ui"
-            ]
+            ],
+            "time": "2014-03-03T17:36:28+00:00"
         },
         {
             "name": "bower-asset/jquery",
@@ -911,7 +925,8 @@
                 "javascript",
                 "jquery",
                 "library"
-            ]
+            ],
+            "time": "2016-05-20T17:24:43+00:00"
         },
         {
             "name": "bower-asset/jquery-3.2.x",
@@ -970,7 +985,8 @@
                     "node_modules",
                     "components"
                 ]
-            }
+            },
+            "time": "2014-09-22T14:17:52+00:00"
         },
         {
             "name": "bower-asset/jquery-goup",
@@ -1005,7 +1021,8 @@
                 "scroll",
                 "scrolltop",
                 "scrolltotop"
-            ]
+            ],
+            "time": "2017-08-31T15:51:29+00:00"
         },
         {
             "name": "bower-asset/jquery-migrate-1.4.x",
@@ -1024,7 +1041,8 @@
             "type": "bower-asset-library",
             "extra": {
                 "bower-asset-main": "jquery-migrate.js"
-            }
+            },
+            "time": "2016-04-15T06:38:34+00:00"
         },
         {
             "name": "bower-asset/jquery-migrate-3.0.x",
@@ -1043,7 +1061,8 @@
             "type": "bower-asset-library",
             "extra": {
                 "bower-asset-main": "jquery-migrate.js"
-            }
+            },
+            "time": "2016-06-10T14:28:59+00:00"
         },
         {
             "name": "bower-asset/jquery.nicescroll",
@@ -1073,7 +1092,8 @@
                     "demo",
                     "package.json"
                 ]
-            }
+            },
+            "time": "2016-03-01T20:38:24+00:00"
         },
         {
             "name": "bower-asset/material-design-iconic-font",
@@ -1112,7 +1132,8 @@
                 "font",
                 "icons",
                 "material"
-            ]
+            ],
+            "time": "2015-11-08T04:50:28+00:00"
         },
         {
             "name": "bower-asset/materialize",
@@ -1171,7 +1192,8 @@
                 "responsive",
                 "sass",
                 "ux"
-            ]
+            ],
+            "time": "2017-04-15T01:39:28+00:00"
         },
         {
             "name": "bower-asset/pace",
@@ -1217,7 +1239,8 @@
                 "progress",
                 "progress",
                 "spinner"
-            ]
+            ],
+            "time": "2014-11-06T16:31:34+00:00"
         },
         {
             "name": "bower-asset/pnotify",
@@ -1269,7 +1292,8 @@
             "license": [
                 "Apache-2.0"
             ],
-            "description": "JavaScript notification plugin."
+            "description": "JavaScript notification plugin.",
+            "time": "2017-07-31T21:50:29+00:00"
         },
         {
             "name": "bower-asset/respond",
@@ -1293,7 +1317,8 @@
                     "test"
                 ]
             },
-            "description": "Fast and lightweight polyfill for min/max-width CSS3 Media Queries (for IE 6-8, and more)"
+            "description": "Fast and lightweight polyfill for min/max-width CSS3 Media Queries (for IE 6-8, and more)",
+            "time": "2013-12-19T04:44:31+00:00"
         },
         {
             "name": "bower-asset/responsive-tables-js",
@@ -1323,7 +1348,8 @@
                 "jquery",
                 "responsive",
                 "table"
-            ]
+            ],
+            "time": "2015-10-08T14:18:04+00:00"
         },
         {
             "name": "bower-asset/select2",
@@ -1391,7 +1417,8 @@
                 "scrolling",
                 "slimscroll",
                 "ui"
-            ]
+            ],
+            "time": "2016-06-11T09:19:14+00:00"
         },
         {
             "name": "bower-asset/tinymce-builded",
@@ -1418,7 +1445,8 @@
                 "rich",
                 "tinymce",
                 "wysiwyg"
-            ]
+            ],
+            "time": "2016-09-12T14:09:41+00:00"
         },
         {
             "name": "clue/stream-filter",