X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=notification_edit.php;h=ec26f610b68f246b93beb3f19bb2b7ff3590357f;hb=2ccee198591bc2ad5d80b5e1076246449d9232c1;hp=6e5bd9360ce41fa5be91dfb243959c420d458fee;hpb=1fad211ab12fc66117094e33425f8414fccd2cfa;p=timetracker.git

diff --git a/notification_edit.php b/notification_edit.php
index 6e5bd936..ec26f610 100644
--- a/notification_edit.php
+++ b/notification_edit.php
@@ -34,7 +34,7 @@ import('ttFavReportHelper');
 import('ttNotificationHelper');
 
 // Access check.
-if (!ttAccessCheck(right_manage_team)) {
+if (!ttAccessAllowed('manage_advanced_settings') || !$user->isPluginEnabled('no')) {
   header('Location: access_denied.php');
   exit();
 }
@@ -42,15 +42,21 @@ if (!ttAccessCheck(right_manage_team)) {
 $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_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'];
+  $cl_cc = $notification['cc'];
+  $cl_subject = $notification['subject'];
+  $cl_report_condition = $notification['report_condition'];
 }
 
 $form = new Form('notificationForm');
@@ -64,15 +70,21 @@ $form->addInput(array('type'=>'combobox',
   'empty'=>array(''=>$i18n->getKey('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','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->getKey('button.save')));
 
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
   // 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->getKey('error.report'));
+  if (!ttValidCronSpec($cl_cron_spec)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.schedule'));
+  if (!ttValidEmail($cl_email)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
+  if (!ttValidEmail($cl_cc, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.cc'));
+  if (!ttValidString($cl_subject, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.subject'));
+  if (!ttValidCondition($cl_report_condition)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.condition'));
 
-  if ($errors->no()) {
+  if ($err->no()) {
     // Calculate next execution time.
     $next = tdCron::getNextOccurrence($cl_cron_spec, mktime());
 
@@ -83,15 +95,18 @@ if ($request->getMethod() == 'POST') {
         '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
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
   }
-} // POST
+} // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('title', $i18n->getKey('title.add_notification'));
+$smarty->assign('title', $i18n->getKey('title.edit_notification'));
 $smarty->assign('content_page_name', 'notification_edit.tpl');
 $smarty->display('index.tpl');