Soem refactoring to keep things a bit more consistent.

[timetracker.git] / cf_custom_field_delete.php

diff --git a/cf_custom_field_delete.php b/cf_custom_field_delete.php
index 6f42e31..88779be 100644 (file)
--- a/cf_custom_field_delete.php
+++ b/cf_custom_field_delete.php
@@ -31,7 +31,7 @@ require_once('plugins/CustomFields.class.php');
 import('form.Form');
 
 // Access check.
-if (!ttAccessCheck(right_manage_team)) {
+if (!ttAccessCheck(right_manage_team) || !$user->isPluginEnabled('cf')) {
   header('Location: access_denied.php');
   exit();
 }
@@ -40,38 +40,36 @@ $id = $request->getParameter('id');
 
 $form = new Form('fieldDeleteForm');
 
-if ($request->getMethod() == 'POST') {
-  if ($request->getParameter('btn_delete'))  {
-       // Delete button pressed.
-       $res = CustomFields::deleteField($id);
+if ($request->isPost()) {
+  if ($request->getParameter('btn_delete')) {
+    // Delete button pressed.
+    $res = CustomFields::deleteField($id);
     if ($res) {
       header('Location: cf_custom_fields.php');
       exit();
-    } else {
-      $errors->add($i18n->getKey('error.db'));
-    }
+    } else
+      $err->add($i18n->getKey('error.db'));
   }
   if ($request->getParameter('btn_cancel')) {
-       // Cancel button pressed.
-       header('Location: cf_custom_fields.php');
-       exit();
+    // Cancel button pressed.
+    header('Location: cf_custom_fields.php');
+    exit();
   }
 } else {
   $field = CustomFields::getField($id);        
   if (false === $field)
-    $errors->add($i18n->getKey('error.db'));
+    $err->add($i18n->getKey('error.db'));
 
-  if ($errors->isEmpty()) {
+  if ($err->no()) {
     $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$id));
     $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')));
   }
 }
-       
+
 $smarty->assign('field', $field['label']);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.fieldDeleteForm.btn_cancel.focus()"');
 $smarty->assign('title', $i18n->getKey('title.cf_delete_custom_field'));
 $smarty->assign('content_page_name', 'cf_custom_field_delete.tpl');
 $smarty->display('index.tpl');
-?>
\ No newline at end of file