<?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 *
$user = User::getSilent($uid);
list($alias) = explode('@', $user->forlifeEmail());
- $tables_to_clear = array('uid' => array('competences_ins', 'entreprises', 'langues_ins', 'mentor_pays',
- 'mentor_secteurs', 'mentor', 'perte_pass', 'watch_sub'),
+ $tables_to_clear = array('uid' => array('competences_ins', 'profile_job', 'langues_ins', 'profile_mentor_country',
+ 'profile_mentor_sector', 'profile_mentor', 'perte_pass', 'watch_sub'),
'user_id' => array('requests', 'user_changes'));
if ($really_del) {
function get_user_details_pro($uid, $view = 'private')
{
- $sql = "SELECT e.entreprise, s.label as secteur , ss.label as sous_secteur , f.fonction_fr as fonction,
- e.poste, e.adr1, e.adr2, e.adr3, e.postcode, e.city, e.entrid,
- gp.pays AS countrytxt, gr.name AS region, e.entrid,
- e.pub, e.adr_pub, e.email, e.email_pub, e.web
- FROM entreprises AS e
- LEFT JOIN emploi_secteur AS s ON(e.secteur = s.id)
- LEFT JOIN emploi_ss_secteur AS ss ON(e.ss_secteur = ss.id AND e.secteur = ss.secteur)
- LEFT JOIN fonctions_def AS f ON(e.fonction = f.id)
- LEFT JOIN geoloc_pays AS gp ON (gp.a2 = e.country)
- LEFT JOIN geoloc_region AS gr ON (gr.a2 = e.country and gr.region = e.region)
- WHERE e.uid = {?}
- ORDER BY e.entrid";
+ $sql = "SELECT en.name AS entreprise, s.name as secteur, f.fonction_fr as fonction,
+ j.description AS poste, gp.pays AS countrytxt, gr.name AS region,
+ j.id AS entrid, j.pub, j.email, j.email_pub, j.url AS w_web, en.url AS web,
+ e.adr1, e.adr2, e.adr3, e.postcode, e.city, e.adr_pub
+ FROM profile_job AS j
+ LEFT JOIN entreprises AS e ON (e.entrid = j.id AND e.uid = j.uid)
+ LEFT JOIN profile_job_enum AS en ON (j.jobid = en.id)
+ LEFT JOIN profile_job_subsubsector_enum AS s ON (j.subsubsectorid = s.id)
+ LEFT JOIN fonctions_def AS f ON (j.functionid = f.id)
+ LEFT JOIN geoloc_pays AS gp ON (gp.a2 = e.country)
+ LEFT JOIN geoloc_region AS gr ON (gr.a2 = e.country AND gr.region = e.region)
+ WHERE j.uid = {?}
+ ORDER BY j.id";
$res = XDB::query($sql, $uid);
$all_pro = $res->fetchAllAssoc();
foreach ($all_pro as $i => $pro) {
function &get_user_details($login, $from_uid = '', $view = 'private')
{
- $reqsql = "SELECT u.user_id, u.promo, u.promo_sortie, u.prenom, u.nom, u.nom_usage, u.date, u.cv,
+ $reqsql = "SELECT u.user_id, d.promo, u.prenom, u.nom, u.nom_usage, u.date, u.cv,
u.perms IN ('admin','user','disabled') AS inscrit, FIND_IN_SET('femme', u.flags) AS sexe, u.deces != 0 AS dcd, u.deces,
q.profile_nick AS nickname, q.profile_from_ax, q.profile_freetext AS freetext,
q.profile_freetext_pub AS freetext_pub,
m.expertise != '' AS is_referent,
(COUNT(e.email) > 0 OR FIND_IN_SET('googleapps', u.mail_storage) > 0) AS actif,
nd.display AS name_display, nd.tooltip AS name_tooltip
- FROM auth_user_md5 AS u
- INNER JOIN auth_user_quick AS q USING(user_id)
- 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 FIND_IN_SET('bestalias', a2.flags))
- LEFT JOIN contacts AS c ON (c.uid = {?} and c.contact = u.user_id)
- LEFT JOIN profile_corps AS co ON (co.uid = u.user_id)
- LEFT JOIN geoloc_pays AS gp1 ON (gp1.a2 = u.nationalite)
- LEFT JOIN geoloc_pays AS gp2 ON (gp2.a2 = u.nationalite2)
- LEFT JOIN geoloc_pays AS gp3 ON (gp3.a2 = u.nationalite3)
- INNER JOIN sections AS s ON (s.id = u.section)
- LEFT JOIN photo AS p ON (p.uid = u.user_id)
- LEFT JOIN mentor AS m ON (m.uid = u.user_id)
- LEFT JOIN emails AS e ON (e.uid = u.user_id AND e.flags='active')
- INNER JOIN profile_names_display AS nd ON (nd.user_id = u.user_id)
+ FROM auth_user_md5 AS u
+ INNER JOIN auth_user_quick AS q USING(user_id)
+ 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 FIND_IN_SET('bestalias', a2.flags))
+ LEFT JOIN contacts AS c ON (c.uid = {?} and c.contact = u.user_id)
+ LEFT JOIN profile_corps AS co ON (co.uid = u.user_id)
+ LEFT JOIN geoloc_pays AS gp1 ON (gp1.a2 = u.nationalite)
+ LEFT JOIN geoloc_pays AS gp2 ON (gp2.a2 = u.nationalite2)
+ LEFT JOIN geoloc_pays AS gp3 ON (gp3.a2 = u.nationalite3)
+ INNER JOIN sections AS s ON (s.id = u.section)
+ LEFT JOIN photo AS p ON (p.uid = u.user_id)
+ LEFT JOIN profile_mentor AS m ON (m.uid = u.user_id)
+ LEFT JOIN emails AS e ON (e.uid = u.user_id AND e.flags='active')
+ INNER JOIN profile_names_display AS nd ON (nd.user_id = u.user_id)
+ INNER JOIN profile_display AS d ON (d.pid = u.user_id)
WHERE a.alias = {?}
GROUP BY u.user_id";
$res = XDB::query($reqsql, $from_uid, $login);
$uid = $user['user_id'];
// hide orange status, cv, nickname, section
if (!has_user_right('private', $view)) {
- $user['promo_sortie'] = $user['promo'] + 3;
$user['cv'] = '';
$user['nickname'] = '';
$user['section'] = '';
$res = XDB::iterRow("SELECT en.name AS name, en.url AS url, d.degree AS degree,
ed.grad_year AS grad_year, f.field AS field, ed.program AS program
FROM profile_education AS ed
- INNER JOIN profile_education_enum AS en ON (en.id = ed.eduid)
- INNER JOIN profile_education_degree_enum AS d ON (d.id = ed.degreeid)
- INNER JOIN profile_education_field_enum AS f ON (f.id = ed.fieldid)
- WHERE uid={?}
+ LEFT JOIN profile_education_enum AS en ON (en.id = ed.eduid)
+ LEFT JOIN profile_education_degree_enum AS d ON (d.id = ed.degreeid)
+ LEFT JOIN profile_education_field_enum AS f ON (f.id = ed.fieldid)
+ WHERE uid = {?} AND NOT FIND_IN_SET('primary', flags)
ORDER BY ed.grad_year", $uid);
- $user['education'] = "";
- require_once('education.func.inc.php');
if (list($name, $url, $degree, $grad_year, $field, $program) = $res->next()) {
- $user['education'] .= education_fmt($name, $url, $degree, $grad_year, $field, $program, $user['sexe'], true);
+ require_once('education.func.inc.php');
+ $user['education'][] = education_fmt($name, $url, $degree, $grad_year, $field, $program, $user['sexe'], true);
}
while (list($name, $url, $degree, $grad_year, $field, $program) = $res->next()) {
- $user['education'] .= ", " . education_fmt($name, $url, $degree, $grad_year, $field, $program, $user['sexe'], true);
+ $user['education'][] = education_fmt($name, $url, $degree, $grad_year, $field, $program, $user['sexe'], true);
}
if (has_user_right($user['corps_pub'], $view)) {
// }}}
// {{{ function set_user_details_addresses()
function set_user_details_addresses($uid, $adrs) {
- $res = XDB::query("SELECT adrid FROM adresses WHERE uid = {?} AND adrid >= 1 ORDER BY adrid", $uid);
- $adrids = $res->fetchColumn();
+ $req = XDB::query('SELECT MAX(adrid) + 1
+ FROM adresses
+ WHERE uid = {?}', $uid);
+ $adrid = $req->fetchOneCell();
+ if (is_null($adrid)) {
+ $adrid = 0;
+ }
foreach ($adrs as $adr) {
- if (isset($adr['adrid']) && isset($adr['remove']) && $adr['remove']) {
- remove_user_address($uid, $adr['adrid']);
- if (isset($adrids[$adr['adrid']])) unset($adrids[$adr['adrid']]);
- } else if (isset($adr['adrid'])) {
- update_user_address($uid, $adr['adrid'], $adr);
- } else {
- for ($adrid = 1; isset($adrids[$adrid-1]) && ($adrids[$adrid-1] == $adrid); $adrid++);
+ if (!@$adr['remove']) {
add_user_address($uid, $adrid, $adr);
- $adrids[$adrid-1] = $adrid;
+ ++$adrid;
}
}
require_once 'geoloc.inc.php';
function set_user_details_pro($uid, $pros)
{
- $res = XDB::query("SELECT entrid FROM entreprises WHERE uid = {?} ORDER BY entrid", $uid);
- $entrids = $res->fetchColumn();
+ $req = XDB::query('SELECT MAX(entrid) + 1
+ FROM entreprises
+ WHERE uid = {?}', $uid);
+ $entrid = $req->fetchOneCell();
+ if (is_null($entrid)) {
+ $entrid = 0;
+ }
foreach ($pros as $pro) {
- if (isset($pro['entrid']) && isset($pro['remove']) && $pro['remove']) {
- remove_user_pro($uid, $pro['entrid']);
- if (isset($entrids[$pro['entrid']])) unset($entrids[$pro['entrid']]);
- } else if (isset($pro['entrid'])) {
- update_user_pro($uid, $pro['entrid'], $pro);
- } else {
- for ($entrid = 0; isset($entrids[$entrid]) && ($entrids[$entrid] == $entrid); $entrid++);
+ if (!@$pro['remove']) {
add_user_pro($uid, $entrid, $pro);
+ ++$entrid;
}
}
}
projects / platal.git / blobdiff