[Phpgroupware-cvs] CVS: projects/inc class.boprojects.inc.php, 1.55, 1.56

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.boprojects.inc.php 
Log Message:
email notifications

Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** class.boprojects.inc.php    15 Sep 2003 00:53:28 -0000      1.55
--- class.boprojects.inc.php    15 Sep 2003 01:12:06 -0000      1.56
***************
*** 848,855 ****
--- 848,865 ----
                        {
                                $this->so->edit_project($values, 
$book_activities, $bill_activities);
+ 
+                               if(is_array($values['employees']))
+                               {
+                                       $this->send_alarm($values,'pro');
+                               }
                        }
                        else
                        {
                                $values['project_id'] = 
$this->so->add_project($values, $book_activities, $bill_activities);
+ 
+                               if(is_array($values['employees']))
+                               {
+                                       $this->send_alarm($values);
+                               }
                        }
  
***************
*** 944,948 ****
                                if ($values['old_edate'] != $values['edate'])
                                {
!                                       $this->send_alarm($values);
                                }
                        }
--- 954,961 ----
                                if ($values['old_edate'] != $values['edate'])
                                {
!                                       $values['edateformatted']       = 
$this->formatted_edate($values['edate'],False);
!                                       $values['pro_title']            = 
$this->return_value('pro',$values['project_id']);
! 
!                                       $this->send_alarm($values,'mstone');
                                }
                        }
***************
*** 963,967 ****
                }
  
!               function formatted_edate($edate = '')
                {
                        $edate = intval($edate);
--- 976,980 ----
                }
  
!               function formatted_edate($edate = '',$colored = True)
                {
                        $edate = intval($edate);
***************
*** 977,989 ****
                        }
  
!                       if (mktime(2,0,0,$month,$day,$year) == $edate)
!                       {
!                               $edateout = '<b>' . $edateout . '</b>';
!                       }
!                       if (mktime(2,0,0,$month,$day,$year) >= $edate)
                        {
!                               $edateout = '<font color="CC0000"><b>' . 
$edateout . '</b></font>';
                        }
- 
                        return $edateout;
                }
--- 990,1004 ----
                        }
  
!                       if($colored)
                        {
!                               if (mktime(2,0,0,$month,$day,$year) == $edate)
!                               {
!                                       $edateout = '<b>' . $edateout . '</b>';
!                               }
!                               if (mktime(2,0,0,$month,$day,$year) >= $edate)
!                               {
!                                       $edateout = '<font color="CC0000"><b>' 
. $edateout . '</b></font>';
!                               }
                        }
                        return $edateout;
                }
***************
*** 994,998 ****
                }
  
!               function send_alarm($type = 'assign',$values)
                {
                        $GLOBALS['phpgw_info']['user']['preferences'] = 
$GLOBALS['phpgw']->preferences->create_email_preferences();
--- 1009,1013 ----
                }
  
!               function send_alarm($values,$type = 'assign')
                {
                        $GLOBALS['phpgw_info']['user']['preferences'] = 
$GLOBALS['phpgw']->preferences->create_email_preferences();
***************
*** 1004,1008 ****
                                case 'assign':
                                        $subject = lang('assignment to project 
%1',$values['title']);
!                                       $msg = lang('assignment to project %1, 
ID: %2',$values['title'], $values['number']);
                                        break;
                                case 'update':
--- 1019,1023 ----
                                case 'assign':
                                        $subject = lang('assignment to project 
%1',$values['title']);
!                                       $msg = lang('assignment to project 
%1',$values['title']);
                                        break;
                                case 'update':
***************
*** 1011,1016 ****
                                        break;
                                case 'mstone':
!                                       $action = lang('date due of milestone 
%1 of project %2 has been updated', $values['m_title'],$values['title']);
!                                       $msg = lang('new date due of milestone 
%1: %2', $values['m_title'], $values['edateformatted']);
                                        break;
                        }
--- 1026,1031 ----
                                        break;
                                case 'mstone':
!                                       $action = lang('date due of milestone 
%1 of project %2 has been updated', $values['title'],$values['pro_title']);
!                                       $msg = lang('new date due of milestone 
%1: %2', $values['title'], $values['edateformatted']);
                                        break;
                        }
***************
*** 1032,1036 ****
                                {
                                        case 'assign':
!                                               if 
($GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_assign'] == 
'yes')
                                                {
                                                        $to_notify = True;
--- 1047,1051 ----
                                {
                                        case 'assign':
!                                               if 
($prefs['projects']['notify_assign'] == 'yes')
                                                {
                                                        $to_notify = True;
***************
*** 1038,1042 ****
                                                break;
                                        case 'pro':
!                                               
if($GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_pro'] == 
'yes')
                                                {
                                                        $to_notify = True;
--- 1053,1057 ----
                                                break;
                                        case 'pro':
!                                               
if($prefs['projects']['notify_pro'] == 'yes')
                                                {
                                                        $to_notify = True;
***************
*** 1044,1048 ****
                                                break;
                                        case 'mstone':
!                                               
if($GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_mstone'] 
== 'yes')
                                                {
                                                        $to_notify = True;
--- 1059,1063 ----
                                                break;
                                        case 'mstone':
!                                               
if($prefs['projects']['notify_mstone'] == 'yes')
                                                {
                                                        $to_notify = True;
***************
*** 1080,1085 ****
                                        }
                                }
                        }
-                       //unset($send);
                        return $returncode;
                }
--- 1095,1100 ----
                                        }
                                }
+                               //unset($prefs);
                        }
                        return $returncode;
                }