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: Markus P. <mar...@us...> - 2005-04-04 21:35:20
|
Update of /cvsroot/mxbb/core/modules/mx_core_portal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9123 Modified Files: mx_online.php Log Message: Re-written mx_online.php block. Based on two different script from phpBB 2.0.13: includes/page_header.php and index.php Index: mx_online.php =================================================================== RCS file: /cvsroot/mxbb/core/modules/mx_core_portal/mx_online.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mx_online.php 9 Jan 2005 21:55:44 -0000 1.6 --- mx_online.php 4 Apr 2005 21:34:40 -0000 1.7 *************** *** 1,16 **** <?php /** ------------------------------------------------------------------------ ! * subject : mx-portal, CMS & portal * begin : june, 2002 ! * copyright : (C) 2002-2005 MX-System * email : jon...@ho... * project site : www.mx-system.com * ! * description : * ------------------------------------------------------------------------- * $Id$ */ ! /** * 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 --- 1,16 ---- <?php /** ------------------------------------------------------------------------ ! * subject : mxBB-Portal, CMS & portal * begin : june, 2002 ! * copyright : (C) 2002-2005 mxBB-Portal * email : jon...@ho... * project site : www.mx-system.com * ! * description : Who's Online Block. * ------------------------------------------------------------------------- * $Id$ */ ! /** * 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 *************** *** 18,284 **** * (at your option) any later version. */ - - if ( !defined( 'IN_PORTAL' ) ) - { - die( "Hacking attempt" ); - } ! $block_config = read_block_config( $block_id ); ! ! $title = $block_config[$block_id]['block_title']; ! ! // Start output of page ! ! ! // Generate logged in/logged out status ! ! if ( $userdata['session_logged_in'] ) ! { ! $u_login_logout = "login.$phpEx?logout=true"; ! $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'] ) : ''; // Get basic (usernames + totals) online // situation ! $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 ) . " ! OR u.user_session_time >= " . ( time() - 300 ) . " ) ! ORDER BY u.username ASC, s.session_ip ASC"; - $result = $db->sql_query( $sql ); ! if ( !$result ) ! { ! message_die( GENERAL_ERROR, 'Could not obtain user/online information', '', __LINE__, __FILE__, $sql ); ! } ! $userlist_ary = array(); ! $userlist_visible = array(); ! $logged_visible_online = 0; ! $logged_hidden_online = 0; ! $guests_online = 0; ! $online_userlist = ''; ! $prev_user_id = 0; ! $prev_user_ip = ''; ! $prev_session_ip = "0"; ! while ( $row = $db->sql_fetchrow( $result ) ) ! { ! // User is logged in and therefor not a guest ! if ( $row['session_logged_in'] ) ! { ! // Skip multiple sessions for one user ! if ( $row['user_id'] != $prev_user_id ) { ! $style_color = ''; ! if ( $row['user_level'] == ADMIN ) ! { ! $row['username'] = '<b>' . $row['username'] . '</b>'; ! $style_color = 'style="color:#' . $theme['fontcolor3'] . '"'; ! } ! else if ( $row['user_level'] == MOD ) { ! $row['username'] = '<b>' . $row['username'] . '</b>'; ! $style_color = 'style="color:#' . $theme['fontcolor2'] . '"'; ! } ! if ( $row['user_allow_viewonline'] ) ! { ! $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; } } ! } ! else ! { ! // Skip multiple sessions for one user ! if ( $row['session_ip'] != $prev_session_ip ) { ! $guests_online++; } - } ! $prev_session_ip = $row['session_ip']; ! $prev_user_id = $row['user_id']; ! } ! ! if ( empty( $online_userlist ) ) ! { ! $online_userlist = $lang['None']; ! } ! $online_userlist = $lang['Registered_users'] . ' ' . $online_userlist; ! ! $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online; ! ! if ( $total_online_users > $board_config['record_online_users'] ) ! { ! $sql = "UPDATE " . CONFIG_TABLE . " ! SET config_value = '$total_online_users' ! WHERE config_name = 'record_online_users'"; ! if ( !$result = $db->sql_query( $sql ) ) ! { ! message_die( GENERAL_ERROR, 'Could not update online user record (nr of users)', '', __LINE__, __FILE__, $sql ); } ! $sql = "UPDATE " . CONFIG_TABLE . " ! SET config_value = '" . time() . "' ! WHERE config_name = 'record_online_date'"; ! if ( !$result = $db->sql_query( $sql ) ) { ! message_die( GENERAL_ERROR, 'Could not update online user record (date)', '', __LINE__, __FILE__, $sql ); } ! $board_config['record_online_users'] = $total_online_users; ! $board_config['record_online_date'] = time(); ! } ! ! if ( $total_online_users == 0 ) ! { ! $l_t_user_s = $lang['Online_users_zero_total']; ! } ! else if ( $total_online_users == 1 ) ! { ! $l_t_user_s = $lang['Online_user_total']; ! } ! else ! { ! $l_t_user_s = $lang['Online_users_total']; ! } ! ! if ( $logged_visible_online == 0 ) ! { ! $l_r_user_s = $lang['Reg_users_zero_total']; ! } ! else if ( $logged_visible_online == 1 ) ! { ! $l_r_user_s = $lang['Reg_user_total']; ! } ! else ! { ! $l_r_user_s = $lang['Reg_users_total']; ! } ! ! if ( $logged_hidden_online == 0 ) ! { ! $l_h_user_s = $lang['Hidden_users_zero_total']; ! } ! else if ( $logged_hidden_online == 1 ) ! { ! $l_h_user_s = $lang['Hidden_user_total']; ! } ! else ! { ! $l_h_user_s = $lang['Hidden_users_total']; ! } ! ! if ( $guests_online == 0 ) ! { ! $l_g_user_s = $lang['Guest_users_zero_total']; ! } ! else if ( $guests_online == 1 ) ! { ! $l_g_user_s = $lang['Guest_user_total']; ! } ! else ! { ! $l_g_user_s = $lang['Guest_users_total']; ! } ! ! $l_online_users = sprintf( $l_t_user_s, $total_online_users ); ! $l_online_users .= sprintf( $l_r_user_s, $logged_visible_online ); ! $l_online_users .= sprintf( $l_h_user_s, $logged_hidden_online ); ! $l_online_users .= sprintf( $l_g_user_s, $guests_online ); ! ! // Obtain number of new private messages ! // if user is logged in ! if ( $userdata['session_logged_in'] ) ! { ! 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 ( !$status = $db->sql_query( $sql ) ) ! { ! 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']; } } else { ! $l_privmsgs_text = $lang['No_new_pm']; ! $s_privmsg_new = 0; ! $icon_pm = $images['pm_no_new_msg']; } ! 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; } ! $template->set_filenames( array( "body_online" => "mx_online.tpl" ) ! ); ! $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']; ! if ( $total_posts == 0 ) { $l_total_post_s = $lang['Posted_articles_zero_total']; } ! else if ( $total_posts == 1 ) { $l_total_post_s = $lang['Posted_article_total']; --- 18,222 ---- * (at your option) any later version. */ ! if( !defined('IN_PORTAL') ) { ! die("Hacking attempt"); } + // ================================================================================ + // The following code is backported from includes/page_header.php (phpBB 2.0.13) + // ================================================================================ + + // // Get basic (usernames + totals) online // situation + // + $logged_visible_online = 0; + $logged_hidden_online = 0; + $guests_online = 0; + $online_userlist = ''; + $l_online_users = ''; ! //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)) ) ! { ! message_die(GENERAL_ERROR, 'Could not obtain user/online information', '', __LINE__, __FILE__, $sql); ! } ! $userlist_ary = array(); ! $userlist_visible = array(); ! $prev_user_id = 0; ! $prev_user_ip = $prev_session_ip = ''; ! while( $row = $db->sql_fetchrow($result) ) ! { ! // User is logged in and therefor not a guest ! if ( $row['session_logged_in'] ) { ! // Skip multiple sessions for one user ! if ( $row['user_id'] != $prev_user_id ) { ! $style_color = ''; ! if ( $row['user_level'] == ADMIN ) ! { ! $row['username'] = '<b>' . $row['username'] . '</b>'; ! $style_color = 'style="color:#' . $theme['fontcolor3'] . '"'; ! } ! else if ( $row['user_level'] == MOD ) ! { ! $row['username'] = '<b>' . $row['username'] . '</b>'; ! $style_color = 'style="color:#' . $theme['fontcolor2'] . '"'; ! } ! if ( $row['user_allow_viewonline'] ) ! { ! $user_online_link = '<a href="' . append_sid("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("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; ! } } + + $prev_user_id = $row['user_id']; } ! else { ! // Skip multiple sessions for one user ! if ( $row['session_ip'] != $prev_session_ip ) ! { ! $guests_online++; ! } } ! $prev_session_ip = $row['session_ip']; } + $db->sql_freeresult($result); ! if ( empty($online_userlist) ) { ! $online_userlist = $lang['None']; } + $online_userlist = ( ( isset($forum_id) ) ? $lang['Browsing_forum'] : $lang['Registered_users'] ) . ' ' . $online_userlist; ! $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online; ! if ( $total_online_users > $board_config['record_online_users']) { ! $board_config['record_online_users'] = $total_online_users; ! $board_config['record_online_date'] = time(); ! $sql = "UPDATE " . CONFIG_TABLE . " ! SET config_value = '$total_online_users' ! WHERE config_name = 'record_online_users'"; ! if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update online user record (nr of users)', '', __LINE__, __FILE__, $sql); } ! ! $sql = "UPDATE " . CONFIG_TABLE . " ! SET config_value = '" . $board_config['record_online_date'] . "' ! WHERE config_name = 'record_online_date'"; ! if ( !$db->sql_query($sql) ) { ! message_die(GENERAL_ERROR, 'Could not update online user record (date)', '', __LINE__, __FILE__, $sql); } } + + if ( $total_online_users == 0 ) + { + $l_t_user_s = $lang['Online_users_zero_total']; + } + else if ( $total_online_users == 1 ) + { + $l_t_user_s = $lang['Online_user_total']; + } else { ! $l_t_user_s = $lang['Online_users_total']; ! } ! if ( $logged_visible_online == 0 ) ! { ! $l_r_user_s = $lang['Reg_users_zero_total']; ! } ! else if ( $logged_visible_online == 1 ) ! { ! $l_r_user_s = $lang['Reg_user_total']; ! } ! else ! { ! $l_r_user_s = $lang['Reg_users_total']; } ! if ( $logged_hidden_online == 0 ) { ! $l_h_user_s = $lang['Hidden_users_zero_total']; ! } ! else if ( $logged_hidden_online == 1 ) ! { ! $l_h_user_s = $lang['Hidden_user_total']; } else { ! $l_h_user_s = $lang['Hidden_users_total']; } ! ! if ( $guests_online == 0 ) ! { ! $l_g_user_s = $lang['Guest_users_zero_total']; ! } ! else if ( $guests_online == 1 ) ! { ! $l_g_user_s = $lang['Guest_user_total']; ! } ! else ! { ! $l_g_user_s = $lang['Guest_users_total']; ! } ! ! $l_online_users = sprintf($l_t_user_s, $total_online_users); ! $l_online_users .= sprintf($l_r_user_s, $logged_visible_online); ! $l_online_users .= sprintf($l_h_user_s, $logged_hidden_online); ! $l_online_users .= sprintf($l_g_user_s, $guests_online); } ! // ================================================================================ ! // The following code is backported from index.php (phpBB 2.0.13) ! // ================================================================================ ! // ! // If you don't use these stats on your index you may want to consider ! // removing them ! // ! $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']; ! if( $total_posts == 0 ) { $l_total_post_s = $lang['Posted_articles_zero_total']; } ! else if( $total_posts == 1 ) { $l_total_post_s = $lang['Posted_article_total']; *************** *** 289,297 **** } ! if ( $total_users == 0 ) { $l_total_user_s = $lang['Registered_users_zero_total']; } ! else if ( $total_users == 1 ) { $l_total_user_s = $lang['Registered_user_total']; --- 227,235 ---- } ! if( $total_users == 0 ) { $l_total_user_s = $lang['Registered_users_zero_total']; } ! else if( $total_users == 1 ) { $l_total_user_s = $lang['Registered_user_total']; *************** *** 302,323 **** } ! $template->assign_vars( array( 'BLOCK_SIZE' => $block_size, ! 'U_VIEWONLINE' => append_sid( PHPBB_URL . 'viewonline.' . $phpEx ), ! 'U_PHPBB_ROOT_PATH' => PHPBB_URL, ! 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'L_WHO_IS_ONLINE' => $lang['Who_is_Online'], ! 'L_WHOSONLINE_ADMIN' => sprintf( $lang['Admin_online_color'], '<span style="color:#' . $theme['fontcolor3'] . '">', '</span>' ), ! 'L_WHOSONLINE_MOD' => sprintf( $lang['Mod_online_color'], '<span style="color:#' . $theme['fontcolor2'] . '">', '</span>' ), ! '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'] ) ), ! 'LOGGED_IN_USER_LIST' => $online_userlist, ! 'TOTAL_USERS_ONLINE' => $l_online_users, ! '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>' ) ! ) ); ! $template->pparse( "body_online" ); ! $template->destroy(); ?> \ No newline at end of file --- 240,282 ---- } ! // ================================================================================ ! // Send our Who's Online block to the browser ! // ================================================================================ ! $template->set_filenames(array( ! 'body_online' => 'mx_online.tpl') ! ); ! $template->assign_vars(array( ! // ! // Template variables particular to the mxBB Online Block. ! // ! 'BLOCK_SIZE' => $block_size, ! 'U_PHPBB_ROOT_PATH' => PHPBB_URL, ! 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! ! // ! // Template variables part of phpBB includes/page_header.php ! // ! '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'], ! 'L_WHOSONLINE_ADMIN' => sprintf($lang['Admin_online_color'], '<span style="color:#' . $theme['fontcolor3'] . '">', '</span>'), ! 'L_WHOSONLINE_MOD' => sprintf($lang['Mod_online_color'], '<span style="color:#' . $theme['fontcolor2'] . '">', '</span>'), ! ! 'U_VIEWONLINE' => append_sid(PHPBB_URL.'viewonline.'.$phpEx), ! ! // ! // Template variables part of phpBB index.php ! // ! '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>'), ! ! )); ! ! $template->pparse('body_online'); ?> \ No newline at end of file |
|
From: Markus P. <mar...@us...> - 2005-04-04 00:43:05
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8387 Modified Files: admin_mx_meta.php Log Message: Oopss... I forgot to load the META lang file. Index: admin_mx_meta.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_meta.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** admin_mx_meta.php 4 Apr 2005 00:21:56 -0000 1.7 --- admin_mx_meta.php 4 Apr 2005 00:42:37 -0000 1.8 *************** *** 28,53 **** } - function generate_meta_select($default, $select_name) - { - global $lang; - - $select = '<select name="' . $select_name . '">'; - foreach( $lang['mx_meta'][$select_name] as $key => $value ) - { - $selected = ( $key == $default ) ? ' selected="selected"' : ''; - $select .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>'; - } - $select .= '</select>'; - - return $select; - } - define('IN_PORTAL', 1); $mx_root_path = '../'; // Security and page header ! require('./pagestart.php'); if ( $mx_request_vars->is_post('submit') ) { --- 28,56 ---- } define('IN_PORTAL', 1); $mx_root_path = '../'; + // // Security and page header ! // require('./pagestart.php'); + + // + // Load language file. + // + if ( @file_exists($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_meta.' . $phpEx) ) + { + include($mx_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_meta.' . $phpEx); + } + else + { + include($mx_root_path . 'language/lang_english/lang_meta.' . $phpEx); + } + + + // + // Main procedure + // if ( $mx_request_vars->is_post('submit') ) { *************** *** 104,108 **** } ! include( '../mx_meta.inc' ); $template->set_filenames(array( 'meta' => 'admin/admin_mx_meta.tpl') --- 107,116 ---- } ! ! // ! // Read current settings and send result to browser ! // ! include($mx_root_path . 'mx_meta.inc'); ! $template->set_filenames(array( 'meta' => 'admin/admin_mx_meta.tpl') *************** *** 147,149 **** --- 155,177 ---- include("./page_footer_admin.$phpEx"); + + // ======================================== + // FUNCTIONS + // ======================================== + + function generate_meta_select($default, $select_name) + { + global $lang; + + $select = '<select name="' . $select_name . '">'; + foreach( $lang['mx_meta'][$select_name] as $key => $value ) + { + $selected = ( $key == $default ) ? ' selected="selected"' : ''; + $select .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>'; + } + $select .= '</select>'; + + return $select; + } + ?> \ No newline at end of file |
|
From: Markus P. <mar...@us...> - 2005-04-04 00:22:11
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3345/admin Modified Files: admin_mx_meta.php Log Message: Meta Tags Administration fully rewritten (Thanks to Snake). Index: admin_mx_meta.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_meta.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** admin_mx_meta.php 9 Jan 2005 21:55:43 -0000 1.6 --- admin_mx_meta.php 4 Apr 2005 00:21:56 -0000 1.7 *************** *** 1,10 **** <?php /** ------------------------------------------------------------------------ ! * subject : mx-portal, CMS & portal * begin : june, 2002 ! * copyright : (C) 2002-2005 MX-System ! * email : jon...@ho... * project site : www.mx-system.com ! * reference : http://www.allhtml.com/metatags/index.php * * description : --- 1,9 ---- <?php /** ------------------------------------------------------------------------ ! * subject : Meta Tags Administration * begin : june, 2002 ! * copyright : (C) 2002-2005 mxBB-Portal * project site : www.mx-system.com ! * reference : See lang_meta.php * * description : *************** *** 23,387 **** $no_page_header = true; ! if ( !empty( $setmodules ) ) { ! $filename = basename( __FILE__ ); ! $module['Portal - System']['Meta Tag'] = 'admin/' . $filename; ! return; } ! // Pick a poll list combo, ! ! function meta_language_select( $default, $select_name = "langcode" ) ! { ! $language["ar-dz"] = "Algérien"; ! $language["de-at"] = "Allemand (Austrian)"; ! $language["af"] = "Africain"; ! $language["sq"] = "Albanais"; ! $language["de"] = "Allemand"; ! $language["de-li"] = "Allemand (Liechtenstein) "; ! $language["de-lu"] = "Allemand (Luxembourg) "; ! $language["de-ch"] = "Allemand (Suisse) "; ! $language["en-us"] = "Américain "; ! $language["en"] = "Anglais "; ! $language["en-za"] = "Anglais (Afrique du sud) "; ! $language["en-bz"] = "Anglais (Bélize) "; ! $language["en-gb"] = "Anglais (Grande Bretagne) "; ! $language["ar"] = "Arabe "; ! $language["ar-sa"] = "Arabe (Arabie Saoudite) "; ! $language["ar-bh"] = "Arabe (Bahreïn) "; ! $language["ar-ae"] = "Arabe (Emirat arabe uni) "; ! $language["en-au"] = "Australien "; ! $language["eu"] = "Basque "; ! $language["nl-be"] = "Belge "; ! $language["be"] = "Biélorussie "; ! $language["bg"] = "Bulgarre "; ! $language["en-ca"] = "Canadien "; ! $language["ca"] = "Catalan "; ! $language["zh"] = "Chinois "; ! $language["zh-hk"] = "Chinois (Hong-Kong) "; ! $language["zh-cn"] = "Chinois (PRC) "; ! $language["zh-sg"] = "Chinois (Singapourg) "; ! $language["zh-tw"] = "Chinois (Taïwan) "; ! $language["ko"] = "Coréein "; ! $language["hr"] = "Croate "; ! $language["cs"] = "Crète "; ! $language["da"] = "Danois "; ! $language["ar-eg"] = "Egyptien "; ! $language["es"] = "Espagnol "; ! $language["es-ar"] = "Espagnol (Argentine) "; ! $language["es-bo"] = "Espagnol (Bolivie) "; ! $language["es-cl"] = "Espagnol (Chilie) "; ! $language["es-co"] = "Espagnol (Colombie) "; ! $language["es-cr"] = "Espagnol (Costa Rica) "; ! $language["es-sv"] = "Espagnol (El Salvador) "; ! $language["es-ec"] = "Espagnol (Equateur) "; ! $language["es-gt"] = "Espagnol (Guatemala) "; ! $language["es-hn"] = "Espagnol (Honduras) "; ! $language["es-mx"] = "Espagnol (Mexique) "; ! $language["es-ni"] = "Espagnol (Nicaragua) "; ! $language["es-pa"] = "Espagnol (Panama) "; ! $language["es-py"] = "Espagnol (Paraguay) "; ! $language["es-pr"] = "Espagnol (Puerto Rico) "; ! $language["es-pe"] = "Espagnol (Pérou) "; ! $language["en-tt"] = "Espagnol (Trinidad) "; ! $language["es-uy"] = "Espagnol (Uruguay) "; ! $language["es-ve"] = "Espagnol (Venezuela) "; ! $language["et"] = "Estonien "; ! $language["sx"] = "Estonien "; ! $language["fo"] = "Faeroese "; ! $language["fi"] = "Finlandais "; ! $language["fr"] = "Français "; ! $language["fr-be"] = "Français (Belgique) "; ! $language["fr-ca"] = "Français (Canada) "; ! $language["fr-lu"] = "Français (Luxembourg) "; ! $language["fr-ch"] = "Français (Suisse) "; ! $language["gd"] = "Galicien "; ! $language["el"] = "Gréc "; ! $language["nl"] = "Hollandais "; ! $language["hu"] = "Hongrois "; ! $language["he"] = "Hébreux "; ! $language["in"] = "Indonésien "; ! $language["hi"] = "Indou "; ! $language["fa"] = "Iranien "; ! $language["ar-iq"] = "Iraquien "; ! $language["en-ie"] = "Irlandais "; ! $language["is"] = "Islandais "; ! $language["it"] = "Italien "; ! $language["it-ch"] = "Italien (Suisse) "; ! $language["en-jm"] = "Jamaicain "; ! $language["ja"] = "Japonais "; ! $language["ar-jo"] = "Jordanien "; ! $language["ar-kw"] = "Koweitien "; ! $language["lv"] = "Lettische "; ! $language["ar-lb"] = "Libanais "; ! $language["lt"] = "Littuanien "; ! $language["ar-ly"] = "Lybien "; ! $language["mk"] = "Macédoine "; ! $language["mt"] = "Maltais "; ! $language["ms"] = "Malésien "; ! $language["ar-ma"] = "Marocain "; ! $language["no"] = "Norvégien (Nynorsk) "; ! $language["no"] = "Norvégien (bokmal) "; ! $language["en-nz"] = "Néo-zélandais "; ! $language["ar-om"] = "Oman "; ! $language["pl"] = "Polonais "; ! $language["pt"] = "Portugais "; ! $language["pt-br"] = "Portugais (Brésil) "; ! $language["ar-qa"] = "Quatar "; ! $language["rm"] = "Rhaeto-Romanic "; ! $language["ro"] = "Roumain (Moldavie) "; ! $language["ro-mo"] = "Roumain (Moldavie) "; ! $language["ru"] = "Russe "; ! $language["ru-mo"] = "Russe (Moldavie) "; ! $language["sr"] = "Serbe (Cyrillic) "; ! $language["sr"] = "Serbe (Latin) "; ! $language["sk"] = "Slovaque "; ! $language["sl"] = "Slovéne "; ! $language["sb"] = "Sorbian "; ! $language["sv"] = "Suèdois "; ! $language["sv-fi"] = "Suèdois (Finlande) "; ! $language["ar-sy"] = "Syrien "; ! $language["th"] = "Thaïlandais "; ! $language["ts"] = "Tsonga (Afrique du sud) "; ! $language["tn"] = "Tswana (Afrique du sud) "; ! $language["ar-tn"] = "Tunisien "; ! $language["tr"] = "Turc "; ! $language["uk"] = "Ukrainien "; ! $language["ur"] = "Urdu "; ! $language["vi"] = "Vietnamien "; ! $language["xh"] = "Xhosa (Afrique) "; ! $language["ji"] = "Yiddish "; ! $language["ar-ye"] = "Yémen "; ! $language["zu"] = "Zulu (Afrique) "; ! /* ! $language["om"] = "(Afan) Oromo"; ! $language["ab"] = "Abkhazian"; ! $language["aa"] = "Afar"; ! $language["af"] = "Afrikaans"; ! $language["sq"] = "Albanian"; ! $language["am"] = "Amharic"; ! $language["ar"] = "Arabic"; ! $language["hy"] = "Armenian"; ! $language["as"] = "Assamese"; ! $language["ay"] = "Aymara"; ! $language["az"] = "Azerbaijani"; ! $language["ba"] = "Bashkir"; ! $language["eu"] = "Basque"; ! $language["bn"] = "Bengali, Bangla"; ! $language["dz"] = "Bhutani"; ! $language["bh"] = "Bihari"; ! $language["bi"] = "Bislama"; ! $language["br"] = "Breton"; ! $language["bg"] = "Bulgarian"; ! $language["my"] = "Burmese"; ! $language["be"] = "Byelorussian"; ! $language["km"] = "Cambodian"; ! $language["ca"] = "Catalan"; ! $language["zh"] = "Chinese"; ! $language["co"] = "Corsican"; ! $language["hr"] = "Croatian"; ! $language["cs"] = "Czech"; ! $language["da"] = "Danish"; ! $language["nl"] = "Dutch"; ! $language["en"] = "English"; ! $language["eo"] = "Esperanto"; ! $language["et"] = "Estonian"; ! $language["fo"] = "Faeroese"; ! $language["fj"] = "Fiji"; ! $language["fi"] = "Finnish"; ! $language["fr"] = "French"; ! $language["fy"] = "Frisian"; ! $language["gl"] = "Galician"; ! $language["ka"] = "Georgian"; ! $language["de"] = "German"; ! $language["el"] = "Greek"; ! $language["kl"] = "Greenlandic"; ! $language["gn"] = "Guarani"; ! $language["gu"] = "Gujarati"; ! $language["ha"] = "Hausa"; ! $language["iw"] = "Hebrew"; ! $language["hi"] = "Hindi"; ! $language["hu"] = "Hungarian"; ! $language["is"] = "Icelandic"; ! $language["in"] = "Indonesian"; ! $language["ia"] = "Interlingua"; ! $language["ie"] = "Interlingue"; ! $language["ik"] = "Inupiak"; ! $language["ga"] = "Irish"; ! $language["it"] = "Italian"; ! $language["ja"] = "Japanese"; ! $language["jw"] = "Javanese"; ! $language["kn"] = "Kannada"; ! $language["ks"] = "Kashmiri"; ! $language["kk"] = "Kazakh"; ! $language["rw"] = "Kinyarwanda"; ! $language["ky"] = "Kirghiz"; ! $language["rn"] = "Kirundi"; ! $language["ko"] = "Korean"; ! $language["ku"] = "Kurdish"; ! $language["lo"] = "Laothian"; ! $language["la"] = "Latin"; ! $language["lv"] = "Latvian, Lettish"; ! $language["ln"] = "Lingala"; ! $language["lt"] = "Lithuanian"; ! $language["mk"] = "Macedonian"; ! $language["mg"] = "Malagasy"; ! $language["ms"] = "Malay"; ! $language["ml"] = "Malayalam"; ! $language["mt"] = "Maltese"; ! $language["mi"] = "Maori"; ! $language["mr"] = "Marathi"; ! $language["mo"] = "Moldavian"; ! $language["mn"] = "Mongolian"; ! $language["na"] = "Nauru"; ! $language["ne"] = "Nepali"; ! $language["no"] = "Norwegian"; ! $language["oc"] = "Occitan"; ! $language["or"] = "Oriya"; ! $language["ps"] = "Pashto, Pushto"; ! $language["fa"] = "Persian"; ! $language["pl"] = "Polish"; ! $language["pt"] = "Portuguese"; ! $language["pa"] = "Punjabi"; ! $language["qu"] = "Quechua"; ! $language["rm"] = "Rhaeto-Romance"; ! $language["ro"] = "Romanian"; ! $language["ru"] = "Russian"; ! $language["sm"] = "Samoan"; ! $language["sg"] = "Sangro"; ! $language["sa"] = "Sanskrit"; ! $language["gd"] = "Scots Gaelic"; ! $language["sr"] = "Serbian"; ! $language["sh"] = "Serbo-Croatian"; ! $language["st"] = "Sesotho"; ! $language["tn"] = "Setswana"; ! $language["sn"] = "Shona"; ! $language["sd"] = "Sindhi"; ! $language["si"] = "Singhalese"; ! $language["ss"] = "Siswati"; ! $language["sk"] = "Slovak"; ! $language["sl"] = "Slovenian"; ! $language["so"] = "Somali"; ! $language["es"] = "Spanish"; ! $language["su"] = "Sundanese"; ! $language["sw"] = "Swahili"; ! $language["sv"] = "Swedish"; ! $language["tl"] = "Tagalog"; ! $language["tg"] = "Tajik"; ! $language["ta"] = "Tamil"; ! $language["tt"] = "Tatar"; ! $language["te"] = "Tegulu"; ! $language["th"] = "Thai"; ! $language["bo"] = "Tibetan"; ! $language["ti"] = "Tigrinya"; ! $language["to"] = "Tonga"; ! $language["ts"] = "Tsonga"; ! $language["tr"] = "Turkish"; ! $language["tk"] = "Turkmen"; ! $language["tw"] = "Twi"; ! $language["uk"] = "Ukrainian"; ! $language["ur"] = "Urdu"; ! $language["uz"] = "Uzbek"; ! $language["vi"] = "Vietnamese"; ! $language["vo"] = "Volapuk"; ! $language["cy"] = "Welsh"; ! $language["wo"] = "Wolof"; ! $language["xh"] = "Xhosa"; ! $language["ji"] = "Yiddish"; ! $language["yo"] = "Yoruba"; ! $language["zu"] = "Zulu"; ! */ ! ! $select = '<select name="' . $select_name . '">'; ! while ( list( $key, $value ) = @each( $language ) ) ! { ! $selected = ( $key == $default ) ? ' selected="selected"' : ''; ! ! $select .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>'; ! } ! ! $select .= "</select>"; ! ! return $select; ! } ! ! function rating_select( $default, $select_name = "rating" ) ! { ! $rating["general"] = "general"; ! $rating["14 years"] = "14 years"; ! $rating["restricted"] = "restricted"; ! $rating["mature"] = "mature"; ! ! $select = '<select name="' . $select_name . '">'; ! while ( list( $key, $value ) = @each( $rating ) ) ! { ! $selected = ( $key == $default ) ? ' selected="selected"' : ''; ! ! $select .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>'; ! } ! ! $select .= "</select>"; ! ! return $select; ! } ! ! function robots_select( $default, $select_name = "index" ) ! { ! $robots["index"] = "Index"; ! $robots["noindex"] = "No index"; ! ! $select = '<select name="' . $select_name . '">'; ! while ( list( $key, $value ) = @each( $robots ) ) ! { ! $selected = ( $key == $default ) ? ' selected="selected"' : ''; ! ! $select .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>'; ! } ! ! $select .= "</select>"; ! ! return $select; ! } ! ! function follow_select( $default, $select_name = "follow" ) { ! $follow["follow"] = "Follow"; ! $follow["nofollow"] = "No follow"; $select = '<select name="' . $select_name . '">'; ! while ( list( $key, $value ) = @each( $follow ) ) { $selected = ( $key == $default ) ? ' selected="selected"' : ''; - $select .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>'; } ! ! $select .= "</select>"; return $select; } ! define( 'IN_PORTAL', 1 ); $mx_root_path = '../'; // Security and page header ! require( './pagestart.php' ); ! if ( isset( $HTTP_POST_VARS['submit'] ) ) { ! $title = $HTTP_POST_VARS[title] ; ! $author = $HTTP_POST_VARS[author] ; ! $copyright = $HTTP_POST_VARS[copyright] ; ! $keywords = $HTTP_POST_VARS[keywords] ; ! $description = $HTTP_POST_VARS[description] ; ! $langcode = $HTTP_POST_VARS[langcode] ; ! $rating = $HTTP_POST_VARS[rating] ; ! $index = $HTTP_POST_VARS[index] ; ! $follow = $HTTP_POST_VARS[follow] ; ! $pragma = $HTTP_POST_VARS[pragma]; ! $icon = $HTTP_POST_VARS[icon]; ! $header = $HTTP_POST_VARS[header]; $config_data = '<?php'; --- 22,70 ---- $no_page_header = true; ! if ( !empty($setmodules) ) { ! $module['Portal - System']['Meta Tag'] = 'admin/' . basename(__FILE__); return; } ! function generate_meta_select($default, $select_name) { ! global $lang; $select = '<select name="' . $select_name . '">'; ! foreach( $lang['mx_meta'][$select_name] as $key => $value ) { $selected = ( $key == $default ) ? ' selected="selected"' : ''; $select .= '<option value="' . $key . '"' . $selected . '>' . $value . '</option>'; } ! $select .= '</select>'; return $select; } ! define('IN_PORTAL', 1); $mx_root_path = '../'; // Security and page header ! require('./pagestart.php'); ! if ( $mx_request_vars->is_post('submit') ) { ! // MX_TYPE_NO_TAGS : Because this information is to be part of the HTML output (overall_header). ! // MX_TYPE_NO_STRIP: Because we need quoted slashes to dynamically build the mx_meta.inc as valid PHP code. ! ! $title = $mx_request_vars->post('title', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); ! $author = $mx_request_vars->post('author', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); ! $copyright = $mx_request_vars->post('copyright', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); ! $keywords = $mx_request_vars->post('keywords', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); ! $description = $mx_request_vars->post('description', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); ! $langcode = $mx_request_vars->post('langcode', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); ! $rating = $mx_request_vars->post('rating', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); ! $index = $mx_request_vars->post('index', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); ! $follow = $mx_request_vars->post('follow', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); ! $pragma = $mx_request_vars->post('pragma', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); ! $icon = $mx_request_vars->post('icon', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); ! $header = $mx_request_vars->post('header', (MX_TYPE_NO_TAGS | MX_TYPE_NO_STRIP), ''); $config_data = '<?php'; *************** *** 398,453 **** $config_data .= "\n" . ' $icon = "' . $icon . '";'; $config_data .= "\n" . ' $header = "' . $header . '";'; ! $config_data .= "\n" . '?>'; // Done this to prevent highlighting editors getting confused! ! // Write out the config file. ! @umask( 0111 ); ! $fp = @fopen( '../mx_meta.inc', 'w' ); ! $result = @fputs( $fp, $config_data, strlen( $config_data ) ); ! @fclose( $fp ); } include( '../mx_meta.inc' ); ! $template->set_filenames( array( "meta" => "admin/admin_mx_meta.tpl" ) ! ); ! ! $template->assign_vars( array( "S_CONFIG_ACTION" => append_sid( "admin_mx_meta.$phpEx" ), ! "L_CONFIGURATION_TITLE" => $lang['Meta_admin'], ! "L_CONFIGURATION_EXPLAIN" => $lang['Mega_admin_explain'], ! "L_SUBMIT" => $lang['Submit'], ! "L_RESET" => $lang['Reset'], ! "L_TITLE" => $lang['Meta_Title'], ! "L_AUTHOR" => $lang['Meta_Author'], ! "L_COPYRIGHT" => $lang['Meta_Copyright'], ! "L_KEYWORDS" => $lang['Meta_Keywords'], ! "L_KEYWORDS_EXPLAIN" => $lang['Meta_Keywords_explain'], ! "L_DESCRIPTION" => $lang['Meta_Description'], ! "L_LANGUAGE" => $lang['Meta_Language'], ! "L_RATING" => $lang['Meta_Rating'], ! "L_ROBOTS" => $lang['Meta_Robots'], ! "L_PRAGMA" => $lang['Meta_Pragma'], ! "L_BOOKMARK" => $lang['Meta_Bookmark_icon'], ! "L_BOOKMARK_EXPLAIN" => $lang['Meta_Bookmark_explain'], ! "L_HTITLE" => $lang['Meta_HTITLE'], ! ! "TITLE" => $title, ! "AUTHOR" => $author, ! "COPYRIGHT" => $copyright, ! "KEYWORDS" => $keywords, ! "DESCRIPTION" => $description, ! "LANGUAGE" => meta_language_select( $langcode ), ! "RATING" => rating_select( $rating ), ! "ROBOTS_INDEX" => robots_select( $index ), ! "ROBOTS_FOLLOW" => follow_select( $follow ), ! "ICON" => $icon, ! "HEADER" => $header, ! "PRAGMA" => ( $pragma == 1 ) ? "checked='checked'" : "" ! ) ); ! include_once( './page_header_admin.' . $phpEx ); ! $template->pparse( 'meta' ); ! include( './page_footer_admin.' . $phpEx ); ?> \ No newline at end of file --- 81,149 ---- $config_data .= "\n" . ' $icon = "' . $icon . '";'; $config_data .= "\n" . ' $header = "' . $header . '";'; ! $config_data .= "\n" . '?>'; // Done this to prevent highlighting editors getting confused! ! // Write out the config file. + + @umask(0111); + $fp = @fopen($mx_root_path . 'mx_meta.inc', 'w'); + // check if the file was writable + if ( !$fp ) + { + mx_message_die(GENERAL_ERROR, $lang['Meta_data_ioerror']); + } + $result = @fputs($fp, $config_data, strlen($config_data)); + @fclose($fp); + + // display a message that the meta file has been updated + $template->assign_vars(array( + 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid(PORTAL_URL . "admin/admin_mx_meta.$phpEx") . '">') + ); + $message = sprintf($lang['Meta_data_updated'], '<a href="' . append_sid(PORTAL_URL . "admin/admin_mx_meta.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid(PORTAL_URL . "admin/index.$phpEx?pane=right") . '">', '</a>'); ! mx_message_die(GENERAL_MESSAGE, $message); } include( '../mx_meta.inc' ); ! $template->set_filenames(array( ! 'meta' => 'admin/admin_mx_meta.tpl') ! ); ! $template->assign_vars(array( ! 'S_CONFIG_ACTION' => append_sid("admin_mx_meta.$phpEx"), ! 'L_CONFIGURATION_TITLE' => $lang['Meta_admin'], ! 'L_CONFIGURATION_EXPLAIN' => $lang['Mega_admin_explain'], ! 'L_SUBMIT' => $lang['Submit'], ! 'L_RESET' => $lang['Reset'], ! 'L_TITLE' => $lang['Meta_Title'], ! 'L_AUTHOR' => $lang['Meta_Author'], ! 'L_COPYRIGHT' => $lang['Meta_Copyright'], ! 'L_KEYWORDS' => $lang['Meta_Keywords'], ! 'L_KEYWORDS_EXPLAIN' => $lang['Meta_Keywords_explain'], ! 'L_DESCRIPTION' => $lang['Meta_Description'], ! 'L_LANGUAGE' => $lang['Meta_Language'], ! 'L_RATING' => $lang['Meta_Rating'], ! 'L_ROBOTS' => $lang['Meta_Robots'], ! 'L_PRAGMA' => $lang['Meta_Pragma'], ! 'L_BOOKMARK' => $lang['Meta_Bookmark_icon'], ! 'L_BOOKMARK_EXPLAIN' => $lang['Meta_Bookmark_explain'], ! 'L_HTITLE' => $lang['Meta_HTITLE'], ! 'TITLE' => $title, ! 'AUTHOR' => $author, ! 'COPYRIGHT' => $copyright, ! 'KEYWORDS' => $keywords, ! 'DESCRIPTION' => $description, ! 'LANGUAGE' => generate_meta_select($langcode, 'langcode'), ! 'RATING' => generate_meta_select($rating, 'rating'), ! 'ROBOTS_INDEX' => generate_meta_select($index, 'index'), ! 'ROBOTS_FOLLOW' => generate_meta_select($follow, 'follow'), ! 'ICON' => $icon, ! 'HEADER' => $header, ! 'PRAGMA' => ( $pragma == 1 ) ? ' checked="checked"' : '', ! )); ! include("./page_header_admin.$phpEx"); ! $template->pparse('meta'); ! include("./page_footer_admin.$phpEx"); ?> \ No newline at end of file |
|
From: Markus P. <mar...@us...> - 2005-04-04 00:19:23
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2442 Modified Files: lang_admin.php Log Message: Fixed $lang entries related to Meta tags administration. Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** lang_admin.php 4 Apr 2005 00:14:14 -0000 1.32 --- lang_admin.php 4 Apr 2005 00:18:55 -0000 1.33 *************** *** 116,121 **** $lang['Meta_Bookmark_explain'] = "(relative location)"; $lang['Meta_HTITLE'] = "Extra Header Settings"; ! $lang['Meta_data_updated'] = "Meta data file (mx_meta.inc) has been updated!"; ! $lang['Meta_data_ioerror'] = "Unable to open mx_meta.inc. Make sure the file is writable."; $lang['Create_block'] = "Create new Block"; $lang['Block_delete'] = "Delete a Block"; --- 116,121 ---- $lang['Meta_Bookmark_explain'] = "(relative location)"; $lang['Meta_HTITLE'] = "Extra Header Settings"; ! $lang['Meta_data_updated'] = "Meta data file (mx_meta.inc) has been updated!<br />Click %sHERE%s to return to Meta Tags Administration."; ! $lang['Meta_data_ioerror'] = "Unable to open mx_meta.inc. Make sure the file is writable (chmod 777)."; $lang['Create_block'] = "Create new Block"; $lang['Block_delete'] = "Delete a Block"; |
|
From: Markus P. <mar...@us...> - 2005-04-04 00:14:23
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1367 Modified Files: lang_admin.php Log Message: Added $lang['Meta_data_ioerror'] Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** lang_admin.php 4 Apr 2005 00:12:28 -0000 1.31 --- lang_admin.php 4 Apr 2005 00:14:14 -0000 1.32 *************** *** 117,120 **** --- 117,121 ---- $lang['Meta_HTITLE'] = "Extra Header Settings"; $lang['Meta_data_updated'] = "Meta data file (mx_meta.inc) has been updated!"; + $lang['Meta_data_ioerror'] = "Unable to open mx_meta.inc. Make sure the file is writable."; $lang['Create_block'] = "Create new Block"; $lang['Block_delete'] = "Delete a Block"; |
|
From: Markus P. <mar...@us...> - 2005-04-04 00:12:55
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv956 Modified Files: lang_admin.php Log Message: Added $lang['Meta_data_updated'] Index: lang_admin.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_admin.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** lang_admin.php 9 Mar 2005 13:36:47 -0000 1.30 --- lang_admin.php 4 Apr 2005 00:12:28 -0000 1.31 *************** *** 116,119 **** --- 116,120 ---- $lang['Meta_Bookmark_explain'] = "(relative location)"; $lang['Meta_HTITLE'] = "Extra Header Settings"; + $lang['Meta_data_updated'] = "Meta data file (mx_meta.inc) has been updated!"; $lang['Create_block'] = "Create new Block"; $lang['Block_delete'] = "Delete a Block"; |
|
From: Markus P. <mar...@us...> - 2005-04-04 00:00:32
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30564 Modified Files: lang_meta.php Log Message: Added second level entries to META lang definitions. Index: lang_meta.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_meta.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lang_meta.php 3 Apr 2005 23:14:35 -0000 1.1 --- lang_meta.php 4 Apr 2005 00:00:19 -0000 1.2 *************** *** 17,23 **** // ! // Language codes are based on the ISO-639 standard as pointed ! // by RFC3066 - Tags for the Identification of Languages, which is ! // referenced by the HTML 4.01 Specification. // // More information can be found here: --- 17,23 ---- // ! // First level of all language codes are based on the ISO-639 standard ! // as pointed by the RFC3066 "Tags for the Identification of Languages", ! // which is referenced by the HTML 4.01 Specification. // // More information can be found here: *************** *** 26,211 **** // http://www.loc.gov/standards/iso639-2/langhome.html // ! $lang['mx_meta']['langcode']['ab'] = "Abkhazian"; ! $lang['mx_meta']['langcode']['aa'] = "Afar"; ! $lang['mx_meta']['langcode']['af'] = "Afrikaans"; ! $lang['mx_meta']['langcode']['ak'] = "Akan"; ! $lang['mx_meta']['langcode']['sq'] = "Albanian"; ! $lang['mx_meta']['langcode']['am'] = "Amharic"; ! $lang['mx_meta']['langcode']['ar'] = "Arabic"; ! $lang['mx_meta']['langcode']['an'] = "Aragonese"; ! $lang['mx_meta']['langcode']['hy'] = "Armenian"; ! $lang['mx_meta']['langcode']['as'] = "Assamese"; ! $lang['mx_meta']['langcode']['av'] = "Avaric"; ! $lang['mx_meta']['langcode']['ae'] = "Avestan"; ! $lang['mx_meta']['langcode']['ay'] = "Aymara"; ! $lang['mx_meta']['langcode']['az'] = "Azerbaijani"; ! $lang['mx_meta']['langcode']['bm'] = "Bambara"; ! $lang['mx_meta']['langcode']['ba'] = "Bashkir"; ! $lang['mx_meta']['langcode']['eu'] = "Basque"; ! $lang['mx_meta']['langcode']['be'] = "Belarusian"; ! $lang['mx_meta']['langcode']['bn'] = "Bengali"; ! $lang['mx_meta']['langcode']['bh'] = "Bihari"; ! $lang['mx_meta']['langcode']['bi'] = "Bislama"; ! $lang['mx_meta']['langcode']['bs'] = "Bosnian"; ! $lang['mx_meta']['langcode']['br'] = "Breton"; ! $lang['mx_meta']['langcode']['bg'] = "Bulgarian"; ! $lang['mx_meta']['langcode']['my'] = "Burmese"; ! $lang['mx_meta']['langcode']['ca'] = "Catalan"; ! $lang['mx_meta']['langcode']['ch'] = "Chamorro"; ! $lang['mx_meta']['langcode']['ce'] = "Chechen"; ! $lang['mx_meta']['langcode']['zh'] = "Chinese"; ! $lang['mx_meta']['langcode']['cu'] = "Church Slavonic"; ! $lang['mx_meta']['langcode']['cv'] = "Chuvash"; ! $lang['mx_meta']['langcode']['kw'] = "Cornish"; ! $lang['mx_meta']['langcode']['co'] = "Corsican"; ! $lang['mx_meta']['langcode']['cr'] = "Cree"; ! $lang['mx_meta']['langcode']['hr'] = "Croatian"; ! $lang['mx_meta']['langcode']['cs'] = "Czech"; ! $lang['mx_meta']['langcode']['da'] = "Danish"; ! $lang['mx_meta']['langcode']['dv'] = "Divehi"; ! $lang['mx_meta']['langcode']['nl'] = "Dutch"; ! $lang['mx_meta']['langcode']['dz'] = "Dzongkha"; ! $lang['mx_meta']['langcode']['en'] = "English"; ! $lang['mx_meta']['langcode']['eo'] = "Esperanto"; ! $lang['mx_meta']['langcode']['et'] = "Estonian"; ! $lang['mx_meta']['langcode']['ee'] = "Ewe"; ! $lang['mx_meta']['langcode']['fo'] = "Faroese"; ! $lang['mx_meta']['langcode']['fj'] = "Fijian"; ! $lang['mx_meta']['langcode']['fi'] = "Finnish"; ! $lang['mx_meta']['langcode']['fr'] = "French"; ! $lang['mx_meta']['langcode']['fy'] = "Frisian"; ! $lang['mx_meta']['langcode']['ff'] = "Fulah"; ! $lang['mx_meta']['langcode']['gl'] = "Gallegan"; ! $lang['mx_meta']['langcode']['lg'] = "Ganda"; ! $lang['mx_meta']['langcode']['ka'] = "Georgian"; ! $lang['mx_meta']['langcode']['de'] = "German"; ! $lang['mx_meta']['langcode']['gn'] = "Guarani"; ! $lang['mx_meta']['langcode']['gu'] = "Gujarati"; ! $lang['mx_meta']['langcode']['ht'] = "Haitian"; ! $lang['mx_meta']['langcode']['ha'] = "Hausa"; ! $lang['mx_meta']['langcode']['he'] = "Hebrew"; ! $lang['mx_meta']['langcode']['hz'] = "Herero"; ! $lang['mx_meta']['langcode']['hi'] = "Hindi"; ! $lang['mx_meta']['langcode']['ho'] = "Hiri Motu"; ! $lang['mx_meta']['langcode']['hu'] = "Hungarian"; ! $lang['mx_meta']['langcode']['is'] = "Icelandic"; ! $lang['mx_meta']['langcode']['io'] = "Ido"; ! $lang['mx_meta']['langcode']['ig'] = "Igbo"; ! $lang['mx_meta']['langcode']['id'] = "Indonesian"; ! $lang['mx_meta']['langcode']['ie'] = "Interlingue"; ! $lang['mx_meta']['langcode']['iu'] = "Inuktitut"; ! $lang['mx_meta']['langcode']['ik'] = "Inupiaq"; ! $lang['mx_meta']['langcode']['ga'] = "Irish"; ! $lang['mx_meta']['langcode']['it'] = "Italian"; ! $lang['mx_meta']['langcode']['ja'] = "Japanese"; ! $lang['mx_meta']['langcode']['jv'] = "Javanese"; ! $lang['mx_meta']['langcode']['kl'] = "Kalaallisut"; ! $lang['mx_meta']['langcode']['kn'] = "Kannada"; ! $lang['mx_meta']['langcode']['kr'] = "Kanuri"; ! $lang['mx_meta']['langcode']['ks'] = "Kashmiri"; ! $lang['mx_meta']['langcode']['kk'] = "Kazakh"; ! $lang['mx_meta']['langcode']['km'] = "Khmer"; ! $lang['mx_meta']['langcode']['ki'] = "Kikuyu"; ! $lang['mx_meta']['langcode']['rw'] = "Kinyarwanda"; ! $lang['mx_meta']['langcode']['ky'] = "Kirghiz"; ! $lang['mx_meta']['langcode']['kv'] = "Komi"; ! $lang['mx_meta']['langcode']['kg'] = "Kongo"; ! $lang['mx_meta']['langcode']['ko'] = "Korean"; ! $lang['mx_meta']['langcode']['ku'] = "Kurdish"; ! $lang['mx_meta']['langcode']['kj'] = "Kwanyama"; ! $lang['mx_meta']['langcode']['lo'] = "Lao"; ! $lang['mx_meta']['langcode']['la'] = "Latin"; ! $lang['mx_meta']['langcode']['lv'] = "Latvian"; ! $lang['mx_meta']['langcode']['li'] = "Limburgish"; ! $lang['mx_meta']['langcode']['ln'] = "Lingala"; ! $lang['mx_meta']['langcode']['lt'] = "Lithuanian"; ! $lang['mx_meta']['langcode']['lu'] = "Luba-Katanga"; ! $lang['mx_meta']['langcode']['lb'] = "Luxembourgish"; ! $lang['mx_meta']['langcode']['mk'] = "Macedonian"; ! $lang['mx_meta']['langcode']['mg'] = "Malagasy"; ! $lang['mx_meta']['langcode']['ms'] = "Malay"; ! $lang['mx_meta']['langcode']['ml'] = "Malayalam"; ! $lang['mx_meta']['langcode']['mt'] = "Maltese"; ! $lang['mx_meta']['langcode']['gv'] = "Manx"; ! $lang['mx_meta']['langcode']['mi'] = "Maori"; ! $lang['mx_meta']['langcode']['mr'] = "Marathi"; ! $lang['mx_meta']['langcode']['mh'] = "Marshallese"; ! $lang['mx_meta']['langcode']['el'] = "Modern Greek"; ! $lang['mx_meta']['langcode']['mo'] = "Moldavian"; ! $lang['mx_meta']['langcode']['mn'] = "Mongolian"; ! $lang['mx_meta']['langcode']['na'] = "Nauru"; ! $lang['mx_meta']['langcode']['nv'] = "Navajo"; ! $lang['mx_meta']['langcode']['nd'] = "Ndebele, North"; ! $lang['mx_meta']['langcode']['ng'] = "Ndonga"; ! $lang['mx_meta']['langcode']['ne'] = "Nepali"; ! $lang['mx_meta']['langcode']['nb'] = "Norwegian"; ! $lang['mx_meta']['langcode']['nn'] = "Norwegian Nynorsk"; ! $lang['mx_meta']['langcode']['ny'] = "Nyanja"; ! $lang['mx_meta']['langcode']['oc'] = "Occitan"; ! $lang['mx_meta']['langcode']['oj'] = "Ojibwa"; ! $lang['mx_meta']['langcode']['or'] = "Oriya"; ! $lang['mx_meta']['langcode']['om'] = "Oromo"; ! $lang['mx_meta']['langcode']['os'] = "Ossetian"; ! $lang['mx_meta']['langcode']['pi'] = "Pali"; ! $lang['mx_meta']['langcode']['pa'] = "Panjabi"; ! $lang['mx_meta']['langcode']['fa'] = "Persian"; ! $lang['mx_meta']['langcode']['pl'] = "Polish"; ! $lang['mx_meta']['langcode']['pt'] = "Portuguese"; ! $lang['mx_meta']['langcode']['ps'] = "Pushto"; ! $lang['mx_meta']['langcode']['qu'] = "Quechua"; ! $lang['mx_meta']['langcode']['rm'] = "Raeto-Romance"; ! $lang['mx_meta']['langcode']['ro'] = "Romanian"; ! $lang['mx_meta']['langcode']['rn'] = "Rundi"; ! $lang['mx_meta']['langcode']['ru'] = "Russian"; ! $lang['mx_meta']['langcode']['sm'] = "Samoan"; ! $lang['mx_meta']['langcode']['sg'] = "Sango"; ! $lang['mx_meta']['langcode']['sa'] = "Sanskrit"; ! $lang['mx_meta']['langcode']['sc'] = "Sardinian"; ! $lang['mx_meta']['langcode']['gd'] = "Scottish Gaelic"; ! $lang['mx_meta']['langcode']['sr'] = "Serbian"; ! $lang['mx_meta']['langcode']['sn'] = "Shona"; ! $lang['mx_meta']['langcode']['ii'] = "Sichuan Yi"; ! $lang['mx_meta']['langcode']['sd'] = "Sindhi"; ! $lang['mx_meta']['langcode']['si'] = "Sinhalese"; ! $lang['mx_meta']['langcode']['sk'] = "Slovak"; ! $lang['mx_meta']['langcode']['sl'] = "Slovenian"; ! $lang['mx_meta']['langcode']['so'] = "Somali"; ! $lang['mx_meta']['langcode']['st'] = "Sotho"; ! $lang['mx_meta']['langcode']['nr'] = "South Ndebele"; ! $lang['mx_meta']['langcode']['es'] = "Spanish"; ! $lang['mx_meta']['langcode']['su'] = "Sundanese"; ! $lang['mx_meta']['langcode']['sw'] = "Swahili"; ! $lang['mx_meta']['langcode']['ss'] = "Swati"; ! $lang['mx_meta']['langcode']['sv'] = "Swedish"; ! $lang['mx_meta']['langcode']['tl'] = "Tagalog"; ! $lang['mx_meta']['langcode']['ty'] = "Tahitian"; ! $lang['mx_meta']['langcode']['tg'] = "Tajik"; ! $lang['mx_meta']['langcode']['ta'] = "Tamil"; ! $lang['mx_meta']['langcode']['tt'] = "Tatar"; ! $lang['mx_meta']['langcode']['te'] = "Telugu"; ! $lang['mx_meta']['langcode']['th'] = "Thai"; ! $lang['mx_meta']['langcode']['bo'] = "Tibetan"; ! $lang['mx_meta']['langcode']['ti'] = "Tigrinya"; ! $lang['mx_meta']['langcode']['to'] = "Tonga"; ! $lang['mx_meta']['langcode']['ts'] = "Tsonga"; ! $lang['mx_meta']['langcode']['tn'] = "Tswana"; ! $lang['mx_meta']['langcode']['tr'] = "Turkish"; ! $lang['mx_meta']['langcode']['tk'] = "Turkmen"; ! $lang['mx_meta']['langcode']['tw'] = "Twi"; ! $lang['mx_meta']['langcode']['uk'] = "Ukrainian"; ! $lang['mx_meta']['langcode']['ur'] = "Urdu"; ! $lang['mx_meta']['langcode']['ug'] = "Uyghur"; ! $lang['mx_meta']['langcode']['uz'] = "Uzbek"; ! $lang['mx_meta']['langcode']['ve'] = "Venda"; ! $lang['mx_meta']['langcode']['vi'] = "Vietnamese"; ! $lang['mx_meta']['langcode']['vo'] = "Volapük"; ! $lang['mx_meta']['langcode']['wa'] = "Walloon"; ! $lang['mx_meta']['langcode']['cy'] = "Welsh"; ! $lang['mx_meta']['langcode']['wo'] = "Wolof"; ! $lang['mx_meta']['langcode']['xh'] = "Xhosa"; ! $lang['mx_meta']['langcode']['yi'] = "Yiddish"; ! $lang['mx_meta']['langcode']['yo'] = "Yoruba"; ! $lang['mx_meta']['langcode']['za'] = "Zhuang"; ! $lang['mx_meta']['langcode']['zu'] = "Zulu"; --- 26,273 ---- // http://www.loc.gov/standards/iso639-2/langhome.html // ! // Note: There might be some mistakes in second level codes. ! // Apologies in advance for any mistake here. Feel free to contact ! // us if you believe anything must be changed here. Thanks ! // ! $lang['mx_meta']['langcode']['ab'] = "Abkhazian"; ! $lang['mx_meta']['langcode']['aa'] = "Afar"; ! $lang['mx_meta']['langcode']['af'] = "Afrikaans"; ! $lang['mx_meta']['langcode']['ak'] = "Akan"; ! $lang['mx_meta']['langcode']['sq'] = "Albanian"; ! $lang['mx_meta']['langcode']['am'] = "Amharic"; ! $lang['mx_meta']['langcode']['ar'] = "Arabic"; ! $lang['mx_meta']['langcode']['ar-ae'] = "Arabic (Arab Emirates)"; ! $lang['mx_meta']['langcode']['ar-bh'] = "Arabic (Bahrein)"; ! $lang['mx_meta']['langcode']['ar-eg'] = "Arabic (Egypt)"; ! $lang['mx_meta']['langcode']['ar-iq'] = "Arabic (Iraq)"; ! $lang['mx_meta']['langcode']['ar-jo'] = "Arabic (Jordania)"; ! $lang['mx_meta']['langcode']['ar-kw'] = "Arabic (Kuwait)"; ! $lang['mx_meta']['langcode']['ar-lb'] = "Arabic (Libanon)"; ! $lang['mx_meta']['langcode']['ar-ly'] = "Arabic (Lybia)"; ! $lang['mx_meta']['langcode']['ar-ma'] = "Arabic (Morocco)"; ! $lang['mx_meta']['langcode']['ar-om'] = "Arabic (Oman)"; ! $lang['mx_meta']['langcode']['ar-qa'] = "Arabic (Qtar)"; ! $lang['mx_meta']['langcode']['ar-sa'] = "Arabic (Saudi Arabia)"; ! $lang['mx_meta']['langcode']['ar-sy'] = "Arabic (Syria)"; ! $lang['mx_meta']['langcode']['ar-tn'] = "Arabic (Tunisia)"; ! $lang['mx_meta']['langcode']['ar-ye'] = "Arabic (Yemen)"; ! $lang['mx_meta']['langcode']['an'] = "Aragonese"; ! $lang['mx_meta']['langcode']['hy'] = "Armenian"; ! $lang['mx_meta']['langcode']['as'] = "Assamese"; ! $lang['mx_meta']['langcode']['av'] = "Avaric"; ! $lang['mx_meta']['langcode']['ae'] = "Avestan"; ! $lang['mx_meta']['langcode']['ay'] = "Aymara"; ! $lang['mx_meta']['langcode']['az'] = "Azerbaijani"; ! $lang['mx_meta']['langcode']['bm'] = "Bambara"; ! $lang['mx_meta']['langcode']['ba'] = "Bashkir"; ! $lang['mx_meta']['langcode']['eu'] = "Basque"; ! $lang['mx_meta']['langcode']['be'] = "Belarusian"; ! $lang['mx_meta']['langcode']['bn'] = "Bengali"; ! $lang['mx_meta']['langcode']['bh'] = "Bihari"; ! $lang['mx_meta']['langcode']['bi'] = "Bislama"; ! $lang['mx_meta']['langcode']['bs'] = "Bosnian"; ! $lang['mx_meta']['langcode']['br'] = "Breton"; ! $lang['mx_meta']['langcode']['bg'] = "Bulgarian"; ! $lang['mx_meta']['langcode']['my'] = "Burmese"; ! $lang['mx_meta']['langcode']['ca'] = "Catalan"; ! $lang['mx_meta']['langcode']['ch'] = "Chamorro"; ! $lang['mx_meta']['langcode']['ce'] = "Chechen"; ! $lang['mx_meta']['langcode']['zh'] = "Chinese"; ! $lang['mx_meta']['langcode']['zh-hk'] = "Chinese (Hong-Kong)"; ! $lang['mx_meta']['langcode']['zh-cn'] = "Chinese (PRC)"; ! $lang['mx_meta']['langcode']['zh-sg'] = "Chinese (Singapour)"; ! $lang['mx_meta']['langcode']['zh-tw'] = "Chinese (Taiwan)"; ! $lang['mx_meta']['langcode']['cu'] = "Church Slavonic"; ! $lang['mx_meta']['langcode']['cv'] = "Chuvash"; ! $lang['mx_meta']['langcode']['kw'] = "Cornish"; ! $lang['mx_meta']['langcode']['co'] = "Corsican"; ! $lang['mx_meta']['langcode']['cr'] = "Cree"; ! $lang['mx_meta']['langcode']['hr'] = "Croatian"; ! $lang['mx_meta']['langcode']['cs'] = "Czech"; ! $lang['mx_meta']['langcode']['da'] = "Danish"; ! $lang['mx_meta']['langcode']['dv'] = "Divehi"; ! $lang['mx_meta']['langcode']['nl'] = "Dutch"; ! $lang['mx_meta']['langcode']['nl-be'] = "Dutch (Belgian)"; ! $lang['mx_meta']['langcode']['dz'] = "Dzongkha"; ! $lang['mx_meta']['langcode']['en'] = "English"; ! $lang['mx_meta']['langcode']['en-au'] = "English (Australia)"; ! $lang['mx_meta']['langcode']['en-bz'] = "English (Belize)"; ! $lang['mx_meta']['langcode']['en-ca'] = "English (Canada)"; ! $lang['mx_meta']['langcode']['en-ie'] = "English (Ireland)"; ! $lang['mx_meta']['langcode']['en-jm'] = "English (Jamaican)"; ! $lang['mx_meta']['langcode']['en-gb'] = "English (Great Britain)"; ! $lang['mx_meta']['langcode']['en-nz'] = "English (New Zeland)"; ! $lang['mx_meta']['langcode']['en-za'] = "English (South Africa)"; ! $lang['mx_meta']['langcode']['eo'] = "Esperanto"; ! $lang['mx_meta']['langcode']['et'] = "Estonian"; ! $lang['mx_meta']['langcode']['ee'] = "Ewe"; ! $lang['mx_meta']['langcode']['fo'] = "Faroese"; ! $lang['mx_meta']['langcode']['fj'] = "Fijian"; ! $lang['mx_meta']['langcode']['fi'] = "Finnish"; ! $lang['mx_meta']['langcode']['fr'] = "French"; ! $lang['mx_meta']['langcode']['fr-be'] = "French (Belgian)"; ! $lang['mx_meta']['langcode']['fr-ca'] = "French (Canada)"; ! $lang['mx_meta']['langcode']['fr-lu'] = "French (Luxembourg)"; ! $lang['mx_meta']['langcode']['fr-ch'] = "French (Switzerland)"; ! $lang['mx_meta']['langcode']['fy'] = "Frisian"; ! $lang['mx_meta']['langcode']['ff'] = "Fulah"; ! $lang['mx_meta']['langcode']['gl'] = "Gallegan"; ! $lang['mx_meta']['langcode']['lg'] = "Ganda"; ! $lang['mx_meta']['langcode']['ka'] = "Georgian"; ! $lang['mx_meta']['langcode']['de'] = "German"; ! $lang['mx_meta']['langcode']['de-li'] = "German (Liechtenstein)"; ! $lang['mx_meta']['langcode']['de-lu'] = "German (Luxembourg)"; ! $lang['mx_meta']['langcode']['de-ch'] = "German (Switzerland)"; ! $lang['mx_meta']['langcode']['gn'] = "Guarani"; ! $lang['mx_meta']['langcode']['gu'] = "Gujarati"; ! $lang['mx_meta']['langcode']['ht'] = "Haitian"; ! $lang['mx_meta']['langcode']['ha'] = "Hausa"; ! $lang['mx_meta']['langcode']['he'] = "Hebrew"; ! $lang['mx_meta']['langcode']['hz'] = "Herero"; ! $lang['mx_meta']['langcode']['hi'] = "Hindi"; ! $lang['mx_meta']['langcode']['ho'] = "Hiri Motu"; ! $lang['mx_meta']['langcode']['hu'] = "Hungarian"; ! $lang['mx_meta']['langcode']['is'] = "Icelandic"; ! $lang['mx_meta']['langcode']['io'] = "Ido"; ! $lang['mx_meta']['langcode']['ig'] = "Igbo"; ! $lang['mx_meta']['langcode']['id'] = "Indonesian"; ! $lang['mx_meta']['langcode']['ie'] = "Interlingue"; ! $lang['mx_meta']['langcode']['iu'] = "Inuktitut"; ! $lang['mx_meta']['langcode']['ik'] = "Inupiaq"; ! $lang['mx_meta']['langcode']['ga'] = "Irish"; ! $lang['mx_meta']['langcode']['it'] = "Italian"; ! $lang['mx_meta']['langcode']['it-ch'] = "Italian (Switzerland)"; ! $lang['mx_meta']['langcode']['ja'] = "Japanese"; ! $lang['mx_meta']['langcode']['jv'] = "Javanese"; ! $lang['mx_meta']['langcode']['kl'] = "Kalaallisut"; ! $lang['mx_meta']['langcode']['kn'] = "Kannada"; ! $lang['mx_meta']['langcode']['kr'] = "Kanuri"; ! $lang['mx_meta']['langcode']['ks'] = "Kashmiri"; ! $lang['mx_meta']['langcode']['kk'] = "Kazakh"; ! $lang['mx_meta']['langcode']['km'] = "Khmer"; ! $lang['mx_meta']['langcode']['ki'] = "Kikuyu"; ! $lang['mx_meta']['langcode']['rw'] = "Kinyarwanda"; ! $lang['mx_meta']['langcode']['ky'] = "Kirghiz"; ! $lang['mx_meta']['langcode']['kv'] = "Komi"; ! $lang['mx_meta']['langcode']['kg'] = "Kongo"; ! $lang['mx_meta']['langcode']['ko'] = "Korean"; ! $lang['mx_meta']['langcode']['ku'] = "Kurdish"; ! $lang['mx_meta']['langcode']['kj'] = "Kwanyama"; ! $lang['mx_meta']['langcode']['lo'] = "Lao"; ! $lang['mx_meta']['langcode']['la'] = "Latin"; ! $lang['mx_meta']['langcode']['lv'] = "Latvian"; ! $lang['mx_meta']['langcode']['li'] = "Limburgish"; ! $lang['mx_meta']['langcode']['ln'] = "Lingala"; ! $lang['mx_meta']['langcode']['lt'] = "Lithuanian"; ! $lang['mx_meta']['langcode']['lu'] = "Luba-Katanga"; ! $lang['mx_meta']['langcode']['lb'] = "Luxembourgish"; ! $lang['mx_meta']['langcode']['mk'] = "Macedonian"; ! $lang['mx_meta']['langcode']['mg'] = "Malagasy"; ! $lang['mx_meta']['langcode']['ms'] = "Malay"; ! $lang['mx_meta']['langcode']['ml'] = "Malayalam"; ! $lang['mx_meta']['langcode']['mt'] = "Maltese"; ! $lang['mx_meta']['langcode']['gv'] = "Manx"; ! $lang['mx_meta']['langcode']['mi'] = "Maori"; ! $lang['mx_meta']['langcode']['mr'] = "Marathi"; ! $lang['mx_meta']['langcode']['mh'] = "Marshallese"; ! $lang['mx_meta']['langcode']['el'] = "Modern Greek"; ! $lang['mx_meta']['langcode']['mo'] = "Moldavian"; ! $lang['mx_meta']['langcode']['mn'] = "Mongolian"; ! $lang['mx_meta']['langcode']['na'] = "Nauru"; ! $lang['mx_meta']['langcode']['nv'] = "Navajo"; ! $lang['mx_meta']['langcode']['nd'] = "Ndebele, North"; ! $lang['mx_meta']['langcode']['ng'] = "Ndonga"; ! $lang['mx_meta']['langcode']['ne'] = "Nepali"; ! $lang['mx_meta']['langcode']['nb'] = "Norwegian"; ! $lang['mx_meta']['langcode']['nn'] = "Norwegian Nynorsk"; ! $lang['mx_meta']['langcode']['ny'] = "Nyanja"; ! $lang['mx_meta']['langcode']['oc'] = "Occitan"; ! $lang['mx_meta']['langcode']['oj'] = "Ojibwa"; ! $lang['mx_meta']['langcode']['or'] = "Oriya"; ! $lang['mx_meta']['langcode']['om'] = "Oromo"; ! $lang['mx_meta']['langcode']['os'] = "Ossetian"; ! $lang['mx_meta']['langcode']['pi'] = "Pali"; ! $lang['mx_meta']['langcode']['pa'] = "Panjabi"; ! $lang['mx_meta']['langcode']['fa'] = "Persian"; ! $lang['mx_meta']['langcode']['pl'] = "Polish"; ! $lang['mx_meta']['langcode']['pt'] = "Portuguese"; ! $lang['mx_meta']['langcode']['pt-br'] = "Portuguese (Brazil)"; ! $lang['mx_meta']['langcode']['ps'] = "Pushto"; ! $lang['mx_meta']['langcode']['qu'] = "Quechua"; ! $lang['mx_meta']['langcode']['rm'] = "Raeto-Romance"; ! $lang['mx_meta']['langcode']['ro'] = "Romanian"; ! $lang['mx_meta']['langcode']['ro-mo'] = "Romanian (Moldavia)"; ! $lang['mx_meta']['langcode']['rn'] = "Rundi"; ! $lang['mx_meta']['langcode']['ru'] = "Russian"; ! $lang['mx_meta']['langcode']['ru-mo'] = "Russian (Moldavia)"; ! $lang['mx_meta']['langcode']['sm'] = "Samoan"; ! $lang['mx_meta']['langcode']['sg'] = "Sango"; ! $lang['mx_meta']['langcode']['sa'] = "Sanskrit"; ! $lang['mx_meta']['langcode']['sc'] = "Sardinian"; ! $lang['mx_meta']['langcode']['gd'] = "Scottish Gaelic"; ! $lang['mx_meta']['langcode']['sr'] = "Serbian"; ! $lang['mx_meta']['langcode']['sn'] = "Shona"; ! $lang['mx_meta']['langcode']['ii'] = "Sichuan Yi"; ! $lang['mx_meta']['langcode']['sd'] = "Sindhi"; ! $lang['mx_meta']['langcode']['si'] = "Sinhalese"; ! $lang['mx_meta']['langcode']['sk'] = "Slovak"; ! $lang['mx_meta']['langcode']['sl'] = "Slovenian"; ! $lang['mx_meta']['langcode']['so'] = "Somali"; ! $lang['mx_meta']['langcode']['st'] = "Sotho"; ! $lang['mx_meta']['langcode']['nr'] = "South Ndebele"; ! $lang['mx_meta']['langcode']['es'] = "Spanish"; ! $lang['mx_meta']['langcode']['es-ar'] = "Spanish (Argentina)"; ! $lang['mx_meta']['langcode']['es-bo'] = "Spanish (Bolivia)"; ! $lang['mx_meta']['langcode']['es-cl'] = "Spanish (Chile)"; ! $lang['mx_meta']['langcode']['es-co'] = "Spanish (Colombia)"; ! $lang['mx_meta']['langcode']['es-cr'] = "Spanish (Costa Rica)"; ! $lang['mx_meta']['langcode']['es-sv'] = "Spanish (El Salvador)"; ! $lang['mx_meta']['langcode']['es-ec'] = "Spanish (Ecuador)"; ! $lang['mx_meta']['langcode']['es-gt'] = "Spanish (Guatemala)"; ! $lang['mx_meta']['langcode']['es-hn'] = "Spanish (Honduras)"; ! $lang['mx_meta']['langcode']['es-mx'] = "Spanish (Mexico)"; ! $lang['mx_meta']['langcode']['es-ni'] = "Spanish (Nicaragua)"; ! $lang['mx_meta']['langcode']['es-pa'] = "Spanish (Panama)"; ! $lang['mx_meta']['langcode']['es-py'] = "Spanish (Paraguay)"; ! $lang['mx_meta']['langcode']['es-pr'] = "Spanish (Puerto Rico)"; ! $lang['mx_meta']['langcode']['es-pe'] = "Spanish (Peru)"; ! $lang['mx_meta']['langcode']['es-tt'] = "Spanish (Trinidad)"; ! $lang['mx_meta']['langcode']['es-uy'] = "Spanish (Uruguay)"; ! $lang['mx_meta']['langcode']['es-ve'] = "Spanish (Venezuela)"; ! $lang['mx_meta']['langcode']['su'] = "Sundanese"; ! $lang['mx_meta']['langcode']['sw'] = "Swahili"; ! $lang['mx_meta']['langcode']['ss'] = "Swati"; ! $lang['mx_meta']['langcode']['sv'] = "Swedish"; ! $lang['mx_meta']['langcode']['sv-fi'] = "Swedish (Finland)"; ! $lang['mx_meta']['langcode']['tl'] = "Tagalog"; ! $lang['mx_meta']['langcode']['ty'] = "Tahitian"; ! $lang['mx_meta']['langcode']['tg'] = "Tajik"; ! $lang['mx_meta']['langcode']['ta'] = "Tamil"; ! $lang['mx_meta']['langcode']['tt'] = "Tatar"; ! $lang['mx_meta']['langcode']['te'] = "Telugu"; ! $lang['mx_meta']['langcode']['th'] = "Thai"; ! $lang['mx_meta']['langcode']['bo'] = "Tibetan"; ! $lang['mx_meta']['langcode']['ti'] = "Tigrinya"; ! $lang['mx_meta']['langcode']['to'] = "Tonga"; ! $lang['mx_meta']['langcode']['ts'] = "Tsonga"; ! $lang['mx_meta']['langcode']['tn'] = "Tswana"; ! $lang['mx_meta']['langcode']['tr'] = "Turkish"; ! $lang['mx_meta']['langcode']['tk'] = "Turkmen"; ! $lang['mx_meta']['langcode']['tw'] = "Twi"; ! $lang['mx_meta']['langcode']['uk'] = "Ukrainian"; ! $lang['mx_meta']['langcode']['ur'] = "Urdu"; ! $lang['mx_meta']['langcode']['ug'] = "Uyghur"; ! $lang['mx_meta']['langcode']['uz'] = "Uzbek"; ! $lang['mx_meta']['langcode']['ve'] = "Venda"; ! $lang['mx_meta']['langcode']['vi'] = "Vietnamese"; ! $lang['mx_meta']['langcode']['vo'] = "Volapük"; ! $lang['mx_meta']['langcode']['wa'] = "Walloon"; ! $lang['mx_meta']['langcode']['cy'] = "Welsh"; ! $lang['mx_meta']['langcode']['wo'] = "Wolof"; ! $lang['mx_meta']['langcode']['xh'] = "Xhosa"; ! $lang['mx_meta']['langcode']['yi'] = "Yiddish"; ! $lang['mx_meta']['langcode']['yo'] = "Yoruba"; ! $lang['mx_meta']['langcode']['za'] = "Zhuang"; ! $lang['mx_meta']['langcode']['zu'] = "Zulu"; |
|
From: Markus P. <mar...@us...> - 2005-04-03 23:15:07
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17801 Added Files: lang_meta.php Log Message: Added new lang_meta.php script with all META tags related entries. --- NEW FILE: lang_meta.php --- <?php /*************************************************************************** * lang_meta.php [English] * ------------------- * copyright : (C) 2003-2005 mxBB Portal * email : su...@mx... * * $Id: lang_meta.php,v 1.1 2005/04/03 23:14:35 markus_petrux Exp $ * * Rev. hist : * ****************************************************************************/ // // This file contains lang entries related to META tags. // // // Language codes are based on the ISO-639 standard as pointed // by RFC3066 - Tags for the Identification of Languages, which is // referenced by the HTML 4.01 Specification. // // More information can be found here: // http://www.w3.org/TR/html401/struct/dirlang.html#h-8.1.1 // ftp://ftp.rfc-editor.org/in-notes/rfc3066.txt // http://www.loc.gov/standards/iso639-2/langhome.html // $lang['mx_meta']['langcode']['ab'] = "Abkhazian"; $lang['mx_meta']['langcode']['aa'] = "Afar"; $lang['mx_meta']['langcode']['af'] = "Afrikaans"; $lang['mx_meta']['langcode']['ak'] = "Akan"; $lang['mx_meta']['langcode']['sq'] = "Albanian"; $lang['mx_meta']['langcode']['am'] = "Amharic"; $lang['mx_meta']['langcode']['ar'] = "Arabic"; $lang['mx_meta']['langcode']['an'] = "Aragonese"; $lang['mx_meta']['langcode']['hy'] = "Armenian"; $lang['mx_meta']['langcode']['as'] = "Assamese"; $lang['mx_meta']['langcode']['av'] = "Avaric"; $lang['mx_meta']['langcode']['ae'] = "Avestan"; $lang['mx_meta']['langcode']['ay'] = "Aymara"; $lang['mx_meta']['langcode']['az'] = "Azerbaijani"; $lang['mx_meta']['langcode']['bm'] = "Bambara"; $lang['mx_meta']['langcode']['ba'] = "Bashkir"; $lang['mx_meta']['langcode']['eu'] = "Basque"; $lang['mx_meta']['langcode']['be'] = "Belarusian"; $lang['mx_meta']['langcode']['bn'] = "Bengali"; $lang['mx_meta']['langcode']['bh'] = "Bihari"; $lang['mx_meta']['langcode']['bi'] = "Bislama"; $lang['mx_meta']['langcode']['bs'] = "Bosnian"; $lang['mx_meta']['langcode']['br'] = "Breton"; $lang['mx_meta']['langcode']['bg'] = "Bulgarian"; $lang['mx_meta']['langcode']['my'] = "Burmese"; $lang['mx_meta']['langcode']['ca'] = "Catalan"; $lang['mx_meta']['langcode']['ch'] = "Chamorro"; $lang['mx_meta']['langcode']['ce'] = "Chechen"; $lang['mx_meta']['langcode']['zh'] = "Chinese"; $lang['mx_meta']['langcode']['cu'] = "Church Slavonic"; $lang['mx_meta']['langcode']['cv'] = "Chuvash"; $lang['mx_meta']['langcode']['kw'] = "Cornish"; $lang['mx_meta']['langcode']['co'] = "Corsican"; $lang['mx_meta']['langcode']['cr'] = "Cree"; $lang['mx_meta']['langcode']['hr'] = "Croatian"; $lang['mx_meta']['langcode']['cs'] = "Czech"; $lang['mx_meta']['langcode']['da'] = "Danish"; $lang['mx_meta']['langcode']['dv'] = "Divehi"; $lang['mx_meta']['langcode']['nl'] = "Dutch"; $lang['mx_meta']['langcode']['dz'] = "Dzongkha"; $lang['mx_meta']['langcode']['en'] = "English"; $lang['mx_meta']['langcode']['eo'] = "Esperanto"; $lang['mx_meta']['langcode']['et'] = "Estonian"; $lang['mx_meta']['langcode']['ee'] = "Ewe"; $lang['mx_meta']['langcode']['fo'] = "Faroese"; $lang['mx_meta']['langcode']['fj'] = "Fijian"; $lang['mx_meta']['langcode']['fi'] = "Finnish"; $lang['mx_meta']['langcode']['fr'] = "French"; $lang['mx_meta']['langcode']['fy'] = "Frisian"; $lang['mx_meta']['langcode']['ff'] = "Fulah"; $lang['mx_meta']['langcode']['gl'] = "Gallegan"; $lang['mx_meta']['langcode']['lg'] = "Ganda"; $lang['mx_meta']['langcode']['ka'] = "Georgian"; $lang['mx_meta']['langcode']['de'] = "German"; $lang['mx_meta']['langcode']['gn'] = "Guarani"; $lang['mx_meta']['langcode']['gu'] = "Gujarati"; $lang['mx_meta']['langcode']['ht'] = "Haitian"; $lang['mx_meta']['langcode']['ha'] = "Hausa"; $lang['mx_meta']['langcode']['he'] = "Hebrew"; $lang['mx_meta']['langcode']['hz'] = "Herero"; $lang['mx_meta']['langcode']['hi'] = "Hindi"; $lang['mx_meta']['langcode']['ho'] = "Hiri Motu"; $lang['mx_meta']['langcode']['hu'] = "Hungarian"; $lang['mx_meta']['langcode']['is'] = "Icelandic"; $lang['mx_meta']['langcode']['io'] = "Ido"; $lang['mx_meta']['langcode']['ig'] = "Igbo"; $lang['mx_meta']['langcode']['id'] = "Indonesian"; $lang['mx_meta']['langcode']['ie'] = "Interlingue"; $lang['mx_meta']['langcode']['iu'] = "Inuktitut"; $lang['mx_meta']['langcode']['ik'] = "Inupiaq"; $lang['mx_meta']['langcode']['ga'] = "Irish"; $lang['mx_meta']['langcode']['it'] = "Italian"; $lang['mx_meta']['langcode']['ja'] = "Japanese"; $lang['mx_meta']['langcode']['jv'] = "Javanese"; $lang['mx_meta']['langcode']['kl'] = "Kalaallisut"; $lang['mx_meta']['langcode']['kn'] = "Kannada"; $lang['mx_meta']['langcode']['kr'] = "Kanuri"; $lang['mx_meta']['langcode']['ks'] = "Kashmiri"; $lang['mx_meta']['langcode']['kk'] = "Kazakh"; $lang['mx_meta']['langcode']['km'] = "Khmer"; $lang['mx_meta']['langcode']['ki'] = "Kikuyu"; $lang['mx_meta']['langcode']['rw'] = "Kinyarwanda"; $lang['mx_meta']['langcode']['ky'] = "Kirghiz"; $lang['mx_meta']['langcode']['kv'] = "Komi"; $lang['mx_meta']['langcode']['kg'] = "Kongo"; $lang['mx_meta']['langcode']['ko'] = "Korean"; $lang['mx_meta']['langcode']['ku'] = "Kurdish"; $lang['mx_meta']['langcode']['kj'] = "Kwanyama"; $lang['mx_meta']['langcode']['lo'] = "Lao"; $lang['mx_meta']['langcode']['la'] = "Latin"; $lang['mx_meta']['langcode']['lv'] = "Latvian"; $lang['mx_meta']['langcode']['li'] = "Limburgish"; $lang['mx_meta']['langcode']['ln'] = "Lingala"; $lang['mx_meta']['langcode']['lt'] = "Lithuanian"; $lang['mx_meta']['langcode']['lu'] = "Luba-Katanga"; $lang['mx_meta']['langcode']['lb'] = "Luxembourgish"; $lang['mx_meta']['langcode']['mk'] = "Macedonian"; $lang['mx_meta']['langcode']['mg'] = "Malagasy"; $lang['mx_meta']['langcode']['ms'] = "Malay"; $lang['mx_meta']['langcode']['ml'] = "Malayalam"; $lang['mx_meta']['langcode']['mt'] = "Maltese"; $lang['mx_meta']['langcode']['gv'] = "Manx"; $lang['mx_meta']['langcode']['mi'] = "Maori"; $lang['mx_meta']['langcode']['mr'] = "Marathi"; $lang['mx_meta']['langcode']['mh'] = "Marshallese"; $lang['mx_meta']['langcode']['el'] = "Modern Greek"; $lang['mx_meta']['langcode']['mo'] = "Moldavian"; $lang['mx_meta']['langcode']['mn'] = "Mongolian"; $lang['mx_meta']['langcode']['na'] = "Nauru"; $lang['mx_meta']['langcode']['nv'] = "Navajo"; $lang['mx_meta']['langcode']['nd'] = "Ndebele, North"; $lang['mx_meta']['langcode']['ng'] = "Ndonga"; $lang['mx_meta']['langcode']['ne'] = "Nepali"; $lang['mx_meta']['langcode']['nb'] = "Norwegian"; $lang['mx_meta']['langcode']['nn'] = "Norwegian Nynorsk"; $lang['mx_meta']['langcode']['ny'] = "Nyanja"; $lang['mx_meta']['langcode']['oc'] = "Occitan"; $lang['mx_meta']['langcode']['oj'] = "Ojibwa"; $lang['mx_meta']['langcode']['or'] = "Oriya"; $lang['mx_meta']['langcode']['om'] = "Oromo"; $lang['mx_meta']['langcode']['os'] = "Ossetian"; $lang['mx_meta']['langcode']['pi'] = "Pali"; $lang['mx_meta']['langcode']['pa'] = "Panjabi"; $lang['mx_meta']['langcode']['fa'] = "Persian"; $lang['mx_meta']['langcode']['pl'] = "Polish"; $lang['mx_meta']['langcode']['pt'] = "Portuguese"; $lang['mx_meta']['langcode']['ps'] = "Pushto"; $lang['mx_meta']['langcode']['qu'] = "Quechua"; $lang['mx_meta']['langcode']['rm'] = "Raeto-Romance"; $lang['mx_meta']['langcode']['ro'] = "Romanian"; $lang['mx_meta']['langcode']['rn'] = "Rundi"; $lang['mx_meta']['langcode']['ru'] = "Russian"; $lang['mx_meta']['langcode']['sm'] = "Samoan"; $lang['mx_meta']['langcode']['sg'] = "Sango"; $lang['mx_meta']['langcode']['sa'] = "Sanskrit"; $lang['mx_meta']['langcode']['sc'] = "Sardinian"; $lang['mx_meta']['langcode']['gd'] = "Scottish Gaelic"; $lang['mx_meta']['langcode']['sr'] = "Serbian"; $lang['mx_meta']['langcode']['sn'] = "Shona"; $lang['mx_meta']['langcode']['ii'] = "Sichuan Yi"; $lang['mx_meta']['langcode']['sd'] = "Sindhi"; $lang['mx_meta']['langcode']['si'] = "Sinhalese"; $lang['mx_meta']['langcode']['sk'] = "Slovak"; $lang['mx_meta']['langcode']['sl'] = "Slovenian"; $lang['mx_meta']['langcode']['so'] = "Somali"; $lang['mx_meta']['langcode']['st'] = "Sotho"; $lang['mx_meta']['langcode']['nr'] = "South Ndebele"; $lang['mx_meta']['langcode']['es'] = "Spanish"; $lang['mx_meta']['langcode']['su'] = "Sundanese"; $lang['mx_meta']['langcode']['sw'] = "Swahili"; $lang['mx_meta']['langcode']['ss'] = "Swati"; $lang['mx_meta']['langcode']['sv'] = "Swedish"; $lang['mx_meta']['langcode']['tl'] = "Tagalog"; $lang['mx_meta']['langcode']['ty'] = "Tahitian"; $lang['mx_meta']['langcode']['tg'] = "Tajik"; $lang['mx_meta']['langcode']['ta'] = "Tamil"; $lang['mx_meta']['langcode']['tt'] = "Tatar"; $lang['mx_meta']['langcode']['te'] = "Telugu"; $lang['mx_meta']['langcode']['th'] = "Thai"; $lang['mx_meta']['langcode']['bo'] = "Tibetan"; $lang['mx_meta']['langcode']['ti'] = "Tigrinya"; $lang['mx_meta']['langcode']['to'] = "Tonga"; $lang['mx_meta']['langcode']['ts'] = "Tsonga"; $lang['mx_meta']['langcode']['tn'] = "Tswana"; $lang['mx_meta']['langcode']['tr'] = "Turkish"; $lang['mx_meta']['langcode']['tk'] = "Turkmen"; $lang['mx_meta']['langcode']['tw'] = "Twi"; $lang['mx_meta']['langcode']['uk'] = "Ukrainian"; $lang['mx_meta']['langcode']['ur'] = "Urdu"; $lang['mx_meta']['langcode']['ug'] = "Uyghur"; $lang['mx_meta']['langcode']['uz'] = "Uzbek"; $lang['mx_meta']['langcode']['ve'] = "Venda"; $lang['mx_meta']['langcode']['vi'] = "Vietnamese"; $lang['mx_meta']['langcode']['vo'] = "Volapük"; $lang['mx_meta']['langcode']['wa'] = "Walloon"; $lang['mx_meta']['langcode']['cy'] = "Welsh"; $lang['mx_meta']['langcode']['wo'] = "Wolof"; $lang['mx_meta']['langcode']['xh'] = "Xhosa"; $lang['mx_meta']['langcode']['yi'] = "Yiddish"; $lang['mx_meta']['langcode']['yo'] = "Yoruba"; $lang['mx_meta']['langcode']['za'] = "Zhuang"; $lang['mx_meta']['langcode']['zu'] = "Zulu"; // // Other related META tag entries follow... // $lang['mx_meta']['rating']['general'] = "General"; $lang['mx_meta']['rating']['14 years'] = "14 years"; $lang['mx_meta']['rating']['restricted']= "Restricted"; $lang['mx_meta']['rating']['mature'] = "Mature"; $lang['mx_meta']['index']['index'] = "Index"; $lang['mx_meta']['index']['noindex'] = "No index"; $lang['mx_meta']['follow']['follow'] = "Follow"; $lang['mx_meta']['follow']['nofollow'] = "No follow"; // // That's all Folks! // ------------------------------------------------- ?> |
|
From: Markus P. <mar...@us...> - 2005-04-03 23:11:42
|
Update of /cvsroot/mxbb/core/language/lang_english In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16675 Modified Files: lang_main.php Log Message: Fixed file name on header comments. ;-) Index: lang_main.php =================================================================== RCS file: /cvsroot/mxbb/core/language/lang_english/lang_main.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** lang_main.php 7 Mar 2005 09:34:51 -0000 1.14 --- lang_main.php 3 Apr 2005 23:11:33 -0000 1.15 *************** *** 1,5 **** <?php /*************************************************************************** ! * lang_admin.php [English] * ------------------- * copyright : (C) 2003 mxBB Portal --- 1,5 ---- <?php /*************************************************************************** ! * lang_main.php [English] * ------------------- * copyright : (C) 2003 mxBB Portal |
|
From: Markus P. <mar...@us...> - 2005-04-03 16:45:52
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10908/admin Modified Files: admin_mx_gen_cache.php Log Message: Bug #60 - Fix mx_cache() db2xml function using propietary MySQL code. Also, revised the whole admin_mx_gen_cache.php script: code cleanup, use of mx_request_vars class, moved db2xml_all to includes/mx_cache.php, fixed several problems, including $lang usage, etc. Index: admin_mx_gen_cache.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_gen_cache.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** admin_mx_gen_cache.php 6 Mar 2005 01:10:12 -0000 1.13 --- admin_mx_gen_cache.php 3 Apr 2005 16:45:15 -0000 1.14 *************** *** 21,142 **** $no_page_header = true; ! if ( !empty( $setmodules ) ) { ! $filename = basename( __FILE__ ); ! $module['Portal - System']['Generate cache'] = 'admin/' . $filename; ! return; } ! define( 'IN_PORTAL', 1 ); ! $mx_root_path = "../"; // Security and page header ! require( './pagestart.php' ); ! ! if ( isset( $HTTP_POST_VARS['generate'] ) || isset( $HTTP_GET_VARS['generate'] ) ) ! { ! $generate = ( isset( $HTTP_POST_VARS['generate'] ) ) ? $HTTP_POST_VARS['generate'] : $HTTP_GET_VARS['generate']; ! $generate = htmlspecialchars( $generate ); ! } ! else ! { ! $generate = ""; ! } ! /* ! function db2xml( $host, $user, $password, $database, $sql, $xml_file ) ! { ! $create_xml = fopen( $xml_file, "w" ); ! fwrite( $create_xml, "<xml>\r\n<table>\r\n" ); ! $req = mysql_db_query( $database, $sql ); ! while ( $row = mysql_fetch_array( $req ) ) ! { ! fwrite( $create_xml, "<item>\r\n" ); ! for( $j = 0;$line = each( $row );$j++ ) ! { ! if ( $j % 2 ) ! { ! fwrite( $create_xml, "<$line[0]>" . to_text( $line[1] ) . "</$line[0]>\r\n" ); ! } ! } ! fwrite( $create_xml, "</item>\r\n" ); ! } ! fwrite( $create_xml, "</table>\r\n</xml>" ); ! fclose( $create_xml ); ! mysql_free_result( $req ); ! } ! */ - function db2xml_all( $host, $user, $password, $database, $sql, $xml_file ) - { - $req = mysql_db_query( $database, $sql ); - - $block_id_tmp = ''; - $create_xml = ''; - $cache_start = false; - - while ( $row = mysql_fetch_array( $req ) ) - { - if ( $block_id_tmp != $row['block_id'] && $cache_start) - { - fwrite( $create_xml, "</table>\r\n</xml>" ); - fclose( $create_xml ); - } - - if ( $block_id_tmp != $row['block_id'] ) - { - $create_xml = fopen( $xml_file . $row['block_id'] . '.xml', "w" ); - fwrite( $create_xml, "<xml>\r\n<table>\r\n" ); - $cache_start = true; - } - - fwrite( $create_xml, "<item>\r\n" ); - for( $j = 0;$line = each( $row );$j++ ) - { - if ( $j % 2 ) - { - fwrite( $create_xml, "<$line[0]>" . to_text( $line[1] ) . "</$line[0]>\r\n" ); - } - } - fwrite( $create_xml, "</item>\r\n" ); - $block_id_tmp = $row['block_id']; - } - - fwrite( $create_xml, "</table>\r\n</xml>" ); - fclose( $create_xml ); - - mysql_free_result( $req ); - } // Load default template for install ! $template->set_filenames( array( "body" => "admin/admin_message_body.tpl" ) ! ); ! $title = $lang['Generate_mx_cache']; ! // Bug fix ! if ( isset( $HTTP_POST_VARS['generate'] ) || isset( $HTTP_GET_VARS['generate'] ) ) ! { ! $generate = ( isset( $HTTP_POST_VARS['generate'] ) ) ? $HTTP_POST_VARS['generate'] : $HTTP_GET_VARS['generate']; ! $generate = htmlspecialchars( $generate ); ! } ! else ! { ! $generate = ""; ! } ! if ( $generate != 'yes' ) { ! $msg = !empty( $lang['Cache_submit'] ) ? $lang['Cache_submit'] : "generate the cache file?"; ! $msg_explain = !empty( $lang['Cache_explain'] ) ? $lang['Cache_explain'] : "With this option you can generate xml files (cache files) with the portal configuration. These files allow to reduce the number of database queries and improve the portal performance. For the moment this option is not automatic, therefore you must re-generate the cache file after each modification of your portal configuration, otherwise the modifications will not be active."; ! ! $message = $msg_explain . "<br /><br /><br />"; ! $message .= "<FORM ACTION='" . append_sid( PORTAL_URL . 'admin/admin_mx_gen_cache.php' ) . "' METHOD='post'>"; ! $message .= "<INPUT TYPE='hidden' NAME='generate' VALUE='yes'>"; ! $message .= "<INPUT TYPE='submit' NAME='submit' VALUE=\"$msg >>\">"; ! $message .= "</FORM>"; } else --- 21,57 ---- $no_page_header = true; ! if ( !empty($setmodules) ) { ! $module['Portal - System']['Generate cache'] = 'admin/' . basename(__FILE__); return; } ! define('IN_PORTAL', 1); ! $mx_root_path = '../'; // Security and page header ! require('./pagestart.php'); ! // Getting mode of operation ! $generate = ( $mx_request_vars->request('generate', MX_TYPE_INT, 0) == 1 ? true : false ); // Load default template for install ! $template->set_filenames(array( ! 'body' => 'admin/admin_message_body.tpl') ! ); ! // Main procedure ! if ( !$generate ) { ! $message = $lang['Cache_explain'] . '<br /> <br /> <br />'; ! $message .= '<form action="' . append_sid(PORTAL_URL . "admin/admin_mx_gen_cache.$phpEx") . '" method="post">'; ! $message .= '<input type="hidden" name="generate" value="1">'; ! $message .= '<input type="submit" name="submit" value="' . $lang['Cache_submit'] . ' >>" class="liteoption" />'; ! $message .= '</form>'; } else *************** *** 146,194 **** $cache_dir = $mx_root_path . 'cache/'; ! @mkdir( $cache_dir, 0777 ); ! @chmod( $cache_dir, 0777 ); ! if ( !is_writable( $cache_dir ) ) { ! $message = !empty( $lang['Cache_dir_write_protect'] ) ? $lang['Cache_dir_write_protect'] : "Your cache directory is write-protected, unable to generate the cache file"; ! mx_message_die( GENERAL_MESSAGE, $message, '' ); exit; ! } /* // Generate block data $sql = "SELECT blk.block_id ! , blk.block_title ! , blk.block_desc ! , blk.show_block ! , blk.show_title ! , blk.show_stats ! , blk.block_time ! , blk.block_editor_id ! , blk.function_id ! , blk.auth_view ! , blk.auth_edit ! , blk.auth_delete ! , blk.auth_view_group ! , blk.auth_edit_group ! , blk.auth_delete_group ! , blk.auth_moderator_group ! FROM " . BLOCK_TABLE . " blk" ; ! db2xml( $dbhost, $dbuser, $dbpasswd, $dbname, $sql, $cache_dir . "block_config.xml" ); */ ! // Generate block parameter data ! $sql = "SELECT sys.parameter_id ! , sys.block_id ! , par.parameter_name ! , sys.parameter_value ! , sys.bbcode_uid ! FROM " . BLOCK_SYSTEM_PARAMETER_TABLE . " sys, ! " . PARAMETER_TABLE . " par ! WHERE sys.parameter_id = par.parameter_id ! ORDER BY sys.block_id, sys.parameter_id"; ! db2xml_all( $dbhost, $dbuser, $dbpasswd, $dbname, $sql, $cache_dir . "block_" ); /* --- 61,109 ---- $cache_dir = $mx_root_path . 'cache/'; ! @mkdir($cache_dir, 0777); ! @chmod($cache_dir, 0777); ! if ( !is_writable($cache_dir) ) { ! $message = $lang['Cache_dir_write_protect']; ! mx_message_die(GENERAL_MESSAGE, $message, ''); exit; ! } /* // Generate block data $sql = "SELECT blk.block_id ! , blk.block_title ! , blk.block_desc ! , blk.show_block ! , blk.show_title ! , blk.show_stats ! , blk.block_time ! , blk.block_editor_id ! , blk.function_id ! , blk.auth_view ! , blk.auth_edit ! , blk.auth_delete ! , blk.auth_view_group ! , blk.auth_edit_group ! , blk.auth_delete_group ! , blk.auth_moderator_group ! FROM " . BLOCK_TABLE . " blk"; ! db2xml($sql, $cache_dir . 'block_config.xml'); */ ! // Generate block parameter data ! $sql = "SELECT sys.parameter_id, ! sys.block_id, ! par.parameter_name, ! sys.parameter_value, ! sys.bbcode_uid ! FROM " . BLOCK_SYSTEM_PARAMETER_TABLE . " sys, ! " . PARAMETER_TABLE . " par ! WHERE sys.parameter_id = par.parameter_id ! ORDER BY sys.block_id, sys.parameter_id"; ! db2xml_all($sql, $cache_dir . 'block_'); /* *************** *** 200,204 **** " . MODULE_TABLE . " mdl, " . PAGE_TABLE . " pag, ! " . COLUMN_TABLE . " col WHERE blk.function_id = fnc.function_id AND pag.page_id = col.page_id --- 115,119 ---- " . MODULE_TABLE . " mdl, " . PAGE_TABLE . " pag, ! " . COLUMN_TABLE . " col WHERE blk.function_id = fnc.function_id AND pag.page_id = col.page_id *************** *** 208,229 **** ORDER BY col.page_id, column_id, column_order, block_order"; ! db2xml( $dbhost, $dbuser, $dbpasswd, $dbname, $sql, $cache_dir . "page_config.xml" ); */ // Update cache ! update_session_cache( $block_id ); ! ! $message = !empty( $lang['Cache_generate'] ) ? $lang['Cache_generate'] : "Your cache files is generated" ; ! } ! $template->assign_vars( array( 'MESSAGE_TITLE' => ( !empty( $lang[$title] ) ? $lang[$title] : $title ), ! 'MESSAGE_TEXT' => $message ! ) ); ! include_once( './page_header_admin.' . $phpEx ); ! $template->pparse( "body" ); ! include_once( './page_footer_admin.' . $phpEx ); ! exit(); ?> \ No newline at end of file --- 123,143 ---- ORDER BY col.page_id, column_id, column_order, block_order"; ! db2xml($sql, $cache_dir . 'page_config.xml'); */ // Update cache ! update_session_cache($block_id); ! $message = $lang['Cache_generate']; ! } ! $template->assign_vars(array( ! 'MESSAGE_TITLE' => $lang['Generate_mx_cache'], ! 'MESSAGE_TEXT' => $message ! )); ! include_once("./page_header_admin.$phpEx"); ! $template->pparse('body'); ! include_once("./page_footer_admin.$phpEx"); ?> \ No newline at end of file |
|
From: Markus P. <mar...@us...> - 2005-04-03 16:45:52
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10908/includes Modified Files: mx_cache.php Log Message: Bug #60 - Fix mx_cache() db2xml function using propietary MySQL code. Also, revised the whole admin_mx_gen_cache.php script: code cleanup, use of mx_request_vars class, moved db2xml_all to includes/mx_cache.php, fixed several problems, including $lang usage, etc. Index: mx_cache.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_cache.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_cache.php 9 Mar 2005 22:46:36 -0000 1.2 --- mx_cache.php 3 Apr 2005 16:45:15 -0000 1.3 *************** *** 283,362 **** } ! function db2xml( $host, $user, $password, $database, $sql, $xml_file ) { ! $create_xml = fopen( $xml_file, "w" ); ! fwrite( $create_xml, "<xml>\r\n<table>\r\n" ); ! $req = mysql_db_query( $database, $sql ); ! while ( $row = mysql_fetch_array( $req ) ) { ! fwrite( $create_xml, "<item>\r\n" ); ! for( $j = 0;$line = each( $row );$j++ ) { if ( $j % 2 ) { ! fwrite( $create_xml, "<$line[0]>" . to_text( $line[1] ) . "</$line[0]>\r\n" ); } } ! fwrite( $create_xml, "</item>\r\n" ); } ! fwrite( $create_xml, "</table>\r\n</xml>" ); ! fclose( $create_xml ); ! mysql_free_result( $req ); } ! function write_cache_config( $block_id = '' ) { ! global $db, $mx_root_path, $dbhost, $dbuser, $dbpasswd, $dbname, $HTTP_SESSION_VARS; $HTTP_SESSION_VARS['cache_read'] = false; $cache_dir = $mx_root_path . 'cache/'; ! @mkdir( $cache_dir, 0777 ); ! @chmod( $cache_dir, 0777 ); ! if ( !is_writable( $cache_dir ) ) { ! $message = !empty( $lang['Cache_dir_write_protect'] ) ? $lang['Cache_dir_write_protect'] : "Your cache directory is write-protected, unable to generate the cache file"; ! mx_message_die( GENERAL_MESSAGE, $message, '' ); exit; } /* ! $sql = "SELECT blk.block_id ! , blk.block_title ! , blk.block_desc ! , blk.show_block ! , blk.show_title ! , blk.show_stats ! , blk.block_time ! , blk.block_editor_id ! , blk.function_id ! , blk.auth_view ! , blk.auth_edit ! , blk.auth_delete ! , blk.auth_view_group ! , blk.auth_edit_group ! , blk.auth_moderator_group FROM " . BLOCK_TABLE . " blk" ; ! db2xml( $dbhost, $dbuser, $dbpasswd, $dbname, $sql, $cache_dir . "block_config.xml" ); */ - - $sql = "SELECT sys.parameter_id - , sys.block_id - , par.parameter_name - , sys.parameter_value - , sys.bbcode_uid - FROM " . BLOCK_SYSTEM_PARAMETER_TABLE . " sys, - " . PARAMETER_TABLE . " par - WHERE sys.parameter_id = par.parameter_id - AND sys.block_id = '" . $block_id . "'"; ! db2xml( $dbhost, $dbuser, $dbpasswd, $dbname, $sql, $cache_dir . "block_" . $block_id .".xml" ); /* // Generate page_blocks data ! $sql = "SELECT col.page_id, pag.page_name, pag.page_icon, pag.page_header, pag.page_graph_border, pag.auth_view AS pag_auth_view, pag.auth_view_group AS pag_auth_view_group, pag.auth_moderator_group AS pag_auth_moderator_group, bct.column_id, col.column_title, col.column_order, col.column_size, blk.block_id, blk.auth_view, blk.auth_view_group, blk.auth_edit, blk.auth_edit_group, blk.show_block, blk.show_title, blk.show_stats, blk.block_time, blk.block_editor_id, bct.column_id AS block_col_id, module_path, function_file, function_admin FROM " . COLUMN_BLOCK_TABLE . " bct, " . BLOCK_TABLE . " blk, --- 283,416 ---- } ! function db2xml($sql, $xml_file) { ! global $db; ! if ( !( $result = $db->sql_query($sql) ) ) { ! return; ! } ! ! if( !( $create_xml = fopen($xml_file, 'w') ) ) ! { ! return; ! } ! ! fwrite($create_xml, "<xml>\r\n<table>\r\n"); ! ! while( $row = $db->sql_fetchrow($result) ) ! { ! fwrite($create_xml, "<item>\r\n"); ! for( $j=0; $line = each($row); $j++ ) { if ( $j % 2 ) { ! fwrite($create_xml, "<$line[0]>" . to_text($line[1]) . "</$line[0]>\r\n"); } } ! fwrite($create_xml, "</item>\r\n"); } ! ! fwrite($create_xml, "</table>\r\n</xml>"); ! fclose($create_xml); } ! function db2xml_all($sql, $xml_file) { ! global $db; ! ! if ( !( $result = $db->sql_query($sql) ) ) ! { ! return; ! } ! ! $block_id_tmp = ''; ! $create_xml = ''; ! $cache_start = false; ! ! while( $row = $db->sql_fetchrow($result) ) ! { ! if ( $block_id_tmp != $row['block_id'] && $cache_start ) ! { ! fwrite($create_xml, "</table>\r\n</xml>"); ! fclose($create_xml); ! } ! ! if ( $block_id_tmp != $row['block_id'] ) ! { ! $create_xml = fopen($xml_file . $row['block_id'] . '.xml', 'w'); ! fwrite($create_xml, "<xml>\r\n<table>\r\n"); ! $cache_start = true; ! } ! ! fwrite($create_xml, "<item>\r\n"); ! for( $j = 0; $line = each($row); $j++ ) ! { ! if ( $j % 2 ) ! { ! fwrite($create_xml, "<$line[0]>" . to_text($line[1]) . "</$line[0]>\r\n"); ! } ! } ! fwrite($create_xml, "</item>\r\n"); ! ! $block_id_tmp = $row['block_id']; ! } ! ! fwrite($create_xml, "</table>\r\n</xml>"); ! fclose($create_xml); ! } ! ! function write_cache_config($block_id = '') ! { ! global $mx_root_path, $lang, $HTTP_SESSION_VARS; $HTTP_SESSION_VARS['cache_read'] = false; $cache_dir = $mx_root_path . 'cache/'; ! @mkdir($cache_dir, 0777); ! @chmod($cache_dir, 0777); ! if ( !is_writable($cache_dir) ) { ! mx_message_die(GENERAL_MESSAGE, $lang['Cache_dir_write_protect'], ''); exit; } /* ! $sql = "SELECT blk.block_id ! , blk.block_title ! , blk.block_desc ! , blk.show_block ! , blk.show_title ! , blk.show_stats ! , blk.block_time ! , blk.block_editor_id ! , blk.function_id ! , blk.auth_view ! , blk.auth_edit ! , blk.auth_delete ! , blk.auth_view_group ! , blk.auth_edit_group ! , blk.auth_moderator_group FROM " . BLOCK_TABLE . " blk" ; ! db2xml($sql, $cache_dir . 'block_config.xml'); */ ! $sql = "SELECT sys.parameter_id, ! sys.block_id, ! par.parameter_name, ! sys.parameter_value, ! sys.bbcode_uid ! FROM " . BLOCK_SYSTEM_PARAMETER_TABLE . " sys, ! " . PARAMETER_TABLE . " par ! WHERE sys.parameter_id = par.parameter_id ! AND sys.block_id = '$block_id'"; ! ! db2xml($sql, $cache_dir . 'block_' . $block_id . '.xml'); /* // Generate page_blocks data ! $sql = "SELECT col.page_id, pag.page_name, pag.page_icon, pag.page_header, pag.page_graph_border, pag.auth_view AS pag_auth_view, pag.auth_view_group AS pag_auth_view_group, pag.auth_moderator_group AS pag_auth_moderator_group, bct.column_id, col.column_title, col.column_order, col.column_size, blk.block_id, blk.auth_view, blk.auth_view_group, blk.auth_edit, blk.auth_edit_group, blk.show_block, blk.show_title, blk.show_stats, blk.block_time, blk.block_editor_id, bct.column_id AS block_col_id, module_path, function_file, function_admin FROM " . COLUMN_BLOCK_TABLE . " bct, " . BLOCK_TABLE . " blk, *************** *** 364,368 **** " . MODULE_TABLE . " mdl, " . PAGE_TABLE . " pag, ! " . COLUMN_TABLE . " col WHERE blk.function_id = fnc.function_id AND pag.page_id = col.page_id --- 418,422 ---- " . MODULE_TABLE . " mdl, " . PAGE_TABLE . " pag, ! " . COLUMN_TABLE . " col WHERE blk.function_id = fnc.function_id AND pag.page_id = col.page_id *************** *** 372,376 **** ORDER BY col.page_id, column_id, column_order, block_order"; ! db2xml( $dbhost, $dbuser, $dbpasswd, $dbname, $sql, $cache_dir . "page_config.xml" ); */ } --- 426,430 ---- ORDER BY col.page_id, column_id, column_order, block_order"; ! db2xml($sql, $cache_dir . 'page_config.xml'); */ } *************** *** 386,392 **** } */ ! get_page_session(); ! $cache_dir = $mx_root_path . 'cache/'; if ( !empty($block_id) && $portal_config['mx_use_cache'] == 1 ) --- 440,446 ---- } */ ! get_page_session(); ! $cache_dir = $mx_root_path . 'cache/'; if ( !empty($block_id) && $portal_config['mx_use_cache'] == 1 ) *************** *** 397,405 **** $portal_cache_time = time(); ! $sql = "UPDATE ".PORTAL_TABLE." SET portal_recached = '$portal_cache_time' WHERE portal_id = 1"; ! if ( !( $result = $db->sql_query( $sql, BEGIN_TRANSACTION ) ) ) { --- 451,459 ---- $portal_cache_time = time(); ! $sql = "UPDATE ".PORTAL_TABLE." SET portal_recached = '$portal_cache_time' WHERE portal_id = 1"; ! if ( !( $result = $db->sql_query( $sql, BEGIN_TRANSACTION ) ) ) { |
|
From: Markus P. <mar...@us...> - 2005-04-03 15:13:00
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19264 Modified Files: admin_mx_page.php Log Message: Replaced use of HTTP_POST_VARS/HTTP_GET_VARS with new mx_request_vars class. Index: admin_mx_page.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_page.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** admin_mx_page.php 3 Apr 2005 13:34:50 -0000 1.20 --- admin_mx_page.php 3 Apr 2005 15:12:50 -0000 1.21 *************** *** 117,121 **** function page_edit($mode, $page_id) { ! global $template, $lang, $db, $board_config, $theme, $HTTP_GET_VARS, $HTTP_POST_VARS, $phpEx; $auth_fields = array('auth_view'); --- 117,121 ---- function page_edit($mode, $page_id) { ! global $template, $lang, $db, $board_config, $theme, $mx_request_vars, $phpEx; $auth_fields = array('auth_view'); *************** *** 151,156 **** $newmode = 'create'; $buttonvalue = $lang['Submit']; ! $page_name = $HTTP_POST_VARS['page_name']; ! $page_desc = $HTTP_POST_VARS['page_desc']; // $page_icon = empty($row['page_icon']) ? 'icon_home.gif' : $row['page_icon']; $page_icon = post_icons('page_icons/'); --- 151,156 ---- $newmode = 'create'; $buttonvalue = $lang['Submit']; ! $page_name = $mx_request_vars->post('page_name', MX_TYPE_ANY, ''); ! $page_desc = $mx_request_vars->post('page_desc', MX_TYPE_ANY, ''); // $page_icon = empty($row['page_icon']) ? 'icon_home.gif' : $row['page_icon']; $page_icon = post_icons('page_icons/'); *************** *** 248,259 **** function page_modify($mode, $page_id) { ! global $template, $lang, $db, $board_config, $theme, $HTTP_POST_VARS, $phpEx; if ( $mode == 'modify' ) { ! if ( $page_id != intval($HTTP_POST_VARS['page_id_new']) ) { $sql = "UPDATE " . COLUMN_TABLE . " ! SET page_id = " . intval($HTTP_POST_VARS['page_id_new']) . " WHERE page_id = " . $page_id; if ( !( $result = $db->sql_query($sql) ) ) --- 248,267 ---- function page_modify($mode, $page_id) { ! global $template, $lang, $db, $board_config, $theme, $mx_request_vars, $phpEx; ! ! $page_id_new = $mx_request_vars->post('page_id_new', MX_TYPE_INT, 0); ! $page_name = $mx_request_vars->post('page_name', MX_TYPE_ANY, ''); ! $page_desc = $mx_request_vars->post('page_desc', MX_TYPE_ANY, ''); ! $page_icon = $mx_request_vars->post('menuicon', MX_TYPE_NO_TAGS, ''); ! $page_header = $mx_request_vars->post('page_header', MX_TYPE_NO_TAGS, ''); ! $page_graph_border = $mx_request_vars->post('page_graph_border', MX_TYPE_NO_TAGS, ''); ! $auth_view = $mx_request_vars->post('auth_view', MX_TYPE_INT, 0); if ( $mode == 'modify' ) { ! if ( $page_id != $page_id_new ) { $sql = "UPDATE " . COLUMN_TABLE . " ! SET page_id = " . $page_id_new . " WHERE page_id = " . $page_id; if ( !( $result = $db->sql_query($sql) ) ) *************** *** 263,274 **** } $sql = "UPDATE " . PAGE_TABLE . " ! SET page_id = " . intval($HTTP_POST_VARS['page_id_new']) . ", ! page_name = '" . str_replace("\'", "''", $HTTP_POST_VARS['page_name']) . "', ! page_desc = '" . str_replace("\'", "''", $HTTP_POST_VARS['page_desc']) . "', ! page_icon = '" . str_replace("\'", "''", $HTTP_POST_VARS['menuicons']) . "', ! page_header = '" . str_replace("\'", "''", $HTTP_POST_VARS['page_header']) . "', ! page_graph_border = '" . str_replace("\'", "''", $HTTP_POST_VARS['page_graph_border']) . "', ! auth_view = '" . $HTTP_POST_VARS['auth_view'] . "' ! WHERE page_id = " . $page_id; if ( !( $result = $db->sql_query($sql) ) ) { --- 271,282 ---- } $sql = "UPDATE " . PAGE_TABLE . " ! SET page_id = '$page_id_new', ! page_name = '$page_name', ! page_desc = '$page_desc', ! page_icon = '$page_icon', ! page_header = '$page_header', ! page_graph_border = '$page_graph_border', ! auth_view = '$auth_view' ! WHERE page_id = $page_id"; if ( !( $result = $db->sql_query($sql) ) ) { *************** *** 276,284 **** } } ! ! if ( $mode == 'create' ) { $sql = "INSERT INTO " . PAGE_TABLE . " ( page_id, page_name, page_desc, page_icon, page_graph_border, auth_view, page_header ) ! VALUES ( '$HTTP_POST_VARS[page_id_new]' , '$HTTP_POST_VARS[page_name]', '$HTTP_POST_VARS[page_desc]', '$HTTP_POST_VARS[menuicons]', '$HTTP_POST_VARS[page_graph_border]', '$HTTP_POST_VARS[auth_view]', '$HTTP_POST_VARS[page_header]' )"; if ( !( $result = $db->sql_query($sql) ) ) { --- 284,291 ---- } } ! elseif ( $mode == 'create' ) { $sql = "INSERT INTO " . PAGE_TABLE . " ( page_id, page_name, page_desc, page_icon, page_graph_border, auth_view, page_header ) ! VALUES ( '$page_id_new' , '$page_name', '$page_desc', '$page_icon', '$page_graph_border', '$auth_view', '$page_header' )"; if ( !( $result = $db->sql_query($sql) ) ) { *************** *** 287,301 **** // Page templates - - if ( isset($HTTP_POST_VARS['use_template']) || isset($HTTP_GET_VARS['use_template']) ) - { - $use_template = ( isset($HTTP_POST_VARS['use_template']) ) ? $HTTP_POST_VARS['use_template'] : $HTTP_GET_VARS['use_template']; - } - else - { - $use_template = ''; - } ! if ( $use_template != '' && $use_template != '1' ) { $sql = " SELECT * FROM " . COLUMN_TEMPLATES . " WHERE page_template_id = " . $use_template; --- 294,301 ---- // Page templates ! $use_template = $mx_request_vars->post('use_template', MX_TYPE_INT, 0); ! ! if ( $use_template > 1 ) { $sql = " SELECT * FROM " . COLUMN_TEMPLATES . " WHERE page_template_id = " . $use_template; *************** *** 309,313 **** for( $row_count = 0; $row_count < count($row); $row_count++ ) { ! $sql1 = "INSERT INTO " . COLUMN_TABLE . " (column_title, column_order, column_size, page_id) VALUES ( '" . $row[$row_count]['column_title'] . "', '" . $row[$row_count]['column_order'] . "', '" . $row[$row_count]['column_size'] . "', '" . $HTTP_POST_VARS['page_id_new'] . "' )"; if ( !( $result = $db->sql_query($sql1) ) ) { --- 309,314 ---- for( $row_count = 0; $row_count < count($row); $row_count++ ) { ! $sql1 = "INSERT INTO " . COLUMN_TABLE . " (column_title, column_order, column_size, page_id) ! VALUES ( '" . $row[$row_count]['column_title'] . "', '" . $row[$row_count]['column_order'] . "', '" . $row[$row_count]['column_size'] . "', '$page_id_new' )"; if ( !( $result = $db->sql_query($sql1) ) ) { *************** *** 335,339 **** function page_delete($mode, $page_id) { ! global $template, $lang, $db, $board_config, $theme, $HTTP_POST_VARS, $phpEx; if ( $mode == 'delete' ) --- 336,340 ---- function page_delete($mode, $page_id) { ! global $template, $lang, $db, $board_config, $theme, $phpEx; if ( $mode == 'delete' ) |
|
From: Markus P. <mar...@us...> - 2005-04-03 14:30:53
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9454 Modified Files: mx_functions.php Log Message: Added flag MX_TYPE_ANY to mx_request_vars. It might make this class easier to use in some circumstancies. Index: mx_functions.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** mx_functions.php 17 Mar 2005 19:48:41 -0000 1.31 --- mx_functions.php 3 Apr 2005 14:30:26 -0000 1.32 *************** *** 1123,1126 **** --- 1123,1127 ---- // Following flags are options for the $type parameter in method _read() // + define('MX_TYPE_ANY' , 0); // Retrieve the get/post var as-is (only stripslashes() will be applied). define('MX_TYPE_INT' , 1); // Be sure we get a request var of type INT. define('MX_TYPE_FLOAT' , 2); // Be sure we get a request var of type FLOAT. *************** *** 1135,1142 **** // Additional notes: // ! // More than one can specified by OR'ing the $type argument. Example: ! // For instance, we can use ( MX_TYPE_POST_VARS | MX_TYPE_GET_VARS ), see method request(). ! // or we can use ( MX_TYPE_NO_TAGS | MX_TYPE_NO_SQL ). ! // However, MX_TYPE_NO_HTML and MX_TYPE_NO_TAGS can't be specified at a time (defaults to MX_TYPE_NO_HTML). // Also, MX_TYPE_INT and MX_TYPE_FLOAT ignore flags MX_TYPE_NO_* // --- 1136,1143 ---- // Additional notes: // ! // More than one flag can specified by OR'ing the $type argument. Examples: ! // For instance, we could use ( MX_TYPE_POST_VARS | MX_TYPE_GET_VARS ), see method request(). ! // or we could use ( MX_TYPE_NO_TAGS | MX_TYPE_NO_SQL ). ! // However, MX_TYPE_NO_HTML and MX_TYPE_NO_TAGS can't be specified at a time (defaults to MX_TYPE_NO_TAGS which is more restritive). // Also, MX_TYPE_INT and MX_TYPE_FLOAT ignore flags MX_TYPE_NO_* // *************** *** 1144,1152 **** // ! // This class must be instatiated in common.php ;-) // // Usage examples: // - // $mx_request_vars = new mx_request_vars(); // $mode = $mx_request_vars->post('mode', MX_TYPE_NO_TAGS, ''); // $page_id = $mx_request_vars->get('page', MX_TYPE_INT, 1); --- 1145,1152 ---- // ! // This class IS instatiated in common.php ;-) // // Usage examples: // // $mode = $mx_request_vars->post('mode', MX_TYPE_NO_TAGS, ''); // $page_id = $mx_request_vars->get('page', MX_TYPE_INT, 1); *************** *** 1188,1192 **** // the passed argument. This is tipical practice in languages like C, but it can also be done with PHP. // ! function _read($var, $type = 0, $dflt = '') { global $HTTP_POST_VARS, $HTTP_GET_VARS; --- 1188,1192 ---- // the passed argument. This is tipical practice in languages like C, but it can also be done with PHP. // ! function _read($var, $type = MX_TYPE_ANY, $dflt = '') { global $HTTP_POST_VARS, $HTTP_GET_VARS; *************** *** 1227,1231 **** return floatval($val); } ! if( $type & MX_TYPE_NO_HTML ) // no slashes nor html { if( is_array($val) ) --- 1227,1231 ---- return floatval($val); } ! if( $type & MX_TYPE_NO_TAGS ) // ie username { if( is_array($val) ) *************** *** 1233,1245 **** foreach( $val as $k => $v ) { ! $val[$k] = htmlspecialchars(ltrim(rtrim($v, " \t\n\r\0\x0B\\"))); } } else { ! $val = htmlspecialchars(ltrim(rtrim($val, " \t\n\r\0\x0B\\"))); } } ! elseif( $type & MX_TYPE_NO_TAGS ) // ie username { if( is_array($val) ) --- 1233,1245 ---- foreach( $val as $k => $v ) { ! $val[$k] = htmlspecialchars(strip_tags(ltrim(rtrim($v, " \t\n\r\0\x0B\\")))); } } else { ! $val = htmlspecialchars(strip_tags(ltrim(rtrim($val, " \t\n\r\0\x0B\\")))); } } ! elseif( $type & MX_TYPE_NO_HTML ) // no slashes nor html { if( is_array($val) ) *************** *** 1247,1256 **** foreach( $val as $k => $v ) { ! $val[$k] = htmlspecialchars(strip_tags(ltrim(rtrim($v, " \t\n\r\0\x0B\\")))); } } else { ! $val = htmlspecialchars(strip_tags(ltrim(rtrim($val, " \t\n\r\0\x0B\\")))); } } --- 1247,1256 ---- foreach( $val as $k => $v ) { ! $val[$k] = htmlspecialchars(ltrim(rtrim($v, " \t\n\r\0\x0B\\"))); } } else { ! $val = htmlspecialchars(ltrim(rtrim($val, " \t\n\r\0\x0B\\"))); } } *************** *** 1279,1291 **** // _read() wrappers to retrieve POST, GET or any REQUEST (both) variable. // ! function post($var, $type = 0, $dflt = '') { return $this->_read($var, ($type | MX_TYPE_POST_VARS), $dflt); } ! function get($var, $type = 0, $dflt = '') { return $this->_read($var, ($type | MX_TYPE_GET_VARS), $dflt); } ! function request($var, $type = 0, $dflt = '') { return $this->_read($var, ($type | MX_TYPE_POST_VARS | MX_TYPE_GET_VARS), $dflt); --- 1279,1291 ---- // _read() wrappers to retrieve POST, GET or any REQUEST (both) variable. // ! function post($var, $type = MX_TYPE_ANY, $dflt = '') { return $this->_read($var, ($type | MX_TYPE_POST_VARS), $dflt); } ! function get($var, $type = MX_TYPE_ANY, $dflt = '') { return $this->_read($var, ($type | MX_TYPE_GET_VARS), $dflt); } ! function request($var, $type = MX_TYPE_ANY, $dflt = '') { return $this->_read($var, ($type | MX_TYPE_POST_VARS | MX_TYPE_GET_VARS), $dflt); |
|
From: Markus P. <mar...@us...> - 2005-04-03 13:35:17
|
Update of /cvsroot/mxbb/core/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27745 Modified Files: admin_mx_page.php Log Message: Code clean-up. Introduced usage of mx_request_vars. Fixed bug #61 (missing AS keyword in SELECT fails on PostgreSQL). Index: admin_mx_page.php =================================================================== RCS file: /cvsroot/mxbb/core/admin/admin_mx_page.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** admin_mx_page.php 17 Mar 2005 11:30:34 -0000 1.19 --- admin_mx_page.php 3 Apr 2005 13:34:50 -0000 1.20 *************** *** 21,131 **** $no_page_header = true; ! if ( !empty( $setmodules ) ) { ! $file = basename( __FILE__ ); ! $module['Portal - Pages']['Page_admin'] = 'admin/' . $file; return; } ! define( 'IN_PORTAL', 1 ); $mx_root_path = '../'; // Security and page header ! require( './pagestart.php' ); // Mode setting - if ( isset( $HTTP_POST_VARS['mode'] ) || isset( $HTTP_GET_VARS['mode'] ) ) - { - $mode = ( isset( $HTTP_POST_VARS['mode'] ) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; - $mode = htmlspecialchars( $mode ); - } - else - { - $mode = ''; - } - - if ( isset( $HTTP_POST_VARS['page_id'] ) || isset( $HTTP_GET_VARS['page_id'] ) ) - { - $page_id = ( isset( $HTTP_POST_VARS['page_id'] ) ) ? $HTTP_POST_VARS['page_id'] : $HTTP_GET_VARS['page_id']; - $page_id = intval( $page_id ); - } - else - { - $page_id = 1; - } ! if ( !empty( $mode ) ) { ! switch ( $mode ) { case 'add': case 'edit': ! page_edit( $mode, $page_id ); break; - case 'create': case 'modify': ! page_modify( $mode, $page_id ); break; - case 'delete': ! page_delete( $mode, $page_id ); break; - case 'delpage': ! page_delete( $mode, $page_id ); break; - default: ! mx_message_die( GENERAL_MESSAGE, $lang['No_mode'] ); break; } exit; } // CODE STARTS HERE ! $template->set_filenames( array( ! "body" => 'admin/mx_page_admin_edit.tpl' ) ! ); $sql = "SELECT * FROM " . PAGE_TABLE . " ORDER BY page_name"; ! ! if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't get list of page", "", __LINE__, __FILE__, $sql ); } $row_count = 0; ! while ( $tblock[$row_count] = $db->sql_fetchrow( $result ) ) { ! $icon_tmp = ( !empty( $tblock[$row_count]['page_icon'] ) && $tblock[$row_count]['page_icon'] != 'none' ) ? '<img src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . "images/page_icons/" . $tblock[$row_count]['page_icon'] . '" />' : ''; $page_id = $tblock[$row_count]['page_id']; ! $template->assign_block_vars( "pages", array( 'ID' => $page_id, ! 'NAME' => $tblock[$row_count]['page_name'], ! 'DESC' => $tblock[$row_count]['page_desc'], ! 'U_PAGES' => append_sid( PORTAL_URL . "admin/admin_mx_page_setting.php?page_id=" . $page_id ), ! 'ICON' => $icon_tmp, ! 'U_EDIT' => append_sid( PORTAL_URL . "admin/admin_mx_page.$phpEx?mode=edit&page_id=$page_id" ), ! 'U_SETTING' => append_sid( PORTAL_URL . "admin/admin_mx_page_setting.php?page_id=" . $page_id ), ! 'U_DELETE' => append_sid( PORTAL_URL . "admin/admin_mx_page.$phpEx?mode=delete&page_id=$page_id" ) ! ) ); ! $row_count++; } ! $template->assign_vars( array( 'S_ACTION' => append_sid( PORTAL_URL . "admin/admin_mx_page.$phpEx?mode=add" ), ! 'BLOCK_SIZE' => ( !empty( $block_size ) ? $block_size : '100%' ) , ! 'L_TITLE' => $lang['Page_admin'], ! 'L_EDIT' => $lang['Edit'], ! 'L_SETTING' => $lang['Settings'], ! 'L_DELETE' => $lang['Delete'], ! 'L_CREATE_PAGE' => $lang['Add_Page'] ! ) ); ! include_once( './page_header_admin.' . $phpEx ); ! $template->pparse( "body" ); ! include_once( './page_footer_admin.' . $phpEx ); // CODE ENDS HERE (obviously) exit; --- 21,112 ---- $no_page_header = true; ! if ( !empty($setmodules) ) { ! $module['Portal - Pages']['Page_admin'] = 'admin/' . basename(__FILE__); return; } ! define('IN_PORTAL', 1); $mx_root_path = '../'; // Security and page header ! require('./pagestart.php'); + // // Mode setting + // + $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, ''); + $page_id = $mx_request_vars->request('page_id', MX_TYPE_INT, 1); ! if ( !empty($mode) ) { ! switch( $mode ) { case 'add': case 'edit': ! page_edit($mode, $page_id); break; case 'create': case 'modify': ! page_modify($mode, $page_id); break; case 'delete': ! page_delete($mode, $page_id); break; case 'delpage': ! page_delete($mode, $page_id); break; default: ! mx_message_die(GENERAL_MESSAGE, $lang['No_mode']); break; } exit; } + // CODE STARTS HERE ! $template->set_filenames(array( ! 'body' => 'admin/mx_page_admin_edit.tpl') ! ); $sql = "SELECT * FROM " . PAGE_TABLE . " ORDER BY page_name"; ! if ( !( $result = $db->sql_query($sql) ) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't get list of page", '', __LINE__, __FILE__, $sql); } $row_count = 0; ! while ( $tblock[$row_count] = $db->sql_fetchrow($result) ) { ! $icon_tmp = ( !empty($tblock[$row_count]['page_icon']) && $tblock[$row_count]['page_icon'] != 'none' ) ? '<img src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . "images/page_icons/" . $tblock[$row_count]['page_icon'] . '" />' : ''; $page_id = $tblock[$row_count]['page_id']; ! $template->assign_block_vars('pages', array( ! 'ID' => $page_id, ! 'NAME' => $tblock[$row_count]['page_name'], ! 'DESC' => $tblock[$row_count]['page_desc'], ! 'U_PAGES' => append_sid(PORTAL_URL . "admin/admin_mx_page_setting.$phpEx?page_id=$page_id"), ! 'ICON' => $icon_tmp, ! 'U_EDIT' => append_sid(PORTAL_URL . "admin/admin_mx_page.$phpEx?mode=edit&page_id=$page_id"), ! 'U_SETTING' => append_sid(PORTAL_URL . "admin/admin_mx_page_setting.$phpEx?page_id=$page_id"), ! 'U_DELETE' => append_sid(PORTAL_URL . "admin/admin_mx_page.$phpEx?mode=delete&page_id=$page_id") ! )); $row_count++; } ! $template->assign_vars(array( ! 'S_ACTION' => append_sid(PORTAL_URL . "admin/admin_mx_page.$phpEx?mode=add"), ! 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ), ! 'L_TITLE' => $lang['Page_admin'], ! 'L_EDIT' => $lang['Edit'], ! 'L_SETTING' => $lang['Settings'], ! 'L_DELETE' => $lang['Delete'], ! 'L_CREATE_PAGE' => $lang['Add_Page'] ! )); ! include_once('./page_header_admin.' . $phpEx); ! $template->pparse('body'); ! include_once('./page_footer_admin.' . $phpEx); // CODE ENDS HERE (obviously) exit; *************** *** 134,170 **** // ****************************************************************** ! function page_edit( $mode, $page_id ) { ! global $template, $lang, $db, $board_config, $theme, $HTTP_GET_VARS, $HTTP_POST_VARS; ! $auth_fields = array( 'auth_view' ); ! $auth_ary = array( "auth_view" => AUTH_ALL ! ); ! $auth_levels = array( 'ALL', 'REG', 'PRIVATE', 'MOD', 'ADMIN', 'ANONYMOUS' ); ! $auth_const = array( AUTH_ALL, AUTH_REG, AUTH_ACL, AUTH_MOD, AUTH_ADMIN, AUTH_ANONYMOUS ); - $field_names = array( 'auth_view' => $lang['View'] ); - // Show form to create/modify a page ! if ( $mode == 'edit' ) ! { // $newmode determines if we are going to INSERT or UPDATE after posting? $newmode = 'modify'; $buttonvalue = $lang['Update']; ! $row = get_info( PAGE_TABLE, 'page_id', $page_id ); $page_name = $row['page_name']; $page_desc = $row['page_desc']; ! // $page_icon = $row['page_icon']; ! $page_icon = post_icons( 'page_icons/', $row['page_icon'] ); ! $page_header = empty( $row['page_header'] ) ? 'overall_header.tpl' : $row['page_header']; $page_graph_border = $row['page_graph_border']; ! //$page_group_auth_id = $row['auth_view_group']; ! $l_choose_page_template = ""; ! $template_list = ""; } else --- 115,149 ---- // ****************************************************************** ! function page_edit($mode, $page_id) { ! global $template, $lang, $db, $board_config, $theme, $HTTP_GET_VARS, $HTTP_POST_VARS, $phpEx; ! $auth_fields = array('auth_view'); ! $auth_ary = array('auth_view' => AUTH_ALL); ! $auth_levels = array('ALL', 'REG', 'PRIVATE', 'MOD', 'ADMIN', 'ANONYMOUS'); ! $auth_const = array(AUTH_ALL, AUTH_REG, AUTH_ACL, AUTH_MOD, AUTH_ADMIN, AUTH_ANONYMOUS); ! $field_names = array('auth_view' => $lang['View']); // Show form to create/modify a page ! if ( $mode == 'edit' ) ! { // $newmode determines if we are going to INSERT or UPDATE after posting? $newmode = 'modify'; $buttonvalue = $lang['Update']; ! $row = get_info(PAGE_TABLE, 'page_id', $page_id); $page_name = $row['page_name']; $page_desc = $row['page_desc']; ! // $page_icon = $row['page_icon']; ! $page_icon = post_icons('page_icons/', $row['page_icon']); ! $page_header = empty($row['page_header']) ? 'overall_header.tpl' : $row['page_header']; $page_graph_border = $row['page_graph_border']; ! // $page_group_auth_id = $row['auth_view_group']; ! $l_choose_page_template = ''; ! $template_list = ''; } else *************** *** 172,211 **** $newmode = 'create'; $buttonvalue = $lang['Submit']; ! $page_name = $HTTP_POST_VARS[page_name]; ! $page_desc = $HTTP_POST_VARS[page_desc]; ! // $page_icon = empty($row['page_icon']) ? 'icon_home.gif' : $row['page_icon']; ! $page_icon = post_icons( 'page_icons/' ); $page_header = 'overall_header.tpl'; ! $page_graph_border = '' ; ! $sql = "SELECT max( page_id ) page_id FROM " . PAGE_TABLE; ! if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't get page information", "", __LINE__, __FILE__, $sql ); } ! $row = $db->sql_fetchrow( $result ); ! $page_id = $row['page_id'] + 1; ! // Page templates dropdown ! ! $template_list = get_list( "use_template", PAGE_TEMPLATES, "page_template_id", "template_name", 1, true ); ! $l_choose_page_template = empty( $lang['Choose_page_template'] ) ? "Choose page template" : $lang['Choose_page_template']; } ! $template->set_filenames( array( "edit_page" => "admin/mx_page_edit_body.tpl" ) ! ); - $s_hidden_fields = '<input type="hidden" name="mode" value="' . $newmode . '" /><input type="hidden" name="page_id" value="' . $page_id . '" />'; - - // Output values of individual // fields ! ! for( $j = 0; $j < count( $auth_fields ); $j++ ) { $custom_auth[$j] = ' <select name="' . $auth_fields[$j] . '">'; ! for( $k = 0; $k < count( $auth_levels ); $k++ ) { $selected = ( $row[$auth_fields[$j]] == $auth_const[$k] ) ? ' selected="selected"' : ''; --- 151,191 ---- $newmode = 'create'; $buttonvalue = $lang['Submit']; ! $page_name = $HTTP_POST_VARS['page_name']; ! $page_desc = $HTTP_POST_VARS['page_desc']; ! // $page_icon = empty($row['page_icon']) ? 'icon_home.gif' : $row['page_icon']; ! $page_icon = post_icons('page_icons/'); $page_header = 'overall_header.tpl'; ! $page_graph_border = ''; ! $sql = "SELECT MAX(page_id) AS page_id FROM " . PAGE_TABLE; ! if ( !( $result = $db->sql_query($sql) ) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't get page information", '', __LINE__, __FILE__, $sql); } ! $row = $db->sql_fetchrow($result); ! $page_id = $row['page_id'] + 1; ! // Page templates dropdown ! ! $template_list = get_list('use_template', PAGE_TEMPLATES, 'page_template_id', 'template_name', 1, true); ! $l_choose_page_template = empty($lang['Choose_page_template']) ? "Choose page template" : $lang['Choose_page_template']; } ! $template->set_filenames(array( ! 'edit_page' => 'admin/mx_page_edit_body.tpl') ! ); ! ! $s_hidden_fields = '<input type="hidden" name="mode" value="' . $newmode . '" /><input type="hidden" name="page_id" value="' . $page_id . '" />'; ! // Output values of individual // fields ! ! for( $j = 0; $j < count($auth_fields); $j++ ) { $custom_auth[$j] = ' <select name="' . $auth_fields[$j] . '">'; ! for( $k = 0; $k < count($auth_levels); $k++ ) { $selected = ( $row[$auth_fields[$j]] == $auth_const[$k] ) ? ' selected="selected"' : ''; *************** *** 214,262 **** $custom_auth[$j] .= '</select> '; ! // $custom_group_auth = mx_get_groups( $page_group_auth_id ); $cell_title = $field_names[$auth_fields[$j]]; ! $template->assign_block_vars( 'page_auth_titles', array( 'CELL_TITLE' => $cell_title ) ! ); ! $template->assign_block_vars( 'page_auth_data', array( ! 'S_AUTH_LEVELS_SELECT' => $custom_auth[$j] ) ! ); $s_column_span++; } ! $template->assign_vars( array( 'L_TITLE' => $lang['Page_admin'], ! 'L_EXPLAIN' => $lang['Page_admin_explain'], ! 'L_PAGE_NAME' => $lang['Page'], ! 'L_PAGE_DESC' => $lang['Page_desc'], ! 'L_PAGE_ID' => empty( $lang['Page_Id'] ) ? "Page Id" : $lang['Page_Id'] , ! 'L_PAGE_ICON' => empty( $lang['Page_icon'] ) ? "Page Icon" : $lang['Page_icon'] , ! 'L_PAGE_HEADER' => empty( $lang['Page_header'] ) ? "Page header file" : $lang['Page_header'] , ! 'L_PAGE_GRAPH_BORDER' => empty( $lang['Page_graph_border'] ) ? "Page border graphics" : $lang['Page_graph_border'] , ! 'L_PAGE_GRAPH_BORDER_EXPLAIN' => $lang['Page_graph_border_explain'], ! 'L_AUTH_TITLE' => empty( $lang['Auth_Page'] ) ? "Permission" : $lang['Auth_Page'], ! 'L_CHOOSE_PAGE_TEMPLATE' => $l_choose_page_template, ! ! 'PAGE_ID' => $page_id, ! 'PAGE_NAME' => $page_name, ! 'PAGE_DESC' => $page_desc, ! 'S_PAGE_ICON' => $page_icon, ! 'PAGE_HEADER' => $page_header, ! 'PAGE_GRAPH_BORDER' => $page_graph_border, ! 'S_ACTION' => append_sid( "admin_mx_page.php" ), ! 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_SUBMIT_VALUE' => $buttonvalue, ! 'S_FUNCTION_LIST' => $functionlist, ! 'S_TEMPLATE_LIST' => $template_list ! ) ); ! define( 'IN_ADMIN', 1 ); ! include( './page_header_admin.php' ); ! $template->pparse( "edit_page" ); ! include( './page_footer_admin.php' ); } // ****************************************************************** --- 194,243 ---- $custom_auth[$j] .= '</select> '; ! // $custom_group_auth = mx_get_groups($page_group_auth_id); $cell_title = $field_names[$auth_fields[$j]]; ! $template->assign_block_vars('page_auth_titles', array( ! 'CELL_TITLE' => $cell_title ! )); ! $template->assign_block_vars('page_auth_data', array( ! 'S_AUTH_LEVELS_SELECT' => $custom_auth[$j] ! )); $s_column_span++; } ! $template->assign_vars(array( ! 'L_TITLE' => $lang['Page_admin'], ! 'L_EXPLAIN' => $lang['Page_admin_explain'], ! 'L_PAGE_NAME' => $lang['Page'], ! 'L_PAGE_DESC' => $lang['Page_desc'], ! 'L_PAGE_ID' => empty($lang['Page_Id']) ? "Page Id" : $lang['Page_Id'] , ! 'L_PAGE_ICON' => empty($lang['Page_icon']) ? "Page Icon" : $lang['Page_icon'] , ! 'L_PAGE_HEADER' => empty($lang['Page_header']) ? "Page header file" : $lang['Page_header'] , ! 'L_PAGE_GRAPH_BORDER' => empty($lang['Page_graph_border']) ? "Page border graphics" : $lang['Page_graph_border'] , ! 'L_PAGE_GRAPH_BORDER_EXPLAIN'=> $lang['Page_graph_border_explain'], ! 'L_AUTH_TITLE' => empty($lang['Auth_Page']) ? "Permission" : $lang['Auth_Page'], ! 'L_CHOOSE_PAGE_TEMPLATE' => $l_choose_page_template, ! 'PAGE_ID' => $page_id, ! 'PAGE_NAME' => $page_name, ! 'PAGE_DESC' => $page_desc, ! 'S_PAGE_ICON' => $page_icon, ! 'PAGE_HEADER' => $page_header, ! 'PAGE_GRAPH_BORDER' => $page_graph_border, ! 'S_ACTION' => append_sid("admin_mx_page.$phpEx"), ! 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_SUBMIT_VALUE' => $buttonvalue, ! 'S_FUNCTION_LIST' => $functionlist, ! 'S_TEMPLATE_LIST' => $template_list ! )); ! define('IN_ADMIN', 1); ! include("./page_header_admin.$phpEx"); ! $template->pparse('edit_page'); ! include("./page_footer_admin.$phpEx"); } // ****************************************************************** *************** *** 265,354 **** // ****************************************************************** ! function page_modify( $mode, $page_id ) { ! global $template, $lang, $db, $board_config, $theme, $HTTP_POST_VARS; ! if ( $mode == "modify" ) { ! if ( $page_id != intval( $HTTP_POST_VARS['page_id_new'] ) ) { $sql = "UPDATE " . COLUMN_TABLE . " ! SET page_id = " . intval( $HTTP_POST_VARS['page_id_new'] ) . " WHERE page_id = " . $page_id; ! ! if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't update page information", "", __LINE__, __FILE__, $sql ); } } $sql = "UPDATE " . PAGE_TABLE . " ! SET page_id = " . intval( $HTTP_POST_VARS['page_id_new'] ) . ", ! page_name = '" . str_replace( "\'", "''", $HTTP_POST_VARS['page_name'] ) . "', ! page_desc = '" . str_replace( "\'", "''", $HTTP_POST_VARS['page_desc'] ) . "', ! page_icon = '" . str_replace( "\'", "''", $HTTP_POST_VARS['menuicons'] ) . "', ! page_header = '" . str_replace( "\'", "''", $HTTP_POST_VARS['page_header'] ) . "', ! page_graph_border = '" . str_replace( "\'", "''", $HTTP_POST_VARS['page_graph_border'] ) . "', auth_view = '" . $HTTP_POST_VARS['auth_view'] . "' WHERE page_id = " . $page_id; ! ! if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't update page information", "", __LINE__, __FILE__, $sql ); } } ! if ( $mode == "create" ) { $sql = "INSERT INTO " . PAGE_TABLE . " ( page_id, page_name, page_desc, page_icon, page_graph_border, auth_view, page_header ) VALUES ( '$HTTP_POST_VARS[page_id_new]' , '$HTTP_POST_VARS[page_name]', '$HTTP_POST_VARS[page_desc]', '$HTTP_POST_VARS[menuicons]', '$HTTP_POST_VARS[page_graph_border]', '$HTTP_POST_VARS[auth_view]', '$HTTP_POST_VARS[page_header]' )"; ! ! if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't insert page information", "", __LINE__, __FILE__, $sql ); ! } ! // Page templates ! if ( isset( $HTTP_POST_VARS['use_template'] ) || isset( $HTTP_GET_VARS['use_template'] ) ) { ! $use_template = ( isset( $HTTP_POST_VARS['use_template'] ) ) ? $HTTP_POST_VARS['use_template'] : $HTTP_GET_VARS['use_template']; } else { ! $use_template = ""; } ! if ( $use_template != "" && $use_template != "1" ) { $sql = " SELECT * FROM " . COLUMN_TEMPLATES . " WHERE page_template_id = " . $use_template; ! ! if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't get list of Columns for this template", "", __LINE__, __FILE__, $sql ); } ! $row = $db->sql_fetchrowset( $result ); ! for( $row_count = 0; $row_count < count( $row ); $row_count++ ) { $sql1 = "INSERT INTO " . COLUMN_TABLE . " (column_title, column_order, column_size, page_id) VALUES ( '" . $row[$row_count]['column_title'] . "', '" . $row[$row_count]['column_order'] . "', '" . $row[$row_count]['column_size'] . "', '" . $HTTP_POST_VARS['page_id_new'] . "' )"; ! if ( !$result = $db->sql_query( $sql1 ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't insert page information", "", __LINE__, __FILE__, $sql ); } } ! } ! // End of Page templates ! } ! // Update cache ! update_session_cache( $block_id ); ! ! $message = $lang['Portal_Config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_portal_config'], "<a href=\"" . append_sid( "admin_mx_page.php" ) . "\">", "</a>" ) . "<br /><br />" . sprintf( $lang['Click_return_admin_index'], "<a href=\"" . append_sid( "index.php?pane=right" ) . "\">", "</a>" ); ! mx_message_die( GENERAL_MESSAGE, $message ); ! }; // ****************************************************************** --- 246,331 ---- // ****************************************************************** ! function page_modify($mode, $page_id) { ! global $template, $lang, $db, $board_config, $theme, $HTTP_POST_VARS, $phpEx; ! if ( $mode == 'modify' ) { ! if ( $page_id != intval($HTTP_POST_VARS['page_id_new']) ) { $sql = "UPDATE " . COLUMN_TABLE . " ! SET page_id = " . intval($HTTP_POST_VARS['page_id_new']) . " WHERE page_id = " . $page_id; ! if ( !( $result = $db->sql_query($sql) ) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't update page information", '', __LINE__, __FILE__, $sql); } } $sql = "UPDATE " . PAGE_TABLE . " ! SET page_id = " . intval($HTTP_POST_VARS['page_id_new']) . ", ! page_name = '" . str_replace("\'", "''", $HTTP_POST_VARS['page_name']) . "', ! page_desc = '" . str_replace("\'", "''", $HTTP_POST_VARS['page_desc']) . "', ! page_icon = '" . str_replace("\'", "''", $HTTP_POST_VARS['menuicons']) . "', ! page_header = '" . str_replace("\'", "''", $HTTP_POST_VARS['page_header']) . "', ! page_graph_border = '" . str_replace("\'", "''", $HTTP_POST_VARS['page_graph_border']) . "', auth_view = '" . $HTTP_POST_VARS['auth_view'] . "' WHERE page_id = " . $page_id; ! if ( !( $result = $db->sql_query($sql) ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't update page information", '', __LINE__, __FILE__, $sql); } } ! if ( $mode == 'create' ) { $sql = "INSERT INTO " . PAGE_TABLE . " ( page_id, page_name, page_desc, page_icon, page_graph_border, auth_view, page_header ) VALUES ( '$HTTP_POST_VARS[page_id_new]' , '$HTTP_POST_VARS[page_name]', '$HTTP_POST_VARS[page_desc]', '$HTTP_POST_VARS[menuicons]', '$HTTP_POST_VARS[page_graph_border]', '$HTTP_POST_VARS[auth_view]', '$HTTP_POST_VARS[page_header]' )"; ! if ( !( $result = $db->sql_query($sql) ) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't insert page information", '', __LINE__, __FILE__, $sql); ! } ! // Page templates ! if ( isset($HTTP_POST_VARS['use_template']) || isset($HTTP_GET_VARS['use_template']) ) { ! $use_template = ( isset($HTTP_POST_VARS['use_template']) ) ? $HTTP_POST_VARS['use_template'] : $HTTP_GET_VARS['use_template']; } else { ! $use_template = ''; } ! if ( $use_template != '' && $use_template != '1' ) { $sql = " SELECT * FROM " . COLUMN_TEMPLATES . " WHERE page_template_id = " . $use_template; ! if ( !( $result = $db->sql_query($sql) ) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't get list of Columns for this template", '', __LINE__, __FILE__, $sql); } ! $row = $db->sql_fetchrowset($result); ! for( $row_count = 0; $row_count < count($row); $row_count++ ) { $sql1 = "INSERT INTO " . COLUMN_TABLE . " (column_title, column_order, column_size, page_id) VALUES ( '" . $row[$row_count]['column_title'] . "', '" . $row[$row_count]['column_order'] . "', '" . $row[$row_count]['column_size'] . "', '" . $HTTP_POST_VARS['page_id_new'] . "' )"; ! if ( !( $result = $db->sql_query($sql1) ) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't insert page information", '', __LINE__, __FILE__, $sql); } } ! } ! // End of Page templates ! } ! // Update cache ! update_session_cache($block_id); ! $message = $lang['Portal_Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_portal_config'], '<a href="' . append_sid("admin_mx_page.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>'); ! ! mx_message_die(GENERAL_MESSAGE, $message); ! } // ****************************************************************** *************** *** 356,367 **** // ****************************************************************** ! function page_delete( $mode, $page_id ) { ! global $template, $lang, $db, $board_config, $theme, $HTTP_POST_VARS; ! if ( $mode == "delete" ) { ! $template->set_filenames( array( "admin_page" => "admin/mx_page_delete_body.tpl" ) ! ); $buttonvalue = $lang['Delete']; --- 333,345 ---- // ****************************************************************** ! function page_delete($mode, $page_id) { ! global $template, $lang, $db, $board_config, $theme, $HTTP_POST_VARS, $phpEx; ! if ( $mode == 'delete' ) { ! $template->set_filenames(array( ! 'admin_page' => 'admin/mx_page_delete_body.tpl') ! ); $buttonvalue = $lang['Delete']; *************** *** 370,433 **** $s_hidden_fields = '<input type="hidden" name="mode" value="' . $newmode . '" />'; ! $page_name = get_list( "page_id", PAGE_TABLE, 'page_id', 'page_name', $page_id, true ); ! ! $template->assign_vars( array( 'NAME' => $name, ! ! 'L_PAGE_DELETE' => $lang['Page_admin'], ! 'L_PAGE_DELETE_EXPLAIN' => $lang['Page_admin_explain'], ! 'L_PAGE_NAME' => $lang['Page'], ! 'NAME' => $page_name, ! "S_HIDDEN_FIELDS" => $s_hidden_fields, ! 'S_PAGE_ACTION' => append_sid( "admin_mx_page.php" ), ! 'S_SUBMIT_VALUE' => $buttonvalue ! ) ); ! define( 'IN_ADMIN', 1 ); ! include_once( './page_header_admin.php' ); ! $template->pparse( "admin_page" ); ! include_once( './page_footer_admin.php' ); } ! if ( $mode == "delpage" ) { $sql = "SELECT column_id FROM " . COLUMN_TABLE . " WHERE page_id = " . $page_id; ! if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't get list of Column", "", __LINE__, __FILE__, $sql ); } ! while ( $row = $db->sql_fetchrow( $result ) ) { $sql = "DELETE FROM " . COLUMN_BLOCK_TABLE . " ! WHERE column_id = " . $row[column_id] ; ! if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't delete column/block information", "", __LINE__, __FILE__, $sql ); } } $sql = "DELETE FROM " . COLUMN_TABLE . " WHERE page_id = " . $page_id; ! ! if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't delete page information", "", __LINE__, __FILE__, $sql ); } $sql = "DELETE FROM " . PAGE_TABLE . " WHERE page_id = " . $page_id; ! ! if ( !$result = $db->sql_query( $sql ) ) { ! mx_message_die( GENERAL_ERROR, "Couldn't delete page information", "", __LINE__, __FILE__, $sql ); } ! $message = $lang['Portal_Config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_portal_config'], "<a href=\"" . append_sid( "admin_mx_page.php" ) . "\">", "</a>" ) . "<br /><br />" . sprintf( $lang['Click_return_admin_index'], "<a href=\"" . append_sid( "index.php?pane=right" ) . "\">", "</a>" ); // Update cache ! update_session_cache( $block_id ); ! ! mx_message_die( GENERAL_MESSAGE, $message ); } ! }; ?> \ No newline at end of file --- 348,407 ---- $s_hidden_fields = '<input type="hidden" name="mode" value="' . $newmode . '" />'; ! $page_name = get_list('page_id', PAGE_TABLE, 'page_id', 'page_name', $page_id, true); ! $template->assign_vars(array( ! 'L_PAGE_DELETE' => $lang['Page_admin'], ! 'L_PAGE_DELETE_EXPLAIN' => $lang['Page_admin_explain'], ! 'L_PAGE_NAME' => $lang['Page'], ! 'NAME' => $page_name, ! 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_PAGE_ACTION' => append_sid("admin_mx_page.$phpEx"), ! 'S_SUBMIT_VALUE' => $buttonvalue ! )); ! define('IN_ADMIN', 1); ! include_once("./page_header_admin.$phpEx"); ! $template->pparse('admin_page'); ! include_once("./page_footer_admin.$phpEx"); } ! if ( $mode == 'delpage' ) { $sql = "SELECT column_id FROM " . COLUMN_TABLE . " WHERE page_id = " . $page_id; ! if ( !( $result = $db->sql_query($sql) ) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't get list of Column", '', __LINE__, __FILE__, $sql); } ! while( $row = $db->sql_fetchrow($result) ) { $sql = "DELETE FROM " . COLUMN_BLOCK_TABLE . " ! WHERE column_id = " . $row['column_id']; ! if ( !( $result = $db->sql_query($sql) ) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't delete column/block information", '', __LINE__, __FILE__, $sql); } } $sql = "DELETE FROM " . COLUMN_TABLE . " WHERE page_id = " . $page_id; ! if ( !( $result = $db->sql_query($sql) ) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't delete page information", '', __LINE__, __FILE__, $sql); } $sql = "DELETE FROM " . PAGE_TABLE . " WHERE page_id = " . $page_id; ! if ( !( $result = $db->sql_query($sql) ) ) { ! mx_message_die(GENERAL_ERROR, "Couldn't delete page information", '', __LINE__, __FILE__, $sql); } ! $message = $lang['Portal_Config_updated'] . '<br /><br />' . sprintf($lang['Click_return_portal_config'], '<a href="' . append_sid("admin_mx_page.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>'); // Update cache ! update_session_cache($block_id); ! ! mx_message_die(GENERAL_MESSAGE, $message); } ! } ?> \ No newline at end of file |
|
From: Markus P. <mar...@us...> - 2005-04-03 12:54:35
|
Update of /cvsroot/mxbb/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18532 Modified Files: index.php Log Message: Code clean-up. Fixed usage of mx_request_vars. Index: index.php =================================================================== RCS file: /cvsroot/mxbb/core/index.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** index.php 21 Mar 2005 20:59:32 -0000 1.26 --- index.php 3 Apr 2005 12:54:24 -0000 1.27 *************** *** 26,31 **** $mx_root_path = "./"; ! include_once( $mx_root_path . 'extension.inc' ); ! include_once( $mx_root_path . 'common.' . $phpEx ); $view_page = false; --- 26,31 ---- $mx_root_path = "./"; ! include($mx_root_path . 'extension.inc'); ! include($mx_root_path . 'common.' . $phpEx); $view_page = false; *************** *** 33,43 **** // Page selector ! $page_id = $mx_request_vars->is_get('page') ? $mx_request_vars->get('page', MX_TYPE_INT, '1') : $mx_request_vars->post('page', MX_TYPE_INT, '1'); // Start session management ! $userdata = session_pagestart( $user_ip, - ( 1000 + $page_id ) ); ! mx_init_userprefs( $userdata ); ! if ( $mx_request_vars->is_get('mx_copy') || $mx_request_vars->is_post('mx_copy') ) { compose_mx_copy(); --- 33,43 ---- // Page selector ! $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1); // Start session management ! $userdata = session_pagestart($user_ip, - ( 1000 + $page_id )); ! mx_init_userprefs($userdata); ! if ( $mx_request_vars->is_request('mx_copy') ) { compose_mx_copy(); *************** *** 51,57 **** { $HTTP_SESSION_VARS['mx_session_recached'] = $portal_config['portal_recached']; ! if ( defined( 'MX_DEBUG' ) ) { ! echo( 'populating page block http_session' ); } // Populate all mx_pages session vars, for faster navigation --- 51,57 ---- { $HTTP_SESSION_VARS['mx_session_recached'] = $portal_config['portal_recached']; ! if ( defined('MX_DEBUG') ) { ! echo('populating page block http_session'); } // Populate all mx_pages session vars, for faster navigation *************** *** 62,69 **** $block_rows = $HTTP_SESSION_VARS['mx_pages']['page_' . $page_id]['blocks']; ! $total_block = count( $block_rows ); $column_rows = $HTTP_SESSION_VARS['mx_pages']['page_' . $page_id]['columns']; ! $total_column = count( $column_rows ); $page_title .= $page_row['page_name']; --- 62,69 ---- $block_rows = $HTTP_SESSION_VARS['mx_pages']['page_' . $page_id]['blocks']; ! $total_block = count($block_rows); $column_rows = $HTTP_SESSION_VARS['mx_pages']['page_' . $page_id]['columns']; ! $total_column = count($column_rows); $page_title .= $page_row['page_name']; *************** *** 72,104 **** // Page auth ! $is_auth_ary = array(); ! $is_auth_ary = page_auth( AUTH_VIEW, $userdata, $page_row['page_auth_view'], $page_row['page_auth_view_group'] ); if ( !$is_auth_ary[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__, "" ); } ! else if ( !$is_auth_ary[auth_view] && !$userdata['session_logged_in'] ) { ! mx_redirect( append_sid( $mx_root_path . "login.$phpEx?redirect=" . mx_this_url(), true ) ); } ! include( $mx_root_path . 'includes/page_header.' . $phpEx ); // Initialize template ! $layouttemplate = new mx_Template( $template->root, $board_config, $db ); - $layouttemplate->set_filenames( array( - "mx_main_layout" => "mx_main_layout.tpl" ) - ); - // Generate the fold/unfold menu navigation switches (cookie based) ! if ( ( $HTTP_COOKIE_VARS['phpbbEdit_Blocks'] ) != '' ) { $edit_on = $HTTP_COOKIE_VARS['phpbbEdit_Blocks']; } ! else if ( $userdata['user_level'] == ADMIN ) { $edit_on = true; --- 72,103 ---- // Page auth ! $is_auth_ary = page_auth(AUTH_VIEW, $userdata, $page_row['page_auth_view'], $page_row['page_auth_view_group']); if ( !$is_auth_ary[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 ( !$is_auth_ary[auth_view] && !$userdata['session_logged_in'] ) { ! mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=" . mx_this_url(), true)); } ! include($mx_root_path . 'includes/page_header.' . $phpEx); // Initialize template ! $layouttemplate = new mx_Template($template->root, $board_config, $db); ! ! $layouttemplate->set_filenames(array( ! 'mx_main_layout' => 'mx_main_layout.tpl') ! ); // Generate the fold/unfold menu navigation switches (cookie based) ! if ( !empty($HTTP_COOKIE_VARS['phpbbEdit_Blocks']) ) { $edit_on = $HTTP_COOKIE_VARS['phpbbEdit_Blocks']; } ! elseif ( $userdata['user_level'] == ADMIN ) { $edit_on = true; *************** *** 119,147 **** // Send optional column class ! if ( $total_column == 1 ) { $colclass = 'middlecol'; } ! else { ! switch ( $column ) { ! case '0': $colclass = 'leftcol'; break; ! case '1': $colclass = 'middlecol'; break; ! case '2': $colclass = 'rightcol'; break; } } ! // Pass column data ! ! $layouttemplate->assign_block_vars( 'layout_column', array( 'COL_CLASS' => $colclass, ! 'BLOCK_SIZE' => $block_size ! ) ); $column_contents = array(); --- 118,147 ---- // Send optional column class ! if ( $total_column == 1 ) { $colclass = 'middlecol'; } ! else { ! switch( $column ) { ! case 0: $colclass = 'leftcol'; break; ! case 1: $colclass = 'middlecol'; break; ! case 2: $colclass = 'rightcol'; break; } } ! // Pass column data ! ! $layouttemplate->assign_block_vars('layout_column', array( ! 'COL_CLASS' => $colclass, ! 'BLOCK_SIZE' => $block_size ! )); $column_contents = array(); *************** *** 149,157 **** $show_edit_blocks_icon = false; ! for( $block = 0; $block < $total_block; $block++ ) { // Validate this block is really visible and exists for the column ! if ( $column_rows[$column]['column_id'] == $block_rows[$block]['column_id'] ) { --- 149,157 ---- $show_edit_blocks_icon = false; ! for( $block = 0; $block < $total_block; $block++ ) { // Validate this block is really visible and exists for the column ! if ( $column_rows[$column]['column_id'] == $block_rows[$block]['column_id'] ) { *************** *** 159,179 **** $block_file = $block_rows[$block]['function_file']; $dynamic_main_block_id = ''; ! // Block view auth ----------------------------------------------------------------------------------------------------- ! ! $is_auth_ary = array(); $is_auth_ary = block_auth( AUTH_VIEW, $mx_block_id, $userdata, $block_rows[$block]['auth_view'], $block_rows[$block]['auth_view_group'] ); ! if ( ($is_auth_ary[auth_view] && $block_rows[$block]['show_block'] == 1) || $is_auth_ary[auth_mod] ) { ! //$layouttemplate->assign_block_vars( 'layoutcol', array() ); ! $template = new mx_Template( $template->root, $board_config, $db ); $module_root_path = $block_rows[$block]['module_path']; ! $title_class = $block_rows[$block]['function_file'] != 'mx_multiple_blocks.php' ? 'mxthHead' : 'mxthHead_none'; ! ob_start(); ! include( $module_root_path . $block_file ); $column_contents[$column] = ob_get_contents(); ob_end_clean(); --- 159,178 ---- $block_file = $block_rows[$block]['function_file']; $dynamic_main_block_id = ''; ! // Block view auth ----------------------------------------------------------------------------------------------------- ! $is_auth_ary = block_auth( AUTH_VIEW, $mx_block_id, $userdata, $block_rows[$block]['auth_view'], $block_rows[$block]['auth_view_group'] ); ! if ( ($is_auth_ary[auth_view] && $block_rows[$block]['show_block'] == 1) || $is_auth_ary[auth_mod] ) { ! //$layouttemplate->assign_block_vars('layoutcol', array()); ! $template = new mx_Template($template->root, $board_config, $db); $module_root_path = $block_rows[$block]['module_path']; ! $title_class = $block_rows[$block]['function_file'] != 'mx_multiple_blocks.php' ? 'mxthHead' : 'mxthHead_none'; ! ob_start(); ! include($module_root_path . $block_file); $column_contents[$column] = ob_get_contents(); ob_end_clean(); *************** *** 182,237 **** if ( $block_rows[$block]['show_block'] == 1 || $is_auth_ary[auth_mod] ) { ! $layouttemplate->assign_block_vars( 'layout_column.blocks', array( ! 'BLOCK' => $column_contents[$column], ! 'BLOCK_SIZE' => ( !empty( $block_size ) ? $block_size : '100%' ) ! ) ); ! //if ( $block_rows[$block]['function_file'] != 'mx_multiple_blocks.php' ) //{ // $layouttemplate->assign_block_vars('layout_column.blocks.no_split', array()); //} ! // Switch: graphical block borders ! ! if ( !empty( $page_row['page_graph_border'] ) ) { if ( file_exists($mx_root_path . TEMPLATE_ROOT_PATH . 'images/' . $page_row['page_graph_border'] . '1-1.gif') ) { ! $layouttemplate->assign_block_vars( 'layout_column.blocks.graph_border', array( 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'PREFIX' => $page_row['page_graph_border'] ! ) ); } } ! ! if ( $block_rows[$block]['show_stats'] == 1 && !empty( $block_rows[$block]['block_time'] ) && !empty( $block_rows[$block]['block_editor_id'] ) ) { ! $editor_name_tmp = get_userdata( $block_rows[$block]['block_editor_id'] ); $editor_name = $editor_name_tmp['username']; ! $edit_time = create_date( $board_config['default_dateformat'], $block_rows[$block]['block_time'], $board_config['board_timezone'] ); ! ! $layouttemplate->assign_block_vars( 'layout_column.blocks.block_stats', array( ! 'L_BLOCK_UPDATED' => $lang['Block_updated_by'], ! 'EDITOR_NAME' => $editor_name, ! 'EDIT_TIME' => $edit_time ! ) ); } else { ! $layouttemplate->assign_block_vars( 'layout_column.blocks.no_stats', array() ); ! } } } // End View auth ! // Block edit auth --------------------------------------------------------------------------------- $mx_block_edit = false; ! ! $is_auth_ary = array(); ! $is_auth_ary = block_auth( AUTH_EDIT, $mx_block_id , $userdata, $block_rows[$block]['auth_edit'], $block_rows[$block]['auth_edit_group'] ); ! if ( ( ($is_auth_ary[auth_edit] && $block_rows[$block]['show_block'] == 1 ) || $is_auth_ary[auth_mod]) ) { $show_edit_blocks_icon = true; $mx_block_edit = true; ! // Define some hidden Edit Block parameters $s_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; --- 181,236 ---- if ( $block_rows[$block]['show_block'] == 1 || $is_auth_ary[auth_mod] ) { ! $layouttemplate->assign_block_vars('layout_column.blocks', array( ! 'BLOCK' => $column_contents[$column], ! 'BLOCK_SIZE' => ( !empty($block_size) ? $block_size : '100%' ) ! )); ! //if ( $block_rows[$block]['function_file'] != 'mx_multiple_blocks.php' ) //{ // $layouttemplate->assign_block_vars('layout_column.blocks.no_split', array()); //} ! // Switch: graphical block borders ! ! if ( !empty($page_row['page_graph_border']) ) { if ( file_exists($mx_root_path . TEMPLATE_ROOT_PATH . 'images/' . $page_row['page_graph_border'] . '1-1.gif') ) { ! $layouttemplate->assign_block_vars('layout_column.blocks.graph_border', array( ! 'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH, ! 'PREFIX' => $page_row['page_graph_border'] ! )); } } ! ! if ( $block_rows[$block]['show_stats'] == 1 && !empty($block_rows[$block]['block_time']) && !empty($block_rows[$block]['block_editor_id']) ) { ! $editor_name_tmp = get_userdata($block_rows[$block]['block_editor_id']); $editor_name = $editor_name_tmp['username']; ! $edit_time = create_date($board_config['default_dateformat'], $block_rows[$block]['block_time'], $board_config['board_timezone']); ! ! $layouttemplate->assign_block_vars('layout_column.blocks.block_stats', array( ! 'L_BLOCK_UPDATED' => $lang['Block_updated_by'], ! 'EDITOR_NAME' => $editor_name, ! 'EDIT_TIME' => $edit_time ! )); } else { ! $layouttemplate->assign_block_vars('layout_column.blocks.no_stats', array()); ! } } } // End View auth ! // Block edit auth --------------------------------------------------------------------------------- $mx_block_edit = false; ! ! $is_auth_ary = block_auth(AUTH_EDIT, $mx_block_id , $userdata, $block_rows[$block]['auth_edit'], $block_rows[$block]['auth_edit_group']); ! if ( ( ($is_auth_ary[auth_edit] && $block_rows[$block]['show_block'] == 1 ) || $is_auth_ary[auth_mod]) ) { $show_edit_blocks_icon = true; $mx_block_edit = true; ! // Define some hidden Edit Block parameters $s_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />'; *************** *** 243,282 **** // Switch between different block types ! $block_edit_img = ( ( $block_file == 'mx_multiple_blocks.php' ) ? 'block_edit_split.gif' : ( $block_file == 'mx_textblock_blog.php' ? 'block_edit_admin.gif' : 'block_edit.gif' ) ) ; $split_admin_file = !empty( $block_rows[$block]['function_admin'] ) ? $block_rows[$block]['function_admin'] : 'admin/admin_mx_block.php'; ! // Dynamic Block Itself if ( !empty($dynamic_main_block_id) ) ! { ! $is_dynamic_auth_ary = array(); ! $is_dynamic_auth_ary = block_auth( AUTH_EDIT, $dynamic_main_block_id , $userdata, $dynamic_block_config[$dynamic_main_block_id]['auth_edit'], $dynamic_block_config[$dynamic_main_block_id]['auth_edit_group'] ); ! ! if ( ($is_dynamic_auth_ary[auth_edit] || $is_dynamic_auth_ary[auth_mod]) ) ! { ! $block_desc = !empty( $dynamic_block_config[$dynamic_main_block_id]['block_desc'] ) ? ' (' . $dynamic_block_config[$dynamic_main_block_id]['block_desc'] . ')' : ''; ! $edit_url = append_sid( $mx_root_path . 'admin/admin_mx_block.php' . "?sid=" . $userdata['session_id'] ); $edit_img = '<input type="image" class ="editblock" src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/block_icons/' . 'block_edit_admin.gif' . '" alt="' . $lang['Block_Edit'] . $block_rows[$block]['block_id'] . '" title="' . $lang['Block_Edit'] . ' :: ' . $dynamic_block_config[$dynamic_main_block_id]['block_title'] . $block_desc . '">'; ! $s_hidden_fields .= '<input type="hidden" name="block_id" value="' . $dynamic_main_block_id . '" />'; ! ! $layouttemplate->assign_block_vars( 'layout_column.blocks.edit', array( ! 'BLOCK_SIZE' => ( !empty( $block_size ) ? $block_size : '100%' ), ! 'L_TITLE' => $title, ! 'L_DESC' => $b_description, ! 'EDIT_ACTION' => $edit_url, ! 'EDIT_IMG' => $edit_img, ! 'TITLECLASS' => $title_class, ! 'S_HIDDEN_FORM_FIELDS' => $s_hidden_fields ! ) ); ! ! if ( $edit_on ) ! { ! $layouttemplate->assign_block_vars( 'layout_column.blocks.edit.switch_edit_on', array() ); ! } ! else ! { ! $layouttemplate->assign_block_vars( 'layout_column.blocks.edit.switch_edit_off', array() ); ! } } } --- 242,273 ---- // Switch between different block types ! $block_edit_img = ( ( $block_file == 'mx_multiple_blocks.php' ) ? 'block_edit_split.gif' : ( $block_file == 'mx_textblock_blog.php' ? 'block_edit_admin.gif' : 'block_edit.gif' ) ) ; $split_admin_file = !empty( $block_rows[$block]['function_admin'] ) ? $block_rows[$block]['function_admin'] : 'admin/admin_mx_block.php'; ! // Dynamic Block Itself if ( !empty($dynamic_main_block_id) ) ! { ! $is_dynamic_auth_ary = block_auth(AUTH_EDIT, $dynamic_main_block_id , $userdata, $dynamic_block_config[$dynamic_main_block_id]['auth_edit'], $dynamic_block_config[$dynamic_main_block_id]['auth_edit_group']); ! ! if ( $is_dynamic_auth_ary[auth_edit] || $is_dynamic_auth_ary[auth_mod] ) ! { ! $block_desc = !empty($dynamic_block_config[$dynamic_main_block_id]['block_desc']) ? ' (' . $dynamic_block_config[$dynamic_main_block_id]['block_desc'] . ')' : ''; ! $edit_url = append_sid($mx_root_path . 'admin/admin_mx_block.php' . "?sid=" . $userdata['session_id']); $edit_img = '<input type="image" class ="editblock" src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/block_icons/' . 'block_edit_admin.gif' . '" alt="' . $lang['Block_Edit'] . $block_rows[$block]['block_id'] . '" title="' . $lang['Block_Edit'] . ' :: ' . $dynamic_block_config[$dynamic_main_block_id]['block_title'] . $block_desc . '">'; ! $s_hidden_fields .= '<input type="hidden" name="block_id" value="' . $dynamic_main_block_id . '" />'; ! ! $layouttemplate->assign_block_vars('layout_column.blocks.edit', array( ! 'BLOCK_SIZE' => ( !empty( $block_size ) ? $block_size : '100%' ), ! 'L_TITLE' => $title, ! 'L_DESC' => $b_description, ! 'EDIT_ACTION' => $edit_url, ! 'EDIT_IMG' => $edit_img, ! 'TITLECLASS' => $title_class, ! 'S_HIDDEN_FORM_FIELDS' => $s_hidden_fields ! )); ! ! $layouttemplate->assign_block_vars('layout_column.blocks.edit.switch_edit_' . ( $edit_on ? 'on' : 'off' ), array()); } } *************** *** 285,339 **** $edit_url = append_sid( $mx_root_path . $split_admin_file . "?sid=" . $userdata['session_id'] ); $edit_img = '<input type="image" class ="editblock" src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/block_icons/' . $block_edit_img . '" alt="' . $lang['Block_Edit'] . ' :: ' . $block_rows[$block]['block_title'] . $block_desc . '" title="' . $lang['Block_Edit'] . ' :: ' . $block_rows[$block]['block_title'] . $block_desc . '">'; ! $s_hidden_fields .= '<input type="hidden" name="block_id" value="' . $mx_block_id . '" />'; ! $layouttemplate->assign_block_vars( 'layout_column.blocks.edit', array( ! 'BLOCK_SIZE' => ( !empty( $block_size ) ? $block_size : '100%' ), ! 'L_TITLE' => $title, ! 'L_DESC' => $b_description, ! 'EDIT_ACTION' => $edit_url, ! 'EDIT_IMG' => $edit_img, ! 'TITLECLASS' => $title_class, ! 'S_HIDDEN_FORM_FIELDS' => $s_hidden_fields ! ) ); // Is the Block hidden ? ! if ( $block_rows[$block]['show_block'] == 0 ) { $hidden_img = '<img src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/block_icons/block_hidden.gif" alt="' . $lang['Hidden_block'] . '">'; ! $layouttemplate->assign_block_vars( 'layout_column.blocks.edit.hidden_block', array( ! 'HIDDEN_BLOCK' => $hidden_img ! ) ); } ! // Switch: Edit Block ! ! if ( $edit_on ) ! { ! $layouttemplate->assign_block_vars( 'layout_column.blocks.edit.switch_edit_on', array() ); ! } ! else ! { ! $layouttemplate->assign_block_vars( 'layout_column.blocks.edit.switch_edit_off', array() ); ! } } // End Edit auth // Switch: show block header ------------------- if ( $block_rows[$block]['show_block'] == 1 && ( $mx_block_edit || $block_rows[$block]['show_title'] == 1 ) || $is_auth_ary[auth_mod] ) ! { $layouttemplate->assign_block_vars('layout_column.blocks.block_header', array()); ! // Switch: show title ------------------- ! if ( $block_rows[$block]['show_title'] == 1 || $is_auth_ary[auth_mod] ) ! { $this_block_title = $block_rows[$block]['show_title'] == 0 && $is_auth_ary[auth_mod] ? '(' . $block_rows[$block]['block_title'] . ')' : $block_rows[$block]['block_title']; $layouttemplate->assign_block_vars('layout_column.blocks.show_title', array( ! 'L_TITLE' => $this_block_title, ! 'TITLECLASS' => $title_class )); ! } } ! } } // for ... blocks --- 276,324 ---- $edit_url = append_sid( $mx_root_path . $split_admin_file . "?sid=" . $userdata['session_id'] ); $edit_img = '<input type="image" class ="editblock" src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/block_icons/' . $block_edit_img . '" alt="' . $lang['Block_Edit'] . ' :: ' . $block_rows[$block]['block_title'] . $block_desc . '" title="' . $lang['Block_Edit'] . ' :: ' . $block_rows[$block]['block_title'] . $block_desc . '">'; ! $s_hidden_fields .= '<input type="hidden" name="block_id" value="' . $mx_block_id . '" />'; ! $layouttemplate->assign_block_vars('layout_column.blocks.edit', array( ! 'BLOCK_SIZE' => ( !empty( $block_size ) ? $block_size : '100%' ), ! 'L_TITLE' => $title, ! 'L_DESC' => $b_description, ! 'EDIT_ACTION' => $edit_url, ! 'EDIT_IMG' => $edit_img, ! 'TITLECLASS' => $title_class, ! 'S_HIDDEN_FORM_FIELDS' => $s_hidden_fields ! )); // Is the Block hidden ? ! if ( $block_rows[$block]['show_block'] == 0 ) { $hidden_img = '<img src="' . PORTAL_URL . TEMPLATE_ROOT_PATH . 'images/block_icons/block_hidden.gif" alt="' . $lang['Hidden_block'] . '">'; ! $layouttemplate->assign_block_vars('layout_column.blocks.edit.hidden_block', array( ! 'HIDDEN_BLOCK' => $hidden_img ! )); } ! // Switch: Edit Block ! ! $layouttemplate->assign_block_vars( 'layout_column.blocks.edit.switch_edit_' . ( $edit_on ? 'on' : 'off' ), array() ); ! } // End Edit auth // Switch: show block header ------------------- if ( $block_rows[$block]['show_block'] == 1 && ( $mx_block_edit || $block_rows[$block]['show_title'] == 1 ) || $is_auth_ary[auth_mod] ) ! { $layouttemplate->assign_block_vars('layout_column.blocks.block_header', array()); ! // Switch: show title ------------------- ! if ( $block_rows[$block]['show_title'] == 1 || $is_auth_ary[auth_mod] ) ! { $this_block_title = $block_rows[$block]['show_title'] == 0 && $is_auth_ary[auth_mod] ? '(' . $block_rows[$block]['block_title'] . ')' : $block_rows[$block]['block_title']; $layouttemplate->assign_block_vars('layout_column.blocks.show_title', array( ! 'L_TITLE' => $this_block_title, ! 'TITLECLASS' => $title_class )); ! } } ! } } // for ... blocks *************** *** 342,350 **** // Output page ! $layouttemplate->pparse( "mx_main_layout" ); // Output footer ! include( $mx_root_path . 'includes/page_tail.' . $phpEx ); ?> \ No newline at end of file --- 327,335 ---- // Output page ! $layouttemplate->pparse('mx_main_layout'); // Output footer ! include($mx_root_path . 'includes/page_tail.' . $phpEx); ?> \ No newline at end of file |
|
From: Markus P. <mar...@us...> - 2005-04-03 12:34:13
|
Update of /cvsroot/mxbb/core/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13474 Modified Files: mx_install.php Log Message: Remove template S_INSTALL_METHOD (unused). Index: mx_install.php =================================================================== RCS file: /cvsroot/mxbb/core/install/mx_install.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** mx_install.php 26 Mar 2005 02:48:04 -0000 1.38 --- mx_install.php 3 Apr 2005 12:34:04 -0000 1.39 *************** *** 54,58 **** // This is shown in the top right corner of the installation panels. // ! define('INSTALLER_VERSION', '1.0.7'); define('INSTALLER_NAME', 'mxBB-Installer'); --- 54,58 ---- // This is shown in the top right corner of the installation panels. // ! define('INSTALLER_VERSION', '1.0.8'); define('INSTALLER_NAME', 'mxBB-Installer'); *************** *** 921,925 **** 'L_SUBMIT' => $lang['Start_Install'], - 'S_INSTALL_METHOD' => $select_install_method, 'S_PHPBB_PATH' => $select_phpbb_path, 'MX_DB_PREFIX' => ( !empty($mx_table_prefix) ? $mx_table_prefix : 'mx_' ), --- 921,924 ---- |
|
From: Jon O. <jon...@us...> - 2005-04-02 22:03:30
|
Update of /cvsroot/mxbb/mx_kb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12059/modules/mx_kb Modified Files: db_install.php db_upgrade.php mx_install_readme.htm Log Message: final fix before release Index: mx_install_readme.htm =================================================================== RCS file: /cvsroot/mxbb/mx_kb/mx_install_readme.htm,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** mx_install_readme.htm 16 Jan 2005 01:02:41 -0000 1.9 --- mx_install_readme.htm 2 Apr 2005 22:03:20 -0000 1.10 *************** *** 219,232 **** <table> <tr> ! <td colspan="2"><p><b><font size="5">MX Module - Knowledge Base <br> ! <font size="2">v. 1.08</font></font></b></p> <p><span style="font-weight: bold"><span style="font-size: 16px; line-height: normal">Module</span></span> <br /> ! - for Mx Portal v. 2.7.5+</p> <p><strong>Author</strong><br /> Haplo<br /> <br /> <span style="font-weight: bold">Description</span> <br /> ! The MX Module is an addon product for the MX-portal.</p> <p><strong>Features</strong> <br /> Easy to use and install/uninstall module.</p> --- 219,233 ---- <table> <tr> ! <td colspan="2"><p><b><font size="5">mxBB</font><font size="5"> Module - ! Knowledge Base <br> ! <font size="2">v. 2.0.1</font></font></b></p> <p><span style="font-weight: bold"><span style="font-size: 16px; line-height: normal">Module</span></span> <br /> ! - for Mx Portal v. 2.7.5+ (with some notes, see below)</p> <p><strong>Author</strong><br /> Haplo<br /> <br /> <span style="font-weight: bold">Description</span> <br /> ! The mxBB Module is an addon product for the mxBB Portal.</p> <p><strong>Features</strong> <br /> Easy to use and install/uninstall module.</p> *************** *** 251,263 **** <p>All install notes are maintained at www.mx-system.com, <a href="http://www.mx-system.com/forum/viewforum.php?f=11">here</a>.<br> <br> ! To summarize:<br> ! If installing from scratch, use import module in the AdminCP.<br> ! If upgrading, use the upgrade option in the AdminCP<br> ! If uninstalling, use the delete feature in the AdminCP</p> ! <p>Note: If upgrading, do NOT delete module prior to upgrading, or else ! you'll lose all module data!<br /> ! <br /> <a href="#top"> Back to Top</a> <br /> ! <br /><a name="themes"> <br /> <span style="font-weight: bold">II. Additional Styles</span> <br /> --- 252,298 ---- <p>All install notes are maintained at www.mx-system.com, <a href="http://www.mx-system.com/forum/viewforum.php?f=11">here</a>.<br> <br> ! <i>To summarize:</i></p> ! <ul> ! <li> If installing from scratch, use the "install module" option in the ! AdminCP - Modules</li> ! <li> If upgrading, use the "upgrade module" option in the ! AdminCP - Modules</li> ! <li> If uninstalling, use the "delete module" feature in the AdminCP ! - Modules</li> ! </ul> <p><i>Note:</i> If upgrading, do NOT delete module prior to upgrading, or else ! you'll lose all module data!</p> ! <p><i>Note also:</i> Since this module is developed for next generation ! mxBB core, you have to patch your core 2.7.5 portal if downloaded prior ! to this module release. If using latest core this patch is already included.</p> ! <p>OPEN admin/admin_mx_module.php</p> ! <p>FIND</p> ! <table width="100%" border="1" cellpadding="2"> ! <tr> ! <td><font size="1">// <br> ! // Generate safe object identifiers for the target DB<br> ! // where this module pack is going to be imported...<br> ! // </font></td> ! </tr> ! </table> <p>BEFORE ADD</p> ! <table width="100%" border="1" cellpadding="2"> ! <tr> ! <td><font size="1">// Start - For compatibility with mxBB modules 2.x<br> ! $fcontents_temp = array();<br> ! for($i = 0; $i < count($fcontents); $i++) {<br> ! $module_data = explode($delimeter, trim($fcontents[$i]));<br> ! <br> ! if ( $module_data[0] != 'New_function' && $module_data[4] != 'endoflist' ! )<br> ! {<br> ! $fcontents_temp[] = implode($delimeter, $module_data);<br> ! }<br> ! }<br> ! $fcontents = $fcontents_temp;<br> ! // End - mxBB modules 2.x code patch</font></td> ! </tr> ! </table> <p><br /> <a href="#top"> Back to Top</a> <br /> ! <br /> ! <a name="themes"> <br /> <span style="font-weight: bold">II. Additional Styles</span> <br /> *************** *** 265,269 **** <br /> <a href="#top"> Back to Top</a> <br /> ! <br /><a name="languages"> <br /> <span style="font-weight: bold">III. Additional Languages</span> <br /> --- 300,305 ---- <br /> <a href="#top"> Back to Top</a> <br /> ! <br /> ! <a name="languages"> <br /> <span style="font-weight: bold">III. Additional Languages</span> <br /> *************** *** 273,286 **** here</a>. <br /> <br /> ! If exists, download and install in the modules/mx_modulename/language ! folder. If not, duplicate (copy and paste) any included language file, ! rename to match your language, translate using any texteditor, save and ! upload. <br /> <br /> ! <a href="#top"> Back to Top</a> </p> ! ! <p> /Mx Team</p> ! </td> ! </tr> </table> </body> --- 309,323 ---- here</a>. <br /> <br /> ! If exists, download and install in the modules/mx_modulename/language ! folder. If not, duplicate (copy and paste) any included language ! file, rename to match your language, translate using any texteditor, ! save ! and ! upload. <br /> <br /> ! <a href="#top"> Back to Top</a> </p> ! <p> /mxBB Team</p> ! </td> ! </tr> </table> </body> Index: db_install.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/db_install.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** db_install.php 1 Apr 2005 23:33:52 -0000 1.25 --- db_install.php 2 Apr 2005 22:03:20 -0000 1.26 *************** *** 202,208 **** --- 202,211 ---- // kb 2.0 "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('wysiwyg', '0')", + "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('wysiwyg_path', 'modules/')", + "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('allow_html', '1')", "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('allow_bbcode', '1')", "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('allow_smilies', '1')", + "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('formatting_fixup', '0')", "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('allowed_html_tags', 'b,i,u,a')", Index: db_upgrade.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/db_upgrade.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** db_upgrade.php 1 Apr 2005 23:33:52 -0000 1.18 --- db_upgrade.php 2 Apr 2005 22:03:20 -0000 1.19 *************** *** 116,119 **** --- 116,120 ---- $upgrade_109 = 0; $upgrade_200 = 0; + $upgrade_201 = 0; $message = "<b>Upgrading!</b><br/><br/>"; *************** *** 183,187 **** } ! // ------------------------------------------------------------------------------------------------------ if ( $upgrade_105 == 1 ) --- 184,199 ---- } ! // validate before 2.01 ! $result = $db->sql_query( "SELECT config_value from " . $mx_table_prefix . "kb_config WHERE config_name = 'wysiwyg_path'" ); ! if ( $db->sql_numrows( $result ) == 0 ) ! { ! $upgrade_201 = 1; ! $message .= "<b>Upgrading to v. 2.01...ok</b><br/><br/>"; ! } ! else ! { ! $message .= "<b>Validating v. 2.01...ok</b><br/><br/>"; ! } ! // ------------------------------------------------------------------------------------------------------ if ( $upgrade_105 == 1 ) *************** *** 288,292 **** data text NOT NULL )"; ! $sql[] = "ALTER TABLE " . $mx_table_prefix . "kb_articles MODIFY article_author_id mediumint(8) NOT NULL "; } --- 300,309 ---- data text NOT NULL )"; ! } ! ! if ( $upgrade_201 == 1 ) ! { ! $sql[] = "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('wysiwyg_path', '0')"; ! $sql[] = "INSERT INTO " . $mx_table_prefix . "kb_config VALUES ('formatting_fixup', '0')"; $sql[] = "ALTER TABLE " . $mx_table_prefix . "kb_articles MODIFY article_author_id mediumint(8) NOT NULL "; } |
Update of /cvsroot/mxbb/mx_kb/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12059/modules/mx_kb/admin Modified Files: admin_kb_art.php admin_kb_auth.php admin_kb_cat.php admin_kb_config.php admin_kb_custom.php admin_kb_rebuild_search.php admin_kb_types.php Log Message: final fix before release Index: admin_kb_art.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_art.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** admin_kb_art.php 2 Apr 2005 20:36:55 -0000 1.17 --- admin_kb_art.php 2 Apr 2005 22:03:19 -0000 1.18 *************** *** 64,67 **** --- 64,68 ---- include( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); include( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); + include( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); Index: admin_kb_auth.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_auth.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_kb_auth.php 2 Apr 2005 20:37:02 -0000 1.4 --- admin_kb_auth.php 2 Apr 2005 22:03:19 -0000 1.5 *************** *** 63,66 **** --- 63,67 ---- include( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); include( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); + include( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); Index: admin_kb_config.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_config.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** admin_kb_config.php 2 Apr 2005 20:37:02 -0000 1.17 --- admin_kb_config.php 2 Apr 2005 22:03:19 -0000 1.18 *************** *** 64,67 **** --- 64,68 ---- include( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); include( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); + include( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); Index: admin_kb_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_cat.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** admin_kb_cat.php 2 Apr 2005 20:37:02 -0000 1.10 --- admin_kb_cat.php 2 Apr 2005 22:03:19 -0000 1.11 *************** *** 64,67 **** --- 64,68 ---- include( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); include( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); + include( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); Index: admin_kb_rebuild_search.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_rebuild_search.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_kb_rebuild_search.php 2 Apr 2005 20:37:02 -0000 1.3 --- admin_kb_rebuild_search.php 2 Apr 2005 22:03:19 -0000 1.4 *************** *** 59,62 **** --- 59,63 ---- include( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); include( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); + include( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); Index: admin_kb_types.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_types.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** admin_kb_types.php 2 Apr 2005 20:37:02 -0000 1.9 --- admin_kb_types.php 2 Apr 2005 22:03:19 -0000 1.10 *************** *** 64,67 **** --- 64,68 ---- include( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); include( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); + include( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); Index: admin_kb_custom.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_custom.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_kb_custom.php 2 Apr 2005 20:37:02 -0000 1.3 --- admin_kb_custom.php 2 Apr 2005 22:03:19 -0000 1.4 *************** *** 55,58 **** --- 55,59 ---- include( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); include( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); + include( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); |
Update of /cvsroot/mxbb/kb_076_mxaddon/root/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11840/modules/kb_076_mxaddon/root/admin Modified Files: admin_kb_art.php admin_kb_auth.php admin_kb_cat.php admin_kb_config.php admin_kb_custom.php admin_kb_rebuild_search.php admin_kb_types.php Log Message: final fix before release Index: admin_kb_art.php =================================================================== RCS file: /cvsroot/mxbb/kb_076_mxaddon/root/admin/admin_kb_art.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin_kb_art.php 2 Apr 2005 20:35:40 -0000 1.5 --- admin_kb_art.php 2 Apr 2005 22:02:29 -0000 1.6 *************** *** 64,67 **** --- 64,68 ---- include( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); include( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); + include( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); Index: admin_kb_auth.php =================================================================== RCS file: /cvsroot/mxbb/kb_076_mxaddon/root/admin/admin_kb_auth.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_kb_auth.php 1 Apr 2005 14:12:28 -0000 1.2 --- admin_kb_auth.php 2 Apr 2005 22:02:29 -0000 1.3 *************** *** 63,66 **** --- 63,67 ---- include( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); include( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); + include( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); Index: admin_kb_config.php =================================================================== RCS file: /cvsroot/mxbb/kb_076_mxaddon/root/admin/admin_kb_config.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_kb_config.php 1 Apr 2005 14:12:28 -0000 1.3 --- admin_kb_config.php 2 Apr 2005 22:02:30 -0000 1.4 *************** *** 64,67 **** --- 64,68 ---- include( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); include( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); + include( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); Index: admin_kb_cat.php =================================================================== RCS file: /cvsroot/mxbb/kb_076_mxaddon/root/admin/admin_kb_cat.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_kb_cat.php 2 Apr 2005 20:35:40 -0000 1.4 --- admin_kb_cat.php 2 Apr 2005 22:02:29 -0000 1.5 *************** *** 64,67 **** --- 64,68 ---- include( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); include( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); + include( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); Index: admin_kb_rebuild_search.php =================================================================== RCS file: /cvsroot/mxbb/kb_076_mxaddon/root/admin/admin_kb_rebuild_search.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_kb_rebuild_search.php 1 Apr 2005 14:12:28 -0000 1.2 --- admin_kb_rebuild_search.php 2 Apr 2005 22:02:30 -0000 1.3 *************** *** 59,62 **** --- 59,63 ---- include( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); include( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); + include( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); Index: admin_kb_types.php =================================================================== RCS file: /cvsroot/mxbb/kb_076_mxaddon/root/admin/admin_kb_types.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_kb_types.php 1 Apr 2005 14:12:28 -0000 1.3 --- admin_kb_types.php 2 Apr 2005 22:02:30 -0000 1.4 *************** *** 64,67 **** --- 64,68 ---- include( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); include( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); + include( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); Index: admin_kb_custom.php =================================================================== RCS file: /cvsroot/mxbb/kb_076_mxaddon/root/admin/admin_kb_custom.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_kb_custom.php 1 Apr 2005 14:12:28 -0000 1.2 --- admin_kb_custom.php 2 Apr 2005 22:02:30 -0000 1.3 *************** *** 55,58 **** --- 55,59 ---- include( $module_root_path . 'includes/functions_kb_auth.' . $phpEx ); include( $module_root_path . 'includes/functions_kb_field.' . $phpEx ); + include( $module_root_path . 'includes/functions_kb_mx.' . $phpEx ); include( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); |
|
From: Jon O. <jon...@us...> - 2005-04-02 22:02:51
|
Update of /cvsroot/mxbb/kb_076_mxaddon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11840/modules/kb_076_mxaddon Modified Files: install_kb_tables.php install_upgrade_readme.txt upgrade_kb_tables.php Log Message: final fix before release Index: install_upgrade_readme.txt =================================================================== RCS file: /cvsroot/mxbb/kb_076_mxaddon/install_upgrade_readme.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** install_upgrade_readme.txt 30 Mar 2005 09:28:11 -0000 1.3 --- install_upgrade_readme.txt 2 Apr 2005 22:02:29 -0000 1.4 *************** *** 4,8 **** ## MOD Addon Author: Haplo < jon...@ho... > (Jon Ohlsson) http://www.mx-system.com ## MOD Description: This mod adds a Knowledge Base manager to your board ! ## MOD Version: KB MOD 2.0.1 ## ## Installation Level: easy --- 4,8 ---- ## MOD Addon Author: Haplo < jon...@ho... > (Jon Ohlsson) http://www.mx-system.com ## MOD Description: This mod adds a Knowledge Base manager to your board ! ## MOD Version: KB MOD 2.0.1(abc...) ## ## Installation Level: easy *************** *** 33,49 **** ## in our MOD-Database, located at: http://www.phpbb.com/mods/ ############################################################## - ## Author Notes: - ## After installing please go into your ACP and change all - ## of the setting to how you want them. Also add categories - ## and types - ## - ## Putting [page] in your article will add pages to it. Putting [toc] will add entry to table of contents ## - ############################################################## ## ## MOD History: ## ! ## 2005/03/29 - Version KB MOD 2.0.1 ## - Name changed, since much (most) is rewritten ;) ## - Updated with latest phpBB security patches --- 33,42 ---- ## in our MOD-Database, located at: http://www.phpbb.com/mods/ ############################################################## ## ## ## MOD History: ## ! ## 2005/03/29 - Version KB MOD 2.0.1abc... ## - Name changed, since much (most) is rewritten ;) ## - Updated with latest phpBB security patches *************** *** 56,61 **** ## - Rewritten BBcode/html handling (once more yes) ## - Custom fields added ! ## - wysiwyg feature (tinymce) ! ## - All reported bugs in dev thread fixed ## 2004/09/14 - Version 0.7.6 + MX Addon 1.03 --- 49,55 ---- ## - Rewritten BBcode/html handling (once more yes) ## - Custom fields added ! ## - wysiwyg feature (tinymce), ! ## you can simply download latest version from http://tinymce.moxiecode.com/ and upload into phpbbroot/modules/ ! ## - All reported bugs/fixes/addons in dev thread fixed (implemented) ## 2004/09/14 - Version 0.7.6 + MX Addon 1.03 *************** *** 176,180 **** ## 3) Prepare the database by running the included install/upgrade-*.php file. ## - use install_kb_tables.php for a fresh installation, ! ## and upgrade_kb_tables.php if upgrading (even if from original kb 0.76) ## ############################################################## --- 170,175 ---- ## 3) Prepare the database by running the included install/upgrade-*.php file. ## - use install_kb_tables.php for a fresh installation, ! ## and upgrade_kb_tables.php if upgrading (even if from original kb 0.76 - works! ) ! ## 4) Delete install/upgrade files ## ############################################################## Index: install_kb_tables.php =================================================================== RCS file: /cvsroot/mxbb/kb_076_mxaddon/install_kb_tables.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** install_kb_tables.php 1 Apr 2005 14:12:24 -0000 1.6 --- install_kb_tables.php 2 Apr 2005 22:02:29 -0000 1.7 *************** *** 223,229 **** --- 223,231 ---- $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("wysiwyg", "0");'; + $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("wysiwyg_path", "modules/");'; $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("allow_html", "1");'; $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("allow_bbcode", "1");'; $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("allow_smilies", "1");'; + $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("formatting_fixup", "0");'; $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("allowed_html_tags", "b,i,u,a");'; Index: upgrade_kb_tables.php =================================================================== RCS file: /cvsroot/mxbb/kb_076_mxaddon/upgrade_kb_tables.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** upgrade_kb_tables.php 1 Apr 2005 14:12:27 -0000 1.5 --- upgrade_kb_tables.php 2 Apr 2005 22:02:29 -0000 1.6 *************** *** 133,136 **** --- 133,137 ---- $upgrade_103 = 0; $upgrade_200 = 0; + $upgrade_201 = 0; // validate before 1.01 if( !$result = $db->sql_query("SELECT article_rating from ".KB_ARTICLES_TABLE)) *************** *** 179,182 **** --- 180,195 ---- } + // validate before 2.01 + $result = $db->sql_query( "SELECT config_value from " . KB_CONFIG_TABLE . " WHERE config_name = 'wysiwyg_path'" ); + if( $db->sql_numrows( $result ) == 0 ) + { + $upgrade_201 = 1; + $res_message .= "Upgrading to v. 2.01...<br />"; + } + else + { + $res_message .= "v. 2.01 : installed <br />"; + } + if ( $submit ) { *************** *** 283,288 **** } ! $sql[] = 'ALTER TABLE ' . KB_ARTICLES_TABLE . ' MODIFY article_author_id mediumint(8) NOT NULL ;'; ! break; --- 296,305 ---- } ! if ( $upgrade_201 == 1 ) ! { ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("wysiwyg_path", "modules/");'; ! $sql[] = 'INSERT INTO '.KB_CONFIG_TABLE.' (config_name, config_value) VALUES ("formatting_fixup", "0");'; ! $sql[] = 'ALTER TABLE ' . KB_ARTICLES_TABLE . ' MODIFY article_author_id mediumint(8) NOT NULL ;'; ! } break; |
|
From: Jon O. <jon...@us...> - 2005-04-02 21:05:19
|
Update of /cvsroot/mxbb/mx_kb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15662/modules/mx_kb Modified Files: db_uninstall.php Log Message: typho Index: db_uninstall.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/db_uninstall.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** db_uninstall.php 1 Apr 2005 23:33:52 -0000 1.8 --- db_uninstall.php 2 Apr 2005 21:05:10 -0000 1.9 *************** *** 113,117 **** "DROP TABLE " . $mx_table_prefix . "kb_wordmatch ", ! "DROP TABLE " . $mx_table_prefix . "kb_votes " ); --- 113,121 ---- "DROP TABLE " . $mx_table_prefix . "kb_wordmatch ", ! "DROP TABLE " . $mx_table_prefix . "kb_votes ", ! ! "DROP TABLE " . $mx_table_prefix . "kb_custom ", ! ! "DROP TABLE " . $mx_table_prefix . "kb_customdata " ); |
|
From: Jon O. <jon...@us...> - 2005-04-02 20:37:13
|
Update of /cvsroot/mxbb/mx_kb/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30024/modules/mx_kb/includes Modified Files: functions_kb.php functions_kb_field.php functions_kb_mx.php kb_article.php kb_cat.php kb_constants.php kb_footer.php kb_header.php kb_moderator.php kb_post.php kb_rate.php kb_stats.php Log Message: fixing up: - permissions - tpl - footers adding - cat jump box Index: kb_stats.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/includes/kb_stats.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** kb_stats.php 1 Apr 2005 14:14:48 -0000 1.6 --- kb_stats.php 2 Apr 2005 20:37:03 -0000 1.7 *************** *** 35,38 **** --- 35,40 ---- // + $kb_quick_nav = get_kb_cat_list( '', 1, true, true ); + if ( !$is_block ) { Index: kb_header.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/includes/kb_header.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** kb_header.php 28 Mar 2005 20:22:47 -0000 1.14 --- kb_header.php 2 Apr 2005 20:37:03 -0000 1.15 *************** *** 25,41 **** } - define( 'ALLOW_NEW', 1 ); - define( 'ALLOW_ANON', 1 ); - // Parse and show the overall header. $template->set_filenames( array( 'kb_header' => 'kb_header.tpl' ) ); - if ( isset ( $HTTP_GET_VARS['cat'] ) ) { if ( $kb_config['allow_new'] == 1 && ( $kb_is_auth['auth_post'] || $kb_is_auth['auth_mod'] ) ) { ! $temp_url = append_sid( this_kb_mxurl( "mode=add&cat=" . intval ($HTTP_GET_VARS['cat'] ) ) ); $add_article = '<a href="' . $temp_url . '">' . $lang['Add_article'] . '</a>'; } --- 25,44 ---- } // Parse and show the overall header. $template->set_filenames( array( 'kb_header' => 'kb_header.tpl' ) ); if ( isset ( $HTTP_GET_VARS['cat'] ) ) { + $category_id = intval ($HTTP_GET_VARS['cat'] ); + // Start auth check + // + $kb_is_auth = array(); + $kb_is_auth = kb_auth(AUTH_ALL, $category_id, $userdata); + // End of auth check + if ( $kb_config['allow_new'] == 1 && ( $kb_is_auth['auth_post'] || $kb_is_auth['auth_mod'] ) ) { ! $temp_url = append_sid( this_kb_mxurl( "mode=add&cat=" . $category_id ) ); $add_article = '<a href="' . $temp_url . '">' . $lang['Add_article'] . '</a>'; } *************** *** 79,83 **** if ( $kb_config['stats_list'] == 1 ) { ! get_quick_stats( intval( $HTTP_GET_VARS['cat'] ) ); } --- 82,86 ---- if ( $kb_config['stats_list'] == 1 ) { ! get_quick_stats( $category_id ); } Index: kb_footer.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/includes/kb_footer.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** kb_footer.php 9 Jan 2005 21:40:38 -0000 1.3 --- kb_footer.php 2 Apr 2005 20:37:03 -0000 1.4 *************** *** 27,34 **** // Parse and show the overall footer. ! $template->set_filenames( array( 'kb_footer' => 'kb_footer.tpl' ) ! ); ! $template->assign_vars( array( 'L_MODULE_VERSION' => $kb_module_version, 'L_MODULE_ORIG_AUTHOR' => $kb_module_orig_author, 'L_MODULE_AUTHOR' => $kb_module_author ) --- 27,60 ---- // Parse and show the overall footer. ! $template->set_filenames( array( 'kb_footer' => 'kb_footer.tpl' ) ); ! if ( !empty($kb_auth_can) ) ! { ! $template->assign_block_vars( 'auth_can', array() ); ! } ! ! if ( !empty($kb_quick_nav) ) ! { ! $template->assign_block_vars( 'quick_nav', array() ); ! } ! ! if ( !MXBB_MODULE ) ! { ! $template->assign_block_vars( 'copy_footer', array() ); ! } ! ! $quick_nav_action = this_kb_mxurl(); ! ! $template->assign_vars( array( ! 'QUICK_JUMP_ACTION' => $quick_nav_action, ! //'SID' => $userdata['session_id'], ! ! 'L_QUICK_NAV' => $lang['Quick_nav'], ! 'L_QUICK_JUMP' => $lang['Quick_jump'], ! 'QUICK_NAV' => $kb_quick_nav, ! ! 'S_AUTH_LIST' => $kb_auth_can, ! ! 'L_MODULE_VERSION' => $kb_module_version, 'L_MODULE_ORIG_AUTHOR' => $kb_module_orig_author, 'L_MODULE_AUTHOR' => $kb_module_author ) Index: kb_post.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/includes/kb_post.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** kb_post.php 1 Apr 2005 23:33:52 -0000 1.7 --- kb_post.php 2 Apr 2005 20:37:03 -0000 1.8 *************** *** 169,204 **** $error_msg = ''; ! ! // If changed category ! if ( $old_category_id != $category_id ) { ! update_kb_number( $old_category_id, '- 1' ); ! if ( $kb_is_auth['auth_mod'] || ( $kb_is_auth['auth_approval_edit'] && $userdata['user_id'] == $author_id ) ) { update_kb_number( $category_id, '+ 1' ); } ! } ! ! // If unapproved ! if ( $kb_is_auth['auth_mod'] || ( $kb_is_auth['auth_approval_edit'] && $userdata['user_id'] == $author_id ) ) ! { ! $approve = 1; ! ! if ( $old_approve != 1 ) { update_kb_number( $category_id, '+ 1' ); } } ! else { $approve = 2; ! ! if ( $old_approve == 1 && $old_category_id == $category_id ) { ! update_kb_number( $category_id, '- 1' ); } ! } ! $sql = "UPDATE " . KB_ARTICLES_TABLE . " SET article_category_id = '$category_id', --- 169,199 ---- $error_msg = ''; ! ! $cat_switch = $old_category_id != $category_id; // Has switched category ! ! if ( $kb_is_auth['auth_mod'] || $kb_is_auth['auth_approval_edit'] ) // approval auth { ! $approve = 1; ! if ( $cat_switch ) { + update_kb_number( $old_category_id, ( $old_approve == 1 ? '- 1' : '0' ) ); update_kb_number( $category_id, '+ 1' ); } ! else { update_kb_number( $category_id, '+ 1' ); } } ! else { $approve = 2; ! ! if ( $cat_switch ) { ! update_kb_number( $old_category_id, ( $old_approve == 1 ? '- 1' : '0' ) ); } ! } ! $sql = "UPDATE " . KB_ARTICLES_TABLE . " SET article_category_id = '$category_id', *************** *** 277,283 **** if ( $approve == 1 && $kb_config['use_comments'] && $kb_is_auth['auth_comment']) { - // Post $topic_data = kb_insert_post( $kb_message, $subject, $kb_comment['category_forum_id'], $kb_comment['article_editor_id'], $kb_comment['article_editor'], $kb_comment['article_editor_sig'], $kb_comment['topic_id'], $kb_update_message ); ! $sql = "UPDATE " . KB_ARTICLES_TABLE . " SET topic_id = " . $topic_data['topic_id'] . " WHERE article_id = " . $kb_comment['article_id']; --- 272,277 ---- if ( $approve == 1 && $kb_config['use_comments'] && $kb_is_auth['auth_comment']) { $topic_data = kb_insert_post( $kb_message, $subject, $kb_comment['category_forum_id'], $kb_comment['article_editor_id'], $kb_comment['article_editor'], $kb_comment['article_editor_sig'], $kb_comment['topic_id'], $kb_update_message ); ! $sql = "UPDATE " . KB_ARTICLES_TABLE . " SET topic_id = " . $topic_data['topic_id'] . " WHERE article_id = " . $kb_comment['article_id']; *************** *** 289,300 **** } - $kb_message_tmp = $kb_message . '\n\n' . $kb_update_message; - - kb_notify( $kb_config['notify'], $kb_message_tmp, $kb_config['admin_id'], $kb_comment['article_author_id'] ); - $kb_custom_field->file_update_data( $article_id ); if ( $approve == 1 ) { mx_add_search_words( 'single', $article_id, stripslashes( $article_text ), stripslashes( $article_title ), 'kb' ); --- 283,291 ---- } $kb_custom_field->file_update_data( $article_id ); if ( $approve == 1 ) { + kb_notify( $kb_config['notify'], $kb_message, $kb_config['admin_id'], $kb_comment['article_editor_id'] ); mx_add_search_words( 'single', $article_id, stripslashes( $article_text ), stripslashes( $article_title ), 'kb' ); *************** *** 515,519 **** 'L_ADD_ARTICLE' => $lang['Add_article'], - 'L_MESSAGE_TITLE' => $lang['Message'], 'L_ARTICLE_TITLE' => $lang['Article_title'], --- 506,509 ---- Index: kb_moderator.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/includes/kb_moderator.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** kb_moderator.php 1 Apr 2005 20:39:47 -0000 1.8 --- kb_moderator.php 2 Apr 2005 20:37:03 -0000 1.9 *************** *** 41,45 **** // ! if ( !($kb_is_auth['auth_mod'] && $userdata['session_logged_in']) ) { $message = $lang['No_add'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); --- 41,45 ---- // ! if ( !( ($kb_is_auth['auth_delete'] || $kb_is_auth['auth_mod']) && $userdata['session_logged_in'] ) ) { $message = $lang['No_add'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $mx_root_path . "index.$phpEx" ) . '">', '</a>' ); *************** *** 53,65 **** else { ! if ( $approve ) { $action = 'approve'; } ! else if ( $unapprove ) { $action = 'unapprove'; } ! else if ( $delete ) { $action = 'delete'; --- 53,65 ---- else { ! if ( $approve && $kb_is_auth['auth_mod']) { $action = 'approve'; } ! else if ( $unapprove && $kb_is_auth['auth_mod']) { $action = 'unapprove'; } ! else if ( $delete && ( $kb_is_auth['auth_mod'] || $kb_is_auth['auth_delete']) ) { $action = 'delete'; *************** *** 84,103 **** $topic_sql = ''; ! if ( $kb_is_auth['auth_comment'] && $kb_config['use_comments'] ) ! { ! if ( !$row['topic_id'] ) ! { ! $kb_comment = array(); ! // Populate the kb_comment variable ! $kb_comment = kb_get_data($row, $userdata); ! // Compose post header ! $subject = $lang['KB_comment_prefix'] . $kb_comment['article_title']; ! $message_temp = kb_compose_comment( $kb_comment ); ! ! $kb_message = $message_temp['message']; ! $kb_update_message = $message_temp['update_message']; // Post $topic_data = kb_insert_post( $kb_message, $subject, $kb_comment['category_forum_id'], $kb_comment['article_editor_id'], $kb_comment['article_editor'], $kb_comment['article_editor_sig'], $kb_comment['topic_id'], $kb_update_message ); --- 84,104 ---- $topic_sql = ''; ! ! $kb_comment = array(); ! // Populate the kb_comment variable ! $kb_comment = kb_get_data($row, $userdata ); ! // Compose post header ! $subject = $lang['KB_comment_prefix'] . $kb_comment['article_title']; ! $message_temp = kb_compose_comment( $kb_comment ); + $kb_message = $message_temp['message']; + $kb_update_message = $message_temp['update_message']; + + if ( $kb_config['use_comments'] ) + { + if ( !$row['topic_id'] ) + { // Post $topic_data = kb_insert_post( $kb_message, $subject, $kb_comment['category_forum_id'], $kb_comment['article_editor_id'], $kb_comment['article_editor'], $kb_comment['article_editor_sig'], $kb_comment['topic_id'], $kb_update_message ); *************** *** 118,121 **** --- 119,123 ---- update_kb_number( $article_category_id, '+ 1' ); + kb_notify( $kb_config['notify'], $kb_message, $kb_config['admin_id'], $kb_comment['article_editor_id'] ); mx_add_search_words( 'single', $article_id, stripslashes( $row['article_body'] ), stripslashes( $row['article_title'] ), 'kb' ); *************** *** 180,184 **** } ! if ( $kb_config['del_topic'] && $kb_is_auth['auth_delete'] && $article['topic_id'] ) { $topic = $article['topic_id']; --- 182,186 ---- } ! if ( $kb_config['del_topic'] && $article['topic_id'] ) { $topic = $article['topic_id']; *************** *** 324,327 **** --- 326,331 ---- } break; + + } Index: kb_article.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/includes/kb_article.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** kb_article.php 1 Apr 2005 23:33:52 -0000 1.20 --- kb_article.php 2 Apr 2005 20:37:03 -0000 1.21 *************** *** 24,27 **** --- 24,28 ---- die( "Hacking attempt" ); } + $article_id = !isset( $article_id ) ? intval( $HTTP_GET_VARS['k'] ) : $article_id; $start = ( isset( $HTTP_GET_VARS['start'] ) ) ? intval( $HTTP_GET_VARS['start'] ) : 0; *************** *** 33,41 **** if ( !( $result = $db->sql_query( $sql ) ) ) { ! mx_message_die( GENERAL_ERROR, "Could not obtain article data", '', __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); - if ( count($row) > 0 ) { --- 34,41 ---- if ( !( $result = $db->sql_query( $sql ) ) ) { ! message_die( GENERAL_ERROR, "Could not obtain article data", '', __LINE__, __FILE__, $sql ); } $row = $db->sql_fetchrow( $result ); if ( count($row) > 0 ) { *************** *** 60,67 **** // // User authorisation levels output // ! ! $kb_auth_can = ( ( $kb_is_auth['auth_post'] ) ? $lang['KB_Rules_post_can'] : $lang['KB_Rules_post_cannot'] ) . '<br />'; $kb_auth_can .= ( ( $kb_is_auth['auth_edit'] ) ? $lang['KB_Rules_edit_can'] : $lang['KB_Rules_edit_cannot'] ) . '<br />'; $kb_auth_can .= ( ( $kb_is_auth['auth_delete'] ) ? $lang['KB_Rules_delete_can'] : $lang['KB_Rules_delete_cannot'] ) . '<br />'; --- 60,67 ---- // + // // User authorisation levels output // ! $kb_auth_can = '<br />' . ( ( $kb_is_auth['auth_post'] ) ? $lang['KB_Rules_post_can'] : $lang['KB_Rules_post_cannot'] ) . '<br />'; $kb_auth_can .= ( ( $kb_is_auth['auth_edit'] ) ? $lang['KB_Rules_edit_can'] : $lang['KB_Rules_edit_cannot'] ) . '<br />'; $kb_auth_can .= ( ( $kb_is_auth['auth_delete'] ) ? $lang['KB_Rules_delete_can'] : $lang['KB_Rules_delete_cannot'] ) . '<br />'; *************** *** 73,79 **** if ( $kb_is_auth['auth_mod'] ) { ! $kb_auth_can .= $lang['KB_Rules_moderate_can'] . '<br />'; } $category = get_kb_cat( $article_category_id ); $article_category_name = $category['category_name']; --- 73,81 ---- if ( $kb_is_auth['auth_mod'] ) { ! $kb_auth_can .= $lang['KB_Rules_moderate_can']; } + $kb_quick_nav = get_kb_cat_list( $article_category_id, 1, true, true ); + $category = get_kb_cat( $article_category_id ); $article_category_name = $category['category_name']; *************** *** 238,243 **** $gen_simple_header = TRUE; } ! ! if ( !$is_block && !$print_version) { include( $mx_root_path . 'includes/page_header.' . $phpEx ); --- 240,244 ---- $gen_simple_header = TRUE; } ! if ( !$is_block) { include( $mx_root_path . 'includes/page_header.' . $phpEx ); *************** *** 293,304 **** { $message = $lang['Article_not_exsist'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $phpbb_root_path . "index.$phpEx" ) . '">', '</a>' ); ! message_die( GENERAL_MESSAGE, $message ); } else { $kb_comment = array(); ! // Populate the kb_comment variable ! $kb_comment = kb_get_data($row, $userdata); // Compose post header --- 294,305 ---- { $message = $lang['Article_not_exsist'] . '<br /><br />' . sprintf( $lang['Click_return_kb'], '<a href="' . append_sid( this_kb_mxurl() ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_index'], '<a href="' . append_sid( $phpbb_root_path . "index.$phpEx" ) . '">', '</a>' ); ! mx_message_die( GENERAL_MESSAGE, $message ); } else { $kb_comment = array(); ! // Populate the kb_comment variable ! $kb_comment = kb_get_data($row, $userdata ); // Compose post header *************** *** 308,311 **** --- 309,335 ---- $kb_message = $message_temp['message']; $kb_update_message = $message_temp['update_message']; + + $topic_id_tmp = $row['topic_id']; + // + // Check if this topic exists. It could have been deleted by accident ;) If so recreate it! + // + if ( !empty($topic_id_tmp) ) + { + $sql = "SELECT * + FROM " . TOPICS_TABLE . " + WHERE topic_id = $topic_id_tmp"; + if ( !($result = $db->sql_query($sql)) ) + { + mx_message_die(GENERAL_ERROR, 'Could not obtain forums information', '', __LINE__, __FILE__, $sql); + } + } + + // + // If the query doesn't return any rows this isn't a valid topic. Set to null. + // + if ( !($topic_row = $db->sql_fetchrow($result)) ) + { + $topic_id = 0; + } // If no phpbb topic id is created, create on ;) *************** *** 313,318 **** { // Post ! $topic_data = kb_insert_post( $kb_message, $subject, $kb_comment['category_forum_id'], $kb_comment['article_editor_id'], $userdata['article_editor'], $userdata['article_editor_sig'], $kb_comment['topic_id'], $kb_update_message ); ! $sql = "UPDATE " . KB_ARTICLES_TABLE . " SET topic_id = " . $topic_data['topic_id'] . " WHERE article_id = " . $kb_comment['article_id']; --- 337,342 ---- { // Post ! $topic_data = kb_insert_post( $kb_message, $subject, $kb_comment['category_forum_id'], $kb_comment['article_editor_id'], $kb_comment['article_editor'], $kb_comment['article_editor_sig'], $kb_comment['topic_id'], $kb_update_message ); ! $sql = "UPDATE " . KB_ARTICLES_TABLE . " SET topic_id = " . $topic_data['topic_id'] . " WHERE article_id = " . $kb_comment['article_id']; *************** *** 423,429 **** 'COMMENTS_IMG' => $comments_img, ! 'PATH' => $path_kb, ! 'S_AUTH_LIST' => $kb_auth_can ! ) ); --- 447,451 ---- 'COMMENTS_IMG' => $comments_img, ! 'PATH' => $path_kb ) ); Index: functions_kb.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/includes/functions_kb.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** functions_kb.php 1 Apr 2005 23:33:52 -0000 1.26 --- functions_kb.php 2 Apr 2005 20:37:02 -0000 1.27 *************** *** 300,304 **** $temp_url = append_sid( $module_root_path . "admin/admin_kb_art.$phpEx?mode=approve&a=$article_id" . "&start=" . $start); $approve = '<a href="' . $temp_url . '"><img src="' . $images['icon_approve'] . '" border="0" alt="' . $lang['Approve'] . '"></a>'; ! }elseif ( $article_approved == 1 ) { // unapprove --- 300,305 ---- $temp_url = append_sid( $module_root_path . "admin/admin_kb_art.$phpEx?mode=approve&a=$article_id" . "&start=" . $start); $approve = '<a href="' . $temp_url . '"><img src="' . $images['icon_approve'] . '" border="0" alt="' . $lang['Approve'] . '"></a>'; ! } ! elseif ( $article_approved == 1 ) { // unapprove *************** *** 310,332 **** $delete = '<a href="' . $temp_url . '"><img src="' . $phpbb_root_path . $images['icon_delpost'] . '" border="0" alt="' . $lang['Delete'] . '"></a>'; } ! else if ( $kb_is_auth['auth_mod'] ) { $category = get_kb_cat( $article_cat ); $category_name = $category['category_name']; ! if ( $article_approved == 2 || $article_approved == 0 ) ! { ! // approve ! $temp_url = append_sid( this_kb_mxurl( "mode=moderate&action=approve&a=$article_id&cat=$article_cat&page=$page_id" . "&start=" . $start) ); ! $approve = '<a href="' . $temp_url . '"><img src="' . $images['icon_approve'] . '" border="0" alt="' . $lang['Approve'] . '"></a>'; ! }elseif ( $article_approved == 1 ) ! { ! // unapprove ! $temp_url = append_sid( this_kb_mxurl( "mode=moderate&action=unapprove&a=$article_id&cat=$article_cat&page=$page_id" . "&start=" . $start) ); ! $approve = '<a href="' . $temp_url . '"><img src="' . $images['icon_unapprove'] . '" border="0" alt="' . $lang['Un_approve'] . '"></a>'; ! } ! // delete ! $temp_url = append_sid( this_kb_mxurl( "mode=moderate&action=delete&a=$article_id&cat=$article_cat&page=$page_id" . "&start=" . $start) ); ! $delete = '<a href="' . $temp_url . '"><img src="' . $phpbb_root_path . $images['icon_delpost'] . '" border="0" alt="' . $lang['Delete'] . '"></a>'; } --- 311,340 ---- $delete = '<a href="' . $temp_url . '"><img src="' . $phpbb_root_path . $images['icon_delpost'] . '" border="0" alt="' . $lang['Delete'] . '"></a>'; } ! else { $category = get_kb_cat( $article_cat ); $category_name = $category['category_name']; ! if ( $kb_is_auth['auth_mod'] ) ! { ! if ( $article_approved == 2 || $article_approved == 0 ) ! { ! // approve ! $temp_url = append_sid( this_kb_mxurl( "mode=moderate&action=approve&a=$article_id&cat=$article_cat&page=$page_id" . "&start=" . $start) ); ! $approve = '<a href="' . $temp_url . '"><img src="' . $images['icon_approve'] . '" border="0" alt="' . $lang['Approve'] . '"></a>'; ! } ! elseif ( $article_approved == 1 ) ! { ! // unapprove ! $temp_url = append_sid( this_kb_mxurl( "mode=moderate&action=unapprove&a=$article_id&cat=$article_cat&page=$page_id" . "&start=" . $start) ); ! $approve = '<a href="' . $temp_url . '"><img src="' . $images['icon_unapprove'] . '" border="0" alt="' . $lang['Un_approve'] . '"></a>'; ! } ! } ! if ( $kb_is_auth['auth_delete'] || $kb_is_auth['auth_mod']) ! { ! // delete ! $temp_url = append_sid( this_kb_mxurl( "mode=moderate&action=delete&a=$article_id&cat=$article_cat&page=$page_id" . "&start=" . $start) ); ! $delete = '<a href="' . $temp_url . '"><img src="' . $phpbb_root_path . $images['icon_delpost'] . '" border="0" alt="' . $lang['Delete'] . '"></a>'; ! } } *************** *** 546,550 **** function kb_notify( $action, $message, $to_id, $from_id ) { ! global $lang, $board_config, $kb_config, $db, $module_root_path, $phpbb_root_path, $mx_root_path, $phpEx; if ( $action == 2 ) // Mail --- 554,558 ---- function kb_notify( $action, $message, $to_id, $from_id ) { ! global $lang, $board_config, $kb_config, $db, $module_root_path, $phpbb_root_path, $mx_root_path, $phpEx, $userdata; if ( $action == 2 ) // Mail *************** *** 577,581 **** global $db, $lang, $user_ip, $board_config, $userdata, $phpbb_root_path, $phpEx; ! if ( !$from_id ) { $from_id = $userdata['user_id']; --- 585,589 ---- global $db, $lang, $user_ip, $board_config, $userdata, $phpbb_root_path, $phpEx; ! if ( empty( $from_id ) ) { $from_id = $userdata['user_id']; *************** *** 830,834 **** function get_kb_cat_index( $parent = 0 ) { ! global $db, $template, $phpbb_root_path, $mx_root_path, $module_root_path, $phpEx, $is_block, $page_id, $kb_config, $userdata; $sql = "SELECT * --- 838,842 ---- function get_kb_cat_index( $parent = 0 ) { ! global $db, $template, $phpbb_root_path, $mx_root_path, $module_root_path, $phpEx, $is_block, $page_id, $kb_config, $userdata, $kb_quick_nav; $sql = "SELECT * *************** *** 842,851 **** } while ( $category = $db->sql_fetchrow( $result ) ) { // Start auth check // ! $kb_is_auth = array(); ! $kb_is_auth = kb_auth(AUTH_ALL, $category['category_id'], $userdata); // End of auth check --- 850,860 ---- } + while ( $category = $db->sql_fetchrow( $result ) ) { // Start auth check // ! $kb_is_cat_auth = array(); ! $kb_is_cat_auth = kb_auth(AUTH_ALL, $category['category_id'], $userdata); // End of auth check *************** *** 884,888 **** $category = '<a href="' . $temp_url . '" class="forumlink">' . $category_name . '</a>'; // Newssuite operating mode ! if ( ns_auth_cat( $category_id ) && $kb_is_auth['auth_view']) { $template->assign_block_vars( 'catrow', array( 'CATEGORY' => $category, --- 893,897 ---- $category = '<a href="' . $temp_url . '" class="forumlink">' . $category_name . '</a>'; // Newssuite operating mode ! if ( ns_auth_cat( $category_id ) && $kb_is_cat_auth['auth_view']) { $template->assign_block_vars( 'catrow', array( 'CATEGORY' => $category, *************** *** 893,896 **** --- 902,907 ---- } + $kb_quick_nav = get_kb_cat_list( '', 1, true, true ); + return $template; } *************** *** 975,979 **** // gets sub categories for a category ! function get_kb_cat_subs_admin( $parent, $select = 1, $indent ) { global $db, $template, $phpbb_root_path, $module_root_path, $phpEx, $images, $row_color, $row_class, $theme, $i, $lang; --- 986,990 ---- // gets sub categories for a category ! function get_kb_cat_subs_admin( $parent, $select = 1, $indent, $ss ) { global $db, $template, $phpbb_root_path, $module_root_path, $phpEx, $images, $row_color, $row_class, $theme, $i, $lang; *************** *** 1020,1025 **** $down2 = '<a href="' . $temp_url . '" class="gen">' . $lang['Move_down'] . '</a>'; ! $row_color = ( !( $i % 2 ) ) ? $theme['td_color1'] : $theme['td_color2']; ! $row_class = ( !( $i % 2 ) ) ? $theme['td_class1'] : $theme['td_class2']; $template->assign_block_vars( 'catrow.subrow', array( 'CATEGORY' => $category2, --- 1031,1036 ---- $down2 = '<a href="' . $temp_url . '" class="gen">' . $lang['Move_down'] . '</a>'; ! $row_color = ( !( $ss % 2 ) ) ? $theme['td_color1'] : $theme['td_color2']; ! $row_class = ( !( $ss % 2 ) ) ? $theme['td_class1'] : $theme['td_class2']; $template->assign_block_vars( 'catrow.subrow', array( 'CATEGORY' => $category2, *************** *** 1027,1031 **** 'CAT_ARTICLES' => $category_articles2, ! 'INDENT' => $indent, 'U_EDIT' => $edit2, --- 1038,1042 ---- 'CAT_ARTICLES' => $category_articles2, ! 'INDENT' => $indent . '--» ', 'U_EDIT' => $edit2, *************** *** 1038,1046 **** ); ! $temp = $indent . '-> '; ! get_kb_cat_subs_admin( $category_id2, $select, $temp ); } ! return $template; } --- 1049,1058 ---- ); ! $temp = $indent . ' '; ! $ss++; ! $ss = get_kb_cat_subs_admin( $category_id2, $select, $temp, $ss ); } ! return $ss; } *************** *** 1080,1085 **** $status = ''; } ! $catlist .= "<option value=\"$category2[$idfield]\" $status>" . $indent . $category2[$namefield] . "</option>\n"; ! $temp = $indent . '-> '; $catlist .= get_kb_cat_subs_list( $category2[$idfield], $select, $selected, $temp ); } --- 1092,1097 ---- $status = ''; } ! $catlist .= "<option value=\"$category2[$idfield]\" $status>" . $indent . '--»'. $category2[$namefield] . "</option>\n"; ! $temp = $indent . ' '; $catlist .= get_kb_cat_subs_list( $category2[$idfield], $select, $selected, $temp ); } *************** *** 1138,1142 **** $catlist .= "<option value=\"$category[$idfield]\" $status>" . $category[$namefield] . "</option>\n"; ! $catlist .= get_kb_cat_subs_list( $category[$idfield], $select, $selected, ' -> ' ); } } --- 1150,1154 ---- $catlist .= "<option value=\"$category[$idfield]\" $status>" . $category[$namefield] . "</option>\n"; ! $catlist .= get_kb_cat_subs_list( $category[$idfield], $select, $selected, ' ' ); } } *************** *** 1372,1380 **** // Start KB addon - update original post -------------------------------------------------- - $sql = "SELECT topic_first_post_id FROM " . TOPICS_TABLE . " WHERE topic_id = '$topic_id'"; ! if ( !( $result = $db->sql_query( $sql ) ) ) { --- 1384,1391 ---- // Start KB addon - update original post -------------------------------------------------- $sql = "SELECT topic_first_post_id FROM " . TOPICS_TABLE . " WHERE topic_id = '$topic_id'"; ! if ( !( $result = $db->sql_query( $sql ) ) ) { *************** *** 1382,1399 **** } $row = $db->sql_fetchrow( $result ); ! $orig_post_id = $row[0]; ! $sql = "UPDATE " . TOPICS_TABLE . " SET topic_title = '$subject' WHERE topic_id = '$topic_id'"; ! if ( !( $result = $db->sql_query( $sql, BEGIN_TRANSACTION ) ) ) { message_die( GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql ); } - $message_tmp = $message . '\n\n' . $message_update_text; - $sql = "UPDATE " . POSTS_TEXT_TABLE . " SET post_subject = '$subject', --- 1393,1410 ---- } $row = $db->sql_fetchrow( $result ); ! $orig_post_id = $row[0]; ! $sql = "UPDATE " . TOPICS_TABLE . " SET topic_title = '$subject' WHERE topic_id = '$topic_id'"; ! if ( !( $result = $db->sql_query( $sql, BEGIN_TRANSACTION ) ) ) { message_die( GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql ); } + + $message_tmp = $mode == 'newtopic' ? $message : $message . '\n\n' . $message_update_text; $sql = "UPDATE " . POSTS_TEXT_TABLE . " SET post_subject = '$subject', *************** *** 1401,1414 **** post_text = '$message_tmp' WHERE post_id = '$orig_post_id'"; ! if ( !( $result = $db->sql_query( $sql, BEGIN_TRANSACTION ) ) ) { message_die( GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql ); } - // End kb addon coe ---------------------------------------------------------- // if all is well then return the id of our new post ! return array( 'post_id' => $post_id, 'topic_id' => $topic_id ); } --- 1412,1424 ---- post_text = '$message_tmp' WHERE post_id = '$orig_post_id'"; ! if ( !( $result = $db->sql_query( $sql, BEGIN_TRANSACTION ) ) ) { message_die( GENERAL_ERROR, 'Error in posting', '', __LINE__, __FILE__, $sql ); } // End kb addon coe ---------------------------------------------------------- // if all is well then return the id of our new post ! return array( 'post_id' => $post_id, 'topic_id' => $topic_id, 'notify' => $message_tmp ); } *************** *** 1422,1426 **** if ( !MXBB_MODULE ) { ! $mxurl = $phpbb_root_path . 'kb.' . $phpEx . ( $args == '' ? '' : '?' . $args ); return $mxurl; } --- 1432,1436 ---- if ( !MXBB_MODULE ) { ! $mxurl = $module_root_path . 'kb.' . $phpEx . ( $args == '' ? '' : '?' . $args ); return $mxurl; } *************** *** 1454,1458 **** if ( !MXBB_MODULE ) { ! $mxurl = $phpbb_root_path . 'kb_search.' . $phpEx . ( $args == '' ? '' : '?' . $args ); return $mxurl; } --- 1464,1468 ---- if ( !MXBB_MODULE ) { ! $mxurl = $module_root_path . 'kb_search.' . $phpEx . ( $args == '' ? '' : '?' . $args ); return $mxurl; } *************** *** 1672,1679 **** } ! function kb_get_data($row, $userdata, $kb_post_mode = '') { ! global $db, $lang, $username; $kb_author_data = get_kb_author( $row['article_author_id'], true ); --- 1682,1695 ---- } ! function kb_get_data($row = '', $userdata = '', $kb_post_mode = 'add') { ! global $db, $lang, $username, $kb_config; + // Debug checks + if ( empty( $row ) || empty( $userdata ) ) + { + die('kb_get_data - empty pars'); + } + $kb_author_data = get_kb_author( $row['article_author_id'], true ); *************** *** 1684,1688 **** } $cat_row = $db->sql_fetchrow( $results ); ! // Article data $kb_comment['article_id'] = $row['article_id']; --- 1700,1704 ---- } $cat_row = $db->sql_fetchrow( $results ); ! // Article data $kb_comment['article_id'] = $row['article_id']; *************** *** 1700,1704 **** // Article author $kb_comment['article_author_id'] = $row['article_author_id']; ! $kb_comment['article_author'] = $kb_post_mode == 'add' ? ( $row['article_author_id'] != -1 ? $kb_author_data['username'] : ( ( $row['username'] == '' ) ? $lang['Guest'] : $row['username'] ) ) : $row['username']; $kb_comment['article_author_sig'] = $kb_author_data['user_attachsig']; --- 1716,1720 ---- // Article author $kb_comment['article_author_id'] = $row['article_author_id']; ! $kb_comment['article_author'] = $row['article_author_id'] != -1 ? $kb_author_data['username'] : ( ( $row['username'] == '' ) ? $lang['Guest'] : $row['username'] ) ; $kb_comment['article_author_sig'] = $kb_author_data['user_attachsig']; *************** *** 1706,1719 **** $kb_comment['article_editor_id'] = $userdata['user_id']; $kb_comment['article_editor'] = ( $userdata['user_id'] != '-1' ) ? $userdata['username'] : ( ( $username == '' ) ? $lang['Guest'] : stripslashes($username) ); ! $kb_comment['article_editor_sig'] = $userdata['user_attachsig']; return $kb_comment; } - if ( $author_id == -1 ) - { - $author_kb_art = ( $username != '' ) ? $lang['Guest'] : $row['username']; - } - // Compose phpbb comment header function kb_compose_comment( $kb_comment ) --- 1722,1736 ---- $kb_comment['article_editor_id'] = $userdata['user_id']; $kb_comment['article_editor'] = ( $userdata['user_id'] != '-1' ) ? $userdata['username'] : ( ( $username == '' ) ? $lang['Guest'] : stripslashes($username) ); ! $kb_comment['article_editor_sig'] = ( $userdata['user_id'] != '-1' ) ? $userdata['user_attachsig'] : '0'; ! ! // Debug checks ! if ( $kb_post_mode == 'edit' && $kb_config['use_comments'] && empty($kb_comment['topic_id'])) ! { ! die('kb_get_data - no forum topic id for comment'); ! } return $kb_comment; } // Compose phpbb comment header function kb_compose_comment( $kb_comment ) *************** *** 1820,1824 **** global $news_type_select_data, $kb_type_select_data, $kb_config; ! if ( !MXBB_MODULE || MXBB_27x ) { return true; --- 1837,1841 ---- global $news_type_select_data, $kb_type_select_data, $kb_config; ! if ( !MXBB_MODULE ) { return true; Index: kb_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/includes/kb_cat.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** kb_cat.php 1 Apr 2005 20:39:47 -0000 1.13 --- kb_cat.php 2 Apr 2005 20:37:03 -0000 1.14 *************** *** 42,50 **** // End of auth check // // // User authorisation levels output // ! $kb_auth_can = ( ( $kb_is_auth['auth_post'] ) ? $lang['KB_Rules_post_can'] : $lang['KB_Rules_post_cannot'] ) . '<br />'; $kb_auth_can .= ( ( $kb_is_auth['auth_edit'] ) ? $lang['KB_Rules_edit_can'] : $lang['KB_Rules_edit_cannot'] ) . '<br />'; $kb_auth_can .= ( ( $kb_is_auth['auth_delete'] ) ? $lang['KB_Rules_delete_can'] : $lang['KB_Rules_delete_cannot'] ) . '<br />'; --- 42,51 ---- // End of auth check + // // // User authorisation levels output // ! $kb_auth_can = '<br />' . ( ( $kb_is_auth['auth_post'] ) ? $lang['KB_Rules_post_can'] : $lang['KB_Rules_post_cannot'] ) . '<br />'; $kb_auth_can .= ( ( $kb_is_auth['auth_edit'] ) ? $lang['KB_Rules_edit_can'] : $lang['KB_Rules_edit_cannot'] ) . '<br />'; $kb_auth_can .= ( ( $kb_is_auth['auth_delete'] ) ? $lang['KB_Rules_delete_can'] : $lang['KB_Rules_delete_cannot'] ) . '<br />'; *************** *** 56,63 **** if ( $kb_is_auth['auth_mod'] ) { ! //$kb_auth_can .= sprintf($lang['KB_Rules_moderate'], "<a href=\"modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id&start=" . $start . "&sid=" . $userdata['session_id'] . '">', '</a>'); ! $kb_auth_can .= $lang['KB_Rules_moderate_can'] . '<br />'; } if ( !$kb_is_auth['auth_view'] ) { --- 57,65 ---- if ( $kb_is_auth['auth_mod'] ) { ! $kb_auth_can .= $lang['KB_Rules_moderate_can']; } + $kb_quick_nav = get_kb_cat_list( $category_id, 1, true, true ); + if ( !$kb_is_auth['auth_view'] ) { *************** *** 160,164 **** } ! $template->assign_vars( array( 'PAGINATION' => $pagination, 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $kb_config['art_pagination'] ) + 1 ), ceil( $total_articles / $kb_config['art_pagination'] ) ), 'L_GOTO_PAGE' => $lang['Goto_page'], --- 162,167 ---- } ! $template->assign_vars( array( ! 'PAGINATION' => $pagination, 'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $kb_config['art_pagination'] ) + 1 ), ceil( $total_articles / $kb_config['art_pagination'] ) ), 'L_GOTO_PAGE' => $lang['Goto_page'], *************** *** 177,182 **** 'PATH' => $path_kb, - 'S_AUTH_LIST' => $kb_auth_can, - 'U_CAT' => append_sid( this_kb_mxurl( 'mode=cat&cat=' . $category_id ) ) ) ); --- 180,183 ---- |
|
From: Jon O. <jon...@us...> - 2005-04-02 20:37:12
|
Update of /cvsroot/mxbb/mx_kb/templates/subSilver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30024/modules/mx_kb/templates/subSilver Modified Files: kb_article_body.tpl kb_article_body_print.tpl kb_cat_body.tpl kb_footer.tpl kb_post_body.tpl Log Message: fixing up: - permissions - tpl - footers adding - cat jump box Index: kb_cat_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/kb_cat_body.tpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** kb_cat_body.tpl 1 Apr 2005 20:39:48 -0000 1.10 --- kb_cat_body.tpl 2 Apr 2005 20:37:03 -0000 1.11 *************** *** 60,64 **** <tr> <td valign="top" align="left" ><span class="nav">{PAGE_NUMBER}</span></td> ! <td valign="top" align="right" ><span class="nav">{PAGINATION}</span><br /><br /><span class="gensmall">{S_AUTH_LIST}</span></td> </tr> </table> --- 60,64 ---- <tr> <td valign="top" align="left" ><span class="nav">{PAGE_NUMBER}</span></td> ! <td valign="top" align="right" ><span class="nav">{PAGINATION}</span></td> </tr> </table> Index: kb_article_body_print.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/kb_article_body_print.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** kb_article_body_print.tpl 28 Mar 2005 20:22:49 -0000 1.3 --- kb_article_body_print.tpl 2 Apr 2005 20:37:03 -0000 1.4 *************** *** 73,77 **** <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td width="100%"><span class="genmed"><b>{postrow.POSTER_NAME}</b></span><span class="postdetails">{L_POSTED}: {postrow.POST_DATE}<span class="gen"> </span> {L_POST_SUBJECT} {postrow.POST_SUBJECT}</span></td> </tr> <tr> --- 73,77 ---- <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td width="100%"><span class="genmed"><b>{postrow.POSTER_NAME}</b></span><span class="postdetails"> {L_POSTED}: {postrow.POST_DATE}<span class="gen"> </span> {L_POST_SUBJECT} {postrow.POST_SUBJECT}</span></td> </tr> <tr> Index: kb_article_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/kb_article_body.tpl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** kb_article_body.tpl 1 Apr 2005 14:14:49 -0000 1.13 --- kb_article_body.tpl 2 Apr 2005 20:37:03 -0000 1.14 *************** *** 84,88 **** <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td width="100%"><span class="genmed"><b>{postrow.POSTER_NAME}</b></span><span class="postdetails">{L_POSTED}: {postrow.POST_DATE}<span class="gen"> </span> {L_POST_SUBJECT} {postrow.POST_SUBJECT}</span></td> </tr> <tr> --- 84,88 ---- <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td width="100%"><span class="genmed"><b>{postrow.POSTER_NAME}</b></span><span class="postdetails"> {L_POSTED}: {postrow.POST_DATE}<span class="gen"> </span> {L_POST_SUBJECT} {postrow.POST_SUBJECT}</span></td> </tr> <tr> *************** *** 105,109 **** <tr> <td><span class="nav">{PAGE_NUMBER}</span></td> ! <td align="right"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}</span></td> </tr> </table> --- 105,109 ---- <tr> <td><span class="nav">{PAGE_NUMBER}</span></td> ! <td align="right"><span class="nav">{PAGINATION}</span></td> </tr> </table> *************** *** 121,125 **** <!-- END switch_ratings --> </td> - <td valign="top" align="right"><span class="gensmall">{S_AUTH_LIST}</span></td> </tr> </table> --- 121,124 ---- Index: kb_footer.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/kb_footer.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** kb_footer.tpl 18 Feb 2005 10:07:44 -0000 1.5 --- kb_footer.tpl 2 Apr 2005 20:37:03 -0000 1.6 *************** *** 1,7 **** ! <!-- <div align="center"><span class="copyright"><br /> ! Powered by Knowledge Base, {L_MODULE_ORIG_AUTHOR} ©2002 <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=89202" target="_phpbb" class="copyright">PHPBB.com MOD</a><br /> ! This script ({L_MODULE_VERSION}) is modified by <a href="http://www.mx-system.com/" target="_phpbb" class="copyright">{L_MODULE_AUTHOR}</a><br /> </span></div> ! --> ! </table> \ No newline at end of file --- 1,43 ---- ! ! <tr> ! <td> ! <table width="100%" cellspacing="0" cellpadding="0" border="0"> ! <tr> ! <td align="left" valign="top"> ! <!-- BEGIN quick_nav --> ! <form method="get" name="jumpbox" action="{QUICK_JUMP_ACTION}" onSubmit="if(document.jumpbox.cat.value == -1){return false;}"> ! <table cellspacing="0" cellpadding="0" border="0"> ! <tr> ! <td nowrap="nowrap"><span class="gensmall">{L_QUICK_NAV} ! <select name="cat" onchange="if(this.options[this.selectedIndex].value != 0){ forms['jumpbox'].submit() }"> ! <option value="0">{L_QUICK_JUMP}</otpion> ! {QUICK_NAV} ! </select> ! <!-- <input type="hidden" name="sid" value="{SID}" /> --> ! <input type="hidden" name="mode" value="cat" /> ! <input type="submit" value="{L_QUICK_JUMP}" class="liteoption" /></span> ! </td> ! </tr> ! </table> ! </form> ! <!-- END quick_nav --> ! </td> ! <td align="right"> ! <!-- BEGIN auth_can --> ! <span class="gensmall">{S_AUTH_LIST}</span> ! <!-- END auth_can --> ! </td> ! </tr> ! </table> ! </td> ! </tr> ! ! ! ! </table> ! ! <!-- BEGIN copy_footer --> <div align="center"><span class="copyright"><br /> ! Powered by Knowledge Base MOD, {L_MODULE_ORIG_AUTHOR} & <a href="http://www.mx-system.com/" target="_phpbb" class="copyright">{L_MODULE_AUTHOR}</a> © 2002-2005 <br /><a href="http://www.phpbb.com/phpBB/viewtopic.php?t=200195" target="_phpbb" class="copyright">PHPBB.com MOD</a> </span></div> ! <!-- END copy_footer --> Index: kb_post_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/kb_post_body.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** kb_post_body.tpl 1 Apr 2005 23:33:53 -0000 1.4 --- kb_post_body.tpl 2 Apr 2005 20:37:03 -0000 1.5 *************** *** 292,296 **** <!-- BEGIN input --> <tr> ! <td class="row1"><span class="gen"><b>{input.FIELD_NAME}</b></span><br><span class="gensmall">{input.FIELD_DESCRIPTION}</span></td> <td class="row2"> <input type="text" class="post" size="50" name="field[{input.FIELD_ID}]" value="{input.FIELD_VALUE}" /> --- 292,296 ---- <!-- BEGIN input --> <tr> ! <td class="row1"><span class="genmed">{input.FIELD_NAME}</span><br><span class="gensmall">{input.FIELD_DESCRIPTION}</span></td> <td class="row2"> <input type="text" class="post" size="50" name="field[{input.FIELD_ID}]" value="{input.FIELD_VALUE}" /> *************** *** 301,305 **** <!-- BEGIN textarea --> <tr> ! <td class="row1"><span class="gen"><b>{textarea.FIELD_NAME}</b></span><br><span class="gensmall">{textarea.FIELD_DESCRIPTION}</span></td> <td class="row2"> <textarea rows="6" class="post" name="field[{textarea.FIELD_ID}]" cols="32">{textarea.FIELD_VALUE}</textarea> --- 301,305 ---- <!-- BEGIN textarea --> <tr> ! <td class="row1"><span class="genmed">{textarea.FIELD_NAME}</span><br><span class="gensmall">{textarea.FIELD_DESCRIPTION}</span></td> <td class="row2"> <textarea rows="6" class="post" name="field[{textarea.FIELD_ID}]" cols="32">{textarea.FIELD_VALUE}</textarea> *************** *** 310,314 **** <!-- BEGIN radio --> <tr> ! <td class="row1"><span class="gen"><b>{radio.FIELD_NAME}</b></span><br><span class="gensmall">{radio.FIELD_DESCRIPTION}</span></td> <td class="row2"> <!-- BEGIN row --> --- 310,314 ---- <!-- BEGIN radio --> <tr> ! <td class="row1"><span class="genmed">{radio.FIELD_NAME}</span><br><span class="gensmall">{radio.FIELD_DESCRIPTION}</span></td> <td class="row2"> <!-- BEGIN row --> *************** *** 321,325 **** <!-- BEGIN select --> <tr> ! <td class="row1"><span class="gen"><b>{select.FIELD_NAME}</b></span><br><span class="gensmall">{select.FIELD_DESCRIPTION}</span></td> <td class="row2"> <select name="field[{select.FIELD_ID}]" class="post"> --- 321,325 ---- <!-- BEGIN select --> <tr> ! <td class="row1"><span class="genmed">{select.FIELD_NAME}</span><br><span class="gensmall">{select.FIELD_DESCRIPTION}</span></td> <td class="row2"> <select name="field[{select.FIELD_ID}]" class="post"> *************** *** 334,338 **** <!-- BEGIN select_multiple --> <tr> ! <td class="row1"><span class="gen"><b>{select_multiple.FIELD_NAME}</b></span><br><span class="gensmall">{select_multiple.FIELD_DESCRIPTION}</span></td> <td class="row2"> <select name="field[{select_multiple.FIELD_ID}][]" multiple="multiple" size="4" class="post"> --- 334,338 ---- <!-- BEGIN select_multiple --> <tr> ! <td class="row1"><span class="genmed">{select_multiple.FIELD_NAME}</span><br><span class="gensmall">{select_multiple.FIELD_DESCRIPTION}</span></td> <td class="row2"> <select name="field[{select_multiple.FIELD_ID}][]" multiple="multiple" size="4" class="post"> *************** *** 347,351 **** <!-- BEGIN checkbox --> <tr> ! <td class="row1"><span class="gen"><b>{checkbox.FIELD_NAME}</b></span><br><span class="gensmall">{checkbox.FIELD_DESCRIPTION}</span></td> <td class="row2"> <!-- BEGIN row --> --- 347,351 ---- <!-- BEGIN checkbox --> <tr> ! <td class="row1"><span class="genmed">{checkbox.FIELD_NAME}</span><br><span class="gensmall">{checkbox.FIELD_DESCRIPTION}</span></td> <td class="row2"> <!-- BEGIN row --> *************** *** 355,361 **** </tr> <!-- END checkbox --> - <tr> - <td class="cat" colspan="2" align="center"><span class="cattitle">{L_MESSAGE_TITLE}</span></td> - </tr> <tr> <td class="row1" valign="top"><span class="gen"><b><nobr>{L_ARTICLE_TEXT}</nobr></b><br /><br /> --- 355,358 ---- |
|
From: Jon O. <jon...@us...> - 2005-04-02 20:37:12
|
Update of /cvsroot/mxbb/mx_kb/templates/subSilver/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30024/modules/mx_kb/templates/subSilver/admin Modified Files: kb_cat_admin_body.tpl kb_cat_edit_body.tpl Log Message: fixing up: - permissions - tpl - footers adding - cat jump box Index: kb_cat_edit_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/admin/kb_cat_edit_body.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kb_cat_edit_body.tpl 1 Feb 2005 20:45:44 -0000 1.2 --- kb_cat_edit_body.tpl 2 Apr 2005 20:37:03 -0000 1.3 *************** *** 59,63 **** <tr> <td class="row1"><span class="gen">{L_EDIT_LEVEL}:</span></td> ! <td class="row2"><select name="auth_edit"><option {EDIT_REG} value="{S_USER}">{L_REG}</option><option {EDIT_PRIVATE} value="{S_PRIVATE}">{L_PRIVATE}</option><option {EDIT_MOD} value="{S_MOD}">{L_MOD}</option><option {EDIT_ADMIN} value="{S_ADMIN}">{L_ADMIN}</option></select></td> </tr> <tr> --- 59,63 ---- <tr> <td class="row1"><span class="gen">{L_EDIT_LEVEL}:</span></td> ! <td class="row2"><select name="auth_edit"><option {EDIT_GUEST} value="{S_GUEST}">{L_GUEST}</option><option {EDIT_REG} value="{S_USER}">{L_REG}</option><option {EDIT_PRIVATE} value="{S_PRIVATE}">{L_PRIVATE}</option><option {EDIT_MOD} value="{S_MOD}">{L_MOD}</option><option {EDIT_ADMIN} value="{S_ADMIN}">{L_ADMIN}</option></select></td> </tr> <tr> *************** *** 67,75 **** <tr> <td class="row1"><span class="gen">{L_APPROVAL_LEVEL}:</span></td> ! <td class="row2"><select name="auth_approval"><option {APPROVAL_DISABLED} value="{S_USER}">{L_DISABLED}</option><option {APPROVAL_MOD} value="{S_MOD}">{L_MOD}</option><option {APPROVAL_ADMIN} value="{S_ADMIN}">{L_ADMIN}</option></select></td> </tr> <tr> <td class="row1"><span class="gen">{L_APPROVAL_EDIT_LEVEL}:</span></td> ! <td class="row2"><select name="auth_approval_edit"><option {APPROVAL_DISABLED} value="{S_USER}">{L_DISABLED}</option><option {APPROVAL_MOD} value="{S_MOD}">{L_MOD}</option><option {APPROVAL_ADMIN} value="{S_ADMIN}">{L_ADMIN}</option></select></td> </tr> <tr> --- 67,75 ---- <tr> <td class="row1"><span class="gen">{L_APPROVAL_LEVEL}:</span></td> ! <td class="row2"><select name="auth_approval"><option {APPROVAL_DISABLED} value="{S_GUEST}">{L_DISABLED}</option><option {APPROVAL_MOD} value="{S_MOD}">{L_MOD}</option><option {APPROVAL_ADMIN} value="{S_ADMIN}">{L_ADMIN}</option></select></td> </tr> <tr> <td class="row1"><span class="gen">{L_APPROVAL_EDIT_LEVEL}:</span></td> ! <td class="row2"><select name="auth_approval_edit"><option {APPROVAL_DISABLED} value="{S_GUEST}">{L_DISABLED}</option><option {APPROVAL_MOD} value="{S_MOD}">{L_MOD}</option><option {APPROVAL_ADMIN} value="{S_ADMIN}">{L_ADMIN}</option></select></td> </tr> <tr> Index: kb_cat_admin_body.tpl =================================================================== RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/admin/kb_cat_admin_body.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kb_cat_admin_body.tpl 14 Aug 2003 17:59:40 -0000 1.1 --- kb_cat_admin_body.tpl 2 Apr 2005 20:37:03 -0000 1.2 *************** *** 28,32 **** <!-- BEGIN subrow --> <tr> ! <td class="{catrow.subrow.ROW_CLASS}"><span class="gen">{catrow.subrow.INDENT}{catrow.subrow.CATEGORY}<br />{catrow.subrow.INDENT}{catrow.subrow.CAT_DESCRIPTION}</span></td> <td class="{catrow.subrow.ROW_CLASS}" align="center"><span class="gen">{catrow.subrow.CAT_ARTICLES}</span></td> <td class="{catrow.subrow.ROW_CLASS}" align="center"><span class="gen">{catrow.subrow.U_UP}<br />{catrow.subrow.U_DOWN}</span></td> --- 28,32 ---- <!-- BEGIN subrow --> <tr> ! <td class="{catrow.subrow.ROW_CLASS}"><span class="gen">{catrow.subrow.INDENT}{catrow.subrow.CATEGORY}<br /> {catrow.subrow.CAT_DESCRIPTION}</span></td> <td class="{catrow.subrow.ROW_CLASS}" align="center"><span class="gen">{catrow.subrow.CAT_ARTICLES}</span></td> <td class="{catrow.subrow.ROW_CLASS}" align="center"><span class="gen">{catrow.subrow.U_UP}<br />{catrow.subrow.U_DOWN}</span></td> |
Update of /cvsroot/mxbb/mx_kb/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30024/modules/mx_kb/admin Modified Files: admin_kb_art.php admin_kb_auth.php admin_kb_cat.php admin_kb_config.php admin_kb_custom.php admin_kb_rebuild_search.php admin_kb_types.php Log Message: fixing up: - permissions - tpl - footers adding - cat jump box Index: admin_kb_art.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_art.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** admin_kb_art.php 1 Apr 2005 20:39:30 -0000 1.16 --- admin_kb_art.php 2 Apr 2005 20:36:55 -0000 1.17 *************** *** 127,130 **** --- 127,142 ---- $topic_sql = ''; + $kb_comment = array(); + + // Populate the kb_comment variable + $kb_comment = kb_get_data($row, $userdata ); + + // Compose post header + $subject = $lang['KB_comment_prefix'] . $kb_comment['article_title']; + $message_temp = kb_compose_comment( $kb_comment ); + + $kb_message = $message_temp['message']; + $kb_update_message = $message_temp['update_message']; + // Insert comment, if not already present if ( $kb_config['use_comments'] ) *************** *** 132,147 **** if ( !$row['topic_id'] ) { - $kb_comment = array(); - - // Populate the kb_comment variable - $kb_comment = kb_get_data($row, $userdata); - - // Compose post header - $subject = $lang['KB_comment_prefix'] . $kb_comment['article_title']; - $message_temp = kb_compose_comment( $kb_comment ); - - $kb_message = $message_temp['message']; - $kb_update_message = $message_temp['update_message']; - // Post $topic_data = kb_insert_post( $kb_message, $subject, $kb_comment['category_forum_id'], $kb_comment['article_editor_id'], $kb_comment['article_editor'], $kb_comment['article_editor_sig'], $kb_comment['topic_id'], $kb_update_message ); --- 144,147 ---- *************** *** 162,165 **** --- 162,166 ---- update_kb_number( $article_category_id, '+ 1' ); + kb_notify( $kb_config['notify'], $kb_message, $kb_config['admin_id'], $kb_comment['article_editor_id'] ); mx_add_search_words( 'single', $article_id, stripslashes( $row['article_body'] ), stripslashes( $row['article_title'] ), 'kb' ); Index: admin_kb_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_cat.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** admin_kb_cat.php 1 Apr 2005 14:14:47 -0000 1.9 --- admin_kb_cat.php 2 Apr 2005 20:37:02 -0000 1.10 *************** *** 188,191 **** --- 188,197 ---- 'DELETE_MOD' => 'selected="selected"', 'APPROVAL_DISABLED' => 'selected="selected"', + + 'S_GUEST' => AUTH_ALL, + 'S_USER' => AUTH_REG, + 'S_PRIVATE' => AUTH_ACL, + 'S_MOD' => AUTH_MOD, + 'S_ADMIN' => AUTH_ADMIN ) ); } *************** *** 229,233 **** $cat_order = $id['cat_order'] + 10; ! $sql = "INSERT INTO " . KB_CATEGORIES_TABLE . " ( category_name, category_details, number_articles, parent, cat_order, auth_view, auth_post, auth_rate, auth_comment, auth_edit, auth_delete, auth_approval, auth_approval_edit, comments_forum_id)" . " VALUES ( '$cat_name', ' $cat_desc', '0', '$parent', '$cat_order', '$view_level', '$view_post', '$view_rate', '$comment_level', '$comment_edit', '$comment_delete', '$approval', '$approval_edit', '$comments_forum_id')"; if ( !( $results = $db->sql_query( $sql ) ) ) --- 235,240 ---- $cat_order = $id['cat_order'] + 10; ! $sql = "INSERT INTO " . KB_CATEGORIES_TABLE . " ( category_name, category_details, number_articles, parent, cat_order, auth_view, auth_post, auth_rate, auth_comment, auth_edit, auth_delete, auth_approval, auth_approval_edit, comments_forum_id)" . " VALUES ! ( '$cat_name', ' $cat_desc', '0', '$parent', '$cat_order', '$view_level', '$post_level', '$rate_level', '$comment_level', '$edit_level', '$delete_level', '$approval_level', '$approval_edit_level', '$comments_forum_id')"; if ( !( $results = $db->sql_query( $sql ) ) ) *************** *** 620,623 **** --- 627,631 ---- } + $ss = 0; while ( $category = $db->sql_fetchrow( $cat_result ) ) { *************** *** 642,647 **** $down = '<a href="' . $temp_url . '" class="gen">' . $lang['Move_down'] . '</a>'; ! $row_color = ( !( $i % 2 ) ) ? $theme['td_color1'] : $theme['td_color2']; ! $row_class = ( !( $i % 2 ) ) ? $theme['td_class1'] : $theme['td_class2']; $template->assign_block_vars( 'catrow', array( 'CATEGORY' => $category_link, --- 650,655 ---- $down = '<a href="' . $temp_url . '" class="gen">' . $lang['Move_down'] . '</a>'; ! $row_color = ( !( $ss % 2 ) ) ? $theme['td_color1'] : $theme['td_color2']; ! $row_class = ( !( $ss % 2 ) ) ? $theme['td_class1'] : $theme['td_class2']; $template->assign_block_vars( 'catrow', array( 'CATEGORY' => $category_link, *************** *** 659,663 **** $i++; ! get_kb_cat_subs_admin( $category_id, '1', '-> ' ); } break; --- 667,672 ---- $i++; ! $ss++; ! $ss = get_kb_cat_subs_admin( $category_id, '1', ' ', $ss ); } break; |
2 messages has been excluded from this view by a project administrator.
