From d3beb9e8d8b37e2b94c2cae911eddc6995551b6b Mon Sep 17 00:00:00 2001
From: JediKev <kevin@enhancesoft.com>
Date: Fri, 3 Nov 2017 12:55:13 -0500
Subject: [PATCH] issue: Org. User Account Status
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This addresses an issue where the User’s account status is always 'Active'
in the Organization list no matter what their actual status is. This adds the
account status to the user query which adds the correct status to the Users’
account.
---
include/staff/templates/users.tmpl.php | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/include/staff/templates/users.tmpl.php b/include/staff/templates/users.tmpl.php
index 7d56f26ef..112d25bf7 100644
--- a/include/staff/templates/users.tmpl.php
+++ b/include/staff/templates/users.tmpl.php
@@ -1,16 +1,18 @@
<?php
$qs = array();
-$select = 'SELECT user.*, email.address as email ';
+$select = 'SELECT user.*, email.address as email, account.status as status, account.id as account_id ';
$from = 'FROM '.USER_TABLE.' user '
- . 'LEFT JOIN '.USER_EMAIL_TABLE.' email ON (user.id = email.user_id) ';
+ . 'LEFT JOIN '.USER_EMAIL_TABLE.' email ON (user.id = email.user_id) '
+ . 'LEFT JOIN '.USER_ACCOUNT_TABLE.' account ON (user.id = account.user_id) ';
$where = ' WHERE user.org_id='.db_input($org->getId());
$sortOptions = array('name' => 'user.name',
'email' => 'email.address',
'create' => 'user.created',
- 'update' => 'user.updated');
+ 'update' => 'user.updated',
+ 'status' => 'account.status');
$orderWays = array('DESC'=>'DESC','ASC'=>'ASC');
$sort= ($_REQUEST['sort'] && $sortOptions[strtolower($_REQUEST['sort'])]) ? strtolower($_REQUEST['sort']) : 'name';
//Sorting options...
@@ -80,9 +82,9 @@ if ($num) { ?>
<thead>
<tr>
<th width="4%"> </th>
- <th width="38%"><?php echo __('Name'); ?></th>
- <th width="35%"><?php echo __('Email'); ?></th>
- <th width="8%"><?php echo __('Status'); ?></th>
+ <th width="30%"><?php echo __('Name'); ?></th>
+ <th width="33%"><?php echo __('Email'); ?></th>
+ <th width="18%"><?php echo __('Status'); ?></th>
<th width="15%"><?php echo __('Created'); ?></th>
</tr>
</thead>
@@ -93,7 +95,10 @@ if ($num) { ?>
while ($row = db_fetch_array($res)) {
$name = new UsersName($row['name']);
- $status = 'Active';
+ if (!$row['account_id'])
+ $status = __('Guest');
+ else
+ $status = new UserAccountStatus($row['status']);
$sel=false;
if($ids && in_array($row['id'], $ids))
$sel=true;
--
GitLab