From 2a4f9f6a106fc268df31200f5285310da8d35b2d Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Thu, 5 Mar 2015 12:38:35 +0000 Subject: [PATCH] A few minor changes. --- core/users/groupdelete.php | 10 +++++++--- core/users/groupmemberadd.php | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/core/users/groupdelete.php b/core/users/groupdelete.php index 7ccbade5ee..a9ebacf947 100644 --- a/core/users/groupdelete.php +++ b/core/users/groupdelete.php @@ -45,6 +45,7 @@ require_once "resources/require.php"; $sql = "select group_name from v_groups "; $sql .= "where group_uuid = '".$group_uuid."' "; $sql .= "and (domain_uuid = '".$_SESSION['domain_uuid']."' or domain_uuid is null); "; + //echo $sql . "\n"; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); @@ -56,7 +57,8 @@ require_once "resources/require.php"; //delete the group users $sql = "delete from v_group_users "; $sql .= "where group_uuid = '".$group_uuid."' "; - $sql .= "and (domain_uuid = '".$_SESSION['domain_uuid']."' or domain_uuid is null) "; + $sql .= "and (domain_uuid = '".$_SESSION['domain_uuid']."' or domain_uuid is null); "; + //echo $sql . "\n"; if (!$db->exec($sql)) { $error = $db->errorInfo(); print_r($error); @@ -66,7 +68,8 @@ require_once "resources/require.php"; if (strlen($group_name) > 0) { $sql = "delete from v_group_permissions "; $sql .= "where group_name = '".$group_name."' "; - $sql .= "and (domain_uuid = '".$_SESSION['domain_uuid']."' or domain_uuid is null) "; + $sql .= "and (domain_uuid = '".$_SESSION['domain_uuid']."' or domain_uuid is null); "; + //echo $sql . "\n"; if (!$db->exec($sql)) { $error = $db->errorInfo(); print_r($error); @@ -76,7 +79,8 @@ require_once "resources/require.php"; //delete the group $sql = "delete from v_groups "; $sql .= "where group_uuid = '".$group_uuid."' "; - $sql .= "and (domain_uuid = '".$_SESSION['domain_uuid']."' or domain_uuid is null) "; + $sql .= "and (domain_uuid = '".$_SESSION['domain_uuid']."' or domain_uuid is null); "; + //echo $sql . "\n"; if (!$db->exec($sql)) { $error = $db->errorInfo(); print_r($error); diff --git a/core/users/groupmemberadd.php b/core/users/groupmemberadd.php index e40dc225c2..10aa90a2a1 100644 --- a/core/users/groupmemberadd.php +++ b/core/users/groupmemberadd.php @@ -46,7 +46,7 @@ else { $user_uuid = check_str($_POST["user_uuid"]); //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) && strlen($group_name) > 0) { $sql = "insert into v_group_users "; $sql .= "("; $sql .= "group_user_uuid, ";