From 2f7b5c7924839aaf66cf97adee6d91d454cc0f7f Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 18 Feb 2020 22:05:31 -0700 Subject: [PATCH] Update app_defaults.php --- core/users/app_defaults.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/core/users/app_defaults.php b/core/users/app_defaults.php index f3c196769d..ea8a9466a1 100644 --- a/core/users/app_defaults.php +++ b/core/users/app_defaults.php @@ -36,7 +36,9 @@ if ($domains_processed == 1) { $sql = "CREATE VIEW view_users AS ( \n"; $sql .= " select u.domain_uuid, u.user_uuid, d.domain_name, u.username, u.user_status, u.user_enabled, u.add_date, \n"; - $sql .= " c.contact_uuid, c.contact_organization, c.contact_name_given ||' '|| c.contact_name_family as contact_name, c.contact_name_given, c.contact_name_family, \n"; + if (file_exists($_SERVER["PROJECT_ROOT"]."/app/contacts/app_config.php")) { + $sql .= " c.contact_uuid, c.contact_organization, c.contact_name_given ||' '|| c.contact_name_family as contact_name, c.contact_name_given, c.contact_name_family, \n"; + } $sql .= " ( \n"; $sql .= " select \n"; $sql .= " string_agg(g.group_name, ', ') \n"; @@ -55,9 +57,15 @@ if ($domains_processed == 1) { $sql .= " ORDER BY group_level DESC \n"; $sql .= " LIMIT 1 \n"; $sql .= " ) AS group_level \n"; - $sql .= " from v_contacts as c \n"; - $sql .= " right join v_users u on u.contact_uuid = c.contact_uuid \n"; - $sql .= " inner join v_domains as d on d.domain_uuid = u.domain_uuid \n"; + if (file_exists($_SERVER["PROJECT_ROOT"]."/app/contacts/app_config.php")) { + $sql .= " from v_contacts as c \n"; + $sql .= " right join v_users u on u.contact_uuid = c.contact_uuid \n"; + $sql .= " inner join v_domains as d on d.domain_uuid = u.domain_uuid \n"; + } + else { + $sql .= " from v_users as u \n"; + $sql .= " inner join v_domains as d on d.domain_uuid = u.domain_uuid \n"; + } $sql .= " where 1 = 1 \n"; $sql .= " order by u.username asc \n"; $sql .= "); \n";