X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=bin%2Fcron%2Fcheckdb.php;h=98a22e75a8ba7bd023581d317f0fc5be8032045b;hb=f3f800d85b3328e5a8f90806f9d265d2702cbca5;hp=c56a8b68d3013750a2dbab58e92505ea48581525;hpb=be638e733bce413df4324d985297d9a4d94dcbca;p=platal.git

diff --git a/bin/cron/checkdb.php b/bin/cron/checkdb.php
index c56a8b6..98a22e7 100755
--- a/bin/cron/checkdb.php
+++ b/bin/cron/checkdb.php
@@ -80,7 +80,10 @@ check("SELECT  u.user_id, nom, prenom, promo,
            OR  (profile_freetext_pub != 'private' AND profile_freetext_pub != 'public')
            OR  (profile_medals_pub != 'private' AND profile_medals_pub != 'public')",
     "Utilisateur n'ayant pas de flag de publicite pour leurs donnees de profil");
-check("select uid from adresses where pub != 'private' and pub !='ax' and pub != 'public'", "Utiliseur n'ayant pas de flag de publicite pour une adresse");
+check("SELECT  pid
+         FROM  profile_addresses
+        WHERE  pub != 'private' AND pub !='ax' AND pub != 'public'",
+      "Utiliseur n'ayant pas de flag de publicité pour une adresse.");
 check("select uid from profile_phones where pub != 'private' and pub != 'ax' and pub != 'public'", "Utiliseur n'ayant pas de flag de publicite pour un numero de téléphone");
 check("select uid from profile_networking where pub != 'private' and pub != 'public'", "Utiliseur n'ayant pas de flag de publicité pour une adresse de networking");
 
@@ -110,10 +113,10 @@ check("select c.* from contacts as c left join auth_user_md5 as u on u.user_id=c
 check("select e.* from emails as e left join auth_user_md5 as u on u.user_id=e.uid where e.uid and u.prenom is null");
 
 /* validite de forums */
-check("select f.* from forums.abos as f left join auth_user_md5 as u on u.user_id=f.uid where u.prenom is null");
-check("select f.* from forums.abos as f left join forums.list as fd on fd.fid=f.fid where fd.nom is null");
-check("select f.* from forums.respofaqs as f left join forums.list as fd on fd.fid=f.fid where fd.nom is null");
-check("select f.* from forums.respofaqs as f left join auth_user_md5 as u on u.user_id=f.uid where u.prenom is null");
+check("select f.* from #forums#.abos as f left join #x4dat#.auth_user_md5 as u on u.user_id=f.uid where u.prenom is null");
+check("select f.* from #forums#.abos as f left join #forums#.list as fd on fd.fid=f.fid where fd.nom is null");
+check("select f.* from #forums#.respofaqs as f left join #forums#.list as fd on fd.fid=f.fid where fd.nom is null");
+check("select f.* from #forums#.respofaqs as f left join #x4dat#.auth_user_md5 as u on u.user_id=f.uid where u.prenom is null");
 
 /* validite de groupesx_ins */
 check("select g.* from groupesx_ins as g left join auth_user_md5 as u on u.user_id=g.guid where u.prenom is null");
@@ -123,19 +126,23 @@ check("select g.* from groupesx_ins as g left join groupesx_def as gd on g.gid=g
 check("select p.* from photo as p left join auth_user_md5 as u on u.user_id=p.uid where u.prenom is null");
 
 /* validite des formats téléphoniques */
-check("SELECT DISTINCT g.phoneprf from geoloc_pays AS g
-          WHERE EXISTS (SELECT h.phoneprf
-                          FROM geoloc_pays AS h
-                         WHERE h.phoneprf = g.phoneprf AND h.phoneformat != (SELECT i.phoneformat
-                                                                               FROM geoloc_pays AS i
-                                                                              WHERE i.phoneprf = g.phoneprf
-                                                                              LIMIT 1))",
+check("SELECT DISTINCT  g.phonePrefix
+                  FROM  geoloc_countries AS g
+          WHERE EXISTS  (SELECT  h.phonePrefix
+                           FROM  geoloc_countries AS h
+                          WHERE  h.phonePrefix = g.phonePrefix
+                                 AND h.phoneFormat != (SELECT  i.phoneFormat
+                                                         FROM  geoloc_countries AS i
+                                                        WHERE  i.phonePrefix = g.phonePrefix
+                                                        LIMIT  1))",
       "Préfixes téléphoniques qui ont des formats de numéros de téléphones différents selon les pays");
 
-/* validite des champ pays et region */
-check("SELECT a.uid, a.country FROM adresses AS a LEFT JOIN geoloc_pays AS gp ON a.country = gp.a2 WHERE gp.pays IS NULL","donne la liste des pays dans les profils qui n'ont pas d'entree correspondante dans geoloc_pays");
-/* les régions ne sont valides que dans les adresses pros */
-//check("SELECT e.uid, e.country, e.region FROM entreprises AS e LEFT JOIN geoloc_region AS gr ON (e.country = gr.a2 AND e.region = gr.region) WHERE e.region != '' AND gr.name IS NULL","donne la liste des regions dans les profils pros qui n'ont pas d'entree correspondante dans geoloc_region");
+/* validite des champ pays */
+check("SELECT  a.pid, a.countryId
+         FROM  profile_addresses AS a
+    LEFT JOIN  geoloc_countries  AS gc ON (a.countryId = gc.iso_3166_1_a2)
+        WHERE  gc.countryFR IS NULL OR gc.countryFR = ''",
+      "donne la liste des pays dans les profils qui n'ont pas d'entree correspondante dans geoloc_countries");
 
 /* donne la liste des emails douteux que les administrateurs n'ont pas encore traité */
 check("SELECT  a1.alias, a2.alias, e1.email, e2.flags
@@ -188,25 +195,13 @@ check("SELECT  matricule,nom,prenom,matricule_ax,COUNT(matricule_ax) AS c
         WHERE  matricule_ax != '0'
         GROUP BY  matricule_ax
         having  c > 1", "à chaque personne de l'annuaire de l'AX (identification_ax) doit correspondre AU PLUS UNE personne de notre annuaire (auth_user_md5) -> si ce n'est pas le cas il faut regarder en manuel ce qui ne va pas !");
-        
-/* each alumni has one and only one display name by default and one and only one name when we talk to him directly */
-check("SELECT u.`user_id`, u.`nom`, u.`prenom`, COUNT(n.`display`) AS c
-        FROM `auth_user_md5` AS u
-        LEFT JOIN `profile_names_display` AS n ON(u.`user_id` = n.`user_id` AND FIND_IN_SET(n.`reason`, 'default'))
-        GROUP BY u.`user_id`
-        HAVING c != 1", "chaque personne doit avoir un et un seul nom par défaut");
-check("SELECT u.`user_id`, u.`nom`, u.`prenom`, COUNT(n.`display`) AS c
-        FROM `auth_user_md5` AS u
-        LEFT JOIN `profile_names_display` AS n ON(u.`user_id` = n.`user_id` AND FIND_IN_SET(n.`reason`, 'yourself'))
-        GROUP BY u.`user_id`
-        HAVING c != 1", "chaque personne doit avoir un et un seul nom quand on lui parle");
 
 /* no alumni is allowed to have empty names */
-check("SELECT u.`user_id`, u.`nom`, u.`prenom`
-        FROM `auth_user_md5` AS u
-        INNER JOIN `profile_names_search` AS n USING(`user_id`)
-        WHERE n.`search_name` = ''", "liste des personnes qui ont un de leur nom de recherche vide");
-        
+check("SELECT  s.uid, d.public_name
+         FROM  profile_name    AS s
+   INNER JOIN  profile_display AS d ON (d.pid = s.uid)
+        WHERE  name = ''", "liste des personnes qui ont un de leur nom de recherche vide");
+
 /* verifie qu'il n'y a pas d'utilisateurs ayant un compte Google Apps désactivé et une redirection encore active vers Google Apps */
 check("SELECT  a.alias, g.g_status, u.mail_storage
          FROM  auth_user_md5 AS u