Revision: 1934
http://mrbs.svn.sourceforge.net/mrbs/?rev=1934&view=rev
Author: cimorrison
Date: 2011-09-07 09:16:34 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
Merged in latest changes from trunk
Modified Paths:
--------------
mrbs/branches/datatables/web/edit_entry.php
mrbs/branches/datatables/web/functions_mail.inc
mrbs/branches/datatables/web/lang.en
Property Changed:
----------------
mrbs/branches/datatables/
mrbs/branches/datatables/web/upgrade/5/pgsql.sql
Property changes on: mrbs/branches/datatables
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/ics_attachments:1652-1741
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/only_unicode:1747-1749
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1863-1929
+ /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/ics_attachments:1652-1741
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/only_unicode:1747-1749
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1863-1933
Modified: mrbs/branches/datatables/web/edit_entry.php
===================================================================
--- mrbs/branches/datatables/web/edit_entry.php 2011-09-07 09:13:31 UTC (rev
1933)
+++ mrbs/branches/datatables/web/edit_entry.php 2011-09-07 09:16:34 UTC (rev
1934)
@@ -1150,12 +1150,11 @@
</div>
<?php
- // Checkbox for skipping past conflicts
echo "<div>\n";
$label_text = get_vocab("rep_num_weeks") . ":<br>" .
get_vocab("rep_for_nweekly");
generate_input($label_text, 'rep_num_weeks', $rep_num_weeks);
echo "</div>\n";
-
+ // Checkbox for skipping past conflicts
echo "<div>\n";
echo "<label for=\"skip\">" . get_vocab("skip_conflicts") .
":</label>\n";
echo "<input type=\"checkbox\" class=\"checkbox\" " .
Modified: mrbs/branches/datatables/web/functions_mail.inc
===================================================================
--- mrbs/branches/datatables/web/functions_mail.inc 2011-09-07 09:13:31 UTC
(rev 1933)
+++ mrbs/branches/datatables/web/functions_mail.inc 2011-09-07 09:16:34 UTC
(rev 1934)
@@ -401,7 +401,7 @@
// Generate a list of repeat dates for a series
-function create_repeat_list($data, $as_html)
+function create_repeat_list($data, $action, $as_html)
{
global $max_rep_entrys;
@@ -412,7 +412,14 @@
// The introductory text
$result = ($as_html) ? "<p>" : "\n\n";
- $result .= get_vocab("mail_body_repeats");
+ if (($action == "delete") || ($action == "reject"))
+ {
+ $result .= get_vocab("mail_body_repeats_deleted");
+ }
+ else
+ {
+ $result .= get_vocab("mail_body_repeats_booked");
+ }
$result .= ($as_html) ? "</p>\n" : "\n\n";
$reps = mrbsGetRepeatEntryList($data['start_time'],
@@ -741,7 +748,7 @@
// be booked due to conflicts.
if ($data['rep_type'] != REP_NONE)
{
- $body .= create_repeat_list($data, $as_html);
+ $body .= create_repeat_list($data, $action, $as_html);
}
if ($as_html)
@@ -757,7 +764,8 @@
// create_addresses($data, $action)
//
// Returns an array indexed by 'from', 'to' and 'cc' with each element
-// consisting of a comma separated list of email addresses
+// consisting of a comma separated list of email addresses, or else
+// FALSE if there are no 'to' or 'cc' addresses
//
// Parameters:
// $data an array containing all the data concerning this booking
@@ -849,8 +857,8 @@
$to[] = $booker_email;
}
}
- // In case $to is empty, no need to go further
- if (empty($to))
+ // In case $to and $cc are empty, no need to go further
+ if (empty($to) && empty($cc))
{
return FALSE;
}
Modified: mrbs/branches/datatables/web/lang.en
===================================================================
--- mrbs/branches/datatables/web/lang.en 2011-09-07 09:13:31 UTC (rev
1933)
+++ mrbs/branches/datatables/web/lang.en 2011-09-07 09:16:34 UTC (rev
1934)
@@ -160,8 +160,9 @@
$vocab["mail_body_rej_entry"] = "An entry has been rejected by the
administrators, here are the details:";
$vocab["mail_body_more_info"] = "The administrators require more
information about an entry; here are the details:";
$vocab["mail_body_reminder"] = "Reminder - an entry is awaiting approval;
here are the details:";
-$vocab["mail_body_repeats"] = "The following dates were booked:";
-$vocab["mail_body_exceptions"] = "The following dates could not be booked
due to conflicts:";
+$vocab["mail_body_repeats_booked"] = "The following dates were booked:";
+$vocab["mail_body_repeats_deleted"] = "The following bookings were deleted:";
+$vocab["mail_body_exceptions"] = "The following dates could not be
booked due to conflicts:";
$vocab["mail_subject_new_entry"] = "Entry added for $mrbs_company MRBS";
$vocab["mail_subject_changed_entry"] = "Entry changed for $mrbs_company MRBS";
$vocab["mail_subject_delete"] = "Entry deleted for $mrbs_company MRBS";
Property changes on: mrbs/branches/datatables/web/upgrade/5/pgsql.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/disabled_rooms/web/upgrade/5/pgsql.sql:1601-1634
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/ics_attachments/web/upgrade/5/pgsql.sql:1652-1741
/mrbs/branches/only_unicode/web/upgrade/5/pgsql.sql:1747-1749
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql:1407-1570
/mrbs/trunk/web/upgrade/5/pgsql.sql:1863-1929
+ /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/disabled_rooms/web/upgrade/5/pgsql.sql:1601-1634
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/ics_attachments/web/upgrade/5/pgsql.sql:1652-1741
/mrbs/branches/only_unicode/web/upgrade/5/pgsql.sql:1747-1749
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql:1407-1570
/mrbs/trunk/web/upgrade/5/pgsql.sql:1863-1933
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Using storage to extend the benefits of virtualization and iSCSI
Virtualization increases hardware utilization and delivers a new level of
agility. Learn what those decisions are and how to modernize your storage
and backup environments for virtualization.
http://www.accelacomm.com/jaw/sfnl/114/51434361/
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
