[Easymod-cvs] easymod2/mods/easymod/em_includes em_functions.php,1.3,1.4

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

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

Modified Files:
	em_functions.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: em_functions.php
===================================================================
RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_functions.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** em_functions.php	22 May 2005 00:29:37 -0000	1.3
--- em_functions.php	25 May 2005 01:10:41 -0000	1.4
***************
*** 806,810 ****
  
  	// assume the EM_test.txt file exists; now see if we can unlink (delete) it
! 	if ( unlink( 'EM_test.txt'))
  	{
  		$access_msg = 'OK' ;
--- 806,810 ----
  
  	// assume the EM_test.txt file exists; now see if we can unlink (delete) it
! 	if ( unlink('EM_test.txt') )
  	{
  		$access_msg = 'OK' ;
***************
*** 822,829 ****
  function check_access_mkdir( &$access_msg)
  {
! 	global $lang ;
  
  	// check for server mkdir access
! 	if ( mkdir( 'EM_test_dir', 0777))
  	{
  		// clean up!
--- 822,839 ----
  function check_access_mkdir( &$access_msg)
  {
! 	global $lang, $phpbb_root_path, $script_path, $phpEx ;
! 
! 	if ( file_exists('EM_test_dir') )
! 	{
! 		if ( !rmdir('EM_test_dir') )
! 		{
! 			// we can't remove the file but it has been created so we'll assume we have mkdir access
! 			$access_msg = 'OK';
! 			return true;
! 		}
! 	}
  
  	// check for server mkdir access
! 	if ( mkdir( 'EM_test_dir', 0777) )
  	{
  		// clean up!