[mxbb-commits] mx_pafiledb/admin admin_pa_catauth.php, 1.15, 1.16 admin_pa_category.php, 1.16, 1.17 admin_pa_custom.php, 1.17, 1.18 admin_pa_fchecker.php, 1.16, 1.17 admin_pa_file.php, 1.19, 1.20 admin_pa_license.php, 1.15, 1.16 admin_pa_settings.php, 1.17, 1.18 admin_pa_ug_auth.php, 1.13, 1.14 mx_module_defs.php, 1.6, 1.7

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

Update of /cvsroot/mxbb/mx_pafiledb/admin
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22598/modules/mx_pafiledb/admin

Modified Files:
	admin_pa_catauth.php admin_pa_category.php admin_pa_custom.php 
	admin_pa_fchecker.php admin_pa_file.php admin_pa_license.php 
	admin_pa_settings.php admin_pa_ug_auth.php mx_module_defs.php 
Log Message:
Finalizing module

Index: admin_pa_category.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/admin/admin_pa_category.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** admin_pa_category.php	2 May 2006 23:28:15 -0000	1.16
--- admin_pa_category.php	17 Jun 2006 20:13:21 -0000	1.17
***************
*** 25,29 ****
  		include_once( $module_root_path . 'pafiledb/includes/pafiledb_constants.' . $phpEx );
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['1_Cat_manage_title'] = $file;
  		return;
  	}
--- 25,29 ----
  		include_once( $module_root_path . 'pafiledb/includes/pafiledb_constants.' . $phpEx );
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['1_Cat_manage'] = $file;
  		return;
  	}
***************
*** 53,57 ****
  
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['1_Cat_manage_title'] = 'modules/mx_pafiledb/admin/' . $file;
  		return;
  	}
--- 53,57 ----
  
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['1_Cat_manage'] = 'modules/mx_pafiledb/admin/' . $file;
  		return;
  	}
***************
*** 70,73 ****
--- 70,88 ----
  }
  
+ // **********************************************************************
+ // Read language definition
+ // **********************************************************************
+ if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
+ {
+ 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
+ }
+ else
+ {
+ 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
+ }
+ 
+ //
+ // Init
+ //
  $pafiledb->init();
  
***************
*** 152,157 ****
  }
  
! $pafiledb_template->set_filenames( array( 'admin' => $template_file )
! 	);
  
  $pafiledb_template->assign_vars( array(
--- 167,171 ----
  }
  
! $pafiledb_template->set_filenames( array( 'admin' => $template_file ) );
  
  $pafiledb_template->assign_vars( array(
***************
*** 161,166 ****
  	'ERROR' => ( sizeof( $pafiledb->error ) ) ? implode( '<br />', $pafiledb->error ) : '',
  	'S_HIDDEN_FIELDS' => $s_hidden_fields,
! 	'S_CAT_ACTION' => append_sid( "admin_pa_category.$phpEx" ) )
! );
  
  if ( $mode == '' || $mode == 'cat_order' || $mode == 'sync' || $mode == 'sync_all' )
--- 175,180 ----
  	'ERROR' => ( sizeof( $pafiledb->error ) ) ? implode( '<br />', $pafiledb->error ) : '',
  	'S_HIDDEN_FIELDS' => $s_hidden_fields,
! 	'S_CAT_ACTION' => append_sid( "admin_pa_category.$phpEx" )
! ));
  
  if ( $mode == '' || $mode == 'cat_order' || $mode == 'sync' || $mode == 'sync_all' )
***************
*** 173,178 ****
  		'L_MOVE_DOWN' => $lang['Move_down'],
  		'L_SUB_CAT' => $lang['Sub_category'],
! 		'L_RESYNC' => $lang['Resync'] )
! 	);
  	admin_cat_main( $cat_id );
  }
--- 187,192 ----
  		'L_MOVE_DOWN' => $lang['Move_down'],
  		'L_SUB_CAT' => $lang['Sub_category'],
! 		'L_RESYNC' => $lang['Resync']
! 	));
  	admin_cat_main( $cat_id );
  }
***************
*** 211,215 ****
  		$autogenerate_comments_default = "checked=\"checked\"";
  
! 		$comments_forum_id = 0;
  
  		//
--- 225,229 ----
  		$autogenerate_comments_default = "checked=\"checked\"";
  
! 		$comments_forum_id = -1;
  
  		//
***************
*** 332,336 ****
  		'L_FORUM_ID' => $lang['Forum_id'],
  		'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'],
! 		'FORUM_LIST' => get_forums( $comments_forum_id ),
  
  		'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'],
--- 346,350 ----
  		'L_FORUM_ID' => $lang['Forum_id'],
  		'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'],
! 		'FORUM_LIST' => get_forums( $comments_forum_id, true, 'comments_forum_id' ),
  
  		'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'],
***************
*** 420,425 ****
  		'L_SELECT_CAT' => $lang['Select_a_Category'],
  		'L_DELETE' => $lang['Delete'],
! 		'L_MOVE' => $lang['Move'] )
! 	);
  }
  
--- 434,439 ----
  		'L_SELECT_CAT' => $lang['Select_a_Category'],
  		'L_DELETE' => $lang['Delete'],
! 		'L_MOVE' => $lang['Move']
! 	));
  }
  
***************
*** 431,434 ****
  
  include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx );
- 
  ?>
\ No newline at end of file
--- 445,447 ----

Index: admin_pa_file.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/admin/admin_pa_file.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** admin_pa_file.php	2 May 2006 23:28:15 -0000	1.19
--- admin_pa_file.php	17 Jun 2006 20:13:21 -0000	1.20
***************
*** 25,29 ****
  		include_once( $module_root_path . 'pafiledb/includes/pafiledb_constants.' . $phpEx );
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['2_File_manage_title'] = $file;
  		return;
  	}
--- 25,29 ----
  		include_once( $module_root_path . 'pafiledb/includes/pafiledb_constants.' . $phpEx );
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['2_File_manage'] = $file;
  		return;
  	}
***************
*** 52,56 ****
  
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['2_File_manage_title'] = 'modules/mx_pafiledb/admin/' . $file;
  		return;
  	}
--- 52,56 ----
  
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['2_File_manage'] = 'modules/mx_pafiledb/admin/' . $file;
  		return;
  	}
***************
*** 69,72 ****
--- 69,89 ----
  }
  
+ // **********************************************************************
+ // Read language definition
+ // **********************************************************************
+ if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
+ {
+ 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
+ 	include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx ); // For notification
+ }
+ else
+ {
+ 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
+ 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ); // For notification
+ }
+ 
+ //
+ // Init
+ //
  $custom_field = new custom_field();
  $custom_field->init();
***************
*** 80,83 ****
--- 97,101 ----
  
  $mode = ( isset( $_REQUEST['mode'] ) ) ? htmlspecialchars( $_REQUEST['mode'] ) : '';
+ $mode_notification = ( isset( $_REQUEST['mode'] ) ) ? htmlspecialchars( $_REQUEST['mode'] ) : '';
  $mode_js = ( isset( $_REQUEST['mode_js'] ) ) ? htmlspecialchars( $_REQUEST['mode_js'] ) : '';
  $mode = ( isset( $_POST['addfile'] ) ) ? 'add' : $mode;
***************
*** 137,145 ****
  }
  
! $s_file_actions = array( 'approved' => $lang['Approved_files'],
  	'broken' => $lang['Broken_files'],
  	'file_cat' => $lang['File_cat'],
  	'all_file' => $lang['All_files'],
! 	'maintenance' => $lang['Maintenance'] );
  
  switch ( $mode )
--- 155,165 ----
  }
  
! $s_file_actions = array(
! 	'approved' => $lang['Approved_files'],
  	'broken' => $lang['Broken_files'],
  	'file_cat' => $lang['File_cat'],
  	'all_file' => $lang['All_files'],
! 	'maintenance' => $lang['Maintenance']
! );
  
  switch ( $mode )
***************
*** 154,161 ****
  	case 'all_file':
  	default:
- 		/* - orig
- 		$template_file = 'admin/pa_admin_file.tpl';
- 		*/
- 		// MX
  		$template_file = 'admin/pa_admin_file.tpl';
  		$l_title = $lang['File_manage_title'];
--- 174,177 ----
***************
*** 164,171 ****
  		break;
  	case 'add':
- 		/* - orig
- 		$template_file = 'admin/pa_admin_file_edit.tpl';
- 		*/
- 		// MX
  		$template_file = 'admin/pa_admin_file_edit.tpl';
  		$l_title = $lang['Afiletitle'];
--- 180,183 ----
***************
*** 175,182 ****
  	case 'edit':
  	case 'do_add':
- 		/* - orig
- 		$template_file = 'admin/pa_admin_file_edit.tpl';
- 		*/
- 		// MX
  		$template_file = 'admin/pa_admin_file_edit.tpl';
  		$l_title = $lang['Efiletitle'];
--- 187,190 ----
***************
*** 186,193 ****
  		break;
  	case 'maintenance':
- 		/* - orig
- 		$template_file = 'admin/pa_admin_file_checker.tpl';
- 		*/
- 		// MX
  		$template_file = 'admin/pa_admin_file_checker.tpl';
  		$l_title = $lang['File_checker'];
--- 194,197 ----
***************
*** 210,219 ****
  	$pafiledb->_pafiledb();
  	$mode = 'edit';
  	if ( !$mirrors )
  	{
  		$message = $lang['Fileadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_pa_file.php" ) . '">', '</a>' );
  		mx_message_die( GENERAL_MESSAGE, $message );
  	}
! }elseif ( $mode == 'do_add' && $file_id )
  {
  	$file_id = $pafiledb->update_add_file( $file_id );
--- 214,250 ----
  	$pafiledb->_pafiledb();
  	$mode = 'edit';
+ 
  	if ( !$mirrors )
  	{
+ 		//
+ 		// Notification
+ 		//
+ 		$pafiledb->update_add_file_notify($file_id, 'add');
+ 
+ 		/*
+ 		//
+ 		// Auto comment
+ 		//
+ 		if ( $pafiledb->comments[$cat_id]['activated'] && $this->comments[$cat_id]['autogenerate_comments'] )
+ 		{
+ 			//
+ 			// Autogenerate comment (duplicate the notification message)
+ 			//
+ 			$mx_pa_notification = new mx_pa_notification();
+ 			$mx_pa_notification->init( $file_id );
+ 			$mx_pa_notification->_compose_auto_note($pa_post_mode == 'add' ? MX_NEW_NOTIFICATION : MX_EDITED_NOTIFICATION);
+ 
+ 			//
+ 			// Generate comment
+ 			//
+ 			$this->update_add_comment('', $file_id, 0, addslashes(trim($mx_pa_notification->subject)), addslashes(trim($mx_pa_notification->message)));
+ 		}
+ 		*/
+ 
  		$message = $lang['Fileadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_pa_file.php" ) . '">', '</a>' );
  		mx_message_die( GENERAL_MESSAGE, $message );
  	}
! }
! elseif ( $mode == 'do_add' && $file_id )
  {
  	$file_id = $pafiledb->update_add_file( $file_id );
***************
*** 221,230 ****
  	$pafiledb->_pafiledb();
  	$mode = 'edit';
  	if ( !$mirrors )
  	{
  		$message = $lang['Fileedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_pa_file.$phpEx" ) . '">', '</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 );
  	}
! }elseif ( $mode == 'delete' )
  {
  	if ( is_array( $file_ids ) && !empty( $file_ids ) )
--- 252,288 ----
  	$pafiledb->_pafiledb();
  	$mode = 'edit';
+ 
  	if ( !$mirrors )
  	{
+ 		//
+ 		// Notification
+ 		//
+ 		$pafiledb->update_add_file_notify($file_id, 'edit');
+ 
+ 		/*
+ 		//
+ 		// Auto comment
+ 		//
+ 		if ( $pafiledb->comments[$cat_id]['activated'] && $this->comments[$cat_id]['autogenerate_comments'] )
+ 		{
+ 			//
+ 			// Autogenerate comment (duplicate the notification message)
+ 			//
+ 			$mx_pa_notification = new mx_pa_notification();
+ 			$mx_pa_notification->init( $file_id );
+ 			$mx_pa_notification->_compose_auto_note($pa_post_mode == 'add' ? MX_NEW_NOTIFICATION : MX_EDITED_NOTIFICATION);
+ 
+ 			//
+ 			// Generate comment
+ 			//
+ 			$this->update_add_comment('', $file_id, 0, addslashes(trim($mx_pa_notification->subject)), addslashes(trim($mx_pa_notification->message)));
+ 		}
+ 		*/
+ 
  		$message = $lang['Fileedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_pa_file.$phpEx" ) . '">', '</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 );
  	}
! }
! elseif ( $mode == 'delete' )
  {
  	if ( is_array( $file_ids ) && !empty( $file_ids ) )
***************
*** 232,235 ****
--- 290,335 ----
  		foreach( $file_ids as $temp_file_id )
  		{
+ 			$sql = 'SELECT *
+ 				FROM ' . PA_FILES_TABLE . "
+ 				WHERE file_id = $temp_file_id";
+ 
+ 			if ( !( $result = $db->sql_query( $sql ) ) )
+ 			{
+ 				mx_message_die( GENERAL_ERROR, 'Couldn\'t get file info', '', __LINE__, __FILE__, $sql );
+ 			}
+ 			$file_info = $db->sql_fetchrow( $result );
+ 
+ 			//
+ 			// Notification
+ 			//
+ 			$pafiledb->update_add_file_notify($temp_file_id, 'delete');
+ 
+ 			//
+ 			// Comments
+ 			//
+ 			if ($pafiledb->comments[$file_info['file_catid']]['activated'] && $pafiledb_config['del_topic'])
+ 			{
+ 				if ( $pafiledb->comments[$file_info['file_catid']]['internal_comments'] )
+ 				{
+ 					$sql = 'DELETE FROM ' . PA_COMMENTS_TABLE . "
+ 					WHERE file_id = '" . $file_id . "'";
+ 
+ 					if ( !( $db->sql_query( $sql ) ) )
+ 					{
+ 						mx_message_die( GENERAL_ERROR, 'Couldnt delete comments', '', __LINE__, __FILE__, $sql );
+ 					}
+ 				}
+ 				else
+ 				{
+ 					if ( $file_info['topic_id'] )
+ 					{
+ 						include( $module_root_path . 'pafiledb/includes/functions_comment.' . $phpEx );
+ 						$mx_pa_comments = new pafiledb_comments();
+ 						$mx_pa_comments->init( $file_info, 'phpbb');
+ 						$mx_pa_comments->post('delete_all', $file_info['topic_id']);
+ 					}
+ 				}
+ 			}
+ 
  			$pafiledb->delete_files( $temp_file_id );
  		}
***************
*** 237,247 ****
  	else
  	{
  		$pafiledb->delete_files( $file_id );
  	}
  	$pafiledb->_pafiledb();
! }elseif ( $mode == 'do_maintenace' )
  {
  	$pafiledb->file_mainenance();
! }elseif ( $mode == 'do_approve' || $mode == 'do_unapprove' )
  {
  	if ( is_array( $file_ids ) && !empty( $file_ids ) )
--- 337,391 ----
  	else
  	{
+ 		$sql = 'SELECT *
+ 			FROM ' . PA_FILES_TABLE . "
+ 			WHERE file_id = $file_id";
+ 		if ( !( $result = $db->sql_query( $sql ) ) )
+ 		{
+ 			mx_message_die( GENERAL_ERROR, 'Couldn\'t get file info', '', __LINE__, __FILE__, $sql );
+ 		}
+ 		$file_info = $db->sql_fetchrow( $result );
+ 
+ 		//
+ 		// Notification
+ 		//
+ 		$pafiledb->update_add_file_notify($file_id, 'delete');
+ 
+ 		//
+ 		// Comments
+ 		//
+ 		if ($pafiledb->comments[$file_info['file_catid']]['activated'] && $pafiledb_config['del_topic'])
+ 		{
+ 			if ( $pafiledb->comments[$file_info['file_catid']]['internal_comments'] )
+ 			{
+ 				$sql = 'DELETE FROM ' . PA_COMMENTS_TABLE . "
+ 				WHERE file_id = '" . $file_id . "'";
+ 
+ 				if ( !( $db->sql_query( $sql ) ) )
+ 				{
+ 					mx_message_die( GENERAL_ERROR, 'Couldnt delete comments', '', __LINE__, __FILE__, $sql );
+ 				}
+ 			}
+ 			else
+ 			{
+ 				if ( $file_info['topic_id'] )
+ 				{
+ 					include( $module_root_path . 'pafiledb/includes/functions_comment.' . $phpEx );
+ 					$mx_pa_comments = new pafiledb_comments();
+ 					$mx_pa_comments->init( $file_info, 'phpbb');
+ 					$mx_pa_comments->post('delete_all', $file_info['topic_id']);
+ 				}
+ 			}
+ 		}
+ 
  		$pafiledb->delete_files( $file_id );
  	}
+ 
  	$pafiledb->_pafiledb();
! }
! elseif ( $mode == 'do_maintenace' )
  {
  	$pafiledb->file_mainenance();
! }
! elseif ( $mode == 'do_approve' || $mode == 'do_unapprove' )
  {
  	if ( is_array( $file_ids ) && !empty( $file_ids ) )
***************
*** 251,272 ****
  			$pafiledb->file_approve( $mode, $temp_file_id );
  		}
  	}
  	else
  	{
  		$pafiledb->file_approve( $mode, $file_id );
  	}
  	$pafiledb->_pafiledb();
  }
  
! $pafiledb_template->set_filenames( array( 'admin' => $template_file )
! 	);
  
! $pafiledb_template->assign_vars( array( 'L_FILE_TITLE' => $l_title,
! 		'L_FILE_EXPLAIN' => $l_explain,
! 		'L_ADD_FILE' => $lang['Afiletitle'],
  
! 		'S_HIDDEN_FIELDS' => $s_hidden_fields,
! 		'S_FILE_ACTION' => append_sid( "admin_pa_file.$phpEx" ) )
! 	);
  
  if ( in_array( $mode, array( '', 'approved', 'broken', 'do_approve', 'do_unapprove', 'delete', 'file_cat', 'all_file' ) ) )
--- 395,424 ----
  			$pafiledb->file_approve( $mode, $temp_file_id );
  		}
+ 		//
+ 		// Notification
+ 		//
+ 		$pafiledb->update_add_file_notify($file_ids, $mode);
  	}
  	else
  	{
  		$pafiledb->file_approve( $mode, $file_id );
+ 		//
+ 		// Notification
+ 		//
+ 		$pafiledb->update_add_file_notify($file_id, $mode);
  	}
  	$pafiledb->_pafiledb();
  }
  
! $pafiledb_template->set_filenames( array( 'admin' => $template_file ) );
  
! $pafiledb_template->assign_vars( array(
! 	'L_FILE_TITLE' => $l_title,
! 	'L_FILE_EXPLAIN' => $l_explain,
! 	'L_ADD_FILE' => $lang['Afiletitle'],
  
! 	'S_HIDDEN_FIELDS' => $s_hidden_fields,
! 	'S_FILE_ACTION' => append_sid( "admin_pa_file.$phpEx" )
! ));
  
  if ( in_array( $mode, array( '', 'approved', 'broken', 'do_approve', 'do_unapprove', 'delete', 'file_cat', 'all_file' ) ) )
***************
*** 297,300 ****
--- 449,453 ----
  			mx_message_die( GENERAL_ERROR, 'Couldn\'t get file info', '', __LINE__, __FILE__, $sql );
  		}
+ 
  		while ( $row = $db->sql_fetchrow( $result ) )
  		{
***************
*** 374,378 ****
  		if ( $mode == '' )
  		{
! 			$global_array = array( 0 => array( 'lang_var' => $lang['Approved_files'],
  					'row_set' => $approved_file_rowset,
  					'approval' => 'approve' ),
--- 527,532 ----
  		if ( $mode == '' )
  		{
! 			$global_array = array(
! 				0 => array( 'lang_var' => $lang['Approved_files'],
  					'row_set' => $approved_file_rowset,
  					'approval' => 'approve' ),
***************
*** 382,401 ****
  				2 => array( 'lang_var' => $lang['All_files'],
  					'row_set' => $all_file_rowset,
! 					'approval' => 'unapprove' ) );
! 		}elseif ( $mode == 'all_file' || $mode == 'file_cat' )
  		{
! 			$global_array = array( 0 => array( 'lang_var' => $lang['All_files'],
! 					'row_set' => $all_file_rowset,
! 					'approval' => 'unapprove' ) );
! 		}elseif ( $mode == 'approved' )
  		{
! 			$global_array = array( 0 => array( 'lang_var' => $lang['Approved_files'],
! 					'row_set' => $approved_file_rowset,
! 					'approval' => 'approve' ) );
! 		}elseif ( $mode == 'broken' )
  		{
! 			$global_array = array( 0 => array( 'lang_var' => $lang['Broken_files'],
! 					'row_set' => $broken_file_rowset,
! 					'approval' => 'both' ) );
  		}
  	}
--- 536,562 ----
  				2 => array( 'lang_var' => $lang['All_files'],
  					'row_set' => $all_file_rowset,
! 					'approval' => 'unapprove' )
! 			);
! 		}
! 		elseif ( $mode == 'all_file' || $mode == 'file_cat' )
  		{
! 			$global_array = array( 0 => array(
! 				'lang_var' => $lang['All_files'],
! 				'row_set' => $all_file_rowset,
! 				'approval' => 'unapprove' ) );
! 		}
! 		elseif ( $mode == 'approved' )
  		{
! 			$global_array = array( 0 => array(
! 				'lang_var' => $lang['Approved_files'],
! 				'row_set' => $approved_file_rowset,
! 				'approval' => 'approve' ) );
! 		}
! 		elseif ( $mode == 'broken' )
  		{
! 			$global_array = array( 0 => array(
! 				'lang_var' => $lang['Broken_files'],
! 				'row_set' => $broken_file_rowset,
! 				'approval' => 'both' ) );
  		}
  	}
***************
*** 424,445 ****
  	$cat_list .= '</select>';
  
! 	$pafiledb_template->assign_vars( array( 'L_EDIT' => $lang['Edit'],
! 			'L_DELETE' => $lang['Delete'],
! 			'L_CATEGORY' => $lang['Category'],
! 			'L_MODE' => $lang['View'],
! 			'L_GO' => $lang['Go'],
! 			'L_DELETE_FILE' => $lang['Delete_selected'],
! 			'L_APPROVE' => $lang['Approve'],
! 			'L_UNAPPROVE' => $lang['Unapprove'],
! 			'L_APPROVE_FILE' => $lang['Approve_selected'],
! 			'L_UNAPPROVE_FILE' => $lang['Unapprove_selected'],
! 			'L_NO_FILES' => $lang['No_file'],
  
! 			'PAGINATION' => generate_pagination( append_sid( "admin_pa_file.$phpEx?mode=$mode&amp;sort_method=$sort_method&amp;sort_order=$sort_order&cat_id=$cat_id" ), $total_files, $pafiledb_config['pagination'], $start ),
! 			'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $pafiledb_config['pagination'] ) + 1 ), ceil( $total_files / $pafiledb_config['pagination'] ) ),
  
! 			'S_CAT_LIST' => $cat_list,
! 			'S_MODE_SELECT' => $s_file_list )
! 		);
  
  	if ( $total_files > 0 )
--- 585,607 ----
  	$cat_list .= '</select>';
  
! 	$pafiledb_template->assign_vars( array(
! 		'L_EDIT' => $lang['Edit'],
! 		'L_DELETE' => $lang['Delete'],
! 		'L_CATEGORY' => $lang['Category'],
! 		'L_MODE' => $lang['View'],
! 		'L_GO' => $lang['Go'],
! 		'L_DELETE_FILE' => $lang['Delete_selected'],
! 		'L_APPROVE' => $lang['Approve'],
! 		'L_UNAPPROVE' => $lang['Unapprove'],
! 		'L_APPROVE_FILE' => $lang['Approve_selected'],
! 		'L_UNAPPROVE_FILE' => $lang['Unapprove_selected'],
! 		'L_NO_FILES' => $lang['No_file'],
  
! 		'PAGINATION' => generate_pagination( append_sid( "admin_pa_file.$phpEx?mode=$mode&amp;sort_method=$sort_method&amp;sort_order=$sort_order&cat_id=$cat_id" ), $total_files, $pafiledb_config['pagination'], $start ),
! 		'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $start / $pafiledb_config['pagination'] ) + 1 ), ceil( $total_files / $pafiledb_config['pagination'] ) ),
  
! 		'S_CAT_LIST' => $cat_list,
! 		'S_MODE_SELECT' => $s_file_list )
! 	);
  
  	if ( $total_files > 0 )
***************
*** 455,471 ****
  		{
  			$approve = $unapprove = true;
! 		}elseif ( $files_data['approval'] == 'approve' )
  		{
  			$approve = true;
! 		}elseif ( $files_data['approval'] == 'unapprove' )
  		{
  			$unapprove = true;
  		}
  
! 		$pafiledb_template->assign_block_vars( 'file_mode', array( 'L_FILE_MODE' => $files_data['lang_var'],
! 				'DATA' => ( isset( $files_data['row_set'] ) ) ? true : false,
! 				'APPROVE' => $approve,
! 				'UNAPPROVE' => $unapprove )
! 			);
  
  		if ( isset( $files_data['row_set'] ) )
--- 617,636 ----
  		{
  			$approve = $unapprove = true;
! 		}
! 		elseif ( $files_data['approval'] == 'approve' )
  		{
  			$approve = true;
! 		}
! 		elseif ( $files_data['approval'] == 'unapprove' )
  		{
  			$unapprove = true;
  		}
  
! 		$pafiledb_template->assign_block_vars( 'file_mode', array(
! 			'L_FILE_MODE' => $files_data['lang_var'],
! 			'DATA' => ( isset( $files_data['row_set'] ) ) ? true : false,
! 			'APPROVE' => $approve,
! 			'UNAPPROVE' => $unapprove
! 		));
  
  		if ( isset( $files_data['row_set'] ) )
***************
*** 475,490 ****
  			{
  				$approve_mode = ( $file_data['file_approved'] ) ? 'do_unapprove' : 'do_approve';
! 				$pafiledb_template->assign_block_vars( 'file_mode.file_row', array( 'FILE_NAME' => $file_data['file_name'],
! 						'FILE_NUMBER' => $i++,
! 						'FILE_ID' => $file_data['file_id'],
! 						'U_FILE_EDIT' => append_sid( "admin_pa_file.$phpEx?mode=edit&file_id={$file_data['file_id']}" ),
! 						'U_FILE_DELETE' => append_sid( "admin_pa_file.$phpEx?mode=delete&file_id={$file_data['file_id']}" ),
! 						'U_FILE_APPROVE' => append_sid( "admin_pa_file.$phpEx?mode=$approve_mode&file_id={$file_data['file_id']}" ),
! 						'L_APPROVE' => ( $file_data['file_approved'] ) ? $lang['Unapprove'] : $lang['Approve'] )
! 					);
  			}
  		}
  	}
! }elseif ( $mode == 'add' || $mode == 'edit' || $mirrors )
  {
  	if ( $mode == 'add' )
--- 640,657 ----
  			{
  				$approve_mode = ( $file_data['file_approved'] ) ? 'do_unapprove' : 'do_approve';
! 				$pafiledb_template->assign_block_vars( 'file_mode.file_row', array(
! 					'FILE_NAME' => $file_data['file_name'],
! 					'FILE_NUMBER' => $i++,
! 					'FILE_ID' => $file_data['file_id'],
! 					'U_FILE_EDIT' => append_sid( "admin_pa_file.$phpEx?mode=edit&file_id={$file_data['file_id']}" ),
! 					'U_FILE_DELETE' => append_sid( "admin_pa_file.$phpEx?mode=delete&file_id={$file_data['file_id']}" ),
! 					'U_FILE_APPROVE' => append_sid( "admin_pa_file.$phpEx?mode=$approve_mode&file_id={$file_data['file_id']}" ),
! 					'L_APPROVE' => ( $file_data['file_approved'] ) ? $lang['Unapprove'] : $lang['Approve']
! 				));
  			}
  		}
  	}
! }
! elseif ( $mode == 'add' || $mode == 'edit' || $mirrors )
  {
  	if ( $mode == 'add' )
***************
*** 544,623 ****
  	}
  
! 	$pafiledb_template->assign_vars( array( 'U_MIRRORS_PAGE' => append_sid( "admin_pa_file.$phpEx?mode=mirrors&file_id=$file_id" ),
  
! 			'ADD_MIRRORS' => $mirrors,
! 			'MODE_EDIT' => ( $mode == 'edit' ) ? true : false,
! 			'MODE' => $mode,
! 			'FILESIZE' => intval( $pafiledb_config['max_file_size'] ),
! 			'FILE_NAME' => $file_name,
! 			'FILE_DESC' => $file_desc,
! 			'FILE_LONG_DESC' => $file_long_desc,
! 			'FILE_AUTHOR' => $file_author,
! 			'FILE_VERSION' => $file_version,
! 			'FILE_SSURL' => $file_ssurl,
! 			'FILE_WEBSITE' => $file_website,
! 			'FILE_DLURL' => $file_url,
! 			'FILE_DOWNLOAD' => $file_download,
! 			'CUSTOM_EXIST' => $custom_exist,
! 			'APPROVED_CHECKED_YES' => $approved_checked_yes,
! 			'APPROVED_CHECKED_NO' => $approved_checked_no,
! 			'SS_CHECKED_YES' => $ss_checked_yes,
! 			'SS_CHECKED_NO' => $ss_checked_no,
! 			'PIN_CHECKED_YES' => $pin_checked_yes,
! 			'PIN_CHECKED_NO' => $pin_checked_no,
! 			'MIRROR_FILE' => $file_unique_name,
! 			// 'U_UPLOADED_MIRROR' => get_formated_url() . '/' . $file_dir . $file_unique_name,
! 			'U_UPLOADED_MIRROR' => PORTAL_URL . 'modules/mx_pafiledb/' . $file_dir . $file_unique_name,
  
! 			'L_FILE_APPROVED' => $lang['Approved'],
! 			'L_FILE_APPROVED_INFO' => $lang['Approved_info'],
! 			'L_ADDTIONAL_FIELD' => $lang['Addtional_field'],
! 			'L_SCREENSHOT' => $lang['Scrsht'],
! 			'L_FILES' => $lang['Files'],
! 			'L_FILE_NAME' => $lang['Filename'],
! 			'L_FILE_NAME_INFO' => $lang['Filenameinfo'],
! 			'L_FILE_SHORT_DESC' => $lang['Filesd'],
! 			'L_FILE_SHORT_DESC_INFO' => $lang['Filesdinfo'],
! 			'L_FILE_LONG_DESC' => $lang['Fileld'],
! 			'L_FILE_LONG_DESC_INFO' => $lang['Fileldinfo'],
! 			'L_FILE_AUTHOR' => $lang['Filecreator'],
! 			'L_FILE_AUTHOR_INFO' => $lang['Filecreatorinfo'],
! 			'L_FILE_VERSION' => $lang['Fileversion'],
! 			'L_FILE_VERSION_INFO' => $lang['Fileversioninfo'],
! 			'L_FILESS' => $lang['Filess'],
! 			'L_FILESSINFO' => $lang['Filessinfo'],
! 			'L_FILESS_UPLOAD' => $lang['Filess_upload'],
! 			'L_FILESSINFO_UPLOAD' => $lang['Filessinfo_upload'],
! 			'L_FILE_SSLINK' => $lang['Filess_link'],
! 			'L_FILE_SSLINK_INFO' => $lang['Filess_link_info'],
! 			'L_FILESSUPLOAD' => $lang['Filessupload'],
! 			'L_FILE_WEBSITE' => $lang['Filedocs'],
! 			'L_FILE_WEBSITE_INFO' => $lang['Filedocsinfo'],
! 			'L_FILE_URL' => $lang['Fileurl'],
! 			'L_FILE_UPLOAD' => $lang['File_upload'],
! 			'L_FILEINFO_UPLOAD' => $lang['Fileinfo_upload'],
! 			'L_FILE_URL_INFO' => $lang['Fileurlinfo'],
! 			'L_FILE_POSTICONS' => $lang['Filepi'],
! 			'L_FILE_POSTICONS_INFO' => $lang['Filepiinfo'],
! 			'L_FILE_CAT' => $lang['Filecat'],
! 			'L_FILE_CAT_INFO' => $lang['Filecatinfo'],
! 			'L_FILE_LICENSE' => $lang['Filelicense'],
! 			'L_NONE' => $lang['None'],
! 			'L_FILE_LICENSE_INFO' => $lang['Filelicenseinfo'],
! 			'L_FILE_PINNED' => $lang['Filepin'],
! 			'L_FILE_PINNED_INFO' => $lang['Filepininfo'],
! 			'L_FILE_DOWNLOAD' => $lang['Filedls'],
! 			'L_MIRRORS' => $lang['Mirrors'],
! 			'L_MIRRORS_INFO' => $lang['Mirrors_explain'],
! 			'L_CLICK_HERE_MIRRORS' => $lang['Click_here_mirrors'],
! 			'L_UPLOADED_FILE' => $lang['Uploaded_file'],
! 			'L_NO' => $lang['No'],
! 			'L_YES' => $lang['Yes'],
  
! 			'S_POSTICONS' => $file_posticons,
! 			'S_LICENSE_LIST' => $file_license,
! 			'S_CAT_LIST' => $file_cat_list )
! 		);
! }elseif ( $mode == 'mirrors' )
  {
  	if ( isset( $_POST['delete_mirrors'] ) )
--- 711,792 ----
  	}
  
! 	$pafiledb_template->assign_vars( array(
! 		'U_MIRRORS_PAGE' => append_sid( "admin_pa_file.$phpEx?mode=mirrors&file_id=$file_id" ),
  
! 		'ADD_MIRRORS' => $mirrors,
! 		'MODE_EDIT' => ( $mode == 'edit' ) ? true : false,
! 		'MODE' => $mode,
! 		'FILESIZE' => intval( $pafiledb_config['max_file_size'] ),
! 		'FILE_NAME' => $file_name,
! 		'FILE_DESC' => $file_desc,
! 		'FILE_LONG_DESC' => $file_long_desc,
! 		'FILE_AUTHOR' => $file_author,
! 		'FILE_VERSION' => $file_version,
! 		'FILE_SSURL' => $file_ssurl,
! 		'FILE_WEBSITE' => $file_website,
! 		'FILE_DLURL' => $file_url,
! 		'FILE_DOWNLOAD' => $file_download,
! 		'CUSTOM_EXIST' => $custom_exist,
! 		'APPROVED_CHECKED_YES' => $approved_checked_yes,
! 		'APPROVED_CHECKED_NO' => $approved_checked_no,
! 		'SS_CHECKED_YES' => $ss_checked_yes,
! 		'SS_CHECKED_NO' => $ss_checked_no,
! 		'PIN_CHECKED_YES' => $pin_checked_yes,
! 		'PIN_CHECKED_NO' => $pin_checked_no,
! 		'MIRROR_FILE' => $file_unique_name,
! 		// 'U_UPLOADED_MIRROR' => get_formated_url() . '/' . $file_dir . $file_unique_name,
! 		'U_UPLOADED_MIRROR' => PORTAL_URL . 'modules/mx_pafiledb/' . $file_dir . $file_unique_name,
  
! 		'L_FILE_APPROVED' => $lang['Approved'],
! 		'L_FILE_APPROVED_INFO' => $lang['Approved_info'],
! 		'L_ADDTIONAL_FIELD' => $lang['Addtional_field'],
! 		'L_SCREENSHOT' => $lang['Scrsht'],
! 		'L_FILES' => $lang['Files'],
! 		'L_FILE_NAME' => $lang['Filename'],
! 		'L_FILE_NAME_INFO' => $lang['Filenameinfo'],
! 		'L_FILE_SHORT_DESC' => $lang['Filesd'],
! 		'L_FILE_SHORT_DESC_INFO' => $lang['Filesdinfo'],
! 		'L_FILE_LONG_DESC' => $lang['Fileld'],
! 		'L_FILE_LONG_DESC_INFO' => $lang['Fileldinfo'],
! 		'L_FILE_AUTHOR' => $lang['Filecreator'],
! 		'L_FILE_AUTHOR_INFO' => $lang['Filecreatorinfo'],
! 		'L_FILE_VERSION' => $lang['Fileversion'],
! 		'L_FILE_VERSION_INFO' => $lang['Fileversioninfo'],
! 		'L_FILESS' => $lang['Filess'],
! 		'L_FILESSINFO' => $lang['Filessinfo'],
! 		'L_FILESS_UPLOAD' => $lang['Filess_upload'],
! 		'L_FILESSINFO_UPLOAD' => $lang['Filessinfo_upload'],
! 		'L_FILE_SSLINK' => $lang['Filess_link'],
! 		'L_FILE_SSLINK_INFO' => $lang['Filess_link_info'],
! 		'L_FILESSUPLOAD' => $lang['Filessupload'],
! 		'L_FILE_WEBSITE' => $lang['Filedocs'],
! 		'L_FILE_WEBSITE_INFO' => $lang['Filedocsinfo'],
! 		'L_FILE_URL' => $lang['Fileurl'],
! 		'L_FILE_UPLOAD' => $lang['File_upload'],
! 		'L_FILEINFO_UPLOAD' => $lang['Fileinfo_upload'],
! 		'L_FILE_URL_INFO' => $lang['Fileurlinfo'],
! 		'L_FILE_POSTICONS' => $lang['Filepi'],
! 		'L_FILE_POSTICONS_INFO' => $lang['Filepiinfo'],
! 		'L_FILE_CAT' => $lang['Filecat'],
! 		'L_FILE_CAT_INFO' => $lang['Filecatinfo'],
! 		'L_FILE_LICENSE' => $lang['Filelicense'],
! 		'L_NONE' => $lang['None'],
! 		'L_FILE_LICENSE_INFO' => $lang['Filelicenseinfo'],
! 		'L_FILE_PINNED' => $lang['Filepin'],
! 		'L_FILE_PINNED_INFO' => $lang['Filepininfo'],
! 		'L_FILE_DOWNLOAD' => $lang['Filedls'],
! 		'L_MIRRORS' => $lang['Mirrors'],
! 		'L_MIRRORS_INFO' => $lang['Mirrors_explain'],
! 		'L_CLICK_HERE_MIRRORS' => $lang['Click_here_mirrors'],
! 		'L_UPLOADED_FILE' => $lang['Uploaded_file'],
! 		'L_NO' => $lang['No'],
! 		'L_YES' => $lang['Yes'],
  
! 		'S_POSTICONS' => $file_posticons,
! 		'S_LICENSE_LIST' => $file_license,
! 		'S_CAT_LIST' => $file_cat_list )
! 	);
! }
! elseif ( $mode == 'mirrors' )
  {
  	if ( isset( $_POST['delete_mirrors'] ) )
***************
*** 706,740 ****
  	}
  
! 	$pafiledb_template->assign_vars( array( 'ROW_NOT_EMPTY' => ( empty( $mirrors_data ) ) ? false : true,
! 			'FILESIZE' => intval( $pafiledb_config['max_file_size'] ),
  
! 			'L_MIRROR_LOCATION' => $lang['Mirror_location'],
! 			'L_FILE_UPLOAD' => $lang['File_upload'],
! 			'L_FILE_DELETE' => $lang['Delete'],
! 			'L_DELETE' => $lang['Delete_selected'],
! 			'L_FILEINFO_UPLOAD' => $lang['Fileinfo_upload'],
! 			'L_UPLOADED_FILE' => $lang['Uploaded_file'],
! 			'L_FILE_URL' => $lang['Fileurl'],
! 			'L_FILE_URL_INFO' => $lang['Fileurl'],
! 			'L_MODIFY' => $lang['Efiletitle'],
! 			'L_ADD_NEW' => $lang['Afiletitle'],
! 			'L_ADD_NEW_MIRROR' => $lang['Add_new_mirror'] )
! 		);
  
  	foreach( $mirrors_data as $mirror_id => $mirror_data )
  	{
! 		$pafiledb_template->assign_block_vars( 'row', array( 'LOCATION' => $mirror_data['mirror_location'],
! 				'MIRROR_ID' => $mirror_id,
! 				'MIRROR_URL' => $mirror_data['file_dlurl'],
! 				'MIRROR_FILE' => $mirror_data['unique_name'],
! 				'U_UPLOADED_MIRROR' => get_formated_url() . '/' . $mirror_data['file_dir'] . $mirror_data['unique_name'] )
! 			);
  	}
  }
  
! $pafiledb_template->assign_vars( array( 'ERROR' => ( sizeof( $pafiledb->error ) ) ? implode( '<br />', $pafiledb->error ) : '' )
! 	);
  
  // Output
  include( $mx_root_path . 'admin/page_header_admin.' . $phpEx );
  $pafiledb_template->display( 'admin' );
--- 875,912 ----
  	}
  
! 	$pafiledb_template->assign_vars( array(
! 		'ROW_NOT_EMPTY' => ( empty( $mirrors_data ) ) ? false : true,
! 		'FILESIZE' => intval( $pafiledb_config['max_file_size'] ),
  
! 		'L_MIRROR_LOCATION' => $lang['Mirror_location'],
! 		'L_FILE_UPLOAD' => $lang['File_upload'],
! 		'L_FILE_DELETE' => $lang['Delete'],
! 		'L_DELETE' => $lang['Delete_selected'],
! 		'L_FILEINFO_UPLOAD' => $lang['Fileinfo_upload'],
! 		'L_UPLOADED_FILE' => $lang['Uploaded_file'],
! 		'L_FILE_URL' => $lang['Fileurl'],
! 		'L_FILE_URL_INFO' => $lang['Fileurl'],
! 		'L_MODIFY' => $lang['Efiletitle'],
! 		'L_ADD_NEW' => $lang['Afiletitle'],
! 		'L_ADD_NEW_MIRROR' => $lang['Add_new_mirror']
! 	));
  
  	foreach( $mirrors_data as $mirror_id => $mirror_data )
  	{
! 		$pafiledb_template->assign_block_vars( 'row', array(
! 			'LOCATION' => $mirror_data['mirror_location'],
! 			'MIRROR_ID' => $mirror_id,
! 			'MIRROR_URL' => $mirror_data['file_dlurl'],
! 			'MIRROR_FILE' => $mirror_data['unique_name'],
! 			'U_UPLOADED_MIRROR' => get_formated_url() . '/' . $mirror_data['file_dir'] . $mirror_data['unique_name']
! 		));
  	}
  }
  
! $pafiledb_template->assign_vars( array( 'ERROR' => ( sizeof( $pafiledb->error ) ) ? implode( '<br />', $pafiledb->error ) : '' ) );
  
+ //
  // Output
+ //
  include( $mx_root_path . 'admin/page_header_admin.' . $phpEx );
  $pafiledb_template->display( 'admin' );
***************
*** 742,745 ****
  $pafiledb_cache->unload();
  include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx );
- 
  ?>
\ No newline at end of file
--- 914,916 ----

Index: admin_pa_settings.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/admin/admin_pa_settings.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** admin_pa_settings.php	2 May 2006 23:28:15 -0000	1.17
--- admin_pa_settings.php	17 Jun 2006 20:13:21 -0000	1.18
***************
*** 25,29 ****
  		include_once( $module_root_path . 'pafiledb/includes/pafiledb_constants.' . $phpEx );
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['0_Configuration_title'] = $file;
  		return;
  	}
--- 25,29 ----
  		include_once( $module_root_path . 'pafiledb/includes/pafiledb_constants.' . $phpEx );
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['0_Configuration'] = $file;
  		return;
  	}
***************
*** 52,56 ****
  
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['0_Configuration_title'] = 'modules/mx_pafiledb/admin/' . $file;
  		return;
  	}
--- 52,56 ----
  
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['0_Configuration'] = 'modules/mx_pafiledb/admin/' . $file;
  		return;
  	}
***************
*** 70,73 ****
--- 70,85 ----
  }
  
+ // **********************************************************************
+ // Read language definition
+ // **********************************************************************
+ if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
+ {
+ 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
+ }
+ else
+ {
+ 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
+ }
+ 
  $submit = ( isset( $_POST['submit'] ) ) ? true : false;
  $size = ( isset( $_POST['max_size'] ) ) ? $_POST['max_size'] : '';
***************
*** 243,246 ****
--- 255,260 ----
  $internal_comments_phpbb = ( !$new['internal_comments'] ) ? "checked=\"checked\"" : "";
  
+ $comments_forum_id = $new['comments_forum_id'];
+ 
  $del_topic_yes = ( $new['del_topic'] ) ? "checked=\"checked\"" : "";
  $del_topic_no = ( !$new['del_topic'] ) ? "checked=\"checked\"" : "";
***************
*** 316,319 ****
--- 330,334 ----
  	'L_YES' => $lang['Yes'],
  	'L_NO' => $lang['No'],
+ 	'L_NONE' => $lang['Acc_None'],
  
  	//
***************
*** 377,382 ****
  	'L_APPEARANCE_TITLE' => $lang['Appearance_title'],
  
! 	'L_PAGINATION' => $lang['Article_pag'],
! 	'L_PAGINATION_EXPLAIN' => $lang['Article_pag_explain'],
  	'PAGINATION' => $pagination,
  
--- 392,397 ----
  	'L_APPEARANCE_TITLE' => $lang['Appearance_title'],
  
! 	'L_PAGINATION' => $lang['File_pagination'],
! 	'L_PAGINATION_EXPLAIN' => $lang['File_pagination_explain'],
  	'PAGINATION' => $pagination,
  
***************
*** 420,423 ****
--- 435,442 ----
  	'L_INTERNAL_COMMENTS_PHPBB' => $lang['Internal_comments_phpBB'],
  
+ 	'L_FORUM_ID' => $lang['Forum_id'],
+ 	'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'],
+ 	'FORUM_LIST' => get_forums( $comments_forum_id, false, 'comments_forum_id' ),
+ 
  	'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'],
  	'L_AUTOGENERATE_COMMENTS_EXPLAIN' => $lang['Autogenerate_comments_explain'],
***************
*** 572,576 ****
  	'L_ATUH_VIEWALL_INFO' => $lang['Auth_viewall_explain'],
  	'S_ATUH_VIEWALL' => $auth_select['auth_viewall'],
- 
  ));
  
--- 591,594 ----
***************
*** 581,584 ****
  $template->pparse( 'admin' );
  include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx );
- 
  ?>
\ No newline at end of file
--- 599,601 ----

Index: admin_pa_catauth.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/admin/admin_pa_catauth.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** admin_pa_catauth.php	2 May 2006 23:28:15 -0000	1.15
--- admin_pa_catauth.php	17 Jun 2006 20:13:21 -0000	1.16
***************
*** 25,29 ****
  		include_once( $module_root_path . 'pafiledb/includes/pafiledb_constants.' . $phpEx );
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['3_Permissions_title'] = $file;
  		return;
  	}
--- 25,29 ----
  		include_once( $module_root_path . 'pafiledb/includes/pafiledb_constants.' . $phpEx );
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['3_Permissions'] = $file;
  		return;
  	}
***************
*** 52,56 ****
  
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['3_Permissions_title'] = 'modules/mx_pafiledb/admin/' . $file;
  		return;
  	}
--- 52,56 ----
  
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['3_Permissions'] = 'modules/mx_pafiledb/admin/' . $file;
  		return;
  	}
***************
*** 69,72 ****
--- 69,87 ----
  }
  
+ // **********************************************************************
+ // Read language definition
+ // **********************************************************************
+ if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
+ {
+ 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
+ }
+ else
+ {
+ 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
+ }
+ 
+ //
+ // Init
+ //
  $pafiledb->init();
  
***************
*** 104,109 ****
  }
  
  // Start program proper
! 
  if ( isset( $_POST['submit'] ) )
  {
--- 119,125 ----
  }
  
+ //
  // Start program proper
! //
  if ( isset( $_POST['submit'] ) )
  {
***************
*** 140,144 ****
  	$message = $lang['Category_auth_updated'] . '<br /><br />' . sprintf( $lang['Click_return_catauth'], '<a href="' . append_sid( "admin_pa_catauth.$phpEx" ) . '">', "</a>" );
  	mx_message_die( GENERAL_MESSAGE, $message );
! } // End of submit
  // Output the authorisation details if an id was
  // specified
--- 156,162 ----
  	$message = $lang['Category_auth_updated'] . '<br /><br />' . sprintf( $lang['Click_return_catauth'], '<a href="' . append_sid( "admin_pa_catauth.$phpEx" ) . '">', "</a>" );
  	mx_message_die( GENERAL_MESSAGE, $message );
! }
! 
! // End of submit
  // Output the authorisation details if an id was
  // specified
***************
*** 146,160 ****
  $pafiledb_template->set_filenames( array( 'body' => 'admin/pa_auth_cat_body.tpl' ) );
  
! $permissions_menu = array( append_sid( "admin_pa_catauth.$phpEx" ) => $lang['Cat_Permissions'],
  	append_sid( "admin_pa_ug_auth.$phpEx?mode=user" ) => $lang['User_Permissions'],
  	append_sid( "admin_pa_ug_auth.$phpEx?mode=group" ) => $lang['Group_Permissions'],
  	append_sid( "admin_pa_ug_auth.$phpEx?mode=global_user" ) => $lang['User_Global_Permissions'],
! 	append_sid( "admin_pa_ug_auth.$phpEx?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 )
! 		);
  }
  
--- 164,181 ----
  $pafiledb_template->set_filenames( array( 'body' => 'admin/pa_auth_cat_body.tpl' ) );
  
! $permissions_menu = array(
! 	append_sid( "admin_pa_catauth.$phpEx" ) => $lang['Cat_Permissions'],
  	append_sid( "admin_pa_ug_auth.$phpEx?mode=user" ) => $lang['User_Permissions'],
  	append_sid( "admin_pa_ug_auth.$phpEx?mode=group" ) => $lang['Group_Permissions'],
  	append_sid( "admin_pa_ug_auth.$phpEx?mode=global_user" ) => $lang['User_Global_Permissions'],
! 	append_sid( "admin_pa_ug_auth.$phpEx?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
! 	));
  }
  
***************
*** 166,172 ****
  	$cell_title = $field_names[$cat_auth_fields[$j]];
  
! 	$pafiledb_template->assign_block_vars( 'cat_auth_titles', array( 'CELL_TITLE' => $cell_title )
! 		);
  }
  if ( empty( $cat_id ) )
  {
--- 187,193 ----
  	$cell_title = $field_names[$cat_auth_fields[$j]];
  
! 	$pafiledb_template->assign_block_vars( 'cat_auth_titles', array( 'CELL_TITLE' => $cell_title ) );
  }
+ 
  if ( empty( $cat_id ) )
  {
***************
*** 176,183 ****
  elseif ( !empty( $cat_id ) )
  {
! 	$pafiledb_template->assign_block_vars( 'cat_row', array( 'CATEGORY_NAME' => $pafiledb->cat_rowset[$cat_id]['cat_name'],
! 			'IS_HIGHER_CAT' => ( $pafiledb->cat_rowset[$cat_id] ) ? false : true,
! 			'U_CAT' => append_sid( "admin_pa_catauth.$phpEx?cat_parent={$pafiledb->cat_rowset[$cat_id]['cat_parent']}" ) )
! 		);
  
  	for( $j = 0; $j < count( $cat_auth_fields ); $j++ )
--- 197,205 ----
  elseif ( !empty( $cat_id ) )
  {
! 	$pafiledb_template->assign_block_vars( 'cat_row', array(
! 		'CATEGORY_NAME' => $pafiledb->cat_rowset[$cat_id]['cat_name'],
! 		'IS_HIGHER_CAT' => ( $pafiledb->cat_rowset[$cat_id] ) ? false : true,
! 		'U_CAT' => append_sid( "admin_pa_catauth.$phpEx?cat_parent={$pafiledb->cat_rowset[$cat_id]['cat_parent']}" )
! 	));
  
  	for( $j = 0; $j < count( $cat_auth_fields ); $j++ )
***************
*** 192,197 ****
  		$custom_auth[$j] .= '</select>&nbsp;';
  
! 		$pafiledb_template->assign_block_vars( 'cat_row.cat_auth_data', array( 'S_AUTH_LEVELS_SELECT' => $custom_auth[$j] )
! 			);
  	}
  
--- 214,218 ----
  		$custom_auth[$j] .= '</select>&nbsp;';
  
! 		$pafiledb_template->assign_block_vars( 'cat_row.cat_auth_data', array( 'S_AUTH_LEVELS_SELECT' => $custom_auth[$j] ) );
  	}
  
***************
*** 199,216 ****
  	$cat_name = $pafiledb->cat_rowset[$cat_id]['cat_name'];
  }
  $s_column_span = count( $cat_auth_fields ) + 2;
  
! $pafiledb_template->assign_vars( array( 'CATEGORY_NAME' => $cat_name,
  
! 		'L_CATEGORY' => $lang['Category'],
! 		'L_AUTH_TITLE' => $lang['Auth_Control_Category'],
! 		'L_AUTH_EXPLAIN' => $lang['Category_auth_explain'],
! 		'L_SUBMIT' => $lang['Submit'],
! 		'L_RESET' => $lang['Reset'],
  
! 		'S_CATAUTH_ACTION' => append_sid( "admin_pa_catauth.$phpEx" ),
! 		'S_COLUMN_SPAN' => $s_column_span,
! 		'S_HIDDEN_FIELDS' => $s_hidden_fields )
! 	);
  
  // Output
--- 220,239 ----
  	$cat_name = $pafiledb->cat_rowset[$cat_id]['cat_name'];
  }
+ 
  $s_column_span = count( $cat_auth_fields ) + 2;
  
! $pafiledb_template->assign_vars( array(
! 	'CATEGORY_NAME' => $cat_name,
  
! 	'L_CATEGORY' => $lang['Category'],
! 	'L_AUTH_TITLE' => $lang['Auth_Control_Category'],
! 	'L_AUTH_EXPLAIN' => $lang['Category_auth_explain'],
! 	'L_SUBMIT' => $lang['Submit'],
! 	'L_RESET' => $lang['Reset'],
  
! 	'S_CATAUTH_ACTION' => append_sid( "admin_pa_catauth.$phpEx" ),
! 	'S_COLUMN_SPAN' => $s_column_span,
! 	'S_HIDDEN_FIELDS' => $s_hidden_fields
! ));
  
  // Output
***************
*** 220,223 ****
  $pafiledb_cache->unload();
  include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx );
- 
  ?>
\ No newline at end of file
--- 243,245 ----

Index: admin_pa_license.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/admin/admin_pa_license.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** admin_pa_license.php	2 May 2006 23:28:15 -0000	1.15
--- admin_pa_license.php	17 Jun 2006 20:13:21 -0000	1.16
***************
*** 25,29 ****
  		include_once( $module_root_path . 'pafiledb/includes/pafiledb_constants.' . $phpEx );
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['4_License_title'] = $file;
  		return;
  	}
--- 25,29 ----
  		include_once( $module_root_path . 'pafiledb/includes/pafiledb_constants.' . $phpEx );
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['4_License'] = $file;
  		return;
  	}
***************
*** 51,55 ****
  
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['4_License_title'] = 'modules/mx_pafiledb/admin/' . $file;
  		return;
  	}
--- 51,55 ----
  
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['4_License'] = 'modules/mx_pafiledb/admin/' . $file;
  		return;
  	}
***************
*** 67,70 ****
--- 67,82 ----
  }
  
+ // **********************************************************************
+ // Read language definition
+ // **********************************************************************
+ if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
+ {
+ 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
+ }
+ else
+ {
+ 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
+ }
+ 
  if ( isset( $HTTP_GET_VARS['license'] ) || isset( $HTTP_POST_VARS['license'] ) )
  {
***************
*** 75,85 ****
  		case 'add':
  			{
! 				$template->set_filenames( array(
! 						/* - orig
! 			    'admin' => 'admin/pa_admin_license_add.tpl')
! 			*/
! 						// MX
! 						'admin' => 'admin/pa_admin_license_add.tpl' )
! 					);
  
  				if ( isset( $HTTP_GET_VARS['add'] ) || isset( $HTTP_POST_VARS['add'] ) )
--- 87,91 ----
  		case 'add':
  			{
! 				$template->set_filenames( array( 'admin' => 'admin/pa_admin_license_add.tpl' ) );
  
  				if ( isset( $HTTP_GET_VARS['add'] ) || isset( $HTTP_POST_VARS['add'] ) )
***************
*** 103,107 ****
  
  					$message = $lang['Licenseadded'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_pa_license.$phpEx" ) . '">', '</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 );
  				}
--- 109,112 ----
***************
*** 109,118 ****
  				if ( empty( $add ) )
  				{
! 					$template->assign_vars( array( 'S_ADD_LIC_ACTION' => append_sid( "admin_pa_license.$phpEx" ),
! 							'L_ALICENSETITLE' => $lang['Alicensetitle'],
! 							'L_LICENSEEXPLAIN' => $lang['Licenseexplain'],
! 							'L_LNAME' => $lang['Lname'],
! 							'L_LTEXT' => $lang['Ltext'] )
! 						);
  				}
  
--- 114,124 ----
  				if ( empty( $add ) )
  				{
! 					$template->assign_vars( array(
! 						'S_ADD_LIC_ACTION' => append_sid( "admin_pa_license.$phpEx" ),
! 						'L_ALICENSETITLE' => $lang['Alicensetitle'],
! 						'L_LICENSEEXPLAIN' => $lang['Licenseexplain'],
! 						'L_LNAME' => $lang['Lname'],
! 						'L_LTEXT' => $lang['Ltext']
! 					));
  				}
  
***************
*** 122,132 ****
  		case 'edit':
  			{
! 				$template->set_filenames( array(
! 						/* - orig
! 				'admin' => 'admin/pa_admin_license_edit.tpl')
! 			*/
! 						// MX
! 						'admin' => 'admin/pa_admin_license_edit.tpl' )
! 					);
  
  				if ( isset( $HTTP_GET_VARS['edit'] ) || isset( $HTTP_POST_VARS['edit'] ) )
--- 128,132 ----
  		case 'edit':
  			{
! 				$template->set_filenames( array( 'admin' => 'admin/pa_admin_license_edit.tpl' ) );
  
  				if ( isset( $HTTP_GET_VARS['edit'] ) || isset( $HTTP_POST_VARS['edit'] ) )
***************
*** 155,159 ****
  
  					$message = $lang['Licenseedited'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . append_sid( "admin_pa_license.$phpEx" ) . '">', '</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 );
  				}
--- 155,158 ----
***************
*** 174,191 ****
  
  					$license = $db->sql_fetchrow( $result );
- 
  					$text = str_replace( "<br>", "\n", $license['license_text'] );
  
  					$template->assign_block_vars( "license_form", array() );
  
! 					$template->assign_vars( array( 'S_EDIT_LIC_ACTION' => append_sid( "admin_pa_license.$phpEx" ),
! 							'L_ELICENSETITLE' => $lang['Elicensetitle'],
! 							'L_LICENSEEXPLAIN' => $lang['Licenseexplain'],
! 							'L_LNAME' => $lang['Lname'],
! 							'LICENSE_NAME' => $license['license_name'],
! 							'TEXT' => $text,
! 							'SELECT' => $select,
! 							'L_LTEXT' => $lang['Ltext'] )
! 						);
  				}
  
--- 173,190 ----
  
  					$license = $db->sql_fetchrow( $result );
  					$text = str_replace( "<br>", "\n", $license['license_text'] );
  
  					$template->assign_block_vars( "license_form", array() );
  
! 					$template->assign_vars( array(
! 						'S_EDIT_LIC_ACTION' => append_sid( "admin_pa_license.$phpEx" ),
! 						'L_ELICENSETITLE' => $lang['Elicensetitle'],
! 						'L_LICENSEEXPLAIN' => $lang['Licenseexplain'],
! 						'L_LNAME' => $lang['Lname'],
! 						'LICENSE_NAME' => $license['license_name'],
! 						'TEXT' => $text,
! 						'SELECT' => $select,
! 						'L_LTEXT' => $lang['Ltext']
! 					));
  				}
  
***************
*** 206,214 ****
  					$template->assign_block_vars( "license", array() );
  
! 					$template->assign_vars( array( 'S_EDIT_LIC_ACTION' => append_sid( "admin_pa_license.$phpEx" ),
! 							'L_ELICENSETITLE' => $lang['Elicensetitle'],
! 							'L_LICENSEEXPLAIN' => $lang['Licenseexplain'],
! 							'ROW' => $row )
! 						);
  				}
  
--- 205,214 ----
  					$template->assign_block_vars( "license", array() );
  
! 					$template->assign_vars( array(
! 						'S_EDIT_LIC_ACTION' => append_sid( "admin_pa_license.$phpEx" ),
! 						'L_ELICENSETITLE' => $lang['Elicensetitle'],
! 						'L_LICENSEEXPLAIN' => $lang['Licenseexplain'],
! 						'ROW' => $row
! 					));
  				}
  
***************
*** 218,228 ****
  		case 'delete':
  			{
! 				$template->set_filenames( array(
! 						/* - orig
! 				'admin' => 'admin/pa_admin_license_delete.tpl')
! 			*/
! 						// MX
! 						'admin' => 'admin/pa_admin_license_delete.tpl' )
! 					);
  
  				if ( isset( $HTTP_GET_VARS['delete'] ) || isset( $HTTP_POST_VARS['delete'] ) )
--- 218,222 ----
  		case 'delete':
  			{
! 				$template->set_filenames( array( 'admin' => 'admin/pa_admin_license_delete.tpl' ) );
  
  				if ( isset( $HTTP_GET_VARS['delete'] ) || isset( $HTTP_POST_VARS['delete'] ) )
***************
*** 283,291 ****
  					}
  
! 					$template->assign_vars( array( 'S_DELETE_LIC_ACTION' => append_sid( "admin_pa_license.$phpEx" ),
! 							'L_DLICENSETITLE' => $lang['Dlicensetitle'],
! 							'L_LICENSEEXPLAIN' => $lang['Licenseexplain'],
! 							'ROW' => $row )
! 						);
  				}
  
--- 277,286 ----
  					}
  
! 					$template->assign_vars( array(
! 						'S_DELETE_LIC_ACTION' => append_sid( "admin_pa_license.$phpEx" ),
! 						'L_DLICENSETITLE' => $lang['Dlicensetitle'],
! 						'L_LICENSEEXPLAIN' => $lang['Licenseexplain'],
! 						'ROW' => $row
! 					));
  				}
  
***************
*** 297,307 ****
  {
  	// main
! 	$template->set_filenames( array(
! 			/* - orig
! 				'admin' => 'admin/pa_admin_license_delete.tpl')
! 			*/
! 			// MX
! 			'admin' => 'admin/pa_admin_license.tpl' )
! 		);
  
  	$sql = "SELECT * FROM " . PA_LICENSE_TABLE;
--- 292,296 ----
  {
  	// main
! 	$template->set_filenames( array( 'admin' => 'admin/pa_admin_license.tpl' ) );
  
  	$sql = "SELECT * FROM " . PA_LICENSE_TABLE;
***************
*** 317,328 ****
  	}
  
! 	$template->assign_vars( array( 'S_DELETE_LIC_ACTION' => append_sid( "admin_pa_license.$phpEx" ),
! 			'L_LICENSETITLE' => $lang['License_title'],
! 			'L_ALICENSETITLE' => $lang['Alicensetitle'],
! 			'L_ELICENSETITLE' => $lang['Elicensetitle'],
! 			'L_DLICENSETITLE' => $lang['Dlicensetitle'],
! 			'L_LICENSEEXPLAIN' => $lang['Licenseexplain'],
! 			'ROW' => $row )
! 		);
  }
  
--- 306,318 ----
  	}
  
! 	$template->assign_vars( array(
! 		'S_DELETE_LIC_ACTION' => append_sid( "admin_pa_license.$phpEx" ),
! 		'L_LICENSETITLE' => $lang['License_title'],
! 		'L_ALICENSETITLE' => $lang['Alicensetitle'],
! 		'L_ELICENSETITLE' => $lang['Elicensetitle'],
! 		'L_DLICENSETITLE' => $lang['Dlicensetitle'],
! 		'L_LICENSEEXPLAIN' => $lang['Licenseexplain'],
! 		'ROW' => $row
! 	));
  }
  
***************
*** 331,334 ****
  $template->pparse( 'admin' );
  include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx );
- 
  ?>
\ No newline at end of file
--- 321,323 ----

Index: admin_pa_fchecker.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/admin/admin_pa_fchecker.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** admin_pa_fchecker.php	2 May 2006 23:28:15 -0000	1.16
--- admin_pa_fchecker.php	17 Jun 2006 20:13:21 -0000	1.17
***************
*** 25,29 ****
  		include_once( $module_root_path . 'pafiledb/includes/pafiledb_constants.' . $phpEx );
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['6_Fchecker_title'] = $file;
  		return;
  	}
--- 25,29 ----
  		include_once( $module_root_path . 'pafiledb/includes/pafiledb_constants.' . $phpEx );
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['6_Fchecker'] = $file;
  		return;
  	}
***************
*** 51,55 ****
  
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['6_Fchecker_title'] = 'modules/mx_pafiledb/admin/' . $file;
  		return;
  	}
--- 51,55 ----
  
  		$file = basename( __FILE__ );
! 		$module['pafileDB_Download']['6_Fchecker'] = 'modules/mx_pafiledb/admin/' . $file;
  		return;
  	}
***************
*** 68,71 ****
--- 68,83 ----
  }
  
+ // **********************************************************************
+ // Read language definition
+ // **********************************************************************
+ if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
+ {
+ 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
+ }
+ else
+ {
+ 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
+ }
+ 
  $this_dir = $module_root_path . 'pafiledb/uploads/';
  
***************
*** 78,93 ****
  }
  
! /* - Original
! $template->set_filenames(array(
!     	'admin' => 'admin/pa_admin_file_checker.tpl')
! );
! */
! // MX Module
! $template->set_filenames( array( 'admin' => 'admin/pa_admin_file_checker.tpl' )
! 	);
  
! $template->assign_vars( array( 'L_FILE_CHECKER' => $lang['File_checker'],
! 		'L_FCHECKER_EXPLAIN' => $lang['File_checker_explain'] )
! 	);
  
  if ( $safety == 1 )
--- 90,99 ----
  }
  
! $template->set_filenames( array( 'admin' => 'admin/pa_admin_file_checker.tpl' ) );
  
! $template->assign_vars( array(
! 	'L_FILE_CHECKER' => $lang['File_checker'],
! 	'L_FCHECKER_EXPLAIN' => $lang['File_checker_explain']
! ));
  
  if ( $safety == 1 )
***************
*** 97,102 ****
  	$template->assign_block_vars( "check", array() );
  
! 	$template->assign_vars( array( 'L_FILE_CHECKER_SP1' => $lang['Checker_sp1'] )
! 		);
  
  	$sql = "SELECT * FROM " . PA_FILES_TABLE;
--- 103,107 ----
  	$template->assign_block_vars( "check", array() );
  
! 	$template->assign_vars( array( 'L_FILE_CHECKER_SP1' => $lang['Checker_sp1'] ) );
  
  	$sql = "SELECT * FROM " . PA_FILES_TABLE;
***************
*** 117,132 ****
  		if ( !is_file( $this_dir . "/" . str_replace( $html_path, "", $temp_dlurl ) ) )
  		{
! 			/*			$sql = "DELETE FROM " . PA_FILES_TABLE . " WHERE file_dlurl = '" . $temp_dlurl . "'";
! 			if ( !($db->sql_query($sql)) )
! 			{
! 				mx_message_die(GENERAL_ERROR, 'Couldnt Query info', '', __LINE__, __FILE__, $sql);
! 			}*/
! 			$template->assign_block_vars( "check.check_step1", array( 'DEL_DURL' => $temp_dlurl )
! 				);
  		}
  	}
  
! 	$template->assign_vars( array( 'L_FILE_CHECKER_SP2' => $lang['Checker_sp2'] )
! 		);
  	$sql = "SELECT * FROM " . PA_FILES_TABLE;
  
--- 122,130 ----
  		if ( !is_file( $this_dir . "/" . str_replace( $html_path, "", $temp_dlurl ) ) )
  		{
! 			$template->assign_block_vars( "check.check_step1", array( 'DEL_DURL' => $temp_dlurl ) );
  		}
  	}
  
! 	$template->assign_vars( array( 'L_FILE_CHECKER_SP2' => $lang['Checker_sp2'] ) );
  	$sql = "SELECT * FROM " . PA_FILES_TABLE;
  
***************
*** 153,163 ****
  			}*/
  
! 			$template->assign_block_vars( "check.check_step2", array( 'DEL_SSURL' => $temp_file_id )
! 				);
  		}
  	}
  
! 	$template->assign_vars( array( 'L_FILE_CHECKER_SP3' => $lang['Checker_sp3'] )
! 		);
  
  	$files = opendir( $this_dir );
--- 151,159 ----
  			}*/
  
! 			$template->assign_block_vars( "check.check_step2", array( 'DEL_SSURL' => $temp_file_id ) );
  		}
  	}
  
! 	$template->assign_vars( array( 'L_FILE_CHECKER_SP3' => $lang['Checker_sp3'] ) );
  
  	$files = opendir( $this_dir );
***************
*** 184,189 ****
  			$saved = $saved + filesize( $this_dir . $temp );
  			// unlink($this_dir.$temp);
! 			$template->assign_block_vars( "check.check_step3", array( 'DEL_FILE' => $temp )
! 				);
  		}
  	}
--- 180,184 ----
  			$saved = $saved + filesize( $this_dir . $temp );
  			// unlink($this_dir.$temp);
! 			$template->assign_block_vars( "check.check_step3", array( 'DEL_FILE' => $temp ) );
  		}
  	}
***************
*** 208,214 ****
  	}
  
! 	$template->assign_vars( array( 'L_FILE_CHECKER_SAVED' => $lang['Checker_saved'],
! 			'SAVED' => $saved )
! 		);
  }
  else
--- 203,210 ----
  	}
  
! 	$template->assign_vars( array(
! 		'L_FILE_CHECKER_SAVED' => $lang['Checker_saved'],
! 		'SAVED' => $saved
! 	));
  }
  else
***************
*** 218,225 ****
  	$lang['File_saftey'] = str_replace( "{html_path}", $html_path, $lang['File_saftey'] );
  
! 	$template->assign_vars( array( 'L_FILE_CHECKER' => $lang['File_checker'],
! 			'L_FILE_PERFORM' => $lang['File_checker_perform'],
! 			'L_FILE_SAFTEY' => $lang['File_saftey'] )
! 		);
  }
  
--- 214,222 ----
  	$lang['File_saftey'] = str_replace( "{html_path}", $html_path, $lang['File_saftey'] );
  
! 	$template->assign_vars( array(
! 		'L_FILE_CHECKER' => $lang['File_checker'],
! 		'L_FILE_PERFORM' => $lang['File_checker_perform'],
! 		'L_FILE_SAFTEY' => $lang['File_saftey']
! 	));
  }
  
***************
*** 228,231 ****
  $template->pparse( 'admin' );
  include( $mx_root_path . 'admin/page_footer_admin.' . $phpEx );
- 
  ?>
\ No newline at end of file
--- 225,227 ----

Index: mx_module_defs.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/admin/mx_module_defs.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mx_module_defs.php	2 May 2006 23:28:15 -0000	1.6
--- mx_module_defs.php	17 Jun 2006 20:13:22 -0000	1.7
***************
*** 9,12 ****
--- 9,17 ----
  */
  
+ if ( !defined( 'IN_PORTAL' ) )
+ {
+ 	die( "Hacking attempt" );
+ }
+ 
  /********************************************************************************\
  | Class: mx_module_defs
***************
*** 19,24 ****
  
  // Flow control
! define('MX_PANEL_DEBUG'					, false);
  
  class mx_module_defs
  {
--- 24,33 ----
  
  // Flow control
! define('MX_PANEL_DEBUG', false);
  
+ /**
+  * Enter description here...
+  *
+  */
  class mx_module_defs
  {
***************
*** 146,150 ****
  		// This is a PANEL - with it's own submit and reload interface
  		//
! 		$this->is_panel = true;
  
  		//
--- 155,159 ----
  		// This is a PANEL - with it's own submit and reload interface
  		//...
 
[truncated message content]