Project

General

Profile

« Previous | Next » 

Revision 3f4a0df9

Added by Renato Botelho over 8 years ago

Remove hideplatform global config and all uses of it

View differences:

src/etc/inc/globals.inc
60 60
	"product_website" => "www.pfsense.org",
61 61
	"product_website_footer" => "https://www.pfsense.org/?gui=bootstrap",
62 62
	"product_email" => "coreteam@pfsense.org",
63
	"hideplatform" => false,
64 63
	"hidebackupbeforeupgrade" => false,
65 64
	"disablehelpmenu" => false,
66 65
	"disablehelpicon" => false,
src/etc/pfSense-rc
202 202
	/sbin/mdmfs -S -M -s 4m md $varrunpath
203 203
fi
204 204

  
205
# Use php -n here because we are not ready to load extensions yet
206
hideplatform=$(/usr/local/bin/php -n /usr/local/sbin/read_global_var hideplatform)
207
if [ "$hideplatform" = "true" ]; then
208
	platformbanner="" # hide the platform
209
else
210
	platformbanner=" on the '${PLATFORM}' platform"
211
fi
212

  
213 205
echo
214 206
cat /usr/local/share/pfSense/ascii-art/pfsense-logo-small.txt
215 207
echo
216 208
echo
217
echo "Welcome to ${product} ${version}${version_patch}${platformbanner}..."
209
echo "Welcome to ${product} ${version}${version_patch}..."
218 210
echo
219 211

  
220 212
/sbin/conscontrol mute off >/dev/null
src/etc/rc.banner
29 29
$hostname = $config['system']['hostname'];
30 30
$product = $g['product_name'];
31 31
$machine = trim(`uname -m`);
32
$hideplatform = $g['hideplatform'];
33 32

  
34
if (!$hideplatform) {
35
	if ($g['platform'] == $g['product_name']) {
36
		$platform = "full-install";
37
	} else {
38
		$platform = $g['platform'];
39
	}
40
	$platformbanner = " {$platform}";
41
}
42

  
43
print "*** Welcome to {$product} {$g['product_version_string']} ({$machine}{$platformbanner}) on {$hostname} ***\n";
33
print "*** Welcome to {$product} {$g['product_version_string']} ({$machine}) on {$hostname} ***\n";
44 34

  
45 35
$iflist = get_configured_interface_with_descr(false, true);
46 36
foreach ($iflist as $ifname => $friendly) {
src/usr/local/www/widgets/widgets/system_information.widget.php
125 125
			<?php endif; ?>
126 126
			</td>
127 127
		</tr>
128
		<?php if (!$g['hideplatform']): ?>
129
		<tr>
130
			<th><?=gettext("Platform");?></th>
131
			<td>
132
				<?=htmlspecialchars($g['platform']);?>
133
				<?php if (($g['platform'] == "nanobsd") && (file_exists("/etc/nanosize.txt"))) {
134
					echo " (" . htmlspecialchars(trim(file_get_contents("/etc/nanosize.txt"))) . ")";
135
				} ?>
136
			</td>
137
		</tr>
138
		<?php endif; ?>
139 128
		<?php if ($g['platform'] == "nanobsd"): ?>
140 129
			<?php
141 130
			global $SLICE, $OLDSLICE, $TOFLASH, $COMPLETE_PATH, $COMPLETE_BOOT_PATH;

Also available in: Unified diff