From fbcf00372e5ecdddfeae80b1fe2862182aabe125 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Mon, 7 Nov 2005 01:20:04 +0000
Subject: [PATCH] * Clean up interface, make consistent * Add php execute
 command

---
 usr/local/www/exec.php | 58 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 55 insertions(+), 3 deletions(-)

diff --git a/usr/local/www/exec.php b/usr/local/www/exec.php
index 9556a6e019..145d07d5f2 100755
--- a/usr/local/www/exec.php
+++ b/usr/local/www/exec.php
@@ -201,10 +201,23 @@ if (!isBlank($_POST['txtCommand'])) {
    puts("</pre>");
 }
 
+
+if (!isBlank($_POST['txtPHPCommand'])) {
+   puts("<pre>");
+   require_once("config.inc");
+   require_once("functions.inc");
+   echo eval($_POST['txtPHPCommand']);
+   puts("</pre>");
+}
+
+
 ?>
 
 <form action="exec.php" method="POST" enctype="multipart/form-data" name="frmExecPlus" onSubmit="return frmExecPlus_onSubmit( this );">
   <table>
+	<tr>
+	  <td colspan="2" valign="top" class="vnsepcell">Execute Shell command</td>
+	</tr>  
     <tr>
       <td class="label" align="right">Command:</td>
       <td class="type"><input id="txtCommand" name="txtCommand" type="text" size="80" value="<?=htmlspecialchars($_POST['txtCommand']);?>"></td>
@@ -223,19 +236,58 @@ if (!isBlank($_POST['txtCommand'])) {
       <td height="8"></td>
       <td></td>
     </tr>
+	<tr>
+	  <td colspan="2" valign="top" height="16"></td>
+	</tr>
+	<tr>
+	  <td colspan="2" valign="top" class="vnsepcell">Download</td>
+	</tr>    
     <tr>
-      <td align="right">Download:</td>
+      <td align="right">File to download:</td>
       <td>
         <input name="dlPath" type="text" id="dlPath" size="50">
+	</td></tr>
+    <tr>
+      <td valign="top">&nbsp;&nbsp;&nbsp;</td>
+      <td valign="top" class="label">	
         <input name="submit" type="submit"  class="button" id="download" value="Download">
         </td>
     </tr>
+	<tr>
+	  <td colspan="2" valign="top" height="16"></td>
+	</tr>
+	<tr>
+	  <td colspan="2" valign="top" class="vnsepcell">Upload</td>
+	</tr>    
     <tr>
-      <td align="right">Upload:</td>
+      <td align="right">File to upload:</td>
       <td valign="top" class="label">
-<input name="ulfile" type="file" class="button" id="ulfile">
+	<input name="ulfile" type="file" class="button" id="ulfile">
+	</td></tr>
+    <tr>
+      <td valign="top">&nbsp;&nbsp;&nbsp;</td>
+      <td valign="top" class="label">	
         <input name="submit" type="submit"  class="button" id="upload" value="Upload"></td>
     </tr>
+	<tr>
+	  <td colspan="2" valign="top" height="16"></td>
+	</tr>
+	<tr>
+	  <td colspan="2" valign="top" class="vnsepcell">PHP Execute</td>
+	</tr>
+	<tr>
+		<td class="label" align="right">Command:</td>
+		<td class="type"><textarea id="txtPHPCommand" name="txtPHPCommand" type="text" rows="3" cols="50" value="<?=htmlspecialchars($_POST['txtPHPCommand']);?>"></textarea></td>
+	</tr>
+    <tr>
+      <td valign="top">&nbsp;&nbsp;&nbsp;</td>
+      <td valign="top" class="label">
+         <input type="submit" class="button" value="Execute">
+	 <p>
+	 <b>Example:</b>   interfaces_carp_bring_up_final();
+      </td>
+    </tr>
+    
   </table>
 <?php include("fend.inc"); ?>
 </form>