Menu
▾
▴
[mxbb-commits] mx_pafiledb/pafiledb/admin admin_catauth_manage.php, 1.2, 1.3 admin_custom_manage.php, 1.2, 1.3 admin_settings.php, 1.2, 1.3 admin_ug_auth_manage.php, 1.2, 1.3 admin_file_manage.php, 1.3, NONE
Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23242/modules/mx_pafiledb/pafiledb/admin Modified Files: admin_catauth_manage.php admin_custom_manage.php admin_settings.php admin_ug_auth_manage.php Removed Files: admin_file_manage.php Log Message: massive update Index: admin_custom_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_custom_manage.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_custom_manage.php 8 Jul 2006 16:28:46 -0000 1.2 --- admin_custom_manage.php 1 Aug 2006 21:03:24 -0000 1.3 *************** *** 24,28 **** // include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); - include_once( $module_root_path . 'pafiledb/includes/functions_field.' . $phpEx ); // --- 24,27 ---- Index: admin_catauth_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_catauth_manage.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_catauth_manage.php 8 Jul 2006 16:28:46 -0000 1.2 --- admin_catauth_manage.php 1 Aug 2006 21:03:24 -0000 1.3 *************** *** 19,23 **** { global $db, $images, $template, $pafiledb_template, $lang, $phpEx, $pafiledb_functions, $pafiledb_cache, $pafiledb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars; ! global $cat_auth_fields, $cat_auth_const, $cat_auth_levels; // --- 19,24 ---- { global $db, $images, $template, $pafiledb_template, $lang, $phpEx, $pafiledb_functions, $pafiledb_cache, $pafiledb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars; ! global $cat_auth_fields, $cat_auth_const, $cat_auth_levels, $global_auth_fields; ! global $cat_auth_approval_fields, $cat_auth_approval_const, $cat_auth_approval_levels; // *************** *** 26,32 **** include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); ! $cat_auth_fields = array( 'auth_view', 'auth_read', 'auth_view_file', 'auth_edit_file', 'auth_delete_file', 'auth_upload', 'auth_download', 'auth_rate', 'auth_email', 'auth_view_comment', 'auth_post_comment', 'auth_edit_comment', 'auth_delete_comment', 'auth_approval' ); ! $field_names = array( 'auth_view' => $lang['View'], 'auth_read' => $lang['Read'], 'auth_view_file' => $lang['View_file'], --- 27,38 ---- include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx ); ! $custom_auth_approval = array(); ! $custom_auth = array(); ! $cat_auth_fields = array( 'auth_view', 'auth_read', 'auth_view_file', 'auth_edit_file', 'auth_delete_file', 'auth_upload', 'auth_download', 'auth_rate', 'auth_email', 'auth_view_comment', 'auth_post_comment', 'auth_edit_comment', 'auth_delete_comment' ); ! $cat_auth_approval_fields = array( 'auth_approval', 'auth_approval_edit' ); ! ! $field_names = array( ! 'auth_view' => $lang['View'], 'auth_read' => $lang['Read'], 'auth_view_file' => $lang['View_file'], *************** *** 35,38 **** --- 41,45 ---- 'auth_upload' => $lang['Upload'], 'auth_approval' => $lang['Approval'], + 'auth_approval_edit' => $lang['Approval_edit'], 'auth_download' => $lang['Download_file'], 'auth_rate' => $lang['Rate'], *************** *** 46,49 **** --- 53,59 ---- $cat_auth_const = array( AUTH_ALL, AUTH_REG, AUTH_ACL, AUTH_MOD, AUTH_ADMIN ); + $cat_auth_approval_levels = array( 'NONE', 'MOD', 'ADMIN' ); + $cat_auth_approval_const = array( AUTH_ALL, AUTH_MOD, AUTH_ADMIN ); + $cat_parent = ( isset( $_REQUEST['cat_parent'] ) ) ? intval( $_REQUEST['cat_parent'] ) : 0; *************** *** 130,133 **** --- 140,150 ---- } + for( $j = 0; $j < count( $cat_auth_approval_fields ); $j++ ) + { + $cell_title = $field_names[$cat_auth_approval_fields[$j]]; + + $pafiledb_template->assign_block_vars( 'cat_auth_titles', array( 'CELL_TITLE' => $cell_title ) ); + } + if ( empty( $cat_id ) ) { *************** *** 143,146 **** --- 160,166 ---- )); + // + // Standard auth fields + // for( $j = 0; $j < count( $cat_auth_fields ); $j++ ) { *************** *** 157,165 **** } $s_hidden_fields = '<input type="hidden" name="cat_id" value="' . $cat_id . '">'; $cat_name = $this->cat_rowset[$cat_id]['cat_name']; } ! $s_column_span = count( $cat_auth_fields ) + 2; $pafiledb_template->assign_vars( array( --- 177,202 ---- } + // + // Standard auth fields + // + for( $j = 0; $j < count( $cat_auth_approval_fields ); $j++ ) + { + $custom_auth_approval[$j] = ' <select name="' . $cat_auth_approval_fields[$j] . '[' . $cat_id . ']' . '">'; + + for( $k = 0; $k < count( $cat_auth_approval_levels ); $k++ ) + { + $selected = ( $this->cat_rowset[$cat_id][$cat_auth_approval_fields[$j]] == $cat_auth_approval_const[$k] ) ? ' selected="selected"' : ''; + $custom_auth_approval[$j] .= '<option value="' . $cat_auth_approval_const[$k] . '"' . $selected . '>' . $lang['Category_' . $cat_auth_approval_levels[$k]] . '</option>'; + } + $custom_auth_approval[$j] .= '</select> '; + + $pafiledb_template->assign_block_vars( 'cat_row.cat_auth_data', array( 'S_AUTH_LEVELS_SELECT' => $custom_auth_approval[$j] ) ); + } + $s_hidden_fields = '<input type="hidden" name="cat_id" value="' . $cat_id . '">'; $cat_name = $this->cat_rowset[$cat_id]['cat_name']; } ! $s_column_span = count( $cat_auth_fields ) + count( $cat_auth_approval_fields ) + 2; $pafiledb_template->assign_vars( array( --- admin_file_manage.php DELETED --- Index: admin_ug_auth_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_ug_auth_manage.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_ug_auth_manage.php 8 Jul 2006 16:28:46 -0000 1.2 --- admin_ug_auth_manage.php 1 Aug 2006 21:03:24 -0000 1.3 *************** *** 19,23 **** { global $db, $images, $template, $pafiledb_template, $lang, $phpEx, $pafiledb_functions, $pafiledb_cache, $pafiledb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars; ! global $cat_auth_fields, $cat_auth_const, $cat_auth_levels; // --- 19,24 ---- { global $db, $images, $template, $pafiledb_template, $lang, $phpEx, $pafiledb_functions, $pafiledb_cache, $pafiledb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars; ! global $cat_auth_fields, $cat_auth_const, $cat_auth_levels, $global_auth_fields; ! global $optionlist_mod, $optionlist_acl_adv; // *************** *** 541,546 **** $cell_title = $field_names[$cat_auth_fields[$i]]; ! $pafiledb_template->assign_block_vars( 'acltype', array( 'L_UG_ACL_TYPE' => $cell_title ) ! ); $s_column_span++; } --- 542,546 ---- $cell_title = $field_names[$cat_auth_fields[$i]]; ! $pafiledb_template->assign_block_vars( 'acltype', array( 'L_UG_ACL_TYPE' => $cell_title ) ); $s_column_span++; } *************** *** 549,554 **** $s_hidden_fields .= ( $mode == 'user' ) ? '<input type="hidden" name="' . POST_USERS_URL . '" value="' . $user_id . '" />' : '<input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" />'; - include( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); - $pafiledb_template->set_filenames( array( 'body' => 'admin/pa_auth_ug_body.tpl' ) ); --- 549,552 ---- *************** *** 775,780 **** $s_hidden_fields .= ( $mode == 'global_user' ) ? '<input type="hidden" name="' . POST_USERS_URL . '" value="' . $user_id . '" />' : '<input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" />'; - include( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); - $pafiledb_template->set_filenames( array( 'body' => 'admin/pa_auth_ug_body.tpl' ) ); --- 773,776 ---- *************** *** 820,825 **** // Select a user/group - include( $mx_root_path . 'admin/page_header_admin.' . $phpEx ); - $pafiledb_template->set_filenames( array( 'body' => ( $mode == 'user' || $mode == 'global_user' ) ? 'admin/user_select_body.tpl' : 'admin/auth_select_body.tpl' ) ); --- 816,819 ---- *************** *** 852,857 **** } ! $pafiledb_template->assign_vars( array( 'S_AUTH_SELECT' => $select_list ) ! ); } --- 846,850 ---- } ! $pafiledb_template->assign_vars( array( 'S_AUTH_SELECT' => $select_list ) ); } Index: admin_settings.php =================================================================== RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_settings.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_settings.php 8 Jul 2006 16:28:46 -0000 1.2 --- admin_settings.php 1 Aug 2006 21:03:24 -0000 1.3 *************** *** 181,184 **** --- 181,187 ---- $cat_col = $new['cat_col']; + $use_simple_navigation_yes = ( $new['use_simple_navigation'] ) ? "checked=\"checked\"" : ""; + $use_simple_navigation_no = ( !$new['use_simple_navigation'] ) ? "checked=\"checked\"" : ""; + // // Instructions *************** *** 354,358 **** 'CAT_COL' => $cat_col, ! 'L_CAT_COL' => $lang['cat_col'], 'L_NFDAYS' => $lang['Nfdays'], --- 357,366 ---- 'CAT_COL' => $cat_col, ! 'L_CAT_COL' => $lang['Cat_col'], ! ! 'S_USE_SIMPLE_NAVIGATION_YES' => $use_simple_navigation_yes, ! 'S_USE_SIMPLE_NAVIGATION_NO' => $use_simple_navigation_no, ! 'L_USE_SIMPLE_NAVIGATION' => $lang['Use_simple_navigation'], ! 'L_USE_SIMPLE_NAVIGATION_EXPLAIN' => $lang['Use_simple_navigation_explain'], 'L_NFDAYS' => $lang['Nfdays'], |
