X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=profile_edit.php;h=7f024fe88b81a87a603775f45016f5671e1d3613;hb=ad98b13400fdc2fa2299a22c9bd54c4cd27960c3;hp=e9afa970554547978673472c47d7d7dd4266f8a8;hpb=11cfcc792a4c3578abce0ef3f1b933f3858b5c1d;p=timetracker.git

diff --git a/profile_edit.php b/profile_edit.php
index e9afa970..7f024fe8 100644
--- a/profile_edit.php
+++ b/profile_edit.php
@@ -29,6 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttUserHelper');
+import('ttRoleHelper');
 
 // Access check.
 if (!ttAccessCheck(right_data_entry|right_view_reports)) {
@@ -52,6 +53,7 @@ if ($request->isPost()) {
     $cl_team = trim($request->getParameter('team_name'));
     $cl_currency = trim($request->getParameter('currency'));
     if (!$cl_currency) $cl_currency = CURRENCY_DEFAULT;
+    $cl_roles = $request->getParameter('roles');
     $cl_lang = $request->getParameter('lang');
     $cl_decimal_mark = $request->getParameter('decimal_mark');
     $cl_date_format = $request->getParameter('date_format');
@@ -62,7 +64,7 @@ if ($request->isPost()) {
     $cl_project_required = $request->getParameter('project_required');
     $cl_task_required = $request->getParameter('task_required');
     $cl_record_type = $request->getParameter('record_type');
-    $cl_punch_in_mode = $request->getParameter('punch_in_mode');
+    $cl_punch_mode = $request->getParameter('punch_mode');
     $cl_allow_overlap = $request->getParameter('allow_overlap');
     $cl_future_entries = $request->getParameter('future_entries');
     $cl_uncompleted_indicators = $request->getParameter('uncompleted_indicators');
@@ -89,6 +91,7 @@ if ($request->isPost()) {
   if ($user->canManageTeam()) {
     $cl_team = $user->team;
     $cl_currency = ($user->currency == ''? CURRENCY_DEFAULT : $user->currency);
+    $cl_roles = $user->roles;
     $cl_lang = $user->lang;
     $cl_decimal_mark = $user->decimal_mark;
     $cl_date_format = $user->date_format;
@@ -99,7 +102,7 @@ if ($request->isPost()) {
     $cl_project_required = $user->project_required;
     $cl_task_required = $user->task_required;
     $cl_record_type = $user->record_type;
-    $cl_punch_in_mode = $user->punch_in_mode;
+    $cl_punch_mode = $user->punch_mode;
     $cl_allow_overlap = $user->allow_overlap;
     $cl_future_entries = $user->future_entries;
     $cl_uncompleted_indicators = $user->uncompleted_indicators;
@@ -133,6 +136,8 @@ $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=
 if ($user->canManageTeam()) {
   $form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'team_name','value'=>$cl_team));
   $form->addInput(array('type'=>'text','maxlength'=>'7','name'=>'currency','value'=>$cl_currency));
+  // Roles checkbox.
+  $form->addInput(array('type'=>'checkbox','name'=>'roles','value'=>$cl_roles,'onchange'=>'handleRolesCheckbox()'));
 
   // Prepare an array of available languages.
   $lang_files = I18n::getLangFileList();
@@ -195,8 +200,8 @@ if ($user->canManageTeam()) {
   $record_type_options[TYPE_DURATION] = $i18n->getKey('form.profile.type_duration');
   $form->addInput(array('type'=>'combobox','name'=>'record_type','style'=>'width: 150px;','data'=>$record_type_options,'value'=>$cl_record_type));
 
-  // Punch in mode checkbox.
-  $form->addInput(array('type'=>'checkbox','name'=>'punch_in_mode','value'=>$cl_punch_in_mode));
+  // Punch mode checkbox.
+  $form->addInput(array('type'=>'checkbox','name'=>'punch_mode','value'=>$cl_punch_mode));
 
   // Allow overlap checkbox.
   $form->addInput(array('type'=>'checkbox','name'=>'allow_overlap','value'=>$cl_allow_overlap));
@@ -295,11 +300,19 @@ if ($request->isPost()) {
 
       $plugins = trim($plugins, ',');
 
+      // If we use roles... No, we'll do it differently.
+      /*
+      if ($cl_roles && !ttRoleHelper::rolesExist()) {
+         ttRoleHelper::createDefaultRoles();
+      }*/
+
       // Prepare config string.
+      if ($cl_roles)
+        $config .= ',roles';
       if ($cl_show_holidays)
         $config .= ',show_holidays';
-      if ($cl_punch_in_mode)
-        $config .= ',punch_in_mode';
+      if ($cl_punch_mode)
+        $config .= ',punch_mode';
       if ($cl_allow_overlap)
         $config .= ',allow_overlap';
       if ($cl_future_entries)
@@ -343,7 +356,7 @@ if ($request->isPost()) {
 
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('onload', 'onLoad="handleTaskRequiredCheckbox(); handlePluginCheckboxes();"');
+$smarty->assign('onload', 'onLoad="handleRolesCheckbox(); handleTaskRequiredCheckbox(); handlePluginCheckboxes();"');
 $smarty->assign('title', $i18n->getKey('title.profile'));
 $smarty->assign('content_page_name', 'profile_edit.tpl');
 $smarty->display('index.tpl');