mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-28 10:20:45 +02:00
Code Issues Releases Wiki Activity

Memory optimization and more speed logging.

Browse Source
This commit is contained in:
Cameron
2021-01-24 17:16:49 -08:00
parent 522d71d243
commit 11de1fc0f4
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
class2.php
View File

@@ -1515,7 +1515,6 @@ function init_session()
# - scope public # - scope public
*/ */
// ---------------------------------------- // ----------------------------------------
// Set 'UTC' as default timezone to avoid PHP warnings. // Set 'UTC' as default timezone to avoid PHP warnings.
@@ -1523,15 +1522,19 @@ function init_session()
global $user_pref, $currentUser, $_E107; global $user_pref, $currentUser, $_E107;
e107::getDebug()->logTime('[init_session: getInstance]');
$e107 = e107::getInstance(); $e107 = e107::getInstance();
// New user model // New user model
e107::getDebug()->logTime('[init_session: getUser]');
$user = e107::getUser(); $user = e107::getUser();
// Get user timezone. // Get user timezone.
e107::getDebug()->logTime('[init_session: getTimezone]');
$tzUser = $user->getTimezone(); $tzUser = $user->getTimezone();
// If user timezone is valid. // If user timezone is valid.
e107::getDebug()->logTime('[init_session: systemTimeZoneIsValid]');
if (varset($tzUser, false) && systemTimeZoneIsValid($tzUser)) if (varset($tzUser, false) && systemTimeZoneIsValid($tzUser))
{ {
// Sets the default timezone used by all date/time functions. // Sets the default timezone used by all date/time functions.
@@ -1555,10 +1558,12 @@ function init_session()
unset($tz); unset($tz);
} }
e107::getDebug()->log("Timezone: ".USERTIMEZONE); // remove later on. e107::getDebug()->log("Timezone: ".USERTIMEZONE); // remove later on.
e107::getDebug()->logTime('[init_session: getIP]');
define('USERIP', e107::getIPHandler()->getIP()); define('USERIP', e107::getIPHandler()->getIP());
e107::getDebug()->logTime('[init_session: getToken]');
define('POST_REFERER', md5($user->getToken())); define('POST_REFERER', md5($user->getToken()));
// Check for intruders - outside the model for now // Check for intruders - outside the model for now
@@ -1589,6 +1594,7 @@ e107::getDebug()->log("Timezone: ".USERTIMEZONE); // remove later on.
return; return;
} }
e107::getDebug()->logTime('[init_session: hasBan]');
if ($user->hasBan()) if ($user->hasBan())
{ {
$msg = e107::findPref('ban_messages/6'); $msg = e107::findPref('ban_messages/6');
@@ -1596,6 +1602,7 @@ e107::getDebug()->log("Timezone: ".USERTIMEZONE); // remove later on.
exit; exit;
} }
e107::getDebug()->logTime('[init_session: Constants]');
define('ADMIN', $user->isAdmin()); define('ADMIN', $user->isAdmin());
define('ADMINID', $user->getAdminId()); define('ADMINID', $user->getAdminId());
define('ADMINNAME', $user->getAdminName()); define('ADMINNAME', $user->getAdminName());
@@ -1603,6 +1610,7 @@ e107::getDebug()->log("Timezone: ".USERTIMEZONE); // remove later on.
define('ADMINEMAIL', $user->getAdminEmail()); define('ADMINEMAIL', $user->getAdminEmail());
define('ADMINPWCHANGE', $user->getAdminPwchange()); define('ADMINPWCHANGE', $user->getAdminPwchange());
e107::getDebug()->logTime('[init_session: isUser]');
if (!$user->isUser()) if (!$user->isUser())
{ {
define('USER', false); define('USER', false);
@@ -1698,6 +1706,7 @@ e107::getDebug()->log("Timezone: ".USERTIMEZONE); // remove later on.
$user_pref = $user->getPref(); $user_pref = $user->getPref();
} }
e107::getDebug()->logTime('[init_session: getClassList]');
define('USERCLASS_LIST', $user->getClassList(true)); define('USERCLASS_LIST', $user->getClassList(true));
define('e_CLASS_REGEXP', $user->getClassRegex()); define('e_CLASS_REGEXP', $user->getClassRegex());
define('e_NOBODY_REGEXP', '(^|,)'.e_UC_NOBODY.'(,|$)'); define('e_NOBODY_REGEXP', '(^|,)'.e_UC_NOBODY.'(,|$)');

2
e107_handlers/e_db_pdo_class.php
View File

@@ -222,7 +222,7 @@ class e_db_pdo implements e_db
try try
{ {
$this->mySQLaccess->query("use `".$database."`"); $this->mySQLaccess->exec("use `".$database."`");
// $this->mySQLaccess->select_db($database); $dbh->query("use newdatabase"); // $this->mySQLaccess->select_db($database); $dbh->query("use newdatabase");
} }
catch (PDOException $e) catch (PDOException $e)