Revision: 1249
http://mrbs.svn.sourceforge.net/mrbs/?rev=1249&view=rev
Author: cimorrison
Date: 2009-11-10 13:34:07 +0000 (Tue, 10 Nov 2009)
Log Message:
-----------
Booking status added to email notifications.
Modified Paths:
--------------
mrbs/branches/provisional_bookings/web/edit_entry_handler.php
mrbs/branches/provisional_bookings/web/functions_mail.inc
mrbs/branches/provisional_bookings/web/systemdefaults.inc.php
Modified: mrbs/branches/provisional_bookings/web/edit_entry_handler.php
===================================================================
--- mrbs/branches/provisional_bookings/web/edit_entry_handler.php
2009-11-10 13:00:18 UTC (rev 1248)
+++ mrbs/branches/provisional_bookings/web/edit_entry_handler.php
2009-11-10 13:34:07 UTC (rev 1249)
@@ -444,7 +444,8 @@
$status);
// Send a mail to the Administrator
if ($mail_settings['admin_on_bookings'] or
$mail_settings['area_admin_on_bookings'] or
- $mail_settings['room_admin_on_bookings'] or $mail_settings['booker'])
+ $mail_settings['room_admin_on_bookings'] or $mail_settings['booker']
or
+ $mail_settings['book_admin_on_provisional'])
{
require_once "functions_mail.inc";
// Send a mail only if this a new entry, or if this is an
@@ -503,7 +504,8 @@
// Send a mail to the Administrator
if ($mail_settings['admin_on_bookings'] or
$mail_settings['area_admin_on_bookings'] or
- $mail_settings['room_admin_on_bookings'] or $mail_settings['booker'])
+ $mail_settings['room_admin_on_bookings'] or $mail_settings['booker']
or
+ $mail_settings['book_admin_on_provisional'])
{
require_once "functions_mail.inc";
// Send a mail only if this a new entry, or if this is an
Modified: mrbs/branches/provisional_bookings/web/functions_mail.inc
===================================================================
--- mrbs/branches/provisional_bookings/web/functions_mail.inc 2009-11-10
13:00:18 UTC (rev 1248)
+++ mrbs/branches/provisional_bookings/web/functions_mail.inc 2009-11-10
13:34:07 UTC (rev 1249)
@@ -152,7 +152,7 @@
{
global $url_base, $returl, $name, $description, $area_name;
global $room_name, $starttime, $duration, $dur_units, $end_date, $endtime;
- global $rep_enddate, $typel, $type, $create_by, $rep_type, $enable_periods;
+ global $rep_enddate, $typel, $type, $status, $create_by, $rep_type,
$enable_periods;
global $rep_opt, $rep_num_weeks;
global $tbl_room, $tbl_area, $tbl_entry, $tbl_users, $tbl_repeat;
global $mail_previous, $auth;
@@ -338,7 +338,12 @@
$body .= compareEntries(convertToMailCharset($description),
convertToMailCharset($mail_previous['description']),
$new_entry) . "\n";
-
+
+ // Status:
+ $body .= get_mail_vocab("status") . ": ";
+ $body .= ($status == STATUS_CONFIRMED) ? get_mail_vocab("confirmed") :
get_mail_vocab("provisional");
+ $body .= "\n";
+
// Room:
$body .= get_mail_vocab("room") . ": " .
compareEntries(convertToMailCharset($area_name),
Modified: mrbs/branches/provisional_bookings/web/systemdefaults.inc.php
===================================================================
--- mrbs/branches/provisional_bookings/web/systemdefaults.inc.php
2009-11-10 13:00:18 UTC (rev 1248)
+++ mrbs/branches/provisional_bookings/web/systemdefaults.inc.php
2009-11-10 13:34:07 UTC (rev 1249)
@@ -556,6 +556,10 @@
// Default is FALSE. Room admin emails are set in room_area admin page.
$mail_settings['room_admin_on_bookings'] = FALSE;
+// Set to TRUE if you want the appropriate booking administrators to be emailed
+// when a provisional booking is created
+$mail_settings['book_admin_on_provisional'] = FALSE;
+
// Set to TRUE if you want ADMIN to be notified when entries are deleted. Email
// will be sent to mrbs admin, area admin and room admin as per above settings,
// as well as to booker if 'booker' is TRUE (see below).
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
