diff options
Diffstat (limited to 'src/usr/local/www/diag_pkglogs.php')
| -rwxr-xr-x | src/usr/local/www/diag_pkglogs.php | 155 |
1 files changed, 78 insertions, 77 deletions
diff --git a/src/usr/local/www/diag_pkglogs.php b/src/usr/local/www/diag_pkglogs.php index 6575c48..e02cfff 100755 --- a/src/usr/local/www/diag_pkglogs.php +++ b/src/usr/local/www/diag_pkglogs.php @@ -3,33 +3,59 @@ $Id$ diag_pkglogs.php - Copyright (C) 2005 Colin Smith - All rights reserved. - - Copyright (C) 2013-2015 Electric Sheep Fencing, LP - 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. - +*/ +/* ==================================================================== + * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. + * Copyright (c) 2005 Colin Smith + * + * 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. + * + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgment: + * "This product includes software developed by the pfSense Project + * for use in the pfSense software distribution. (http://www.pfsense.org/). + * + * 4. The names "pfSense" and "pfSense Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * coreteam@pfsense.org. + * + * 5. Products derived from this software may not be called "pfSense" + * nor may "pfSense" appear in their names without prior written + * permission of the Electric Sheep Fencing, LLC. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * + * "This product includes software developed by the pfSense Project + * for use in the pfSense software distribution (http://www.pfsense.org/). + * + * THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY + * EXPRESSED 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 pfSense PROJECT OR + * ITS CONTRIBUTORS 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. + * + * ==================================================================== + * + */ +/* <logging> <logtab>arpwatch</logtab> <grepfor>arpwatch</logtab> @@ -59,9 +85,6 @@ if (!($nentries = $config['syslog']['nentries'])) { $nentries = 50; } -//if ($_POST['clear']) -// clear_log_file($logfile); - $i = 0; $pkgwithlogging = false; $apkg = $_GET['pkg']; @@ -88,26 +111,16 @@ if (!$apkg) { // If we aren't looking for a specific package, locate the first p $pgtitle = array(gettext("Status"), gettext("Package logs")); include("head.inc"); -?> -<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<?php include("fbegin.inc"); ?> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td> - <?php - if ($pkgwithlogging == false) { - print_info_box(gettext("No packages with logging facilities are currently installed.")); - echo '</ul></td></tr></table>'; - include("fend.inc"); - exit; - } +if($pkgwithlogging == false) { + print_info_box(gettext("No packages with logging facilities are currently installed.")); +} else { $tab_array = array(); - foreach ($config['installedpackages']['package'] as $package) { - if (is_array($package['logging'])) { - if (!($logtab = $package['logging']['logtab'])) { + foreach($config['installedpackages']['package'] as $package) { + if(is_array($package['logging'])) { + if(!($logtab = $package['logging']['logtab'])) $logtab = $package['name']; - } - if ($apkg == $package['name']) { + + if($apkg == $package['name']) { $curtab = $logtab; $tab_array[] = array(sprintf(gettext("%s"), $logtab), true, "diag_pkglogs.php?pkg=".$package['name']); } else { @@ -116,32 +129,20 @@ include("head.inc"); } } display_top_tabs($tab_array); - ?> - </td> - </tr> - <tr> - <td> - <div id="mainarea"> - <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td colspan="2" class="listtopic"> - <?php printf(gettext('Last %1$s %2$s log entries'), $nentries, $curtab); ?> - </td> - </tr> - <?php - $package =& $config['installedpackages']['package'][$apkgid]; - dump_clog($g['varlog_path'] . '/' . $package['logging']['logfilename'], $nentries); - ?> - </table> -<!-- -<form action="diag_pkglogs.php" method="post"> -<input name="clear" type="submit" class="formbtn" value="Clear log"> -</form> ---> - </div> - </td> - </tr> -</table> -<?php include("fend.inc"); ?> -</body> -</html> +?> + + <div class="panel panel-default"> + <div class="panel-heading"><h2 class="panel-title"><?=printf(gettext('Last %1$s %2$s log entries'),$nentries,$curtab)?></h2></div> + <div>class="panel-body"> + <pre> +<?php + $package = $config['installedpackages']['package'][$apkgid]; + dump_clog_no_table($g['varlog_path'] . '/' . $package['logging']['logfilename'], $nentries, true, array()); +?> + </pre> + </div> + </div> + +<?php } + +include("foot.inc"); ?>
\ No newline at end of file |
