[Easymod-cvs] easymod2/mods/easymod/em_includes em_functions.php,1.1,1.2 em_modio.php,1.1,1.2

[Jim W. <ter...@us...>]

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

Modified Files:
	em_functions.php em_modio.php 
Log Message:
Can now use arbitrary ports.

Index: em_functions.php
===================================================================
RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_functions.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** em_functions.php	24 Apr 2005 14:59:53 -0000	1.1
--- em_functions.php	1 May 2005 07:22:01 -0000	1.2
***************
*** 138,142 ****
  		{
  			// prep the file
! 			$edit = new mod_io( $files[$i]['filename'], $files[$i]['path'], $command_file->read_method, $command_file->write_method, $command_file->move_method, $command_file->ftp_user, $command_file->ftp_pass, $command_file->ftp_path, $command_file->ftp_host, $command_file->ftp_type, $command_file->ftp_cache) ;
  			$edit->emftp = $command_file->emftp ;
  
--- 138,142 ----
  		{
  			// prep the file
! 			$edit = new mod_io( $files[$i]['filename'], $files[$i]['path'], $command_file->read_method, $command_file->write_method, $command_file->move_method, $command_file->ftp_user, $command_file->ftp_pass, $command_file->ftp_path, $command_file->ftp_host, $command_file->ftp_port, $command_file->ftp_type, $command_file->ftp_cache) ;
  			$edit->emftp = $command_file->emftp ;
  
***************
*** 180,184 ****
  		{
  			// prep the file
! 			$edit = new mod_io( $files[$i]['filename'], $files[$i]['path'], $command_file->read_method, $command_file->write_method, $command_file->move_method, $command_file->ftp_user, $command_file->ftp_pass, $command_file->ftp_path, $command_file->ftp_host, $command_file->ftp_type, $command_file->ftp_cache) ;
  			$edit->emftp = $command_file->emftp ;
  
--- 180,184 ----
  		{
  			// prep the file
! 			$edit = new mod_io( $files[$i]['filename'], $files[$i]['path'], $command_file->read_method, $command_file->write_method, $command_file->move_method, $command_file->ftp_user, $command_file->ftp_pass, $command_file->ftp_path, $command_file->ftp_host, $command_file->ftp_port, $command_file->ftp_type, $command_file->ftp_cache) ;
  			$edit->emftp = $command_file->emftp ;
  
***************
*** 219,223 ****
  	{
  		// prep the file
! 		$edit = new mod_io( $filename, $path, $command_file->read_method, $command_file->write_method, $command_file->move_method, $command_file->ftp_user, $command_file->ftp_pass, $command_file->ftp_path, $command_file->ftp_host, $command_file->ftp_type, $command_file->ftp_cache) ;
  		$edit->emftp = $command_file->emftp ;
  
--- 219,223 ----
  	{
  		// prep the file
! 		$edit = new mod_io( $filename, $path, $command_file->read_method, $command_file->write_method, $command_file->move_method, $command_file->ftp_user, $command_file->ftp_pass, $command_file->ftp_path, $command_file->ftp_host, $command_file->ftp_port, $command_file->ftp_type, $command_file->ftp_cache) ;
  		$edit->emftp = $command_file->emftp ;
  

Index: em_modio.php
===================================================================
RCS file: /cvsroot/easymod/easymod2/mods/easymod/em_includes/em_modio.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** em_modio.php	24 Apr 2005 14:59:53 -0000	1.1
--- em_modio.php	1 May 2005 07:22:01 -0000	1.2
***************
*** 65,68 ****
--- 65,69 ----
  	var $ftp_path ;
  	var $ftp_host ;
+ 	var $ftp_port ;
  	var $ftp_type ;	// using the PHP FTP extension?
  	var $ftp_cache ;	// with ext, writing to /tmp or admin/em_includes/cache?
***************
*** 75,79 ****
  
  	// get sent the method and ftp info (install proggie)
! 	function mod_io( $filename, $path, $read_method, $write_method, $move_method, $ftp_user, $ftp_pass, $ftp_path, $ftp_host, $ftp_type, $ftp_cache)
  	{
  		$this->filename = $filename ;
--- 76,80 ----
  
  	// get sent the method and ftp info (install proggie)
! 	function mod_io( $filename, $path, $read_method, $write_method, $move_method, $ftp_user, $ftp_pass, $ftp_path, $ftp_host, $ftp_port, $ftp_type, $ftp_cache)
  	{
  		$this->filename = $filename ;
***************
*** 88,91 ****
--- 89,93 ----
  		$this->ftp_path = $ftp_path ;
  		$this->ftp_host = $ftp_host ;
+ 		$this->ftp_port = $ftp_port ;
  		$this->ftp_type = $ftp_type ;
  		$this->ftp_cache = $ftp_cache ;
***************
*** 465,469 ****
  			$this->emftp = new emftp( $this->ftp_type, $debug) ;
  
! 			if (!$this->emftp->ftp_connect( $this->ftp_host))
  			{
  				$this->err_msg = 'modio_prep[1]<br><br>' ;
--- 467,471 ----
  			$this->emftp = new emftp( $this->ftp_type, $debug) ;
  
! 			if (!$this->emftp->ftp_connect( $this->ftp_host, $this->ftp_port))
  			{
  				$this->err_msg = 'modio_prep[1]<br><br>' ;