Skip to content

O
OpnSense
Commit cb336a65 authored by Ad Schellevis's avatar Ad Schellevis
Browse files
Options

(dashboard) further cleanup... the same, but different

parent 4021045e
Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 358 deletions
src/www/fbegin.inc
View file @ cb336a65
...@@ -194,7 +194,7 @@ if($need_alert_display == true) { ...@@ -194,7 +194,7 @@ if($need_alert_display == true) {
<a href="<?=$button['href'];?>" class="btn btn-primary"><span class="glyphicon glyphicon-plus-sign __iconspacer"></span><?=$button['label'];?></a> <a href="<?=$button['href'];?>" class="btn btn-primary"><span class="glyphicon glyphicon-plus-sign __iconspacer"></span><?=$button['label'];?></a>
<?php endforeach; endif; ?> <?php endforeach; endif; ?>
<?php if (isset($widgetfiles)): ?> <?php if (isset($widgetCollection)): ?>
<a href="#" id="updatepref" style="display:none" onclick="return updatePref();" class="btn btn-primary"><?=gettext("Save Settings");?></a> <a href="#" id="updatepref" style="display:none" onclick="return updatePref();" class="btn btn-primary"><?=gettext("Save Settings");?></a>
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#modal_widgets"><span class="glyphicon glyphicon-plus-sign __iconspacer"></span><?= gettext('Add widget') ?></button> <button type="button" class="btn btn-default" data-toggle="modal" data-target="#modal_widgets"><span class="glyphicon glyphicon-plus-sign __iconspacer"></span><?= gettext('Add widget') ?></button>
<?php endif; ?> <?php endif; ?>
......
src/www/foot.inc
View file @ cb336a65
...@@ -11,51 +11,44 @@ ...@@ -11,51 +11,44 @@
</main> </main>
<?php <?php
if (isset($widgetfiles)): if (isset($widgetCollection)):
$widgetfiles_add = $widgetfiles; // sort by name
sort($widgetfiles_add); usort($widgetCollection, function ($item1, $item2) {
return strcmp(strtolower($item1['name']), strtolower($item2['name']));
});
?> ?>
<div class="modal fade" id="modal_widgets" tabindex="-1" role="dialog" aria-labelledby="modal_widgets_label" aria-hidden="true"> <div class="modal fade" id="modal_widgets" tabindex="-1" role="dialog" aria-labelledby="modal_widgets_label" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button> <button type="button" class="close" data-dismiss="modal">
<span aria-hidden="true">&times;</span>
<span class="sr-only"><?=gettext("Close");?></span>
</button>
<h4 class="modal-title" id="modal_widgets_label"><?=gettext("Available Widgets"); ?></h4> <h4 class="modal-title" id="modal_widgets_label"><?=gettext("Available Widgets"); ?></h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<table class="table table-striped table-hover"> <table class="table table-striped table-hover">
<?php <?php
foreach($widgetfiles_add as $widget): foreach($widgetCollection as $widgetItem):
if(!stristr($widget, "widget.php")) $widgettitle = $widgetItem['name'] . "_title";
continue; $widgettitlelink = $widgetItem['name'] . "_title_link";
if (isset($$widgettitle)):?>
$periodpos = strpos($widget, ".");
$widgetname = substr($widget, 0, $periodpos);
$nicename = $widgetname;
$nicename = str_replace("_", " ", $nicename);
//make the title look nice
$nicename = ucwords($nicename);
$widgettitle = $widgetname . "_title";
$widgettitlelink = $widgetname . "_title_link";
if (isset($$widgettitle)):?>
<tr> <tr>
<td style="cursor: pointer;" onclick='return addWidget("<?=$widgetname; ?>")'><?=$$widgettitle; ?></td> <td style="cursor: pointer;" onclick='return addWidget("<?=$widgetItem['name']; ?>")'><?=$$widgettitle; ?></td>
</tr> </tr>
<?php <?php
elseif ($nicename != ""): ?> elseif (!empty($widgetItem['display_name'])): ?>
<tr> <tr>
<td style="cursor: pointer;" onclick='return addWidget("<?=$widgetname; ?>")'><?=$nicename; ?></td> <td style="cursor: pointer;" onclick='return addWidget("<?=$widgetItem['name']; ?>")'><?=$widgetItem['display_name']; ?></td>
</tr> </tr>
<?php <?php
endif; endif;
endforeach; ?> endforeach; ?>
</table> </table>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button> <button type="button" class="btn btn-default" data-dismiss="modal"><?=gettext("Close");?></button>
</div> </div>
</div><!-- /modal-content --> </div><!-- /modal-content -->
</div><!-- /modal-dialog --> </div><!-- /modal-dialog -->
......
src/www/index.php
View file @ cb336a65
...@@ -35,240 +35,79 @@ ini_set('output_buffering', 'true'); ...@@ -35,240 +35,79 @@ ini_set('output_buffering', 'true');
ob_start(null, "1000"); ob_start(null, "1000");
## Load Essential Includes // Load Essential Includes
require_once('guiconfig.inc'); require_once('guiconfig.inc');
// closing should be $_POST, but the whole notice handling needs more attention. Leave it as is for now.
if (isset($_REQUEST['closenotice'])) { if (isset($_REQUEST['closenotice'])) {
close_notice($_REQUEST['closenotice']); close_notice($_REQUEST['closenotice']);
echo get_menu_messages(); echo get_menu_messages();
exit; exit;
} }
##build list of widgets
$directory = "/usr/local/www/widgets/widgets/";
$dirhandle = opendir($directory);
$filename = "";
$widgetnames = array();
$widgetfiles = array();
$widgetlist = array();
while (false !== ($filename = readdir($dirhandle))) {
$periodpos = strpos($filename, ".");
/* Ignore files not ending in .php */
if (substr($filename, -4, 4) != ".php") {
continue;
}
$widgetname = substr($filename, 0, $periodpos);
$widgetnames[] = $widgetname;
if ($widgetname != "system_information") {
$widgetfiles[] = $filename;
}
}
##sort widgets alphabetically
sort($widgetfiles);
##insert the system information widget as first, so as to be displayed first
array_unshift($widgetfiles, "system_information.widget.php");
##if no config entry found, initialize config entry ##if no config entry found, initialize config entry
if (empty($config['widgets']) || !is_array($config['widgets'])) { if (empty($config['widgets']) || !is_array($config['widgets'])) {
$config['widgets'] = array(); $config['widgets'] = array();
} }
if ($_POST && $_POST['sequence']) { if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$config['widgets']['sequence'] = $_POST['sequence']; $pconfig = $config['widgets'];
if (empty($pconfig['sequence'])) {
foreach ($widgetnames as $widget) { // set default dashboard view
if ($_POST[$widget . '-config']) { $pconfig['sequence'] = 'system_information-container:col1:show,interface_list-container:col1:show,traffic_graphs-container:col1:show';
$config['widgets'][$widget . '-config'] = $_POST[$widget . '-config'];
}
}
write_config(gettext("Widget configuration has been changed."));
header("Location: index.php");
exit;
}
## Check to see if we have a swap space,
## if true, display, if false, hide it ...
if (file_exists('/usr/sbin/swapinfo')) {
$swapinfo = `/usr/sbin/swapinfo`;
if (stristr($swapinfo, '%')) {
$showswap = true;
} }
} ##build list of widgets
$widgetCollection = array();
##build widget saved list information $widgetSeqParts = explode(",", $pconfig['sequence']);
if ($config['widgets'] && $config['widgets']['sequence'] != "") { foreach (glob('/usr/local/www/widgets/widgets/*.widget.php') as $php_file) {
$pconfig['sequence'] = $config['widgets']['sequence']; $widgetItem = array();
$widgetItem['name'] = basename($php_file, '.widget.php');
$widgetlist = $pconfig['sequence']; $widgetItem['display_name'] = ucwords(str_replace("_", " ", $widgetItem['name']));
$colpos = array(); $widgetItem['filename'] = $php_file;
$savedwidgetfiles = array(); $widgetItem['state'] = "none";
$widgetname = ""; $widgetItem['sortKey'] = $widgetItem['name'] == 'system_information' ? "" : $widgetItem['name'];
$widgetlist = explode(",", $widgetlist); foreach ($widgetSeqParts as $seqPart) {
$tmp = explode(':', $seqPart);
##read the widget position and display information if (count($tmp) == 3 && explode('-', $tmp[0])[0] == $widgetItem['name']) {
foreach ($widgetlist as $widget) { $widgetItem['state'] = $tmp[2];
$dashpos = strpos($widget, "-"); }
$widgetname = substr($widget, 0, $dashpos);
if (!in_array($widgetname, $widgetnames)) {
continue;
} }
$colposition = strpos($widget, ":"); $widgetCollection[] = $widgetItem;
$displayposition = strrpos($widget, ":");
$colpos[] = substr($widget, $colposition+1, $displayposition - $colposition-1);
$displayarray[] = substr($widget, $displayposition+1);
$savedwidgetfiles[] = $widgetname . ".widget.php";
} }
// sort widgets
##add widgets that may not be in the saved configuration, in case they are to be displayed later usort($widgetCollection, function ($item1, $item2) {
foreach ($widgetfiles as $defaultwidgets) { return strcmp(strtolower($item1['sortKey']), strtolower($item2['sortKey']));
if (!in_array($defaultwidgets, $savedwidgetfiles)) { });
$savedwidgetfiles[] = $defaultwidgets; } elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
} if (!empty($_POST['sequence'])) {
$config['widgets']['sequence'] = $_POST['sequence'];
write_config(gettext("Widget configuration has been changed."));
} }
header("Location: index.php");
##find custom configurations of a particular widget and load its info to $pconfig exit;
foreach ($widgetnames as $widget) {
if (isset($config['widgets'][$widget . '-config'])) {
$pconfig[$widget . '-config'] = $config['widgets'][$widget . '-config'];
}
}
$widgetlist = $savedwidgetfiles;
} else {
// no saved widget sequence found, build default list.
$widgetlist = $widgetfiles;
} }
// handle widget includes
foreach (glob("/usr/local/www/widgets/include/*.inc") as $filename) {
##build list of php include files include($filename);
$phpincludefiles = array();
$directory = "/usr/local/www/widgets/include/";
$dirhandle = opendir($directory);
$filename = "";
while (false !== ($filename = readdir($dirhandle))) {
$phpincludefiles[] = $filename;
}
foreach ($phpincludefiles as $includename) {
if (!stristr($includename, ".inc")) {
continue;
}
include($directory . $includename);
} }
include("head.inc"); include("head.inc");
?> ?>
<body> <body>
<script src='/javascript/index/ajax.js'></script>
<script type="text/javascript">
//<![CDATA[
function addWidget(selectedDiv){
container = $('#'+selectedDiv);
state = $('#'+selectedDiv+'-config');
container.show();
showSave();
state.val('show');
}
function configureWidget(selectedDiv){
selectIntLink = '#' + selectedDiv + "-settings";
if ($(selectIntLink).css('display') == "none")
$(selectIntLink).show();
else
$(selectIntLink).hide();
}
function showWidget(selectedDiv,swapButtons){
container = $('#'+selectedDiv+'-container');
min_btn = $('#'+selectedDiv+'-min');
max_btn = $('#'+selectedDiv+'-max');
state = $('#'+selectedDiv+'-config');
container.show();
min_btn.show();
max_btn.hide();
showSave();
state.val('show');
}
function minimizeWidget(selectedDiv,swapButtons){
container = $('#'+selectedDiv+'-container');
min_btn = $('#'+selectedDiv+'-min');
max_btn = $('#'+selectedDiv+'-max');
state = $('#'+selectedDiv+'-config');
container.hide();
min_btn.hide();
max_btn.show();
showSave();
state.val('hide');
}
function closeWidget(selectedDiv){
widget = $('#'+selectedDiv);
state = $('#'+selectedDiv+'-config');
showSave();
widget.hide();
state.val('close');
}
function showSave(){
$('#updatepref').show();
}
function updatePref(){
var widgets = $('.widgetdiv');
var widgetSequence = '';
var firstprint = false;
widgets.each(function(key) {
obj = $(this);
if (firstprint)
widgetSequence += ',';
state = $('input[name='+obj.attr('id')+'-config]').val();
widgetSequence += obj.attr('id')+'-container:col1:'+state;
firstprint = true;
});
$("#sequence").val(widgetSequence);
$("#iform").submit();
return false;
}
//]]>
</script>
<?php <?php
include("fbegin.inc"); include("fbegin.inc");?>
?>
<?php <?php
## If it is the first time webConfigurator has been ## If it is the first time webConfigurator has been
## accessed since initial install show this stuff. ## accessed since initial install show this stuff.
if (isset($config['trigger_initial_wizard'])) : if (isset($config['trigger_initial_wizard'])) :?>
?> <script type="text/javascript">
$( document ).ready(function() {
$(".page-content-head:first").hide();
});
</script>
<header class="page-content-head"> <header class="page-content-head">
<div class="container-fluid"> <div class="container-fluid">
<h1><?= gettext("Starting initial configuration!") ?></h1> <h1><?= gettext("Starting initial configuration!") ?></h1>
...@@ -298,10 +137,68 @@ if (isset($config['trigger_initial_wizard'])) : ...@@ -298,10 +137,68 @@ if (isset($config['trigger_initial_wizard'])) :
</div> </div>
</section> </section>
<meta http-equiv="refresh" content="3;url=wizard.php"> <meta http-equiv="refresh" content="3;url=wizard.php">
<?php exit; ?>
<?php <?php
endif; ?> // normal dashboard
else:?>
<script src='/javascript/index/ajax.js'></script>
<script type="text/javascript">
//<![CDATA[
function addWidget(selectedDiv) {
$('#'+selectedDiv).show();
$('#'+selectedDiv+'-config').val('show');
showSave();
}
function configureWidget(selectedDiv) {
selectIntLink = '#' + selectedDiv + "-settings";
if ($(selectIntLink).css('display') == "none") {
$(selectIntLink).show();
} else {
$(selectIntLink).hide();
}
}
function showWidget(selectedDiv,swapButtons) {
$('#'+selectedDiv+'-container').show();
$('#'+selectedDiv+'-min').show();
$('#'+selectedDiv+'-max').hide();
$('#'+selectedDiv+'-config').val('show');
showSave();
}
function minimizeWidget(selectedDiv,swapButtons) {
$('#'+selectedDiv+'-container').hide();
$('#'+selectedDiv+'-min').hide();
$('#'+selectedDiv+'-max').show();
$('#'+selectedDiv+'-config').val('hide');
showSave();
}
function closeWidget(selectedDiv) {
$('#'+selectedDiv).hide();
$('#'+selectedDiv+'-config').val('close');
showSave();
}
function showSave() {
$('#updatepref').show();
}
function updatePref() {
var widgetInfo = [];
$('.widgetdiv').each(function(key) {
widgetInfo.push($(this).attr('id')+'-container:col1:'+$('input[name='+$(this).attr('id')+'-config]').val());
});
$("#sequence").val(widgetInfo.join(','));
$("#iform").submit();
return false;
}
//]]>
</script>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
...@@ -311,104 +208,46 @@ endif; ?> ...@@ -311,104 +208,46 @@ endif; ?>
print_info_box($crash_report); print_info_box($crash_report);
} }
$totalwidgets = count($widgetfiles); foreach ($widgetCollection as $widgetItem):
$halftotal = $totalwidgets / 2 - 2; $widgettitle = $widgetItem['name'] . "_title";
$widgetcounter = 0; $widgettitlelink = $widgetItem['name'] . "_title_link";
$directory = "/usr/local/www/widgets/widgets/"; switch ($widgetItem['state']) {
$printed = false; case "show":
$firstprint = false;
foreach ($widgetlist as $widget) {
if (!stristr($widget, "widget.php")) {
continue;
}
$periodpos = strpos($widget, ".");
$widgetname = substr($widget, 0, $periodpos);
if ($widgetname != "") {
$nicename = $widgetname;
$nicename = str_replace("_", " ", $nicename);
//make the title look nice
$nicename = ucwords($nicename);
}
if (isset($config['widgets']) && isset($pconfig['sequence'])) {
if (isset($displayarray[$widgetcounter])) {
$disparr = $displayarray[$widgetcounter];
} else {
$disparr = null;
}
switch($disparr){
case "show":
$divdisplay = "block";
$display = "block";
$inputdisplay = "show";
$showWidget = "none";
$mindiv = "inline";
break;
case "hide":
$divdisplay = "block";
$display = "none";
$inputdisplay = "hide";
$showWidget = "inline";
$mindiv = "none";
break;
case "close":
$divdisplay = "none";
$display = "block";
$inputdisplay = "close";
$showWidget = "none";
$mindiv = "inline";
break;
default:
$divdisplay = "none";
$display = "block";
$inputdisplay = "none";
$showWidget = "none";
$mindiv = "inline";
break;
}
} else {
if ($firstprint == false) {
$divdisplay = "block"; $divdisplay = "block";
$display = "block"; $display = "block";
$inputdisplay = "show"; $inputdisplay = "show";
$showWidget = "none";
$mindiv = "inline"; $mindiv = "inline";
$firstprint = true; break;
} else { case "hide":
switch ($widget) { $divdisplay = "block";
case "interface_list.widget.php": $display = "none";
case "traffic_graphs.widget.php": $inputdisplay = "hide";
$divdisplay = "block"; $mindiv = "none";
$display = "block"; break;
$inputdisplay = "show"; case "close":
$showWidget = "none"; $divdisplay = "none";
$mindiv = "inline"; $display = "block";
break; $inputdisplay = "close";
default: $mindiv = "inline";
$divdisplay = "none"; break;
$display = "block"; default:
$inputdisplay = "close"; $divdisplay = "none";
$showWidget = "none"; $display = "block";
$mindiv = "inline"; $inputdisplay = "none";
break; $mindiv = "inline";
} break;
}
}?> }?>
<section class="col-xs-12 col-md-6 widgetdiv" id="<?= $widgetname ?>" style="display:<?= $divdisplay ?>;"> <section class="col-xs-12 col-md-6 widgetdiv" id="<?= $widgetItem['name'] ?>" style="display:<?= $divdisplay ?>;">
<div class="content-box"> <div class="content-box">
<form action="<?=$_SERVER['REQUEST_URI'];?>" method="post" id="iform"> <form method="post" id="iform">
<input type="hidden" value="" name="sequence" id="sequence" /> <input type="hidden" value="" name="sequence" id="sequence" />
<header class="content-box-head container-fluid"> <header class="content-box-head container-fluid">
<ul class="list-inline __nomb"> <ul class="list-inline __nomb">
<li><h3> <li><h3>
<?php <?php
$widgettitle = $widgetname . "_title";
$widgettitlelink = $widgetname . "_title_link";
if (isset($$widgettitle)) { if (isset($$widgettitle)) {
//only show link if defined //only show link if defined
if ($$widgettitlelink != "") { if (!empty($$widgettitlelink)) {
?> ?>
<u><span onclick="location.href='/<?= $$widgettitlelink ?>'" style="cursor:pointer"> <u><span onclick="location.href='/<?= $$widgettitlelink ?>'" style="cursor:pointer">
<?php <?php
...@@ -426,7 +265,7 @@ endif; ?> ...@@ -426,7 +265,7 @@ endif; ?>
<u><span onclick="location.href='/<?= $$widgettitlelink ?>'" style="cursor:pointer"> <u><span onclick="location.href='/<?= $$widgettitlelink ?>'" style="cursor:pointer">
<?php <?php
} }
echo $nicename; echo $widgetItem['display_name'];
if (isset($$widgettitlelink)) { if (isset($$widgettitlelink)) {
?> ?>
</span></u> </span></u>
...@@ -436,58 +275,44 @@ endif; ?> ...@@ -436,58 +275,44 @@ endif; ?>
</h3></li> </h3></li>
<li class="pull-right"> <li class="pull-right">
<div class="btn-group"> <div class="btn-group">
<button type="button" class="btn btn-default btn-xs" title="minimize" id="<?= $widgetname ?>-min" onclick='return minimizeWidget("<?= $widgetname ?>",true)' style="display:<?= $mindiv ?>;"><span class="glyphicon glyphicon-minus"></span></button> <button type="button" class="btn btn-default btn-xs" title="minimize" id="<?= $widgetItem['name'] ?>-min" onclick='return minimizeWidget("<?= $widgetItem['name'] ?>",true)' style="display:<?= $mindiv ?>;"><span class="glyphicon glyphicon-minus"></span></button>
<button type="button" class="btn btn-default btn-xs" title="maximize" id="<?= $widgetname ?>-max" onclick='return showWidget("<?= $widgetname ?>",true)' style="display:<?= $mindiv == 'none' ? 'inline' : 'none' ?>;"><span class="glyphicon glyphicon-plus"></span></button> <button type="button" class="btn btn-default btn-xs" title="maximize" id="<?= $widgetItem['name'] ?>-max" onclick='return showWidget("<?= $widgetItem['name'] ?>",true)' style="display:<?= $mindiv == 'none' ? 'inline' : 'none' ?>;"><span class="glyphicon glyphicon-plus"></span></button>
<button type="button" class="btn btn-default btn-xs" title="remove widget" onclick='return closeWidget("<?= $widgetname ?>",true)'><span class="glyphicon glyphicon-remove"></span></button> <button type="button" class="btn btn-default btn-xs" title="remove widget" onclick='return closeWidget("<?= $widgetItem['name'] ?>",true)'><span class="glyphicon glyphicon-remove"></span></button>
<button type="button" class="btn btn-default btn-xs" id="<?= $widgetname ?>-configure" onclick='return configureWidget("<?= $widgetname ?>")' style="display:none; cursor:pointer" ><span class="glyphicon glyphicon-pencil"></span></button> <button type="button" class="btn btn-default btn-xs" id="<?= $widgetItem['name'] ?>-configure" onclick='return configureWidget("<?= $widgetItem['name'] ?>")' style="display:none; cursor:pointer" ><span class="glyphicon glyphicon-pencil"></span></button>
</div> </div>
</li> </li>
</ul> </ul>
</header> </header>
</form> </form>
<div class="content-box-main collapse in" id="<?= $widgetname ?>-container" style="display:<?= $mindiv ?>"> <div class="content-box-main collapse in" id="<?= $widgetItem['name'] ?>-container" style="display:<?= $mindiv ?>">
<input type="hidden" value="<?= $inputdisplay ?>" id="<?= $widgetname ?>-config" name="<?= $widgetname ?>-config" /> <input type="hidden" value="<?= $inputdisplay ?>" id="<?= $widgetItem['name'] ?>-config" name="<?= $widgetItem['name'] ?>-config" />
<?php <?php
if ($divdisplay != "block") {?> if ($divdisplay != "block"):?>
<div id="<?= $widgetname ?>-loader" style="display:<?= $display ?>;" align="center"> <div id="<?= $widgetItem['name'] ?>-loader" style="display:<?= $display ?>;" align="center">
<br /> <br />
<span class="glyphicon glyphicon-refresh"></span> <?= gettext("Loading selected widget") ?> <span class="glyphicon glyphicon-refresh"></span> <?= gettext("Loading selected widget") ?>
<br /> <br />
</div> <?php $display = "none"; </div>
} <?php
if (file_exists($directory . $widget)) { else:
if ($divdisplay == 'block') { if ($divdisplay == 'block') {
include($directory . $widget); include($widgetItem['filename']);
}
} }
$widgetcounter++; ?> endif;
?>
</div> </div>
</div> </div>
</section> </section>
<?php <?php
} //end foreach ?> endforeach;?>
</div> </div>
</div> </div>
</section> </section>
<?php <?php
//build list of javascript include files foreach (glob("/usr/local/www/widgets/javascript/*.js") as $filename):?>
$jsincludefiles = array(); <script src="/widgets/javascript/<?=basename($filename);?>" type="text/javascript"></script>
$directory = "widgets/javascript/"; <?php
$dirhandle = opendir($directory); endforeach;?>
$filename = ""; <?php
while (false !== ($filename = readdir($dirhandle))) { endif;
$jsincludefiles[] = $filename; include("foot.inc");?>
}
foreach ($jsincludefiles as $jsincludename) {
if (!preg_match('/\.js$/', $jsincludename)) {
continue;
}
echo "<script src='{$directory}{$jsincludename}' type='text/javascript'></script>\n";
}
?>
<?php include("foot.inc");
src/www/widgets/widgets/system_information.widget.php
View file @ cb336a65
...@@ -34,6 +34,16 @@ require_once("pfsense-utils.inc"); ...@@ -34,6 +34,16 @@ require_once("pfsense-utils.inc");
require_once("system.inc"); require_once("system.inc");
require_once("stats.inc"); require_once("stats.inc");
## Check to see if we have a swap space,
## if true, display, if false, hide it ...
$swapinfo = `/usr/sbin/swapinfo`;
if (stristr($swapinfo, '%')) {
$showswap = true;
} else {
$showswap = false;
}
if (isset($_REQUEST['getupdatestatus'])) { if (isset($_REQUEST['getupdatestatus'])) {
$pkg_json = trim(configd_run('firmware check')); $pkg_json = trim(configd_run('firmware check'));
if ($pkg_json != '') { if ($pkg_json != '') {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023