mirror of
https://github.com/itflow-org/itflow
synced 2026-03-16 02:34:50 +00:00
Merge branch 'develop' of github.com:itflow-org/itflow into develop
This commit is contained in:
@@ -576,7 +576,7 @@ if (isset($_POST['assign_ticket'])) {
|
|||||||
$agent_name = "No One";
|
$agent_name = "No One";
|
||||||
} else {
|
} else {
|
||||||
// Get & verify assigned agent details
|
// Get & verify assigned agent details
|
||||||
$agent_details_sql = mysqli_query($mysqli, "SELECT user_name, user_email FROM users LEFT JOIN user_settings ON users.user_id = user_settings.user_id WHERE users.user_id = $assigned_to AND users.user_role_id > 1");
|
$agent_details_sql = mysqli_query($mysqli, "SELECT user_name, user_email FROM users WHERE users.user_id = $assigned_to");
|
||||||
$agent_details = mysqli_fetch_array($agent_details_sql);
|
$agent_details = mysqli_fetch_array($agent_details_sql);
|
||||||
|
|
||||||
$agent_name = sanitizeInput($agent_details['user_name']);
|
$agent_name = sanitizeInput($agent_details['user_name']);
|
||||||
@@ -732,7 +732,7 @@ if (isset($_POST['bulk_assign_ticket'])) {
|
|||||||
$agent_name = "No One";
|
$agent_name = "No One";
|
||||||
} else {
|
} else {
|
||||||
// Get & verify assigned agent details
|
// Get & verify assigned agent details
|
||||||
$agent_details_sql = mysqli_query($mysqli, "SELECT user_name, user_email FROM users LEFT JOIN user_settings ON users.user_id = user_settings.user_id WHERE users.user_id = $assign_to AND user_settings.user_role > 1");
|
$agent_details_sql = mysqli_query($mysqli, "SELECT user_name, user_email FROM users LEFT JOIN user_settings ON users.user_id = user_settings.user_id WHERE users.user_id = $assign_to");
|
||||||
$agent_details = mysqli_fetch_array($agent_details_sql);
|
$agent_details = mysqli_fetch_array($agent_details_sql);
|
||||||
|
|
||||||
$agent_name = sanitizeInput($agent_details['user_name']);
|
$agent_name = sanitizeInput($agent_details['user_name']);
|
||||||
|
|||||||
@@ -41,9 +41,11 @@ $sql_recent_logs = mysqli_query($mysqli, "SELECT * FROM logs
|
|||||||
<?php } ?>
|
<?php } ?>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<div class="card-footer">
|
<?php if (isset($session_is_admin) && $session_is_admin === true) { ?>
|
||||||
<a href="admin_audit_log.php?q=<?php echo "$session_name successfully logged in"; ?>">See More...</a>
|
<div class="card-footer">
|
||||||
</div>
|
<a href="admin_audit_log.php?q=<?php echo "$session_name successfully logged in"; ?>">See More...</a>
|
||||||
|
</div>
|
||||||
|
<?php } ?>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="card card-dark">
|
<div class="card card-dark">
|
||||||
@@ -86,9 +88,11 @@ $sql_recent_logs = mysqli_query($mysqli, "SELECT * FROM logs
|
|||||||
?>
|
?>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<div class="card-footer">
|
<?php if (isset($session_is_admin) && $session_is_admin === true) { ?>
|
||||||
<a href="admin_audit_log.php?q=<?php echo nullable_htmlentities($session_name); ?>">See More...</a>
|
<div class="card-footer">
|
||||||
</div>
|
<a href="admin_audit_log.php?q=<?php echo nullable_htmlentities($session_name); ?>">See More...</a>
|
||||||
|
</div>
|
||||||
|
<?php } ?>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|||||||
Reference in New Issue
Block a user