posaune

[timetracker.git] / cf_dropdown_option_edit.php

diff --git a/cf_dropdown_option_edit.php b/cf_dropdown_option_edit.php
index 1013a54..4f1103d 100644 (file)
--- a/cf_dropdown_option_edit.php
+++ b/cf_dropdown_option_edit.php
@@ -30,29 +30,35 @@ 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');
 $cl_name = CustomFields::getOptionName($cl_id);
-if (false === $cl_name)
-  $err->add($i18n->getKey('error.db'));
+if (!$cl_name) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
 
 $form = new Form('optionEditForm');
 if ($err->no()) {
   $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
   $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-  $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
+  $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 }
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
 
   // Validate user input.
-  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
 
   if ($err->no()) {
     $res = CustomFields::updateOption($cl_id, $cl_name);
@@ -62,12 +68,12 @@ if ($request->isPost()) {
       header("Location: cf_dropdown_options.php?field_id=$field_id");
       exit();
     } else
-      $err->add($i18n->getKey('error.db'));
+      $err->add($i18n->get('error.db'));
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.optionEditForm.name.focus()"');
-$smarty->assign('title', $i18n->getKey('title.cf_edit_dropdown_option'));
+$smarty->assign('title', $i18n->get('title.cf_edit_dropdown_option'));
 $smarty->assign('content_page_name', 'cf_dropdown_option_edit.tpl');
 $smarty->display('index.tpl');