[Phpgroupware-cvs] CVS: email/inc class.bomessage.inc.php,1.5.2.4,1.5.2.5 class.mail_dcom_base.inc.php,1.6.2.1,1.6.2.2 class.uimessage.inc.php,1.2.2.3,1.2.2.4

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/email/inc
In directory subversions:/tmp/cvs-serv30291

Modified Files:
      Tag: Version-0_9_14-branch
        class.bomessage.inc.php class.mail_dcom_base.inc.php 
        class.uimessage.inc.php 
Log Message:
readded a call to calendar's hook_email and other X-phpGW-Type hooks


Index: class.bomessage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.bomessage.inc.php,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -C2 -r1.5.2.4 -r1.5.2.5
*** class.bomessage.inc.php     20 Nov 2002 23:03:24 -0000      1.5.2.4
--- class.bomessage.inc.php     24 Nov 2002 02:10:45 -0000      1.5.2.5
***************
*** 310,314 ****
                        
                        // ----  Special X-phpGW-Type Message Flag  -----
!                       // is this still a planned feature?
                        $this->xi['application'] = '';
                        $msgtype = 
$GLOBALS['phpgw']->msg->phpgw_get_flag('X-phpGW-Type');
--- 310,314 ----
                        
                        // ----  Special X-phpGW-Type Message Flag  -----
!                       // this is used at least by the calendar for the 
notifications
                        $this->xi['application'] = '';
                        $msgtype = 
$GLOBALS['phpgw']->msg->phpgw_get_flag('X-phpGW-Type');
***************
*** 318,322 ****
                        {
                                $msg_type = explode(';',$msgtype);
!                               $application = 
substr($msg_type[0],1,strlen($msg_type[0])-2);
                                $this->xi['application'] = $application;
                                
//$GLOBALS['phpgw']->template->parse('V_x-phpgw-type','B_x-phpgw-type');
--- 318,322 ----
                        {
                                $msg_type = explode(';',$msgtype);
!                               $application = substr($msg_type[0],1,-1);
                                $this->xi['application'] = $application;
                                
//$GLOBALS['phpgw']->template->parse('V_x-phpgw-type','B_x-phpgw-type');
***************
*** 1618,1622 ****
                        }
                        
!                       /* // IS THIS STILL USED ???????
                        if($application)
                        {
--- 1618,1622 ----
                        }
                        
!                       // used to show in calendar-notifications the event and 
allow to except it there
                        if($application)
                        {
***************
*** 1625,1635 ****
                                        $msg_type = explode(';',$msgtype);
                                        $id_array = explode('=',$msg_type[2]);
!                                       $calendar_id = 
intval(substr($id_array[1],1,strlen($id_array[1])-2));
!                                       
!                                       echo '<tr><td align="center">';
! \                                     
$GLOBALS['phpgw']->hooks->single('email',$application)
!                                       echo '</td></tr>';
                                }
!                       } */
                        
                        
//$GLOBALS['phpgw']->template->pparse('out','T_message_main');
--- 1625,1631 ----
                                        $msg_type = explode(';',$msgtype);
                                        $id_array = explode('=',$msg_type[2]);
!                                       $this->xi['calendar_id'] = 
intval(substr($id_array[1],1,-1));
                                }
!                       }
                        
                        
//$GLOBALS['phpgw']->template->pparse('out','T_message_main');

Index: class.mail_dcom_base.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_dcom_base.inc.php,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** class.mail_dcom_base.inc.php        20 Nov 2002 23:03:24 -0000      1.6.2.1
--- class.mail_dcom_base.inc.php        24 Nov 2002 02:10:45 -0000      1.6.2.2
***************
*** 300,304 ****
                function get_flag($stream,$msg_num,$flag)
                {
!                       $header = $this->fetchheader($stream,$msg_num);
                        $flag = strtolower($flag);
                        for ($i=0;$i<count($header);$i++)
--- 300,304 ----
                function get_flag($stream,$msg_num,$flag)
                {
!                       $header = 
explode("\n",$this->fetchheader($stream,$msg_num));
                        $flag = strtolower($flag);
                        for ($i=0;$i<count($header);$i++)

Index: class.uimessage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.uimessage.inc.php,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** class.uimessage.inc.php     20 Nov 2002 23:03:25 -0000      1.2.2.3
--- class.uimessage.inc.php     24 Nov 2002 02:10:45 -0000      1.2.2.4
***************
*** 258,261 ****
--- 258,267 ----
                                //$GLOBALS['phpgw']->common->phpgw_footer();
                        }
+                       if (isset($this->bo->xi['application']))
+                       {
+                               global $calendar_id;
+                               $calendar_id = $this->bo->xi['calendar_id'];
+                               
$GLOBALS['phpgw']->hooks->single('email',$this->bo->xi['application']);
+                       }
                        // tell apache to release emeory back to the system on 
script end
                        //apache_child_terminate();