do not display blocked and not activated users

diff --git a/tmpl/pages/avocats.php b/tmpl/pages/avocats.php
index 2904606..fbfce43 100644 (file)
--- a/tmpl/pages/avocats.php
+++ b/tmpl/pages/avocats.php
@@ -1,5 +1,5 @@
 <?php
-  $sql = "SELECT case when srv.service = 'rendezvous' and srv.expiration >= CURRENT_DATE then 1 else null end as rendezvous_active,usr.* from users usr left join userservices srv on (usr.id=srv.id_user) where usr.usergroup in ('administrator','avocat') group by usr.id;";
+  $sql = "SELECT case when srv.service = 'rendezvous' and srv.expiration >= CURRENT_DATE then 1 else null end as rendezvous_active,usr.* from users usr left join userservices srv on (usr.id=srv.id_user) where usr.usergroup in ('administrator','avocat') and usr.userblocked != 1 and usr.activationkey is null group by usr.id;";
   $avocats = $db->dbqueryall($sql);
   if ($avocats){
 ?>

diff --git a/tmpl/pages/tabledeprix.php b/tmpl/pages/tabledeprix.php
index fbf70e7..0136062 100644 (file)
--- a/tmpl/pages/tabledeprix.php
+++ b/tmpl/pages/tabledeprix.php
@@ -14,7 +14,7 @@
         <li class="list-group-item">Visible dans l'annuaire</li>
         <li class="list-group-item list-group-item-dark"><strong>Service Rendez-Vous</strong></li>
         <li class="list-group-item">Periode d'évaluation 1 mois gratuit</li>
-        <li class="list-group-item list-group-item-dark"><strong>Système Billjee</strong></li>
+        <li class="list-group-item list-group-item-dark"><strong>Service Billjee</strong></li>
         <li class="list-group-item">Periode d'évaluation 1 mois gratuit</li>
       </ul>
     </div>