Refactoring white space

[timetracker.git] / admin_options.php

diff --git a/admin_options.php b/admin_options.php
index ac90921..05fa480 100644 (file)
--- a/admin_options.php
+++ b/admin_options.php
@@ -36,7 +36,7 @@ if (!ttAccessCheck(right_administer_site)) {
   exit();
 }
 
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
   $cl_password1 = $request->getParameter('password1');
   $cl_password2 = $request->getParameter('password2');
 }
@@ -46,26 +46,25 @@ $form->addInput(array('type'=>'text','aspassword'=>true,'maxlength'=>'30','name'
 $form->addInput(array('type'=>'text','aspassword'=>true,'maxlength'=>'30','name'=>'password2','style'=>"width: 150px;",'value'=>$cl_password2));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.submit')));
 
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
   if ($cl_password1 || $cl_password2) {
-       // Validate user input.
-       if (!ttValidString($cl_password1)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
-       if (!ttValidString($cl_password2)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
+    // Validate user input.
+    if (!ttValidString($cl_password1)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.password'));
+    if (!ttValidString($cl_password2)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.confirm_password'));
     if ($cl_password1 !== $cl_password2)
-      $errors->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+      $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
   }
 
-  if ($errors->isEmpty() && $cl_password1) {
+  if ($err->no() && $cl_password1) {
     if (ttUserHelper::setPassword($user->id, $cl_password1)) {
       header('Location: admin_teams.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.options'));
 $smarty->assign('content_page_name', 'admin_options.tpl');
 $smarty->display('index.tpl');
-?>
\ No newline at end of file