summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-09-30 14:33:29 -0300
committerRenato Botelho <renato@netgate.com>2015-09-30 14:33:37 -0300
commit2344bed478676b498a014dcec618db37e3422fd1 (patch)
treef278a4652a311ce1935d40e626ec4310b45737b6 /src/usr/local/www
parentc580e34c6fe24107817d6a72956e77b23f043beb (diff)
downloadpfsense-2344bed478676b498a014dcec618db37e3422fd1.zip
pfsense-2344bed478676b498a014dcec618db37e3422fd1.tar.gz
Use product_name global variable in more places
Diffstat (limited to 'src/usr/local/www')
-rw-r--r--src/usr/local/www/diag_logs_settings.php4
-rwxr-xr-xsrc/usr/local/www/head.inc6
-rw-r--r--src/usr/local/www/index.php2
-rw-r--r--src/usr/local/www/system_advanced_admin.php2
-rw-r--r--src/usr/local/www/system_advanced_misc.php2
-rw-r--r--src/usr/local/www/system_firmware_settings.php4
6 files changed, 10 insertions, 10 deletions
diff --git a/src/usr/local/www/diag_logs_settings.php b/src/usr/local/www/diag_logs_settings.php
index 255c98f..271d6a0 100644
--- a/src/usr/local/www/diag_logs_settings.php
+++ b/src/usr/local/www/diag_logs_settings.php
@@ -331,7 +331,7 @@ $section->addInput(new Form_Select(
$section->addInput(new Form_Checkbox(
'disablelocallogging',
'Local Logging',
- $g['platform'] == 'pfSense' ? "Disable writing log files to the local disk" : "Disable writing log files to the local RAM disk",
+ $g['platform'] == $g['product_name'] ? "Disable writing log files to the local disk" : "Disable writing log files to the local RAM disk",
$pconfig['disablelocallogging']
));
@@ -548,4 +548,4 @@ events.push(function(){
</script>
<?php
-include("foot.inc"); \ No newline at end of file
+include("foot.inc");
diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc
index 54a05a4..2621cc0 100755
--- a/src/usr/local/www/head.inc
+++ b/src/usr/local/www/head.inc
@@ -182,7 +182,7 @@ $system_menu[] = array(gettext("Advanced"), "/system_advanced_admin.php");
$system_menu[] = array(gettext("Firmware"), "/system_firmware.php");
$system_menu[] = array(gettext("General Setup"), "/system.php");
$system_menu[] = array(gettext("High Avail. Sync"), "/system_hasync.php");
-if ($g['platform'] == "pfSense" or $g['platform'] == "nanobsd") {
+if ($g['platform'] == $g['product_name'] or $g['platform'] == "nanobsd") {
$system_menu[] = array(gettext("Packages"), "/pkg_mgr_installed.php");
}
$system_menu[] = array(gettext("Setup Wizard"), "/wizard.php?xml=setup_wizard.xml");
@@ -275,7 +275,7 @@ $status_menu[] = array(gettext("Load Balancer"), "/status_lb_pool.php");
$status_menu[] = array(gettext("NTP"), "/status_ntpd.php");
$status_menu[] = array(gettext("OpenVPN"), "/status_openvpn.php");
-if ($g['platform'] == "pfSense") {
+if ($g['platform'] == $g['product_name']) {
$status_menu[] = array(gettext("Package Logs"), "/diag_pkglogs.php");
}
@@ -558,4 +558,4 @@ if (are_notices_pending()):?>
}
</script>
-<?php endif; \ No newline at end of file
+<?php endif;
diff --git a/src/usr/local/www/index.php b/src/usr/local/www/index.php
index 1810284..8b80259 100644
--- a/src/usr/local/www/index.php
+++ b/src/usr/local/www/index.php
@@ -151,7 +151,7 @@ if (file_exists("/usr/sbin/swapinfo")) {
## If packages are installed lets resync
if (file_exists('/conf/needs_package_sync')) {
if ($config['installedpackages'] <> '' && is_array($config['installedpackages']['package'])) {
- if ($g['platform'] == "pfSense" || $g['platform'] == "nanobsd") {
+ if ($g['platform'] == $g['product_name'] || $g['platform'] == "nanobsd") {
## If the user has logged into webGUI quickly while the system is booting then do not redirect them to
## the package reinstall page. That is about to be done by the boot script anyway.
## The code in head.inc will put up a notice to the user.
diff --git a/src/usr/local/www/system_advanced_admin.php b/src/usr/local/www/system_advanced_admin.php
index edc6334..e98ad4f 100644
--- a/src/usr/local/www/system_advanced_admin.php
+++ b/src/usr/local/www/system_advanced_admin.php
@@ -474,7 +474,7 @@ $section->addInput(new Form_Input(
))->setHelp('Note: Leave this blank for the default of 22.');
-if (!$g['enableserial_force'] && ($g['platform'] == "pfSense" || $g['platform'] == "cdrom"))
+if (!$g['enableserial_force'] && ($g['platform'] == $g['product_name'] || $g['platform'] == "cdrom"))
{
$form->add($section);
$section = new Form_Section('Serial Communications');
diff --git a/src/usr/local/www/system_advanced_misc.php b/src/usr/local/www/system_advanced_misc.php
index 08c235a..dbf5f7a 100644
--- a/src/usr/local/www/system_advanced_misc.php
+++ b/src/usr/local/www/system_advanced_misc.php
@@ -536,7 +536,7 @@ $section->addInput(new Form_Checkbox(
'use_mfs_tmpvar',
'Use RAM Disks',
'Use memory file system for /tmp and /var',
- ($pconfig['use_mfs_tmpvar'] || $g['platform'] != "pfSense")
+ ($pconfig['use_mfs_tmpvar'] || $g['platform'] != $g['product_name'])
))->setHelp('Set this if you wish to use /tmp and /var as RAM disks (memory file '.
'system disks) on a full install rather than use the hard disk. Setting this will '.
'cause the data in /tmp and /var to be lost at reboot, including log data. RRD '.
diff --git a/src/usr/local/www/system_firmware_settings.php b/src/usr/local/www/system_firmware_settings.php
index aaf9089..e9f576c 100644
--- a/src/usr/local/www/system_firmware_settings.php
+++ b/src/usr/local/www/system_firmware_settings.php
@@ -183,7 +183,7 @@ $section->addInput(new Form_Checkbox(
$form->add($section);
-if(file_exists("/usr/local/bin/git") && $g['platform'] == "pfSense") {
+if(file_exists("/usr/local/bin/git") && $g['platform'] == $g['product_name']) {
$section = new Form_Section('GitSync');
$section->addInput(new Form_Checkbox(
@@ -257,4 +257,4 @@ update_firmwareurl();
</script>
<?php
-include("foot.inc"); \ No newline at end of file
+include("foot.inc");
OpenPOWER on IntegriCloud