X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=plugins.php;h=1c0a076bb2a18bdfe2ca6f9c6b5360a500abe072;hb=5c582eb5bacc8b3d9d2775ade454590c71b113ec;hp=5c830149b7ccddc91c5791e53814eb177a8ebbc2;hpb=dc825d15a8f66df15a52af1275fbaad594e93aa1;p=timetracker.git

diff --git a/plugins.php b/plugins.php
index 5c830149..1c0a076b 100644
--- a/plugins.php
+++ b/plugins.php
@@ -34,22 +34,10 @@ if (!ttAccessAllowed('manage_features')) {
   header('Location: access_denied.php');
   exit();
 }
-if ($request->isPost() && $request->getParameter('group_changed') && !$user->isGroupValid($request->getParameter('group'))) {
-  header('Location: access_denied.php'); // Wrong group id in post.
-  exit();
-}
 // End of access checks.
 
-// TODO: re-structure the file, perhaps by separating post and get processing into whole different sections.
-if ($request->isPost() && $request->getParameter('group_changed')) {
-  $group_id = $request->getParameter('group');
-  $user->setOnBehalfGroup($group_id);
-} else {
-  $group_id = $user->getGroup();
-}
-
 if ($request->isPost()) {
-  // Plugin checkboxes.
+  // Plugins that user wants to save for the current group.
   $cl_charts = $request->getParameter('charts');
   $cl_clients = $request->getParameter('clients');
   $cl_client_required = $request->getParameter('client_required');
@@ -63,8 +51,13 @@ if ($request->isPost()) {
   $cl_quotas = $request->getParameter('quotas');
   $cl_week_view = $request->getParameter('week_view');
   $cl_work_units = $request->getParameter('work_units');
+  $cl_approval = $request->getParameter('approval');
+  $cl_timesheets = $request->getParameter('timesheets');
+  $cl_templates = $request->getParameter('templates');
+  $cl_attachments = $request->getParameter('attachments');
 } else {
-  // Which plugins do we have enabled?
+  // Note: we get here in get, and also in post when group changes.
+  // Which plugins do we have enabled in currently selected group?
   $plugins = explode(',', $user->getPlugins());
   $cl_charts = in_array('ch', $plugins);
   $cl_clients = in_array('cl', $plugins);
@@ -79,25 +72,14 @@ if ($request->isPost()) {
   $cl_quotas = in_array('mq', $plugins);
   $cl_week_view = in_array('wv', $plugins);
   $cl_work_units = in_array('wu', $plugins);
+  $cl_approval = in_array('ap', $plugins);
+  $cl_timesheets = in_array('ts', $plugins);
+  $cl_templates = in_array('tp', $plugins);
+  $cl_attachments = in_array('at', $plugins);
 }
 
 $form = new Form('pluginsForm');
 
-if ($user->can('manage_subgroups')) {
-  $groups = $user->getGroupsForDropdown();
-  if (count($groups) > 1) {
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'document.pluginsForm.group_changed.value=1;document.pluginsForm.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);
-  }
-}
-
 // Plugin checkboxes.
 $form->addInput(array('type'=>'checkbox','name'=>'charts','value'=>$cl_charts));
 $form->addInput(array('type'=>'checkbox','name'=>'clients','value'=>$cl_clients,'onchange'=>'handlePluginCheckboxes()'));
@@ -112,72 +94,76 @@ $form->addInput(array('type'=>'checkbox','name'=>'locking','value'=>$cl_locking,
 $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'=>'checkbox','name'=>'approval','value'=>$cl_approval));
+$form->addInput(array('type'=>'checkbox','name'=>'timesheets','value'=>$cl_timesheets));
+$form->addInput(array('type'=>'checkbox','name'=>'templates','value'=>$cl_templates,'onchange'=>'handlePluginCheckboxes()'));
+$form->addInput(array('type'=>'checkbox','name'=>'attachments','value'=>$cl_attachments,'onchange'=>'handlePluginCheckboxes()'));
 
+// Submit button.
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 
-$form->setValueByElement('group_changed','');
-
 if ($request->isPost()) {
-  if ($request->getParameter('group_changed')) {
-    // User changed the group in dropdown.
-    // Redirect to self.
-    header('Location: plugins.php');
+  // Note: we get here when the Save button is clicked.
+  // We update plugin list for the current group.
+
+  // 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';
+  if ($cl_approval)
+    $plugins .= ',ap';
+  if ($cl_timesheets)
+    $plugins .= ',ts';
+  if ($cl_templates)
+    $plugins .= ',tp';
+  if ($cl_attachments)
+    $plugins .= ',at';
+
+  // Recycle week view plugin options as they are not configured on this page.
+  $existing_plugins = explode(',', $user->getPlugins());
+  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, ',');
+
+  if ($user->updateGroup(array(
+    'plugins' => $plugins))) {
+    header('Location: success.php');
     exit();
-  }
-
-  // Validate user input. Do we have to?
-
-  if ($err->no()) {
-    // 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->getPlugins());
-    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, ',');
-
-    if ($user->updateGroup(array(
-      'plugins' => $plugins))) {
-      header('Location: success.php');
-      exit();
-    } else
-      $err->add($i18n->get('error.db'));
-  }
+  } else
+    $err->add($i18n->get('error.db'));
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="handlePluginCheckboxes();"');
+$smarty->assign('user_exists', $user->exists());
 $smarty->assign('title', $i18n->get('title.plugins'));
 $smarty->assign('content_page_name', 'plugins.tpl');
 $smarty->display('index.tpl');