Refactoring white space

[timetracker.git] / admin_team_edit.php

diff --git a/admin_team_edit.php b/admin_team_edit.php
index c6181a6..09ef866 100644 (file)
--- a/admin_team_edit.php
+++ b/admin_team_edit.php
@@ -39,8 +39,8 @@ if (!ttAccessCheck(right_administer_site)) {
 
 $team_id = $request->getParameter('id');
 $team_details = ttTeamHelper::getTeamDetails($team_id);        
-  
-if ($request->getMethod() == 'POST') {
+
+if ($request->isPost()) {
   $cl_team_name = trim($request->getParameter('team_name'));
   $cl_manager_name = trim($request->getParameter('manager_name'));
   $cl_manager_login = trim($request->getParameter('manager_login'));
@@ -58,7 +58,7 @@ if ($request->getMethod() == 'POST') {
   }
   $cl_manager_email = $team_details['manager_email'];
 }
-  
+
 $form = new Form('teamForm');
 $form->addInput(array('type'=>'text','maxlength'=>'80','name'=>'team_name','value'=>$cl_team_name));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'manager_name','value'=>$cl_manager_name));
@@ -72,25 +72,25 @@ $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$team_id));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_cancel','value'=>$i18n->getKey('button.cancel')));
 
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
   if ($request->getParameter('btn_save')) {
-       // Validate user input.
-    if (!ttValidString($cl_team_name, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
-    if (!ttValidString($cl_manager_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_name'));
-    if (!ttValidString($cl_manager_login)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_login'));
-       if (!$auth->isPasswordExternal() && ($cl_password1 || $cl_password2)) {
-      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_team_name, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.team_name'));
+    if (!ttValidString($cl_manager_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_name'));
+    if (!ttValidString($cl_manager_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.manager_login'));
+    if (!$auth->isPasswordExternal() && ($cl_password1 || $cl_password2)) {
+      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'));
-    }  
-    if (!ttValidEmail($cl_manager_email, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
-      
+        $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+    }
+    if (!ttValidEmail($cl_manager_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
+
     // New login must be unique.
     if ($cl_manager_login != $team_details['manager_login'])
-      if (ttUserHelper::getUserByLogin($cl_manager_login)) $errors->add($i18n->getKey('error.user_exists'));
-        
-    if ($errors->isEmpty()) {
+      if (ttUserHelper::getUserByLogin($cl_manager_login)) $err->add($i18n->getKey('error.user_exists'));
+
+    if ($err->no()) {
       $update_result = ttTeamHelper::update($team_id, array('name'=>$cl_team_name));
       if ($update_result) {
         $update_result = ttUserHelper::update($team_details['manager_id'], array(
@@ -104,7 +104,7 @@ if ($request->getMethod() == 'POST') {
         header('Location: admin_teams.php');
         exit();
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
     }
   }
 
@@ -112,7 +112,7 @@ if ($request->getMethod() == 'POST') {
     header('Location: admin_teams.php');
     exit();
   }
-} // POST
+} // isPost
 
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
@@ -120,4 +120,3 @@ $smarty->assign('onload', 'onLoad="document.teamForm.manager_name.focus()"');
 $smarty->assign('title', $i18n->getKey('title.edit_team'));
 $smarty->assign('content_page_name', 'admin_team_edit.tpl');
 $smarty->display('index.tpl');
-?>
\ No newline at end of file