Revision: 1579
http://mrbs.svn.sourceforge.net/mrbs/?rev=1579&view=rev
Author: cimorrison
Date: 2010-11-03 12:29:03 +0000 (Wed, 03 Nov 2010)
Log Message:
-----------
Fixed bug where the duration wasn't always being calculated correctly when
using periods
Modified Paths:
--------------
mrbs/branches/from_to_bookings/web/functions.inc
Modified: mrbs/branches/from_to_bookings/web/functions.inc
===================================================================
--- mrbs/branches/from_to_bookings/web/functions.inc 2010-11-03 11:12:05 UTC
(rev 1578)
+++ mrbs/branches/from_to_bookings/web/functions.inc 2010-11-03 12:29:03 UTC
(rev 1579)
@@ -225,35 +225,23 @@
global $periods;
$max_periods = count($periods);
-
- $dur /= 60;
-
- if ( $dur >= $max_periods || $start_period == 0 )
+ $dur /= 60; // duration now in minutes
+ $mins_in_day = 24*60;
+ $days = $dur / $mins_in_day;
+ $remainder = $dur % $mins_in_day;
+
+ if (($remainder == 0) || (($start_period == 0) && ($remainder ==
$max_periods)))
{
- if( $start_period == 0 && $dur == $max_periods )
+ $dur = (int) $days;
+ if ($remainder == $max_periods)
{
- $units = $translate ? get_vocab("days") : "days";
- $dur = 1;
- return;
+ $dur++;
}
-
- $dur /= 60;
- if(($dur >= 24) && is_int($dur))
- {
- $dur /= 24;
- $units = $translate ? get_vocab("days") : "days";
- return;
- }
- else
- {
- $dur *= 60;
- $dur = ($dur % $max_periods) + floor( $dur/(24*60) ) * $max_periods;
- $units = $translate ? get_vocab("periods") : "periods";
- return;
- }
+ $units = $translate ? get_vocab("days") : "days";
}
else
{
+ $dur = (intval($days) * $max_periods) + $remainder;
$units = $translate ? get_vocab("periods") : "periods";
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Achieve Improved Network Security with IP and DNS Reputation.
Defend against bad network traffic, including botnets, malware,
phishing sites, and compromised hosts - saving your company time,
money, and embarrassment. Learn More!
http://p.sf.net/sfu/hpdev2dev-nov
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
