phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.10,


From: Mark A Peters <address@hidden>
Subject: [Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.10,1.71.2.11 class.uicalendar.inc.php,1.66.2.20,1.66.2.21 class.socalendar_sql.inc.php,1.28.2.1,1.28.2.2 class.html.inc.php,1.1,1.1.2.1
Date: Sun, 25 Aug 2002 00:07:51 -0400

Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv26872/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.bocalendar.inc.php class.uicalendar.inc.php 
        class.socalendar_sql.inc.php class.html.inc.php 
Log Message:
Updating some of the files to include Ralf Beckers fixes.  Still Need to talk 
with him in regards to a few he has submited.

Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.71.2.10
retrieving revision 1.71.2.11
diff -C2 -r1.71.2.10 -r1.71.2.11
*** class.bocalendar.inc.php    29 Jun 2002 03:33:08 -0000      1.71.2.10
--- class.bocalendar.inc.php    25 Aug 2002 04:07:48 -0000      1.71.2.11
***************
*** 128,131 ****
--- 128,134 ----
                var $debug_string;
  
+               var $sortby;
+               var $num_months;
+ 
                function bocalendar($session=0)
                {
***************
*** 204,209 ****
                        $this->printer_friendly = (intval($friendly) == 
1?True:False);
  
!                       if(isset($GLOBALS['HTTP_POST_VARS']['filter']))   { 
$this->filter = $GLOBALS['HTTP_POST_VARS']['filter']; }
!                       if(isset($GLOBALS['HTTP_POST_VARS']['cat_id']))  { 
$this->cat_id = $GLOBALS['HTTP_POST_VARS']['cat_id']; }
  
                        if(!isset($this->filter))
--- 207,213 ----
                        $this->printer_friendly = (intval($friendly) == 
1?True:False);
  
!                       if(isset($GLOBALS['HTTP_POST_VARS']['filter'])) { 
$this->filter = $GLOBALS['HTTP_POST_VARS']['filter']; }
!                       if(isset($GLOBALS['HTTP_POST_VARS']['sortby'])) { 
$this->sortby = $GLOBALS['HTTP_POST_VARS']['sortby']; }
!                       if(isset($GLOBALS['HTTP_POST_VARS']['cat_id'])) { 
$this->cat_id = $GLOBALS['HTTP_POST_VARS']['cat_id']; }
  
                        if(!isset($this->filter))
***************
*** 221,225 ****
                        );
                        $localtime = 
$GLOBALS['phpgw']->datetime->users_localtime;
!                       
                        $date = (isset($GLOBALS['date'])?$GLOBALS['date']:'');
                        $date = 
(isset($GLOBALS['HTTP_GET_VARS']['date'])?$GLOBALS['HTTP_GET_VARS']['date']:$date);
--- 225,229 ----
                        );
                        $localtime = 
$GLOBALS['phpgw']->datetime->users_localtime;
! 
                        $date = (isset($GLOBALS['date'])?$GLOBALS['date']:'');
                        $date = 
(isset($GLOBALS['HTTP_GET_VARS']['date'])?$GLOBALS['HTTP_GET_VARS']['date']:$date);
***************
*** 228,238 ****
                        $year = 
(isset($GLOBALS['HTTP_GET_VARS']['year'])?$GLOBALS['HTTP_GET_VARS']['year']:'');
                        $year = ($year=='' && 
isset($GLOBALS['HTTP_POST_VARS']['year'])?$GLOBALS['HTTP_POST_VARS']['year']:$year);
!                       
                        $month = 
(isset($GLOBALS['HTTP_GET_VARS']['month'])?$GLOBALS['HTTP_GET_VARS']['month']:'');
                        $month = ($month=='' && 
isset($GLOBALS['HTTP_POST_VARS']['month'])?$GLOBALS['HTTP_POST_VARS']['month']:$month);
!                       
                        $day = 
(isset($GLOBALS['HTTP_GET_VARS']['day'])?$GLOBALS['HTTP_GET_VARS']['day']:'');
                        $day = ($day=='' && 
isset($GLOBALS['HTTP_POST_VARS']['day'])?$GLOBALS['HTTP_POST_VARS']['day']:'');
!                       
                        if(isset($date) && $date!='')
                        {
--- 232,245 ----
                        $year = 
(isset($GLOBALS['HTTP_GET_VARS']['year'])?$GLOBALS['HTTP_GET_VARS']['year']:'');
                        $year = ($year=='' && 
isset($GLOBALS['HTTP_POST_VARS']['year'])?$GLOBALS['HTTP_POST_VARS']['year']:$year);
! 
                        $month = 
(isset($GLOBALS['HTTP_GET_VARS']['month'])?$GLOBALS['HTTP_GET_VARS']['month']:'');
                        $month = ($month=='' && 
isset($GLOBALS['HTTP_POST_VARS']['month'])?$GLOBALS['HTTP_POST_VARS']['month']:$month);
! 
                        $day = 
(isset($GLOBALS['HTTP_GET_VARS']['day'])?$GLOBALS['HTTP_GET_VARS']['day']:'');
                        $day = ($day=='' && 
isset($GLOBALS['HTTP_POST_VARS']['day'])?$GLOBALS['HTTP_POST_VARS']['day']:'');
! 
!                       $num_months = 
(isset($GLOBALS['HTTP_GET_VARS']['num_months'])?$GLOBALS['HTTP_GET_VARS']['num_months']:'');
!                       $num_months = ($num_months=='' && 
isset($GLOBALS['HTTP_POST_VARS']['num_months'])?$GLOBALS['HTTP_POST_VARS']['num_months']:$num_months);
! 
                        if(isset($date) && $date!='')
                        {
***************
*** 247,251 ****
                                        $this->year = $year;
                                }
!                               elseif($this->year == 0)
                                {
                                        $this->year = date('Y',$localtime);
--- 254,258 ----
                                        $this->year = $year;
                                }
!                               else    // if($this->year == 0)
                                {
                                        $this->year = date('Y',$localtime);
***************
*** 255,259 ****
                                        $this->month = $month;
                                }
!                               elseif($this->month == 0)
                                {
                                        $this->month = date('m',$localtime);
--- 262,266 ----
                                        $this->month = $month;
                                }
!                               else    // if($this->month == 0)
                                {
                                        $this->month = date('m',$localtime);
***************
*** 263,267 ****
                                        $this->day = $day;
                                }
!                               elseif($this->day == 0)
                                {
                                        $this->day = date('d',$localtime);
--- 270,274 ----
                                        $this->day = $day;
                                }
!                               else    // if($this->day == 0)
                                {
                                        $this->day = date('d',$localtime);
***************
*** 269,272 ****
--- 276,288 ----
                        }
  
+                       if(isset($num_months) && $num_months!='')
+                       {
+                               $this->num_months = $num_months;
+                       }
+                       elseif($this->num_months == 0)
+                       {
+                               $this->num_months = 1;
+                       }
+ 
  //                    $this->today = 
date('Ymd',$GLOBALS['phpgw']->datetime->gmtnow);
                        $this->today = 
date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
***************
*** 360,367 ****
                function set_owner_to_group($owner)
                {
!                       if($this->debug)
!                       {
!                               echo 
'<!--calendar::bocalendar::set_owner_to_group:owner = '.$owner.' -->'."\n";
!                       }
                        $this->owner = intval($owner);
                        $this->is_group = True;
--- 376,380 ----
                function set_owner_to_group($owner)
                {
!                       
print_debug('calendar::bocalendar::set_owner_to_group:owner',$owner);
                        $this->owner = intval($owner);
                        $this->is_group = True;
***************
*** 413,427 ****
                {
                        $data = 
$GLOBALS['phpgw']->session->appsession('session_data','calendar');
!                       if($this->debug)
!                       {
!                               echo '<!-- 
'."\n".'Read:'."\n"._debug_array($data,False)."\n".' -->'."\n";
!                       }
  
                        $this->filter = $data['filter'];
                        $this->cat_id = $data['cat_id'];
                        $this->owner  = intval($data['owner']);
                        $this->year   = intval($data['year']);
                        $this->month  = intval($data['month']);
                        $this->day    = intval($data['day']);
                }
  
--- 426,439 ----
                {
                        $data = 
$GLOBALS['phpgw']->session->appsession('session_data','calendar');
!                       print_debug('Read',_debug_array($data,False));
  
                        $this->filter = $data['filter'];
                        $this->cat_id = $data['cat_id'];
+                       $this->sortby = $data['sortby'];
                        $this->owner  = intval($data['owner']);
                        $this->year   = intval($data['year']);
                        $this->month  = intval($data['month']);
                        $this->day    = intval($data['day']);
+                       $this->num_months = intval($data['num_months']);
                }
  
***************
*** 447,469 ****
                        {
                                $temp_event = $this->get_cached_event();
!                          $event = $this->read_entry(intval($param['id']));
!                          if($this->owner == $event['owner'])
!                          {
!                               $exception_time = 
mktime($event['start']['hour'],$event['start']['min'],0,$param['month'],$param['day'],$param['year'])
 - $GLOBALS['phpgw']->datetime->tz_offset;
!                               $event['recur_exception'][] = 
intval($exception_time);
!                               $this->so->cal->event = $event;
!                               if($this->debug)
!                               {
!                                       echo '<!-- exception time = 
'.$event['recur_exception'][count($event['recur_exception']) -1].' -->'."\n";
!                                       echo '<!-- count event exceptions = 
'.count($event['recur_exception']).' -->'."\n";
!                                  }
!                               $this->so->add_entry($event);
!                               $cd = 16;
!                       }
!                       else
!                       {
!                          $cd = 60;
!                       }
                        }
                        $this->so->cal->event = $temp_event;
                        unset($temp_event);
--- 459,478 ----
                        {
                                $temp_event = $this->get_cached_event();
!                               $event = 
$this->read_entry(intval($param['id']));
! //                            if($this->owner == $event['owner'])
! //                            {
!                               $exception_time = 
mktime($event['start']['hour'],$event['start']['min'],0,$param['month'],$param['day'],$param['year'])
 - $GLOBALS['phpgw']->datetime->tz_offset;
!                               $event['recur_exception'][] = 
intval($exception_time);
!                               $this->so->cal->event = $event;
!                               print_debug('exception 
time',$event['recur_exception'][count($event['recur_exception']) -1]);
!                               print_debug('count event 
exceptions',count($event['recur_exception']));
!                               $this->so->add_entry($event);
!                               $cd = 16;
                        }
+                       else
+                       {
+                               $cd = 60;
+                       }
+ //                    }
                        $this->so->cal->event = $temp_event;
                        unset($temp_event);
***************
*** 475,489 ****
                        if($this->check_perms(PHPGW_ACL_DELETE))
                        {
!                          $temp_event = $this->read_entry($id);
!                          if($this->owner == $temp_event['owner'])
!                          {
!                               $this->so->delete_entry($id);
!                               $cd = 16;
!                       }
!                       else
!                       {
!                          $cd = 60;
!                       }
                        }
                        return $cd;
                }
--- 484,498 ----
                        if($this->check_perms(PHPGW_ACL_DELETE))
                        {
!                               $temp_event = $this->read_entry($id);
! //                            if($this->owner == $temp_event['owner'])
! //                            {
!                               $this->so->delete_entry($id);
!                               $cd = 16;
                        }
+                       else
+                       {
+                               $cd = 60;
+                       }
+ //                    }
                        return $cd;
                }
***************
*** 495,531 ****
                                $event = 
$this->so->read_entry($params['cal_id']);
                                @reset($params['reinstate_index']);
!                               echo '<!-- Count of reinstate_index = 
'.count($params['reinstate_index']).' -->'."\n";
                                if(count($params['reinstate_index']) > 1)
                                {
                                        while(list($key,$value) = 
each($params['reinstate_index']))
                                        {
!                                               if($this->debug)
!                                               {
!                                                       echo '<!-- 
reinstate_index ['.$key.'] = '.intval($value).' -->'."\n";
!                                                       echo '<!-- exception 
time = '.$event['recur_exception'][intval($value)].' -->'."\n";
!                                               }
                                                
unset($event['recur_exception'][intval($value)]);
!                                               if($this->debug)
!                                               {
!                                                       echo '<!-- count event 
exceptions = '.count($event['recur_exception']).' -->'."\n";
!                                               }
                                        }
                                }
                                else
                                {
!                               if($this->debug)
!                               {
!                                       echo '<!-- reinstate_index [0] = 
'.intval($params['reinstate_index'][0]).' -->'."\n";
!                                       echo '<!-- exception time = 
'.$event['recur_exception'][intval($params['reinstate_index'][0])].' -->'."\n";
!                                  }
                                        
unset($event['recur_exception'][intval($params['reinstate_index'][0])]);
!                               if($this->debug)
!                               {
!                                       echo '<!-- count event exceptions = 
'.count($event['recur_exception']).' -->'."\n";
!                               }
!                          }
!                       $this->so->cal->event = $event;
!                               $this->so->add_entry($event);
!                               return 42;
                        }
                        else
--- 504,528 ----
                                $event = 
$this->so->read_entry($params['cal_id']);
                                @reset($params['reinstate_index']);
!                               print_debug('Count of 
reinstate_index',count($params['reinstate_index']));
                                if(count($params['reinstate_index']) > 1)
                                {
                                        while(list($key,$value) = 
each($params['reinstate_index']))
                                        {
!                                               print_debug('reinstate_index 
['.$key.']',intval($value));
!                                               print_debug('exception 
time',$event['recur_exception'][intval($value)]);
                                                
unset($event['recur_exception'][intval($value)]);
!                                               print_debug('count event 
exceptions',count($event['recur_exception']));
                                        }
                                }
                                else
                                {
!                                       
print_debug('reinstate_index[0]',intval($params['reinstate_index'][0]));
!                                       print_debug('exception 
time',$event['recur_exception'][intval($params['reinstate_index'][0])]);
                                        
unset($event['recur_exception'][intval($params['reinstate_index'][0])]);
!                                       print_debug('count event 
exceptions',count($event['recur_exception']));
!                               }
!                               $this->so->cal->event = $event;
!                               $this->so->add_entry($event);
!                               return 42;
                        }
                        else
***************
*** 701,712 ****
                                        for($i=0;$i<count($parts);$i++)
                                        {
                                                $acct_type = 
$GLOBALS['phpgw']->accounts->get_type(intval($parts[$i]));
                                                if($acct_type == 'u')
                                                {
!                                                       $part[$parts[$i]] = 1;
                                                }
                                                elseif($acct_type == 'g')
                                                {
!                                                       $part[$parts[$i]] = 1;
                                                        $groups[] = $parts[$i];
                                                        /* This pulls ALL users 
of a group and makes them as participants to the event */
--- 698,715 ----
                                        for($i=0;$i<count($parts);$i++)
                                        {
+                                               if (($accept_type = 
substr($parts[$i],-1,1)) == '0' || intval($accept_type) > 0)
+                                               {
+                                                       $accept_type = 'U';
+                                               }
                                                $acct_type = 
$GLOBALS['phpgw']->accounts->get_type(intval($parts[$i]));
                                                if($acct_type == 'u')
                                                {
! //                                                    $part[$parts[$i]] = 1;
!                                                       
$part[intval($parts[$i])] = $accept_type;
                                                }
                                                elseif($acct_type == 'g')
                                                {
! //                                                    $part[$parts[$i]] = 1;
!                                                       
$part[intval($parts[$i])] = $accept_type;
                                                        $groups[] = $parts[$i];
                                                        /* This pulls ALL users 
of a group and makes them as participants to the event */
***************
*** 721,725 ****
                                                        while($member = 
each($members))
                                                        {
!                                                               
$part[$member[1]['account_id']] = 1;
                                                        }
                                                }
--- 724,729 ----
                                                        while($member = 
each($members))
                                                        {
! //                                                            
$part[$member[1]['account_id']] = 1;
!                                                               
$part[$member[1]['account_id']] = $accept_type;
                                                        }
                                                }
***************
*** 734,740 ****
                                {
                                        @reset($part);
!                                       while(list($key,$value) = each($part))
                                        {
!                                               
$this->so->add_attribute('participants','U',intval($key));
                                        }
                                }
--- 738,744 ----
                                {
                                        @reset($part);
!                                       while(list($key,$accept_type) = 
each($part))
                                        {
!                                               
$this->so->add_attribute('participants',$accept_type,intval($key));
                                        }
                                }

Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.20
retrieving revision 1.66.2.21
diff -C2 -r1.66.2.20 -r1.66.2.21
*** class.uicalendar.inc.php    16 Jul 2002 02:03:55 -0000      1.66.2.20
--- class.uicalendar.inc.php    25 Aug 2002 04:07:48 -0000      1.66.2.21
***************
*** 378,382 ****
                                )
                        );
- 
                        $p->set_var($var);
                        return $p->fp('out','index_t');
--- 378,381 ----
***************
*** 837,841 ****
                                $cal_id = $GLOBALS['HTTP_GET_VARS']['cal_id'];
                                $event = 
$this->bo->read_entry(intval($GLOBALS['HTTP_GET_VARS']['cal_id']));
!                               
                                if(!$this->bo->can_user_edit($event))
                                {
--- 836,840 ----
                                $cal_id = $GLOBALS['HTTP_GET_VARS']['cal_id'];
                                $event = 
$this->bo->read_entry(intval($GLOBALS['HTTP_GET_VARS']['cal_id']));
! 
                                if(!$this->bo->can_user_edit($event))
                                {
***************
*** 1453,1457 ****
  
                        $sb = CreateObject('phpgwapi.sbox');
!       
                        unset($GLOBALS['phpgw_info']['flags']['noheader']);
                        unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
--- 1452,1456 ----
  
                        $sb = CreateObject('phpgwapi.sbox');
! 
                        unset($GLOBALS['phpgw_info']['flags']['noheader']);
                        unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
***************
*** 1484,1488 ****
                                )
                        );
!       
  // View type
                        $var[] = Array(
--- 1483,1487 ----
                                )
                        );
! 
  // View type
                        $var[] = Array(
***************
*** 1723,1727 ****
                        
$p->set_block('search_form','search_list','search_list');
                        
$p->set_block('search_form','search_list_footer','search_list_footer');
!       
                        $var = Array(
                                'color'         => $this->theme['bg_text'],
--- 1722,1726 ----
                        
$p->set_block('search_form','search_list','search_list');
                        
$p->set_block('search_form','search_list_footer','search_list_footer');
! 
                        $var = Array(
                                'color'         => $this->theme['bg_text'],
***************
*** 1755,1764 ****
                {
                        $data = array(
!                               'filter'=> $this->bo->filter,
!                               'cat_id'=> $this->bo->cat_id,
!                               'owner' => $this->bo->owner,
!                               'year'  => $this->bo->year,
!                               'month' => $this->bo->month,
!                               'day'   => $this->bo->day
                        );
                        echo '<br>UI:';
--- 1754,1765 ----
                {
                        $data = array(
!                               'filter'     => $this->bo->filter,
!                               'cat_id'     => $this->bo->cat_id,
!                               'owner'      => $this->bo->owner,
!                               'year'       => $this->bo->year,
!                               'month'      => $this->bo->month,
!                               'day'        => $this->bo->day,
!                               'sortby'     => $this->bo->sortby,
!                               'num_months' => $this->bo->num_months
                        );
                        echo '<br>UI:';
***************
*** 1770,1779 ****
                {
                        $data = array(
!                               'filter'=> $this->bo->filter,
!                               'cat_id'=> $this->bo->cat_id,
!                               'owner' => $this->bo->owner,
!                               'year'  => $this->bo->year,
!                               'month' => $this->bo->month,
!                               'day'   => $this->bo->day
                        );
                        $this->bo->save_sessiondata($data);
--- 1771,1783 ----
                {
                        $data = array(
!                               'filter'     => $this->bo->filter,
!                               'cat_id'     => $this->bo->cat_id,
!                               'owner'      => $this->bo->owner,
!                               'year'       => $this->bo->year,
!                               'month'      => $this->bo->month,
!                               'day'        => $this->bo->day,
!                               'date'       => $this->bo->date,
!                               'sortby'     => $this->bo->sortby,
!                               'num_months' => $this->bo->num_months
                        );
                        $this->bo->save_sessiondata($data);
***************
*** 1782,1785 ****
--- 1786,1793 ----
                function output_template_array(&$p,$row,$list,$var)
                {
+                       if (!isset($var['hidden_vars']))
+                       {
+                               $var['hidden_vars'] = '';
+                       }
                        $p->set_var($var);
                        $p->parse($row,$list,True);
***************
*** 2145,2149 ****
                        for($i=0;$i<count($overlapping_events);$i++)
                        {
!                               $overlap .= 
'<li>'.$this->link_to_entry($this->bo->read_entry($overlapping_events[$i]),$month,$mday,$year);
                        }
  
--- 2153,2158 ----
                        for($i=0;$i<count($overlapping_events);$i++)
                        {
!                               $overlapped_event = 
$this->bo->read_entry($overlapping_events[$i]);
!                               $overlap .= '<li> 
['.$GLOBALS['phpgw']->common->grab_owner_name($overlapped_event['owner']).'] 
'.$this->link_to_entry($overlapped_event,$month,$mday,$year);
                        }
  
***************
*** 2255,2259 ****
                        
$p->set_block('month_header','monthly_header','monthly_header');
                        
$p->set_block('month_header','column_title','column_title');
!               
                        $var = Array(
                                'bgcolor'       => $this->theme['th_bg'],
--- 2264,2268 ----
                        
$p->set_block('month_header','monthly_header','monthly_header');
                        
$p->set_block('month_header','column_title','column_title');
! 
                        $var = Array(
                                'bgcolor'       => $this->theme['th_bg'],
***************
*** 2268,2272 ****
                        }
                        $p->set_var($var);
!               
                        $p->set_var('col_width','14');
                        if($display_name == True)
--- 2277,2281 ----
                        }
                        $p->set_var($var);
! 
                        $p->set_var('col_width','14');
                        if($display_name == True)
***************
*** 2287,2294 ****
                function 
display_week($startdate,$weekly,$cellcolor,$display_name = 
False,$owner=0,$monthstart=0,$monthend=0)
                {
!                       if($owner == 0) { $owner = 
$GLOBALS['phpgw_info']['user']['account_id']; }
  
                        $temp_owner = $this->bo->owner;
- //                    $this->bo->owner = $owner;
  
                        $str = '';
--- 2296,2305 ----
                function 
display_week($startdate,$weekly,$cellcolor,$display_name = 
False,$owner=0,$monthstart=0,$monthend=0)
                {
!                       if($owner == 0)
!                       {
!                               $owner = 
$GLOBALS['phpgw_info']['user']['account_id'];
!                       }
  
                        $temp_owner = $this->bo->owner;
  
                        $str = '';
***************
*** 2297,2305 ****
                
                        $p->set_file(
!                                  Array (
                                        'month_header'  => 'month_header.tpl',
!                                       'month_day'     => 'month_day.tpl'
!                               )
!                       );
                        
$p->set_block('month_header','monthly_header','monthly_header');
                        
$p->set_block('month_header','month_column','month_column');
--- 2308,2316 ----
                
                        $p->set_file(
!                               Array(
                                        'month_header'  => 'month_header.tpl',
!                                       'month_day'     => 'month_day.tpl'
!                               )
!                       );
                        
$p->set_block('month_header','monthly_header','monthly_header');
                        
$p->set_block('month_header','month_column','month_column');
***************
*** 2307,2311 ****
                        $p->set_block('month_day','day_event','day_event');
                        $p->set_block('month_day','event','event');
!               
                        $p->set_var('extra','');
                        $p->set_var('col_width','14');
--- 2318,2322 ----
                        $p->set_block('month_day','day_event','day_event');
                        $p->set_block('month_day','event','event');
! 
                        $p->set_var('extra','');
                        $p->set_var('col_width','14');
***************
*** 2862,2866 ****
  
                        $date_to_eval = 
sprintf("%04d%02d%02d",$params['year'],$params['month'],$params['day']);
!       
                        $time = Array();
  
--- 2873,2877 ----
  
                        $date_to_eval = 
sprintf("%04d%02d%02d",$params['year'],$params['month'],$params['day']);
! 
                        $time = Array();
  
***************
*** 2960,2966 ****
                                                        $rowspan = 
intval(($endtime - $last_starttime) / (60 * 
intval($this->bo->prefs['calendar']['interval'])));
                                                }
!                                               
                                                $mins = (int)((($endtime - 
$starttime) / 60) % 60);
!                       
                                                if(($mins <> 0 && $mins <= 
intval(60 / intval($this->bo->prefs['calendar']['interval']))) || ($mins == 0 
&& date('i',$endtime) > intval($this->bo->prefs['calendar']['interval'])))
                                                {
--- 2971,2977 ----
                                                        $rowspan = 
intval(($endtime - $last_starttime) / (60 * 
intval($this->bo->prefs['calendar']['interval'])));
                                                }
! 
                                                $mins = (int)((($endtime - 
$starttime) / 60) % 60);
! 
                                                if(($mins <> 0 && $mins <= 
intval(60 / intval($this->bo->prefs['calendar']['interval']))) || ($mins == 0 
&& date('i',$endtime) > intval($this->bo->prefs['calendar']['interval'])))
                                                {
***************
*** 3198,3202 ****
                                $this->bo->so->owner = $part;
                                $this->bo->so->open_box($part);
- 
                                $this->bo->store_to_cache(
                                        Array(
--- 3209,3212 ----
***************
*** 3437,3441 ****
                                $users = Array();
                                
$this->build_part_list($users,$accounts,$this->bo->owner);
!     
                                $str = '';
                                @asort($users);
--- 3447,3451 ----
                                $users = Array();
                                
$this->build_part_list($users,$accounts,$this->bo->owner);
! 
                                $str = '';
                                @asort($users);

Index: class.socalendar_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.socalendar_sql.inc.php,v
retrieving revision 1.28.2.1
retrieving revision 1.28.2.2
diff -C2 -r1.28.2.1 -r1.28.2.2
*** class.socalendar_sql.inc.php        23 Jun 2002 20:28:43 -0000      1.28.2.1
--- class.socalendar_sql.inc.php        25 Aug 2002 04:07:48 -0000      1.28.2.2
***************
*** 496,500 ****
                while (list($key,$value) = @each($event['participants']))
                {
!                       if(intval($key) == intval($this->user))
                        {
                                $value = 'A';
--- 496,501 ----
                while (list($key,$value) = @each($event['participants']))
                {
! //                    if(intval($key) == intval($this->user))
!                       if(intval($key) == $event['owner'])
                        {
                                $value = 'A';

Index: class.html.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.html.inc.php,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** class.html.inc.php  10 Dec 2001 03:54:06 -0000      1.1
--- class.html.inc.php  25 Aug 2002 04:07:48 -0000      1.1.2.1
***************
*** 16,26 ****
  class html
  {
-       var $prefered_img_title;
- 
        function html()
        {
-               global $HTTP_USER_AGENT;
-                                                                               
                                                // should be Ok for all HTML 4 
compatible browsers
-               $this->prefered_img_title = 
stristr($HTTP_USER_AGENT,'konqueror') ? 'title' : 'alt';
        }
  
--- 16,21 ----
***************
*** 146,150 ****
                if ($title)
                {
!                       $html .= " $this->prefered_img_title=\"$title\"";
                }
                if ($opts)
--- 141,145 ----
                if ($title)
                {
!                       $html .= " alt=\"$title\" title=\"$title\"";
                }
                if ($opts)





reply via email to

[Prev in Thread] Current Thread [Next in Thread]