github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-20 05:14:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow spaces in Full Names

Browse source
This commit is contained in:
Serghey Rodin 2013-11-14 17:42:34 +02:00
commit d27cfa7590
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
func/main.sh
View file

@ -605,6 +605,15 @@ validate_format_name() {
fi fi
} }
# Name with space
validate_format_name_s() {
if ! [[ "$1" =~ ^[[:alnum:]][-|\ |\.|_[:alnum:]]{0,28}[[:alnum:]]$ ]]; then
echo "Error: $2 $1 is not valid"
log_event "$E_INVALID" "$EVENT"
exit $E_INVALID
fi
}
# Username # Username
validate_format_username() { validate_format_username() {
if ! [[ "$1" =~ ^[a-zA-Z0-9][-|\.|_|a-zA-Z0-9]{0,28}[a-zA-Z0-9]$ ]]; then if ! [[ "$1" =~ ^[a-zA-Z0-9][-|\.|_|a-zA-Z0-9]{0,28}[a-zA-Z0-9]$ ]]; then
@ -795,7 +804,7 @@ validate_format(){
email) validate_format_email "$arg" ;; email) validate_format_email "$arg" ;;
exp) validate_format_date "$arg" ;; exp) validate_format_date "$arg" ;;
extentions) validate_format_common "$arg" 'extentions' ;; extentions) validate_format_common "$arg" 'extentions' ;;
fname) validate_format_name "$arg" "$arg_name" ;; fname) validate_format_name_s "$arg" "$arg_name" ;;
forward) validate_format_email "$arg" ;; forward) validate_format_email "$arg" ;;
ftp_password) validate_format_password "$arg" ;; ftp_password) validate_format_password "$arg" ;;
ftp_user) validate_format_username "$arg" "$arg_name" ;; ftp_user) validate_format_username "$arg" "$arg_name" ;;
@ -808,7 +817,7 @@ validate_format(){
ip_status) validate_format_ip_status "$arg" ;; ip_status) validate_format_ip_status "$arg" ;;
job) validate_format_int "$arg" 'job' ;; job) validate_format_int "$arg" 'job' ;;
key) validate_format_username "$arg" "$arg_name" ;; key) validate_format_username "$arg" "$arg_name" ;;
lname) validate_format_name "$arg" "$arg_name" ;; lname) validate_format_name_s "$arg" "$arg_name" ;;
malias) validate_format_username "$arg" "$arg_name" ;; malias) validate_format_username "$arg" "$arg_name" ;;
mask) validate_format_ip "$arg" ;; mask) validate_format_ip "$arg" ;;
max_db) validate_format_int "$arg" 'max db';; max_db) validate_format_int "$arg" 'max db';;

2
web/edit/user/index.php
View file

@ -120,6 +120,8 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-change-user-name ".$v_username." ".$v_fname." ".$v_lname, $output, $return_var); exec (VESTA_CMD."v-change-user-name ".$v_username." ".$v_fname." ".$v_lname, $output, $return_var);
check_return_code($return_var,$output); check_return_code($return_var,$output);
unset($output); unset($output);
$v_fname = $_POST['v_fname'];
$v_lname = $_POST['v_lname'];
} }
// Change NameServers // Change NameServers

4
web/templates/admin/edit_user.html
View file

@ -139,7 +139,7 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<input type="text" size="20" class="vst-input" name="v_fname" <?php if (!empty($v_fname)) echo "value=".$v_fname; ?>> <input type="text" size="20" class="vst-input" name="v_fname" <?php if (!empty($v_fname)) echo "value=\"".$v_fname."\""; ?>>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -149,7 +149,7 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<input type="text" size="20" class="vst-input" name="v_lname" <?php if (!empty($v_lname)) echo "value=".$v_lname; ?>> <input type="text" size="20" class="vst-input" name="v_lname" <?php if (!empty($v_lname)) echo "value=\"".$v_lname."\""; ?>>
</td> </td>
</tr> </tr>
<tr> <tr>