Changeset 158

User picture

Author: Mighty Gorgon

(2009/12/28 17:51) About 2 years ago

Bug fixes:
* Wrong online counter in viewforum
* Wrong lang declaration in CMS Menu
* Altered format of viewonline_body.tpl

Affected files

Updated ip/trunk/cms_menu.php Download diff

157158
1069
		$result = $db->sql_query($sql);
1069
		$result = $db->sql_query($sql);
1070
1070



1071
		$template_to_parse = CMS_TPL . 'cms_menu_list_body.tpl';
1071
		$template_to_parse = CMS_TPL . 'cms_menu_list_body.tpl';



1072
		$template->assign_var('CMS_PAGE_TITLE', $lang['CMS_Menu_Page']);
1072
		$template->assign_var('CMS_PAGE_TITLE', $lang['CMS_MENU_PAGE']);



1073
1073



1074
		$menu_item = array();
1074
		$menu_item = array();



1075
		while ($menu_item = $db->sql_fetchrow($result))
1075
		while ($menu_item = $db->sql_fetchrow($result))





          

  Updated
ip/trunk/includes/users_online_block.php  Download diff




      
      
157158
56
56



57
$any_char = chr(0) . '%';
57
$any_char = chr(0) . '%';



58
$one_char = chr(0) . '_';
58
$one_char = chr(0) . '_';



59
if (!empty($topic_id))
59
if (!empty($topic_id) && !defined('IN_VIEWFORUM'))



60
{
60
{



61
	$user_forum_sql = ' AND s.session_page ' . $db->sql_like_expression("{$any_char}_t_={$topic_id}x{$any_char}");
61
	$user_forum_sql = ' AND s.session_page ' . $db->sql_like_expression("{$any_char}_t_={$topic_id}x{$any_char}");



62
}
62
}


...
...
82
$tmp_bots_array = array();
82
$tmp_bots_array = array();



83
83



84
$prev_user_id = 0;
84
$prev_user_id = 0;



85
$prev_user_ip = $prev_session_ip = '';
85
$prev_user_ip = '';



86
$prev_session_ip = '';



86
while($row = $db->sql_fetchrow($result))
87
while($row = $db->sql_fetchrow($result))



87
{
88
{



88
89



89
	// User is logged in and therefor not a guest
90
	// User is logged in and therefore not a guest



90
	if ($row['session_logged_in'])
91
	if ($row['session_logged_in'])



91
	{
92
	{



92
		// Skip multiple sessions for one user
93
		// Skip multiple sessions for one user





          

  Updated
ip/trunk/templates/default/viewforum_body.tpl  Download diff




      
      
157158
16
16



17
<table class="empty-table" width="100%" cellspacing="0" cellpadding="0" border="0">
17
<table class="empty-table" width="100%" cellspacing="0" cellpadding="0" border="0">



18
<tr>
18
<tr>



19
	<td align="left" valign="bottom" width="65%">
19
	<td align="left" valign="bottom" width="60%">



20
		<span class="gensmall">{L_MODERATOR}:&nbsp;{MODERATORS}</span><br /><!-- IF not S_BOT --><span
class="gensmall">{TOTAL_USERS_ONLINE}&nbsp;</span><br /><span
class="gensmall">{LOGGED_IN_USER_LIST}&nbsp;</span><br /><span
class="gensmall">{BOT_LIST}&nbsp;</span><br /><!-- ENDIF -->
20
		<span class="gensmall">{L_MODERATOR}:&nbsp;{MODERATORS}</span><br /><!-- IF not S_BOT --><span
class="gensmall">{TOTAL_USERS_ONLINE}&nbsp;</span><br /><span
class="gensmall">{LOGGED_IN_USER_LIST}&nbsp;</span><br /><span
class="gensmall">{BOT_LIST}&nbsp;</span><br /><!-- ENDIF -->



21
	</td>
21
	</td>



22
	<td align="right" valign="bottom" rowspan="2">
22
	<td align="right" valign="bottom" rowspan="2">





          

  Updated
ip/trunk/templates/default/viewonline_body.tpl  Download diff




      
      
157158
13
</tr>
13
</tr>



14
<!-- BEGIN reg_user_row -->
14
<!-- BEGIN reg_user_row -->



15
<tr>
15
<tr>



16
	<td width="35%" class="row1h" onclick="window.location.href='{reg_user_row.U_USER_PROFILE}'">
16
	<td width="35%" class="{reg_user_row.ROW_CLASS}h" onclick="window.location.href='{reg_user_row.U_USER_PROFILE}'">{reg_user_row.USERNAME}&nbsp;{reg_user_row.USER_OS_IMG}&nbsp;{reg_user_row.USER_BROWSER_IMG}</td>



17
		{reg_user_row.USERNAME}&nbsp;{reg_user_row.USER_OS_IMG}&nbsp;{reg_user_row.USER_BROWSER_IMG}
17
	<td width="25%" nowrap="nowrap" class="{reg_user_row.ROW_CLASS} row-center"><span class="genmed">{reg_user_row.LASTUPDATE}</span></td>



18
	</td>
18
	<td width="40%" class="{reg_user_row.ROW_CLASS}h" onclick="window.location.href='{reg_user_row.U_FORUM_LOCATION}'"><span class="gen"><a href="{reg_user_row.U_FORUM_LOCATION}">{reg_user_row.FORUM_LOCATION}</a></span></td>



19
	<td width="25%" nowrap="nowrap" class="row2 row-center">



20
		<span class="genmed">{reg_user_row.LASTUPDATE}</span>



21
	</td>



22
	<td width="40%" class="row3h" onclick="window.location.href='{reg_user_row.U_FORUM_LOCATION}'">



23
		<span class="gen">



24
			<a href="{reg_user_row.U_FORUM_LOCATION}">{reg_user_row.FORUM_LOCATION}</a>



25
		</span>



26
	</td>



27
</tr>
19
</tr>



28
<!-- BEGIN switch_user_admin_or_mod -->
20
<!-- BEGIN switch_user_admin_or_mod -->



29
<tr>
21
<tr>



30
	<td width="100%" class="{reg_user_row.ROW_CLASS}" colspan="3">
22
	<td width="100%" class="{reg_user_row.ROW_CLASS}" colspan="3"><span class="gensmall">{L_IP}:&nbsp;<a href="{reg_user_row.U_HOSTNAME_LOOKUP}">{reg_user_row.IP}</a>&nbsp;&#187;&nbsp;<a href="{reg_user_row.U_WHOIS}" target="_blank">{L_WHOIS}</a>&nbsp;||&nbsp;{L_BROWSER}:&nbsp;{reg_user_row.USER_AGENT}</span></td>



31
		<span class="genmed">{L_IP}:&nbsp;<a href="{reg_user_row.U_HOSTNAME_LOOKUP}">{reg_user_row.IP}</a>&nbsp;&#187;&nbsp;<a href="{reg_user_row.U_WHOIS}" target="_blank">{L_WHOIS}</a>&nbsp;||&nbsp;{L_BROWSER}:&nbsp;{reg_user_row.USER_AGENT}</span>



32
	</td>



33
</tr>
23
</tr>



34
<!-- END switch_user_admin_or_mod -->
24
<!-- END switch_user_admin_or_mod -->



35
<!-- END reg_user_row -->
25
<!-- END reg_user_row -->


...
...
37
<tr><td class="row1" colspan="3"><span class="gen">{TOTAL_GUEST_USERS_ONLINE}</span></td></tr>
27
<tr><td class="row1" colspan="3"><span class="gen">{TOTAL_GUEST_USERS_ONLINE}</span></td></tr>



38
<!-- BEGIN guest_user_row -->
28
<!-- BEGIN guest_user_row -->



39
<tr>
29
<tr>



40
	<td width="35%" class="row1h"><span class="genmed">{guest_user_row.USERNAME}&nbsp;{guest_user_row.USER_OS_IMG}&nbsp;{guest_user_row.USER_BROWSER_IMG}</span></td>
30
	<td width="35%" class="{guest_user_row.ROW_CLASS}h"><span class="genmed">{guest_user_row.USERNAME}&nbsp;{guest_user_row.USER_OS_IMG}&nbsp;{guest_user_row.USER_BROWSER_IMG}</span></td>



41
	<td width="25%" nowrap="nowrap" class="row2 row-center"><span class="genmed">{guest_user_row.LASTUPDATE}</span></td>
31
	<td width="25%" nowrap="nowrap" class="{guest_user_row.ROW_CLASS} row-center"><span class="genmed">{guest_user_row.LASTUPDATE}</span></td>



42
	<td width="40%" class="row3h" onclick="window.location.href='{guest_user_row.U_FORUM_LOCATION}'">
32
	<td width="40%" class="{guest_user_row.ROW_CLASS}h" onclick="window.location.href='{guest_user_row.U_FORUM_LOCATION}'"><span class="gen"><a href="{guest_user_row.U_FORUM_LOCATION}">{guest_user_row.FORUM_LOCATION}</a></span></td>



43
		<span class="gen"><a href="{guest_user_row.U_FORUM_LOCATION}">{guest_user_row.FORUM_LOCATION}</a></span>



44
	</td>



45
</tr>
33
</tr>



46
<!-- BEGIN switch_user_admin_or_mod -->
34
<!-- BEGIN switch_user_admin_or_mod -->



47
<tr>
35
<tr>



48
	<td width="100%" class="{guest_user_row.ROW_CLASS}" colspan="3">
36
	<td width="100%" class="{guest_user_row.ROW_CLASS}" colspan="3"><span class="gensmall">{L_IP}:&nbsp;<a href="{guest_user_row.U_HOSTNAME_LOOKUP}">{guest_user_row.IP}</a>&nbsp;&#187;&nbsp;<a href="{guest_user_row.U_WHOIS}" target="_blank">{L_WHOIS}</a>&nbsp;||&nbsp;{L_BROWSER}:&nbsp;{guest_user_row.USER_AGENT}</span></td>



49
		<span class="gensmall">{L_IP}:&nbsp;<a href="{guest_user_row.U_HOSTNAME_LOOKUP}">{guest_user_row.IP}</a>&nbsp;&#187;&nbsp;<a href="{guest_user_row.U_WHOIS}" target="_blank">{L_WHOIS}</a>&nbsp;||&nbsp;{L_BROWSER}:&nbsp;{guest_user_row.USER_AGENT}</span>



50
	</td>



51
</tr>
37
</tr>



52
<!-- END switch_user_admin_or_mod -->
38
<!-- END switch_user_admin_or_mod -->



53
<!-- END guest_user_row -->
39
<!-- END guest_user_row -->