Skip to content

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

(legacy) tabs and spaces in fbegin.inc, non functional

parent 3715ac02
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 127 deletions
src/www/fbegin.inc
View file @ 7aefb9f8
<?php <?php
/* /*
Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2012 Jim Pingle Copyright (C) 2012 Jim Pingle
Copyright (C) 2007-2008 Scott Ullrich <sullrich@gmail.com> Copyright (C) 2007-2008 Scott Ullrich <sullrich@gmail.com>
Copyright (C) 2005-2006 Colin Smith <ethethlay@gmail.com> Copyright (C) 2005-2006 Colin Smith <ethethlay@gmail.com>
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met: modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, 1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer. this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution. documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 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 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
*/ */
function find_service_by_name($names) function find_service_by_name($names)
{ {
if (!is_array($names)) { if (!is_array($names)) {
$names = array($names); $names = array($names);
} }
$services = get_services(); $services = get_services();
foreach ($services as $service) { foreach ($services as $service) {
foreach ($names as $name) { foreach ($names as $name) {
if ($service['name'] == $name) { if ($service['name'] == $name) {
return $service; return $service;
} }
} }
} }
return array(); return array();
} }
/* Determine automated help URL. Should output the page name and /* Determine automated help URL. Should output the page name and
...@@ -56,24 +56,24 @@ preg_match("/\/(.*)\?(.*)/", $_SERVER["REQUEST_URI"], $uri_split); ...@@ -56,24 +56,24 @@ preg_match("/\/(.*)\?(.*)/", $_SERVER["REQUEST_URI"], $uri_split);
/* If there was no match, there were no parameters, just grab the filename /* If there was no match, there were no parameters, just grab the filename
Otherwise, use the matched filename from above. */ Otherwise, use the matched filename from above. */
if (empty($uri_split[0])) { if (empty($uri_split[0])) {
$pagename = ltrim($_SERVER["REQUEST_URI"], '/'); $pagename = ltrim($_SERVER["REQUEST_URI"], '/');
} else { } else {
$pagename = $uri_split[1]; $pagename = $uri_split[1];
} }
/* If the page name is still empty, the user must have requested / (index.php) */ /* If the page name is still empty, the user must have requested / (index.php) */
if (empty($pagename)) { if (empty($pagename)) {
$pagename = "index.php"; $pagename = "index.php";
} }
/* If the filename is wizard.php, reparse looking for the .xml filename */ /* If the filename is wizard.php, reparse looking for the .xml filename */
if ($pagename == 'wizard.php') { if ($pagename == 'wizard.php') {
$param_split = explode('&', $uri_split[2]); $param_split = explode('&', $uri_split[2]);
foreach ($param_split as $param) { foreach ($param_split as $param) {
if (substr($param, 0, 4) == "xml=") { if (substr($param, 0, 4) == "xml=") {
$xmlfile = explode('=', $param); $xmlfile = explode('=', $param);
$pagename = $xmlfile[1]; $pagename = $xmlfile[1];
} }
} }
} }
$aclObj = new \OPNsense\Core\ACL(); $aclObj = new \OPNsense\Core\ACL();
...@@ -82,11 +82,11 @@ $aclObj = new \OPNsense\Core\ACL(); ...@@ -82,11 +82,11 @@ $aclObj = new \OPNsense\Core\ACL();
$need_alert_display = false; $need_alert_display = false;
$found_notices = are_notices_pending(); $found_notices = are_notices_pending();
if($found_notices == true) { if($found_notices == true) {
$notices = get_notices(); $notices = get_notices();
if(!$notices) { if(!$notices) {
$need_alert_display = true; $need_alert_display = true;
$display_text = print_notices($notices) . "<br />"; $display_text = print_notices($notices) . "<br />";
} }
} }
if($need_alert_display == true) { if($need_alert_display == true) {
echo "<div class=\"col-xs-12\"><div class=\"alert alert-info\"><p>".$display_text."</p></div></div>"; echo "<div class=\"col-xs-12\"><div class=\"alert alert-info\"><p>".$display_text."</p></div></div>";
...@@ -95,36 +95,31 @@ if($need_alert_display == true) { ...@@ -95,36 +95,31 @@ if($need_alert_display == true) {
?> ?>
<header class="page-head"> <header class="page-head">
<nav class="navbar navbar-default" role="navigation">
<nav class="navbar navbar-default" role="navigation"> <div class="container-fluid">
<div class="navbar-header">
<div class="container-fluid"> <a class="navbar-brand" href="/index.php">
<div class="navbar-header"> <img class="brand-logo" src="/ui/themes/<?=$g['theme'];?>/build/images/default-logo.png" height="30"/>
<a class="navbar-brand" href="/index.php"> <img class="brand-icon" src="/ui/themes/<?=$g['theme'];?>/build/images/icon-logo.png" height="30"/>
<img class="brand-logo" src="/ui/themes/<?=$g['theme'];?>/build/images/default-logo.png" height="30"/> </a>
<img class="brand-icon" src="/ui/themes/<?=$g['theme'];?>/build/images/icon-logo.png" height="30"/> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navigation">
</a> <span class="sr-only">Toggle navigation</span>
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navigation"> <span class="icon-bar"></span>
<span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> </button>
<span class="icon-bar"></span> </div>
</button> <div class="collapse navbar-collapse">
</div> <ul class="nav navbar-nav navbar-right">
<li id="menu_messages"><?= get_menu_messages() ?></li>
<div class="collapse navbar-collapse"> </ul>
<ul class="nav navbar-nav navbar-right">
<li id="menu_messages"><?= get_menu_messages() ?></li> </div>
</ul> </div>
</nav>
</div>
</div>
</nav>
</header> </header>
<main class="page-content col-sm-10 col-sm-push-2"> <main class="page-content col-sm-10 col-sm-push-2">
<aside id="navigation" class="page-side col-xs-12 col-sm-2 hidden-xs"> <aside id="navigation" class="page-side col-xs-12 col-sm-2 hidden-xs">
<div class="row"> <div class="row">
<nav class="page-side-nav" role="navigation"> <nav class="page-side-nav" role="navigation">
...@@ -191,50 +186,40 @@ if($need_alert_display == true) { ...@@ -191,50 +186,40 @@ if($need_alert_display == true) {
</nav> </nav>
</div> </div>
</aside> </aside>
<div class="row">
<div class="row"> <header class="page-content-head">
<div class="container-fluid">
<header class="page-content-head"> <form action="<?=$_SERVER['REQUEST_URI'];?>" method="post">
<div class="container-fluid"> <ul class="list-inline">
<form action="<?=$_SERVER['REQUEST_URI'];?>" method="post"> <li class="__mb"><h1><?= gentitle($menuBreadcrumbs) ?></h1></li>
<ul class="list-inline"> <li class="btn-group-container">
<li class="__mb"><h1><?= gentitle($menuBreadcrumbs) ?></h1></li> <?php
if (isset($service_hook)) {
<li class="btn-group-container"> $ssvc = array();
switch ($service_hook) {
<?php case 'openvpn':
$ssvc = find_service_by_openvpn_vpnid($vpnid);
if (isset($service_hook)) { break;
$ssvc = array(); default:
switch ($service_hook) { $ssvc = find_service_by_name($service_hook);
case 'openvpn': break;
$ssvc = find_service_by_openvpn_vpnid($vpnid); }
break; if (!empty($ssvc)) {
default: echo get_service_status_icon($ssvc, false);
$ssvc = find_service_by_name($service_hook); echo get_service_control_links($ssvc, false);
break; }
} }
if (!empty($ssvc)) { ?>
echo get_service_status_icon($ssvc, false); <?php if (!empty($main_buttons)): foreach ($main_buttons as $button): ?>
echo get_service_control_links($ssvc, false); <a href="<?=$button['href'];?>" class="btn btn-primary"><span class="glyphicon glyphicon-plus-sign __iconspacer"></span><?=$button['label'];?></a>
} <?php endforeach; endif; ?>
}
<?php if (isset($widgetfiles)): ?>
?> <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>
<?php if (!empty($main_buttons)): foreach ($main_buttons as $button): ?> <?php endif; ?>
<a href="<?=$button['href'];?>" class="btn btn-primary"><span class="glyphicon glyphicon-plus-sign __iconspacer"></span><?=$button['label'];?></a> </li>
<?php endforeach; endif; ?> </ul>
</form>
<?php if (isset($widgetfiles)): ?> </div>
</header>
<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>
<?php endif; ?>
</li>
</ul>
</form>
</div>
</header>
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