Refactoring in UploadFile.class.php to simplify things.

[timetracker.git] / cf_custom_fields.php

diff --git a/cf_custom_fields.php b/cf_custom_fields.php
index 18de06059345d330fcefe564e145d510fcc7aa7d..6de626cc9cb6ee967f98d896bee1aa36b45fab13 100644 (file)
--- a/cf_custom_fields.php
+++ b/cf_custom_fields.php
@@ -30,11 +30,16 @@ require_once('initialize.php');
 require_once('plugins/CustomFields.class.php');
 import('form.Form');
 
 require_once('plugins/CustomFields.class.php');
 import('form.Form');
 

-// Access check.
-if (!ttAccessCheck(right_manage_team) || !$user->isPluginEnabled('cf')) {
+// Access checks.
+if (!ttAccessAllowed('manage_custom_fields')) {

   header('Location: access_denied.php');
   exit();
 }
   header('Location: access_denied.php');
   exit();
 }

+if (!$user->isPluginEnabled('cf')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+// End of access checks.

 
 $form = new Form('customFieldsForm');
 
 
 $form = new Form('customFieldsForm');
 


@@ -45,16 +50,16 @@ if ($request->isPost()) {
     exit();
   }
 } else {
     exit();
   }
 } else {

-  $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->getKey('button.add')));
+  $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));

 
   $fields = CustomFields::getFields();
   // At this time only one custom field is supported. Disable the Add button if we already have one or more custom fields.
   if (count($fields) > 0)
 
   $fields = CustomFields::getFields();
   // At this time only one custom field is supported. Disable the Add button if we already have one or more custom fields.
   if (count($fields) > 0)

-    $form->getElement('btn_add')->setEnable(false);
+    $form->getElement('btn_add')->setEnabled(false);

 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('custom_fields', $fields);
 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('custom_fields', $fields);

-$smarty->assign('title', $i18n->getKey('title.cf_custom_fields'));
+$smarty->assign('title', $i18n->get('title.cf_custom_fields'));

 $smarty->assign('content_page_name', 'cf_custom_fields.tpl');
 $smarty->display('index.tpl');
 $smarty->assign('content_page_name', 'cf_custom_fields.tpl');
 $smarty->display('index.tpl');