ThaMunsta/itflow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into stage
Some checks failed
SQL Syntax Check for db.sql / Check db.sql SQL Syntax (pull_request) Failing after 18s
Details
PHPLint / build (pull_request) Successful in 26s
Details
Welcome New Contributor / run (pull_request_target) Successful in 22s
Details

Browse Source 
# Conflicts:
#	guest/guest_post.php
This commit is contained in:
Mike Johnston
2025-10-21 13:07:25 -04:00
parent 57ae6b0c4c 0d5bfdafdf
commit ca551406c7
2998 changed files with 196488 additions and 27619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
includes/top_nav.php
View File

@@ -50,7 +50,7 @@ $placeholder = array(
shuffle($placeholder);
?>
<!-- SEARCH FORM -->
<form class="form-inline" action="global_search.php">
<form class="form-inline" action="/agent/global_search.php">
<div class="input-group input-group-sm">
<input class="form-control form-control-navbar" type="search" placeholder="<?php echo $placeholder[0]?>" name="query"
value="<?php if (isset($_GET['query'])) { echo nullable_htmlentities($_GET['query']); } ?>">
@@ -102,10 +102,7 @@ shuffle($placeholder);
?>
<li class="nav-item">
<a class="nav-link" href="#"
data-toggle="ajax-modal"
data-ajax-url="ajax/ajax_notifications.php"
>
<a class="nav-link ajax-modal" href="#" data-modal-url="/modals/notifications.php">
<i class="fas fa-bell"></i>
<?php if ($num_notifications) { ?>
<span class="badge badge-light badge-pill navbar-badge position-absolute" style="top: 1px; right: 3px;">
@@ -120,7 +117,7 @@ shuffle($placeholder);
<?php if (empty($session_avatar)) { ?>
<i class="fas fa-user-circle mr-1"></i>
<?php }else{ ?>
<img src="<?php echo "uploads/users/$session_user_id/$session_avatar"; ?>"
<img src="<?php echo "/uploads/users/$session_user_id/$session_avatar"; ?>"
class="user-image img-circle">
<?php } ?>
<span
@@ -133,7 +130,7 @@ shuffle($placeholder);
<i class="fas fa-user-circle fa-6x"></i>
<?php }else{ ?>
<img src="<?php echo "uploads/users/$session_user_id/$session_avatar"; ?>" class="img-circle">
<img src="<?php echo "/uploads/users/$session_user_id/$session_avatar"; ?>" class="img-circle">
<?php } ?>
<p>
<?php echo stripslashes(nullable_htmlentities($session_name)); ?>
@@ -143,18 +140,14 @@ shuffle($placeholder);
<!-- Menu Footer-->
<li class="user-footer">
<?php if ($session_is_admin) { ?>
<a href="admin_user.php" class="btn btn-default btn-block btn-flat mb-2"><i class="fas fa-user-shield mr-2"></i>Administration</a>
<a href="/admin" class="btn btn-default btn-block btn-flat mb-2"><i class="fas fa-user-shield mr-2"></i>Administration</a>
<?php } ?>
<a href="user_details.php" class="btn btn-default btn-flat"><i class="fas fa-user-cog mr-2"></i>Account</a>
<a href="post.php?logout" class="btn btn-default btn-flat float-right"><i class="fas fa-sign-out-alt mr-2"></i>Logout</a>
<a href="/agent/user/user_details.php" class="btn btn-default btn-flat"><i class="fas fa-user-cog mr-2"></i>Account</a>
<a href="/agent/post.php?logout" class="btn btn-default btn-flat float-right"><i class="fas fa-sign-out-alt mr-2"></i>Logout</a>
</li>
</ul>
</li>
</ul>
</nav>
<?php if ($config_module_enable_ticketing == 1) {
include_once __DIR__ . "/../modals/top_nav_tickets_modal.php";
} ?>
<!-- /.navbar -->