X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=user_add.php;h=b8b5d3020ae9de9ad5c202e95cbed5e79680ca58;hb=00d11eaffd41616d9c4b003cc576b55187a9cf8c;hp=59300859aa5ab17f744c66d3a54cde927af6c364;hpb=eb55e2f8ca3859482a389795e03b45283e14ef36;p=timetracker.git diff --git a/user_add.php b/user_add.php index 59300859..b8b5d302 100644 --- a/user_add.php +++ b/user_add.php @@ -43,7 +43,7 @@ if (!ttAccessCheck(right_manage_team)) { // The "limit" plugin is not required for normal operation of the Time Tracker. @include('plugins/limit/user_add.php'); -if (in_array('cl', explode(',', $user->plugins))) +if ($user->isPluginEnabled('cl')) $clients = ttTeamHelper::getActiveClients($user->team_id); $assigned_projects = array(); @@ -77,17 +77,17 @@ $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'=>'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)); $roles[ROLE_USER] = $i18n->getKey('label.user'); $roles[ROLE_COMANAGER] = $i18n->getKey('form.users.comanager'); -if (in_array('cl', explode(',', $user->plugins))) +if ($user->isPluginEnabled('cl')) $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))) +if ($user->isPluginEnabled('cl')) $form->addInput(array('type'=>'combobox','name'=>'client','value'=>$cl_client_id,'data'=>$clients,'datakeys'=>array('id', 'name'),'empty'=>array(''=>$i18n->getKey('dropdown.select')))); $form->addInput(array('type'=>'floatfield','maxlength'=>'10','name'=>'rate','format'=>'.2','value'=>$cl_rate)); @@ -97,23 +97,22 @@ $projects = ttTeamHelper::getActiveProjects($user->team_id); // 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(''); + $this->setOptions(array('width'=>200)); + $this->setValue(''); 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->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']); } - $this->setValue($field->toStringControl()); + $this->setValue($field->getHtml()); return $this->toString(); } }