[Phpgroupware-cvs] property/inc hook_settings.inc.php, 1.6 class.uiwo_hour.inc.php, 1.7

[sigurdne]

Update of property/inc

Modified Files:
     Branch: MAIN
            hook_settings.inc.php lines: +2 -2
            class.uiwo_hour.inc.php lines: +6 -3

Log Message:
no message

====================================================
Index: property/inc/hook_settings.inc.php
diff -u property/inc/hook_settings.inc.php:1.5 
property/inc/hook_settings.inc.php:1.6
--- property/inc/hook_settings.inc.php:1.5      Wed Feb  9 14:17:25 2005
+++ property/inc/hook_settings.inc.php  Wed Mar  2 11:54:04 2005
@@ -93,7 +93,7 @@
        create_select_box('Default Degree Request user 
gratification','default_gratification',$degree);
        create_select_box('Default Degree Request residential 
environment','default_environment',$degree);

-
+       create_select_box('Send order receipt as email 
','order_email_rcpt',$yes_and_no,'Send the order as BCC to the user');

        $default_start_page = array(
                'location'   => lang('Location'),

====================================================
Index: property/inc/class.uiwo_hour.inc.php
diff -u property/inc/class.uiwo_hour.inc.php:1.6 
property/inc/class.uiwo_hour.inc.php:1.7
--- property/inc/class.uiwo_hour.inc.php:1.6    Thu Jan 13 16:52:48 2005
+++ property/inc/class.uiwo_hour.inc.php        Wed Mar  2 11:54:04 2005
@@ -770,17 +770,20 @@
                                
$this->create_html->set_var('phpgw',array('email_data' => $email_data));
                                $GLOBALS['phpgw_info']['flags']['noframework'] 
= True;
                                $html = $this->create_html->parse();
+
 //                             print $html;

                                $headers = "Return-Path: <". $from_email 
.">\r\n";
                                $headers .= "From: " . $from_name . "<" . 
$from_email .">\r\n";
-                               $headers .= "Bcc: " . $from_name . "<" . 
$from_email .">\r\n";
+                               
if($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['order_email_rcpt']==1)
+                               {
+                                       $headers .= "Bcc: " . $from_name . "<" 
. $from_email .">\r\n";
+                               }
                                $headers .= "Content-type: text/html; 
charset=iso-8859-1\r\n";
                                $headers .= "MIME-Version: 1.0\r\n";
                                $subject = lang('Workorder').": ".$workorder_id;

                                $mail_method= 
$this->config->config_data['fmwrkorder_mail'];
-//                             echo 'mail_method: '.$mail_method .'<BR>';

                                if ($mail_method=='smtp'):
                                {