[Easymod-cvs] easymod2/mods/easymod/em_includes em_ftp.php,1.12,1.13 em_functions.php,1.21,1.22

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

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

Modified Files:
	em_ftp.php em_functions.php 
Log Message:
Fixed all known language issues (-=ET=-).

Index: em_functions.php
===================================================================
RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_functions.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** em_functions.php	5 Nov 2005 17:13:01 -0000	1.21
--- em_functions.php	6 Nov 2005 13:30:52 -0000	1.22
***************
*** 773,777 ****
  		if ( trim($buffer) == '<?php')
  		{
! 			$access_msg = 'OK' ;
  			return true ;
  		}
--- 773,777 ----
  		if ( trim($buffer) == '<?php')
  		{
! 			$access_msg = $lang['EM_ok'] ;
  			return true ;
  		}
***************
*** 803,807 ****
  		fclose( $fout) ;
  
! 		$access_msg = 'OK' ;
  		return true ;
  	}
--- 803,807 ----
  		fclose( $fout) ;
  
! 		$access_msg = $lang['EM_ok'] ;
  		return true ;
  	}
***************
*** 824,828 ****
  		fclose( $fout) ;
  
! 		$access_msg = 'OK' ;
  		return true ;
  	}
--- 824,828 ----
  		fclose( $fout) ;
  
! 		$access_msg = $lang['EM_ok'] ;
  		return true ;
  	}
***************
*** 843,847 ****
  	if ( chmod( 'EM_test.txt', 0777))
  	{
! 		$access_msg = 'OK' ;
  		return true ;
  	}
--- 843,847 ----
  	if ( chmod( 'EM_test.txt', 0777))
  	{
! 		$access_msg = $lang['EM_ok'] ;
  		return true ;
  	}
***************
*** 862,866 ****
  	if ( unlink('EM_test.txt') )
  	{
! 		$access_msg = 'OK' ;
  		return true ;
  	}
--- 862,866 ----
  	if ( unlink('EM_test.txt') )
  	{
! 		$access_msg = $lang['EM_ok'] ;
  		return true ;
  	}
***************
*** 883,887 ****
  		{
  			// we can't remove the file but it has been created so we'll assume we have mkdir access
! 			$access_msg = 'OK';
  			return true;
  		}
--- 883,887 ----
  		{
  			// we can't remove the file but it has been created so we'll assume we have mkdir access
! 			$access_msg = $lang['EM_ok'];
  			return true;
  		}
***************
*** 894,898 ****
  		rmdir( 'EM_test_dir') ;
  
! 		$access_msg = 'OK' ;
  		return true ;
  	}
--- 894,898 ----
  		rmdir( 'EM_test_dir') ;
  
! 		$access_msg = $lang['EM_ok'] ;
  		return true ;
  	}
***************
*** 924,928 ****
  			unlink($tmpfname);
  
! 			$access_msg = 'OK' ;
  			return true ;
  		}
--- 924,928 ----
  			unlink($tmpfname);
  
! 			$access_msg = $lang['EM_ok'] ;
  			return true ;
  		}
***************
*** 951,955 ****
  	if (@extension_loaded('ftp'))
  	{
! 		$access_msg = 'OK' ;
  		return true ;
  	}
--- 951,955 ----
  	if (@extension_loaded('ftp'))
  	{
! 		$access_msg = $lang['EM_ok'] ;
  		return true ;
  	}
***************
*** 970,979 ****
  	if (@ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'on')
  	{
! 		$access_msg = 'ON' ;
  		return false ;
  	}
  	else
  	{
! 		$access_msg = 'OFF' ;
  		return true ;
  	}
--- 970,979 ----
  	if (@ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'on')
  	{
! 		$access_msg = $lang['EM_on'] ;
  		return false ;
  	}
  	else
  	{
! 		$access_msg = $lang['EM_off'] ;
  		return true ;
  	}
***************
*** 992,996 ****
  		unlink( $phpbb_root_path . 'EM_test.txt') ;
  
! 		$access_msg = 'OK' ;
  		return true ;
  	}
--- 992,996 ----
  		unlink( $phpbb_root_path . 'EM_test.txt') ;
  
! 		$access_msg = $lang['EM_ok'] ;
  		return true ;
  	}

Index: em_ftp.php
===================================================================
RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_ftp.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** em_ftp.php	6 Nov 2005 11:20:10 -0000	1.12
--- em_ftp.php	6 Nov 2005 13:30:52 -0000	1.13
***************
*** 126,130 ****
  	if( $ftp_debug )
  	{
! 		$test_report[] = '<b>Current FTP working directory:</b> ' . $emftp->ftp_pwd() . '<br />';
  
  //////
--- 126,130 ----
  	if( $ftp_debug )
  	{
! 		$test_report[] = '<b>' . $lang['EM_dir_current'] . ':</b> ' . $emftp->ftp_pwd() . '<br />';
  
  //////
***************
*** 133,137 ****
  
  		$list = $emftp->ftp_nlist();
! 		$test_report[] = '<b>Dir listing:</b> (' . count($list) . ' files being listed)<br />';
  		for( $i = 0; $i < count($list); $i++ )
  		{
--- 133,137 ----
  
  		$list = $emftp->ftp_nlist();
! 		$test_report[] = sprintf($lang['EM_dir_nlist'], count($list)) . '<br />';
  		for( $i = 0; $i < count($list); $i++ )
  		{
***************
*** 283,287 ****
  			{
  				$emftp->ftp_quit();
! 				$test_report[] = 'Could not make the [admin/em_includes/cache] directory.' . '<br />';
  				return false;
  			}
--- 283,287 ----
  			{
  				$emftp->ftp_quit();
! 				$test_report[] = sprintf($lang['EM_fail_make_cache'], 'admin/em_includes/cache') . '<br />';
  				return false;
  			}
***************
*** 310,314 ****
  		{
  			$emftp->ftp_quit();
! 			$test_report[] = "Could not create the [$tmpfname] temporary file.<br />";
  			return false;
  		}
--- 310,314 ----
  		{
  			$emftp->ftp_quit();
! 			$test_report[] = sprintf($lang['EM_fail_tmp'], $tmpfname) . '<br />';
  			return false;
  		}