some stupidities, whole site scan for next release

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-140

diff --git a/htdocs/admin/ax-xorg.php b/htdocs/admin/ax-xorg.php
index f31bd3f..df37956 100644 (file)
--- a/htdocs/admin/ax-xorg.php
+++ b/htdocs/admin/ax-xorg.php
@@ -23,21 +23,20 @@ require_once('xorg.inc.php');
 new_admin_page('admin/ax-xorg.tpl');
 
 // liste des différences
-$sql = "SELECT u.promo,u.nom AS nom,u.prenom AS prenom,ia.nom AS nomax,ia.prenom AS prenomax,u.matricule AS mat,ia.matricule_ax AS matax
-        FROM auth_user_md5 AS u
-        INNER JOIN identification_ax AS ia ON u.matricule_ax = ia.matricule_ax
-        WHERE (SOUNDEX(u.nom) != SOUNDEX(ia.nom) AND SOUNDEX(CONCAT(ia.particule,u.nom)) != SOUNDEX(ia.nom)
-            AND SOUNDEX(u.nom) != SOUNDEX(ia.nom_patro) AND SOUNDEX(CONCAT(ia.particule,u.nom)) != SOUNDEX(ia.nom_patro))
-            OR u.prenom != ia.prenom
-           OR (u.promo != ia.promo AND u.promo != ia.promo+1 AND u.promo != ia.promo-1)
-           ORDER BY u.promo,u.nom,u.prenom";
+$sql = "SELECT  u.promo,u.nom AS nom,u.prenom AS prenom,ia.nom AS nomax,ia.prenom AS prenomax,u.matricule AS mat,ia.matricule_ax AS matax
+          FROM  auth_user_md5 AS u
+    INNER JOIN  identification_ax AS ia ON u.matricule_ax = ia.matricule_ax
+         WHERE  (SOUNDEX(u.nom) != SOUNDEX(ia.nom) AND SOUNDEX(CONCAT(ia.particule,u.nom)) != SOUNDEX(ia.nom)
+                AND SOUNDEX(u.nom) != SOUNDEX(ia.nom_patro) AND SOUNDEX(CONCAT(ia.particule,u.nom)) != SOUNDEX(ia.nom_patro))
+                OR u.prenom != ia.prenom OR (u.promo != ia.promo AND u.promo != ia.promo+1 AND u.promo != ia.promo-1)
+      ORDER BY  u.promo,u.nom,u.prenom";
 $page->mysql_assign($sql,'diffs','nb_diffs');
 
 // gens à l'ax mais pas chez nous
-$sql = "SELECT ia.promo,ia.nom,ia.nom_patro,ia.prenom
-        FROM identification_ax as ia
-        LEFT JOIN auth_user_md5 AS u ON u.matricule_ax = ia.matricule_ax
-        WHERE u.nom IS NULL";
+$sql = "SELECT  ia.promo,ia.nom,ia.nom_patro,ia.prenom
+          FROM  identification_ax as ia
+     LEFT JOIN  auth_user_md5 AS u ON u.matricule_ax = ia.matricule_ax
+         WHERE  u.nom IS NULL";
 $page->mysql_assign($sql,'mank','nb_mank');
 
 // gens chez nous et pas à l'ax

diff --git a/htdocs/carnet/mescontacts.php b/htdocs/carnet/mescontacts.php
index 2f3fa62..442abcf 100644 (file)
--- a/htdocs/carnet/mescontacts.php
+++ b/htdocs/carnet/mescontacts.php
@@ -29,7 +29,7 @@ $user = Env::get('user');
 switch (Env::get('action')) {
     case 'retirer':
        if (preg_match('/^\d+$/', $user)) {
-           if ($globals->db->query("DELETE FROM contacts WHERE uid = $uid' AND contact='{$user}'"))
+           if ($globals->db->query("DELETE FROM contacts WHERE uid = $uid' AND contact='$user'"))
             {
                $page->trig("Contact retiré !");
             }
@@ -64,6 +64,7 @@ if(Get::has('trombi')) {
     require_once('trombi.inc.php');
     function getList($offset,$limit) {
        global $globals;
+        $uid = Session::getInt('uid');
        $res = $globals->db->query("SELECT COUNT(*) FROM contacts WHERE uid = $uid");
        list($total) = mysql_fetch_row($res);
        mysql_free_result($res);

diff --git a/htdocs/listes/admin.php b/htdocs/listes/admin.php
index 10a4279..327d93c 100644 (file)
--- a/htdocs/listes/admin.php
+++ b/htdocs/listes/admin.php
@@ -30,7 +30,7 @@ $client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password'));
 
 if (Env::has('add_member')) {
     require_once('user.func.inc.php');
-    if (($login = get_user_forlife(Env::get('add_member')) === false) {;
+    if (($login = get_user_forlife(Env::get('add_member'))) === false) {;
         $login = Env::get('add_member');
     }
 
@@ -47,7 +47,7 @@ if (Env::has('del_member')) {
     header("Location: ?liste=$liste");
 }
 
-if (Env::has(['add_owner'])) {
+if (Env::has('add_owner')) {
     require_once('user.func.inc.php');
     if (($login = get_user_forlife(Env::get('add_owner'))) === false) {;
         $login = Env::get('add_owner');

diff --git a/htdocs/listes/archives.php b/htdocs/listes/archives.php
index 955e9be..555d9c5 100644 (file)
--- a/htdocs/listes/archives.php
+++ b/htdocs/listes/archives.php
@@ -20,7 +20,7 @@
  ***************************************************************************/
 
 require_once("xorg.inc.php");
-if (Env::has('liste')) header('Location: index.php');
+if (!Env::has('liste')) header('Location: index.php');
 $liste = strtolower(Env::get('liste'));
 
 new_skinned_page('listes/archives.tpl', AUTH_COOKIE, 'listes/archives.head.tpl');

diff --git a/htdocs/listes/check.php b/htdocs/listes/check.php
index e3b76a9..06b6092 100644 (file)
--- a/htdocs/listes/check.php
+++ b/htdocs/listes/check.php
@@ -20,7 +20,7 @@
  ***************************************************************************/
 
 require_once("xorg.inc.php");
-if (Env::has('liste')) header('Location: index.php');
+if (!Env::has('liste')) header('Location: index.php');
 $liste = strtolower(Env::get('liste'));
 
 new_admin_page('listes/check.tpl');

diff --git a/htdocs/listes/create.php b/htdocs/listes/create.php
index d06a22a..a04cc1a 100644 (file)
--- a/htdocs/listes/create.php
+++ b/htdocs/listes/create.php
@@ -25,7 +25,7 @@ new_skinned_page('listes/create.tpl', AUTH_MDP);
 $owners  = preg_split("/[\r\n]+/",Post::get('owners'));
 $members = preg_split("/[\r\n]+/",Post::get('members'));
 
-if (Post::has('add_owner_sub') && Post::has('add_owner'])) {
+if (Post::has('add_owner_sub') && Post::has('add_owner')) {
     require_once('user.func.inc.php');
     if (($forlife = get_user_forlife(Post::get('add_owner'))) !== false) {
         $owners [] = $forlife;

diff --git a/htdocs/listes/moderate.php b/htdocs/listes/moderate.php
index f300c0b..c3fe0bf 100644 (file)
--- a/htdocs/listes/moderate.php
+++ b/htdocs/listes/moderate.php
@@ -61,14 +61,14 @@ if(Env::has('mid')) {
        $reason  = stripslashes(Post::get('reason'));
         $append  = "a été refusé par $prenom $nom avec la raison :\n\n"
                 .  $reason;
-    } elseif (Env:has('mdel')) {
+    } elseif (Env::has('mdel')) {
         $action  = 3; /** 3 = DISCARD **/
         $sbuject = "Message supprimé";
         $append  = "a été supprimé par $prenom $nom.\n\n"
                 .  "Rappel: il ne faut utiliser cette opération que dans le cas de spams ou de virus !\n";
     }
    
-    if (isset($action) && $client->handle_request($liste,$mid,$action,$reason) {
+    if (isset($action) && $client->handle_request($liste, $mid, $action, $reason)) {
         $texte = "le message suivant :\n\n"
                 ."    Auteur: {$mail['sender']}\n"
                 ."    Sujet : « {$mail['subj']} »\n"