Merge pull request #788 from twetech/topnav-notification-fix

Removed useless assignment

top_nav.php

@@ -4,7 +4,8 @@
     <!-- Left navbar links -->
     <ul class="navbar-nav">
         <li class="nav-item">
-      <a class="nav-link" data-widget="pushmenu" data-enable-remember="TRUE" href="#"><i class="fas fa-bars"></i></a>
+            <a class="nav-link" data-widget="pushmenu" data-enable-remember="TRUE" href="#"><i
+                    class="fas fa-bars"></i></a>
         </li>
     </ul>
 
@@ -15,7 +16,8 @@
         <!-- SEARCH FORM -->
         <form class="form-inline" action="global_search.php">
             <div class="input-group input-group-sm">
-        <input class="form-control form-control-navbar" type="search" placeholder="Search" name="query" value="<?php if (isset($_GET['query'])) { echo nullable_htmlentities($_GET['query']); } ?>">
+                <input class="form-control form-control-navbar" type="search" placeholder="Search" name="query"
+                    value="<?php if (isset($_GET['query'])) { echo nullable_htmlentities($_GET['query']); } ?>">
                 <div class="input-group-append">
                     <button class="btn btn-navbar" type="submit">
                         <i class="fas fa-search"></i>
@@ -53,7 +55,9 @@
 
             </a>
             <div class="dropdown-menu dropdown-menu-xlg dropdown-menu-right" style="left: inherit; right: 0px;">
-        <a href="notifications.php" class="dropdown-item dropdown-header"><i class="fas fa-fw fa-bell mr-2"></i><strong><?php echo $num_notifications; ?></strong> Notifications</a>
+                <a href="notifications.php" class="dropdown-item dropdown-header"><i
+                        class="fas fa-fw fa-bell mr-2"></i><strong><?php echo $num_notifications; ?></strong>
+                    Notifications</a>
                 <div class="dropdown-divider"></div>
                 <?php
         while ($row = mysqli_fetch_array($sql_notifications)) {
@@ -63,16 +67,15 @@
             $notification_action = nullable_htmlentities($row['notification_action']);
             $notification_timestamp = date('M d g:ia',strtotime($row['notification_timestamp']));
             $notification_client_id = intval($row['notification_client_id']);
-            if(!empty($notification_action)){
+            if(empty($notification_action)){
-              $notification_action = $notification_action;
-            } else {
                 $notification_action = "#";
             }
         ?>
                 <div class="dropdown-item">
                     <a class="text-dark" href="<?php echo $notification_action; ?>">
                         <p class="mb-1">
-              <span class="text-bold"><i class="fas fa-bullhorn mr-2"></i><?php echo $notification_type; ?></span>
+                            <span class="text-bold"><i
+                                    class="fas fa-bullhorn mr-2"></i><?php echo $notification_type; ?></span>
                             <small class="text-muted mt-1 float-right"><?php echo $notification_timestamp; ?></small>
                         </p>
                         <small class="text-secondary"><?php echo $notification; ?></small>
@@ -84,7 +87,9 @@
         ?>
 
                 <div class="dropdown-divider"></div>
-        <a href="post.php?dismiss_all_notifications" class="dropdown-item dropdown-footer text-secondary text-bold"><i class="fa fa-fw fa-check mr-2"></i>Dismiss Notifications</a>
+                <a href="post.php?dismiss_all_notifications"
+                    class="dropdown-item dropdown-footer text-secondary text-bold"><i
+                        class="fa fa-fw fa-check mr-2"></i>Dismiss Notifications</a>
             </div>
         </li>
         <?php } else { ?>
@@ -100,7 +105,8 @@
                     <i class='far fa-fw fa-4x fa-bell'></i>
                 </div>
                 <div class="dropdown-divider"></div>
-        <a href="notifications_dismissed.php" class="dropdown-item dropdown-footer">See Dismissed Notifications</a>
+                <a href="notifications_dismissed.php" class="dropdown-item dropdown-footer">See Dismissed
+                    Notifications</a>
             </div>
         </li>
 
@@ -113,9 +119,11 @@
                 <?php if (empty($session_avatar)) { ?>
                 <i class="fa fa-fw fa-user"></i>
                 <?php }else{ ?>
-        <img src="<?php echo "uploads/users/$session_user_id/$session_avatar"; ?>" class="user-image img-circle">
+                <img src="<?php echo "uploads/users/$session_user_id/$session_avatar"; ?>"
+                    class="user-image img-circle">
                 <?php } ?>
-        <span class="d-none d-md-inline dropdown-toggle"><?php echo stripslashes(nullable_htmlentities($session_name)); ?></span>
+                <span
+                    class="d-none d-md-inline dropdown-toggle"><?php echo stripslashes(nullable_htmlentities($session_name)); ?></span>
             </a>
             <ul class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
                 <!-- User image -->
@@ -133,8 +141,10 @@
                 </li>
                 <!-- Menu Footer-->
                 <li class="user-footer">
-          <a href="user_profile.php" class="btn btn-default btn-flat"><i class="fas fa-cog mr-2"></i>Profile</a>
+                    <a href="user_profile.php" class="btn btn-default btn-flat"><i
-          <a href="post.php?logout" class="btn btn-default btn-flat float-right"><i class="fas fa-sign-out-alt mr-2"></i>Sign out</a>
+                            class="fas fa-cog mr-2"></i>Profile</a>
+                    <a href="post.php?logout" class="btn btn-default btn-flat float-right"><i
+                            class="fas fa-sign-out-alt mr-2"></i>Sign out</a>
                 </li>
             </ul>
         </li>