X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=task_edit.php;h=e6381731380495b1adbe50757c3cac5d4bcab36d;hb=d6a5ffec0f76b9ab5b1ee4f8e69ecdb2afd7c0ff;hp=549a74f5a1032866c29e5bd7a3de01e3291b0f2b;hpb=0422997f99a43220229bb0fae82ce64c6bfcd7a2;p=timetracker.git

diff --git a/task_edit.php b/task_edit.php
index 549a74f5..e6381731 100644
--- a/task_edit.php
+++ b/task_edit.php
@@ -31,26 +31,34 @@ import('form.Form');
 import('ttTeamHelper');
 import('ttTaskHelper');
 
-// Access check.
-if (!ttAccessCheck(right_manage_team)) {
+// Access checks.
+if (!ttAccessAllowed('manage_tasks')) {
   header('Location: access_denied.php');
   exit();
 }
-
+if (MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 $cl_task_id = (int)$request->getParameter('id');
-$projects = ttTeamHelper::getActiveProjects($user->team_id);
+$task = ttTaskHelper::get($cl_task_id);
+if (!$task) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
-if ($request->getMethod() == 'POST') {
+$projects = ttTeamHelper::getActiveProjects($user->group_id);
+
+if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_description = trim($request->getParameter('description'));
   $cl_status = $request->getParameter('status');
   $cl_projects = $request->getParameter('projects');
 } else {
-  $task = ttTaskHelper::getTask($cl_task_id);
   $cl_name = $task['name'];
   $cl_description = $task['description'];
   $cl_status = $task['status'];
-
   $assigned_projects = ttTaskHelper::getAssignedProjects($cl_task_id);
   foreach ($assigned_projects as $project_item)
     $cl_projects[] = $project_item['id'];
@@ -61,17 +69,17 @@ $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_task_id));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
-  'data'=>array(ACTIVE=>$i18n->getKey('dropdown.status_active'),INACTIVE=>$i18n->getKey('dropdown.status_inactive'))));
+  'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','layout'=>'H','data'=>$projects,'datakeys'=>array('id','name'),'value'=>$cl_projects));
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->getKey('button.copy')));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
 
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
-  if (!ttValidString($cl_description, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.description'));
+  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 ($errors->isEmpty()) {
+  if ($err->no()) {
     if ($request->getParameter('btn_save')) {
       $existing_task = ttTaskHelper::getTaskByName($cl_name);
       if (!$existing_task || ($cl_task_id == $existing_task['id'])) {
@@ -85,15 +93,16 @@ if ($request->getMethod() == 'POST') {
           header('Location: tasks.php');
           exit();
         } else
-          $errors->add($i18n->getKey('error.db'));
+          $err->add($i18n->get('error.db'));
       } else
-        $errors->add($i18n->getKey('error.task_exists'));
+        $err->add($i18n->get('error.task_exists'));
     }
 
     if ($request->getParameter('btn_copy')) {
       if (!ttTaskHelper::getTaskByName($cl_name)) {
         if (ttTaskHelper::insert(array(
-          'team_id' => $user->team_id,
+          'group_id' => $user->getActiveGroup(),
+          'org_id' => $user->org_id,
           'name' => $cl_name,
           'description' => $cl_description,
           'status' => $cl_status,
@@ -101,14 +110,14 @@ if ($request->getMethod() == 'POST') {
           header('Location: tasks.php');
           exit();
         } else
-          $errors->add($i18n->getKey('error.db'));
+          $err->add($i18n->get('error.db'));
       } else
-        $errors->add($i18n->getKey('error.task_exists'));
+        $err->add($i18n->get('error.task_exists'));
     }
   }
-} // POST
+} // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.edit_task'));
+$smarty->assign('title', $i18n->get('title.edit_task'));
 $smarty->assign('content_page_name', 'task_edit.tpl');
 $smarty->display('index.tpl');