mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00
Code Issues Releases Wiki Activity

Issue #2860 - Additional Mark-Time added for 'Online' for reviewing performance.

Browse Source
This commit is contained in:
Cameron 2018-01-13 14:11:46 -08:00
parent da3dfa1a96
commit b50677d50a
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
class2.php
View File

@ -2087,6 +2087,8 @@ if(!isset($_E107['no_online']) && varset($pref['track_online']))
e107::getOnline()->goOnline($pref['track_online'], $pref['flood_protect']);
}
$sql->db_Mark_Time('(After Go online)');
/**
* Set Cookie
* @param string $name
@ -2795,7 +2797,7 @@ class e_http_header
$sql->db_Mark_Time('(After class2)');
function e107_ini_set($var, $value)
@ -2823,3 +2825,4 @@ function plugInstalled($plugname)
return isset($pref['plug_installed'][$plugname]);*/
}
$sql->db_Mark_Time('(After class2)');

17
e107_handlers/online_class.php
View File

@ -141,10 +141,14 @@ class e_online
// don't do anything if main admin logged in as another user
if ($user->isUser() && !$user->getParentId())
{
$sql->db_Mark_Time('Go online (isUser)');
// Find record that matches IP or visitor, or matches user info
$sql->db_Mark_Time('Go online (db select)');
if ($sql->select('online', '*', "(`online_ip` = '{$ip}' AND `online_user_id` = '0') OR `online_user_id` = '{$udata}' LIMIT 1"))
{
$sql->db_Mark_Time('Go online (db fetch)');
$row = $sql->fetch();
$sql->db_Mark_Time('Go online (db end)');
if ($row['online_user_id'] == $udata)
{
@ -230,14 +234,19 @@ class e_online
$query['online_location'] = $page;
}
$sql->db_Mark_Time('Go online (update) Line:'.__LINE__);
$sql->update('online', $query);
$sql->db_Mark_Time('Go online (after update) Line:'.__LINE__);
}
else
{
$sql->db_Mark_Time('Go online (insert) Line: '.__LINE__);
$sql->insert('online',$insert_query);
$sql->db_Mark_Time('Go online (after insert) Line: '.__LINE__);
}
$sql->db_Mark_Time('Go online (after isUser)');
}
// don't do anything if main admin logged in as another user
elseif(!$user->getParentId())
@ -259,7 +268,9 @@ class e_online
// echo "here {$online_pagecount}";
$query="`online_pagecount` = {$row['online_pagecount']}{$update_page} WHERE `online_ip` = '{$ip}' AND `online_user_id` = '0'";
}
$sql->db_Mark_Time('Go online (update) Line:'.__LINE__);
$sql->update('online', $query);
$sql->db_Mark_Time('Go online (after update) Line:'.__LINE__);
}
else
{ // New visitor
@ -301,10 +312,12 @@ class e_online
// Speed up ajax requests
if(!deftrue('e_AJAX_REQUEST'))
{
$sql->db_Mark_Time('Go online (delete) Line:'.__LINE__);
$sql->delete('online', '`online_timestamp` < '.(time() - $online_timeout));
// FIXME - don't use constants below, save data in class vars, call e_online signleton - e107::getOnline()
// $total_online = $sql->db_Count('online'); // 1 less query! :-)
$sql->db_Mark_Time('Go online (total_online) Line:'.__LINE__);
if ($total_online = $sql->gen('SELECT o.*,u.user_image FROM `#online` AS o LEFT JOIN `#user` AS u ON o.online_user_id = u.user_id WHERE o.online_pagecount > 0 ORDER BY o.online_timestamp DESC'))
// if ($total_online = $sql->gen('SELECT o FROM `#online` WHERE o.online_pagecount > 0 ORDER BY o.online_timestamp DESC'))
{
@ -312,6 +325,7 @@ class e_online
$members_online = 0;
$listuserson = array();
$sql->db_Mark_Time('Go online (db fetch) Line:'.__LINE__);
while ($row = $sql->fetch())
{
@ -359,6 +373,7 @@ class e_online
define('TOTAL_ONLINE', $total_online);
define('MEMBERS_ONLINE', $members_online);
define('GUESTS_ONLINE', $total_online - $members_online);
$sql->db_Mark_Time('Go online (db count) Line:'.__LINE__);
define('ON_PAGE', $sql->db_Count('online', '(*)', "WHERE `online_location` = '{$page}' "));
define('MEMBER_LIST', $member_list);