Skip to content

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

(system activity) remove diag_system_activity.php switch to mvc implementation

parent c4beabc6
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 96 deletions
src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
View file @ 8be37cbe
......@@ -79,7 +79,7 @@
<Tester order="50" url="/diag_authentication.php"/>
</Access>
<Diagnostics order="160" cssClass="fa fa-medkit">
<Activity VisibleName="Activity Monitor" url="/diag_system_activity.php"/>
<Activity VisibleName="Activity Monitor" url="/ui/diagnostics/activity/"/>
<Factory VisibleName="Factory Defaults" url="/diag_defaults.php"/>
<Halt VisibleName="Halt System" url="/diag_halt.php"/>
<Reboot VisibleName="Reboot System" url="/reboot.php"/>
......
src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json
View file @ 8be37cbe
......@@ -295,7 +295,8 @@
"name": "WebCfg - Diagnostics: System Activity",
"descr": "Allows access to the 'Diagnostics: System Activity' page",
"match": [
"diag_system_activity.php*"
"ui/diagnostics/activity/*",
"api/diagnostics/activity/*"
]
},
"page-diagnostics-testport": {
......
src/www/diag_system_activity.php deleted 100644 → 0
View file @ c4beabc6
<?php
/*
Copyright (C) 2014 Deciso B.V.
Copyright (C) 2008-2009 Scott Ullrich
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
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.
*/
require_once("guiconfig.inc");
if($_REQUEST['getactivity']) {
$text = `/usr/bin/top -aHS | /usr/bin/cut -c1-105`;
echo $text;
exit;
}
include("head.inc");
?>
<body>
<?php include("fbegin.inc"); ?>
<script type="text/javascript">
//<![CDATA[
function getcpuactivity() {
scroll(0,0);
var url = "/diag_system_activity.php";
var pars = 'getactivity=yes';
jQuery.ajax(
url,
{
type: 'post',
data: pars,
complete: activitycallback
});
}
function activitycallback(transport) {
jQuery('#cpuactivitydiv').html('<pre>' + transport.responseText + '<\/pre>');
setTimeout('getcpuactivity()', 2500);
}
setTimeout('getcpuactivity()', 1000);
//]]>
</script>
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<section class="col-xs-12">
<?php
if($savemsg) {
echo "<div id=\"savemsg\">";
print_info_box($savemsg);
echo "</div>";
}
if (isset($input_errors) && count($input_errors) > 0)
print_input_errors($input_errors);
?>
<div id="cpuactivitydiv">
<?=gettext("Gathering CPU activity, please wait...");?>
</div>
</section>
</section>
</div>
</div>
</section>
<?php include("foot.inc"); ?>
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