phpgroupware-cvs
[Top][All Lists]
Advanced

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

[Phpgroupware-cvs] CVS: calendar/inc class.bocustom_fields.inc.php, NONE


From: Ralf Becker <address@hidden>
Subject: [Phpgroupware-cvs] CVS: calendar/inc class.bocustom_fields.inc.php, NONE, 1.1.2.1 class.uicustom_fields.inc.php, NONE, 1.1.2.1 class.bocalendar.inc.php, 1.71.2.33.2.12, 1.71.2.33.2.13 class.socalendar_sql.inc.php, 1.28.2.4.2.3, 1.28.2.4.2.4 class.uicalendar.inc.php, 1.66.2.55.2.15, 1.66.2.55.2.16 hook_admin.inc.php, 1.7.2.1, 1.7.2.1.2.1 hook_sidebox_menu.inc.php, 1.1.2.4, 1.1.2.5
Date: Fri, 08 Aug 2003 20:33:29 -0400

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.bocalendar.inc.php class.socalendar_sql.inc.php 
        class.uicalendar.inc.php hook_admin.inc.php 
        hook_sidebox_menu.inc.php 
Added Files:
      Tag: Version-0_9_16-branch
        class.bocustom_fields.inc.php class.uicustom_fields.inc.php 
Log Message:
implemented custom fields and sorting for the cal


***** Error reading new file: [Errno 2] No such file or directory: 
'class.bocustom_fields.inc.php'
***** Error reading new file: [Errno 2] No such file or directory: 
'class.uicustom_fields.inc.php'
Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.71.2.33.2.12
retrieving revision 1.71.2.33.2.13
diff -C2 -r1.71.2.33.2.12 -r1.71.2.33.2.13
*** class.bocalendar.inc.php    23 Jul 2003 01:42:02 -0000      1.71.2.33.2.12
--- class.bocalendar.inc.php    9 Aug 2003 00:33:26 -0000       1.71.2.33.2.13
***************
*** 863,866 ****
--- 863,876 ----
                                }
                                
$this->so->add_attribute('priority',$l_cal['priority']);
+ 
+                               foreach($l_cal as $name => $value)
+                               {
+                                       if ($name[0] == '#')    // Custom field
+                                       {
+                                               
$this->so->add_attribute($name,stripslashes($value));
+                                               //echo "<p>update: 
$name='$value'</p>\n";
+                                       }
+                               }
+ 
                                $event = $this->get_cached_event();
  
***************
*** 2804,2813 ****
                                }
  
!                               $var['repetition'] = Array(
                                        'field' => lang('Repetition'),
                                        'data'  => $str,
                                );
                        }
!                       return $var;
                }
  
--- 2814,2855 ----
                                }
  
!                               $var['recure_type'] = Array(
                                        'field' => lang('Repetition'),
                                        'data'  => $str,
                                );
                        }
! 
!                       if (!isset($this->fields))
!                       {
!                               $this->custom_fields = 
CreateObject('calendar.bocustom_fields');
!                               $this->fields = &$this->custom_fields->fields;
!                               $this->stock_fields = 
&$this->custom_fields->stock_fields;
!                       }
!                       foreach($this->fields as $name => $data)
!                       {
!                               if (!$data['disabled'])
!                               {
!                                       if (isset($var[$name]))
!                                       {
!                                               $sorted[$name] = $var[$name];
!                                       }
!                                       elseif 
(!isset($this->stock_fields[$name]) && strlen($event['#'.$name]))        // 
Custom field
!                                       {
!                                               $lang = lang($name);
!                                               $sorted['#'.$name] = array(
!                                                       'field' => $lang == 
$name.'*' ? $name : $lang,
!                                                       'data'  => 
$event['#'.$name]
!                                               );
!                                       }
!                               }
!                               unset($var[$name]);
!                       }
!                       foreach($var as $name => $v)
!                       {
!                               $sorted[$name] = $v;
! 
!                       }
! 
!                       return $sorted;
                }
  
***************
*** 2826,2830 ****
  
                        $default_prefs = 
$GLOBALS['phpgw']->preferences->default['calendar'];
!                       
                        $subject = lang('Calendar Event') . ' - $$action$$: 
$$startdate$$ $$title$$'."\n";
                        $defaults = array(
--- 2868,2872 ----
  
                        $default_prefs = 
$GLOBALS['phpgw']->preferences->default['calendar'];
! 
                        $subject = lang('Calendar Event') . ' - $$action$$: 
$$startdate$$ $$title$$'."\n";
                        $defaults = array(

Index: class.socalendar_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.socalendar_sql.inc.php,v
retrieving revision 1.28.2.4.2.3
retrieving revision 1.28.2.4.2.4
diff -C2 -r1.28.2.4.2.3 -r1.28.2.4.2.4
*** class.socalendar_sql.inc.php        23 Jul 2003 01:42:03 -0000      
1.28.2.4.2.3
--- class.socalendar_sql.inc.php        9 Aug 2003 00:33:26 -0000       
1.28.2.4.2.4
***************
*** 215,219 ****
                }
  
!               
$this->stream->lock(array('phpgw_cal','phpgw_cal_user','phpgw_cal_repeats','phpgw_cal_alarm'));
  
                $this->stream->query('SELECT * FROM phpgw_cal WHERE 
cal_id='.$event_id,__LINE__,__FILE__);
--- 215,221 ----
                }
  
!               $event_id = intval($event_id);
! 
!               
$this->stream->lock(array('phpgw_cal','phpgw_cal_user','phpgw_cal_repeats','phpgw_cal_extra'/*
 OLD-ALARM,'phpgw_cal_alarm'*/));
  
                $this->stream->query('SELECT * FROM phpgw_cal WHERE 
cal_id='.$event_id,__LINE__,__FILE__);
***************
*** 322,325 ****
--- 324,337 ----
                        }
  
+               // Custom fields
+                       $this->stream->query('SELECT * FROM phpgw_cal_extra 
WHERE cal_id='.$event_id,__LINE__,__FILE__);
+                       if($this->stream->num_rows())
+                       {
+                               while($this->stream->next_record())
+                               {
+                                       
$this->add_attribute('#'.$this->stream->f('cal_extra_name'),$this->stream->f('cal_extra_value'));
+                               }
+                       }
+ 
  /* OLD-ALARM
                        if($this->event['reference'])
***************
*** 475,478 ****
--- 487,491 ----
                        'phpgw_cal_user',
                        'phpgw_cal_repeats',
+                       'phpgw_cal_extra'
  // OLD-ALARM                  'phpgw_cal_alarm'
                );
***************
*** 554,557 ****
--- 567,571 ----
                        'phpgw_cal_user',
                        'phpgw_cal_repeats',
+                       'phpgw_cal_extra'
  // OLD-ALARM                  'phpgw_cal_alarm'
                );
***************
*** 669,672 ****
--- 683,697 ----
                        $this->stream->query('DELETE FROM phpgw_cal_repeats 
WHERE cal_id='.$event['id'],__LINE__,__FILE__);
                }
+               // Custom fields
+               $this->stream->query('DELETE FROM phpgw_cal_extra WHERE 
cal_id='.$event['id'],__LINE__,__FILE__);
+ 
+               foreach($event as $name => $value)
+               {
+                       if ($name[0] == '#' && strlen($value))
+                       {
+                               $this->stream->query('INSERT INTO 
phpgw_cal_extra (cal_id,cal_extra_name,cal_extra_value) '
+                               . 
'VALUES('.$event['id'].",'".addslashes(substr($name,1))."','".addslashes($value)."')",__LINE__,__FILE__);
+                       }
+               }
  /*
                $alarmcount = count($event['alarm']);
***************
*** 749,757 ****
                
                $this->stream->query("UPDATE phpgw_cal_user SET 
cal_status='".$status_code_short[$status]."' WHERE cal_id=".$id." AND 
cal_login=".$owner,__LINE__,__FILE__);
!               if ($status == 'R') 
                {
                        $this->stream->query('UPDATE phpgw_cal_alarm set 
alarm_enabled=0 where cal_id='.$id.' and cal_owner='.$owner,__LINE__,__FILE__);
                }
! 
                return True;
        }
--- 774,783 ----
                
                $this->stream->query("UPDATE phpgw_cal_user SET 
cal_status='".$status_code_short[$status]."' WHERE cal_id=".$id." AND 
cal_login=".$owner,__LINE__,__FILE__);
! /* OLD-ALARM
!               if ($status == 'R')
                {
                        $this->stream->query('UPDATE phpgw_cal_alarm set 
alarm_enabled=0 where cal_id='.$id.' and cal_owner='.$owner,__LINE__,__FILE__);
                }
! */
                return True;
        }

Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.55.2.15
retrieving revision 1.66.2.55.2.16
diff -C2 -r1.66.2.55.2.15 -r1.66.2.55.2.16
*** class.uicalendar.inc.php    23 Jul 2003 01:42:03 -0000      1.66.2.55.2.15
--- class.uicalendar.inc.php    9 Aug 2003 00:33:26 -0000       1.66.2.55.2.16
***************
*** 3574,3578 ****
  
  // Brief Description
!                       $var[] = Array(
                                'tr_color' => $this->theme['th_bg'],
                                'field' => lang('Title'),
--- 3574,3578 ----
  
  // Brief Description
!                       $var['title'] = Array(
                                'tr_color' => $this->theme['th_bg'],
                                'field' => lang('Title'),
***************
*** 3581,3585 ****
  
  // Full Description
!                       $var[] = Array(
                                'field' => lang('Full Description'),
                                'data'  => '<textarea name="cal[description]" 
rows="5" cols="40" wrap="virtual" 
maxlength="2048">'.$event['description'].'</textarea>'
--- 3581,3585 ----
  
  // Full Description
!                       $var['description'] = Array(
                                'field' => lang('Full Description'),
                                'data'  => '<textarea name="cal[description]" 
rows="5" cols="40" wrap="virtual" 
maxlength="2048">'.$event['description'].'</textarea>'
***************
*** 3604,3608 ****
                                $check_cats[] = 0;
                        }
!                       $var[] = Array(
                                'field' => lang('Category'),
                                'data'  => '<select name="categories[]" 
multiple 
size="5">'.$this->cat->formated_list('select','all',$check_cats,True).'</select>'
--- 3604,3608 ----
                                $check_cats[] = 0;
                        }
!                       $var['category'] = Array(
                                'field' => lang('Category'),
                                'data'  => '<select name="categories[]" 
multiple 
size="5">'.$this->cat->formated_list('select','all',$check_cats,True).'</select>'
***************
*** 3610,3614 ****
  
  // Location
!                       $var[] = Array(
                                'field' => lang('Location'),
                                'data'  => '<input name="cal[location]" 
size="45" maxlength="255" value="'.$event['location'].'">'
--- 3610,3614 ----
  
  // Location
!                       $var['location'] = Array(
                                'field' => lang('Location'),
                                'data'  => '<input name="cal[location]" 
size="45" maxlength="255" value="'.$event['location'].'">'
***************
*** 3617,3621 ****
  // Date
                        $start = $this->bo->maketime($event['start']) - 
$GLOBALS['phpgw']->datetime->tz_offset;
!                       $var[] = Array(
                                'field' => lang('Start Date'),
                                'data'  => 
$GLOBALS['phpgw']->common->dateformatorder(
--- 3617,3621 ----
  // Date
                        $start = $this->bo->maketime($event['start']) - 
$GLOBALS['phpgw']->datetime->tz_offset;
!                       $var['startdate'] = Array(
                                'field' => lang('Start Date'),
                                'data'  => 
$GLOBALS['phpgw']->common->dateformatorder(
***************
*** 3632,3636 ****
                                        . '<input type="radio" 
name="start[ampm]" value="pm"'.($event['start']['hour'] >= 12?' 
checked':'').'>pm'."\n";
                        }
!                       $var[] = Array(
                                'field' => lang('Start Time'),
                                'data'  => '<input name="start[hour]" size="2" 
VALUE="'.$GLOBALS['phpgw']->common->show_date($start,$hourformat).'" 
maxlength="2">:<input name="start[min]" size="2" 
value="'.$GLOBALS['phpgw']->common->show_date($start,'i').'" 
maxlength="2">'."\n".$str
--- 3632,3636 ----
                                        . '<input type="radio" 
name="start[ampm]" value="pm"'.($event['start']['hour'] >= 12?' 
checked':'').'>pm'."\n";
                        }
!                       $var['starttime'] = Array(
                                'field' => lang('Start Time'),
                                'data'  => '<input name="start[hour]" size="2" 
VALUE="'.$GLOBALS['phpgw']->common->show_date($start,$hourformat).'" 
maxlength="2">:<input name="start[min]" size="2" 
value="'.$GLOBALS['phpgw']->common->show_date($start,'i').'" 
maxlength="2">'."\n".$str
***************
*** 3639,3643 ****
  // End Date
                        $end = $this->bo->maketime($event['end']) - 
$GLOBALS['phpgw']->datetime->tz_offset;
!                       $var[] = Array(
                                'field' => lang('End Date'),
                                'data'  => 
$GLOBALS['phpgw']->common->dateformatorder(
--- 3639,3643 ----
  // End Date
                        $end = $this->bo->maketime($event['end']) - 
$GLOBALS['phpgw']->datetime->tz_offset;
!                       $var['enddate'] = Array(
                                'field' => lang('End Date'),
                                'data'  => 
$GLOBALS['phpgw']->common->dateformatorder(
***************
*** 3654,3658 ****
                                        . '<input type="radio" name="end[ampm]" 
value="pm"'.($event['end']['hour'] >= 12?' checked':'').'>pm'."\n";
                        }
!                       $var[] = Array(
                                'field' => lang('End Time'),
                                'data'  => '<input name="end[hour]" size="2" 
VALUE="'.$GLOBALS['phpgw']->common->show_date($end,$hourformat).'" 
maxlength="2">:<input name="end[min]" size="2" 
value="'.$GLOBALS['phpgw']->common->show_date($end,'i').'" 
maxlength="2">'."\n".$str
--- 3654,3658 ----
                                        . '<input type="radio" name="end[ampm]" 
value="pm"'.($event['end']['hour'] >= 12?' checked':'').'>pm'."\n";
                        }
!                       $var['endtime'] = Array(
                                'field' => lang('End Time'),
                                'data'  => '<input name="end[hour]" size="2" 
VALUE="'.$GLOBALS['phpgw']->common->show_date($end,$hourformat).'" 
maxlength="2">:<input name="end[min]" size="2" 
value="'.$GLOBALS['phpgw']->common->show_date($end,'i').'" 
maxlength="2">'."\n".$str
***************
*** 3660,3664 ****
  
  // Priority
!                       $var[] = Array(
                                'field' => lang('Priority'),
                                'data'  => 
$sb->getPriority('cal[priority]',$event['priority'])
--- 3660,3664 ----
  
  // Priority
!                       $var['priority'] = Array(
                                'field' => lang('Priority'),
                                'data'  => 
$sb->getPriority('cal[priority]',$event['priority'])
***************
*** 3666,3670 ****
  
  // Access
!                       $var[] = Array(
                                'field' => lang('Private'),
                                'data'  => '<input type="checkbox" 
name="cal[private]" value="private"'.(!$event['public']?' checked':'').'>'
--- 3666,3670 ----
  
  // Access
!                       $var['access'] = Array(
                                'field' => lang('Private'),
                                'data'  => '<input type="checkbox" 
name="cal[private]" value="private"'.(!$event['public']?' checked':'').'>'
***************
*** 3693,3697 ****
                                                        }
                                                }
!                                               $var[] = array
                                                (
                                                        'field' => '<input 
type="button" value="' . lang('Participants') . '" 
onClick="accounts_popup();">' . "\n"
--- 3693,3697 ----
                                                        }
                                                }
!                                               $var['participants'] = array
                                                (
                                                        'field' => '<input 
type="button" value="' . lang('Participants') . '" 
onClick="accounts_popup();">' . "\n"
***************
*** 3708,3712 ****
                                                        }
                                                }
!                                               $var[] = array
                                                (
                                                        'field' => 
lang('Participants'),
--- 3708,3712 ----
                                                        }
                                                }
!                                               $var['participants'] = array
                                                (
                                                        'field' => 
lang('Participants'),
***************
*** 3768,3772 ****
                                        $checked = '';
                                }
!                               $var[] = Array(
                                        'field' => 
$GLOBALS['phpgw']->common->grab_owner_name($event['owner']).' 
'.lang('Participates'),
                                        'data'  => '<input type="checkbox" 
name="participants[]" 
value="'.$event['owner'].$event['participants'][$event['owner']].'"'.$checked.'>'
--- 3768,3772 ----
                                        $checked = '';
                                }
!                               $var['owner'] = Array(
                                        'field' => 
$GLOBALS['phpgw']->common->grab_owner_name($event['owner']).' 
'.lang('Participates'),
                                        'data'  => '<input type="checkbox" 
name="participants[]" 
value="'.$event['owner'].$event['participants'][$event['owner']].'"'.$checked.'>'
***************
*** 3826,3830 ****
                                $mout .= '</select>'."\n".' '.lang('minutes').' 
';
  
!                               $var[] = Array(
                                        'field' => lang('Email Reminder'),
                                        'data'  => 
$dout.$hout.$mout.lang('before the event')
--- 3826,3830 ----
                                $mout .= '</select>'."\n".' '.lang('minutes').' 
';
  
!                               $var['alarm'] = Array(
                                        'field' => lang('Email Reminder'),
                                        'data'  => 
$dout.$hout.$mout.lang('before the event')
***************
*** 3833,3847 ****
                        }
  
-                       for($i=0;$i<count($var);$i++)
-                       {
-                               
$this->output_template_array($p,'row','list',$var[$i]);
-                       }
- 
-                       unset($var);
- 
  // Repeat Type
-                       $p->set_var('tr_color',$this->theme['th_bg']);
-                       $p->set_var('hr_text','<center><b>'.lang('Repeating 
Event Information').'</b></center>');
-                       $p->parse('row','hr',True);
                        $str = '';
                        foreach($this->bo->rpt_type as $type => $label)
--- 3833,3837 ----
***************
*** 3849,3853 ****
                                $str .= '<option 
value="'.$type.'"'.($event['recur_type']==$type?' 
selected':'').'>'.lang($label).'</option>';
                        }
!                       $var[] = Array(
                                'field' => lang('Repeat Type'),
                                'data'  => '<select 
name="cal[recur_type]">'."\n".$str.'</select>'."\n"
--- 3839,3843 ----
                                $str .= '<option 
value="'.$type.'"'.($event['recur_type']==$type?' 
selected':'').'>'.lang($label).'</option>';
                        }
!                       $var['recure_type'] = Array(
                                'field' => lang('Repeat Type'),
                                'data'  => '<select 
name="cal[recur_type]">'."\n".$str.'</select>'."\n"
***************
*** 3865,3869 ****
                        }
        
!                       $var[] = Array(
                                'field' => lang('Repeat End Date'),
                                'data'  => '<input type="checkbox" 
name="cal[rpt_use_end]" value="y"'.$checked.'>'.lang('Use End Date').'  '.
--- 3855,3859 ----
                        }
        
!                       $var['recure_enddate'] = Array(
                                'field' => lang('Repeat End Date'),
                                'data'  => '<input type="checkbox" 
name="cal[rpt_use_end]" value="y"'.$checked.'>'.lang('Use End Date').'  '.
***************
*** 3881,3898 ****
                                if (++$i == 5) $boxes .= '<br>';
                        }
!                       $var[] = Array(
                                'field' => lang('Repeat Day').'<br>'.lang('(for 
weekly)'),
                                'data'  => $boxes
                        );
  
!                       $var[] = Array(
                                'field' => lang('Interval'),
                                'data'  => '<input name="cal[recur_interval]" 
size="4" maxlength="4" value="'.$event['recur_interval'].'">'
                        );
  
!                       for($i=0;$i<count($var);$i++)
                        {
!                               
$this->output_template_array($p,'row','list',$var[$i]);
                        }
  
                        $p->set_var('submit_button',lang('Save'));
--- 3871,3946 ----
                                if (++$i == 5) $boxes .= '<br>';
                        }
!                       $var['recure_day'] = Array(
                                'field' => lang('Repeat Day').'<br>'.lang('(for 
weekly)'),
                                'data'  => $boxes
                        );
  
!                       $var['recure_interval'] = Array(
                                'field' => lang('Interval'),
                                'data'  => '<input name="cal[recur_interval]" 
size="4" maxlength="4" value="'.$event['recur_interval'].'">'
                        );
  
!                       if (!isset($this->fields))
                        {
!                               $this->custom_fields = 
CreateObject('calendar.bocustom_fields');
!                               $this->fields = &$this->custom_fields->fields;
!                               $this->stock_fields = 
&$this->custom_fields->stock_fields;
                        }
+                       foreach($this->fields as $name => $data)
+                       {
+                               if (!$data['disabled'])
+                               {
+                                       if (isset($var[$name]))
+                                       {
+                                               switch($name)
+                                               {
+                                                       case 'startdate':
+                                                               
$this->output_template_array($p,'row','list',$var['startdate']);
+                                                               
$this->output_template_array($p,'row','list',$var['starttime']);
+                                                               break;
+                                                       case 'enddate':
+                                                               
$this->output_template_array($p,'row','list',$var['enddate']);
+                                                               
$this->output_template_array($p,'row','list',$var['endtime']);
+                                                               break;
+                                                       case 'recure_type':
+                                                               
$p->set_var('tr_color',$this->theme['th_bg']);
+                                                               
$p->set_var('hr_text','<center><b>'.lang('Repeating Event 
Information').'</b></center>');
+                                                               
$p->parse('row','hr',True);
+                                                               
$this->output_template_array($p,'row','list',$var['recure_type']);
+                                                               
$this->output_template_array($p,'row','list',$var['recure_enddate']);
+                                                               
$this->output_template_array($p,'row','list',$var['recure_day']);
+                                                               
$this->output_template_array($p,'row','list',$var['recure_interval']);
+                                                               break;
+                                                       default:
+                                                               
$this->output_template_array($p,'row','list',$var[$name]);
+                                               }
+                                       }
+                                       elseif 
(!isset($this->stock_fields[$name]))     // Custom field
+                                       {
+                                               $lang = lang($name);
+                                               $size = 'SIZE='.($data['shown'] 
? $data['shown'] : ($data['length'] ? $data['length'] : 30)).
+                                                       ' 
MAXLENGTH='.($data['length'] ? $data['length'] : 255);
+                                               $v = array(
+                                                       'field' => $lang == 
$name.'*' ? $name : $lang,
+                                                       'data'  => '<input 
name="cal[#'.htmlspecialchars($name).']" '.$size.' 
value="'.$event['#'.$name].'">'
+                                               );
+                                               if ($data['title'])
+                                               {
+                                                       $v['tr_color'] = 
$this->theme['th_bg'];
+                                               }
+                                               if (!$data['length'] && 
$data['title'])
+                                               {
+                                                       
$p->set_var('tr_color',$this->theme['th_bg']);
+                                                       
$p->set_var('hr_text','<center><b>'.$v['field'].'</b></center>');
+                                                       
$p->parse('row','hr',True);
+                                               }
+                                               else
+                                               {
+                                                       
$this->output_template_array($p,'row','list',$v);
+                                               }
+                                       }
+                               }
+                       }
+                       unset($var);
  
                        $p->set_var('submit_button',lang('Save'));

Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/hook_admin.inc.php,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.1.2.1
diff -C2 -r1.7.2.1 -r1.7.2.1.2.1
*** hook_admin.inc.php  26 Jan 2002 00:41:22 -0000      1.7.2.1
--- hook_admin.inc.php  9 Aug 2003 00:33:26 -0000       1.7.2.1.2.1
***************
*** 17,21 ****
        $file = Array(
                'Site Configuration' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' 
. $appname),
!               'Calendar Holiday Management'           => 
$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uiholiday.admin'),
                'Global Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=calendar')
        );
--- 17,22 ----
        $file = Array(
                'Site Configuration' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' 
. $appname),
!               'Custom fields and sorting' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicustom_fields.index'),
!               'Calendar Holiday Management' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uiholiday.admin'),
                'Global Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=calendar')
        );

Index: hook_sidebox_menu.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/Attic/hook_sidebox_menu.inc.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** hook_sidebox_menu.inc.php   5 May 2003 18:57:12 -0000       1.1.2.4
--- hook_sidebox_menu.inc.php   9 Aug 2003 00:33:26 -0000       1.1.2.5
***************
*** 55,58 ****
--- 55,59 ----
                $file = Array(
                        
'Configuration'=>$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=calendar'),
+                       'Custom 
Fields'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicustom_fields.index'),
                        'Holiday 
Management'=>$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uiholiday.admin'),
                        'Global Categories' 
=>$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=calendar'),





reply via email to

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