|
From: Jon O. <jon...@us...> - 2006-07-03 12:46:37
|
Update of /cvsroot/mxbb/mx_kb/admin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1736/modules/mx_kb/admin Modified Files: admin_kb_cat.php Log Message: simplification of cat permissions Index: admin_kb_cat.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb_cat.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** admin_kb_cat.php 17 Jun 2006 20:11:23 -0000 1.25 --- admin_kb_cat.php 3 Jul 2006 12:24:44 -0000 1.26 *************** *** 103,106 **** --- 103,111 ---- } + $cat_auth_levels = array( 'ALL', 'REG', 'PRIVATE', 'MOD', 'ADMIN' ); + $cat_auth_const = array( AUTH_ALL, AUTH_REG, AUTH_ACL, AUTH_MOD, AUTH_ADMIN ); + $global_auth = array( 'auth_view', 'auth_post', 'auth_rate', 'auth_comment', 'auth_edit', 'auth_delete', 'auth_approval', 'auth_approval_edit' ); + $auth_select = array(); + switch ( $mode ) { *************** *** 153,156 **** --- 158,184 ---- // + // Permissions + // + $cat_rowset['auth_view'] = 0; + $cat_rowset['auth_post'] = 1; + $cat_rowset['auth_rate'] = 1; + $cat_rowset['auth_comment'] = 1; + $cat_rowset['auth_edit'] = 1; + $cat_rowset['auth_delete'] = 2; + $cat_rowset['auth_approval'] = 5; + $cat_rowset['auth_approval_edit'] = 5; + + foreach( $global_auth as $auth ) + { + $auth_select[$auth] = ' <select name="' . $auth . '">'; + for( $k = 0; $k < count( $cat_auth_levels ); $k++ ) + { + $selected = ( $cat_rowset[$auth] == $cat_auth_const[$k] ) ? ' selected="selected"' : ''; + $auth_select[$auth] .= '<option value="' . $cat_auth_const[$k] . '"' . $selected . '>' . $lang['Forum_' . $cat_auth_levels[$k]] . '</option>'; + } + $auth_select[$auth] .= '</select> '; + } + + // // Generate page // *************** *** 259,290 **** // 'L_CAT_PERMISSIONS' => $lang['Category_Permissions'], 'L_VIEW_LEVEL' => $lang['View_level'], 'L_UPLOAD_LEVEL' => $lang['Upload_level'], 'L_RATE_LEVEL' => $lang['Rate_level'], 'L_COMMENT_LEVEL' => $lang['Comment_level'], 'L_EDIT_LEVEL' => $lang['Edit_level'], 'L_DELETE_LEVEL' => $lang['Delete_level'], 'L_APPROVAL_LEVEL' => $lang['Approval_level'], 'L_APPROVAL_EDIT_LEVEL' => $lang['Approval_edit_level'], ! 'L_GUEST' => $lang['Forum_ALL'], ! 'L_REG' => $lang['Forum_REG'], ! 'L_PRIVATE' => $lang['Forum_PRIVATE'], ! 'L_MOD' => $lang['Forum_MOD'], ! 'L_ADMIN' => $lang['Forum_ADMIN'], 'L_DISABLED' => $lang['Disabled'], - 'VIEW_GUEST' => 'selected="selected"', - 'UPLOAD_REG' => 'selected="selected"', - 'RATE_REG' => 'selected="selected"', - 'COMMENT_REG' => 'selected="selected"', - 'EDIT_REG' => 'selected="selected"', - 'DELETE_MOD' => 'selected="selected"', - 'APPROVAL_DISABLED' => 'selected="selected"', - 'S_GUEST' => AUTH_ALL, - 'S_USER' => AUTH_REG, - 'S_PRIVATE' => AUTH_ACL, - 'S_MOD' => AUTH_MOD, - 'S_ADMIN' => AUTH_ADMIN )); } --- 287,317 ---- // 'L_CAT_PERMISSIONS' => $lang['Category_Permissions'], + 'L_VIEW_LEVEL' => $lang['View_level'], + 'S_VIEW_LEVEL' => $auth_select['auth_view'], + 'L_UPLOAD_LEVEL' => $lang['Upload_level'], + 'S_UPLOAD_LEVEL' => $auth_select['auth_post'], + 'L_RATE_LEVEL' => $lang['Rate_level'], + 'S_RATE_LEVEL' => $auth_select['auth_rate'], + 'L_COMMENT_LEVEL' => $lang['Comment_level'], + 'S_COMMENT_LEVEL' => $auth_select['auth_comment'], + 'L_EDIT_LEVEL' => $lang['Edit_level'], + 'S_EDIT_LEVEL' => $auth_select['auth_edit'], + 'L_DELETE_LEVEL' => $lang['Delete_level'], + 'S_DELETE_LEVEL' => $auth_select['auth_delete'], + 'L_APPROVAL_LEVEL' => $lang['Approval_level'], + 'S_APPROVAL_LEVEL' => $auth_select['auth_approval'], + 'L_APPROVAL_EDIT_LEVEL' => $lang['Approval_edit_level'], ! 'S_APPROVAL_EDIT_LEVEL' => $auth_select['auth_approval_edit'], 'L_DISABLED' => $lang['Disabled'], )); } *************** *** 409,412 **** --- 436,453 ---- $notify_group_list = mx_get_groups($mx_kb->cat_rowset[$cat_id]['notify_group'], 'notify_group'); + // + // Permissions + // + foreach( $global_auth as $auth ) + { + $auth_select[$auth] = ' <select name="' . $auth . '">'; + for( $k = 0; $k < count( $cat_auth_levels ); $k++ ) + { + $selected = ( $mx_kb->cat_rowset[$cat_id][$auth] == $cat_auth_const[$k] ) ? ' selected="selected"' : ''; + $auth_select[$auth] .= '<option value="' . $cat_auth_const[$k] . '"' . $selected . '>' . $lang['Forum_' . $cat_auth_levels[$k]] . '</option>'; + } + $auth_select[$auth] .= '</select> '; + } + // // Generate page *************** *** 519,586 **** // 'L_CAT_PERMISSIONS' => $lang['Category_Permissions'], 'L_VIEW_LEVEL' => $lang['View_level'], 'L_UPLOAD_LEVEL' => $lang['Upload_level'], 'L_RATE_LEVEL' => $lang['Rate_level'], 'L_COMMENT_LEVEL' => $lang['Comment_level'], 'L_EDIT_LEVEL' => $lang['Edit_level'], 'L_DELETE_LEVEL' => $lang['Delete_level'], 'L_APPROVAL_LEVEL' => $lang['Approval_level'], 'L_APPROVAL_EDIT_LEVEL' => $lang['Approval_edit_level'], ! 'L_GUEST' => $lang['Forum_ALL'], ! 'L_REG' => $lang['Forum_REG'], ! 'L_PRIVATE' => $lang['Forum_PRIVATE'], ! 'L_MOD' => $lang['Forum_MOD'], ! 'L_ADMIN' => $lang['Forum_ADMIN'], 'L_DISABLED' => $lang['Disabled'], - 'VIEW_GUEST' => ( $mx_kb->cat_rowset[$cat_id]['auth_view'] == AUTH_ALL ) ? 'selected="selected"' : '', - 'VIEW_REG' => ( $mx_kb->cat_rowset[$cat_id]['auth_view'] == AUTH_REG ) ? 'selected="selected"' : '', - 'VIEW_PRIVATE' => ( $mx_kb->cat_rowset[$cat_id]['auth_view'] == AUTH_ACL ) ? 'selected="selected"' : '', - 'VIEW_MOD' => ( $mx_kb->cat_rowset[$cat_id]['auth_view'] == AUTH_MOD ) ? 'selected="selected"' : '', - 'VIEW_ADMIN' => ( $mx_kb->cat_rowset[$cat_id]['auth_view'] == AUTH_ADMIN ) ? 'selected="selected"' : '', - - 'UPLOAD_GUEST' => ( $mx_kb->cat_rowset[$cat_id]['auth_post'] == AUTH_ALL ) ? 'selected="selected"' : '', - 'UPLOAD_REG' => ( $mx_kb->cat_rowset[$cat_id]['auth_post'] == AUTH_REG ) ? 'selected="selected"' : '', - 'UPLOAD_PRIVATE' => ( $mx_kb->cat_rowset[$cat_id]['auth_post'] == AUTH_ACL ) ? 'selected="selected"' : '', - 'UPLOAD_MOD' => ( $mx_kb->cat_rowset[$cat_id]['auth_post'] == AUTH_MOD ) ? 'selected="selected"' : '', - 'UPLOAD_ADMIN' => ( $mx_kb->cat_rowset[$cat_id]['auth_post'] == AUTH_ADMIN ) ? 'selected="selected"' : '', - - 'RATE_GUEST' => ( $mx_kb->cat_rowset[$cat_id]['auth_rate'] == AUTH_ALL ) ? 'selected="selected"' : '', - 'RATE_REG' => ( $mx_kb->cat_rowset[$cat_id]['auth_rate'] == AUTH_REG ) ? 'selected="selected"' : '', - 'RATE_PRIVATE' => ( $mx_kb->cat_rowset[$cat_id]['auth_rate'] == AUTH_ACL ) ? 'selected="selected"' : '', - 'RATE_MOD' => ( $mx_kb->cat_rowset[$cat_id]['auth_rate'] == AUTH_MOD ) ? 'selected="selected"' : '', - 'RATE_ADMIN' => ( $mx_kb->cat_rowset[$cat_id]['auth_rate'] == AUTH_ADMIN ) ? 'selected="selected"' : '', - - 'COMMENT_GUEST' => ( $mx_kb->cat_rowset[$cat_id]['auth_comment'] == AUTH_ALL ) ? 'selected="selected"' : '', - 'COMMENT_REG' => ( $mx_kb->cat_rowset[$cat_id]['auth_comment'] == AUTH_REG ) ? 'selected="selected"' : '', - 'COMMENT_PRIVATE' => ( $mx_kb->cat_rowset[$cat_id]['auth_comment'] == AUTH_ACL ) ? 'selected="selected"' : '', - 'COMMENT_MOD' => ( $mx_kb->cat_rowset[$cat_id]['auth_comment'] == AUTH_MOD ) ? 'selected="selected"' : '', - 'COMMENT_ADMIN' => ( $mx_kb->cat_rowset[$cat_id]['auth_comment'] == AUTH_ADMIN ) ? 'selected="selected"' : '', - - 'EDIT_REG' => ( $mx_kb->cat_rowset[$cat_id]['auth_edit'] == AUTH_REG ) ? 'selected="selected"' : '', - 'EDIT_PRIVATE' => ( $mx_kb->cat_rowset[$cat_id]['auth_edit'] == AUTH_ACL ) ? 'selected="selected"' : '', - 'EDIT_MOD' => ( $mx_kb->cat_rowset[$cat_id]['auth_edit'] == AUTH_MOD ) ? 'selected="selected"' : '', - 'EDIT_ADMIN' => ( $mx_kb->cat_rowset[$cat_id]['auth_edit'] == AUTH_ADMIN ) ? 'selected="selected"' : '', - - 'DELETE_REG' => ( $mx_kb->cat_rowset[$cat_id]['auth_delete'] == AUTH_REG ) ? 'selected="selected"' : '', - 'DELETE_PRIVATE' => ( $mx_kb->cat_rowset[$cat_id]['auth_delete'] == AUTH_ACL ) ? 'selected="selected"' : '', - 'DELETE_MOD' => ( $mx_kb->cat_rowset[$cat_id]['auth_delete'] == AUTH_MOD ) ? 'selected="selected"' : '', - 'DELETE_ADMIN' => ( $mx_kb->cat_rowset[$cat_id]['auth_delete'] == AUTH_ADMIN ) ? 'selected="selected"' : '', - - 'APPROVAL_DISABLED' => ( $mx_kb->cat_rowset[$cat_id]['auth_approval'] == AUTH_ALL ) ? 'selected="selected"' : '', - 'APPROVAL_MOD' => ( $mx_kb->cat_rowset[$cat_id]['auth_approval'] == AUTH_MOD ) ? 'selected="selected"' : '', - 'APPROVAL_ADMIN' => ( $mx_kb->cat_rowset[$cat_id]['auth_approval'] == AUTH_ADMIN ) ? 'selected="selected"' : '', - - 'APPROVAL_EDIT_DISABLED' => ( $mx_kb->cat_rowset[$cat_id]['auth_approval_edit'] == AUTH_ALL ) ? 'selected="selected"' : '', - 'APPROVAL_EDIT_MOD' => ( $mx_kb->cat_rowset[$cat_id]['auth_approval_edit'] == AUTH_MOD ) ? 'selected="selected"' : '', - 'APPROVAL_EDIT_ADMIN' => ( $mx_kb->cat_rowset[$cat_id]['auth_approval_edit'] == AUTH_ADMIN ) ? 'selected="selected"' : '', - - 'S_GUEST' => AUTH_ALL, - 'S_USER' => AUTH_REG, - 'S_PRIVATE' => AUTH_ACL, - 'S_MOD' => AUTH_MOD, - 'S_ADMIN' => AUTH_ADMIN, - 'S_HIDDEN' => '<input type="hidden" name="catid" value="' . $cat_id . '">' ) ); --- 560,590 ---- // 'L_CAT_PERMISSIONS' => $lang['Category_Permissions'], + 'L_VIEW_LEVEL' => $lang['View_level'], + 'S_VIEW_LEVEL' => $auth_select['auth_view'], + 'L_UPLOAD_LEVEL' => $lang['Upload_level'], + 'S_UPLOAD_LEVEL' => $auth_select['auth_post'], + 'L_RATE_LEVEL' => $lang['Rate_level'], + 'S_RATE_LEVEL' => $auth_select['auth_rate'], + 'L_COMMENT_LEVEL' => $lang['Comment_level'], + 'S_COMMENT_LEVEL' => $auth_select['auth_comment'], + 'L_EDIT_LEVEL' => $lang['Edit_level'], + 'S_EDIT_LEVEL' => $auth_select['auth_edit'], + 'L_DELETE_LEVEL' => $lang['Delete_level'], + 'S_DELETE_LEVEL' => $auth_select['auth_delete'], + 'L_APPROVAL_LEVEL' => $lang['Approval_level'], + 'S_APPROVAL_LEVEL' => $auth_select['auth_approval'], + 'L_APPROVAL_EDIT_LEVEL' => $lang['Approval_edit_level'], ! 'S_APPROVAL_EDIT_LEVEL' => $auth_select['auth_approval_edit'], 'L_DISABLED' => $lang['Disabled'], 'S_HIDDEN' => '<input type="hidden" name="catid" value="' . $cat_id . '">' ) ); |