A few bugs fixed related to role revamp.

[timetracker.git] / cf_dropdown_option_add.php

diff --git a/cf_dropdown_option_add.php b/cf_dropdown_option_add.php
index d13c33b..f87003d 100644 (file)
--- a/cf_dropdown_option_add.php
+++ b/cf_dropdown_option_add.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,35 +39,33 @@ if (!ttAccessCheck(right_manage_team)) {
 $cl_field_id = $request->getParameter('field_id');
 $field = CustomFields::getField($cl_field_id);
 if (false === $field)
-  $errors->add($i18n->getKey('error.db'));
-    
+  $err->add($i18n->getKey('error.db'));
+
 $form = new Form('optionAddForm');
-if ($errors->isEmpty()) {
+if ($err->no()) {
   $form->addInput(array('type'=>'hidden','name'=>'field_id','value'=>$cl_field_id));
   $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>''));
   $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey('button.add')));
 }
-  
-if ($request->getMethod() == 'POST') {
+
+if ($request->isPost()) {
   $cl_option_name = trim($request->getParameter('name'));
-  
+
   // Validate user input.
-  if (!ttValidString($cl_option_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
-         
-  if ($errors->isEmpty()) {
-       $res = CustomFields::insertOption($cl_field_id, $cl_option_name);
+  if (!ttValidString($cl_option_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.thing_name'));
+
+  if ($err->no()) {
+    $res = CustomFields::insertOption($cl_field_id, $cl_option_name);
     if ($res) {
       header("Location: cf_dropdown_options.php?field_id=$cl_field_id");
       exit();
-    } else {
-      $errors->add($i18n->getKey('error.db'));
-    }
+    } else
+      $err->add($i18n->getKey('error.db'));
   }
-}
+} // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.optionAddForm.name.focus()"');
 $smarty->assign('title', $i18n->getKey('title.cf_add_dropdown_option'));
 $smarty->assign('content_page_name', 'cf_dropdown_option_add.tpl');
 $smarty->display('index.tpl');
-?>
\ No newline at end of file