X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fuser.func.inc.php;h=126569abf8b3f9035c46fc5c367bce8366eb7fca;hb=225b4e8076bb652982eb13c16b0f832a873c6b5e;hp=104dd6498cbf17773b1137d2051950d63ab6d511;hpb=c7eac294d59c639f26b21920f7d1827d5854c82f;p=platal.git diff --git a/include/user.func.inc.php b/include/user.func.inc.php index 104dd64..126569a 100644 --- a/include/user.func.inc.php +++ b/include/user.func.inc.php @@ -36,8 +36,8 @@ function user_clear_all_subs($user_id, $really_del=true) $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) { @@ -130,18 +130,19 @@ function get_not_registered_user($login, $iterator = false) 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) { @@ -256,7 +257,7 @@ function get_user_details_adr($uid, $view = 'private') { 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_display, 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, @@ -271,20 +272,21 @@ function &get_user_details($login, $from_uid = '', $view = 'private') 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.uid = u.user_id) WHERE a.alias = {?} GROUP BY u.user_id"; $res = XDB::query($reqsql, $from_uid, $login); @@ -292,7 +294,6 @@ function &get_user_details($login, $from_uid = '', $view = 'private') $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'] = ''; @@ -356,7 +357,7 @@ function &get_user_details($login, $from_uid = '', $view = 'private') 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={?} + WHERE uid = {?} AND NOT FIND_IN_SET('primary', flags) ORDER BY ed.grad_year", $uid); if (list($name, $url, $degree, $grad_year, $field, $program) = $res->next()) {