<?php
/***************************************************************************
- * Copyright (C) 2003-2008 Polytechnique.org *
+ * Copyright (C) 2003-2009 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
function education_options($current = 0)
{
$html = '<option value="-1"></option>';
- $res = XDB::iterator("SELECT e.id AS id, e.name AS name, g.pays AS country
+ $res = XDB::iterator("SELECT e.id AS id, gc.countryFR AS country,
+ IF(CHAR_LENGTH(e.name) > 76, e.abbreviation, e.name) AS name
FROM profile_education_enum AS e
- LEFT JOIN geoloc_pays AS g ON (e.country = g.a2)
+ LEFT JOIN geoloc_countries AS gc ON (e.country = gc.iso_3166_1_a2)
WHERE EXISTS (SELECT *
FROM profile_education_degree AS d
WHERE e.id = d.eduid)
- ORDER BY g.pays, e.name");
+ ORDER BY gc.countryFR, e.name");
$country = "";
while ($arr_edu = $res->next()) {
if ($arr_edu["country"] != $country) {
$html = "";
$res = XDB::iterRow("SELECT d.eduid, d.degreeid
FROM profile_education_enum AS e
- INNER JOIN profile_education_degree AS d ON (e.id = d.eduid)
- LEFT JOIN geoloc_pays AS g ON (e.country = g.a2)
- ORDER BY g.pays, e.name");
+ INNER JOIN profile_education_degree AS d ON (e.id = d.eduid)
+ INNER JOIN geoloc_countries AS gc ON (e.country = gc.iso_3166_1_a2)
+ ORDER BY gc.countryFR, e.name");
if ($edu_degree = $res->next()) {
$eduid = $edu_degree['0'];
$html .= "[";