[Easymod-cvs] easymod/install/em_files/admin em_general.php,1.1,1.2

[Eric F. <wg...@us...>]

Update of /cvsroot/easymod/easymod/install/em_files/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17083/admin

Modified Files:
	em_general.php 
Log Message:
Added the help popup to the ACP settings page

Index: em_general.php
===================================================================
RCS file: /cvsroot/easymod/easymod/install/em_files/admin/em_general.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** em_general.php	4 Dec 2005 03:12:30 -0000	1.1
--- em_general.php	7 Dec 2005 00:31:20 -0000	1.2
***************
*** 1,8 ****
  <?php
! /** 
  *
  * @package EasyMOD
  * @version $Id$
! * @copyright (c) 2005 phpBB Group 
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License
  *
--- 1,8 ----
  <?php
! /**
  *
  * @package EasyMOD
  * @version $Id$
! * @copyright (c) 2005 phpBB Group
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License
  *
***************
*** 18,21 ****
--- 18,50 ----
  include($phpbb_root_path . 'includes/em/em_common.'.$phpEx);
  
+ $help = request_var('help', '');
+ if ( !empty($help) )
+ {
+ 	$template->set_filenames(array(
+ 		'body' => 'admin/em_help_popup.tpl')
+ 	);
+ 
+ 	$template->assign_vars(array(
+ 		'L_TITLE'			=> $lang['EM_Help'],
+ 		'L_CLOSE_WINDOW'	=> $lang['Close_window'])
+ 	);
+ 
+ 	$i = 0;
+ 	foreach($lang['EM_Help_topics'] as $name => $values)
+ 	{
+ 		$row_class = ( $i % 2 ) ? 'row1' : 'row2';
+ 		$template->assign_block_vars('help_row', array(
+ 			'ROW_CLASS'	=> $row_class,
+ 			'NAME'		=> $name,
+ 			'TITLE'		=> $values['title'],
+ 			'DESC'		=> nl2br($values['desc']))
+ 		);
+ 
+ 		$i++;
+ 	}
+ 
+ 	$template->pparse('body');
+ 	exit;
+ }
  
  //
***************
*** 69,73 ****
  		message_die(GENERAL_MESSAGE, $message);
  	}
! 	
  	$sql = "UPDATE " . CONFIG_TABLE . " SET
  		config_value = '" . md5($pass) . "'
--- 98,102 ----
  		message_die(GENERAL_MESSAGE, $message);
  	}
! 
  	$sql = "UPDATE " . CONFIG_TABLE . " SET
  		config_value = '" . md5($pass) . "'
***************
*** 101,106 ****
  // Template Vars
  $template->assign_vars(array(
! 	'S_PASSWORD_ACTION' => append_sid(basename(__FILE__) . '?update=pass'),
! 	'S_SETTINGS_ACTION' => append_sid(basename(__FILE__) . '?update=settings'),
  
  	'L_GENERAL' => $lang['EM_General'],
--- 130,137 ----
  // Template Vars
  $template->assign_vars(array(
! 	'U_HELP_POPUP'	=> append_sid($phpbb_root_path . 'admin/em_general.'.$phpEx.'?help=1', true),
! 
! 	'S_PASSWORD_ACTION' => append_sid($phpbb_root_path . 'admin/em_general.'.$phpEx.'?update=pass'),
! 	'S_SETTINGS_ACTION' => append_sid($phpbb_root_path . 'admin/em_general.'.$phpEx.'?update=settings'),
  
  	'L_GENERAL' => $lang['EM_General'],
***************
*** 112,117 ****
  	'L_METHOD' => $lang['EM_method'],
  	'L_TEMP_PATH' => $lang['EM_temp_path'],
- 	'L_FILE_PERM' => $lang['EM_file_perm'],
- 	'L_DIR_PERM' => $lang['EM_dir_perm'],
  	'L_FTP_SETTINGS' => $lang['EM_ftp_conn'],
  	'L_FTP_USER' => $lang['EM_ftp_user'],
--- 143,146 ----
***************
*** 124,135 ****
  	'L_SUBMIT' => $lang['Submit'],
  	'L_RESET' => $lang['Reset'],
! 	
  	'L_MOD_DIR' => $lang['EM_Mod_dir'],
  	'L_MOD_DIR_EXPLAIN' => $lang['EM_Mod_dir_explain'],
! 	
  	'EM_METHODS' => $allowed_methods,
  	'EM_TEMP_PATH' => $board_config['em_tmp_path'],
- 	'EM_FILE_PERM' => $board_config['em_file_perms'],
- 	'EM_DIR_PERM' => $board_config['em_dir_perms'],
  	'EM_MOD_DIR' => $board_config['em_mod_dir'],
  	'EM_FTP_USER' => $board_config['em_ftp_user'],
--- 153,162 ----
  	'L_SUBMIT' => $lang['Submit'],
  	'L_RESET' => $lang['Reset'],
! 
  	'L_MOD_DIR' => $lang['EM_Mod_dir'],
  	'L_MOD_DIR_EXPLAIN' => $lang['EM_Mod_dir_explain'],
! 
  	'EM_METHODS' => $allowed_methods,
  	'EM_TEMP_PATH' => $board_config['em_tmp_path'],
  	'EM_MOD_DIR' => $board_config['em_mod_dir'],
  	'EM_FTP_USER' => $board_config['em_ftp_user'],