diff --git a/adm_program/system/classes/Organization.php b/adm_program/system/classes/Organization.php index 246e076fd9..3e0b5089b6 100644 --- a/adm_program/system/classes/Organization.php +++ b/adm_program/system/classes/Organization.php @@ -143,7 +143,7 @@ public function createBasicData($userId) // create default category for roles, events and weblinks $sql = 'INSERT INTO ' . TBL_CATEGORIES . ' (cat_org_id, cat_uuid, cat_type, cat_name_intern, cat_name, cat_default, cat_sequence, cat_usr_id_create, cat_timestamp_create) - VALUES (?, ?, \'ROL\', \'COMMON\', \'SYS_COMMON\', 1, 1, ?, ?)'; + VALUES (?, ?, \'ROL\', \'COMMON\', \'SYS_COMMON\', true, true, ?, ?)'; $queryParams = array($orgId, Uuid::uuid4(), $systemUserId, DATETIME_NOW); $this->db->queryPrepared($sql, $queryParams); $categoryCommon = $this->db->lastInsertId(); diff --git a/adm_program/system/classes/TableRoles.php b/adm_program/system/classes/TableRoles.php index 9c9d5ed049..a0232b9b97 100644 --- a/adm_program/system/classes/TableRoles.php +++ b/adm_program/system/classes/TableRoles.php @@ -219,7 +219,7 @@ public function delete() FROM '.TBL_ROLES.' INNER JOIN '.TBL_CATEGORIES.' ON cat_id = rol_cat_id - WHERE rol_default_registration = 1 + WHERE rol_default_registration = true AND rol_id <> ? -- $rolId AND cat_org_id = ? -- $GLOBALS[\'gCurrentOrgId\']'; $countRolesStatement = $this->db->queryPrepared($sql, array($rolId, $GLOBALS['gCurrentOrgId'])); @@ -531,7 +531,7 @@ public function setValue($columnName, $newValue, $checkValue = true) FROM '.TBL_ROLES.' INNER JOIN '.TBL_CATEGORIES.' ON cat_id = rol_cat_id - WHERE rol_default_registration = 1 + WHERE rol_default_registration = true AND rol_id <> ? -- $this->getValue(\'rol_id\') AND cat_org_id = ? -- $GLOBALS[\'gCurrentOrgId\']'; $pdoStatement = $this->db->queryPrepared($sql, array((int) $this->getValue('rol_id'), $GLOBALS['gCurrentOrgId'])); diff --git a/adm_program/system/classes/User.php b/adm_program/system/classes/User.php index e809edc437..579141c666 100644 --- a/adm_program/system/classes/User.php +++ b/adm_program/system/classes/User.php @@ -140,7 +140,7 @@ public function assignDefaultRoles() FROM '.TBL_ROLES.' INNER JOIN '.TBL_CATEGORIES.' ON cat_id = rol_cat_id - WHERE rol_default_registration = 1 + WHERE rol_default_registration = true AND cat_org_id = ? -- $this->organizationId'; $defaultRolesStatement = $this->db->queryPrepared($sql, array($this->organizationId));