Split profile page into two for account and group settings to reduce complexity.

[timetracker.git] / profile_edit.php

diff --git a/profile_edit.php b/profile_edit.php
index c64b95bd9752d75c51bd54a845faa1e92a6e0165..9de1820eeb896ace97274834cccb05bea0eca17a 100644 (file)
--- a/profile_edit.php
+++ b/profile_edit.php
@@ -38,7 +38,6 @@ if (!ttAccessAllowed('manage_own_settings')) {
 }
 // End of access checks.
 
 }
 // End of access checks.
 

-if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');

 $can_manage_account = $user->can('manage_own_account');
 
 if ($request->isPost()) {
 $can_manage_account = $user->can('manage_own_account');
 
 if ($request->isPost()) {


@@ -49,79 +48,10 @@ if ($request->isPost()) {
     $cl_password2 = $request->getParameter('password2');
   }
   $cl_email = trim($request->getParameter('email'));
     $cl_password2 = $request->getParameter('password2');
   }
   $cl_email = trim($request->getParameter('email'));

-
-  if ($user->canManageTeam()) {
-    $cl_team = trim($request->getParameter('team_name'));
-    $cl_currency = trim($request->getParameter('currency'));
-    if (!$cl_currency) $cl_currency = CURRENCY_DEFAULT;
-    $cl_lang = $request->getParameter('lang');
-    $cl_decimal_mark = $request->getParameter('decimal_mark');
-    $cl_date_format = $request->getParameter('date_format');
-    $cl_time_format = $request->getParameter('time_format');
-    $cl_start_week = $request->getParameter('start_week');
-    $cl_show_holidays = $request->getParameter('show_holidays');
-    $cl_tracking_mode = $request->getParameter('tracking_mode');
-    $cl_project_required = $request->getParameter('project_required');
-    $cl_task_required = $request->getParameter('task_required');
-    $cl_record_type = $request->getParameter('record_type');
-    $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');
-    $cl_bcc_email = trim($request->getParameter('bcc_email'));
-
-    // Plugin checkboxes.
-    $cl_charts = $request->getParameter('charts');
-    $cl_clients = $request->getParameter('clients');
-    $cl_client_required = $request->getParameter('client_required');
-    $cl_invoices = $request->getParameter('invoices');
-    $cl_paid_status = $request->getParameter('paid_status');
-    $cl_custom_fields = $request->getParameter('custom_fields');
-    $cl_expenses = $request->getParameter('expenses');
-    $cl_tax_expenses = $request->getParameter('tax_expenses');
-    $cl_notifications = $request->getParameter('notifications');
-    $cl_locking = $request->getParameter('locking');
-    $cl_quotas = $request->getParameter('quotas');
-    $cl_week_view = $request->getParameter('week_view');
-  }

 } else {
   $cl_name = $user->name;
   $cl_login = $user->login;
   $cl_email = $user->email;
 } else {
   $cl_name = $user->name;
   $cl_login = $user->login;
   $cl_email = $user->email;

-  if ($user->canManageTeam()) {
-    $cl_team = $user->team;
-    $cl_currency = ($user->currency == ''? CURRENCY_DEFAULT : $user->currency);
-    $cl_lang = $user->lang;
-    $cl_decimal_mark = $user->decimal_mark;
-    $cl_date_format = $user->date_format;
-    $cl_time_format = $user->time_format;
-    $cl_start_week = $user->week_start;
-    $cl_show_holidays = $user->show_holidays;
-    $cl_tracking_mode = $user->tracking_mode;
-    $cl_project_required = $user->project_required;
-    $cl_task_required = $user->task_required;
-    $cl_record_type = $user->record_type;
-    $cl_punch_mode = $user->punch_mode;
-    $cl_allow_overlap = $user->allow_overlap;
-    $cl_future_entries = $user->future_entries;
-    $cl_uncompleted_indicators = $user->uncompleted_indicators;
-    $cl_bcc_email = $user->bcc_email;
-
-    // Which plugins do we have enabled?
-    $plugins = explode(',', $user->plugins);
-    $cl_charts = in_array('ch', $plugins);
-    $cl_clients = in_array('cl', $plugins);
-    $cl_client_required = in_array('cm', $plugins);
-    $cl_invoices = in_array('iv', $plugins);
-    $cl_paid_status = in_array('ps', $plugins);
-    $cl_custom_fields = in_array('cf', $plugins);    
-    $cl_expenses = in_array('ex', $plugins);
-    $cl_tax_expenses = in_array('et', $plugins);
-    $cl_notifications = in_array('no', $plugins);
-    $cl_locking = in_array('lk', $plugins);
-    $cl_quotas = in_array('mq', $plugins);
-    $cl_week_view = in_array('wv', $plugins);
-  }

 }
 
 $form = new Form('profileForm');
 }
 
 $form = new Form('profileForm');


@@ -132,102 +62,6 @@ if (!$auth->isPasswordExternal()) {
   $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'password2','value'=>$cl_password2));
 }
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=>$cl_email,'enable'=>$can_manage_account));
   $form->addInput(array('type'=>'password','maxlength'=>'30','name'=>'password2','value'=>$cl_password2));
 }
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'email','value'=>$cl_email,'enable'=>$can_manage_account));

-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));
-
-  // 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));
-
-  $DECIMAL_MARK_OPTIONS = array(array('id'=>'.','name'=>'.'),array('id'=>',','name'=>','));
-  $form->addInput(array('type'=>'combobox','name'=>'decimal_mark','style'=>'width: 150px','data'=>$DECIMAL_MARK_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_decimal_mark,
-    'onchange'=>'adjustDecimalPreview()'));
-
-  $DATE_FORMAT_OPTIONS = array(
-    array('id'=>'%Y-%m-%d','name'=>'Y-m-d'),
-    array('id'=>'%m/%d/%Y','name'=>'m/d/Y'),
-    array('id'=>'%d.%m.%Y','name'=>'d.m.Y'),
-    array('id'=>'%d.%m.%Y %a','name'=>'d.m.Y a'));
-  $form->addInput(array('type'=>'combobox','name'=>'date_format','style'=>'width: 150px;','data'=>$DATE_FORMAT_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_date_format,
-    'onchange'=>'MakeFormatPreview("date_format_preview", this);'));
-  $TIME_FORMAT_OPTIONS = array(
-    array('id'=>'%H:%M','name'=>$i18n->get('form.profile.24_hours')),
-    array('id'=>'%I:%M %p','name'=>$i18n->get('form.profile.12_hours')));
-  $form->addInput(array('type'=>'combobox','name'=>'time_format','style'=>'width: 150px;','data'=>$TIME_FORMAT_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_time_format,
-    'onchange'=>'MakeFormatPreview("time_format_preview", this);'));
-
-  // Prepare week start choices.
-  $week_start_options = array();
-  foreach ($i18n->weekdayNames as $id => $week_dn) {
-    $week_start_options[] = array('id' => $id, 'name' => $week_dn);
-  }
-  $form->addInput(array('type'=>'combobox','name'=>'start_week','style'=>'width: 150px;','data'=>$week_start_options,'datakeys'=>array('id','name'),'value'=>$cl_start_week));
-
-  // Show holidays checkbox.
-  $form->addInput(array('type'=>'checkbox','name'=>'show_holidays','value'=>$cl_show_holidays));
-
-  // Prepare tracking mode choices.
-  $tracking_mode_options = array();
-  $tracking_mode_options[MODE_TIME] = $i18n->get('form.profile.mode_time');
-  $tracking_mode_options[MODE_PROJECTS] = $i18n->get('form.profile.mode_projects');
-  $tracking_mode_options[MODE_PROJECTS_AND_TASKS] = $i18n->get('form.profile.mode_projects_and_tasks');
-  $form->addInput(array('type'=>'combobox','name'=>'tracking_mode','style'=>'width: 150px;','data'=>$tracking_mode_options,'value'=>$cl_tracking_mode,'onchange'=>'handleTaskRequiredCheckbox()'));
-  $form->addInput(array('type'=>'checkbox','name'=>'project_required','value'=>$cl_project_required));
-  $form->addInput(array('type'=>'checkbox','name'=>'task_required','value'=>$cl_task_required));
-
-  // Prepare record type choices.
-  $record_type_options = array();
-  $record_type_options[TYPE_ALL] = $i18n->get('form.profile.type_all');
-  $record_type_options[TYPE_START_FINISH] = $i18n->get('form.profile.type_start_finish');
-  $record_type_options[TYPE_DURATION] = $i18n->get('form.profile.type_duration');
-  $form->addInput(array('type'=>'combobox','name'=>'record_type','style'=>'width: 150px;','data'=>$record_type_options,'value'=>$cl_record_type));
-
-  // 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));
-
-  // Future entries checkbox.
-  $form->addInput(array('type'=>'checkbox','name'=>'future_entries','value'=>$cl_future_entries));
-
-  // Uncompleted indicators checkbox.
-  $form->addInput(array('type'=>'checkbox','name'=>'uncompleted_indicators','value'=>$cl_uncompleted_indicators));
-
-  // Add bcc email control, for manager only.
-  if ($user->isManager()) {
-    $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'bcc_email','value'=>$cl_bcc_email));
-  }
-
-  // Plugin checkboxes.
-  $form->addInput(array('type'=>'checkbox','name'=>'charts','value'=>$cl_charts));
-  $form->addInput(array('type'=>'checkbox','name'=>'clients','value'=>$cl_clients,'onchange'=>'handlePluginCheckboxes()'));
-  $form->addInput(array('type'=>'checkbox','name'=>'client_required','value'=>$cl_client_required));
-  $form->addInput(array('type'=>'checkbox','name'=>'invoices','value'=>$cl_invoices));
-  $form->addInput(array('type'=>'checkbox','name'=>'paid_status','value'=>$cl_paid_status));
-  $form->addInput(array('type'=>'checkbox','name'=>'custom_fields','value'=>$cl_custom_fields,'onchange'=>'handlePluginCheckboxes()'));
-  $form->addInput(array('type'=>'checkbox','name'=>'expenses','value'=>$cl_expenses,'onchange'=>'handlePluginCheckboxes()'));
-  $form->addInput(array('type'=>'checkbox','name'=>'tax_expenses','value'=>$cl_tax_expenses));
-  $form->addInput(array('type'=>'checkbox','name'=>'notifications','value'=>$cl_notifications,'onchange'=>'handlePluginCheckboxes()'));
-  $form->addInput(array('type'=>'checkbox','name'=>'locking','value'=>$cl_locking,'onchange'=>'handlePluginCheckboxes()'));
-  $form->addInput(array('type'=>'checkbox','name'=>'quotas','value'=>$cl_quotas,'onchange'=>'handlePluginCheckboxes()'));
-  $form->addInput(array('type'=>'checkbox','name'=>'week_view','value'=>$cl_week_view,'onchange'=>'handlePluginCheckboxes()'));
-}

 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()) {
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
 if ($request->isPost()) {


@@ -246,94 +80,15 @@ if ($request->isPost()) {
       $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'));
       $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'));

-  if ($user->canManageTeam()) {
-    if (!ttValidString($cl_team, true)) $err->add($i18n->get('error.field'), $i18n->get('label.team_name'));
-    if (!ttValidString($cl_currency, true)) $err->add($i18n->get('error.field'), $i18n->get('label.currency'));
-    if ($user->isManager()) {
-      if (!ttValidEmail($cl_bcc_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.bcc'));
-    }
-  }

   // Finished validating user input.
 
   if ($err->no()) {
   // Finished validating user input.
 
   if ($err->no()) {

-    $update_result = true;
-    if ($user->canManageTeam()) {
-
-      // Prepare plugins string.
-      if ($cl_charts)
-        $plugins .= ',ch';
-      if ($cl_clients)
-        $plugins .= ',cl';
-      if ($cl_client_required)
-        $plugins .= ',cm';
-      if ($cl_invoices)
-        $plugins .= ',iv';
-      if ($cl_paid_status)
-        $plugins .= ',ps';
-      if ($cl_custom_fields)
-        $plugins .= ',cf';
-      if ($cl_expenses)
-        $plugins .= ',ex';
-      if ($cl_tax_expenses)
-        $plugins .= ',et';
-      if ($cl_notifications)
-        $plugins .= ',no';
-      if ($cl_locking)
-        $plugins .= ',lk';
-      if ($cl_quotas)
-        $plugins .= ',mq';
-      if ($cl_week_view)
-        $plugins .= ',wv';
-
-      // Recycle week view plugin options as they are not configured on this page.
-      $existing_plugins = explode(',', $user->plugins);
-      if (in_array('wvn', $existing_plugins))
-        $plugins .= ',wvn';
-      if (in_array('wvl', $existing_plugins))
-        $plugins .= ',wvl';
-      if (in_array('wvns', $existing_plugins))
-        $plugins .= ',wvns';
-
-      $plugins = trim($plugins, ',');
-
-      // Prepare config string.
-      if ($cl_show_holidays)
-        $config .= ',show_holidays';
-      if ($cl_punch_mode)
-        $config .= ',punch_mode';
-      if ($cl_allow_overlap)
-        $config .= ',allow_overlap';
-      if ($cl_future_entries)
-        $config .= ',future_entries';
-      if ($cl_uncompleted_indicators)
-        $config .= ',uncompleted_indicators';
-      $config = trim($config, ',');
-
-      $update_result = ttTeamHelper::update($user->team_id, array(
-        'name' => $cl_team,
-        'currency' => $cl_currency,
-        'lang' => $cl_lang,
-        'decimal_mark' => $cl_decimal_mark,
-        'date_format' => $cl_date_format,
-        'time_format' => $cl_time_format,
-        'week_start' => $cl_start_week,
-        'tracking_mode' => $cl_tracking_mode,
-        'project_required' => $cl_project_required,
-        'task_required' => $cl_task_required,
-        'record_type' => $cl_record_type,
-        'uncompleted_indicators' => $cl_uncompleted_indicators,
-        'bcc_email' => $cl_bcc_email,
-        'plugins' => $plugins,
-        'config' => $config));
-    }
-    if ($update_result) {
-      $update_result = ttUserHelper::update($user->id, array(
+    $update_result = ttUserHelper::update($user->id, array(

         'name' => $cl_name,
         'login' => $cl_login,
         'password' => $cl_password1,
         'email' => $cl_email,
         'status' => ACTIVE));
         'name' => $cl_name,
         'login' => $cl_login,
         'password' => $cl_password1,
         'email' => $cl_email,
         'status' => ACTIVE));

-    }

     if ($update_result) {
       header('Location: time.php');
       exit();
     if ($update_result) {
       header('Location: time.php');
       exit();


@@ -344,7 +99,6 @@ if ($request->isPost()) {
 
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 
 $smarty->assign('auth_external', $auth->isPasswordExternal());
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));

-$smarty->assign('onload', 'onLoad="handleTaskRequiredCheckbox(); handlePluginCheckboxes();"');

 $smarty->assign('title', $i18n->get('title.profile'));
 $smarty->assign('content_page_name', 'profile_edit.tpl');
 $smarty->display('index.tpl');
 $smarty->assign('title', $i18n->get('title.profile'));
 $smarty->assign('content_page_name', 'profile_edit.tpl');
 $smarty->display('index.tpl');