X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=role_delete.php;h=a3ce2985d3337df148df40fe54d1b2234276ff6c;hb=HEAD;hp=4198ec60edc7af96fc398297903b3c6fadf09479;hpb=1c40fb09e97ff643c80e9b96106d891e6fdbde1b;p=timetracker.git

diff --git a/role_delete.php b/role_delete.php
index 4198ec60..a3ce2985 100644
--- a/role_delete.php
+++ b/role_delete.php
@@ -31,19 +31,24 @@ import('ttRoleHelper');
 import('form.Form');
 
 // Access check.
-if (!ttAccessCheck(right_manage_team)) {
+if (!ttAccessAllowed('manage_roles')) {
   header('Location: access_denied.php');
   exit();
 }
-
 $cl_role_id = (int)$request->getParameter('id');
 $role = ttRoleHelper::get($cl_role_id);
+if (!$role) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
 $role_to_delete = $role['name'];
 
 $form = new Form('roleDeleteForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_role_id));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
@@ -52,9 +57,9 @@ if ($request->isPost()) {
         header('Location: roles.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     } else
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
   } elseif ($request->getParameter('btn_cancel')) {
     header('Location: roles.php');
     exit();
@@ -64,6 +69,6 @@ if ($request->isPost()) {
 $smarty->assign('role_to_delete', $role_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.taskDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->getKey('title.delete_role'));
+$smarty->assign('title', $i18n->get('title.delete_role'));
 $smarty->assign('content_page_name', 'role_delete.tpl');
 $smarty->display('index.tpl');