X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=client_add.php;h=275a65eef1ee417d3762ad46f00f4f375dc28bb8;hb=2a998c95dd9e86a9ad57939b056b62cab7402b08;hp=503b94031697add322e0a6dcd72242247dd1a8d0;hpb=098a79f0819ebb89b7d48df4a6b154af4560f68e;p=timetracker.git

diff --git a/client_add.php b/client_add.php
index 503b9403..275a65ee 100644
--- a/client_add.php
+++ b/client_add.php
@@ -39,7 +39,7 @@ if (!ttAccessCheck(right_manage_team)) {
 
 $projects = ttTeamHelper::getActiveProjects($user->team_id);
 
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_address = trim($request->getParameter('address'));
   $cl_tax = $request->getParameter('tax');
@@ -47,23 +47,24 @@ if ($request->getMethod() == 'POST') {
 } else {
   // Do not assign all projects to a new client by default. This should help to reduce clutter.
   // foreach ($projects as $project_item)
-  //    $cl_projects[] = $project_item['id'];
+  //   $cl_projects[] = $project_item['id'];
 }
 
 $form = new Form('clientForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 350px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','style'=>'width: 350px;','cols'=>'55','rows'=>'5','value'=>$cl_address));
 $form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
-$form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'layout'=>'H','datakeys'=>array('id','name'),'value'=>$cl_projects));
+if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+  $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'layout'=>'H','datakeys'=>array('id','name'),'value'=>$cl_projects));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','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.client_name'));
-  if (!ttValidString($cl_address, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.client_address'));
-  if (!ttValidFloat($cl_tax, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.tax'));
+  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.client_name'));
+  if (!ttValidString($cl_address, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.client_address'));
+  if (!ttValidFloat($cl_tax, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.tax'));
 
-  if ($errors->isEmpty()) {
+  if ($err->no()) {
     if (!ttClientHelper::getClientByName($cl_name)) {
       if (ttClientHelper::insert(array(
         'team_id' => $user->team_id,
@@ -75,15 +76,14 @@ if ($request->getMethod() == 'POST') {
         header('Location: clients.php');
         exit();
       } else
-        $errors->add($i18n->getKey('error.db'));	
+        $err->add($i18n->getKey('error.db'));
      } else
-       $errors->add($i18n->getKey('error.client_exists'));
+       $err->add($i18n->getKey('error.client_exists'));
   }
-} // post
-	
+} // isPost
+
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.clientForm.name.focus()"');
 $smarty->assign('title', $i18n->getKey('title.add_client'));
 $smarty->assign('content_page_name', 'client_add.tpl');
 $smarty->display('index.tpl');
-?>
\ No newline at end of file