X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=project_add.php;h=fe46a6bd4c2de9426c9c4845a956087ee79f97c2;hb=a46ca9f2c279305fc8a6c7456e23f4ef46fd6fe4;hp=97ccd434052babd0671ffc2abba245b51b3fb89a;hpb=5ef582473f6b329be18ad83c61e053fdcd9c6ed5;p=timetracker.git diff --git a/project_add.php b/project_add.php index 97ccd434..fe46a6bd 100644 --- a/project_add.php +++ b/project_add.php @@ -32,7 +32,7 @@ import('ttProjectHelper'); import('ttTeamHelper'); // Access check. -if (!ttAccessCheck(right_manage_team)) { +if (!ttAccessCheck(right_manage_team) || (MODE_PROJECTS != $user->tracking_mode && MODE_PROJECTS_AND_TASKS != $user->tracking_mode)) { header('Location: access_denied.php'); exit(); } @@ -45,7 +45,7 @@ $tasks = ttTeamHelper::getActiveTasks($user->team_id); foreach ($tasks as $task_item) $all_tasks[$task_item['id']] = $task_item['name']; -if ($request->getMethod() == 'POST') { +if ($request->isPost()) { $cl_name = trim($request->getParameter('project_name')); $cl_description = trim($request->getParameter('description')); $cl_users = $request->getParameter('users', array()); @@ -65,13 +65,13 @@ if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks)); $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey('button.add'))); -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 ($errors->isEmpty()) { - if (!ttProjectHelper::getProjectByName($cl_name)) { + if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name')); + if (!ttValidString($cl_description, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.description')); + + if ($err->no()) { + if (!ttProjectHelper::getProjectByName($cl_name)) { if (ttProjectHelper::insert(array( 'team_id' => $user->team_id, 'name' => $cl_name, @@ -82,11 +82,11 @@ if ($request->getMethod() == 'POST') { header('Location: projects.php'); exit(); } else - $errors->add($i18n->getKey('error.db')); + $err->add($i18n->getKey('error.db')); } else - $errors->add($i18n->getKey('error.project_exists')); + $err->add($i18n->getKey('error.project_exists')); } -} // post +} // isPost $smarty->assign('forms', array($form->getName()=>$form->toArray())); $smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');