From 3090989dea3b456b3fe5895e4257a7d457250bee Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Fri, 9 Oct 2020 00:37:28 +0200
Subject: [PATCH] Fixed accounts editor for OTServ, which dont have
 accounts.group_id

---
 system/pages/admin/accounts.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/system/pages/admin/accounts.php b/system/pages/admin/accounts.php
index a9e2c3da..ded959c9 100644
--- a/system/pages/admin/accounts.php
+++ b/system/pages/admin/accounts.php
@@ -204,7 +204,7 @@ else if (isset($_REQUEST['search'])) {
 			}
 		}
 	} else if ($id == 0) {
-		$accounts_db = $db->query('SELECT `id`, `name`,' . ($hasTypeColumn ? 'type' : 'group_id') . ' FROM `accounts` ORDER BY `id` ASC');
+		$accounts_db = $db->query('SELECT `id`, `name`' . ($hasTypeColumn ? ',type' : ($hasGroupColumn ? ',group_id' : '')) . ' FROM `accounts` ORDER BY `id` ASC');
 		?>
 		<div class="col-12 col-sm-12 col-lg-10">
 			<div class="card card-info card-outline">
@@ -217,7 +217,9 @@ else if (isset($_REQUEST['search'])) {
 						<tr>
 							<th>ID</th>
 							<th>Name</th>
+							<?php if($hasTypeColumn || $hasGroupColumn): ?>
 							<th>Position</th>
+							<?php endif; ?>
 							<th style="width: 40px">Edit</th>
 						</tr>
 						</thead>
@@ -226,6 +228,7 @@ else if (isset($_REQUEST['search'])) {
 							<tr>
 								<th><?php echo $account_lst['id']; ?></th>
 								<td><?php echo $account_lst['name']; ?></a></td>
+								<?php if($hasTypeColumn || $hasGroupColumn): ?>
 								<td>
 									<?php if ($hasTypeColumn) {
 										echo $acc_type[$account_lst['type']];
@@ -234,6 +237,7 @@ else if (isset($_REQUEST['search'])) {
 										echo $group[$account_lst['group_id']];
 									} ?>
 								</td>
+								<?php endif; ?>
 								<td><a href="?p=accounts&id=<?php echo $account_lst['id']; ?>" class="btn btn-success btn-sm" title="Edit">
 										<i class="fas fa-pencil-alt"></i>
 									</a>