|
@@ -724,7 +724,7 @@ include "root.php";
|
|
|
unset($sql);
|
|
unset($sql);
|
|
|
}
|
|
}
|
|
|
$this->write_progress("\tChecking if superuser is in the correct group");
|
|
$this->write_progress("\tChecking if superuser is in the correct group");
|
|
|
- $sql = "select count(*) as count from v_group_users ";
|
|
|
|
|
|
|
+ $sql = "select count(*) as count from v_user_groups ";
|
|
|
$sql .= "where domain_uuid = '".$this->global_settings->domain_uuid()."' ";
|
|
$sql .= "where domain_uuid = '".$this->global_settings->domain_uuid()."' ";
|
|
|
$sql .= "and user_uuid = '".$this->admin_uuid."' ";
|
|
$sql .= "and user_uuid = '".$this->admin_uuid."' ";
|
|
|
$sql .= "and group_name = 'superadmin' ";
|
|
$sql .= "and group_name = 'superadmin' ";
|
|
@@ -735,7 +735,7 @@ include "root.php";
|
|
|
$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
|
|
$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
|
|
|
if ($row['count'] == 0) {
|
|
if ($row['count'] == 0) {
|
|
|
//add the user to the superadmin group
|
|
//add the user to the superadmin group
|
|
|
- $sql = "insert into v_group_users ";
|
|
|
|
|
|
|
+ $sql = "insert into v_user_groups ";
|
|
|
$sql .= "(";
|
|
$sql .= "(";
|
|
|
$sql .= "group_user_uuid, ";
|
|
$sql .= "group_user_uuid, ";
|
|
|
$sql .= "domain_uuid, ";
|
|
$sql .= "domain_uuid, ";
|
|
@@ -770,7 +770,7 @@ include "root.php";
|
|
|
$_SESSION['event_socket_password'] = $this->global_settings->switch_event_password();
|
|
$_SESSION['event_socket_password'] = $this->global_settings->switch_event_password();
|
|
|
|
|
|
|
|
//get the groups assigned to the user and then set the groups in $_SESSION["groups"]
|
|
//get the groups assigned to the user and then set the groups in $_SESSION["groups"]
|
|
|
- $sql = "SELECT * FROM v_group_users ";
|
|
|
|
|
|
|
+ $sql = "SELECT * FROM v_user_groups ";
|
|
|
$sql .= "where domain_uuid=:domain_uuid ";
|
|
$sql .= "where domain_uuid=:domain_uuid ";
|
|
|
$sql .= "and user_uuid=:user_uuid ";
|
|
$sql .= "and user_uuid=:user_uuid ";
|
|
|
$prep_statement = $this->dbh->prepare(check_sql($sql));
|
|
$prep_statement = $this->dbh->prepare(check_sql($sql));
|
FusionPBX