diff options
| author | Mark Crane <mcrane@pfsense.org> | 2009-01-23 01:28:11 +0000 |
|---|---|---|
| committer | Mark Crane <mcrane@pfsense.org> | 2009-01-23 01:28:11 +0000 |
| commit | 221e8bfa5d007ad8e25e4a01c42c5ea496bd35df (patch) | |
| tree | 8f74c713bfa1bdc3bbbe260c45023332c5fb8b48 | |
| parent | 07213c013d998d5d98f6fe37a8f0004a7a3c6717 (diff) | |
| download | pfsense-packages-221e8bfa5d007ad8e25e4a01c42c5ea496bd35df.tar.gz pfsense-packages-221e8bfa5d007ad8e25e4a01c42c5ea496bd35df.tar.bz2 pfsense-packages-221e8bfa5d007ad8e25e4a01c42c5ea496bd35df.zip | |
phpservice package improvements
| -rw-r--r-- | packages/phpservice/phpservice.inc | 18 | ||||
| -rw-r--r-- | packages/phpservice/phpservice_php_edit.tmp | 7 | ||||
| -rw-r--r-- | pkg_config.7.xml | 2 |
3 files changed, 14 insertions, 13 deletions
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> diff --git a/pkg_config.7.xml b/pkg_config.7.xml index ad4ff644..5f1176c2 100644 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -94,7 +94,7 @@ <pkginfolink></pkginfolink> <config_file>http://www.pfsense.com/packages/config/phpservice/phpservice.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url> - <version>0.2.5</version> + <version>0.2.6</version> <status>Alpha</status> <required_version>1.2.1</required_version> <maintainer>markjcrane@gmail.com</maintainer> |