X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=cf_dropdown_option_delete.php;h=999094e53d71ee108bb277c74028190785c92d8c;hb=75a1eedb8977b8f2db459128bab9aaf367e3b58b;hp=8adb43aa9af7b43da96fbefaaafb8028e5b448a7;hpb=5ef582473f6b329be18ad83c61e053fdcd9c6ed5;p=timetracker.git

diff --git a/cf_dropdown_option_delete.php b/cf_dropdown_option_delete.php
index 8adb43aa..999094e5 100644
--- a/cf_dropdown_option_delete.php
+++ b/cf_dropdown_option_delete.php
@@ -30,49 +30,52 @@ require_once('initialize.php');
 require_once('plugins/CustomFields.class.php');
 import('form.Form');
 
-// Access check.
-if (!ttAccessCheck(right_manage_team)) {
+// 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->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->get('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);	
-  if (false === $option)
-    $errors->add($i18n->getKey('error.db'));
-
-  if ($errors->isEmpty()) {
-    $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')));
-  }
+  $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);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.optionDeleteForm.btn_cancel.focus()"');
-$smarty->assign('title', $i18n->getKey('title.cf_delete_dropdown_option'));
+$smarty->assign('title', $i18n->get('title.cf_delete_dropdown_option'));
 $smarty->assign('content_page_name', 'cf_dropdown_option_delete.tpl');
 $smarty->display('index.tpl');