|
From: Jon O. <jon...@us...> - 2006-06-29 13:39:06
|
Update of /cvsroot/mxbb/mx_calsnails/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv4127/modules/mx_calsnails/admin Modified Files: admin_calendar.php Log Message: Code cleanup Index: admin_calendar.php =================================================================== RCS file: /cvsroot/mxbb/mx_calsnails/admin/admin_calendar.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** admin_calendar.php 2 May 2006 23:25:58 -0000 1.12 --- admin_calendar.php 29 Jun 2006 13:39:02 -0000 1.13 *************** *** 9,13 **** */ - // MX001: define('IN_PHPBB', 1); define( 'IN_PORTAL', true ); --- 9,12 ---- *************** *** 15,38 **** { $filename = basename( __FILE__ ); - // MX002 $module['Portal CalSnails Lite']['Settings'] = 'modules/mx_calsnails/admin/' . $filename; return; } - // -------------------------------------------------- - // MX003: Begin - - /* ========== * ========== * ========== * - global $db; - // - // Load default header - // - $phpbb_root_path = "../"; - $phpEx = substr(strrchr(__FILE__, '.'), 1); - require('pagestart.' . $phpEx); - - require($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx); - $page_title = $lang['Config_Cal']; - $caltable = $table_prefix . "cal_config"; - * ========== * ========== * ========== */ $mx_root_path = '../../../'; --- 14,20 ---- *************** *** 46,51 **** include_once( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); - // MX003: End - // -------------------------------------------------- $sql = "SELECT * FROM " . $caltable; if ( !$result = $db->sql_query( $sql ) ) --- 28,31 ---- *************** *** 82,86 **** --- 62,69 ---- } } + + // // Build Week Start select box + // $week_start_select = "<select name='week_start'>"; $week_start_select .= "<option value='0' "; *************** *** 100,105 **** $show_headers_yes = ( $new['show_headers'] ) ? "checked=\"checked\"" : ""; $show_headers_no = ( !$new['show_headers'] ) ? "checked=\"checked\"" : ""; - // ---------- - // +MX005 function get_cal_levels( $field ) --- 83,86 ---- *************** *** 132,184 **** $s_cal_type = get_cal_levels( 'allow_user_default' ); ! // -MX005 ! // ---------- ! $template->set_filenames( array( "body" => "admin/calendar_config_body.tpl" ) ! ); ! ! $template->assign_vars( array( "S_CONFIG_ACTION" => append_sid( "admin_calendar.$phpEx" ), ! "L_YES" => $lang['Yes'], ! "L_NO" => $lang['No'], ! "L_CONFIGURATION_TITLE" => $lang['Config_Calendar'], ! "L_GENERAL_SETTINGS" => $lang['Config_Calendar'], ! "L_CONFIGURATION_EXPLAIN" => $lang['Config_Calendar_explain'], ! "L_WEEK_START" => $lang['week_start'], ! "L_SUBJECT_LENGTH" => $lang['subject_length'], ! "L_SUBJECT_LENGTH_EXPLAIN" => $lang['subject_length_explain'], ! "L_ALLOW_ANON" => $lang['allow_anon'], ! "L_ALLOW_USER_POST" => $lang['allow_user_post'], ! "L_ALLOW_ANON_DEFAULT" => $lang['allow_anon_post_default'], // MX005: added ! "L_ALLOW_USER_DEFAULT" => $lang['allow_user_post_default'], ! "L_ALLOW_OLD" => $lang['allow_old'], ! "L_ALLOW_OLD_EXPLAIN" => $lang['allow_old_explain'], ! "L_SHOW_HEADERS" => $lang['show_headers'], ! "L_DATE_FORMAT" => $lang['Date_format'], ! "L_DATE_FORMAT_EXPLAIN" => $lang['cal_date_explain'], ! "L_SUBMIT" => $lang['Submit'], ! "L_RESET" => $lang['Reset'], ! "WEEK_START_SELECT" => $week_start_select, ! "SUBJECT_LENGTH" => $new['subject_length'], ! "SCIPT_PATH" => $new['cal_script_path'], ! "S_ALLOW_ANON_YES" => $allow_anon_yes, ! "S_ALLOW_ANON_NO" => $allow_anon_no, ! "S_ALLOW_USER_POST_YES" => $allow_user_post_yes, ! "S_ALLOW_USER_POST_NO" => $allow_user_post_no, ! "S_ALLOW_ANON_DEFAULT" => $s_cal_anon, // MX005: added ! "S_ALLOW_USER_DEFAULT" => $s_cal_type, ! "S_ALLOW_OLD_YES" => $allow_old_yes, ! "S_ALLOW_OLD_NO" => $allow_old_no, ! "S_SHOW_HEADERS_YES" => $show_headers_yes, ! "S_SHOW_HEADERS_NO" => $show_headers_no, ! "CAL_DATEFORMAT" => $new['cal_dateformat'] ) ! ); $template->pparse( "body" ); - // MX004: include('./page_footer_admin.'.$phpEx); include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); - ?> \ No newline at end of file --- 113,160 ---- $s_cal_type = get_cal_levels( 'allow_user_default' ); ! $template->set_filenames( array( "body" => "admin/calendar_config_body.tpl" ) ); ! $template->assign_vars( array( ! "S_CONFIG_ACTION" => append_sid( "admin_calendar.$phpEx" ), ! "L_YES" => $lang['Yes'], ! "L_NO" => $lang['No'], ! "L_CONFIGURATION_TITLE" => $lang['Config_Calendar'], ! "L_GENERAL_SETTINGS" => $lang['Config_Calendar'], ! "L_CONFIGURATION_EXPLAIN" => $lang['Config_Calendar_explain'], ! "L_WEEK_START" => $lang['week_start'], ! "L_SUBJECT_LENGTH" => $lang['subject_length'], ! "L_SUBJECT_LENGTH_EXPLAIN" => $lang['subject_length_explain'], ! "L_ALLOW_ANON" => $lang['allow_anon'], ! "L_ALLOW_USER_POST" => $lang['allow_user_post'], ! "L_ALLOW_ANON_DEFAULT" => $lang['allow_anon_post_default'], // MX005: added ! "L_ALLOW_USER_DEFAULT" => $lang['allow_user_post_default'], ! "L_ALLOW_OLD" => $lang['allow_old'], ! "L_ALLOW_OLD_EXPLAIN" => $lang['allow_old_explain'], ! "L_SHOW_HEADERS" => $lang['show_headers'], ! "L_DATE_FORMAT" => $lang['Date_format'], ! "L_DATE_FORMAT_EXPLAIN" => $lang['cal_date_explain'], ! "L_SUBMIT" => $lang['Submit'], ! "L_RESET" => $lang['Reset'], ! "WEEK_START_SELECT" => $week_start_select, ! "SUBJECT_LENGTH" => $new['subject_length'], ! "SCIPT_PATH" => $new['cal_script_path'], ! "S_ALLOW_ANON_YES" => $allow_anon_yes, ! "S_ALLOW_ANON_NO" => $allow_anon_no, ! "S_ALLOW_USER_POST_YES" => $allow_user_post_yes, ! "S_ALLOW_USER_POST_NO" => $allow_user_post_no, ! "S_ALLOW_ANON_DEFAULT" => $s_cal_anon, // MX005: added ! "S_ALLOW_USER_DEFAULT" => $s_cal_type, ! "S_ALLOW_OLD_YES" => $allow_old_yes, ! "S_ALLOW_OLD_NO" => $allow_old_no, ! "S_SHOW_HEADERS_YES" => $show_headers_yes, ! "S_SHOW_HEADERS_NO" => $show_headers_no, ! "CAL_DATEFORMAT" => $new['cal_dateformat'] ! )); $template->pparse( "body" ); include_once( $mx_root_path . 'admin/page_footer_admin.' . $phpEx ); ?> \ No newline at end of file |