extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-28 16:21:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add never expires checkbox, since default date is now valid; Fixes to verify status is unsettable;

Browse Source
This commit is contained in:
Miles Lott 2001-09-08 06:18:43 +00:00
parent 71b16171cf
commit a7d2c1f0f5
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
admin/inc/class.boaccounts.inc.php
View File

@ -271,7 +271,8 @@
'account_firstname' => $GLOBALS['HTTP_POST_VARS']['account_firstname'], 'account_firstname' => $GLOBALS['HTTP_POST_VARS']['account_firstname'],
'account_lastname' => $GLOBALS['HTTP_POST_VARS']['account_lastname'], 'account_lastname' => $GLOBALS['HTTP_POST_VARS']['account_lastname'],
'account_passwd' => $GLOBALS['HTTP_POST_VARS']['account_passwd'], 'account_passwd' => $GLOBALS['HTTP_POST_VARS']['account_passwd'],
'account_status' => ($GLOBALS['HTTP_POST_VARS']['account_status']?$GLOBALS['HTTP_POST_VARS']['account_status']:''), 'status' => ($GLOBALS['HTTP_POST_VARS']['account_status'] ? 'A' : ''),
'account_status' => ($GLOBALS['HTTP_POST_VARS']['account_status'] ? 'A' : ''),
'old_loginid' => ($GLOBALS['HTTP_GET_VARS']['old_loginid']?rawurldecode($GLOBALS['HTTP_GET_VARS']['old_loginid']):''), 'old_loginid' => ($GLOBALS['HTTP_GET_VARS']['old_loginid']?rawurldecode($GLOBALS['HTTP_GET_VARS']['old_loginid']):''),
'account_id' => ($GLOBALS['HTTP_GET_VARS']['account_id']?$GLOBALS['HTTP_GET_VARS']['account_id']:0), 'account_id' => ($GLOBALS['HTTP_GET_VARS']['account_id']?$GLOBALS['HTTP_GET_VARS']['account_id']:0),
'account_passwd_2' => $GLOBALS['HTTP_POST_VARS']['account_passwd_2'], 'account_passwd_2' => $GLOBALS['HTTP_POST_VARS']['account_passwd_2'],
@ -281,7 +282,8 @@
'loginshell' => $GLOBALS['HTTP_POST_VARS']['loginshell'], 'loginshell' => $GLOBALS['HTTP_POST_VARS']['loginshell'],
'account_expires_month' => $GLOBALS['HTTP_POST_VARS']['account_expires_month'], 'account_expires_month' => $GLOBALS['HTTP_POST_VARS']['account_expires_month'],
'account_expires_day' => $GLOBALS['HTTP_POST_VARS']['account_expires_day'], 'account_expires_day' => $GLOBALS['HTTP_POST_VARS']['account_expires_day'],
'account_expires_year' => $GLOBALS['HTTP_POST_VARS']['account_expires_year'] 'account_expires_year' => $GLOBALS['HTTP_POST_VARS']['account_expires_year'],
'account_expires_never' => $GLOBALS['HTTP_POST_VARS']['never_expires']
/* 'file_space' => $GLOBALS['HTTP_POST_VARS']['account_file_space_number'] . "-" . $GLOBALS['HTTP_POST_VARS']['account_file_space_type'] */ /* 'file_space' => $GLOBALS['HTTP_POST_VARS']['account_file_space_number'] . "-" . $GLOBALS['HTTP_POST_VARS']['account_file_space_type'] */
); );
@ -586,7 +588,8 @@
'firstname' => $GLOBALS['HTTP_POST_VARS']['account_firstname'], 'firstname' => $GLOBALS['HTTP_POST_VARS']['account_firstname'],
'lastname' => $GLOBALS['HTTP_POST_VARS']['account_lastname'], 'lastname' => $GLOBALS['HTTP_POST_VARS']['account_lastname'],
'account_passwd' => $GLOBALS['HTTP_POST_VARS']['account_passwd'], 'account_passwd' => $GLOBALS['HTTP_POST_VARS']['account_passwd'],
'status' => $GLOBALS['HTTP_POST_VARS']['account_status'], 'status' => ($GLOBALS['HTTP_POST_VARS']['account_status'] ? 'A' : ''),
'account_status' => ($GLOBALS['HTTP_POST_VARS']['account_status'] ? 'A' : ''),
'old_loginid' => ($GLOBALS['HTTP_GET_VARS']['old_loginid']?rawurldecode($GLOBALS['HTTP_GET_VARS']['old_loginid']):''), 'old_loginid' => ($GLOBALS['HTTP_GET_VARS']['old_loginid']?rawurldecode($GLOBALS['HTTP_GET_VARS']['old_loginid']):''),
'account_id' => ($GLOBALS['HTTP_GET_VARS']['account_id']?$GLOBALS['HTTP_GET_VARS']['account_id']:0), 'account_id' => ($GLOBALS['HTTP_GET_VARS']['account_id']?$GLOBALS['HTTP_GET_VARS']['account_id']:0),
'account_passwd_2' => $GLOBALS['HTTP_POST_VARS']['account_passwd_2'], 'account_passwd_2' => $GLOBALS['HTTP_POST_VARS']['account_passwd_2'],
@ -596,7 +599,8 @@
'loginshell' => $GLOBALS['HTTP_POST_VARS']['loginshell'], 'loginshell' => $GLOBALS['HTTP_POST_VARS']['loginshell'],
'account_expires_month' => $GLOBALS['HTTP_POST_VARS']['account_expires_month'], 'account_expires_month' => $GLOBALS['HTTP_POST_VARS']['account_expires_month'],
'account_expires_day' => $GLOBALS['HTTP_POST_VARS']['account_expires_day'], 'account_expires_day' => $GLOBALS['HTTP_POST_VARS']['account_expires_day'],
'account_expires_year' => $GLOBALS['HTTP_POST_VARS']['account_expires_year'] 'account_expires_year' => $GLOBALS['HTTP_POST_VARS']['account_expires_year'],
'account_expires_never' => $GLOBALS['HTTP_POST_VARS']['never_expires']
/* 'file_space' => $GLOBALS['HTTP_POST_VARS']['account_file_space_number'] . "-" . $GLOBALS['HTTP_POST_VARS']['account_file_space_type'] */ /* 'file_space' => $GLOBALS['HTTP_POST_VARS']['account_file_space_number'] . "-" . $GLOBALS['HTTP_POST_VARS']['account_file_space_type'] */
); );
@ -707,17 +711,25 @@
$totalerrors++; $totalerrors++;
} }
if ($_userData['account_expires_month'] || $_userData['account_expires_day'] || $_userData['account_expires_year']) if ($_userData['account_expires_month'] || $_userData['account_expires_day'] || $_userData['account_expires_year'] || $_userData['account_expires_never'])
{ {
if (! checkdate($_userData['account_expires_month'],$_userData['account_expires_day'],$_userData['account_expires_year'])) if($_userData['account_expires_never'])
{ {
$error[$totalerrors] = lang('You have entered an invalid expiration date'); $_userData['expires'] = -1;
$totalerrors++; $_userData['account_expires'] = $_userData['expires'];
} }
else else
{ {
$_userData['expires'] = mktime(2,0,0,$_userData['account_expires_month'],$_userData['account_expires_day'],$_userData['account_expires_year']); if (! checkdate($_userData['account_expires_month'],$_userData['account_expires_day'],$_userData['account_expires_year']))
$_userData['account_expires'] = $_userData['expires']; {
$error[$totalerrors] = lang('You have entered an invalid expiration date');
$totalerrors++;
}
else
{
$_userData['expires'] = mktime(2,0,0,$_userData['account_expires_month'],$_userData['account_expires_day'],$_userData['account_expires_year']);
$_userData['account_expires'] = $_userData['expires'];
}
} }
} }
else else