Revision: 1922
http://mrbs.svn.sourceforge.net/mrbs/?rev=1922&view=rev
Author: cimorrison
Date: 2011-09-02 13:32:48 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
Merged in latest changes from trunk
Modified Paths:
--------------
mrbs/branches/datatables/web/edit_entry_handler.php
mrbs/branches/datatables/web/functions_mail.inc
mrbs/branches/datatables/web/systemdefaults.inc.php
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-1917
+ /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-1921
Modified: mrbs/branches/datatables/web/edit_entry_handler.php
===================================================================
--- mrbs/branches/datatables/web/edit_entry_handler.php 2011-09-02 13:21:16 UTC
(rev 1921)
+++ mrbs/branches/datatables/web/edit_entry_handler.php 2011-09-02 13:32:48 UTC
(rev 1922)
@@ -766,8 +766,9 @@
// Skip and Book button (to book the entries that don't conflict)
-// Only show this button if there were no policies broken
-if (empty($rules_broken))
+// Only show this button if there were no policies broken and it's a series
+if (empty($rules_broken) &&
+ isset($rep_type) && ($rep_type != REP_NONE))
{
echo "<form method=\"post\" action=\"" .
htmlspecialchars(basename($PHP_SELF)) . "\">\n";
echo "<fieldset><legend></legend>\n";
Modified: mrbs/branches/datatables/web/functions_mail.inc
===================================================================
--- mrbs/branches/datatables/web/functions_mail.inc 2011-09-02 13:21:16 UTC
(rev 1921)
+++ mrbs/branches/datatables/web/functions_mail.inc 2011-09-02 13:32:48 UTC
(rev 1922)
@@ -1065,6 +1065,13 @@
global $mail_settings, $sendmail_settings, $smtp_settings, $enable_periods;
+ // Don't do aything if mail has been disabled. Useful for testing MRBS
without
+ // sending emails to those who don't want them
+ if ($mail_settings['disabled'])
+ {
+ return;
+ }
+
if ($mail_settings['debug'])
{
echo "[DEBUG] Preparing to send email ... <br>";
Modified: mrbs/branches/datatables/web/systemdefaults.inc.php
===================================================================
--- mrbs/branches/datatables/web/systemdefaults.inc.php 2011-09-02 13:21:16 UTC
(rev 1921)
+++ mrbs/branches/datatables/web/systemdefaults.inc.php 2011-09-02 13:32:48 UTC
(rev 1922)
@@ -836,6 +836,9 @@
//(b) whether there are addresses to send email to and (c) the result of the
mail
// sending operation.
$mail_settings['debug'] = FALSE;
+// Set this to TRUE if you do not want any email sent, whatever the rest of
the settings.
+// This is a global setting that will override anything else. Useful when
testing MRBS.
+$mail_settings['disabled'] = FALSE;
/**********
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-1917
+ /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-1921
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
