From 224ccab95064f6209c41fd423032f5e8e4f2f384 Mon Sep 17 00:00:00 2001
From: Daniel Preussker <preussker@quxlabs.com>
Date: Sat, 21 Nov 2015 12:15:42 +0000
Subject: [PATCH] Fixed adduser bug Always show notification bubble Added
 tooltip to archive's sticky button

---
 html/includes/authentication/mysql.inc.php | 2 +-
 html/includes/print-menubar.php            | 4 +---
 html/pages/notifications.inc.php           | 4 +++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/html/includes/authentication/mysql.inc.php b/html/includes/authentication/mysql.inc.php
index 5fdf20fb8b..0248d66b30 100644
--- a/html/includes/authentication/mysql.inc.php
+++ b/html/includes/authentication/mysql.inc.php
@@ -110,7 +110,7 @@ function adduser($username, $password, $level, $email='', $realname='', $can_mod
         }
         else {
             foreach (dbFetchRows('select notifications.* from notifications where not exists( select 1 from notifications_attribs where notifications.notifications_id = notifications_attribs.notifications_id and notifications_attribs.user_id = ?) order by notifications.notifications_id desc',array($userid)) as $notif) {
-                dbInsert(array('notifications_id'=>$notif['notification_id'],'user_id'=>$userid,'key'=>'read','value'=>1),'notifications_attribs');
+                dbInsert(array('notifications_id'=>$notif['notifications_id'],'user_id'=>$userid,'key'=>'read','value'=>1),'notifications_attribs');
             }
         }
         return $userid;
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 05eabc91c3..61116e193e 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -490,9 +490,7 @@ if(is_file("includes/print-menubar-custom.inc.php")) {
     <ul class="nav navbar-nav navbar-right">
 <?php
 $notifications = new ObjCache('notifications');
-if (($notifications['sticky_count']+$notifications['count']) != 0) {
-    echo '       <li><a href="notifications/"><span class="badge count-notif">'.($notifications['sticky_count']+$notifications['count']).'</span></a></li>';
-}
+echo '       <li><a href="notifications/"><span class="badge count-notif">'.($notifications['sticky_count']+$notifications['count']).'</span></a></li>';
 ?>
       <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-cog fa-fw fa-lg fa-nav-icons"></i></a>
diff --git a/html/pages/notifications.inc.php b/html/pages/notifications.inc.php
index 0bb6d90dea..7d8543a485 100644
--- a/html/pages/notifications.inc.php
+++ b/html/pages/notifications.inc.php
@@ -127,7 +127,7 @@ $notifications = new ObjCache('notifications');
   <div class="well">
     <div class="row">
       <div class="col-md-12">
-        <h4 id="<?php echo $notif['notifications_id']; ?>"><?php echo $notif['title']; ?><button class="btn btn-primary fa fa-bell-o pull-right stick-notif" style="margin-top:-10px;"></button></h4>
+        <h4 id="<?php echo $notif['notifications_id']; ?>"><?php echo $notif['title']; echo ($_SESSION['userlevel'] == 10 ? '<span class="pull-right"><button class="btn btn-primary fa fa-bell-o stick-notif" data-toggle="tooltip" data-placement="bottom" title="Mark as Sticky" style="margin-top:-10px;"></button></span>' : ''); ?>
       </div>
     </div>
     <div class="row">
@@ -175,6 +175,7 @@ $(function() {
   });
 
   $(document).on( "click", ".read-notif", function() {
+    $(this).attr("disabled", true);
     var notif = $(this).parent().parent().attr('id');
     $.ajax({
       type: 'POST',
@@ -190,6 +191,7 @@ $(function() {
           });
         }
         else {
+          $(this).attr("disabled", false);
           $("#message").html('<div class="alert alert-info">' + data.message + '</div>');
         }
       }