X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=group_edit.php;h=1df99a1c534806a847042cd942988c3521dccfbb;hb=HEAD;hp=6ec572e9856d06236f36d17bb43ae9d34b1ebe1c;hpb=aba62f48b2293cde4cc39123deb92bd7935dc76b;p=timetracker.git diff --git a/group_edit.php b/group_edit.php index 6ec572e9..1df99a1c 100644 --- a/group_edit.php +++ b/group_edit.php @@ -30,19 +30,51 @@ require_once('initialize.php'); import('form.Form'); import('ttUserHelper'); import('ttRoleHelper'); +import('ttConfigHelper'); // Access checks. -if (!(ttAccessAllowed('manage_basic_settings') || ttAccessAllowed('manage_advanced_settings'))) { - header('Location: access_denied.php'); - exit(); +// There are 4 distinct situations: +// 1) Editing home group in get or post. +// 2) Editing a subgroup in get or post. +// We'll check access separately as it is about different right checks. +if ($request->isGet()) { + $group_id = $request->getParameter('id') ? $request->getParameter('id') : $user->getGroup(); +} else { + $group_id = $request->getParameter('group') ? $request->getParameter('group') : $user->getGroup(); +} +$home_group = $user->group_id == $group_id; +if ($home_group) { + // Editing home group. + if (!ttAccessAllowed('manage_basic_settings')) { + header('Location: access_denied.php'); // Not allowed to edit home group settings. + exit(); + } +} else { + // Editing a subgroup. + if (!ttAccessAllowed('manage_subgroups')) { + header('Location: access_denied.php'); // No right to manage subgroups. + exit(); + } + if (!$user->isSubgroupValid($group_id)) { + header('Location: access_denied.php'); // Wrong subgroup. + exit(); + } } // End of access checks. -$advanced_settings = $user->can('manage_advanced_settings'); +// Set on behalf group accordingly. +$groupChanged = $request->getParameter('group_changed'); +if ($request->isPost() && $groupChanged) { + $user->setOnBehalfGroup($group_id); +} + +$groups = $user->getGroupsForDropdown(); +$group = ttGroupHelper::getGroupAttrs($group_id); +$config = $user->getConfigHelper(); + if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$'); -if ($request->isPost()) { - $cl_team = trim($request->getParameter('team_name')); +if ($request->isPost() && !$groupChanged) { $cl_currency = trim($request->getParameter('currency')); if (!$cl_currency) $cl_currency = CURRENCY_DEFAULT; $cl_lang = $request->getParameter('lang'); @@ -50,7 +82,7 @@ if ($request->isPost()) { $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_holidays = trim($request->getParameter('holidays')); $cl_tracking_mode = $request->getParameter('tracking_mode'); $cl_project_required = $request->getParameter('project_required'); $cl_task_required = $request->getParameter('task_required'); @@ -59,60 +91,39 @@ if ($request->isPost()) { $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')); - $cl_allow_ip = trim($request->getParameter('allow_ip')); - - // 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'); + $cl_confirm_save = $request->getParameter('confirm_save'); } else { - $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; - $cl_allow_ip = $user->allow_ip; - - // 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); + $cl_currency = ($group['currency'] == ''? CURRENCY_DEFAULT : $group['currency']); + $cl_lang = $group['lang']; + $cl_decimal_mark = $group['decimal_mark']; + $cl_date_format = $group['date_format']; + $cl_time_format = $group['time_format']; + $cl_start_week = $group['week_start']; + $cl_holidays = $group['holidays']; + $cl_tracking_mode = $group['tracking_mode']; + $cl_project_required = $group['project_required']; + $cl_task_required = $group['task_required']; + $cl_record_type = $group['record_type']; + $cl_punch_mode = $config->getDefinedValue('punch_mode'); + $cl_allow_overlap = $config->getDefinedValue('allow_overlap'); + $cl_future_entries = $config->getDefinedValue('future_entries'); + $cl_uncompleted_indicators = $config->getDefinedValue('uncompleted_indicators'); + $cl_confirm_save = $config->getDefinedValue('confirm_save'); } $form = new Form('groupForm'); -$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'team_name','value'=>$cl_team,'enable'=>$advanced_settings)); +$form->addInput(array('type'=>'hidden','name'=>'id','value'=>$group_id)); +if (count($groups) > 1) { + $form->addInput(array('type'=>'combobox', + 'onchange'=>'document.groupForm.group_changed.value=1;document.groupForm.submit();', + 'name'=>'group', + 'style'=>'width: 250px;', + 'value'=>$group_id, + 'data'=>$groups, + 'datakeys'=>array('id','name'))); + $form->addInput(array('type'=>'hidden','name'=>'group_changed')); + $smarty->assign('group_dropdown', 1); +} $form->addInput(array('type'=>'text','maxlength'=>'7','name'=>'currency','value'=>$cl_currency)); // Prepare an array of available languages. @@ -145,8 +156,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);')); @@ -157,23 +168,23 @@ foreach ($i18n->weekdayNames as $id => $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)); +// Show holidays control. +$form->addInput(array('type'=>'text','name'=>'holidays','value'=>$cl_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'); +$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. @@ -188,120 +199,62 @@ $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. -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)); -} +// Confirm save checkbox. +$form->addInput(array('type'=>'checkbox','name'=>'confirm_save','value'=>$cl_confirm_save)); -// 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 ($user->can('delete_group')) $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('button.delete'))); -if ($request->isPost()) { - // Validate user input. - if (!ttValidString($cl_team, 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 ($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.profile.allow_ip')); - } - // Finished validating user input. - - if ($err->no()) { - $update_result = true; - if ($user->canManageTeam()) { +$form->setValueByElement('group_changed',''); - // 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 ($request->isPost()) { - // 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'; + if ($request->getParameter('btn_delete')) { + // Delete button pressed, redirect. + header('Location: group_delete.php?id='.$group_id); + exit(); + } - $plugins = trim($plugins, ','); + if ($request->getParameter('btn_save')) { + // Validate user input. + if (!ttValidString($cl_currency, true)) $err->add($i18n->get('error.field'), $i18n->get('label.currency')); + if (!ttValidHolidays($cl_holidays)) $err->add($i18n->get('error.field'), $i18n->get('form.group_edit.holidays')); + // Finished validating user input. - // 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, ','); + if ($err->no()) { + // Update config. + $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); + $config->setDefinedValue('confirm_save', $cl_confirm_save); - $update_result = ttTeamHelper::update($user->group_id, array( - 'name' => $cl_team, + if ($user->updateGroup(array( + 'group_id' => $group_id, '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, + 'holidays' => $cl_holidays, '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)); + 'config' => $config->getConfig()))) { + header('Location: success.php'); + exit(); + } else + $err->add($i18n->get('error.db')); } - if ($update_result) { - header('Location: time.php'); - exit(); - } else - $err->add($i18n->get('error.db')); } } // isPost -$smarty->assign('auth_external', $auth->isPasswordExternal()); +$smarty->assign('group_dropdown', count($groups) > 1); $smarty->assign('forms', array($form->getName()=>$form->toArray())); $smarty->assign('onload', 'onLoad="handleTaskRequiredCheckbox(); handlePluginCheckboxes();"'); -$smarty->assign('title', $i18n->get('title.group')); +$smarty->assign('title', $i18n->get('title.edit_group')); $smarty->assign('content_page_name', 'group_edit.tpl'); $smarty->display('index.tpl');