X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=admin_team_add.php;h=6a8b05d574f565dbc1315fa4e71182979c1a1373;hb=54c7f39c93815e99c45f3f974a4ec14673fee1b2;hp=3ce0e662a7874e67dcd1353a5e8f3c0c74ef9e5c;hpb=fd3db1c1a2b975a23c907b2e9b714a0cfe47f3e0;p=timetracker.git

diff --git a/admin_team_add.php b/admin_team_add.php
index 3ce0e662..6a8b05d5 100644
--- a/admin_team_add.php
+++ b/admin_team_add.php
@@ -29,15 +29,17 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttUserHelper');
+import('ttRoleHelper');
 
 // Access check.
-if (!ttAccessCheck(right_administer_site)) {
+if (!ttAccessAllowed('administer_site')) {
   header('Location: access_denied.php');
   exit();
 }
 
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
   $cl_team_name = trim($request->getParameter('team_name'));
+  $cl_lang = $request->getParameter('lang');
   $cl_manager_name = trim($request->getParameter('manager_name'));
   $cl_manager_login = trim($request->getParameter('manager_login'));
   if (!$auth->isPasswordExternal()) {
@@ -45,59 +47,74 @@ if ($request->getMethod() == 'POST') {
     $cl_password2 = $request->getParameter('password2');
   }
   $cl_manager_email = trim($request->getParameter('manager_email'));
-}
+} else
+  $cl_lang = $i18n->lang; // Browser setting from initialize.php.
 
 $form = new Form('teamForm');
 $form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'team_name','value'=>$cl_team_name));
+
+// Prepare an array of available languages.
+$lang_files = I18n::getLangFileList();
+foreach ($lang_files as $lfile) {
+  $content = file(RESOURCE_DIR."/".$lfile);
+  $lname = '';
+  foreach ($content as $line) {
+    if (strstr($line, 'i18n_language')) {
+      $a = explode('=', $line);
+      $lname = trim(str_replace(';','',str_replace("'","",$a[1])));
+      break;
+    }
+  }
+  unset($content);
+  $longname_lang[] = array('id'=>I18n::getLangFromFilename($lfile),'name'=>$lname);
+}
+$longname_lang = mu_sort($longname_lang, 'name');
+$form->addInput(array('type'=>'combobox','name'=>'lang','style'=>'width: 200px','data'=>$longname_lang,'datakeys'=>array('id','name'),'value'=>$cl_lang));
+
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'manager_name','value'=>$cl_manager_name));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'manager_login','value'=>$cl_manager_login));
 if (!$auth->isPasswordExternal()) {
-  $form->addInput(array('type'=>'text','maxlength'=>'30','name'=>'password1','aspassword'=>true,'value'=>$cl_password1));
-  $form->addInput(array('type'=>'text','maxlength'=>'30','name'=>'password2','aspassword'=>true,'value'=>$cl_password2));
+  $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'=>'manager_email','value'=>$cl_manager_email));
-$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.submit')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 
-if ($request->getMethod() == 'POST') {
-  // 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()) {
-    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 ($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'));
+if ($request->isPost()) {
+
+  /*
+   * Note: creating a group by admin is pretty much the same as self-registration,
+   * except that created_by fields for group and user must be set to admin account.
+   * Therefore, we'll reuse ttRegistrator instance to create a group here
+   * and override created_by fields using ttRegistrator::setCreatedBy() function.
+   */
+
+  // Create fields array for ttRegistrator instance.
+  if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
+  $fields = array(
+    'user_name' => $cl_manager_name,
+    'login' => $cl_manager_login,
+    'password1' => $cl_password1,
+    'password2' => $cl_password2,
+    'email' => $cl_manager_email,
+    'group_name' => $cl_team_name,
+    'currency' => CURRENCY_DEFAULT,
+    'lang' => $cl_lang);
 
-  if ($errors->isEmpty()) {
-    if (!ttUserHelper::getUserByLogin($cl_manager_login)) {
-      // Create a new team.
-      if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
-      $team_id = ttTeamHelper::insert(array('name'=>$cl_team_name,'currency'=>CURRENCY_DEFAULT));
-      if ($team_id) {
-        // Team created, now create a team manager.
-        $user_id = ttUserHelper::insert(array(
-          'team_id' => $team_id,
-          'role' => ROLE_MANAGER,
-          'name' => $cl_manager_name,
-          'login' => $cl_manager_login,
-          'password' => $cl_password1,
-          'email' => $cl_manager_email));
-      }
-      if ($team_id && $user_id) {
-        header('Location: admin_teams.php');
-      } else
-        $errors->add($i18n->getKey('error.db'));
-    } else
-      $errors->add($i18n->getKey('error.user_exists'));
+  // Create an instance of ttRegistrator class.
+  import('ttRegistrator');
+  $registrator = new ttRegistrator($fields, $err);
+  $registrator->register();
+  $registrator->setCreatedBy($user->id); // Override created_by to admin account.
+  if ($err->no()) {
+    header('Location: admin_teams.php');
+    exit();
   }
-} // POST
+} // isPost
 
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.teamForm.team.focus()"');
 $smarty->assign('content_page_name', 'admin_team_add.tpl');
-$smarty->assign('title', $i18n->getKey('title.create_team'));
+$smarty->assign('title', $i18n->get('title.create_team'));
 $smarty->display('index.tpl');