Changeset: 96572ec1bb00 https://sourceforge.net/p/mrbs/hg-code/ci/96572ec1bb003c859675170e0d15f8fe74647c41 Author: Campbell Morrison <cimorri...@hg.code.sf.net> Date: Wed Sep 14 20:22:52 2016 +0100 Log message:
Merge with namespace diffstat: web/Themes/classic126/styling.inc | 1 + web/Themes/default/footer.inc | 4 +- web/Themes/default/header.inc | 3 +- web/Themes/default/styling.inc | 1 + web/add.php | 1 + web/admin.php | 1 + web/approve_entry_handler.php | 2 + web/areadefaults.inc.php | 1 + web/auth/auth_auth_basic.inc | 1 + web/auth/auth_config.inc | 4 +- web/auth/auth_crypt.inc | 1 + web/auth/auth_db.inc | 6 ++- web/auth/auth_db_ext.inc | 2 + web/auth/auth_ext.inc | 1 + web/auth/auth_imap.inc | 1 + web/auth/auth_imap_php.inc | 1 + web/auth/auth_ldap.inc | 1 + web/auth/auth_nis.inc | 1 + web/auth/auth_none.inc | 1 + web/auth/auth_nw.inc | 1 + web/auth/auth_pop3.inc | 1 + web/auth/auth_smtp.inc | 1 + web/auth/auth_wordpress.inc | 3 +- web/check_slot_ajax.php | 2 + web/config.inc.php | 1 + web/css/mrbs-ielte7.css.php | 3 +- web/css/mrbs-print.css.php | 1 + web/css/mrbs-rtl.css.php | 1 + web/css/mrbs.css.php | 1 + web/day.php | 4 +- web/dbsys.inc | 68 +++++++++++++++++++----------------- web/defaultincludes.inc | 1 + web/del.php | 2 + web/del_entry.php | 2 + web/del_entry_ajax.php | 1 + web/edit_area_room.php | 2 + web/edit_entry.php | 2 + web/edit_entry_handler.php | 2 + web/edit_users.php | 6 ++- web/functions.inc | 13 ++++-- web/functions_ical.inc | 1 + web/functions_mail.inc | 10 +++-- web/functions_table.inc | 1 + web/functions_view.inc | 1 + web/grab_globals.inc.php | 2 + web/help.php | 1 + web/import.php | 2 + web/index.php | 1 + web/internalconfig.inc.php | 1 + web/js.inc | 1 + web/js/admin.js.php | 1 + web/js/cell_click.js.php | 1 + web/js/datatables.js.php | 1 + web/js/datepicker.js.php | 1 + web/js/edit_area_room.js.php | 1 + web/js/edit_entry.js.php | 1 + web/js/edit_users.js.php | 1 + web/js/functions.js.php | 1 + web/js/general.js.php | 1 + web/js/multiple.js.php | 1 + web/js/pending.js.php | 1 + web/js/refresh.js.php | 1 + web/js/report.js.php | 1 + web/js/resizable.js.php | 1 + web/js/search.js.php | 1 + web/language.inc | 3 +- web/lib/Locale.php | 3 +- web/lib/MRBS/Exception.php | 10 +++++ web/mincals.inc | 2 + web/month.php | 2 + web/mrbs_auth.inc | 2 + web/mrbs_sql.inc | 4 +- web/mysqli.inc | 5 ++- web/pending.php | 2 + web/pgsql.inc | 4 +- web/record_activity_ajax.php | 2 + web/report.php | 12 +++-- web/search.php | 2 + web/session/session_cookie.inc | 2 + web/session/session_host.inc | 1 + web/session/session_http.inc | 4 +- web/session/session_ip.inc | 1 + web/session/session_nt.inc | 1 + web/session/session_omni.inc | 1 + web/session/session_php.inc | 2 + web/session/session_remote_user.inc | 2 + web/session/session_wordpress.inc | 1 + web/standard_vars.inc.php | 1 + web/style.inc | 1 + web/systemdefaults.inc.php | 1 + web/theme.inc | 1 + web/trailer.inc | 1 + web/upgrade.inc | 1 + web/upgrade/13/post.inc | 1 + web/upgrade/15/post.inc | 1 + web/upgrade/16/post.inc | 1 + web/upgrade/17/post.inc | 1 + web/upgrade/2/post.inc | 1 + web/upgrade/21/post.inc | 1 + web/upgrade/24/post.inc | 1 + web/upgrade/26/post.inc | 1 + web/upgrade/32/post.inc | 1 + web/upgrade/34/post.inc | 1 + web/upgrade/4/post.inc | 1 + web/upgrade/43/post.inc | 1 + web/upgrade/46/post.inc | 1 + web/upgrade/47/post.inc | 3 +- web/upgrade/48/post.inc | 1 + web/upgrade/5/post.inc | 1 + web/upgrade/6/post.inc | 1 + web/upgrade/7/post.inc | 1 + web/upgrade/8/post.inc | 1 + web/version.inc | 1 + web/version_num.inc | 1 + web/view_entry.php | 2 + web/week.php | 2 + 116 files changed, 224 insertions(+), 65 deletions(-) diffs (truncated from 1574 to 300 lines): diff -r 8153a7626cec -r 96572ec1bb00 web/Themes/classic126/styling.inc --- a/web/Themes/classic126/styling.inc Tue Sep 13 12:22:48 2016 +0100 +++ b/web/Themes/classic126/styling.inc Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; // $Id$ diff -r 8153a7626cec -r 96572ec1bb00 web/Themes/default/footer.inc --- a/web/Themes/default/footer.inc Tue Sep 13 12:22:48 2016 +0100 +++ b/web/Themes/default/footer.inc Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,6 @@ -<?php // -*-mode: PHP; coding:utf-8;-*- +<?php +namespace MRBS; + // $Id$ function print_theme_footer() diff -r 8153a7626cec -r 96572ec1bb00 web/Themes/default/header.inc --- a/web/Themes/default/header.inc Tue Sep 13 12:22:48 2016 +0100 +++ b/web/Themes/default/header.inc Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; // $Id$ @@ -227,7 +228,7 @@ </td> <?php // For session protocols that define their own logon box... - if (function_exists('PrintLogonBox')) + if (function_exists(__NAMESPACE__ . "\PrintLogonBox")) { echo "<td>\n"; echo "<div id=\"logon_box\">\n"; diff -r 8153a7626cec -r 96572ec1bb00 web/Themes/default/styling.inc --- a/web/Themes/default/styling.inc Tue Sep 13 12:22:48 2016 +0100 +++ b/web/Themes/default/styling.inc Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; // $Id$ diff -r 8153a7626cec -r 96572ec1bb00 web/add.php --- a/web/add.php Tue Sep 13 12:22:48 2016 +0100 +++ b/web/add.php Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; // $Id$ diff -r 8153a7626cec -r 96572ec1bb00 web/admin.php --- a/web/admin.php Tue Sep 13 12:22:48 2016 +0100 +++ b/web/admin.php Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; // $Id$ diff -r 8153a7626cec -r 96572ec1bb00 web/approve_entry_handler.php --- a/web/approve_entry_handler.php Tue Sep 13 12:22:48 2016 +0100 +++ b/web/approve_entry_handler.php Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,6 @@ <?php +namespace MRBS; + // $Id$ // Handles actions on bookings awaiting approval diff -r 8153a7626cec -r 96572ec1bb00 web/areadefaults.inc.php --- a/web/areadefaults.inc.php Tue Sep 13 12:22:48 2016 +0100 +++ b/web/areadefaults.inc.php Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; // $Id$ diff -r 8153a7626cec -r 96572ec1bb00 web/auth/auth_auth_basic.inc --- a/web/auth/auth_auth_basic.inc Tue Sep 13 12:22:48 2016 +0100 +++ b/web/auth/auth_auth_basic.inc Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; /* $Id$ * diff -r 8153a7626cec -r 96572ec1bb00 web/auth/auth_config.inc --- a/web/auth/auth_config.inc Tue Sep 13 12:22:48 2016 +0100 +++ b/web/auth/auth_config.inc Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,6 @@ -<?php +<?php +namespace MRBS; + /***************************************************************************** * * File name auth_config.inc diff -r 8153a7626cec -r 96572ec1bb00 web/auth/auth_crypt.inc --- a/web/auth/auth_crypt.inc Tue Sep 13 12:22:48 2016 +0100 +++ b/web/auth/auth_crypt.inc Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; /* $Id$ * diff -r 8153a7626cec -r 96572ec1bb00 web/auth/auth_db.inc --- a/web/auth/auth_db.inc Tue Sep 13 12:22:48 2016 +0100 +++ b/web/auth/auth_db.inc Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,6 @@ <?php +namespace MRBS; + /***************************************************************************** * * File name auth_db.inc @@ -70,7 +72,7 @@ $do_rehash = true; } } - elseif (!PasswordCompat\binary\check()) + elseif (!\PasswordCompat\binary\check()) { // password_verify() failed and we are using a version of PHP where // crypt() is broken and so we are stuck, unable to verify the @@ -89,7 +91,7 @@ { $result = 1; - if (PasswordCompat\binary\check()) + if (\PasswordCompat\binary\check()) { $do_rehash = true; } diff -r 8153a7626cec -r 96572ec1bb00 web/auth/auth_db_ext.inc --- a/web/auth/auth_db_ext.inc Tue Sep 13 12:22:48 2016 +0100 +++ b/web/auth/auth_db_ext.inc Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,6 @@ <?php +namespace MRBS; + /***************************************************************************** * * File name auth_db_ext.inc diff -r 8153a7626cec -r 96572ec1bb00 web/auth/auth_ext.inc --- a/web/auth/auth_ext.inc Tue Sep 13 12:22:48 2016 +0100 +++ b/web/auth/auth_ext.inc Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; /* $Id$ * diff -r 8153a7626cec -r 96572ec1bb00 web/auth/auth_imap.inc --- a/web/auth/auth_imap.inc Tue Sep 13 12:22:48 2016 +0100 +++ b/web/auth/auth_imap.inc Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; /* $Id$ * diff -r 8153a7626cec -r 96572ec1bb00 web/auth/auth_imap_php.inc --- a/web/auth/auth_imap_php.inc Tue Sep 13 12:22:48 2016 +0100 +++ b/web/auth/auth_imap_php.inc Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; /* $Id$ * diff -r 8153a7626cec -r 96572ec1bb00 web/auth/auth_ldap.inc --- a/web/auth/auth_ldap.inc Tue Sep 13 12:22:48 2016 +0100 +++ b/web/auth/auth_ldap.inc Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; // $Id$ diff -r 8153a7626cec -r 96572ec1bb00 web/auth/auth_nis.inc --- a/web/auth/auth_nis.inc Tue Sep 13 12:22:48 2016 +0100 +++ b/web/auth/auth_nis.inc Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; /* $Id$ * diff -r 8153a7626cec -r 96572ec1bb00 web/auth/auth_none.inc --- a/web/auth/auth_none.inc Tue Sep 13 12:22:48 2016 +0100 +++ b/web/auth/auth_none.inc Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; /* $Id$ * diff -r 8153a7626cec -r 96572ec1bb00 web/auth/auth_nw.inc --- a/web/auth/auth_nw.inc Tue Sep 13 12:22:48 2016 +0100 +++ b/web/auth/auth_nw.inc Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; // $Id$ diff -r 8153a7626cec -r 96572ec1bb00 web/auth/auth_pop3.inc --- a/web/auth/auth_pop3.inc Tue Sep 13 12:22:48 2016 +0100 +++ b/web/auth/auth_pop3.inc Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; /* $Id$ * diff -r 8153a7626cec -r 96572ec1bb00 web/auth/auth_smtp.inc --- a/web/auth/auth_smtp.inc Tue Sep 13 12:22:48 2016 +0100 +++ b/web/auth/auth_smtp.inc Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; /* $Id$ * diff -r 8153a7626cec -r 96572ec1bb00 web/auth/auth_wordpress.inc --- a/web/auth/auth_wordpress.inc Tue Sep 13 12:22:48 2016 +0100 +++ b/web/auth/auth_wordpress.inc Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; define('WP_USE_THEMES', false); require_once MRBS_ROOT . '/'. $auth['wordpress']['rel_path'] . '/wp-load.php'; @@ -63,7 +64,7 @@ $admin_roles = array($admin_roles); } // Put the roles into the standard WordPress format - $admin_roles = array_map('standardise_role_name', $admin_roles); + $admin_roles = array_map(__NAMESPACE__ . "\\standardise_role_name", $admin_roles); // Check to see if one of the user's roles is an admin role foreach($wp_user->roles as $user_role) diff -r 8153a7626cec -r 96572ec1bb00 web/check_slot_ajax.php --- a/web/check_slot_ajax.php Tue Sep 13 12:22:48 2016 +0100 +++ b/web/check_slot_ajax.php Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,6 @@ <?php +namespace MRBS; + // $Id$ // An Ajax function to check which of an array of time slots is invalid. (We need to do diff -r 8153a7626cec -r 96572ec1bb00 web/config.inc.php --- a/web/config.inc.php Tue Sep 13 12:22:48 2016 +0100 +++ b/web/config.inc.php Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; // $Id$ diff -r 8153a7626cec -r 96572ec1bb00 web/css/mrbs-ielte7.css.php --- a/web/css/mrbs-ielte7.css.php Tue Sep 13 12:22:48 2016 +0100 +++ b/web/css/mrbs-ielte7.css.php Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ -<?php +<?php +namespace MRBS; // $Id$ diff -r 8153a7626cec -r 96572ec1bb00 web/css/mrbs-print.css.php --- a/web/css/mrbs-print.css.php Tue Sep 13 12:22:48 2016 +0100 +++ b/web/css/mrbs-print.css.php Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; // $Id$ diff -r 8153a7626cec -r 96572ec1bb00 web/css/mrbs-rtl.css.php --- a/web/css/mrbs-rtl.css.php Tue Sep 13 12:22:48 2016 +0100 +++ b/web/css/mrbs-rtl.css.php Wed Sep 14 20:22:52 2016 +0100 @@ -1,4 +1,5 @@ <?php +namespace MRBS; // $Id$ diff -r 8153a7626cec -r 96572ec1bb00 web/css/mrbs.css.php --- a/web/css/mrbs.css.php Tue Sep 13 12:22:48 2016 +0100 +++ b/web/css/mrbs.css.php Wed Sep 14 20:22:52 2016 +0100 ------------------------------------------------------------------------------ _______________________________________________ Mrbs-commits mailing list Mrbs-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mrbs-commits