X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=user_edit.php;h=1d588e8ef9cb31785cd55a39137a7e040f5fee54;hb=98907514962d51214461614c73087dc9f0f6c2f7;hp=e51142e1c8a53c1010475cafbc793ecdcc69ef6a;hpb=098a79f0819ebb89b7d48df4a6b154af4560f68e;p=timetracker.git

diff --git a/user_edit.php b/user_edit.php
index e51142e1..1d588e8e 100644
--- a/user_edit.php
+++ b/user_edit.php
@@ -64,7 +64,7 @@ if (in_array('cl', explode(',', $user->plugins)))
 $projects = ttTeamHelper::getActiveProjects($user->team_id);
 $assigned_projects = array();
 
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
   $cl_login = trim($request->getParameter('login'));
   if (!$auth->isPasswordExternal()) {
@@ -74,7 +74,7 @@ if ($request->getMethod() == 'POST') {
   $cl_email = trim($request->getParameter('email'));
   $cl_role = $request->getParameter('role');
   $cl_client_id = $request->getParameter('client');
-  $cl_status = $request->getParameter('status');  
+  $cl_status = $request->getParameter('status');
   $cl_rate = $request->getParameter('rate');
   $cl_projects = $request->getParameter('projects');
   if (is_array($cl_projects)) {
@@ -85,7 +85,7 @@ if ($request->getMethod() == 'POST') {
         $project_with_rate['rate'] = $request->getParameter('rate_'.$p);
         $assigned_projects[] = $project_with_rate;
       } else
-        $errors->add($i18n->getKey('error.field'), 'rate_'.$p);
+        $err->add($i18n->getKey('error.field'), 'rate_'.$p);
     }
   }
 } else {
@@ -162,20 +162,20 @@ $form->addInputElement($table);
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$user_id));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.save')));
 
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_name)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.person_name'));
-  if (!ttValidString($cl_login)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
+  if (!ttValidString($cl_name)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.person_name'));
+  if (!ttValidString($cl_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.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'));
+    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_email, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
-  if (!ttValidFloat($cl_rate, true)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('form.users.default_rate'));
+      $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+  }
+  if (!ttValidEmail($cl_email, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.email'));
+  if (!ttValidFloat($cl_rate, true)) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.users.default_rate'));
 
-  if ($errors->isEmpty()) {
+  if ($err->no()) {
     $existing_user = ttUserHelper::getUserByLogin($cl_login);
     if (!$existing_user || ($user_id == $existing_user['id'])) {
 
@@ -188,8 +188,8 @@ if ($request->getMethod() == 'POST') {
         'rate' => $cl_rate,
         'projects' => $assigned_projects);
       if (right_assign_roles & $user->rights) {
-      	$fields['role'] = $cl_role;
-      	$fields['client_id'] = $cl_client_id;
+        $fields['role'] = $cl_role;
+        $fields['client_id'] = $cl_client_id;
       }
 
       if (ttUserHelper::update($user_id, $fields)) {
@@ -198,32 +198,32 @@ if ($request->getMethod() == 'POST') {
         if (($user_id == $user->id) && ($user->login != $cl_login)) {
           setcookie('tt_login', $cl_login, time() + COOKIE_EXPIRE, '/');
         }
-      
+
         // In case the name of the "on behalf" user has changed - set it in session.
         if (($user->behalf_id == $user_id) && ($user->behalf_name != $cl_name)) {
           $_SESSION['behalf_name'] = $cl_name;
         }
-        
+
         // If we deactivated our own account, do housekeeping and logout.
         if ($user->id == $user_id && !is_null($cl_status) && $cl_status == INACTIVE) {
-      	  // Remove tt_login cookie that stores login name.
-      	  unset($_COOKIE['tt_login']);
-      	  setcookie('tt_login', NULL, -1);
-		
+          // Remove tt_login cookie that stores login name.
+          unset($_COOKIE['tt_login']);
+          setcookie('tt_login', NULL, -1);
+
           $auth->doLogout();
           header('Location: login.php');
           exit();
         }
-        
+
         header('Location: users.php');
         exit();
 
       } else
-        $errors->add($i18n->getKey('error.db'));
+        $err->add($i18n->getKey('error.db'));
     } else
-      $errors->add($i18n->getKey('error.user_exists'));
+      $err->add($i18n->getKey('error.user_exists'));
   }
-} // post
+} // isPost
 
 $rates = ttProjectHelper::getRates($user_id);
 $smarty->assign('rates', $rates);
@@ -235,4 +235,3 @@ $smarty->assign('user_id', $user_id);
 $smarty->assign('title', $i18n->getKey('title.edit_user'));
 $smarty->assign('content_page_name', 'user_edit.tpl');
 $smarty->display('index.tpl');
-?>
\ No newline at end of file