nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Contacts has been moved to the core

Browse Source 
This means the contacts should always be avaialble.
This commit is contained in:
FusionPBX
2024-11-19 11:39:18 -07:00
committed by GitHub
parent 9cb1217995
commit c3c1b18358
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/users/app_defaults.php
View File

@@ -35,9 +35,7 @@ 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";
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 .= " 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";
@@ -67,15 +65,9 @@ if ($domains_processed == 1) {
$sql .= " ORDER BY group_level DESC \n";
$sql .= " LIMIT 1 \n";
$sql .= " ) AS group_level \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 .= " 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";
$sql .= " where 1 = 1 \n";
$sql .= " order by u.username asc \n";
$sql .= "); \n";