From 5318686626fac89fe15176ecbcdadc2f8c15d409 Mon Sep 17 00:00:00 2001
From: Bartek Fabiszewski <github@fabiszewski.net>
Date: Tue, 11 Apr 2017 17:00:40 +0200
Subject: [PATCH] Reorganize files into subfolders

---
 auth.php                                   | 11 ++++++-----
 client/index.php                           |  6 +++---
 main.css => css/main.css                   |  0
 helpers/config.php                         |  4 +---
 helpers/db.php                             |  2 +-
 helpers/position.php                       |  2 +-
 helpers/track.php                          |  2 +-
 helpers/user.php                           |  4 ++--
 index.php                                  | 20 ++++++++++----------
 admin.js => js/admin.js                    |  2 +-
 api_gmaps.js => js/api_gmaps.js            |  0
 api_openlayers.js => js/api_openlayers.js  |  0
 main.js => js/main.js                      | 10 +++++-----
 pass.js => js/pass.js                      |  2 +-
 lang.php                                   |  5 +++--
 adduser.php => utils/adduser.php           |  2 +-
 changepass.php => utils/changepass.php     |  2 +-
 download.php => utils/download.php         |  4 ++--
 getpositions.php => utils/getpositions.php |  4 ++--
 gettracks.php => utils/gettracks.php       |  4 ++--
 logout.php => utils/logout.php             |  2 +-
 21 files changed, 44 insertions(+), 44 deletions(-)
 rename main.css => css/main.css (100%)
 rename admin.js => js/admin.js (98%)
 rename api_gmaps.js => js/api_gmaps.js (100%)
 rename api_openlayers.js => js/api_openlayers.js (100%)
 rename main.js => js/main.js (97%)
 rename pass.js => js/pass.js (98%)
 rename adduser.php => utils/adduser.php (96%)
 rename changepass.php => utils/changepass.php (96%)
 rename download.php => utils/download.php (98%)
 rename getpositions.php => utils/getpositions.php (95%)
 rename gettracks.php => utils/gettracks.php (92%)
 rename logout.php => utils/logout.php (90%)

diff --git a/auth.php b/auth.php
index 33307e2..dbb00de 100755
--- a/auth.php
+++ b/auth.php
@@ -17,13 +17,14 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-require_once("helpers/config.php");
+define("ROOT_DIR", __DIR__);
+require_once(ROOT_DIR . "/helpers/config.php");
 $config = new uConfig();
 
-require_once("lang.php");
-require_once("helpers/db.php");
+require_once(ROOT_DIR . "/lang.php");
+require_once(ROOT_DIR . "/helpers/db.php");
 $mysqli = uDb::getInstance();
-require_once($config::$rootDir . "/helpers/user.php");
+require_once(ROOT_DIR . "/helpers/user.php");
 
 session_name('ulogger');
 session_start();
@@ -57,7 +58,7 @@ if (!$user->isValid && ($config::$require_authentication || defined('headless'))
         <title>' . $lang["title"] . '</title>
         <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
         <meta name="viewport" content="initial-scale=1.0, user-scalable=no">
-        <link rel="stylesheet" type="text/css" href="main.css">
+        <link rel="stylesheet" type="text/css" href="css/main.css">
         <script type="text/javascript">
         function focus() {
           document.forms[0].elements[0].focus();
diff --git a/client/index.php b/client/index.php
index ce80a13..6fe0f01 100644
--- a/client/index.php
+++ b/client/index.php
@@ -29,7 +29,7 @@ function setError(&$response, $message) {
 }
 
 define("headless", true);
-require_once("../auth.php"); // sets $mysqli, $user
+require_once(dirname(__DIR__) . "/auth.php"); // sets $mysqli, $user
 
 $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : null;
 $response = [ 'error' => false ];
@@ -64,7 +64,7 @@ switch ($action) {
       setError($response, "missing required parameter");
       break;
     }
-    require_once("../helpers/track.php");
+    require_once(ROOT_DIR . "/helpers/track.php");
     $track = new uTrack();
     $trackId = $track->add($user->id, $trackName);
     if ($trackId === false) {
@@ -94,7 +94,7 @@ switch ($action) {
       break;
     }
 
-    require_once("../helpers/position.php");
+    require_once(ROOT_DIR . "/helpers/position.php");
     $position = new uPosition();
     $positionId = $position->add($user->id, $trackId,
             $time, $lat, $lon, $altitude, $speed, $bearing, $accuracy, $provider, $comment, $imageId);
diff --git a/main.css b/css/main.css
similarity index 100%
rename from main.css
rename to css/main.css
diff --git a/helpers/config.php b/helpers/config.php
index 72b9306..f47ed84 100644
--- a/helpers/config.php
+++ b/helpers/config.php
@@ -78,13 +78,11 @@
     static $units = "metric";
 
     private static $fileLoaded = false;
-    public static $rootDir;
 
    /**
     * Constructor
     */
     public function __construct() {
-      self::$rootDir = dirname(__DIR__);
       $this->setFromFile();
       $this->setFromCookies();
     }
@@ -93,7 +91,7 @@
     * Read config values from "/config.php" file
     */
     private function setFromFile() {
-      $configFile = self::$rootDir . "/config.php";
+      $configFile = ROOT_DIR . "/config.php";
       if (self::$fileLoaded || !file_exists($configFile)) {
         return;
       }
diff --git a/helpers/db.php b/helpers/db.php
index 7a5c805..db7b030 100644
--- a/helpers/db.php
+++ b/helpers/db.php
@@ -17,7 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-  require_once (__DIR__ . "/config.php");
+  require_once(ROOT_DIR . "/helpers/config.php");
 
  /**
   * mysqli wrapper
diff --git a/helpers/position.php b/helpers/position.php
index 99cdd7b..20dd7bb 100644
--- a/helpers/position.php
+++ b/helpers/position.php
@@ -17,7 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-  require_once(__DIR__ . "/db.php");
+  require_once(ROOT_DIR . "/helpers/db.php");
 
  /**
   * Positions handling
diff --git a/helpers/track.php b/helpers/track.php
index 0988ce7..f299e05 100644
--- a/helpers/track.php
+++ b/helpers/track.php
@@ -17,7 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-  require_once(__DIR__ . "/db.php");
+  require_once(ROOT_DIR . "/helpers/db.php");
 
  /**
   * Track handling
diff --git a/helpers/user.php b/helpers/user.php
index 4d4324d..647ed5c 100644
--- a/helpers/user.php
+++ b/helpers/user.php
@@ -16,8 +16,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
-  require_once (__DIR__ . "/config.php");
-  require_once (__DIR__ . "/db.php");
+  require_once (ROOT_DIR . "/helpers/config.php");
+  require_once (ROOT_DIR . "/helpers/db.php");
 
  /**
   * User handling routines
diff --git a/index.php b/index.php
index ed15534..23eb4ec 100755
--- a/index.php
+++ b/index.php
@@ -17,9 +17,9 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-  require_once("auth.php"); // sets $mysqli, $user
-  require_once("helpers/position.php");
-  require_once("helpers/track.php");
+  require_once(__DIR__ . "/auth.php"); // sets $mysqli, $user
+  require_once(ROOT_DIR . "/helpers/position.php");
+  require_once(ROOT_DIR . "/helpers/track.php");
 
   $displayUserId = NULL;
   $usersArr = [];
@@ -57,7 +57,7 @@
     <title><?= $lang["title"] ?></title>
     <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no">
-    <link rel="stylesheet" type="text/css" href="main.css">
+    <link rel="stylesheet" type="text/css" href="css/main.css">
     <script>
       var interval = '<?= $config::$interval ?>';
       var userid = '<?= ($displayUserId) ? $displayUserId : -1 ?>';
@@ -73,19 +73,19 @@
       var init_longitude = '<?= $config::$init_longitude ?>';
       var lang = <?= json_encode($lang) ?>;
     </script>
-    <script type="text/javascript" src="main.js"></script>
+    <script type="text/javascript" src="js/main.js"></script>
 
     <?php if ($config::$mapapi == "gmaps"): ?>
       <script type="text/javascript" src="//maps.googleapis.com/maps/api/js<?= !empty($config::$gkey) ? "?key={$config::$gkey}" : "" ?>"></script>
-      <script type="text/javascript" src="api_gmaps.js"></script>
+      <script type="text/javascript" src="js/api_gmaps.js"></script>
     <?php else: ?>
       <script type="text/javascript" src="//openlayers.org/api/OpenLayers.js"></script>
-      <script type="text/javascript" src="api_openlayers.js"></script>
+      <script type="text/javascript" src="js/api_openlayers.js"></script>
     <?php endif; ?>
     <?php if ($user->isAdmin): ?>
-      <script type="text/javascript" src="admin.js"></script>
+      <script type="text/javascript" src="js/admin.js"></script>
     <?php endif; ?>
-    <script type="text/javascript" src="pass.js"></script>
+    <script type="text/javascript" src="js/pass.js"></script>
     <script type="text/javascript" src="//www.google.com/jsapi"></script>
     <script type="text/javascript">
       google.load('visualization', '1', { packages:['corechart'] });
@@ -101,7 +101,7 @@
             <a href="javascript:void(0);" onclick="userMenu()"><img class="icon" alt="<?= $lang["user"] ?>" src="images/user.svg"> <?= $user->login ?></a>
             <div id="user_dropdown" class="dropdown">
               <a href="javascript:void(0)" onclick="changePass()"><img class="icon" alt="<?= $lang["changepass"] ?>" src="images/lock.svg"> <?= $lang["changepass"] ?></a>
-              <a href="logout.php"><img class="icon" alt="<?= $lang["logout"] ?>" src="images/poweroff.svg"> <?= $lang["logout"] ?></a>
+              <a href="utils/logout.php"><img class="icon" alt="<?= $lang["logout"] ?>" src="images/poweroff.svg"> <?= $lang["logout"] ?></a>
             </div>
           </div>
         <?php else: ?>
diff --git a/admin.js b/js/admin.js
similarity index 98%
rename from admin.js
rename to js/admin.js
index 8baf01c..39bd593 100644
--- a/admin.js
+++ b/js/admin.js
@@ -58,7 +58,7 @@ function submitUser() {
       xhr = null;
     }
   }
-  xhr.open('POST', 'adduser.php', true);
+  xhr.open('POST', 'utils/adduser.php', true);
   xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
   xhr.send('login=' + login + '&pass=' + pass);
   return;
diff --git a/api_gmaps.js b/js/api_gmaps.js
similarity index 100%
rename from api_gmaps.js
rename to js/api_gmaps.js
diff --git a/api_openlayers.js b/js/api_openlayers.js
similarity index 100%
rename from api_openlayers.js
rename to js/api_openlayers.js
diff --git a/main.js b/js/main.js
similarity index 97%
rename from main.js
rename to js/main.js
index 7ce3ba2..c16a700 100755
--- a/main.js
+++ b/js/main.js
@@ -126,7 +126,7 @@ function loadTrack(userid, trackid, update) {
       xhr = null;
     }
   }
-  xhr.open('GET', 'getpositions.php?trackid=' + trackid + '&userid=' + userid, true);
+  xhr.open('GET', 'utils/getpositions.php?trackid=' + trackid + '&userid=' + userid, true);
   xhr.send();
 }
 
@@ -215,7 +215,7 @@ function getPopupHtml(p, i, count) {
 }
 
 function load(type, userid, trackid) {
-  var url = 'download.php?type=' + type + '&userid=' + userid + '&trackid=' + trackid;
+  var url = 'utils/download.php?type=' + type + '&userid=' + userid + '&trackid=' + trackid;
   window.location.assign(url);
 }
 
@@ -305,7 +305,7 @@ function getTracks(userid) {
       xhr = null;
     }
   }
-  xhr.open('GET', 'gettracks.php?userid=' + userid, true);
+  xhr.open('GET', 'utils/gettracks.php?userid=' + userid, true);
   xhr.send();
 }
 
@@ -368,11 +368,11 @@ function loadMapAPI(api) {
   document.getElementById("map-canvas").innerHTML = '';
   var url = new Array();
   if (api == 'gmaps') {
-    url.push('api_gmaps.js');
+    url.push('js/api_gmaps.js');
     url.push('//maps.googleapis.com/maps/api/js?' + ((gkey !== null) ? ('key=' + gkey + '&') : '') + 'callback=init');
   }
   else {
-    url.push('api_openlayers.js');
+    url.push('js/api_openlayers.js');
     url.push('//openlayers.org/api/OpenLayers.js');
   }
   addScript(url[0]);
diff --git a/pass.js b/js/pass.js
similarity index 98%
rename from pass.js
rename to js/pass.js
index 1194430..caad414 100644
--- a/pass.js
+++ b/js/pass.js
@@ -58,7 +58,7 @@ function submitPass() {
       xhr = null;
     }
   }
-  xhr.open('POST', 'changepass.php', true);
+  xhr.open('POST', 'utils/changepass.php', true);
   xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
   xhr.send('oldpass=' + oldpass + '&pass=' + pass);
   return;
diff --git a/lang.php b/lang.php
index 1b5c7c8..1a16ca3 100755
--- a/lang.php
+++ b/lang.php
@@ -17,6 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+
   // available languages
   $langsArr = [
     "en" => "English",
@@ -29,12 +30,12 @@
   ];
 
   // always load en base
-  require_once("lang/en.php");
+  require_once(ROOT_DIR . "/lang/en.php");
 
   // override with translated strings if needed
   // missing strings will be displayed in English
   if ($config::$lang != "en" && array_key_exists($config::$lang, $langsArr)) {
-    require_once("lang/{$config::$lang}.php");
+    require_once(ROOT_DIR . "/lang/{$config::$lang}.php");
   }
 
 ?>
diff --git a/adduser.php b/utils/adduser.php
similarity index 96%
rename from adduser.php
rename to utils/adduser.php
index ab85eb3..fac632e 100644
--- a/adduser.php
+++ b/utils/adduser.php
@@ -17,7 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-  require_once("auth.php"); // sets $mysqli, $user
+  require_once(dirname(__DIR__) . "/auth.php"); // sets $mysqli, $user
 
   /**
    * Exit with xml response
diff --git a/changepass.php b/utils/changepass.php
similarity index 96%
rename from changepass.php
rename to utils/changepass.php
index c20ef3e..717f554 100644
--- a/changepass.php
+++ b/utils/changepass.php
@@ -17,7 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-  require_once("auth.php"); // sets $mysqli, $user
+  require_once(dirname(__DIR__) . "/auth.php"); // sets $mysqli, $user
 
   /**
    * Exit with error message
diff --git a/download.php b/utils/download.php
similarity index 98%
rename from download.php
rename to utils/download.php
index 5c0cd11..6a98dfc 100755
--- a/download.php
+++ b/utils/download.php
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-require_once("auth.php"); // sets $mysqli, $user
-require_once("helpers/position.php");
+require_once(dirname(__DIR__) . "/auth.php"); // sets $mysqli, $user
+require_once(ROOT_DIR . "/helpers/position.php");
 
 /**
  * Add kml marker style element
diff --git a/getpositions.php b/utils/getpositions.php
similarity index 95%
rename from getpositions.php
rename to utils/getpositions.php
index 6ae2b2b..847a1bb 100755
--- a/getpositions.php
+++ b/utils/getpositions.php
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-require_once("auth.php"); // sets $mysqli, $user
-require_once("helpers/position.php");
+require_once(dirname(__DIR__) . "/auth.php"); // sets $mysqli, $user
+require_once(ROOT_DIR . "/helpers/position.php");
 
 $userId = (isset($_REQUEST["userid"]) && is_numeric($_REQUEST["userid"])) ? $_REQUEST["userid"] : NULL;
 $trackId = (isset($_REQUEST["trackid"]) && is_numeric($_REQUEST["trackid"])) ? $_REQUEST["trackid"] : NULL;
diff --git a/gettracks.php b/utils/gettracks.php
similarity index 92%
rename from gettracks.php
rename to utils/gettracks.php
index e390914..b31d98e 100755
--- a/gettracks.php
+++ b/utils/gettracks.php
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-require_once("auth.php"); // sets $mysqli, $user
-require_once("helpers/track.php");
+require_once(dirname(__DIR__) . "/auth.php"); // sets $mysqli, $user
+require_once(ROOT_DIR . "/helpers/track.php");
 
 $userId = ((isset($_REQUEST["userid"]) && is_numeric($_REQUEST["userid"])) ? $_REQUEST["userid"] : 0);
 
diff --git a/logout.php b/utils/logout.php
similarity index 90%
rename from logout.php
rename to utils/logout.php
index e2c1e46..23591f5 100755
--- a/logout.php
+++ b/utils/logout.php
@@ -25,7 +25,7 @@ if (isset($_COOKIE[session_name('ulogger') ])) {
 }
 session_destroy();
 $ssl = ((!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == "" || $_SERVER['HTTPS'] == "off") ? "http" : "https");
-$url = str_replace("//", "/", $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME']) . "/index.php");
+$url = str_replace("//", "/", $_SERVER['HTTP_HOST'] . dirname(dirname($_SERVER['SCRIPT_NAME'])) . "/index.php");
 header("Location: $ssl://$url");
 
 ?>
\ No newline at end of file