Merge branch 'VCL-1106_updates_for_php7' into develop
Project: http://git-wip-us.apache.org/repos/asf/vcl/repo Commit: http://git-wip-us.apache.org/repos/asf/vcl/commit/ce1e6d7f Tree: http://git-wip-us.apache.org/repos/asf/vcl/tree/ce1e6d7f Diff: http://git-wip-us.apache.org/repos/asf/vcl/diff/ce1e6d7f Branch: refs/heads/develop Commit: ce1e6d7fd0b0373b2e75ecc002ccb3511926f0cd Parents: de9e192 e505850 Author: Josh Thompson <jftho...@ncsu.edu> Authored: Mon Oct 29 15:51:03 2018 -0400 Committer: Josh Thompson <jftho...@ncsu.edu> Committed: Mon Oct 29 15:51:03 2018 -0400 ---------------------------------------------------------------------- web/.ht-inc/addomain.php | 6 +- web/.ht-inc/authentication.php | 22 +- web/.ht-inc/authmethods/itecsauth.php | 36 +- web/.ht-inc/authmethods/ldapauth.php | 32 +- web/.ht-inc/authmethods/shibauth.php | 36 +- web/.ht-inc/blockallocations.php | 106 +++--- web/.ht-inc/computer.php | 72 ++-- web/.ht-inc/config.php | 44 +-- web/.ht-inc/dashboard.php | 32 +- web/.ht-inc/groups.php | 28 +- web/.ht-inc/help.php | 2 +- web/.ht-inc/image.php | 78 ++--- web/.ht-inc/managementnode.php | 18 +- web/.ht-inc/oneclick.php | 4 +- web/.ht-inc/privileges.php | 72 ++-- web/.ht-inc/requests.php | 18 +- web/.ht-inc/resource.php | 4 +- web/.ht-inc/schedule.php | 4 +- web/.ht-inc/serverprofiles.php | 12 +- web/.ht-inc/siteconfig.php | 82 ++--- web/.ht-inc/sitemaintenance.php | 8 +- web/.ht-inc/statistics.php | 22 +- web/.ht-inc/userpreferences.php | 4 +- web/.ht-inc/utils.php | 537 +++++++++++++++-------------- web/.ht-inc/vm.php | 26 +- web/.ht-inc/xmlrpcWrappers.php | 78 ++--- web/index.php | 4 +- web/shibauth/index.php | 16 +- 28 files changed, 708 insertions(+), 695 deletions(-) ----------------------------------------------------------------------