summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr/local/www')
-rw-r--r--src/usr/local/www/diag_confbak.php2
-rw-r--r--src/usr/local/www/jquery/pfSense.js4
-rw-r--r--src/usr/local/www/pkg_edit.php10
-rw-r--r--src/usr/local/www/pkg_mgr.php2
-rw-r--r--src/usr/local/www/pkg_mgr_install.php12
-rw-r--r--src/usr/local/www/pkg_mgr_installed.php2
6 files changed, 14 insertions, 18 deletions
diff --git a/src/usr/local/www/diag_confbak.php b/src/usr/local/www/diag_confbak.php
index c74f28f..fb947a5 100644
--- a/src/usr/local/www/diag_confbak.php
+++ b/src/usr/local/www/diag_confbak.php
@@ -225,7 +225,7 @@ if (is_array($confvers)):
<td><?=gettext("Current configuration")?></td>
</tr>
<?php
- // And now for hte table of prior backups
+ // And now for the table of prior backups
$c = 0;
foreach ($confvers as $version):
if ($version['time'] != 0) {
diff --git a/src/usr/local/www/jquery/pfSense.js b/src/usr/local/www/jquery/pfSense.js
index a82e6b1..1e74d63 100644
--- a/src/usr/local/www/jquery/pfSense.js
+++ b/src/usr/local/www/jquery/pfSense.js
@@ -93,7 +93,7 @@ $(function() {
});
})();
- // Automatically change IpAddress mask selectors to 128/32 options for IPv6/IPvd addresses
+ // Automatically change IpAddress mask selectors to 128/32 options for IPv6/IPv4 addresses
$('span.pfIpMask + select').each(function (idx, select){
var input = $(select).prevAll('input[type=text]');
@@ -156,7 +156,7 @@ $(function() {
// The need to NOT hide the advanced options if the elements therein are not set to the system
// default values makes it better to handle advanced option hiding in each PHP file so this is being
- // disabled for now changing hte class name it acts on to "auto-advanced"
+ // disabled for now by changing the class name it acts on to "auto-advanced"
// Hide advanced inputs by default
if ($('.auto-advanced').length > 0)
diff --git a/src/usr/local/www/pkg_edit.php b/src/usr/local/www/pkg_edit.php
index 1773d9a..ea04094 100644
--- a/src/usr/local/www/pkg_edit.php
+++ b/src/usr/local/www/pkg_edit.php
@@ -616,7 +616,7 @@ $form->addGlobal(new Form_Input(
));
/* If a package's XML has <advanced_options/> configured, then setup
- * ta section for the fields that have <advancedfield/> set.
+ * the section for the fields that have <advancedfield/> set.
* These fields will be placed below other fields in a separate area titled 'Advanced Features'.
* These advanced fields are not normally configured and generally left to default to 'default settings'.
*/
@@ -629,7 +629,7 @@ if ($pkg['advanced_options'] == "enabled") {
$js_array = array();
-// Now loop through all of hte fields defined in the XML
+// Now loop through all of the fields defined in the XML
foreach ($pkg['fields']['field'] as $pkga) {
if ($pkga['type'] == "sorting") {
@@ -719,7 +719,7 @@ foreach ($pkg['fields']['field'] as $pkga) {
break;
case "password":
- // Creat a password element
+ // Create a password element
if($grouping) {
$group->add(new Form_Input(
$pkga['fieldname'],
@@ -748,7 +748,7 @@ foreach ($pkg['fields']['field'] as $pkga) {
break;
case "info":
- // If the info containe a table we should detect and Bootstrap it
+ // If the info contains a table we should detect and Bootstrap it
if (strpos($pkga['description'], '<table') !== FALSE)
$info = bootstrapTable($pkga['description']);
@@ -971,7 +971,7 @@ foreach ($pkg['fields']['field'] as $pkga) {
break;
- // Creat textarea element
+ // Create a textarea element
case "textarea":
if ($pkga['rows']) {
$rows = " rows='{$pkga['rows']}' ";
diff --git a/src/usr/local/www/pkg_mgr.php b/src/usr/local/www/pkg_mgr.php
index 0c9b43a..159f632 100644
--- a/src/usr/local/www/pkg_mgr.php
+++ b/src/usr/local/www/pkg_mgr.php
@@ -167,7 +167,7 @@ if(!$pkg_info || !is_array($pkg_info)):?>
<a id="btnclear" type="button" title="<?=gettext("Clear")?>" class="btn btn-default btn-sm"><?=gettext("Clear")?></a>
</div>
<div class="col-sm-10 col-sm-offset-2">
- <span class="help-block">Enter a search string or *nix regular expression to seach package names and descriptions.</span>
+ <span class="help-block">Enter a search string or *nix regular expression to search package names and descriptions.</span>
</div>
</div>
</div>
diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php
index 214defd..69b90f4 100644
--- a/src/usr/local/www/pkg_mgr_install.php
+++ b/src/usr/local/www/pkg_mgr_install.php
@@ -394,34 +394,30 @@ if ($_GET) {
switch ($_POST['mode']) {
case 'delete':
- mwexec('/usr/local/sbin/pfSense-upgrade -l /tmp/webgui-log.txt -p /tmp/webgui-log.sock -r ' . $pkgid, false, false, true);
+ mwexec_bg('/usr/local/sbin/pfSense-upgrade -l /tmp/webgui-log.txt -p /tmp/webgui-log.sock -r ' . $pkgid);
$start_polling = true;
break;
case 'reinstallall':
if (is_array($config['installedpackages']) && is_array($config['installedpackages']['package'])) {
$progbar = false; // We don't show the progress bar for reinstallall. It would be far too confusing
- mwexec('/usr/local/sbin/pfSense-upgrade -l /tmp/webgui-log.txt -p /tmp/webgui-log.sock -i ' . "ALL_PACKAGES" . ' -f', false, false, true);
+ mwexec_bg('/usr/local/sbin/pfSense-upgrade -l /tmp/webgui-log.txt -p /tmp/webgui-log.sock -i ALL_PACKAGES -f');
$start_polling = true;
}
break;
case 'reinstallpkg':
- mwexec('/usr/local/sbin/pfSense-upgrade -l /tmp/webgui-log.txt -p /tmp/webgui-log.sock -i ' . $pkgid . ' -f', false, false, true);
+ mwexec_bg('/usr/local/sbin/pfSense-upgrade -l /tmp/webgui-log.txt -p /tmp/webgui-log.sock -i ' . $pkgid . ' -f');
$start_polling = true;
break;
case 'installed':
default:
- mwexec('/usr/local/sbin/pfSense-upgrade -l /tmp/webgui-log.txt -p /tmp/webgui-log.sock -i ' . $pkgid, false, false, true);
+ mwexec_bg('/usr/local/sbin/pfSense-upgrade -l /tmp/webgui-log.txt -p /tmp/webgui-log.sock -i ' . $pkgid);
$start_polling = true;
break;
}
- // Delete all temporary package tarballs and staging areas.
- unlink_if_exists("/tmp/apkg_*");
- rmdir_recursive("/var/tmp/instmp*");
-
// close log
if ($fd_log) {
fclose($fd_log);
diff --git a/src/usr/local/www/pkg_mgr_installed.php b/src/usr/local/www/pkg_mgr_installed.php
index 8d61cba..775d2b7 100644
--- a/src/usr/local/www/pkg_mgr_installed.php
+++ b/src/usr/local/www/pkg_mgr_installed.php
@@ -219,7 +219,7 @@ if(empty($installed_packages)):?>
<i class="icon-large icon-info-sign"></i> = Information, &nbsp;
<i class="icon-large icon-retweet"></i> = Reinstall.
<br />
- <font color="blue"><?=gettext("Blue")?></font> = <?=gettext("Newer version available")?>
+ <font color="blue"><?=gettext("Blue package name")?></font> = <?=gettext("Newer version available")?>
</span>
</div>
OpenPOWER on IntegriCloud