dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Frytimo pr patches for php8.1 (#6630)

Browse Source 
* Passing null to parameter #2 ($string) of type string is deprecated

* Passing null to parameter #1 ($string) of type string is deprecated

* php 8.1 fixes

* php 8.1 fixes - replace strlen($var) > 0 with !empty($var)

* php 8.1 fixes - replace ${var} with {$var}

* php 8.1 fixes - replace ${var} with {$var}

* php 8.1 fixes - replace ${var} with {$var}

* php 8.1 fixes - replace ${var} with {$var}

* php 8.1 fixes - strlower with null

* php 8.1 fixes - strreplace with null

* php 8.1 fixes - passing null to base64_decode

* php 8.1 fixes - check for false and check for null on $this->dir

* php 8.1 fixes - remove assignment of $db variable to modules object

* php 8.1 fixes - avoid sending null to substr

* php 8.1 fixes - change ${var} to {$var}

* php 8.1 fixes - check for null before preg_replace

* php 8.1 fixes - remove setting db variable on domains object

* php 8.1 fixes - set empty string if $row['domain_setting_subcategory'] is null

* php 8.1 fixes - set empty string if $_REQUEST['show'] is not available

* php 8.1 fixes

* php 8.1 fixes - correct $_POST checking syntax

* php 8.1 fixes - correct $_POST variables

* php 8.1 fixes

* Use brackets consistently

* Update user_setting_edit.php

* Change to not empty

* Update device.php

* Update text.php

---------

Co-authored-by: Tim Fry <tim@voipstratus.com>
Co-authored-by: FusionPBX <markjcrane@gmail.com>
This commit is contained in:
frytimo
2023-05-05 10:46:37 -06:00
committed by GitHub
co-authored by Tim Fry FusionPBX
parent ebbb2f1a72
commit fef8165be2
230 changed files with 1948 additions and 1937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/authentication/resources/classes/authentication.php
+7 -7
View File
@@ -277,7 +277,7 @@ class authentication {
$sql = "select distinct(permission_name) from v_group_permissions ";
$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
foreach ($_SESSION["groups"] as $field) {
if (strlen($field['group_name']) > 0) {
if (!empty($field['group_name'])) {
$sql_where_or[] = "group_name = :group_name_".$x;
$parameters['group_name_'.$x] = $field['group_name'];
$x++;
@@ -310,8 +310,8 @@ class authentication {
$name = $row['user_setting_name'];
$category = $row['user_setting_category'];
$subcategory = $row['user_setting_subcategory'];
if (strlen($row['user_setting_value']) > 0) {
if (strlen($subcategory) == 0) {
if (!empty($row['user_setting_value'])) {
if (empty($subcategory)) {
//$$category[$name] = $row['domain_setting_value'];
if ($name == "array") {
$_SESSION[$category][] = $row['user_setting_value'];
@@ -365,7 +365,7 @@ class authentication {
foreach($result as $x => $row) {
//set the destination
$destination = $row['extension'];
if (strlen($row['number_alias']) > 0) {
if (!empty($row['number_alias'])) {
$destination = $row['number_alias'];
}
@@ -390,7 +390,7 @@ class authentication {
//set the time zone
if (!isset($_SESSION["time_zone"]["user"])) { $_SESSION["time_zone"]["user"] = null; }
if (strlen($_SESSION["time_zone"]["user"]) == 0) {
if (strlen($_SESSION["time_zone"]["user"] ?? '') === 0) {
//set the domain time zone as the default time zone
date_default_timezone_set($_SESSION['domain']['time_zone']['name']);
}
@@ -415,7 +415,7 @@ class authentication {
//get the domain name from the username
if ($_SESSION["users"]["unique"]["text"] != "global") {
$username_array = explode("@", $_REQUEST["username"]);
$username_array = explode("@", $_REQUEST["username"] ?? '');
if (count($username_array) > 1) {
//get the domain name
$domain_name = $username_array[count($username_array) -1];
@@ -444,7 +444,7 @@ class authentication {
}
//get the domain name from the http value
if (strlen($_REQUEST["domain_name"]) > 0) {
if (!empty($_REQUEST["domain_name"] ?? '')) {
$this->domain_name = $_REQUEST["domain_name"];
}
core/authentication/resources/classes/plugins/database.php
+3 -2
View File
@@ -18,6 +18,7 @@ class plugin_database {
public $username;
public $password;
public $key;
public $debug;
/**
* database checks the local database to authenticate the user or key
@@ -136,7 +137,7 @@ class plugin_database {
$sql .= "u.user_email, u.salt, u.api_key, u.domain_uuid, d.domain_name ";
$sql .= "from v_users as u, v_domains as d ";
$sql .= "where u.domain_uuid = d.domain_uuid ";
if (strlen($this->key) > 30) {
if (strlen($this->key ?? '') > 30) {
$sql .= "and u.api_key = :api_key ";
$parameters['api_key'] = $this->key;
}
@@ -199,7 +200,7 @@ class plugin_database {
$valid_password = true;
}
else if (substr($row["password"], 0, 1) === '$') {
if (isset($this->password) && strlen($this->password) > 0) {
if (isset($this->password) && !empty($this->password)) {
if (password_verify($this->password, $row["password"])) {
$valid_password = true;
}
core/authentication/resources/classes/plugins/email.php
+3 -2
View File
@@ -17,6 +17,7 @@ class plugin_email {
public $user_uuid;
public $user_email;
public $contact_uuid;
public $debug;
/**
* time based one time password with email
@@ -119,7 +120,7 @@ class plugin_email {
unset($parameters);
//set class variables
//if (strlen($row["user_email"]) > 0) {
//if (!empty($row["user_email"])) {
// $this->user_uuid = $row['user_uuid'];
// $this->user_email = $row['user_email'];
// $this->contact_uuid = $row['contact_uuid'];
@@ -132,7 +133,7 @@ class plugin_email {
$_SESSION["contact_uuid"] = $row["contact_uuid"];
//user email not found
if (strlen($row["user_email"]) == 0) {
if (empty($row["user_email"])) {
//build the result array
$result["plugin"] = "email";
$result["domain_name"] = $_SESSION["domain_name"];
core/authentication/resources/classes/plugins/ldap.php
+2 -2
View File
@@ -116,7 +116,7 @@ class plugin_ldap {
$user_authorized = false;
//provide backwards compatability
if (strlen($_SESSION["ldap"]["user_dn"]["text"]) > 0) {
if (!empty($_SESSION["ldap"]["user_dn"]["text"])) {
$_SESSION["ldap"]["user_dn"][] = $_SESSION["ldap"]["user_dn"]["text"];
}
@@ -127,7 +127,7 @@ class plugin_ldap {
//Note: As of 4/16, the call below will fail randomly. PHP debug reports ldap_bind
//called below with all arguments '*uninitialized*'. However, the debugger
//single-stepping just before the failing call correctly displays all the values.
if (strlen($bind_pw) > 0) {
if (!empty($bind_pw)) {
$bind = ldap_bind($connect, $bind_dn, $bind_pw);
if ($bind) {
//connected and authorized
core/dashboard/dashboard_edit.php
+11 -11
View File
@@ -84,7 +84,7 @@
}
//process the user data and save it to the database
if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (count($_POST) > 0 && empty($_POST["persistformvar"])) {
//validate the token
$token = new token;
if (!$token->validate($_SERVER['PHP_SELF'])) {
@@ -94,7 +94,7 @@
}
//process the http post data by submitted action
if ($_POST['action'] != '' && strlen($_POST['action']) > 0) {
if ($_POST['action'] != '' && !empty($_POST['action'])) {
//prepare the array(s)
//send the array to the database class
@@ -128,13 +128,13 @@
//check for all required data
$msg = '';
//if (strlen($dashboard_name) == 0) { $msg .= $text['message-required']." ".$text['label-dashboard_name']."<br>\n"; }
//if (strlen($dashboard_path) == 0) { $msg .= $text['message-required']." ".$text['label-dashboard_path']."<br>\n"; }
//if (strlen($dashboard_groups) == 0) { $msg .= $text['message-required']." ".$text['label-dashboard_groups']."<br>\n"; }
//if (strlen($dashboard_order) == 0) { $msg .= $text['message-required']." ".$text['label-dashboard_order']."<br>\n"; }
//if (strlen($dashboard_enabled) == 0) { $msg .= $text['message-required']." ".$text['label-dashboard_enabled']."<br>\n"; }
//if (strlen($dashboard_description) == 0) { $msg .= $text['message-required']." ".$text['label-dashboard_description']."<br>\n"; }
if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
//if (empty($dashboard_name)) { $msg .= $text['message-required']." ".$text['label-dashboard_name']."<br>\n"; }
//if (empty($dashboard_path)) { $msg .= $text['message-required']." ".$text['label-dashboard_path']."<br>\n"; }
//if (empty($dashboard_groups)) { $msg .= $text['message-required']." ".$text['label-dashboard_groups']."<br>\n"; }
//if (empty($dashboard_order)) { $msg .= $text['message-required']." ".$text['label-dashboard_order']."<br>\n"; }
//if (empty($dashboard_enabled)) { $msg .= $text['message-required']." ".$text['label-dashboard_enabled']."<br>\n"; }
//if (empty($dashboard_description)) { $msg .= $text['message-required']." ".$text['label-dashboard_description']."<br>\n"; }
if (!empty($msg) && empty($_POST["persistformvar"])) {
require_once "resources/header.php";
require_once "resources/persist_form_var.php";
echo "<div align='center'>\n";
@@ -283,7 +283,7 @@
if (is_array($dashboard_groups) && sizeof($dashboard_groups) != 0) {
$assigned_groups = array();
foreach ($dashboard_groups as $field) {
if (strlen($field['group_name']) > 0) {
if (!empty($field['group_name'])) {
if (is_uuid($field['group_uuid'])) {
$assigned_groups[] = $field['group_uuid'];
}
@@ -356,7 +356,7 @@
if (is_array($dashboard_groups) && sizeof($dashboard_groups) != 0) {
echo "<table cellpadding='0' cellspacing='0' border='0'>\n";
foreach($dashboard_groups as $field) {
if (strlen($field['group_name']) > 0) {
if (!empty($field['group_name'])) {
echo "<tr>\n";
echo " <td class='vtable' style='white-space: nowrap; padding-right: 30px;' nowrap='nowrap'>\n";
echo $field['group_name'].(($field['group_domain_uuid'] != '') ? "@".$_SESSION['domains'][$field['group_domain_uuid']]['domain_name'] : null);
core/databases/database_edit.php
+11 -11
View File
@@ -78,7 +78,7 @@
$database_description = $_POST["database_description"];
}
if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
if (count($_POST)>0 && empty($_POST["persistformvar"])) {
$msg = '';
if ($action == "update") {
@@ -109,16 +109,16 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
}
//check for all required data
//if (strlen($database_driver) == 0) { $msg .= $text['message-required'].$text['label-driver']."<br>\n"; }
//if (strlen($database_type) == 0) { $msg .= $text['message-required'].$text['label-type']."<br>\n"; }
//if (strlen($database_host) == 0) { $msg .= $text['message-required'].$text['label-host']."<br>\n"; }
//if (strlen($database_port) == 0) { $msg .= $text['message-required'].$text['label-port']."<br>\n"; }
//if (strlen($database_name) == 0) { $msg .= $text['message-required'].$text['label-name']."<br>\n"; }
//if (strlen($database_username) == 0) { $msg .= $text['message-required'].$text['label-username']."<br>\n"; }
//if (strlen($database_password) == 0) { $msg .= $text['message-required'].$text['label-password']."<br>\n"; }
//if (strlen($database_path) == 0) { $msg .= $text['message-required'].$text['label-path']."<br>\n"; }
//if (strlen($database_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
//if (empty($database_driver)) { $msg .= $text['message-required'].$text['label-driver']."<br>\n"; }
//if (empty($database_type)) { $msg .= $text['message-required'].$text['label-type']."<br>\n"; }
//if (empty($database_host)) { $msg .= $text['message-required'].$text['label-host']."<br>\n"; }
//if (empty($database_port)) { $msg .= $text['message-required'].$text['label-port']."<br>\n"; }
//if (empty($database_name)) { $msg .= $text['message-required'].$text['label-name']."<br>\n"; }
//if (empty($database_username)) { $msg .= $text['message-required'].$text['label-username']."<br>\n"; }
//if (empty($database_password)) { $msg .= $text['message-required'].$text['label-password']."<br>\n"; }
//if (empty($database_path)) { $msg .= $text['message-required'].$text['label-path']."<br>\n"; }
//if (empty($database_description)) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
if (!empty($msg) && empty($_POST["persistformvar"])) {
require_once "resources/header.php";
require_once "resources/persist_form_var.php";
echo "<div align='center'>\n";
core/default_settings/default_setting_edit.php
+12 -12
View File
@@ -81,7 +81,7 @@
}
//process the http post
if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (count($_POST) > 0 && empty($_POST["persistformvar"])) {
//set the default_setting_uuid
if ($action == "update") {
@@ -101,14 +101,14 @@
//check for all required data
$msg = '';
if (strlen($default_setting_category) == 0) { $msg .= $text['message-required'].$text['label-category']."<br>\n"; }
if (strlen($default_setting_subcategory) == 0) { $msg .= $text['message-required'].$text['label-subcategory']."<br>\n"; }
if (strlen($default_setting_name) == 0) { $msg .= $text['message-required'].$text['label-type']."<br>\n"; }
//if (strlen($default_setting_value) == 0) { $msg .= $text['message-required'].$text['label-value']."<br>\n"; }
if (strlen($default_setting_order) == 0) { $msg .= $text['message-required'].$text['label-order']."<br>\n"; }
if (strlen($default_setting_enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
//if (strlen($default_setting_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (empty($default_setting_category)) { $msg .= $text['message-required'].$text['label-category']."<br>\n"; }
if (empty($default_setting_subcategory)) { $msg .= $text['message-required'].$text['label-subcategory']."<br>\n"; }
if (empty($default_setting_name)) { $msg .= $text['message-required'].$text['label-type']."<br>\n"; }
//if (empty($default_setting_value)) { $msg .= $text['message-required'].$text['label-value']."<br>\n"; }
if (empty($default_setting_order)) { $msg .= $text['message-required'].$text['label-order']."<br>\n"; }
if (empty($default_setting_enabled)) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
//if (empty($default_setting_description)) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
if (!empty($msg) && empty($_POST["persistformvar"])) {
require_once "resources/header.php";
require_once "resources/persist_form_var.php";
echo "<div align='center'>\n";
@@ -223,7 +223,7 @@
return;
}
} //if ($_POST["persistformvar"] != "true")
} //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
} //(count($_POST)>0 && empty($_POST["persistformvar"]))
//pre-populate the form
if (count($_GET) > 0 && $_POST["persistformvar"] != "true") {
@@ -247,7 +247,7 @@
}
//set the defaults
if (strlen($default_setting_enabled) == 0) { $default_setting_enabled = 'true'; }
if (empty($default_setting_enabled)) { $default_setting_enabled = 'true'; }
//create token
$object = new token;
@@ -473,7 +473,7 @@
}
echo " <optgroup label='".$category."'>\n";
}
if (strlen($val) > 0) {
if (!empty($val)) {
$time_zone_offset = get_time_zone_offset($val)/3600;
$time_zone_offset_hours = floor($time_zone_offset);
$time_zone_offset_minutes = ($time_zone_offset - $time_zone_offset_hours) * 60;
core/default_settings/default_settings.php
+14 -10
View File
@@ -46,12 +46,16 @@
$text = $language->get();
//get the http post data
$search = $_REQUEST['search'];
$default_setting_category = $_REQUEST['default_setting_category'];
$search = $_REQUEST['search'] ?? '';
$default_setting_category = $_REQUEST['default_setting_category'] ?? '';
if (is_array($_POST['default_settings'])) {
$action = $_POST['action'];
$domain_uuid = $_POST['domain_uuid'];
$default_settings = $_POST['default_settings'];
} else {
$action = '';
$domain_uuid = '';
$default_settings = '';
}
//sanitize the variables
@@ -102,7 +106,7 @@
//get the count
$sql = "select count(default_setting_uuid) from v_default_settings ";
if (isset($search) && strlen($search) > 0) {
if (isset($search) && !empty($search)) {
$sql .= "where (";
$sql .= " lower(default_setting_category) like :search ";
$sql .= " or lower(default_setting_subcategory) like :search ";
@@ -112,7 +116,7 @@
$sql .= ") ";
$parameters['search'] = '%'.$search.'%';
}
if (isset($default_setting_category) && strlen($default_setting_category) > 0) {
if (isset($default_setting_category) && !empty($default_setting_category)) {
$sql .= (stripos($sql,'WHERE') === false) ? 'where ' : 'and ';
$sql .= "lower(default_setting_category) = :default_setting_category ";
$parameters['default_setting_category'] = strtolower($default_setting_category);
@@ -124,7 +128,7 @@
$sql = "select default_setting_uuid, default_setting_category, default_setting_subcategory, default_setting_name, ";
$sql .= "default_setting_value, cast(default_setting_enabled as text), default_setting_description ";
$sql .= "from v_default_settings ";
if (isset($search) && strlen($search) > 0) {
if (isset($search) && !empty($search)) {
$sql .= "where (";
$sql .= " lower(default_setting_category) like :search ";
$sql .= " or lower(default_setting_subcategory) like :search ";
@@ -134,13 +138,13 @@
$sql .= ") ";
$parameters['search'] = '%'.$search.'%';
}
if (isset($default_setting_category) && strlen($default_setting_category) > 0) {
if (isset($default_setting_category) && !empty($default_setting_category)) {
$sql .= (stripos($sql,'WHERE') === false) ? 'where ' : 'and ';
$sql .= "lower(default_setting_category) = :default_setting_category ";
$parameters['default_setting_category'] = strtolower($default_setting_category);
}
$sql .= order_by($order_by, $order, 'default_setting_category, default_setting_subcategory, default_setting_order', 'asc');
$sql .= limit_offset($rows_per_page, $offset);
//$sql .= limit_offset($rows_per_page, $offset ?? ''); //$offset is always null
$database = new database;
$default_settings = $database->select($sql, $parameters, 'all');
unset($sql, $parameters);
@@ -153,7 +157,7 @@
$sql .= " count(d2.default_setting_category) ";
$sql .= " from v_default_settings as d2 ";
$sql .= " where d2.default_setting_category = d1.default_setting_category ";
if (isset($search) && strlen($search) > 0) {
if (!empty($search)) {
$sql .= " and (";
$sql .= " lower(d2.default_setting_category) like :search ";
$sql .= " or lower(d2.default_setting_subcategory) like :search ";
@@ -345,7 +349,7 @@
if ($row['default_setting_value'] !== $field['default_setting_value']) {
$setting_bold = 'font-weight:bold;';
}
if (strlen($field['default_setting_value']) > 0) {
if (!empty($field['default_setting_value'])) {
$default_value = 'Default: '.$field['default_setting_value'];
}
else {
@@ -465,7 +469,7 @@
echo " [...]\n";
}
else if ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text" || substr_count($subcategory, '_secret') > 0) {
echo " ".str_repeat('*', strlen($row['default_setting_value']));
echo " ".str_repeat('*', strlen($row['default_setting_value'] ?? ''));
}
else if ($category == 'theme' && $subcategory == 'button_icons' && $name == 'text') {
echo " ".$text['option-button_icons_'.$row['default_setting_value']]."\n";
core/default_settings/default_settings_reload.php
+1 -2
View File
@@ -46,13 +46,12 @@ $language = new text;
$text = $language->get();
//set the variables
$search = $_REQUEST['search'];
$search = $_REQUEST['search'] ?? '';
$domain_uuid = $_GET['id'];
//reload default settings
require "resources/classes/domains.php";
$domain = new domains();
$domain->db = $db;
$domain->set();
//add a message
core/domain_settings/domain_setting_edit.php
+13 -13
View File
@@ -89,7 +89,7 @@
$domain_setting_description = $_POST["domain_setting_description"];
}
if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (count($_POST) > 0 && empty($_POST["persistformvar"])) {
$msg = '';
if ($action == "update") {
@@ -105,14 +105,14 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
}
//check for all required/authorized data
if (strlen($domain_setting_category) == 0 || (is_array($allowed_categories) && sizeof($allowed_categories) > 0 && !in_array(strtolower($domain_setting_category), $allowed_categories))) { $msg .= $text['message-required'].$text['label-category']."<br>\n"; }
if (strlen($domain_setting_subcategory) == 0) { $msg .= $text['message-required'].$text['label-subcategory']."<br>\n"; }
if (strlen($domain_setting_name) == 0) { $msg .= $text['message-required'].$text['label-type']."<br>\n"; }
//if (strlen($domain_setting_value) == 0) { $msg .= $text['message-required'].$text['label-value']."<br>\n"; }
if (strlen($domain_setting_order) == 0) { $msg .= $text['message-required'].$text['label-order']."<br>\n"; }
if (strlen($domain_setting_enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
//if (strlen($domain_setting_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (empty($domain_setting_category) || (is_array($allowed_categories) && sizeof($allowed_categories) > 0 && !in_array(strtolower($domain_setting_category), $allowed_categories))) { $msg .= $text['message-required'].$text['label-category']."<br>\n"; }
if (empty($domain_setting_subcategory)) { $msg .= $text['message-required'].$text['label-subcategory']."<br>\n"; }
if (empty($domain_setting_name)) { $msg .= $text['message-required'].$text['label-type']."<br>\n"; }
//if (empty($domain_setting_value)) { $msg .= $text['message-required'].$text['label-value']."<br>\n"; }
if (empty($domain_setting_order)) { $msg .= $text['message-required'].$text['label-order']."<br>\n"; }
if (empty($domain_setting_enabled)) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
//if (empty($domain_setting_description)) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
if (!empty($msg) && empty($_POST["persistformvar"])) {
require_once "resources/header.php";
require_once "resources/persist_form_var.php";
echo "<div align='center'>\n";
@@ -232,7 +232,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
}
//update time zone
if ($domain_setting_category == "domain" && $domain_setting_subcategory == "time_zone" && $domain_setting_name == "name" && strlen($domain_setting_value) > 0 ) {
if ($domain_setting_category == "domain" && $domain_setting_subcategory == "time_zone" && $domain_setting_name == "name" && !empty($domain_setting_value) ) {
$sql = "select * from v_dialplans ";
$sql .= "where app_uuid = '34dd307b-fffe-4ead-990c-3d070e288126' ";
$sql .= "and domain_uuid = :domain_uuid ";
@@ -349,7 +349,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
}
//set the defaults
if (strlen($domain_setting_enabled) == 0) { $domain_setting_enabled = 'true'; }
if (empty($domain_setting_enabled)) { $domain_setting_enabled = 'true'; }
//create token
$object = new token;
@@ -455,7 +455,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
$category = $row['domain_setting_category'];
$subcategory = $row['domain_setting_subcategory'];
$subcategory = $row['domain_setting_subcategory'] ?? '';
$name = $row['domain_setting_name'];
if ($category == "domain" && $subcategory == "menu" && $name == "uuid" ) {
echo " <select class='formfld' id='domain_setting_value' name='domain_setting_value' style=''>\n";
@@ -524,7 +524,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
}
echo " <optgroup label='".escape($category)."'>\n";
}
if (strlen($val) > 0) {
if (!empty($val)) {
$time_zone_offset = get_time_zone_offset($val)/3600;
$time_zone_offset_hours = floor($time_zone_offset);
$time_zone_offset_minutes = ($time_zone_offset - $time_zone_offset_hours) * 60;
core/domains/domain_edit.php
+7 -7
View File
@@ -70,7 +70,7 @@
}
//process the data
if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (count($_POST) > 0 && empty($_POST["persistformvar"])) {
//get the domain_uuid
if ($action == "update" && $_POST["domain_uuid"]) {
@@ -102,9 +102,9 @@
//check for all required data
$msg = '';
if (strlen($domain_name) == 0) { $msg .= $text['message-required'].$text['label-name']."<br>\n"; }
//if (strlen($domain_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (empty($domain_name)) { $msg .= $text['message-required'].$text['label-name']."<br>\n"; }
//if (empty($domain_description)) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
if (!empty($msg) && empty($_POST["persistformvar"])) {
require_once "resources/header.php";
require_once "resources/persist_form_var.php";
echo "<div align='center'>\n";
@@ -165,14 +165,14 @@
}
//create the recordings directory for the new domain.
if (isset($_SESSION['switch']['recordings']['dir']) && strlen($_SESSION['switch']['recordings']['dir']) > 0) {
if (isset($_SESSION['switch']['recordings']['dir']) && !empty($_SESSION['switch']['recordings']['dir'])) {
if (!file_exists($_SESSION['switch']['recordings']['dir']."/".$domain_name)) {
mkdir($_SESSION['switch']['recordings']['dir']."/".$domain_name, 0770);
}
}
//create the voicemail directory for the new domain.
if (isset($_SESSION['switch']['voicemail']['dir']) && strlen($_SESSION['switch']['voicemail']['dir']) > 0) {
if (isset($_SESSION['switch']['voicemail']['dir']) && !empty($_SESSION['switch']['voicemail']['dir'])) {
if (!file_exists($_SESSION['switch']['voicemail']['dir']."/default/".$domain_name)) {
mkdir($_SESSION['switch']['voicemail']['dir']."/default/".$domain_name, 0770);
}
@@ -571,7 +571,7 @@
}
//set the defaults
if (strlen($domain_enabled) == 0) { $domain_enabled = 'true'; }
if (empty($domain_enabled)) { $domain_enabled = 'true'; }
//create token
$object = new token;
core/domains/domains.php
-1
View File
@@ -76,7 +76,6 @@
//set the setting arrays
$domain = new domains();
$domain->db = $db;
$domain->set();
//redirect the user
core/groups/app_defaults.php
+1 -1
View File
@@ -37,7 +37,7 @@ if ($domains_processed == 1) {
$result = $database->select($sql, null, 'all');
if (is_array($result)) {
foreach($result as $row) {
if (strlen($row['group_name']) > 0) {
if (!empty($row['group_name'])) {
//get the group_uuid
$sql = "select group_uuid from v_groups ";
$sql .= "where group_name = :group_name ";
core/groups/group_edit.php
+8 -8
View File
@@ -67,7 +67,7 @@
}
//process the user data and save it to the database
if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (count($_POST) > 0 && empty($_POST["persistformvar"])) {
//process the http post data by submitted action
if ($_POST['action'] != '' && is_uuid($group_uuid)) {
@@ -103,12 +103,12 @@
//check for all required data
$msg = '';
if (strlen($group_name) == 0) { $msg .= $text['message-required']." ".$text['label-group_name']."<br>\n"; }
//if (strlen($domain_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-domain_uuid']."<br>\n"; }
if (strlen($group_level) == 0) { $msg .= $text['message-required']." ".$text['label-group_level']."<br>\n"; }
//if (strlen($group_protected) == 0) { $msg .= $text['message-required']." ".$text['label-group_protected']."<br>\n"; }
//if (strlen($group_description) == 0) { $msg .= $text['message-required']." ".$text['label-group_description']."<br>\n"; }
if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (empty($group_name)) { $msg .= $text['message-required']." ".$text['label-group_name']."<br>\n"; }
//if (empty($domain_uuid)) { $msg .= $text['message-required']." ".$text['label-domain_uuid']."<br>\n"; }
if (empty($group_level)) { $msg .= $text['message-required']." ".$text['label-group_level']."<br>\n"; }
//if (empty($group_protected)) { $msg .= $text['message-required']." ".$text['label-group_protected']."<br>\n"; }
//if (empty($group_description)) { $msg .= $text['message-required']." ".$text['label-group_description']."<br>\n"; }
if (!empty($msg) && empty($_POST["persistformvar"])) {
require_once "resources/header.php";
require_once "resources/persist_form_var.php";
echo "<div align='center'>\n";
@@ -259,7 +259,7 @@
echo "</td>\n";
echo "<td class='vtable' style='position: relative;' align='left'>\n";
echo " <select class='formfld' name='domain_uuid'>\n";
if (strlen($domain_uuid) == 0) {
if (empty($domain_uuid)) {
echo " <option value='' selected='selected'>".$text['label-global']."</option>\n";
}
else {
core/groups/group_permissions.php
+5 -5
View File
@@ -71,7 +71,7 @@
$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
$sql .= "and permission_assigned = 'true' ";
foreach ($_SESSION["groups"] as $field) {
if (strlen($field['group_name']) > 0) {
if (!empty($field['group_name'])) {
$sql_where_or[] = "group_name = :group_name_".$x;
$parameters['group_name_'.$x] = $field['group_name'];
$x++;
@@ -139,7 +139,7 @@
$group_permissions = $database->select($sql, $parameters, 'all');
//process the user data and save it to the database
if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (count($_POST) > 0 && empty($_POST["persistformvar"])) {
$x = 0;
if (is_array($_POST['group_permissions'])) {
foreach($_POST['group_permissions'] as $row) {
@@ -210,10 +210,10 @@
//build the array;
if ($action == "save") {
if (strlen($group_permission_uuid) == 0) {
if (empty($group_permission_uuid)) {
$group_permission_uuid = uuid();
}
if (isset($row['permission_name']) && strlen($row['permission_name']) > 0) {
if (isset($row['permission_name']) && !empty($row['permission_name'])) {
$array['save']['group_permissions'][$x]['group_permission_uuid'] = $group_permission_uuid;
$array['save']['group_permissions'][$x]['permission_name'] = $row['permission_name'];
$array['save']['group_permissions'][$x]['permission_protected'] = $row['permission_protected'] == 'true' ? "true" : 'false';
@@ -225,7 +225,7 @@
}
if ($action == "delete") {
if (isset($row['permission_name']) && strlen($row['permission_name']) > 0) {
if (isset($row['permission_name']) && !empty($row['permission_name'])) {
$array['delete']['group_permissions'][$x]['permission_name'] = $row['permission_name'];
$array['delete']['group_permissions'][$x]['group_uuid'] = $group_uuid;
$array['delete']['group_permissions'][$x]['group_name'] = $group_name;
core/groups/groupmemberadd.php
+1 -1
View File
@@ -62,7 +62,7 @@
}
//add the user to the group
if (is_uuid($user_uuid) && is_uuid($group_uuid) && strlen($group_name) > 0) {
if (is_uuid($user_uuid) && is_uuid($group_uuid) && !empty($group_name)) {
$array['user_groups'][0]['user_group_uuid'] = uuid();
$array['user_groups'][0]['domain_uuid'] = $domain_uuid;
$array['user_groups'][0]['group_uuid'] = $group_uuid;
core/menu/menu_edit.php
+5 -5
View File
@@ -63,7 +63,7 @@
}
//process the http post
if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (count($_POST) > 0 && empty($_POST["persistformvar"])) {
//validate the token
$token = new token;
@@ -75,10 +75,10 @@
//check for all required data
$msg = '';
//if (strlen($menu_name) == 0) { $msg .= $text['message-required'].$text['label-name']."<br>\n"; }
//if (strlen($menu_language) == 0) { $msg .= $text['message-required'].$text['label-language']."<br>\n"; }
//if (strlen($menu_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
//if (empty($menu_name)) { $msg .= $text['message-required'].$text['label-name']."<br>\n"; }
//if (empty($menu_language)) { $msg .= $text['message-required'].$text['label-language']."<br>\n"; }
//if (empty($menu_description)) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
if (!empty($msg) && empty($_POST["persistformvar"])) {
require_once "resources/header.php";
require_once "resources/persist_form_var.php";
echo "<div align='center'>\n";
core/menu/menu_item_edit.php
+9 -9
View File
@@ -94,7 +94,7 @@
$menu_item_link = preg_replace('#[^a-zA-Z0-9_:\-\.\&\=\?\/]#', '', $menu_item_link);
//when a HTTP POST is available then process it
if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (count($_POST) > 0 && empty($_POST["persistformvar"])) {
if ($action == "update") {
$menu_item_uuid = $_POST["menu_item_uuid"];
@@ -110,10 +110,10 @@
//check for all required data
$msg = '';
if (strlen($menu_item_title) == 0) { $msg .= $text['message-required'].$text['label-title']."<br>\n"; }
if (strlen($menu_item_category) == 0) { $msg .= $text['message-required'].$text['label-category']."<br>\n"; }
//if (strlen($menu_item_link) == 0) { $msg .= $text['message-required'].$text['label-link']."<br>\n"; }
if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (empty($menu_item_title)) { $msg .= $text['message-required'].$text['label-title']."<br>\n"; }
if (empty($menu_item_category)) { $msg .= $text['message-required'].$text['label-category']."<br>\n"; }
//if (empty($menu_item_link)) { $msg .= $text['message-required'].$text['label-link']."<br>\n"; }
if (!empty($msg) && empty($_POST["persistformvar"])) {
require_once "resources/header.php";
require_once "resources/persist_form_var.php";
echo "<div align='center'>\n";
@@ -213,7 +213,7 @@
unset($parameters);
//add a group to the menu
if ($_REQUEST["a"] != "delete" && strlen($group_uuid_name) > 0 && permission_exists('menu_add')) {
if ($_REQUEST["a"] != "delete" && !empty($group_uuid_name) && permission_exists('menu_add')) {
$group_data = explode('|', $group_uuid_name);
$group_uuid = $group_data[0];
$group_name = $group_data[1];
@@ -234,7 +234,7 @@
}
//add the menu item label
if ($_REQUEST["a"] != "delete" && strlen($menu_item_title) > 0 && permission_exists('menu_add')) {
if ($_REQUEST["a"] != "delete" && !empty($menu_item_title) && permission_exists('menu_add')) {
$sql = "select count(*) from v_menu_languages ";
$sql .= "where menu_item_uuid = :menu_item_uuid ";
$sql .= "and menu_language = :menu_language ";
@@ -351,7 +351,7 @@
if (is_array($menu_item_groups) && sizeof($menu_item_groups) != 0) {
$assigned_groups = array();
foreach ($menu_item_groups as $field) {
if (strlen($field['group_name']) > 0) {
if (!empty($field['group_name'])) {
if (is_uuid($field['group_uuid'])) {
$assigned_groups[] = $field['group_uuid'];
}
@@ -480,7 +480,7 @@
if (is_array($menu_item_groups) && sizeof($menu_item_groups) != 0) {
echo "<table cellpadding='0' cellspacing='0' border='0'>\n";
foreach($menu_item_groups as $field) {
if (strlen($field['group_name']) > 0) {
if (!empty($field['group_name'])) {
echo "<tr>\n";
echo " <td class='vtable' style='white-space: nowrap; padding-right: 30px;' nowrap='nowrap'>";
echo $field['group_name'].(($field['group_domain_uuid'] != '') ? "@".$_SESSION['domains'][$field['group_domain_uuid']]['domain_name'] : null);
core/user_logs/resources/classes/user_logs.php
+1 -1
View File
@@ -88,7 +88,7 @@ if (!class_exists('user_logs')) {
$database = new database;
$database->app_name = 'authentication';
$database->app_uuid = 'a8a12918-69a4-4ece-a1ae-3932be0e41f1';
if (strlen($user_log_uuid)>0)
if (strlen($user_log_uuid ?? '')>0)
$database->uuid($user_log_uuid);
$database->save($array, false);
$message = $database->message;
core/user_logs/user_log_edit.php
+1 -1
View File
@@ -86,7 +86,7 @@
echo "</td>\n";
echo "<td class='vtable' style='position: relative;' align='left'>\n";
echo " <select class='formfld' name='domain_uuid'>\n";
if (strlen($domain_uuid) == 0) {
if (empty($domain_uuid)) {
echo " <option value='' selected='selected'>".$text['select-global']."</option>\n";
}
else {
core/user_settings/user_setting_edit.php
+16 -16
View File
@@ -79,17 +79,17 @@
}
//get http post variables and set them to php variables
if (count($_REQUEST) > 0) {
$user_setting_category = strtolower($_REQUEST["user_setting_category"]);
$user_setting_subcategory = strtolower($_POST["user_setting_subcategory"]);
if (!empty($_REQUEST)) {
$user_setting_category = strtolower($_REQUEST["user_setting_category"] ?? '');
$user_setting_subcategory = strtolower($_POST["user_setting_subcategory"] ?? '');
$user_setting_name = strtolower($_POST["user_setting_name"]);
$user_setting_value = $_POST["user_setting_value"];
$user_setting_order = $_POST["user_setting_order"];
$user_setting_enabled = strtolower($_POST["user_setting_enabled"]);
$user_setting_enabled = strtolower($_POST["user_setting_enabled"] ?? '');
$user_setting_description = $_POST["user_setting_description"];
}
if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (!empty($_POST) && empty($_POST["persistformvar"])) {
$msg = '';
if ($action == "update") {
@@ -105,14 +105,14 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
}
//check for all required/authorized data
if (strlen($user_setting_category) == 0 || (is_array($allowed_categories) && sizeof($allowed_categories) > 0 && !in_array(strtolower($user_setting_category), $allowed_categories))) { $msg .= $text['message-required'].$text['label-category']."<br>\n"; }
if (strlen($user_setting_subcategory) == 0) { $msg .= $text['message-required'].$text['label-subcategory']."<br>\n"; }
if (strlen($user_setting_name) == 0) { $msg .= $text['message-required'].$text['label-type']."<br>\n"; }
//if (strlen($user_setting_value) == 0) { $msg .= $text['message-required'].$text['label-value']."<br>\n"; }
if (strlen($user_setting_order) == 0) { $msg .= $text['message-required'].$text['label-order']."<br>\n"; }
if (strlen($user_setting_enabled) == 0) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
//if (strlen($user_setting_description) == 0) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
if (empty($user_setting_category) || (is_array($allowed_categories) && sizeof($allowed_categories) > 0 && !in_array(strtolower($user_setting_category), $allowed_categories))) { $msg .= $text['message-required'].$text['label-category']."<br>\n"; }
if (empty($user_setting_subcategory)) { $msg .= $text['message-required'].$text['label-subcategory']."<br>\n"; }
if (empty($user_setting_name)) { $msg .= $text['message-required'].$text['label-type']."<br>\n"; }
//if (empty($user_setting_value)) { $msg .= $text['message-required'].$text['label-value']."<br>\n"; }
if (empty($user_setting_order)) { $msg .= $text['message-required'].$text['label-order']."<br>\n"; }
if (empty($user_setting_enabled)) { $msg .= $text['message-required'].$text['label-enabled']."<br>\n"; }
//if (empty($user_setting_description)) { $msg .= $text['message-required'].$text['label-description']."<br>\n"; }
if (!empty($msg) && empty($_POST["persistformvar"])) {
require_once "resources/header.php";
require_once "resources/persist_form_var.php";
echo "<div align='center'>\n";
@@ -220,7 +220,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
}
//update time zone
if ($user_setting_category == "domain" && $user_setting_subcategory == "time_zone" && $user_setting_name == "name" && strlen($user_setting_value) > 0 ) {
if ($user_setting_category == "domain" && $user_setting_subcategory == "time_zone" && $user_setting_name == "name" && !empty($user_setting_value) ) {
$sql = "select * from v_dialplans ";
$sql .= "where app_uuid = '34dd307b-fffe-4ead-990c-3d070e288126' ";
$sql .= "and domain_uuid = :domain_uuid ";
@@ -270,7 +270,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
$array['dialplan_details'][0]['dialplan_detail_tag'] = 'action';
$array['dialplan_details'][0]['dialplan_detail_type'] = 'set';
$array['dialplan_details'][0]['dialplan_detail_data'] = 'timezone='.$user_setting_value;
$array['dialplan_details'][0]['dialplan_detail_group'] = strlen($dialplan_detail_group) > 0 ? $dialplan_detail_group : 'null';
$array['dialplan_details'][0]['dialplan_detail_group'] = !empty($dialplan_detail_group) ? $dialplan_detail_group : 'null';
$array['dialplan_details'][0]['dialplan_detail_order'] = '15';
$p = new permissions;
@@ -513,7 +513,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
}
echo " <optgroup label='".$category."'>\n";
}
if (strlen($val) > 0) {
if (!empty($val)) {
$time_zone_offset = get_time_zone_offset($val)/3600;
$time_zone_offset_hours = floor($time_zone_offset);
$time_zone_offset_minutes = ($time_zone_offset - $time_zone_offset_hours) * 60;
core/user_settings/user_settings.php
+4 -1
View File
@@ -126,10 +126,13 @@
$param = "";
if (isset($_GET['page'])) {
$page = $_GET['page'];
if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
if (empty($page)) { $page = 0; $_GET['page'] = 0; }
list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page);
$offset = $rows_per_page * $page;
}
else {
$offset = 0;
}
//get the list
$sql = "select user_setting_uuid, user_uuid, user_setting_category, user_setting_subcategory, user_setting_name, user_setting_value, cast(user_setting_enabled as text), user_setting_description ";
core/users/app_defaults.php
+1 -1
View File
@@ -91,7 +91,7 @@ if ($domains_processed == 1) {
$result = $database->select($sql, null, 'all');
if (is_array($result)) {
foreach($result as $row) {
if (strlen($row['group_name']) > 0) {
if (!empty($row['group_name'])) {
//get the group_uuid
$sql = "select group_uuid from v_groups ";
$sql .= "where group_name = :group_name ";
core/users/user_edit.php
+8 -8
View File
@@ -199,7 +199,7 @@
$invalid[] = $text['label-email'];
}
if (strlen($password) > 0) {
if (!empty($password)) {
if (is_numeric($required['length']) && $required['length'] != 0) {
if (strlen($password) < $required['length']) {
$invalid[] = $text['label-characters'];
@@ -634,7 +634,7 @@
$name = $row['user_setting_name'];
$category = $row['user_setting_category'];
$subcategory = $row['user_setting_subcategory'];
if (strlen($subcategory) == 0) {
if (empty($subcategory)) {
//$$category[$name] = $row['domain_setting_value'];
$user_settings[$category][$name] = $row['user_setting_value'];
}
@@ -648,7 +648,7 @@
}
//set the defaults
if (strlen($user_enabled) == 0) { $user_enabled = "true"; }
if (empty($user_enabled)) { $user_enabled = "true"; }
//create token
$object = new token;
@@ -914,7 +914,7 @@
echo "</select>\n";
echo "<br />\n";
echo $text['description-contact']."\n";
if (strlen($contact_uuid) > 0) {
if (!empty($contact_uuid)) {
echo " <a href=\"".PROJECT_PATH."/app/contacts/contact_edit.php?id=".urlencode($contact_uuid)."\">".$text['description-contact_view']."</a>\n";
}
echo " </td>";
@@ -963,7 +963,7 @@
if (is_array($user_groups)) {
echo "<table cellpadding='0' cellspacing='0' border='0'>\n";
foreach($user_groups as $field) {
if (strlen($field['group_name']) > 0) {
if (!empty($field['group_name'])) {
echo "<tr>\n";
echo " <td class='vtable' style='white-space: nowrap; padding-right: 30px;' nowrap='nowrap'>";
echo escape($field['group_name']).(($field['group_domain_uuid'] != '') ? "@".$_SESSION['domains'][$field['group_domain_uuid']]['domain_name'] : null);
@@ -1040,7 +1040,7 @@
echo " <td class='vncell' valign='top'>".$text['label-api_key']."</td>";
echo " <td class='vtable'>\n";
echo " <input type='text' class='formfld' style='width: 250px; display: none;' name='api_key' id='api_key' value=\"".escape($api_key)."\" >";
if (strlen($api_key) == 0) {
if (empty($api_key)) {
//generate api key
echo button::create(['type'=>'button',
'label'=>$text['button-generate'],
@@ -1069,7 +1069,7 @@
document.getElementById('button-api_key_view').style.display = 'inline';"]);
}
if (strlen($text['description-api_key']) > 0) {
if (!empty($text['description-api_key'])) {
echo " <br />".$text['description-api_key']."<br />\n";
}
echo " </td>";
@@ -1146,7 +1146,7 @@
'onclick'=>"document.getElementById('user_totp_secret').value = '';
document.getElementById('frm').submit();"]);
}
if (strlen($user_totp_secret) == 0) {
if (empty($user_totp_secret)) {
echo " <br />".$text['description-user_totp_secret']."<br />\n";
}
else {
core/users/user_imports.php
+5 -5
View File
@@ -83,7 +83,7 @@
}
//get the schema
if (strlen($delimiter) > 0 && file_exists($_SESSION['file'])) {
if (!empty($delimiter) && file_exists($_SESSION['file'] ?? '')) {
//get the first line
$line = fgets(fopen($_SESSION['file'], 'r'));
$line_fields = explode($delimiter, $line);
@@ -137,7 +137,7 @@
}
//match the column names to the field names
if (strlen($delimiter) > 0 && file_exists($_SESSION['file']) && $action != 'import') {
if (!empty($delimiter) && file_exists($_SESSION['file'] ?? '') && $action != 'import') {
//create token
$object = new token;
@@ -233,7 +233,7 @@
}
//upload the csv
if (file_exists($_SESSION['file']) && $action == 'import') {
if (file_exists($_SESSION['file'] ?? '') && $action == 'import') {
//validate the token
$token = new token;
@@ -297,8 +297,8 @@
//}
//build the data array
if (strlen($table_name) > 0) {
if (strlen($parent) == 0) {
if (!empty($table_name)) {
if (empty($parent)) {
$array[$table_name][$row_id]['domain_uuid'] = $domain_uuid;
$array[$table_name][$row_id][$field_name] = $result[$key];
}