X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=cf_dropdown_option_delete.php;h=999094e53d71ee108bb277c74028190785c92d8c;hb=3d6637d9e14122d6998e0be59e9138d41733d5db;hp=0a1f25ba076b13d1406a99524d78a4f3f22bdffa;hpb=a0dd058ab6007cfc6a72713215a7f4abb96f1b45;p=timetracker.git

diff --git a/cf_dropdown_option_delete.php b/cf_dropdown_option_delete.php
index 0a1f25ba..999094e5 100644
--- a/cf_dropdown_option_delete.php
+++ b/cf_dropdown_option_delete.php
@@ -30,13 +30,23 @@ require_once('initialize.php');
 require_once('plugins/CustomFields.class.php');
 import('form.Form');
 
-// Access check.
-if (!ttAccessAllowed('manage_custom_fields') || !$user->isPluginEnabled('cf')) {
+// Access checks.
+if (!ttAccessAllowed('manage_custom_fields')) {
   header('Location: access_denied.php');
   exit();
 }
-
+if (!$user->isPluginEnabled('cf')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
 $cl_id = $request->getParameter('id');
+$option = CustomFields::getOptionName($cl_id);
+if (!$option) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
 $form = new Form('optionDeleteForm');
 
 if ($request->isPost()) {
@@ -58,15 +68,9 @@ if ($request->isPost()) {
     exit();
   }
 } else {
-  $option = CustomFields::getOptionName($cl_id);
-  if (false === $option)
-    $err->add($i18n->get('error.db'));
-
-  if ($err->no()) {
-    $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-    $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')));
-  }
+  $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
+  $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')));
 }
 
 $smarty->assign('option', $option);