A bit more progress on refactoring access checks.

[timetracker.git] / mobile / expense_delete.php

diff --git a/mobile/expense_delete.php b/mobile/expense_delete.php
index 38800b6..48051b4 100644 (file)
--- a/mobile/expense_delete.php
+++ b/mobile/expense_delete.php
@@ -26,13 +26,13 @@
 // | https://www.anuko.com/time_tracker/credits.htm
 // +----------------------------------------------------------------------+
 
-require_once('initialize.php');
+require_once('../initialize.php');
 import('form.Form');
 import('DateAndTime');
 import('ttExpenseHelper');
 
 // Access check.
-if (!ttAccessCheck(right_data_entry)) {
+if (!ttAccessAllowed('track_own_expenses') || !$user->isPluginEnabled('ex')) {
   header('Location: access_denied.php');
   exit();
 }
@@ -41,7 +41,7 @@ $cl_id = $request->getParameter('id');
 $expense_item = ttExpenseHelper::getItem($cl_id, $user->getActiveUser());
 
 // Prohibit deleting invoiced records.
-if ($expense_item['invoice_id']) die($i18n->getKey('error.sys'));
+if ($expense_item['invoice_id']) die($i18n->get('error.sys'));
 
 if ($request->isPost()) {
   if ($request->getParameter('delete_button')) { // Delete button pressed.
@@ -49,7 +49,7 @@ if ($request->isPost()) {
     // Determine if it is okay to delete the record.
     $item_date = new DateAndTime(DB_DATEFORMAT, $expense_item['date']);
     if ($user->isDateLocked($item_date))
-      $err->add($i18n->getKey('error.range_locked'));
+      $err->add($i18n->get('error.range_locked'));
 
     if ($err->no()) {
       // Mark the record as deleted.
@@ -57,7 +57,7 @@ if ($request->isPost()) {
         header('Location: expenses.php');
         exit();
       } else
-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));
     }
   }
   if ($request->getParameter('cancel_button')) { // Cancel button pressed.
@@ -68,11 +68,11 @@ if ($request->isPost()) {
 
 $form = new Form('expenseItemForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
-$form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->getKey('label.delete')));
-$form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->getKey('button.cancel')));
+$form->addInput(array('type'=>'submit','name'=>'delete_button','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'cancel_button','value'=>$i18n->get('button.cancel')));
 
 $smarty->assign('expense_item', $expense_item);
 $smarty->assign('forms', array($form->getName() => $form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.delete_expense'));
-$smarty->assign('content_page_name', 'expense_delete.tpl');
-$smarty->display('index.tpl');
+$smarty->assign('title', $i18n->get('title.delete_expense'));
+$smarty->assign('content_page_name', 'mobile/expense_delete.tpl');
+$smarty->display('mobile/index.tpl');