X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=077b3dc4302ba7ee9b3763215d294a2000b9a5e4;hb=7996ae8cd41fbb3ccd748eaed71a50f866269c6e;hp=60747e556031d6dcc13778df133fc3e1dc9137cb;hpb=950a769bb3f3154de64960ffc5cac111263bc8b0;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index 60747e5..077b3dc 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -1,6 +1,6 @@ $this->make_hook('ajax_medal', AUTH_COOKIE, 'user', NO_AUTH), 'profile/networking' => $this->make_hook('networking', AUTH_PUBLIC), 'profile/ajax/job' => $this->make_hook('ajax_job', AUTH_COOKIE, 'user', NO_AUTH), - 'profile/ajax/secteur' => $this->make_hook('ajax_secteur', AUTH_COOKIE, 'user', NO_AUTH), - 'profile/ajax/ssecteur' => $this->make_hook('ajax_ssecteur', AUTH_COOKIE, 'user', NO_AUTH), + 'profile/ajax/sector' => $this->make_hook('ajax_sector', AUTH_COOKIE, 'user', NO_AUTH), + 'profile/ajax/sub_sector' => $this->make_hook('ajax_sub_sector', AUTH_COOKIE, 'user', NO_AUTH), + 'profile/ajax/alternates' => $this->make_hook('ajax_alternates', AUTH_COOKIE, 'user', NO_AUTH), 'profile/ajax/skill' => $this->make_hook('ajax_skill', AUTH_COOKIE, 'user', NO_AUTH), 'profile/ajax/searchname' => $this->make_hook('ajax_searchname', AUTH_COOKIE, 'user', NO_AUTH), 'profile/ajax/buildnames' => $this->make_hook('ajax_buildnames', AUTH_COOKIE, 'user', NO_AUTH), @@ -47,7 +48,6 @@ class ProfileModule extends PLModule 'javascript/grades.js' => $this->make_hook('grades_js', AUTH_COOKIE), 'profile/medal' => $this->make_hook('medal', AUTH_PUBLIC), 'profile/name_info' => $this->make_hook('name_info', AUTH_PUBLIC), - 'profile/orange' => $this->make_hook('p_orange', AUTH_MDP), 'referent' => $this->make_hook('referent', AUTH_COOKIE), 'emploi' => $this->make_hook('ref_search', AUTH_COOKIE), @@ -56,6 +56,7 @@ class ProfileModule extends PLModule 'referent/country' => $this->make_hook('ref_country', AUTH_COOKIE, 'user', NO_AUTH), 'groupes-x' => $this->make_hook('xnet', AUTH_COOKIE), + 'groupes-x/logo' => $this->make_hook('xnetlogo', AUTH_PUBLIC), 'vcard' => $this->make_hook('vcard', AUTH_COOKIE, 'user', NO_HTTPS), 'admin/binets' => $this->make_hook('admin_binets', AUTH_MDP, 'admin'), @@ -65,15 +66,12 @@ class ProfileModule extends PLModule 'admin/education_degree' => $this->make_hook('admin_education_degree', AUTH_MDP, 'admin'), 'admin/education_degree_set' => $this->make_hook('admin_education_degree_set', AUTH_MDP, 'admin'), 'admin/sections' => $this->make_hook('admin_sections', AUTH_MDP, 'admin'), - 'admin/secteurs' => $this->make_hook('admin_secteurs', AUTH_MDP, 'admin'), 'admin/networking' => $this->make_hook('admin_networking', AUTH_MDP, 'admin'), 'admin/trombino' => $this->make_hook('admin_trombino', AUTH_MDP, 'admin'), - 'admin/ss_secteurs' => $this->make_hook('admin_ss_secteurs', AUTH_MDP, 'admin'), - 'admin/fonctions' => $this->make_hook('admin_fonctions', AUTH_MDP, 'admin'), + 'admin/sectors' => $this->make_hook('admin_sectors', AUTH_MDP, 'admin'), 'admin/corps_enum' => $this->make_hook('admin_corps_enum', AUTH_MDP, 'admin'), 'admin/corps_rank' => $this->make_hook('admin_corps_rank', AUTH_MDP, 'admin'), 'admin/names' => $this->make_hook('admin_names', AUTH_MDP, 'admin'), - ); } @@ -85,41 +83,21 @@ class ProfileModule extends PLModule function handler_photo(&$page, $x = null, $req = null) { - if (!$x || !($user = User::getSilent($x))) { + if (!$x || !($profile = Profile::get($x))) { return PL_NOT_FOUND; } // Retrieve the photo and its mime type. - $photo_data = null; - $photo_type = null; - if ($req && S::logged()) { include 'validations.inc.php'; - $myphoto = PhotoReq::get_request($user->id()); - if ($myphoto) { - $photo_data = $myphoto->data; - $photo_type = $myphoto->mimetype; - } + $myphoto = PhotoReq::get_request($profile->owner()->id()); + $photo = PlImage::fromData($myphoto->data, $myphoto->mimetype); } else { - $res = XDB::query( - "SELECT attachmime, attach, pub - FROM photo - WHERE uid = {?}", $user->id()); - list($photo_type, $photo_data, $photo_pub) = $res->fetchOneRow(); - if ($photo_pub != 'public' && !S::logged()) { - $photo_type = $photo_data = null; - } + $photo = $profile->getPhoto(true, true); } // Display the photo, or a default one when not available. - if ($photo_type && $photo_data != null) { - header('Content-type: image/' . $photo_type); - echo $photo_data; - } else { - header('Content-type: image/png'); - echo file_get_contents(dirname(__FILE__).'/../htdocs/images/none.png'); - } - exit; + $photo->send(); } function handler_medal(&$page, $mid) @@ -128,14 +106,13 @@ class ProfileModule extends PLModule $mid = $thumb ? @func_get_arg(2) : $mid; $res = XDB::query("SELECT img - FROM profile_medals + FROM profile_medal_enum WHERE id = {?}", $mid); $img = $thumb ? dirname(__FILE__).'/../htdocs/images/medals/thumb/' . $res->fetchOneCell() : dirname(__FILE__).'/../htdocs/images/medals/' . $res->fetchOneCell(); - $type = mime_content_type($img); - header("Content-Type: $type"); + pl_cached_content_headers(mime_content_type($img)); echo file_get_contents($img); exit; } @@ -200,53 +177,49 @@ class ProfileModule extends PLModule } elseif (Env::v('suppr')) { S::assert_xsrf_token(); - XDB::execute('DELETE FROM photo - WHERE uid = {?}', - S::v('uid')); - XDB::execute('DELETE FROM requests - WHERE user_id = {?} AND type="photo"', + XDB::execute('DELETE FROM profile_photos + WHERE pid = {?}', + S::user()->profile()->id()); + XDB::execute("DELETE FROM requests + WHERE uid = {?} AND type = 'photo'", S::v('uid')); $globals->updateNbValid(); + $page->trigSuccess("Ta photo a bien été supprimée. Elle ne sera plus visible sur le site dans au plus une heure."); } elseif (Env::v('cancel')) { S::assert_xsrf_token(); - $sql = XDB::query('DELETE FROM requests - WHERE user_id={?} AND type="photo"', + $sql = XDB::query("DELETE FROM requests + WHERE uid = {?} AND type = 'photo'", S::v('uid')); $globals->updateNbValid(); } - $sql = XDB::query('SELECT COUNT(*) + $sql = XDB::query("SELECT COUNT(*) FROM requests - WHERE user_id={?} AND type="photo"', + WHERE uid = {?} AND type = 'photo'", S::v('uid')); $page->assign('submited', $sql->fetchOneCell()); $page->assign('has_trombi_x', file_exists($trombi_x)); } - function handler_profile(&$page, $x = null) + function handler_profile(&$page, $id = null) { - // TODO/note for upcoming developers: - // We currently maintain both $user and $login; $user is the old way of - // obtaining information, and eventually everything will be loaded - // through $login. That is the reason why in the template $user is named - // $x, and $login $user (sorry for the confusion). - - // Determines which user to display the profile of, and retrieves basic - // information on this user. - if (is_null($x)) { + // Checks if the identifier corresponds to an actual profile. Numeric + // identifiers canonly be user by logged users. + if (is_null($id)) { return PL_NOT_FOUND; } - - $login = S::logged() ? User::get($x) : User::getSilent($x); - if (!$login) { + $pid = (!is_numeric($id) || S::admin()) ? Profile::getPID($id) : null; + if (is_null($pid)) { + if (S::logged()) { + $page->trigError($id . " inconnu dans l'annuaire."); + } return PL_NOT_FOUND; } - // Now that we know this is the profile of an existing user, we can - // switch to the appropriate template. + // Now that we know this is an existing profile, we can switch to the + // appropriate template. $page->changeTpl('profile/profile.tpl', SIMPLE); - require_once 'user.func.inc.php'; // Determines the access level at which the profile will be displayed. if (!S::logged() || Env::v('view') == 'public') { @@ -257,165 +230,111 @@ class ProfileModule extends PLModule $view = 'private'; } - // Determines is the user is registered, and fetches the user infos in - // the appropriate way. - $res = XDB::query("SELECT perms IN ('admin','user','disabled') - FROM auth_user_md5 - WHERE user_id = {?}", $login->id()); - if ($res->fetchOneCell()) { - $new = Env::v('modif') == 'new'; - $user = get_user_details($login->login(), S::v('uid'), $view); - } else { - $new = false; - $user = array(); - if (S::logged()) { - pl_redirect('marketing/public/' . $login->login()); - } + // Fetches profile's and profile's owner information and redirects to + // marketing if the owner has not subscribed and the requirer has logged in. + $profile = Profile::get($pid, Profile::FETCH_ALL, $view); + $owner = $profile->owner(); + if (S::logged() && !is_null($owner) && $owner->state == 'pending') { + pl_redirect('marketing/public/' . $profile->hrid()); } // Profile view are logged. if (S::logged()) { - S::logger()->log('view_profile', $login->login()); + S::logger()->log('view_profile', $profile->hrid()); } // Sets the title of the html page. - $page->setTitle($login->fullName()); + $page->setTitle($profile->fullName()); - // Prepares the display of the user's mugshot. - $photo = 'photo/' . $login->login() . ($new ? '/req' : ''); - if (!isset($user['photo_pub']) || !has_user_right($user['photo_pub'], $view)) { - $photo = ""; - } - $page->assign('photo_url', $photo); - - if (!isset($user['y']) and !isset($user['x'])) { - list($user['x'], $user['y']) = getimagesize("images/none.png"); - } - if (!isset($user['y']) or $user['y'] < 1) $user['y']=1; - if (!isset($user['x']) or $user['x'] < 1) $user['x']=1; - if ($user['x'] > 240) { - $user['y'] = (integer)($user['y']*240/$user['x']); - $user['x'] = 240; - } - if ($user['y'] > 300) { - $user['x'] = (integer)($user['x']*300/$user['y']); - $user['y'] = 300; - } - if ($user['x'] < 160) { - $user['y'] = (integer)($user['y']*160/$user['x']); - $user['x'] = 160; + // Determines and displays the virtual alias. + if (!is_null($owner)) { + $page->assign('virtualalias', $owner->emailAlias()); } - // Determines and displays the virtual alias. - global $globals; - $res = XDB::query( - "SELECT alias - FROM virtual - INNER JOIN virtual_redirect USING (vid) - INNER JOIN auth_user_quick ON (user_id = {?} AND emails_alias_pub = 'public') - WHERE (redirect={?} OR redirect={?}) - AND alias LIKE '%@{$globals->mail->alias_dom}'", - $login->id(), - $login->forlifeEmail(), - // TODO(vzanotti): get ride of all @m4x.org addresses in the - // virtual redirect base, and remove this über-ugly hack. - $login->login() . '@' . $globals->mail->domain2); - $page->assign('virtualalias', $res->fetchOneCell()); - - // Adds miscellaneous properties to the display. - // Adds the global user property array to the display. - $page->assign_by_ref('x', $user); - $page->assign_by_ref('user', $login); - $page->assign('logged', has_user_right('private', $view)); + $page->assign_by_ref('profile', $profile); + $page->assign_by_ref('owner', $owner); $page->assign('view', $view); + $page->assign('logged', S::logged()); $page->addJsLink('close_on_esc.js'); - if (isset($user['date'])) { - header('Last-Modified: ' . date('r', strtotime($user['date']))); - } + header('Last-Modified: ' . date('r', strtotime($profile->last_change))); } function handler_ax(&$page, $user = null) { - $user = User::get($user); + $user = Profile::get($user); if (!$user) { return PL_NOT_FOUND; } - - $res = XDB::query("SELECT matricule_ax - FROM auth_user_md5 - WHERE user_id = {?}", $user->id()); - $mat = $res->fetchOneCell(); - if (!intval($mat)) { - $page->kill("Le matricule AX de {$user->login()} est inconnu"); + if (!$user->ax_id) { + $page->kill("Le matricule AX de {$user->hrid()} est inconnu"); } - http_redirect("http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&anc_id=$mat"); + http_redirect("http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&ancc_id=" . $user->ax_id); } - function handler_p_edit(&$page, $opened_tab = null, $mode = null) + function handler_p_edit(&$page, $user = null, $opened_tab = null, $mode = null, $success = null) { global $globals; - // AX Synchronization - require_once 'synchro_ax.inc.php'; - if (is_ax_key_missing()) { - $page->assign('no_private_key', true); - } - if (Env::v('synchro_ax') == 'confirm' && !is_ax_key_missing()) { - ax_synchronize(S::user()->login(), S::v('uid')); - $page->trigSuccess('Ton profil a été synchronisé avec celui du site polytechniciens.com'); + if (is_null($user)) { + $user = S::user(); + if (!$user->hasProfile()) { + return PL_NOT_FOUND; + } else { + pl_redirect('profile/edit/' . $user->profile()->hrid()); + } + } else { + $user = Profile::get($user); + if (!$user) { + return PL_NOT_FOUND; + } else if (!S::user()->canEdit($user) && Platal::notAllowed()) { + return PL_FORBIDDEN; + } } // Build the page $page->addJsLink('ajax.js'); - $page->addJsLink('education.js'); - $page->addJsLink('grades.js'); + $page->addJsLink('education.js', false); /* dynamic content */ + $page->addJsLink('grades.js', false); /* dynamic content */ $page->addJsLink('profile.js'); $page->addJsLink('jquery.autocomplete.js'); - $wiz = new PlWizard('Profil', PlPage::getCoreTpl('plwizard.tpl'), true, true); + $wiz = new PlWizard('Profil', PlPage::getCoreTpl('plwizard.tpl'), true, true, false); + $wiz->addUserData('profile', $user); + $wiz->addUserData('owner', $user->owner()); $this->load('page.inc.php'); - $wiz->addPage('ProfileGeneral', 'Général', 'general'); - $wiz->addPage('ProfileAddresses', 'Adresses personnelles', 'adresses'); - $wiz->addPage('ProfileGroups', 'Groupes X - Binets', 'poly'); - $wiz->addPage('ProfileDecos', 'Décorations - Medailles', 'deco'); - $wiz->addPage('ProfileJobs', 'Informations professionnelles', 'emploi'); - $wiz->addPage('ProfileSkills', 'Compétences diverses', 'skill'); - $wiz->addPage('ProfileMentor', 'Mentoring', 'mentor'); - $wiz->apply($page, 'profile/edit', $opened_tab, $mode); - - // Misc checks - $res = XDB::query("SELECT user_id - FROM auth_user_md5 - WHERE user_id = {?} AND naissance = '0000-00-00'", S::i('uid')); - if ($res->numRows()) { + $wiz->addPage('ProfileSettingGeneral', 'Général', 'general'); + $wiz->addPage('ProfileSettingAddresses', 'Adresses personnelles', 'adresses'); + $wiz->addPage('ProfileSettingGroups', 'Groupes X - Binets', 'poly'); + $wiz->addPage('ProfileSettingDecos', 'Décorations - Medailles', 'deco'); + $wiz->addPage('ProfileSettingJobs', 'Informations professionnelles', 'emploi'); + $wiz->addPage('ProfileSettingSkills', 'Compétences diverses', 'skill'); + $wiz->addPage('ProfileSettingMentor', 'Mentoring', 'mentor'); + $wiz->apply($page, 'profile/edit/' . $user->hrid(), $opened_tab, $mode); + + if (!$user->birthdate) { $page->trigWarning("Ta date de naissance n'est pas renseignée, ce qui t'empêcheras de réaliser" . " la procédure de récupération de mot de passe si un jour tu le perdais."); } $page->setTitle('Mon Profil'); + if (isset($success) && $success) { + $page->trigSuccess('Ton profil a bien été mis à jour.'); + } } function handler_education_js(&$page) { - header('Content-Type: text/javascript; charset=utf-8'); - header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); - header('Last-Modified:' . gmdate('D, d M Y H:i:s') . ' GMT'); - header('Cache-Control: no-cache, must-revalidate'); - header('Pragma: no-cache'); + pl_cached_content_headers("text/javascript", "utf-8"); $page->changeTpl('profile/education.js.tpl', NO_SKIN); - require_once "education.func.inc.php"; + require_once 'education.func.inc.php'; } function handler_grades_js(&$page) { - header('Content-Type: text/javascript; charset=utf-8'); - header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); - header('Last-Modified:' . gmdate('D, d M Y H:i:s') . ' GMT'); - header('Cache-Control: no-cache, must-revalidate'); - header('Pragma: no-cache'); + pl_cached_content_headers("text/javascript", "utf-8"); $page->changeTpl('profile/grades.js.tpl', NO_SKIN); $res = XDB::iterator("SELECT * - FROM profile_medals_grades + FROM profile_medal_grade_enum ORDER BY mid, pos"); $grades = array(); while ($tmp = $res->next()) { @@ -424,7 +343,7 @@ class ProfileModule extends PLModule $page->assign('grades', $grades); $res = XDB::iterator("SELECT *, FIND_IN_SET('validation', flags) AS validate - FROM profile_medals + FROM profile_medal_enum ORDER BY type, text"); $mlist = array(); while ($tmp = $res->next()) { @@ -435,7 +354,7 @@ class ProfileModule extends PLModule function handler_ajax_address(&$page, $id) { - header('Content-Type: text/html; charset=utf-8'); + pl_content_headers("text/html"); $page->changeTpl('profile/adresses.address.tpl', NO_SKIN); $page->assign('i', $id); $page->assign('address', array()); @@ -443,7 +362,7 @@ class ProfileModule extends PLModule function handler_ajax_tel(&$page, $prefid, $prefname, $telid) { - header('Content-Type: text/html; charset=utf-8'); + pl_content_headers("text/html"); $page->changeTpl('profile/phone.tpl', NO_SKIN); $page->assign('prefid', $prefid); $page->assign('prefname', $prefname); @@ -466,7 +385,7 @@ class ProfileModule extends PLModule function handler_ajax_medal(&$page, $id) { - header('Content-Type: text/html; charset=utf-8'); + pl_content_headers("text/html"); $page->changeTpl('profile/deco.medal.tpl', NO_SKIN); $page->assign('id', $id); $page->assign('medal', array('valid' => 0, 'grade' => 0)); @@ -474,31 +393,27 @@ class ProfileModule extends PLModule function handler_ajax_job(&$page, $id) { - header('Content-Type: text/html; charset=utf-8'); + pl_content_headers("text/html"); $page->changeTpl('profile/jobs.job.tpl', NO_SKIN); $page->assign('i', $id); $page->assign('job', array()); $page->assign('new', true); $res = XDB::query("SELECT id, name AS label FROM profile_job_sector_enum"); - $page->assign('secteurs', $res->fetchAllAssoc()); - $res = XDB::query("SELECT id, fonction_fr, FIND_IN_SET('titre', flags) AS title - FROM fonctions_def - ORDER BY id"); - $page->assign('fonctions', $res->fetchAllAssoc()); + $page->assign('sectors', $res->fetchAllAssoc()); require_once "emails.combobox.inc.php"; fill_email_combobox($page); } - function handler_ajax_secteur(&$page, $id, $jobid, $jobpref, $sect, $ssect = -1) + function handler_ajax_sector(&$page, $id, $jobid, $jobpref, $sect, $ssect = -1) { - header('Content-Type: text/html; charset=utf-8'); - $res = XDB::iterator("SELECT id, name AS label, FIND_IN_SET('optgroup', flags) AS optgroup + pl_content_headers("text/html"); + $res = XDB::iterator("SELECT id, name, FIND_IN_SET('optgroup', flags) AS optgroup FROM profile_job_subsector_enum WHERE sectorid = {?}", $sect); - $page->changeTpl('profile/jobs.secteur.tpl', NO_SKIN); + $page->changeTpl('profile/jobs.sector.tpl', NO_SKIN); $page->assign('id', $id); - $page->assign('ssecteurs', $res); + $page->assign('subSectors', $res); $page->assign('sel', $ssect); if ($id != -1) { $page->assign('change', 1); @@ -507,21 +422,41 @@ class ProfileModule extends PLModule } } - function handler_ajax_ssecteur(&$page, $id, $ssect, $sssect = -1) + function handler_ajax_sub_sector(&$page, $id, $ssect, $sssect = -1) { header('Content-Type: text/html; charset=utf-8'); - $res = XDB::iterator("SELECT id, name AS label + $res = XDB::iterator("SELECT id, name FROM profile_job_subsubsector_enum WHERE subsectorid = {?}", $ssect); - $page->changeTpl('profile/jobs.soussecteur.tpl', NO_SKIN); + $page->changeTpl('profile/jobs.sub_sector.tpl', NO_SKIN); $page->assign('id', $id); - $page->assign('sssecteurs', $res); + $page->assign('subSubSectors', $res); $page->assign('sel', $sssect); } - function handler_ajax_skill(&$page, $cat, $id) + function handler_ajax_alternates(&$page, $id, $sssect) { header('Content-Type: text/html; charset=utf-8'); + $res = XDB::iterator('SELECT name + FROM profile_job_alternates + WHERE subsubsectorid = {?} + ORDER BY id', + $sssect); + $page->changeTpl('profile/jobs.alternates.tpl', NO_SKIN); + $alternates = ''; + if ($res->total() > 0) { + $alternate = $res->next(); + $alternates = $alternate['name']; + while ($alternate = $res->next()) { + $alternates .= ', ' . $alternate['name']; + } + } + $page->assign('alternates', $alternates); + } + + function handler_ajax_skill(&$page, $cat, $id) + { + pl_content_headers("text/html"); $page->changeTpl('profile/skill.skill.tpl', NO_SKIN); $page->assign('cat', $cat); $page->assign('id', $id); @@ -551,111 +486,48 @@ class ProfileModule extends PLModule $page->assign('i', $id); } - function handler_ajax_buildnames(&$page, $data) + function handler_ajax_buildnames(&$page, $data, $isFemale) { header('Content-Type: text/html; charset=utf-8'); $page->changeTpl('profile/general.buildnames.tpl', NO_SKIN); require_once 'name.func.inc.php'; - $page->assign('names', build_javascript_names($data)); + $page->assign('names', build_javascript_names($data, $isFemale)); } - function handler_p_orange(&$page) + function handler_referent(&$page, $pf) { - $page->changeTpl('profile/orange.tpl'); - - require_once 'validations.inc.php'; - - $res = XDB::query("SELECT e.entry_year, e.grad_year, d.promo, FIND_IN_SET('femme', u.flags) AS sexe - FROM auth_user_md5 AS u - INNER JOIN profile_display AS d ON (d.pid = u.user_id) - INNER JOIN profile_education AS e ON (e.uid = u.user_id AND FIND_IN_SET('primary', e.flags)) - WHERE u.user_id = {?}", S::v('uid')); - - list($promo, $promo_sortie_old, $promo_display, $sexe) = $res->fetchOneRow(); - $page->assign('promo_sortie_old', $promo_sortie_old); - $page->assign('promo', $promo); - $page->assign('promo_display', $promo_display); - $page->assign('sexe', $sexe); - - if (!Env::has('promo_sortie')) { - return; - } else { - S::assert_xsrf_token(); - } - - $promo_sortie = Env::i('promo_sortie'); - - if ($promo_sortie < 1000 || $promo_sortie > 9999) { - $page->trigError('L\'année de sortie doit être un nombre de quatre chiffres.'); - } - elseif ($promo_sortie < $promo + 3) { - $page->trigError('Trop tôt !'); - } - elseif ($promo_sortie == $promo_sortie_old) { - $page->trigWarning('Tu appartiens déjà à la promotion correspondante à cette année de sortie.'); - } - elseif ($promo_sortie == $promo + 3) { - XDB::execute("UPDATE profile_education - SET grad_year = {?} - WHERE uid = {?} AND FIND_IN_SET('primary', flags)", $promo_sortie, S::v('uid')); - $page->trigSuccess('Ton statut "orange" a été supprimé.'); - $page->assign('promo_sortie_old', $promo_sortie); - } - else { - $page->assign('promo_sortie', $promo_sortie); - - if (Env::has('submit')) { - $myorange = new OrangeReq(S::user(), $promo_sortie); - $myorange->submit(); - $page->assign('myorange', $myorange); - } - } - } - - function handler_referent(&$page, $x = null) - { - require_once 'user.func.inc.php'; $page->changeTpl('profile/fiche_referent.tpl', SIMPLE); - $user = User::get($x); - if ($user == null) { + $pf = Profile::get($pf); + if (!$pf) { return PL_NOT_FOUND; } - $res = XDB::query("SELECT cv FROM auth_user_md5 WHERE user_id = {?}", $user->id()); - $cv = $res->fetchOneCell(); - - $page->assign_by_ref('user', $user); - $page->assign('cv', MiniWiki::WikiToHTML($cv, true)); - $page->assign('adr_pro', get_user_details_pro($user->id())); + $page->assign_by_ref('profile', $pf); ///// recuperations infos referent - //expertise - $res = XDB::query("SELECT expertise FROM profile_mentor WHERE uid = {?}", $user->id()); - $page->assign('expertise', $res->fetchOneCell()); - - //secteurs - $secteurs = $ss_secteurs = Array(); + // Sectors + $sectors = $subSectors = Array(); $res = XDB::iterRow( "SELECT s.name AS label, ss.name AS label FROM profile_mentor_sector AS m LEFT JOIN profile_job_sector_enum AS s ON(m.sectorid = s.id) LEFT JOIN profile_job_subsector_enum AS ss ON(m.sectorid = ss.sectorid AND m.subsectorid = ss.id) - WHERE uid = {?}", $user->id()); - while (list($sec, $ssec) = $res->next()) { - $secteurs[] = $sec; - $ss_secteurs[] = $ssec; + WHERE pid = {?}", $pf->id()); + while (list($sector, $subSector) = $res->next()) { + $sectors[] = $sector; + $subSectors[] = $subSector; } - $page->assign_by_ref('secteurs', $secteurs); - $page->assign_by_ref('ss_secteurs', $ss_secteurs); + $page->assign_by_ref('sectors', $sectors); + $page->assign_by_ref('subSectors', $subSectors); // Countries. $res = XDB::query( "SELECT gc.countryFR FROM profile_mentor_country AS m LEFT JOIN geoloc_countries AS gc ON (m.country = gc.iso_3166_1_a2) - WHERE uid = {?}", $user->id()); + WHERE pid = {?}", $pf->id()); $page->assign('pays', $res->fetchColumn()); $page->addJsLink('close_on_esc.js'); @@ -668,61 +540,39 @@ class ProfileModule extends PLModule $page->setTitle('Conseil Pro'); - //recuperation des noms de secteurs - $res = XDB::iterRow("SELECT id, name AS label FROM profile_job_sector_enum"); - $secteurs[''] = ''; - while (list($tmp_id, $tmp_label) = $res->next()) { - $secteurs[$tmp_id] = $tmp_label; - } - $page->assign_by_ref('secteurs', $secteurs); + // Retrieval of sector names + $sectors = DirEnum::getOptions(DirEnum::SECTORS); + $sectors[''] = ''; + $page->assign_by_ref('sectors', $sectors); // nb de mentors $res = XDB::query("SELECT count(*) FROM profile_mentor"); $page->assign('mentors_number', $res->fetchOneCell()); // On vient d'un formulaire - $where = array(); - $pays_sel = XDB::escape(Env::v('pays_sel')); - $secteur_sel = XDB::escape(Env::v('secteur')); - $ss_secteur_sel = XDB::escape(Env::v('ss_secteur')); - $expertise_champ = XDB::escape(Env::v('expertise')); - - if ($pays_sel != "''") { - $where[] = "mp.country = $pays_sel"; - } - if ($secteur_sel != "''") { - $where[] = "ms.sectorid = $secteur_sel"; - if ($ss_secteur_sel != "''") { - $where[] = "ms.subsectorid = $ss_secteur_sel"; - } - } - if ($expertise_champ != "''") { - $where[] = "MATCH(m.expertise) AGAINST($expertise_champ)"; - } - - if ($where) { - $where = join(' AND ', $where); - - $set = new UserSet("INNER JOIN profile_mentor AS m ON (m.uid = u.user_id) - LEFT JOIN profile_mentor_country AS mp ON (mp.uid = m.uid) - LEFT JOIN profile_mentor_sector AS ms ON (ms.uid = m.uid)", - $where); + require_once 'ufbuilder.inc.php'; + $ufb = new UFB_MentorSearch(); + if (!$ufb->isEmpty()) { + require_once 'userset.inc.php'; + $ufc = $ufb->getUFC(); + $set = new ProfileSet($ufc); $set->addMod('mentor', 'Référents'); $set->apply('referent/search', $page, $action, $subaction); if ($set->count() > 100) { $page->assign('recherche_trop_large', true); } } + $page->changeTpl('profile/referent.tpl'); } function handler_ref_sect(&$page, $sect) { - header('Content-Type: text/html; charset=utf-8'); + pl_content_headers("text/html"); $page->changeTpl('include/field.select.tpl', NO_SKIN); - $page->assign('onchange', 'setSSecteurs()'); + $page->assign('onchange', 'setSSectors()'); $page->assign('id', 'ssect_field'); - $page->assign('name', 'ss_secteur'); + $page->assign('name', 'subSector'); $it = XDB::iterator("SELECT id, name AS field FROM profile_job_subsector_enum WHERE sectorid = {?}", $sect); @@ -731,14 +581,14 @@ class ProfileModule extends PLModule function handler_ref_country(&$page, $sect, $ssect = '') { - header('Content-Type: text/html; charset=utf-8'); + pl_content_headers("text/html"); $page->changeTpl('include/field.select.tpl', NO_SKIN); $page->assign('name', 'pays_sel'); $where = ($ssect ? ' AND ms.subsectorid = {?}' : ''); $it = XDB::iterator("SELECT gc.iso_3166_1_a2 AS id, gc.countryFR AS field FROM geoloc_countries AS gc INNER JOIN profile_mentor_country AS mp ON (mp.country = gc.iso_3166_1_a2) - INNER JOIN profile_mentor_sector AS ms ON (ms.uid = mp.uid) + INNER JOIN profile_mentor_sector AS ms ON (ms.pid = mp.pid) WHERE ms.sectorid = {?} " . $where . " GROUP BY iso_3166_1_a2 ORDER BY countryFR", $sect, $ssect); @@ -753,13 +603,35 @@ class ProfileModule extends PLModule $req = XDB::query(' SELECT m.asso_id, a.nom, diminutif, a.logo IS NOT NULL AS has_logo, COUNT(e.eid) AS events, mail_domain AS lists - FROM groupex.membres AS m - INNER JOIN groupex.asso AS a ON(m.asso_id = a.id) - LEFT JOIN groupex.evenements AS e ON(e.asso_id = m.asso_id AND e.archive = 0) + FROM group_members AS m + INNER JOIN groups AS a ON(m.asso_id = a.id) + LEFT JOIN group_events AS e ON(e.asso_id = m.asso_id AND e.archive = 0) WHERE uid = {?} GROUP BY m.asso_id ORDER BY a.nom', S::i('uid')); $page->assign('assos', $req->fetchAllAssoc()); } + function handler_xnetlogo(&$page, $id) + { + if (is_null($id)) { + return PL_NOT_FOUND; + } + + $res = XDB::query('SELECT logo, logo_mime + FROM groups + WHERE id = {?}', $id); + list($logo, $logo_mime) = $res->fetchOneRow(); + + if (!empty($logo)) { + pl_cached_dynamic_content_headers($logo_mime); + echo $logo; + } else { + pl_cached_dynamic_content_headers("image/jpeg"); + readfile(dirname(__FILE__) . '/../htdocs/images/dflt_carre.jpg'); + } + + exit; + } + function handler_vcard(&$page, $x = null) { if (is_null($x)) { @@ -773,7 +645,7 @@ class ProfileModule extends PLModule } $vcard = new VCard(); - $vcard->addUser($x); + $vcard->addProfile(Profile::get($x)); $vcard->show(); } @@ -789,10 +661,8 @@ class ProfileModule extends PLModule switch ($action) { case "original": - header("Content-type: image/jpeg"); - readfile("/home/web/trombino/photos" . $user->promo() . "/" . $user->login() . ".jpg"); + PlImage::fromFile("/home/web/trombino/photos" . $user->promo() . "/" . $user->login() . ".jpg", "image/jpeg")->send(); exit; - break; case "new": S::assert_xsrf_token(); @@ -802,14 +672,14 @@ class ProfileModule extends PLModule $mimetype = substr($_FILES['userfile']['type'], 6); unlink($_FILES['userfile']['tmp_name']); XDB::execute( - "REPLACE INTO photo SET uid={?}, attachmime = {?}, attach={?}, x={?}, y={?}", - $user->id(), $mimetype, $data, $x, $y); + "REPLACE INTO profile_photos SET pid={?}, attachmime = {?}, attach={?}, x={?}, y={?}", + $user->profile()->id(), $mimetype, $data, $x, $y); break; case "delete": S::assert_xsrf_token(); - XDB::execute('DELETE FROM photo WHERE uid = {?}', $user->id()); + XDB::execute('DELETE FROM profile_photos WHERE pid = {?}', $user->profile()->id()); break; } } @@ -827,8 +697,8 @@ class ProfileModule extends PLModule function handler_admin_binets(&$page, $action = 'list', $id = null) { $page->setTitle('Administration - Binets'); $page->assign('title', 'Gestion des binets'); - $table_editor = new PLTableEditor('admin/binets', 'binets_def', 'id'); - $table_editor->add_join_table('binets_ins','binet_id',true); + $table_editor = new PLTableEditor('admin/binets', 'profile_binet_enum', 'id'); + $table_editor->add_join_table('profile_binets','binet_id',true); $table_editor->describe('text','intitulé',true); $table_editor->apply($page, $action, $id); } @@ -870,31 +740,18 @@ class ProfileModule extends PLModule function handler_admin_sections(&$page, $action = 'list', $id = null) { $page->setTitle('Administration - Sections'); $page->assign('title', 'Gestion des sections'); - $table_editor = new PLTableEditor('admin/sections','sections','id'); + $table_editor = new PLTableEditor('admin/sections','profile_section_enum','id'); $table_editor->describe('text','intitulé',true); $table_editor->apply($page, $action, $id); } - function handler_admin_ss_secteurs(&$page, $action = 'list', $id = null) { - $page->setTitle('Administration - Sous-secteurs'); - $page->assign('title', 'Gestion des sous-secteurs'); - $table_editor = new PLTableEditor('admin/ss_secteurs', 'emploi_ss_secteur', 'id', true); - $table_editor->describe('label', 'intitulé', true); - $table_editor->apply($page, $action, $id); - } - function handler_admin_fonctions(&$page, $action = 'list', $id = null) { - $page->setTitle('Administration - Fonctions'); - $page->assign('title', 'Gestion des fonctions'); - $table_editor = new PLTableEditor('admin/fonctions', 'fonctions_def', 'id', true); - $table_editor->describe('fonction_fr', 'intitulé', true); - $table_editor->describe('fonction_en', 'intitulé (ang)', true); - $table_editor->describe('flags', 'titre', true); - $table_editor->apply($page, $action, $id); - } - function handler_admin_secteurs(&$page, $action = 'list', $id = null) { + function handler_admin_sectors(&$page, $action = 'list', $id = null) { $page->setTitle('Administration - Secteurs'); $page->assign('title', 'Gestion des secteurs'); - $table_editor = new PLTableEditor('admin/secteurs', 'emploi_secteur', 'id', true); - $table_editor->describe('label', 'intitulé', true); + $table_editor = new PLTableEditor('admin/sectors', 'profile_job_subsubsector_enum', 'id', true); + $table_editor->describe('sectorid', 'id du secteur', false); + $table_editor->describe('subsectorid', 'id du sous-secteur', false); + $table_editor->describe('name', 'nom', true); + $table_editor->describe('flags', 'affichage', true); $table_editor->apply($page, $action, $id); } function handler_admin_networking(&$page, $action = 'list', $id = null) { @@ -927,7 +784,7 @@ class ProfileModule extends PLModule function handler_admin_medals(&$page, $action = 'list', $id = null) { $page->setTitle('Administration - Distinctions'); $page->assign('title', 'Gestion des Distinctions'); - $table_editor = new PLTableEditor('admin/medals','profile_medals','id'); + $table_editor = new PLTableEditor('admin/medals','profile_medal_enum','id'); $table_editor->describe('text', 'intitulé', true); $table_editor->describe('img', 'nom de l\'image', false); $table_editor->describe('flags', 'valider', true); @@ -938,29 +795,29 @@ class ProfileModule extends PLModule $mid = $id; if (Post::v('act') == 'del') { - XDB::execute('DELETE FROM profile_medals_grades + XDB::execute('DELETE FROM profile_medal_grade_enum WHERE mid={?} AND gid={?}', $mid, Post::i('gid')); } else { foreach (Post::v('grades', array()) as $gid=>$text) { if ($gid === 0) { if (!empty($text)) { $res = XDB::query('SELECT MAX(gid) - FROM profile_medals_grades + FROM profile_medal_grade_enum WHERE mid = {?}', $mid); $gid = $res->fetchOneCell() + 1; - XDB::execute('INSERT INTO profile_medals_grades (mid, gid, text, pos) + XDB::execute('INSERT INTO profile_medal_grade_enum (mid, gid, text, pos) VALUES ({?}, {?}, {?}, {?})', $mid, $gid, $text, $_POST['pos']['0']); } } else { - XDB::execute('UPDATE profile_medals_grades + XDB::execute('UPDATE profile_medal_grade_enum SET pos={?}, text={?} WHERE gid={?} AND mid={?}', $_POST['pos'][$gid], $text, $gid, $mid); } } } - $res = XDB::iterator('SELECT gid, text, pos FROM profile_medals_grades WHERE mid={?} ORDER BY pos', $mid); + $res = XDB::iterator('SELECT gid, text, pos FROM profile_medal_grade_enum WHERE mid={?} ORDER BY pos', $mid); $page->assign('grades', $res); } }