A bit more refactoring.

[timetracker.git] / task_delete.php

diff --git a/task_delete.php b/task_delete.php
index 3329264..ebc96e2 100644 (file)
--- a/task_delete.php
+++ b/task_delete.php
@@ -31,7 +31,7 @@ import('ttTaskHelper');
 import('form.Form');
 
 // Access check.
-if (!ttAccessCheck(right_manage_team)) {
+if (!ttAccessCheck(right_manage_team) || MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
   header('Location: access_denied.php');
   exit();
 }
@@ -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::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