Changeset:
128316dd7790
https://sourceforge.net/p/mrbs/hg-code/ci/128316dd7790aa2918680361a330c4baf34f6576
Author:
Campbell Morrison <[email protected]>
Date:
Mon Mar 27 17:46:58 2017 +0100
Log message:
Added the booking title
diffstat:
web/index.php | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diffs (49 lines):
diff -r 8384b59f4538 -r 128316dd7790 web/index.php
--- a/web/index.php Mon Mar 27 17:34:54 2017 +0100
+++ b/web/index.php Mon Mar 27 17:46:58 2017 +0100
@@ -87,7 +87,9 @@
// and then find the remaining occupied slots
do {
$map[$room_id][$slot][] = array('id' => $entry['id'],
- 'type' => $entry['type']);
+ 'type' => $entry['type'],
+ 'name' => $entry['name'],
+ 'description' =>
$entry['description']);
$slot = next($slots);
} while (($slot !== false) && ($entry['end_time'] > ($slot +
$resolution)));
reset($slots);
@@ -137,7 +139,7 @@
{
// The booking has come to an end, so write it out
$last_id = null;
- $html .= get_cell_html($this_id, $type, $n_slots);
+ $html .= get_cell_html($content, $type, $n_slots);
}
else
{
@@ -149,6 +151,7 @@
{
$this_id = $data[0]['id'];
$type = $data[0]['type'];
+ $content = htmlspecialchars($data[0]['name']);
if (!isset($last_id))
{
@@ -165,7 +168,7 @@
{
// The booking has come to an end, so write it out
$last_id = null;
- $html .= get_cell_html($this_id, $type, $n_slots);
+ $html .= get_cell_html($content, $type, $n_slots);
prev($row);
}
}
@@ -179,7 +182,7 @@
if (($data === false) && isset($last_id))
{
// We're at the end of the row and there's a booking to write out
- $html .= get_cell_html($this_id, $type, $n_slots);
+ $html .= get_cell_html($content, $type, $n_slots);
break;
}
}
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
