[Easymod-cvs] easymod2/mods/easymod/em_includes em_ftp.php,1.10,1.11 em_functions.php,1.20,1.21

[Markus P. <mar...@us...>]

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

Modified Files:
	em_ftp.php em_functions.php 
Log Message:
Implemented the test_ftp function in the EM settings panel.

Index: em_functions.php
===================================================================
RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_functions.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** em_functions.php	5 Nov 2005 00:30:52 -0000	1.20
--- em_functions.php	5 Nov 2005 17:13:01 -0000	1.21
***************
*** 730,734 ****
  		$sP = 'b';
  	elseif($in_Perms & 0x8000) // Regular
! 		$sP = '-;';
  	elseif($in_Perms & 0xA000) // Symbolic Link
  		$sP = 'l';
--- 730,734 ----
  		$sP = 'b';
  	elseif($in_Perms & 0x8000) // Regular
! 		$sP = '-';
  	elseif($in_Perms & 0xA000) // Symbolic Link
  		$sP = 'l';

Index: em_ftp.php
===================================================================
RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_ftp.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** em_ftp.php	5 Nov 2005 12:52:51 -0000	1.10
--- em_ftp.php	5 Nov 2005 17:13:01 -0000	1.11
***************
*** 126,130 ****
  	if( $ftp_debug )
  	{
! 		$test_report[] = '<b>PWD:</b> ' . $emftp->ftp_pwd() . '<br />';
  
  //////
--- 126,130 ----
  	if( $ftp_debug )
  	{
! 		$test_report[] = '<b>Current FTP working directory:</b> ' . $emftp->ftp_pwd() . '<br />';
  
  //////
***************
*** 225,230 ****
  ///// this looks like it could be a problem with the ../../../ on ftp
  /////
! 	$local_filename  = 'easymod.gif';
! 	$remote_filename = '../../../easymod.gif';
  
  	// write to phpBB root and then, confirm we can overwrite so just do the same thing again
--- 225,232 ----
  ///// this looks like it could be a problem with the ../../../ on ftp
  /////
! //	$local_filename  = 'easymod.gif';
! //	$remote_filename = '../../../easymod.gif';
! 	$local_filename  = $phpbb_root_path . 'admin/mods/easymod/easymod.gif';
! 	$remote_filename = $phpbb_root_path . 'easymod.gif';
  
  	// write to phpBB root and then, confirm we can overwrite so just do the same thing again
***************
*** 242,250 ****
  			$test_report[] = '<br />';
  			$test_report[] = '<b>' . $lang['EM_ftp_phpbb_root'] . '</b><br />';
! 			if( $dh = opendir('../../../') )
  			{
  				while( ($file = readdir($dh)) !== false )
  				{
! 					$test_report[] = mfunGetPerms(fileperms('../../../' . $file)) . " $file <br />";
  				}
  				closedir($dh);
--- 244,252 ----
  			$test_report[] = '<br />';
  			$test_report[] = '<b>' . $lang['EM_ftp_phpbb_root'] . '</b><br />';
! 			if( $dh = opendir($phpbb_root_path) )
  			{
  				while( ($file = readdir($dh)) !== false )
  				{
! 					$test_report[] = mfunGetPerms(fileperms($phpbb_root_path . $file)) . " $file <br />";
  				}
  				closedir($dh);