Revision: 2994
https://sourceforge.net/p/mrbs/code/2994/
Author: cimorrison
Date: 2015-01-28 17:15:43 +0000 (Wed, 28 Jan 2015)
Log Message:
-----------
Renamed mrbsGetBookingInfo() to get rid of an upper-case 'I' and so avoid
possible problems in a Turkish locale
Modified Paths:
--------------
mrbs/trunk/web/approve_entry_handler.php
mrbs/trunk/web/del_entry.php
mrbs/trunk/web/edit_entry_handler.php
mrbs/trunk/web/mrbs_sql.inc
mrbs/trunk/web/view_entry.php
Modified: mrbs/trunk/web/approve_entry_handler.php
===================================================================
--- mrbs/trunk/web/approve_entry_handler.php 2015-01-28 16:59:38 UTC (rev
2993)
+++ mrbs/trunk/web/approve_entry_handler.php 2015-01-28 17:15:43 UTC (rev
2994)
@@ -20,7 +20,7 @@
$user = getUserName();
// Retrieve the booking details
-$data = mrbsGetBookingInfo($id, $series);
+$data = get_booking_info($id, $series);
$room_id = $data['room_id'];
// Initialise $mail_previous so that we can use it as a parameter for
notifyAdminOnBooking
@@ -58,7 +58,7 @@
{
$is_new_entry = FALSE;
// Get the current booking data, before we change anything, for use in
emails
- $mail_previous = mrbsGetBookingInfo($id, $series);
+ $mail_previous = get_booking_info($id, $series);
}
$start_times = mrbsApproveEntry($id, $series);
$result = ($start_times !== FALSE);
Modified: mrbs/trunk/web/del_entry.php
===================================================================
--- mrbs/trunk/web/del_entry.php 2015-01-28 16:59:38 UTC (rev 2993)
+++ mrbs/trunk/web/del_entry.php 2015-01-28 17:15:43 UTC (rev 2994)
@@ -37,7 +37,7 @@
$returl .= "?year=$year&month=$month&day=$day&area=$area";
}
-if ($info = mrbsGetBookingInfo($id, FALSE, TRUE))
+if ($info = get_booking_info($id, FALSE, TRUE))
{
$user = getUserName();
// check that the user is allowed to delete this entry
@@ -64,7 +64,7 @@
{
require_once "functions_mail.inc";
// Gather all fields values for use in emails.
- $mail_previous = mrbsGetBookingInfo($id, FALSE);
+ $mail_previous = get_booking_info($id, FALSE);
// If this is an individual entry of a series then force the entry_type
// to be a changed entry, so that when we create the iCalendar object we
know that
// we only want to delete the individual entry
Modified: mrbs/trunk/web/edit_entry_handler.php
===================================================================
--- mrbs/trunk/web/edit_entry_handler.php 2015-01-28 16:59:38 UTC (rev
2993)
+++ mrbs/trunk/web/edit_entry_handler.php 2015-01-28 17:15:43 UTC (rev
2994)
@@ -254,7 +254,7 @@
// (2) we always get passed start_seconds and end_seconds in the Ajax data
if ($ajax && $commit)
{
- $old_booking = mrbsGetBookingInfo($id, FALSE);
+ $old_booking = get_booking_info($id, FALSE);
foreach ($formvars as $var => $var_type)
{
if (!isset($$var) || (($var_type == 'array') && empty($$var)))
Modified: mrbs/trunk/web/mrbs_sql.inc
===================================================================
--- mrbs/trunk/web/mrbs_sql.inc 2015-01-28 16:59:38 UTC (rev 2993)
+++ mrbs/trunk/web/mrbs_sql.inc 2015-01-28 17:15:43 UTC (rev 2994)
@@ -1138,7 +1138,7 @@
}
-// mrbsGetBookingInfo($id, $series)
+// get_booking_info($id, $series)
//
// Gets all the details for a booking with $id, which is in the
// repeat table if $series is set, otherwise in the entry table.
@@ -1146,7 +1146,7 @@
// Returns the results in an array with keys the same as the table
// field names. In the event of an error stops with a fatal error,
// unless $silent is TRUE, when it returns FALSE.
-function mrbsGetBookingInfo($id, $series, $silent=FALSE)
+function get_booking_info($id, $series, $silent=FALSE)
{
global $tbl_entry, $tbl_repeat, $tbl_room, $tbl_area;
@@ -1889,11 +1889,11 @@
{
if ($edit_type == "series")
{
- $mail_previous = mrbsGetBookingInfo($repeat_id, TRUE);
+ $mail_previous = get_booking_info($repeat_id, TRUE);
}
else
{
- $mail_previous = mrbsGetBookingInfo($id, FALSE);
+ $mail_previous = get_booking_info($id, FALSE);
}
}
else
Modified: mrbs/trunk/web/view_entry.php
===================================================================
--- mrbs/trunk/web/view_entry.php 2015-01-28 16:59:38 UTC (rev 2993)
+++ mrbs/trunk/web/view_entry.php 2015-01-28 17:15:43 UTC (rev 2994)
@@ -117,7 +117,7 @@
// or else if $auth['only_admin_can_book_repeat'] is not set
$repeats_allowed = $is_admin || empty($auth['only_admin_can_book_repeat']);
-$row = mrbsGetBookingInfo($id, $series);
+$row = get_booking_info($id, $series);
$room = $row['room_id'];
$area = $row['area_id'];
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
