Added data officer role

Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO
2019-07-14 21:58:18 +02:00
parent 0c830b1276
commit ea3b0c372b
23 changed files with 163 additions and 18 deletions

View File

@ -0,0 +1,51 @@
<div id="sspinner" class="alert alert-info lead"><i class="icon-spinner icon-spin icon-2x pull-left"></i><?php print $text_working; ?></div>
<div id="resultscontainer" class="boxlistcontent<?php if($n <= 0) { ?> empty<?php } ?>" >
<table id="resultstable" class="table table-striped table-condensed">
<thead id="resultstop">
<tr class="resultrow">
<th class="auditcell date header">
<?php print $text_date; ?>
<a xid="date" xorder="1" onclick="Piler.changeOrder(this);"><i class="icon-chevron-up"></i></a>
<a xid="date" xorder="0" onclick="Piler.changeOrder(this);"><i class="icon-chevron-down"></i></a>
</th>
<th class="auditcell user header">
<?php print $text_user; ?>
<a xid="user" xorder="1" onclick="Piler.changeOrder(this);"><i class="icon-chevron-up"></i></a>
<a xid="user" xorder="0" onclick="Piler.changeOrder(this);"><i class="icon-chevron-down"></i></a>
</th>
<th class="auditcell action header">
<?php print $text_delete; ?>
<a xid="action" xorder="1" onclick="Piler.changeOrder(this);"><i class="icon-chevron-up"></i></a>
<a xid="action" xorder="0" onclick="Piler.changeOrder(this);"><i class="icon-chevron-down"></i></a>
</th>
<th class="auditcell description header">
<?php print $text_description; ?>
</th>
<th class="auditcell ref header">
<?php print $text_ref; ?>
</th>
</tr>
</thead>
<tbody>
<?php $i=0; foreach ($data as $d) { $i++; ?>
<tr class="resultrow<?php if($i % 2) { ?> odd<?php } ?>">
<td class="auditcell date"><?php print date(DATE_TEMPLATE . " H:i", $d['date1']); ?></td>
<td class="auditcell user"><?php print $d['email']; ?></td>
<td class="auditcell date"><?php print $d['deleted']; ?></td>
<td class="auditcell ip"><?php print $d['reason']; ?></td>
<td class="auditcell ref"><?php if($d['deleted'] == 0) { ?><a href="#" onclick="Piler.view_message(<?php print $d['id']; ?>);"><?php } print $d['id']; if($d['deleted'] == 0) { ?></a><?php } ?></td>
</tr>
<?php } ?>
</tbody>
</table>
</div>
<!--div id="messagelistfooter" class="boxfooter">
</div-->

View File

@ -62,7 +62,7 @@
</div>
<div class="modal-footer">
<a href="#" class="btn" data-dismiss="modal" aria-hidden="true"><?php print $text_close; ?></a>
<a href="#" onclick="var reason = $('#reason').val(); if(reason) { Piler.bulk_remove_messages(reason, '<?php print $text_successfully_removed; ?>'); }" class="btn btn-primary" data-dismiss="modal" aria-hidden="true">OK</a>
<a href="#" onclick="var reason = $('#reason').val(); if(reason) { Piler.bulk_remove_messages(reason, '<?php if(NEED_TO_APPROVE_DELETE) { print $text_need_to_approve_removal; } else { print $text_successfully_removed; } ?>'); }" class="btn btn-primary" data-dismiss="modal" aria-hidden="true">OK</a>
</div>
</div>
<?php } ?>

View File

@ -27,6 +27,9 @@
<li><a href="index.php?route=health/health"><i class="icon-medkit"></i>&nbsp;<?php print $text_health; ?></a></li>
<?php if(ENABLE_AUDIT == 1) { ?>
<li><a href="index.php?route=audit/audit"><i class="icon-book"></i>&nbsp;<?php print $text_audit; ?></a></li>
<?php } ?>
<?php if(ENABLE_DELETE == 1) { ?>
<li><a href="index.php?route=audit/removal"><i class="icon-eraser"></i>&nbsp;<?php print $text_remove; ?></a></li>
<?php } ?>
</ul>
</li>

View File

@ -128,6 +128,7 @@
<option value="0"<?php if(isset($post['isadmin']) && $post['isadmin'] == 0){ ?> selected="selected"<?php } ?>><?php print $text_user_regular; ?></option>
<?php if(Registry::get('admin_user') == 1) { ?><option value="1"<?php if(isset($post['isadmin']) && $post['isadmin'] == 1){ ?> selected="selected"<?php } ?>><?php print $text_user_masteradmin; ?></option><?php } ?>
<option value="2"<?php if(isset($post['isadmin']) && $post['isadmin'] == 2){ ?> selected="selected"<?php } ?>><?php print $text_user_auditor; ?></option>
<option value="4"<?php if(isset($post['isadmin']) && $post['isadmin'] == 4){ ?> selected="selected"<?php } ?>><?php print $text_user_data_officer; ?></option>
</select>
</div>
</div>

View File

@ -139,6 +139,7 @@
<option value="0"<?php if(isset($user['isadmin']) && $user['isadmin'] == 0){ ?> selected="selected"<?php } ?>><?php print $text_user_regular; ?></option>
<?php if(Registry::get('admin_user') == 1) { ?><option value="1"<?php if(isset($user['isadmin']) && $user['isadmin'] == 1){ ?> selected="selected"<?php } ?>><?php print $text_user_masteradmin; ?></option><?php } ?>
<option value="2"<?php if(isset($user['isadmin']) && $user['isadmin'] == 2){ ?> selected="selected"<?php } ?>><?php print $text_user_auditor; ?></option>
<option value="4"<?php if(isset($user['isadmin']) && $user['isadmin'] == 2){ ?> selected="selected"<?php } ?>><?php print $text_user_data_officer; ?></option>
</select>
</div>
</div>

View File

@ -57,6 +57,7 @@
if($user['isadmin'] == 0){ print $text_user_regular; }
if($user['isadmin'] == 1){ print $text_user_masteradmin; }
if($user['isadmin'] == 2){ print $text_user_auditor; }
if($user['isadmin'] == 4){ print $text_user_data_officer; }
?>
</td>
<td><a href="index.php?route=user/edit&amp;uid=<?php print $user['uid']; ?>"><i class="icon-edit"></i>&nbsp;<?php print $text_edit_or_view; ?></a></td>