From 0643cf4b877f11fb8b2345394c372ccb49dc66de Mon Sep 17 00:00:00 2001 From: xisi Date: Wed, 29 Jan 2014 18:33:34 -0500 Subject: [PATCH] fixed crons, tested on 2 boxes --- cronjobs/shared.inc.php | 11 ++++++----- public/include/admin_checks.php | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cronjobs/shared.inc.php b/cronjobs/shared.inc.php index fc0d4c9a..b34026df 100644 --- a/cronjobs/shared.inc.php +++ b/cronjobs/shared.inc.php @@ -47,14 +47,15 @@ $dStartTime = microtime(true); // Our cron name $cron_name = basename($_SERVER['PHP_SELF'], '.php'); -// Our security check -define("SECURITY", 1); - // Include our configuration (holding defines for the requires) +require_once(BASEPATH . 'include/config/global.inc.dist.php'); require_once(BASEPATH . 'include/config/global.inc.php'); -// We include all needed files here, even though our templates could load them themself -require_once(INCLUDE_DIR . '/autoloader.inc.php'); +require_once(BASEPATH . 'include/config/security.inc.dist.php'); +@include_once(BASEPATH . 'include/config/security.inc.php'); + +require_once(BASEPATH . 'include/bootstrap.php'); +require_once(BASEPATH . 'include/version.inc.php'); // Command line switches array_shift($argv); diff --git a/public/include/admin_checks.php b/public/include/admin_checks.php index 62c9a1f0..29f0a3eb 100644 --- a/public/include/admin_checks.php +++ b/public/include/admin_checks.php @@ -39,7 +39,7 @@ if (@$_SESSION['USERDATA']['is_admin'] && $user->isAdmin(@$_SESSION['USERDATA'][ } // check if htaccess exists if (!file_exists(BASEPATH.".htaccess")) { - $htaccess_link = ".htaccess>"; + $htaccess_link = ".htaccess"; $notice[] = "You don't seem to have a .htaccess in your public folder, if you're using apache set it up $htaccess_link"; } // check if we can write templates/cache and templates/compile -> error