Menu
▾
▴
mxbb-commits — Internal Mailing List for CVS Commit Messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(95) |
Apr
(270) |
May
(111) |
Jun
|
Jul
|
Aug
(64) |
Sep
(130) |
Oct
(319) |
Nov
(17) |
Dec
(191) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(53) |
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(387) |
Jul
(102) |
Aug
(247) |
Sep
(120) |
Oct
(1) |
Nov
(8) |
Dec
(21) |
| 2007 |
Jan
(38) |
Feb
(36) |
Mar
|
Apr
(32) |
May
(135) |
Jun
(523) |
Jul
(192) |
Aug
(103) |
Sep
(533) |
Oct
(77) |
Nov
(23) |
Dec
(203) |
| 2008 |
Jan
(312) |
Feb
(1193) |
Mar
(404) |
Apr
(67) |
May
(62) |
Jun
(497) |
Jul
(297) |
Aug
(110) |
Sep
(335) |
Oct
(256) |
Nov
(50) |
Dec
(118) |
| 2009 |
Jan
(67) |
Feb
(10) |
Mar
(1) |
Apr
(1) |
May
|
Jun
(10) |
Jul
(61) |
Aug
|
Sep
(16) |
Oct
(45) |
Nov
(12) |
Dec
(14) |
| 2010 |
Jan
(30) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
(7) |
Aug
(7) |
Sep
(5) |
Oct
(5) |
Nov
|
Dec
|
| 2011 |
Jan
(7) |
Feb
(3) |
Mar
(89) |
Apr
(11) |
May
(5) |
Jun
|
Jul
(8) |
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(2) |
Dec
(89) |
| 2012 |
Jan
(7) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(3) |
Oct
(42) |
Nov
(1) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
(90) |
May
(38) |
Jun
(235) |
Jul
(38) |
Aug
(10) |
Sep
|
Oct
(29) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
(52) |
Jun
|
Jul
(7) |
Aug
|
Sep
(17) |
Oct
|
Nov
|
Dec
|
|
From: Jon O. <jon...@us...> - 2007-09-09 16:50:32
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9995 Modified Files: mx_module_defs.php Log Message: Ok, massive update for 2.9.x. Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/admin/mx_module_defs.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** mx_module_defs.php 5 May 2007 20:16:52 -0000 1.23 --- mx_module_defs.php 9 Sep 2007 16:50:26 -0000 1.24 *************** *** 244,248 **** 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . PHPBB_URL . append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, --- 244,248 ---- 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . PHPBB_URL . mx_append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, *************** *** 380,384 **** 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . PHPBB_URL . append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, --- 380,384 ---- 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . PHPBB_URL . mx_append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, *************** *** 548,552 **** $template->assign_vars(array( 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . PHPBB_URL . append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, 'L_PREVIEW' => $lang['Preview'], --- 548,552 ---- $template->assign_vars(array( 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . PHPBB_URL . mx_append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, 'L_PREVIEW' => $lang['Preview'], |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:50:24
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb2blocks/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9945 Modified Files: phpbb2blocks_constants.php Log Message: Ok, massive update for 2.9.x. Index: phpbb2blocks_constants.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/includes/phpbb2blocks_constants.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** phpbb2blocks_constants.php 5 May 2007 20:15:53 -0000 1.2 --- phpbb2blocks_constants.php 9 Sep 2007 16:50:14 -0000 1.3 *************** *** 10,13 **** --- 10,18 ---- */ + if ( PORTAL_BACKEND != 'phpbb2' ) + { + mx_message_die(GENERAL_MESSAGE, 'There are blocks on this page designed for mxBB with phpBB2 backend, thus not compatible with current setup.'); + } + // ------------------------------------------------------------------------- // Footer Copyrights |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:50:01
|
Update of /cvsroot/mxbb/core/modules/mx_navmenu/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9513/admin Modified Files: mx_module_defs.php Log Message: Ok, massive update for 2.9.x. Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/admin/mx_module_defs.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** mx_module_defs.php 21 Jul 2007 23:09:03 -0000 1.27 --- mx_module_defs.php 9 Sep 2007 16:49:57 -0000 1.28 *************** *** 206,217 **** // Get group data // ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> " . TRUE . " ! ORDER BY group_name"; if( !($result = $db->sql_query($sql)) ) { ! message_die(GENERAL_ERROR, "Couldn't get list of groups", '', __LINE__, __FILE__, $sql); } --- 206,229 ---- // Get group data // ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> " . TRUE . " ! ORDER BY group_name ASC"; ! break; ! case 'phpbb3': ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_name NOT IN ('BOTS', 'GUESTS') ! ORDER BY group_name ASC"; ! break; ! } if( !($result = $db->sql_query($sql)) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't get list of groups", '', __LINE__, __FILE__, $sql); } *************** *** 290,294 **** 'L_BLOCK' => $lang['Block'], ! 'S_ACTION' => append_sid(PORTAL_URL . $s_action_file), )); --- 302,306 ---- 'L_BLOCK' => $lang['Block'], ! 'S_ACTION' => mx_append_sid(PORTAL_URL . $s_action_file), )); *************** *** 296,300 **** { $template->assign_block_vars('block_mode', array( ! 'U_RETURN' => append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage") )); } --- 308,312 ---- { $template->assign_block_vars('block_mode', array( ! 'U_RETURN' => mx_append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage") )); } *************** *** 437,442 **** 'CAT_DESC' => ( $cat_desc != '' ) ? ' - ' . $cat_desc : '', ! 'U_CAT_MOVE_UP' => append_sid($mx_root_path . $s_action_file . $upmode . '&sid=' . $userdata['session_id']), ! 'U_CAT_MOVE_DOWN' => append_sid($mx_root_path . $s_action_file . $downmode . '&sid=' . $userdata['session_id'] ), // --- 449,454 ---- 'CAT_DESC' => ( $cat_desc != '' ) ? ' - ' . $cat_desc : '', ! 'U_CAT_MOVE_UP' => mx_append_sid($mx_root_path . $s_action_file . $upmode . '&sid=' . $userdata['session_id']), ! 'U_CAT_MOVE_DOWN' => mx_append_sid($mx_root_path . $s_action_file . $downmode . '&sid=' . $userdata['session_id'] ), // *************** *** 461,465 **** 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . append_sid(PHPBB_URL . "faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, --- 473,477 ---- 'HTML_STATUS' => $html_status, ! 'BBCODE_STATUS' => sprintf($bbcode_status, '<a href="' . mx_append_sid(PHPBB_URL . "faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'), 'SMILIES_STATUS' => $smilies_status, *************** *** 548,552 **** $message_delete = $lang['Delete_nav_menu'] . ' - ' . $menuname . '<br /><br />' . $lang['Delete_nav_menu_explain'] ! . '<br /><br />' . sprintf($lang['Click_nav_menu_delete_yes'], '<a href="' . append_sid($mx_root_path . $s_action_file . $deletemode . '&sid=' . $userdata['session_id']) . '">', '</a>') . '<br /><br />'; --- 560,564 ---- $message_delete = $lang['Delete_nav_menu'] . ' - ' . $menuname . '<br /><br />' . $lang['Delete_nav_menu_explain'] ! . '<br /><br />' . sprintf($lang['Click_nav_menu_delete_yes'], '<a href="' . mx_append_sid($mx_root_path . $s_action_file . $deletemode . '&sid=' . $userdata['session_id']) . '">', '</a>') . '<br /><br />'; *************** *** 591,596 **** 'ROW_COLOR' => $row_color, ! 'U_MENU_MOVE_UP' => append_sid($mx_root_path . $s_action_file . $upmode . '&sid=' . $userdata['session_id']), ! 'U_MENU_MOVE_DOWN' => append_sid($mx_root_path . $s_action_file . $downmode . '&sid=' . $userdata['session_id']), // --- 603,608 ---- 'ROW_COLOR' => $row_color, ! 'U_MENU_MOVE_UP' => mx_append_sid($mx_root_path . $s_action_file . $upmode . '&sid=' . $userdata['session_id']), ! 'U_MENU_MOVE_DOWN' => mx_append_sid($mx_root_path . $s_action_file . $downmode . '&sid=' . $userdata['session_id']), // *************** *** 839,843 **** 'L_BLOCK' => $lang['Block'], ! 'S_ACTION' => append_sid(PORTAL_URL . $s_action_file), )); --- 851,855 ---- 'L_BLOCK' => $lang['Block'], ! 'S_ACTION' => mx_append_sid(PORTAL_URL . $s_action_file), )); *************** *** 845,849 **** { $template->assign_block_vars('block_mode', array( ! 'U_RETURN' => append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage") )); } --- 857,861 ---- { $template->assign_block_vars('block_mode', array( ! 'U_RETURN' => mx_append_sid(PORTAL_URL . "index.$phpEx?page=$portalpage") )); } *************** *** 948,953 **** 'CAT_TITLE' => $cat_title, ! 'U_CAT_MOVE_UP' => append_sid($mx_root_path . $s_action_file . $upmode . '&sid=' . $userdata['session_id']), ! 'U_CAT_MOVE_DOWN' => append_sid($mx_root_path . $s_action_file . $downmode . '&sid=' . $userdata['session_id'] ), // --- 960,965 ---- 'CAT_TITLE' => $cat_title, ! 'U_CAT_MOVE_UP' => mx_append_sid($mx_root_path . $s_action_file . $upmode . '&sid=' . $userdata['session_id']), ! 'U_CAT_MOVE_DOWN' => mx_append_sid($mx_root_path . $s_action_file . $downmode . '&sid=' . $userdata['session_id'] ), // *************** *** 1071,1076 **** 'ROW_COLOR' => $row_color, ! 'U_MENU_MOVE_UP' => append_sid($mx_root_path . $s_action_file . $upmode . '&sid=' . $userdata['session_id']), ! 'U_MENU_MOVE_DOWN' => append_sid($mx_root_path . $s_action_file . $downmode . '&sid=' . $userdata['session_id']), // --- 1083,1088 ---- 'ROW_COLOR' => $row_color, ! 'U_MENU_MOVE_UP' => mx_append_sid($mx_root_path . $s_action_file . $upmode . '&sid=' . $userdata['session_id']), ! 'U_MENU_MOVE_DOWN' => mx_append_sid($mx_root_path . $s_action_file . $downmode . '&sid=' . $userdata['session_id']), // |
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'], |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:49:43
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9427/mx_phpbb3blocks Added Files: index.htm mx_forum.php mx_viewforum.php phpbb3blocks.pak Log Message: Ok, massive update for 2.9.x. --- NEW FILE: mx_viewforum.php --- <?php /** * * @package mxBB Portal Module - mx_phpbb3blocks * @version $Id: mx_viewforum.php,v 1.1 2007/09/09 16:49:37 jonohlsson Exp $ * @copyright (c) 2002-2006 mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mxbb.net * */ if( !defined('IN_PORTAL') || !is_object($mx_block)) { die("Hacking attempt"); } /** * @ignore */ // =================================================== // Include the constants file // =================================================== include_once( $module_root_path . 'includes/phpbb3blocks_constants.' . $phpEx ); include_once( $module_root_path . 'includes/mx_functions_display.' . $phpEx ); // ================================================================================ // The following code is based on includes/page_header.php (phpBB 2.0.14) // ================================================================================ $l_timezone = explode('.', $board_config['board_timezone']); $l_timezone = (count($l_timezone) > 1 && $l_timezone[count($l_timezone)-1] != 0) ? $lang[sprintf('%.1f', $board_config['board_timezone'])] : $lang[number_format($board_config['board_timezone'])]; // Start initial var setup $forum_id = $mx_request_vars->request('f', MX_TYPE_NO_TAGS, '0'); $mark_read = $mx_request_vars->request('mark', MX_TYPE_NO_TAGS, ''); $start = $mx_request_vars->request('start', MX_TYPE_NO_TAGS, '0'); $sort_days = $mx_request_vars->request('st', MX_TYPE_NO_TAGS, ((!empty($mx_user->data['user_topic_show_days'])) ? $mx_user->data['user_topic_show_days'] : 0)); $sort_key = $mx_request_vars->request('sk', MX_TYPE_NO_TAGS, ((!empty($mx_user->data['user_topic_sortby_type'])) ? $mx_user->data['user_topic_sortby_type'] : 't')); $sort_dir = $mx_request_vars->request('sd', MX_TYPE_NO_TAGS, ((!empty($mx_user->data['user_topic_sortby_dir'])) ? $mx_user->data['user_topic_sortby_dir'] : 'd')); // Check if the user has actually sent a forum ID with his/her request // If not give them a nice error page. if (!$forum_id) { trigger_error('NO_FORUM'); } $sql_from = FORUMS_TABLE . ' f'; $lastread_select = ''; // Grab appropriate forum data if ($board_config['load_db_lastread'] && $mx_user->data['is_registered']) { $sql_from .= ' LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.user_id = ' . $mx_user->data['user_id'] . ' AND ft.forum_id = f.forum_id)'; $lastread_select .= ', ft.mark_time'; } if ($mx_user->data['is_registered']) { $sql_from .= ' LEFT JOIN ' . FORUMS_WATCH_TABLE . ' fw ON (fw.forum_id = f.forum_id AND fw.user_id = ' . $mx_user->data['user_id'] . ')'; $lastread_select .= ', fw.notify_status'; } $sql = "SELECT f.* $lastread_select FROM $sql_from WHERE f.forum_id = $forum_id"; $result = $db->sql_query($sql); $forum_data = $db->sql_fetchrow($result); $db->sql_freeresult($result); if (!$forum_data) { trigger_error('NO_FORUM'); } // Configure style, language, etc. $mx_user->setup('viewforum', $forum_data['forum_style']); // Permissions check if (!$phpbb_auth->acl_gets('f_list', 'f_read', $forum_id) || ($forum_data['forum_type'] == FORUM_LINK && $forum_data['forum_link'] && !$phpbb_auth->acl_get('f_read', $forum_id))) { if ($mx_user->data['user_id'] != ANONYMOUS) { trigger_error('SORRY_AUTH_READ'); } // mx_redirect() login.php } // Forum is passworded ... check whether access has been granted to this // user this session, if not show login box if ($forum_data['forum_password']) { //login_forum_box($forum_data); } // Is this forum a link? ... User got here either because the // number of clicks is being tracked or they guessed the id if ($forum_data['forum_type'] == FORUM_LINK && $forum_data['forum_link']) { // Does it have click tracking enabled? if ($forum_data['forum_flags'] & FORUM_FLAG_LINK_TRACK) { $sql = 'UPDATE ' . FORUMS_TABLE . ' SET forum_posts = forum_posts + 1 WHERE forum_id = ' . $forum_id; $db->sql_query($sql); } mx_redirect($forum_data['forum_link']); } // Build navigation links mx_generate_forum_nav($forum_data); // Forum Rules if ($phpbb_auth->acl_get('f_read', $forum_id)) { generate_forum_rules($forum_data); } // Do we have subforums? $active_forum_ary = $moderators = array(); if ($forum_data['left_id'] != $forum_data['right_id'] - 1) { list($active_forum_ary, $moderators) = mx_display_forums($forum_data, $board_config['load_moderators'], $board_config['load_moderators']); } else { $template->assign_var('S_HAS_SUBFORUM', false); get_moderators($moderators, $forum_id); } $template->set_filenames(array( 'block_topic' => 'mx_topic.html') ); make_jumpbox(mx3_append_sid("{$phpbb_root_path}viewforum.$phpEx"), $forum_id); $template->assign_vars(array( 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, 'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone), 'U_VIEW_FORUM' => mx_append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=' . $page_id . 'f=' . $forum_id . '&start=' . $start), )); // Ok, if someone has only list-access, we only display the forum list. // We also make this circumstance available to the template in case we want to display a notice. ;) if (!$phpbb_auth->acl_get('f_read', $forum_id)) { $template->assign_vars(array( 'S_NO_READ_ACCESS' => true, 'S_AUTOLOGIN_ENABLED' => ($board_config['allow_autologin']) ? true : false, 'S_LOGIN_ACTION' => mx3_append_sid("{$mx_root_path}login.$phpEx", 'mode=login') . '&redirect=' . urlencode(str_replace('&', '&', mx_url(array('_f_')))), )); } // Handle marking posts if ($mark_read == 'topics') { markread('topics', $forum_id); $redirect_url = mx_append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=' . $page_id . 'f=' . $forum_id); meta_refresh(3, $redirect_url); trigger_error($mx_user->_lang['TOPICS_MARKED'] . '<br /><br />' . sprintf($mx_user->_lang['RETURN_FORUM'], '<a href="' . $redirect_url . '">', '</a>')); } // Is a forum specific topic count required? if ($forum_data['forum_topics_per_page']) { $board_config['topics_per_page'] = $forum_data['forum_topics_per_page']; } // Do the forum Prune thang - cron type job ... if ($forum_data['prune_next'] < time() && $forum_data['enable_prune']) { $template->assign_var('RUN_CRON_TASK', '<img src="' . mx3_append_sid($phpbb_root_path . 'cron.' . $phpEx, 'cron_type=prune_forum&f=' . $forum_id) . '" alt="cron" width="1" height="1" />'); } // Forum rules and subscription info $s_watching_forum = $s_watching_forum_img = array(); $s_watching_forum['link'] = $s_watching_forum['title'] = ''; $s_watching_forum['is_watching'] = false; if (($board_config['email_enable'] || $board_config['jab_enable']) && $board_config['allow_forum_notify'] && $phpbb_auth->acl_get('f_subscribe', $forum_id)) { $notify_status = (isset($forum_data['notify_status'])) ? $forum_data['notify_status'] : NULL; watch_topic_forum('forum', $s_watching_forum, $s_watching_forum_img, $mx_user->data['user_id'], $forum_id, 0, $notify_status); } $s_forum_rules = ''; mx_gen_forum_auth_level('forum', $forum_id, $forum_data['forum_status']); // Topic ordering options $limit_days = array(0 => $mx_user->_lang['ALL_TOPICS'], 1 => $mx_user->_lang['1_DAY'], 7 => $mx_user->_lang['7_DAYS'], 14 => $mx_user->_lang['2_WEEKS'], 30 => $mx_user->_lang['1_MONTH'], 90 => $mx_user->_lang['3_MONTHS'], 180 => $mx_user->_lang['6_MONTHS'], 365 => $mx_user->_lang['1_YEAR']); $sort_by_text = array('a' => $mx_user->_lang['AUTHOR'], 't' => $mx_user->_lang['POST_TIME'], 'r' => $mx_user->_lang['REPLIES'], 's' => $mx_user->_lang['SUBJECT'], 'v' => $mx_user->_lang['VIEWS']); $sort_by_sql = array('a' => 't.topic_first_poster_name', 't' => 't.topic_last_post_time', 'r' => 't.topic_replies', 's' => 't.topic_title', 'v' => 't.topic_views'); $s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = ''; mx_gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param); // Limit topics to certain time frame, obtain correct topic count if ($sort_days) { $min_post_time = time() - ($sort_days * 86400); $sql = 'SELECT COUNT(topic_id) AS num_topics FROM ' . TOPICS_TABLE . " WHERE forum_id = $forum_id AND topic_type NOT IN (" . POST_ANNOUNCE . ', ' . POST_GLOBAL . ") AND topic_last_post_time >= $min_post_time " . (($phpbb_auth->acl_get('m_approve', $forum_id)) ? '' : 'AND topic_approved = 1'); $result = $db->sql_query($sql); $topics_count = (int) $db->sql_fetchfield('num_topics'); $db->sql_freeresult($result); if (isset($_POST['sort'])) { $start = 0; } $sql_limit_time = "AND t.topic_last_post_time >= $min_post_time"; // Make sure we have information about day selection ready $template->assign_var('S_SORT_DAYS', true); } else { $topics_count = ($phpbb_auth->acl_get('m_approve', $forum_id)) ? $forum_data['forum_topics_real'] : $forum_data['forum_topics']; $sql_limit_time = ''; } // Make sure $start is set to the last page if it exceeds the amount if ($start < 0 || $start > $topics_count) { $start = ($start < 0) ? 0 : floor(($topics_count - 1) / $board_config['topics_per_page']) * $board_config['topics_per_page']; } // Basic pagewide vars $post_alt = ($forum_data['forum_status'] == ITEM_LOCKED) ? $mx_user->_lang['FORUM_LOCKED'] : $mx_user->_lang['POST_NEW_TOPIC']; // Display active topics? $s_display_active = ($forum_data['forum_type'] == FORUM_CAT && ($forum_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS)) ? true : false; $template->assign_vars(array( 'MODERATORS' => (!empty($moderators[$forum_id])) ? implode(', ', $moderators[$forum_id]) : '', 'POST_IMG' => ($forum_data['forum_status'] == ITEM_LOCKED) ? $mx_user->img('button_topic_locked', $post_alt) : $mx_user->img('button_topic_new', $post_alt), 'NEWEST_POST_IMG' => $mx_user->img('icon_topic_newest', 'VIEW_NEWEST_POST'), 'LAST_POST_IMG' => $mx_user->img('icon_topic_latest', 'VIEW_LATEST_POST'), 'FOLDER_IMG' => $mx_user->img('topic_read', 'NO_NEW_POSTS'), 'FOLDER_NEW_IMG' => $mx_user->img('topic_unread', 'NEW_POSTS'), 'FOLDER_HOT_IMG' => $mx_user->img('topic_read_hot', 'NO_NEW_POSTS_HOT'), 'FOLDER_HOT_NEW_IMG' => $mx_user->img('topic_unread_hot', 'NEW_POSTS_HOT'), 'FOLDER_LOCKED_IMG' => $mx_user->img('topic_read_locked', 'NO_NEW_POSTS_LOCKED'), 'FOLDER_LOCKED_NEW_IMG' => $mx_user->img('topic_unread_locked', 'NEW_POSTS_LOCKED'), 'FOLDER_STICKY_IMG' => $mx_user->img('sticky_read', 'POST_STICKY'), 'FOLDER_STICKY_NEW_IMG' => $mx_user->img('sticky_unread', 'POST_STICKY'), 'FOLDER_ANNOUNCE_IMG' => $mx_user->img('announce_read', 'POST_ANNOUNCEMENT'), 'FOLDER_ANNOUNCE_NEW_IMG' => $mx_user->img('announce_unread', 'POST_ANNOUNCEMENT'), 'FOLDER_MOVED_IMG' => $mx_user->img('topic_moved', 'TOPIC_MOVED'), 'REPORTED_IMG' => $mx_user->img('icon_topic_reported', 'TOPIC_REPORTED'), 'UNAPPROVED_IMG' => $mx_user->img('icon_topic_unapproved', 'TOPIC_UNAPPROVED'), 'GOTO_PAGE_IMG' => $mx_user->img('icon_post_target', 'GOTO_PAGE'), 'L_NO_TOPICS' => ($forum_data['forum_status'] == ITEM_LOCKED) ? $mx_user->_lang['POST_FORUM_LOCKED'] : $mx_user->_lang['NO_TOPICS'], 'S_DISPLAY_POST_INFO' => ($forum_data['forum_type'] == FORUM_POST && ($phpbb_auth->acl_get('f_post', $forum_id) || $mx_user->data['user_id'] == ANONYMOUS)) ? true : false, 'S_IS_POSTABLE' => ($forum_data['forum_type'] == FORUM_POST) ? true : false, 'S_USER_CAN_POST' => ($phpbb_auth->acl_get('f_post', $forum_id)) ? true : false, 'S_DISPLAY_ACTIVE' => $s_display_active, 'S_SELECT_SORT_DIR' => $s_sort_dir, 'S_SELECT_SORT_KEY' => $s_sort_key, 'S_SELECT_SORT_DAYS' => $s_limit_days, 'S_TOPIC_ICONS' => ($s_display_active && sizeof($active_forum_ary)) ? max($active_forum_ary['enable_icons']) : (($forum_data['enable_icons']) ? true : false), 'S_WATCH_FORUM_LINK' => $s_watching_forum['link'], 'S_WATCH_FORUM_TITLE' => $s_watching_forum['title'], 'S_WATCHING_FORUM' => $s_watching_forum['is_watching'], 'S_FORUM_ACTION' => mx3_append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id&start=$start"), 'S_DISPLAY_SEARCHBOX' => ($phpbb_auth->acl_get('u_search') && $phpbb_auth->acl_get('f_search', $forum_id) && $board_config['load_search']) ? true : false, 'S_SEARCHBOX_ACTION' => mx3_append_sid("{$phpbb_root_path}search.$phpEx", 'fid[]=' . $forum_id), 'S_SINGLE_MODERATOR' => (!empty($moderators[$forum_id]) && sizeof($moderators[$forum_id]) > 1) ? false : true, 'U_MCP' => ($phpbb_auth->acl_get('m_', $forum_id)) ? mx3_append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&i=main&mode=forum_view", true, $mx_user->session_id) : '', 'U_POST_NEW_TOPIC' => ($phpbb_auth->acl_get('f_post', $forum_id) || $mx_user->data['user_id'] == ANONYMOUS) ? mx_append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=post&f=' . $forum_id) : '', 'U_VIEW_FORUM' => mx_append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id&$u_sort_param&start=$start"), 'U_MARK_TOPICS' => ($mx_user->data['is_registered'] || $board_config['load_anon_lastread']) ? mx3_append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id&mark=topics") : '', )); // Grab icons $icons = $mx_cache->obtain_icons(); // Grab all topic data $rowset = $announcement_list = $topic_list = $global_announce_list = array(); $sql_array = array( 'SELECT' => 't.*', 'FROM' => array( TOPICS_TABLE => 't' ), 'LEFT_JOIN' => array(), ); $sql_approved = ($phpbb_auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1'; if ($mx_user->data['is_registered']) { if ($board_config['load_db_track']) { $sql_array['LEFT_JOIN'][] = array('FROM' => array(TOPICS_POSTED_TABLE => 'tp'), 'ON' => 'tp.topic_id = t.topic_id AND tp.user_id = ' . $mx_user->data['user_id']); $sql_array['SELECT'] .= ', tp.topic_posted'; } if ($board_config['load_db_lastread']) { $sql_array['LEFT_JOIN'][] = array('FROM' => array(TOPICS_TRACK_TABLE => 'tt'), 'ON' => 'tt.topic_id = t.topic_id AND tt.user_id = ' . $mx_user->data['user_id']); $sql_array['SELECT'] .= ', tt.mark_time'; if ($s_display_active && sizeof($active_forum_ary)) { $sql_array['LEFT_JOIN'][] = array('FROM' => array(FORUMS_TRACK_TABLE => 'ft'), 'ON' => 'ft.forum_id = t.forum_id AND ft.user_id = ' . $mx_user->data['user_id']); $sql_array['SELECT'] .= ', ft.mark_time AS forum_mark_time'; } } } if ($forum_data['forum_type'] == FORUM_POST) { // Obtain announcements ... removed sort ordering, sort by time in all cases $sql = $db->sql_build_query('SELECT', array( 'SELECT' => $sql_array['SELECT'], 'FROM' => $sql_array['FROM'], 'LEFT_JOIN' => $sql_array['LEFT_JOIN'], 'WHERE' => 't.forum_id IN (' . $forum_id . ', 0) AND t.topic_type IN (' . POST_ANNOUNCE . ', ' . POST_GLOBAL . ')', 'ORDER_BY' => 't.topic_time DESC', )); $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) { $rowset[$row['topic_id']] = $row; $announcement_list[] = $row['topic_id']; if ($row['topic_type'] == POST_GLOBAL) { $global_announce_list[$row['topic_id']] = true; } else { $topics_count--; } } $db->sql_freeresult($result); } // If the user is trying to reach late pages, start searching from the end $store_reverse = false; $sql_limit = $board_config['topics_per_page']; if ($start > $topics_count / 2) { $store_reverse = true; if ($start + $board_config['topics_per_page'] > $topics_count) { $sql_limit = min($board_config['topics_per_page'], max(1, $topics_count - $start)); } // Select the sort order $sql_sort_order = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'ASC' : 'DESC'); $sql_start = max(0, $topics_count - $sql_limit - $start); } else { // Select the sort order $sql_sort_order = $sort_by_sql[$sort_key] . ' ' . (($sort_dir == 'd') ? 'DESC' : 'ASC'); $sql_start = $start; } if ($forum_data['forum_type'] == FORUM_POST || !sizeof($active_forum_ary)) { $sql_where = 't.forum_id = ' . $forum_id; } else if (empty($active_forum_ary['exclude_forum_id'])) { $sql_where = $db->sql_in_set('t.forum_id', $active_forum_ary['forum_id']); } else { $get_forum_ids = array_diff($active_forum_ary['forum_id'], $active_forum_ary['exclude_forum_id']); $sql_where = (sizeof($get_forum_ids)) ? $db->sql_in_set('t.forum_id', $get_forum_ids) : 't.forum_id = ' . $forum_id; } // SQL array for obtaining topics/stickies $sql_array = array( 'SELECT' => $sql_array['SELECT'], 'FROM' => $sql_array['FROM'], 'LEFT_JOIN' => $sql_array['LEFT_JOIN'], 'WHERE' => $sql_where . ' AND t.topic_type IN (' . POST_NORMAL . ', ' . POST_STICKY . ") $sql_approved $sql_limit_time", 'ORDER_BY' => 't.topic_type ' . ((!$store_reverse) ? 'DESC' : 'ASC') . ', ' . $sql_sort_order, ); // If store_reverse, then first obtain topics, then stickies, else the other way around... // Funnily enough you typically save one query if going from the last page to the middle (store_reverse) because // the number of stickies are not known $sql = $db->sql_build_query('SELECT', $sql_array); if ( !($result = $db->sql_query_limit($sql, $sql_limit, $sql_start)) ) { mx_message_die(GENERAL_ERROR, 'Could not query new topic information', '', __LINE__, __FILE__, $sql); } $shadow_topic_list = array(); while ($row = $db->sql_fetchrow($result)) { if ($row['topic_status'] == ITEM_MOVED) { $shadow_topic_list[$row['topic_moved_id']] = $row['topic_id']; } $rowset[$row['topic_id']] = $row; $topic_list[] = $row['topic_id']; } $db->sql_freeresult($result); //print_r($shadow_topic_list); // If we have some shadow topics, update the rowset to reflect their topic information if (sizeof($shadow_topic_list)) { $sql = 'SELECT * FROM ' . TOPICS_TABLE . ' WHERE ' . $db->sql_in_set('topic_id', array_keys($shadow_topic_list)); if ( !($result = $db->sql_query($sql)) ) { mx_message_die(GENERAL_ERROR, 'Could not query new topic information', '', __LINE__, __FILE__, $sql); } while ($row = $db->sql_fetchrow($result)) { $orig_topic_id = $shadow_topic_list[$row['topic_id']]; // If the shadow topic is already listed within the rowset (happens for active topics for example), then do not include it... if (isset($rowset[$row['topic_id']])) { // We need to remove any trace regarding this topic. :) unset($rowset[$orig_topic_id]); unset($topic_list[array_search($orig_topic_id, $topic_list)]); $topics_count--; continue; } // Do not include those topics the user has no permission to access if (!$phpbb_auth->acl_get('f_read', $row['forum_id'])) { // We need to remove any trace regarding this topic. :) unset($rowset[$orig_topic_id]); unset($topic_list[array_search($orig_topic_id, $topic_list)]); $topics_count--; continue; } // We want to retain some values $row = array_merge($row, array( 'topic_moved_id' => $rowset[$orig_topic_id]['topic_moved_id'], 'topic_status' => $rowset[$orig_topic_id]['topic_status']) ); $rowset[$orig_topic_id] = $row; } $db->sql_freeresult($result); } unset($shadow_topic_list); // Ok, adjust topics count for active topics list if ($s_display_active) { $topics_count = 1; } $template->assign_vars(array( 'PAGINATION' => mx_generate_pagination($base_url, $topics_count, $board_config['topics_per_page'], $start, true, true, true, false, 'l_start'), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor($start / $board_config['topics_per_page']) + 1 ), ceil($topics_count / $board_config['topics_per_page'])), 'TOTAL_TOPICS' => ($s_display_active) ? false : (($topics_count == 1) ? $mx_user->_lang['VIEW_FORUM_TOPIC'] : sprintf($mx_user->_lang['VIEW_FORUM_TOPICS'], $topics_count))) ); $topic_list = ($store_reverse) ? array_merge($announcement_list, array_reverse($topic_list)) : array_merge($announcement_list, $topic_list); $topic_tracking_info = $tracking_topics = array(); //print_r($topic_list); // Okay, lets dump out the page ... if (sizeof($topic_list)) { $mark_forum_read = true; $mark_time_forum = 0; // Active topics? if ($s_display_active && sizeof($active_forum_ary)) { // Generate topic forum list... $topic_forum_list = array(); foreach ($rowset as $t_id => $row) { $topic_forum_list[$row['forum_id']]['forum_mark_time'] = ($board_config['load_db_lastread'] && $mx_user->data['is_registered'] && isset($row['forum_mark_time'])) ? $row['forum_mark_time'] : 0; $topic_forum_list[$row['forum_id']]['topics'][] = $t_id; } if ($board_config['load_db_lastread'] && $mx_user->data['is_registered']) { foreach ($topic_forum_list as $f_id => $topic_row) { $topic_tracking_info += get_topic_tracking($f_id, $topic_row['topics'], $rowset, array($f_id => $topic_row['forum_mark_time']), false); } } else if ($board_config['load_anon_lastread'] || $mx_user->data['is_registered']) { foreach ($topic_forum_list as $f_id => $topic_row) { $topic_tracking_info += get_complete_topic_tracking($f_id, $topic_row['topics'], false); } } unset($topic_forum_list); } else { if ($board_config['load_db_lastread'] && $mx_user->data['is_registered']) { $topic_tracking_info = get_topic_tracking($forum_id, $topic_list, $rowset, array($forum_id => $forum_data['mark_time']), $global_announce_list); $mark_time_forum = (!empty($forum_data['mark_time'])) ? $forum_data['mark_time'] : $mx_user->data['user_lastmark']; } else if ($board_config['load_anon_lastread'] || $mx_user->data['is_registered']) { $topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_list, $global_announce_list); if (!$mx_user->data['is_registered']) { $mx_user->data['user_lastmark'] = (isset($tracking_topics['l'])) ? (int) (base_convert($tracking_topics['l'], 36, 10) + $board_config['board_startdate']) : 0; } $mark_time_forum = (isset($tracking_topics['f'][$forum_id])) ? (int) (base_convert($tracking_topics['f'][$forum_id], 36, 10) + $board_config['board_startdate']) : $mx_user->data['user_lastmark']; } } $s_type_switch = 0; foreach ($topic_list as $topic_id) { $row = &$rowset[$topic_id]; // This will allow the style designer to output a different header // or even separate the list of announcements from sticky and normal topics $s_type_switch_test = ($row['topic_type'] == POST_ANNOUNCE || $row['topic_type'] == POST_GLOBAL) ? 1 : 0; // Replies $replies = ($phpbb_auth->acl_get('m_approve', $forum_id)) ? $row['topic_replies_real'] : $row['topic_replies']; if ($row['topic_status'] == ITEM_MOVED) { $topic_id = $row['topic_moved_id']; $unread_topic = false; } else { $unread_topic = (isset($topic_tracking_info[$topic_id]) && $row['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false; } // Get folder img, topic status/type related information $folder_img = $folder_alt = $topic_type = ''; topic_status($row, $replies, $unread_topic, $folder_img, $folder_alt, $topic_type); // Generate all the URIs ... $view_topic_url = mx3_append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . (($row['forum_id']) ? $row['forum_id'] : $forum_id) . '&t=' . $topic_id); $topic_unapproved = (!$row['topic_approved'] && $phpbb_auth->acl_get('m_approve', $forum_id)) ? true : false; $posts_unapproved = ($row['topic_approved'] && $row['topic_replies'] < $row['topic_replies_real'] && $phpbb_auth->acl_get('m_approve', $forum_id)) ? true : false; $u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? mx3_append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . "&t=$topic_id", true, $mx_user->session_id) : ''; $i = count($row['forum_id']); // Send vars to template $template->assign_block_vars('topicrow', array( 'FORUM_ID' => $forum_id, 'TOPIC_ID' => $topic_id, 'TOPIC_AUTHOR' => get_username_string('username', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), 'TOPIC_AUTHOR_COLOUR' => get_username_string('colour', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), 'TOPIC_AUTHOR_FULL' => get_username_string('full', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), 'FIRST_POST_TIME' => $mx_user->format_date($row['topic_time']), 'LAST_POST_SUBJECT' => phpBB3::censor_text($row['topic_last_post_subject']), 'LAST_POST_TIME' => $mx_user->format_date($row['topic_last_post_time']), 'LAST_VIEW_TIME' => $mx_user->format_date($row['topic_last_view_time']), 'LAST_POST_AUTHOR' => get_username_string('username', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), 'LAST_POST_AUTHOR_COLOUR' => get_username_string('colour', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), 'LAST_POST_AUTHOR_FULL' => get_username_string('full', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), 'PAGINATION' => topic_generate_pagination($replies, $view_topic_url), 'REPLIES' => $replies, 'VIEWS' => $row['topic_views'], 'TOPIC_TITLE' => phpBB3::censor_text($row['topic_title']), 'TOPIC_TYPE' => $topic_type, 'TOPIC_FOLDER_IMG' => $mx_user->img($folder_img, $folder_alt), 'TOPIC_FOLDER_IMG_SRC' => $mx_user->img($folder_img, $folder_alt, false, '', 'src'), 'TOPIC_FOLDER_IMG_ALT' => $mx_user->_lang[$folder_alt], 'TOPIC_ICON_IMG' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '', 'TOPIC_ICON_IMG_WIDTH' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['width'] : '', 'TOPIC_ICON_IMG_HEIGHT' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['height'] : '', 'ATTACH_ICON_IMG' => ($phpbb_auth->acl_get('u_download') && $phpbb_auth->acl_get('f_download', $forum_id) && $row['topic_attachment']) ? $mx_user->img('icon_topic_attach', $mx_user->_lang['TOTAL_ATTACHMENTS']) : '', 'UNAPPROVED_IMG' => ($topic_unapproved || $posts_unapproved) ? $mx_user->img('icon_topic_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '', 'S_TOPIC_TYPE' => $row['topic_type'], 'S_USER_POSTED' => (isset($row['topic_posted']) && $row['topic_posted']) ? true : false, 'S_UNREAD_TOPIC' => $unread_topic, 'S_TOPIC_REPORTED' => (!empty($row['topic_reported']) && $phpbb_auth->acl_get('m_report', $forum_id)) ? true : false, 'S_TOPIC_UNAPPROVED' => $topic_unapproved, 'S_POSTS_UNAPPROVED' => $posts_unapproved, 'S_HAS_POLL' => ($row['poll_start']) ? true : false, 'S_POST_ANNOUNCE' => ($row['topic_type'] == POST_ANNOUNCE) ? true : false, 'S_POST_GLOBAL' => ($row['topic_type'] == POST_GLOBAL) ? true : false, 'S_POST_STICKY' => ($row['topic_type'] == POST_STICKY) ? true : false, 'S_TOPIC_LOCKED' => ($row['topic_status'] == ITEM_LOCKED) ? true : false, 'S_TOPIC_MOVED' => ($row['topic_status'] == ITEM_MOVED) ? true : false, 'U_NEWEST_POST' => $view_topic_url . '&view=unread#unread', 'U_LAST_POST' => $view_topic_url . '&p=' . $row['topic_last_post_id'] . '#p' . $row['topic_last_post_id'], 'U_LAST_POST_AUTHOR' => get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), 'U_TOPIC_AUTHOR' => get_username_string('profile', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), 'U_VIEW_TOPIC' => $view_topic_url, 'U_MCP_REPORT' => mx3_append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&mode=reports&f=' . $forum_id . '&t=' . $topic_id, true, $mx_user->session_id), 'U_MCP_QUEUE' => $u_mcp_queue, 'S_TOPIC_TYPE_SWITCH' => ($s_type_switch == $s_type_switch_test) ? -1 : $s_type_switch_test, 'S_ROW_COUNT' => $i) ); $s_type_switch = ($row['topic_type'] == POST_ANNOUNCE || $row['topic_type'] == POST_GLOBAL) ? 1 : 0; if ($unread_topic) { $mark_forum_read = false; } unset($rowset[$topic_id]); } } // This is rather a fudge but it's the best I can think of without requiring information // on all topics (as we do in 2.0.x). It looks for unread or new topics, if it doesn't find // any it updates the forum last read cookie. This requires that the user visit the forum // after reading a topic if ($forum_data['forum_type'] == FORUM_POST && sizeof($topic_list) && $mark_forum_read) { update_forum_tracking_info($forum_id, $forum_data['forum_last_post_time'], false, $mark_time_forum); } $template->pparse('block_topic'); ?> --- NEW FILE: mx_forum.php --- <?php /** * * @package mxBB Portal Module - mx_phpbb3blocks * @version $Id: mx_forum.php,v 1.1 2007/09/09 16:49:36 jonohlsson Exp $ * @copyright (c) 2002-2006 mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mxbb.net * */ if( !defined('IN_PORTAL') || !is_object($mx_block)) { die("Hacking attempt"); } /** * @ignore */ // =================================================== // Include the constants file // =================================================== include_once( $module_root_path . 'includes/phpbb3blocks_constants.' . $phpEx ); include_once( $module_root_path . 'includes/mx_functions_display.' . $phpEx ); // ================================================================================ // The following code is based on includes/page_header.php (phpBB 2.0.14) // ================================================================================ $l_timezone = explode('.', $board_config['board_timezone']); $l_timezone = (count($l_timezone) > 1 && $l_timezone[count($l_timezone)-1] != 0) ? $lang[sprintf('%.1f', $board_config['board_timezone'])] : $lang[number_format($board_config['board_timezone'])]; // // Start session management // //$mx_user->session_begin(); $mx_user->init($user_ip, PAGE_INDEX); //$mx_user->data = $mx_user->session_pagestart($user_ip, - ( MX_PORTAL_PAGES_OFFSET + $page_id )); $phpbb_auth->acl($mx_user->data); $mx_user->setup('viewforum'); // // End session management // mx_display_forums('', $board_config['load_moderators']); // Set some stats, get posts count from forums data if we... hum... retrieve all forums data $total_posts = $board_config['num_posts']; $total_topics = $board_config['num_topics']; $total_users = $board_config['num_users']; $l_total_user_s = ($total_users == 0) ? 'TOTAL_USERS_ZERO' : 'TOTAL_USERS_OTHER'; $l_total_post_s = ($total_posts == 0) ? 'TOTAL_POSTS_ZERO' : 'TOTAL_POSTS_OTHER'; $l_total_topic_s = ($total_topics == 0) ? 'TOTAL_TOPICS_ZERO' : 'TOTAL_TOPICS_OTHER'; // Grab group details for legend display if ($phpbb_auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) { $sql = 'SELECT group_id, group_name, group_colour, group_type FROM ' . GROUPS_TABLE . ' WHERE group_legend = 1 ORDER BY group_name ASC'; } else { $sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_type FROM ' . GROUPS_TABLE . ' g LEFT JOIN ' . USER_GROUP_TABLE . ' ug ON ( g.group_id = ug.group_id AND ug.user_id = ' . $mx_user->data['user_id'] . ' AND ug.user_pending = 0 ) WHERE g.group_legend = 1 AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $mx_user->data['user_id'] . ') ORDER BY g.group_name ASC'; } $result = $db->sql_query($sql); $legend = ''; while ($row = $db->sql_fetchrow($result)) { $colour_text = ($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . '"' : ''; if ($row['group_name'] == 'BOTS') { $legend .= (($legend != '') ? ', ' : '') . '<span' . $colour_text . '>' . $mx_user->lang['G_BOTS'] . '</span>'; } else { $legend .= (($legend != '') ? ', ' : '') . '<a' . $colour_text . ' href="' . mx3_append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&g=' . $row['group_id']) . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $mx_user->lang['G_' . $row['group_name']] : $row['group_name']) . '</a>'; } } $db->sql_freeresult($result); // Generate birthday list if required ... $birthday_list = ''; if ($board_config['load_birthdays'] && $board_config['allow_birthdays']) { $now = getdate(time() + $mx_user->timezone + $mx_user->dst - date('Z')); $sql = 'SELECT user_id, username, user_colour, user_birthday FROM ' . USERS_TABLE . " WHERE user_birthday LIKE '" . $db->sql_escape(sprintf('%2d-%2d-', $now['mday'], $now['mon'])) . "%' AND user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')'; $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) { $birthday_list .= (($birthday_list != '') ? ', ' : '') . mx_get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']); if ($age = (int) substr($row['user_birthday'], -4)) { $birthday_list .= ' (' . ($now['year'] - $age) . ')'; } } $db->sql_freeresult($result); } $template->set_filenames(array( 'block_forum' => 'mx_forum.html') ); // Assign index specific vars $template->assign_vars(array( 'TOTAL_POSTS' => sprintf($mx_user->lang[$l_total_post_s], $total_posts), 'TOTAL_TOPICS' => sprintf($mx_user->lang[$l_total_topic_s], $total_topics), 'TOTAL_USERS' => sprintf($mx_user->lang[$l_total_user_s], $total_users), //'NEWEST_USER' => sprintf($mx_user->lang['NEWEST_USER'], mx_get_username_string('full', $board_config['newest_user_id'], $board_config['newest_username'], $board_config['newest_user_colour'])), 'NEWEST_USER' => sprintf('Newest User', mx_get_username_string('full', $board_config['newest_user_id'], $board_config['newest_username'], $board_config['newest_user_colour'])), 'LEGEND' => $legend, 'BIRTHDAY_LIST' => $birthday_list, 'FORUM_IMG' => $mx_user->img('forum_read', 'NO_NEW_POSTS'), 'FORUM_NEW_IMG' => $mx_user->img('forum_unread', 'NEW_POSTS'), 'FORUM_LOCKED_IMG' => $mx_user->img('forum_read_locked', 'NO_NEW_POSTS_LOCKED'), 'FORUM_NEW_LOCKED_IMG' => $mx_user->img('forum_unread_locked', 'NO_NEW_POSTS_LOCKED'), 'S_LOGIN_ACTION' => mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login'), 'S_DISPLAY_BIRTHDAY_LIST' => ($board_config['load_birthdays']) ? true : false, 'U_MARK_FORUMS' => ($mx_user->data['is_registered'] || $board_config['load_anon_lastread']) ? mx3_append_sid("{$phpbb_root_path}index.$phpEx", 'mark=forums') : '', 'U_MCP' => ($phpbb_auth->acl_get('m_') || $phpbb_auth->acl_getf_global('m_')) ? mx3_append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=front', true, $mx_user->session_id) : '') ); $template->pparse('block_forum'); ?> --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> --- NEW FILE: phpbb3blocks.pak --- module=+:53=+:phpBB3 Blocks=+:modules/mx_phpbb3blocks/=+:mxBB Portal phpBB3 blocks=+: New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:53=+:52=+:phpBB Index=+:phpBB Index Block=+:mx_forum.php=+: parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0 block=+:=+:phpBB Index=+:Demo block=+:52=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1 function=+:0=+:0=+:0=+:endoflist=+:0=+:0 |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:49:43
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb2blocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9427/mx_phpbb2blocks Modified Files: mx_announce.php mx_forum.php mx_last_msg.php mx_poll.php mx_statistics.php Log Message: Ok, massive update for 2.9.x. Index: mx_poll.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_poll.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_poll.php 5 May 2007 20:13:40 -0000 1.3 --- mx_poll.php 9 Sep 2007 16:49:36 -0000 1.4 *************** *** 36,40 **** $forum_lst_poll = $mx_block->get_parameters( 'poll_forum' ); ! $auth_data_sql_poll = get_auth_forum(); if ( empty($forum_lst_poll) ) --- 36,40 ---- $forum_lst_poll = $mx_block->get_parameters( 'poll_forum' ); ! $auth_data_sql_poll = $phpbb_auth->get_auth_forum(); if ( empty($forum_lst_poll) ) *************** *** 141,147 **** $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(PORTAL_URL . "index.$phpEx?page=$current_page&vote=viewresult") . '">') ); ! $message .= '<br /><br />' . sprintf($lang['Click_view_voted'], '<a href="' . append_sid(PORTAL_URL . "index.$phpEx?page=$current_page&vote=viewresult") . '">', '</a>'); mx_block_message($lang['Surveys_Polls'], $message); --- 141,147 ---- $template->assign_vars(array( ! 'META' => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(PORTAL_URL . "index.$phpEx?page=$current_page&vote=viewresult") . '">') ); ! $message .= '<br /><br />' . sprintf($lang['Click_view_voted'], '<a href="' . mx_append_sid(PORTAL_URL . "index.$phpEx?page=$current_page&vote=viewresult") . '">', '</a>'); mx_block_message($lang['Surveys_Polls'], $message); *************** *** 250,254 **** 'L_TOTAL_VOTES' => $lang['Total_votes'], 'TOTAL_VOTES' => $vote_results_sum, ! 'U_URL' => append_sid(PHPBB_URL . "viewtopic.$phpEx?t=$topic_id")) ); --- 250,254 ---- 'L_TOTAL_VOTES' => $lang['Total_votes'], 'TOTAL_VOTES' => $vote_results_sum, ! 'U_URL' => mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?t=$topic_id")) ); *************** *** 278,283 **** 'L_SUBMIT_VOTE' => $lang['Submit_vote'], 'L_VIEW_RESULTS' => $lang['View_results'], ! 'U_VIEW_RESULTS' => append_sid(PORTAL_URL . "index.$phpEx?page=$current_page&vote=viewresult"), ! 'U_URL' => append_sid(PHPBB_URL . "viewtopic.$phpEx?t=$topic_id")) ); --- 278,283 ---- 'L_SUBMIT_VOTE' => $lang['Submit_vote'], 'L_VIEW_RESULTS' => $lang['View_results'], ! 'U_VIEW_RESULTS' => mx_append_sid(PORTAL_URL . "index.$phpEx?page=$current_page&vote=viewresult"), ! 'U_URL' => mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?t=$topic_id")) ); *************** *** 299,303 **** 'VOTE_RCAP' => $images['mx_vote_rcap'], 'S_HIDDEN_FIELDS' => ( !empty($s_hidden_fields) ? $s_hidden_fields : '' ), ! 'S_POLL_ACTION' => append_sid(PORTAL_URL . "index.$phpEx?page=$current_page")) ); --- 299,303 ---- 'VOTE_RCAP' => $images['mx_vote_rcap'], 'S_HIDDEN_FIELDS' => ( !empty($s_hidden_fields) ? $s_hidden_fields : '' ), ! 'S_POLL_ACTION' => mx_append_sid(PORTAL_URL . "index.$phpEx?page=$current_page")) ); Index: mx_statistics.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_statistics.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_statistics.php 5 May 2007 20:13:41 -0000 1.3 --- mx_statistics.php 9 Sep 2007 16:49:36 -0000 1.4 *************** *** 125,129 **** // Authorization SQL // ! $auth_data_sql_stats = get_auth_forum(); // --- 125,129 ---- // Authorization SQL // ! $auth_data_sql_stats = $phpbb_auth->get_auth_forum(); // *************** *** 187,191 **** $firstcount = $user_data[0]['user_posts']; ! $get_db_stats = get_db_stat( 'postcount' ); for( $i = 0; $i < $user_count; $i++ ) --- 187,191 ---- $firstcount = $user_data[0]['user_posts']; ! $get_db_stats = phpBB2::get_db_stat( 'postcount' ); for( $i = 0; $i < $user_count; $i++ ) *************** *** 199,203 **** "PERCENTAGE" => $percentage, "BAR" => $bar_percent, ! "URL" => append_sid(PHPBB_URL . "profile.php?mode=viewprofile&u=" . $user_data[$i]['user_id']), "POSTS" => $user_data[$i]['user_posts']) ); --- 199,203 ---- "PERCENTAGE" => $percentage, "BAR" => $bar_percent, ! "URL" => mx_append_sid(PHPBB_URL . "profile.php?mode=viewprofile&u=" . $user_data[$i]['user_id']), "POSTS" => $user_data[$i]['user_posts']) ); *************** *** 229,233 **** "TITLE" => $topic_data[$i]['topic_title'], "REPLIES" => $topic_data[$i]['topic_replies'], ! "URL" => append_sid(PHPBB_URL . "viewtopic.php?t=" . $topic_data[$i]['topic_id'])) ); } --- 229,233 ---- "TITLE" => $topic_data[$i]['topic_title'], "REPLIES" => $topic_data[$i]['topic_replies'], ! "URL" => mx_append_sid(PHPBB_URL . "viewtopic.php?t=" . $topic_data[$i]['topic_id'])) ); } *************** *** 259,263 **** "TITLE" => $topic_data[$i]['topic_title'], "VIEWS" => $topic_data[$i]['topic_views'], ! "URL" => append_sid(PHPBB_URL . "viewtopic.php?t=" . $topic_data[$i]['topic_id'])) ); } --- 259,263 ---- "TITLE" => $topic_data[$i]['topic_title'], "VIEWS" => $topic_data[$i]['topic_views'], ! "URL" => mx_append_sid(PHPBB_URL . "viewtopic.php?t=" . $topic_data[$i]['topic_id'])) ); } *************** *** 271,278 **** // $total_posts = $get_db_stats; //Already queried above ! $total_users = get_db_stat('usercount'); ! $total_topics = get_db_stat('topiccount'); ! $start_date = create_date($board_config['default_dateformat'], $board_config['board_startdate'], $board_config['board_timezone']); $boarddays = ( time() - $board_config['board_startdate'] ) / 86400; --- 271,278 ---- // $total_posts = $get_db_stats; //Already queried above ! $total_users = phpBB2::get_db_stat('usercount'); ! $total_topics = phpBB2::get_db_stat('topiccount'); ! $start_date = phpBB2::create_date($board_config['default_dateformat'], $board_config['board_startdate'], $board_config['board_timezone']); $boarddays = ( time() - $board_config['board_startdate'] ) / 86400; *************** *** 429,433 **** // Newest user data // ! $newest_userdata = get_db_stat('newestuser'); $newest_user = $newest_userdata['username']; $newest_uid = $newest_userdata['user_id']; --- 429,433 ---- // Newest user data // ! $newest_userdata = phpBB2::get_db_stat('newestuser'); $newest_user = $newest_userdata['username']; $newest_uid = $newest_userdata['user_id']; *************** *** 455,464 **** } $row = $db->sql_fetchrow($result); ! $most_users_date = ( $row['config_value'] > 0 ) ? create_date($board_config['default_dateformat'], $row['config_value'], $board_config['board_timezone']) : $lang['Not_available']; $row = $db->sql_fetchrow($result); $most_users = ( $row['config_value'] > 0 ) ? $row['config_value'] : $lang['Not_available']; $statistic_array = array($lang['Number_posts'], $lang['Posts_per_day'], $lang['Number_topics'], $lang['Topics_per_day'], $lang['Number_users'], $lang['Users_per_day'], $lang['Board_started'], $lang['Board_Up_Days'], $lang['Database_size'], $lang['Avatar_dir_size'], $lang['Latest_Reg_User_Date'], $lang['Latest_Reg_User'], $lang['Most_Ever_Online_Date'], $lang['Most_Ever_Online'], $lang['Gzip_compression']); ! $value_array = array($total_posts, $posts_per_day, $total_topics, $topics_per_day, $total_users, $users_per_day, $start_date, sprintf('%.2f', $boarddays), $dbsize, $avatar_dir_size, create_date($board_config['default_dateformat'], $newest_user_date, $board_config['board_timezone']), sprintf('<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . '">' . $newest_user . '</a>'), $most_users_date, $most_users, ( $board_config['gzip_compress'] ) ? $lang['Enabled'] : $lang['Disabled']); // --- 455,464 ---- } $row = $db->sql_fetchrow($result); ! $most_users_date = ( $row['config_value'] > 0 ) ? phpBB2::create_date($board_config['default_dateformat'], $row['config_value'], $board_config['board_timezone']) : $lang['Not_available']; $row = $db->sql_fetchrow($result); $most_users = ( $row['config_value'] > 0 ) ? $row['config_value'] : $lang['Not_available']; $statistic_array = array($lang['Number_posts'], $lang['Posts_per_day'], $lang['Number_topics'], $lang['Topics_per_day'], $lang['Number_users'], $lang['Users_per_day'], $lang['Board_started'], $lang['Board_Up_Days'], $lang['Database_size'], $lang['Avatar_dir_size'], $lang['Latest_Reg_User_Date'], $lang['Latest_Reg_User'], $lang['Most_Ever_Online_Date'], $lang['Most_Ever_Online'], $lang['Gzip_compression']); ! $value_array = array($total_posts, $posts_per_day, $total_topics, $topics_per_day, $total_users, $users_per_day, $start_date, sprintf('%.2f', $boarddays), $dbsize, $avatar_dir_size, phpBB2::create_date($board_config['default_dateformat'], $newest_user_date, $board_config['board_timezone']), sprintf('<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$newest_uid") . '">' . $newest_user . '</a>'), $most_users_date, $most_users, ( $board_config['gzip_compress'] ) ? $lang['Enabled'] : $lang['Disabled']); // Index: mx_last_msg.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_last_msg.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_last_msg.php 5 Jun 2007 21:20:34 -0000 1.4 --- mx_last_msg.php 9 Sep 2007 16:49:36 -0000 1.5 *************** *** 54,58 **** // Authorization SQL // ! $auth_data_sql_msg = get_auth_forum(); if ( empty($forum_lst_msg) ) --- 54,58 ---- // Authorization SQL // ! $auth_data_sql_msg = $phpbb_auth->get_auth_forum(); if ( empty($forum_lst_msg) ) *************** *** 175,179 **** 'U_ALIGN' => $align, 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), ! 'U_URL' => append_sid(PORTAL_URL . 'index.php' . '?block_id=' . $block_id), 'U_URL_NEXT' => $url_next, 'U_URL_PREV' => $url_prev, --- 175,179 ---- 'U_ALIGN' => $align, 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), ! 'U_URL' => mx_append_sid(PORTAL_URL . 'index.php' . '?block_id=' . $block_id), 'U_URL_NEXT' => $url_next, 'U_URL_PREV' => $url_prev, *************** *** 200,204 **** $message = $postrow[$row_count]['topic_title']; ! $url = append_sid(PHPBB_URL . 'viewtopic.php?'. 'lmsg_start=' . $msg_start . '&t=' . $postrow[$row_count]['topic_id'] . '#' . $postrow[$row_count]['topic_last_post_id']); if ( $postrow[$row_count]['topic_status'] == TOPIC_MOVED ) --- 200,204 ---- $message = $postrow[$row_count]['topic_title']; ! $url = mx_append_sid(PHPBB_URL . 'viewtopic.php?'. 'lmsg_start=' . $msg_start . '&t=' . $postrow[$row_count]['topic_id'] . '#' . $postrow[$row_count]['topic_last_post_id']); if ( $postrow[$row_count]['topic_status'] == TOPIC_MOVED ) *************** *** 283,287 **** $folder_alt = $lang['New_posts']; ! $newest_post_img = '<a href="' . append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['last_msg_icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; } else --- 283,287 ---- $folder_alt = $lang['New_posts']; ! $newest_post_img = '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['last_msg_icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; } else *************** *** 298,302 **** $folder_alt = ( $postrow[$row_count]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['New_posts']; ! $newest_post_img = '<a href="' . append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['last_msg_icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; } } --- 298,302 ---- $folder_alt = ( $postrow[$row_count]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['New_posts']; ! $newest_post_img = '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['last_msg_icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; } } *************** *** 320,324 **** if ( $display_author == "TRUE" ) { ! $topic_author = ( $postrow[$row_count]['user_id'] != ANONYMOUS ) ? '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $postrow[$row_count]['user_id']) . '" class="gensmall">' : ''; $topic_author .= ( $postrow[$row_count]['user_id'] != ANONYMOUS ) ? $postrow[$row_count]['username'] : ( ( $postrow[$row_count]['post_username'] != '' ) ? $postrow[$row_count]['post_username'] : $lang['Guest'] ); $topic_author .= ( $postrow[$row_count]['user_id'] != ANONYMOUS ) ? '</a>' : ''; --- 320,324 ---- if ( $display_author == "TRUE" ) { ! $topic_author = ( $postrow[$row_count]['user_id'] != ANONYMOUS ) ? '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $postrow[$row_count]['user_id']) . '" class="gensmall">' : ''; $topic_author .= ( $postrow[$row_count]['user_id'] != ANONYMOUS ) ? $postrow[$row_count]['username'] : ( ( $postrow[$row_count]['post_username'] != '' ) ? $postrow[$row_count]['post_username'] : $lang['Guest'] ); $topic_author .= ( $postrow[$row_count]['user_id'] != ANONYMOUS ) ? '</a>' : ''; *************** *** 331,335 **** if ( $display_last_author == "TRUE" ) { ! $last_post_author = ( $postrow[$row_count]['id2'] == ANONYMOUS ) ? ( ( $postrow[$row_count]['post_username'] != '' ) ? $postrow[$row_count]['post_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $postrow[$row_count]['id2']) . '" class="gensmall">' . $postrow[$row_count]['user2'] . '</a>'; } else --- 331,335 ---- if ( $display_last_author == "TRUE" ) { ! $last_post_author = ( $postrow[$row_count]['id2'] == ANONYMOUS ) ? ( ( $postrow[$row_count]['post_username'] != '' ) ? $postrow[$row_count]['post_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $postrow[$row_count]['id2']) . '" class="gensmall">' . $postrow[$row_count]['user2'] . '</a>'; } else *************** *** 351,355 **** if ( $display_date == "TRUE" ) { ! $message_date = create_date($board_config['default_dateformat'], $postrow[$row_count]['post_time'], $board_config['board_timezone']); } else --- 351,355 ---- if ( $display_date == "TRUE" ) { ! $message_date = phpBB2::create_date($board_config['default_dateformat'], $postrow[$row_count]['post_time'], $board_config['board_timezone']); } else *************** *** 373,377 **** } ! $forum_url = append_sid(PHPBB_URL . 'viewforum.php?'. 'lmsg_start=' . $msg_start . '&f=' . $postrow[$row_count]['forum_id']); } else --- 373,377 ---- } ! $forum_url = mx_append_sid(PHPBB_URL . 'viewforum.php?'. 'lmsg_start=' . $msg_start . '&f=' . $postrow[$row_count]['forum_id']); } else *************** *** 383,387 **** if ( $display_icon_view == "TRUE" ) { ! $last_post_url = '<a href="' . append_sid(PHPBB_URL . "viewtopic.$phpEx?". "lmsg_start=" . $msg_start . "&" . POST_POST_URL . '=' . $postrow[$row_count]['topic_last_post_id']) . '#' . $postrow[$row_count]['topic_last_post_id'] . '"><img src="' . $images['last_msg_icon_latest_reply'] . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>'; } else --- 383,387 ---- if ( $display_icon_view == "TRUE" ) { ! $last_post_url = '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?". "lmsg_start=" . $msg_start . "&" . POST_POST_URL . '=' . $postrow[$row_count]['topic_last_post_id']) . '#' . $postrow[$row_count]['topic_last_post_id'] . '"><img src="' . $images['last_msg_icon_latest_reply'] . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>'; } else Index: mx_announce.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_announce.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_announce.php 5 May 2007 20:13:40 -0000 1.3 --- mx_announce.php 9 Sep 2007 16:49:36 -0000 1.4 *************** *** 75,79 **** // Authorization SQL // ! $auth_data_sql = get_auth_forum(); if ( empty($announce_forum) ) { --- 75,80 ---- // Authorization SQL // ! $auth_data_sql = $phpbb_auth->get_auth_forum(); ! if ( empty($announce_forum) ) { *************** *** 142,146 **** $poster_id = $postrow[$i]['user_id']; $poster = ( $poster_id == ANONYMOUS ) ? $lang['Guest'] : $postrow[$i]['username']; ! $post_date = create_date($board_config['default_dateformat'], $postrow[$i]['post_time'], $board_config['board_timezone']); $title = $postrow[$i]['topic_title']; --- 143,147 ---- $poster_id = $postrow[$i]['user_id']; $poster = ( $poster_id == ANONYMOUS ) ? $lang['Guest'] : $postrow[$i]['username']; ! $post_date = phpBB2::create_date($board_config['default_dateformat'], $postrow[$i]['post_time'], $board_config['board_timezone']); $title = $postrow[$i]['topic_title']; *************** *** 265,269 **** $folder_alt = $lang['New_posts']; ! $newest_post_img = '<a href="' . append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['mx_icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; } else --- 266,270 ---- $folder_alt = $lang['New_posts']; ! $newest_post_img = '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['mx_icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; } else *************** *** 280,284 **** $folder_alt = ( $postrow[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['New_posts']; ! $newest_post_img = '<a href="' . append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['mx_icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; } } --- 281,285 ---- $folder_alt = ( $postrow[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['New_posts']; ! $newest_post_img = '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest") . '"><img src="' . $images['mx_icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; } } *************** *** 302,312 **** $replies = $postrow[$i]['topic_replies']; $views = $postrow[$i]['topic_views']; ! $first_post_time = create_date($board_config['default_dateformat'], $postrow[$i]['topic_time'], $board_config['board_timezone']); ! $last_post_time = create_date($board_config['default_dateformat'], $postrow[$i]['last_post_time'], $board_config['board_timezone']); ! $last_post_author = ( $postrow[$i]['id2'] == ANONYMOUS ) ? ( ( $postrow[$i]['post_username2'] != '' ) ? $postrow[$i]['post_username2'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $postrow[$i]['id2']) . '">' . $postrow[$i]['user2'] . '</a>'; ! $last_post_img = '<a href="' . append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $postrow[$i]['topic_last_post_id']) . '#' . $postrow[$i]['topic_last_post_id'] . '"><img src="' . $images['mx_icon_latest_reply'] . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>'; ! $last_post_url = append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $postrow[$i]['topic_last_post_id'] . '#' . $postrow[$i]['topic_last_post_id']); $template->assign_block_vars("postrow", array( --- 303,313 ---- $replies = $postrow[$i]['topic_replies']; $views = $postrow[$i]['topic_views']; ! $first_post_time = phpBB2::create_date($board_config['default_dateformat'], $postrow[$i]['topic_time'], $board_config['board_timezone']); ! $last_post_time = phpBB2::create_date($board_config['default_dateformat'], $postrow[$i]['last_post_time'], $board_config['board_timezone']); ! $last_post_author = ( $postrow[$i]['id2'] == ANONYMOUS ) ? ( ( $postrow[$i]['post_username2'] != '' ) ? $postrow[$i]['post_username2'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $postrow[$i]['id2']) . '">' . $postrow[$i]['user2'] . '</a>'; ! $last_post_img = '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $postrow[$i]['topic_last_post_id']) . '#' . $postrow[$i]['topic_last_post_id'] . '"><img src="' . $images['mx_icon_latest_reply'] . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>'; ! $last_post_url = mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $postrow[$i]['topic_last_post_id'] . '#' . $postrow[$i]['topic_last_post_id']); $template->assign_block_vars("postrow", array( *************** *** 322,328 **** 'IMAGE' => $module_root_path . TEMPLATE_ROOT_PATH . 'images/' . $annoucement_image, ! 'U_TOPIC_URL' => append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . '=' . $postrow[$i]['topic_id']), 'U_LAST_POST_URL' => $last_post_url, ! 'U_PROFILE_POSTER' => append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&u=$poster_id"), 'REPLIES' => $replies, --- 323,329 ---- 'IMAGE' => $module_root_path . TEMPLATE_ROOT_PATH . 'images/' . $annoucement_image, ! 'U_TOPIC_URL' => mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . '=' . $postrow[$i]['topic_id']), 'U_LAST_POST_URL' => $last_post_url, ! 'U_PROFILE_POSTER' => mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&u=$poster_id"), 'REPLIES' => $replies, Index: mx_forum.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_forum.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_forum.php 5 May 2007 20:13:40 -0000 1.4 --- mx_forum.php 9 Sep 2007 16:49:36 -0000 1.5 *************** *** 54,61 **** $template->assign_vars(array( ! "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid(PORTAL_URL . "index.$phpEx") . '">' ) ); ! $message = $lang['Forums_marked_read'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(PORTAL_URL . "index.$phpEx") . '">', '</a> '); mx_message_die(GENERAL_MESSAGE, $message); --- 54,61 ---- $template->assign_vars(array( ! "META" => '<meta http-equiv="refresh" content="3;url=' . mx_append_sid(PORTAL_URL . "index.$phpEx") . '">' ) ); ! $message = $lang['Forums_marked_read'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . mx_append_sid(PORTAL_URL . "index.$phpEx") . '">', '</a> '); mx_message_die(GENERAL_MESSAGE, $message); *************** *** 73,79 **** // /* ! $total_posts = get_db_stat('postcount'); ! $total_users = get_db_stat('usercount'); ! $newest_userdata = get_db_stat('newestuser'); $newest_user = $newest_userdata['username']; $newest_uid = $newest_userdata['user_id']; --- 73,79 ---- // /* ! $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']; *************** *** 223,227 **** while( $row = $db->sql_fetchrow($result) ) { ! $forum_moderators[$row['forum_id']][] = '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . '">' . $row['username'] . '</a>'; } $db->sql_freeresult($result); --- 223,227 ---- while( $row = $db->sql_fetchrow($result) ) { ! $forum_moderators[$row['forum_id']][] = '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . '">' . $row['username'] . '</a>'; } $db->sql_freeresult($result); *************** *** 243,247 **** while( $row = $db->sql_fetchrow($result) ) { ! $forum_moderators[$row['forum_id']][] = '<a href="' . append_sid(PHPBB_URL . "groupcp.$phpEx?" . POST_GROUPS_URL . "=" . $row['group_id']) . '">' . $row['group_name'] . '</a>'; } $db->sql_freeresult($result); --- 243,247 ---- while( $row = $db->sql_fetchrow($result) ) { ! $forum_moderators[$row['forum_id']][] = '<a href="' . mx_append_sid(PHPBB_URL . "groupcp.$phpEx?" . POST_GROUPS_URL . "=" . $row['group_id']) . '">' . $row['group_name'] . '</a>'; } $db->sql_freeresult($result); *************** *** 256,260 **** */ // Fix, using the cached auth data ! $auth_data_sql = get_auth_forum(); $is_auth_tmp = explode(',', $auth_data_sql); --- 256,260 ---- */ // Fix, using the cached auth data ! $auth_data_sql = $phpbb_auth->get_auth_forum(); $is_auth_tmp = explode(',', $auth_data_sql); *************** *** 283,287 **** //'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>'), 'FORUM_IMG' => $images['mx_forum'], --- 283,287 ---- //'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>'), 'FORUM_IMG' => $images['mx_forum'], *************** *** 305,310 **** 'L_MARK_FORUMS_READ' => $lang['Mark_all_forums'], ! //'U_MARK_READ' => append_sid(PORTAL_URL . "modules/mx_coreblocks/mx_forum.$phpEx?mark=forums")) ! 'U_MARK_READ' => append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=' . $page_id . '&mark=forums')) ); --- 305,310 ---- 'L_MARK_FORUMS_READ' => $lang['Mark_all_forums'], ! //'U_MARK_READ' => mx_append_sid(PORTAL_URL . "modules/mx_coreblocks/mx_forum.$phpEx?mark=forums")) ! 'U_MARK_READ' => mx_append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=' . $page_id . '&mark=forums')) ); *************** *** 339,343 **** 'CAT_ID' => $cat_id, 'CAT_DESC' => $category_rows[$i]['cat_title'], ! 'U_VIEWCAT' => append_sid(PHPBB_URL . "index.$phpEx?" . POST_CAT_URL . "=$cat_id")) ); --- 339,343 ---- 'CAT_ID' => $cat_id, 'CAT_DESC' => $category_rows[$i]['cat_title'], ! 'U_VIEWCAT' => mx_append_sid(PHPBB_URL . "index.$phpEx?" . POST_CAT_URL . "=$cat_id")) ); *************** *** 413,423 **** if ( $forum_data[$j]['forum_last_post_id'] ) { ! $last_post_time = create_date($board_config['default_dateformat'], $forum_data[$j]['post_time'], $board_config['board_timezone']); $last_post = $last_post_time . '<br />'; ! $last_post .= ( $forum_data[$j]['user_id'] == ANONYMOUS ) ? ( ($forum_data[$j]['post_username'] != '' ) ? $forum_data[$j]['post_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $forum_data[$j]['user_id']) . '">' . $forum_data[$j]['username'] . '</a> '; ! $last_post .= '<a href="' . append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $forum_data[$j]['forum_last_post_id']) . '#' . $forum_data[$j]['forum_last_post_id'] . '"><img src="' . $images['mx_icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>'; } else --- 413,423 ---- if ( $forum_data[$j]['forum_last_post_id'] ) { ! $last_post_time = phpBB2::create_date($board_config['default_dateformat'], $forum_data[$j]['post_time'], $board_config['board_timezone']); $last_post = $last_post_time . '<br />'; ! $last_post .= ( $forum_data[$j]['user_id'] == ANONYMOUS ) ? ( ($forum_data[$j]['post_username'] != '' ) ? $forum_data[$j]['post_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $forum_data[$j]['user_id']) . '">' . $forum_data[$j]['username'] . '</a> '; ! $last_post .= '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $forum_data[$j]['forum_last_post_id']) . '#' . $forum_data[$j]['forum_last_post_id'] . '"><img src="' . $images['mx_icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>'; } else *************** *** 454,458 **** 'L_FORUM_FOLDER_ALT' => $folder_alt, ! 'U_VIEWFORUM' => append_sid(PHPBB_URL . "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id")) ); } --- 454,458 ---- 'L_FORUM_FOLDER_ALT' => $folder_alt, ! 'U_VIEWFORUM' => mx_append_sid(PHPBB_URL . "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id")) ); } |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:49:43
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks/templates/subSilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9427/mx_coreblocks/templates/subSilver Removed Files: index.htm mx_google.tpl mx_includex.tpl mx_language.tpl mx_login.tpl mx_online.tpl mx_search_body.tpl mx_search_results.tpl mx_site_log.tpl mx_theme.tpl Log Message: Ok, massive update for 2.9.x. --- mx_search_results.tpl DELETED --- --- mx_online.tpl DELETED --- --- mx_search_body.tpl DELETED --- --- mx_site_log.tpl DELETED --- --- mx_login.tpl DELETED --- --- mx_theme.tpl DELETED --- --- mx_language.tpl DELETED --- --- mx_google.tpl DELETED --- --- mx_includex.tpl DELETED --- --- index.htm DELETED --- |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:49:42
|
Update of /cvsroot/mxbb/core/modules/mx_coreblocks/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9427/mx_coreblocks/templates/_core Added Files: index.htm mx_google.tpl mx_includex.tpl mx_language.tpl mx_login.tpl mx_online.tpl mx_search_body.tpl mx_search_results.tpl mx_site_log.tpl mx_theme.tpl Log Message: Ok, massive update for 2.9.x. --- NEW FILE: mx_search_results.tpl --- <table width="100%" cellspacing="1" cellpadding="2" border="0" align="center"> <tr> <td align="left" valign="bottom"><span class="maintitle">{L_SEARCH_MATCHES}</span><br /></td> </tr> </table> <table width="100%" cellspacing="1" cellpadding="2" border="0" align="center"> <tr> <td align="left"><span class="nav"><a href="{U_NEW_SEARCH}" class="nav">{L_NEW_SEARCH}</a></span></td> </tr> </table> <table width="100%" cellpadding="2" cellspacing="0" border="0" class="forumline" align="center" style="border-top:none;"> <tr> <th align="left" class="thCornerL" nowrap="nowrap" width="20%"> {L_PAGE} </th> <th align="left" class="thHead" nowrap="nowrap"> {L_BLOCK} </th> </tr> <!-- BEGIN searchresults --> <tr> <td class="row1"> <span class="name">{searchresults.PAGE_TITLE_URL}</span> <span class="gensmall">{searchresults.PAGE_DESC}</span> </td> <td class="row2" align="left" valign="middle"> <span class="forumlink">{searchresults.BLOCK_TITLE_URL}</span> <span class="gensmall">{searchresults.BLOCK_DESC}</span> <span class="gensmall">{searchresults.L_BLOCK_UPDATED}{searchresults.BLOCK_EDITOR} {searchresults.EDIT_TIME}</span> </td> </tr> <!-- END searchresults --> <tr> <td class="cat" colspan="2" height="28" valign="middle"> </td> </tr> </table> <table width="100%" cellspacing="1" border="0" align="center" cellpadding="2"> <tr> <td align="left" valign="top"><span class="nav">{PAGE_NUMBER}</span></td> <td align="right" valign="top" nowrap="nowrap"><span class="nav">{PAGINATION}</span><br /><span class="gensmall">{S_TIMEZONE}</span></td> </tr> </table> --- NEW FILE: mx_online.tpl --- <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> <td class="row1" align="center" valign="middle" rowspan="2"> <a href="{U_VIEWONLINE}" class="cattitle"><img src="{ONLINE_IMG}" alt="{L_WHO_IS_ONLINE}" border="0" /></a> </td> <td class="row1" align="left" width="100%"> <span class="gensmall">{TOTAL_POSTS}<br />{TOTAL_USERS}<br />{NEWEST_USER}</span> </td> </tr> <tr> <td class="row1" align="left"> <span class="gensmall">{TOTAL_USERS_ONLINE} [ {L_WHOSONLINE_ADMIN} ] [ {L_WHOSONLINE_MOD} ]<br />{RECORD_USERS}<br />{LOGGED_IN_USER_LIST}</span> </td> </tr> </table> --- NEW FILE: mx_search_body.tpl --- <form action="{S_SEARCH_ACTION}" method="post"> <table width="100%" cellpadding="2" cellspacing="0" border="0" align="center"> <tr> <td align="left"><span class="nav"><a href="{U_KB}" class="nav">{L_KB}</a></span></td> </tr> </table> <table class="forumline" width="100%" cellpadding="2" cellspacing="1" border="0" style="border-top:none;"> <tr> <th class="thHead" colspan="4" height="25">{L_SEARCH_QUERY}</th> </tr> <tr> <td class="row1" colspan="2" width="50%"><span class="gen">{L_SEARCH_KEYWORDS}:</span><br /><span class="gensmall">{L_SEARCH_KEYWORDS_EXPLAIN}</span></td> <td class="row2" colspan="2" valign="top"><span class="genmed"><input type="text" style="width: 300px" class="post" name="search_keywords" size="30" /><br /><input type="radio" name="search_terms" value="any" checked="checked" /> {L_SEARCH_ANY_TERMS}<br /><input type="radio" name="search_terms" value="all" /> {L_SEARCH_ALL_TERMS}</span></td> </tr> <tr> <td class="cat" colspan="4" align="center" height="28">{S_HIDDEN_FIELDS}<input class="liteoption" type="submit" value="{S_SEARCH}" /></td> </tr> </table> <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> <tr> <td align="right" valign="middle"><span class="gensmall">{S_TIMEZONE}</span></td> </tr> </table> </form> --- NEW FILE: mx_site_log.tpl --- <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <!-- BEGIN no_row --> <tr> <td class="row1" align="left" colspan="2">{no_row.L_NO_ITEMS}</td> </tr> <!-- END no_row --> <!-- BEGIN msg_row --> <tr> <td width="5%" class="row2" align="center"> <span class="cattitle"><img src="{msg_row.FOLDER_IMG}" width="19" height="18" alt="{msg_row.L_TOPIC_FOLDER_ALT}" title="{msg_row.L_TOPIC_FOLDER_ALT}" /></span> </td> <td class="row1" align="left"> <span class="gen"><b><a href="{msg_row.U_PAGE}" target="{U_TARGET}" class="genmed">{msg_row.LAST_PAGE}</a></b></span><br /> <span class="genmed">» <a href="{msg_row.U_BLOCK}" target="{U_TARGET}" class="genmed">{msg_row.LAST_BLOCK}</a></span><br /> <span class="gensmall"><i>{msg_row.EXTRA}</i>{msg_row.L_BLOCK_UPDATED}{msg_row.EDITOR} ({msg_row.EDIT_TIME}</span>) </td> </tr> <!-- END msg_row --> <tr> <td align="right" valign="top" nowrap="nowrap" colspan="2" class="cat"><span class="gensmall">{PAGINATION}</span></td> </tr> </table> --- NEW FILE: mx_login.tpl --- <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> <td class="row1" valign="middle" height="28"> <span class="gensmall"> <form action="{S_LOGIN_ACTION}" method="post"> {L_USERNAME}:<br /><input class="post" type="text" name="username" size="10" /><br /> {L_PASSWORD}:<br /><input class="post" type="password" name="password" size="10" /><br /> <!-- BEGIN switch_allow_autologin --> <input class="text" type="checkbox" name="autologin" /> {L_AUTO_LOGIN}<br /> <!-- END switch_allow_autologin --> <!--<input type="checkbox" class="post" name="autologin" value="ON" /> {L_AUTO_LOGIN}<br />--> <input type="submit" class="mainoption" name="login" value="{L_LOGIN}" /> </form> </span> </td> </tr> </table> --- NEW FILE: mx_theme.tpl --- <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <!-- BEGIN switch_is_admin --> <tr> <td class="cat" align="center" valign="middle" ><span class="gensmall"> {switch_is_admin.L_CHANGE_NOW} </span></td> </tr> <tr> <td class="row1" align="center" valign="middle" height="28"> <form method="post" action="{ACTION_URL}"> {switch_is_admin.STYLE_SELECT} <br /> <input type="submit" class="mainoption" name="change_default_theme" value="{L_CHANGE_NOW}" /> </form> </td> </tr> <!-- END switch_is_admin --> <!-- BEGIN switch_is_user --> <tr> <td class="cat" align="center" valign="middle" ><span class="gensmall"> {switch_is_user.L_CHANGE_NOW} </span></td> </tr> <tr> <td class="row1" align="center" valign="middle" height="28"> <form method="post" action="{ACTION_URL}"> {switch_is_user.STYLE_SELECT} <br /> <input type="submit" class="mainoption" name="change_user_theme" value="{L_CHANGE_NOW}" /> </form> </td> </tr> <!-- END switch_is_user --> </table> --- NEW FILE: mx_language.tpl --- <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <!-- BEGIN switch_is_admin --> <tr> <td class="cat" align="center" valign="middle" ><span class="gensmall"> {switch_is_admin.L_CHANGE_NOW} </span></td> </tr> <tr> <td class="row1" align="center" valign="middle" height="28"> <form method="post" action="{ACTION_URL}"> {switch_is_admin.LANG_SELECT} <br /> <input type="submit" class="mainoption" name="change_default_lang" value="{L_CHANGE_NOW}" /> </form> </td> </tr> <!-- END switch_is_admin --> <!-- BEGIN switch_is_user --> <tr> <td class="cat" align="center" valign="middle" ><span class="gensmall"> {switch_is_user.L_CHANGE_NOW} </span></td> </tr> <tr> <td class="row1" align="center" valign="middle" height="28"> <form method="post" action="{ACTION_URL}"> {switch_is_user.LANG_SELECT} <br /> <input type="submit" class="mainoption" name="change_user_lang" value="{L_CHANGE_NOW}" /> </form> </td> </tr> <!-- END switch_is_user --> </table> --- NEW FILE: mx_google.tpl --- <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <tr> <td class="row1" align="center" valign="middle" height="28"> <a href="http://www.google.com" target="_blank"><img src="http://www.google.com/logos/Logo_40wht.gif" border="0" alt="Google" title="Google" align="absmiddle" /></a> <form method="get" action="http://www.google.com/search"> <input class="post" type="text" name="q" size="22" maxlength="255" value="" /> <input type="submit" class="mainoption" name="btnG" value="{L_SEARCH}" /> </form> </td> </tr> </table> --- NEW FILE: mx_includex.tpl --- <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline" style="border-top:none;"> <!-- BEGIN iframe_mode --> <tr> <td class="row1" align="left"> <iframe width="100%" height="{iframe_mode.IFRAME_HEIGHT}" src="{iframe_mode.FILE_URL}" frameborder="0"> If you can see this, your browser doesn't understand IFRAME. However, we'll still <a href="{iframe_mode.FILE_URL}">link</a> you to the file. </iframe> </td> </tr> <!-- END iframe_mode --> <!-- BEGIN textfile_mode --> <tr> <td class="row1" align="left" >{textfile_mode.FILE_CONTENTS}</td> </tr> <!-- END textfile_mode --> <!-- BEGIN multimedia_mode --> <tr> <td class="row1" align="left"> <div align="center"> <object width="320" height="315" classid="clsid:22D6F312-B0F6-11D0-94AB-0080C74C7E95"> <param name="src" value="{multimedia_mode.MEDIA_URL}"> <embed src="/directory/sample.wmv" {multimedia_mode.WIDTH} {multimedia_mode.HEIGHT} pluginspage="http://www.microsoft.com/Windows/MediaPlayer/" type="video/x-ms-asf-plugin"> </embed> </object> <!-- <embed type="application/x-mplayer2" src="{multimedia_mode.MEDIA_URL}" {multimedia_mode.HEIGHT} {multimedia_mode.WIDTH} border="0" autoplay="TRUE" controller="TRUE" pluginspage="http://www.microsoft.com/windows/windowsmedia/default.asp" ></embed> --> </div> </td> </tr> <!-- END multimedia_mode --> <!-- BEGIN pic_mode --> <tr> <td class="row1" align="left" >{pic_mode.FILE_CONTENTS}</td> </tr> <!-- END pic_mode --> </table> --- NEW FILE: index.htm --- <html> <head> <title></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> </head> <body bgcolor="#FFFFFF" text="#000000"> </body> </html> |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:49:42
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9427/mx_textblocks Modified Files: TextBlocks.pak mx_textblock_html.php mx_textblock_multi.php Log Message: Ok, massive update for 2.9.x. Index: mx_textblock_html.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_html.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mx_textblock_html.php 5 May 2007 20:13:41 -0000 1.15 --- mx_textblock_html.php 9 Sep 2007 16:49:36 -0000 1.16 *************** *** 44,48 **** 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), 'L_TITLE' => ( !empty($lang[$title]) ? $lang[$title] : $title ), ! 'U_URL' => append_sid(PORTAL_URL . 'index.' . $phpEx . '?block_id=' . $block_id), 'U_TEXT' => $message, 'BLOCK_ID' => $block_id, --- 44,48 ---- 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), 'L_TITLE' => ( !empty($lang[$title]) ? $lang[$title] : $title ), ! 'U_URL' => mx_append_sid(PORTAL_URL . 'index.' . $phpEx . '?block_id=' . $block_id), 'U_TEXT' => $message, 'BLOCK_ID' => $block_id, Index: mx_textblock_multi.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/mx_textblock_multi.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** mx_textblock_multi.php 5 May 2007 20:13:41 -0000 1.20 --- mx_textblock_multi.php 9 Sep 2007 16:49:36 -0000 1.21 *************** *** 124,128 **** if( $page_num != $i ) { ! $temp_url = append_sid(PORTAL_URL . "index.php?page=$page_id&mode=pagination&page_num=$page_number" . $xtra_dynamic); $page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . ' - ' . $article_toc . '</a>'; } --- 124,128 ---- if( $page_num != $i ) { ! $temp_url = mx_append_sid(PORTAL_URL . "index.php?page=$page_id&mode=pagination&page_num=$page_number" . $xtra_dynamic); $page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . ' - ' . $article_toc . '</a>'; } *************** *** 160,164 **** if( $page_num != $i ) { ! $temp_url = append_sid(PORTAL_URL . "index.php?page=$page_id&mode=pagination&page_num=$page_number" . $xtra_dynamic); $page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . '</a>'; } --- 160,164 ---- if( $page_num != $i ) { ! $temp_url = mx_append_sid(PORTAL_URL . "index.php?page=$page_id&mode=pagination&page_num=$page_number" . $xtra_dynamic); $page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . '</a>'; } Index: TextBlocks.pak =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/TextBlocks.pak,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** TextBlocks.pak 21 Jul 2007 23:08:20 -0000 1.18 --- TextBlocks.pak 9 Sep 2007 16:49:36 -0000 1.19 *************** *** 1,3 **** ! module=+:20=+:Textblocks=+:modules/mx_textblocks/=+:Dynamic Textblocks=+: New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:20=+:24=+:TextBlock (phpBB)=+:BBcodes, html and smilies - defined by phpBB config=+:mx_textblock_bbcode.php=+: --- 1,3 ---- ! module=+:20=+:Textblocks=+:modules/mx_textblocks/=+:mxBB Textblocks=+: New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0 function=+:20=+:24=+:TextBlock (phpBB)=+:BBcodes, html and smilies - defined by phpBB config=+:mx_textblock_bbcode.php=+: |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:49:24
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9406 Modified Files: lang_admin.php Log Message: Ok, massive update for 2.9.x. Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** lang_admin.php 22 Jul 2007 21:00:38 -0000 1.77 --- lang_admin.php 9 Sep 2007 16:49:18 -0000 1.78 *************** *** 142,145 **** --- 142,153 ---- $lang['Portal_status_explain'] = 'Handy switch, when reconstructing the site. Only admin is able to view pages and browse around normally. While disabled, the message below is displayed.'; $lang['Disabled_message'] = 'Portal disabled message'; + $lang['Portal_Backend'] = 'mxBB User/Session backend'; + $lang['Portal_Backend_explain'] = 'Select internal, phpBB2 or phpBB3 sessions and users'; + $lang['Portal_Backend_path'] = 'Relative path to phpBB [non-internal]'; + $lang['Portal_Backend_path_explain'] = 'If using non-internal sessions and users, enter the relative path to phpbb, eg \'phpBB2/\' or \'../phpBB2/\'. Note: slashes are important.'; + $lang['Portal_Backend_submit'] = 'Change and validate Backend'; + $lang['Portal_config_valid'] = 'Current Backend Status: '; + $lang['Portal_config_valid_true'] = '<b><font color="green">Valid</font></b>'; + $lang['Portal_config_valid_false'] = '<b><font color="red">Bad Setup. Either your phpBB relative path is wrong or phpBB is uninstalled (your phpBB database is unavailable). Thus, \'internal\' backend is used.</font></b>'; // *************** *** 367,428 **** // - // Install Process - // - $lang['Welcome_install'] = 'Welcome to the mxBB Portal Installation Wizard'; - $lang['Install_Instruction'] = 'Please fill out the details requested below. This installation program will create your personalized config.php (in the Portal root directory) and the Portal database with default settings. Once this is done, you\'ll see a report of all the steps taken (please note mxBB Portal does not modify your phpBB database in any way). You should then login to your board with your administrator username and password and go to the Administration Control Panel to configure your portal with your own preferences. Please note mxBB Portal will not work by itself, phpBB must already be installed and configured. Thank you for choosing mxBB Portal.'; - $lang['Upgrade_Instruction'] = 'mxBB Portal is already installed. Please make backups of your database now !<br /><br />The next step will modify the structure of your database (please note mxBB Portal does not modify your phpBB database in any way). If for whatever reason this upgrade procedure fails, there would be no other way to return to your current state. Please make backups of your database BEFORE proceeding !<br /><br />Once done, click the button below to start the upgrade procedure.'; - $lang['Install_moreinfo'] = '%sRelease Notes%s | %sWelcome Pack%s | %sOnline FAQ%s | %sSupport Forums%s | %sTerms Of Use%s'; - $lang['Install_settings'] = 'Installation Settings'; - $lang['Choose_lang_explain'] = 'Please use the form below to select the language you wish to use throughout the installation process.'; - $lang['Choose_lang'] = 'Choose Language'; - $lang['Language'] = 'Language'; - $lang['Phpbb_path'] = 'phpBB relative path'; - $lang['Phpbb_path_explain'] = 'Relative path to phpBB, ex. phpBB/ or ../phpBB/<br />Note the slashes "/", they are important!'; - $lang['Phpbb_url'] = 'Full phpBB URL'; - $lang['Phpbb_url_explain'] = 'Full phpBB URL, ex. <br />http://www.example.com/phpBB/'; - $lang['Portal_url'] = 'Full Portal URL'; - $lang['Portal_url_explain'] = 'Full Portal URL, ex. <br />http://www.example.com/'; - $lang['Database_settings'] = 'Database Settings'; - $lang['dbms'] = 'Database Type'; - $lang['DB_Host'] = 'Database Server Hostname/DSN'; - $lang['DB_Name'] = 'Your Database Name'; - $lang['DB_Username'] = 'Database Username'; - $lang['DB_Password'] = 'Database Password'; - $lang['Table_Prefix'] = 'phpBB Prefix in DB'; - $lang['MX_Table_Prefix'] = 'mxBB Portal Prefix in DB'; - $lang['Start_Install'] = 'Start mxBB Installation'; - $lang['Start_Upgrade'] = 'Yes, I have already done a backup and wish to upgrade my mxBB Portal now.'; - $lang['Portal_intalled'] = 'mxBB Portal has been installed !'; - $lang['Portal_upgraded'] = 'mxBB Portal has been upgraded !'; - $lang['Unwriteable_config'] = 'Your mxBB config file (config.php) is currently un-writeable.<br /><br />A copy of the config file will be downloaded to you when you click the button below. You should upload this file to your mxBB root directory: %s <br /><br />Once this is done, please %sREFRESH%s this window to proceed with the next installation step.<br /><br />Thank you for choosing mxBB Portal.<br />'; - $lang['Send_file'] = 'Just send the file to me and I\'ll FTP it manually'; - $lang['phpBB_nfnd_retry'] = 'Sorry, but we could not find your phpBB installation. Please press the %sBACK%s button of your browser and retry.'; - $lang['Installation_error'] = 'An error has occurred during the installation'; - $lang['Debug_Information'] = 'DEBUG INFORMATION'; - $lang['Install_phpbb_not_found'] = 'Sorry, we could not find any phpBB board installed on this server.<br />Please install phpBB BEFORE installing mxBB Portal.<br />\n<br />\n'; - $lang['Install_phpbb_db_failed'] = 'Sorry, we could not connect to the phpBB database.<br />Please check that your phpBB is correctly installed and up and running BEFORE installing mxBB Portal.<br />\n<br />\n'; - $lang['Install_phpbb_unsupported'] = 'Unfortunately, the phpBB board installed on this server is not supported by mxBB Portal.<br />Please check the release notes for installation requirements.<br />\n<br />\n'; - $lang['Install_noscript_warning'] = 'Sorry, this installation requires a JavaScript enabled browser. It might not work on your browser.'; - $lang['Upgrade_are_you_sure'] = 'This upgrade procedure will make modifications to your database. Are you sure you wish to proceed?'; - $lang['Writing_config'] = 'Writing config.php file'; - $lang['Processing_schema'] = 'Processing SQL Schema \'%s\''; - $lang['Portal_intalling'] = 'Installing mxBB Portal version %s'; - $lang['Portal_upgrading'] = 'Upgrading mxBB Portal version %s'; - $lang['Install_warning'] = 'There was 1 warning updating the database'; - $lang['Install_warnings'] = 'There were %d warnings updating the database'; - $lang['Subscribe_mxBB_News_now'] = 'We recommend that you subscribe to the %smxBB-News Mailing List%s to receive information about important news and release announcements.<br /> <br />%sSubscribe to mxBB-News, now!%s'; - $lang['Portal_install_done'][0] = 'At this point your basic installation is complete.'; - $lang['Portal_install_done'][1] = 'Please delete the /install/ and /contrib/ folders BEFORE proceeding!!!'; - $lang['Portal_install_done'][2] = 'Remember to make backups as often as possible ;-)'; - $lang['Portal_install_done'][3] = 'Press the button below and use your Administrator username and password to login to the system.'; - $lang['Portal_install_done'][4] = 'Enter the Admin Control Panel - Management, and upgrade ALL modules - one by one!'; - $lang['Portal_install_done'][5] = 'Please be sure to check the Portal Configurations and make any required changes.'; - $lang['Go_to_admincp'] = 'Now visit the Admin Control Panel and upgrade your modules'; - $lang['Thanks_for_choosing'] = 'Thank you for choosing mxBB Portal!'; - $lang['Critical_Error'] = 'CRITICAL ERROR'; - $lang['Error_loading_config'] = 'Sorry, could not load mxBB Portal config.php'; - $lang['Error_database_down'] = 'Sorry, could not connect to the database.'; - - // // Cache // --- 375,378 ---- |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:49:14
|
Update of /cvsroot/mxbb/core/install/schemas In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9080/schemas Modified Files: mysql_schema_install.sql upgrade_schemas_map.php Added Files: mysql_schema_upgrade_to_2.9.0.sql mysql_schema_upgrade_to_2.9.1.sql Log Message: Ok, massive update for 2.9.x. Index: upgrade_schemas_map.php =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/upgrade_schemas_map.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** upgrade_schemas_map.php 23 Jul 2007 21:36:43 -0000 1.20 --- upgrade_schemas_map.php 9 Sep 2007 16:49:08 -0000 1.21 *************** *** 20,23 **** --- 20,25 ---- array('schema' => 'upgrade_to_2.8.0' , 'sql' => "SELECT override_user_style FROM mx_table_portal"), array('schema' => 'upgrade_to_2.8.1' , 'sql' => "SELECT portal_status FROM mx_table_portal"), + array('schema' => 'upgrade_to_2.9.0' , 'sql' => "SELECT portal_desc FROM mx_table_portal"), + array('schema' => 'upgrade_to_2.9.1' , 'sql' => "SELECT themes_id FROM mx_table_themes"), ); --- NEW FILE: mysql_schema_upgrade_to_2.9.0.sql --- # # mxBB-Portal - MySQL Schema - Upgrade "2.9.0" # # $Id: mysql_schema_upgrade_to_2.9.0.sql,v 1.1 2007/09/09 16:49:08 jonohlsson Exp $ # # # Table structure for table 'mx_table_user_group' # CREATE TABLE mx_table_user_group ( group_id mediumint(8) DEFAULT '0' NOT NULL, user_id mediumint(8) DEFAULT '0' NOT NULL, user_pending tinyint(1), KEY group_id (group_id), KEY user_id (user_id) ); # # Table structure for table 'mx_table_groups' # CREATE TABLE mx_table_groups ( group_id mediumint(8) NOT NULL auto_increment, group_type tinyint(4) DEFAULT '1' NOT NULL, group_name varchar(40) NOT NULL, group_description varchar(255) NOT NULL, group_moderator mediumint(8) DEFAULT '0' NOT NULL, group_single_user tinyint(1) DEFAULT '1' NOT NULL, PRIMARY KEY (group_id), KEY group_single_user (group_single_user) ); # -------------------------------------------------------- # # Table structure for table 'mx_table_sessions' # # Note that if you\'re running 3.23.x you may want to make # this table a type HEAP. This type of table is stored # within system memory and therefore for big busy boards # is likely to be noticeably faster than continually # writing to disk ... # CREATE TABLE mx_table_sessions ( session_id char(32) DEFAULT '' NOT NULL, session_user_id mediumint(8) DEFAULT '0' NOT NULL, session_start int(11) DEFAULT '0' NOT NULL, session_time int(11) DEFAULT '0' NOT NULL, session_ip char(8) DEFAULT '0' NOT NULL, session_page int(11) DEFAULT '0' NOT NULL, session_logged_in tinyint(1) DEFAULT '0' NOT NULL, session_admin tinyint(2) DEFAULT '0' NOT NULL, PRIMARY KEY (session_id), KEY session_user_id (session_user_id), KEY session_id_ip_user_id (session_id, session_ip, session_user_id) ); # -------------------------------------------------------- # # Table structure for table `mx_table_sessions_keys` # CREATE TABLE mx_table_sessions_keys ( key_id varchar(32) DEFAULT '0' NOT NULL, user_id mediumint(8) DEFAULT '0' NOT NULL, last_ip varchar(8) DEFAULT '0' NOT NULL, last_login int(11) DEFAULT '0' NOT NULL, PRIMARY KEY (key_id, user_id), KEY last_login (last_login) ); # -------------------------------------------------------- # # Table structure for table 'mx_table_users' # CREATE TABLE mx_table_users ( user_id mediumint(8) NOT NULL, user_active tinyint(1) DEFAULT '1', username varchar(25) NOT NULL, user_password varchar(32) NOT NULL, user_session_time int(11) DEFAULT '0' NOT NULL, user_session_page smallint(5) DEFAULT '0' NOT NULL, user_lastvisit int(11) DEFAULT '0' NOT NULL, user_regdate int(11) DEFAULT '0' NOT NULL, user_level tinyint(4) DEFAULT '0', # user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, # user_timezone decimal(5,2) DEFAULT '0' NOT NULL, # user_style tinyint(4), # user_lang varchar(255), # user_dateformat varchar(14) DEFAULT 'd M Y H:i' NOT NULL, # user_new_privmsg smallint(5) UNSIGNED DEFAULT '0' NOT NULL, # user_unread_privmsg smallint(5) UNSIGNED DEFAULT '0' NOT NULL, # user_last_privmsg int(11) DEFAULT '0' NOT NULL, user_login_tries smallint(5) UNSIGNED DEFAULT '0' NOT NULL, user_last_login_try int(11) DEFAULT '0' NOT NULL, # user_emailtime int(11), # user_viewemail tinyint(1), # user_attachsig tinyint(1), # user_allowhtml tinyint(1) DEFAULT '1', # user_allowbbcode tinyint(1) DEFAULT '1', # user_allowsmile tinyint(1) DEFAULT '1', # user_allowavatar tinyint(1) DEFAULT '1' NOT NULL, # user_allow_pm tinyint(1) DEFAULT '1' NOT NULL, # user_allow_viewonline tinyint(1) DEFAULT '1' NOT NULL, # user_notify tinyint(1) DEFAULT '1' NOT NULL, # user_notify_pm tinyint(1) DEFAULT '0' NOT NULL, # user_popup_pm tinyint(1) DEFAULT '0' NOT NULL, # user_rank int(11) DEFAULT '0', # user_avatar varchar(100), # user_avatar_type tinyint(4) DEFAULT '0' NOT NULL, user_email varchar(255), # user_icq varchar(15), # user_website varchar(100), # user_from varchar(100), # user_sig text, # user_sig_bbcode_uid char(10), # user_aim varchar(255), # user_yim varchar(255), # user_msnm varchar(255), # user_occ varchar(100), # user_interests varchar(255), # user_actkey varchar(32), # user_newpasswd varchar(32), PRIMARY KEY (user_id), KEY user_session_time (user_session_time) ); # -- Users INSERT INTO mx_table_users (user_id, username, user_level, user_regdate, user_password, user_email, user_active) VALUES ( -1, 'Anonymous', 0, 0, '', '', 0); # -- username: admin password: admin (change this or remove it once everything is working!) INSERT INTO mx_table_users (user_id, username, user_level, user_regdate, user_password, user_email, user_active) VALUES ( 2, 'Admin', 1, 0, '21232f297a57a5a743894a0e4a801fc3', 'ad...@yo...', 1); # -- Groups INSERT INTO mx_table_groups (group_id, group_name, group_description, group_single_user) VALUES (1, 'Anonymous', 'Personal User', 1); INSERT INTO mx_table_groups (group_id, group_name, group_description, group_single_user) VALUES (2, 'Admin', 'Personal User', 1); # -- User -> Group INSERT INTO mx_table_user_group (group_id, user_id, user_pending) VALUES (1, -1, 0); INSERT INTO mx_table_user_group (group_id, user_id, user_pending) VALUES (2, 2, 0); # ------------------------------------------------------------ # # New Fields in Table `mx_portal` # ALTER TABLE mx_table_portal ADD portal_desc varchar(255) NOT NULL default 'A _little_ text to describe your site'; ALTER TABLE mx_table_portal ADD server_name varchar(255) NOT NULL default 'www.myserver.tld'; ALTER TABLE mx_table_portal ADD script_path varchar(255) NOT NULL default '/'; ALTER TABLE mx_table_portal ADD script_protocol varchar(255) NOT NULL default 'http://'; ALTER TABLE mx_table_portal ADD server_port varchar(255) NOT NULL default '80'; ALTER TABLE mx_table_portal ADD default_dateformat varchar(255) NOT NULL default 'D M d, Y g:i a'; ALTER TABLE mx_table_portal ADD board_timezone smallint(2) NOT NULL default '0'; ALTER TABLE mx_table_portal ADD gzip_compress smallint(2) unsigned NOT NULL default '0'; ALTER TABLE mx_table_portal ADD cookie_domain varchar(255) NOT NULL default ''; ALTER TABLE mx_table_portal ADD cookie_name varchar(255) NOT NULL default 'mxbb28x'; ALTER TABLE mx_table_portal ADD cookie_path varchar(255) NOT NULL default '/'; ALTER TABLE mx_table_portal ADD cookie_secure smallint(2) unsigned NOT NULL default '0'; ALTER TABLE mx_table_portal ADD session_length varchar(255) NOT NULL default '3600'; ALTER TABLE mx_table_portal ADD allow_autologin smallint(2) unsigned NOT NULL default '1'; ALTER TABLE mx_table_portal ADD max_autologin_time smallint(2) NOT NULL default '0'; ALTER TABLE mx_table_portal ADD max_login_attempts smallint(2) NOT NULL default '5'; ALTER TABLE mx_table_portal ADD login_reset_time varchar(255) NOT NULL default '30'; ALTER TABLE mx_table_portal ADD default_lang varchar(255) NOT NULL default 'english'; ALTER TABLE mx_table_portal ADD allow_html smallint(2) unsigned NOT NULL default '1'; ALTER TABLE mx_table_portal ADD allow_html_tags varchar(255) NOT NULL default 'b,i,u,pre'; ALTER TABLE mx_table_portal ADD allow_bbcode smallint(2) unsigned NOT NULL default '1'; ALTER TABLE mx_table_portal ADD allow_smilies smallint(2) unsigned NOT NULL default '1'; ALTER TABLE mx_table_portal ADD smilies_path varchar(255) NOT NULL default 'images/smiles'; ALTER TABLE mx_table_portal ADD board_email varchar(255) NOT NULL default 'you...@yo...'; ALTER TABLE mx_table_portal ADD board_email_sig varchar(255) NOT NULL default 'Thanks, the mxBB Team'; ALTER TABLE mx_table_portal ADD smtp_delivery smallint(2) unsigned NOT NULL default '0'; ALTER TABLE mx_table_portal ADD smtp_host varchar(255) NOT NULL default ''; ALTER TABLE mx_table_portal ADD smtp_username varchar(255) NOT NULL default ''; ALTER TABLE mx_table_portal ADD smtp_password varchar(255) NOT NULL default ''; ALTER TABLE mx_table_portal ADD smtp_auth_method varchar(255) NOT NULL default ''; ALTER TABLE mx_table_portal ADD portal_startdate varchar(255) NOT NULL default '0'; ALTER TABLE mx_table_portal ADD rand_seed varchar(255) NOT NULL default '0'; ALTER TABLE mx_table_portal ADD record_online_users varchar(255) NOT NULL default '0'; ALTER TABLE mx_table_portal ADD record_online_date varchar(255) NOT NULL default '0'; ALTER TABLE mx_table_portal ADD portal_backend_path varchar(255) NOT NULL default ''; # Remove from mx_table_portal # Help?? # ALTER TABLE mx_table_portal DELETE portal_url; # ALTER TABLE mx_table_portal DELETE portal_phpbb_url; --- NEW FILE: mysql_schema_upgrade_to_2.9.1.sql --- # -------------------------------------------------------- # # Table structure for table 'mx_table_themes' # CREATE TABLE mx_table_themes ( themes_id mediumint(8) UNSIGNED NOT NULL auto_increment, template_name varchar(30) NOT NULL default '', style_name varchar(30) NOT NULL default '', head_stylesheet varchar(100) default NULL, portal_backend varchar(30) NOT NULL default '', PRIMARY KEY (themes_id) ); # -- Themes INSERT INTO mx_table_themes (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (1, 'mxSilver', 'mxSilver', 'mxSilver.css', 'internal'); INSERT INTO mx_table_themes (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (2, 'subSilver', 'subSilver', 'subSilver.css', 'phpbb2'); INSERT INTO mx_table_themes (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (3, 'subsilver2', 'subsilver2', 'subsilver2.css', 'phpbb3'); INSERT INTO mx_table_themes (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (4, 'prosilver', 'prosilver', 'prosilver.css', 'phpbb3'); Index: mysql_schema_install.sql =================================================================== RCS file: /cvsroot/mxbb/core/install/schemas/mysql_schema_install.sql,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** mysql_schema_install.sql 12 Aug 2007 20:54:45 -0000 1.42 --- mysql_schema_install.sql 9 Sep 2007 16:49:08 -0000 1.43 *************** *** 59,62 **** --- 59,63 ---- INSERT INTO mx_table_block VALUES("29", "Demo Pages", "Introduction", "24", "0", "5", "0", "0", "0", "0", "0", "1", "1", "1", "1144407996", "2"); INSERT INTO mx_table_block VALUES("30", "Modules Info", "Introduction", "24", "0", "5", "0", "0", "0", "0", "0", "1", "1", "1", "1144407795", "2"); + INSERT INTO mx_table_block VALUES("31", "Page Navigation", "This is a page navigation menu", "52", "0", "5", "0", "0", "0", "0", "0", "1", "1", "0", "1144406422", "2"); *************** *** 104,107 **** --- 105,113 ---- INSERT INTO mx_table_block_system_parameter VALUES("25", "64", "TRUE", "", "0"); + INSERT INTO mx_table_block_system_parameter VALUES("31", "100", "", "", "0"); + INSERT INTO mx_table_block_system_parameter VALUES("31", "101", "Overall_navigation", "", "0"); + INSERT INTO mx_table_block_system_parameter VALUES("31", "102", "Horizontal", "", "0"); + INSERT INTO mx_table_block_system_parameter VALUES("31", "103", "TRUE", "", "0"); + INSERT INTO mx_table_block_system_parameter VALUES("9", "50", "This is basically a [i:021a122fa6]standard[/i:021a122fa6] TextBlock, but you may configure settings for bbcodes, html and smilies for [i:021a122fa6]this[/i:021a122fa6] block.\r\n\r\nTry it out! \r\n(to edit use the top right edit button)", "021a122fa6", "0"); INSERT INTO mx_table_block_system_parameter VALUES("9", "51", "none", "", "0"); *************** *** 439,443 **** # INSERT INTO mx_table_page VALUES("1", "Home", "This is the startpage", "0", "", "10","icon_home.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); ! INSERT INTO mx_table_page VALUES("2", "Forum", "This is the phpBB Forum startpage", "0", "", "20","icon_forum.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "1"); INSERT INTO mx_table_page VALUES("3", "Demo Page", "Block Demos", "0", "", "30","icon_docs.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); INSERT INTO mx_table_page VALUES("4", "Sitestats", "Sitestats page", "0", "", "40","icon_stats.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); --- 445,449 ---- # INSERT INTO mx_table_page VALUES("1", "Home", "This is the startpage", "0", "", "10","icon_home.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); ! INSERT INTO mx_table_page VALUES("2", "Forum", "This is the phpBB Forum startpage", "0", "", "20","icon_forum.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "overall_header_navigation_phpbb.tpl", "", "", "0", "a:1:{i:0;s:0:\"\";}", "1"); INSERT INTO mx_table_page VALUES("3", "Demo Page", "Block Demos", "0", "", "30","icon_docs.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); INSERT INTO mx_table_page VALUES("4", "Sitestats", "Sitestats page", "0", "", "40","icon_stats.gif", "", "", "", "", "1", "0", "0", "0", "-1", "-1", "", "", "", "0", "a:1:{i:0;s:0:\"\";}", "-1"); *************** *** 564,586 **** DROP TABLE IF EXISTS mx_table_portal; CREATE TABLE `mx_table_portal` ( ! `portal_id` smallint(5) unsigned NOT NULL auto_increment, ! `portal_name` varchar(150) default NULL, ! `portal_phpbb_url` varchar(255) default 'http://www.phpbb.com/phpBB/', ! `portal_url` varchar(255) default NULL, ! `portal_version` varchar(255) default NULL, ! `default_admin_style` smallint(5) NOT NULL default '-1', `default_style` smallint(5) NOT NULL default '-1', ! `override_user_style` smallint(2) NOT NULL default '1', ! `overall_header` varchar(255) default 'overall_header.tpl', ! `overall_footer` varchar(255) default 'overall_footer.tpl', ! `main_layout` varchar(255) default 'mx_main_layout.tpl', ! `navigation_block` smallint(5) unsigned NOT NULL default '0', ! `top_phpbb_links` smallint(5) unsigned NOT NULL default '0', ! `mx_use_cache` smallint(5) unsigned NOT NULL default '1', `portal_recached` varchar(255) NOT NULL default '', ! `mod_rewrite` smallint(2) NOT NULL default '0', ! `portal_backend` varchar(255) default 'phpBB2', ! `portal_status` smallint(2) NOT NULL default '1', ! `disabled_message` varchar(255) default 'We are currenty upgrading this site with latest mxBB software.', PRIMARY KEY (`portal_id`) ) TYPE=MyISAM; --- 570,632 ---- DROP TABLE IF EXISTS mx_table_portal; CREATE TABLE `mx_table_portal` ( ! `portal_id` smallint(2) unsigned NOT NULL auto_increment, ! ! `portal_name` varchar(255) NOT NULL default 'yourdomain.com', ! `portal_desc` varchar(255) NOT NULL default 'A _little_ text to describe your site', ! `portal_status` smallint(2) unsigned NOT NULL default '1', ! `disabled_message` varchar(255) NOT NULL default 'We are currenty upgrading this site with latest mxBB software.', ! `server_name` varchar(255) NOT NULL default 'www.myserver.tld', ! `script_path` varchar(255) NOT NULL default '/', ! `script_protocol` varchar(255) NOT NULL default 'http://', ! `server_port` varchar(255) NOT NULL default '80', ! `default_dateformat` varchar(255) NOT NULL default 'D M d, Y g:i a', ! `board_timezone` smallint(2) NOT NULL default '0', ! `gzip_compress` smallint(2) unsigned NOT NULL default '0', ! `mx_use_cache` smallint(2) unsigned NOT NULL default '1', ! `mod_rewrite` smallint(2) unsigned NOT NULL default '0', ! ! `cookie_domain` varchar(255) NOT NULL default '', ! `cookie_name` varchar(255) NOT NULL default 'mxbb28x', ! `cookie_path` varchar(255) NOT NULL default '/', ! `cookie_secure` smallint(2) unsigned NOT NULL default '0', ! `session_length` varchar(255) NOT NULL default '3600', ! `allow_autologin` smallint(2) unsigned NOT NULL default '1', ! `max_autologin_time` smallint(2) NOT NULL default '0', ! `max_login_attempts` smallint(2) NOT NULL default '5', ! `login_reset_time` varchar(255) NOT NULL default '30', ! ! `default_lang` varchar(255) NOT NULL default 'english', `default_style` smallint(5) NOT NULL default '-1', ! `override_user_style` smallint(2) unsigned NOT NULL default '1', ! `default_admin_style` smallint(5) NOT NULL default '-1', ! `overall_header` varchar(255) NOT NULL default 'overall_header_navigation.tpl', ! `overall_footer` varchar(255) NOT NULL default 'overall_footer.tpl', ! `main_layout` varchar(255) NOT NULL default 'mx_main_layout.tpl', ! `navigation_block` smallint(5) unsigned NOT NULL default '31', ! `top_phpbb_links` smallint(2) unsigned NOT NULL default '0', ! `allow_html` smallint(2) unsigned NOT NULL default '1', ! `allow_html_tags` varchar(255) NOT NULL default 'b,i,u,pre', ! `allow_bbcode` smallint(2) unsigned NOT NULL default '1', ! `allow_smilies` smallint(2) unsigned NOT NULL default '1', ! `smilies_path` varchar(255) NOT NULL default 'images/smiles', ! ! `board_email` varchar(255) NOT NULL default 'you...@yo...', ! `board_email_sig` varchar(255) NOT NULL default 'Thanks, the mxBB Team', ! `smtp_delivery` smallint(2) unsigned NOT NULL default '0', ! `smtp_host` varchar(255) NOT NULL default '', ! `smtp_username` varchar(255) NOT NULL default '', ! `smtp_password` varchar(255) NOT NULL default '', ! `smtp_auth_method` varchar(255) NOT NULL default '', ! ! `portal_version` varchar(255) NOT NULL default '', `portal_recached` varchar(255) NOT NULL default '', ! `portal_backend` varchar(255) NOT NULL default 'internal', ! `portal_backend_path` varchar(255) NOT NULL default '', ! ! `portal_startdate` varchar(255) NOT NULL default '0', ! `rand_seed` varchar(255) NOT NULL default '0', ! `record_online_users` varchar(255) NOT NULL default '0', ! `record_online_date` varchar(255) NOT NULL default '0', ! PRIMARY KEY (`portal_id`) ) TYPE=MyISAM; *************** *** 631,632 **** --- 677,830 ---- ) TYPE=MyISAM; + # + # Table structure for table 'mx_table_user_group' + # + CREATE TABLE mx_table_user_group ( + group_id mediumint(8) DEFAULT '0' NOT NULL, + user_id mediumint(8) DEFAULT '0' NOT NULL, + user_pending tinyint(1), + KEY group_id (group_id), + KEY user_id (user_id) + ); + + # + # Table structure for table 'mx_table_groups' + # + CREATE TABLE mx_table_groups ( + group_id mediumint(8) NOT NULL auto_increment, + group_type tinyint(4) DEFAULT '1' NOT NULL, + group_name varchar(40) NOT NULL, + group_description varchar(255) NOT NULL, + group_moderator mediumint(8) DEFAULT '0' NOT NULL, + group_single_user tinyint(1) DEFAULT '1' NOT NULL, + PRIMARY KEY (group_id), + KEY group_single_user (group_single_user) + ); + + # -------------------------------------------------------- + # + # Table structure for table 'mx_table_sessions' + # + # Note that if you\'re running 3.23.x you may want to make + # this table a type HEAP. This type of table is stored + # within system memory and therefore for big busy boards + # is likely to be noticeably faster than continually + # writing to disk ... + # + CREATE TABLE mx_table_sessions ( + session_id char(32) DEFAULT '' NOT NULL, + session_user_id mediumint(8) DEFAULT '0' NOT NULL, + session_start int(11) DEFAULT '0' NOT NULL, + session_time int(11) DEFAULT '0' NOT NULL, + session_ip char(8) DEFAULT '0' NOT NULL, + session_page int(11) DEFAULT '0' NOT NULL, + session_logged_in tinyint(1) DEFAULT '0' NOT NULL, + session_admin tinyint(2) DEFAULT '0' NOT NULL, + PRIMARY KEY (session_id), + KEY session_user_id (session_user_id), + KEY session_id_ip_user_id (session_id, session_ip, session_user_id) + ); + + # -------------------------------------------------------- + # + # Table structure for table `mx_table_sessions_keys` + # + CREATE TABLE mx_table_sessions_keys ( + key_id varchar(32) DEFAULT '0' NOT NULL, + user_id mediumint(8) DEFAULT '0' NOT NULL, + last_ip varchar(8) DEFAULT '0' NOT NULL, + last_login int(11) DEFAULT '0' NOT NULL, + PRIMARY KEY (key_id, user_id), + KEY last_login (last_login) + ); + + # -------------------------------------------------------- + # + # Table structure for table 'mx_table_users' + # + CREATE TABLE mx_table_users ( + user_id mediumint(8) NOT NULL, + user_active tinyint(1) DEFAULT '1', + username varchar(25) NOT NULL, + user_password varchar(32) NOT NULL, + user_session_time int(11) DEFAULT '0' NOT NULL, + user_session_page smallint(5) DEFAULT '0' NOT NULL, + user_lastvisit int(11) DEFAULT '0' NOT NULL, + user_regdate int(11) DEFAULT '0' NOT NULL, + user_level tinyint(4) DEFAULT '0', + # user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + # user_timezone decimal(5,2) DEFAULT '0' NOT NULL, + # user_style tinyint(4), + # user_lang varchar(255), + # user_dateformat varchar(14) DEFAULT 'd M Y H:i' NOT NULL, + # user_new_privmsg smallint(5) UNSIGNED DEFAULT '0' NOT NULL, + # user_unread_privmsg smallint(5) UNSIGNED DEFAULT '0' NOT NULL, + # user_last_privmsg int(11) DEFAULT '0' NOT NULL, + user_login_tries smallint(5) UNSIGNED DEFAULT '0' NOT NULL, + user_last_login_try int(11) DEFAULT '0' NOT NULL, + # user_emailtime int(11), + # user_viewemail tinyint(1), + # user_attachsig tinyint(1), + # user_allowhtml tinyint(1) DEFAULT '1', + # user_allowbbcode tinyint(1) DEFAULT '1', + # user_allowsmile tinyint(1) DEFAULT '1', + # user_allowavatar tinyint(1) DEFAULT '1' NOT NULL, + # user_allow_pm tinyint(1) DEFAULT '1' NOT NULL, + # user_allow_viewonline tinyint(1) DEFAULT '1' NOT NULL, + # user_notify tinyint(1) DEFAULT '1' NOT NULL, + # user_notify_pm tinyint(1) DEFAULT '0' NOT NULL, + # user_popup_pm tinyint(1) DEFAULT '0' NOT NULL, + # user_rank int(11) DEFAULT '0', + # user_avatar varchar(100), + # user_avatar_type tinyint(4) DEFAULT '0' NOT NULL, + user_email varchar(255), + # user_icq varchar(15), + # user_website varchar(100), + # user_from varchar(100), + # user_sig text, + # user_sig_bbcode_uid char(10), + # user_aim varchar(255), + # user_yim varchar(255), + # user_msnm varchar(255), + # user_occ varchar(100), + # user_interests varchar(255), + # user_actkey varchar(32), + # user_newpasswd varchar(32), + PRIMARY KEY (user_id), + KEY user_session_time (user_session_time) + ); + + # -- Users + INSERT INTO mx_table_users (user_id, username, user_level, user_regdate, user_password, user_email, user_active) VALUES ( -1, 'Anonymous', 0, 0, '', '', 0); + + # -- username: admin password: admin (change this or remove it once everything is working!) + INSERT INTO mx_table_users (user_id, username, user_level, user_regdate, user_password, user_email, user_active) VALUES ( 2, 'Admin', 1, 0, '21232f297a57a5a743894a0e4a801fc3', 'ad...@yo...', 1); + + # -- Groups + INSERT INTO mx_table_groups (group_id, group_name, group_description, group_single_user) VALUES (1, 'Anonymous', 'Personal User', 1); + INSERT INTO mx_table_groups (group_id, group_name, group_description, group_single_user) VALUES (2, 'Admin', 'Personal User', 1); + + + # -- User -> Group + INSERT INTO mx_table_user_group (group_id, user_id, user_pending) VALUES (1, -1, 0); + INSERT INTO mx_table_user_group (group_id, user_id, user_pending) VALUES (2, 2, 0); + + # -------------------------------------------------------- + # + # Table structure for table 'mx_table_themes' + # + CREATE TABLE mx_table_themes ( + themes_id mediumint(8) UNSIGNED NOT NULL auto_increment, + template_name varchar(30) NOT NULL default '', + style_name varchar(30) NOT NULL default '', + head_stylesheet varchar(100) default NULL, + portal_backend varchar(30) NOT NULL default '', + PRIMARY KEY (themes_id) + ); + + # -- Themes + INSERT INTO mx_table_themes (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (1, 'mxSilver', 'mxSilver', 'mxSilver.css', 'internal'); + INSERT INTO mx_table_themes (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (2, 'subSilver', 'subSilver', 'subSilver.css', 'phpbb2'); + INSERT INTO mx_table_themes (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (3, 'subsilver2', 'subsilver2', 'subsilver2.css', 'phpbb3'); + INSERT INTO mx_table_themes (themes_id, template_name, style_name, head_stylesheet, portal_backend) VALUES (4, 'prosilver', 'prosilver', 'prosilver.css', 'phpbb3'); + |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:49:14
|
Update of /cvsroot/mxbb/core/install/templates In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9080/templates Modified Files: mx_install_body.tpl mx_install_header.tpl Log Message: Ok, massive update for 2.9.x. Index: mx_install_header.tpl =================================================================== RCS file: /cvsroot/mxbb/core/install/templates/mx_install_header.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mx_install_header.tpl 26 Jun 2006 21:32:23 -0000 1.7 --- mx_install_header.tpl 9 Sep 2007 16:49:08 -0000 1.8 *************** *** 207,210 **** --- 207,219 ---- } + /* None-bold submit button */ + input.info { + background-color : #FAFAFA; + font-weight : normal; + font-size: 11px; font-family: Verdana, Arial, Helvetica, sans-serif; + border: solid red 2px; + padding: 5px; + } + /* This is the line in the posting page which shows the rollover help line. This is actually a text box, but if set to be the same Index: mx_install_body.tpl =================================================================== RCS file: /cvsroot/mxbb/core/install/templates/mx_install_body.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** mx_install_body.tpl 6 Aug 2007 19:46:10 -0000 1.4 --- mx_install_body.tpl 9 Sep 2007 16:49:08 -0000 1.5 *************** *** 1,3 **** --- 1,15 ---- <script language="javascript1.2" type="text/javascript"><!-- + + function getObj(obj) + { + return ( document.getElementById ? document.getElementById(obj) : ( document.all ? document.all[obj] : null ) ); + } + + function displayObj(obj, status) + { + var x = getObj(obj); + if( x && x.style ) x.style.display = status; + } + function check_phpbb_path() { *************** *** 5,8 **** --- 17,30 ---- { var i = document.forms['frmInstall'].elements['select_phpbb_path'].value; + if (i == -1) + { + displayObj('phpbb', 'none'); + displayObj('mxbb', 'block'); + } + else + { + displayObj('phpbb', 'block'); + displayObj('mxbb', 'none'); + } for( var x in pathinfo[i] ) { *************** *** 12,20 **** } var pathinfo = []; ! var i = 0; <!-- BEGIN datarow --> pathinfo[i] = []; pathinfo[i]['phpbb_path'] = '{datarow.PHPBB_PATH}'; ! pathinfo[i]['phpbb_url'] = '{datarow.PHPBB_URL}'; pathinfo[i]['portal_url'] = '{datarow.PORTAL_URL}'; pathinfo[i]['dbms'] = '{datarow.DBMS}'; --- 34,44 ---- } var pathinfo = []; ! var i = -1; ! <!-- BEGIN datarow --> pathinfo[i] = []; + pathinfo[i]['info'] = '{datarow.INFO}'; pathinfo[i]['phpbb_path'] = '{datarow.PHPBB_PATH}'; ! //pathinfo[i]['phpbb_url'] = '{datarow.PHPBB_URL}'; pathinfo[i]['portal_url'] = '{datarow.PORTAL_URL}'; pathinfo[i]['dbms'] = '{datarow.DBMS}'; *************** *** 28,31 **** --- 52,56 ---- i++; <!-- END datarow --> + if(i) window.onload = check_phpbb_path; //--></script><noscript> *************** *** 39,47 **** <!-- BEGIN switch_readonly_mode --> <tr> ! <td class="row1" align="right"><span class="gen"><b>{L_PHPBB_PATH}: </b></span></td> <td class="row2">{S_PHPBB_PATH}</td> </tr> <!-- END switch_readonly_mode --> <tr> <td class="row1" align="right"><span class="gen"><b>{L_MX_DB_PREFIX}: </b></span></td> <td class="row2"><input type="text" name="mx_prefix" value="{MX_DB_PREFIX}" /></td> --- 64,75 ---- <!-- BEGIN switch_readonly_mode --> <tr> ! <td class="row1" align="right" width="50%"><span class="gen"><b>{L_Backend}: </b></span><br /><span class="gensmall">{L_Backend_explain}: </span></td> <td class="row2">{S_PHPBB_PATH}</td> </tr> <!-- END switch_readonly_mode --> <tr> + <td class="row1" colspan="2" align="center"><input size="120" class="info" type="text" name="info" value="{INFO}" /></td></td> + </tr> + <tr> <td class="row1" align="right"><span class="gen"><b>{L_MX_DB_PREFIX}: </b></span></td> <td class="row2"><input type="text" name="mx_prefix" value="{MX_DB_PREFIX}" /></td> *************** *** 54,62 **** --> <tr> ! <th colspan="2">{L_PORTAL_CONFIGURATION}</th> ! </tr> ! <tr> ! <td class="row1" align="right"><span class="gen">{L_PHPBB_PATH}: </span></td> ! <td class="row2"><input type="text" size="80" name="phpbb_path" value="{PHPBB_PATH}"{READONLY} /></td> </tr> <tr> --- 82,86 ---- --> <tr> ! <th colspan="2">{L_PORTAL_CONFIGURATION}{READ_ONLY}</th> </tr> <tr> *************** *** 64,77 **** <td class="row2"><input type="text" size="80" name="portal_url" value="{PORTAL_URL}"{READONLY} /></td> </tr> <tr> <td class="row1" align="right"><span class="gen">{L_PHPBB_URL}: </span></td> <td class="row2"><input type="text" size="80" name="phpbb_url" value="{PHPBB_URL}"{READONLY} /></td> </tr> <tr> ! <th colspan="2">{L_DATABASE_CONFIGURATION}</th> </tr> <tr> ! <td class="row1" align="right"><span class="gen">{L_DBMS}: </span></td> ! <td class="row2"><input type="text" name="dbms" value="{DBMS}"{READONLY} /></td> </tr> <tr> --- 88,110 ---- <td class="row2"><input type="text" size="80" name="portal_url" value="{PORTAL_URL}"{READONLY} /></td> </tr> + + <tr><td colspan="2"><div id="phpbb" style="display:none;" class="genmed"><table width="100%" cellpadding="2" cellspacing="1" border="0"> + + <!-- <tr> <td class="row1" align="right"><span class="gen">{L_PHPBB_URL}: </span></td> <td class="row2"><input type="text" size="80" name="phpbb_url" value="{PHPBB_URL}"{READONLY} /></td> </tr> + --> <tr> ! <td class="row1" align="right"><span class="gen">{L_PHPBB_PATH}: </span></td> ! <td class="row2"><input type="text" size="80" name="phpbb_path" value="{PHPBB_PATH}"{READONLY} /></td> </tr> <tr> ! <th colspan="2">{L_DATABASE_CONFIGURATION}{READ_ONLY}</th> ! </tr> ! <tr> ! <td class="row1" align="right" width="50%"><span class="gen">{L_DBMS}: </span></td> ! <td class="row2"><input type="text" name="dbms" value="{DBMS}" {READONLY}/></td> </tr> <tr> *************** *** 96,101 **** </tr> <tr> ! <td class="catbottom" align="center" colspan="2">{S_HIDDEN_FIELDS}<input class="mainoption" type="submit" value="{L_SUBMIT}" /></td> </tr> </table> </form> \ No newline at end of file --- 129,170 ---- </tr> <tr> ! <td class="catbottom" align="center" colspan="2">{S_HIDDEN_FIELDS}<input class="liteoption" type="submit" name="debug" value="Debug" /><input class="mainoption" name="phpbb" type="submit" value="{L_SUBMIT}" /></td> ! </tr> ! ! ! </table></div></td></tr> ! ! <tr><td colspan="2"><div id="mxbb" style="display:none;" class="genmed"><table width="100%" cellpadding="2" cellspacing="1" border="0"> ! ! <tr> ! <th colspan="2">{L_DATABASE_CONFIGURATION}</th> ! </tr> ! <tr> ! <td class="row1" align="right" width="50%"><span class="gen">{L_DBMS}: </span></td> ! <td class="row2"><select name="dbms_mxbb">{DBMS_SELECT}</select></td> </tr> + <tr> + <td class="row1" align="right"><span class="gen">{L_DB_HOST}: </span></td> + <td class="row2"><input type="text" name="dbhost_mxbb" value="" /></td> + </tr> + <tr> + <td class="row1" align="right"><span class="gen">{L_DB_NAME}: </span></td> + <td class="row2"><input type="text" name="dbname_mxbb" value="" /></td> + </tr> + <tr> + <td class="row1" align="right"><span class="gen">{L_DB_USER}: </span></td> + <td class="row2"><input type="text" name="dbuser_mxbb" value="" /></td> + </tr> + <tr> + <td class="row1" align="right"><span class="gen">{L_DB_PASSWORD}: </span></td> + <td class="row2"><input type="password" name="dbpasswd_mxbb" value="" /></td> + </tr> + <tr> + <td class="catbottom" align="center" colspan="2">{S_HIDDEN_FIELDS}<input class="liteoption" type="submit" name="debug" value="Debug" /><input class="mainoption" name="mxbb" type="submit" value="{L_SUBMIT}" /></td> + </tr> + + </table></div></td></tr> + + </table> </form> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:49:14
|
Update of /cvsroot/mxbb/core/install/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9080/includes Modified Files: functions_install.php Log Message: Ok, massive update for 2.9.x. Index: functions_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/includes/functions_install.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** functions_install.php 11 Aug 2007 03:49:32 -0000 1.2 --- functions_install.php 9 Sep 2007 16:49:07 -0000 1.3 *************** *** 75,98 **** global $lang; $available_dbms = array( ! 'firebird' => array( ! 'LABEL' => 'FireBird', ! 'SCHEMA' => 'firebird', ! 'MODULE' => 'interbase', ! 'DELIM' => ';;', ! 'COMMENTS' => 'remove_remarks', ! 'DRIVER' => 'firebird', ! 'AVAILABLE' => true, ! '2.0.x' => false, ! ), ! 'mysqli' => array( ! 'LABEL' => 'MySQL with MySQLi Extension', ! 'SCHEMA' => 'mysql_41', ! 'MODULE' => 'mysqli', ! 'DELIM' => ';', ! 'COMMENTS' => 'remove_remarks', ! 'DRIVER' => 'mysqli', ! 'AVAILABLE' => true, ! '2.0.x' => true, ! ), 'mysql' => array( 'LABEL' => 'MySQL', --- 75,98 ---- global $lang; $available_dbms = array( ! // 'firebird' => array( ! // 'LABEL' => 'FireBird', ! // 'SCHEMA' => 'firebird', ! // 'MODULE' => 'interbase', ! // 'DELIM' => ';;', ! // 'COMMENTS' => 'remove_remarks', ! // 'DRIVER' => 'firebird', ! // 'AVAILABLE' => true, ! // '2.0.x' => false, ! // ), ! // 'mysqli' => array( ! // 'LABEL' => 'MySQL with MySQLi Extension', ! // 'SCHEMA' => 'mysql_41', ! // 'MODULE' => 'mysqli', ! // 'DELIM' => ';', ! // 'COMMENTS' => 'remove_remarks', ! // 'DRIVER' => 'mysqli', ! // 'AVAILABLE' => true, ! // '2.0.x' => true, ! // ), 'mysql' => array( 'LABEL' => 'MySQL', *************** *** 105,138 **** '2.0.x' => true, ), ! 'mssql' => array( ! 'LABEL' => 'MS SQL Server 2000+', ! 'SCHEMA' => 'mssql', ! 'MODULE' => 'mssql', ! 'DELIM' => 'GO', ! 'COMMENTS' => 'remove_comments', ! 'DRIVER' => 'mssql', ! 'AVAILABLE' => true, ! '2.0.x' => true, ! ), ! 'mssql_odbc'=> array( ! 'LABEL' => 'MS SQL Server [ ODBC ]', ! 'SCHEMA' => 'mssql', ! 'MODULE' => 'odbc', ! 'DELIM' => 'GO', ! 'COMMENTS' => 'remove_comments', ! 'DRIVER' => 'mssql_odbc', 'AVAILABLE' => true, '2.0.x' => true, ), ! 'oracle' => array( ! 'LABEL' => 'Oracle', ! 'SCHEMA' => 'oracle', ! 'MODULE' => 'oci8', ! 'DELIM' => '/', ! 'COMMENTS' => 'remove_comments', ! 'DRIVER' => 'oracle', ! 'AVAILABLE' => true, ! '2.0.x' => false, ! ), 'postgres' => array( 'LABEL' => 'PostgreSQL 7.x/8.x', --- 105,148 ---- '2.0.x' => true, ), ! 'mysql4' => array( ! 'LABEL' => 'MySQL 4.x', ! 'SCHEMA' => 'mysql', ! 'MODULE' => 'mysql', ! 'DELIM' => ';', ! 'COMMENTS' => 'remove_remarks', ! 'DRIVER' => 'mysql', 'AVAILABLE' => true, '2.0.x' => true, ), ! // 'mssql' => array( ! // 'LABEL' => 'MS SQL Server 2000+', ! // 'SCHEMA' => 'mssql', ! // 'MODULE' => 'mssql', ! // 'DELIM' => 'GO', ! // 'COMMENTS' => 'remove_comments', ! // 'DRIVER' => 'mssql', ! // 'AVAILABLE' => true, ! // '2.0.x' => true, ! // ), ! // 'mssql_odbc'=> array( ! // 'LABEL' => 'MS SQL Server [ ODBC ]', ! // 'SCHEMA' => 'mssql', ! // 'MODULE' => 'odbc', ! // 'DELIM' => 'GO', ! // 'COMMENTS' => 'remove_comments', ! // 'DRIVER' => 'mssql_odbc', ! // 'AVAILABLE' => true, ! // '2.0.x' => true, ! // ), ! // 'oracle' => array( ! // 'LABEL' => 'Oracle', ! // 'SCHEMA' => 'oracle', ! // 'MODULE' => 'oci8', ! // 'DELIM' => '/', ! // 'COMMENTS' => 'remove_comments', ! // 'DRIVER' => 'oracle', ! // 'AVAILABLE' => true, ! // '2.0.x' => false, ! // ), 'postgres' => array( 'LABEL' => 'PostgreSQL 7.x/8.x', *************** *** 145,158 **** '2.0.x' => true, ), ! 'sqlite' => array( ! 'LABEL' => 'SQLite', ! 'SCHEMA' => 'sqlite', ! 'MODULE' => 'sqlite', ! 'DELIM' => ';', ! 'COMMENTS' => 'remove_remarks', ! 'DRIVER' => 'sqlite', ! 'AVAILABLE' => true, ! '2.0.x' => false, ! ), ); --- 155,168 ---- '2.0.x' => true, ), ! // 'sqlite' => array( ! // 'LABEL' => 'SQLite', ! // 'SCHEMA' => 'sqlite', ! // 'MODULE' => 'sqlite', ! // 'DELIM' => ';', ! // 'COMMENTS' => 'remove_remarks', ! // 'DRIVER' => 'sqlite', ! // 'AVAILABLE' => true, ! // '2.0.x' => false, ! // ), ); *************** *** 224,228 **** { $selected = ($dbms_name == $default) ? ' selected="selected"' : ''; ! $dbms_options .= '<option value="' . $dbms_name . '"' . $selected .'>' . $lang['DLL_' . strtoupper($dbms_name)] . '</option>'; } return $dbms_options; --- 234,238 ---- { $selected = ($dbms_name == $default) ? ' selected="selected"' : ''; ! $dbms_options .= '<option value="' . $dbms_name . '"' . $selected .'>' . $dbms_name . '</option>'; } return $dbms_options; *************** *** 1246,1278 **** global $mx_portal_name, $mx_portal_version, $phpbb_url, $portal_url, $tplEx; ! if( $mode == 'install' ) ! { ! $portal_table = array( ! 'portal_id' => 1, ! 'portal_name' => "'$mx_portal_name'", ! 'portal_version' => "'$mx_portal_version'", ! 'portal_phpbb_url' => "'$phpbb_url'", ! 'portal_url' => "'$portal_url'", ! 'overall_header' => "'overall_header.$tplEx'", ! 'main_layout' => "'mx_main_layout.$tplEx'", ! 'navigation_block' => 0, ! 'top_phpbb_links' => 0, ! 'mx_use_cache' => 1, ! 'mod_rewrite' => 0, ! ); ! $sql = "INSERT INTO ".PORTAL_TABLE." (". ! implode(', ', array_keys($portal_table)). ! ") VALUES (". ! implode(', ', array_values($portal_table)). ! ")"; ! } ! else ! { ! $sql = "UPDATE ".PORTAL_TABLE." ! SET portal_name='$mx_portal_name', ! portal_version='$mx_portal_version' ! WHERE portal_id = 1"; ! } ! parse_cmd_sql($sql); } --- 1256,1260 ---- global $mx_portal_name, $mx_portal_version, $phpbb_url, $portal_url, $tplEx; ! } |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:48:46
|
Update of /cvsroot/mxbb/core/contrib/custom_overall_header In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8941/custom_overall_header Modified Files: overall_header_phpBB.tpl Log Message: Ok, massive update for 2.9.x. Index: overall_header_phpBB.tpl =================================================================== RCS file: /cvsroot/mxbb/core/contrib/custom_overall_header/overall_header_phpBB.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** overall_header_phpBB.tpl 5 Sep 2006 17:03:46 -0000 1.1 --- overall_header_phpBB.tpl 9 Sep 2007 16:48:41 -0000 1.2 *************** *** 51,55 **** window.open('{U_SEARCH_PAFILEDB}&search_keywords=' + document.search_block.search_keywords.value, '_self', ''); return false; ! } else { --- 51,55 ---- window.open('{U_SEARCH_PAFILEDB}&search_keywords=' + document.search_block.search_keywords.value, '_self', ''); return false; ! } else { *************** *** 67,79 **** <a name="top"></a> ! <table width="100%" cellspacing="0" cellpadding="10" border="0" align="center"> ! <tr> <td class="bodyline"><table width="100%" cellspacing="0" cellpadding="0" border="0"> ! <tr> <td><a href="{U_INDEX}"><img src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}images/logo.gif" border="0" alt="{L_INDEX}" vspace="1" /></a></td> ! <td align="center" width="100%" valign="middle"><span class="maintitle">{SITENAME}</span><br /><span class="gen">{SITE_DESCRIPTION}<br /> </span> <table cellspacing="0" cellpadding="2" border="0"> ! <tr> ! <td align="center" valign="top" nowrap="nowrap"><span class="mainmenu"> <a href="{U_FAQ}" class="mainmenu"><img src="{U_PHPBB_ROOT_PATH}templates/subSilver/images/icon_mini_faq.gif" width="12" height="13" border="0" alt="{L_FAQ}" hspace="3" />{L_FAQ}</a> <a href="{U_SEARCH}" class="mainmenu"><img src="{U_PHPBB_ROOT_PATH}templates/subSilver/images/icon_mini_search.gif" width="12" height="13" border="0" alt="{L_SEARCH}" hspace="3" />{L_SEARCH}</a> <a href="{U_MEMBERLIST}" class="mainmenu"><img src="{U_PHPBB_ROOT_PATH}templates/subSilver/images/icon_mini_members.gif" width="12" height="13" border="0" alt="{L_MEMBERLIST}" hspace="3" />{L_MEMBERLIST}</a> <a href="{U_GROUP_CP}" class="mainmenu"><img src="{U_PHPBB_ROOT_PATH}templates/subSilver/images/icon_mini_groups.gif" width="12" height="13" border="0" alt="{L_USERGROUPS}" hspace="3" />{L_USERGROUPS}</a> <!-- BEGIN switch_user_logged_out --> <a href="{U_REGISTER}" class="mainmenu"><img src="{U_PHPBB_ROOT_PATH}templates/subSilver/images/icon_mini_register.gif" width="12" height="13" border="0" alt="{L_REGISTER}" hspace="3" />{L_REGISTER}</a> --- 67,79 ---- <a name="top"></a> ! <table width="100%" cellspacing="0" cellpadding="10" border="0" align="center"> ! <tr> <td class="bodyline"><table width="100%" cellspacing="0" cellpadding="0" border="0"> ! <tr> <td><a href="{U_INDEX}"><img src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}images/logo.gif" border="0" alt="{L_INDEX}" vspace="1" /></a></td> ! <td align="center" width="100%" valign="middle"><span class="maintitle">{SITENAME}</span><br /><span class="gen">{SITE_DESCRIPTION}<br /> </span> <table cellspacing="0" cellpadding="2" border="0"> ! <tr> ! <td align="center" valign="top" nowrap="nowrap"><span class="mainmenu"> <a href="{U_FAQ}" class="mainmenu"><img src="{U_PHPBB_ROOT_PATH}templates/subSilver/images/icon_mini_faq.gif" width="12" height="13" border="0" alt="{L_FAQ}" hspace="3" />{L_FAQ}</a> <a href="{U_SEARCH}" class="mainmenu"><img src="{U_PHPBB_ROOT_PATH}templates/subSilver/images/icon_mini_search.gif" width="12" height="13" border="0" alt="{L_SEARCH}" hspace="3" />{L_SEARCH}</a> <a href="{U_MEMBERLIST}" class="mainmenu"><img src="{U_PHPBB_ROOT_PATH}templates/subSilver/images/icon_mini_members.gif" width="12" height="13" border="0" alt="{L_MEMBERLIST}" hspace="3" />{L_MEMBERLIST}</a> <a href="{U_GROUP_CP}" class="mainmenu"><img src="{U_PHPBB_ROOT_PATH}templates/subSilver/images/icon_mini_groups.gif" width="12" height="13" border="0" alt="{L_USERGROUPS}" hspace="3" />{L_USERGROUPS}</a> <!-- BEGIN switch_user_logged_out --> <a href="{U_REGISTER}" class="mainmenu"><img src="{U_PHPBB_ROOT_PATH}templates/subSilver/images/icon_mini_register.gif" width="12" height="13" border="0" alt="{L_REGISTER}" hspace="3" />{L_REGISTER}</a> *************** *** 87,91 **** </tr> </table> ! <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> <tr> --- 87,91 ---- </tr> </table> ! <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> <tr> *************** *** 111,115 **** </tr> </table> ! <!-- BEGIN phpbb_stats --> <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> --- 111,115 ---- </tr> </table> ! <!-- BEGIN phpbb_stats --> <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> *************** *** 129,132 **** </tr> </table> ! <!-- END phpbb_stats --> ! \ No newline at end of file --- 129,131 ---- </tr> </table> ! <!-- END phpbb_stats --> |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:48:45
|
Update of /cvsroot/mxbb/core/contrib/sync_overall_header In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8941/sync_overall_header Modified Files: how to.txt Log Message: Ok, massive update for 2.9.x. Index: how to.txt =================================================================== RCS file: /cvsroot/mxbb/core/contrib/sync_overall_header/how to.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** how to.txt 20 Dec 2005 04:24:04 -0000 1.5 --- how to.txt 9 Sep 2007 16:48:41 -0000 1.6 *************** *** 31,35 **** #-----[ FIND ]---------------------- # ! 'U_INDEX' => append_sid('index.'.$phpEx), # --- 31,35 ---- #-----[ FIND ]---------------------- # ! 'U_INDEX' => mx_append_sid('index.'.$phpEx), # *************** *** 41,45 **** 'MX_ROOT_PATH' => $path_to_mx, 'TEMPLATE_ROOT_PATH' => 'templates/'.$theme['template_name'], ! 'L_FORUM' => $lang['Forum'], // // Use either 'sitename' or manual definfition in lang_main for the home link text! --- 41,45 ---- 'MX_ROOT_PATH' => $path_to_mx, 'TEMPLATE_ROOT_PATH' => 'templates/'.$theme['template_name'], ! 'L_FORUM' => $lang['Forum'], // // Use either 'sitename' or manual definfition in lang_main for the home link text! *************** *** 49,56 **** // before // That's all, Folks! // ! // 'L_HOME' => $board_config['sitename'], ! 'L_HOME' => $lang['Portal_home'], ! 'U_INDEX' => append_sid( $path_to_mx . 'index.'.$phpEx . '?page=2'), ! 'U_INDEX_PORTAL' => append_sid( $path_to_mx . 'index.'.$phpEx), // Additional header links are defined accordinly // --- 49,56 ---- // before // That's all, Folks! // ! // 'L_HOME' => $board_config['sitename'], ! 'L_HOME' => $lang['Portal_home'], ! 'U_INDEX' => mx_append_sid( $path_to_mx . 'index.'.$phpEx . '?page=2'), ! 'U_INDEX_PORTAL' => mx_append_sid( $path_to_mx . 'index.'.$phpEx), // Additional header links are defined accordinly // |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:48:27
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8466/includes Modified Files: mx_constants.php mx_functions_blockcp.php mx_functions_ch.php mx_functions_core.php mx_functions_phpbb.php mx_functions_style.php mx_functions_tools.php page_header.php Added Files: template.php Log Message: Ok, massive update for 2.9.x. Index: mx_functions_ch.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_ch.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mx_functions_ch.php 30 Jan 2007 16:26:07 -0000 1.8 --- mx_functions_ch.php 9 Sep 2007 16:48:16 -0000 1.9 *************** *** 34,38 **** define('RUN_CH_INSTALL', true); } ! $board_config = &$config->data; // let's run the upgrade script --- 34,38 ---- define('RUN_CH_INSTALL', true); } ! $board_config = $config->data; // let's run the upgrade script Index: mx_functions_blockcp.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_blockcp.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** mx_functions_blockcp.php 7 May 2007 19:25:11 -0000 1.18 --- mx_functions_blockcp.php 9 Sep 2007 16:48:16 -0000 1.19 *************** *** 248,254 **** 'BLOCK_DESC' => ( $block_desc != '' ) ? ' - ' . $block_desc : '', ! 'U_BLOCK_SETTINGS' => append_sid(PORTAL_URL . "admin/admin_mx_blockcp.$phpEx?block_id=$block_id"), ! 'U_BLOCK_DELETE' => append_sid(PORTAL_URL . "admin/admin_mx_block.$phpEx?mode=delete_block&block_id=$block_id"), ! 'U_BLOCK_PERMISSIONS' => append_sid(PORTAL_URL . "admin/admin_mx_block_auth.$phpEx?cat_id=$block_id"), 'E_BLOCK_TITLE' => $block_title, --- 248,254 ---- 'BLOCK_DESC' => ( $block_desc != '' ) ? ' - ' . $block_desc : '', ! 'U_BLOCK_SETTINGS' => mx_append_sid(PORTAL_URL . "admin/admin_mx_blockcp.$phpEx?block_id=$block_id"), ! 'U_BLOCK_DELETE' => mx_append_sid(PORTAL_URL . "admin/admin_mx_block.$phpEx?mode=delete_block&block_id=$block_id"), ! 'U_BLOCK_PERMISSIONS' => mx_append_sid(PORTAL_URL . "admin/admin_mx_block_auth.$phpEx?cat_id=$block_id"), 'E_BLOCK_TITLE' => $block_title, *************** *** 354,358 **** $message_delete = $lang['Delete_block'] . ' - ' . $block_title . '<br /><br />' . $lang['Delete_block_explain'] ! . '<br /><br />' . sprintf($lang['Click_block_delete_yes'], '<a href="' . append_sid($s_action_file . $deletemode) . '">', '</a>') . '<br /><br />'; --- 354,358 ---- $message_delete = $lang['Delete_block'] . ' - ' . $block_title . '<br /><br />' . $lang['Delete_block_explain'] ! . '<br /><br />' . sprintf($lang['Click_block_delete_yes'], '<a href="' . mx_append_sid($s_action_file . $deletemode) . '">', '</a>') . '<br /><br />'; *************** *** 465,472 **** // Get the list of phpBB usergroups // ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> " . TRUE . " ! ORDER BY group_name ASC"; if( !($result = $db->sql_query($sql)) ) { --- 465,485 ---- // Get the list of phpBB usergroups // ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> " . TRUE . " ! ORDER BY group_name ASC"; ! break; ! case 'phpbb3': ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_name NOT IN ('BOTS', 'GUESTS') ! ORDER BY group_name ASC"; ! break; ! } ! if( !($result = $db->sql_query($sql)) ) { Index: mx_functions_core.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** mx_functions_core.php 6 Aug 2007 21:11:42 -0000 1.52 --- mx_functions_core.php 9 Sep 2007 16:48:16 -0000 1.53 *************** *** 132,135 **** --- 132,187 ---- /** + * Obtain cfg file data + * + * @param unknown_type $theme + * @return unknown + */ + function obtain_cfg_items($theme) + { + global $board_config, $phpbb_root_path; + + $parsed_items = array( + 'theme' => array(), + 'template' => array(), + 'imageset' => array() + ); + + foreach ($parsed_items as $key => $parsed_array) + { + $parsed_array = $this->get('_cfg_' . $key . '_' . $theme[$key . '_path']); + + if ($parsed_array === false) + { + $parsed_array = array(); + } + + $reparse = false; + $filename = $phpbb_root_path . 'styles/' . $theme[$key . '_path'] . '/' . $key . '/' . $key . '.cfg'; + + if (!file_exists($filename)) + { + continue; + } + + if (!isset($parsed_array['filetime']) || (($board_config['load_tplcompile'] && @filemtime($filename) > $parsed_array['filetime']))) + { + $reparse = true; + } + + // Re-parse cfg file + if ($reparse) + { + $parsed_array = mx_parse_cfg_file($filename); + $parsed_array['filetime'] = @filemtime($filename); + + $this->put('_cfg_' . $key . '_' . $theme[$key . '_path'], $parsed_array); + } + $parsed_items[$key] = $parsed_array; + } + + return $parsed_items; + } + + /** * Read. * *************** *** 601,604 **** --- 653,657 ---- if ($type = 'all') { + //if (preg_match('/^(tpl2_|tpl_|sql_|_block_|_page_|data_(?!global))/', $entry)) // Cannot remove tpl cache files currently in use ;) if (preg_match('/^(sql_|_block_|_page_|data_(?!global))/', $entry)) { *************** *** 1069,1072 **** --- 1122,1193 ---- } } + + /** + * Obtain currently listed icons + * + * @return unknown + */ + function obtain_icons() + { + if (($icons = $this->get('_icons')) === false) + { + global $db; + + // Topic icons + $sql = 'SELECT * + FROM ' . ICONS_TABLE . ' + ORDER BY icons_order'; + $result = $db->sql_query($sql); + + $icons = array(); + while ($row = $db->sql_fetchrow($result)) + { + $icons[$row['icons_id']]['img'] = $row['icons_url']; + $icons[$row['icons_id']]['width'] = (int) $row['icons_width']; + $icons[$row['icons_id']]['height'] = (int) $row['icons_height']; + $icons[$row['icons_id']]['display'] = (bool) $row['display_on_posting']; + } + $db->sql_freeresult($result); + + $this->put('_icons', $icons); + } + + return $icons; + } + + /** + * Obtain list of naughty words and build preg style replacement arrays for use by the + * calling script + * + * * @return unknown + */ + function obtain_word_list() + { + global $board_config, $mx_user, $db; + + if (!$mx_user->optionget('viewcensors') && $board_config['allow_nocensors']) + { + return array(); + } + + if (($censors = $this->get('_word_censors')) === false) + { + $sql = 'SELECT word, replacement + FROM ' . WORDS_TABLE; + $result = $db->sql_query($sql); + + $censors = array(); + while ($row = $db->sql_fetchrow($result)) + { + $censors['match'][] = '#(?<!\w)(' . str_replace('\*', '\w*?', preg_quote($row['word'], '#')) . ')(?!\w)#i'; + $censors['replace'][] = $row['replacement']; + } + $db->sql_freeresult($result); + + $this->put('_word_censors', $censors); + } + + return $censors; + } } *************** *** 1412,1416 **** $editor_name_tmp = mx_get_userdata($this->editor_id); $editor_name = $editor_name_tmp['username']; ! $edit_time = create_date( $board_config['default_dateformat'], $this->block_time, $board_config['board_timezone'] ); $layouttemplate->assign_block_vars('layout_column.blocks.block_stats', array( --- 1533,1537 ---- $editor_name_tmp = mx_get_userdata($this->editor_id); $editor_name = $editor_name_tmp['username']; ! $edit_time = phpBB2::create_date( $board_config['default_dateformat'], $this->block_time, $board_config['board_timezone'] ); $layouttemplate->assign_block_vars('layout_column.blocks.block_stats', array( *************** *** 1492,1496 **** // $block_desc = !empty( $this->block_desc ) ? ' (' . $this->block_desc . ')' : ''; ! $edit_url = append_sid( $mx_root_path . $edit_file . "?sid=" . $userdata['session_id'] ); $edit_img = '<input type="image" src="' . $block_edit_img . '" alt="' . $block_edit_alt . ' :: ' . $this->block_title . $block_desc . '" title="' . $block_edit_alt . ' :: ' . $this->block_title . $block_desc . '">'; --- 1613,1617 ---- // $block_desc = !empty( $this->block_desc ) ? ' (' . $this->block_desc . ')' : ''; ! $edit_url = mx_append_sid( $mx_root_path . $edit_file . "?sid=" . $userdata['session_id'] ); $edit_img = '<input type="image" src="' . $block_edit_img . '" alt="' . $block_edit_alt . ' :: ' . $this->block_title . $block_desc . '" title="' . $block_edit_alt . ' :: ' . $this->block_title . $block_desc . '">'; *************** *** 1509,1519 **** ); ! if ($overall_header) ! { ! $layouttemplate->assign_block_vars('editcp', $temp_array); ! } ! else { ! $layouttemplate->assign_block_vars('layout_column.blocks.edit', $temp_array); } } --- 1630,1643 ---- ); ! if (isset($layouttemplate)) { ! if ($overall_header) ! { ! $layouttemplate->assign_block_vars('editcp', $temp_array); ! } ! else ! { ! $layouttemplate->assign_block_vars('layout_column.blocks.edit', $temp_array); ! } } } *************** *** 1941,1945 **** function load_block_parameters( $block_id = false ) { ! global $mx_root_path, $template, $blockcptemplate, $board_config, $theme, $userdata; $return = false; --- 2065,2069 ---- function load_block_parameters( $block_id = false ) { ! global $mx_root_path, $module_root_path, $template, $blockcptemplate, $board_config, $theme, $userdata; $return = false; *************** *** 1957,1961 **** ob_start(); $this->is_panel = false; ! $template = new mx_Template($mx_root_path . $this->module_root_path . 'templates/subSilver', $board_config); switch ( $parameter_data['parameter_type'] ) --- 2081,2085 ---- ob_start(); $this->is_panel = false; ! $template = new mx_Template($mx_root_path . $this->module_root_path . 'templates/' . $theme['template_name']); switch ( $parameter_data['parameter_type'] ) *************** *** 2532,2535 **** --- 2656,2660 ---- var $auth_view = false; + var $auth_mod = false; var $auth_ip = false; var $phpbb_stats = '-1'; *************** *** 2711,2714 **** --- 2836,2840 ---- $this->_auth_ary = $this->auth(); $this->auth_view = $this->_auth_ary['auth_view']; + $this->auth_mod = $this->_auth_ary['auth_mod']; $this->auth_ip = $mx_ip->auth($this->info['ip_filter']); *************** *** 2736,2739 **** --- 2862,2937 ---- /** + * Initiate and load page data + * @access private + */ + function sync_configs() + { + global $portal_config, $board_config; + + foreach ($portal_config as $key => $value) + { + $do = true; + switch ($key) + { + // + // Keep phpBB2/phpBB3 cookies, but overwrite internal + // + case 'cookie_domain': + case 'cookie_name': + case 'cookie_path': + case 'cookie_secure': + case 'session_length': + if (PORTAL_BACKEND != 'internal') + { + $do = false; + } + break; + + case 'portal_id': + case 'portal_status': + case 'disabled_message': + case 'default_style': + case 'override_user_style': + case 'default_lang': + case 'script_path': + case 'mx_use_cache': + case 'mod_rewrite': + case 'default_admin_style': + case 'overall_header': + case 'overall_footer': + case 'main_layout': + case 'navigation_block': + case 'top_phpbb_links': + //case 'smilies_path': + case 'portal_version': + case 'portal_recached': + case 'portal_backend': + case 'portal_startdate': + case 'rand_seed': + case 'record_online_users': + case 'record_online_date': + $do = false; + break; + case 'portal_name': + $key = 'sitename'; + break; + + case 'portal_desc': + $key = 'site_desc'; + break; + + case 'portal_desc': + $key = 'site_desc'; + break; + } + + if ($do) + { + $board_config[$key] = $value; + } + } + } + + /** * Enter description here... * *************** *** 2869,2873 **** $template->assign_block_vars( 'navlinks', array( 'PAGE_NAME' => $parent_name, ! 'U_VIEW_PAGE' => append_sid( $this->this_mxurl( 'page=' . $parent_page_id ) ) ) ); } --- 3067,3071 ---- $template->assign_block_vars( 'navlinks', array( 'PAGE_NAME' => $parent_name, ! 'U_VIEW_PAGE' => mx_append_sid( $this->this_mxurl( 'page=' . $parent_page_id ) ) ) ); } *************** *** 2876,2880 **** $template->assign_block_vars( 'navlinks', array( 'PAGE_NAME' => $this->page_rowset[$page_id]['page_name'], ! 'U_VIEW_PAGE' => append_sid( $this->this_mxurl( 'page=' . $this->page_rowset[$page_id]['page_id'] ) ) ) ); --- 3074,3078 ---- $template->assign_block_vars( 'navlinks', array( 'PAGE_NAME' => $this->page_rowset[$page_id]['page_name'], ! 'U_VIEW_PAGE' => mx_append_sid( $this->this_mxurl( 'page=' . $this->page_rowset[$page_id]['page_id'] ) ) ) ); *************** *** 3013,3016 **** --- 3211,3240 ---- /** + * Load file. + * + * Load additional functions/classes. + * + * @access public + * @param string $text + * @param boolean $read_file + */ + function load_file($file = '', $backend = '', $ext = '') + { + global $mx_root_path, $phpbb_root_path, $phpEx; + + $backend = !empty($backend) ? 'shared/' . $backend . '/includes/' : ''; + $ext = !empty($ext) ? $ext : $phpEx; + + if (file_exists($mx_root_path . 'includes/'.$backend.$file.'.'.$ext)) + { + @include_once($mx_root_path . 'includes/'.$backend.$file.'.'.$ext); + } + else + { + @include_once($phpbb_root_path . 'includes/'.$file.'.'.$ext); + } + } + + /** * editcp_exists. * Index: mx_constants.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_constants.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** mx_constants.php 30 Jan 2007 16:26:07 -0000 1.24 --- mx_constants.php 9 Sep 2007 16:48:16 -0000 1.25 *************** *** 15,22 **** } ! // ! // Include phpBB constants ! // ! include_once($phpbb_root_path . 'includes/constants.' . $phpEx); /** --- 15,68 ---- } ! // User Levels <- this values are for compatiblility with mxBB 2.8.x and phpBB2 ! // Revove them when mxBB is fixed ! !defined('DELETED') ? define('DELETED', -1) : false; ! !defined('USER') ? define('USER', 0) : false; ! !defined('ADMIN') ? define('ADMIN', 1) : false; ! !defined('MOD') ? define('MOD', 2) : false; ! // User Levels <- this values are for compatiblility with mxBB 2.8.x and phpBB2 ! ! // URL PARAMETERS ! !defined('POST_TOPIC_URL') ? define('POST_TOPIC_URL', 't') : false; ! !defined('POST_CAT_URL') ? define('POST_CAT_URL', 'c') : false; ! !defined('POST_FORUM_URL') ? define('POST_FORUM_URL', 'f') : false; ! !defined('POST_USERS_URL') ? define('POST_USERS_URL', 'u') : false; ! !defined('POST_POST_URL') ? define('POST_POST_URL', 'p') : false; ! !defined('POST_GROUPS_URL') ? define('POST_GROUPS_URL', 'g') : false; ! ! // Page numbers for session handling ! !defined('PAGE_INDEX') ? define('PAGE_INDEX', 0) : false; ! !defined('PAGE_LOGIN') ? define('PAGE_LOGIN', -1) : false; ! !defined('PAGE_SEARCH') ? define('PAGE_SEARCH', -2) : false; ! !defined('PAGE_REGISTER') ? define('PAGE_REGISTER', -3) : false; ! !defined('PAGE_PROFILE') ? define('PAGE_PROFILE', -4) : false; ! !defined('PAGE_VIEWONLINE') ? define('PAGE_VIEWONLINE', -6) : false; ! !defined('PAGE_VIEWMEMBERS') ? define('PAGE_VIEWMEMBERS', -7) : false; ! !defined('PAGE_FAQ') ? define('PAGE_FAQ', -8) : false; ! !defined('PAGE_POSTING') ? define('PAGE_POSTING', -9) : false; ! !defined('PAGE_PRIVMSGS') ? define('PAGE_PRIVMSGS', -10) : false; ! !defined('PAGE_GROUPCP') ? define('PAGE_GROUPCP', -11) : false; ! !defined('PAGE_TOPIC_OFFSET') ? define('PAGE_TOPIC_OFFSET', 5000) : false; ! ! // Auth settings (blockCP) ! !defined('AUTH_LIST_ALL') ? define('AUTH_LIST_ALL', 0) : false; ! !defined('AUTH_ALL') ? define('AUTH_ALL', 0) : false; ! !defined('AUTH_REG') ? define('AUTH_REG', 1) : false; ! !defined('AUTH_ACL') ? define('AUTH_ACL', 2) : false; ! !defined('AUTH_MOD') ? define('AUTH_MOD', 3) : false; ! !defined('AUTH_ADMIN') ? define('AUTH_ADMIN', 5) : false; ! !defined('AUTH_ANONYMOUS') ? define('AUTH_ANONYMOUS', 9) : false; ! ! !defined('AUTH_VIEW') ? define('AUTH_VIEW', 1) : false; ! !defined('AUTH_READ') ? define('AUTH_READ', 2) : false; ! !defined('AUTH_POST') ? define('AUTH_POST', 3) : false; ! !defined('AUTH_REPLY') ? define('AUTH_REPLY', 4) : false; ! !defined('AUTH_EDIT') ? define('AUTH_EDIT', 5) : false; ! !defined('AUTH_DELETE') ? define('AUTH_DELETE', 6) : false; ! !defined('AUTH_ANNOUNCE') ? define('AUTH_ANNOUNCE', 7) : false; ! !defined('AUTH_STICKY') ? define('AUTH_STICKY', 8) : false; ! !defined('AUTH_POLLCREATE') ? define('AUTH_POLLCREATE', 9) : false; ! !defined('AUTH_VOTE') ? define('AUTH_VOTE', 10) : false; ! !defined('AUTH_ATTACH') ? define('AUTH_ATTACH', 11) : false; /** *************** *** 26,35 **** define('MX_PORTAL_PAGES_OFFSET', 1000); - /** - * Other common constants and definitions. - * @access private - */ - define('AUTH_ANONYMOUS', 9); - /**#@+ * mxBB Core table names --- 72,75 ---- *************** *** 57,60 **** --- 97,102 ---- define('PAGE_TEMPLATES' , $mx_table_prefix . 'page_templates'); + define('MX_THEMES_TABLE', $mx_table_prefix.'themes'); + define('MX_MATCH_TABLE' , $mx_table_prefix . 'wordmatch'); define('MX_WORD_TABLE' , $mx_table_prefix . 'wordlist'); Index: mx_functions_phpbb.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** mx_functions_phpbb.php 19 Jun 2007 20:42:00 -0000 1.32 --- mx_functions_phpbb.php 9 Sep 2007 16:48:17 -0000 1.33 *************** *** 15,18 **** --- 15,140 ---- } + // + // First off, include common vanilla phpBB functions, from our shared dir + // Note: These functions will later be accessible wrapped as phpBBX::orig_functionname() + // + include_once($mx_root_path . 'includes/shared/phpbb2/includes/functions.' . $phpEx); + include_once($mx_root_path . 'includes/shared/phpbb3/includes/functions.' . $phpEx); + [...1332 lines suppressed...] ! $template->set_filenames(array( ! 'jumpbox' => 'jumpbox.tpl') ! ); ! ! $template->assign_vars(array( ! 'L_GO' => $lang['Go'], ! 'L_JUMP_TO' => $lang['Jump_to'], ! 'L_SELECT_FORUM' => $lang['Select_forum'], ! ! 'S_JUMPBOX_SELECT' => $boxstring, ! 'S_JUMPBOX_ACTION' => mx_append_sid($action), ! 'S_FORUM_COUNT' => $j) ! ); ! $template->assign_var_from_handle('JUMPBOX', 'jumpbox'); ! ! return; ! } ! ! ?> \ No newline at end of file Index: mx_functions_tools.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mx_functions_tools.php 6 Aug 2007 20:07:05 -0000 1.15 --- mx_functions_tools.php 9 Sep 2007 16:48:17 -0000 1.16 *************** *** 18,22 **** // This 'include' is needed for the mx_text class // ! @include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx); /** --- 18,25 ---- // This 'include' is needed for the mx_text class // ! if( !function_exists('bbencode_second_pass') ) ! { [...1397 lines suppressed...] + break; + + case 'insert': + $return_data = $this->insert_phpbb_post( $title, $comments_text, $this->forum_id, $user_id, $username, $user_attach_sig, $this->topic_id, '', $title_first, $comments_text_first, $comment_bbcode_uid ); + break; + + case 'update': + $return_data = $this->insert_phpbb_post( $title, $comments_text, $this->forum_id, $user_id, $username, $user_attach_sig, $this->topic_id, $cid, $title_first, $comments_text_first, $comment_bbcode_uid ); + break; + + default: + mx_message_die(GENERAL_ERROR, 'bad post mode'); + } + + return $return_data; + } + } + /** * Class: debug. --- NEW FILE: template.php --- <?php /** * * @package mxBB Portal Module - mx_xs * @version $Id: template.php,v 1.18 2007/09/09 16:48:17 jonohlsson Exp $ * @copyright (c) 2002-2007 [CyberAlien, OryNider] mxBB Project Team * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2 * @link http://www.mxbb.net * */ /** * * Template class. By Nathan Codding of the phpBB group. * The interface was originally inspired by PHPLib templates, * and the template file formats are quite similar. * * eXtreme Styles mod/module by CyberAlien. [...2418 lines suppressed...] $list = explode('|', $str); for($i=0; $i<count($list); $i++) { $row = explode('=', $list[$i], 2); if(count($row) == 2) { $array[$row[0]] = $row[1]; } } return $array; } } function xs_switch($tpl, $name) { return (isset($tpl->_tpldata[$name.'.']) && count($tpl->_tpldata[$name.'.']) > 0); } ?> Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_header.php,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** page_header.php 22 Jul 2007 20:59:56 -0000 1.45 --- page_header.php 9 Sep 2007 16:48:17 -0000 1.46 *************** *** 85,90 **** // Parse and show the overall header. // $layouttemplate->set_filenames(array( ! 'overall_header' => empty($mx_page->page_ov_header) || !file_exists($mx_root_path . TEMPLATE_ROOT_PATH . $mx_page->page_ov_header) ? ( empty($gen_simple_header) ? 'overall_header.tpl' : 'simple_header.tpl' ) : $mx_page->page_ov_header )); --- 85,91 ---- // Parse and show the overall header. // + $page_ov_header2 = substr_count($mx_page->page_ov_header, 'html') ? str_replace(".html", ".tpl", $mx_page->page_ov_header) : str_replace(".tpl", ".html", $mx_page->page_ov_header); $layouttemplate->set_filenames(array( ! 'overall_header' => empty($mx_page->page_ov_header) || ( !file_exists($mx_root_path . TEMPLATE_ROOT_PATH . $mx_page->page_ov_header) && !file_exists($mx_root_path . TEMPLATE_ROOT_PATH . $page_ov_header2) ) ? ( empty($gen_simple_header) ? 'overall_header.' . $tplEx : 'simple_header.' . $tplEx ) : $mx_page->page_ov_header )); *************** *** 92,167 **** // Generate logged in/logged out status // ! if ( $userdata['session_logged_in'] ) ! { ! $u_login_logout = 'login.'.$phpEx.'?logout=true&sid=' . $userdata['session_id']; ! $l_login_logout = $lang['Logout'] . ' [ ' . $userdata['username'] . ' ]'; ! } ! else { ! $u_login_logout = 'login.'.$phpEx; ! $l_login_logout = $lang['Login']; ! } ! $s_last_visit = ( $userdata['session_logged_in'] ) ? create_date($board_config['default_dateformat'], $userdata['user_lastvisit'], $board_config['board_timezone']) : ''; ! // ! // Obtain number of new private messages ! // if user is logged in ! // ! if ( ($userdata['session_logged_in']) && (empty($gen_simple_header)) ) ! { ! if ( $userdata['user_new_privmsg'] ) ! { ! $l_message_new = ( $userdata['user_new_privmsg'] == 1 ) ? $lang['New_pm'] : $lang['New_pms']; ! $l_privmsgs_text = sprintf($l_message_new, $userdata['user_new_privmsg']); ! if ( $userdata['user_last_privmsg'] > $userdata['user_lastvisit'] ) { ! $sql = "UPDATE " . USERS_TABLE . " ! SET user_last_privmsg = " . $userdata['user_lastvisit'] . " ! WHERE user_id = " . $userdata['user_id']; ! if ( !$db->sql_query($sql) ) { ! mx_message_die(GENERAL_ERROR, 'Could not update private message new/read time for user', '', __LINE__, __FILE__, $sql); } ! $s_privmsg_new = 1; ! $icon_pm = $images['pm_new_msg']; } else { - $s_privmsg_new = 0; $icon_pm = $images['pm_no_new_msg']; } - $mx_priv_msg = $lang['Private_Messages'] . ' (' . $userdata['user_new_privmsg'] . ')'; - } - else - { - $l_privmsgs_text = $lang['No_new_pm']; ! $s_privmsg_new = 0; ! $icon_pm = $images['pm_no_new_msg']; ! $mx_priv_msg = $lang['Private_Messages']; ! } ! if ( $userdata['user_unread_privmsg'] ) ! { ! $l_message_unread = ( $userdata['user_unread_privmsg'] == 1 ) ? $lang['Unread_pm'] : $lang['Unread_pms']; ! $l_privmsgs_text_unread = sprintf($l_message_unread, $userdata['user_unread_privmsg']); ! } ! else ! { ! $l_privmsgs_text_unread = $lang['No_unread_pm']; ! } ! } ! else ! { ! $icon_pm = $images['pm_no_new_msg']; ! $l_privmsgs_text = $lang['Login_check_pm']; ! $l_privmsgs_text_unread = ''; ! $s_privmsg_new = 0; ! $mx_priv_msg = $lang['Private_Messages']; } // // Generate HTML required for Mozilla Navigation bar --- 93,256 ---- // Generate logged in/logged out status // ! switch (PORTAL_BACKEND) { ! case 'internal': ! case 'phpbb2': ! if ( $userdata['session_logged_in'] ) ! { ! $is_logged = true; ! $u_login_logout = 'login.'.$phpEx.'?logout=true&sid=' . $userdata['session_id']; ! $l_login_logout = $lang['Logout'] . ' [ ' . $userdata['username'] . ' ]'; ! } ! else ! { ! $is_logged = false; ! $u_login_logout = 'login.'.$phpEx; ! $l_login_logout = $lang['Login']; ! } ! $s_last_visit = ( $userdata['session_logged_in'] ) ? phpBB2::create_date($board_config['default_dateformat'], $userdata['user_lastvisit'], $board_config['board_timezone']) : ''; ! // ! // Obtain number of new private messages ! // if user is logged in ! // ! if ( ($userdata['session_logged_in']) && (empty($gen_simple_header)) ) { ! if ( $userdata['user_new_privmsg'] ) { ! $l_message_new = ( $userdata['user_new_privmsg'] == 1 ) ? $lang['New_pm'] : $lang['New_pms']; ! $l_privmsgs_text = sprintf($l_message_new, $userdata['user_new_privmsg']); ! ! if ( $userdata['user_last_privmsg'] > $userdata['user_lastvisit'] ) ! { ! $sql = "UPDATE " . USERS_TABLE . " ! SET user_last_privmsg = " . $userdata['user_lastvisit'] . " ! WHERE user_id = " . $userdata['user_id']; ! if ( !$db->sql_query($sql) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not update private message new/read time for user', '', __LINE__, __FILE__, $sql); ! } ! ! $s_privmsg_new = 1; ! $icon_pm = $images['pm_new_msg']; ! } ! else ! { ! $s_privmsg_new = 0; ! $icon_pm = $images['pm_no_new_msg']; ! } ! $mx_priv_msg = $lang['Private_Messages'] . ' (' . $userdata['user_new_privmsg'] . ')'; } + else + { + $l_privmsgs_text = $lang['No_new_pm']; ! $s_privmsg_new = 0; ! $icon_pm = $images['pm_no_new_msg']; ! $mx_priv_msg = $lang['Private_Messages']; ! } ! ! if ( $userdata['user_unread_privmsg'] ) ! { ! $l_message_unread = ( $userdata['user_unread_privmsg'] == 1 ) ? $lang['Unread_pm'] : $lang['Unread_pms']; ! $l_privmsgs_text_unread = sprintf($l_message_unread, $userdata['user_unread_privmsg']); ! } ! else ! { ! $l_privmsgs_text_unread = $lang['No_unread_pm']; ! } } else { $icon_pm = $images['pm_no_new_msg']; + $l_privmsgs_text = $lang['Login_check_pm']; + $l_privmsgs_text_unread = ''; + $s_privmsg_new = 0; + $mx_priv_msg = $lang['Private_Messages']; } ! break; ! case 'phpbb3': ! ! if ( $mx_user->data['user_id'] != 1 ) ! { ! $is_logged = true; ! $u_login_logout = 'login.'.$phpEx.'?logout=true&sid=' . $mx_user->data['session_id']; ! $l_login_logout = $lang['Logout'] . ' [ ' . $mx_user->data['username'] . ' ]'; ! } ! else ! { ! $is_logged = false; ! $u_login_logout = 'login.'.$phpEx; ! $l_login_logout = $lang['Login']; ! } ! $s_last_visit = ( $mx_user->data['session_logged_in'] ) ? phpBB2::create_date($board_config['default_dateformat'], $mx_user->data['user_lastvisit'], $board_config['board_timezone']) : ''; ! ! // ! // Obtain number of new private messages ! // if user is logged in ! // ! if ( ($mx_user->data['session_logged_in']) && (empty($gen_simple_header)) ) ! { ! if ( $mx_user->data['user_new_privmsg'] ) ! { ! $l_message_new = ( $mx_user->data['user_new_privmsg'] == 1 ) ? $lang['New_pm'] : $lang['New_pms']; ! $l_privmsgs_text = sprintf($l_message_new, $mx_user->data['user_new_privmsg']); ! ! if ( $mx_user->data['user_last_privmsg'] > $mx_user->data['user_lastvisit'] ) ! { ! $sql = "UPDATE " . USERS_TABLE . " ! SET user_last_privmsg = " . $mx_user->data['user_lastvisit'] . " ! WHERE user_id = " . $mx_user->data['user_id']; ! if ( !$db->sql_query($sql) ) ! { ! mx_message_die(GENERAL_ERROR, 'Could not update private message new/read time for user', '', __LINE__, __FILE__, $sql); ! } ! ! $s_privmsg_new = 1; ! $icon_pm = $images['pm_new_msg']; ! } ! else ! { ! $s_privmsg_new = 0; ! $icon_pm = $images['pm_no_new_msg']; ! } ! $mx_priv_msg = $lang['Private_Messages'] . ' (' . $mx_user->data['user_new_privmsg'] . ')'; ! } ! else ! { ! $l_privmsgs_text = $lang['No_new_pm']; ! ! $s_privmsg_new = 0; ! $icon_pm = $images['pm_no_new_msg']; ! $mx_priv_msg = $lang['Private_Messages']; ! } ! ! if ( $mx_user->data['user_unread_privmsg'] ) ! { ! $l_message_unread = ( $mx_user->data['user_unread_privmsg'] == 1 ) ? $lang['Unread_pm'] : $lang['Unread_pms']; ! $l_privmsgs_text_unread = sprintf($l_message_unread, $mx_user->data['user_unread_privmsg']); ! } ! else ! { ! $l_privmsgs_text_unread = $lang['No_unread_pm']; ! } ! } ! else ! { ! $icon_pm = $images['pm_no_new_msg']; ! $l_privmsgs_text = $lang['Login_check_pm']; ! $l_privmsgs_text_unread = ''; ! $s_privmsg_new = 0; ! $mx_priv_msg = $lang['Private_Messages']; ! } ! ! break; } + // // Generate HTML required for Mozilla Navigation bar *************** *** 178,182 **** if ( !empty($nav_array['url']) ) { ! $nav_links_html .= sprintf($nav_link_proto, $nav_item, append_sid($nav_array['url']), $nav_array['title']); } else --- 267,271 ---- if ( !empty($nav_array['url']) ) { ! $nav_links_html .= sprintf($nav_link_proto, $nav_item, mx_append_sid($nav_array['url']), $nav_array['title']); } else *************** *** 251,254 **** --- 340,373 ---- } + // Definitions of main navigation links + switch (PORTAL_BACKEND) + { + case 'internal': + case 'phpbb2': + $u_register = 'profile.'.$phpEx.'?mode=register' ; + $u_profile = 'profile.'.$phpEx.'?mode=editprofile'; + $u_privatemsgs = 'privmsg.'.$phpEx.'?folder=inbox'; + $u_privatemsgs_popup = 'privmsg.'.$phpEx.'?mode=newpm'; + $u_search = 'search.'.$phpEx; + $u_memberlist = 'memberlist.'.$phpEx; + $u_modcp = 'modcp.'.$phpEx; + $u_faq = 'faq.'.$phpEx; + $u_viewonline = 'viewonline.'.$phpEx; + $u_group_cp = 'groupcp.'.$phpEx; + break; + case 'phpbb3': + $u_register = 'ucp.'.$phpEx.'?mode=register'; + $u_profile = 'ucp.'.$phpEx; + $u_privatemsgs = 'ucp.'.$phpEx.'?i=pm&folder=inbox'; + $u_privatemsgs_popup ='ucp.'.$phpEx.'?i=pm&mode=popup'; + $u_search = 'search.'.$phpEx; + $u_memberlist = 'memberlist.'.$phpEx; + $u_modcp = 'mcp.'.$phpEx; + $u_faq = 'faq.'.$phpEx; + $u_viewonline = 'viewonline.'.$phpEx; + $u_group_cp = 'ucp.'.$phpEx.'?i=167'; + break; + } + $layouttemplate->assign_vars(array( 'SITENAME' => $board_config['sitename'], *************** *** 256,262 **** 'PAGE_TITLE' => $mx_page->page_title, 'LAST_VISIT_DATE' => sprintf($lang['You_last_visit'], $s_last_visit), ! 'CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), ! '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'])), 'PRIVATE_MESSAGE_INFO' => $l_privmsgs_text, 'PRIVATE_MESSAGE_INFO_UNREAD' => $l_privmsgs_text_unread, --- 375,381 ---- 'PAGE_TITLE' => $mx_page->page_title, 'LAST_VISIT_DATE' => sprintf($lang['You_last_visit'], $s_last_visit), ! 'CURRENT_TIME' => sprintf($lang['Current_time'], phpBB2::create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), ! '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'])), 'PRIVATE_MESSAGE_INFO' => $l_privmsgs_text, 'PRIVATE_MESSAGE_INFO_UNREAD' => $l_privmsgs_text_unread, *************** *** 287,305 **** 'L_BACK_TO_TOP' => $lang['Back_to_top'], ! 'U_SEARCH_UNANSWERED' => append_sid(PHPBB_URL . 'search.'.$phpEx.'?search_id=unanswered'), ! 'U_SEARCH_SELF' => append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=egosearch'), ! 'U_SEARCH_NEW' => append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=newposts'), ! 'U_REGISTER' => append_sid(PHPBB_URL .'profile.'.$phpEx.'?mode=register'), ! 'U_PROFILE' => append_sid(PHPBB_URL .'profile.'.$phpEx.'?mode=editprofile'), ! 'U_PRIVATEMSGS' => append_sid(PHPBB_URL .'privmsg.'.$phpEx.'?folder=inbox'), ! 'U_PRIVATEMSGS_POPUP' => append_sid(PHPBB_URL .'privmsg.'.$phpEx.'?mode=newpm'), ! 'U_SEARCH' => append_sid(PHPBB_URL .'search.'.$phpEx), ! 'U_MEMBERLIST' => append_sid(PHPBB_URL .'memberlist.'.$phpEx), ! 'U_MODCP' => append_sid(PHPBB_URL .'modcp.'.$phpEx), ! 'U_FAQ' => append_sid(PHPBB_URL .'faq.'.$phpEx), ! 'U_VIEWONLINE' => append_sid(PHPBB_URL .'viewonline.'.$phpEx), ! 'U_LOGIN_LOGOUT' => append_sid(PORTAL_URL . $u_login_logout), ! 'U_GROUP_CP' => append_sid(PHPBB_URL . 'groupcp.'.$phpEx), 'NAV_IMAGES_HOME' => $images['mx_nav_home'], --- 406,426 ---- 'L_BACK_TO_TOP' => $lang['Back_to_top'], ! 'U_SEARCH_UNANSWERED' => mx_append_sid(PHPBB_URL . 'search.'.$phpEx.'?search_id=unanswered'), ! 'U_SEARCH_SELF' => mx_append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=egosearch'), ! 'U_SEARCH_NEW' => mx_append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=newposts'), ! 'U_REGISTER' => mx_append_sid(PHPBB_URL . $u_register), ! 'U_PROFILE' => mx_append_sid(PHPBB_URL . $u_profile), ! 'U_PRIVATEMSGS' => mx_append_sid(PHPBB_URL . $u_privatemsgs), ! 'U_PRIVATEMSGS_POPUP' => mx_append_sid(PHPBB_URL . $u_privatemsgs_popup), ! 'U_SEARCH' => mx_append_sid(PHPBB_URL . $u_search), ! 'U_MEMBERLIST' =>mx_append_sid(PHPBB_URL . $u_memberlist), ! 'U_MODCP' => mx_append_sid(PHPBB_URL . $u_modcp), ! 'U_FAQ' => mx_append_sid(PHPBB_URL . $u_faq), ! 'U_VIEWONLINE' => mx_append_sid(PHPBB_URL . $u_viewonline), ! 'U_LOGIN_LOGOUT' => mx_append_sid(PORTAL_URL . $u_login_logout), ! 'U_GROUP_CP' => mx_append_sid(PHPBB_URL . $u_group_cp), ! ! 'LOGO' => $images['mx_logo'], 'NAV_IMAGES_HOME' => $images['mx_nav_home'], *************** *** 319,323 **** 'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], 'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone), ! 'S_LOGIN_ACTION' => append_sid(PORTAL_URL . 'login.'.$phpEx), // --- 440,444 ---- 'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'], 'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone), ! 'S_LOGIN_ACTION' => mx_append_sid(PORTAL_URL . 'login.'.$phpEx), // *************** *** 371,379 **** 'L_FORUM' => $lang['MX_forum'], ! 'U_INDEX_FORUM' => append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=2'), ! 'U_INDEX' => append_sid(PORTAL_URL . 'index.' . $phpEx), ! 'U_SEARCH_SITE' => append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=' . $search_page_id_site . '&mode=results&search_terms=all'), ! 'U_SEARCH_KB' => append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=' . $search_page_id_kb . '&mode=search&search_terms=all'), ! 'U_SEARCH_PAFILEDB' => append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=' . $search_page_id_pafiledb . '&action=search&search_terms=all'), 'PAGE_ICON' => $page_icon_img, --- 492,500 ---- 'L_FORUM' => $lang['MX_forum'], ! 'U_INDEX_FORUM' => mx_append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=2'), ! 'U_INDEX' => mx_append_sid(PORTAL_URL . 'index.' . $phpEx), ! 'U_SEARCH_SITE' => mx_append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=' . $search_page_id_site . '&mode=results&search_terms=all'), ! 'U_SEARCH_KB' => mx_append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=' . $search_page_id_kb . '&mode=search&search_terms=all'), ! 'U_SEARCH_PAFILEDB' => mx_append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=' . $search_page_id_pafiledb . '&action=search&search_terms=all'), 'PAGE_ICON' => $page_icon_img, *************** *** 461,502 **** // Navigation Menu in overall_header // ! if (!is_object($mx_block)) { ! $mx_block = new mx_block(); ! } ! $block_id = $mx_page->page_navigation_block; ! if(!empty($block_id) ) ! { ! define('MX_OVERALL_NAVIGATION', true); ! $mx_block->init( $block_id ); ! // ! // Define $module_root_path, to be used within blocks ! // ! $module_root_path = $mx_root_path . $mx_block->module_root_path; ! $template = new mx_Template($mx_root_path . 'templates/'. $theme['template_name']); ! // ! // Include block file and cache output ! // ! ob_start(); ! include($module_root_path . $mx_block->block_file); ! $overall_navigation_menu = ob_get_contents(); ! ob_end_clean(); ! // ! // Output Block contents ! // ! $layouttemplate->assign_vars(array( ! 'OVERALL_NAVIGATION' => $overall_navigation_menu) ! ); ! if ( ( ( $mx_block->auth_view && $mx_block->auth_edit && $mx_block->show_block ) || $mx_block->auth_mod ) ) ! { ! $mx_block->output_cp_button(true); } } --- 582,626 ---- // Navigation Menu in overall_header // ! if ($mx_page->auth_view || $mx_page->auth_mod) { ! if (!is_object($mx_block)) ! { ! $mx_block = new mx_block(); ! } ! $block_id = $mx_page->page_navigation_block; ! if(!empty($block_id) ) ! { ! define('MX_OVERALL_NAVIGATION', true); ! $mx_block->init( $block_id ); ! // ! // Define $module_root_path, to be used within blocks ! // ! $module_root_path = $mx_root_path . $mx_block->module_root_path; ! $template = new mx_Template($mx_root_path . 'templates/'. $theme['template_name']); ! // ! // Include block file and cache output ! // ! ob_start(); ! include($module_root_path . $mx_block->block_file); ! $overall_navigation_menu = ob_get_contents(); ! ob_end_clean(); ! // ! // Output Block contents ! // ! $layouttemplate->assign_vars(array( ! 'OVERALL_NAVIGATION' => $overall_navigation_menu) ! ); ! if ( ( ( $mx_block->auth_view && $mx_block->auth_edit && $mx_block->show_block ) || $mx_block->auth_mod ) ) ! { ! $mx_block->output_cp_button(true); ! } } } Index: mx_functions_style.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** mx_functions_style.php 6 Aug 2007 22:40:07 -0000 1.17 --- mx_functions_style.php 9 Sep 2007 16:48:17 -0000 1.18 *************** *** 16,27 **** // ! // Including phpBB version of the Template class // ! include_once($phpbb_root_path . 'includes/template.' . $phpEx); // ! // Including phpBB session functions // ! include_once($phpbb_root_path . 'includes/sessions.' . $phpEx); [...1166 lines suppressed...] } *************** *** 681,684 **** --- 1139,1143 ---- $current_template_path = $module_root_path . $this->current_template_path; $cloned_template_path = $module_root_path . $this->cloned_current_template_path; + $default_template_path = $module_root_path . $this->default_current_template_path; $template_name = $this->template_name; *************** *** 894,896 **** } // class mx_user ! ?> --- 1353,1355 ---- } // class mx_user ! ?> \ No newline at end of file |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:48:23
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8466/admin Modified Files: admin_mx_block_cp.php admin_mx_chkobjs.php admin_mx_gen_cache.php admin_mx_meta.php admin_mx_module.php admin_mx_module_cp.php admin_mx_page_cp.php admin_mx_portal.php index.php page_header_admin.php pagestart.php Added Files: admin_mx_styles.php Log Message: Ok, massive update for 2.9.x. Index: admin_mx_chkobjs.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_chkobjs.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** admin_mx_chkobjs.php 5 May 2007 20:12:54 -0000 1.22 --- admin_mx_chkobjs.php 9 Sep 2007 16:48:15 -0000 1.23 *************** *** 109,113 **** mx_message_die(GENERAL_MESSAGE, '<p>'.$main_desc.'</p>' . ! '<form action="' . append_sid(PORTAL_URL . "admin/admin_mx_chkobjs.$phpEx") . '" method="post"> ' . $select_options . ' <input type="submit" name="submit" value="' . $lang[Submit].'" class="mainoption" /></form>', --- 109,113 ---- mx_message_die(GENERAL_MESSAGE, '<p>'.$main_desc.'</p>' . ! '<form action="' . mx_append_sid(PORTAL_URL . "admin/admin_mx_chkobjs.$phpEx") . '" method="post"> ' . $select_options . ' <input type="submit" name="submit" value="' . $lang[Submit].'" class="mainoption" /></form>', *************** *** 141,147 **** '<b>' . $lang['Confirm'] . '</b>:<br />' . $sql . '<br />' . '<br /> <br />' . ! '[ <a href="'.append_sid(basename(__FILE__)."?check_mode=$tb").'">'.$lang['No'].'</a> ]' . ' ' . ! '[ <a href="'.append_sid(basename(__FILE__).'?mode=db_delete'.$get_vars).'">'.$lang['Yes'].'</a> ]' . '</div><br /> ' . '</form>'; --- 141,147 ---- '<b>' . $lang['Confirm'] . '</b>:<br />' . $sql . '<br />' . '<br /> <br />' . ! '[ <a href="'.mx_append_sid(basename(__FILE__)."?check_mode=$tb").'">'.$lang['No'].'</a> ]' . ' ' . ! '[ <a href="'.mx_append_sid(basename(__FILE__).'?mode=db_delete'.$get_vars).'">'.$lang['Yes'].'</a> ]' . '</div><br /> ' . '</form>'; *************** *** 208,212 **** $html.="\t" . '</tr>' . "\n"; $html.="\t" . '<tr>' . "\n"; ! $html.=tbHead('td', 'cat', 5, '<a href="'.append_sid(basename(__FILE__)."?table=$tb").'"><b>Go Back</b></a>'); $html.="\t" . '</tr>' . "\n"; --- 208,212 ---- $html.="\t" . '</tr>' . "\n"; $html.="\t" . '<tr>' . "\n"; ! $html.=tbHead('td', 'cat', 5, '<a href="'.mx_append_sid(basename(__FILE__)."?table=$tb").'"><b>Go Back</b></a>'); $html.="\t" . '</tr>' . "\n"; *************** *** 258,262 **** $onclick = 'onclick="return confirm(\'Are you sure you want to delete this object?\');"'; ! $html.=tbItem('td', 'row1', 'center', '<a href="'.append_sid(basename(__FILE__).'?mode=delete'.$get_vars).'" '.$onclick.'>'.$lang['Delete'].'</a>'); $html.= "\t" . '</tr>' . "\n"; $row_count++; --- 258,262 ---- $onclick = 'onclick="return confirm(\'Are you sure you want to delete this object?\');"'; ! $html.=tbItem('td', 'row1', 'center', '<a href="'.mx_append_sid(basename(__FILE__).'?mode=delete'.$get_vars).'" '.$onclick.'>'.$lang['Delete'].'</a>'); $html.= "\t" . '</tr>' . "\n"; $row_count++; *************** *** 264,268 **** $html.="\t" . '<tr>' . "\n"; ! $html.=tbHead('td', 'catBottom', 5, '<a href="'.append_sid(basename(__FILE__)."?table=$tb").'"><b>Go Back</b></a>'); $html.="\t" . '</tr>' . "\n"; $html.='</table><br />' . "\n"; --- 264,268 ---- $html.="\t" . '<tr>' . "\n"; ! $html.=tbHead('td', 'catBottom', 5, '<a href="'.mx_append_sid(basename(__FILE__)."?table=$tb").'"><b>Go Back</b></a>'); $html.="\t" . '</tr>' . "\n"; $html.='</table><br />' . "\n"; Index: admin_mx_module_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** admin_mx_module_cp.php 5 May 2007 20:12:55 -0000 1.17 --- admin_mx_module_cp.php 9 Sep 2007 16:48:15 -0000 1.18 *************** *** 289,294 **** 'COOKIE_SECURE' => $board_config['cookie_secure'], ! 'S_ACTION' => append_sid("admin_mx_module_cp.$phpEx"), ! 'S_ACTION_DEFAULT' => append_sid("admin_mx_module_cp.$phpEx"), // --- 289,294 ---- 'COOKIE_SECURE' => $board_config['cookie_secure'], ! 'S_ACTION' => mx_append_sid("admin_mx_module_cp.$phpEx"), ! 'S_ACTION_DEFAULT' => mx_append_sid("admin_mx_module_cp.$phpEx"), // *************** *** 317,324 **** // Get the list of phpBB usergroups // ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> " . TRUE . " ! ORDER BY group_name ASC"; if( !($result = $db->sql_query($sql)) ) { --- 317,336 ---- // Get the list of phpBB usergroups // ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> " . TRUE . " ! ORDER BY group_name ASC"; ! break; ! case 'phpbb3': ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_name NOT IN ('BOTS', 'GUESTS') ! ORDER BY group_name ASC"; ! break; ! } if( !($result = $db->sql_query($sql)) ) { *************** *** 491,495 **** 'MODULE_DESC' => ( $module_rows[$module_count]['module_desc'] != '' ) ? ' - ' . $module_rows[$module_count]['module_desc'] : '', ! 'U_MODULE_EDIT' => append_sid(PORTAL_URL . "admin/admin_mx_module.$phpEx?module_id=" . $module_rows[$module_count]['module_id']), // --- 503,507 ---- 'MODULE_DESC' => ( $module_rows[$module_count]['module_desc'] != '' ) ? ' - ' . $module_rows[$module_count]['module_desc'] : '', ! 'U_MODULE_EDIT' => mx_append_sid(PORTAL_URL . "admin/admin_mx_module.$phpEx?module_id=" . $module_rows[$module_count]['module_id']), // *************** *** 519,523 **** { $template->assign_block_vars('module.reload', array( ! 'U_MODULE_EDIT' => append_sid(PORTAL_URL . "admin/admin_mx_module_cp.$phpEx?module_id=" . $module_id), )); --- 531,535 ---- { $template->assign_block_vars('module.reload', array( ! 'U_MODULE_EDIT' => mx_append_sid(PORTAL_URL . "admin/admin_mx_module_cp.$phpEx?module_id=" . $module_id), )); *************** *** 584,588 **** $message_delete = $lang['Delete_function'] . ' - ' . $function_title . '<br /><br />' . $lang['Delete_function_explain'] ! . '<br /><br />' . sprintf($lang['Click_function_delete_yes'], '<a href="' . append_sid("admin_mx_module_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; --- 596,600 ---- $message_delete = $lang['Delete_function'] . ' - ' . $function_title . '<br /><br />' . $lang['Delete_function_explain'] ! . '<br /><br />' . sprintf($lang['Click_function_delete_yes'], '<a href="' . mx_append_sid("admin_mx_module_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; *************** *** 622,626 **** 'FUNCTION_DESC' => ( $function_desc != '' ) ? ' - ' . $function_desc : '', ! 'U_FUNCTION_DELETE' => append_sid(PORTAL_URL . "admin/admin_mx_module_cp.$phpEx" . $deletemode), // --- 634,638 ---- 'FUNCTION_DESC' => ( $function_desc != '' ) ? ' - ' . $function_desc : '', ! 'U_FUNCTION_DELETE' => mx_append_sid(PORTAL_URL . "admin/admin_mx_module_cp.$phpEx" . $deletemode), // *************** *** 722,726 **** $message_delete = $lang['Delete_parameter'] . ' - ' . $parameter_title . '<br /><br />' . $lang['Delete_parameter_explain'] ! . '<br /><br />' . sprintf($lang['Click_parameter_delete_yes'], '<a href="' . append_sid("admin_mx_module_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; --- 734,738 ---- $message_delete = $lang['Delete_parameter'] . ' - ' . $parameter_title . '<br /><br />' . $lang['Delete_parameter_explain'] ! . '<br /><br />' . sprintf($lang['Click_parameter_delete_yes'], '<a href="' . mx_append_sid("admin_mx_module_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; *************** *** 753,759 **** "PARAMETER_TYPE" => $new_parameter ? '' : (!empty($lang['ParType_'.$parameter_type_key]) ? $lang['ParType_'.$parameter_type_key] : $parameter_type_key), ! "U_DELETE" => append_sid("admin_mx_module_cp.php" . $deletemode), ! "U_MOVE_UP" => append_sid("admin_mx_module_cp.php" . $upmode), ! "U_MOVE_DOWN" => append_sid("admin_mx_module_cp.php" . $downmode), // --- 765,771 ---- "PARAMETER_TYPE" => $new_parameter ? '' : (!empty($lang['ParType_'.$parameter_type_key]) ? $lang['ParType_'.$parameter_type_key] : $parameter_type_key), ! "U_DELETE" => mx_append_sid("admin_mx_module_cp.php" . $deletemode), ! "U_MOVE_UP" => mx_append_sid("admin_mx_module_cp.php" . $upmode), ! "U_MOVE_DOWN" => mx_append_sid("admin_mx_module_cp.php" . $downmode), // *************** *** 857,861 **** $message_delete = $lang['Delete_block'] . ' - ' . $block_title . '<br /><br />' . $lang['Delete_block_explain'] ! . '<br /><br />' . sprintf($lang['Click_block_delete_yes'], '<a href="' . append_sid("admin_mx_module_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; --- 869,873 ---- $message_delete = $lang['Delete_block'] . ' - ' . $block_title . '<br /><br />' . $lang['Delete_block_explain'] ! . '<br /><br />' . sprintf($lang['Click_block_delete_yes'], '<a href="' . mx_append_sid("admin_mx_module_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; *************** *** 874,882 **** $block_editor_id = !$new_block ? $block_rows[$block_count]['block_editor_id'] : $userdata['user_id']; ! $editor_name_tmp = get_userdata($block_editor_id); $editor_name = $editor_name_tmp['username']; $block_time = !$new_block ? $block_rows[$block_count]['block_time'] : time(); ! $edit_time = create_date( $board_config['default_dateformat'], $block_time, $board_config['board_timezone'] ); if ($new_block) --- 886,894 ---- $block_editor_id = !$new_block ? $block_rows[$block_count]['block_editor_id'] : $userdata['user_id']; ! $editor_name_tmp = mx_get_userdata($block_editor_id); $editor_name = $editor_name_tmp['username']; $block_time = !$new_block ? $block_rows[$block_count]['block_time'] : time(); ! $edit_time = phpBB2::create_date( $board_config['default_dateformat'], $block_time, $board_config['board_timezone'] ); if ($new_block) *************** *** 917,923 **** 'BLOCK_LAST_EDITED' => ( $editor_name != '' && !$new_block) ? ' (' . $lang['Block_updated_by'] . $editor_name . ', ' . $edit_time . ')' : '', ! 'U_BLOCK_SETTINGS' => append_sid(PORTAL_URL . "admin/admin_mx_block_cp.$phpEx?block_id=$block_id"), ! 'U_BLOCK_DELETE' => append_sid(PORTAL_URL . "admin/admin_mx_module_cp.$phpEx" . $deletemode), ! 'U_BLOCK_PERMISSIONS' => append_sid(PORTAL_URL . "admin/admin_mx_block_auth.$phpEx?cat_id=$block_id"), // --- 929,935 ---- 'BLOCK_LAST_EDITED' => ( $editor_name != '' && !$new_block) ? ' (' . $lang['Block_updated_by'] . $editor_name . ', ' . $edit_time . ')' : '', ! 'U_BLOCK_SETTINGS' => mx_append_sid(PORTAL_URL . "admin/admin_mx_block_cp.$phpEx?block_id=$block_id"), ! 'U_BLOCK_DELETE' => mx_append_sid(PORTAL_URL . "admin/admin_mx_module_cp.$phpEx" . $deletemode), ! 'U_BLOCK_PERMISSIONS' => mx_append_sid(PORTAL_URL . "admin/admin_mx_block_auth.$phpEx?cat_id=$block_id"), // Index: admin_mx_page_cp.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_page_cp.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** admin_mx_page_cp.php 21 Jul 2007 23:07:14 -0000 1.25 --- admin_mx_page_cp.php 9 Sep 2007 16:48:15 -0000 1.26 *************** *** 148,152 **** // General // ! 'S_ACTION' => append_sid(PORTAL_URL . "admin/admin_mx_page_cp.$phpEx"), 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), 'L_TITLE' => $lang['Page_admin'], --- 148,152 ---- // General // ! 'S_ACTION' => mx_append_sid(PORTAL_URL . "admin/admin_mx_page_cp.$phpEx"), 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), 'L_TITLE' => $lang['Page_admin'], *************** *** 301,305 **** $message_delete = $lang['Delete_page_template'] . '<br /><br />' . $lang['Delete_page_template_explain'] ! . '<br /><br />' . sprintf($lang['Click_page_template_delete_yes'], '<a href="' . append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; --- 301,305 ---- $message_delete = $lang['Delete_page_template'] . '<br /><br />' . $lang['Delete_page_template_explain'] ! . '<br /><br />' . sprintf($lang['Click_page_template_delete_yes'], '<a href="' . mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; *************** *** 323,330 **** 'TEMPLATE_TITLE' => $new_template ? $lang['Add_Template'] : $template_title, ! 'U_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), 'L_TEMPLATE_DELETE' => $lang['Page_template_delete'], ! 'U_TEMPLATE_DELETE' => append_sid("admin_mx_page_cp_template_setting.$phpEx?mode=deletetemplate&page_template_id=$page_template_id"), 'L_CREATE_TEMPLATE' => $lang['Add_Template'], --- 323,330 ---- 'TEMPLATE_TITLE' => $new_template ? $lang['Add_Template'] : $template_title, ! 'U_DELETE' => mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode), 'L_TEMPLATE_DELETE' => $lang['Page_template_delete'], ! 'U_TEMPLATE_DELETE' => mx_append_sid("admin_mx_page_cp_template_setting.$phpEx?mode=deletetemplate&page_template_id=$page_template_id"), 'L_CREATE_TEMPLATE' => $lang['Add_Template'], *************** *** 423,427 **** $message_delete = $lang['Delete_page_template_column'] . ' - ' . $column_title . '<br /><br />' . $lang['Delete_page_template_column_explain'] ! . '<br /><br />' . sprintf($lang['Click_page_template_column_delete_yes'], '<a href="' . append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; --- 423,427 ---- $message_delete = $lang['Delete_page_template_column'] . ' - ' . $column_title . '<br /><br />' . $lang['Delete_page_template_column_explain'] ! . '<br /><br />' . sprintf($lang['Click_page_template_column_delete_yes'], '<a href="' . mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; *************** *** 437,443 **** 'COLUMN_TITLE' => $new_column ? $lang['Create_column'] : $column_title, ! 'U_COLUMN_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_COLUMN_MOVE_UP' => append_sid("admin_mx_page_cp.$phpEx" . $upmode), ! 'U_COLUMN_MOVE_DOWN' => append_sid("admin_mx_page_cp.$phpEx" . $downmode), // --- 437,443 ---- 'COLUMN_TITLE' => $new_column ? $lang['Create_column'] : $column_title, ! 'U_COLUMN_DELETE' => mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_COLUMN_MOVE_UP' => mx_append_sid("admin_mx_page_cp.$phpEx" . $upmode), ! 'U_COLUMN_MOVE_DOWN' => mx_append_sid("admin_mx_page_cp.$phpEx" . $downmode), // *************** *** 478,485 **** // Get the list of phpBB usergroups // ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> " . TRUE . " ! ORDER BY group_name ASC"; if( !($result = $db->sql_query($sql)) ) { --- 478,498 ---- // Get the list of phpBB usergroups // ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> " . TRUE . " ! ORDER BY group_name ASC"; ! break; ! case 'phpbb3': ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_name NOT IN ('BOTS', 'GUESTS') ! ORDER BY group_name ASC"; ! break; ! } ! if( !($result = $db->sql_query($sql)) ) { *************** *** 632,636 **** $message_delete = $lang['Delete_page'] . '<br /><br />' . $lang['Delete_page_explain'] ! . '<br /><br />' . sprintf($lang['Click_page_delete_yes'], '<a href="' . append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; --- 645,649 ---- $message_delete = $lang['Delete_page'] . '<br /><br />' . $lang['Delete_page_explain'] ! . '<br /><br />' . sprintf($lang['Click_page_delete_yes'], '<a href="' . mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; *************** *** 678,683 **** 'PAGE_ICON' => $icon_tmp, ! 'U_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_PREVIEW' => append_sid($mx_root_path . "index.$phpEx" . '?page=' . $page_id), // --- 691,696 ---- 'PAGE_ICON' => $icon_tmp, ! 'U_DELETE' => mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_PREVIEW' => mx_append_sid($mx_root_path . "index.$phpEx" . '?page=' . $page_id), // *************** *** 788,792 **** { $template->assign_block_vars('pages.reload', array( ! 'U_PAGE_EDIT' => append_sid(PORTAL_URL . "admin/admin_mx_page_cp.$phpEx?page_id=" . $page_id), )); --- 801,805 ---- { $template->assign_block_vars('pages.reload', array( ! 'U_PAGE_EDIT' => mx_append_sid(PORTAL_URL . "admin/admin_mx_page_cp.$phpEx?page_id=" . $page_id), )); *************** *** 903,907 **** $message_delete = $lang['Delete_page_column'] . '<br /><br />' . $lang['Delete_page_column_explain'] ! . '<br /><br />' . sprintf($lang['Click_page_column_delete_yes'], '<a href="' . append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; --- 916,920 ---- $message_delete = $lang['Delete_page_column'] . '<br /><br />' . $lang['Delete_page_column_explain'] ! . '<br /><br />' . sprintf($lang['Click_page_column_delete_yes'], '<a href="' . mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; *************** *** 922,928 **** 'COLUMN_TITLE' => $new_column ? $lang['Create_column'] : $column_title, ! 'U_COLUMN_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_COLUMN_MOVE_UP' => append_sid("admin_mx_page_cp.$phpEx" . $upmode), ! 'U_COLUMN_MOVE_DOWN' => append_sid("admin_mx_page_cp.$phpEx" . $downmode), // --- 935,941 ---- 'COLUMN_TITLE' => $new_column ? $lang['Create_column'] : $column_title, ! 'U_COLUMN_DELETE' => mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_COLUMN_MOVE_UP' => mx_append_sid("admin_mx_page_cp.$phpEx" . $upmode), ! 'U_COLUMN_MOVE_DOWN' => mx_append_sid("admin_mx_page_cp.$phpEx" . $downmode), // *************** *** 992,998 **** $block_order = $block_rows[$block]['block_order']; ! $editor_name_tmp = get_userdata($mx_block->editor_id); $editor_name = $editor_name_tmp['username']; ! $edit_time = create_date( $board_config['default_dateformat'], $mx_block->block_time, $board_config['board_timezone'] ); $mode = MX_PAGE_BLOCK_TYPE; --- 1005,1011 ---- $block_order = $block_rows[$block]['block_order']; ! $editor_name_tmp = mx_get_userdata($mx_block->editor_id); $editor_name = $editor_name_tmp['username']; ! $edit_time = phpBB2::create_date( $board_config['default_dateformat'], $mx_block->block_time, $board_config['board_timezone'] ); $mode = MX_PAGE_BLOCK_TYPE; *************** *** 1006,1010 **** { $l_setting = $lang['Block_cp']; ! $u_setting = append_sid(PORTAL_URL . $mx_block->block_edit_file . "?block_id=$block_id"); } else --- 1019,1023 ---- { $l_setting = $lang['Block_cp']; ! $u_setting = mx_append_sid(PORTAL_URL . $mx_block->block_edit_file . "?block_id=$block_id"); } else *************** *** 1018,1022 **** // $l_setting = $lang['Block_cp']; ! $u_setting = append_sid("admin_mx_block_cp.$phpEx?block_id=$block_id"); } --- 1031,1035 ---- // $l_setting = $lang['Block_cp']; ! $u_setting = mx_append_sid("admin_mx_block_cp.$phpEx?block_id=$block_id"); } *************** *** 1035,1042 **** 'U_BLOCK_SETTING' => $u_setting, ! 'U_BLOCK_DELETE' => append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_BLOCK_MOVE_UP' => append_sid("admin_mx_page_cp.$phpEx" . $upmode), ! 'U_BLOCK_MOVE_DOWN' => append_sid("admin_mx_page_cp.$phpEx" . $downmode), ! 'U_BLOCK_RESYNC' => append_sid("admin_mx_page_cp.$phpEx" . $syncmode) )); } // for ... blocks --- 1048,1055 ---- 'U_BLOCK_SETTING' => $u_setting, ! 'U_BLOCK_DELETE' => mx_append_sid("admin_mx_page_cp.$phpEx" . $deletemode), ! 'U_BLOCK_MOVE_UP' => mx_append_sid("admin_mx_page_cp.$phpEx" . $upmode), ! 'U_BLOCK_MOVE_DOWN' => mx_append_sid("admin_mx_page_cp.$phpEx" . $downmode), ! 'U_BLOCK_RESYNC' => mx_append_sid("admin_mx_page_cp.$phpEx" . $syncmode) )); } // for ... blocks Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/index.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** index.php 5 May 2007 20:12:56 -0000 1.32 --- index.php 9 Sep 2007 16:48:16 -0000 1.33 *************** *** 99,108 **** 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! "U_PORTAL_INDEX" => append_sid(PORTAL_URL . "index.$phpEx"), "L_PORTAL_INDEX" => $lang['Portal_index'], "L_PREVIEW_PORTAL" => $lang['Preview_portal'], ! "U_FORUM_INDEX" => append_sid(PHPBB_URL . "index.$phpEx"), ! "U_ADMIN_INDEX" => append_sid("index.$phpEx?pane=right"), //+MOD: DHTML Menu for ACP 'COOKIE_NAME' => $board_config['cookie_name'], --- 99,108 ---- 'U_PHPBB_ROOT_PATH' => PHPBB_URL, 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! "U_PORTAL_INDEX" => mx_append_sid(PORTAL_URL . "index.$phpEx"), "L_PORTAL_INDEX" => $lang['Portal_index'], "L_PREVIEW_PORTAL" => $lang['Preview_portal'], ! "U_FORUM_INDEX" => mx_append_sid(PHPBB_URL . "index.$phpEx"), ! "U_ADMIN_INDEX" => mx_append_sid("index.$phpEx?pane=right"), //+MOD: DHTML Menu for ACP 'COOKIE_NAME' => $board_config['cookie_name'], *************** *** 164,168 **** //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, ! "U_ADMIN_MODULE" => append_sid(PORTAL_URL . $file) )); $row_count++; --- 164,168 ---- //-MOD: DHTML Menu for ACP "ADMIN_MODULE" => $action, ! "U_ADMIN_MODULE" => mx_append_sid(PORTAL_URL . $file) )); $row_count++; *************** *** 176,228 **** // Include PHPBB Administration // ------------------------------------------------------------------------------- ! $module_phpbb = read_admin($phpbb_root_path . 'admin/'); ! $template->assign_block_vars('module_phpbb', array( ! 'L_PHPBB' => $lang['Phpbb'] ! )); ! ! ksort($module_phpbb); ! //+MOD: DHTML Menu for ACP ! $menu_cat_id = 0; ! //-MOD: DHTML Menu for ACP ! while( list($cat, $action_array) = each($module_phpbb) ) ! { ! $cat = ( !empty($lang[$cat]) ) ? $lang[$cat] : preg_replace("/_/", " ", $cat); ! $template->assign_block_vars('module_phpbb.catrow', array( ! //+MOD: DHTML Menu for ACP ! 'MENU_CAT_ID' => $menu_cat_id, ! 'MENU_CAT_ROWS' => count($action_array), ! //-MOD: DHTML Menu for ACP ! 'ADMIN_CATEGORY' => $cat) ! ); ! ksort($action_array); ! $row_count = 0; ! while( list($action, $file) = each($action_array) ) { ! $row_color = ( !($row_count%2) ) ? $theme['td_color1'] : $theme['td_color2']; ! $row_class = ( !($row_count%2) ) ? $theme['td_class1'] : $theme['td_class2']; ! ! $action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action); ! $template->assign_block_vars('module_phpbb.catrow.modulerow', array( ! "ROW_COLOR" => "#" . $row_color, ! "ROW_CLASS" => $row_class, //+MOD: DHTML Menu for ACP ! 'ROW_COUNT' => $row_count, //-MOD: DHTML Menu for ACP ! "ADMIN_MODULE" => $action, ! "U_ADMIN_MODULE" => append_sid(PHPBB_URL . 'admin/' . $file)) ); ! $row_count++; } - //+MOD: DHTML Menu for ACP - $menu_cat_id++; - //-MOD: DHTML Menu for ACP - } // // Read Portal Module Configuration --- 176,265 ---- // Include PHPBB Administration // ------------------------------------------------------------------------------- ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! break; ! case 'phpbb2': ! $module_phpbb = read_admin($phpbb_root_path . 'admin/'); ! $template->assign_block_vars('module_phpbb', array( ! 'L_PHPBB' => $lang['Phpbb'] ! )); ! ksort($module_phpbb); ! //+MOD: DHTML Menu for ACP ! $menu_cat_id = 0; ! //-MOD: DHTML Menu for ACP ! while( list($cat, $action_array) = each($module_phpbb) ) { ! $cat = ( !empty($lang[$cat]) ) ? $lang[$cat] : preg_replace("/_/", " ", $cat); ! $template->assign_block_vars('module_phpbb.catrow', array( //+MOD: DHTML Menu for ACP ! 'MENU_CAT_ID' => $menu_cat_id, ! 'MENU_CAT_ROWS' => count($action_array), //-MOD: DHTML Menu for ACP ! 'ADMIN_CATEGORY' => $cat) ); ! ! ksort($action_array); ! ! $row_count = 0; ! while( list($action, $file) = each($action_array) ) ! { ! $row_color = ( !($row_count%2) ) ? $theme['td_color1'] : $theme['td_color2']; ! $row_class = ( !($row_count%2) ) ? $theme['td_class1'] : $theme['td_class2']; ! ! $action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action); ! ! $template->assign_block_vars('module_phpbb.catrow.modulerow', array( ! "ROW_COLOR" => "#" . $row_color, ! "ROW_CLASS" => $row_class, ! //+MOD: DHTML Menu for ACP ! 'ROW_COUNT' => $row_count, ! //-MOD: DHTML Menu for ACP ! "ADMIN_MODULE" => $action, ! "U_ADMIN_MODULE" => mx_append_sid(PHPBB_URL . 'admin/' . $file . '?sid='.$userdata['session_id'])) ! ); ! $row_count++; ! } ! //+MOD: DHTML Menu for ACP ! $menu_cat_id++; ! //-MOD: DHTML Menu for ACP } + break; + + case 'phpbb3': + + $template->assign_block_vars('module_phpbb', array( + 'L_PHPBB' => $lang['Phpbb'] + )); + + $menu_cat_id = 0; + + $template->assign_block_vars('module_phpbb.catrow', array( + //+MOD: DHTML Menu for ACP + 'MENU_CAT_ID' => $menu_cat_id, + 'MENU_CAT_ROWS' => 1, + //-MOD: DHTML Menu for ACP + 'ADMIN_CATEGORY' => 'Olympus adminCP') + ); + + $template->assign_block_vars('module_phpbb.catrow.modulerow', array( + "ROW_COLOR" => "#" . $theme['td_color1'], + "ROW_CLASS" => $theme['td_class1'], + //+MOD: DHTML Menu for ACP + 'ROW_COUNT' => 0, + //-MOD: DHTML Menu for ACP + "ADMIN_MODULE" => 'Go!', + "U_ADMIN_MODULE" => mx_append_sid($phpbb_root_path . 'adm/index.php?sid='.$mx_user->session_id)) + ); + + break; + } // // Read Portal Module Configuration *************** *** 304,308 **** "ADMIN_MODULE" => $action, ! "U_ADMIN_MODULE" => append_sid(PORTAL_URL . $file)) ); $row_count++; --- 341,345 ---- "ADMIN_MODULE" => $action, ! "U_ADMIN_MODULE" => mx_append_sid(PORTAL_URL . $file)) ); $row_count++; *************** *** 333,338 **** 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, // END ! "L_WELCOME" => $lang['Welcome_mxBB'], ! "L_ADMIN_INTRO" => $lang['Admin_intro_mxBB'], "L_FORUM_STATS" => $lang['Forum_stats'], "L_WHO_IS_ONLINE" => $lang['Who_is_Online'], --- 370,375 ---- 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, // END ! "L_WELCOME" => $lang['Welcome_mxBB'], ! "L_ADMIN_INTRO" => $lang['Admin_intro_mxBB'], "L_FORUM_STATS" => $lang['Forum_stats'], "L_WHO_IS_ONLINE" => $lang['Who_is_Online'], *************** *** 357,470 **** ); ! // ! // Get forum statistics ! // ! $total_posts = get_db_stat('postcount'); ! $total_users = get_db_stat('usercount'); ! $total_topics = get_db_stat('topiccount'); ! $start_date = create_date($board_config['default_dateformat'], $board_config['board_startdate'], $board_config['board_timezone']); ! $boarddays = ( time() - $board_config['board_startdate'] ) / 86400; ! $posts_per_day = sprintf("%.2f", $total_posts / $boarddays); ! $topics_per_day = sprintf("%.2f", $total_topics / $boarddays); ! $users_per_day = sprintf("%.2f", $total_users / $boarddays); ! $avatar_dir_size = 0; ! if ($avatar_dir = @opendir($phpbb_root_path . $board_config['avatar_path']) ) ! { ! while( $file = @readdir($avatar_dir) ) ! { ! if( $file != "." && $file != ".." ) ! { ! $avatar_dir_size += @filesize($phpbb_root_path . $board_config['avatar_path'] . "/" . $file); ! } ! } ! @closedir($avatar_dir); ! // ! // This bit of code translates the avatar directory size into human readable format ! // Borrowed the code from the PHP.net annoted manual, origanally written by: ! // Jesse (je...@je...) ! // ! if($avatar_dir_size >= 1048576) ! { ! $avatar_dir_size = round($avatar_dir_size / 1048576 * 100) / 100 . " MB"; ! } ! else if($avatar_dir_size >= 1024) ! { ! $avatar_dir_size = round($avatar_dir_size / 1024 * 100) / 100 . " KB"; ! } ! else ! { ! $avatar_dir_size = $avatar_dir_size . " Bytes"; ! } ! } ! else ! { ! // Couldn't open Avatar dir. ! $avatar_dir_size = $lang['Not_available']; ! } ! if($posts_per_day > $total_posts) ! { ! $posts_per_day = $total_posts; ! } ! if($topics_per_day > $total_topics) ! { ! $topics_per_day = $total_topics; ! } ! if($users_per_day > $total_users) ! { ! $users_per_day = $total_users; ! } ! // ! // DB size ... MySQL only ! // ! // This code is heavily influenced by a similar routine ! // in phpMyAdmin 2.2.0 ! // ! if( preg_match("/^mysql/", SQL_LAYER) ) ! { ! $sql = "SELECT VERSION() AS mysql_version"; ! if($result = $db->sql_query($sql)) ! { ! $row = $db->sql_fetchrow($result); ! $version = $row['mysql_version']; ! if( preg_match("/^(3\.23|4\.|5\.)/", $version) ) { ! $db_name = ( preg_match("/^(3\.23\.[6-9])|(3\.23\.[1-9][1-9])|(4\.)|(5\.)/", $version) ) ? "`$dbname`" : $dbname; ! $sql = "SHOW TABLE STATUS ! FROM " . $db_name; if($result = $db->sql_query($sql)) { ! $tabledata_ary = $db->sql_fetchrowset($result); ! $dbsize = 0; ! for($i = 0; $i < count($tabledata_ary); $i++) { ! if( $tabledata_ary[$i]['Type'] != "MRG_MyISAM" ) { ! if( $table_prefix != "" ) { ! if( strstr($tabledata_ary[$i]['Name'], $table_prefix) ) { ! $dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length']; } } ! else ! { ! $dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length']; ! } ! } } ! } // Else we couldn't get the table status. } else --- 394,541 ---- ); ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! break; ! case 'phpbb2': ! case 'phpbb3': ! $template->assign_block_vars("forum_stats", array()); ! // ! // Get forum statistics ! // ! $total_posts = phpBB2::get_db_stat('postcount'); ! $total_users = phpBB2::get_db_stat('usercount'); ! $total_topics = phpBB2::get_db_stat('topiccount'); ! $start_date = phpBB2::create_date($board_config['default_dateformat'], $board_config['board_startdate'], $board_config['board_timezone']); ! $boarddays = ( time() - $board_config['board_startdate'] ) / 86400; ! $posts_per_day = sprintf("%.2f", $total_posts / $boarddays); ! $topics_per_day = sprintf("%.2f", $total_topics / $boarddays); ! $users_per_day = sprintf("%.2f", $total_users / $boarddays); ! $avatar_dir_size = 0; ! if ($avatar_dir = @opendir($phpbb_root_path . $board_config['avatar_path']) ) ! { ! while( $file = @readdir($avatar_dir) ) ! { ! if( $file != "." && $file != ".." ) ! { ! $avatar_dir_size += @filesize($phpbb_root_path . $board_config['avatar_path'] . "/" . $file); ! } ! } ! @closedir($avatar_dir); ! // ! // This bit of code translates the avatar directory size into human readable format ! // Borrowed the code from the PHP.net annoted manual, origanally written by: ! // Jesse (je...@je...) ! // ! if($avatar_dir_size >= 1048576) ! { ! $avatar_dir_size = round($avatar_dir_size / 1048576 * 100) / 100 . " MB"; ! } ! else if($avatar_dir_size >= 1024) ! { ! $avatar_dir_size = round($avatar_dir_size / 1024 * 100) / 100 . " KB"; ! } ! else ! { ! $avatar_dir_size = $avatar_dir_size . " Bytes"; ! } ! } ! else ! { ! // Couldn't open Avatar dir. ! $avatar_dir_size = $lang['Not_available']; ! } ! if($posts_per_day > $total_posts) ! { ! $posts_per_day = $total_posts; ! } ! if($topics_per_day > $total_topics) ! { ! $topics_per_day = $total_topics; ! } ! if($users_per_day > $total_users) { ! $users_per_day = $total_users; ! } ! // ! // DB size ... MySQL only ! // ! // This code is heavily influenced by a similar routine ! // in phpMyAdmin 2.2.0 ! // ! if( preg_match("/^mysql/", SQL_LAYER) ) ! { ! $sql = "SELECT VERSION() AS mysql_version"; if($result = $db->sql_query($sql)) { ! $row = $db->sql_fetchrow($result); ! $version = $row['mysql_version']; ! if( preg_match("/^(3\.23|4\.|5\.)/", $version) ) { ! $db_name = ( preg_match("/^(3\.23\.[6-9])|(3\.23\.[1-9][1-9])|(4\.)|(5\.)/", $version) ) ? "`$dbname`" : $dbname; ! ! $sql = "SHOW TABLE STATUS ! FROM " . $db_name; ! if($result = $db->sql_query($sql)) { ! $tabledata_ary = $db->sql_fetchrowset($result); ! ! $dbsize = 0; ! for($i = 0; $i < count($tabledata_ary); $i++) { ! if( $tabledata_ary[$i]['Type'] != "MRG_MyISAM" ) { ! if( $table_prefix != "" ) ! { ! if( strstr($tabledata_ary[$i]['Name'], $table_prefix) ) ! { ! $dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length']; ! } ! } ! else ! { ! $dbsize += $tabledata_ary[$i]['Data_length'] + $tabledata_ary[$i]['Index_length']; ! } } } ! } // Else we couldn't get the table status. } ! else ! { ! $dbsize = $lang['Not_available']; ! } ! } ! else ! { ! $dbsize = $lang['Not_available']; ! } ! $db->sql_freeresult($result); ! } ! else if( preg_match("/^mssql/", SQL_LAYER) ) ! { ! $sql = "SELECT ((SUM(size) * 8.0) * 1024.0) as dbsize ! FROM sysfiles"; ! if( $result = $db->sql_query($sql) ) ! { ! $dbsize = ( $row = $db->sql_fetchrow($result) ) ? intval($row['dbsize']) : $lang['Not_available']; ! } ! else ! { ! $dbsize = $lang['Not_available']; ! } ! $db->sql_freeresult($result); } else *************** *** 472,543 **** $dbsize = $lang['Not_available']; } - } - else - { - $dbsize = $lang['Not_available']; - } - $db->sql_freeresult($result); - } - else if( preg_match("/^mssql/", SQL_LAYER) ) - { - $sql = "SELECT ((SUM(size) * 8.0) * 1024.0) as dbsize - FROM sysfiles"; - if( $result = $db->sql_query($sql) ) - { - $dbsize = ( $row = $db->sql_fetchrow($result) ) ? intval($row['dbsize']) : $lang['Not_available']; - } - else - { - $dbsize = $lang['Not_available']; - } - $db->sql_freeresult($result); - } - else - { - $dbsize = $lang['Not_available']; - } ! if ( is_integer($dbsize) ) ! { ! if( $dbsize >= 1048576 ) ! { ! $dbsize = sprintf("%.2f MB", ( $dbsize / 1048576 )); ! } ! else if( $dbsize >= 1024 ) ! { ! $dbsize = sprintf("%.2f KB", ( $dbsize / 1024 )); ! } ! else ! { ! $dbsize = sprintf("%.2f Bytes", $dbsize); ! } ! } ! $template->assign_vars(array( ! "NUMBER_OF_POSTS" => $total_posts, ! "NUMBER_OF_TOPICS" => $total_topics, ! "NUMBER_OF_USERS" => $total_users, ! "START_DATE" => $start_date, ! "POSTS_PER_DAY" => $posts_per_day, ! "TOPICS_PER_DAY" => $topics_per_day, ! "USERS_PER_DAY" => $users_per_day, ! "AVATAR_DIR_SIZE" => $avatar_dir_size, ! "DB_SIZE" => $dbsize, ! "GZIP_COMPRESSION" => ( $board_config['gzip_compress'] ) ? $lang['ON'] : $lang['OFF']) ! ); ! // ! // End forum statistics ! // // // Get users online information. // ! $sql = "SELECT u.user_id, u.username, u.user_session_time, u.user_session_page, s.session_logged_in, s.session_ip, s.session_start ! FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s ! WHERE s.session_logged_in = " . TRUE . " ! AND u.user_id = s.session_user_id ! AND u.user_id <> " . ANONYMOUS . " ! AND s.session_time >= " . ( time() - 300 ) . " ! ORDER BY u.user_session_time DESC"; if(!$result = $db->sql_query($sql)) { --- 543,606 ---- $dbsize = $lang['Not_available']; } ! if ( is_integer($dbsize) ) ! { ! if( $dbsize >= 1048576 ) ! { ! $dbsize = sprintf("%.2f MB", ( $dbsize / 1048576 )); ! } ! else if( $dbsize >= 1024 ) ! { ! $dbsize = sprintf("%.2f KB", ( $dbsize / 1024 )); ! } ! else ! { ! $dbsize = sprintf("%.2f Bytes", $dbsize); ! } ! } ! $template->assign_vars(array( ! "NUMBER_OF_POSTS" => $total_posts, ! "NUMBER_OF_TOPICS" => $total_topics, ! "NUMBER_OF_USERS" => $total_users, ! "START_DATE" => $start_date, ! "POSTS_PER_DAY" => $posts_per_day, ! "TOPICS_PER_DAY" => $topics_per_day, ! "USERS_PER_DAY" => $users_per_day, ! "AVATAR_DIR_SIZE" => $avatar_dir_size, ! "DB_SIZE" => $dbsize, ! "GZIP_COMPRESSION" => ( $board_config['gzip_compress'] ) ? $lang['ON'] : $lang['OFF']) ! ); ! // ! // End forum statistics ! // ! break; ! } // // Get users online information. // ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! $sql = "SELECT u.*, s.* ! FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s ! WHERE s.session_logged_in = " . TRUE . " ! AND u.user_id = s.session_user_id ! AND u.user_id <> " . ANONYMOUS . " ! AND s.session_time >= " . ( time() - 300 ) . " ! ORDER BY u.user_session_time DESC"; ! break; ! case 'phpbb3': ! $sql = "SELECT u.*, s.* ! FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s ! WHERE u.user_id <> " . ANONYMOUS . " ! AND u.user_id = s.session_user_id ! AND s.session_time >= " . ( time() - 300 ) . " ! ORDER BY s.session_time DESC"; ! break; ! } ! if(!$result = $db->sql_query($sql)) { *************** *** 547,555 **** $db->sql_freeresult($result); ! $sql = "SELECT session_page, session_logged_in, session_time, session_ip, session_start ! FROM " . SESSIONS_TABLE . " ! WHERE session_logged_in = 0 ! AND session_time >= " . ( time() - 300 ) . " ! ORDER BY session_time DESC"; if(!$result = $db->sql_query($sql)) { --- 610,633 ---- $db->sql_freeresult($result); ! ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! $sql = "SELECT session_page, session_logged_in, session_time, session_ip, session_start ! FROM " . SESSIONS_TABLE . " ! WHERE session_logged_in = 0 ! AND session_time >= " . ( time() - 300 ) . " ! ORDER BY session_time DESC"; ! break; ! case 'phpbb3': ! $sql = "SELECT u.*, s.* ! FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s ! WHERE u.user_id = " . ANONYMOUS . " ! AND u.user_id = s.session_user_id ! AND s.session_time >= " . ( time() - 300 ) . " ! ORDER BY s.session_time DESC"; ! break; ! } if(!$result = $db->sql_query($sql)) { *************** *** 559,578 **** $db->sql_freeresult($result); - $sql = "SELECT forum_name, forum_id - FROM " . FORUMS_TABLE; ! if($forums_result = $db->sql_query($sql)) ! { ! while($forumsrow = $db->sql_fetchrow($forums_result)) ! { ! $forum_data[$forumsrow['forum_id']] = $forumsrow['forum_name']; ! } ! } ! else { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain user/online forums information.", "", __LINE__, __FILE__, $sql); ! } ! $db->sql_freeresult($result); $reg_userid_ary = array(); --- 637,671 ---- $db->sql_freeresult($result); ! switch (PORTAL_BACKEND) { ! case 'internal': ! break; ! case 'phpbb2': ! ! $sql = "SELECT forum_name, forum_id ! FROM " . FORUMS_TABLE; ! ! if($forums_result = $db->sql_query($sql)) ! { ! while($forumsrow = $db->sql_fetchrow($forums_result)) ! { ! $forum_data[$forumsrow['forum_id']] = $forumsrow['forum_name']; ! } ! } ! else ! { ! mx_message_die(GENERAL_ERROR, "Couldn't obtain user/online forums information.", "", __LINE__, __FILE__, $sql); ! } ! ! $db->sql_freeresult($result); ! break; ! ! case 'phpbb3': ! // To-do ! break; ! ! } $reg_userid_ary = array(); *************** *** 664,668 **** } //-MOD: ViewOnline extension for mxBB Portal Pages ! $location_url = append_sid(PHPBB_URL . "admin_forums.$phpEx?mode=editforum&" . POST_FORUM_URL . "=" . $onlinerow_reg[$i]['user_session_page']); $location = $forum_data[$onlinerow_reg[$i]['user_session_page']]; } --- 757,761 ---- } //-MOD: ViewOnline extension for mxBB Portal Pages ! $location_url = mx_append_sid(PHPBB_URL . "admin_forums.$phpEx?mode=editforum&" . POST_FORUM_URL . "=" . $onlinerow_reg[$i]['user_session_page']); $location = $forum_data[$onlinerow_reg[$i]['user_session_page']]; } *************** *** 671,675 **** $row_class = ( $registered_users % 2 ) ? $theme['td_class1'] : $theme['td_class2']; ! $reg_ip = decode_ip($onlinerow_reg[$i]['session_ip']); $template->assign_block_vars("reg_user_row", array( --- 764,768 ---- $row_class = ( $registered_users % 2 ) ? $theme['td_class1'] : $theme['td_class2']; ! $reg_ip = phpBB2::decode_ip($onlinerow_reg[$i]['session_ip']); $template->assign_block_vars("reg_user_row", array( *************** *** 677,688 **** "ROW_CLASS" => $row_class, "USERNAME" => $username, ! "STARTED" => create_date($board_config['default_dateformat'], $onlinerow_reg[$i]['session_start'], $board_config['board_timezone']), ! "LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow_reg[$i]['user_session_time'], $board_config['board_timezone']), "FORUM_LOCATION" => $location, "IP_ADDRESS" => $reg_ip, "U_WHOIS_IP" => "http://network-tools.com/default.asp?host=$reg_ip", ! "U_USER_PROFILE" => append_sid(PHPBB_URL . "admin_users.$phpEx?mode=edit&" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']), ! "U_FORUM_LOCATION" => append_sid($location_url)) ); } --- 770,781 ---- "ROW_CLASS" => $row_class, "USERNAME" => $username, ! "STARTED" => phpBB2::create_date($board_config['default_dateformat'], $onlinerow_reg[$i]['session_start'], $board_config['board_timezone']), ! "LASTUPDATE" => phpBB2::create_date($board_config['default_dateformat'], $onlinerow_reg[$i]['user_session_time'], $board_config['board_timezone']), "FORUM_LOCATION" => $location, "IP_ADDRESS" => $reg_ip, "U_WHOIS_IP" => "http://network-tools.com/default.asp?host=$reg_ip", ! "U_USER_PROFILE" => mx_append_sid(PHPBB_URL . "admin_users.$phpEx?mode=edit&" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']), ! "U_FORUM_LOCATION" => mx_append_sid($location_url)) ); } *************** *** 763,767 **** else { ! $location_url = append_sid(PHPBB_URL . "admin_forums.$phpEx?mode=editforum&" . POST_FORUM_URL . "=" . $onlinerow_guest[$i]['session_page']); $location = $forum_data[$onlinerow_guest[$i]['session_page']]; } --- 856,860 ---- else { ! $location_url = mx_append_sid(PHPBB_URL . "admin_forums.$phpEx?mode=editforum&" . POST_FORUM_URL . "=" . $onlinerow_guest[$i]['session_page']); $location = $forum_data[$onlinerow_guest[$i]['session_page']]; } *************** *** 770,774 **** $row_class = ( $guest_users % 2 ) ? $theme['td_class1'] : $theme['td_class2']; ! $guest_ip = decode_ip($onlinerow_guest[$i]['session_ip']); $template->assign_block_vars("guest_user_row", array( --- 863,867 ---- $row_class = ( $guest_users % 2 ) ? $theme['td_class1'] : $theme['td_class2']; ! $guest_ip = phpBB2::decode_ip($onlinerow_guest[$i]['session_ip']); $template->assign_block_vars("guest_user_row", array( *************** *** 776,786 **** "ROW_CLASS" => $row_class, "USERNAME" => $lang['Guest'], ! "STARTED" => create_date($board_config['default_dateformat'], $onlinerow_guest[$i]['session_start'], $board_config['board_timezone']), ! "LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow_guest[$i]['session_time'], $board_config['board_timezone']), "FORUM_LOCATION" => $location, "IP_ADDRESS" => $guest_ip, "U_WHOIS_IP" => "http://network-tools.com/default.asp?host=$guest_ip", ! "U_FORUM_LOCATION" => append_sid($location_url)) ); } --- 869,879 ---- "ROW_CLASS" => $row_class, "USERNAME" => $lang['Guest'], ! "STARTED" => phpBB2::create_date($board_config['default_dateformat'], $onlinerow_guest[$i]['session_start'], $board_config['board_timezone']), ! "LASTUPDATE" => phpBB2::create_date($board_config['default_dateformat'], $onlinerow_guest[$i]['session_time'], $board_config['board_timezone']), "FORUM_LOCATION" => $location, "IP_ADDRESS" => $guest_ip, "U_WHOIS_IP" => "http://network-tools.com/default.asp?host=$guest_ip", ! "U_FORUM_LOCATION" => mx_append_sid($location_url)) ); } *************** *** 936,941 **** $template->assign_vars(array( 'ADMIN_TITLE' => $lang['mxBB_adminCP'], ! "S_FRAME_NAV" => append_sid("index.$phpEx?pane=left"), ! "S_FRAME_MAIN" => append_sid("index.$phpEx?pane=right")) ); --- 1029,1034 ---- $template->assign_vars(array( 'ADMIN_TITLE' => $lang['mxBB_adminCP'], ! "S_FRAME_NAV" => mx_append_sid("index.$phpEx?pane=left"), ! "S_FRAME_MAIN" => mx_append_sid("index.$phpEx?pane=right")) ); Index: page_header_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/page_header_admin.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** page_header_admin.php 5 May 2007 20:12:56 -0000 1.19 --- page_header_admin.php 9 Sep 2007 16:48:16 -0000 1.20 *************** *** 73,82 **** 'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']), 'L_FAQ' => $lang['FAQ'], ! 'U_INDEX' => append_sid('../index.'.$phpEx), 'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone), ! 'S_LOGIN_ACTION' => append_sid('../login.'.$phpEx), ! 'S_JUMPBOX_ACTION' => append_sid('../viewforum.'.$phpEx), ! 'S_CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), 'S_CONTENT_DIRECTION' => $lang['DIRECTION'], 'S_CONTENT_ENCODING' => $lang['ENCODING'], --- 73,82 ---- 'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']), 'L_FAQ' => $lang['FAQ'], ! 'U_INDEX' => mx_append_sid('../index.'.$phpEx), 'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone), ! 'S_LOGIN_ACTION' => mx_append_sid('../login.'.$phpEx), ! 'S_JUMPBOX_ACTION' => mx_append_sid('../viewforum.'.$phpEx), ! 'S_CURRENT_TIME' => sprintf($lang['Current_time'], phpBB2::create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])), 'S_CONTENT_DIRECTION' => $lang['DIRECTION'], 'S_CONTENT_ENCODING' => $lang['ENCODING'], *************** *** 138,142 **** 'T_GECKO_STYLESHEET' => 'gecko.css', ! 'MX_ICON_CSS' => $images['mx_graphics']['icon_style'] //- mxBB )); --- 138,143 ---- 'T_GECKO_STYLESHEET' => 'gecko.css', ! 'MX_ICON_CSS' => $images['mx_graphics']['icon_style'], ! 'LOGO' => $images['mx_logo'] //- mxBB )); Index: admin_mx_module.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_module.php,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** admin_mx_module.php 5 May 2007 20:12:55 -0000 1.46 --- admin_mx_module.php 9 Sep 2007 16:48:15 -0000 1.47 *************** *** 183,187 **** 'COOKIE_SECURE' => $board_config['cookie_secure'], ! 'S_ACTION' => append_sid("admin_mx_module.$phpEx") )); --- 183,187 ---- 'COOKIE_SECURE' => $board_config['cookie_secure'], ! 'S_ACTION' => mx_append_sid("admin_mx_module.$phpEx") )); *************** *** 293,305 **** $message_uninstall = $lang['Module_delete'] ! . '<br /><br />' . sprintf($lang['Click_module_delete_yes'], '<a href="' . append_sid("admin_mx_module.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; $message_upgrade = $lang['upgrade_module_pack_explain'] ! . '<br /><br />' . sprintf($lang['Click_module_upgrade_yes'], '<a href="' . append_sid("admin_mx_module.$phpEx" . $upgrademode) . '">', '</a>') . '<br /><br />'; $message_export = $lang['export_module_pack_explain'] ! . '<br /><br />' . sprintf($lang['Click_module_export_yes'], '<a href="' . append_sid("admin_mx_module.$phpEx" . $exportmode) . '">', '</a>') . '<br /><br />'; --- 293,305 ---- $message_uninstall = $lang['Module_delete'] ! . '<br /><br />' . sprintf($lang['Click_module_delete_yes'], '<a href="' . mx_append_sid("admin_mx_module.$phpEx" . $deletemode) . '">', '</a>') . '<br /><br />'; $message_upgrade = $lang['upgrade_module_pack_explain'] ! . '<br /><br />' . sprintf($lang['Click_module_upgrade_yes'], '<a href="' . mx_append_sid("admin_mx_module.$phpEx" . $upgrademode) . '">', '</a>') . '<br /><br />'; $message_export = $lang['export_module_pack_explain'] ! . '<br /><br />' . sprintf($lang['Click_module_export_yes'], '<a href="' . mx_append_sid("admin_mx_module.$phpEx" . $exportmode) . '">', '</a>') . '<br /><br />'; *************** *** 325,329 **** 'IMG_URL_DELETE' => $visible_uninstall ? $module_nav_icon_url . 'contract.gif' : $module_nav_icon_url . 'expand.gif', ! 'U_MODULE' => append_sid("admin_mx_module_cp.$phpEx" . $settingmode), 'MODULE_ID' => $module_id, --- 325,329 ---- 'IMG_URL_DELETE' => $visible_uninstall ? $module_nav_icon_url . 'contract.gif' : $module_nav_icon_url . 'expand.gif', ! 'U_MODULE' => mx_append_sid("admin_mx_module_cp.$phpEx" . $settingmode), 'MODULE_ID' => $module_id, --- NEW FILE: admin_mx_styles.php --- <?php /*************************************************************************** * admin_styles.php * ------------------- * begin : Thursday, Jul 12, 2001 * copyright : (C) 2001 The phpBB Group * email : su...@ph... * * $Id: admin_mx_styles.php,v 1.1 2007/09/09 16:48:16 jonohlsson Exp $ * * ***************************************************************************/ /*************************************************************************** * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * ***************************************************************************/ if( !empty($setmodules) ) { $file = basename(__FILE__); $module['Styles']['Add_new'] = 'admin/' . "$file?mode=addnew"; //$module['Styles']['Create_new'] = 'admin/' . "$file?mode=create"; $module['Styles']['Manage'] = 'admin/' . $file; //$module['Styles']['Export'] = 'admin/' . "$file?mode=export"; //$module['2_CP']['2_1_Modules'] = 'admin/' . $file; return; } // // Security and Page header // define('IN_PORTAL', 1); $mx_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); $no_page_header = TRUE; require('./pagestart.' . $phpEx); // // Load default header // include_once('./page_header_admin.php'); $confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE; $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE; if ($cancel) { redirect('admin/' . mx_append_sid("admin_mx_styles.$phpEx", true)); } if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) { $mode = ( isset($HTTP_GET_VARS['mode']) ) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mode']; $mode = htmlspecialchars($mode); } else { $mode = ""; } switch( $mode ) { case "addnew": $install_to = ( isset($HTTP_GET_VARS['install_to']) ) ? urldecode($HTTP_GET_VARS['install_to']) : $HTTP_POST_VARS['install_to']; $style_name = ( isset($HTTP_GET_VARS['style']) ) ? urldecode($HTTP_GET_VARS['style']) : $HTTP_POST_VARS['style']; if( isset($install_to) ) { include($mx_root_path. "templates/" . basename($install_to) . "/". basename($install_to). ".cfg"); $sql = "INSERT INTO " . MX_THEMES_TABLE . " (template_name, style_name, head_stylesheet, portal_backend) VALUES( '" . $style_name . "', '" . $style_name . "', '" . $style_name . ".css', '" . PORTAL_BACKEND . "' )"; if( !$result = $db->sql_query($sql) ) { mx_message_die(GENERAL_ERROR, "Could not insert theme data!", "", __LINE__, __FILE__, $sql); } $message = $lang['Theme_installed'] . "<br /><br />" . sprintf($lang['Click_return_styleadmin'], "<a href=\"" . mx_append_sid("admin_mx_styles.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); } else { $installable_themes = array(); if( $dir = @opendir($mx_root_path. "templates/") ) { while( $sub_dir = @readdir($dir) ) { if( !is_file(phpBB2::phpbb_realpath($mx_root_path . 'templates/' .$sub_dir)) && !is_link(phpBB2::phpbb_realpath($mx_root_path . 'templates/' .$sub_dir)) && $sub_dir != "." && $sub_dir != ".." && $sub_dir != "CVS" ) { if( @file_exists(@phpBB2::phpbb_realpath($mx_root_path. "templates/" . $sub_dir . "/$sub_dir.cfg")) ) { @include($mx_root_path. "templates/" . $sub_dir . "/$sub_dir.cfg"); if ($mx_template_settings['portal_backend'] == PORTAL_BACKEND) { $style_name = $sub_dir; $sql = "SELECT themes_id FROM " . MX_THEMES_TABLE . " WHERE style_name = '" . str_replace("\'", "''", $style_name) . "'"; if(!$result = $db->sql_query($sql)) { mx_message_die(GENERAL_ERROR, "Could not query themes table!", "", __LINE__, __FILE__, $sql); } if(!$db->sql_numrows($result)) { $installable_themes[] = array('style_name'=>$sub_dir, 'template_name'=>$sub_dir); } } } } } $template->set_filenames(array( "body" => "admin/styles_addnew_body.tpl") ); $template->assign_vars(array( "L_STYLES_TITLE" => $lang['Styles_admin'], "L_STYLES_ADD_TEXT" => $lang['Styles_addnew_explain'], "L_STYLE" => $lang['Style'], //"L_TEMPLATE" => $lang['Template'], "L_INSTALL" => $lang['Install'], "L_ACTION" => $lang['Action']) ); for($i = 0; $i < count($installable_themes); $i++) { $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; $template->assign_block_vars("styles", array( "ROW_CLASS" => $row_class, "ROW_COLOR" => "#" . $row_color, "STYLE_NAME" => $installable_themes[$i]['style_name'], //"TEMPLATE_NAME" => $installable_themes[$i]['template_name'], "U_STYLES_INSTALL" => mx_append_sid("admin_mx_styles.$phpEx?mode=addnew&style=" . urlencode($installable_themes[$i]['style_name']) . "&install_to=" . urlencode($installable_themes[$i]['template_name']))) ); } $template->pparse("body"); } closedir($dir); } break; case "delete": $style_id = ( isset($HTTP_GET_VARS['style_id']) ) ? intval($HTTP_GET_VARS['style_id']) : intval($HTTP_POST_VARS['style_id']); if( !$confirm ) { if($style_id == $board_config['default_style']) { mx_message_die(GENERAL_MESSAGE, $lang['Cannot_remove_style']); } $hidden_fields = '<input type="hidden" name="mode" value="'.$mode.'" /><input type="hidden" name="style_id" value="'.$style_id.'" />'; // // Set template files // $template->set_filenames(array( "confirm" => "admin/confirm_body.tpl") ); $template->assign_vars(array( "MESSAGE_TITLE" => $lang['Confirm'], "MESSAGE_TEXT" => $lang['Confirm_delete_style'], "L_YES" => $lang['Yes'], "L_NO" => $lang['No'], "S_CONFIRM_ACTION" => mx_append_sid("admin_mx_styles.$phpEx"), "S_HIDDEN_FIELDS" => $hidden_fields) ); $template->pparse("confirm"); } else { // // The user has confirmed the delete. Remove the style, the style element // names and update any users who might be using this style // $sql = "DELETE FROM " . MX_THEMES_TABLE . " WHERE themes_id = $style_id"; if(!$result = $db->sql_query($sql, BEGIN_TRANSACTION)) { mx_message_die(GENERAL_ERROR, "Could not remove style data!", "", __LINE__, __FILE__, $sql); } $sql = "UPDATE " . USERS_TABLE . " SET user_style = " . $board_config['default_style'] . " WHERE user_style = $style_id"; if(!$result = $db->sql_query($sql, END_TRANSACTION)) { mx_message_die(GENERAL_ERROR, "Could not update user style information", "", __LINE__, __FILE__, $sql); } $message = $lang['Style_removed'] . "<br /><br />" . sprintf($lang['Click_return_styleadmin'], "<a href=\"" . mx_append_sid("admin_mx_styles.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid("index.$phpEx?pane=right") . "\">", "</a>"); mx_message_die(GENERAL_MESSAGE, $message); } break; default: $sql = "SELECT themes_id, template_name, style_name FROM " . MX_THEMES_TABLE . " WHERE portal_backend = '" . PORTAL_BACKEND . "' ORDER BY template_name"; if(!$result = $db->sql_query($sql)) { mx_message_die(GENERAL_ERROR, "Could not get style information!", "", __LINE__, __FILE__, $sql); } $style_rowset = $db->sql_fetchrowset($result); $template->set_filenames(array( "body" => "admin/styles_list_body.tpl") ); $template->assign_vars(array( "L_STYLES_TITLE" => $lang['Styles_admin'], "L_STYLES_TEXT" => $lang['Styles_explain'], "L_STYLE" => $lang['Style'], "L_DELETE" => $lang['Delete']) ); for($i = 0; $i < count($style_rowset); $i++) { $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; $template->assign_block_vars("styles", array( "ROW_CLASS" => $row_class, "ROW_COLOR" => $row_color, "STYLE_NAME" => $style_rowset[$i]['style_name'], "U_STYLES_DELETE" => mx_append_sid("admin_mx_styles.$phpEx?mode=delete&style_id=" . $style_rowset[$i]['themes_id'])) ); } $template->pparse("body"); break; } if (empty($HTTP_POST_VARS['send_file'])) { include('./page_footer_admin.php'); } ?> Index: admin_mx_gen_cache.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_gen_cache.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** admin_mx_gen_cache.php 5 May 2007 20:12:54 -0000 1.25 --- admin_mx_gen_cache.php 9 Sep 2007... [truncated message content] |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:48:23
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8466/install Modified Files: mx_install.php Log Message: Ok, massive update for 2.9.x. Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** mx_install.php 6 Aug 2007 19:33:27 -0000 1.79 --- mx_install.php 9 Sep 2007 16:48:17 -0000 1.80 *************** *** 32,38 **** // Set mxBB-Portal version here ! // ! $mx_portal_name = 'mxBB-Portal'; ! $mx_portal_version = '2.8.1'; ! $mx_portal_copy = '<b>mxBB - Modular Portal & CMS for phpBB!</b> <br /><br/> mxBB is a fully modular portal and CMS for phpBB, featuring dynamic pages, blocks, and themes, by means of a powerful yet flexible AdminCP. It works without touching phpBB by using integrated functions and features. mxBB-Portal is the classical phpBB portal add-on, improved and enhanced for every phpBB version released since 2001. <br /><br />Authors: The mxBB Development Team. <br />Please visit <a href="http://www.mx-system.com/">www.mx-system.com</a> for further information.'; // --- 32,38 ---- // Set mxBB-Portal version here ! // ! $mx_portal_name = 'mxBB Modular System'; ! $mx_portal_version = '2.9.1'; ! $mx_portal_copy = '<b>mxBB Modular System!</b> <br /><br/> mxBB is a fully modular system, portal and CMS, featuring dynamic pages, blocks, and themes, by means of a powerful yet flexible AdminCP. mxBB Portal is the classical phpBB portal add-on, improved and enhanced for every phpBB version released since 2001. <br /><br />Authors: The mxBB Development Team. <br />Please visit <a href="http://www.mx-system.com/">www.mx-system.com</a> for further information.'; // *************** *** 243,260 **** 'COMMENTS' => 'mx_remove_remarks' ), ! 'mysqli' => array( ! 'LABEL' => 'MySQL with MySQLi Extension', ! 'SCHEMA' => 'mysql', ! 'DELIM' => ';', ! 'DELIM_BASIC' => ';', ! 'COMMENTS' => 'mx_remove_remarks' ! ), ! // 'postgres' => array( ! // 'LABEL' => 'PostgreSQL 7.x', ! // 'SCHEMA' => 'postgres', // 'DELIM' => ';', // 'DELIM_BASIC' => ';', ! // 'COMMENTS' => 'mx_remove_comments' // ), // 'mssql' => array( // 'LABEL' => 'MS SQL Server 7/2000', --- 243,260 ---- 'COMMENTS' => 'mx_remove_remarks' ), ! // 'mysqli' => array( ! // 'LABEL' => 'MySQL with MySQLi Extension', ! // 'SCHEMA' => 'mysql', // 'DELIM' => ';', // 'DELIM_BASIC' => ';', ! // 'COMMENTS' => 'mx_remove_remarks' // ), + 'postgres' => array( + 'LABEL' => 'PostgreSQL 7.x', + 'SCHEMA' => 'postgres', + 'DELIM' => ';', + 'DELIM_BASIC' => ';', + 'COMMENTS' => 'mx_remove_comments' + ), // 'mssql' => array( // 'LABEL' => 'MS SQL Server 7/2000', *************** *** 344,349 **** if( install_language_select($lang_options, $language, 'language') > 1 ) { ! include($mx_root_path . "language/lang_$language/lang_main.$phpEx"); ! include($mx_root_path . "language/lang_$language/lang_admin.$phpEx"); $s_hidden_fields = ''; --- 344,348 ---- if( install_language_select($lang_options, $language, 'language') > 1 ) { ! include($mx_root_path . "install/language/lang_$language/lang_admin.$phpEx"); $s_hidden_fields = ''; *************** *** 365,384 **** } ! if( !@file_exists($mx_root_path . "language/lang_$language/lang_main.$phpEx") || ! !@file_exists($mx_root_path . "language/lang_$language/lang_admin.$phpEx") ) { $language = guess_lang(); } ! if( !@file_exists($mx_root_path . "language/lang_$language/lang_main.$phpEx") || ! !@file_exists($mx_root_path . "language/lang_$language/lang_admin.$phpEx") ) { ! include($mx_root_path . "language/lang_english/lang_main.$phpEx"); ! include($mx_root_path . "language/lang_engslih/lang_admin.$phpEx"); } else { ! include($mx_root_path . "language/lang_$language/lang_main.$phpEx"); ! include($mx_root_path . "language/lang_$language/lang_admin.$phpEx"); } --- 364,420 ---- } ! if( !@file_exists($mx_root_path . "install/language/lang_$language/lang_admin.$phpEx") ) { $language = guess_lang(); } ! if( !@file_exists($mx_root_path . "install/language/lang_$language/lang_admin.$phpEx") ) { ! include($mx_root_path . "install/language/lang_english/lang_admin.$phpEx"); ! $language = 'english'; } else { ! include($mx_root_path . "install/language/lang_$language/lang_admin.$phpEx"); ! } ! ! $board_email = (!empty($HTTP_POST_VARS['board_email'])) ? $HTTP_POST_VARS['board_email'] : ''; ! $script_path = (!empty($HTTP_POST_VARS['script_path'])) ? $HTTP_POST_VARS['script_path'] : str_replace('install', '', dirname($HTTP_SERVER_VARS['PHP_SELF'])); ! ! if (!empty($HTTP_POST_VARS['server_name'])) ! { ! $server_name = $HTTP_POST_VARS['server_name']; ! } ! else ! { ! // Guess at some basic info used for install.. ! if (!empty($HTTP_SERVER_VARS['SERVER_NAME']) || !empty($HTTP_ENV_VARS['SERVER_NAME'])) ! { ! $server_name = (!empty($HTTP_SERVER_VARS['SERVER_NAME'])) ? $HTTP_SERVER_VARS['SERVER_NAME'] : $HTTP_ENV_VARS['SERVER_NAME']; ! } ! else if (!empty($HTTP_SERVER_VARS['HTTP_HOST']) || !empty($HTTP_ENV_VARS['HTTP_HOST'])) ! { ! $server_name = (!empty($HTTP_SERVER_VARS['HTTP_HOST'])) ? $HTTP_SERVER_VARS['HTTP_HOST'] : $HTTP_ENV_VARS['HTTP_HOST']; ! } ! else ! { ! $server_name = ''; ! } ! } ! ! if (!empty($HTTP_POST_VARS['server_port'])) ! { ! $server_port = $HTTP_POST_VARS['server_port']; ! } ! else ! { ! if (!empty($HTTP_SERVER_VARS['SERVER_PORT']) || !empty($HTTP_ENV_VARS['SERVER_PORT'])) ! { ! $server_port = (!empty($HTTP_SERVER_VARS['SERVER_PORT'])) ? $HTTP_SERVER_VARS['SERVER_PORT'] : $HTTP_ENV_VARS['SERVER_PORT']; ! } ! else ! { ! $server_port = '80'; ! } } *************** *** 386,390 **** // Do install -------------------------------------------------- // ! $confirm = ( isset($HTTP_POST_VARS['confirm']) || isset($HTTP_GET_VARS['confirm']) ); if( $confirm ) --- 422,426 ---- // Do install -------------------------------------------------- // ! $confirm = ( isset($HTTP_POST_VARS['confirm']) || isset($HTTP_GET_VARS['confirm']) ) && !isset($HTTP_POST_VARS['debug']); if( $confirm ) *************** *** 398,417 **** { case 'install': - $phpbb_path = ( !empty($HTTP_POST_VARS['phpbb_path']) ? $HTTP_POST_VARS['phpbb_path'] : '' ); - $phpbb_url = ( !empty($HTTP_POST_VARS['phpbb_url']) ? $HTTP_POST_VARS['phpbb_url'] : '' ); - $portal_url = ( !empty($HTTP_POST_VARS['portal_url']) ? $HTTP_POST_VARS['portal_url'] : '' ); - $dbms = ( isset($HTTP_POST_VARS['dbms']) ? $HTTP_POST_VARS['dbms'] : '' ); - $dbhost = ( !empty($HTTP_POST_VARS['dbhost']) ? $HTTP_POST_VARS['dbhost'] : '' ); - $dbname = ( !empty($HTTP_POST_VARS['dbname']) ? $HTTP_POST_VARS['dbname'] : '' ); - $dbuser = ( !empty($HTTP_POST_VARS['dbuser']) ? $HTTP_POST_VARS['dbuser'] : '' ); - $dbpasswd = ( !empty($HTTP_POST_VARS['dbpasswd']) ? $HTTP_POST_VARS['dbpasswd'] : '' ); - $table_prefix = ( !empty($HTTP_POST_VARS['prefix']) ? $HTTP_POST_VARS['prefix'] : '' ); - $mx_table_prefix = ( !empty($HTTP_POST_VARS['mx_prefix']) ? $HTTP_POST_VARS['mx_prefix'] : '' ); - $acm_type = ( isset($HTTP_POST_VARS['acm_type']) ? $HTTP_POST_VARS['acm_type'] : '' ); ! if( empty($phpbb_path) || empty($phpbb_url) || empty($portal_url) || ! empty($dbms) || empty($dbhost) || empty($dbname) || empty($dbuser) || ! empty($mx_table_prefix) ) { break; } --- 434,475 ---- { case 'install': ! if ($HTTP_POST_VARS['mxbb']) { + $portal_url = ( !empty($HTTP_POST_VARS['portal_url']) ? $HTTP_POST_VARS['portal_url'] : '' ); + $phpbb_path = ( !empty($HTTP_POST_VARS['phpbb_path']) ? $HTTP_POST_VARS['phpbb_path'] : '' ); + //$phpbb_url = ( !empty($HTTP_POST_VARS['phpbb_url']) ? $HTTP_POST_VARS['phpbb_url'] : '' ); + $dbms = ( isset($HTTP_POST_VARS['dbms_mxbb']) ? $HTTP_POST_VARS['dbms_mxbb'] : '' ); + $dbhost = ( !empty($HTTP_POST_VARS['dbhost_mxbb']) ? $HTTP_POST_VARS['dbhost_mxbb'] : '' ); + $dbname = ( !empty($HTTP_POST_VARS['dbname_mxbb']) ? $HTTP_POST_VARS['dbname_mxbb'] : '' ); + $dbuser = ( !empty($HTTP_POST_VARS['dbuser_mxbb']) ? $HTTP_POST_VARS['dbuser_mxbb'] : '' ); + $dbpasswd = ( !empty($HTTP_POST_VARS['dbpasswd_mxbb']) ? $HTTP_POST_VARS['dbpasswd_mxbb'] : '' ); + //$table_prefix = ( !empty($HTTP_POST_VARS['prefix']) ? $HTTP_POST_VARS['prefix'] : '' ); + $mx_table_prefix = ( !empty($HTTP_POST_VARS['mx_prefix']) ? $HTTP_POST_VARS['mx_prefix'] : '' ); + //$acm_type = ( isset($HTTP_POST_VARS['acm_type']) ? $HTTP_POST_VARS['acm_type'] : '' ); + + $portal_backend = 'internal'; + } + else + { + $portal_url = ( !empty($HTTP_POST_VARS['portal_url']) ? $HTTP_POST_VARS['portal_url'] : '' ); + $phpbb_path = ( !empty($HTTP_POST_VARS['phpbb_path']) ? $HTTP_POST_VARS['phpbb_path'] : '' ); + //$phpbb_url = ( !empty($HTTP_POST_VARS['phpbb_url']) ? $HTTP_POST_VARS['phpbb_url'] : '' ); + $dbms = ( isset($HTTP_POST_VARS['dbms']) ? $HTTP_POST_VARS['dbms'] : '' ); + $dbhost = ( !empty($HTTP_POST_VARS['dbhost']) ? $HTTP_POST_VARS['dbhost'] : '' ); + $dbname = ( !empty($HTTP_POST_VARS['dbname']) ? $HTTP_POST_VARS['dbname'] : '' ); + $dbuser = ( !empty($HTTP_POST_VARS['dbuser']) ? $HTTP_POST_VARS['dbuser'] : '' ); + $dbpasswd = ( !empty($HTTP_POST_VARS['dbpasswd']) ? $HTTP_POST_VARS['dbpasswd'] : '' ); + $table_prefix = ( !empty($HTTP_POST_VARS['prefix']) ? $HTTP_POST_VARS['prefix'] : '' ); + $mx_table_prefix = ( !empty($HTTP_POST_VARS['mx_prefix']) ? $HTTP_POST_VARS['mx_prefix'] : '' ); + //$acm_type = ( isset($HTTP_POST_VARS['acm_type']) ? $HTTP_POST_VARS['acm_type'] : '' ); + + $portal_backend = file_exists($mx_root_path . $phpbb_path . "modcp.$phpEx") ? 'phpbb2' : 'phpbb3'; + } + + + if( empty($portal_url) || empty($dbms) || empty($dbhost) || empty($dbname) || empty($dbuser) || empty($mx_table_prefix) ) + { + install_die(sprintf($lang['MissingVariables'], '<a href="javascript:history.go(-1);">', '</a>')); break; } *************** *** 420,441 **** // If they entered the information manually, we need to verify they did it correctly ;-) // ! $phpbb_info = get_phpbb_info($mx_root_path . $phpbb_path . "config.$phpEx"); ! ! if( !empty($phpbb_info['acm_type']) ) ! { ! @define('IN_PHPBB3', true); ! $tplEx = 'html'; // Not used atm ! } ! else { ! $tplEx = 'tpl'; ! } ! if( !isset($phpbb_info['dbms']) || $phpbb_info['dbms'] != $dbms || $phpbb_info['dbhost'] != $dbhost || ! $phpbb_info['dbname'] != $dbname || $phpbb_info['dbuser'] != $dbuser || ! $phpbb_info['dbpasswd'] != $dbpasswd || $phpbb_info['table_prefix'] != $table_prefix ) ! { ! install_die(sprintf($lang['phpBB_nfnd_retry'], '<a href="javascript:history.go(-1);">', '</a>')); } // // Trailing slashes are very important for the URLs we need to store in the mx_portal table. --- 478,503 ---- // If they entered the information manually, we need to verify they did it correctly ;-) // ! if ($HTTP_POST_VARS['phpbb']) { ! $phpbb_info = get_phpbb_info($mx_root_path . $phpbb_path . "config.$phpEx"); ! if( !empty($phpbb_info['acm_type']) ) ! { ! @define('IN_PHPBB3', true); ! $tplEx = 'html'; // Not used atm ! } ! else ! { ! $tplEx = 'tpl'; ! } ! ! if( !isset($phpbb_info['dbms']) || $phpbb_info['dbms'] != $dbms || $phpbb_info['dbhost'] != $dbhost || ! $phpbb_info['dbname'] != $dbname || $phpbb_info['dbuser'] != $dbuser || ! $phpbb_info['dbpasswd'] != $dbpasswd || $phpbb_info['table_prefix'] != $table_prefix ) ! { ! install_die(sprintf($lang['phpBB_nfnd_retry'], '<a href="javascript:history.go(-1);">', '</a>')); ! } } + // // Trailing slashes are very important for the URLs we need to store in the mx_portal table. *************** *** 456,460 **** if( !defined('MX_INSTALLED') ) { ! $mx_acm_type = ( !empty($acm_type) ? $acm_type : 'file' ); $process_msgs[] = $lang['Writing_config'] . ' ...<br />'; --- 518,522 ---- if( !defined('MX_INSTALLED') ) { ! //$mx_acm_type = ( !empty($acm_type) ? $acm_type : 'file' ); $process_msgs[] = $lang['Writing_config'] . ' ...<br />'; *************** *** 469,477 **** $config_data .= '$'."dbpasswd = '$dbpasswd';\n\n"; $config_data .= '$'."mx_table_prefix = '$mx_table_prefix';\n\n"; ! $config_data .= '$'."table_prefix = '$table_prefix';\n\n"; ! $config_data .= '$'."acm_type = '$mx_acm_type';\n\n"; ! $config_data .= '$phpbb_root_path = $mx_root_path . ' . "'$phpbb_path';\n\n"; $config_data .= "define('MX_INSTALLED', true);\n\n"; ! $config_data .= "define('PHPBB_INSTALLED', true);\n\n"; $config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused! --- 531,539 ---- $config_data .= '$'."dbpasswd = '$dbpasswd';\n\n"; $config_data .= '$'."mx_table_prefix = '$mx_table_prefix';\n\n"; ! //$config_data .= '$'."table_prefix = '$table_prefix';\n\n"; ! //$config_data .= '$'."acm_type = '$mx_acm_type';\n\n"; ! //$config_data .= '$phpbb_root_path = $mx_root_path . ' . "'$phpbb_path';\n\n"; $config_data .= "define('MX_INSTALLED', true);\n\n"; ! //$config_data .= "define('PHPBB_INSTALLED', true);\n\n"; $config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused! *************** *** 541,545 **** // Connect to the database // ! include($phpbb_root_path . "includes/constants.$phpEx"); switch($dbms) --- 603,607 ---- // Connect to the database // ! include($mx_root_path . "includes/sessions/internal/constants.$phpEx"); switch($dbms) *************** *** 571,575 **** } - $db = new sql_db($dbhost, $dbuser, $dbpasswd, $dbname, false); --- 633,636 ---- *************** *** 609,613 **** $process_msgs[] = '<hr />'; $process_msgs[] = $install_title . '...<br />'; ! exec_post_process($install_mode); // --- 670,737 ---- $process_msgs[] = '<hr />'; $process_msgs[] = $install_title . '...<br />'; ! ! //exec_post_process($install_mode); ! ! if( $install_mode == 'install' ) ! { ! $portal_table = array( ! 'portal_id' => 1, ! 'portal_version' => "'$mx_portal_version'", ! 'portal_startdate' => "'".time()."'", ! 'default_lang' => "'$language'", ! 'board_email' => "'$board_email'", ! 'script_path' => "'$script_path'", ! 'server_port' => "'$server_port'", ! 'server_name' => "'$server_name'", ! 'portal_backend' => "'$portal_backend'", ! 'portal_backend_path' => "'$phpbb_path'", ! ); ! ! if ($HTTP_POST_VARS['mxbb']) // Internal install ! { ! $portal_table['default_style'] = "'1'"; ! } ! ! $sql = "INSERT INTO ".PORTAL_TABLE." (". ! implode(', ', array_keys($portal_table)). ! ") VALUES (". ! implode(', ', array_values($portal_table)). ! ")"; ! ! parse_cmd_sql($sql); ! ! /* ! $admin_pass_md5 = ($confirm && $userdata['user_level'] == ADMIN) ? $admin_pass1 : md5($admin_pass1); ! ! $sql = "UPDATE " . USERS_TABLE . " ! SET username = '" . str_replace("\'", "''", $admin_name) . "', user_password='" . str_replace("\'", "''", $admin_pass_md5) . "', user_lang = '" . str_replace("\'", "''", $language) . "', user_email='" . str_replace("\'", "''", $board_email) . "' ! WHERE username = 'Admin'"; ! ! if (!$db->sql_query($sql)) ! { ! $process_errors++; ! $process_msgs[] = "Could not update admin info :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />"; ! } ! */ ! ! $sql = "UPDATE " . USERS_TABLE . " ! SET user_regdate = " . time(); ! ! if (!$db->sql_query($sql)) ! { ! $process_errors++; ! $process_msgs[] = "Could not update user_regdate :: " . $sql . " :: " . __LINE__ . " :: " . __FILE__ . "<br /><br />"; ! } ! } ! else ! { ! $sql = "UPDATE ".PORTAL_TABLE." ! SET portal_name='$mx_portal_name', ! portal_version='$mx_portal_version' ! WHERE portal_id = 1"; ! ! parse_cmd_sql($sql); ! } ! // *************** *** 749,753 **** // FYI: // If document root IS part of our absolute path, chances are we can find phpBB from there. ! // This is the most tipical scenario. Under a shared host, the document root tipically points // to a path owned by the same user running the current domain. // That's why we first try to guess the $phpbb_search_path value from $document_root. --- 873,877 ---- // FYI: // If document root IS part of our absolute path, chances are we can find phpBB from there. ! // This is the most typical scenario. Under a shared host, the document root typically points // to a path owned by the same user running the current domain. // That's why we first try to guess the $phpbb_search_path value from $document_root. *************** *** 848,851 **** --- 972,1000 ---- // $select_phpbb_path = '<select name="select_phpbb_path" onchange="check_phpbb_path();">'; + + // + // First, provide the option of standalone install + // + + $template->assign_block_vars('datarow', array( + 'INFO' => $lang['Install_Instruction_mxBB'], + 'PHPBB_PATH' => '', + 'PORTAL_URL' => $portal_url, + 'PHPBB_URL' => '', + 'DBMS' => '', + 'DB_HOST' => '', + 'DB_NAME' => '', + 'DB_USER' => '', + 'DB_PASSWD' => '', + 'DB_PREFIX' => '', + //'ACM_TYPE' => ( !empty($phpbb_info['acm_type']) ? $phpbb_info['acm_type'] : 'file' ), + 'PHPBB_ROOT' => '', + )); + + $select_phpbb_path .= '<option value="-1">'.'Internal'.'</option>'; + + // + // Now, list all phpBB backend options available + // for( $i = 0; $i < $files_cnt; $i++ ) { *************** *** 915,918 **** --- 1064,1068 ---- $template->assign_block_vars('datarow', array( + 'INFO' => $lang['Install_Instruction_phpBB'], 'PHPBB_PATH' => $phpbb_relative, 'PORTAL_URL' => $portal_url, *************** *** 935,941 **** // DEBUG ONLY ;-) // ! //$phpbb_found = false; ! //$phpbb_failed = true; ! //$files_cnt = 0; // -------------------- --- 1085,1094 ---- // DEBUG ONLY ;-) // ! if (isset($HTTP_POST_VARS['debug'])) ! { ! $phpbb_found = false; ! $phpbb_failed = true; ! $files_cnt = 0; ! } // -------------------- *************** *** 961,967 **** 'L_NOSCRIPT_WARNING' => $lang['Install_noscript_warning'], 'L_INITIAL_CONFIGURATION' => $lang['Install_settings'], ! 'L_PORTAL_CONFIGURATION' => $lang['Portal_General_Config'], 'L_DATABASE_CONFIGURATION' => $lang['Database_settings'], 'L_PHPBB_PATH' => $lang['Phpbb_path'], 'L_PORTAL_URL' => $lang['Portal_url'], 'L_PHPBB_URL' => $lang['Phpbb_url'], --- 1114,1125 ---- 'L_NOSCRIPT_WARNING' => $lang['Install_noscript_warning'], 'L_INITIAL_CONFIGURATION' => $lang['Install_settings'], ! 'L_PORTAL_CONFIGURATION' => $lang['Portal_paths'], 'L_DATABASE_CONFIGURATION' => $lang['Database_settings'], + 'READ_ONLY' => $lang['ReadOnly'], + 'L_PHPBB_ONLY' => $lang['Phpbb_only'], + 'L_MXBB_ONLY' => $lang['Mxbb_only'], 'L_PHPBB_PATH' => $lang['Phpbb_path'], + 'L_Backend' => $lang['Session_backend'], + 'L_Backend_explain' => $phpbb_found ? $lang['Session_backend_explain'] : '', 'L_PORTAL_URL' => $lang['Portal_url'], 'L_PHPBB_URL' => $lang['Phpbb_url'], *************** *** 990,993 **** --- 1148,1153 ---- 'ACM_TYPE' => ( !empty($phpbb_info['acm_type']) ? $phpbb_info['acm_type'] : 'file' ), + 'DBMS_SELECT' => dbms_select('mysql'), + 'S_HIDDEN_FIELDS' => $s_hidden_fields, 'S_FORM_ACTION' => "mx_install.$phpEx", |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:48:22
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8466 Modified Files: common.php index.php login.php Log Message: Ok, massive update for 2.9.x. Index: login.php =================================================================== RCS file: /cvsroot/mxbb/core/login.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** login.php 5 May 2007 20:12:57 -0000 1.23 --- login.php 9 Sep 2007 16:48:16 -0000 1.24 *************** *** 22,25 **** --- 22,30 ---- // + // Page selector + // + $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); + + // // Start session, user and style (template + theme) management // - populate $userdata, $lang, $theme, $images and initiate $template. *************** *** 27,30 **** --- 32,40 ---- $mx_user->init($user_ip, PAGE_LOGIN); + // + // Load and instatiate CORE (page) and block classes + // + $mx_page->init( $page_id ); + // session id check if (!empty($HTTP_POST_VARS['sid']) || !empty($HTTP_GET_VARS['sid'])) *************** *** 39,176 **** if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($HTTP_POST_VARS['logout']) || isset($HTTP_GET_VARS['logout']) ) { - if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && (!$userdata['session_logged_in'] || isset($HTTP_POST_VARS['admin'])) ) - { - $username = isset($HTTP_POST_VARS['username']) ? phpbb_clean_username($HTTP_POST_VARS['username']) : ''; - $password = isset($HTTP_POST_VARS['password']) ? $HTTP_POST_VARS['password'] : ''; - - $sql = "SELECT user_id, username, user_password, user_active, user_level, user_login_tries, user_last_login_try - FROM " . USERS_TABLE . " - WHERE username = '" . str_replace("\\'", "''", $username) . "'"; - if ( !($result = $db->sql_query($sql) ) ) - { - mx_message_die(GENERAL_ERROR, 'Error in obtaining userdata', '', __LINE__, __FILE__, $sql); - } - - if( $row = $db->sql_fetchrow($result) ) - { - if( $row['user_level'] != ADMIN && $board_config['board_disable'] ) - { - mx_redirect(append_sid("index.$phpEx", true)); - } - else - { - - // If the last login is more than x minutes ago, then reset the login tries/time - if ($row['user_last_login_try'] && $board_config['login_reset_time'] && $row['user_last_login_try'] < (time() - ($board_config['login_reset_time'] * 60))) - { - $db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_login_tries = 0, user_last_login_try = 0 WHERE user_id = ' . $row['user_id']); - $row['user_last_login_try'] = $row['user_login_tries'] = 0; - } - - // Check to see if user is allowed to login again... if his tries are exceeded - if ($row['user_last_login_try'] && $board_config['login_reset_time'] && $board_config['max_login_attempts'] && - $row['user_last_login_try'] >= (time() - ($board_config['login_reset_time'] * 60)) && $row['user_login_tries'] >= $board_config['max_login_attempts'] && $userdata['user_level'] != ADMIN) - { - mx_message_die(GENERAL_MESSAGE, sprintf($lang['Login_attempts_exceeded'], $board_config['max_login_attempts'], $board_config['login_reset_time'])); - } - - if( md5($password) == $row['user_password'] && $row['user_active'] ) - { - $autologin = ( isset($HTTP_POST_VARS['autologin']) ) ? TRUE : 0; - - $admin = (isset($HTTP_POST_VARS['admin'])) ? 1 : 0; - $session_id = session_begin($row['user_id'], $user_ip, PAGE_INDEX, FALSE, $autologin, $admin); - - // Reset login tries - $db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_login_tries = 0, user_last_login_try = 0 WHERE user_id = ' . $row['user_id']); - - if( $session_id ) - { - $url = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : "index.$phpEx"; - mx_redirect(append_sid($url, true)); - } - else - { - mx_message_die(CRITICAL_ERROR, "Couldn't start session : login", "", __LINE__, __FILE__); - } - } - // Only store a failed login attempt for an active user - inactive users can't login even with a correct password - elseif( $row['user_active'] ) - { - - // Save login tries and last login - if ($row['user_id'] != ANONYMOUS) - { - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_login_tries = user_login_tries + 1, user_last_login_try = ' . time() . ' - WHERE user_id = ' . $row['user_id']; - $db->sql_query($sql); - } ! $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : ''; ! $redirect = str_replace('?', '&', $redirect); ! ! if (strstr(urldecode($redirect), "\n") || strstr(urldecode($redirect), "\r")) ! { ! mx_message_die(GENERAL_ERROR, 'Tried to redirect to potentially insecure url.'); ! } ! ! $template->assign_vars(array( ! 'META' => "<meta http-equiv=\"refresh\" content=\"3;url=login.$phpEx?redirect=$redirect\">") ! ); ! ! $message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], "<a href=\"login.$phpEx?redirect=$redirect\">", '</a>') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>'); ! ! mx_message_die(GENERAL_MESSAGE, $message); ! } ! } ! } ! else ! { ! $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : ""; ! $redirect = str_replace("?", "&", $redirect); ! ! if (strstr(urldecode($redirect), "\n") || strstr(urldecode($redirect), "\r")) ! { ! mx_message_die(GENERAL_ERROR, 'Tried to redirect to potentially insecure url.'); ! } ! ! $template->assign_vars(array( ! 'META' => "<meta http-equiv=\"refresh\" content=\"3;url=login.$phpEx?redirect=$redirect\">") ! ); ! $message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], "<a href=\"login.$phpEx?redirect=$redirect\">", '</a>') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>'); ! mx_message_die(GENERAL_MESSAGE, $message); ! } ! } ! else if( ( isset($HTTP_GET_VARS['logout']) || isset($HTTP_POST_VARS['logout']) ) && $userdata['session_logged_in'] ) ! { ! // session id check ! if ($sid == '' || $sid != $userdata['session_id']) ! { ! mx_message_die(GENERAL_ERROR, 'Invalid_session'); ! } ! if( $userdata['session_logged_in'] ) ! { ! session_end($userdata['session_id'], $userdata['user_id']); ! } ! if (!empty($HTTP_POST_VARS['redirect']) || !empty($HTTP_GET_VARS['redirect'])) ! { ! $url = (!empty($HTTP_POST_VARS['redirect'])) ? htmlspecialchars($HTTP_POST_VARS['redirect']) : htmlspecialchars($HTTP_GET_VARS['redirect']); ! $url = str_replace('&', '&', $url); ! mx_redirect(append_sid($url, true)); ! } ! else ! { ! mx_redirect(append_sid("index.$phpEx", true)); ! } ! } ! else ! { ! $url = ( !empty($HTTP_POST_VARS['redirect']) ) ? str_replace('&', '&', htmlspecialchars($HTTP_POST_VARS['redirect'])) : "index.$phpEx"; ! mx_redirect(append_sid($url, true)); } } --- 49,66 ---- if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($HTTP_POST_VARS['logout']) || isset($HTTP_GET_VARS['logout']) ) { ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! include($mx_root_path . 'includes/sessions/'.PORTAL_BACKEND.'/login.'.$phpEx); ! break; ! case 'phpbb3': ! include($mx_root_path . 'includes/sessions/'.PORTAL_BACKEND.'/login.'.$phpEx); ! break; } } *************** *** 228,232 **** $s_hidden_fields .= (isset($HTTP_GET_VARS['admin'])) ? '<input type="hidden" name="admin" value="1" />' : ''; ! make_jumpbox($phpbb_root_path . 'viewforum.'.$phpEx); $layouttemplate->assign_vars(array( --- 118,122 ---- $s_hidden_fields .= (isset($HTTP_GET_VARS['admin'])) ? '<input type="hidden" name="admin" value="1" />' : ''; ! //mx_make_jumpbox($phpbb_root_path . 'viewforum.'.$phpEx); $layouttemplate->assign_vars(array( *************** *** 236,240 **** 'L_SEND_PASSWORD' => $lang['Forgotten_password'], ! 'U_SEND_PASSWORD' => append_sid($phpbb_root_path . "profile.$phpEx?mode=sendpassword"), 'S_HIDDEN_FIELDS' => $s_hidden_fields) --- 126,130 ---- 'L_SEND_PASSWORD' => $lang['Forgotten_password'], ! 'U_SEND_PASSWORD' => mx_append_sid($phpbb_root_path . "profile.$phpEx", "mode=sendpassword"), 'S_HIDDEN_FIELDS' => $s_hidden_fields) *************** *** 253,260 **** else { ! mx_redirect(append_sid("index.$phpEx", true)); } - } - ?> \ No newline at end of file --- 143,148 ---- else { ! mx_redirect(mx_append_sid("index.$phpEx", false)); } } ?> \ No newline at end of file Index: common.php =================================================================== RCS file: /cvsroot/mxbb/core/common.php,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** common.php 5 Aug 2007 22:07:26 -0000 1.67 --- common.php 9 Sep 2007 16:48:16 -0000 1.68 *************** *** 16,19 **** --- 16,20 ---- define('IN_PHPBB', 1); + define('PHPBB_INSTALLED', true); $mx_starttime = explode(' ', microtime()); *************** *** 197,224 **** } - str_replace("//", "/", $phpbb_root_path); - // ! // mxBB Includes // include_once($mx_root_path . 'includes/mx_constants.' . $phpEx); // Also includes phpBB constants - include_once($mx_root_path . 'includes/mx_functions_style.' . $phpEx); // Extends the phpBB template class - - // - // phpBB Includes - // - include_once($phpbb_root_path . 'includes/functions.' . $phpEx); - - // - // More mxBB Includes - // include_once($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class - include_once($mx_root_path . 'includes/mx_functions.' . $phpEx); // CORE Functions - include_once($mx_root_path . 'includes/mx_functions_phpbb.' . $phpEx); // phpBB associated functions include_once($mx_root_path . 'includes/mx_functions_core.' . $phpEx); // CORE class - // We do not need this any longer, unset for safety purposes - unset($dbpasswd); - // // Instatiate the mx_cache class --- 198,208 ---- } // ! // mxBB CORE Includes // include_once($mx_root_path . 'includes/mx_constants.' . $phpEx); // Also includes phpBB constants include_once($mx_root_path . 'includes/db/' . $dbms . '.' . $phpEx); // Load dbal and initiate class include_once($mx_root_path . 'includes/mx_functions_core.' . $phpEx); // CORE class // // Instatiate the mx_cache class *************** *** 232,240 **** // ! // Define some general Defs // ! define('PHPBB_URL', $portal_config['portal_phpbb_url']); ! define('PORTAL_URL', $portal_config['portal_url']); ! define('PORTAL_VERSION', $portal_config['portal_version']); // --- 216,272 ---- // ! // Define Users/Group/Sessions backend, and validate // ! $table_prefix = ''; ! switch ($portal_config['portal_backend']) ! { ! case 'internal': ! $phpbb_root_path = $mx_root_path . 'includes/shared/phpbb2/'; ! str_replace("//", "/", $phpbb_root_path); ! $portal_backend_valid_file = true; ! $table_prefix = 'phpBB_'; ! $tplEx = 'tpl'; ! break; ! case 'phpbb2': ! $phpbb_root_path = $mx_root_path . $portal_config['portal_backend_path']; ! str_replace("//", "/", $phpbb_root_path); ! $portal_backend_valid_file = @file_exists($phpbb_root_path . "modcp.$phpEx"); ! @include_once($phpbb_root_path . 'config.' . $phpEx); ! $tplEx = 'tpl'; ! break; ! case 'phpbb3': ! $phpbb_root_path = $mx_root_path . $portal_config['portal_backend_path']; ! str_replace("//", "/", $phpbb_root_path); ! $portal_backend_valid_file = @file_exists($phpbb_root_path . "mcp.$phpEx"); ! @include_once($phpbb_root_path . 'config.' . $phpEx); ! $tplEx = 'html'; ! break; ! } ! ! if (!$portal_backend_valid_file || empty($table_prefix)) ! { ! // ! // If phpBB setup is bad, revert to standalone. Thus we can access the adminCP ;) ! // ! define('PORTAL_BACKEND', 'internal'); ! $phpbb_root_path = $mx_root_path . 'includes/shared/phpbb2/'; ! str_replace("//", "/", $phpbb_root_path); ! $tplEx = 'tpl'; ! } ! else ! { ! define('PORTAL_BACKEND', $portal_config['portal_backend']); ! } ! ! // ! // mxBB Includes - doing the rest ! // ! @include_once($mx_root_path . 'includes/sessions/'.PORTAL_BACKEND.'/constants.' . $phpEx); ! include_once($mx_root_path . 'includes/mx_functions_style.' . $phpEx); // Styling and sessions ! include_once($mx_root_path . 'includes/mx_functions.' . $phpEx); // CORE Functions ! include_once($mx_root_path . 'includes/mx_functions_phpbb.' . $phpEx); // phpBB associated functions ! ! // We do not need this any longer, unset for safety purposes ! unset($dbpasswd); // *************** *** 282,286 **** // $client_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : getenv('REMOTE_ADDR') ); ! $user_ip = encode_ip($client_ip); // --- 314,331 ---- // $client_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : getenv('REMOTE_ADDR') ); ! $user_ip = phpBB2::encode_ip($client_ip); ! ! // ! // Define some general Defs ! // ! $script_name = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($portal_config['script_path'])); ! $server_name = trim($portal_config['server_name']); ! $server_protocol = ( $portal_config['cookie_secure'] ) ? 'https://' : 'http://'; ! $server_port = ( $portal_config['server_port'] <> 80 ) ? ':' . trim($portal_config['server_port']) . '/' : '/'; ! ! $server_url = $server_protocol . $server_name . $server_port . $script_name; ! ! define('PORTAL_URL', $server_url); ! define('PORTAL_VERSION', $portal_config['portal_version']); // *************** *** 289,305 **** // basic forum information is not available // ! if( @file_exists($phpbb_root_path . 'includes/class_config.' . $phpEx) && @file_exists($phpbb_root_path . 'includes/class_groups.' . $phpEx) ) ! { ! include($mx_root_path . 'includes/mx_functions_ch.'.$phpEx); ! } ! else { ! // ! // Grab phpBB global variables, re-cache if necessary ! // - optional parameter to enable/disable cache for config data. If enabled, remember to refresh the mxBB cache whenever updating phpBB config settings ! // - true: enable cache, false: disable cache ! $board_config = $mx_cache->obtain_phpbb_config(false); } // // Is phpBB File Attachment MOD present? --- 334,375 ---- // basic forum information is not available // ! switch (PORTAL_BACKEND) { ! case 'internal': ! $board_config = array(); ! $script_name_phpbb = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim('includes/shared/phpbb2/')) . '/'; ! break; ! ! case 'phpbb2': ! if( @file_exists($phpbb_root_path . 'includes/class_config.' . $phpEx) && @file_exists($phpbb_root_path . 'includes/class_groups.' . $phpEx) ) ! { ! include($mx_root_path . 'includes/mx_functions_ch.'.$phpEx); ! } ! else ! { ! // ! // Grab phpBB global variables, re-cache if necessary ! // - optional parameter to enable/disable cache for config data. If enabled, remember to refresh the mxBB cache whenever updating phpBB config settings ! // - true: enable cache, false: disable cache ! $board_config = $mx_cache->obtain_phpbb_config(false); ! } ! $script_name_phpbb = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path'])) . '/'; ! break; ! ! case 'phpbb3': ! // ! // Grab phpBB global variables, re-cache if necessary ! // - optional parameter to enable/disable cache for config data. If enabled, remember to refresh the mxBB cache whenever updating phpBB config settings ! // - true: enable cache, false: disable cache ! $board_config = $mx_cache->obtain_phpbb_config(false); ! $script_name_phpbb = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path'])) . '/'; ! break; } + $server_url_phpbb = $server_protocol . $server_name . $server_port . $script_name_phpbb; + define('PHPBB_URL', $server_url_phpbb); + + mx_page::sync_configs(); + // // Is phpBB File Attachment MOD present? Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/index.php,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** index.php 22 Jul 2007 20:59:56 -0000 1.70 --- index.php 9 Sep 2007 16:48:16 -0000 1.71 *************** *** 45,49 **** // /* ! if( !($userdata['user_level'] == ADMIN && $userdata['session_logged_in']) ) { mx_message_die(GENERAL_MESSAGE, 'We are currenty upgrading this site with latest mxBB software. Hopefully everything will run smoothly again later tonight (GMT). /Jon', 'Information'); --- 45,49 ---- // /* ! if( !($mx_user->data['user_level'] == ADMIN && $mx_user->data['session_logged_in']) ) { mx_message_die(GENERAL_MESSAGE, 'We are currenty upgrading this site with latest mxBB software. Hopefully everything will run smoothly again later tonight (GMT). /Jon', 'Information'); *************** *** 54,58 **** // Site under reconstruction // ! if( !$portal_config['portal_status'] && !($userdata['user_level'] == ADMIN && $userdata['session_logged_in']) ) { mx_message_die(GENERAL_MESSAGE, $portal_config['disabled_message'], 'Information'); --- 54,58 ---- // Site under reconstruction // ! if( !$portal_config['portal_status'] && !($mx_user->data['user_level'] == ADMIN && $mx_user->data['session_logged_in']) ) { mx_message_die(GENERAL_MESSAGE, $portal_config['disabled_message'], 'Information'); *************** *** 70,81 **** // Page Auth and IP filter // ! if ( !$mx_page->auth_view && $userdata['session_logged_in'] ) { $message = empty( $lang['Page_Not_Authorised'] ) ? "Sorry, but you don't have privilege to access this page." : $lang['Page_Not_Authorised']; mx_message_die(GENERAL_MESSAGE, $message, '', __LINE__, __FILE__, ''); } ! elseif ( !$mx_page->auth_view && !$userdata['session_logged_in'] ) { ! mx_redirect( append_sid( "login.$phpEx?redirect=" . 'index.php?page=' . $page_id, true ) ); } elseif ( !$mx_page->auth_ip ) --- 70,81 ---- // Page Auth and IP filter // ! if ( !($mx_page->auth_view || $mx_page->auth_mod) && $mx_user->data['session_logged_in'] ) { $message = empty( $lang['Page_Not_Authorised'] ) ? "Sorry, but you don't have privilege to access this page." : $lang['Page_Not_Authorised']; mx_message_die(GENERAL_MESSAGE, $message, '', __LINE__, __FILE__, ''); } ! elseif ( !($mx_page->auth_view || $mx_page->auth_mod) && !$mx_user->data['session_logged_in'] ) { ! mx_redirect( mx3_append_sid( "login.$phpEx?redirect=index.$phpEx", 'page=' . $page_id, true ) ); } elseif ( !$mx_page->auth_ip ) |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:44:28
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks/templates/_core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7201/admin Log Message: Directory /cvsroot/mxbb/core/modules/mx_textblocks/templates/_core/admin added to the repository |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:44:16
|
Update of /cvsroot/mxbb/core/modules/mx_textblocks/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7186/_core Log Message: Directory /cvsroot/mxbb/core/modules/mx_textblocks/templates/_core added to the repository |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:42:53
|
Update of /cvsroot/mxbb/core/modules/mx_rebuild_search_tables/templates/_core/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6384/admin Log Message: Directory /cvsroot/mxbb/core/modules/mx_rebuild_search_tables/templates/_core/admin added to the repository |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:42:41
|
Update of /cvsroot/mxbb/core/modules/mx_rebuild_search_tables/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6361/_core Log Message: Directory /cvsroot/mxbb/core/modules/mx_rebuild_search_tables/templates/_core added to the repository |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:41:13
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks/templates/prosilver In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5875/prosilver Log Message: Directory /cvsroot/mxbb/core/modules/mx_phpbb3blocks/templates/prosilver added to the repository |
|
From: Jon O. <jon...@us...> - 2007-09-09 16:41:13
|
Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks/templates/_core In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5875/_core Log Message: Directory /cvsroot/mxbb/core/modules/mx_phpbb3blocks/templates/_core added to the repository |
2 messages has been excluded from this view by a project administrator.
