mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-10 08:34:09 +02:00
Code Issues Releases Wiki Activity

CURL init cleanup.

Browse Source
This commit is contained in:
Cameron
2016-06-01 10:41:47 -07:00
parent 324822a109
commit 8e44dd147d
4 changed files with 113 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
class2.php
View File

@@ -407,14 +407,14 @@ e107::getSingleton('e107_traffic'); // We start traffic counting ASAP
$sql = e107::getDb(); //TODO - find & replace $sql, $e107->sql
$sql->db_SetErrorReporting(FALSE);
$sql->db_Mark_Time('Start: SQL Connect');
$sql->db_Mark_Time('SQL Connect');
$merror=$sql->db_Connect($mySQLserver, $mySQLuser, $mySQLpassword, $mySQLdefaultdb);
// create after the initial connection.
//DEPRECATED, BC, call the method only when needed
$sql2 = e107::getDb('sql2'); //TODO find & replace all $sql2 calls
$sql->db_Mark_Time('Start: Prefs, misc tables');
$sql->db_Mark_Time('Prefs, misc tables');
//DEPRECATED, BC, call the method only when needed, $e107->admin_log caught by __get()
$admin_log = e107::getAdminLog(); //TODO - find & replace $admin_log, $e107->admin_log
@@ -440,7 +440,7 @@ e107_require_once(e_HANDLER.'php_compatibility_handler.php');
//
// L: Extract core prefs from the database
//
$sql->db_Mark_Time('Start: Extract Core Prefs');
$sql->db_Mark_Time('Extract Core Prefs');
// TODO - remove it from here, auto-loaded when required
e107_require_once(e_HANDLER.'cache_handler.php');
@@ -527,7 +527,7 @@ if(e107::getPref('ssl_enabled') && !deftrue('e_SSL_DISABLE'))
// $sql->db_Mark_Time('(Extracting Core Prefs Done)');
$sql->db_Mark_Time('Start: Init Language and detect changes');
$sql->db_Mark_Time('Init Language and detect changes');
$lng = e107::getLanguage(); // required for v1.0 BC.
$lng->detect();
@@ -622,7 +622,7 @@ if(!empty($pref['redirectsiteurl']) && !empty($pref['siteurl'])) {
// to avoid multi-language 'access-denied' issues.
//session_start(); see e107::getSession() above
e107::getSession(); //init core _SESSION - actually here for reference only, it's done by language handler set() method
$sql->db_Mark_Time('Start: Set User Language Session');
$sql->db_Mark_Time('Set User Language Session');
e107::getLanguage()->set(); // set e_LANGUAGE, USERLAN, Language Session / Cookies etc. requires $pref;
if(varset($pref['multilanguage']) && (e_LANGUAGE != $pref['sitelanguage']))
@@ -635,7 +635,7 @@ if(varset($pref['multilanguage']) && (e_LANGUAGE != $pref['sitelanguage']))
// e107_include_once(e_LANGUAGEDIR.e_LANGUAGE.'/'.e_LANGUAGE.'.php');
// e107_include_once(e_LANGUAGEDIR.e_LANGUAGE.'/'.e_LANGUAGE.'_custom.php');
// v1 Custom language File Path.
$sql->db_Mark_Time('Start: Include Global Core Language Files');
$sql->db_Mark_Time('Include Global Core Language Files');
if((e_ADMIN_AREA === true) && !empty($pref['adminlanguage']))
{
include(e_LANGUAGEDIR.$pref['adminlanguage'].'/'.$pref['adminlanguage'].'.php');
@@ -662,7 +662,7 @@ unset($customLan, $customLan2);
$lng->bcDefs(); // defined v1.x definitions for old templates.
$sql->db_Mark_Time('Start: Include Global Plugin Language Files');
$sql->db_Mark_Time('Include Global Plugin Language Files');
if(isset($pref['lan_global_list']))
{
foreach($pref['lan_global_list'] as $path)
@@ -673,7 +673,7 @@ if(isset($pref['lan_global_list']))
$sql->db_Mark_Time('Start: CHAP challenge');
$sql->db_Mark_Time('CHAP challenge');
$die = (e_AJAX_REQUEST == true) ? false : true;
e107::getSession()
@@ -684,7 +684,7 @@ unset($die);
//
// N: misc setups: online user tracking, cache
//
$sql->db_Mark_Time('Start: Misc resources. Online user tracking, cache');
$sql->db_Mark_Time('Misc resources. Online user tracking, cache');
/**
@@ -698,15 +698,15 @@ $override = e107::getSingleton('override', true); //TODO - find & replace $overr
//DEPRECATED, BC, call the method only when needed, $e107->user_class caught by __get()
$e_userclass = e107::getUserClass(); //TODO - find & replace $e_userclass, $e107->user_class
$sql->db_Mark_Time('Start: Init Event Handler');
$sql->db_Mark_Time('Init Event Handler');
e107::getEvent()->init();
$sql->db_Mark_Time('Start: Register Core Events');
$sql->db_Mark_Time('Register Core Events');
e107::getNotify()->registerEvents();
//
// O: Start user session
//
$sql -> db_Mark_Time('Start: User session');
$sql -> db_Mark_Time('User session');
init_session(); // Set up a lot of the user-related constants
@@ -781,7 +781,7 @@ if (isset($pref['modules']) && $pref['modules']) {
}
*/
$sql->db_Mark_Time('Start: Load Plugin Modules');
$sql->db_Mark_Time('Load Plugin Modules');
$js_body_onload = array(); // Initialise this array in case a module wants to add to it
@@ -803,7 +803,7 @@ if(isset($pref['e_module_list']) && $pref['e_module_list'])
// P: THEME LOADING
//
$sql->db_Mark_Time('Start: Load Theme');
$sql->db_Mark_Time('Load Theme');
//########### Module redefinable functions ###############
if (!function_exists('checkvalidtheme'))
@@ -886,7 +886,7 @@ if (!function_exists('checkvalidtheme'))
//
// Q: ALL OTHER SETUP CODE
//
$sql->db_Mark_Time('Start: Misc Setup');
$sql->db_Mark_Time('Misc Setup');
//------------------------------------------------------------------------------------------------------------------------------------//
if (!class_exists('e107table', false))
@@ -1017,7 +1017,7 @@ $ns = e107::getRender(); //TODO - find & replace $ns, $e107->ns
// EONE-134 - bad e_module could destroy e107 instance
$e107 = e107::getInstance(); // Is this needed now?
$sql->db_Mark_Time('Start: IP Handler and Ban Check');
$sql->db_Mark_Time('IP Handler and Ban Check');
e107::getIPHandler()->ban();
if(varset($pref['force_userupdate']) && USER && !isset($_E107['no_forceuserupdate']) && $_SERVER['QUERY_STRING'] !== 'logout')
@@ -1029,7 +1029,7 @@ if(varset($pref['force_userupdate']) && USER && !isset($_E107['no_forceuserupdat
}
}
$sql->db_Mark_Time('Start: Signup/splash/admin');
$sql->db_Mark_Time('Signup/splash/admin');
if(($pref['membersonly_enabled'] && !isset($_E107['allow_guest'])) || ($pref['maintainance_flag'] && empty($_E107['cli']) && empty($_E107['no_maintenance'])))
@@ -1047,7 +1047,7 @@ if(!isset($_E107['no_prunetmp']))
}
$sql->db_Mark_Time('Start: Login/logout/ban/tz');
$sql->db_Mark_Time('Login/logout/ban/tz');
if (isset($_POST['userlogin']) || isset($_POST['userlogin_x']))
@@ -1139,7 +1139,7 @@ define('TIMEOFFSET', $e_deltaTime);
// ----------------------------------------------------------------------------
$sql->db_Mark_Time('Start: Find/Load Theme');
$sql->db_Mark_Time('Find/Load Theme');
if(e_ADMIN_AREA) // Load admin phrases ASAP
{
@@ -1175,7 +1175,7 @@ if(!defined('THEME'))
$theme_pref = varset($pref['sitetheme_pref']);
// --------------------------------------------------------------
$sql->db_Mark_Time('Start: Find/Load Theme-Layout'); // needs to run after checkvalidtheme() (for theme previewing).
$sql->db_Mark_Time('Find/Load Theme-Layout'); // needs to run after checkvalidtheme() (for theme previewing).
if(!defined("THEME_LAYOUT"))
{
@@ -1258,15 +1258,17 @@ if(!defined("THEME_LAYOUT"))
// -----------------------------------------------------------------------
$sql->db_Mark_Time('Start: Get menus');
if(!isset($_E107['no_menus']))
{
$sql->db_Mark_Time('Init Menus');
e107::getMenu()->init();
}
// here we USE the theme
if(e_ADMIN_AREA)
{
$sql->db_Mark_Time('Loading Admin Theme');
if(file_exists(THEME.'admin_theme.php')&&(strpos(e_SELF.'?'.e_QUERY, $ADMIN_DIRECTORY.'menus.php?configure')===FALSE)) // no admin theme when previewing.
{
require_once (THEME.'admin_theme.php');
@@ -1278,6 +1280,7 @@ if(e_ADMIN_AREA)
}
else
{
$sql->db_Mark_Time('Loading Site Theme');
require_once (THEME.'theme.php');
if(isset($SC_WRAPPER))
{
@@ -1835,7 +1838,7 @@ function init_session()
}
$sql->db_Mark_Time('Start: Go online');
$sql->db_Mark_Time('Go online');
if(!isset($_E107['no_online']) && varset($pref['track_online']))
{
e107::getOnline()->goOnline($pref['track_online'], $pref['flood_protect']);