Menu
▾
▴
[mxbb-commits] mx_forum/admin admin_forums_ext.php,1.2,1.3 mx_module_defs.php,1.2,1.3 admin_edit.php,1.2,NONE phpbb_config.php,1.8,NONE
|
From: Jon O. <jon...@us...> - 2005-09-15 17:59:39
|
Update of /cvsroot/mxbb/mx_forum/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2687/modules/mx_forum/admin Modified Files: admin_forums_ext.php mx_module_defs.php Removed Files: admin_edit.php phpbb_config.php Log Message: Making the phpBB integration module ready for mxBB 2.8 --- admin_edit.php DELETED --- Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/mx_forum/admin/mx_module_defs.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mx_module_defs.php 20 Aug 2005 18:49:25 -0000 1.2 --- mx_module_defs.php 15 Sep 2005 17:59:19 -0000 1.3 *************** *** 70,74 **** switch ( $parameter_data['parameter_type'] ) { ! } --- 70,76 ---- switch ( $parameter_data['parameter_type'] ) { ! case 'phpbb_type_select': ! $parameter_value = addslashes( serialize( $parameter_value ) ); ! break; } *************** *** 81,85 **** function display_module_parameters( $parameter_data ) { ! global $template, $blockcptemplate, $mx_blockcp, $mx_root_path, $theme, $lang; switch ( $parameter_data['parameter_type'] ) --- 83,87 ---- function display_module_parameters( $parameter_data ) { ! global $template, $mx_blockcp, $mx_root_path, $theme, $lang; switch ( $parameter_data['parameter_type'] ) *************** *** 99,104 **** include_once( $module_root_path . "includes/phpbb_defs.$phpEx" ); $template->set_filenames(array( ! 'parameter' => $mx_root_path . $mx_blockcp->module_root_path . 'templates/'. $theme['template_name'] . '/admin/mx_module_parameters.tpl') ); --- 101,115 ---- include_once( $module_root_path . "includes/phpbb_defs.$phpEx" ); + if (file_exists($mx_root_path . $mx_blockcp->module_root_path . 'templates/'. $theme['template_name'] . '/admin/mx_module_parameters.tpl')) + { + $module_template_file = $mx_root_path . $mx_blockcp->module_root_path . 'templates/'. $theme['template_name'] . '/admin/mx_module_parameters.tpl'; + } + else + { + $module_template_file = $mx_root_path . $mx_blockcp->module_root_path . 'templates/subSilver' . '/admin/mx_module_parameters.tpl'; + } + $template->set_filenames(array( ! 'parameter' => $module_template_file) ); *************** *** 126,133 **** $categories = $db->sql_fetchrowset( $result ); ! $phpbb_type_select_data = array(); ! $phpbb_type_select_temp = $mx_blockcp->block_parameters['phpbb_type_select']['parameter_value']; ! $phpbb_type_select_temp = stripslashes( $phpbb_type_select_temp ); ! $phpbb_type_select_data = eval( "return " . $phpbb_type_select_temp . ";" ); // // Check that some categories exist --- 137,142 ---- $categories = $db->sql_fetchrowset( $result ); ! $phpbb_type_select_data = ( !empty( $mx_blockcp->block_parameters['Source_phpBB_Forums']['parameter_value'] ) ) ? unserialize($mx_blockcp->block_parameters['Source_phpBB_Forums']['parameter_value']) : array(); ! // // Check that some categories exist *************** *** 158,166 **** 'FORUM_DESC' => $forums[$j][$catt_desc], ! 'CHECKED' => ( $phpbb_type_select_data[$forums[$j]['forum_id']]['forum_news'] ? 'CHECKED' : '' ), ! 'ANNOUNCE_CHECKED' => ( $phpbb_type_select_data[$forums[$j]['forum_id']]['forum_news_announce'] ? 'CHECKED' : '' ), ! 'STICKY_CHECKED' => ( $phpbb_type_select_data[$forums[$j]['forum_id']]['forum_news_sticky'] ? 'CHECKED' : '' ), ! 'NORMAL_CHECKED' => ( $phpbb_type_select_data[$forums[$j]['forum_id']]['forum_news_post'] ? 'CHECKED' : '' ) ) ! ); } } --- 167,172 ---- 'FORUM_DESC' => $forums[$j][$catt_desc], ! 'CHECKED' => ( $phpbb_type_select_data[$forums[$j]['forum_id']] ? 'CHECKED' : '' ), ! )); } } *************** *** 171,174 **** --- 177,181 ---- $template->assign_vars(array( 'NAME' => $lang[$parameter_data['parameter_name']], + 'SELSCT_NAME' => $parameter_data['parameter_name'], 'PARAMETER_TITLE' => ( !empty($lang[$parameter_data['parameter_name']]) ) ? $lang[$parameter_data['parameter_name']] : $parameter_data['parameter_name'], 'PARAMETER_TYPE' => ( !empty($lang["ParType_".$parameter_data['parameter_type']]) ) ? $lang["ParType_".$parameter_data['parameter_type']] : '', *************** *** 185,188 **** --- 192,197 ---- )); + $template->pparse('parameter'); + } } Index: admin_forums_ext.php =================================================================== RCS file: /cvsroot/mxbb/mx_forum/admin/admin_forums_ext.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_forums_ext.php 9 Jan 2005 22:22:02 -0000 1.2 --- admin_forums_ext.php 15 Sep 2005 17:59:19 -0000 1.3 *************** *** 26,38 **** } - // Load default header - - /* - $phpbb_root_path = "./../"; - require($phpbb_root_path . 'extension.inc'); - require('./pagestart.' . $phpEx); - include($phpbb_root_path . 'includes/functions_admin.'.$phpEx); - */ [...1092 lines suppressed...] $template->pparse( "body" ); - // include('./page_footer_admin.'.$phpEx); include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); --- 154,168 ---- 'PHPBB_SEARCH' => $phpbb_search, ! //'L_PHPBB_VIEWFORUM' => $lang['phpbb_viewforum'], ! //'PHPBB_VIEWFORUM' => $phpbb_viewforum, 'L_PHPBB_VIEWONLINE' => $lang['phpbb_viewonline'], 'PHPBB_VIEWONLINE' => $phpbb_viewonline, ! //'L_PHPBB_VIEWTOPIC' => $lang['phpbb_viewtopic'], ! //'PHPBB_VIEWTOPIC' => $phpbb_viewtopic ! )); $template->pparse( "body" ); include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); --- phpbb_config.php DELETED --- |
