fix default blacklists (#5820)

This commit is contained in:
Thomas NOËL 2014-10-29 13:22:36 +01:00
parent a663852e74
commit b24998f36f
1 changed files with 11 additions and 9 deletions

View File

@ -55,15 +55,17 @@ if (!is_array($config['univnautes']))
$a_un =& $config['univnautes'];
if (!is_array($a_un['blacklists']))
$a_un['blacklists'] = array(
'macaddresses' => array(),
'nameid' => array()
);
$a_un['blacklists'] = array();
$a_blacklist =& $a_un['blacklists'];
$pconfig['macaddresses'] = base64_decode($a_blacklist['macaddresses']);
$pconfig['nameid'] = base64_decode($a_blacklist['nameid']);
if ($a_blacklist['macaddresses'])
$pconfig['macaddresses'] = base64_decode($a_blacklist['macaddresses']);
else
$pconfig['macaddresses'] = '';
if ($a_blacklist['nameid'])
$pconfig['nameid'] = base64_decode($a_blacklist['nameid']);
else
$pconfig['nameid'] = '';
$pgtitle = array(gettext("Services"),gettext("Captive portal"), "SAML 2.0 Blacklists");
$shortcut_section = "captiveportal";
@ -121,7 +123,7 @@ include("head.inc");
<tr>
<td valign="top" class="vncellreq"><?=gettext("Mac addresses"); ?></td>
<td class="vtable">
<textarea name="macaddresses" cols="65" rows="4" id="macaddresses" class="formpre"><?=htmlspecialchars($pconfig['macaddresses']);?></textarea>
<textarea name="macaddresses" cols="65" rows="5" id="macaddresses" class="formpre"><?=htmlspecialchars($pconfig['macaddresses']);?></textarea>
<br>
<?=gettext("List of mac address to ban, one per line."); ?>
</td>
@ -133,7 +135,7 @@ include("head.inc");
<tr>
<td valign="top" class="vncellreq"><?=gettext("SAML NameIDs"); ?></td>
<td class="vtable">
<textarea name="nameid" cols="65" rows="4" id="nameid" class="formpre"><?=htmlspecialchars($pconfig['nameid']);?></textarea>
<textarea name="nameid" cols="65" rows="5" id="nameid" class="formpre"><?=htmlspecialchars($pconfig['nameid']);?></textarea>
<br>
<?=gettext("List of NameID (SAML identifier) to ban, one per line."); ?>
</td>