Changeset:
d9449994a06a
https://sourceforge.net/p/mrbs/hg-code/ci/d9449994a06a7b53223a5ed30f99b0631fc7464c
Author:
Campbell Morrison <[email protected]>
Date:
Fri Feb 19 17:26:06 2016 +0000
Log message:
Restructured code
diffstat:
web/edit_area_room.php | 13 +++++++++++--
web/functions_mail.inc | 11 -----------
2 files changed, 11 insertions(+), 13 deletions(-)
diffs (51 lines):
diff -r 4bb13f52e4b8 -r d9449994a06a web/edit_area_room.php
--- a/web/edit_area_room.php Fri Feb 19 16:26:29 2016 +0000
+++ b/web/edit_area_room.php Fri Feb 19 17:26:06 2016 +0000
@@ -48,6 +48,17 @@
require_once "mrbs_sql.inc";
+// Take a string of email addresses separated by commas or newlines
+// and return a comma separated list with duplicates removed.
+function clean_address_list($string)
+{
+ $string = str_replace(array("\r\n", "\n", "\r"), ',', $string);
+ $array = explode(',', $string);
+ array_walk($array, 'trim');
+ return implode(',', array_unique($array));
+}
+
+
function create_field_entry_timezone()
{
global $timezone, $zoneinfo_outlook_compatible;
@@ -485,8 +496,6 @@
exit();
}
}
-
- require_once "functions_mail.inc";
// PHASE 2 (ROOM) - UPDATE THE DATABASE
// ------------------------------------
diff -r 4bb13f52e4b8 -r d9449994a06a web/functions_mail.inc
--- a/web/functions_mail.inc Fri Feb 19 16:26:29 2016 +0000
+++ b/web/functions_mail.inc Fri Feb 19 17:26:06 2016 +0000
@@ -202,17 +202,6 @@
}
-// Take a string of email addresses separated by commas or newlines
-// and return a comma separated list with duplicates removed.
-function clean_address_list($string)
-{
- $string = str_replace(array("\r\n", "\n", "\r"), ',', $string);
- $array = explode(',', $string);
- array_walk($array, 'trim');
- return implode(',', array_unique($array));
-}
-
-
// get the list of email addresses that are allowed to approve bookings
// for the room with id $room_id
// (At the moment this is just the admin email address, but this could
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
