From: Janusz Dobrowolski <janusz@frontaccouting.eu>
Date: Wed, 19 Dec 2012 18:43:31 +0000 (+0100)
Subject: All outgoing emails are optionally send also to BCC mailbox configured in company... 
X-Git-Tag: 2.3-final~361
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=1c6d923f84499d78eb656460f056364ea0a74e9e

All outgoing emails are optionally send also to BCC mailbox configured in company setup.
---

diff --git a/admin/company_preferences.php b/admin/company_preferences.php
index 51881218..8762378d 100644
--- a/admin/company_preferences.php
+++ b/admin/company_preferences.php
@@ -108,7 +108,8 @@ if (isset($_POST['update']) && $_POST['update'] != "")
 				'use_dimension', 'curr_default', 'f_year', 
 				'no_item_list' => 0, 'no_customer_list' => 0, 
 				'no_supplier_list' =>0, 'base_sales', 
-				'time_zone' => 0, 'add_pct', 'round_to', 'login_tout', 'auto_curr_reval'))
+				'time_zone' => 0, 'add_pct', 'round_to', 'login_tout', 'auto_curr_reval',
+				'bcc_email'))
 		);
 
 		$_SESSION['wa_current_user']->timeout = $_POST['login_tout'];
@@ -119,7 +120,10 @@ if (isset($_POST['update']) && $_POST['update'] != "")
 } /* end of if submit */
 
 //---------------------------------------------------------------------------------------------
-
+if (get_company_pref('bcc_email') === null) { // available from 2.3.14, can be not defined on pre-2.4 installations
+	set_company_pref('bcc_email', 'setup.company', 'varchar', 100, '');
+	refresh_sys_prefs();
+}
 
 start_form(true);
 $myrow = get_company_prefs();
@@ -151,6 +155,7 @@ if ($_POST['add_pct'] == -1)
 $_POST['round_to'] = $myrow['round_to'];	
 $_POST['auto_curr_reval'] = $myrow['auto_curr_reval'];	
 $_POST['del_coy_logo']  = 0;
+$_POST['bcc_email']  = $myrow["bcc_email"];
 
 start_outer_table(TABLESTYLE2);
 
@@ -164,6 +169,8 @@ text_row_ex(_("Phone Number:"), 'phone', 25, 55);
 text_row_ex(_("Fax Number:"), 'fax', 25);
 email_row_ex(_("Email Address:"), 'email', 25, 55);
 
+email_row_ex(_("BCC Address for all outgoing mails:"), 'bcc_email', 25, 55);
+
 text_row_ex(_("Official Company Number:"), 'coy_no', 25);
 text_row_ex(_("GSTNo:"), 'gst_no', 25);
 
diff --git a/reporting/includes/class.mail.inc b/reporting/includes/class.mail.inc
index 65066ca7..c51e5b6a 100644
--- a/reporting/includes/class.mail.inc
+++ b/reporting/includes/class.mail.inc
@@ -39,11 +39,15 @@ class email
     var $subject = "";
     var $body = "";
 	var $charset = 'ISO-8859-1';
+	var $add_params;
 	
     function email($name, $mail)
     {
         $this->boundary = md5(uniqid(time()));
 		$this->header = "From: $name <$mail>\n";
+		$bcc = get_company_pref('bcc_email');
+		if ($bcc)
+			$this->bcc[] = $bcc;
     }
 
     function to($mail)
@@ -156,7 +160,7 @@ class email
 		$ret = 0;
         foreach($this->to as $mail)
         {
-			if (mail($mail, $this->subject, $this->body, $this->header))
+			if (mail($mail, $this->subject, $this->body, $this->header, $this->add_params))
 				$ret++;
         }
         return $ret;
diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql
index a720b7dc..a141c444 100644
--- a/sql/en_US-demo.sql
+++ b/sql/en_US-demo.sql
@@ -2067,6 +2067,7 @@ INSERT INTO `0_sys_prefs` VALUES('default_workorder_required', 'glsetup.manuf',
 INSERT INTO `0_sys_prefs` VALUES('version_id', 'system', 'varchar', 11, '2.3rc');
 INSERT INTO `0_sys_prefs` VALUES('auto_curr_reval', 'setup.company', 'smallint', 6, '1');
 INSERT INTO `0_sys_prefs` VALUES('grn_clearing_act', 'glsetup.purchase', 'varchar', 15, '1550');
+INSERT INTO `0_sys_prefs` VALUES('bcc_email', 'setup.company', 'varchar', 100, '');
 
 -- --------------------------------------------------------
 
diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql
index a866a6f7..fd8f96ba 100644
--- a/sql/en_US-new.sql
+++ b/sql/en_US-new.sql
@@ -1826,6 +1826,7 @@ INSERT INTO `0_sys_prefs` VALUES('default_workorder_required', 'glsetup.manuf',
 INSERT INTO `0_sys_prefs` VALUES('version_id', 'system', 'varchar', 11, '2.3rc');
 INSERT INTO `0_sys_prefs` VALUES('auto_curr_reval', 'setup.company', 'smallint', 6, '1');
 INSERT INTO `0_sys_prefs` VALUES('grn_clearing_act', 'glsetup.purchase', 'varchar', 15, '1550');
+INSERT INTO `0_sys_prefs` VALUES('bcc_email', 'setup.company', 'varchar', 100, '');
 
 -- --------------------------------------------------------