TFTP package interface changes, fix /etc/inetd.conf so that tftp is enabled properly.

4 files changed, 18 insertions, 36 deletions

diff --git a/packages/tftp/tftp.inc b/packages/tftp/tftp.inc
index deed9c48..de6b90db 100644
--- a/packages/tftp/tftp.inc
+++ b/packages/tftp/tftp.inc
@@ -118,7 +118,7 @@ function php_install_command()
 		fclose($handle);
 		
 		$handle = fopen($filename,"w");
-		$contents = str_replace("\#tftp    dgram   udp     wait    root    /usr/libexec/tftpd", "tftp    dgram   udp     wait    root    /usr/libexec/tftpd", $contents);
+		$contents = str_replace("#tftp	dgram	udp	wait	root	/usr/libexec/tftpd", "tftp	dgram	udp	wait	root	/usr/libexec/tftpd", $contents);
 		fwrite($handle, $contents);		
 		unset($contents); 	
 		fclose($handle);
@@ -140,8 +140,8 @@ function php_install_command()
   	
 	write_rcfile(array(
 		"file" => "tftp.sh",
-		"start" => "/usr/sbin/./inetd",
-		"stop" => "killall -9 /usr/sbin/inetd"
+		"start" => "/usr/sbin/inetd",
+		"stop" => "killall -9 inetd"
 		)
 	);
 	
@@ -170,13 +170,13 @@ function php_deinstall_command()
 		fclose($handle);
 		
 		$handle = fopen($filename,"w");
-		$contents = str_replace("tftp    dgram   udp     wait    root    /usr/libexec/tftpd", "\#tftp    dgram   udp     wait    root    /usr/libexec/tftpd", $contents);
+		$contents = str_replace("tftp	dgram	udp	wait	root	/usr/libexec/tftpd", "#tftp	dgram	udp	wait	root	/usr/libexec/tftpd", $contents);
 		fwrite($handle, $contents);		
 		unset($contents); 	
 		fclose($fout);
 		unset($filename);
 		
-	exec("killall -9 /usr/sbin/inetd");
+	exec("killall -9 inetd");
 	
 	unlink_if_exists("/usr/local/pkg/tftp.xml");
 	unlink_if_exists("/usr/local/pkg/tftp.inc");
diff --git a/packages/tftp/tftp.xml b/packages/tftp/tftp.xml
index 812789e6..8ede05ce 100644
--- a/packages/tftp/tftp.xml
+++ b/packages/tftp/tftp.xml
@@ -41,7 +41,7 @@
     <requirements>Describe your package requirements here</requirements>
     <faq>Currently there are no FAQ items provided.</faq>
 	<name>tftp Settings</name>
-	<version>0.7</version>
+	<version>0.7.1</version>
 	<title>TFTP: Settings</title>
 	<include_file>/usr/local/pkg/tftp.inc</include_file>
 	<menu>
diff --git a/packages/tftp/tftp_files.tmp b/packages/tftp/tftp_files.tmp
index d79d39a2..78f59442 100644
--- a/packages/tftp/tftp_files.tmp
+++ b/packages/tftp/tftp_files.tmp
@@ -109,9 +109,11 @@ include("head.inc");
 	<form action="tftp_files.php" method="POST" enctype="multipart/form-data" name="frmUpload" onSubmit="">
 	  <table>
 	
+		<!--
 		<tr>
 		  <td colspan="2" valign="top" class="vnsepcell">Upload</td>
-		</tr>    
+		</tr>
+		-->    
 	    <tr>
 	      <td align="right">File to upload:</td>
 	      <td valign="top" class="label">
@@ -126,22 +128,16 @@ include("head.inc");
 	  </table>
 	</div>
 	</form>
-	
+
+    <br />
+    <br />
 	
 	<form action="tftp_files.php" method="post" name="iform" id="iform">
         
     <table width="100%" border="0" cellpadding="0" cellspacing="0">
     <tr>
       <td width="25%" class="listhdrr">Name</td>
-      <td width="50%" class="listhdr">&nbsp;</td>
-      <td width="10%" class="list">
-        <table border="0" cellspacing="0" cellpadding="1">
-          <tr>
-            <td width="17"></td>
-            <td valign="middle"><a href="tftp_files_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
-          </tr>
-        </table>
-      </td>
+      <!--<td width="50%" class="listhdr">&nbsp;</td>-->
 		</tr>
 		
     <?php		
@@ -152,12 +148,12 @@ include("head.inc");
                 echo "<tr>\n";
                 echo "  <td class=\"listlr\" ondblclick=\"\">\n";
                 echo "	  <a href=\"tftp_files.php?a=download&filename=".$file."\">\n";
-                echo "    $file";
+                echo "    	$file";
                 echo "	  </a>";
                 echo "  </td>\n";
-                echo "  <td class=\"listlr\" ondblclick=\"\">\n";
-                echo "    ";
-                echo "  </td>\n";                
+                //echo "  <td class=\"listlr\" ondblclick=\"\">\n";
+                //echo "    ";
+                //echo "  </td>\n";                
                 echo "  <td valign=\"middle\" nowrap class=\"list\">\n";
                 echo "    <table border=\"0\" cellspacing=\"0\" cellpadding=\"1\">\n";
                 echo "      <tr>\n";
@@ -174,20 +170,6 @@ include("head.inc");
     }
     ?>
 
-    <tr>
-      <td class="list" colspan="2"></td>
-      <td class="list">
-        <table border="0" cellspacing="0" cellpadding="1">
-          <tr>
-            <td width="17"></td>
-            <td valign="middle">
-              <a href="tftp_files_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a>
-            </td>
-          </tr>
-        </table>
-		  </td>
-     </tr>
-
      <tr>
        <td class="list" colspan="3"></td>
        <td class="list"></td>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index 4067f984..acebfff7 100644
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -80,7 +80,7 @@
       <pkginfolink></pkginfolink>
       <config_file>http://www.pfsense.com/packages/config/tftp/tftp.xml</config_file>
       <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url>
-      <version>0.7</version>
+      <version>0.7.1</version>
       <status>Alpha</status>
       <required_version>1.2.1</required_version>
       <maintainer>markjcrane@gmail.com</maintainer>