ignores

[platal.git] / htdocs / marketing / index.php

diff --git a/htdocs/marketing/index.php b/htdocs/marketing/index.php
index f6e22d7..d908c7b 100644 (file)
--- a/htdocs/marketing/index.php
+++ b/htdocs/marketing/index.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2004 Polytechnique.org                              *
+ *  Copyright (C) 2003-2006 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -27,15 +27,15 @@ $page->assign('xorg_title','Polytechnique.org - Marketing');
 
 $res   = $globals->xdb->query(
           "SELECT COUNT(*) AS vivants,
-                  COUNT(NULLIF(perms!='pending', 0)) AS inscrits,
-                  100*COUNT(NULLIF(perms!='pending', 0))/COUNT(*) AS ins_rate,
+                  COUNT(NULLIF(perms='admin' OR perms='user', 0)) AS inscrits,
+                  100*COUNT(NULLIF(perms='admin' OR perms='user', 0))/COUNT(*) AS ins_rate,
                   COUNT(NULLIF(promo >= 1972, 0)) AS vivants72,
-                  COUNT(NULLIF(promo >= 1972 AND perms!='pending', 0)) AS inscrits72,
-                  100 * COUNT(NULLIF(promo >= 1972 AND perms!='pending', 0)) /
+                  COUNT(NULLIF(promo >= 1972 AND (perms='admin' OR perms='user'), 0)) AS inscrits72,
+                  100 * COUNT(NULLIF(promo >= 1972 AND (perms='admin' OR perms='user'), 0)) /
                       COUNT(NULLIF(promo >= 1972, 0)) AS ins72_rate,
                   COUNT(NULLIF(FIND_IN_SET('femme', flags), 0)) AS vivantes,
-                  COUNT(NULLIF(FIND_IN_SET('femme', flags) AND perms!='pending', 0)) AS inscrites,
-                  100 * COUNT(NULLIF(FIND_IN_SET('femme', flags) AND perms!='pending', 0)) /
+                  COUNT(NULLIF(FIND_IN_SET('femme', flags) AND (perms='admin' OR perms='user'), 0)) AS inscrites,
+                  100 * COUNT(NULLIF(FIND_IN_SET('femme', flags) AND (perms='admin' OR perms='user'), 0)) /
                       COUNT(NULLIF(FIND_IN_SET('femme', flags), 0)) AS inse_rate
              FROM auth_user_md5
             WHERE deces = 0");