X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=admin_options.php;h=6f8125589a6ccdb47be1e17289b78295bea877a5;hb=9eee35c738a83c870e8d6dfda19d859bd063b233;hp=05fa4800958f181feba8cbef2db6f5c6af763e87;hpb=eb55e2f8ca3859482a389795e03b45283e14ef36;p=timetracker.git

diff --git a/admin_options.php b/admin_options.php
index 05fa4800..6f812558 100644
--- a/admin_options.php
+++ b/admin_options.php
@@ -31,39 +31,67 @@ import('form.Form');
 import('ttUserHelper');
 
 // Access check.
-if (!ttAccessCheck(right_administer_site)) {
+if (!ttAccessAllowed('administer_site')) {
   header('Location: access_denied.php');
   exit();
 }
 
 if ($request->isPost()) {
-  $cl_password1 = $request->getParameter('password1');
-  $cl_password2 = $request->getParameter('password2');
+  $cl_name = trim($request->getParameter('name'));
+  $cl_login = trim($request->getParameter('login'));
+  if (!$auth->isPasswordExternal()) {
+    $cl_password1 = $request->getParameter('password1');
+    $cl_password2 = $request->getParameter('password2');
+  }
+  $cl_email = trim($request->getParameter('email'));
+} else {
+  $cl_name = $user->name;
+  $cl_login = $user->login;
+  $cl_email = $user->email;
 }
 
 $form = new Form('optionsForm');
-$form->addInput(array('type'=>'text','aspassword'=>true,'maxlength'=>'30','name'=>'password1','style'=>'width: 150px;','value'=>$cl_password1));
-$form->addInput(array('type'=>'text','aspassword'=>true,'maxlength'=>'30','name'=>'password2','style'=>"width: 150px;",'value'=>$cl_password2));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','value'=>$cl_name));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','value'=>$cl_login));
+if (!$auth->isPasswordExternal()) {
+  $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'password1','value'=>$cl_password1));
+  $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'password2','value'=>$cl_password2));
+}
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=>$cl_email));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.submit')));
 
 if ($request->isPost()) {
-  if ($cl_password1 || $cl_password2) {
-    // Validate user input.
+  // Validate user input.
+  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'));
+  // New login must be unique.
+  if ($cl_login != $user->login && ttUserHelper::getUserByLogin($cl_login))
+    $err->add($i18n->getKey('error.user_exists'));
+  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)
       $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'));
+  // Finished validating user input.
 
-  if ($err->no() && $cl_password1) {
-    if (ttUserHelper::setPassword($user->id, $cl_password1)) {
+  if ($err->no()) {
+    if (ttUserHelper::update($user->id, array(
+      'name' => $cl_name,
+      'login' => $cl_login,
+      'password' => $cl_password1,
+      'email' => $cl_email,
+      'status' => ACTIVE))) {
       header('Location: admin_teams.php');
       exit();
-    } else
+    } else {
       $err->add($i18n->getKey('error.db'));
+    }
   }
 } // isPost
 
+$smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('title', $i18n->getKey('title.options'));
 $smarty->assign('content_page_name', 'admin_options.tpl');