[Phpgroupware-cvs] CVS: property list_event.php,1.1,1.2

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property
In directory subversions:/tmp/cvs-serv7802

Modified Files:
        list_event.php 
Log Message:
no message

Index: list_event.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_event.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** list_event.php      28 Sep 2002 22:08:14 -0000      1.1
--- list_event.php      30 Sep 2002 16:28:00 -0000      1.2
***************
*** 71,74 ****
--- 71,75 ----
        
$t->set_var('location_link',$GLOBALS['phpgw']->link('/property/event_apartment.php'));
        $t->set_var('lang_location',lang('Location'));
+       $t->set_var('lang_equipment',lang('Equipment'));
  
  
***************
*** 171,175 ****
        if (!$start_date)
        {
!               $start_dateout = 
$GLOBALS['phpgw']->common->show_date(mktime(),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
                $t->set_var('start_date',$start_dateout);
        }
--- 172,176 ----
        if (!$start_date)
        {
!               $start_dateout = 
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,date("m"),date("d")-7,date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
                $t->set_var('start_date',$start_dateout);
        }
***************
*** 327,331 ****
        $t->set_var('lang_descr',lang('Description'));
        $t->set_var('lang_apartment',lang('Apartment'));
-       $t->set_var('lang_equipment',lang('Equipment'));
        $t->set_var('lang_edit_entry',lang('Edit'));
        $t->set_var('lang_building',lang('Building'));
--- 328,331 ----
***************
*** 421,424 ****
--- 421,425 ----
  //print_r(array_keys ($event_user));
  
+                       $event_user_lid='';
                        $event_user= array_keys ($event_user);
                        $event_user_c=count($event_user);
***************
*** 429,432 ****
--- 430,434 ----
                        }
  
+ //                    $account_lid = implode(",", 
array_unique($event_user_lid));
                        $account_lid = implode(",", $event_user_lid);
  
***************
*** 497,504 ****
                                $user_id = $db2->f('user_id');
                                $account_lid = 
$GLOBALS['phpgw']->accounts->id2name($user_id);
-                               if (! $account_lid)  $account_lid  = ' ';
                                $datetime_reject = $db2->f('datetime_reject');
                                $datetime_done = $db2->f('datetime_done');
                        }
  
                        $month = 
$GLOBALS['phpgw']->common->show_date(time(),'n');
--- 499,512 ----
                                $user_id = $db2->f('user_id');
                                $account_lid = 
$GLOBALS['phpgw']->accounts->id2name($user_id);
                                $datetime_reject = $db2->f('datetime_reject');
                                $datetime_done = $db2->f('datetime_done');
                        }
+                       else
+                       {
+                               $datetime_reject = '';
+                               $datetime_done = '';
+                       }
+ 
+                       if (! $account_lid)  $account_lid  = ' ';
  
                        $month = 
$GLOBALS['phpgw']->common->show_date(time(),'n');