From: x2000habouzit Date: Fri, 29 Oct 2004 02:08:19 +0000 (+0000) Subject: comma missing X-Git-Tag: xorg/old~1143 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=314735bccc1b943f18701fbfb5e1f227ec6547cf;p=platal.git comma missing --- diff --git a/htdocs/fiche.php b/htdocs/fiche.php index a9b96ce..b37ffe6 100644 --- a/htdocs/fiche.php +++ b/htdocs/fiche.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: fiche.php,v 1.16 2004-10-29 01:24:20 x2000habouzit Exp $ + $Id: fiche.php,v 1.17 2004-10-29 02:08:19 x2000habouzit Exp $ ***************************************************************************/ @@ -43,19 +43,20 @@ if (isset($_REQUEST['user'])) else $where_clause = " WHERE u.matricule = '{$_REQUEST['mat']}'"; -$reqsql = "SELECT u.prenom, u.nom, u.epouse, IF(gp.nat='',gp.pays,gp.nat) AS text +$reqsql = "SELECT u.prenom, u.nom, u.epouse, IF(gp.nat='',gp.pays,gp.nat) AS text, u.user_id, a.alias, a2.alias, u.matricule, i.deces != 0 as dcd, i.deces, u.date, u.cv, sections.text, u.mobile, u.web, u.libre, u.promo, c.uid IS NOT NULL, p.x, p.y - FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON (u.user_id=a.id AND a.type='a_vie') - INNER JOIN aliases AS a2 ON (u.user_id=a2.id AND (a2.type='alias' OR a2.type='epouse') AND a2.alias LIKE '%.%') - LEFT JOIN contacts AS c ON (c.uid = {$_SESSION['uid']} and c.contact = u.user_id) - INNER JOIN geoloc_pays AS gp ON (gp.a2 = u.nationalite) - INNER JOIN sections ON(sections.id = u.section) + FROM auth_user_md5 AS u + INNER JOIN aliases AS a ON (u.user_id=a.id AND a.type='a_vie') + INNER JOIN aliases AS a2 ON (u.user_id=a2.id AND (a2.type='alias' OR a2.type='epouse') AND a2.alias LIKE '%.%') + LEFT JOIN contacts AS c ON (c.uid = {$_SESSION['uid']} and c.contact = u.user_id) + INNER JOIN geoloc_pays AS gp ON (gp.a2 = u.nationalite) + INNER JOIN sections ON(sections.id = u.section) INNER JOIN identification AS i ON(u.matricule = i.matricule) LEFT JOIN photo as p ON(p.uid = u.user_id)".$where_clause." ORDER BY a2.type != 'epouse', LENGTH(a2.alias) LIMIT 1"; + $result = $globals->db->query($reqsql); if (mysql_num_rows($result)!=1)