From 221e8bfa5d007ad8e25e4a01c42c5ea496bd35df Mon Sep 17 00:00:00 2001
From: Mark Crane <mcrane@pfsense.org>
Date: Fri, 23 Jan 2009 01:28:11 +0000
Subject: phpservice package improvements

---
 packages/phpservice/phpservice.inc          | 18 +++++++++---------
 packages/phpservice/phpservice_php_edit.tmp |  7 ++++---
 2 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'packages/phpservice')

diff --git a/packages/phpservice/phpservice.inc b/packages/phpservice/phpservice.inc
index 9acb7037..da6ada59 100644
--- a/packages/phpservice/phpservice.inc
+++ b/packages/phpservice/phpservice.inc
@@ -118,15 +118,15 @@ function phpservice_sync_package_php()
 		$tmp .= "  }\n";
 		$tmp .= "\n";
 		$tmp .= "\n";
-
-		$tmp .= "//------------------------------------------\n";
+		$tmp .= "\n";
 		      
 		foreach($config['installedpackages']['phpservice']['config'] as $rowhelper) {
-				      
-		      $tmp .= base64_decode($rowhelper['php']);
-		      $tmp .= "\n";
-		      $tmp .= "//------------------------------------------\n";
-		                
+
+			$tmp .= "// name: ".$rowhelper['name']." \n";
+			$tmp .= "// description: ".$rowhelper['description']." \n\n";				      
+			$tmp .= base64_decode($rowhelper['php']);
+			$tmp .= "\n";
+
 		}
       		
 		$tmp .= "\n";
@@ -150,7 +150,7 @@ function phpservice_sync_package_php()
 }
 
 
-function phpservice_sync_package() 
+function php_sync_package() 
 {
   
 	global $config;   
@@ -193,7 +193,7 @@ function php_install_command()
 		)
 	);
 		  	       
-	phpservice_sync_package();
+	php_sync_package();
 	//$handle = popen("/usr/local/etc/rc.d/phpservice.sh start", "r");
 	//pclose($handle);
 	
diff --git a/packages/phpservice/phpservice_php_edit.tmp b/packages/phpservice/phpservice_php_edit.tmp
index a077a3ba..fcc163bd 100644
--- a/packages/phpservice/phpservice_php_edit.tmp
+++ b/packages/phpservice/phpservice_php_edit.tmp
@@ -69,7 +69,7 @@ if ($_POST) {
 		}
 		
 		write_config();
-		sync_package_phpservice();
+		php_sync_package();
 		
 		header("Location: phpservice_php.php");
 		exit;
@@ -110,7 +110,7 @@ function show_advanced_config() {
    <tr>
      <td class="tabcont" >
 
-
+	<!--
   	<table width="100%" border="0" cellpadding="6" cellspacing="0">              
       <tr>
         <td><p><span class="vexpl"><span class="red"><strong>PHP<br>
@@ -118,6 +118,7 @@ function show_advanced_config() {
             </p></td>
       </tr>
     </table>
+    -->
     <br />
     
         <form action="phpservice_php_edit.php" method="post" name="iform" id="iform">
@@ -134,7 +135,7 @@ function show_advanced_config() {
               <td width="22%" valign="top" class="vncell">PHP</td>
               <td width="78%" class="vtable">
               <?php
-                echo "<textarea name=\"php\" id=\"php\" cols=\"30\" rows=\"4\" wrap=\"off\"></textarea>\n";
+                echo "<textarea name=\"php\" id=\"php\" cols=\"70\" rows=\"7\" wrap=\"off\">".htmlspecialchars($pconfig['php'])."</textarea>\n";
               ?>
                 <!--
                 <br>
-- 
cgit v1.2.3