[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8563] bkbooking: fixed bug when sending email when e
From: |
Kjell Arne Espedal |
Subject: |
[Fmsystem-commits] [8563] bkbooking: fixed bug when sending email when event is set inactive |
Date: |
Thu, 12 Jan 2012 15:16:45 +0000 |
Revision: 8563
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8563
Author: kjell
Date: 2012-01-12 15:16:44 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
bkbooking: fixed bug when sending email when event is set inactive
Modified Paths:
--------------
trunk/booking/inc/class.uievent.inc.php
Modified: trunk/booking/inc/class.uievent.inc.php
===================================================================
--- trunk/booking/inc/class.uievent.inc.php 2012-01-12 14:50:07 UTC (rev
8562)
+++ trunk/booking/inc/class.uievent.inc.php 2012-01-12 15:16:44 UTC (rev
8563)
@@ -534,7 +534,8 @@
if(!$errors['event'] and
!$errors['resource_number'] and !$errors['organization_number'] and
!$errors['invoice_data'] && !$errors['contact_name'] && !$errors['cost'])
{
- if (phpgw::get_var('mail', 'POST') ||
phpgw::get_var('sendtorbuilding', 'POST'))
+
+ if ((phpgw::get_var('mail', 'POST') ||
phpgw::get_var('sendtorbuilding', 'POST')) && phpgw::get_var('active', 'POST'))
{
if(phpgw::get_var('sendtocollision', 'POST') || phpgw::get_var('sendtocontact',
'POST') || phpgw::get_var('sendtorbuilding', 'POST'))
{
@@ -626,15 +627,17 @@
$this->send_mailnotification($event['contact_email'], lang('Event changed'),
phpgw::get_var('mail', 'POST'));
}
} elseif (!phpgw::get_var('active',
'POST')) {
+
if
($event['customer_organization_name']) {
$comment_text_log = $event['customer_organization_name'];
} else {
$comment_text_log = $event['contact_name'];
}
-
$comment_text_log = $comment_text_log.' sitt arrangement i
'.$event['building_name'].' '.date('d-m-Y H:i', strtotime($event['from_']))."
har blitt kansellert.\n For mer opplysinger slå opp i AktivBy.";
-//
$comment_text_log = phpgw::get_var('mail', 'POST');
+
$comment_text_log = $comment_text_log.' sitt arrangement i
'.$event['building_name'].' '.date('d-m-Y H:i', strtotime($event['from_']))."
har blitt kansellert.\n For mer opplysinger slå opp i AktivBy.\n\n";
+
$comment_text_log .= phpgw::get_var('mail', 'POST');
$sendt = 0;
$mail_sendt_to
= '';
+
if($building_info['email']) {
$sendt++;
$mail_sendt_to = $mail_sendt_to.' '.$building_info['email'];
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8563] bkbooking: fixed bug when sending email when event is set inactive,
Kjell Arne Espedal <=