Added validation of checkbox group input on project config.

[timetracker.git] / project_edit.php

diff --git a/project_edit.php b/project_edit.php
index d30782ab540c1a0f4d81157f6d6790dcb43c28c7..106e657bc3b6df6baea4f0421754ff37c3b22a13 100644 (file)
--- a/project_edit.php
+++ b/project_edit.php
@@ -29,25 +29,30 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttProjectHelper');
 require_once('initialize.php');
 import('form.Form');
 import('ttProjectHelper');

-import('ttTeamHelper');
+import('ttGroupHelper');

 
 // Access checks.
 if (!ttAccessAllowed('manage_projects')) {
   header('Location: access_denied.php');
   exit();
 }
 
 // Access checks.
 if (!ttAccessAllowed('manage_projects')) {
   header('Location: access_denied.php');
   exit();
 }

-if (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode) {
+if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {

   header('Location: feature_disabled.php');
   exit();
 }
   header('Location: feature_disabled.php');
   exit();
 }

-

 $cl_project_id = (int)$request->getParameter('id');
 $cl_project_id = (int)$request->getParameter('id');

+$project = ttProjectHelper::get($cl_project_id);
+if (!$project) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.

 
 

-$users = ttTeamHelper::getActiveUsers();
+$users = ttGroupHelper::getActiveUsers();

 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
 
 foreach ($users as $user_item)
   $all_users[$user_item['id']] = $user_item['name'];
 

-$tasks = ttTeamHelper::getActiveTasks($user->team_id);
+$tasks = ttGroupHelper::getActiveTasks();

 foreach ($tasks as $task_item)
   $all_tasks[$task_item['id']] = $task_item['name'];
 
 foreach ($tasks as $task_item)
   $all_tasks[$task_item['id']] = $task_item['name'];
 


@@ -58,7 +63,6 @@ if ($request->isPost()) {
   $cl_users = $request->getParameter('users', array());
   $cl_tasks = $request->getParameter('tasks', array());
 } else {
   $cl_users = $request->getParameter('users', array());
   $cl_tasks = $request->getParameter('tasks', array());
 } else {

-  $project = ttProjectHelper::get($cl_project_id);

   $cl_name = $project['name'];
   $cl_description = $project['description'];
   $cl_status = $project['status'];
   $cl_name = $project['name'];
   $cl_description = $project['description'];
   $cl_status = $project['status'];


@@ -81,7 +85,7 @@ $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width:
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));

-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if (MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())

   $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
 $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')));
   $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
 $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')));


@@ -90,6 +94,8 @@ 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'));
   // 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 (!ttGroupHelper::validateCheckboxGroupInput($cl_users, 'tt_users')) $err->add($i18n->get('error.field'), $i18n->get('label.users'));
+  if (!ttGroupHelper::validateCheckboxGroupInput($cl_tasks, 'tt_tasks')) $err->add($i18n->get('error.field'), $i18n->get('label.tasks'));

 
   if ($err->no()) {
     if ($request->getParameter('btn_save')) {
 
   if ($err->no()) {
     if ($request->getParameter('btn_save')) {


@@ -108,14 +114,12 @@ if ($request->isPost()) {
         } else
            $err->add($i18n->get('error.db'));
       } else
         } else
            $err->add($i18n->get('error.db'));
       } else

-        $err->add($i18n->get('error.project_exists'));
+        $err->add($i18n->get('error.object_exists'));

     }
 
     if ($request->getParameter('btn_copy')) {
       if (!ttProjectHelper::getProjectByName($cl_name)) {
     }
 
     if ($request->getParameter('btn_copy')) {
       if (!ttProjectHelper::getProjectByName($cl_name)) {

-        if (ttProjectHelper::insert(array(
-          'team_id' => $user->team_id,
-          'name' => $cl_name,
+        if (ttProjectHelper::insert(array('name' => $cl_name,

           'description' => $cl_description,
           'users' => $cl_users,
           'tasks' => $cl_tasks,
           'description' => $cl_description,
           'users' => $cl_users,
           'tasks' => $cl_tasks,


@@ -125,12 +129,14 @@ if ($request->isPost()) {
         } else
           $err->add($i18n->get('error.db'));
       } else
         } else
           $err->add($i18n->get('error.db'));
       } else

-        $err->add($i18n->get('error.project_exists'));
+        $err->add($i18n->get('error.object_exists'));

     }
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
     }
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));

+$smarty->assign('show_users', count($users) > 0);
+$smarty->assign('show_tasks', count($tasks) > 0);

 $smarty->assign('onload', 'onLoad="document.projectForm.name.focus()"');
 $smarty->assign('title', $i18n->get('title.edit_project'));
 $smarty->assign('content_page_name', 'project_edit.tpl');
 $smarty->assign('onload', 'onLoad="document.projectForm.name.focus()"');
 $smarty->assign('title', $i18n->get('title.edit_project'));
 $smarty->assign('content_page_name', 'project_edit.tpl');