[mxbb-commits] core/modules/mx_coreblocks mx_online.php,1.22,1.23

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_coreblocks
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19755

Modified Files:
	mx_online.php 
Log Message:
phpBB3 backend mx_online colors

Index: mx_online.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_online.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** mx_online.php	17 Dec 2007 06:56:24 -0000	1.22
--- mx_online.php	9 Jan 2008 01:49:27 -0000	1.23
***************
*** 48,52 ****
  			break;
  		case 'phpbb3':
! 			$sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_type, s.session_autologin, s.session_ip
  				FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
  				WHERE u.user_id = s.session_user_id
--- 48,52 ----
  			break;
  		case 'phpbb3':
! 			$sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_type, u.user_colour, s.session_autologin, s.session_ip
  				FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
  				WHERE u.user_id = s.session_user_id
***************
*** 76,90 ****
  			{
  				$style_color = '';
! 				if ( $row['user_level'] == ADMIN )
  				{
! 					$row['username'] = '<b>' . $row['username'] . '</b>';
! 					$style_color = 'style="color:#' . $theme['fontcolor3'] . '"';
  				}
! 				else if ( $row['user_level'] == MOD )
  				{
! 					$row['username'] = '<b>' . $row['username'] . '</b>';
! 					$style_color = 'style="color:#' . $theme['fontcolor2'] . '"';
  				}
- 
  				if ( $row['user_allow_viewonline'] || PORTAL_BACKEND == 'internal')
  				{
--- 76,96 ----
  			{
  				$style_color = '';
! 				if (PORTAL_BACKEND == 'phpbb3')
  				{
! 					$style_color = ($row['user_colour']) ? ' style="color:#' . $row['user_colour'] . '" class="username-coloured"' : '';
  				}
! 				else
  				{
! 					if ( $row['user_level'] == ADMIN )
! 					{
! 						$row['username'] = '<b>' . $row['username'] . '</b>';
! 						$style_color = 'style="color:#' . $theme['fontcolor3'] . '"';
! 					}
! 					else if ( $row['user_level'] == MOD )
! 					{
! 						$row['username'] = '<b>' . $row['username'] . '</b>';
! 						$style_color = 'style="color:#' . $theme['fontcolor2'] . '"';
! 					}
  				}
  				if ( $row['user_allow_viewonline'] || PORTAL_BACKEND == 'internal')
  				{
***************
*** 92,101 ****
  					$logged_visible_online++;
  				}
! 				else
  				{
  					$user_online_link = '<a href="' . mx_append_sid(PHPBB_URL."profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']) . '"' . $style_color .'><i>' . $row['username'] . '</i></a>';
  					$logged_hidden_online++;
  				}
! 
  				if ( $row['user_allow_viewonline'] || $mx_user->data['user_level'] == ADMIN )
  				{
--- 98,111 ----
  					$logged_visible_online++;
  				}
! 				else if (PORTAL_BACKEND == 'internal')
  				{
  					$user_online_link = '<a href="' . mx_append_sid(PHPBB_URL."profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']) . '"' . $style_color .'><i>' . $row['username'] . '</i></a>';
  					$logged_hidden_online++;
  				}
! 				else if (PORTAL_BACKEND == 'phpbb3')
! 				{
! 					$user_online_link = ($row['user_type'] != USER_IGNORE) ? mx_get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']) : '<span' . $style_color . '>' . $row['username'] . '</span>';
! 					$logged_hidden_online++;
! 				}
  				if ( $row['user_allow_viewonline'] || $mx_user->data['user_level'] == ADMIN )
  				{