Added some comments clarifying the design approach.

[timetracker.git] / notification_edit.php

diff --git a/notification_edit.php b/notification_edit.php
index f4d1d1d0ee3af507d9c1fd5c7590cf70975fcab8..69535815dd6bdf316753bb409a154c305b29a62a 100644 (file)
--- a/notification_edit.php
+++ b/notification_edit.php
@@ -33,24 +33,34 @@ import('form.Form');
 import('ttFavReportHelper');
 import('ttNotificationHelper');
 
 import('ttFavReportHelper');
 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();
+}

 
 $notification_id = (int) $request->getParameter('id');
 $fav_reports = ttFavReportHelper::getReports($user->id);
 
 
 $notification_id = (int) $request->getParameter('id');
 $fav_reports = ttFavReportHelper::getReports($user->id);
 

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

   $cl_fav_report = trim($request->getParameter('fav_report'));
   $cl_cron_spec = trim($request->getParameter('cron_spec'));
   $cl_email = trim($request->getParameter('email'));
   $cl_fav_report = trim($request->getParameter('fav_report'));
   $cl_cron_spec = trim($request->getParameter('cron_spec'));
   $cl_email = trim($request->getParameter('email'));

+  $cl_cc = trim($request->getParameter('cc'));
+  $cl_subject = trim($request->getParameter('subject'));
+  $cl_report_condition = trim($request->getParameter('report_condition'));

 } else {
   $notification = ttNotificationHelper::get($notification_id);
   $cl_fav_report = $notification['report_id'];
   $cl_cron_spec = $notification['cron_spec'];
   $cl_email = $notification['email'];
 } else {
   $notification = ttNotificationHelper::get($notification_id);
   $cl_fav_report = $notification['report_id'];
   $cl_cron_spec = $notification['cron_spec'];
   $cl_email = $notification['email'];

+  $cl_cc = $notification['cc'];
+  $cl_subject = $notification['subject'];
+  $cl_report_condition = $notification['report_condition'];

 }
 
 $form = new Form('notificationForm');
 }
 
 $form = new Form('notificationForm');


@@ -61,37 +71,46 @@ $form->addInput(array('type'=>'combobox',
   'value'=>$cl_fav_report,
   'data'=>$fav_reports,
   'datakeys'=>array('id','name'),
   'value'=>$cl_fav_report,
   'data'=>$fav_reports,
   'datakeys'=>array('id','name'),

-  'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+  'empty'=>array(''=>$i18n->get('dropdown.select'))));

 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'cron_spec','style'=>'width: 250px;','value'=>$cl_cron_spec));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','style'=>'width: 250px;','value'=>$cl_email));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'cron_spec','style'=>'width: 250px;','value'=>$cl_cron_spec));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','style'=>'width: 250px;','value'=>$cl_email));

-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.save')));
+$form->addInput(array('type'=>'text','name'=>'cc','style'=>'width: 300px;','value'=>$cl_cc));
+$form->addInput(array('type'=>'text','name'=>'subject','style'=>'width: 300px;','value'=>$cl_subject));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'report_condition','style'=>'width: 250px;','value'=>$cl_report_condition));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.save')));

 
 

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

   // Validate user input.
   // Validate user input.

-  if (!$cl_fav_report) $errors->add($i18n->getKey('error.report')); 
-  if (!ttValidCronSpec($cl_cron_spec)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.cron_schedule'));
-  if (!ttValidEmail($cl_email)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
+  if (!$cl_fav_report) $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'));
+  if (!ttValidString($cl_subject, true)) $err->add($i18n->get('error.field'), $i18n->get('label.subject'));
+  if (!ttValidCondition($cl_report_condition)) $err->add($i18n->get('error.field'), $i18n->get('label.condition'));

 
 

-  if ($errors->isEmpty()) {
+  if ($err->no()) {

     // Calculate next execution time.
     $next = tdCron::getNextOccurrence($cl_cron_spec, mktime());
 
     if (ttNotificationHelper::update(array(
         'id' => $notification_id,
     // Calculate next execution time.
     $next = tdCron::getNextOccurrence($cl_cron_spec, mktime());
 
     if (ttNotificationHelper::update(array(
         'id' => $notification_id,

-        'team_id' => $user->team_id,
+        'group_id' => $user->group_id,

         'cron_spec' => $cl_cron_spec,
         'next' => $next,
         'report_id' => $cl_fav_report,
         'email' => $cl_email,
         'cron_spec' => $cl_cron_spec,
         'next' => $next,
         'report_id' => $cl_fav_report,
         'email' => $cl_email,

+        'cc' => $cl_cc,
+        'subject' => $cl_subject,
+        'report_condition' => $cl_report_condition,

         'status' => ACTIVE))) {
         header('Location: notifications.php');
         exit();
       } else
         'status' => ACTIVE))) {
         header('Location: notifications.php');
         exit();
       } else

-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));

   }
   }

-} // POST
+} // isPost

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

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

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