Changeset:
f3483a8fd30a
https://sourceforge.net/p/mrbs/hg-code/ci/f3483a8fd30aae7fe18571f75f286f3061a4857c
Author:
Campbell Morrison <[email protected]>
Date:
Tue Dec 15 18:56:52 2015 +0000
Log message:
Renamed parameter, for consistency
diffstat:
web/functions_table.inc | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diffs (84 lines):
diff -r 2aa1854ff52f -r f3483a8fd30a web/functions_table.inc
--- a/web/functions_table.inc Tue Dec 15 18:52:55 2015 +0000
+++ b/web/functions_table.inc Tue Dec 15 18:56:52 2015 +0000
@@ -711,7 +711,7 @@
}
-function day_table_innerhtml($day, $month, $year, $room_id, $area,
$timetohighlight=NULL)
+function day_table_innerhtml($day, $month, $year, $room_id, $area_id,
$timetohighlight=NULL)
{
global $tbl_entry, $tbl_room, $tbl_area;
global $enable_periods, $periods;
@@ -721,7 +721,7 @@
$sql = "SELECT COUNT(*)
FROM $tbl_room R, $tbl_area A
- WHERE R.area_id=$area
+ WHERE R.area_id=$area_id
AND R.area_id = A.id
AND R.disabled = 0
AND A.disabled = 0";
@@ -783,7 +783,7 @@
E.create_by AS entry_create_by
FROM $tbl_entry E, $tbl_room R
WHERE E.room_id = R.id
- AND R.area_id = $area
+ AND R.area_id = $area_id
AND R.disabled = 0
AND start_time <= $pm7 AND end_time > $am7
ORDER BY start_time"; // necessary so that multiple bookings appear
in the right order
@@ -815,7 +815,7 @@
}
- $rooms = get_rooms($area);
+ $rooms = get_rooms($area_id);
$n_time_slots = get_n_time_slots();
$morning_slot_seconds = (($morningstarts * 60) + $morningstarts_minutes) *
60;
@@ -877,7 +877,7 @@
{
// Put the room_id in a data attribute so that JavaScript can pick it up
$header_inner .= "<th data-room=\"" . $room['id'] . "\" style=\"width:
$column_width%\">
- <a
href=\"week.php?year=$year&month=$month&day=$day&area=$area&room="
. $room['id'] . "\"
+ <a
href=\"week.php?year=$year&month=$month&day=$day&area=$area_id&room="
. $room['id'] . "\"
title=\"" . get_vocab("viewweek") . " " .
$room['description'] . "\">" .
htmlspecialchars($room['room_name']) .
($room['capacity'] > 0 ? " (" . $room['capacity'] . ")" : "") . "</a></th>\n";
}
@@ -908,7 +908,7 @@
// URL for highlighting a time. Don't use REQUEST_URI or you will get
// the timetohighlight parameter duplicated each time you click.
-
$base_url="day.php?year=$year&month=$month&day=$day&area=$area$room_param";
+
$base_url="day.php?year=$year&month=$month&day=$day&area=$area_id$room_param";
@@ -921,7 +921,7 @@
foreach ($rooms as $room)
{
$tbody .= "<tr class=\"$row_class\">\n";
- $room_cell_link =
"week.php?year=$year&month=$month&day=$day&area=$area&room=" .
$room['id'];
+ $room_cell_link =
"week.php?year=$year&month=$month&day=$day&area=$area_id&room="
. $room['id'];
$tbody .= room_cell_html($room, $room_cell_link);
$is_invalid = array();
for ($s = $morning_slot_seconds;
@@ -935,7 +935,7 @@
$is_invalid[$s] = $is_possibly_invalid && is_invalid_datetime(0, 0,
$s, $month, $day, $year);
}
// set up the query strings to be used for the link in the cell
- $query_strings = get_query_strings($area, $room['id'], $month, $day,
$year, $s);
+ $query_strings = get_query_strings($area_id, $room['id'], $month,
$day, $year, $s);
// and then draw the cell
if (!isset($today[$room['id']][$day][$s]))
@@ -979,7 +979,7 @@
foreach ($rooms as $room)
{
// set up the query strings to be used for the link in the cell
- $query_strings = get_query_strings($area, $room['id'], $month, $day,
$year, $s);
+ $query_strings = get_query_strings($area_id, $room['id'], $month,
$day, $year, $s);
// and then draw the cell
if (!isset($today[$room['id']][$day][$s]))
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
