[Easymod-cvs] easymod2/mods/easymod easymod_display_functions.php,1.7,1.8 easymod_install.php,1.10,1.11

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

Update of /cvsroot/easymod/easymod2/mods/easymod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3259/mods/easymod

Modified Files:
	easymod_display_functions.php easymod_install.php 
Log Message:
- Fixed bug #1188771
- Workaround for bug #1204617 , can't really fix this since we can't delete the directory
- Other minor updates

Index: easymod_display_functions.php
===================================================================
RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_display_functions.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** easymod_display_functions.php	18 May 2005 22:12:16 -0000	1.7
--- easymod_display_functions.php	25 May 2005 01:10:39 -0000	1.8
***************
*** 285,289 ****
  	{
  		// either copy or suggest FTP; never suggest exec b/c i don't want to explain it tp dumbasses ;-)
! 		$values['move_rec'] = (($access['root_write']) && ($access['copy_access'])) ? $lang['EM_move_copy'] : $lang['EM_move_ftp'] ;
  	}
  
--- 285,289 ----
  	{
  		// either copy or suggest FTP; never suggest exec b/c i don't want to explain it tp dumbasses ;-)
! 		$values['move_rec'] = (($access['root_write']) && ($access['copy_access']) && ($can_write)) ? $lang['EM_move_copy'] : $lang['EM_move_ftp'] ;
  	}
  

Index: easymod_install.php
===================================================================
RCS file: /cvsroot/easymod/easymod2/mods/easymod/easymod_install.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** easymod_install.php	22 May 2005 00:29:36 -0000	1.10
--- easymod_install.php	25 May 2005 01:10:39 -0000	1.11
***************
*** 375,379 ****
  else if ( $install_step == 1)
  {
! 	$install_style = (isset($HTTP_GET_VARS['setup'])) ? ($HTTP_GET_VARS['setup'] == 'advanced') ? 'advanced' : 'simple' : 'simple' ;
  	$substep = (isset($HTTP_POST_VARS['substep'])) ? htmlspecialchars( $HTTP_POST_VARS['substep']) : '' ;
  	if ($substep != 'a' && $substep != 'b' && $substep != 'c')
--- 375,379 ----
  else if ( $install_step == 1)
  {
! 	$install_style = ( ( isset($HTTP_GET_VARS['setup']) && $HTTP_GET_VARS['setup'] == 'advanced' ) || ( isset($HTTP_POST_VARS['setup']) && $HTTP_POST_VARS['setup'] == 'advanced' ) ) ? 'advanced' : 'simple';
  	$substep = (isset($HTTP_POST_VARS['substep'])) ? htmlspecialchars( $HTTP_POST_VARS['substep']) : '' ;
  	if ($substep != 'a' && $substep != 'b' && $substep != 'c')