1
0
mirror of https://github.com/billz/raspap-webgui.git synced 2023-10-10 13:37:24 +02:00

Merge pull request #259 from D9ping/Branch_D9ping

Fix incorrect escaping break lines of WPA and WPA2 secured networks.
This commit is contained in:
Bill Zimmerman 2018-10-31 19:19:18 +05:30 committed by GitHub
commit c366ef0abb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -203,7 +203,7 @@ function DisplayWPAConfig(){
<?php if (array_key_exists('priority', $network)) { ?> <?php if (array_key_exists('priority', $network)) { ?>
<input type="hidden" name="priority<?php echo $index ?>" value="<?php echo htmlspecialchars($network['priority'], ENT_QUOTES); ?>" /> <input type="hidden" name="priority<?php echo $index ?>" value="<?php echo htmlspecialchars($network['priority'], ENT_QUOTES); ?>" />
<?php } ?> <?php } ?>
<input type="hidden" name="protocol<?php echo $index ?>" value="<?php echo htmlspecialchars($network['protocol'], ENT_QUOTES); ?>" /><?php echo htmlspecialchars($network['protocol'], ENT_QUOTES); ?> <input type="hidden" name="protocol<?php echo $index ?>" value="<?php echo htmlspecialchars($network['protocol'], ENT_QUOTES); ?>" /><?php echo $network['protocol']; ?>
</td> </td>
<?php if ($network['protocol'] === 'Open') { ?> <?php if ($network['protocol'] === 'Open') { ?>
<td><input type="hidden" name="passphrase<?php echo $index ?>" value="" />---</td> <td><input type="hidden" name="passphrase<?php echo $index ?>" value="" />---</td>

View File

@ -175,9 +175,9 @@ function ConvertToSecurity( $security ) {
$protocol = $protocol_match[1]; $protocol = $protocol_match[1];
$matchArr = explode('-', $match); $matchArr = explode('-', $match);
if (count($matchArr) > 2) { if (count($matchArr) > 2) {
$options[] = $protocol . ' ('. $matchArr[2] .')'; $options[] = htmlspecialchars($protocol . ' ('. $matchArr[2] .')', ENT_QUOTES);
} else { } else {
$options[] = $protocol; $options[] = htmlspecialchars($protocol, ENT_QUOTES);
} }
} }
} }