X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=5cd6a3cf45277990ba93d498c8da49ef1fe61e85;hb=5c0d2c01826cb3802aed682513b7f98454394867;hp=09c836ba704d2e53a9c0bbf73e38284134eba1ae;hpb=3396ef5550610949a8ecb01beb333da547cd619b;p=mailer.git diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index 09c836ba70..5cd6a3cf45 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -1,7 +1,7 @@ = '0.3.6')) { - // Generate random number - setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getUserId(), '')); - } else { - // Generate weak (!!!) code - setConfigEntry('RAND_NUMBER', mt_rand(1000000, 9999999)); - } - - // Check module for permissions - $checkModule = checkModulePermissions(); - - // Cound module here - countModuleHit(getModule()); - - // Admin module should be accessable by guests to login - if ((getModule() == 'admin') && ($checkModule == 'admin_only')) { - // This is fine and can be ignored - } elseif ($checkModule != 'done') { - // Not fine! - logDebugMessage(__FILE__, __LINE__, sprintf("Check of module %s results in unexpected value: %s", - getModule(), - $checkModule - )); - } - } else { - // Wrong database? - addFatalMessage(__FILE__, __LINE__, getMessage('WRONG_DB_SELECTED')); - } - } else { - // No link to database! - addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK')); - } - } else { - // Maybe you forgot to enter your MySQL data? - addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_DATA_MISSING')); - } + // Initialize SQL link + initSqlLink(); } else { - /////////////////////////////////////////////////// - // Include neccessary functions for installation // - /////////////////////////////////////////////////// - // Default output is 'direct' for HTML output setConfigEntry('OUTPUT_MODE', 'direct'); // This hack prevents a backtrace in CSS output - if (getOutputMode() == '1') { + if (isCssOutputMode()) { // Problem with config so set output mode setConfigEntry('OUTPUT_MODE', 'render'); } // END - if - // Set other missing variables - if (!isOutputModeSet()) setOutputMode('0'); + // CFG: DATABASE-TYPE + setConfigEntry('_DB_TYPE', 'mysql3'); + + // Set link as down + unsetSqlLinkUp(__FILE__, __LINE__); + + // Load database layer here + loadIncludeOnce('inc/db/lib.php'); + + // Init message system + initMessages(); // Include more - foreach (array('inc/databases.php','inc/db/lib.php','inc/session.php','inc/versions.php','inc/install-functions.php','inc/load_config.php') as $inc) { - // Load the include - loadIncludeOnce($inc); + foreach (array('databases', 'session', 'versions', 'install-functions', 'load_config', 'load_cache') as $inc) { + // Load include file + loadIncludeOnce('inc/' . $inc . '.php'); } // END - foreach - // Load config - loadIncludeOnce('inc/load_config.php'); + // Init installer + initInstaller(); - // Are we installation routine? - if ((!isInstalling()) && (getOutputMode() != '1') && (getOutputMode() != -1)) { - // You have to install first! + // Check whether we are in installation routine + if ((!isInstalling()) && (!isCssOutputMode()) && (!isRawOutputMode())) { + // Redirect to the URL redirectToUrl('install.php'); } // END - if - - // Init filter system here - initFilterSystem(); - - // Load cache - loadIncludeOnce('inc/load_cache.php'); - - // Run the init filter chain - runFilterChain('init'); } // Handle fatal errors -handleFatalErrors(); +runFilterChain('handle_fatal_errors'); // [EOF] ?>