[Phpgroupware-cvs] CVS: admin/inc class.uiaccounts.inc.php, 1.23.2.9.2.14, 1.23.2.9.2.15

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.uiaccounts.inc.php 
Log Message:
rolled back jscal

Index: class.uiaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccounts.inc.php,v
retrieving revision 1.23.2.9.2.14
retrieving revision 1.23.2.9.2.15
diff -C2 -r1.23.2.9.2.14 -r1.23.2.9.2.15
*** class.uiaccounts.inc.php    18 Aug 2003 23:43:48 -0000      1.23.2.9.2.14
--- class.uiaccounts.inc.php    7 Sep 2003 09:27:04 -0000       1.23.2.9.2.15
***************
*** 933,937 ****
                {
                        $sbox = createobject('phpgwapi.sbox');
-                       $jscal = CreateObject('phpgwapi.jscalendar');
  
                        unset($GLOBALS['phpgw_info']['flags']['noheader']);
--- 933,936 ----
***************
*** 991,994 ****
--- 990,1014 ----
                                        $userData['changepassword'] = True;
                                }
+ 
+                               if ($userData['expires'] == -1)
+                               {
+                                       $userData['account_expires_month'] = 0;
+                                       $userData['account_expires_day']   = 0;
+                                       $userData['account_expires_year']  = 0;
+                               }
+                               else
+                               {
+                                       /*Change this to be an admin/setup 
setting.
+                                          For now, default to expire one week 
from today. */
+                                          
+                                       $time_var = time() + (60*60*24*7);
+                                       $userData['account_expires_month'] = 
+                                               date('m',$userData['expires'] > 
0 ? $userData['expires'] : $time_var);
+                                       $userData['account_expires_day']   = 
+                                               date('d',$userData['expires'] > 
0 ? $userData['expires'] : $time_var);
+                                       $userData['account_expires_year']  = 
+                                               date('Y',$userData['expires'] > 
0 ? $userData['expires'] : $time_var);
+                               }
+ 
                                $allGroups = $account->get_list('groups');
                        }
***************
*** 1040,1043 ****
--- 1060,1068 ----
                                $loginshell = '';
                        }
+                       
+                       $_y = 
$sbox->getyears('account_expires_year',$userData['account_expires_year'],date('Y'),date('Y')+10);
+                       $_m = 
$sbox->getmonthtext('account_expires_month',$userData['account_expires_month']);
+                       $_d = 
$sbox->getdays('account_expires_day',$userData['account_expires_day']);
+ 
                        $account_file_space = '';
                /*
***************
*** 1068,1072 ****
                */
                        $var = Array(
!                               'input_expires' => 
$jscal->input('expires',$userData['expires']<0?'':($userData['expires']?$userData['expires']:time()+(60*60*24*7))),
                                'lang_never'    => lang('Never'),
                                'account_lid'   => '<input name="account_lid" 
value="' . $userData['account_lid'] . '">',
--- 1093,1097 ----
                */
                        $var = Array(
!                               'input_expires' => 
$GLOBALS['phpgw']->common->dateformatorder($_y,$_m,$_d,True),
                                'lang_never'    => lang('Never'),
                                'account_lid'   => '<input name="account_lid" 
value="' . $userData['account_lid'] . '">',