[Phpgroupware-cvs] CVS: admin/inc class.boaccounts.inc.php, 1.22.2.7.2.5, 1.22.2.7.2.6

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv31666

Modified Files:
      Tag: Version-0_9_16-branch
        class.boaccounts.inc.php 
Log Message:
rollback jscal

Index: class.boaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.boaccounts.inc.php,v
retrieving revision 1.22.2.7.2.5
retrieving revision 1.22.2.7.2.6
diff -C2 -r1.22.2.7.2.5 -r1.22.2.7.2.6
*** class.boaccounts.inc.php    19 Aug 2003 12:16:27 -0000      1.22.2.7.2.5
--- class.boaccounts.inc.php    7 Sep 2003 09:57:42 -0000       1.22.2.7.2.6
***************
*** 323,334 ****
                                        'homedirectory'         => 
$_POST['homedirectory'],
                                        'loginshell'            => 
$_POST['loginshell'],
!                                       'account_expires_never' => 
$_POST['never_expires']
                                        /* 'file_space' => 
$_POST['account_file_space_number'] . "-" . $_POST['account_file_space_type'] */
                                );
-                               if ($_POST['expires'] !== '' && 
!$_POST['never_expires'])
-                               {
-                                       $jscal = 
CreateObject('phpgwapi.jscalendar',False);
-                                       $userData += 
$jscal->input2date($_POST['expires'],False,'account_expires_day','account_expires_month','account_expires_year');
-                               }
                                if (!$errors = $this->validate_user($userData))
                                {
--- 323,332 ----
                                        'homedirectory'         => 
$_POST['homedirectory'],
                                        'loginshell'            => 
$_POST['loginshell'],
!                                       'account_expires_month' => 
$_POST['account_expires_month'],
!                                       'account_expires_day'   => 
$_POST['account_expires_day'],
!                                       'account_expires_year'  => 
$_POST['account_expires_year'],
!                                       'account_expires_never' => 
$_POST['never_expires'],
                                        /* 'file_space' => 
$_POST['account_file_space_number'] . "-" . $_POST['account_file_space_type'] */
                                );
                                if (!$errors = $this->validate_user($userData))
                                {
***************
*** 563,574 ****
                                        'homedirectory'         => 
$_POST['homedirectory'],
                                        'loginshell'            => 
$_POST['loginshell'],
                                        'account_expires_never' => 
$_POST['never_expires']
                                        /* 'file_space' => 
$_POST['account_file_space_number'] . "-" . $_POST['account_file_space_type'] */
                                );
!                               if ($_POST['expires'] !== '' && 
!$_POST['never_expires'])
!                               {
!                                       $jscal = 
CreateObject('phpgwapi.jscalendar',False);
!                                       $userData += 
$jscal->input2date($_POST['expires'],False,'account_expires_day','account_expires_month','account_expires_year');
!                               }
                                if (!$errors = $this->validate_user($userData))
                                {
--- 561,571 ----
                                        'homedirectory'         => 
$_POST['homedirectory'],
                                        'loginshell'            => 
$_POST['loginshell'],
+                                       'account_expires_month' => 
$_POST['account_expires_month'],
+                                       'account_expires_day'   => 
$_POST['account_expires_day'],
+                                       'account_expires_year'  => 
$_POST['account_expires_year'],
                                        'account_expires_never' => 
$_POST['never_expires']
                                        /* 'file_space' => 
$_POST['account_file_space_number'] . "-" . $_POST['account_file_space_type'] */
                                );
! 
                                if (!$errors = $this->validate_user($userData))
                                {