Changeset:
7bca8a61c4c3
https://sourceforge.net/p/mrbs/hg-code/ci/7bca8a61c4c3f5d53e5c3e1723772018ff15065c
Author:
Campbell Morrison <[email protected]>
Date:
Sat Dec 19 16:19:15 2015 +0000
Log message:
Restructured code
diffstat:
web/mrbs_sql.inc | 34 +++++++---------------------------
1 files changed, 7 insertions(+), 27 deletions(-)
diffs (65 lines):
diff -r db90cfd72f8f -r 7bca8a61c4c3 web/mrbs_sql.inc
--- a/web/mrbs_sql.inc Sat Dec 19 16:05:15 2015 +0000
+++ b/web/mrbs_sql.inc Sat Dec 19 16:19:15 2015 +0000
@@ -430,6 +430,11 @@
{
global $tbl_entry;
+ if (!isset($id))
+ {
+ return NULL;
+ }
+
$sql = "SELECT *
FROM $tbl_entry
WHERE id=$id
@@ -1865,7 +1870,7 @@
else
{
$old_bookings = array();
- $old_bookings[] = getBooking($id);
+ $old_bookings[] = get_entry_by_id($id);
}
foreach ($old_bookings as $old_booking)
@@ -2031,31 +2036,6 @@
return $result;
}
-function getBooking($id)
-{
- global $tbl_entry;
-
- if (!isset($id))
- {
- return NULL;
- }
-
- $sql = "SELECT * FROM $tbl_entry WHERE id=$id LIMIT 1";
- $res = sql_query($sql);
-
- if ($res === FALSE)
- {
- trigger_error(sql_error(), E_USER_WARNING);
- return FALSE;
- }
-
- if (sql_count($res) == 0)
- {
- return NULL;
- }
-
- return sql_row_keyed($res, 0);
-}
function get_bookings_in_series($repeat_id)
{
@@ -2071,7 +2051,7 @@
}
foreach ($res as $id)
{
- $bookings[] = getBooking($id);
+ $bookings[] = get_entry_by_id($id);
}
return $bookings;
}
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
