X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=group_edit.php;h=01d2ecdc4c26a3bb7e8826c26015dae446728162;hb=47676f16efdde0b36a4ed09d2ab0476584aeb2a6;hp=1d71cc17d581dbf9c3102e0044ec355a1079b1d2;hpb=45c855269d952873285f7a835e82fc2b3eff3971;p=timetracker.git

diff --git a/group_edit.php b/group_edit.php
index 1d71cc17..01d2ecdc 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -30,18 +30,22 @@ require_once('initialize.php');
 import('form.Form');
 import('ttUserHelper');
 import('ttRoleHelper');
+import('ttConfigHelper');
 
 // Access checks.
-if (!ttAccessAllowed('manage_basic_settings')) {
+if (!(ttAccessAllowed('manage_basic_settings') || ttAccessAllowed('manage_advanced_settings'))) {
   header('Location: access_denied.php');
   exit();
 }
 // End of access checks.
 
+$config = new ttConfigHelper($user->config);
+
+$advanced_settings = $user->can('manage_advanced_settings');
 if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
 
 if ($request->isPost()) {
-  $cl_team = trim($request->getParameter('team_name'));
+  $cl_group = trim($request->getParameter('group_name'));
   $cl_currency = trim($request->getParameter('currency'));
   if (!$cl_currency) $cl_currency = CURRENCY_DEFAULT;
   $cl_lang = $request->getParameter('lang');
@@ -59,6 +63,7 @@ if ($request->isPost()) {
   $cl_future_entries = $request->getParameter('future_entries');
   $cl_uncompleted_indicators = $request->getParameter('uncompleted_indicators');
   $cl_bcc_email = trim($request->getParameter('bcc_email'));
+  $cl_allow_ip = trim($request->getParameter('allow_ip'));
 
   // Plugin checkboxes.
   $cl_charts = $request->getParameter('charts');
@@ -73,8 +78,9 @@ if ($request->isPost()) {
   $cl_locking = $request->getParameter('locking');
   $cl_quotas = $request->getParameter('quotas');
   $cl_week_view = $request->getParameter('week_view');
+  $cl_work_units = $request->getParameter('work_units');
 } else {
-  $cl_team = $user->team;
+  $cl_group = $user->group;
   $cl_currency = ($user->currency == ''? CURRENCY_DEFAULT : $user->currency);
   $cl_lang = $user->lang;
   $cl_decimal_mark = $user->decimal_mark;
@@ -91,6 +97,7 @@ if ($request->isPost()) {
   $cl_future_entries = $user->future_entries;
   $cl_uncompleted_indicators = $user->uncompleted_indicators;
   $cl_bcc_email = $user->bcc_email;
+  $cl_allow_ip = $user->allow_ip;
 
   // Which plugins do we have enabled?
   $plugins = explode(',', $user->plugins);
@@ -106,10 +113,11 @@ if ($request->isPost()) {
   $cl_locking = in_array('lk', $plugins);
   $cl_quotas = in_array('mq', $plugins);
   $cl_week_view = in_array('wv', $plugins);
+  $cl_work_units = in_array('wu', $plugins);
 }
 
 $form = new Form('groupForm');
-$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'team_name','value'=>$cl_team));
+$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'group_name','value'=>$cl_group,'enable'=>$advanced_settings));
 $form->addInput(array('type'=>'text','maxlength'=>'7','name'=>'currency','value'=>$cl_currency));
 
 // Prepare an array of available languages.
@@ -142,8 +150,8 @@ $DATE_FORMAT_OPTIONS = array(
 $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')));
+  array('id'=>'%H:%M','name'=>$i18n->get('form.group_edit.24_hours')),
+  array('id'=>'%I:%M %p','name'=>$i18n->get('form.group_edit.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);'));
 
@@ -159,18 +167,18 @@ $form->addInput(array('type'=>'checkbox','name'=>'show_holidays','value'=>$cl_sh
 
 // 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');
+$tracking_mode_options[MODE_TIME] = $i18n->get('form.group_edit.mode_time');
+$tracking_mode_options[MODE_PROJECTS] = $i18n->get('form.group_edit.mode_projects');
+$tracking_mode_options[MODE_PROJECTS_AND_TASKS] = $i18n->get('form.group_edit.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');
+$record_type_options[TYPE_ALL] = $i18n->get('form.group_edit.type_all');
+$record_type_options[TYPE_START_FINISH] = $i18n->get('form.group_edit.type_start_finish');
+$record_type_options[TYPE_DURATION] = $i18n->get('form.group_edit.type_duration');
 $form->addInput(array('type'=>'combobox','name'=>'record_type','style'=>'width: 150px;','data'=>$record_type_options,'value'=>$cl_record_type));
 
 // Punch mode checkbox.
@@ -185,9 +193,10 @@ $form->addInput(array('type'=>'checkbox','name'=>'future_entries','value'=>$cl_f
 // Uncompleted indicators checkbox.
 $form->addInput(array('type'=>'checkbox','name'=>'uncompleted_indicators','value'=>$cl_uncompleted_indicators));
 
-// Add bcc email control, for manager only.
-if ($user->can('manage_advanced_settings')) {
+// Add bcc email control.
+if ($advanced_settings) {
   $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'bcc_email','value'=>$cl_bcc_email));
+  $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'allow_ip','value'=>$cl_allow_ip));
 }
 
 // Plugin checkboxes.
@@ -203,89 +212,92 @@ $form->addInput(array('type'=>'checkbox','name'=>'notifications','value'=>$cl_no
 $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'=>'checkbox','name'=>'work_units','value'=>$cl_work_units,'onchange'=>'handlePluginCheckboxes()'));
+
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+if ($user->can('delete_group')) $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('button.delete')));
 
 if ($request->isPost()) {
+
+  if ($request->getParameter('btn_delete')) {
+    // Delete button pressed, redirect.
+    header('Location: group_delete.php?id='.$user->group_id);
+    exit();
+  }
+
   // Validate user input.
-  if (!ttValidString($cl_team, true)) $err->add($i18n->get('error.field'), $i18n->get('label.team_name'));
+  if (!ttValidString($cl_group, true)) $err->add($i18n->get('error.field'), $i18n->get('label.group_name'));
   if (!ttValidString($cl_currency, true)) $err->add($i18n->get('error.field'), $i18n->get('label.currency'));
-  if ($user->can('manage_advanced_settings')) {
+  if ($advanced_settings) {
     if (!ttValidEmail($cl_bcc_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.bcc'));
+    if (!ttValidIP($cl_allow_ip, true)) $err->add($i18n->get('error.field'), $i18n->get('form.group_edit.allow_ip'));
   }
   // 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';
+    // 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';
+    if ($cl_work_units)
+      $plugins .= ',wu';
 
-      // 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';
+    // 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, ',');
+    $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 config.
+    $config->setDefinedValue('show_holidays', $cl_show_holidays);
+    $config->setDefinedValue('punch_mode', $cl_punch_mode);
+    $config->setDefinedValue('allow_overlap', $cl_allow_overlap);
+    $config->setDefinedValue('future_entries', $cl_future_entries);
+    $config->setDefinedValue('uncompleted_indicators', $cl_uncompleted_indicators);
 
-      $update_result = ttTeamHelper::update($user->group_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) {
+    if ($user->updateGroup(array(
+      'name' => $cl_group,
+      '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,
+      'allow_ip' => $cl_allow_ip,
+      'plugins' => $plugins,
+      'config' => $config->getConfig()))) {
       header('Location: time.php');
       exit();
     } else