Use absolute path when including config

kimden · May 22, 2014 · b8b9a90 · b8b9a90
1 parent 3f6326c
commit b8b9a90
Show file tree

Hide file tree

Showing 23 changed files with 43 additions and 54 deletions.
diff --git a/about.php b/about.php
@@ -19,8 +19,7 @@
  * along with stkaddons.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('ROOT', './');
-require_once(ROOT . 'config.php');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . "config.php");
 
 $tpl = new StkTemplate('about.tpl');
 $tpl->assign('title', htmlspecialchars(_('STK Add-ons') . ' | ' . _('About')));

diff --git a/addons-panel.php b/addons-panel.php
@@ -19,11 +19,7 @@
  * along with stkaddons.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('ROOT'))
-{
-    define('ROOT', './');
-}
-require_once(ROOT . 'config.php');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . "config.php");
 
 $a_tpl = new StkTemplate('addons-panel.tpl');
 

diff --git a/addons.php b/addons.php
@@ -19,8 +19,7 @@
  * along with stkaddons.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('ROOT', './');
-require_once(ROOT . 'config.php');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . "config.php");
 $_GET['type'] = (isset($_GET['type'])) ? $_GET['type'] : NULL;
 switch ($_GET['type']) {
     default:

diff --git a/download.php b/download.php
@@ -18,8 +18,7 @@
  * along with stkaddons.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('ROOT', './');
-require_once(ROOT . 'config.php');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . "config.php");
 
 $dir = $_GET['type'];
 $file = $_GET['file'];

diff --git a/error.php b/error.php
@@ -32,8 +32,7 @@
         break;
 }
 
-define('ROOT', './');
-require_once(ROOT . 'config.php');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . "config.php");
 
 $tpl = new StkTemplate('error-page.tpl');
 switch ($error_code)

diff --git a/generate_xml.php b/generate_xml.php
@@ -18,8 +18,7 @@
  * along with stkaddons.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('ROOT', './');
-require_once(ROOT . 'config.php');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . "config.php");
 
 $xml = writeNewsXML();
 echo 'News xml written: ' . $xml . '<br />';

diff --git a/image.php b/image.php
@@ -16,6 +16,5 @@
  You should have received a copy of the GNU General Public License along with
  stkaddons.  If not, see <http://www.gnu.org/licenses/>.   */
 
-define('ROOT', './');
-require_once(ROOT . 'config.php');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . "config.php");
 resizeImage($_GET['pic']);
diff --git a/include.php b/include.php
@@ -19,7 +19,7 @@
  * along with stkaddons.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-require_once(ROOT . 'config.php');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . "config.php");
 require_once(INCLUDE_PATH . 'AccessControl.class.php');
 require_once(INCLUDE_PATH . 'DBConnection.class.php');
 require_once(INCLUDE_PATH . 'Constants.php');

diff --git a/include/DBConnection.class.php b/include/DBConnection.class.php
@@ -1,6 +1,23 @@
 <?php
-
-require_once(ROOT . 'config.php');
+/**
+ * copyright 2013 Glenn De Jonghe
+ *           2013 Stephen Just <[email protected]>
+ *           2014 Daniel Butum <danibutum at gmail dot com>
+ * This file is part of SuperTuxKart
+ *
+ * stkaddons is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * stkaddons is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with stkaddons.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 /**
  * Class DBException

diff --git a/include/SLocale.class.php b/include/SLocale.class.php
@@ -115,7 +115,7 @@ private static function setLocale($locale)
         $_COOKIE['lang'] = $locale;
 
         // Set translation file info
-        bindtextdomain('translations', ROOT . 'locale');
+        bindtextdomain('translations', ROOT_PATH . 'locale');
         textdomain('translations');
         bind_textdomain_codeset('translations', 'UTF-8');
 

diff --git a/include/Template.class.php b/include/Template.class.php
@@ -184,13 +184,13 @@ public static function getTemplateDir($template)
     {
         if ($template === null)
         {
-            return ROOT . 'tpl/default/';
+            return TPL_PATH;
         }
         if (preg_match('/[a-z0-9\\-_]/i', $template))
         {
             throw new TemplateException('Invalid character in template name.');
         }
-        $dir = ROOT . 'tpl/' . $template . '/';
+        $dir = ROOT_PATH . 'tpl' . DS . $template . DS;
         if (file_exists($dir) && is_dir($dir))
         {
             return $dir;

diff --git a/index.php b/index.php
@@ -16,8 +16,7 @@
  You should have received a copy of the GNU General Public License along with 
  stkaddons.  If not, see <http://www.gnu.org/licenses/>.   */
 
-define('ROOT', './');
-require(ROOT . "config.php");
+require_once(__DIR__ . DIRECTORY_SEPARATOR . "config.php");
 //AccessControl::setLevel(NULL);
 
 $tpl = new StkTemplate('index.tpl');

diff --git a/install/config-base.php b/install/config-base.php
@@ -76,7 +76,6 @@
 define("ASSET_XML", DOWN_LOCATION . "xml/assets.xml");
 define("NEWS_XML_LOCAL", UP_LOCATION . "xml/news.xml");
 define("ASSET_XML_LOCAL", UP_LOCATION . "xml/news.xml");
-define("JPG_ROOT", ROOT);
 
 // add composer autoload
 require_once(ROOT_PATH . 'vendor' . DS . 'autoload.php');
diff --git a/login.php b/login.php
@@ -19,8 +19,7 @@
  * along with stkaddons.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('ROOT', './');
-require_once(ROOT . 'config.php');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . "config.php");
 
 // define possibly undefined variables
 $_POST['user'] = (isset($_POST['user'])) ? $_POST['user'] : null;

diff --git a/manage-panel.php b/manage-panel.php
@@ -18,11 +18,7 @@
  * along with stkaddons.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('ROOT'))
-{
-    define('ROOT', './');
-}
-require_once(ROOT . 'config.php');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . "config.php");
 AccessControl::setLevel('manageaddons');
 
 $_GET['action'] = (isset($_GET['action'])) ? $_GET['action'] : null;

diff --git a/manage.php b/manage.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * copyright 2011 Stephen Just <[email protected]>
  *           2014 Daniel Butum <danibutum at gmail dot com>
@@ -18,8 +17,8 @@
  * You should have received a copy of the GNU General Public License
  * along with stkaddons.  If not, see <http://www.gnu.org/licenses/>.
  */
-define('ROOT', './');
-require_once(ROOT . 'config.php');
+
+require_once(__DIR__ . DIRECTORY_SEPARATOR . "config.php");
 AccessControl::setLevel('manageaddons');
 
 $_GET['action'] = (isset($_GET['action'])) ? $_GET['action'] : null;

diff --git a/music.php b/music.php
@@ -18,8 +18,7 @@
  * along with stkaddons.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('ROOT', './');
-require_once(ROOT . 'config.php');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . "config.php");
 
 $tpl = new StkTemplate('music-browser.tpl');
 $tpl->assign('title', htmlspecialchars(_('STK Add-ons') . ' | ' . _('Browse Music')));

diff --git a/password-reset.php b/password-reset.php
@@ -20,8 +20,7 @@
  * along with stkaddons.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('ROOT', './');
-require_once(ROOT . 'config.php');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . "config.php");
 
 $tpl = new StkTemplate('password-reset.tpl');
 $tpl->assign('title', htmlspecialchars(_('Reset Password') . ' - ' . _('STK Add-ons')));

diff --git a/privacy.php b/privacy.php
@@ -18,8 +18,7 @@
  * along with stkaddons.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('ROOT', './');
-require_once(ROOT . 'config.php');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . "config.php");
 
 $tpl = new StkTemplate('info-page.tpl');
 $tpl->assign('title', htmlspecialchars(_('STK Add-ons') . ' | ' . _('Privacy')));

diff --git a/register.php b/register.php
@@ -19,8 +19,7 @@
  * along with stkaddons.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('ROOT', './');
-require_once(ROOT . 'config.php');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . "config.php");
 
 $_POST['user'] = (empty($_POST['user'])) ? NULL : $_POST['user'];
 $_POST['name'] = (empty($_POST['name'])) ? NULL : $_POST['name'];

diff --git a/upload.php b/upload.php
@@ -18,8 +18,7 @@
  * along with stkaddons. If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('ROOT', './');
-require_once(ROOT . 'config.php');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . "config.php");
 AccessControl::setLevel('addAddon');
 
 // Define possibly undefined variables

diff --git a/users-panel.php b/users-panel.php
@@ -19,11 +19,7 @@
  * along with stkaddons.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('ROOT'))
-{
-    define('ROOT', './');
-}
-require_once(ROOT . 'config.php');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . "config.php");
 AccessControl::setLevel('basicPage');
 
 $user_name = '';

diff --git a/users.php b/users.php
@@ -19,8 +19,7 @@
  * along with stkaddons.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('ROOT', './');
-require_once(ROOT . 'config.php');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . "config.php");
 AccessControl::setLevel('basicPage');
 
 // set current user if not defined
@@ -124,7 +123,7 @@
 
 // right panel
 ob_start();
-include(ROOT . 'users-panel.php');
+include(ROOT_PATH . 'users-panel.php');
 $panel['right'] = ob_get_clean();
 
 // output the view