X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=9cd96c8fa492f27b5bdde675b4488abe42986120;hb=81f648125535d3fbb1ac770ce99202a0da2faa1b;hp=49b40d35824e07f7bd2e82a3526a1c4b43820c56;hpb=3299d3eba008bfd2450d0f19d072126f98c78e1e;p=mailer.git diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index 49b40d3582..9cd96c8fa4 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -40,6 +40,10 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) { // CFG: DEBUG-SQL (if enabled and DEBUG_MODE is enabled all SQL queries will be logged to debug.log) define('DEBUG_SQL', false); +// Default is not a frameset +global $isFrameset; +$isFrameset = false; + // Load library require_once(PATH."inc/db/lib.php"); @@ -113,15 +117,12 @@ LIMIT 1", __FILE__, __LINE__); // Run daily reset if ((date("d", $_CONFIG['last_update']) != date("d", time()) || ((isBooleanConstantAndTrue('DEBUG_MODE')))) && (!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed')) && (isBooleanConstantAndTrue('admin_registered')) && (!isset($_GET['register'])) && ($CSS != 1)) { // Do daily things in external PHP file but only when script is completely setup - $INC_POOL[] = PATH."inc/reset/reset_daily.php"; + $INC_POOL[] = sprintf("%sinc/reset/reset_daily.php", PATH); // Daily reset was run! define('__DAILY_RESET', "1"); } - // Load all extensions - require_once(PATH."inc/load_extensions.php"); - // Load "databases" aka static arrays require_once(PATH."inc/databases.php"); @@ -155,7 +156,7 @@ LIMIT 1", __FILE__, __LINE__); UPDATE_ONLINE_LIST(get_session('PHPSESSID'), $GLOBALS['module'], $GLOBALS['action'], $GLOBALS['what']); // Load theme name - $CurrTheme = GET_CURR_THEME(); + $currTheme = GET_CURR_THEME(); // Set default 'what' value //* DEBUG */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-
\n"; @@ -233,7 +234,6 @@ LIMIT 1", __FILE__, __LINE__); // Include required files require_once(PATH."inc/databases.php"); require_once(PATH."inc/theme-manager.php"); - require_once(PATH."inc/load_extensions.php"); // Check if we are in installation routine $installPhp = basename($_SERVER['PHP_SELF']);