Skip to content

O
OpnSense
Commit 3e170015 authored by Ad Schellevis's avatar Ad Schellevis Committed by Franco Fichtner
Browse files
Options

(legacy) quick refactor vpn_pptp_users_edit.php 

(cherry picked from commit ada16808)
parent c99aeee1
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 100 deletions
src/www/vpn_pptp_users_edit.php
View file @ 3e170015
<?php <?php
/* /*
Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2014-2016 Deciso B.V.
Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>. Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>.
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 pptpusercmp($a, $b) function pptpusercmp($a, $b)
...@@ -54,19 +54,21 @@ if (!is_array($config['pptpd']['user'])) { ...@@ -54,19 +54,21 @@ if (!is_array($config['pptpd']['user'])) {
} }
$a_secret = &$config['pptpd']['user']; $a_secret = &$config['pptpd']['user'];
if (is_numericint($_GET['id'])) { if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$id = $_GET['id']; if (isset($_GET['id']) && !empty($a_secret[$_GET['id']])) {
} $id = $_GET['id'];
if (isset($_POST['id']) && is_numericint($_POST['id'])) { }
$id = $_POST['id']; if (isset($id)) {
} $pconfig['username'] = $a_secret[$id]['name'];
$pconfig['ip'] = $a_secret[$id]['ip'];
if (isset($id) && $a_secret[$id]) { } else {
$pconfig['username'] = $a_secret[$id]['name']; $pconfig['username'] = null;
$pconfig['ip'] = $a_secret[$id]['ip']; $pconfig['ip'] = null;
} }
} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
if ($_POST) { if (isset($_POST['id']) && !empty($a_secret[$_POST['id']])) {
$id = $_POST['id'];
}
unset($input_errors); unset($input_errors);
$pconfig = $_POST; $pconfig = $_POST;
...@@ -137,73 +139,80 @@ if ($_POST) { ...@@ -137,73 +139,80 @@ if ($_POST) {
} }
} }
$service_hook = 'pptpd';
$service_hook = 'pptpd';
legacy_html_escape_form_data($pconfig);
include("head.inc"); include("head.inc");
?> ?>
<body> <body>
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main">
<section class="page-content-main"> <div class="container-fluid">
<div class="container-fluid"> <div class="row">
<div class="row"> <?php if (isset($input_errors) && count($input_errors) > 0) {
print_input_errors($input_errors);
} ?>
<?php if (isset($input_errors) && count($input_errors) > 0) { <section class="col-xs-12">
print_input_errors($input_errors); <div class="tab-content content-box col-xs-12">
} ?> <form method="post" name="iform" id="iform">
<div class="table-responsive">
<section class="col-xs-12"> <table class="table table-striped">
<div class="tab-content content-box col-xs-12"> <tr>
<td width="22%">
<form action="vpn_pptp_users_edit.php" method="post" name="iform" id="iform"> <strong><?=gettext("Edit User");?></strong>
</td>
<div class="table-responsive"> <td width="78%" align="right">
<table class="table table-striped table-sort"> <small><?=gettext("full help"); ?> </small>
<tr> <i class="fa fa-toggle-off text-danger" style="cursor: pointer;" id="show_all_help_page"></i>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Username");?></td> </td>
<td width="78%" class="vtable"> </tr>
<input name="username" type="text" class="form-control user" id="username" size="20" value="<?=htmlspecialchars($pconfig['username']);?>" /> <tr>
</td> <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Username");?></td>
</tr> <td>
<tr> <input name="username" type="text" id="username" value="<?=$pconfig['username'];?>" />
<td width="22%" valign="top" class="vncellreq"><?=gettext("Password");?></td> </td>
<td width="78%" class="vtable"> </tr>
<input name="password" type="password" class="form-control pwd" id="password" size="20" /> <tr>
<br /><input name="password2" type="password" class="form-control pwd" id="password2" size="20" /> <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Password");?></td>
&nbsp;(<?=gettext("confirmation");?>)<?php if (isset($id) && $a_secret[$id]) : <td>
?><br /> <input name="password" type="password" class="form-control pwd" id="password" />
<span class="vexpl"><?=gettext("If you want to change the users' password, ". <br /><input name="password2" type="password" class="form-control pwd" id="password2" />
"enter it here twice.");?></span><?php &nbsp;(<?=gettext("confirmation");?>)
endif; ?></td> <?php
</tr> if (isset($id)) :?><br />
<tr> <?=gettext("If you want to change the users' password, ".
<td width="22%" valign="top" class="vncell"><?=gettext("IP address");?></td> "enter it here twice.");?>
<td width="78%" class="vtable"> <?php
<input name="ip" type="text" class="form-control unknown" id="ip" size="20" value="<?=htmlspecialchars($pconfig['ip']);?>" /> endif; ?>
<br /><span class="vexpl"><?=gettext("If you want the user to be assigned a specific IP address, enter it here.");?></span></td> </td>
</tr> </tr>
<tr> <tr>
<td class="vncell" width="22%" valign="top">&nbsp;</td> <td><a id="help_for_ip" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("IP address");?></td>
<td class="vncell" width="78%"> <td>
<input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save");?>" /> <input name="ip" type="text" class="form-control unknown" id="ip" value="<?=htmlspecialchars($pconfig['ip']);?>" />
<?php if (isset($id) && $a_secret[$id]) : <div class="hidden" for="help_for_ip">
?> <?=gettext("If you want the user to be assigned a specific IP address, enter it here.");?>
<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" /> </div>
<?php </td>
endif; ?> </tr>
</td> <tr>
</tr> <td>&nbsp;</td>
</table> <td>
</div> <input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save");?>" />
</form> <?php
if (isset($id)) :?>
</div> <input name="id" type="hidden" value="<?=$id;?>" />
</section> <?php
</div> endif; ?>
</div> </td>
</section> </tr>
</table>
</div>
</form>
</div>
</section>
</div>
</div>
</section>
<?php include("foot.inc"); <?php include("foot.inc");
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