From f430266adc72bf73e3ac4ceee915d1377c3869ab Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Wed, 29 Mar 2017 11:30:15 +0200 Subject: [permission-manager] changed include/exclude to all/selected --- modules-available/permissionmanager/inc/dbupdate.inc.php | 6 +++--- modules-available/permissionmanager/inc/getdata.inc.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'modules-available/permissionmanager/inc') diff --git a/modules-available/permissionmanager/inc/dbupdate.inc.php b/modules-available/permissionmanager/inc/dbupdate.inc.php index 417fd812..1101e4f7 100644 --- a/modules-available/permissionmanager/inc/dbupdate.inc.php +++ b/modules-available/permissionmanager/inc/dbupdate.inc.php @@ -34,13 +34,13 @@ class DbUpdate { Database::exec($query); } - public static function saveRole($roleName, $locType, $locations, $permissions, $role = NULL) { + public static function saveRole($roleName, $locations, $permissions, $role = NULL) { if ($role) { - Database::exec("UPDATE role SET name = '$roleName', locType = '$locType' WHERE id = $role"); + Database::exec("UPDATE role SET name = '$roleName' WHERE id = $role"); Database::exec("DELETE FROM roleXlocation WHERE roleid = $role"); Database::exec("DELETE FROM roleXpermission WHERE roleid = $role"); } else { - Database::exec("INSERT INTO role (name, locType) VALUES ('$roleName', '$locType')"); + Database::exec("INSERT INTO role (name) VALUES ('$roleName')"); $role = Database::lastInsertId(); } foreach ($locations as $locID) { diff --git a/modules-available/permissionmanager/inc/getdata.inc.php b/modules-available/permissionmanager/inc/getdata.inc.php index 67210246..7ca56754 100644 --- a/modules-available/permissionmanager/inc/getdata.inc.php +++ b/modules-available/permissionmanager/inc/getdata.inc.php @@ -40,7 +40,7 @@ class GetData { } public static function getRoleData($roleID) { - $query = "SELECT id, name, locType FROM role WHERE id = $roleID"; + $query = "SELECT id, name FROM role WHERE id = $roleID"; $data = Database::queryFirst($query); $query = "SELECT roleid, locid FROM roleXlocation WHERE roleid = $roleID"; $res = Database::simpleQuery($query); -- cgit v1.2.3-55-g7522