First fix for WatchRegistration (need more)

diff --git a/classes/user.php b/classes/user.php
index 55762d4..113d3f6 100644 (file)
--- a/classes/user.php
+++ b/classes/user.php
@@ -493,6 +493,11 @@ class User extends PlUser
         return isset($this->contacts[$profile->id()]);
     }
 
+    public function isWatchedUser(Profile &$profile)
+    {
+        return in_array($profile->id(), $this->watchUsers());
+    }
+
     // Groupes X
     private $groups = null;
     public function groups()

diff --git a/classes/userfilter.php b/classes/userfilter.php
index 8abfe73..2931a05 100644 (file)
--- a/classes/userfilter.php
+++ b/classes/userfilter.php
@@ -1257,7 +1257,7 @@ class UFC_WatchRegistration extends UFC_UserRelated
         if (count($uids) == 0) {
             return PlFilterCondition::COND_FALSE;
         } else {
-            return XDB::format('$UID IN {?}', $uids);
+            return XDB::format('a.uid IN {?}', $uids);
         }
     }
 }

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 698a549..887f6cc 100644 (file)
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -71,9 +71,10 @@
 
   {if $withAuth}
   <div class="noprint bits">
+    {if $registered || (!$dead && $hasowner)}
     <div>
       {if !$registered && !$dead && $hasowner}
-        {if $show_action && ($show_action eq 'ajouter')}
+        {if !$smarty.session.user->isWatchedUser($profile)}
     <a href="carnet/notifs/add_nonins/{$user->login()}?token={xsrf_token}">{*
     *}{icon name=add title="Ajouter à la liste de mes surveillances"}</a>
         {else}
@@ -98,6 +99,7 @@
         {/if}
       {/if}
     </div>
+    {/if}
 
     {if hasPerm('admin') && $hasowner}
     <div>
@@ -154,7 +156,7 @@
         <td class="smaller" colspan="2">
           {"Ce"|sex:"Cette":$profile} camarade n'est pas {"inscrit"|sex:"inscrite":$profile}.
           <a href="marketing/public/{$user->login()}" class='popup'>Si tu connais son adresse email,
-          <strong>n'hésite pas à nous la transmettre !</a>
+          <strong>n'hésite pas à nous la transmettre !</strong></a>
         </td>
       </tr>
       {elseif $user->state neq 'disabled' && $user->lost}