Revision: 2696
https://sourceforge.net/p/mrbs/code/2696/
Author: cimorrison
Date: 2013-02-14 11:23:09 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
Fixed last change properly
Modified Paths:
--------------
mrbs/trunk/web/edit_area_room.php
Modified: mrbs/trunk/web/edit_area_room.php
===================================================================
--- mrbs/trunk/web/edit_area_room.php 2013-02-14 10:51:14 UTC (rev 2695)
+++ mrbs/trunk/web/edit_area_room.php 2013-02-14 11:23:09 UTC (rev 2696)
@@ -472,10 +472,14 @@
else
{
// Check morningstarts, eveningends, and resolution for consistency
- // 1 Jan 2000 chosen to be a date free of DST changes
- $start_first_slot = get_start_first_slot(1, 1, 2000);
- $start_last_slot = get_start_last_slot(1, 1, 2000);
- $start_difference = ($start_last_slot - $start_first_slot)/60;
// minutes
+ $start_first_slot = ($area_morningstarts*60) +
$area_morningstarts_minutes; // minutes
+ $start_last_slot = ($area_eveningends*60) +
$area_eveningends_minutes; // minutes
+ $start_difference = ($start_last_slot - $start_first_slot); //
minutes
+ if (hm_before(array('hours' => $area_eveningends, 'minutes' =>
$area_eveningends_minutes),
+ array('hours' => $area_morningstarts, 'minutes' =>
$area_morningstarts_minutes)))
+ {
+ $start_difference += 3600;
+ }
if ($start_difference%$area_res_mins != 0)
{
$valid_resolution = FALSE;
------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
