Update of /cvsroot/mxbb/mx_kb/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv651/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: additional fixes Index: admin_kb_art.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_art.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** admin_kb_art.php 20 Apr 2005 19:30:06 -0000 1.21 --- admin_kb_art.php 1 May 2005 16:39:22 -0000 1.22 *************** *** 25,38 **** define( 'IN_PORTAL', 1 ); define( 'MXBB_MODULE', false ); ! if ( !empty( $setmodules ) ) { $file = basename( __FILE__ ); ! $module['KB_title']['Art_man'] = $file; return; } - $phpbb_root_path = $module_root_path = $mx_root_path = "./../"; - require( $phpbb_root_path . 'extension.inc' ); require( './pagestart.' . $phpEx ); include( $phpbb_root_path . 'config.'.$phpEx ); --- 25,40 ---- define( 'IN_PORTAL', 1 ); define( 'MXBB_MODULE', false ); ! ! $phpbb_root_path = $module_root_path = $mx_root_path = "./../"; ! require_once( $phpbb_root_path . 'extension.inc' ); ! if ( !empty( $setmodules ) ) { + include_once( $phpbb_root_path . 'includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); ! $module['KB_title']['3_Art_man'] = $file; return; } require( './pagestart.' . $phpEx ); include( $phpbb_root_path . 'config.'.$phpEx ); *************** *** 52,69 **** define( 'IN_PORTAL', 1 ); define( 'MXBB_MODULE', true ); ! if ( !empty( $setmodules ) ) { $file = basename( __FILE__ ); ! $module['KB_title']['Art_man'] = 'modules/mx_kb/admin/' . $file; return; } - - $mx_root_path = './../../../'; - $module_root_path = "./../"; define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); ! require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); include( $module_root_path . 'includes/kb_constants.' . $phpEx ); --- 54,76 ---- define( 'IN_PORTAL', 1 ); define( 'MXBB_MODULE', true ); ! if ( !empty( $setmodules ) ) { + $mx_root_path = './../'; + $module_root_path = './../modules/mx_kb/'; + require_once( $mx_root_path . 'extension.inc' ); + include_once( $module_root_path . 'includes/kb_constants.' . $phpEx ); + $file = basename( __FILE__ ); ! $module['KB_title']['3_Art_man'] = $module_root_path . 'admin/' . $file; return; } + $mx_root_path = './../../../'; + $module_root_path = './../'; + define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); ! require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); include( $module_root_path . 'includes/kb_constants.' . $phpEx ); *************** *** 170,174 **** $article_category_id = $kb_row['article_category_id']; ! update_kb_number( $article_category_id, '+ 1' ); kb_notify( $kb_config['notify'], $kb_message, $kb_config['admin_id'], $kb_comment['article_editor_id'], 'approved' ); mx_add_search_words( 'single', $article_id, stripslashes( $kb_row['article_body'] ), stripslashes( $kb_row['article_title'] ), 'kb' ); --- 177,181 ---- $article_category_id = $kb_row['article_category_id']; ! update_kb_number( $article_category_id ); kb_notify( $kb_config['notify'], $kb_message, $kb_config['admin_id'], $kb_comment['article_editor_id'], 'approved' ); mx_add_search_words( 'single', $article_id, stripslashes( $kb_row['article_body'] ), stripslashes( $kb_row['article_title'] ), 'kb' ); *************** *** 203,207 **** } ! update_kb_number( $article_category_id, '- 1' ); mx_remove_search_post( $article_id, 'kb' ); --- 210,214 ---- } ! update_kb_number( $article_category_id ); mx_remove_search_post( $article_id, 'kb' ); *************** *** 230,234 **** if ( $article['approved'] == 1 ) { ! update_kb_number( $article_category_id, '- 1' ); } --- 237,241 ---- if ( $article['approved'] == 1 ) { ! update_kb_number( $article_category_id ); } Index: admin_kb_auth.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_auth.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** admin_kb_auth.php 20 Apr 2005 19:30:17 -0000 1.7 --- admin_kb_auth.php 1 May 2005 16:39:22 -0000 1.8 *************** *** 24,37 **** define( 'IN_PORTAL', 1 ); define( 'MXBB_MODULE', false ); ! if ( !empty( $setmodules ) ) { $file = basename( __FILE__ ); ! $module['KB_title']['Permissions'] = $file; return; } ! ! $phpbb_root_path = $module_root_path = $mx_root_path = "./../"; ! require( $phpbb_root_path . 'extension.inc' ); require( './pagestart.' . $phpEx ); include( $phpbb_root_path . 'config.'.$phpEx ); --- 24,39 ---- define( 'IN_PORTAL', 1 ); define( 'MXBB_MODULE', false ); ! ! $phpbb_root_path = $module_root_path = $mx_root_path = "./../"; ! require( $phpbb_root_path . 'extension.inc' ); ! if ( !empty( $setmodules ) ) { + include_once( $phpbb_root_path . 'includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); ! $module['KB_title']['4_Permissions'] = $file; return; } ! require( './pagestart.' . $phpEx ); include( $phpbb_root_path . 'config.'.$phpEx ); *************** *** 51,65 **** if ( !empty( $setmodules ) ) { $file = basename( __FILE__ ); ! $module['KB_title']['Permissions'] = "modules/mx_kb/admin/" . $file; return; } $mx_root_path = './../../../'; ! $module_root_path = "./../"; define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); ! ! require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); include( $module_root_path . 'includes/kb_constants.' . $phpEx ); --- 53,72 ---- if ( !empty( $setmodules ) ) { + $mx_root_path = './../'; + $module_root_path = './../modules/mx_kb/'; + require_once( $mx_root_path . 'extension.inc' ); + include_once( $module_root_path . 'includes/kb_constants.' . $phpEx ); + $file = basename( __FILE__ ); ! $module['KB_title']['4_Permissions'] = $module_root_path . 'admin/' . $file; return; } $mx_root_path = './../../../'; ! $module_root_path = './../'; define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); ! ! require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); include( $module_root_path . 'includes/kb_constants.' . $phpEx ); Index: admin_kb_config.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_config.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** admin_kb_config.php 20 Apr 2005 19:30:17 -0000 1.20 --- admin_kb_config.php 1 May 2005 16:39:22 -0000 1.21 *************** *** 26,38 **** define( 'MXBB_MODULE', false ); if ( !empty( $setmodules ) ) { $file = basename( __FILE__ ); ! $module['KB_title']['Configuration'] = $file; return; } - $phpbb_root_path = $module_root_path = $mx_root_path = "./../"; - require( $phpbb_root_path . 'extension.inc' ); require( './pagestart.' . $phpEx ); include( $phpbb_root_path . 'config.'.$phpEx ); --- 26,40 ---- define( 'MXBB_MODULE', false ); + $phpbb_root_path = $module_root_path = $mx_root_path = "./../"; + require( $phpbb_root_path . 'extension.inc' ); + if ( !empty( $setmodules ) ) { + include_once( $phpbb_root_path . 'includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); ! $module['KB_title']['1_Configuration'] = $file; return; } require( './pagestart.' . $phpEx ); include( $phpbb_root_path . 'config.'.$phpEx ); *************** *** 52,66 **** if ( !empty( $setmodules ) ) { $file = basename( __FILE__ ); ! $module['KB_title']['Configuration'] = 'modules/mx_kb/admin/' . $file . '?mode=config'; return; } $mx_root_path = './../../../'; ! $module_root_path = "./../"; define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); ! require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); include( $module_root_path . 'includes/kb_constants.' . $phpEx ); --- 54,73 ---- if ( !empty( $setmodules ) ) { + $mx_root_path = './../'; + $module_root_path = './../modules/mx_kb/'; + require_once( $mx_root_path . 'extension.inc' ); + include_once( $module_root_path . 'includes/kb_constants.' . $phpEx ); + $file = basename( __FILE__ ); ! $module['KB_title']['1_Configuration'] = $module_root_path . 'admin/' . $file . '?mode=config'; return; } $mx_root_path = './../../../'; ! $module_root_path = './../'; define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); ! require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); include( $module_root_path . 'includes/kb_constants.' . $phpEx ); Index: admin_kb_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_cat.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** admin_kb_cat.php 20 Apr 2005 19:30:17 -0000 1.14 --- admin_kb_cat.php 1 May 2005 16:39:22 -0000 1.15 *************** *** 25,38 **** define( 'IN_PORTAL', 1 ); define( 'MXBB_MODULE', false ); ! if ( !empty( $setmodules ) ) { $file = basename( __FILE__ ); ! $module['KB_title']['Cat_man'] = $file; return; } ! ! $phpbb_root_path = $module_root_path = $mx_root_path = "./../"; ! require( $phpbb_root_path . 'extension.inc' ); require( './pagestart.' . $phpEx ); include( $phpbb_root_path . 'config.'.$phpEx ); --- 25,40 ---- define( 'IN_PORTAL', 1 ); define( 'MXBB_MODULE', false ); ! ! $phpbb_root_path = $module_root_path = $mx_root_path = "./../"; ! require( $phpbb_root_path . 'extension.inc' ); ! if ( !empty( $setmodules ) ) { + include_once( $phpbb_root_path . 'includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); ! $module['KB_title']['2_Cat_man'] = $file; return; } ! require( './pagestart.' . $phpEx ); include( $phpbb_root_path . 'config.'.$phpEx ); *************** *** 52,66 **** if ( !empty( $setmodules ) ) { $file = basename( __FILE__ ); ! $module['KB_title']['Cat_man'] = 'modules/mx_kb/admin/' . $file; return; } ! $mx_root_path = './../../../'; ! $module_root_path = "./../"; define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); ! ! require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); include( $module_root_path . 'includes/kb_constants.' . $phpEx ); --- 54,73 ---- if ( !empty( $setmodules ) ) { + $mx_root_path = './../'; + $module_root_path = './../modules/mx_kb/'; + require_once( $mx_root_path . 'extension.inc' ); + include_once( $module_root_path . 'includes/kb_constants.' . $phpEx ); + $file = basename( __FILE__ ); ! $module['KB_title']['2_Cat_man'] = $module_root_path . 'admin/' . $file; return; } ! $mx_root_path = './../../../'; ! $module_root_path = './../'; define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); ! ! require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); include( $module_root_path . 'includes/kb_constants.' . $phpEx ); Index: admin_kb_rebuild_search.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_rebuild_search.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** admin_kb_rebuild_search.php 20 Apr 2005 19:30:17 -0000 1.7 --- admin_kb_rebuild_search.php 1 May 2005 16:39:22 -0000 1.8 *************** *** 21,33 **** define( 'MXBB_MODULE', false ); if ( !empty( $setmodules ) ) { $file = basename( __FILE__ ); ! $module['KB_title']['Optimize tables'] = $file; return; } - $phpbb_root_path = $module_root_path = $mx_root_path = "./../"; - require( $phpbb_root_path . 'extension.inc' ); require( './pagestart.' . $phpEx ); include( $phpbb_root_path . 'config.'.$phpEx ); --- 21,35 ---- define( 'MXBB_MODULE', false ); + $phpbb_root_path = $module_root_path = $mx_root_path = "./../"; + require( $phpbb_root_path . 'extension.inc' ); + if ( !empty( $setmodules ) ) { + include_once( $phpbb_root_path . 'includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); ! $module['KB_title']['7_Optimize_tables'] = $file; return; } require( './pagestart.' . $phpEx ); include( $phpbb_root_path . 'config.'.$phpEx ); *************** *** 47,61 **** if ( !empty( $setmodules ) ) { $file = basename( __FILE__ ); ! $module['KB_title']['Optimize tables'] = 'modules/mx_kb/admin/' . $file; return; } $mx_root_path = './../../../'; ! $module_root_path = "./../"; define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); ! require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); include( $module_root_path . 'includes/kb_constants.' . $phpEx ); --- 49,68 ---- if ( !empty( $setmodules ) ) { + $mx_root_path = './../'; + $module_root_path = './../modules/mx_kb/'; + require_once( $mx_root_path . 'extension.inc' ); + include_once( $module_root_path . 'includes/kb_constants.' . $phpEx ); + $file = basename( __FILE__ ); ! $module['KB_title']['7_Optimize_tables'] = $module_root_path . 'admin/' . $file; return; } $mx_root_path = './../../../'; ! $module_root_path = './../'; define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); ! require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); include( $module_root_path . 'includes/kb_constants.' . $phpEx ); Index: admin_kb_types.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_types.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** admin_kb_types.php 20 Apr 2005 19:30:17 -0000 1.12 --- admin_kb_types.php 1 May 2005 16:39:22 -0000 1.13 *************** *** 25,38 **** define( 'IN_PORTAL', 1 ); define( 'MXBB_MODULE', false ); ! if ( !empty( $setmodules ) ) { $file = basename( __FILE__ ); ! $module['KB_title']['Types_man'] = $file; return; } ! ! $phpbb_root_path = $module_root_path = $mx_root_path = "./../"; ! require( $phpbb_root_path . 'extension.inc' ); require( './pagestart.' . $phpEx ); include( $phpbb_root_path . 'config.'.$phpEx ); --- 25,40 ---- define( 'IN_PORTAL', 1 ); define( 'MXBB_MODULE', false ); ! ! $phpbb_root_path = $module_root_path = $mx_root_path = "./../"; ! require( $phpbb_root_path . 'extension.inc' ); ! if ( !empty( $setmodules ) ) { + include_once( $phpbb_root_path . 'includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); ! $module['KB_title']['5_Types_man'] = $file; return; } ! require( './pagestart.' . $phpEx ); include( $phpbb_root_path . 'config.'.$phpEx ); *************** *** 52,62 **** if ( !empty( $setmodules ) ) { $file = basename( __FILE__ ); ! $module['KB_title']['Types_man'] = 'modules/mx_kb/admin/' . $file; return; } $mx_root_path = './../../../'; ! $module_root_path = "./../"; define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); --- 54,69 ---- if ( !empty( $setmodules ) ) { + $mx_root_path = './../'; + $module_root_path = './../modules/mx_kb/'; + require_once( $mx_root_path . 'extension.inc' ); + include_once( $module_root_path . 'includes/kb_constants.' . $phpEx ); + $file = basename( __FILE__ ); ! $module['KB_title']['5_Types_man'] = $module_root_path . 'admin/' . $file; return; } $mx_root_path = './../../../'; ! $module_root_path = './../'; define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); Index: admin_kb_custom.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_custom.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** admin_kb_custom.php 20 Apr 2005 19:30:17 -0000 1.7 --- admin_kb_custom.php 1 May 2005 16:39:22 -0000 1.8 *************** *** 17,29 **** define( 'MXBB_MODULE', false ); if ( !empty( $setmodules ) ) { $file = basename( __FILE__ ); ! $module['KB_title']['Custom Field'] = $file; return; } ! ! $phpbb_root_path = $module_root_path = $mx_root_path = "./../"; ! require( $phpbb_root_path . 'extension.inc' ); require( './pagestart.' . $phpEx ); include( $phpbb_root_path . 'config.'.$phpEx ); --- 17,31 ---- define( 'MXBB_MODULE', false ); + $phpbb_root_path = $module_root_path = $mx_root_path = "./../"; + require( $phpbb_root_path . 'extension.inc' ); + if ( !empty( $setmodules ) ) { + include_once( $phpbb_root_path . 'includes/kb_constants.' . $phpEx ); $file = basename( __FILE__ ); ! $module['KB_title']['6_Custom_Field'] = $file; return; } ! require( './pagestart.' . $phpEx ); include( $phpbb_root_path . 'config.'.$phpEx ); *************** *** 43,57 **** if ( !empty( $setmodules ) ) { $file = basename( __FILE__ ); ! $module['KB_title']['Custom Field'] = "modules/mx_kb/admin/" . "$file"; return; } $mx_root_path = './../../../'; ! $module_root_path = "./../"; define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); ! require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); include( $module_root_path . 'includes/kb_constants.' . $phpEx ); --- 45,64 ---- if ( !empty( $setmodules ) ) { + $mx_root_path = './../'; + $module_root_path = './../modules/mx_kb/'; + require_once( $mx_root_path . 'extension.inc' ); + include_once( $module_root_path . 'includes/kb_constants.' . $phpEx ); + $file = basename( __FILE__ ); ! $module['KB_title']['6_Custom_Field'] = $module_root_path . 'admin/' . $file; return; } $mx_root_path = './../../../'; ! $module_root_path = './../'; define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) ); ! require( $mx_root_path . 'extension.inc' ); require( $mx_root_path . '/admin/pagestart.' . $phpEx ); include( $module_root_path . 'includes/kb_constants.' . $phpEx ); |