Revision: 1456
http://mrbs.svn.sourceforge.net/mrbs/?rev=1456&view=rev
Author: cimorrison
Date: 2010-09-17 09:57:54 +0000 (Fri, 17 Sep 2010)
Log Message:
-----------
Added confirmation status and approval status to delete notification email
details.
Modified Paths:
--------------
mrbs/branches/provisional_bookings_new_style/web/functions_mail.inc
Modified: mrbs/branches/provisional_bookings_new_style/web/functions_mail.inc
===================================================================
--- mrbs/branches/provisional_bookings_new_style/web/functions_mail.inc
2010-09-17 08:28:04 UTC (rev 1455)
+++ mrbs/branches/provisional_bookings_new_style/web/functions_mail.inc
2010-09-17 09:57:54 UTC (rev 1456)
@@ -438,7 +438,7 @@
convertToMailCharset($mail_previous['description']),
$new_entry) . "\n";
- if ($confirmation_enabled)
+ if ($confirmation_enabled)
{
// Confirmation status:
$body .= get_mail_vocab("confirmation_status") . ": ";
@@ -447,7 +447,7 @@
$body .= compareEntries($new_status, $old_status, $new_entry) . "\n";
}
- if ($approval_enabled)
+ if ($approval_enabled)
{
// Approval status:
$body .= get_mail_vocab("approval_status") . ": ";
@@ -654,6 +654,7 @@
{
global $typel, $enable_periods, $auth;
global $mail_settings, $standard_fields, $tbl_entry;
+ global $approval_enabled, $confirmation_enabled;
// Get any extra arguments
$action = (func_num_args() > 1) ? func_get_arg(1) : "delete";
@@ -734,6 +735,23 @@
$body .= convertToMailCharset($mail_previous['namebooker']) . "\n";
$body .= get_mail_vocab("description") . ": ";
$body .= convertToMailCharset($mail_previous['description']) . "\n";
+
+ if ($confirmation_enabled)
+ {
+ // Confirmation status:
+ $body .= get_mail_vocab("confirmation_status") . ": ";
+ $body .= ($mail_previous['status'] & STATUS_TENTATIVE) ?
get_mail_vocab("tentative") : get_mail_vocab("confirmed");
+ $body .= "\n";
+ }
+
+ if ($approval_enabled)
+ {
+ // Approval status:
+ $body .= get_mail_vocab("approval_status") . ": ";
+ $body .= ($mail_previous['status'] & STATUS_AWAITING_APPROVAL) ?
get_mail_vocab("awaiting_approval") : get_mail_vocab("approved");
+ $body .= "\n";
+ }
+
$body .= get_mail_vocab("room") . ": ";
$body .= convertToMailCharset($mail_previous['area_name']);
$body .= " - " . convertToMailCharset($mail_previous['room_name']) . "\n";
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
