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

diff --git a/client_add.php b/client_add.php
index 503b9403..820a32fd 100644
--- a/client_add.php
+++ b/client_add.php
@@ -29,17 +29,21 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttClientHelper');
-import('ttTeamHelper');
+import('ttGroupHelper');
 
-// Access check.
-if (!ttAccessCheck(right_manage_team)) {
+// Access checks.
+if (!ttAccessAllowed('manage_clients')) {
   header('Location: access_denied.php');
   exit();
 }
+if (!$user->isPluginEnabled('cl')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 
-$projects = ttTeamHelper::getActiveProjects($user->team_id);
+$projects = ttGroupHelper::getActiveProjects();
 
-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,27 +51,28 @@ 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'];
 }
 
+$show_projects = (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && count($projects) > 0;
+
 $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'=>'textarea','name'=>'address','maxlength'=>'255','style'=>'width: 350px; height: 80px;','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));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.add')));
-	
-if ($request->getMethod() == 'POST') {
+if ($show_projects)
+  $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->get('button.add')));
+
+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->get('error.field'), $i18n->get('label.client_name'));
+  if (!ttValidString($cl_address, true)) $err->add($i18n->get('error.field'), $i18n->get('label.client_address'));
+  if (!ttValidFloat($cl_tax, true)) $err->add($i18n->get('error.field'), $i18n->get('label.tax'));
 
-  if ($errors->isEmpty()) {
+  if ($err->no()) {
     if (!ttClientHelper::getClientByName($cl_name)) {
-      if (ttClientHelper::insert(array(
-        'team_id' => $user->team_id,
-        'name' => $cl_name,
+      if (ttClientHelper::insert(array('name' => $cl_name,
         'address' => $cl_address,
         'tax' => $cl_tax,
         'projects' => $cl_projects,
@@ -75,15 +80,15 @@ if ($request->getMethod() == 'POST') {
         header('Location: clients.php');
         exit();
       } else
-        $errors->add($i18n->getKey('error.db'));	
+        $err->add($i18n->get('error.db'));
      } else
-       $errors->add($i18n->getKey('error.client_exists'));
+       $err->add($i18n->get('error.object_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('show_projects', $show_projects);
+$smarty->assign('title', $i18n->get('title.add_client'));
 $smarty->assign('content_page_name', 'client_add.tpl');
 $smarty->display('index.tpl');
-?>
\ No newline at end of file