From d3a65f1db442879a82703cafe1e73252734802db Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 28 Jul 2020 15:47:36 -0600 Subject: [PATCH] Update indentation and line spacing. --- resources/check_auth.php | 51 +++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/resources/check_auth.php b/resources/check_auth.php index 82ff6090b6..462b43abc9 100644 --- a/resources/check_auth.php +++ b/resources/check_auth.php @@ -23,6 +23,7 @@ Contributor(s): Mark J Crane */ + //includes require_once "resources/require.php"; @@ -157,6 +158,11 @@ unset($sql, $parameters, $result, $row); } + //get the domains + if (file_exists($_SERVER["PROJECT_ROOT"]."/app/domains/app_config.php") && !is_cli()){ + require_once "app/domains/resources/domains.php"; + } + //get the user settings $sql = "select * from v_user_settings "; $sql .= "where domain_uuid = :domain_uuid "; @@ -197,13 +203,8 @@ //get the extensions that are assigned to this user if (file_exists($_SERVER["PROJECT_ROOT"]."/app/extensions/app_config.php")) { - if ( - isset($_SESSION["user"]) && - is_uuid($_SESSION["user_uuid"]) && - is_uuid($_SESSION["domain_uuid"]) && - !isset($_SESSION['user']['extension']) - ) { - //get the user extension list + if (isset($_SESSION["user"]) && is_uuid($_SESSION["user_uuid"]) && is_uuid($_SESSION["domain_uuid"]) && !isset($_SESSION['user']['extension'])) { + //get the user extension list $_SESSION['user']['extension'] = null; $sql = "select "; $sql .= "e.extension_uuid, "; @@ -230,22 +231,24 @@ if (is_array($result) && @sizeof($result) != 0) { foreach($result as $x => $row) { //set the destination - $destination = $row['extension']; - if (strlen($row['number_alias']) > 0) { - $destination = $row['number_alias']; - } + $destination = $row['extension']; + if (strlen($row['number_alias']) > 0) { + $destination = $row['number_alias']; + } + //build the user array - $_SESSION['user']['extension'][$x]['user'] = $row['extension']; - $_SESSION['user']['extension'][$x]['number_alias'] = $row['number_alias']; - $_SESSION['user']['extension'][$x]['destination'] = $destination; - $_SESSION['user']['extension'][$x]['extension_uuid'] = $row['extension_uuid']; - $_SESSION['user']['extension'][$x]['outbound_caller_id_name'] = $row['outbound_caller_id_name']; - $_SESSION['user']['extension'][$x]['outbound_caller_id_number'] = $row['outbound_caller_id_number']; - $_SESSION['user']['extension'][$x]['user_context'] = $row['user_context']; - $_SESSION['user']['extension'][$x]['description'] = $row['description']; + $_SESSION['user']['extension'][$x]['user'] = $row['extension']; + $_SESSION['user']['extension'][$x]['number_alias'] = $row['number_alias']; + $_SESSION['user']['extension'][$x]['destination'] = $destination; + $_SESSION['user']['extension'][$x]['extension_uuid'] = $row['extension_uuid']; + $_SESSION['user']['extension'][$x]['outbound_caller_id_name'] = $row['outbound_caller_id_name']; + $_SESSION['user']['extension'][$x]['outbound_caller_id_number'] = $row['outbound_caller_id_number']; + $_SESSION['user']['extension'][$x]['user_context'] = $row['user_context']; + $_SESSION['user']['extension'][$x]['description'] = $row['description']; + //set the user context - $_SESSION['user']['user_context'] = $row["user_context"]; - $_SESSION['user_context'] = $row["user_context"]; + $_SESSION['user']['user_context'] = $row["user_context"]; + $_SESSION['user_context'] = $row["user_context"]; } } unset($sql, $parameters, $result, $row); @@ -260,12 +263,6 @@ exit(); } } - - //get the domains - if (file_exists($_SERVER["PROJECT_ROOT"]."/app/domains/app_config.php") && !is_cli()){ - require_once "app/domains/resources/domains.php"; - } - } //set the time zone