From 906b86d3dc4c00ad53e2b93a52f854ab5b5d9b46 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Fri, 5 Mar 2021 20:03:57 -0700 Subject: [PATCH] Use elseif instead of a series of if statements. Also replace strlen with isset. --- app/provision/resources/classes/provision.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php index 2ac5d55dbe..74d6b8c816 100644 --- a/app/provision/resources/classes/provision.php +++ b/app/provision/resources/classes/provision.php @@ -295,15 +295,11 @@ include "root.php"; $provision = array(); if (is_array($_SESSION['provision'])) { foreach ($_SESSION['provision'] as $key => $val) { - if (is_array($val)) { - $value = $val; - } - else { - if (strlen($val['var']) > 0) { $value = $val['var']; } - if (strlen($val['text']) > 0) { $value = $val['text']; } - if (strlen($val['boolean']) > 0) { $value = $val['boolean']; } - if (strlen($val['numeric']) > 0) { $value = $val['numeric']; } - } + if (isset($val['var'])) { $value = $val['var']; } + elseif (isset($val['text'])) { $value = $val['text']; } + elseif (isset($val['boolean'])) { $value = $val['boolean']; } + elseif (isset($val['numeric'])) { $value = $val['numeric']; } + elseif (is_array($val) && !is_uuid($val['uuid'])) { $value = $val; } if (isset($value)) { $provision[$key] = $value; } unset($value); }