mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 03:40:37 +02:00
Code Issues Releases Wiki Activity

Issue #682 and other 'wrong avatar' issues in chatbox, online-menu etc. New $tp->toAvatar() method introduced.

Browse Source
This commit is contained in:
Cameron
2015-02-04 20:36:56 -08:00
parent d3ff0d7333
commit 4572cd7ceb
6 changed files with 82 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_plugins/online/online_menu.php
View File

@@ -25,7 +25,11 @@ include_lan(e_PLUGIN.'online/languages/'.e_LANGUAGE.'.php');
require_once(e_PLUGIN.'online/online_shortcodes.php');
if (is_readable(THEME.'online_menu_template.php'))
if (is_readable(THEME.'templates/online/online_menu_template.php'))
{
require(THEME.'templates/online/online_menu_template.php');
}
elseif (is_readable(THEME.'online_menu_template.php'))
{
require(THEME.'online_menu_template.php');
}

4
e107_plugins/online/online_menu_template.php
View File

@@ -17,7 +17,7 @@
global $sc_style;
//##### LASTSEEN MENU ---------------------------------------------------------
$LASTSEEN_TEMPLATE['start'] = "<ul class='lastseen-menu'>";
$LASTSEEN_TEMPLATE['start'] = "<ul class='lastseen-menu '>";
$LASTSEEN_TEMPLATE['item'] = "<li>{LASTSEEN_USERLINK} <small class='muted'>{LASTSEEN_DATE}</small></li>";
$LASTSEEN_TEMPLATE['end'] = "</ul>";
@@ -32,7 +32,7 @@ $sc_style['ONLINE_MEMBERS']['post'] = "</li>";
$sc_style['ONLINE_MEMBERS_LIST']['pre'] = "<ul>";
$sc_style['ONLINE_MEMBERS_LIST']['post'] = "</ul>";
$sc_style['ONLINE_MEMBERS_LIST_EXTENDED']['pre'] = "<ul class='unstyled'>";
$sc_style['ONLINE_MEMBERS_LIST_EXTENDED']['pre'] = "<ul class='unstyled list-unstyled'>";
$sc_style['ONLINE_MEMBERS_LIST_EXTENDED']['post'] = "</ul>";
$sc_style['ONLINE_ONPAGE']['pre'] = "<li>".LAN_ONLINE_3;

9
e107_plugins/online/online_shortcodes.php
View File

@@ -141,7 +141,14 @@ class online_shortcodes
{
if($parm == 'avatar')
{
return e107::getParser()->parseTemplate("{USER_AVATAR=".$this->currentMember['oimage']."}",true);
$userData = array(
'user_image' => $this->currentMember['oimage'],
'user_name' => $this->currentMember['oname']
);
return e107::getParser()->toAvatar($userData);
// return e107::getParser()->parseTemplate("{USER_AVATAR=".$this->currentMember['oimage']."}",true);
}
return "<img src='".e_IMAGE_ABS."admin_images/users_16.png' alt='' style='vertical-align:middle' />";