X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=077b3dc4302ba7ee9b3763215d294a2000b9a5e4;hb=7996ae8cd41fbb3ccd748eaed71a50f866269c6e;hp=e1c70c00abb0acb17879e3d2f213427b15017618;hpb=fb813fb52d5ab65ca9a5b92b5cb9089523380d79;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index e1c70c0..077b3dc 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -48,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), @@ -84,17 +83,17 @@ 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. if ($req && S::logged()) { include 'validations.inc.php'; - $myphoto = PhotoReq::get_request($user->id()); + $myphoto = PhotoReq::get_request($profile->owner()->id()); $photo = PlImage::fromData($myphoto->data, $myphoto->mimetype); } else { - $photo = $user->profile()->getPhoto(true); + $photo = $profile->getPhoto(true, true); } // Display the photo, or a default one when not available. @@ -107,7 +106,7 @@ 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 ? @@ -178,57 +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 = (!is_numeric($x) || S::has_perms()) ? Profile::get($x) : null; - if (!$login) { + $pid = (!is_numeric($id) || S::admin()) ? Profile::getPID($id) : null; + if (is_null($pid)) { if (S::logged()) { - $page->trigError($x . ' inconnu dans l\'annuaire'); + $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') { @@ -239,72 +230,34 @@ class ProfileModule extends PLModule $view = 'private'; } - // Determines is the user is registered, and fetches the user infos in - // the appropriate way. - $owner = $login->owner(); - if (!$owner || $owner->state != 'pending') { - $new = Env::v('modif') == 'new'; - // XXX: Deprecated... - $user = get_user_details($login->hrid(), S::i('uid'), $view); - } else { - $new = false; - $user = array(); - if (S::logged()) { - pl_redirect('marketing/public/' . $owner->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->hrid()); + S::logger()->log('view_profile', $profile->hrid()); } // Sets the title of the html page. - $page->setTitle($login->fullName()); - - // Prepares the display of the user's mugshot. - $photo = 'photo/' . $login->hrid() . ($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; - } + $page->setTitle($profile->fullName()); // Determines and displays the virtual alias. - global $globals; - $owner = $login->owner(); - if ($owner) { + if (!is_null($owner)) { $page->assign('virtualalias', $owner->emailAlias()); } - // 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', $owner); - $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) @@ -341,21 +294,21 @@ class ProfileModule extends PLModule // Build the page $page->addJsLink('ajax.js'); - $page->addJsLink('education.js'); /* dynamic content */ - $page->addJsLink('grades.js'); /* dynamic content */ + $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, 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->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) { @@ -381,7 +334,7 @@ class ProfileModule extends PLModule 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()) { @@ -390,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()) { @@ -490,10 +443,13 @@ class ProfileModule extends PLModule ORDER BY id', $sssect); $page->changeTpl('profile/jobs.alternates.tpl', NO_SKIN); - $alternate = $res->next(); - $alternates = $alternate['name']; - while ($alternate = $res->next()) { - $alternates .= ', ' . $alternate['name']; + $alternates = ''; + if ($res->total() > 0) { + $alternate = $res->next(); + $alternates = $alternate['name']; + while ($alternate = $res->next()) { + $alternates .= ', ' . $alternate['name']; + } } $page->assign('alternates', $alternates); } @@ -530,83 +486,27 @@ 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)); - } - - function handler_p_orange(&$page, $pid = null) - { - $page->changeTpl('profile/orange.tpl'); - - require_once 'validations.inc.php'; - $profile = Profile::get($pid); - if (is_null($profile)) { - return PL_NOT_FOUND; - } - $page->assign('promo_sortie_old', $profile->grad_year); - $page->assign('promo', $profile->entry_year); - $page->assign('promo_display', $profile->promo()); - $page->assign('sexe', $profile->isFemale()); - - if (!Env::has('promo_sortie')) { - return; - } else { - S::assert_xsrf_token(); - } - - $promo_sortie = Env::i('promo_sortie'); - $promo = $profile->entry_year; - 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, $profile->id()); - $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); - } - } + $page->assign('names', build_javascript_names($data, $isFemale)); } - function handler_referent(&$page, $user) + function handler_referent(&$page, $pf) { - require_once 'user.func.inc.php'; $page->changeTpl('profile/fiche_referent.tpl', SIMPLE); - $user = Profile::get($user); - if (!$user) { + $pf = Profile::get($pf); + if (!$pf) { return PL_NOT_FOUND; } - $page->assign_by_ref('user', $user); - $page->assign('cv', MiniWiki::WikiToHTML($user->cv, true)); - //TODO: waiting for job refactoring to be done - //$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()); - // Sectors $sectors = $subSectors = Array(); $res = XDB::iterRow( @@ -614,7 +514,7 @@ class ProfileModule extends PLModule 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()); + WHERE pid = {?}", $pf->id()); while (list($sector, $subSector) = $res->next()) { $sectors[] = $sector; $subSectors[] = $subSector; @@ -627,7 +527,7 @@ class ProfileModule extends PLModule "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'); @@ -640,10 +540,8 @@ class ProfileModule extends PLModule $page->setTitle('Conseil Pro'); - require_once "directory.enums.inc.php"; - // Retrieval of sector names - $sectors = DirEnum::getOptionsArray(DirEnum::SECTORS); + $sectors = DirEnum::getOptions(DirEnum::SECTORS); $sectors[''] = ''; $page->assign_by_ref('sectors', $sectors); @@ -690,7 +588,7 @@ class ProfileModule extends PLModule $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); @@ -747,7 +645,7 @@ class ProfileModule extends PLModule } $vcard = new VCard(); - $vcard->addUser($x); + $vcard->addProfile(Profile::get($x)); $vcard->show(); } @@ -763,8 +661,7 @@ class ProfileModule extends PLModule switch ($action) { case "original": - pl_cached_content_headers("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; case "new": @@ -775,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; } } @@ -800,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); } @@ -843,7 +740,7 @@ 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); } @@ -887,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); @@ -898,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); } }