A bit of refactoring in user_add.php.

[timetracker.git] / notification_delete.php

diff --git a/notification_delete.php b/notification_delete.php
index 62f11ef8e7e9a5c06d85f6439b85e22ebfde0294..c1f0785e2473246714cb6f91bd2508197cdb1e22 100644 (file)
--- a/notification_delete.php
+++ b/notification_delete.php
@@ -30,41 +30,50 @@ require_once('initialize.php');
 import('form.Form');
 import('ttNotificationHelper');
 
 import('form.Form');
 import('ttNotificationHelper');
 

-// Access check.
-if (!ttAccessCheck(right_manage_team)) {
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {

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

-
+if (!$user->isPluginEnabled('no')) {
+  header('Location: feature_disabled.php');
+  exit();
+}
+if (!$user->exists()) {
+  header('Location: access_denied.php'); // No users in subgroup.
+  exit();
+}

 $cl_notification_id = (int)$request->getParameter('id');
 $notification = ttNotificationHelper::get($cl_notification_id);
 $cl_notification_id = (int)$request->getParameter('id');
 $notification = ttNotificationHelper::get($cl_notification_id);

+if (!$notification) {
+  header('Location: access_denied.php'); // Wrong notification id.
+  exit();
+}
+// End of access checks.
+

 $notification_to_delete = $notification['name'];
 
 $form = new Form('notificationDeleteForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_notification_id));
 $notification_to_delete = $notification['name'];
 
 $form = new Form('notificationDeleteForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_notification_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'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete')));
+$form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->get('button.cancel')));

 
 

-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {

   if ($request->getParameter('btn_delete')) {
   if ($request->getParameter('btn_delete')) {

-       if(ttNotificationHelper::get($cl_notification_id)) {
-      if (ttNotificationHelper::delete($cl_notification_id)) {
-        header('Location: notifications.php');
-        exit();
-      } else
-        $errors->add($i18n->getKey('error.db'));
+    if (ttNotificationHelper::delete($cl_notification_id)) {
+      header('Location: notifications.php');
+      exit();

     } else
     } else

-      $errors->add($i18n->getKey('error.db'));
-  } else if ($request->getParameter('btn_cancel')) {
-       header('Location: notifications.php');
-       exit();
+      $err->add($i18n->get('error.db'));
+  } elseif ($request->getParameter('btn_cancel')) {
+    header('Location: notifications.php');
+    exit();

   }
   }

-} // post
-       
+} // isPost
+

 $smarty->assign('notification_to_delete', $notification_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.notificationDeleteForm.btn_cancel.focus()"');
 $smarty->assign('notification_to_delete', $notification_to_delete);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.notificationDeleteForm.btn_cancel.focus()"');

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

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

-?>
\ No newline at end of file