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

$online_shortcodes now loaded correctly using e107::getScBatch(). (Could break old plugins)

Browse Source
This commit is contained in:
Cameron
2021-01-08 13:47:54 -08:00
parent eec9a163cb
commit 0fabc9aa9c
4 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
e107_plugins/online/lastseen_menu.php
View File

@@ -14,32 +14,26 @@
* $Author$
*/
if (!defined('e107_INIT')) { exit; }
e107::includeLan(e_PLUGIN.'online/languages/'.e_LANGUAGE.'.php');
if(class_exists('online_shortcodes'))
if(!defined('e107_INIT'))
{
$online_shortcodes = new online_shortcodes;
}
else
{
require_once(e_PLUGIN.'online/online_shortcodes.php');
exit;
}
$online_shortcodes = e107::getScBatch('online', true);
if(THEME_LEGACY !== true)
{
$LASTSEEN_TEMPLATE = e107::getTemplate('online','online_menu', 'lastseen'); // $ONLINE_MENU_TEMPLATE['lastseen'];
$LASTSEEN_TEMPLATE = e107::getTemplate('online', 'online_menu', 'lastseen'); // $ONLINE_MENU_TEMPLATE['lastseen'];
}
else
{
if (is_readable(THEME.'online_menu_template.php'))
if(is_readable(THEME . 'online_menu_template.php'))
{
require(THEME.'online_menu_template.php');
require(THEME . 'online_menu_template.php');
}
else
{
require(e_PLUGIN.'online/templates/online_menu_template.php');
require(e_PLUGIN . 'online/templates/online_menu_template.php');
$LASTSEEN_TEMPLATE = $ONLINE_MENU_TEMPLATE['lastseen'];
}
@@ -48,21 +42,23 @@ else
$menu_pref = e107::getConfig('menu')->getPref();
$tp = e107::getParser();
$num = intval(vartrue($menu_pref['online_ls_amount'],10));
$num = intval(vartrue($menu_pref['online_ls_amount'], 10));
$sql->select('user', 'user_id, user_name, user_currentvisit', 'ORDER BY user_currentvisit DESC LIMIT 0,'.$num, 'nowhere');
$lslist = $sql -> db_getList();
$sql->select('user', 'user_id, user_name, user_currentvisit', 'ORDER BY user_currentvisit DESC LIMIT 0,' . $num, 'nowhere');
$lslist = $sql->db_getList();
$text = $tp->parseTemplate($LASTSEEN_TEMPLATE['start'], true);
$text = $tp -> parseTemplate($LASTSEEN_TEMPLATE['start'], true);
foreach($lslist as $row)
{
// setScVar('online_shortcodes', 'currentUser', $row);
// $online_shortcodes->setScVar('currentUser', $row);
$online_shortcodes->currentUser = $row;
$text .= $tp -> parseTemplate($LASTSEEN_TEMPLATE['item'],true, $online_shortcodes);
$text .= $tp->parseTemplate($LASTSEEN_TEMPLATE['item'], true, $online_shortcodes);
}
$text .= $tp -> parseTemplate($LASTSEEN_TEMPLATE['end'], true, $online_shortcodes);
$caption = vartrue($menu_pref['online_ls_caption'],LAN_LASTSEEN_1);
$text .= $tp->parseTemplate($LASTSEEN_TEMPLATE['end'], true, $online_shortcodes);
$caption = vartrue($menu_pref['online_ls_caption'], LAN_LASTSEEN_1);
e107::getRender()->tablerender($caption, $text, 'lastseen');