From 57ceca4590de2048f1d6616372d4bb521b813efd Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Mon, 1 Jun 2015 04:54:21 +0000 Subject: [PATCH] Account for the fact that mb_strtolower is not always available. --- resources/check_auth.php | 4 ++-- resources/classes/domains.php | 2 +- resources/functions.php | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/resources/check_auth.php b/resources/check_auth.php index b6b439abec..40d1b70bea 100644 --- a/resources/check_auth.php +++ b/resources/check_auth.php @@ -64,7 +64,7 @@ require_once "resources/require.php"; $domain_name = $username_array[count($username_array) -1]; $_SESSION['domain_name'] = $domain_name; foreach ($_SESSION['domains'] as $row) { - if (mb_strtolower($row['domain_name']) == mb_strtolower($domain_name)) { + if (lower_case($row['domain_name']) == lower_case($domain_name)) { $_SESSION['domain_uuid'] = $row['domain_uuid']; break; } @@ -79,7 +79,7 @@ require_once "resources/require.php"; //set the domain information if (strlen($domain_name) > 0) { foreach ($_SESSION['domains'] as &$row) { - if (mb_strtolower($row['domain_name']) == mb_strtolower($domain_name)) { + if (lower_case($row['domain_name']) == lower_case($domain_name)) { //set the domain session variables $domain_uuid = $row["domain_uuid"]; $_SESSION["domain_uuid"] = $row["domain_uuid"]; diff --git a/resources/classes/domains.php b/resources/classes/domains.php index 6ac7690a35..eecf800459 100644 --- a/resources/classes/domains.php +++ b/resources/classes/domains.php @@ -242,7 +242,7 @@ $_SESSION["domain_name"] = $row['domain_name']; } else { - if (mb_strtolower($row['domain_name']) == mb_strtolower($domain_array[0]) || mb_strtolower($row['domain_name']) == mb_strtolower('www.'.$domain_array[0])) { + if (lower_case($row['domain_name']) == lower_case($domain_array[0]) || lower_case($row['domain_name']) == lower_case('www.'.$domain_array[0])) { $_SESSION["domain_uuid"] = $row["domain_uuid"]; $_SESSION["domain_name"] = $row['domain_name']; } diff --git a/resources/functions.php b/resources/functions.php index 7449fb8da4..d70639b30a 100644 --- a/resources/functions.php +++ b/resources/functions.php @@ -1293,4 +1293,23 @@ function number_pad($number,$n) { } } +//lower case + function lower_case($string) { + if (function_exists('mb_strtolower')) { + return mb_strtolower($string, 'UTF-8'); + } + else { + return strtolower($string); + } + } + +//upper case + function upper_case($string) { + if (function_exists('mb_strtoupper')) { + return mb_strtoupper($string, 'UTF-8'); + } + else { + return strtoupper($string); + } + } ?>