X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/fd0872d9e582113346fa1e93557f370286c5c9f2..2352b1096ea3b8301f06d3e5b072022ae08a2f73:/role_add.php

diff --git a/role_add.php b/role_add.php
index e4cbb964..e1e16cc7 100644
--- a/role_add.php
+++ b/role_add.php
@@ -28,7 +28,6 @@
 
 require_once('initialize.php');
 import('form.Form');
-import('ttTeamHelper');
 import('ttRoleHelper');
 
 // Access check.
@@ -40,7 +39,7 @@ if (!ttAccessAllowed('manage_roles')) {
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_description = trim($request->getParameter('description'));
-  $cl_rank = (int) $request->getParameter('rank');
+  $cl_rank = (int)$request->getParameter('rank');
 }
 
 $form = new Form('roleForm');
@@ -56,13 +55,16 @@ if ($request->isPost()) {
   // Validate user input.
   if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+  if ($cl_rank >= $user->rank || $cl_rank < 0) $err->add($i18n->get('error.field'), $i18n->get('form.roles.rank'));
+  if ($err->no() && ttRoleHelper::getRoleByName($cl_name)) $err->add($i18n->get('error.object_exists'));
 
   if ($err->no()) {
-    $existing_role = ttRoleHelper::getRoleByRank($cl_rank, $user->team_id);
+    $existing_role = ttRoleHelper::getRoleByRank($cl_rank, $user->group_id);
     if (!$existing_role) {
         // Insert a role with default user rights.
         if (ttRoleHelper::insert(array(
-          'team_id' => $user->team_id,
+          'group_id' => $user->group_id,
+          'org_id' => $user->org_id,
           'name' => $cl_name,
           'rank' => $cl_rank,
           'description' => $cl_description,