From b9904a5eee0601866ea3efaab024a16c6c03f771 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Fri, 10 May 2013 19:59:54 +0200
Subject: [PATCH] properly use BASEPATH in global config, created shared file
 for crons

---
 cronjobs/findblock.php                    | 14 ++--------
 cronjobs/shared.inc.php                   | 32 +++++++++++++++++++++++
 public/include/autoloader.inc.php         | 14 +++++-----
 public/include/config/global.inc.dist.php |  2 +-
 4 files changed, 42 insertions(+), 20 deletions(-)
 create mode 100644 cronjobs/shared.inc.php

diff --git a/cronjobs/findblock.php b/cronjobs/findblock.php
index e313db57..9794ff26 100644
--- a/cronjobs/findblock.php
+++ b/cronjobs/findblock.php
@@ -18,18 +18,8 @@ limitations under the License.
 
  */
 
-// MODIFY THIS
-// We need to find our include files so set this properly
-define("BASEPATH", "../public/");
-
-// Our security check
-define("SECURITY", 1);
-
-// Include our configuration (holding defines for the requires)
-require_once(BASEPATH . '/include/config/global.inc.php');
-
-// We include all needed files here, even though our templates could load them themself
-require_once(BASEPATH . INCLUDE_DIR . '/autoloader.inc.php');
+// Include all settings and classes
+require_once('shared.inc.php');
 
 // Fetch our last block found from the DB as a starting point
 $strLastBlockHash = $block->getLast()->blockhash;
diff --git a/cronjobs/shared.inc.php b/cronjobs/shared.inc.php
new file mode 100644
index 00000000..70744716
--- /dev/null
+++ b/cronjobs/shared.inc.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+
+Copyright:: 2013, Sebastian Grewe
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+ */
+
+// MODIFY THIS
+// We need to find our include files so set this properly
+define("BASEPATH", "../public/");
+
+// Our security check
+define("SECURITY", 1);
+
+// Include our configuration (holding defines for the requires)
+require_once(BASEPATH . '/include/config/global.inc.php');
+
+// We include all needed files here, even though our templates could load them themself
+require_once(BASEPATH . INCLUDE_DIR . '/autoloader.inc.php');
diff --git a/public/include/autoloader.inc.php b/public/include/autoloader.inc.php
index 1cd74202..936ee1c9 100644
--- a/public/include/autoloader.inc.php
+++ b/public/include/autoloader.inc.php
@@ -1,10 +1,10 @@
 <?php
 
-require_once(BASEPATH . CLASS_DIR . '/debug.class.php');
-require_once(BASEPATH . CLASS_DIR . '/bitcoin.class.php');
-require_once(BASEPATH . INCLUDE_DIR . '/database.inc.php');
-require_once(BASEPATH . INCLUDE_DIR . '/smarty.inc.php');
+require_once(CLASS_DIR . '/debug.class.php');
+require_once(CLASS_DIR . '/bitcoin.class.php');
+require_once(INCLUDE_DIR . '/database.inc.php');
+require_once(INCLUDE_DIR . '/smarty.inc.php');
 // Load classes that need the above as dependencies
-require_once(BASEPATH . CLASS_DIR . '/user.class.php');
-require_once(BASEPATH . CLASS_DIR . '/block.class.php');
-require_once(BASEPATH . CLASS_DIR . '/settings.class.php');
+require_once(CLASS_DIR . '/user.class.php');
+require_once(CLASS_DIR . '/block.class.php');
+require_once(CLASS_DIR . '/settings.class.php');
diff --git a/public/include/config/global.inc.dist.php b/public/include/config/global.inc.dist.php
index 2cb38c6d..ce709e47 100644
--- a/public/include/config/global.inc.dist.php
+++ b/public/include/config/global.inc.dist.php
@@ -7,7 +7,7 @@ if (!defined('SECURITY'))
 define('THEME', 'mmcFE');
 
 // Our include directory for additional features
-define('INCLUDE_DIR', 'include');
+define('INCLUDE_DIR', BASEPATH . 'include');
 
 // Our class directory
 define('CLASS_DIR', INCLUDE_DIR . '/classes');