Added user custom fields on user_edit.php page.

[timetracker.git] / user_add.php

diff --git a/user_add.php b/user_add.php
index 26cbe695a00bac013e95f6e44dab840336d65e48..0cd71b0a48d0c510912a5f42ba70127209e8bf3a 100644 (file)
--- a/user_add.php
+++ b/user_add.php
@@ -29,22 +29,33 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttTeamHelper');
 require_once('initialize.php');
 import('form.Form');
 import('ttTeamHelper');

+import('ttGroupHelper');

 import('ttUserHelper');
 import('form.Table');
 import('form.TableColumn');
 import('ttUserHelper');
 import('form.Table');
 import('form.TableColumn');

+import('ttRoleHelper');

 
 

-// Access check.
-if (!ttAccessCheck(right_manage_team)) {
+// Access checks.
+if (!ttAccessAllowed('manage_users')) {

   header('Location: access_denied.php');
   exit();
 }
   header('Location: access_denied.php');
   exit();
 }

+// End of access checks.

 
 // Use the "limit" plugin if we have one. Ignore include errors.
 
 // Use the "limit" plugin if we have one. Ignore include errors.

-// The "limit" plugin is not required for normal operation of the Time Tracker.
+// The "limit" plugin is not required for normal operation of Time Tracker.

 @include('plugins/limit/user_add.php');
 
 @include('plugins/limit/user_add.php');
 

-if (in_array('cl', explode(',', $user->plugins)))
-  $clients = ttTeamHelper::getActiveClients($user->team_id);
+$show_quota = $user->isPluginEnabled('mq');
+if ($user->isPluginEnabled('cl'))
+  $clients = ttGroupHelper::getActiveClients();
+
+// Use custom fields plugin if it is enabled.
+if ($user->isPluginEnabled('cf')) {
+  require_once('plugins/CustomFields.class.php');
+  $custom_fields = new CustomFields();
+  $smarty->assign('custom_fields', $custom_fields);
+}

 
 $assigned_projects = array();
 if ($request->isPost()) {
 
 $assigned_projects = array();
 if ($request->isPost()) {


@@ -55,9 +66,21 @@ if ($request->isPost()) {
     $cl_password2 = $request->getParameter('pas2');
   }
   $cl_email = trim($request->getParameter('email'));
     $cl_password2 = $request->getParameter('pas2');
   }
   $cl_email = trim($request->getParameter('email'));

-  $cl_role = $request->getParameter('role');
-  if (!$cl_role) $cl_role = ROLE_USER;
+  $cl_role_id = $request->getParameter('role');

   $cl_client_id = $request->getParameter('client');
   $cl_client_id = $request->getParameter('client');

+  $cl_quota_percent = $request->getParameter('quota_percent');
+  // If we have user custom fields - collect input.
+  if ($custom_fields && $custom_fields->userFields) {
+    foreach ($custom_fields->userFields as $userField) {
+      $control_name = 'user_field_'.$userField['id'];
+      $userCustomFields[$userField['id']] = array('field_id' => $userField['id'],
+        'control_name' => $control_name,
+        'label' => $userField['label'],
+        'type' => $userField['type'],
+        'required' => $userField['required'],
+        'value' => trim($request->getParameter($control_name)));
+    }
+  }

   $cl_rate = $request->getParameter('rate');
   $cl_projects = $request->getParameter('projects');
   if (is_array($cl_projects)) {
   $cl_rate = $request->getParameter('rate');
   $cl_projects = $request->getParameter('projects');
   if (is_array($cl_projects)) {


@@ -68,7 +91,7 @@ if ($request->isPost()) {
         $project_with_rate['rate'] = $request->getParameter('rate_'.$p);
         $assigned_projects[] = $project_with_rate;
       } else
         $project_with_rate['rate'] = $request->getParameter('rate_'.$p);
         $assigned_projects[] = $project_with_rate;
       } else

-        $err->add($i18n->getKey('error.field'), 'rate_'.$p);
+        $err->add($i18n->get('error.field'), 'rate_'.$p);

     }
   }
 }
     }
   }
 }


@@ -77,72 +100,101 @@ $form = new Form('userForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 300px;','value'=>$cl_name));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','style'=>'width: 300px;','value'=>$cl_login));
 if (!$auth->isPasswordExternal()) {
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'name','style'=>'width: 300px;','value'=>$cl_name));
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','style'=>'width: 300px;','value'=>$cl_login));
 if (!$auth->isPasswordExternal()) {

-  $form->addInput(array('type'=>'text','maxlength'=>'30','name'=>'pas1','aspassword'=>true,'value'=>$cl_password1));
-  $form->addInput(array('type'=>'text','maxlength'=>'30','name'=>'pas2','aspassword'=>true,'value'=>$cl_password2));
+  $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'pas1','value'=>$cl_password1));
+  $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'pas2','value'=>$cl_password2));

 }
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=>$cl_email));
 
 }
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=>$cl_email));
 

-$roles[ROLE_USER] = $i18n->getKey('label.user');
-$roles[ROLE_COMANAGER] = $i18n->getKey('form.users.comanager');
-if (in_array('cl', explode(',', $user->plugins)))
-  $roles[ROLE_CLIENT] = $i18n->getKey('label.client');
-$form->addInput(array('type'=>'combobox','onchange'=>'handleClientControl()','name'=>'role','value'=>$cl_role,'data'=>$roles));
-if (in_array('cl', explode(',', $user->plugins)))
-  $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+$active_roles = ttTeamHelper::getActiveRolesForUser();
+$form->addInput(array('type'=>'combobox','onchange'=>'handleClientControl()','name'=>'role','value'=>$cl_role_id,'data'=>$active_roles,'datakeys'=>array('id', 'name')));
+if ($user->isPluginEnabled('cl'))
+  $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->get('dropdown.select'))));
+
+// If we have custom fields - add controls for them.
+if ($custom_fields && $custom_fields->userFields) {
+  foreach ($custom_fields->userFields as $userField) {
+    $field_name = 'user_field_'.$userField['id'];
+    if ($userField['type'] == CustomFields::TYPE_TEXT) {
+      $form->addInput(array('type'=>'text','name'=>$field_name,'value'=>$userCustomFields[$userField['id']]['value']));
+    } elseif ($userField['type'] == CustomFields::TYPE_DROPDOWN) {
+      $form->addInput(array('type'=>'combobox','name'=>$field_name,
+      'style'=>'width: 250px;',
+      'data'=>CustomFields::getOptions($userField['id']),
+      'value'=>$userCustomFields[$userField['id']]['value'],
+      'empty'=>array(''=>$i18n->get('dropdown.select'))));
+    }
+  }
+}

 
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));
 
 $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate));

+if ($show_quota)
+  $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'quota_percent','format'=>'.2','value'=>$cl_quota_percent));

 
 

-$projects = ttTeamHelper::getActiveProjects($user->team_id);
+$show_projects = MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode();
+if ($show_projects) {
+  $projects = ttGroupHelper::getActiveProjects();
+  if (count($projects) == 0) $show_projects = false;
+}

 
 // Define classes for the projects table.
 class NameCellRenderer extends DefaultCellRenderer {
   function render(&$table, $value, $row, $column, $selected = false) {
 
 // Define classes for the projects table.
 class NameCellRenderer extends DefaultCellRenderer {
   function render(&$table, $value, $row, $column, $selected = false) {

-    $this->setOptions(array('width'=>200,'valign'=>'top'));
-    $this->setValue('<label for = "'.$table->getName().'_'.$row.'">'.htmlspecialchars($value).'</label>');
+    $this->setOptions(array('width'=>200));
+    $this->setValue('<label for = "'.$table->name.'_'.$row.'">'.htmlspecialchars($value).'</label>');

     return $this->toString();
   }
 }
 class RateCellRenderer extends DefaultCellRenderer {
   function render(&$table, $value, $row, $column, $selected = false) {
     global $assigned_projects;
     return $this->toString();
   }
 }
 class RateCellRenderer extends DefaultCellRenderer {
   function render(&$table, $value, $row, $column, $selected = false) {
     global $assigned_projects;

-    $field = new FloatField('rate_'.$table->getValueAtName($row, 'id'), $table->getValueAtName($row, 'p_rate'));
+    $field = new FloatField('rate_'.$table->getValueAtName($row, 'id'));

     $field->setFormName($table->getFormName());
     $field->setFormName($table->getFormName());

-    $field->setLocalization($GLOBALS['I18N']);

     $field->setSize(5);
     $field->setFormat('.2');
     foreach ($assigned_projects as $p) {
       if ($p['id'] == $table->getValueAtName($row,'id')) $field->setValue($p['rate']);
     }
     $field->setSize(5);
     $field->setFormat('.2');
     foreach ($assigned_projects as $p) {
       if ($p['id'] == $table->getValueAtName($row,'id')) $field->setValue($p['rate']);
     }

-    $this->setValue($field->toStringControl());
+    $this->setValue($field->getHtml());

     return $this->toString();
   }
 }
 // Create projects table.
 $table = new Table('projects');
 $table->setIAScript('setDefaultRate');
     return $this->toString();
   }
 }
 // Create projects table.
 $table = new Table('projects');
 $table->setIAScript('setDefaultRate');

-$table->setTableOptions(array('width'=>'100%','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));
+$table->setTableOptions(array('width'=>'300','cellspacing'=>'1','cellpadding'=>'3','border'=>'0'));

 $table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
 $table->setData($projects);
 $table->setKeyField('id');
 $table->setValue($cl_projects);
 $table->setRowOptions(array('valign'=>'top','class'=>'tableHeader'));
 $table->setData($projects);
 $table->setKeyField('id');
 $table->setValue($cl_projects);

-$table->addColumn(new TableColumn('name', $i18n->getKey('label.project'), new NameCellRenderer()));
-$table->addColumn(new TableColumn('p_rate', $i18n->getKey('form.users.rate'), new RateCellRenderer()));
+$table->addColumn(new TableColumn('name', $i18n->get('label.project'), new NameCellRenderer()));
+$table->addColumn(new TableColumn('p_rate', $i18n->get('form.users.rate'), new RateCellRenderer()));

 $form->addInputElement($table);
 
 $form->addInputElement($table);
 

-$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->isPost()) {
   // Validate user input.
 
 if ($request->isPost()) {
   // 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'));
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.person_name'));
+  if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('label.login'));

   if (!$auth->isPasswordExternal()) {
   if (!$auth->isPasswordExternal()) {

-    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 (!ttValidString($cl_password1)) $err->add($i18n->get('error.field'), $i18n->get('label.password'));
+    if (!ttValidString($cl_password2)) $err->add($i18n->get('error.field'), $i18n->get('label.confirm_password'));

     if ($cl_password1 !== $cl_password2)
     if ($cl_password1 !== $cl_password2)

-      $err->add($i18n->getKey('error.not_equal'), $i18n->getKey('label.password'), $i18n->getKey('label.confirm_password'));
+      $err->add($i18n->get('error.not_equal'), $i18n->get('label.password'), $i18n->get('label.confirm_password'));
+  }
+  if (!ttValidEmail($cl_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
+  // Require selection of a client for a client role.
+  if ($user->isPluginEnabled('cl') && ttRoleHelper::isClientRole($cl_role_id) && !$cl_client_id) $err->add($i18n->get('error.client'));
+  if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('label.quota'));
+  // Validate input in user custom fields.
+  if ($custom_fields && $custom_fields->userFields) {
+    foreach ($userCustomFields as $userField) {
+      // Validation is the same for text and dropdown fields.
+      if (!ttValidString($userField['value'], !$userField['required'])) $err->add($i18n->get('error.field'), htmlspecialchars($userField['label']));
+    }

   }
   }

-  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 (!ttValidFloat($cl_rate, true)) $err->add($i18n->get('error.field'), $i18n->get('form.users.default_rate'));
+  if (!ttUserHelper::canAdd()) $err->add($i18n->get('error.user_count'));

 
   if ($err->no()) {
     if (!ttUserHelper::getUserByLogin($cl_login)) {
 
   if ($err->no()) {
     if (!ttUserHelper::getUserByLogin($cl_login)) {


@@ -151,24 +203,42 @@ if ($request->isPost()) {
         'login' => $cl_login,
         'password' => $cl_password1,
         'rate' => $cl_rate,
         'login' => $cl_login,
         'password' => $cl_password1,
         'rate' => $cl_rate,

-        'team_id' => $user->team_id,
-        'role' => $cl_role,
+        'quota_percent' => $cl_quota_percent,
+        'group_id' => $user->getGroup(),
+        'org_id' => $user->org_id,
+        'role_id' => $cl_role_id,

         'client_id' => $cl_client_id,
         'projects' => $assigned_projects,
         'email' => $cl_email);
         'client_id' => $cl_client_id,
         'projects' => $assigned_projects,
         'email' => $cl_email);

-      if (ttUserHelper::insert($fields)) {
+      $user_id = ttUserHelper::insert($fields);
+
+      // Insert user custom fields if we have them.
+      $result = true;
+      if ($user_id && $custom_fields && $custom_fields->userFields) {
+        $result = $custom_fields->insertEntityFields(CustomFields::ENTITY_USER, $user_id, $userCustomFields);
+      }
+
+      if ($user_id && $result) {
+        if (!$user->exists()) {
+          // We added a user to an empty subgroup. Set new user as on behalf user.
+          // Needed for user-based things to work (such as notifications config).
+          $user->setOnBehalfUser($user_id);
+        }

         header('Location: users.php');
         exit();
       } else
         header('Location: users.php');
         exit();
       } else

-        $err->add($i18n->getKey('error.db'));
+        $err->add($i18n->get('error.db'));

     } else
     } else

-      $err->add($i18n->getKey('error.user_exists'));
+      $err->add($i18n->get('error.user_exists'));

   }
   }

-} // POST
+} // isPost

 
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 
 $smarty->assign('auth_external', $auth->isPasswordExternal());

+$smarty->assign('active_roles', $active_roles);

 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.userForm.name.focus();handleClientControl();"');

-$smarty->assign('title', $i18n->getKey('title.add_user'));
+$smarty->assign('show_quota', $show_quota);
+$smarty->assign('show_projects', $show_projects);
+$smarty->assign('title', $i18n->get('title.add_user'));

 $smarty->assign('content_page_name', 'user_add.tpl');
 $smarty->display('index.tpl');
 $smarty->assign('content_page_name', 'user_add.tpl');
 $smarty->display('index.tpl');