[mxbb-commits] mx_pafiledb/pafiledb/admin admin_cat_manage.php, 1.3, 1.4 admin_catauth_manage.php, 1.4, 1.5 admin_custom_manage.php, 1.4, 1.5 admin_license_manage.php, 1.3, 1.4 admin_settings.php, 1.4, 1.5 admin_ug_auth_manage.php, 1.4, 1.5

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23199/admin

Modified Files:
	admin_cat_manage.php admin_catauth_manage.php 
	admin_custom_manage.php admin_license_manage.php 
	admin_settings.php admin_ug_auth_manage.php 
Log Message:
for 2.9.x

Index: admin_cat_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_cat_manage.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** admin_cat_manage.php	13 Aug 2006 19:44:45 -0000	1.3
--- admin_cat_manage.php	9 Sep 2007 20:16:16 -0000	1.4
***************
*** 18,22 ****
  	function main( $action )
  	{
! 		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;
  
  		//
--- 18,22 ----
  	function main( $action )
  	{
! 		global $db, $images, $template, $template, $lang, $phpEx, $pafiledb_functions, $pafiledb_cache, $pafiledb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars;
  
  		//
***************
*** 36,40 ****
  			{
  				$this->_pafiledb();
! 				$message = $lang['Catadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_pafiledb.$phpEx?action=cat_manage" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_edit_permissions'], '<a href="' . append_sid( "admin_pafiledb.$phpEx?action=catauth_manage&cat_id=$new_cat_id" ) . '">', '</a>' );
  				mx_message_die( GENERAL_MESSAGE, $message );
  			}
--- 36,40 ----
  			{
  				$this->_pafiledb();
! 				$message = $lang['Catadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( "admin_pafiledb.$phpEx?action=cat_manage" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_edit_permissions'], '<a href="' . mx_append_sid( "admin_pafiledb.$phpEx?action=catauth_manage&cat_id=$new_cat_id" ) . '">', '</a>' );
  				mx_message_die( GENERAL_MESSAGE, $message );
  			}
***************
*** 47,51 ****
  			{
  				$this->_pafiledb();
! 				$message = $lang['Catedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_pafiledb.$phpEx?action=cat_manage" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_edit_permissions'], '<a href="' . append_sid( "admin_pafiledb.$phpEx?action=catauth_manage&cat_id=$new_cat_id" ) . '">', '</a>' );
  				mx_message_die( GENERAL_MESSAGE, $message );
  			}
--- 47,51 ----
  			{
  				$this->_pafiledb();
! 				$message = $lang['Catedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( "admin_pafiledb.$phpEx?action=cat_manage" ) . '">', '</a>' ) . '<br /><br />' . sprintf( $lang['Click_edit_permissions'], '<a href="' . mx_append_sid( "admin_pafiledb.$phpEx?action=catauth_manage&cat_id=$new_cat_id" ) . '">', '</a>' );
  				mx_message_die( GENERAL_MESSAGE, $message );
  			}
***************
*** 58,62 ****
  			{
  				$this->_pafiledb();
! 				$message = $lang['Catsdeleted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_pafiledb.$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 );
  			}
--- 58,62 ----
  			{
  				$this->_pafiledb();
! 				$message = $lang['Catsdeleted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( "admin_pafiledb.$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 );
  			}
***************
*** 107,115 ****
  		}
  
! 		$pafiledb_template->set_filenames( array( 'admin' => $template_file ) );
  
! 		if ( sizeof( $this->error ) ) $pafiledb_template->assign_block_vars( 'pafiledb_error', array() );
  
! 		$pafiledb_template->assign_vars( array(
  			'L_CAT_TITLE' => $l_title,
  			'L_CAT_EXPLAIN' => $l_explain,
--- 107,115 ----
  		}
  
! 		$template->set_filenames( array( 'admin' => $template_file ) );
  
! 		if ( sizeof( $this->error ) ) $template->assign_block_vars( 'pafiledb_error', array() );
  
! 		$template->assign_vars( array(
  			'L_CAT_TITLE' => $l_title,
  			'L_CAT_EXPLAIN' => $l_explain,
***************
*** 117,126 ****
  			'ERROR' => ( sizeof( $this->error ) ) ? implode( '<br />', $this->error ) : '',
  			'S_HIDDEN_FIELDS' => $s_hidden_fields,
! 			'S_CAT_ACTION' => append_sid( "admin_pafiledb.$phpEx?action=cat_manage" )
  		));
  
  		if ( $mode == '' || $mode == 'cat_order' || $mode == 'sync' || $mode == 'sync_all' )
  		{
! 			$pafiledb_template->assign_vars( array(
  				'L_CREATE_CATEGORY' => $lang['Create_category'],
  				'L_EDIT' => $lang['Edit'],
--- 117,126 ----
  			'ERROR' => ( sizeof( $this->error ) ) ? implode( '<br />', $this->error ) : '',
  			'S_HIDDEN_FIELDS' => $s_hidden_fields,
! 			'S_CAT_ACTION' => mx_append_sid( "admin_pafiledb.$phpEx?action=cat_manage" )
  		));
  
  		if ( $mode == '' || $mode == 'cat_order' || $mode == 'sync' || $mode == 'sync_all' )
  		{
! 			$template->assign_vars( array(
  				'L_CREATE_CATEGORY' => $lang['Create_category'],
  				'L_EDIT' => $lang['Edit'],
***************
*** 261,265 ****
  			}
  
! 			$pafiledb_template->assign_vars( array(
  				'CAT_NAME' => $cat_name,
  				'CAT_DESC' => $cat_desc,
--- 261,265 ----
  			}
  
! 			$template->assign_vars( array(
  				'CAT_NAME' => $cat_name,
  				'CAT_DESC' => $cat_desc,
***************
*** 366,370 ****
  			$file_to_select_cat = $this->generate_jumpbox( 0, 0, '', true );
  
! 			$pafiledb_template->assign_vars( array(
  				'S_SELECT_CAT' => $select_cat,
  				'S_FILE_SELECT_CAT' => $file_to_select_cat,
--- 366,370 ----
  			$file_to_select_cat = $this->generate_jumpbox( 0, 0, '', true );
  
! 			$template->assign_vars( array(
  				'S_SELECT_CAT' => $select_cat,
  				'S_FILE_SELECT_CAT' => $file_to_select_cat,
***************
*** 380,384 ****
  		}
  
! 		$pafiledb_template->display( 'admin' );
  
  		$this->_pafiledb();
--- 380,384 ----
  		}
  
! 		$template->pparse( 'admin' );
  
  		$this->_pafiledb();

Index: admin_settings.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_settings.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** admin_settings.php	13 Aug 2006 19:44:45 -0000	1.4
--- admin_settings.php	9 Sep 2007 20:16:17 -0000	1.5
***************
*** 71,75 ****
  					if ( $config_name == 'tpl_php' && isset( $_POST[$config_name] ) && $new[$config_name] != $pa_config[$config_name] )
  					{
! 						$pafiledb_template->compile_cache_clear();
  					}
  
--- 71,75 ----
  					if ( $config_name == 'tpl_php' && isset( $_POST[$config_name] ) && $new[$config_name] != $pa_config[$config_name] )
  					{
! 						$template->compile_cache_clear();
  					}
  
***************
*** 81,85 ****
  			{
  				$pafiledb_cache->unload();
! 				$message = $lang['Settings_changed'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_pafiledb.$phpEx?action=settings" ) . '">', '</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 );
  			}
--- 81,85 ----
  			{
  				$pafiledb_cache->unload();
! 				$message = $lang['Settings_changed'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( "admin_pafiledb.$phpEx?action=settings" ) . '">', '</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 );
  			}
***************
*** 269,273 ****
  
  		$template->assign_vars( array(
! 			'S_SETTINGS_ACTION' => append_sid( "admin_pafiledb.$phpEx?action=settings" ),
  
  			'L_CONFIGURATION_TITLE' => $lang['Panel_config_title'],
--- 269,273 ----
  
  		$template->assign_vars( array(
! 			'S_SETTINGS_ACTION' => mx_append_sid( "admin_pafiledb.$phpEx?action=settings" ),
  
  			'L_CONFIGURATION_TITLE' => $lang['Panel_config_title'],

Index: admin_ug_auth_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_ug_auth_manage.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** admin_ug_auth_manage.php	13 Aug 2006 19:44:45 -0000	1.4
--- admin_ug_auth_manage.php	9 Sep 2007 20:16:17 -0000	1.5
***************
*** 18,22 ****
  	function main( $action )
  	{
! 		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;
--- 18,22 ----
  	function main( $action )
  	{
! 		global $db, $images, $template, $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;
***************
*** 64,77 ****
  
  		$permissions_menu = array(
! 			append_sid( "admin_pafiledb.$phpEx?action=catauth_manage" ) => $lang['Cat_Permissions'],
! 			append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=user" ) => $lang['User_Permissions'],
! 			append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=group" ) => $lang['Group_Permissions'],
! 			append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=global_user" ) => $lang['User_Global_Permissions'],
! 			append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=global_group" ) => $lang['Group_Global_Permissions']
  		);
  
  		foreach( $permissions_menu as $url => $l_name )
  		{
! 			$pafiledb_template->assign_block_vars( 'pertype', array(
  				'U_NAME' => $url,
  				'L_NAME' => $l_name
--- 64,77 ----
  
  		$permissions_menu = array(
! 			mx_append_sid( "admin_pafiledb.$phpEx?action=catauth_manage" ) => $lang['Cat_Permissions'],
! 			mx_append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=user" ) => $lang['User_Permissions'],
! 			mx_append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=group" ) => $lang['Group_Permissions'],
! 			mx_append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=global_user" ) => $lang['User_Global_Permissions'],
! 			mx_append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=global_group" ) => $lang['Group_Global_Permissions']
  		);
  
  		foreach( $permissions_menu as $url => $l_name )
  		{
! 			$template->assign_block_vars( 'pertype', array(
  				'U_NAME' => $url,
  				'L_NAME' => $l_name
***************
*** 242,246 ****
  
  			$l_auth_return = ( $mode == 'user' ) ? $lang['Click_return_userauth'] : $lang['Click_return_groupauth'];
! 			$message = $lang['Auth_updated'] . '<br /><br />' . sprintf( $l_auth_return, '<a href="' . append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=$mode" ) . '">', '</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 );
  		}
--- 242,246 ----
  
  			$l_auth_return = ( $mode == 'user' ) ? $lang['Click_return_userauth'] : $lang['Click_return_groupauth'];
! 			$message = $lang['Auth_updated'] . '<br /><br />' . sprintf( $l_auth_return, '<a href="' . mx_append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=$mode" ) . '">', '</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 );
  		}
***************
*** 372,376 ****
  
  			$l_auth_return = ( $mode == 'global_user' ) ? $lang['Click_return_userauth'] : $lang['Click_return_groupauth'];
! 			$message = $lang['Auth_updated'] . '<br /><br />' . sprintf( $l_auth_return, '<a href="' . append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=$mode" ) . '">', '</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 );
  		}
--- 372,376 ----
  
  			$l_auth_return = ( $mode == 'global_user' ) ? $lang['Click_return_userauth'] : $lang['Click_return_groupauth'];
! 			$message = $lang['Auth_updated'] . '<br /><br />' . sprintf( $l_auth_return, '<a href="' . mx_append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=$mode" ) . '">', '</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 );
  		}
***************
*** 530,534 ****
  					$ug = ( $mode == 'user' ) ? 'group&amp;' . POST_GROUPS_URL : 'user&amp;' . POST_USERS_URL;
  
! 					$t_usergroup_list .= ( ( $t_usergroup_list != '' ) ? ', ' : '' ) . '<a href="' . append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=$ug=" . $id[$i] ) . '">' . $name[$i] . '</a>';
  				}
  			}
--- 530,534 ----
  					$ug = ( $mode == 'user' ) ? 'group&amp;' . POST_GROUPS_URL : 'user&amp;' . POST_USERS_URL;
  
! 					$t_usergroup_list .= ( ( $t_usergroup_list != '' ) ? ', ' : '' ) . '<a href="' . mx_append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=$ug=" . $id[$i] ) . '">' . $name[$i] . '</a>';
  				}
  			}
***************
*** 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++;
  			}
--- 542,546 ----
  				$cell_title = $field_names[$cat_auth_fields[$i]];
  
! 				$template->assign_block_vars( 'acltype', array( 'L_UG_ACL_TYPE' => $cell_title ) );
  				$s_column_span++;
  			}
***************
*** 549,557 ****
  			$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 . '" />';
  
! 			$pafiledb_template->set_filenames( array( 'body' => 'admin/pa_auth_ug_body.tpl' ) );
  
  			if ( $mode == 'user' )
  			{
! 				$pafiledb_template->assign_vars( array(
  					'USER' => true,
  					'USERNAME' => $t_username,
--- 549,557 ----
  			$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 . '" />';
  
! 			$template->set_filenames( array( 'body' => 'admin/pa_auth_ug_body.tpl' ) );
  
  			if ( $mode == 'user' )
  			{
! 				$template->assign_vars( array(
  					'USER' => true,
  					'USERNAME' => $t_username,
***************
*** 562,566 ****
  			else
  			{
! 				$pafiledb_template->assign_vars( array(
  					'USER' => false,
  					'USERNAME' => $t_groupname,
--- 562,566 ----
  			else
  			{
! 				$template->assign_vars( array(
  					'USER' => false,
  					'USERNAME' => $t_groupname,
***************
*** 569,573 ****
  			}
  
! 			$pafiledb_template->assign_vars( array(
  				'SHOW_MOD' => true,
  				'L_USER_OR_GROUPNAME' => ( $mode == 'user' ) ? $lang['Username'] : $lang['Group_name'],
--- 569,573 ----
  			}
  
! 			$template->assign_vars( array(
  				'SHOW_MOD' => true,
  				'L_USER_OR_GROUPNAME' => ( $mode == 'user' ) ? $lang['Username'] : $lang['Group_name'],
***************
*** 581,588 ****
  				'L_CAT' => $lang['Category'],
  
! 				'U_USER_OR_GROUP' => append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage" ),
  
  				'S_COLUMN_SPAN' => $s_column_span + 2,
! 				'S_AUTH_ACTION' => append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage" ),
  				'S_HIDDEN_FIELDS' => $s_hidden_fields
  			));
--- 581,588 ----
  				'L_CAT' => $lang['Category'],
  
! 				'U_USER_OR_GROUP' => mx_append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage" ),
  
  				'S_COLUMN_SPAN' => $s_column_span + 2,
! 				'S_AUTH_ACTION' => mx_append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage" ),
  				'S_HIDDEN_FIELDS' => $s_hidden_fields
  			));
***************
*** 714,728 ****
  			}
  
! 			$pafiledb_template->assign_block_vars( 'cat_row', array(
  				'CAT_NAME' => ( $mode == 'global_user' ) ? $lang['User_Global_Permissions'] : $lang['Group_Global_Permissions'],
  				'IS_HIGHER_CAT' => false,
  				'PRE' => '',
  
! 				'U_CAT' => append_sid( "admin_pafiledb.$phpEx?action=settings" )
  			));
  
  			for( $j = 0; $j < count( $global_auth_fields ); $j++ )
  			{
! 				$pafiledb_template->assign_block_vars( 'cat_row.aclvalues', array( 'S_ACL_SELECT' => $optionlist_acl_adv[$j] ) );
  			}
  
--- 714,728 ----
  			}
  
! 			$template->assign_block_vars( 'cat_row', array(
  				'CAT_NAME' => ( $mode == 'global_user' ) ? $lang['User_Global_Permissions'] : $lang['Group_Global_Permissions'],
  				'IS_HIGHER_CAT' => false,
  				'PRE' => '',
  
! 				'U_CAT' => mx_append_sid( "admin_pafiledb.$phpEx?action=settings" )
  			));
  
  			for( $j = 0; $j < count( $global_auth_fields ); $j++ )
  			{
! 				$template->assign_block_vars( 'cat_row.aclvalues', array( 'S_ACL_SELECT' => $optionlist_acl_adv[$j] ) );
  			}
  
***************
*** 754,758 ****
  					$ug = ( $mode == 'global_user' ) ? 'global_group&amp;' . POST_GROUPS_URL : 'global_user&amp;' . POST_USERS_URL;
  
! 					$t_usergroup_list .= ( ( $t_usergroup_list != '' ) ? ', ' : '' ) . '<a href="' . append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=$ug=" . $id[$i] ) . '">' . $name[$i] . '</a>';
  				}
  			}
--- 754,758 ----
  					$ug = ( $mode == 'global_user' ) ? 'global_group&amp;' . POST_GROUPS_URL : 'global_user&amp;' . POST_USERS_URL;
  
! 					$t_usergroup_list .= ( ( $t_usergroup_list != '' ) ? ', ' : '' ) . '<a href="' . mx_append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=$ug=" . $id[$i] ) . '">' . $name[$i] . '</a>';
  				}
  			}
***************
*** 766,770 ****
  				$cell_title = $global_fields_names[$global_auth_fields[$i]];
  
! 				$pafiledb_template->assign_block_vars( 'acltype', array( 'L_UG_ACL_TYPE' => $cell_title ) );
  				$s_column_span++;
  			}
--- 766,770 ----
  				$cell_title = $global_fields_names[$global_auth_fields[$i]];
  
! 				$template->assign_block_vars( 'acltype', array( 'L_UG_ACL_TYPE' => $cell_title ) );
  				$s_column_span++;
  			}
***************
*** 773,781 ****
  			$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 . '" />';
  
! 			$pafiledb_template->set_filenames( array( 'body' => 'admin/pa_auth_ug_body.tpl' ) );
  
  			if ( $mode == 'global_user' )
  			{
! 				$pafiledb_template->assign_vars( array(
  					'USER' => true,
  					'USERNAME' => $t_username,
--- 773,781 ----
  			$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 . '" />';
  
! 			$template->set_filenames( array( 'body' => 'admin/pa_auth_ug_body.tpl' ) );
  
  			if ( $mode == 'global_user' )
  			{
! 				$template->assign_vars( array(
  					'USER' => true,
  					'USERNAME' => $t_username,
***************
*** 786,790 ****
  			else
  			{
! 				$pafiledb_template->assign_vars( array(
  					'USER' => false,
  					'USERNAME' => $t_groupname,
--- 786,790 ----
  			else
  			{
! 				$template->assign_vars( array(
  					'USER' => false,
  					'USERNAME' => $t_groupname,
***************
*** 793,797 ****
  			}
  
! 			$pafiledb_template->assign_vars( array(
  				'SHOW_MOD' => false,
  
--- 793,797 ----
  			}
  
! 			$template->assign_vars( array(
  				'SHOW_MOD' => false,
  
***************
*** 805,812 ****
  				'L_CAT' => ( $mode == 'global_user' ) ? $lang['User_Global_Permissions'] : $lang['Group_Global_Permissions'],
  
! 				'U_USER_OR_GROUP' => append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage" ),
  
  				'S_COLUMN_SPAN' => $s_column_span + 1,
! 				'S_AUTH_ACTION' => append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage" ),
  				'S_HIDDEN_FIELDS' => $s_hidden_fields
  			));
--- 805,812 ----
  				'L_CAT' => ( $mode == 'global_user' ) ? $lang['User_Global_Permissions'] : $lang['Group_Global_Permissions'],
  
! 				'U_USER_OR_GROUP' => mx_append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage" ),
  
  				'S_COLUMN_SPAN' => $s_column_span + 1,
! 				'S_AUTH_ACTION' => mx_append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage" ),
  				'S_HIDDEN_FIELDS' => $s_hidden_fields
  			));
***************
*** 816,826 ****
  			// Select a user/group
  
! 			$pafiledb_template->set_filenames( array( 'body' => ( $mode == 'user' || $mode == 'global_user' ) ? 'admin/user_select_body.tpl' : 'admin/auth_select_body.tpl' ) );
  
  			if ( $mode == 'user' || $mode == 'global_user' )
  			{
! 				$pafiledb_template->assign_vars( array(
  					'L_FIND_USERNAME' => $lang['Find_username'],
! 					'U_SEARCH_USER' => append_sid( $phpbb_root_path . "search.$phpEx?mode=searchuser" )
  				));
  			}
--- 816,826 ----
  			// Select a user/group
  
! 			$template->set_filenames( array( 'body' => ( $mode == 'user' || $mode == 'global_user' ) ? 'admin/user_select_body.tpl' : 'admin/auth_select_body.tpl' ) );
  
  			if ( $mode == 'user' || $mode == 'global_user' )
  			{
! 				$template->assign_vars( array(
  					'L_FIND_USERNAME' => $lang['Find_username'],
! 					'U_SEARCH_USER' => mx_append_sid( $phpbb_root_path . "search.$phpEx?mode=searchuser" )
  				));
  			}
***************
*** 846,850 ****
  				}
  
! 				$pafiledb_template->assign_vars( array( 'S_AUTH_SELECT' => $select_list ) );
  			}
  
--- 846,850 ----
  				}
  
! 				$template->assign_vars( array( 'S_AUTH_SELECT' => $select_list ) );
  			}
  
***************
*** 853,857 ****
  			$l_type = ( $mode == 'user' || $mode == 'global_user' ) ? 'USER' : 'AUTH';
  
! 			$pafiledb_template->assign_vars( array(
  				'L_' . $l_type . '_TITLE' => ( $mode == 'user' || $mode == 'global_user' ) ? $lang['Auth_Control_User'] : $lang['Auth_Control_Group'],
  				'L_' . $l_type . '_EXPLAIN' => ( $mode == 'user' || $mode == 'global_user' ) ? $lang['User_auth_explain'] : $lang['Group_auth_explain'],
--- 853,857 ----
  			$l_type = ( $mode == 'user' || $mode == 'global_user' ) ? 'USER' : 'AUTH';
  
! 			$template->assign_vars( array(
  				'L_' . $l_type . '_TITLE' => ( $mode == 'user' || $mode == 'global_user' ) ? $lang['Auth_Control_User'] : $lang['Auth_Control_Group'],
  				'L_' . $l_type . '_EXPLAIN' => ( $mode == 'user' || $mode == 'global_user' ) ? $lang['User_auth_explain'] : $lang['Group_auth_explain'],
***************
*** 860,868 ****
  
  				'S_HIDDEN_FIELDS' => $s_hidden_fields,
! 				'S_' . $l_type . '_ACTION' => append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage" )
  			));
  		}
  
! 		$pafiledb_template->display( 'body' );
  
  		$this->_pafiledb();
--- 860,868 ----
  
  				'S_HIDDEN_FIELDS' => $s_hidden_fields,
! 				'S_' . $l_type . '_ACTION' => mx_append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage" )
  			));
  		}
  
! 		$template->pparse( 'body' );
  
  		$this->_pafiledb();

Index: admin_custom_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_custom_manage.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** admin_custom_manage.php	13 Aug 2006 19:44:45 -0000	1.4
--- admin_custom_manage.php	9 Sep 2007 20:16:17 -0000	1.5
***************
*** 18,22 ****
  	function main( $action )
  	{
! 		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;
  
  		//
--- 18,22 ----
  	function main( $action )
  	{
! 		global $db, $images, $template, $template, $lang, $phpEx, $pafiledb_functions, $pafiledb_cache, $pafiledb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars;
  
  		//
***************
*** 65,69 ****
  				$custom_field->update_add_field( $field_type );
  
! 				$message = $lang['Fieldadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( 'admin_pafiledb.' . $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 );
  			}
--- 65,69 ----
  				$custom_field->update_add_field( $field_type );
  
! 				$message = $lang['Fieldadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( 'admin_pafiledb.' . $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 );
  			}
***************
*** 72,76 ****
  				$custom_field->update_add_field( $field_type, $field_id );
  
! 				$message = $lang['Fieldedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( 'admin_pafiledb.' . $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 );
  			}
--- 72,76 ----
  				$custom_field->update_add_field( $field_type, $field_id );
  
! 				$message = $lang['Fieldedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( 'admin_pafiledb.' . $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 );
  			}
***************
*** 82,91 ****
  				}
  
! 				$message = $lang['Fieldsdel'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( 'admin_pafiledb.' . $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 );
  			}
  		}
  
! 		$pafiledb_template->set_filenames( array( 'admin' => $template_file ) );
  
  		switch ( $mode )
--- 82,91 ----
  				}
  
! 				$message = $lang['Fieldsdel'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( 'admin_pafiledb.' . $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 );
  			}
  		}
  
! 		$template->set_filenames( array( 'admin' => $template_file ) );
  
  		switch ( $mode )
***************
*** 128,132 ****
  		}
  
! 		$pafiledb_template->assign_vars( array(
  			'L_FIELD_TITLE' => $l_title,
  			'L_FIELD_EXPLAIN' => $lang['Fieldexplain'],
--- 128,132 ----
  		}
  
! 		$template->assign_vars( array(
  			'L_FIELD_TITLE' => $l_title,
  			'L_FIELD_EXPLAIN' => $lang['Fieldexplain'],
***************
*** 134,138 ****
  
  			'S_HIDDEN_FIELDS' => $s_hidden_fields,
! 			'S_FIELD_ACTION' => append_sid( "admin_pafiledb.$phpEx?action=custom_manage" )
  		));
  
--- 134,138 ----
  
  			'S_HIDDEN_FIELDS' => $s_hidden_fields,
! 			'S_FIELD_ACTION' => mx_append_sid( "admin_pafiledb.$phpEx?action=custom_manage" )
  		));
  
***************
*** 144,148 ****
  			}
  
! 			$pafiledb_template->assign_vars( array(
  				'L_FIELD_NAME' => $lang['Fieldname'],
  				'L_FIELD_NAME_INFO' => $lang['Fieldnameinfo'],
--- 144,148 ----
  			}
  
! 			$template->assign_vars( array(
  				'L_FIELD_NAME' => $lang['Fieldname'],
  				'L_FIELD_NAME_INFO' => $lang['Fieldnameinfo'],
***************
*** 177,181 ****
  			$field_type_list .= '</select>';
  
! 			$pafiledb_template->assign_vars( array( 'S_SELECT_FIELD_TYPE' => $field_type_list ) );
  		}
  		elseif ( $mode == 'edit' || $mode == 'delete' || $mode == 'select' )
--- 177,181 ----
  			$field_type_list .= '</select>';
  
! 			$template->assign_vars( array( 'S_SELECT_FIELD_TYPE' => $field_type_list ) );
  		}
  		elseif ( $mode == 'edit' || $mode == 'delete' || $mode == 'select' )
***************
*** 183,187 ****
  			foreach( $custom_field->field_rowset as $field_id => $field_data )
  			{
! 				$pafiledb_template->assign_block_vars( 'field_row', array(
  					'FIELD_ID' => $field_id,
  					'FIELD_NAME' => $field_data['custom_name'],
--- 183,187 ----
  			foreach( $custom_field->field_rowset as $field_id => $field_data )
  			{
! 				$template->assign_block_vars( 'field_row', array(
  					'FIELD_ID' => $field_id,
  					'FIELD_NAME' => $field_data['custom_name'],
***************
*** 192,196 ****
  
  		// Output
! 		$pafiledb_template->display( 'admin' );
  		$this->_pafiledb();
  		$pafiledb_cache->unload();
--- 192,196 ----
  
  		// Output
! 		$template->pparse( 'admin' );
  		$this->_pafiledb();
  		$pafiledb_cache->unload();

Index: admin_catauth_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_catauth_manage.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** admin_catauth_manage.php	13 Aug 2006 19:44:45 -0000	1.4
--- admin_catauth_manage.php	9 Sep 2007 20:16:17 -0000	1.5
***************
*** 18,22 ****
  	function main( $action )
  	{
! 		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;
--- 18,22 ----
  	function main( $action )
  	{
! 		global $db, $images, $template, $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;
***************
*** 104,108 ****
  			}
  
! 			$message = $lang['Category_auth_updated'] . '<br /><br />' . sprintf( $lang['Click_return_catauth'], '<a href="' . append_sid( "admin_pafiledb.$phpEx?action=catauth_manage" ) . '">', "</a>" );
  			mx_message_die( GENERAL_MESSAGE, $message );
  		}
--- 104,108 ----
  			}
  
! 			$message = $lang['Category_auth_updated'] . '<br /><br />' . sprintf( $lang['Click_return_catauth'], '<a href="' . mx_append_sid( "admin_pafiledb.$phpEx?action=catauth_manage" ) . '">', "</a>" );
  			mx_message_die( GENERAL_MESSAGE, $message );
  		}
***************
*** 112,128 ****
  		// specified
  
! 		$pafiledb_template->set_filenames( array( 'body' => 'admin/pa_auth_cat_body.tpl' ) );
  
  		$permissions_menu = array(
! 			append_sid( "admin_pafiledb.$phpEx?action=catauth_manage" ) => $lang['Cat_Permissions'],
! 			append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=user" ) => $lang['User_Permissions'],
! 			append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=group" ) => $lang['Group_Permissions'],
! 			append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=global_user" ) => $lang['User_Global_Permissions'],
! 			append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=global_group" ) => $lang['Group_Global_Permissions']
  		);
  
  		foreach( $permissions_menu as $url => $l_name )
  		{
! 			$pafiledb_template->assign_block_vars( 'pertype', array(
  				'U_NAME' => $url,
  				'L_NAME' => $l_name
--- 112,128 ----
  		// specified
  
! 		$template->set_filenames( array( 'body' => 'admin/pa_auth_cat_body.tpl' ) );
  
  		$permissions_menu = array(
! 			mx_append_sid( "admin_pafiledb.$phpEx?action=catauth_manage" ) => $lang['Cat_Permissions'],
! 			mx_append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=user" ) => $lang['User_Permissions'],
! 			mx_append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=group" ) => $lang['Group_Permissions'],
! 			mx_append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=global_user" ) => $lang['User_Global_Permissions'],
! 			mx_append_sid( "admin_pafiledb.$phpEx?action=ug_auth_manage&mode=global_group" ) => $lang['Group_Global_Permissions']
  		);
  
  		foreach( $permissions_menu as $url => $l_name )
  		{
! 			$template->assign_block_vars( 'pertype', array(
  				'U_NAME' => $url,
  				'L_NAME' => $l_name
***************
*** 137,141 ****
  			$cell_title = $field_names[$cat_auth_fields[$j]];
  
! 			$pafiledb_template->assign_block_vars( 'cat_auth_titles', array( 'CELL_TITLE' => $cell_title ) );
  		}
  
--- 137,141 ----
  			$cell_title = $field_names[$cat_auth_fields[$j]];
  
! 			$template->assign_block_vars( 'cat_auth_titles', array( 'CELL_TITLE' => $cell_title ) );
  		}
  
***************
*** 144,148 ****
  			$cell_title = $field_names[$cat_auth_approval_fields[$j]];
  
! 			$pafiledb_template->assign_block_vars( 'cat_auth_titles', array( 'CELL_TITLE' => $cell_title ) );
  		}
  
--- 144,148 ----
  			$cell_title = $field_names[$cat_auth_approval_fields[$j]];
  
! 			$template->assign_block_vars( 'cat_auth_titles', array( 'CELL_TITLE' => $cell_title ) );
  		}
  
***************
*** 154,161 ****
  		elseif ( !empty( $cat_id ) )
  		{
! 			$pafiledb_template->assign_block_vars( 'cat_row', array(
  				'CATEGORY_NAME' => $this->cat_rowset[$cat_id]['cat_name'],
  				'IS_HIGHER_CAT' => ( $this->cat_rowset[$cat_id] ) ? false : true,
! 				'U_CAT' => append_sid( "admin_pafiledb.$phpEx?action=catauth_manage&cat_parent={$this->cat_rowset[$cat_id]['cat_parent']}" )
  			));
  
--- 154,161 ----
  		elseif ( !empty( $cat_id ) )
  		{
! 			$template->assign_block_vars( 'cat_row', array(
  				'CATEGORY_NAME' => $this->cat_rowset[$cat_id]['cat_name'],
  				'IS_HIGHER_CAT' => ( $this->cat_rowset[$cat_id] ) ? false : true,
! 				'U_CAT' => mx_append_sid( "admin_pafiledb.$phpEx?action=catauth_manage&cat_parent={$this->cat_rowset[$cat_id]['cat_parent']}" )
  			));
  
***************
*** 174,178 ****
  				$custom_auth[$j] .= '</select>&nbsp;';
  
! 				$pafiledb_template->assign_block_vars( 'cat_row.cat_auth_data', array( 'S_AUTH_LEVELS_SELECT' => $custom_auth[$j] ) );
  			}
  
--- 174,178 ----
  				$custom_auth[$j] .= '</select>&nbsp;';
  
! 				$template->assign_block_vars( 'cat_row.cat_auth_data', array( 'S_AUTH_LEVELS_SELECT' => $custom_auth[$j] ) );
  			}
  
***************
*** 191,195 ****
  				$custom_auth_approval[$j] .= '</select>&nbsp;';
  
! 				$pafiledb_template->assign_block_vars( 'cat_row.cat_auth_data', array( 'S_AUTH_LEVELS_SELECT' => $custom_auth_approval[$j] ) );
  			}
  
--- 191,195 ----
  				$custom_auth_approval[$j] .= '</select>&nbsp;';
  
! 				$template->assign_block_vars( 'cat_row.cat_auth_data', array( 'S_AUTH_LEVELS_SELECT' => $custom_auth_approval[$j] ) );
  			}
  
***************
*** 200,204 ****
  		$s_column_span = count( $cat_auth_fields ) + count( $cat_auth_approval_fields ) + 2;
  
! 		$pafiledb_template->assign_vars( array(
  			'CATEGORY_NAME' => $cat_name,
  
--- 200,204 ----
  		$s_column_span = count( $cat_auth_fields ) + count( $cat_auth_approval_fields ) + 2;
  
! 		$template->assign_vars( array(
  			'CATEGORY_NAME' => $cat_name,
  
***************
*** 209,213 ****
  			'L_RESET' => $lang['Reset'],
  
! 			'S_CATAUTH_ACTION' => append_sid( "admin_pafiledb.$phpEx?action=catauth_manage" ),
  			'S_COLUMN_SPAN' => $s_column_span,
  			'S_HIDDEN_FIELDS' => $s_hidden_fields
--- 209,213 ----
  			'L_RESET' => $lang['Reset'],
  
! 			'S_CATAUTH_ACTION' => mx_append_sid( "admin_pafiledb.$phpEx?action=catauth_manage" ),
  			'S_COLUMN_SPAN' => $s_column_span,
  			'S_HIDDEN_FIELDS' => $s_hidden_fields
***************
*** 215,219 ****
  
  		// Output
! 		$pafiledb_template->display( 'body' );
  		$this->_pafiledb();
  		$pafiledb_cache->unload();
--- 215,219 ----
  
  		// Output
! 		$template->pparse( 'body' );
  		$this->_pafiledb();
  		$pafiledb_cache->unload();

Index: admin_license_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_license_manage.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** admin_license_manage.php	13 Aug 2006 19:44:45 -0000	1.3
--- admin_license_manage.php	9 Sep 2007 20:16:17 -0000	1.4
***************
*** 54,58 ****
  							}
  
! 							$message = $lang['Licenseadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_pafiledb.$phpEx?action=license_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 );
  						}
--- 54,58 ----
  							}
  
! 							$message = $lang['Licenseadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( "admin_pafiledb.$phpEx?action=license_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 );
  						}
***************
*** 61,65 ****
  						{
  							$template->assign_vars( array(
! 								'S_ADD_LIC_ACTION' => append_sid( "admin_pafiledb.$phpEx?action=license_manage" ),
  								'L_ALICENSETITLE' => $lang['Alicensetitle'],
  								'L_LICENSEEXPLAIN' => $lang['Licenseexplain'],
--- 61,65 ----
  						{
  							$template->assign_vars( array(
! 								'S_ADD_LIC_ACTION' => mx_append_sid( "admin_pafiledb.$phpEx?action=license_manage" ),
  								'L_ALICENSETITLE' => $lang['Alicensetitle'],
  								'L_LICENSEEXPLAIN' => $lang['Licenseexplain'],
***************
*** 100,104 ****
  							}
  
! 							$message = $lang['Licenseedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_pafiledb.$phpEx?action=license_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 );
  						}
--- 100,104 ----
  							}
  
! 							$message = $lang['Licenseedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( "admin_pafiledb.$phpEx?action=license_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 );
  						}
***************
*** 124,128 ****
  
  							$template->assign_vars( array(
! 								'S_EDIT_LIC_ACTION' => append_sid( "admin_pafiledb.$phpEx?action=license_manage" ),
  								'L_ELICENSETITLE' => $lang['Elicensetitle'],
  								'L_LICENSEEXPLAIN' => $lang['Licenseexplain'],
--- 124,128 ----
  
  							$template->assign_vars( array(
! 								'S_EDIT_LIC_ACTION' => mx_append_sid( "admin_pafiledb.$phpEx?action=license_manage" ),
  								'L_ELICENSETITLE' => $lang['Elicensetitle'],
  								'L_LICENSEEXPLAIN' => $lang['Licenseexplain'],
***************
*** 152,156 ****
  
  							$template->assign_vars( array(
! 								'S_EDIT_LIC_ACTION' => append_sid( "admin_pafiledb.$phpEx?action=license_manage" ),
  								'L_ELICENSETITLE' => $lang['Elicensetitle'],
  								'L_LICENSEEXPLAIN' => $lang['Licenseexplain'],
--- 152,156 ----
  
  							$template->assign_vars( array(
! 								'S_EDIT_LIC_ACTION' => mx_append_sid( "admin_pafiledb.$phpEx?action=license_manage" ),
  								'L_ELICENSETITLE' => $lang['Elicensetitle'],
  								'L_LICENSEEXPLAIN' => $lang['Licenseexplain'],
***************
*** 180,184 ****
  							if ( empty( $select ) )
  							{
! 								$message = $lang['lderror'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_pafiledb.$phpEx?action=license_manage&license=delete" ) . '">', '</a>' );
  
  								mx_message_die( GENERAL_MESSAGE, $message );
--- 180,184 ----
  							if ( empty( $select ) )
  							{
! 								$message = $lang['lderror'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( "admin_pafiledb.$phpEx?action=license_manage&license=delete" ) . '">', '</a>' );
  
  								mx_message_die( GENERAL_MESSAGE, $message );
***************
*** 203,207 ****
  								}
  
! 								$message = $lang['Ldeleted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_pafiledb.$phpEx?action=license_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 );
--- 203,207 ----
  								}
  
! 								$message = $lang['Ldeleted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( "admin_pafiledb.$phpEx?action=license_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 );
***************
*** 224,228 ****
  
  							$template->assign_vars( array(
! 								'S_DELETE_LIC_ACTION' => append_sid( "admin_pafiledb.$phpEx?action=license_manage" ),
  								'L_DLICENSETITLE' => $lang['Dlicensetitle'],
  								'L_LICENSEEXPLAIN' => $lang['Licenseexplain'],
--- 224,228 ----
  
  							$template->assign_vars( array(
! 								'S_DELETE_LIC_ACTION' => mx_append_sid( "admin_pafiledb.$phpEx?action=license_manage" ),
  								'L_DLICENSETITLE' => $lang['Dlicensetitle'],
  								'L_LICENSEEXPLAIN' => $lang['Licenseexplain'],
***************
*** 253,257 ****
  
  			$template->assign_vars( array(
! 				'S_DELETE_LIC_ACTION' => append_sid( "admin_pafiledb.$phpEx?action=license_manage" ),
  				'L_LICENSETITLE' => $lang['License_title'],
  				'L_ALICENSETITLE' => $lang['Alicensetitle'],
--- 253,257 ----
  
  			$template->assign_vars( array(
! 				'S_DELETE_LIC_ACTION' => mx_append_sid( "admin_pafiledb.$phpEx?action=license_manage" ),
  				'L_LICENSETITLE' => $lang['License_title'],
  				'L_ALICENSETITLE' => $lang['Alicensetitle'],