lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 16:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipsec: mark descriptions "$unused" where appropriate

Browse Source
This commit is contained in:
Franco Fichtner 2018-12-16 21:17:43 +01:00
parent 64bd3a333b
commit d9f7574147
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/etc/inc/plugins.inc.d/ipsec.inc
View File

@ -888,7 +888,7 @@ function ipsec_configure_do($verbose = false, $interface = '')
// Debugging configuration
// lkey is the log key, which is a three-letter abbreviation of the subsystem to log, e.g. `ike`.
// The value will be a number between -1 (silent) and 4 (highest verbosity).
foreach (IPSEC_LOG_SUBSYSTEMS as $lkey => $ldescr) {
foreach (IPSEC_LOG_SUBSYSTEMS as $lkey => $unused) {
if (isset($config['ipsec']["ipsec_{$lkey}"]) && is_numeric($config['ipsec']["ipsec_{$lkey}"]) &&
array_key_exists(intval($config['ipsec']["ipsec_{$lkey}"]), IPSEC_LOG_LEVELS)) {
$strongswanTree['charon']['syslog']['daemon'][$lkey] = $config['ipsec']["ipsec_{$lkey}"];

16
src/www/vpn_ipsec_settings.php
View File

@ -46,7 +46,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
} else {
$pconfig['passthrough_networks'] = array();
}
foreach (IPSEC_LOG_SUBSYSTEMS as $lkey => $ldescr) {
foreach (IPSEC_LOG_SUBSYSTEMS as $lkey => $unused) {
if (!empty($config['ipsec']["ipsec_{$lkey}"])) {
$pconfig["ipsec_{$lkey}"] = $config['ipsec']["ipsec_{$lkey}"];
} else {
@ -80,7 +80,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
unset($config['ipsec']['preferoldsa']);
}
if (isset($config['ipsec']) && is_array($config['ipsec'])) {
foreach (IPSEC_LOG_SUBSYSTEMS as $lkey => $ldescr) {
foreach (IPSEC_LOG_SUBSYSTEMS as $lkey => $unused) {
if (empty($pconfig["ipsec_{$lkey}"])) {
if (isset($config['ipsec']["ipsec_{$lkey}"])) {
unset($config['ipsec']["ipsec_{$lkey}"]);
@ -207,18 +207,16 @@ if (isset($input_errors) && count($input_errors) > 0) {
<div class="hidden" data-for="help_for_ipsec_debug">
<strong><?=gettext("Start IPsec in debug mode based on sections selected"); ?></strong> <br/>
</div>
<?php foreach (IPSEC_LOG_SUBSYSTEMS as $lkey => $ldescr) :
?>
<?=$ldescr?>
<?php foreach (IPSEC_LOG_SUBSYSTEMS as $lkey => $ldescr): ?>
<?= $ldescr ?>
<select name="ipsec_<?=$lkey?>" id="ipsec_<?=$lkey?>">
<?php foreach (IPSEC_LOG_LEVELS as $lidx => $lvalue): ?>
<?php foreach (IPSEC_LOG_LEVELS as $lidx => $lvalue): ?>
<option value="<?=$lidx?>" <?= (isset($pconfig["ipsec_{$lkey}"]) && $pconfig["ipsec_{$lkey}"] == $lidx) || (!isset($pconfig["ipsec_{$lkey}"]) && $lidx == "0") ? 'selected="selected"' : '' ?>>
<?=$lvalue?>
</option>
<?php endforeach; ?>
<?php endforeach ?>
</select>
<?php
endforeach; ?>
<?php endforeach ?>
<div class="hidden" data-for="help_for_ipsec_debug">
<?=gettext("Launch IPsec in debug mode so that more verbose logs will be generated to aid in troubleshooting."); ?>
</div>