A bit more progress on getting rid of canManageTeam.

[timetracker.git] / cf_dropdown_option_delete.php

diff --git a/cf_dropdown_option_delete.php b/cf_dropdown_option_delete.php
index 8adb43a..f4e4420 100644 (file)
--- a/cf_dropdown_option_delete.php
+++ b/cf_dropdown_option_delete.php
@@ -31,7 +31,7 @@ require_once('plugins/CustomFields.class.php');
 import('form.Form');
 
 // Access check.
-if (!ttAccessCheck(right_manage_team)) {
+if (!ttAccessAllowed('manage_custom_fields') || !$user->isPluginEnabled('cf')) {
   header('Location: access_denied.php');
   exit();
 }
@@ -39,37 +39,36 @@ if (!ttAccessCheck(right_manage_team)) {
 $cl_id = $request->getParameter('id');
 $form = new Form('optionDeleteForm');
 
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
 
   // Determine field id for redirect.
   $field_id = CustomFields::getFieldIdForOption($cl_id);
   if ($request->getParameter('btn_delete'))  {
-       // Delete button pressed.
-       $res = CustomFields::deleteOption($cl_id);
+    // Delete button pressed.
+    $res = CustomFields::deleteOption($cl_id);
     if ($res) {
       header("Location: cf_dropdown_options.php?field_id=$field_id");
       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_dropdown_options.php?field_id=$field_id");
-       exit();
+    // Cancel button pressed.
+    header("Location: cf_dropdown_options.php?field_id=$field_id");
+    exit();
   }
 } else {
-  $option = CustomFields::getOptionName($cl_id);       
+  $option = CustomFields::getOptionName($cl_id);
   if (false === $option)
-    $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'=>$cl_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('option', $option);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.optionDeleteForm.btn_cancel.focus()"');