Skip to content

O
OpnSense
Commit 389b428f authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

src: whitespace sweep

parent 443c9342
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 662 additions and 662 deletions
src/opnsense/www/css/nv.d3.css
View file @ 389b428f
This diff is collapsed.
src/www/diag_logs_filter_summary.php
View file @ 389b428f
...@@ -116,7 +116,7 @@ include("head.inc"); ?> ...@@ -116,7 +116,7 @@ include("head.inc"); ?>
<section class="col-xs-12"> <section class="col-xs-12">
<? $active_tab = "/diag_logs_filter.php"; include('diag_logs_tabs.inc'); ?> <? $active_tab = "/diag_logs_filter.php"; include('diag_logs_tabs.inc'); ?>
<div class="tab-content content-box col-xs-12"> <div class="tab-content content-box col-xs-12">
<div class="container-fluid"> <div class="container-fluid">
<? $tab_group = 'firewall'; include('diag_logs_pills.php'); ?> <? $tab_group = 'firewall'; include('diag_logs_pills.php'); ?>
<p><?php printf (gettext('This is a firewall log summary, of the last %1$s lines of the firewall log (Max %2$s).'), $gotlines, $lines)?><br /></p> <p><?php printf (gettext('This is a firewall log summary, of the last %1$s lines of the firewall log (Max %2$s).'), $gotlines, $lines)?><br /></p>
</div> </div>
...@@ -132,7 +132,7 @@ include("head.inc"); ?> ...@@ -132,7 +132,7 @@ include("head.inc"); ?>
<div class="panel-heading"><h3 class="panel-title"><?=$fields[$field]?></h3></div> <div class="panel-heading"><h3 class="panel-title"><?=$fields[$field]?></h3></div>
<div class="panel-body"> <div class="panel-body">
<div class="piechart" id="<?=$field?>"> <div class="piechart" id="<?=$field?>">
<svg></svg> <svg></svg>
</div> </div>
<table class="table table-striped table-bordered"> <table class="table table-striped table-bordered">
<th><?=$fields[$field]?></th> <th><?=$fields[$field]?></th>
...@@ -181,7 +181,7 @@ include("head.inc"); ?> ...@@ -181,7 +181,7 @@ include("head.inc"); ?>
// Update Chart after window resize // Update Chart after window resize
nv.utils.windowResize(function(){ chart.update(); }); nv.utils.windowResize(function(){ chart.update(); });
return chart; return chart;
}); });
}); });
......
src/www/head.inc
View file @ 389b428f
...@@ -69,7 +69,7 @@ $pagetitle = gentitle( $pgtitle ); ...@@ -69,7 +69,7 @@ $pagetitle = gentitle( $pgtitle );
<!-- nvd3 --> <!-- nvd3 -->
<script type="text/javascript" src="/ui/js/nv.d3.min.js"></script> <script type="text/javascript" src="/ui/js/nv.d3.min.js"></script>
<?php <?php
/* /*
* Find all javascript files that need to be included * Find all javascript files that need to be included
......
src/www/vpn_openvpn_csc.php
View file @ 389b428f
...@@ -365,7 +365,7 @@ if ($act!="new" && $act!="edit") { ...@@ -365,7 +365,7 @@ if ($act!="new" && $act!="edit") {
<td width="78%" class="vtable"> <td width="78%" class="vtable">
<input name="description" type="text" class="formfld unknown" size="30" value="<?=$pconfig['description'];?>" /> <input name="description" type="text" class="formfld unknown" size="30" value="<?=$pconfig['description'];?>" />
<div class="hidden" for="help_for_description"> <div class="hidden" for="help_for_description">
<?=gettext("You may enter a description here for your reference (not parsed)"); ?>. <?=gettext("You may enter a description here for your reference (not parsed)"); ?>.
</div> </div>
</td> </td>
</tr> </tr>
...@@ -409,7 +409,7 @@ if ($act!="new" && $act!="edit") { ...@@ -409,7 +409,7 @@ if ($act!="new" && $act!="edit") {
<div class="hidden" for="help_for_local_network"> <div class="hidden" for="help_for_local_network">
<?=gettext("These are the IPv4 networks that will be accessible " . <?=gettext("These are the IPv4 networks that will be accessible " .
"from this particular client. Expressed as a comma-separated list of one or more CIDR ranges."); ?> "from this particular client. Expressed as a comma-separated list of one or more CIDR ranges."); ?>
<br /><?=gettext("NOTE: You do not need to specify networks here if they have " . <br /><?=gettext("NOTE: You do not need to specify networks here if they have " .
"already been defined on the main server configuration.");?> "already been defined on the main server configuration.");?>
</div> </div>
</td> </td>
......
src/www/vpn_openvpn_export.php
View file @ 389b428f
...@@ -635,21 +635,21 @@ if (isset($savemsg)) { ...@@ -635,21 +635,21 @@ if (isset($savemsg)) {
<i class="fa fa-toggle-off text-danger" style="cursor: pointer;" id="show_all_help_opnvpn_server" type="button"></i></a> <i class="fa fa-toggle-off text-danger" style="cursor: pointer;" id="show_all_help_opnvpn_server" type="button"></i></a>
</td> </td>
</tr> </tr>
<tr> <tr>
<td valign="top"><i class="fa fa-info-circle text-muted"></i> <?=gettext("Remote Access Server");?></td> <td valign="top"><i class="fa fa-info-circle text-muted"></i> <?=gettext("Remote Access Server");?></td>
<td> <td>
<select name="server" id="server" class="formselect" onchange="server_changed()"> <select name="server" id="server" class="formselect" onchange="server_changed()">
<?php foreach ($ras_server as & $server) : <?php foreach ($ras_server as & $server) :
?> ?>
<option value="<?=$server['index'];?>"><?=htmlspecialchars($server['name']);?></option> <option value="<?=$server['index'];?>"><?=htmlspecialchars($server['name']);?></option>
<?php <?php
endforeach; ?> endforeach; ?>
</select> </select>
</td> </td>
</tr> </tr>
<tr> <tr>
<td valign="top"><i class="fa fa-info-circle text-muted"></i> <?=gettext("Host Name Resolution");?></td> <td valign="top"><i class="fa fa-info-circle text-muted"></i> <?=gettext("Host Name Resolution");?></td>
<td > <td >
<select name="useaddr" id="useaddr" class="formselect" onchange="useaddr_changed(this)"> <select name="useaddr" id="useaddr" class="formselect" onchange="useaddr_changed(this)">
<option value="serveraddr" ><?=gettext("Interface IP Address");?></option> <option value="serveraddr" ><?=gettext("Interface IP Address");?></option>
<option value="servermagic" ><?=gettext("Automagic Multi-WAN IPs (port forward targets)");?></option> <option value="servermagic" ><?=gettext("Automagic Multi-WAN IPs (port forward targets)");?></option>
...@@ -681,11 +681,11 @@ endif; ?> ...@@ -681,11 +681,11 @@ endif; ?>
</div> </div>
<input name="useaddr_hostname" type="text" id="useaddr_hostname" size="40" /> <input name="useaddr_hostname" type="text" id="useaddr_hostname" size="40" />
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td valign="top"><a id="help_for_verify_server_cn" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Verify Server CN");?></td> <td valign="top"><a id="help_for_verify_server_cn" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Verify Server CN");?></td>
<td > <td >
<select name="verifyservercn" id="verifyservercn" class="formselect"> <select name="verifyservercn" id="verifyservercn" class="formselect">
<option value="auto"><?=gettext("Automatic - Use verify-x509-name (OpenVPN 2.3+) where possible");?></option> <option value="auto"><?=gettext("Automatic - Use verify-x509-name (OpenVPN 2.3+) where possible");?></option>
<option value="tls-remote"><?=gettext("Use tls-remote (Deprecated, use only on old clients &lt;= OpenVPN 2.2.x");?>)</option> <option value="tls-remote"><?=gettext("Use tls-remote (Deprecated, use only on old clients &lt;= OpenVPN 2.2.x");?>)</option>
...@@ -697,21 +697,21 @@ endif; ?> ...@@ -697,21 +697,21 @@ endif; ?>
<?=gettext("Only use tls-remote if you must use an older client that you cannot control. The option has been deprecated by OpenVPN and will be removed in the next major version.");?><br/><br/> <?=gettext("Only use tls-remote if you must use an older client that you cannot control. The option has been deprecated by OpenVPN and will be removed in the next major version.");?><br/><br/>
<?=gettext("With tls-remote the server CN may optionally be enclosed in quotes. This can help if the server CN contains spaces and certain clients cannot parse the server CN. Some clients have problems parsing the CN with quotes. Use only as needed.");?> <?=gettext("With tls-remote the server CN may optionally be enclosed in quotes. This can help if the server CN contains spaces and certain clients cannot parse the server CN. Some clients have problems parsing the CN with quotes. Use only as needed.");?>
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td valign="top"><a id="help_for_random_local_port" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Use Random Local Port");?></td> <td valign="top"><a id="help_for_random_local_port" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Use Random Local Port");?></td>
<td > <td >
<input name="randomlocalport" id="randomlocalport" type="checkbox" value="yes" checked="CHECKED" /> <input name="randomlocalport" id="randomlocalport" type="checkbox" value="yes" checked="CHECKED" />
<div class="hidden" for="help_for_random_local_port"> <div class="hidden" for="help_for_random_local_port">
<?=gettext("Use a random local source port (lport) for traffic from the client. Without this set, two clients may not run concurrently.");?> <?=gettext("Use a random local source port (lport) for traffic from the client. Without this set, two clients may not run concurrently.");?>
<br/> <br/>
<?=gettext("NOTE: Not supported on older clients. Automatically disabled for Yealink and Snom configurations."); ?> <?=gettext("NOTE: Not supported on older clients. Automatically disabled for Yealink and Snom configurations."); ?>
</div> </div>
</tr> </tr>
<tr> <tr>
<td valign="top"><i class="fa fa-info-circle text-muted"></i> <?=gettext("Certificate Export Options");?></td> <td valign="top"><i class="fa fa-info-circle text-muted"></i> <?=gettext("Certificate Export Options");?></td>
<td > <td >
<div> <div>
<input name="usetoken" id="usetoken" type="checkbox" value="yes" /> <input name="usetoken" id="usetoken" type="checkbox" value="yes" />
<?=gettext("Use Microsoft Certificate Storage instead of local files.");?> <?=gettext("Use Microsoft Certificate Storage instead of local files.");?>
...@@ -726,11 +726,11 @@ endif; ?> ...@@ -726,11 +726,11 @@ endif; ?>
<?=gettext("Confirm");?> : <?=gettext("Confirm");?> :
<input name="conf" id="conf" type="password" class="formfld pwd" size="20" value="" /> <input name="conf" id="conf" type="password" class="formfld pwd" size="20" value="" />
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td valign="top"><a id="help_for_http_proxy" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Use Proxy");?></td> <td valign="top"><a id="help_for_http_proxy" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Use Proxy");?></td>
<td > <td >
<input name="useproxy" id="useproxy" type="checkbox" value="yes" onclick="useproxy_changed(this)" /> <input name="useproxy" id="useproxy" type="checkbox" value="yes" onclick="useproxy_changed(this)" />
<div class="hidden" for="help_for_http_proxy"> <div class="hidden" for="help_for_http_proxy">
<?=gettext("Use proxy to communicate with the server.");?> <?=gettext("Use proxy to communicate with the server.");?>
...@@ -762,11 +762,11 @@ endif; ?> ...@@ -762,11 +762,11 @@ endif; ?>
</div> </div>
</div> </div>
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td valign="top"><a id="help_for_openvpnmanager" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Management Interface OpenVPNManager");?></td> <td valign="top"><a id="help_for_openvpnmanager" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Management Interface OpenVPNManager");?></td>
<td > <td >
<input name="openvpnmanager" id="openvpnmanager" type="checkbox" value="yes" /> <input name="openvpnmanager" id="openvpnmanager" type="checkbox" value="yes" />
<div class="hidden" for="help_for_openvpnmanager"> <div class="hidden" for="help_for_openvpnmanager">
<?=gettext('This will change the generated .ovpn configuration to allow for usage of the management interface.'. <?=gettext('This will change the generated .ovpn configuration to allow for usage of the management interface.'.
...@@ -775,31 +775,31 @@ endif; ?> ...@@ -775,31 +775,31 @@ endif; ?>
<br/> <br/>
<?=gettext("NOTE: This is not currently compatible with the 64-bit OpenVPN installer. It will work with the 32-bit installer on a 64-bit system.");?> <?=gettext("NOTE: This is not currently compatible with the 64-bit OpenVPN installer. It will work with the 32-bit installer on a 64-bit system.");?>
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2" class="list" height="12">&nbsp;</td> <td colspan="2" class="list" height="12">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td valign="top"><a id="help_for_advancedoptions" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Additional configuration options");?></td> <td valign="top"><a id="help_for_advancedoptions" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Additional configuration options");?></td>
<td > <td >
<textarea rows="6" cols="68" name="advancedoptions" id="advancedoptions"></textarea><br/> <textarea rows="6" cols="68" name="advancedoptions" id="advancedoptions"></textarea><br/>
<div class="hidden" for="help_for_advancedoptions"> <div class="hidden" for="help_for_advancedoptions">
<?=gettext("Enter any additional options you would like to add to the OpenVPN client export configuration here, separated by a line break or semicolon"); ?><br/> <?=gettext("Enter any additional options you would like to add to the OpenVPN client export configuration here, separated by a line break or semicolon"); ?><br/>
<?=gettext("EXAMPLE: remote-random"); ?>; <?=gettext("EXAMPLE: remote-random"); ?>;
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td valign="top"><a id="help_for_clientpkg" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Client Install Packages");?></td> <td valign="top"><a id="help_for_clientpkg" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Client Install Packages");?></td>
<td> <td>
<table width="100%" id="users" border="0" cellpadding="0" cellspacing="0" class="table table-striped table-bordered "> <table width="100%" id="users" border="0" cellpadding="0" cellspacing="0" class="table table-striped table-bordered ">
<tr> <tr>
<td width="25%" ><b><?=gettext("User");?></b></td> <td width="25%" ><b><?=gettext("User");?></b></td>
<td width="35%" ><b><?=gettext("Certificate Name");?></b></td> <td width="35%" ><b><?=gettext("Certificate Name");?></b></td>
<td width="40%" ><b><?=gettext("Export");?></b></td> <td width="40%" ><b><?=gettext("Export");?></b></td>
</tr> </tr>
</table> </table>
<div class="hidden" for="help_for_clientpkg"> <div class="hidden" for="help_for_clientpkg">
<?= gettext("NOTES:") ?> <br/> <?= gettext("NOTES:") ?> <br/>
<?= gettext("The &quot;XP&quot; Windows installers work on Windows XP and later versions. The &quot;win6&quot; Windows installers include a new tap-windows6 driver that works only on Windows Vista and later.") ?><br/> <?= gettext("The &quot;XP&quot; Windows installers work on Windows XP and later versions. The &quot;win6&quot; Windows installers include a new tap-windows6 driver that works only on Windows Vista and later.") ?><br/>
...@@ -816,8 +816,8 @@ endif; ?> ...@@ -816,8 +816,8 @@ endif; ?>
<?= gettext("If you expect to see a certain client in the list but it is not there, it is usually due to a CA mismatch between the OpenVPN server instance and the client certificates found in the User Manager.") ?><br/> <?= gettext("If you expect to see a certain client in the list but it is not there, it is usually due to a CA mismatch between the OpenVPN server instance and the client certificates found in the User Manager.") ?><br/>
</div> </div>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
</div> </div>
</section> </section>
......
src/www/vpn_openvpn_server.php
View file @ 389b428f
...@@ -776,7 +776,7 @@ function tuntap_change() { ...@@ -776,7 +776,7 @@ function tuntap_change() {
<tr id="authmodetr" style="display:none"> <tr id="authmodetr" style="display:none">
<td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Backend for authentication");?></td> <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Backend for authentication");?></td>
<td> <td>
<select name='authmode[]' id='authmode' class="form-control" multiple="multiple" size="5"> <select name='authmode[]' id='authmode' class="form-control" multiple="multiple" size="5">
<?php <?php
if (isset($pconfig['authmode'])) { if (isset($pconfig['authmode'])) {
$authmodes = explode(",", $pconfig['authmode']); $authmodes = explode(",", $pconfig['authmode']);
...@@ -794,7 +794,7 @@ function tuntap_change() { ...@@ -794,7 +794,7 @@ function tuntap_change() {
<?php <?php
endforeach; ?> endforeach; ?>
</select> </select>
</td> </td>
</tr> </tr>
<tr> <tr>
<td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Protocol");?></td> <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Protocol");?></td>
...@@ -1639,7 +1639,7 @@ endif; ?> ...@@ -1639,7 +1639,7 @@ endif; ?>
</div> </div>
<div class="hidden" for="help_for_client_mgmt_port"> <div class="hidden" for="help_for_client_mgmt_port">
<span> <span>
<?=gettext("Use a different management port on clients. The default port is 166. Specify a different port if the client machines need to select from multiple OpenVPN links."); ?><br /> <?=gettext("Use a different management port on clients. The default port is 166. Specify a different port if the client machines need to select from multiple OpenVPN links."); ?><br />
</span> </span>
</div> </div>
</td> </td>
......
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