posaune

[timetracker.git] / notification_add.php

diff --git a/notification_add.php b/notification_add.php
index f122111..05a0954 100644 (file)
--- a/notification_add.php
+++ b/notification_add.php
@@ -47,17 +47,15 @@ if (!$user->exists()) {
   exit();
 }
 if ($request->isPost()) {
-  // TODO: improve this, perhaps by refactoring elsewhere.
-  $cl_fav_report = (int) $request->getParameter('fav_report');
-  $fav_report = ttFavReportHelper::getReport($cl_fav_report);
-  if ($user->getUser() != $fav_report['user_id']) {
+  $cl_fav_report_id = (int) $request->getParameter('fav_report');
+  if (!ttFavReportHelper::get($cl_fav_report_id)) {
     header('Location: access_denied.php'); // Invalid fav report id in post.
     exit();
   }
 }
 // End of access checks.
 
-$fav_reports = ttFavReportHelper::getReports($user->getUser());
+$fav_reports = ttFavReportHelper::getReports();
 
 if ($request->isPost()) {
   $cl_cron_spec = trim($request->getParameter('cron_spec'));
@@ -73,7 +71,7 @@ $form = new Form('notificationForm');
 $form->addInput(array('type'=>'combobox',
   'name'=>'fav_report',
   'style'=>'width: 250px;',
-  'value'=>$cl_fav_report,
+  'value'=>$cl_fav_report_id,
   'data'=>$fav_reports,
   'datakeys'=>array('id','name'),
   'empty'=>array(''=>$i18n->get('dropdown.select'))
@@ -87,7 +85,7 @@ $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('bu
 
 if ($request->isPost()) {
   // Validate user input.
-  if (!$cl_fav_report) $err->add($i18n->get('error.report'));
+  if (!$cl_fav_report_id) $err->add($i18n->get('error.report'));
   if (!ttValidCronSpec($cl_cron_spec)) $err->add($i18n->get('error.field'), $i18n->get('label.schedule'));
   if (!ttValidEmail($cl_email)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
   if (!ttValidEmail($cl_cc, true)) $err->add($i18n->get('error.field'), $i18n->get('label.cc'));
@@ -101,7 +99,7 @@ if ($request->isPost()) {
     if (ttNotificationHelper::insert(array(
         'cron_spec' => $cl_cron_spec,
         'next' => $next,
-        'report_id' => $cl_fav_report,
+        'report_id' => $cl_fav_report_id,
         'email' => $cl_email,
         'cc' => $cl_cc,
         'subject' => $cl_subject,