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.86,1.87


From: Ralf Becker <address@hidden>
Subject: [Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.86,1.87 class.bopreferences.inc.php,1.7,1.8 class.uicalendar.inc.php,1.90,1.91
Date: Sat, 23 Nov 2002 15:48:44 -0500

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

Modified Files:
        class.bocalendar.inc.php class.bopreferences.inc.php 
        class.uicalendar.inc.php 
Log Message:
got cal working with the .14 fixes and (provisionaly) with the new themes via 
css (still a lot to do)


Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -r1.86 -r1.87
*** class.bocalendar.inc.php    23 Nov 2002 14:19:32 -0000      1.86
--- class.bocalendar.inc.php    23 Nov 2002 20:48:41 -0000      1.87
***************
*** 93,97 ****
  
                var $debug = False;
! //            var $debug = True;
  
                var $so;
--- 93,97 ----
  
                var $debug = False;
!               var $debug = True;
  
                var $so;
***************
*** 213,218 ****
                        $this->filter = 
get_var('filter',Array('POST','DEFAULT'),' 
'.$this->prefs['calendar']['defaultfilter'].' ');
  
!                       $this->sortby = get_var('sortby',Array('POST'));
!                       if(!isset($this->sortby))
                        {
                           $this->sortby = 
$this->prefs['calendar']['defaultcalendar'] == 'planner_user' ? 'user' : 
'category';
--- 213,218 ----
                        $this->filter = 
get_var('filter',Array('POST','DEFAULT'),' 
'.$this->prefs['calendar']['defaultfilter'].' ');
  
!                       $this->sortby = 
get_var('sortby',Array('POST'),$this->sortby);
!                       if(empty($this->sortby))
                        {
                           $this->sortby = 
$this->prefs['calendar']['defaultcalendar'] == 'planner_user' ? 'user' : 
'category';
***************
*** 395,398 ****
--- 395,414 ----
                        if ($this->use_session)
                        {
+                               if (!is_array($data))
+                               {
+                                       $data = array(
+                                               'filter'     => $this->filter,
+                                               'cat_id'     => $this->cat_id,
+                                               'owner'      => $this->owner,
+                                               'save_owner' => 
$this->save_owner,
+                                               'year'       => $this->year,
+                                               'month'      => $this->month,
+                                               'day'        => $this->day,
+                                               'date'       => $this->date,
+                                               'sortby'     => $this->sortby,
+                                               'num_months' => 
$this->num_months,
+                                               'return_to'  => $this->return_to
+                                       );
+                               }
                                print_debug('Save',_debug_array($data,False));
                                
$GLOBALS['phpgw']->session->appsession('session_data','calendar',$data);
***************
*** 438,443 ****
                                $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);
--- 454,458 ----
                                $temp_event = $this->get_cached_event();
                                $event = 
$this->read_entry(intval($param['id']));
! 
                                $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);
***************
*** 452,456 ****
                                $cd = 60;
                        }
- //                    }
                        $this->so->cal->event = $temp_event;
                        unset($temp_event);
--- 467,470 ----
***************
*** 462,468 ****
                        if($this->check_perms(PHPGW_ACL_DELETE,$id))
                        {
- //                            $temp_event = $this->read_entry($id);
- //                            if($this->owner == $temp_event['owner'])
- //                            {
                                $this->so->delete_entry($id);
                                $cd = 16;
--- 476,479 ----
***************
*** 472,476 ****
                                $cd = 60;
                        }
- //                    }
                        return $cd;
                }
--- 483,486 ----
***************
*** 1092,1096 ****
                                $access = $user == $owner || $grants & $needed 
&& (!$private || $grants & PHPGW_ACL_PRIVATE);
                        }
-                       //echo "<p>rb_check_perms for user $user and needed_acl 
$needed: event=$event[title]: owner=$owner, privat=$private, grants=$grants ==> 
access=$access</p>\n";
  
                        return $access;
--- 1102,1105 ----
***************
*** 1552,1556 ****
                                return False;
                        }
- 
                        $syear = $params['syear'];
                        $smonth = $params['smonth'];
--- 1561,1564 ----
***************
*** 1564,1568 ****
                                unset($owner_id);
                                $owner_id = $this->g_owner;
!                               print_debug('owner_id 
in','('.implode($owner_id).')');
                        }
                        
--- 1572,1576 ----
                                unset($owner_id);
                                $owner_id = $this->g_owner;
!                               print_debug('owner_id 
in','('.implode(',',$owner_id).')');
                        }
                        
***************
*** 1598,1602 ****
                        print_debug('Start 
Date',sprintf("%04d%02d%02d",$syear,$smonth,$sday));
                        print_debug('End 
Date',sprintf("%04d%02d%02d",$eyear,$emonth,$eday));
!                       
                        if($owner_id)
                        {
--- 1606,1610 ----
                        print_debug('Start 
Date',sprintf("%04d%02d%02d",$syear,$smonth,$sday));
                        print_debug('End 
Date',sprintf("%04d%02d%02d",$eyear,$emonth,$eday));
! 
                        if($owner_id)
                        {
***************
*** 1609,1616 ****
                                $cached_event_ids_repeating = 
$this->so->list_repeated_events($syear,$smonth,$sday,$eyear,$emonth,$eday);
                        }
- 
                        $c_cached_ids = count($cached_event_ids);
                        $c_cached_ids_repeating = 
count($cached_event_ids_repeating);
- 
                        
print_debug('Date',sprintf("%04d%02d%02d",$syear,$smonth,$sday));
                        print_debug('Events Cached',$c_cached_ids);
--- 1617,1622 ----
***************
*** 1618,1622 ****
  
                        $this->cached_events = Array();
!                       
                        if($c_cached_ids == 0 && $c_cached_ids_repeating == 0)
                        {
--- 1624,1628 ----
  
                        $this->cached_events = Array();
! 
                        if($c_cached_ids == 0 && $c_cached_ids_repeating == 0)
                        {

Index: class.bopreferences.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bopreferences.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.bopreferences.inc.php 28 Sep 2002 20:01:43 -0000      1.7
--- class.bopreferences.inc.php 23 Nov 2002 20:48:41 -0000      1.8
***************
*** 58,65 ****
                                );
  
!                               if($prefs[$pref_list[1] == True)
                                {
                                        
$GLOBALS['phpgw']->preferences->add('calendar',$pref_list[1],$prefs[$pref_list[1]]);
!                                       if($prefs[$pref_list[2] == True)
                                        {
                                                
$GLOBALS['phpgw']->preferences->add('calendar',$pref_list[2],$prefs[$pref_list[2]]);
--- 58,65 ----
                                );
  
!                               if($prefs[$pref_list[1]] == True)
                                {
                                        
$GLOBALS['phpgw']->preferences->add('calendar',$pref_list[1],$prefs[$pref_list[1]]);
!                                       if($prefs[$pref_list[2]] == True)
                                        {
                                                
$GLOBALS['phpgw']->preferences->add('calendar',$pref_list[2],$prefs[$pref_list[2]]);

Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -r1.90 -r1.91
*** class.uicalendar.inc.php    23 Nov 2002 14:19:32 -0000      1.90
--- class.uicalendar.inc.php    23 Nov 2002 20:48:41 -0000      1.91
***************
*** 308,311 ****
--- 308,581 ----
                }
  
+               /*!
+               @function cal_header
+               @abstract call common::phpgw_header and shows the 
application-header
+               */
+               function cal_header()
+               {
+                       unset($GLOBALS['phpgw_info']['flags']['noheader']);
+                       unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
+                       unset($GLOBALS['phpgw_info']['flags']['noappheader']);
+                       unset($GLOBALS['phpgw_info']['flags']['noappfooter']);
+                       $GLOBALS['phpgw']->common->phpgw_header();
+ 
+                       function add_col(&$tpl,$str)
+                       {
+                               $tpl->set_var('str',$str);
+                               $tpl->parse('header_column','head_col',True);
+                       }
+ 
+                       function add_image_ahref($link,$image,$alt)
+                       {
+                               return '<a href="'.$link.'"><img 
src="'.$GLOBALS['phpgw']->common->image('calendar',$image).'" alt="'.$alt.'" 
title="'.$alt.'" border="0"></a>';
+                       }
+ 
+                       list(,,$referrer) = explode('.',MENUACTION);
+ 
+                       $templates = Array(
+                               'head_tpl'      => 'head.tpl',
+                               'form_button_dropdown'  => 
'form_button_dropdown.tpl',
+                               'form_button_script'    => 
'form_button_script.tpl'
+                       );
+                       $tpl = &$GLOBALS['phpgw']->template;
+                       $tpl->set_file($templates);
+                       $tpl->set_block('head_tpl','head','head');
+                       $tpl->set_block('head_tpl','head_table','head_table');
+                       $tpl->set_block('head_tpl','head_col','head_col');
+                       $tpl->set_block('form_button_script','form_button');
+ 
+                       if(floor(phpversion()) >= 4)
+                       {
+                               $tpl->set_var('cols',8);
+                       }
+                       else
+                       {
+                               $tpl->set_var('cols',7);
+                       }
+ 
+                       $today = 
date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
+ 
+                       $col_width = 12;
+ 
+                       add_col($tpl,'  <td width="2%">&nbsp;</td>');
+ 
+                       add_col($tpl,'  <td 
width="2%">'.add_image_ahref($this->page('day','&date='.$today),'today',lang('Today')).'</td>');
+ 
+                       add_col($tpl,'  <td width="2%" 
align="left">'.add_image_ahref($this->page('week','&date='.$today),'week',lang('This
 week')).'</td>');
+ 
+                       add_col($tpl,'  <td width="2%" 
align="left">'.add_image_ahref($this->page('month','&date='.$today),'month',lang('This
 month')).'</td>');
+ 
+                       add_col($tpl,'  <td width="2%" 
align="left">'.add_image_ahref($this->page('year','&date='.$today),'year',lang('This
 Year')).'</td>');
+ 
+                       if(floor(phpversion()) >= 4)
+                       {
+                               add_col($tpl,'  <td width="2%" 
align="left">'.add_image_ahref($this->page('planner','&date='.$today),'planner',lang('Planner')).'</td>');
+                               $col_width += 2;
+                       }
+ 
+                       add_col($tpl,'  <td width="2%" 
align="left">'.add_image_ahref($this->page('matrixselect'),'view',lang('Daily 
Matrix View')).'</td>');
+ 
+                       add_col($tpl,'  <td width="'.(100 - $col_width).'%" 
align="left"'.(floor(phpversion()) < 4?' colspan="2"':'').'>&nbsp;</td>');
+ 
+                       $tpl->parse('phpgw_body','head_table',True);
+ 
+                       $tpl->set_var('header_column','');
+                       $tpl->set_var('cols',$cols);
+ 
+                       if($referrer!='view')
+                       {
+                               $remainder = 72;
+                               $cal_id       = 
get_var('cal_id',Array('GET','DEFAULT'),0);
+                               $keywords     = 
get_var('keywords',Array('POST','DEFAULT'),'');
+                               $matrixtype   = 
get_var('matrixtype',Array('POST','DEFAULT'),'');
+                               $participants = 
get_var('participants',Array('POST'));
+                               $date         = 
get_var('date',Array('GET','POST'));
+                               $year         = $this->bo->year;
+                               $month        = $this->bo->month;
+                               $day          = $this->bo->day;
+                               $var_list = Array(
+                                       'cal_id',
+                                       'keywords',
+                                       'matrixtype',
+                                       'date',
+                                       'year',
+                                       'month',
+                                       'day'
+                               );
+ 
+                               $base_hidden_vars = '<input type="hidden" 
name="from" value="'.MENUACTION.'">'."\n";
+                               for($i=0;$i<count($var_list);$i++)
+                               {
+                                       if($$var_list[$i])
+                                       {
+                                               $base_hidden_vars .= '    
<input type="hidden" name="'.$var_list[$i].'" value="'.$$var_list[$i].'">'."\n";
+                                       }
+                               }
+                               $hidden_vars = '';
+                               if($participants)
+                               {
+                                       for ($i=0;$i<count($participants);$i++)
+                                       {
+                                               $hidden_vars .= '    <input 
type="hidden" name="participants[]" value="'.$participants[$i].'">'."\n";
+                                       }
+                               }
+ 
+                               $var = Array(
+                                       'form_width' => '28',
+                                       'form_link'     => 
$this->page($referrer),
+                                       'form_name'     => 'cat_id',
+                                       'title' => lang('Category'),
+                                       'hidden_vars'   => 
$base_hidden_vars.$hidden_vars,
+                                       'form_options'  => '<option 
value="0">All</option>'.$this->cat->formatted_list('select','all',$this->bo->cat_id,'True'),
+                                       'button_value'  => lang('Go!')
+                               );
+                               $tpl->set_var($var);
+                               
$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
+                               $tpl->parse('header_column','head_col',True);
+ 
+                               if(MENUACTION == 'calendar.uicalendar.planner')
+                               {
+                                       $remainder -= 28;
+                                       print_debug('Sort 
By',$this->bo->sortby);
+ 
+                                       $form_options = '<option 
value="user"'.($this->bo->sortby=='user'?' 
selected':'').'>'.lang('User').'</option>'."\n";
+                                       $form_options .= '     <option 
value="category"'.((!isset($this->bo->sortby) || !$this->bo->sortby) || 
$this->bo->sortby=='category'?' 
selected':'').'>'.lang('Category').'</option>'."\n";
+ 
+                                       $var = Array(
+                                               'form_width' => '28',
+                                               'form_link'     => 
$this->page($referrer),
+                                               'form_name'     => 'sortby',
+                                               'title' => lang('Sort By'),
+                                               'hidden_vars'   => 
$base_hidden_vars,
+                                               'form_options'  => 
$form_options,
+                                               'button_value'  => lang('Go!')
+                                       );
+                                       $tpl->set_var($var);
+                                       
$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
+                                       
$tpl->parse('header_column','head_col',True);
+                               }
+ 
+                               if($this->bo->check_perms(PHPGW_ACL_PRIVATE))
+                               {
+                                       $remainder -= 28;
+                                       $hidden_vars = '';
+                                       if($participants)
+                                       {
+                                               for 
($i=0;$i<count($participants);$i++)
+                                               {
+                                                       $hidden_vars .= '    
<input type="hidden" name="participants[]" value="'.$participants[$i].'">'."\n";
+                                               }
+                                       }
+                                       $form_options = '<option value=" all 
"'.($this->bo->filter==' all '?' selected':'').'>'.lang('All').'</option>'."\n";
+                                       $form_options .= '     <option value=" 
private "'.((!isset($this->bo->filter) || !$this->bo->filter) || 
$this->bo->filter==' private '?' selected':'').'>'.lang('Private 
Only').'</option>'."\n";
+ 
+                                       $var = Array(
+                                               'form_width' => '28',
+                                               'form_link'     => 
$this->page($referrer),
+                                               'form_name'     => 'filter',
+                                               'title' => lang('Filter'),
+                                               'hidden_vars'   => 
$base_hidden_vars.$hidden_vars,
+                                               'form_options'  => 
$form_options,
+                                               'button_value'  => lang('Go!')
+                                       );
+                                       $tpl->set_var($var);
+                                       
$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
+                                       
$tpl->parse('header_column','head_col',True);
+                               }
+ 
+                               
if((!isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) || 
!$GLOBALS['phpgw_info']['server']['deny_user_grants_access']) && 
count($this->bo->grants) > 0)
+                               {
+                                       $form_options = '';
+                                       reset($this->bo->grants);
+                                       while(list($grantor,$temp_rights) = 
each($this->bo->grants))
+                                       {
+                                               
$GLOBALS['phpgw']->accounts->get_account_name($grantor,$lid,$fname,$lname);
+                                               $drop_down[$lname.' '.$fname] = 
Array(
+                                                       'grantor'       => 
$grantor,
+                                                       'value'         => 
($GLOBALS['phpgw']->accounts->get_type($grantor)=='g'?'g_':'').$grantor,
+                                                       'name'          => 
$GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
+                                               );
+                                       }
+                                       $memberships = 
$GLOBALS['phpgw']->accounts->membership($GLOBALS['phpgw_info']['user']['account_id']);
+                                       while($memberships != False && 
list($key,$group_info) = each($memberships))
+                                       {
+                                               
$GLOBALS['phpgw']->accounts->get_account_name($group_info['account_id'],$lid,$fname,$lname);
+                                               $drop_down[$lname.' '.$fname] = 
Array(
+                                                       'grantor'       => 
$group_info['account_id'],
+                                                       'value'         => 
($GLOBALS['phpgw']->accounts->get_type($group_info['account_id'])=='g'?'g_':'').$group_info['account_id'],
+                                                       'name'          => 
$GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
+                                               );
+ 
+                                               $account_perms = 
$GLOBALS['phpgw']->acl->get_ids_for_location($group_info['account_id'],PHPGW_ACL_READ,'calendar');
+                                               while($account_perms && 
list($key,$group_id) = each($account_perms))
+                                               {
+                                                       
$GLOBALS['phpgw']->accounts->get_account_name($group_id,$lid,$fname,$lname);
+                                                       $drop_down[$lname.' 
'.$fname] = Array(
+                                                               'grantor'       
=> $group_id,
+                                                               'value'         
=> ($GLOBALS['phpgw']->accounts->get_type($group_id)=='g'?'g_':'').$group_id,
+                                                               'name'          
=> $GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
+                                                       );
+                                               }
+                                       }
+ 
+                                       @reset($drop_down);
+                                       @ksort($drop_down);
+                                       while(list($key,$grant) = 
each($drop_down))
+                                       {
+                                               $form_options .= '    <option 
value="'.$grant['value'].'"'.($grant['grantor']==$this->bo->owner?' 
selected':'').'>'.$grant['name'].'</option>'."\n";
+                                       }
+                                       reset($this->bo->grants);
+ 
+                                       $var = Array(
+                                               'form_width' => $remainder,
+                                               'form_link'     => 
$this->page($referrer),
+                                               'form_name'     => 'owner',
+                                               'title' => lang('User'),
+                                               'hidden_vars'   => 
$base_hidden_vars,
+                                               'form_options'  => 
$form_options,
+                                               'button_value'  => lang('Go!')
+                                       );
+                                       $tpl->set_var($var);
+                                       
$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
+                                       
$tpl->parse('header_column','head_col',True);
+                               }
+                       }
+ 
+                       $hidden_vars = '    <input type="hidden" name="from" 
value="'.MENUACTION.'">'."\n";
+                       $date = get_var('date',Array('GET'));
+                       if($date)
+                       {
+                               $hidden_vars .= '    <input type="hidden" 
name="date" value="'.$date.'">'."\n";
+                       }
+                       $hidden_vars .= '    <input type="hidden" name="month" 
value="'.$this->bo->month.'">'."\n";
+                       $hidden_vars .= '    <input type="hidden" name="day" 
value="'.$this->bo->day.'">'."\n";
+                       $hidden_vars .= '    <input type="hidden" name="year" 
value="'.$this->bo->year.'">'."\n";
+                       if(isset($this->bo->filter) && $this->bo->filter)
+                       {
+                               $hidden_vars .= '    <input type="hidden" 
name="filter" value="'.$this->bo->filter.'">'."\n";
+                       }
+                       if(isset($this->bo->sortby) && $this->bo->sortby)
+                       {
+                               $hidden_vars .= '    <input type="hidden" 
name="sortby" value="'.$this->bo->sortby.'">'."\n";
+                       }
+                       if(isset($this->bo->num_months) && 
$this->bo->num_months)
+                       {
+                               $hidden_vars .= '    <input type="hidden" 
name="num_months" value="'.$this->bo->num_months.'">'."\n";
+                       }
+                       $hidden_vars .= '    <input 
name="keywords"'.($keywords?' value="'.$keywords.'"':'').'>';
+ 
+                       $var = Array(
+                               'action_url_button'     => 
$this->page('search'),
+                               'action_text_button'    => lang('Search'),
+                               'action_confirm_button' => '',
+                               'action_extra_field'    => $hidden_vars
+                       );
+                       $tpl->set_var($var);
+                       $button = $tpl->fp('out','form_button');
+                       $tpl->set_var('str','<td align="right" 
valign="bottom">'.$button.'</td>');
+                       $tpl->parse('header_column','head_col',True);
+                       $tpl->parse('phpgw_body','head_table',True);
+               }
+ 
                function printer_friendly($body)
                {
***************
*** 328,337 ****
                        else
                        {
!                               
unset($GLOBALS['phpgw_info']['flags']['noheader']);
!                               
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
!                               
unset($GLOBALS['phpgw_info']['flags']['noappheader']);
!                               
unset($GLOBALS['phpgw_info']['flags']['noappfooter']);
!                               $GLOBALS['phpgw']->common->phpgw_header();
!                               
include(/*$this->template_dir*/PHPGW_APP_ROOT.'/templates/default'.'/header.inc.php');
                                $new_body = $this->bo->debug_string.$body;
                        }
--- 598,603 ----
                        else
                        {
!                               $this->cal_header();
! 
                                $new_body = $this->bo->debug_string.$body;
                        }
***************
*** 647,655 ****
                function view($vcal_id=0,$cal_date=0)
                {
!                       unset($GLOBALS['phpgw_info']['flags']['noheader']);
!                       unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
!                       $GLOBALS['phpgw']->common->phpgw_header();
! 
!                       echo '<center>';
  
                        $cal_id = 
get_var('cal_id',Array('GET','POST','DEFAULT'),$vcal_id);
--- 913,917 ----
                function view($vcal_id=0,$cal_date=0)
                {
!                       $this->cal_header();
  
                        $cal_id = 
get_var('cal_id',Array('GET','POST','DEFAULT'),$vcal_id);
***************
*** 659,663 ****
                        if ($cal_id < 1)
                        {
!                               echo lang('Invalid entry id.').'</center>'."\n";
                                exit;
                        }
--- 921,925 ----
                        if ($cal_id < 1)
                        {
!                               
$GLOBALS['phpgw']->template->set_var('phpgw_body','<center>'.lang('Invalid 
entry id.').'</center>'."\n");
                                exit;
                        }
***************
*** 665,669 ****
                        if(!$this->bo->check_perms(PHPGW_ACL_READ,$cal_id))
                        {
!                               echo lang('You do not have permission to read 
this record!').'</center>'."\n";
                                exit;
                        }
--- 927,931 ----
                        if(!$this->bo->check_perms(PHPGW_ACL_READ,$cal_id))
                        {
!                               
$GLOBALS['phpgw']->template->set_var('phpgw_body','<center>'.lang('You do not 
have permission to read this record!').'</center>'."\n");
                                exit;
                        }
***************
*** 673,677 ****
                        if(!isset($event['id']))
                        {
!                               echo lang("Sorry, this event does not 
exist").'.'.'</center>'."\n";
                                exit;
                        }
--- 935,939 ----
                        if(!isset($event['id']))
                        {
!                               
$GLOBALS['phpgw']->template->set_var('phpgw_body','<center>'.lang("Sorry, this 
event does not exist").'.'.'</center>'."\n");
                                exit;
                        }
***************
*** 698,710 ****
  
                        $ret_value = $this->view_event($event,True);
!                       echo $ret_value;
  
                        if($ret_value == '<center>'.lang('You do not have 
permission to read this record!').'</center>')
                        {
-                               echo '</center>'."\n";
                                exit;
                        }
  
!                       $p = 
CreateObject('phpgwapi.Template',$this->template_dir);
                        $p->set_file(
                                Array(
--- 960,972 ----
  
                        $ret_value = $this->view_event($event,True);
!                       
$GLOBALS['phpgw']->template->set_var('phpgw_body',$ret_value);
  
                        if($ret_value == '<center>'.lang('You do not have 
permission to read this record!').'</center>')
                        {
                                exit;
                        }
  
!                       //$p = 
CreateObject('phpgwapi.Template',$this->template_dir);
!                       $p = &$GLOBALS['phpgw']->template;
                        $p->set_file(
                                Array(
***************
*** 713,721 ****
                        );
  
- //                    if($this->bo->owner == $event['owner'] || 
$this->bo->member_of_group($this->bo->owner))
                        if($this->bo->check_perms(PHPGW_ACL_EDIT,$event))
                        {
- //                            if 
($this->bo->check_perms(PHPGW_ACL_EDIT,$event['owner']))
- //                            {
                                if($event['recur_type'] != MCAL_RECUR_NONE)
                                {
--- 975,980 ----
***************
*** 728,732 ****
                                        );
                                        $p->set_var($var);
!                                       echo $p->fp('out','form_button');
  
                                        $var = Array(
--- 987,991 ----
                                        );
                                        $p->set_var($var);
!                                       
$p->parse('phpgw_body','form_button',True);
  
                                        $var = Array(
***************
*** 737,741 ****
                                        );
                                        $p->set_var($var);
!                                       echo $p->fp('out','form_button');
                                }
                                else
--- 996,1000 ----
                                        );
                                        $p->set_var($var);
!                                       
$p->parse('phpgw_body','form_button',True);
                                }
                                else
***************
*** 748,752 ****
                                        );
                                        $p->set_var($var);
!                                       echo $p->fp('out','form_button');
                                }
  
--- 1007,1011 ----
                                        );
                                        $p->set_var($var);
!                                       
$p->parse('phpgw_body','form_button',True);
                                }
  
***************
*** 758,762 ****
                                );
                                $p->set_var($var);
!                               echo $p->fp('out','form_button');
                        }
  
--- 1017,1021 ----
                                );
                                $p->set_var($var);
!                               $p->parse('phpgw_body','form_button',True);
                        }
  
***************
*** 772,776 ****
                                        );
                                        $p->set_var($var);
!                                       echo $p->fp('out','form_button');
  
                                        $var = Array(
--- 1031,1035 ----
                                        );
                                        $p->set_var($var);
!                                       
$p->parse('phpgw_body','form_button',True);
  
                                        $var = Array(
***************
*** 781,785 ****
                                        );
                                        $p->set_var($var);
!                                       echo $p->fp('out','form_button');
  
                                        if($event['recur_exception'])
--- 1040,1044 ----
                                        );
                                        $p->set_var($var);
!                                       
$p->parse('phpgw_body','form_button',True);
  
                                        if($event['recur_exception'])
***************
*** 792,796 ****
                                                );
                                                $p->set_var($var);
!                                               echo 
$p->fp('out','form_button');
                                        }
                                }
--- 1051,1055 ----
                                                );
                                                $p->set_var($var);
!                                               
$p->parse('phpgw_body','form_button',True);
                                        }
                                }
***************
*** 804,808 ****
                                        );
                                        $p->set_var($var);
!                                       echo $p->fp('out','form_button');
                                }
  //                            }
--- 1063,1067 ----
                                        );
                                        $p->set_var($var);
!                                       
$p->parse('phpgw_body','form_button',True);
                                }
  //                            }
***************
*** 816,821 ****
                        );
                        $p->set_var($var);
! 
!                       echo $p->fp('out','form_button');
  
                        if ($this->bo->return_to)
--- 1075,1079 ----
                        );
                        $p->set_var($var);
!                       $p->parse('phpgw_body','form_button',True);
  
                        if ($this->bo->return_to)
***************
*** 828,834 ****
                                );
                                $p->set_var($var);
!                               echo $p->fp('out','form_button');
                        }
-                       echo '</center>';
  
                        $GLOBALS['phpgw']->hooks->process('calendar_view');
--- 1086,1091 ----
                                );
                                $p->set_var($var);
!                               $p->parse('phpgw_body','form_button',True);
                        }
  
                        $GLOBALS['phpgw']->hooks->process('calendar_view');
***************
*** 1391,1397 ****
                        if (!$no_header)
                        {
!                               
unset($GLOBALS['phpgw_info']['flags']['noheader']);
!                               
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
!                               $GLOBALS['phpgw']->common->phpgw_header();
                        }
  
--- 1648,1655 ----
                        if (!$no_header)
                        {
!                               
//unset($GLOBALS['phpgw_info']['flags']['noheader']);
!                               
//unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
!                               //$GLOBALS['phpgw']->common->phpgw_header();
!                               $this->cal_header();
                        }
  
***************
*** 1448,1455 ****
                                $d     = mktime(0,0,0,$m,1,$y);
                                $month = lang(date('F', $d)).strftime(' %Y', 
$d);
!                               $color = $this->theme[$m % 2 || 
$this->bo->num_months == 1 ? 'th_bg' : 'row_on'];
                                $cols  = $days * $intervals_per_day;
  
!                               $hdr[0]['.'.$i] = 'bgcolor="'.$color.'" 
colspan="'.$cols.'" align="center"';
                                $prev_month = 
sprintf('%04d%02d01',$y-($m==1),$m > 1?$m-1:12);
                                $next_month = 
sprintf('%04d%02d01',$y+($m==12),$m < 12?$m+1:1);
--- 1706,1713 ----
                                $d     = mktime(0,0,0,$m,1,$y);
                                $month = lang(date('F', $d)).strftime(' %Y', 
$d);
!                               $class = $m % 2 || $this->bo->num_months == 1 ? 
'th' : 'row_on';
                                $cols  = $days * $intervals_per_day;
  
!                               $hdr[0]['.'.$i] = 'class="'.$class.'" 
colspan="'.$cols.'" align="center"';
                                $prev_month = 
sprintf('%04d%02d01',$y-($m==1),$m > 1?$m-1:12);
                                $next_month = 
sprintf('%04d%02d01',$y+($m==12),$m < 12?$m+1:1);
***************
*** 1475,1496 ****
                                        // highlight today, saturday, sunday 
and holidays
                                        //
!                                       $color = $this->theme['row_off'];
                                        $dow = 
$GLOBALS['phpgw']->datetime->day_of_week($y,$m,$d);
                                        $date = 
sprintf("%04d%02d%02d",$y,$m,$d);
                                        if ($date == date('Ymd'))
                                        {
!                                               $color = 
$GLOBALS['phpgw_info']['theme']['cal_today'];
                                        }
                                        elseif 
($this->bo->cached_holidays[$date])
                                        {
!                                               $color = 
$this->bo->holiday_color;
                                                $hdr[2]['.'.$index] .= ' 
title="'.$this->bo->cached_holidays[$date][0]['name'].'"';
                                        }
                                        elseif ($dow == 0 || $dow == 6)
                                        {
!                                               $color = 
$this->bo->theme['th_bg'];
                                        }
  
!                                       $hdr[2]['.'.$index] .= " 
bgcolor=\"$color\"";
  
                                        $hdr[2][$index] = '<a 
href="'.$this->planner_html->link('/index.php',
--- 1733,1754 ----
                                        // highlight today, saturday, sunday 
and holidays
                                        //
!                                       $class = 'row_off';
                                        $dow = 
$GLOBALS['phpgw']->datetime->day_of_week($y,$m,$d);
                                        $date = 
sprintf("%04d%02d%02d",$y,$m,$d);
                                        if ($date == date('Ymd'))
                                        {
!                                               $class = 'cal_today';
                                        }
                                        elseif 
($this->bo->cached_holidays[$date])
                                        {
!                                               $class = 'cal_holiday';
                                                $hdr[2]['.'.$index] .= ' 
title="'.$this->bo->cached_holidays[$date][0]['name'].'"';
                                        }
                                        elseif ($dow == 0 || $dow == 6)
                                        {
!                                               $class = 'th';
                                        }
  
!                                       $hdr[2]['.'.$index] .= " 
class=\"$class\"";
  
                                        $hdr[2][$index] = '<a 
href="'.$this->planner_html->link('/index.php',
***************
*** 1522,1528 ****
                        $offset = (7-date("w", $d)+1)%7;
                        $offset = $offset == 0 ? 7 : $offset;
!                       $color = $this->theme[$w % 2 ? 'th_bg' : 'row_on'];
  
!                       $hdr[1]['.'.$w] = 'bgcolor="'.$color.'" 
colspan="'.$intervals_per_day * $offset.'" align="left"';
                        $hdr[1][$w] = '';
                        if ($offset >= 3)
--- 1780,1786 ----
                        $offset = (7-date("w", $d)+1)%7;
                        $offset = $offset == 0 ? 7 : $offset;
!                       $class = $w % 2 ? 'th' : 'row_on';
  
!                       $hdr[1]['.'.$w] = 'class="'.$class.'" 
colspan="'.$intervals_per_day * $offset.'" align="left"';
                        $hdr[1][$w] = '';
                        if ($offset >= 3)
***************
*** 1544,1549 ****
                                $w += (isset($hdr[1][$w]))?1:0; // bug in 
"date('W')" ?
  
!                               $color = $this->theme[$w % 2 ? 'th_bg' : 
'row_on'];
!                               $hdr[1]['.'.$w] = 'bgcolor="'.$color.'" 
colspan="'.$colspan.'" align="left"';
                                $hdr[1][$w] = '';
                                if ($days_left >= 3)
--- 1802,1807 ----
                                $w += (isset($hdr[1][$w]))?1:0; // bug in 
"date('W')" ?
  
!                               $class = $w % 2 ? 'th' : 'row_on';
!                               $hdr[1]['.'.$w] = 'class="'.$class.'" 
colspan="'.$colspan.'" align="left"';
                                $hdr[1][$w] = '';
                                if ($days_left >= 3)
***************
*** 1704,1708 ****
                                $cel .= '<font size="-2"> - 
'.$event['description'].' </font>';
                        }
- 
                        $akt_cell = $end_cell + 1;
  
--- 1962,1965 ----
***************
*** 1833,1837 ****
                                if (is_array($r))
                                {
!                                       $rows['.'.$k] = 
'bgcolor="'.$GLOBALS['phpgw']->nextmatchs->alternate_row_color().'"';
                                        $row = &$rows[$k];
                                        $akt_cell = &$rows['.nr_'.$k];
--- 2090,2094 ----
                                if (is_array($r))
                                {
!                                       $rows['.'.$k] = 
'class="'.$GLOBALS['phpgw']->nextmatchs->alternate_row_color().'"';
                                        $row = &$rows[$k];
                                        $akt_cell = &$rows['.nr_'.$k];
***************
*** 1847,1851 ****
                function planner_print_rows()
           {
!                       $bgcolor = 'bgcolor="'.$this->theme['th_bg'].'"';
                        $intervals_per_day = 
$this->bo->prefs['calendar']['planner_intervals_per_day'];
  
--- 2104,2108 ----
                function planner_print_rows()
           {
!                       $class = 'class="th"';
                        $intervals_per_day = 
$this->bo->prefs['calendar']['planner_intervals_per_day'];
  
***************
*** 1858,1866 ****
                                array(
                                        '_hdr0' => $this->planner_header[0],
!                                       '._hdr0' => $bgcolor,
                                        '_hdr1' => $this->planner_header[1],
!                                       '._hdr1' => $bgcolor,
                                        '_hdr2' => $this->planner_header[2],
!                                       '._hdr2' => $bgcolor
                                )+$this->planner_rows,
                                'width="100%" 
cols="'.(1+$this->planner_days_in_end_month*$intervals_per_day).'"');
--- 2115,2123 ----
                                array(
                                        '_hdr0' => $this->planner_header[0],
!                                       '._hdr0' => $class,
                                        '_hdr1' => $this->planner_header[1],
!                                       '._hdr1' => $class,
                                        '_hdr2' => $this->planner_header[2],
!                                       '._hdr2' => $class
                                )+$this->planner_rows,
                                'width="100%" 
cols="'.(1+$this->planner_days_in_end_month*$intervals_per_day).'"');
***************
*** 1885,1889 ****
                        // process all events within observed interval
                        //
!                       
for($v=$this->planner_firstday;$v<=$this->planner_lastday;$v++)
                        {
                                $daily = $this->bo->cached_events[$v];
--- 2142,2146 ----
                        // process all events within observed interval
                        //
!                       for($v=$this->planner_firstday; $v <= 
$this->planner_lastday; $v += 1)
                        {
                                $daily = $this->bo->cached_events[$v];
***************
*** 1909,1915 ****
                        $sb = CreateObject('phpgwapi.sbox');
  
!                       unset($GLOBALS['phpgw_info']['flags']['noheader']);
!                       unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
!                       $GLOBALS['phpgw']->common->phpgw_header();
  
                        $p = 
CreateObject('phpgwapi.Template',$this->template_dir);
--- 2166,2173 ----
                        $sb = CreateObject('phpgwapi.sbox');
  
!                       //unset($GLOBALS['phpgw_info']['flags']['noheader']);
!                       //unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
!                       //$GLOBALS['phpgw']->common->phpgw_header();
!                       $this->cal_header();
  
                        $p = 
CreateObject('phpgwapi.Template',$this->template_dir);
***************
*** 2284,2288 ****
                {
                        list(,,$method) = explode('.',MENUACTION);
!               
                        if (@$this->bo->printer_friendly)
                        {
--- 2542,2546 ----
                {
                        list(,,$method) = explode('.',MENUACTION);
! 
                        if (@$this->bo->printer_friendly)
                        {
***************
*** 2290,2294 ****
                        }
  
!                       $p = 
CreateObject('phpgwapi.Template',$this->template_dir);
        
                        $p->set_file(
--- 2548,2552 ----
                        }
  
!                       $p = &$GLOBALS['phpgw']->template;
        
                        $p->set_file(
***************
*** 2422,2427 ****
                        $p->parse('table_row','blank_row',True);
  
!                       $p->pparse('out','footer_table');
!                       unset($p);
                }
  
--- 2680,2684 ----
                        $p->parse('table_row','blank_row',True);
  
!                       $p->parse('phpgw_body','footer_table',True);
                }
  
***************
*** 2470,2475 ****
                {
                        $str = '';
- //                    $is_private = 
$this->bo->is_private($event,$event['owner']);
- //                    $editable = ((!$this->bo->printer_friendly) && 
(($is_private && $this->bo->check_perms(PHPGW_ACL_PRIVATE)) || !$is_private));
                        $is_private = !$event['public'] && 
!$this->bo->check_perms(PHPGW_ACL_READ,$event);
                        $editable = !$this->bo->printer_friendly && 
$this->bo->check_perms(PHPGW_ACL_READ,$event);
--- 2727,2730 ----
***************
*** 2735,2761 ****
                {
                        static $cats;
                        if(!is_array($ids))
                        {
                                if (strpos($ids,','))
                                {
!                                       $id_array = explode(',',$ids);
                                }
                                else
                                {
!                                       $id_array[0] = $ids;
                                }
                        }
!                       @reset($id_array);
                        $ret_val = Array();
!                       while(list($index,$id) = each($id_array))
                        {
                                if (!isset($cats[$id]))
                                {
!                                       $cat_arr = $this->cat->return_single( 
$id );
!                                       $cats[$id] = $cat_arr[0];
!                                       $cats[$id]['color'] = 
strstr($cats[$id]['description'],'#');
                                }
                                $ret_val[] = $cats[$id];
!                       }
                        return $ret_val;
                }
--- 2990,3016 ----
                {
                        static $cats;
+ 
                        if(!is_array($ids))
                        {
                                if (strpos($ids,','))
                                {
!                                       $ids = explode(',',$ids);
                                }
                                else
                                {
!                                       $ids = array( 0 => $ids);
                                }
                        }
!                       @reset($ids);
                        $ret_val = Array();
!                       while(list(,$id) = each($ids))
                        {
                                if (!isset($cats[$id]))
                                {
!                                       $cats[$id] = $this->cat->return_single( 
$id );
!                                       $cats[$id]['color'] = 
strstr($cats[$id]['descr'],'#');
                                }
                                $ret_val[] = $cats[$id];
!                       } 
                        return $ret_val;
                }
***************
*** 2776,2780 ****
  
                        $var = Array(
!                               'bgcolor'       => $this->theme['th_bg'],
                                'font_color'    => $this->theme['th_text']
                        );
--- 3031,3035 ----
  
                        $var = Array(
!                               'class' => 'th',
                                'font_color'    => $this->theme['th_text']
                        );
***************
*** 2782,2786 ****
                        {
                                $var = Array(
!                                       'bgcolor'       => '',
                                        'font_color'    => ''
                                );
--- 3037,3041 ----
                        {
                                $var = Array(
!                                       'class' => '',
                                        'font_color'    => ''
                                );
***************
*** 2814,2818 ****
                        for($i=0;$i<7;$i++)
                        {
!                               
if($this->bo->prefs['calendar']['weekdays_only'] && 
$GLOBALS['phpgw']->datetime->days[$i]['weekday'])
                                {
                                        
$p->set_var('col_title',lang($GLOBALS['phpgw']->datetime->days[$i]['name']));
--- 3069,3073 ----
                        for($i=0;$i<7;$i++)
                        {
!                               
if(!$this->bo->prefs['calendar']['weekdays_only'] || 
$GLOBALS['phpgw']->datetime->days[$i]['weekday'])
                                {
                                        
$p->set_var('col_title',lang($GLOBALS['phpgw']->datetime->days[$i]['name']));
***************
*** 3093,3097 ****
                function view_event($event,$alarms=False)
                {
- //                    if((!$event['participants'][$this->bo->owner] && 
!$this->bo->member_of_group()) || (!$event['public'] && 
!$this->bo->check_perms(PHPGW_ACL_PRIVATE)))
                        if((!$event['participants'][$this->bo->owner] && 
!$this->bo->check_perms(PHPGW_ACL_READ,$event)))
                        {
--- 3348,3351 ----
***************
*** 3576,3580 ****
                                                {
                                                        
$p->set_var('event',$time[$i][$j]);
!                                                       
if($GLOBALS['phpgw']->nextmatchs->alternate_row_color() == 
$this->theme['row_on'])
                                                        {
                                                                $row_to_print = 
'_on';
--- 3830,3834 ----
                                                {
                                                        
$p->set_var('event',$time[$i][$j]);
!                                                       
if($GLOBALS['phpgw']->nextmatchs->alternate_row_color() == 'row_on')
                                                        {
                                                                $row_to_print = 
'_on';
***************
*** 3591,3595 ****
                                        {
                                                $p->set_var('event','&nbsp;');
!                                               
if($GLOBALS['phpgw']->nextmatchs->alternate_row_color() == 
$this->theme['row_on'])
                                                {
                                                        $row_to_print = '_on';
--- 3845,3849 ----
                                        {
                                                $p->set_var('event','&nbsp;');
!                                               
if($GLOBALS['phpgw']->nextmatchs->alternate_row_color() == 'row_on')
                                                {
                                                        $row_to_print = '_on';
***************
*** 3609,3613 ****
                                                }
                                                
$p->set_var('event',$time[$i][$j]);
!                                               
if($GLOBALS['phpgw']->nextmatchs->alternate_row_color() == 
$this->theme['row_on'])
                                                {
                                                        $row_to_print = '_on';
--- 3863,3867 ----
                                                }
                                                
$p->set_var('event',$time[$i][$j]);
!                                               
if($GLOBALS['phpgw']->nextmatchs->alternate_row_color() == 'row_on')
                                                {
                                                        $row_to_print = '_on';
***************
*** 3652,3656 ****
                        {
                                $var = array('event' => $time[99][0]);
!                               
if($GLOBALS['phpgw']->nextmatchs->alternate_row_color() == 
$this->theme['row_on'])
                                {
                                        $row_to_print = '_on';
--- 3906,3910 ----
                        {
                                $var = array('event' => $time[99][0]);
!                               
if($GLOBALS['phpgw']->nextmatchs->alternate_row_color() == 'row_on')
                                {
                                        $row_to_print = '_on';
***************
*** 4202,4206 ****
                                if($holidays)
                                {
!                                       $extra = ' 
bgcolor="'.$this->bo->holiday_color.'"';
                                        $class = ($appts?'b':'').'minicalhol';
                                        if ($date == $this->bo->today)
--- 4456,4460 ----
                                if($holidays)
                                {
!                                       $extra = ' class="cal_holiday"';
                                        $class = ($appts?'b':'').'minicalhol';
                                        if ($date == $this->bo->today)
***************
*** 4211,4220 ****
                                elseif ($date != $this->bo->today)
                                {
!                                       $extra = ' bgcolor="'.$cellcolor.'"';
                                        $class = ($appts?'b':'').'minicalendar';
                                }
                                else
                                {
!                                       $extra = ' 
bgcolor="'.$GLOBALS['phpgw_info']['theme']['cal_today'].'"';
                                        $class = ($appts?'b':'').'minicalendar';
                                        $day_image = ' 
background="'.$GLOBALS['phpgw']->common->image('calendar','mini_day_block').'"';
--- 4465,4474 ----
                                elseif ($date != $this->bo->today)
                                {
!                                       $extra = ' class="'.$cellcolor.'"';
                                        $class = ($appts?'b':'').'minicalendar';
                                }
                                else
                                {
!                                       $extra = ' class="cal_today"';
                                        $class = ($appts?'b':'').'minicalendar';
                                        $day_image = ' 
background="'.$GLOBALS['phpgw']->common->image('calendar','mini_day_block').'"';





reply via email to

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