Menu
▾
▴
[mxbb-commits] core/modules/mx_coreblocks mx_login.php, 1.16, 1.17 mx_online.php, 1.38, 1.39
|
From: Florin C B. <ory...@us...> - 2014-05-19 18:14:59
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31842 Modified Files: mx_login.php mx_online.php Log Message: some fixes for ascareus backend Index: mx_login.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_login.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** mx_login.php 18 May 2014 06:24:56 -0000 1.16 --- mx_login.php 19 May 2014 18:14:57 -0000 1.17 *************** *** 10,14 **** */ ! if( !defined('IN_PORTAL') || !is_object($mx_block)) { die("Hacking attempt"); --- 10,14 ---- */ ! if(!defined('IN_PORTAL') || !is_object($mx_block)) { die("Hacking attempt"); *************** *** 16,20 **** $template->set_filenames(array( ! 'body_login' => 'mx_login.tpl') ); --- 16,20 ---- $template->set_filenames(array( ! 'body_login' => 'mx_login.html') ); *************** *** 31,45 **** )); - // // Login box? ! // ! if ( !$userdata['session_logged_in'] ) { $template->assign_block_vars('switch_user_logged_out', array()); ! ! // // Allow autologin? ! // ! if (!isset($board_config['allow_autologin']) || $board_config['allow_autologin'] ) { $template->assign_block_vars('switch_allow_autologin', array()); --- 31,41 ---- )); // Login box? ! if (!$userdata['session_logged_in']) { $template->assign_block_vars('switch_user_logged_out', array()); ! // Allow autologin? ! if (!isset($board_config['allow_autologin']) || $board_config['allow_autologin']) { $template->assign_block_vars('switch_allow_autologin', array()); Index: mx_online.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_online.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** mx_online.php 18 May 2014 06:24:56 -0000 1.38 --- mx_online.php 19 May 2014 18:14:57 -0000 1.39 *************** *** 34,38 **** $l_online_users = ''; ! //if (defined('SHOW_ONLINE')) { switch (PORTAL_BACKEND) --- 34,38 ---- $l_online_users = ''; ! if (defined('SHOW_ONLINE')) { switch (PORTAL_BACKEND) *************** *** 42,62 **** FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s WHERE u.user_id = s.session_user_id ! AND s.session_time >= ".( time() - 300 ) . " ORDER BY u.username ASC, s.session_ip ASC"; ! break; case 'phpbb2': $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_ip FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s WHERE u.user_id = s.session_user_id ! AND s.session_time >= ".( time() - 300 ) . " ORDER BY u.username ASC, s.session_ip ASC"; ! break; case 'phpbb3': $sql = "SELECT u.user_id, u.username, u.user_regdate, u.user_birthday, 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 ! AND s.session_time >= ".( time() - 300 ) . " ORDER BY u.username ASC, s.session_ip ASC"; ! break; } --- 42,72 ---- FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s WHERE u.user_id = s.session_user_id ! AND s.session_time >= ".(time() - 300) . " ORDER BY u.username ASC, s.session_ip ASC"; ! break; ! case 'smf2': ! //To do: ! /** a query or we can use a session method ! $sql = "SELECT u.id_member as u.user_id, u.member_name as u.username, u.id_group as u.user_level, s.session_id, s.data, ! FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s ! WHERE u.id_member > -1 ! AND s.last_update >= ".(time() - 300) . " ! ORDER BY u.member_name ASC, s.session_id ASC"; ! **/ ! break; case 'phpbb2': $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_ip FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s WHERE u.user_id = s.session_user_id ! AND s.session_time >= ".(time() - 300) . " ORDER BY u.username ASC, s.session_ip ASC"; ! break; case 'phpbb3': $sql = "SELECT u.user_id, u.username, u.user_regdate, u.user_birthday, 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 ! AND s.session_time >= ".(time() - 300) . " ORDER BY u.username ASC, s.session_ip ASC"; ! break; } *************** *** 72,76 **** $prev_user_ip = $prev_session_ip = ''; ! while( $row = $db->sql_fetchrow($result) ) { // User is logged in and therefor not a guest --- 82,86 ---- $prev_user_ip = $prev_session_ip = ''; ! while($row = $db->sql_fetchrow($result)) { // User is logged in and therefor not a guest *************** *** 81,112 **** { $style_color = ''; ! switch (PORTAL_BACKEND) { case 'internal': case 'phpbb2': ! ! 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'] . '"'; ! } ! break; ! case 'phpbb3': $style_color = ($row['user_colour']) ? ' style="color:#' . $row['user_colour'] . '" class="username-coloured"' : ''; - break; } ! switch (PORTAL_BACKEND) { case 'internal': $user_online_link = '<a href="' . PORTAL_URL . '"' . $style_color .'><i>' . $row['username'] . '</i></a>'; $logged_hidden_online++; --- 91,123 ---- { $style_color = ''; ! //switch only supported phpBB backends here switch (PORTAL_BACKEND) { case 'internal': + case 'smf2': case 'phpbb2': ! 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'] . '"'; ! } break; ! case 'phpbb3': + case 'olympus': + case 'ascraeus': $style_color = ($row['user_colour']) ? ' style="color:#' . $row['user_colour'] . '" class="username-coloured"' : ''; break; } ! switch (PORTAL_BACKEND) { case 'internal': + case 'smf2': $user_online_link = '<a href="' . PORTAL_URL . '"' . $style_color .'><i>' . $row['username'] . '</i></a>'; $logged_hidden_online++; *************** *** 116,121 **** $logged_hidden_online++; break; ! case 'phpbb3': if ($row['user_allow_viewonline']) { --- 127,134 ---- $logged_hidden_online++; break; ! case 'phpbb3': + case 'olympus': + case 'ascraeus': if ($row['user_allow_viewonline']) { *************** *** 130,134 **** break; } ! if ( $row['user_allow_viewonline'] || $mx_user->data['user_level'] == ADMIN ) { --- 143,147 ---- break; } ! if ( $row['user_allow_viewonline'] || $mx_user->data['user_level'] == ADMIN ) { *************** *** 146,150 **** } } - $prev_session_ip = $row['session_ip']; } --- 159,162 ---- *************** *** 155,166 **** $online_userlist = $lang['None']; } ! $online_userlist = ( ( isset($forum_id) ) ? $lang['Browsing_forum'] : $lang['Registered_users'] ) . ' ' . $online_userlist; ! $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online; ! if ( $total_online_users > $board_config['record_online_users']) { $board_config['record_online_users'] = $total_online_users; $board_config['record_online_date'] = time(); switch (PORTAL_BACKEND) { --- 167,179 ---- $online_userlist = $lang['None']; } ! ! $online_userlist = ((isset($forum_id)) ? $lang['Browsing_forum'] : $lang['Registered_users']) . ' ' . $online_userlist; $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online; ! if ($total_online_users > $board_config['record_online_users']) { $board_config['record_online_users'] = $total_online_users; $board_config['record_online_date'] = time(); + switch (PORTAL_BACKEND) { *************** *** 170,199 **** record_online_date = '" . $board_config['record_online_date'] . "' WHERE portal_id = 1"; ! ! if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not update online user record (nr of users)', '', __LINE__, __FILE__, $sql); } ! $portal_config['record_online_users'] = $total_online_users; $portal_config['record_online_date'] = $board_config['record_online_date']; ! $mx_cache->put( 'mxbb_config', $portal_config ); ! break; case 'phpbb2': case 'phpbb3': $sql = "UPDATE " . CONFIG_TABLE . " SET config_value = '$total_online_users' ! WHERE config_name = 'record_online_users'"; ! ! if ( !$db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, 'Could not update online user record (nr of users)', '', __LINE__, __FILE__, $sql); } ! $sql = "UPDATE " . CONFIG_TABLE . " SET config_value = '" . $board_config['record_online_date'] . "' WHERE config_name = 'record_online_date'"; ! ! if ( !$db->sql_query($sql,300) ) { mx_message_die(GENERAL_ERROR, 'Could not update online user record (date)', '', __LINE__, __FILE__, $sql); --- 183,211 ---- record_online_date = '" . $board_config['record_online_date'] . "' WHERE portal_id = 1"; ! if (!$db->sql_query($sql)) { mx_message_die(GENERAL_ERROR, 'Could not update online user record (nr of users)', '', __LINE__, __FILE__, $sql); } ! $portal_config['record_online_users'] = $total_online_users; $portal_config['record_online_date'] = $board_config['record_online_date']; ! $mx_cache->put('mxbb_config', $portal_config); ! break; ! case 'phpbb2': case 'phpbb3': $sql = "UPDATE " . CONFIG_TABLE . " SET config_value = '$total_online_users' ! WHERE config_name = 'record_online_users'"; ! if (!$db->sql_query($sql)) { mx_message_die(GENERAL_ERROR, 'Could not update online user record (nr of users)', '', __LINE__, __FILE__, $sql); } ! $sql = "UPDATE " . CONFIG_TABLE . " SET config_value = '" . $board_config['record_online_date'] . "' WHERE config_name = 'record_online_date'"; ! ! if (!$db->sql_query($sql, 300)) { mx_message_die(GENERAL_ERROR, 'Could not update online user record (date)', '', __LINE__, __FILE__, $sql); *************** *** 201,206 **** $board_config['record_online_users'] = $total_online_users; $board_config['record_online_date'] = $board_config['record_online_date']; ! $mx_cache->put( 'phpbb_config', $board_config ); ! break; } } --- 213,218 ---- $board_config['record_online_users'] = $total_online_users; $board_config['record_online_date'] = $board_config['record_online_date']; ! $mx_cache->put('phpbb_config', $board_config); ! break; } } *************** *** 282,287 **** $newest_uid = $newest_userdata['user_id']; break; ! case 'phpbb3': $newest_username = $board_config['newest_username']; $newest_uid = $board_config['newest_user_id']; --- 294,306 ---- $newest_uid = $newest_userdata['user_id']; break; ! ! case 'smf2': ! $newest_username = $board_config['latestRealName']; ! $newest_uid = $board_config['latestMember']; ! break; ! case 'phpbb3': + case 'olympus': + case 'ascraeus': $newest_username = $board_config['newest_username']; $newest_uid = $board_config['newest_user_id']; *************** *** 294,303 **** case 'internal': case 'phpbb2': ! if ( $newest_userdata['user_level'] == ADMIN ) { $newest_color = $theme['fontcolor3']; $newest_username = '<b>' . $newest_username . '</b>'; } ! else if ( $newest_userdata['user_level'] == MOD ) { $newest_color = $theme['fontcolor2']; --- 313,322 ---- case 'internal': case 'phpbb2': ! if ($newest_userdata['user_level'] == ADMIN) { $newest_color = $theme['fontcolor3']; $newest_username = '<b>' . $newest_username . '</b>'; } ! else if ($newest_userdata['user_level'] == MOD) { $newest_color = $theme['fontcolor2']; *************** *** 308,313 **** --- 327,342 ---- $newest_user = "The newest registered user is " . $mx_backend->get_username_string('full', $newest_uid, $newest_username, $newest_color); break; + + case 'smf2': + $newest_color = $theme['fontcolor3']; + $newest_username = '<b>' . $newest_username . '</b>'; + $newest_style_color = 'style="color:#' . $newest_color . '"'; + //This is not used in internal mode template, but here only added + $newest_user = sprintf("tr()The newest registered user is ", $mx_backend->get_username_string('full', $newest_uid, $newest_username, $newest_color)); + break; case 'phpbb3': + case 'olympus': + case 'ascraeus': $newest_color = $board_config['newest_user_colour']; $newest_style_color = ($newest_color) ? ' style="color:#' . $newest_color . '" class="username-coloured"' : ''; *************** *** 346,350 **** case 'internal': case 'phpbb2': ! break; --- 375,379 ---- case 'internal': case 'phpbb2': ! case 'smf2': break; *************** *** 382,389 **** --- 411,421 ---- case 'internal': case 'phpbb2': + case 'smf2': $legend .= (($legend != '') ? ', ' : '') . '[' . sprintf($lang['Admin_online_color'], '<span style="color:#' . $theme['fontcolor3'] . '">', '</span>') . '] [' . sprintf($lang['Mod_online_color'], '<span style="color:#' . $theme['fontcolor2'] . '">', '</span>') . ']'; break; case 'phpbb3': + case 'olympus': + case 'ascraeus': while ($row = $db->sql_fetchrow($result)) { *************** *** 410,416 **** --- 442,451 ---- case 'internal': case 'phpbb2': + case 'smf2': break; case 'phpbb3': + case 'olympus': + case 'ascraeus': if ($board_config['load_birthdays'] && $board_config['allow_birthdays']) { *************** *** 421,429 **** AND user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')'; $result = $db->sql_query($sql); ! while ($row = $db->sql_fetchrow($result)) { $birthday_list .= (($birthday_list != '') ? ', ' : '') . $mx_backend->get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']); - if ($age = (int) substr($row['user_birthday'], -4)) { --- 456,463 ---- AND user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')'; $result = $db->sql_query($sql); ! while ($row = $db->sql_fetchrow($result)) { $birthday_list .= (($birthday_list != '') ? ', ' : '') . $mx_backend->get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']); if ($age = (int) substr($row['user_birthday'], -4)) { *************** *** 481,489 **** { case 'internal': ! ! break; default: $template->assign_block_vars("switch_phpbb", array()); - } --- 515,524 ---- { case 'internal': ! case 'smf2': ! ! break; ! default: $template->assign_block_vars("switch_phpbb", array()); } |
