mirror of
https://github.com/pfsense/pfsense.git
synced 2025-10-26 11:38:35 +00:00
1b2af00760
Similar to
dedc40f7de
The password field shows the little lock icon, but the text input area
starts over the top of the icon and as I type in the field the password
"dots" go over the lock icon in each of these data entry places.
Changing the field name/id to not be "password" but to be "passwordfld",
"passwordfld1" "passwordfld2" and the like fixes it. Something does not
like the field being called just "password".
In interfaces.php I also changed the field "username" to be
"ppp_username". This standardized it to work in a similar way to
pppoe_username pptp_username fields. It looks easier to understand for
me.
185 lines
6.7 KiB
PHP
185 lines
6.7 KiB
PHP
<?php
|
|
/*
|
|
vpn_pptp_users_edit.php
|
|
part of m0n0wall (http://m0n0.ch/wall)
|
|
part of pfSense
|
|
|
|
Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>.
|
|
Copyright (C) 2013-2015 Electric Sheep Fencing, LP
|
|
All rights reserved.
|
|
|
|
Redistribution and use in source and binary forms, with or without
|
|
modification, are permitted provided that the following conditions are met:
|
|
|
|
1. Redistributions of source code must retain the above copyright notice,
|
|
this list of conditions and the following disclaimer.
|
|
|
|
2. Redistributions in binary form must reproduce the above copyright
|
|
notice, this list of conditions and the following disclaimer in the
|
|
documentation and/or other materials provided with the distribution.
|
|
|
|
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
|
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
|
|
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
|
|
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
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
|
|
POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
##|+PRIV
|
|
##|*IDENT=page-vpn-vpnpptp-user-edit
|
|
##|*NAME=VPN: VPN PPTP: User: Edit page
|
|
##|*DESCR=Allow access to the 'VPN: VPN PPTP: User: Edit' page.
|
|
##|*MATCH=vpn_pptp_users_edit.php*
|
|
##|-PRIV
|
|
|
|
function pptpusercmp($a, $b) {
|
|
return strcasecmp($a['name'], $b['name']);
|
|
}
|
|
|
|
function pptpd_users_sort() {
|
|
global $config;
|
|
|
|
if (!is_array($config['ppptpd']['user']))
|
|
return;
|
|
|
|
usort($config['pptpd']['user'], "pptpusercmp");
|
|
}
|
|
|
|
require("guiconfig.inc");
|
|
require_once("vpn.inc");
|
|
|
|
if (!is_array($config['pptpd']['user'])) {
|
|
$config['pptpd']['user'] = array();
|
|
}
|
|
$a_secret = &$config['pptpd']['user'];
|
|
|
|
if (is_numericint($_GET['id']))
|
|
$id = $_GET['id'];
|
|
if (isset($_POST['id']) && is_numericint($_POST['id']))
|
|
$id = $_POST['id'];
|
|
|
|
if (isset($id) && $a_secret[$id]) {
|
|
$pconfig['username'] = $a_secret[$id]['name'];
|
|
$pconfig['ip'] = $a_secret[$id]['ip'];
|
|
}
|
|
|
|
if ($_POST) {
|
|
|
|
unset($input_errors);
|
|
$pconfig = $_POST;
|
|
|
|
/* input validation */
|
|
if (isset($id) && ($a_secret[$id])) {
|
|
$reqdfields = explode(" ", "username");
|
|
$reqdfieldsn = array(gettext("Username"));
|
|
} else {
|
|
$reqdfields = explode(" ", "username passwordfld1");
|
|
$reqdfieldsn = array(gettext("Username"),gettext("Password"));
|
|
}
|
|
|
|
do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
|
|
|
|
if (preg_match("/[^a-zA-Z0-9\.\-_]/", $_POST['username']))
|
|
$input_errors[] = gettext("The username contains invalid characters.");
|
|
|
|
if (preg_match("/^!/", $_POST['passwordfld1']))
|
|
$input_errors[] = gettext("The password cannot start with '!'.");
|
|
|
|
if (!preg_match("/^[\x20-\x7E]*$/", $_POST['passwordfld1']))
|
|
$input_errors[] = gettext("The password contains invalid characters.");
|
|
|
|
if (($_POST['passwordfld1']) && ($_POST['passwordfld1'] != $_POST['passwordfld2'])) {
|
|
$input_errors[] = gettext("The passwords do not match.");
|
|
}
|
|
if (($_POST['ip'] && !is_ipaddr($_POST['ip']))) {
|
|
$input_errors[] = gettext("The IP address entered is not valid.");
|
|
}
|
|
|
|
if (!$input_errors && !(isset($id) && $a_secret[$id])) {
|
|
/* make sure there are no dupes */
|
|
foreach ($a_secret as $secretent) {
|
|
if ($secretent['name'] == $_POST['username']) {
|
|
$input_errors[] = gettext("Another entry with the same username already exists.");
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!$input_errors) {
|
|
|
|
if (isset($id) && $a_secret[$id])
|
|
$secretent = $a_secret[$id];
|
|
|
|
$secretent['name'] = $_POST['username'];
|
|
$secretent['ip'] = $_POST['ip'];
|
|
|
|
if ($_POST['passwordfld1'])
|
|
$secretent['password'] = $_POST['passwordfld1'];
|
|
|
|
if (isset($id) && $a_secret[$id])
|
|
$a_secret[$id] = $secretent;
|
|
else
|
|
$a_secret[] = $secretent;
|
|
pptpd_users_sort();
|
|
|
|
write_config();
|
|
mark_subsystem_dirty('pptpusers');
|
|
|
|
header("Location: vpn_pptp_users.php");
|
|
exit;
|
|
}
|
|
}
|
|
|
|
$pgtitle = array(gettext("VPN"),gettext("VPN PPTP"),gettext("User"),gettext("Edit"));
|
|
$shortcut_section = "pptps";
|
|
include("head.inc");
|
|
|
|
?>
|
|
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
|
|
<?php include("fbegin.inc"); ?>
|
|
<?php if ($input_errors) print_input_errors($input_errors); ?>
|
|
<form action="vpn_pptp_users_edit.php" method="post" name="iform" id="iform">
|
|
<div id="mainarea">
|
|
<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="vpn pptp users edit">
|
|
<tr>
|
|
<td width="22%" valign="top" class="vncellreq"><?=gettext("Username");?></td>
|
|
<td width="78%" class="vtable">
|
|
<?=$mandfldhtml;?><input name="username" type="text" class="formfld user" id="username" size="20" value="<?=htmlspecialchars($pconfig['username']);?>" />
|
|
</td>
|
|
</tr>
|
|
<tr>
|
|
<td width="22%" valign="top" class="vncellreq"><?=gettext("Password");?></td>
|
|
<td width="78%" class="vtable">
|
|
<?=$mandfldhtml;?><input name="passwordfld1" type="password" class="formfld pwd" id="passwordfld1" size="20" />
|
|
<br /><?=$mandfldhtml;?><input name="passwordfld2" type="password" class="formfld pwd" id="passwordfld2" size="20" />
|
|
(<?=gettext("confirmation");?>)<?php if (isset($id) && $a_secret[$id]): ?><br />
|
|
<span class="vexpl"><?=gettext("If you want to change the users' password, ".
|
|
"enter it here twice.");?></span><?php endif; ?></td>
|
|
</tr>
|
|
<tr>
|
|
<td width="22%" valign="top" class="vncell"><?=gettext("IP address");?></td>
|
|
<td width="78%" class="vtable">
|
|
<input name="ip" type="text" class="formfld unknown" id="ip" size="20" value="<?=htmlspecialchars($pconfig['ip']);?>" />
|
|
<br /><span class="vexpl"><?=gettext("If you want the user to be assigned a specific IP address, enter it here.");?></span></td>
|
|
</tr>
|
|
<tr>
|
|
<td class="vncell" width="22%" valign="top"> </td>
|
|
<td class="vncell" width="78%">
|
|
<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
|
|
<?php if (isset($id) && $a_secret[$id]): ?>
|
|
<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
|
|
<?php endif; ?>
|
|
</td>
|
|
</tr>
|
|
</table>
|
|
</div>
|
|
</form>
|
|
<?php include("fend.inc"); ?>
|
|
</body>
|
|
</html>
|