summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2004-12-16 23:30:42 +0000
committerScott Ullrich <sullrich@pfsense.org>2004-12-16 23:30:42 +0000
commitb0cd4dedaacb1d3a165b87684996b862c614e970 (patch)
tree53c1a45f2c3e83001fa9da47dae879b6f2cc08df /usr
parent54587e4ee3b48398f540f957cbe0cd7fd7170dc4 (diff)
downloadpfsense-b0cd4dedaacb1d3a165b87684996b862c614e970.zip
pfsense-b0cd4dedaacb1d3a165b87684996b862c614e970.tar.gz
Use correct service name.
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/pkg_mgr.php2
-rwxr-xr-xusr/local/www/pkg_mgr_install.php8
2 files changed, 5 insertions, 5 deletions
diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php
index 8516c0e..2a9a42f 100755
--- a/usr/local/www/pkg_mgr.php
+++ b/usr/local/www/pkg_mgr.php
@@ -122,7 +122,7 @@ if(!$pkg_config['packages']) {
?>
<tr valign="top">
<td class="listlr">
- <?= $pkg['fancyname'] ?>
+ <?= $pkg['name'] ?>
</td>
<td class="listlr">
<?= $pkg['category'] ?>
diff --git a/usr/local/www/pkg_mgr_install.php b/usr/local/www/pkg_mgr_install.php
index 7bb7d3f..9147f65 100755
--- a/usr/local/www/pkg_mgr_install.php
+++ b/usr/local/www/pkg_mgr_install.php
@@ -248,7 +248,7 @@ if($pkg_config['packages']['package'][$id]['logging']) {
$pkgent['logging']['logfile_name'] = $pkg_config['packages']['package'][$id]['logging']['logfile_name'];
mwexec("/usr/sbin/clog -i -s 32768 /var/log/" . $pkgent['logging']['logfile_name']);
mwexec("chmod 0600 /var/log/" . $pkgent['logging']['logfile_name']);
- add_text_to_file("/etc/syslog.conf",$pkgent['logging']['facility'] . "\t\t\t" . $pkgent['logging']['logfile_name']);
+ add_text_to_file("/etc/syslog.conf", $pkgent['logging']['facilityname'] . "\t\t\t" . $pkgent['logging']['logfilename']);
mwexec("/usr/bin/killall -HUP syslogd");
}
$a_out = &$config['packages']['package']; // save item to installedpkgs
@@ -337,7 +337,7 @@ if(file_exists("/usr/local/pkg/" . $pkgent['name'] . ".xml")) {
}
// install menu item into the ext folder
fwrite($fd_log, "Adding menu option to " . $package_conf['menu']['section'] . "/" . $package_conf['menu']['name'] . "\n");
- $fd = fopen("/usr/local/www/ext/" . $package_conf['menu']['section'] . "/" . $package_conf['name'] , "w");
+ $fd = fopen("/usr/local/www/ext/" . $package_conf['menu']['section'] . "/" . $package_conf['menu']['name'] , "w");
fwrite($fd, "/usr/local/www/pkg.php?xml=" . $package_conf['menu']['name'] . "\n");
fclose($fd);
} else {
@@ -396,8 +396,8 @@ function add_text_to_file($file, $text) {
global $fd_log;
fwrite($fd_log, "Adding needed text items:\n");
$filecontents = exec_command_and_return_text("cat " . $file);
- $textTMP = str_replace($text, "", $filecontents);
- $text .= $textTMP . $text;
+ $filecontents = str_replace($text, "", $filecontents);
+ $text = $filecontents . $text;
fwrite($fd_log, $text . "\n");
$fd = fopen($file, "w");
fwrite($fd, $text . "\n");
OpenPOWER on IntegriCloud