Menu
▾
▴
[mxbb-commits] core/modules/mx_coreblocks mx_blockcp.php, 1.17, 1.18 mx_language.php, 1.18, 1.19 mx_login.php, 1.13, 1.14 mx_online.php, 1.18, 1.19 mx_search.php, 1.20, 1.21 mx_site_log.php, 1.15, 1.16 mx_theme.php, 1.18, 1.19
Update of /cvsroot/mxbb/core/modules/mx_coreblocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9427/mx_coreblocks Modified Files: mx_blockcp.php mx_language.php mx_login.php mx_online.php mx_search.php mx_site_log.php mx_theme.php Log Message: Ok, massive update for 2.9.x. Index: mx_online.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_online.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** mx_online.php 5 May 2007 20:13:38 -0000 1.18 --- mx_online.php 9 Sep 2007 16:49:36 -0000 1.19 *************** *** 31,39 **** //if (defined('SHOW_ONLINE')) { ! $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"; if( !($result = $db->sql_query($sql)) ) { --- 31,59 ---- //if (defined('SHOW_ONLINE')) { ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! $sql = "SELECT u.username, u.user_id, 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 '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.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 ! AND s.session_time >= ".( time() - 300 ) . " ! ORDER BY u.username ASC, s.session_ip ASC"; ! break; ! } ! if( !($result = $db->sql_query($sql)) ) { *************** *** 50,54 **** { // User is logged in and therefor not a guest ! if ( $row['session_logged_in'] ) { // Skip multiple sessions for one user --- 70,74 ---- { // User is logged in and therefor not a guest ! if ( ($row['session_logged_in'] && PORTAL_BACKEND != 'phpbb3' || ( $row['user_id'] != 1 && PORTAL_BACKEND == 'phpbb3' ) ) ) { // Skip multiple sessions for one user *************** *** 67,82 **** } ! if ( $row['user_allow_viewonline'] ) { ! $user_online_link = '<a href="' . append_sid(PHPBB_URL."profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . '"' . $style_color .'>' . $row['username'] . '</a>'; $logged_visible_online++; } else { ! $user_online_link = '<a href="' . append_sid(PHPBB_URL."profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . '"' . $style_color .'><i>' . $row['username'] . '</i></a>'; $logged_hidden_online++; } ! if ( $row['user_allow_viewonline'] || $userdata['user_level'] == ADMIN ) { $online_userlist .= ( $online_userlist != '' ) ? ', ' . $user_online_link : $user_online_link; --- 87,102 ---- } ! if ( $row['user_allow_viewonline'] || PORTAL_BACKEND == 'internal') { ! $user_online_link = '<a href="' . mx_append_sid(PHPBB_URL."profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . '"' . $style_color .'>' . $row['username'] . '</a>'; $logged_visible_online++; } else { ! $user_online_link = '<a href="' . mx_append_sid(PHPBB_URL."profile.$phpEx?mode=viewprofile&" . 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 ) { $online_userlist .= ( $online_userlist != '' ) ? ', ' . $user_online_link : $user_online_link; *************** *** 195,201 **** // removing them // ! $total_posts = mx_get_db_stat('postcount'); ! $total_users = mx_get_db_stat('usercount'); ! $newest_userdata = mx_get_db_stat('newestuser'); $newest_user = $newest_userdata['username']; $newest_uid = $newest_userdata['user_id']; --- 215,221 ---- // removing them // ! $total_posts = phpBB2::get_db_stat('postcount'); ! $total_users = phpBB2::get_db_stat('usercount'); ! $newest_userdata = phpBB2::get_db_stat('newestuser'); $newest_user = $newest_userdata['username']; $newest_uid = $newest_userdata['user_id']; *************** *** 246,250 **** 'TOTAL_USERS_ONLINE' => $l_online_users, 'LOGGED_IN_USER_LIST' => $online_userlist, ! 'RECORD_USERS' => sprintf($lang['Record_online_users'], $board_config['record_online_users'], create_date($board_config['default_dateformat'], $board_config['record_online_date'], $board_config['board_timezone'])), 'L_WHO_IS_ONLINE' => $lang['Who_is_Online'], --- 266,270 ---- 'TOTAL_USERS_ONLINE' => $l_online_users, 'LOGGED_IN_USER_LIST' => $online_userlist, ! 'RECORD_USERS' => sprintf($lang['Record_online_users'], $board_config['record_online_users'], phpBB2::create_date($board_config['default_dateformat'], $board_config['record_online_date'], $board_config['board_timezone'])), 'L_WHO_IS_ONLINE' => $lang['Who_is_Online'], *************** *** 254,258 **** 'ONLINE_IMG' => $images['mx_who_is_online'], ! 'U_VIEWONLINE' => append_sid(PHPBB_URL.'viewonline.'.$phpEx), // --- 274,278 ---- 'ONLINE_IMG' => $images['mx_who_is_online'], ! 'U_VIEWONLINE' => mx_append_sid(PHPBB_URL.'viewonline.'.$phpEx), // *************** *** 261,265 **** 'TOTAL_POSTS' => sprintf($l_total_post_s, $total_posts), 'TOTAL_USERS' => sprintf($l_total_user_s, $total_users), ! 'NEWEST_USER' => sprintf($lang['Newest_user'], '<a href="' . append_sid(PHPBB_URL."profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . '">', $newest_user, '</a>'), )); --- 281,285 ---- 'TOTAL_POSTS' => sprintf($l_total_post_s, $total_posts), 'TOTAL_USERS' => sprintf($l_total_user_s, $total_users), ! 'NEWEST_USER' => sprintf($lang['Newest_user'], '<a href="' . mx_append_sid(PHPBB_URL."profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . '">', $newest_user, '</a>'), )); Index: mx_login.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_login.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** mx_login.php 5 May 2007 20:13:38 -0000 1.13 --- mx_login.php 9 Sep 2007 16:49:36 -0000 1.14 *************** *** 21,25 **** $template->assign_vars(array( 'BLOCK_SIZE' => $block_size, ! 'S_LOGIN_ACTION' => append_sid(PORTAL_URL . "login.$phpEx"), 'L_USERNAME' => $lang['Username'], 'L_PASSWORD' => $lang['Password'], --- 21,25 ---- $template->assign_vars(array( 'BLOCK_SIZE' => $block_size, ! 'S_LOGIN_ACTION' => mx_append_sid(PORTAL_URL . "login.$phpEx"), 'L_USERNAME' => $lang['Username'], 'L_PASSWORD' => $lang['Password'], Index: mx_language.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_language.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** mx_language.php 5 May 2007 20:13:38 -0000 1.18 --- mx_language.php 9 Sep 2007 16:49:36 -0000 1.19 *************** *** 67,71 **** $template->assign_vars(array( ! 'ACTION_URL' => append_sid(PORTAL_URL . "index.$phpEx?page=$page_id"), 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), 'L_SELECT_LANG' => $lang['Board_lang'], --- 67,71 ---- $template->assign_vars(array( ! 'ACTION_URL' => mx_append_sid(PORTAL_URL . "index.$phpEx?page=$page_id"), 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), 'L_SELECT_LANG' => $lang['Board_lang'], Index: mx_site_log.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_site_log.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mx_site_log.php 22 Jul 2007 21:00:53 -0000 1.15 --- mx_site_log.php 9 Sep 2007 16:49:36 -0000 1.16 *************** *** 43,48 **** $start_next = $log_start + $log_numberOfEvents; ! $url_next = append_sid( mx_this_url( 'log_start=' . $start_next ) ); ! $url_prev = append_sid( mx_this_url( 'log_start=' . $start_prev ) ); $log_today = date('mdY'); --- 43,48 ---- $start_next = $log_start + $log_numberOfEvents; ! $url_next = mx_append_sid( mx_this_url( 'log_start=' . $start_next ) ); ! $url_prev = mx_append_sid( mx_this_url( 'log_start=' . $start_prev ) ); $log_today = date('mdY'); *************** *** 230,234 **** $page_desc = $page_ids[$search_block_id]['page_desc']; ! $temp_url = !empty($dynamic_block_id) ? append_sid( PORTAL_URL . 'index.php?page=' . $pageid . '&dynamic_block=' . $dynamic_block_id ) : append_sid( PORTAL_URL . 'index.php?page=' . $pageid ); if (empty($editor_name_tmp[$searchdata['block_editor_id']])) --- 230,234 ---- $page_desc = $page_ids[$search_block_id]['page_desc']; ! $temp_url = !empty($dynamic_block_id) ? mx_append_sid( PORTAL_URL . 'index.php?page=' . $pageid . '&dynamic_block=' . $dynamic_block_id ) : mx_append_sid( PORTAL_URL . 'index.php?page=' . $pageid ); if (empty($editor_name_tmp[$searchdata['block_editor_id']])) *************** *** 238,244 **** } ! $edit_time = !empty($searchdata['block_time']) ? create_date( $board_config['default_dateformat'], $searchdata['block_time'], $board_config['board_timezone'] ) : ''; ! $block_editor = '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $searchdata['block_editor_id']) . '" class="name">'; $block_editor .= $editor_name; $block_editor .= '</a>'; --- 238,244 ---- } ! $edit_time = !empty($searchdata['block_time']) ? phpBB2::create_date($board_config['default_dateformat'], $searchdata['block_time'], $board_config['board_timezone'] ) : ''; ! $block_editor = '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $searchdata['block_editor_id']) . '" class="name">'; $block_editor .= $editor_name; $block_editor .= '</a>'; Index: mx_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_blockcp.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** mx_blockcp.php 5 May 2007 20:13:37 -0000 1.17 --- mx_blockcp.php 9 Sep 2007 16:49:36 -0000 1.18 *************** *** 30,33 **** --- 30,34 ---- // Read language definition // ********************************************************************** + // // phpBB // *************** *** 40,44 **** --- 41,48 ---- include($phpbb_root_path . 'language/lang_english/lang_admin.' . $phpEx); } + + // // mxBB + // if( file_exists($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx) ) { *************** *** 58,63 **** // Initialize template // ! //$blockcptemplate = new mx_Template( $template->root, $board_config, $db ); ! $blockcptemplate = new mx_Template( $mx_root_path . 'templates/'. $theme['template_name'], $board_config, $db ); // --- 62,66 ---- // Initialize template // ! $blockcptemplate = new mx_Template( $mx_root_path . 'templates/'. $theme['template_name'] ); // *************** *** 99,103 **** { $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: '; ! header($header_location . append_sid(PORTAL_URL . "index.$phpEx?page=" . $portalpage, true)); exit; } --- 102,106 ---- { $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: '; ! header($header_location . mx_append_sid(PORTAL_URL . "index.$phpEx?page=" . $portalpage, true)); exit; } *************** *** 185,189 **** $has_dyn_block_id = $dynamic_block_id > 0 ? '&dynamic_block='.$dynamic_block_id : ''; ! $message = $lang['BlockCP_Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_blockCP_admin'], '<a href="' . append_sid( PORTAL_URL ."modules/mx_coreblocks/mx_blockcp.$phpEx?block_id=$block_id&module_id=$module_id&function_id=$function_id&portalpage=$portalpage$has_dyn_block_id&sid=$sid") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_portalpage_admin'], '<a href="' . append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage$has_dyn_block_id") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); --- 188,192 ---- $has_dyn_block_id = $dynamic_block_id > 0 ? '&dynamic_block='.$dynamic_block_id : ''; ! $message = $lang['BlockCP_Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_blockCP_admin'], '<a href="' . mx_append_sid( PORTAL_URL ."modules/mx_coreblocks/mx_blockcp.$phpEx?block_id=$block_id&module_id=$module_id&function_id=$function_id&portalpage=$portalpage$has_dyn_block_id&sid=$sid") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_portalpage_admin'], '<a href="' . mx_append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage$has_dyn_block_id") . '">', '</a>'); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 200,204 **** --- 203,209 ---- // Read language definition // ********************************************************************** + // // Module specific + // if( file_exists($mx_root_path . $mx_blockcp->module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx) ) { *************** *** 213,218 **** // Load Dynamic Block Navigation // ! $mx_dynamic_select = new mx_dynamic_select(); ! $mx_dynamic_select->generate($block_id); // --- 218,227 ---- // Load Dynamic Block Navigation // ! if ($is_admin) ! { ! $mx_dynamic_select = new mx_dynamic_select(); ! $mx_dynamic_select->generate($block_id); ! $blockcptemplate->assign_block_vars('dynamic_select', array()); ! } // *************** *** 230,234 **** { $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: '; ! header($header_location . append_sid(PORTAL_URL . "index.$phpEx", true)); exit; } --- 239,243 ---- { $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: '; ! header($header_location . mx_append_sid(PORTAL_URL . "index.$phpEx", true)); exit; } *************** *** 248,254 **** 'CANCEL' => ' <input type="submit" name="cancel" value="' . $lang['return_to_page'] . '"class="liteoption" />', 'RESULT_MESSAGE' => !empty($result_message) ? '<div style="overflow:auto; height:50px;"><span class="gensmall">-::-<br/>' . $result_message . '<br/> -::-</span></div>': '', ! 'S_ACTION' => append_sid($mx_root_path . "modules/mx_coreblocks/mx_blockcp.$phpEx") )); $mx_blockcp->blockcp_mode = 'mx_blockcp'; $mx_blockcp->generate_cp($block_id); --- 257,264 ---- 'CANCEL' => ' <input type="submit" name="cancel" value="' . $lang['return_to_page'] . '"class="liteoption" />', 'RESULT_MESSAGE' => !empty($result_message) ? '<div style="overflow:auto; height:50px;"><span class="gensmall">-::-<br/>' . $result_message . '<br/> -::-</span></div>': '', ! 'S_ACTION' => mx_append_sid($mx_root_path . "modules/mx_coreblocks/mx_blockcp.$phpEx") )); + $module_root_path = $mx_root_path . $mx_blockcp->module_root_path; $mx_blockcp->blockcp_mode = 'mx_blockcp'; $mx_blockcp->generate_cp($block_id); Index: mx_search.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_search.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** mx_search.php 22 Jul 2007 21:00:51 -0000 1.20 --- mx_search.php 9 Sep 2007 16:49:36 -0000 1.21 *************** *** 435,439 **** $page_desc = $page_ids[$search_block_id]['page_desc']; ! $temp_url = !empty($dynamic_block_id) ? append_sid( PORTAL_URL . 'index.php?page=' . $pageid . '&dynamic_block=' . $dynamic_block_id ) : append_sid( PORTAL_URL . 'index.php?page=' . $pageid ); if (empty($editor_name_tmp[$searchdata['block_editor_id']])) --- 435,439 ---- $page_desc = $page_ids[$search_block_id]['page_desc']; ! $temp_url = !empty($dynamic_block_id) ? mx_append_sid( PORTAL_URL . 'index.php?page=' . $pageid . '&dynamic_block=' . $dynamic_block_id ) : mx_append_sid( PORTAL_URL . 'index.php?page=' . $pageid ); if (empty($editor_name_tmp[$searchdata['block_editor_id']])) *************** *** 443,449 **** } ! $edit_time = !empty($searchdata['block_time']) ? '(' . create_date( $board_config['default_dateformat'], $searchdata['block_time'], $board_config['board_timezone'] ) . ')' : ''; ! $block_editor = '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $searchdata['block_editor_id']) . '" class="name">'; $block_editor .= $editor_name; $block_editor .= '</a>'; --- 443,449 ---- } ! $edit_time = !empty($searchdata['block_time']) ? '(' . phpBB2::create_date($board_config['default_dateformat'], $searchdata['block_time'], $board_config['board_timezone'] ) . ')' : ''; ! $block_editor = '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $searchdata['block_editor_id']) . '" class="name">'; $block_editor .= $editor_name; $block_editor .= '</a>'; *************** *** 471,478 **** $base_url = mx_this_url( "search_id=$search_id" ); ! $new_search_url = append_sid( PORTAL_URL . 'index.php?page=' . $page_id ); $template->assign_vars( array( ! 'PAGINATION' => generate_pagination( $base_url, $total_match_count, $per_page, $start ), 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $per_page ) + 1 ), ceil( $total_match_count / $per_page ) ), --- 471,478 ---- $base_url = mx_this_url( "search_id=$search_id" ); ! $new_search_url = mx_append_sid( PORTAL_URL . 'index.php?page=' . $page_id ); $template->assign_vars( array( ! 'PAGINATION' => phpBB2::generate_pagination( $base_url, $total_match_count, $per_page, $start ), 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $per_page ) + 1 ), ceil( $total_match_count / $per_page ) ), *************** *** 501,505 **** 'L_SEARCH_ALL_TERMS' => $lang['Search_for_all'], ! 'S_SEARCH_ACTION' => append_sid( mx_this_url( "mode=results" ) ), 'S_HIDDEN_FIELDS' => '', 'S_SEARCH' => $lang['Search'] --- 501,505 ---- 'L_SEARCH_ALL_TERMS' => $lang['Search_for_all'], ! 'S_SEARCH_ACTION' => mx_append_sid( mx_this_url( "mode=results" ) ), 'S_HIDDEN_FIELDS' => '', 'S_SEARCH' => $lang['Search'] Index: mx_theme.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_theme.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** mx_theme.php 5 May 2007 20:13:38 -0000 1.18 --- mx_theme.php 9 Sep 2007 16:49:36 -0000 1.19 *************** *** 66,70 **** $template->assign_vars(array( ! 'ACTION_URL' => append_sid(PORTAL_URL . "index.$phpEx?page=$page_id"), 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), 'L_BOARD_STYLE' => $board_config['default_style'], --- 66,70 ---- $template->assign_vars(array( ! 'ACTION_URL' => mx_append_sid(PORTAL_URL . "index.$phpEx?page=$page_id"), 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), 'L_BOARD_STYLE' => $board_config['default_style'], |
