X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=task_delete.php;h=3cdb5b691c7f8a657b69d948dc791d56b20f6cf1;hb=ecf7d911c95935f8cfb2403f645cd12f93d8c3f5;hp=3329264b4746431d100a78f6170f140110750834;hpb=098a79f0819ebb89b7d48df4a6b154af4560f68e;p=timetracker.git

diff --git a/task_delete.php b/task_delete.php
index 3329264b..3cdb5b69 100644
--- a/task_delete.php
+++ b/task_delete.php
@@ -31,13 +31,13 @@ import('ttTaskHelper');
 import('form.Form');
 
 // Access check.
-if (!ttAccessCheck(right_manage_team)) {
+if (!ttAccessAllowed('manage_tasks') || MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
   header('Location: access_denied.php');
   exit();
 }
 
 $cl_task_id = (int)$request->getParameter('id');
-$task = ttTaskHelper::getTask($cl_task_id);
+$task = ttTaskHelper::get($cl_task_id);
 $task_to_delete = $task['name'];
 
 $form = new Form('taskDeleteForm');
@@ -45,21 +45,21 @@ $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_task_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')));
 
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
   if ($request->getParameter('btn_delete')) {
-    if(ttTaskHelper::getTask($cl_task_id)) {
+    if(ttTaskHelper::get($cl_task_id)) {
       if (ttTaskHelper::delete($cl_task_id)) {
         header('Location: tasks.php');
         exit();
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
     } else
-      $errors->add($i18n->getKey('error.db'));
-  } else if ($request->getParameter('btn_cancel')) {
+      $err->add($i18n->getKey('error.db'));
+  } elseif ($request->getParameter('btn_cancel')) {
     header('Location: tasks.php');
     exit();
   }
-} // post
+} // isPost
 
 $smarty->assign('task_to_delete', $task_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
@@ -67,4 +67,3 @@ $smarty->assign('onload', 'onLoad="document.taskDeleteForm.btn_cancel.focus()"')
 $smarty->assign('title', $i18n->getKey('title.delete_task'));
 $smarty->assign('content_page_name', 'task_delete.tpl');
 $smarty->display('index.tpl');
-?>
\ No newline at end of file