Removed group selector from users.php page to keep things simple.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index d2754e7..d7560f9 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.18.29.4636 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.29.4637 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/WEB-INF/templates/users.tpl b/WEB-INF/templates/users.tpl
index 4faf124..236475c 100644 (file)
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -6,16 +6,6 @@
   <tr>
     <td valign="top">
 {if $user->can('manage_users')}
-  {if $group_dropdown}
-{$forms.usersForm.open} {* usersForm consists only of one dropdown group control *}
-      <table width="100%">
-        <tr>
-          <td align="center">{$i18n.label.group}: {$forms.usersForm.group.control}</td>
-        </tr>
-      </table>
-{$forms.usersForm.close}
-  {/if}
-
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
   {if $inactive_users}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.users.active_users}</td></tr>

diff --git a/users.php b/users.php
index 77b7e55..d19ba7d 100644 (file)
--- a/users.php
+++ b/users.php
@@ -36,36 +36,8 @@ if (!(ttAccessAllowed('view_users') || ttAccessAllowed('manage_users'))) {
   header('Location: access_denied.php');
   exit();
 }
-if ($request->isPost() && !$user->isGroupValid($request->getParameter('group'))) {
-  header('Location: access_denied.php'); // Wrong group id in post.
-  exit();
-}
-// Note: we don't use "manage_subgroups" in access check, because when user cannot
-// "manage_users" or "view_users" they do not belong here.
 // End of access checks.
 
-if ($request->isPost()) {
-  $group_id = $request->getParameter('group');
-  $user->setOnBehalfGroup($group_id);
-} else {
-  $group_id = $user->getGroup();
-}
-
-$form = new Form('usersForm');
-if ($user->can('manage_subgroups')) {
-  $groups = $user->getGroupsForDropdown();
-  if (count($groups) > 1) {
-    $form->addInput(array('type'=>'combobox',
-      'onchange'=>'this.form.submit();',
-      'name'=>'group',
-      'style'=>'width: 250px;',
-      'value'=>$group_id,
-      'data'=>$groups,
-      'datakeys'=>array('id','name')));
-    $smarty->assign('group_dropdown', 1);
-  }
-}
-
 // Prepare a list of active users.
 if ($user->can('view_users'))
   $options = array('status'=>ACTIVE,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
@@ -88,7 +60,6 @@ if ($uncompleted_indicators) {
   $smarty->assign('uncompleted_indicators', true);
 }
 
-$smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('active_users', $active_users);
 $smarty->assign('inactive_users', $inactive_users);
 $smarty->assign('title', $i18n->get('title.users'));