Changeset:
dbab75e55723
https://sourceforge.net/p/mrbs/hg-code/ci/dbab75e55723babba70d16242bf3460a289192b1
Author:
Campbell Morrison <[email protected]>
Date:
Sat Aug 27 14:10:51 2016 +0100
Log message:
Restructured code
diffstat:
web/month.php | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diffs (40 lines):
diff -r 29a6a9d34e94 -r dbab75e55723 web/month.php
--- a/web/month.php Sat Aug 27 12:39:13 2016 +0100
+++ b/web/month.php Sat Aug 27 14:10:51 2016 +0100
@@ -101,7 +101,11 @@
$html = '';
+ // Month view start time. This ignores morningstarts/eveningends because it
+ // doesn't make sense to not show all entries for the day, and it messes
+ // things up when entries cross midnight.
$month_start = mktime(0, 0, 0, $month, 1, $year);
+ // What column the month starts in: 0 means $weekstarts weekday.
$weekday_start = (date("w", $month_start) - $weekstarts + 7) % 7;
$days_in_month = date("t", $month_start);
@@ -433,13 +437,6 @@
// things up when entries cross midnight.
$month_start = mktime(0, 0, 0, $month, 1, $year);
-// What column the month starts in: 0 means $weekstarts weekday.
-$weekday_start = (date("w", $month_start) - $weekstarts + 7) % 7;
-
-
-$days_in_month = date("t", $month_start);
-$month_end = mktime(23, 59, 59, $month, $days_in_month, $year);
-
if ($enable_periods)
{
$resolution = 60;
@@ -549,6 +546,10 @@
if ($debug_flag)
{
+ $days_in_month = date("t", $month_start);
+ $month_end = mktime(23, 59, 59, $month, $days_in_month, $year);
+ // What column the month starts in: 0 means $weekstarts weekday.
+ $weekday_start = (date("w", $month_start) - $weekstarts + 7) % 7;
echo "<p>DEBUG: month=$month year=$year start=$weekday_start
range=$month_start:$month_end</p>\n";
}
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
