Added validation of checkbox group input on project config.

[timetracker.git] / mobile / project_add.php

diff --git a/mobile/project_add.php b/mobile/project_add.php
index 3b1d0fb0d1720724f0e2f91701849051380d2749..6f6f452d4ab34727fe7b6b5b1d4a653578810856 100644 (file)
--- a/mobile/project_add.php
+++ b/mobile/project_add.php
@@ -29,7 +29,7 @@
 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')) {
 
 // Access checks.
 if (!ttAccessAllowed('manage_projects')) {


@@ -42,11 +42,11 @@ if (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->t
 }
 // End of access checks.
 
 }
 // 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->group_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'];
 


@@ -74,13 +74,12 @@ 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 (!ttProjectHelper::getProjectByName($cl_name)) {
 
   if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {

-      if (ttProjectHelper::insert(array(
-        'group_id' => $user->getActiveGroup(),
-        'org_id' => $user->org_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,