mirror of
https://github.com/lucaspalomodevelop/core.git
synced 2026-03-16 01:24:38 +00:00
inc/globals: far-reaching prune of global variables
* Remove spurious debug output that was never enabled and make actual error messages the default behaviour. * Update links and remove a bit of softcoding that was going on around the GUI through global variables (we don't want to hide the help menu, nope).
This commit is contained in:
Franco Fichtner
parent
1f5d30b8e7
commit
93d00ecd20
@ -284,8 +284,8 @@ function display_login_form()
|
||||
</div>
|
||||
|
||||
<footer class="login-foot container-fluid">
|
||||
<a target="_blank" href="<?=$g['product_website_footer']?>" class="redlnk"><?=$g['product_name']?></a> is ©
|
||||
<?=$g['product_copyright_years']?> by <a href="<?=$g['product_copyright_url']?>" class="tblnk"><?=$g['product_copyright']?></a> All Rights Reserved.
|
||||
<a target="_blank" href="<?=$g['product_website']?>" class="redlnk"><?=$g['product_name']?></a> is ©
|
||||
<?=$g['product_copyright_years']?> by <a href="<?=$g['product_copyright_url']?>" class="tblnk"><?=$g['product_copyright_owner']?></a> All Rights Reserved.
|
||||
[<a href="/license.php" class="tblnk">view license</a>]
|
||||
</footer>
|
||||
|
||||
|
||||
@ -50,13 +50,6 @@ if (file_exists("/usr/local/etc/platform")) {
|
||||
$g['platform'] = "unknown";
|
||||
}
|
||||
|
||||
/* if /debugging exists, lets set $debugging
|
||||
so we can output more information */
|
||||
if(file_exists("/debugging")) {
|
||||
$debugging = true;
|
||||
$g['debug'] = true;
|
||||
}
|
||||
|
||||
$config = parse_config();
|
||||
|
||||
if($config_parsed == true) {
|
||||
|
||||
@ -55,13 +55,6 @@ if (file_exists("/usr/local/etc/platform")) {
|
||||
$g['platform'] = "unknown";
|
||||
}
|
||||
|
||||
/* if /debugging exists, lets set $debugging
|
||||
so we can output more information */
|
||||
if(file_exists("/debugging")) {
|
||||
$debugging = true;
|
||||
$g['debug'] = true;
|
||||
}
|
||||
|
||||
if(file_exists("/var/run/booting") && file_exists("/conf/config.xml")) {
|
||||
$config_contents = file_get_contents("/conf/config.xml");
|
||||
if(stristr($config_contents, "<m0n0wall>") == true) {
|
||||
|
||||
@ -1375,16 +1375,16 @@
|
||||
* - status is returned from a DynDNS service provider.
|
||||
*/
|
||||
function _debug($data) {
|
||||
global $g;
|
||||
global $debug;
|
||||
|
||||
if (!$g['debug'])
|
||||
return;
|
||||
$string = date('m-d-y h:i:s').' - ('.$this->_debugID.') - ['.$this->_dnsService.'] - '.$data."\n";
|
||||
conf_mount_rw();
|
||||
$file = fopen($this->_debugFile, 'a');
|
||||
fwrite($file, $string);
|
||||
fclose($file);
|
||||
conf_mount_ro();
|
||||
if ($debug) {
|
||||
$string = date('m-d-y h:i:s').' - ('.$this->_debugID.') - ['.$this->_dnsService.'] - '.$data."\n";
|
||||
conf_mount_rw();
|
||||
$file = fopen($this->_debugFile, 'a');
|
||||
fwrite($file, $string);
|
||||
fclose($file);
|
||||
conf_mount_ro();
|
||||
}
|
||||
}
|
||||
function _checkIP() {
|
||||
global $debug;
|
||||
|
||||
@ -680,8 +680,6 @@ function filter_generate_gateways() {
|
||||
$int = $member['int'];
|
||||
$gatewayip = $member['gwip'];
|
||||
if (($int <> "") && is_ipaddr($gatewayip)) {
|
||||
if ($g['debug'])
|
||||
log_error(sprintf(gettext('Setting up route with %1$s on %2$s'), $gatewayip, $int));
|
||||
if ($member['weight'] > 1) {
|
||||
$routeto .= str_repeat("( {$int} {$gatewayip} ) ", $member['weight']);
|
||||
} else
|
||||
@ -2577,8 +2575,7 @@ function filter_generate_user_rule($rule)
|
||||
if(!isset($config['system']['schedule_states']))
|
||||
mwexec("/sbin/pfctl -y {$sched['schedlabel']}");
|
||||
return "# schedule finished - {$rule['descr']}";
|
||||
} else if($g['debug'])
|
||||
log_error("[TDR DEBUG] status true -- rule type '$type'");
|
||||
}
|
||||
|
||||
$aline['schedlabel'] = " schedule \"{$sched['schedlabel']}\" ";
|
||||
break;
|
||||
@ -3351,8 +3348,6 @@ function filter_get_time_based_rule_status($schedule) {
|
||||
function filter_tdr_day($schedule) {
|
||||
global $g;
|
||||
|
||||
if($g['debug'])
|
||||
log_error("[TDR DEBUG] filter_tdr_day($schedule)");
|
||||
|
||||
/*
|
||||
* Calculate day of month.
|
||||
@ -3374,8 +3369,6 @@ function filter_tdr_hour($schedule) {
|
||||
$starting_time = strtotime($tmp[0]);
|
||||
$ending_time = strtotime($tmp[1]);
|
||||
$now = strtotime("now");
|
||||
if($g['debug'])
|
||||
log_error("[TDR DEBUG] S: $starting_time E: $ending_time N: $now");
|
||||
if($now >= $starting_time and $now < $ending_time)
|
||||
return true;
|
||||
return false;
|
||||
@ -3392,8 +3385,6 @@ function filter_tdr_position($schedule) {
|
||||
* ...
|
||||
*/
|
||||
$weekday = date("w");
|
||||
if($g['debug'])
|
||||
log_error("[TDR DEBUG] filter_tdr_position($schedule) $weekday");
|
||||
if($weekday == 0)
|
||||
$weekday = 7;
|
||||
$schedule_days = explode(",", $schedule);
|
||||
@ -3412,8 +3403,6 @@ function filter_tdr_month($schedule) {
|
||||
*/
|
||||
$todays_month = date("n");
|
||||
$months = explode(",", $schedule);
|
||||
if($g['debug'])
|
||||
log_error("[TDR DEBUG] filter_tdr_month($schedule)");
|
||||
foreach($months as $month) {
|
||||
if($month == $todays_month)
|
||||
return true;
|
||||
|
||||
@ -242,8 +242,7 @@ function parse_filter_line($line) {
|
||||
$flent['advbase'] = $rule_data[$field++];
|
||||
}
|
||||
} else {
|
||||
if($g['debug'])
|
||||
log_error(sprintf(gettext("There was a error parsing rule number: %s. Please report to mailing list or forum."), $flent['rulenum']));
|
||||
log_error(sprintf(gettext("There was a error parsing rule number: %s. Please report to mailing list or forum."), $flent['rulenum']));
|
||||
return "";
|
||||
}
|
||||
|
||||
@ -251,9 +250,7 @@ function parse_filter_line($line) {
|
||||
if (!((trim($flent['src']) == "") || (trim($flent['dst']) == "") || (trim($flent['time']) == ""))) {
|
||||
return $flent;
|
||||
} else {
|
||||
if($g['debug']) {
|
||||
log_error(sprintf(gettext("There was a error parsing rule: %s. Please report to mailing list or forum."), $errline));
|
||||
}
|
||||
log_error(sprintf(gettext("There was a error parsing rule: %s. Please report to mailing list or forum."), $errline));
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
@ -43,29 +43,22 @@ $g = array(
|
||||
"varetc_path" => "/var/etc",
|
||||
"vardb_path" => "/var/db",
|
||||
"varlog_path" => "/var/log",
|
||||
"tmp_path" => "/tmp",
|
||||
"xml_rootobj" => "pfsense",
|
||||
"admin_group" => "admins",
|
||||
"product_name" => "OPNsense",
|
||||
"product_copyright" => "Deciso B.V.",
|
||||
"product_copyright_url" => "http://www.deciso.com",
|
||||
"product_copyright_years" => "2014 - ".date("Y"),
|
||||
"product_website" => "www.opnsense.org",
|
||||
"product_website_footer" => "https://www.opnsense.org/?gui22",
|
||||
"product_email" => "coreteam@opnsense.org",
|
||||
"hidedownloadbackup" => false,
|
||||
"hidebackupbeforeupgrade" => false,
|
||||
"disablehelpmenu" => false,
|
||||
"disablehelpicon" => false,
|
||||
"product_website" => "https://opnsense.org",
|
||||
"product_email" => "project@opnsense.org",
|
||||
"product_copyright_owner" => "Deciso B.V.",
|
||||
"product_copyright_years" => "2014 - 2015",
|
||||
"product_copyright_url" => "https://www.deciso.com/",
|
||||
"crashreporterurl" => "https://crash.opnsense.org/",
|
||||
"debug" => false,
|
||||
"latest_config" => "11.1",
|
||||
"nopkg_platforms" => array("cdrom"),
|
||||
"minimum_ram_warning" => "101",
|
||||
"minimum_ram_warning_text" => "128 MB",
|
||||
"wan_interface_name" => "wan",
|
||||
"nopccard_platforms" => array("wrap", "net48xx"),
|
||||
"xmlrpcbaseurl" => "https://packages.pfsense.org",
|
||||
"xmlrpcbaseurl" => "https://not.supported.opnsense.org",
|
||||
"captiveportal_path" => "/usr/local/captiveportal",
|
||||
"captiveportal_element_path" => "/var/db/cpelements",
|
||||
"captiveportal_element_sizelimit" => 1048576,
|
||||
@ -94,11 +87,8 @@ if(file_exists("/usr/local/etc/platform")) {
|
||||
$g['platform'] = trim(file_get_contents("/usr/local/etc/platform"));
|
||||
if($g['platform'] == "nanobsd") {
|
||||
$g['firmware_update_text']="OPNsense-*.img.gz";
|
||||
$g['hidedownloadbackup'] = true;
|
||||
$g['hidebackupbeforeupgrade'] = true;
|
||||
|
||||
} else {
|
||||
$g['firmware_update_text']="pfSense-*.tgz";
|
||||
$g['firmware_update_text']="OPNsense-*.tgz";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1055,8 +1055,6 @@ function interfaces_configure()
|
||||
if (file_exists("/var/run/booting"))
|
||||
printf(gettext("Configuring %s interface..."), $ifname);
|
||||
|
||||
if($g['debug'])
|
||||
log_error(sprintf(gettext("Configuring %s"), $ifname));
|
||||
interface_configure($if, $reload);
|
||||
if (file_exists("/var/run/booting"))
|
||||
echo gettext( "done.") . "\n";
|
||||
@ -1081,8 +1079,6 @@ function interfaces_configure()
|
||||
foreach ($track6_list as $if => $ifname) {
|
||||
if (file_exists("/var/run/booting"))
|
||||
printf(gettext("Configuring %s interface..."), $ifname);
|
||||
if ($g['debug'])
|
||||
log_error(sprintf(gettext("Configuring %s"), $ifname));
|
||||
|
||||
interface_configure($if, $reload);
|
||||
|
||||
@ -1102,8 +1098,6 @@ function interfaces_configure()
|
||||
foreach ($delayed_list as $if => $ifname) {
|
||||
if (file_exists("/var/run/booting"))
|
||||
printf(gettext("Configuring %s interface..."), $ifname);
|
||||
if ($g['debug'])
|
||||
log_error(sprintf(gettext("Configuring %s"), $ifname));
|
||||
|
||||
interface_configure($if, $reload);
|
||||
|
||||
@ -1117,8 +1111,6 @@ function interfaces_configure()
|
||||
foreach ($bridge_list as $if => $ifname) {
|
||||
if (file_exists("/var/run/booting"))
|
||||
printf(gettext("Configuring %s interface..."), $ifname);
|
||||
if($g['debug'])
|
||||
log_error(sprintf(gettext("Configuring %s"), $ifname));
|
||||
|
||||
interface_configure($if, $reload);
|
||||
|
||||
@ -1185,9 +1177,6 @@ function interface_bring_down($interface = "wan", $destroy = false, $ifacecfg =
|
||||
if (!isset($config['interfaces'][$interface]))
|
||||
return;
|
||||
|
||||
if ($g['debug'])
|
||||
log_error("Calling interface down for interface {$interface}, destroy is " . (($destroy) ? 'true' : 'false'));
|
||||
|
||||
/*
|
||||
* NOTE: The $realifv6 is needed when WANv4 is type PPP and v6 is DHCP and the option v6 from v4 is used.
|
||||
* In this case the real $realif of v4 is different from that of v6 for operation.
|
||||
@ -2948,8 +2937,6 @@ function interface_configure($interface = "wan", $reloadall = false, $linkupeven
|
||||
interface_virtual_create($interface_to_check);
|
||||
|
||||
/* Disable Accepting router advertisements unless specifically requested */
|
||||
if ($g['debug'])
|
||||
log_error("Deny router advertisements for interface {$interface}");
|
||||
mwexec("/sbin/ifconfig " . escapeshellarg($realif) . " inet6 -accept_rtadv");
|
||||
|
||||
/* wireless configuration? */
|
||||
@ -3210,13 +3197,9 @@ function interface_track6_configure($interface = "lan", $wancfg, $linkupevent =
|
||||
|
||||
switch($trackcfg['ipaddrv6']) {
|
||||
case "6to4":
|
||||
if ($g['debug'])
|
||||
log_error("Interface {$interface} configured via {$wancfg['track6-interface']} type {$type}");
|
||||
interface_track6_6to4_configure($interface, $wancfg);
|
||||
break;
|
||||
case "6rd":
|
||||
if ($g['debug'])
|
||||
log_error("Interface {$interface} configured via {$wancfg['track6-interface']} type {$type}");
|
||||
interface_track6_6rd_configure($interface, $wancfg);
|
||||
break;
|
||||
case "dhcp6":
|
||||
@ -3423,8 +3406,6 @@ function interface_6rd_configure($interface = "wan", $wancfg) {
|
||||
mwexec("/sbin/ifconfig {$stfiface} stfv4br " . escapeshellarg($wancfg['gateway-6rd']));
|
||||
if ($wancfg['prefix-6rd-v4plen'] > 0 && $wancfg['prefix-6rd-v4plen'] < 32)
|
||||
mwexec("/sbin/ifconfig {$stfiface} stfv4net {$ip4address}/{$wancfg['prefix-6rd-v4plen']}");
|
||||
if ($g['debug'])
|
||||
log_error("Created 6rd interface {$stfiface} {$rd6prefix}/{$rd6prefixlen}");
|
||||
|
||||
/* write out a default router file */
|
||||
file_put_contents("/tmp/{$wanif}_routerv6", "{$rd6brgw}\n");
|
||||
@ -3521,9 +3502,6 @@ function interface_6to4_configure($interface = "wan", $wancfg){
|
||||
pfSense_interface_flags($stfiface, IFF_LINK2);
|
||||
mwexec("/sbin/ifconfig {$stfiface} inet6 {$stflanpr} prefixlen 16");
|
||||
|
||||
if ($g['debug'])
|
||||
log_error("Set IPv6 address inet6 {$stflanpr} prefixlen 16 for {$stfiface}, route {$stfbrgw}");
|
||||
|
||||
/* write out a default router file */
|
||||
file_put_contents("/tmp/{$wanif}_routerv6", "{$stfbrgw}");
|
||||
file_put_contents("/tmp/{$wanif}_defaultgwv6", "{$stfbrgw}");
|
||||
@ -3582,8 +3560,6 @@ function interface_dhcpv6_configure($interface = "wan", $wancfg) {
|
||||
$iflist = link_interface_to_track6($interface);
|
||||
foreach ($iflist as $friendly => $ifcfg) {
|
||||
if (is_numeric($ifcfg['track6-prefix-id'])) {
|
||||
if ($g['debug'])
|
||||
log_error("setting up $ifdescr - {$ifcfg['track6-prefix-id']}");
|
||||
$realif = get_real_interface($friendly);
|
||||
$dhcp6cconf .= " prefix-interface {$realif} {\n";
|
||||
$dhcp6cconf .= " sla-id {$ifcfg['track6-prefix-id']};\n";
|
||||
|
||||
@ -739,19 +739,11 @@ function strncpy(&$dst, $src, $length) {
|
||||
function reload_interfaces_sync() {
|
||||
global $config, $g;
|
||||
|
||||
if($g['debug'])
|
||||
log_error(gettext("reload_interfaces_sync() is starting."));
|
||||
|
||||
/* parse config.xml again */
|
||||
$config = parse_config(true);
|
||||
|
||||
/* enable routing */
|
||||
system_routing_enable();
|
||||
if($g['debug'])
|
||||
log_error(gettext("Enabling system routing"));
|
||||
|
||||
if($g['debug'])
|
||||
log_error(gettext("Cleaning up Interfaces"));
|
||||
|
||||
/* set up interfaces */
|
||||
interfaces_configure();
|
||||
@ -1473,9 +1465,7 @@ function compare_hostname_to_dnscache($hostname) {
|
||||
}
|
||||
|
||||
if(trim($oldcontents) != trim($contents)) {
|
||||
if($g['debug']) {
|
||||
log_error(sprintf(gettext('DNSCACHE: Found old IP %1$s and new IP %2$s'), $oldcontents, $contents));
|
||||
}
|
||||
log_error(sprintf(gettext('DNSCACHE: Found old IP %1$s and new IP %2$s'), $oldcontents, $contents));
|
||||
return ($oldcontents);
|
||||
} else {
|
||||
return false;
|
||||
|
||||
@ -217,9 +217,6 @@ function services_radvd_configure($blacklist = array())
|
||||
|
||||
$autotype = $config['interfaces'][$trackif]['ipaddrv6'];
|
||||
|
||||
if ($g['debug'])
|
||||
log_error("configuring RA on {$if} for type {$autotype} radvd subnet {$subnetv6}/{$ifcfgsnv6}");
|
||||
|
||||
$radvdconf .= "# Generated config for {$autotype} delegation from {$trackif} on {$if}\n";
|
||||
$radvdconf .= "interface {$realif} {\n";
|
||||
$radvdconf .= "\tAdvSendAdvert on;\n";
|
||||
|
||||
@ -1053,10 +1053,6 @@ function log_error($error)
|
||||
}
|
||||
|
||||
syslog(LOG_ERR, "$page: $error");
|
||||
|
||||
if ($g['debug']) {
|
||||
syslog(LOG_WARNING, var_dump(debug_backtrace()));
|
||||
}
|
||||
}
|
||||
|
||||
/****f* util/exec_command
|
||||
@ -1079,10 +1075,6 @@ function exec_command($command) {
|
||||
function mwexec($command, $mute = false, $clearsigmask = false) {
|
||||
global $g;
|
||||
|
||||
if ($g['debug']) {
|
||||
if (!$_SERVER['REMOTE_ADDR'])
|
||||
echo "mwexec(): $command\n";
|
||||
}
|
||||
$oarr = array();
|
||||
$retval = 0;
|
||||
|
||||
@ -1108,11 +1100,6 @@ function mwexec($command, $mute = false, $clearsigmask = false) {
|
||||
function mwexec_bg($command, $clearsigmask = false) {
|
||||
global $g;
|
||||
|
||||
if ($g['debug']) {
|
||||
if (!$_SERVER['REMOTE_ADDR'])
|
||||
echo "mwexec(): $command\n";
|
||||
}
|
||||
|
||||
if ($clearsigmask) {
|
||||
$oldset = array();
|
||||
pcntl_sigprocmask(SIG_SETMASK, array(), $oldset);
|
||||
|
||||
@ -223,11 +223,9 @@ setup_microcode();
|
||||
echo "done.\n";
|
||||
|
||||
/* set up interfaces */
|
||||
if(!$debugging)
|
||||
mute_kernel_msgs();
|
||||
mute_kernel_msgs();
|
||||
interfaces_configure();
|
||||
if(!$debugging)
|
||||
unmute_kernel_msgs();
|
||||
unmute_kernel_msgs();
|
||||
|
||||
/* re-make hosts file after configuring interfaces */
|
||||
system_hosts_generate();
|
||||
|
||||
@ -297,24 +297,15 @@ if (isset($config['system']['developer'])) {
|
||||
}
|
||||
$diagnostics_menu = msort(array_merge($diagnostics_menu, return_ext_menu("Diagnostics")),0);
|
||||
|
||||
//$gold_menu = array();
|
||||
//$gold_menu[] = array(gettext("pfSense Gold"), "https://www.pfsense.org/gold");
|
||||
//$gold_menu = msort(array_merge($gold_menu, return_ext_menu("Gold")),0);
|
||||
|
||||
if(! $g['disablehelpmenu']) {
|
||||
$help_menu = array();
|
||||
$help_menu[] = array(gettext("About this Page"), $helpurl);
|
||||
if($g['product_name'] == "pfSense")
|
||||
$help_menu[] = array(gettext("Bug Database"), "https://github.com/opnsense/core/issues");
|
||||
$help_menu[] = array(gettext("User Forum"), "http://forum.opnsense.org/");
|
||||
$help_menu[] = array(gettext("Documentation"), "http://wiki.opnsense.org/");
|
||||
$help_menu[] = array(gettext("Developers Wiki"), "http://wiki.opnsense.org/index.php/developers");
|
||||
$help_menu[] = array(gettext("Paid Support"), "http://opnsense.org/support-overview/commercial-support/");
|
||||
//$help_menu[] = array(gettext("pfSense Book"), "https://www.pfsense.org/j.php?jumpto=book");
|
||||
//$help_menu[] = array(gettext("Search portal"), "https://www.pfsense.org/j.php?jumpto=searchportal");
|
||||
$help_menu[] = array(gettext("FreeBSD Handbook"), "https://www.pfsense.org/j.php?jumpto=fbsdhandbook");
|
||||
$help_menu = msort(array_merge($help_menu, return_ext_menu("Help")),0);
|
||||
}
|
||||
$help_menu = array();
|
||||
$help_menu[] = array(gettext("About this Page"), $helpurl);
|
||||
$help_menu[] = array(gettext("Bug Database"), "https://github.com/opnsense/core/issues");
|
||||
$help_menu[] = array(gettext("User Forum"), "https://forum.opnsense.org/");
|
||||
$help_menu[] = array(gettext("Documentation"), "https://wiki.opnsense.org/");
|
||||
$help_menu[] = array(gettext("Developers Wiki"), "https://wiki.opnsense.org/index.php/Develop:Info");
|
||||
$help_menu[] = array(gettext("Paid Support"), "https://opnsense.org/support-overview/commercial-support/");
|
||||
$help_menu[] = array(gettext("FreeBSD Handbook"), "https://www.freebsd.org/doc/handbook/");
|
||||
$help_menu = msort(array_merge($help_menu, return_ext_menu("Help")),0);
|
||||
|
||||
function add_to_menu($url, $name) {
|
||||
if (isAllowedPage($url))
|
||||
@ -377,13 +368,8 @@ if(is_subsystem_dirty('packagelock')) {
|
||||
echo '<li>'.get_shortcut_status_link($shortcut_section, false).'</li>';
|
||||
echo '<li>'.get_shortcut_log_link($shortcut_section, false).'</li>';
|
||||
|
||||
?>
|
||||
|
||||
|
||||
|
||||
<?php if(! $g['disablehelpicon']): ?>
|
||||
?>
|
||||
<li><a href="<?php echo $helpurl; ?>" target="_blank" title="<?php echo gettext("Help for items on this page"); ?>">Help</a></li>
|
||||
<?php endif; ?>
|
||||
<li class="active"><a href="/index.php?logout">Logout</a></li>
|
||||
</ul>
|
||||
|
||||
@ -465,7 +451,6 @@ if(is_subsystem_dirty('packagelock')) {
|
||||
?>
|
||||
</div>
|
||||
|
||||
<?php if(! $g['disablehelpmenu']): ?>
|
||||
<?php $active = active_main_menu("/help"); ?>
|
||||
<a href="#help" class="list-group-item <?php if ($active):?>active-menu-title<? endif; ?>" data-toggle="collapse" data-parent="#mainmenu"><span class="glyphicon glyphicon-question-sign __iconspacer"></span><?php echo gettext("Help"); ?></a>
|
||||
|
||||
@ -474,7 +459,6 @@ if(is_subsystem_dirty('packagelock')) {
|
||||
output_menu($help_menu, "_blank");
|
||||
?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
|
||||
</nav>
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
|
||||
<footer class="page-foot col-sm-push-2">
|
||||
<div class="container-fluid">
|
||||
<a target="_blank" href="<?=$g['product_website_footer']?>" class="redlnk"><?=$g['product_name']?></a> is ©
|
||||
<?=$g['product_copyright_years']?> by <a href="<?=$g['product_copyright_url']?>" class="tblnk"><?=$g['product_copyright']?></a> All Rights Reserved.
|
||||
<a target="_blank" href="<?=$g['product_website']?>" class="redlnk"><?=$g['product_name']?></a> is ©
|
||||
<?=$g['product_copyright_years']?> by <a href="<?=$g['product_copyright_url']?>" class="tblnk"><?=$g['product_copyright_owner']?></a> All Rights Reserved.
|
||||
[<a href="/license.php" class="tblnk">view license</a>]
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
Copyright (C) 2014-2015 Deciso B.V.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
@ -23,7 +25,8 @@
|
||||
POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
require("guiconfig.inc");
|
||||
require_once("guiconfig.inc");
|
||||
|
||||
include("head.inc");
|
||||
|
||||
$pgtitle = gettext("License");
|
||||
@ -62,7 +65,7 @@ $pgtitle = gettext("License");
|
||||
OPNsense is a fork of <a href="http://www.pfsense.org" target="_blank">pfSense®</a> <small>(Copyright © 2004-2014 Electric Sheep Fencing, LLC. All rights reserved.)</small> a fork from <a href="http://m0n0.ch/wall" target="_blank">m0n0wall®</a> <small>(Copyright © 2002-2013 Manuel Kasper)</small>.<br />
|
||||
<br />
|
||||
OPNsense includes various freely availbale software packages and ports.<br />
|
||||
The current ports are listed <a href="https://github.com/opnsense/tools/blob/master/config/current/ports" target="_blank">here</a>.<br />
|
||||
The current ports are listed <a href="https://github.com/opnsense/tools/blob/master/config/current/ports.conf" target="_blank">here</a>.<br />
|
||||
<br />
|
||||
The authors of OPNsense would like to thank all contributors for their efforts.<br />
|
||||
</p>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
Copyright (C) 2014 Deciso B.V.
|
||||
Copyright (C) 2014-2015 Deciso B.V.
|
||||
Copyright (C) 2008 Scott Ullrich <sullrich@gmail.com>
|
||||
Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
|
||||
All rights reserved.
|
||||
@ -262,10 +262,8 @@ include("head.inc");
|
||||
<strong><?=gettext("Firmware image file ($type):");?> </strong>
|
||||
<input name="ulfile" type="file" class="formfld" />
|
||||
<br />
|
||||
<?php if ($g['hidebackupbeforeupgrade'] === false): ?>
|
||||
<input type="checkbox" name='backupbeforeupgrade' id='backupbeforeupgrade' /> <?=gettext("Perform full backup prior to upgrade");?>
|
||||
<br />
|
||||
<?php endif; ?>
|
||||
<input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Upgrade firmware");?>" />
|
||||
<?=gettext('Click "Upgrade firmware" to start the upgrade process.');?>
|
||||
<?php endif; else: ?>
|
||||
|
||||
@ -1,37 +1,37 @@
|
||||
<?php
|
||||
/*
|
||||
Copyright (C) 2014 Deciso B.V.
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
/*
|
||||
Copyright (C) 2014-2015 Deciso B.V.
|
||||
All rights reserved.
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimer.
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
2. Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
1. Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimer.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
||||
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
|
||||
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGE.
|
||||
2. Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
|
||||
*/
|
||||
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
||||
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
|
||||
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
$active_tab = isset($active_tab) ? $active_tab : $_SERVER['PHP_SELF'];
|
||||
$tab_array = array();
|
||||
// $tab_array[] = array(gettext("Manual Update"), $active_tab == "/system_firmware.php", "system_firmware.php");
|
||||
$tab_array[] = array(gettext("Auto Update"), $active_tab == "/system_firmware_check.php", "system_firmware_check.php");
|
||||
$tab_array[] = array(gettext("Updater Settings"), $active_tab == "/system_firmware_settings.php", "system_firmware_settings.php");
|
||||
//if($g['hidedownloadbackup'] == false)
|
||||
// $tab_array[] = array(gettext("Restore Full Backup"), $active_tab == "/system_firmware_restorefullbackup.php", "system_firmware_restorefullbackup.php");
|
||||
display_top_tabs($tab_array);
|
||||
?>
|
||||
*/
|
||||
|
||||
$active_tab = isset($active_tab) ? $active_tab : $_SERVER['PHP_SELF'];
|
||||
$tab_array = array();
|
||||
//$tab_array[] = array(gettext("Manual Update"), $active_tab == "/system_firmware.php", "system_firmware.php");
|
||||
$tab_array[] = array(gettext("Auto Update"), $active_tab == "/system_firmware_check.php", "system_firmware_check.php");
|
||||
$tab_array[] = array(gettext("Updater Settings"), $active_tab == "/system_firmware_settings.php", "system_firmware_settings.php");
|
||||
//$tab_array[] = array(gettext("Restore Full Backup"), $active_tab == "/system_firmware_restorefullbackup.php", "system_firmware_restorefullbackup.php");
|
||||
|
||||
display_top_tabs($tab_array);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user