X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=client_delete.php;h=a5f00656e592e67cb6fe614f98dc701d8d209873;hb=96e8b431e4b1dadd919b831e4ae184d29ebf1235;hp=e566455a86de0669633ae99d936bdb539eddc1d0;hpb=a7ba11adfecf6cb906749efe5abce688363aef07;p=timetracker.git

diff --git a/client_delete.php b/client_delete.php
index e566455a..a5f00656 100644
--- a/client_delete.php
+++ b/client_delete.php
@@ -30,44 +30,49 @@ require_once('initialize.php');
 import('form.Form');
 import('ttClientHelper');
 
-// 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();
+}
 $id = (int)$request->getParameter('id');
 $client = ttClientHelper::getClient($id);
+if (!$client) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
 $client_to_delete = $client['name'];
 
 $form = new Form('clientDeleteForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$id));
 $form->addInput(array('type'=>'combobox','name'=>'delete_client_entries',
-  'data'=>array('0'=>$i18n->getKey('dropdown.do_not_delete'),'1'=>$i18n->getKey('dropdown.delete'))));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
+  'data'=>array('0'=>$i18n->get('dropdown.do_not_delete'),'1'=>$i18n->get('dropdown.delete'))));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));
 
 if ($request->isPost()) {
-  if(ttClientHelper::getClient($id)) {
-    if ($request->getParameter('btn_delete')) {
-      if (ttClientHelper::delete($id, $request->getParameter('delete_client_entries'))) {
-        header('Location: clients.php');
-        exit();
-      } else
-        $errors->add($i18n->getKey('error.db'));
-    }
-  } else 
-      $errors->add($i18n->getKey('error.db'));
+  if ($request->getParameter('btn_delete')) {
+    if (ttClientHelper::delete($id, $request->getParameter('delete_client_entries'))) {
+      header('Location: clients.php');
+      exit();
+    } else
+      $err->add($i18n->get('error.db'));
+  }
 
   if ($request->getParameter('btn_cancel')) {
     header('Location: clients.php');
     exit();
   }
-} // POST
+} // isPost
 
 $smarty->assign('client_to_delete', $client_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.delete_client'));
+$smarty->assign('title', $i18n->get('title.delete_client'));
 $smarty->assign('content_page_name', 'client_delete.tpl');
 $smarty->display('index.tpl');