|
From: Jon O. <jon...@us...> - 2005-09-22 10:10:29
|
Update of /cvsroot/mxbb/mx_newssuite/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8369/modules/mx_newssuite/admin Modified Files: mx_module_defs.php Log Message: updating Index: mx_module_defs.php =================================================================== RCS file: /cvsroot/mxbb/mx_newssuite/admin/mx_module_defs.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mx_module_defs.php 21 Aug 2005 21:41:22 -0000 1.3 --- mx_module_defs.php 22 Sep 2005 10:10:18 -0000 1.4 *************** *** 63,68 **** function submit_module_parameters( $parameter_data, $block_id ) { ! global $HTTP_POST_VARS, $db, $board_config, $html_entities_match, $html_entities_replace; $parameter_value = $HTTP_POST_VARS[$parameter_data['parameter_name']]; $parameter_opt = ''; --- 63,69 ---- function submit_module_parameters( $parameter_data, $block_id ) { ! global $HTTP_POST_VARS, $db, $board_config, $html_entities_match, $html_entities_replace, $mx_blockcp, $mx_root_path, $phpEx; + $parameter_value = $HTTP_POST_VARS[$parameter_data['parameter_name']]; $parameter_opt = ''; *************** *** 70,74 **** switch ( $parameter_data['parameter_type'] ) { ! } --- 71,87 ---- switch ( $parameter_data['parameter_type'] ) { ! case 'news_type_select': ! $newssuite_config['news_source_switch'] = 'phpbb'; ! $module_root_path = $mx_root_path . $mx_blockcp->module_root_path; ! include( $module_root_path . "includes/newssuite_defs.$phpEx" ); ! ! $news_types_list[$item_types_all] = $HTTP_POST_VARS[$item_types_all]; ! for( $z = 0; $z < ( count( $item_types_array ) ); $z++ ) ! { ! $news_types_list[$item_types_array[$z]] = $HTTP_POST_VARS[$item_types_array[$z]]; ! } ! ! $parameter_value = addslashes( serialize( $news_types_list ) ); ! break; } *************** *** 99,113 **** $module_root_path = $mx_root_path . $mx_blockcp->module_root_path; ! include_once( $module_root_path . 'includes/newssuite_constants.' . $phpEx ); ! include_once( $module_root_path . "includes/newssuite_defs.$phpEx" ); $template->set_filenames(array( ! 'parameter' => $mx_root_path . $mx_blockcp->module_root_path . 'templates/'. $theme['template_name'] . '/admin/mx_module_parameters.tpl') ); ! // Get number of forums in db $sql = "SELECT * FROM " . $news_cat_table . " ORDER BY $cat_extract_order"; if ( !( $result = $db->sql_query( $sql ) ) ) { --- 112,136 ---- $module_root_path = $mx_root_path . $mx_blockcp->module_root_path; ! include( $module_root_path . 'includes/newssuite_constants.' . $phpEx ); ! include( $module_root_path . "includes/newssuite_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) ); ! // Get number of forums in db $sql = "SELECT * FROM " . $news_cat_table . " ORDER BY $cat_extract_order"; + if ( !( $result = $db->sql_query( $sql ) ) ) { *************** *** 121,128 **** --- 144,156 ---- $categories = get_main_cats( $newssuite_config ); + /* $news_type_select_data = array(); $news_type_select_temp = $mx_blockcp->block_parameters['news_type_select']['parameter_value']; $news_type_select_temp = stripslashes( $news_type_select_temp ); $news_type_select_data = eval( "return " . $news_type_select_temp . ";" ); + */ + + $news_type_select_data = ( !empty( $parameter_data['parameter_value'] ) ) ? unserialize($parameter_data['parameter_value']) : array(); + // // Check that some categories exist *************** *** 170,177 **** 'FORUM_DESC' => $forums[$j][$catt_desc], ! 'CHECKED' => ( $news_type_select_data[$forums[$j]['forum_id']]['forum_news'] ? 'CHECKED' : '' ), ! 'ANNOUNCE_CHECKED' => ( $news_type_select_data[$forums[$j]['forum_id']]['forum_news_announce'] ? 'CHECKED' : '' ), ! 'STICKY_CHECKED' => ( $news_type_select_data[$forums[$j]['forum_id']]['forum_news_sticky'] ? 'CHECKED' : '' ), ! 'NORMAL_CHECKED' => ( $news_type_select_data[$forums[$j]['forum_id']]['forum_news_post'] ? 'CHECKED' : '' ) ) ); break; --- 198,205 ---- 'FORUM_DESC' => $forums[$j][$catt_desc], ! 'CHECKED' => ( $news_type_select_data['forum_news'][$forums[$j]['forum_id']] ? 'CHECKED' : '' ), ! 'ANNOUNCE_CHECKED' => ( $news_type_select_data['forum_news_announce'][$forums[$j]['forum_id']] ? 'CHECKED' : '' ), ! 'STICKY_CHECKED' => ( $news_type_select_data['forum_news_sticky'][$forums[$j]['forum_id']] ? 'CHECKED' : '' ), ! 'NORMAL_CHECKED' => ( $news_type_select_data['forum_news_post'][$forums[$j]['forum_id']] ? 'CHECKED' : '' ) ) ); break; *************** *** 181,192 **** 'FORUM_DESC' => $forums[$j][$catt_desc], ! 'CHECKED' => ( $news_type_select_data[$forums[$j][$cool_array_category_id]]['forum_news'] ? 'CHECKED' : '' ), ! // 'ANNOUNCE_CHECKED' => ( $news_type_select_data[$forums[$j]['forum_id']]['forum_news_announce'] ? 'CHECKED' : '' ), ! // 'STICKY_CHECKED' => ( $news_type_select_data[$forums[$j]['forum_id']]['forum_news_sticky'] ? 'CHECKED' : '' ), ! // 'NORMAL_CHECKED' => ( $news_type_select_data[$forums[$j]['forum_id']]['forum_news_post'] ? 'CHECKED' : '' ) ) ); for( $z = 0; $z < ( count( $item_types_array ) ); $z++ ) { ! $template->assign_block_vars( 'catrow.forumrow_kb.types', array( 'CHECKED' => ( $news_type_select_data[$forums[$j][$cool_array_category_id]][$item_types_array[$z]] ? 'CHECKED' : '' ), 'TYPE' => $item_types_array[$z], 'VALUE' => $item_types_id_array[$z] --- 209,217 ---- 'FORUM_DESC' => $forums[$j][$catt_desc], ! 'CHECKED' => ( $news_type_select_data['forum_news'][$forums[$j][$cool_array_category_id]] ? 'CHECKED' : '' ), ) ); for( $z = 0; $z < ( count( $item_types_array ) ); $z++ ) { ! $template->assign_block_vars( 'catrow.forumrow_kb.types', array( 'CHECKED' => ( $news_type_select_data[$item_types_array[$z]][$forums[$j][$cool_array_category_id]] ? 'CHECKED' : '' ), 'TYPE' => $item_types_array[$z], 'VALUE' => $item_types_id_array[$z] *************** *** 203,206 **** --- 228,232 ---- $template->assign_vars(array( 'NAME' => $lang[$parameter_data['parameter_name']], + 'SELECT_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']] : '', |