[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php, 1.42.2.5.2.26, 1.42.2.5.2.27 class.uiprojects.inc.php, 1.47.2.7.2.29, 1.47.2.7.2.30

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv15423/inc

Modified Files:
      Tag: Version-0_9_16-branch
        class.boprojects.inc.php class.uiprojects.inc.php 
Log Message:
update

Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.42.2.5.2.26
retrieving revision 1.42.2.5.2.27
diff -C2 -r1.42.2.5.2.26 -r1.42.2.5.2.27
*** class.boprojects.inc.php    26 Aug 2003 01:27:55 -0000      1.42.2.5.2.26
--- class.boprojects.inc.php    29 Aug 2003 00:01:52 -0000      1.42.2.5.2.27
***************
*** 233,237 ****
                                $prefs['mysize'] = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['mysize'];
                                $prefs['allsize'] = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['allsize'];
!                               $prefs['notification'] = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notification'];
                        }
                        return $prefs;
--- 233,239 ----
                                $prefs['mysize'] = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['mysize'];
                                $prefs['allsize'] = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['allsize'];
!                               $prefs['notify_mstone'] = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_mstone'];
!                               $prefs['notify_task'] = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_task'];
!                               $prefs['notify_assign'] = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_assign'];
                        }
                        return $prefs;
***************
*** 250,254 ****
                                
$GLOBALS['phpgw']->preferences->change('projects','mysize',$prefs['mysize']);
                                
$GLOBALS['phpgw']->preferences->change('projects','allsize',$prefs['allsize']);
!                               
$GLOBALS['phpgw']->preferences->change('projects','notification',(isset($prefs['notification'])?'yes':''));
  
                                
$GLOBALS['phpgw']->preferences->save_repository(True);
--- 252,258 ----
                                
$GLOBALS['phpgw']->preferences->change('projects','mysize',$prefs['mysize']);
                                
$GLOBALS['phpgw']->preferences->change('projects','allsize',$prefs['allsize']);
!                               
$GLOBALS['phpgw']->preferences->change('projects','notify_mstone',(isset($prefs['notify_mstone'])?'yes':''));
!                               
$GLOBALS['phpgw']->preferences->change('projects','notify_task',(isset($prefs['notify_task'])?'yes':''));
!                               
$GLOBALS['phpgw']->preferences->change('projects','notify_assign',(isset($prefs['notify_assign'])?'yes':''));
  
                                
$GLOBALS['phpgw']->preferences->save_repository(True);
***************
*** 307,311 ****
                                        $prefs['mysize']        = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['mysize'];
                                        $prefs['allsize']       = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['allsize'];
!                                       $prefs['notification']  = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notification'];
                                }
                        }
--- 311,317 ----
                                        $prefs['mysize']        = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['mysize'];
                                        $prefs['allsize']       = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['allsize'];
!                                       $prefs['notify_mstone'] = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_mstone'];
!                                       $prefs['notify_task']   = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_task'];
!                                       $prefs['notify_assign'] = 
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_assign'];
                                }
                        }
***************
*** 920,924 ****
                        $values['edate'] = 
mktime(0,0,0,$values['emonth'],$values['eday'],$values['eyear']);
  
!                       if ($values['s_id'] && $values['s_id'] > 0)
                        {
                                $this->so->edit_mstone($values);
--- 926,938 ----
                        $values['edate'] = 
mktime(0,0,0,$values['emonth'],$values['eday'],$values['eyear']);
  
!                       if (isset($values['old_edate']) && 
intval($values['old_edate']) > 0)
!                       {
!                               if ($values['old_edate'] != $values['edate'])
!                               {
!                                       $this->send_alarm($values);
!                               }
!                       }
! 
!                       if (intval($values['s_id']) > 0)
                        {
                                $this->so->edit_mstone($values);
***************
*** 964,967 ****
--- 978,986 ----
                {
                        return $this->so->member($project_id);
+               }
+ 
+               function send_alarm($values)
+               {
+ 
                }
        }

Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7.2.29
retrieving revision 1.47.2.7.2.30
diff -C2 -r1.47.2.7.2.29 -r1.47.2.7.2.30
*** class.uiprojects.inc.php    26 Aug 2003 01:27:55 -0000      1.47.2.7.2.29
--- class.uiprojects.inc.php    29 Aug 2003 00:01:52 -0000      1.47.2.7.2.30
***************
*** 1532,1539 ****
  
                        
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
!                       
$GLOBALS['phpgw']->template->set_var('lang_notification',lang('Would you like 
to get informations per email about projects date due'));
  
                        $prefs = $this->bo->read_prefs();
!                       
$GLOBALS['phpgw']->template->set_var('notif_selected',($prefs['notification'] 
== 'yes'? ' checked':''));
  
                        if ($this->bo->isprojectadmin('pbo') || 
$this->bo->isprojectadmin('pad'))
--- 1532,1546 ----
  
                        
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
! 
!                       
$GLOBALS['phpgw']->template->set_var('lang_notify_mstone',lang('would you like 
to get notified via email about changes of milestones date due'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_notify_task',lang('would you like to 
get notified via email about changes of tasks'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_notify_assign',lang('would you like 
to get notified via email if you get assigned to a project'));
! 
!                       
$GLOBALS['phpgw']->template->set_var('lang_notifications',lang('notifications'));
  
                        $prefs = $this->bo->read_prefs();
!                       
$GLOBALS['phpgw']->template->set_var('notify_mstone_selected',($prefs['notify_mstone']
 == 'yes'? ' checked':''));
!                       
$GLOBALS['phpgw']->template->set_var('notify_task_selected',($prefs['notify_task']
 == 'yes'? ' checked':''));
!                       
$GLOBALS['phpgw']->template->set_var('notify_assign_selected',($prefs['notify_assign']
 == 'yes'? ' checked':''));
  
                        if ($this->bo->isprojectadmin('pbo') || 
$this->bo->isprojectadmin('pad'))
***************
*** 2036,2039 ****
--- 2043,2048 ----
                        {
                                $values = $this->bo->get_single_mstone($s_id);
+ 
+                               
$GLOBALS['phpgw']->template->set_var('old_edate',$values['edate']);
  
                                //if 
($this->bo->check_perms($this->grants[$values['coordinator']],PHPGW_ACL_DELETE) 
|| $values['coordinator'] == $this->account)