X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=client_edit.php;h=7b572ea7c93f5cf01609c012308ae9ae1e0c3e95;hb=ed41335d63e71a11d30e92f4367106e9398adf9d;hp=74062d06eaf630bb473281bcf53fd4aa90b20da2;hpb=45c855269d952873285f7a835e82fc2b3eff3971;p=timetracker.git

diff --git a/client_edit.php b/client_edit.php
index 74062d06..7b572ea7 100644
--- a/client_edit.php
+++ b/client_edit.php
@@ -30,6 +30,7 @@ require_once('initialize.php');
 import('form.Form');
 import('ttClientHelper');
 import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access checks.
 if (!ttAccessAllowed('manage_clients')) {
@@ -40,10 +41,15 @@ if (!$user->isPluginEnabled('cl')) {
   header('Location: feature_disabled.php');
   exit();
 }
+$cl_id = (int)$request->getParameter('id');
+$client = ttClientHelper::getClient($cl_id, true);
+if (!$client) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
-$cl_id = (int) $request->getParameter('id');
-
-$projects = ttTeamHelper::getActiveProjects($user->group_id);
+$projects = ttGroupHelper::getActiveProjects();
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
@@ -52,7 +58,6 @@ if ($request->isPost()) {
   $cl_status = $request->getParameter('status');
   $cl_projects = $request->getParameter('projects');
 } else {
-  $client = ttClientHelper::getClient($cl_id, true);
   $cl_name = $client['name'];
   $cl_address = $client['address'];
   $cl_tax = $client['tax'];
@@ -63,6 +68,8 @@ if ($request->isPost()) {
   }
 }
 
+$show_projects = (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && count($projects) > 0;
+
 $form = new Form('clientForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 $form->addInput(array('type'=>'text','name'=>'name','maxlength'=>'100','style'=>'width: 350px;','value'=>$cl_name));
@@ -70,7 +77,7 @@ $form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','s
 $form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if ($show_projects)
   $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'datakeys'=>array('id','name'),'layout'=>'H','value'=>$cl_projects));
 $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')));
@@ -97,14 +104,12 @@ if ($request->isPost()) {
         } else
           $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->get('error.client_exists'));
+        $err->add($i18n->get('error.object_exists'));
     }
 
     if ($request->getParameter('btn_copy')) {
       if (!ttClientHelper::getClientByName($cl_name)) {
-        if (ttClientHelper::insert(array(
-          'group_id' => $user->group_id,
-          'name' => $cl_name,
+        if (ttClientHelper::insert(array('name' => $cl_name,
           'address' => $cl_address,
           'tax' => $cl_tax,
           'status' => $cl_status,
@@ -114,12 +119,13 @@ if ($request->isPost()) {
         } else
           $err->add($i18n->get('error.db'));
       } else
-        $err->add($i18n->get('error.client_exists'));
+        $err->add($i18n->get('error.object_exists'));
     }
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_projects', $show_projects);
 $smarty->assign('title', $i18n->get('title.edit_client'));
 $smarty->assign('content_page_name', 'client_edit.tpl');
 $smarty->display('index.tpl');