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

Remove deprecated view definitions in app_defaults.php

Browse Source 
Views are being created by the database class views method.
This commit is contained in:
markjcrane
2025-12-10 13:30:09 -07:00
parent c18117f8b5
commit 9c322f58e2
4 changed files with 0 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/groups/app_defaults.php
View File

@@ -101,21 +101,6 @@ if ($domains_processed == 1) {
$database->execute($sql, $parameters);
unset($sql, $parameters);
//drop the view_groups
$database->execute("DROP VIEW view_groups;", null);
//add or update the view
$sql = "CREATE VIEW view_groups AS (";
$sql .= " select domain_uuid, group_uuid, group_name, ";
$sql .= " (select domain_name from v_domains where domain_uuid = g.domain_uuid) as domain_name, ";
$sql .= " (select count(*) from v_group_permissions where group_uuid = g.group_uuid) as group_permissions, ";
$sql .= " (select count(*) from v_user_groups where group_uuid = g.group_uuid) as group_members, ";
$sql .= " group_level, group_protected, group_description ";
$sql .= " from v_groups as g ";
$sql .= ");";
$database->execute($sql, null);
unset($sql);
//group permissions
$database->execute("update v_group_permissions set permission_protected = 'false' where permission_protected is null;", null);
$database->execute("update v_group_permissions set permission_assigned = 'true' where permission_assigned is null;", null);

44
core/users/app_defaults.php
View File

@@ -30,50 +30,6 @@ if ($domains_processed == 1) {
$group = new groups;
$group->defaults();
//create the user view combines username, organization, contact first and last name
$database->execute("DROP VIEW view_users;", null);
$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, c.contact_note, \n";
$sql .= " ( \n";
$sql .= " select \n";
$sql .= " string_agg(g.group_name, ', ') \n";
$sql .= " from \n";
$sql .= " v_user_groups as ug, \n";
$sql .= " v_groups as g \n";
$sql .= " where \n";
$sql .= " ug.group_uuid = g.group_uuid \n";
$sql .= " and u.user_uuid = ug.user_uuid \n";
$sql .= " ) AS group_names, \n";
$sql .= " ( \n";
$sql .= " select \n";
$sql .= " string_agg(g.group_uuid::text, ', ') \n";
//$sql .= " array_agg(g.group_uuid::text) \n";
$sql .= " from \n";
$sql .= " v_user_groups as ug, \n";
$sql .= " v_groups as g \n";
$sql .= " where \n";
$sql .= " ug.group_uuid = g.group_uuid \n";
$sql .= " and u.user_uuid = ug.user_uuid \n";
$sql .= " ) AS group_uuids, \n";
$sql .= " ( \n";
$sql .= " SELECT group_level \n";
$sql .= " FROM v_user_groups ug, v_groups g \n";
$sql .= " WHERE (ug.group_uuid = g.group_uuid) \n";
$sql .= " AND (u.user_uuid = ug.user_uuid) \n";
$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";
$sql .= " where 1 = 1 \n";
$sql .= " order by u.username asc \n";
$sql .= "); \n";
$database->execute($sql, null);
unset($sql);
//find rows that have a null group_uuid and set the correct group_uuid
$sql = "select * from v_user_groups ";
$sql .= "where group_uuid is null; ";