X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=user_edit.php;h=1d588e8ef9cb31785cd55a39137a7e040f5fee54;hb=98907514962d51214461614c73087dc9f0f6c2f7;hp=9026fe0840a7759b320627489d72eb7b5be2e57e;hpb=a7ba11adfecf6cb906749efe5abce688363aef07;p=timetracker.git diff --git a/user_edit.php b/user_edit.php index 9026fe08..1d588e8e 100644 --- a/user_edit.php +++ b/user_edit.php @@ -85,7 +85,7 @@ if ($request->isPost()) { $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 { @@ -164,18 +164,18 @@ $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getK 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')); + $err->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')); + 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->no()) { + if ($err->no()) { $existing_user = ttUserHelper::getUserByLogin($cl_login); if (!$existing_user || ($user_id == $existing_user['id'])) { @@ -219,11 +219,11 @@ if ($request->isPost()) { 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);