|
From: Jon O. <jon...@us...> - 2007-09-09 20:09:36
|
Update of /cvsroot/mxbb/mx_linkdb/linkdb/admin In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19690/admin Modified Files: admin_auth_manage.php admin_cat_manage.php admin_custom_manage.php admin_setting.php Log Message: for 2.9.x Index: admin_custom_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/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 13 Aug 2006 19:43:51 -0000 1.2 --- admin_custom_manage.php 9 Sep 2007 20:09:01 -0000 1.3 *************** *** 62,66 **** $this_custom_field->update_add_field( $field_type ); ! $message = $lang['Fieldadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( 'admin_linkdb.' . $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_linkdb.' . $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_linkdb.' . $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_linkdb.' . $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_linkdb.' . $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_linkdb.' . $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_linkdb.$phpEx?action=custom_manage" ) )); --- 131,135 ---- 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_FIELD_ACTION' => mx_append_sid( "admin_linkdb.$phpEx?action=custom_manage" ) )); Index: admin_cat_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/admin/admin_cat_manage.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** admin_cat_manage.php 31 May 2007 19:53:27 -0000 1.12 --- admin_cat_manage.php 9 Sep 2007 20:09:01 -0000 1.13 *************** *** 31,35 **** { $this->_linkdb(); ! $message = $lang['Catadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_linkdb.$phpEx?action=cat_manage" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 31,35 ---- { $this->_linkdb(); ! $message = $lang['Catadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( "admin_linkdb.$phpEx?action=cat_manage" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 41,45 **** { $this->_linkdb(); ! $message = $lang['Catedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_linkdb.$phpEx?action=cat_manage" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 41,45 ---- { $this->_linkdb(); ! $message = $lang['Catedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( "admin_linkdb.$phpEx?action=cat_manage" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } *************** *** 52,56 **** { $this->_linkdb(); ! $message = $lang['Catsdeleted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_linkdb.$phpEx?action=cat_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 ); } --- 52,56 ---- { $this->_linkdb(); ! $message = $lang['Catsdeleted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( "admin_linkdb.$phpEx?action=cat_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 ); } *************** *** 111,115 **** 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_CAT_ACTION' => append_sid( "admin_linkdb.$phpEx?action=cat_manage" ) ) ); --- 111,115 ---- 'S_HIDDEN_FIELDS' => $s_hidden_fields, ! 'S_CAT_ACTION' => mx_append_sid( "admin_linkdb.$phpEx?action=cat_manage" ) ) ); Index: admin_auth_manage.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/admin/admin_auth_manage.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** admin_auth_manage.php 31 May 2007 19:53:27 -0000 1.6 --- admin_auth_manage.php 9 Sep 2007 20:09:01 -0000 1.7 *************** *** 37,41 **** 'L_AUTH_EXPLAIN' => $lang['Linkdb_Auth_Explain'], 'L_SELECT_CAT' => $lang['Select_a_Category'], ! 'S_ACTION' => append_sid( "admin_linkdb.$phpEx?action=auth_manage" ), 'L_LOOK_UP_CAT' => $lang['Look_up_Category'], 'CAT_SELECT_TITLE' => $s_auth_cat_list --- 37,41 ---- 'L_AUTH_EXPLAIN' => $lang['Linkdb_Auth_Explain'], 'L_SELECT_CAT' => $lang['Select_a_Category'], ! 'S_ACTION' => mx_append_sid( "admin_linkdb.$phpEx?action=auth_manage" ), 'L_LOOK_UP_CAT' => $lang['Look_up_Category'], 'CAT_SELECT_TITLE' => $s_auth_cat_list *************** *** 71,75 **** 'L_IS_MODERATOR' => $lang['Is_Moderator'], ! 'S_ACTION' => append_sid( "admin_linkdb.$phpEx?action=auth_manage&cat_id=$cat_id" ), )); --- 71,75 ---- 'L_IS_MODERATOR' => $lang['Is_Moderator'], ! 'S_ACTION' => mx_append_sid( "admin_linkdb.$phpEx?action=auth_manage&cat_id=$cat_id" ), )); *************** *** 77,84 **** // 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 ) ) ) { --- 77,97 ---- // 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 ) ) ) { *************** *** 161,165 **** } ! $message = $lang['Linkdb_Auth_successfully'] . '<br /><br />' . sprintf( $lang['Click_return_Linkdb_auth'], '<a href="' . append_sid( "admin_linkdb.$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 ); --- 174,178 ---- } ! $message = $lang['Linkdb_Auth_successfully'] . '<br /><br />' . sprintf( $lang['Click_return_Linkdb_auth'], '<a href="' . mx_append_sid( "admin_linkdb.$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 ); Index: admin_setting.php =================================================================== RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/admin/admin_setting.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** admin_setting.php 13 Aug 2006 19:43:51 -0000 1.13 --- admin_setting.php 9 Sep 2007 20:09:01 -0000 1.14 *************** *** 48,52 **** { $linkdb_cache->unload(); ! $message = $lang['Settings_changed'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_linkdb.$phpEx?action=setting" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_return_admin_index'], '<a href="' . append_sid( "index.$phpEx?pane=right" ) . '">', '</a>' ); mx_message_die( GENERAL_MESSAGE, $message ); } --- 48,52 ---- { $linkdb_cache->unload(); ! $message = $lang['Settings_changed'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( "admin_linkdb.$phpEx?action=setting" ) . '">', '</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 ); } *************** *** 197,201 **** $template->assign_vars( array( ! 'S_SETTINGS_ACTION' => append_sid( "admin_linkdb.$phpEx" ), 'L_CONFIGURATION_TITLE' => $lang['Panel_config_title'], --- 197,201 ---- $template->assign_vars( array( ! 'S_SETTINGS_ACTION' => mx_append_sid( "admin_linkdb.$phpEx" ), 'L_CONFIGURATION_TITLE' => $lang['Panel_config_title'], |