Menu
▾
▴
[mxbb-commits] mx_kb/kb/admin admin_auth_manage.php, 1.4, 1.5 admin_cat_manage.php, 1.4, 1.5 admin_custom_manage.php, 1.3, 1.4 admin_settings.php, 1.3, 1.4 admin_types_manage.php, 1.4, 1.5
|
From: Jon O. <jon...@us...> - 2007-09-09 20:06:36
|
Update of /cvsroot/mxbb/mx_kb/kb/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18006/kb/admin Modified Files: admin_auth_manage.php admin_cat_manage.php admin_custom_manage.php admin_settings.php admin_types_manage.php Log Message: for 2.9.x Index: admin_custom_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_custom_manage.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_custom_manage.php 13 Aug 2006 19:43:07 -0000 1.3 --- admin_custom_manage.php 9 Sep 2007 20:06:01 -0000 1.4 *************** *** 62,66 **** $this_custom_field->update_add_field( $field_type ); ! $message = $lang['Fieldadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( 'admin_kb.' . $phpEx . '?action=custom_manage' ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . append_sid( 'index.' . $phpEx . '?pane=right' ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 62,66 ---- $this_custom_field->update_add_field( $field_type ); ! $message = $lang['Fieldadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( 'admin_kb.' . $phpEx . '?action=custom_manage' ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . mx_append_sid( 'index.' . $phpEx . '?pane=right' ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 69,73 **** $this_custom_field->update_add_field( $field_type, $field_id ); ! $message = $lang['Fieldedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( 'admin_kb.' . $phpEx . '?action=custom_manage' ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . append_sid( 'index.' . $phpEx . '?pane=right' ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 69,73 ---- $this_custom_field->update_add_field( $field_type, $field_id ); ! $message = $lang['Fieldedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( 'admin_kb.' . $phpEx . '?action=custom_manage' ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . mx_append_sid( 'index.' . $phpEx . '?pane=right' ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 79,83 **** } ! $message = $lang['Fieldsdel'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( 'admin_kb.' . $phpEx . '?action=custom_manage' ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . append_sid( 'index.' . $phpEx . '?pane=right' ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 79,83 ---- } ! $message = $lang['Fieldsdel'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( 'admin_kb.' . $phpEx . '?action=custom_manage' ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . mx_append_sid( 'index.' . $phpEx . '?pane=right' ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 131,135 **** 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_FIELD_ACTION' => append_sid( "admin_kb.$phpEx?action=custom_manage" ) )); --- 131,135 ---- 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_FIELD_ACTION' => mx_append_sid( "admin_kb.$phpEx?action=custom_manage" ) )); Index: admin_cat_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_cat_manage.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_cat_manage.php 28 Apr 2007 19:59:04 -0000 1.4 --- admin_cat_manage.php 9 Sep 2007 20:06:01 -0000 1.5 *************** *** 156,160 **** $template->assign_vars( array( ! 'S_ACTION' => append_sid( "admin_kb.$phpEx?action=cat_manage&mode=create" ), 'L_EDIT_TITLE' => $lang['Create_cat'], --- 156,160 ---- $template->assign_vars( array( ! 'S_ACTION' => mx_append_sid( "admin_kb.$phpEx?action=cat_manage&mode=create" ), 'L_EDIT_TITLE' => $lang['Create_cat'], *************** *** 365,369 **** } ! $message = $lang['Cat_created'] . '<br /><br />' . sprintf( $lang['Click_return_cat_manager'], '<a href="' . append_sid( "admin_kb.$phpEx?action=cat_manage" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); --- 365,369 ---- } ! $message = $lang['Cat_created'] . '<br /><br />' . sprintf( $lang['Click_return_cat_manager'], '<a href="' . mx_append_sid( "admin_kb.$phpEx?action=cat_manage" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . mx_append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); *************** *** 480,484 **** 'PARENT_LIST' => $this->generate_jumpbox( 0, 0, array( $parent => 1 )), ! 'S_ACTION' => append_sid( "admin_kb.$phpEx?action=cat_manage&mode=edit" ), 'CAT_NAME' => $cat_name, 'CAT_DESCRIPTION' => $cat_desc, --- 480,484 ---- 'PARENT_LIST' => $this->generate_jumpbox( 0, 0, array( $parent => 1 )), ! 'S_ACTION' => mx_append_sid( "admin_kb.$phpEx?action=cat_manage&mode=edit" ), 'CAT_NAME' => $cat_name, 'CAT_DESCRIPTION' => $cat_desc, *************** *** 653,657 **** } ! $message = $lang['Cat_edited'] . '<br /><br />' . sprintf( $lang['Click_return_cat_manager'], '<a href="' . append_sid( "admin_kb.$phpEx?action=cat_manage" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); --- 653,657 ---- } ! $message = $lang['Cat_edited'] . '<br /><br />' . sprintf( $lang['Click_return_cat_manager'], '<a href="' . mx_append_sid( "admin_kb.$phpEx?action=cat_manage" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . mx_append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); *************** *** 696,700 **** //'S_SELECT_TO' => $this->generate_jumpbox( '', $cat_id, 0, true, true ), 'S_SELECT_TO' => $this->generate_jumpbox( 0, 0, array( $cat_id => 1 )), ! 'S_ACTION' => append_sid( "admin_kb.$phpEx?action=cat_manage&mode=delete" ), 'CAT_NAME' => $cat_name ) --- 696,700 ---- //'S_SELECT_TO' => $this->generate_jumpbox( '', $cat_id, 0, true, true ), 'S_SELECT_TO' => $this->generate_jumpbox( 0, 0, array( $cat_id => 1 )), ! 'S_ACTION' => mx_append_sid( "admin_kb.$phpEx?action=cat_manage&mode=delete" ), 'CAT_NAME' => $cat_name ) *************** *** 768,772 **** } ! $message = $lang['Cat_deleted'] . '<br /><br />' . sprintf( $lang['Click_return_cat_manager'], '<a href="' . append_sid( "admin_kb.$phpEx?action=cat_manage" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); --- 768,772 ---- } ! $message = $lang['Cat_deleted'] . '<br /><br />' . sprintf( $lang['Click_return_cat_manager'], '<a href="' . mx_append_sid( "admin_kb.$phpEx?action=cat_manage" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . mx_append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); *************** *** 869,873 **** 'L_ORDER' => $lang['Update_order'], ! 'S_ACTION' => append_sid( "admin_kb.$phpEx?action=cat_manage&mode=create" ) ) ); --- 869,873 ---- 'L_ORDER' => $lang['Update_order'], ! 'S_ACTION' => mx_append_sid( "admin_kb.$phpEx?action=cat_manage&mode=create" ) ) ); Index: admin_types_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_types_manage.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_types_manage.php 28 Apr 2007 19:59:04 -0000 1.4 --- admin_types_manage.php 9 Sep 2007 20:06:01 -0000 1.5 *************** *** 70,74 **** } ! $message = $lang['Type_created'] . '<br /><br />' . sprintf( $lang['Click_return_type_manager'], '<a href="' . append_sid( "admin_kb.$phpEx?action=types_manage" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); break; --- 70,74 ---- } ! $message = $lang['Type_created'] . '<br /><br />' . sprintf( $lang['Click_return_type_manager'], '<a href="' . mx_append_sid( "admin_kb.$phpEx?action=types_manage" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . mx_append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); break; *************** *** 101,105 **** 'L_CREATE' => $lang['Edit'], ! 'S_ACTION' => append_sid( "admin_kb.$phpEx?action=types_manage&mode=edit" ), 'CAT_NAME' => $type, --- 101,105 ---- 'L_CREATE' => $lang['Edit'], ! 'S_ACTION' => mx_append_sid( "admin_kb.$phpEx?action=types_manage&mode=edit" ), 'CAT_NAME' => $type, *************** *** 125,129 **** } ! $message = $lang['Type_edited'] . '<br /><br />' . sprintf( $lang['Click_return_type_manager'], '<a href="' . append_sid( "admin_kb.$phpEx?action=types_manage" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 125,129 ---- } ! $message = $lang['Type_edited'] . '<br /><br />' . sprintf( $lang['Click_return_type_manager'], '<a href="' . mx_append_sid( "admin_kb.$phpEx?action=types_manage" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . mx_append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 165,169 **** 'S_HIDDEN_FIELDS' => '<input type="hidden" name="typeid" value="' . $type_id . '">', 'S_SELECT_TO' => $this->get_list_kb( $type_id, 0 ), ! 'S_ACTION' => append_sid( "admin_kb.$phpEx?action=types_manage&mode=delete" ), 'CAT_NAME' => $type_name --- 165,169 ---- 'S_HIDDEN_FIELDS' => '<input type="hidden" name="typeid" value="' . $type_id . '">', 'S_SELECT_TO' => $this->get_list_kb( $type_id, 0 ), ! 'S_ACTION' => mx_append_sid( "admin_kb.$phpEx?action=types_manage&mode=delete" ), 'CAT_NAME' => $type_name *************** *** 193,197 **** } ! $message = $lang['Type_deleted'] . '<br /><br />' . sprintf( $lang['Click_return_type_manager'], '<a href="' . append_sid( "admin_kb.$phpEx?action=types_manage" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 193,197 ---- } ! $message = $lang['Type_deleted'] . '<br /><br />' . sprintf( $lang['Click_return_type_manager'], '<a href="' . mx_append_sid( "admin_kb.$phpEx?action=types_manage" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . mx_append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 213,217 **** 'L_ACTION' => $lang['Art_action'], ! 'S_ACTION' => append_sid( "admin_kb.$phpEx?action=types_manage&mode=create" ) )); --- 213,217 ---- 'L_ACTION' => $lang['Art_action'], ! 'S_ACTION' => mx_append_sid( "admin_kb.$phpEx?action=types_manage&mode=create" ) )); *************** *** 231,238 **** $type_name = $type['type']; ! $temp_url = append_sid( "admin_kb.$phpEx?action=types_manage&mode=edit&cat=$type_id" ); $edit = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_edit'] . '" border="0" alt="' . $lang['Edit'] . '"></a>'; ! $temp_url = append_sid( "admin_kb.$phpEx?action=types_manage&mode=delete&cat=$type_id" ); $delete = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_delpost'] . '" border="0" alt="' . $lang['Delete'] . '"></a>'; --- 231,238 ---- $type_name = $type['type']; ! $temp_url = mx_append_sid( "admin_kb.$phpEx?action=types_manage&mode=edit&cat=$type_id" ); $edit = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_edit'] . '" border="0" alt="' . $lang['Edit'] . '"></a>'; ! $temp_url = mx_append_sid( "admin_kb.$phpEx?action=types_manage&mode=delete&cat=$type_id" ); $delete = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_delpost'] . '" border="0" alt="' . $lang['Delete'] . '"></a>'; Index: admin_settings.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_settings.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin_settings.php 13 Aug 2006 19:43:07 -0000 1.3 --- admin_settings.php 9 Sep 2007 20:06:01 -0000 1.4 *************** *** 54,58 **** { $mx_kb_cache->unload(); ! $message = $lang['KB_config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_kb_config'], "<a href=\"" . append_sid( "admin_kb.$phpEx?action=settings&mode=config" ) . "\">", "</a>" ) . "<br /><br />" . sprintf( $lang['Click_return_admin_index'], "<a href=\"" . append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); --- 54,58 ---- { $mx_kb_cache->unload(); ! $message = $lang['KB_config_updated'] . "<br /><br />" . sprintf( $lang['Click_return_kb_config'], "<a href=\"" . mx_append_sid( "admin_kb.$phpEx?action=settings&mode=config" ) . "\">", "</a>" ) . "<br /><br />" . sprintf( $lang['Click_return_admin_index'], "<a href=\"" . mx_append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . "\">", "</a>" ); mx_message_die( GENERAL_MESSAGE, $message ); *************** *** 249,253 **** $template->assign_vars( array( ! 'S_ACTION' => append_sid( "admin_kb.$phpEx?action=settings&mode=config" ), 'L_CONFIGURATION_TITLE' => $lang['Panel_config_title'], --- 249,253 ---- $template->assign_vars( array( ! 'S_ACTION' => mx_append_sid( "admin_kb.$phpEx?action=settings&mode=config" ), 'L_CONFIGURATION_TITLE' => $lang['Panel_config_title'], Index: admin_auth_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_auth_manage.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin_auth_manage.php 28 Apr 2007 19:59:04 -0000 1.4 --- admin_auth_manage.php 9 Sep 2007 20:06:00 -0000 1.5 *************** *** 38,42 **** 'L_AUTH_EXPLAIN' => $lang['KB_Auth_Explain'], 'L_SELECT_CAT' => $lang['Select_a_Category'], ! 'S_ACTION' => append_sid( "admin_kb.$phpEx?action=auth_manage" ), 'L_LOOK_UP_CAT' => $lang['Look_up_Category'], 'CAT_SELECT_TITLE' => $s_kb_cat_list --- 38,42 ---- 'L_AUTH_EXPLAIN' => $lang['KB_Auth_Explain'], 'L_SELECT_CAT' => $lang['Select_a_Category'], ! 'S_ACTION' => mx_append_sid( "admin_kb.$phpEx?action=auth_manage" ), 'L_LOOK_UP_CAT' => $lang['Look_up_Category'], 'CAT_SELECT_TITLE' => $s_kb_cat_list *************** *** 72,76 **** 'L_IS_MODERATOR' => $lang['Is_Moderator'], ! 'S_ACTION' => append_sid( "admin_kb.$phpEx?action=auth_manage&cat_id=$cat_id" ), )); --- 72,76 ---- 'L_IS_MODERATOR' => $lang['Is_Moderator'], ! 'S_ACTION' => mx_append_sid( "admin_kb.$phpEx?action=auth_manage&cat_id=$cat_id" ), )); *************** *** 78,85 **** // Get the list of phpBB usergroups // ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> " . true . " ! ORDER BY group_name ASC"; if ( !( $result = $db->sql_query( $sql ) ) ) { --- 78,98 ---- // Get the list of phpBB usergroups // ! switch (PORTAL_BACKEND) ! { ! case 'internal': ! case 'phpbb2': ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_single_user <> " . TRUE . " ! ORDER BY group_name ASC"; ! break; ! case 'phpbb3': ! $sql = "SELECT group_id, group_name ! FROM " . GROUPS_TABLE . " ! WHERE group_name NOT IN ('BOTS', 'GUESTS') ! ORDER BY group_name ASC"; ! break; ! } ! if ( !( $result = $db->sql_query( $sql ) ) ) { *************** *** 160,164 **** } ! $message = $lang['KB_Auth_successfully'] . '<br /><br />' . sprintf( $lang['Click_return_KB_auth'], '<a href="' . append_sid( "admin_kb.$phpEx?action=auth_manage" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); --- 173,177 ---- } ! $message = $lang['KB_Auth_successfully'] . '<br /><br />' . sprintf( $lang['Click_return_KB_auth'], '<a href="' . mx_append_sid( "admin_kb.$phpEx?action=auth_manage" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . mx_append_sid( $mx_root_path . "admin/index.$phpEx?pane=right" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); |
