X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=notification_edit.php;h=30a9d8fe33501c7d7d5c9a7d8baeb531b944ae65;hb=91e951c88f39495bad54d1e06eb138b65c53c6d8;hp=d04430b0c7fb55d3a2223e11a876c870bb35f654;hpb=5ef582473f6b329be18ad83c61e053fdcd9c6ed5;p=timetracker.git

diff --git a/notification_edit.php b/notification_edit.php
index d04430b0..30a9d8fe 100644
--- a/notification_edit.php
+++ b/notification_edit.php
@@ -42,7 +42,7 @@ 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'));
@@ -61,22 +61,21 @@ $form->addInput(array('type'=>'combobox',
   'value'=>$cl_fav_report,
   'data'=>$fav_reports,
   'datakeys'=>array('id','name'),
-  'empty'=>array(''=>$i18n->getKey('dropdown.select'))
-));
+  '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'=>'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.cron_schedule'));
+  if (!ttValidEmail($cl_email)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
+
+  if ($err->no()) {
+    // Calculate next execution time.
+    $next = tdCron::getNextOccurrence($cl_cron_spec, mktime());
 
-  if ($errors->isEmpty()) {
-  	// Calculate next execution time.  	
-  	$next = tdCron::getNextOccurrence($cl_cron_spec, mktime()); 
-  	  
     if (ttNotificationHelper::update(array(
         'id' => $notification_id,
         'team_id' => $user->team_id,
@@ -88,12 +87,11 @@ if ($request->getMethod() == 'POST') {
         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('onload', 'onLoad="document.clientForm.name.focus()"');
 $smarty->assign('title', $i18n->getKey('title.add_notification'));
 $smarty->assign('content_page_name', 'notification_edit.tpl');
 $smarty->display('index.tpl');