X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=1c6466e0328a6818d8878d9b9942681848723e7b;hb=9f97216c33993e507e50ed31e070ce1a1d32cbcf;hp=47fd7358fae905833c6ae7a02fa0a3b9259ab289;hpb=954cfb01db8efa584c72aead14be2146e1ca98c5;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index 47fd735..1c6466e 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -1,6 +1,6 @@ login() . '.jpg'; if (Env::has('upload')) { S::assert_xsrf_token(); @@ -145,7 +143,7 @@ class ProfileModule extends PLModule if (!$upload->upload($_FILES['userfile']) && !$upload->download(Env::v('photo'))) { $page->trigError('Une erreur est survenue lors du téléchargement du fichier'); } else { - $myphoto = new PhotoReq(S::v('uid'), $upload); + $myphoto = new PhotoReq(S::user(), $upload); if ($myphoto->isValid()) { $myphoto->submit(); } @@ -155,7 +153,7 @@ class ProfileModule extends PLModule $upload = new PlUpload(S::user()->login(), 'photo'); if ($upload->copyFrom($trombi_x)) { - $myphoto = new PhotoReq(S::v('uid'), $upload); + $myphoto = new PhotoReq(S::user(), $upload); if ($myphoto->isValid()) { $myphoto->commit(); $myphoto->clean(); @@ -190,52 +188,67 @@ class ProfileModule extends PLModule function handler_profile(&$page, $x = 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)) { return PL_NOT_FOUND; } - global $globals; - require_once 'user.func.inc.php'; - - $page->changeTpl('profile/profile.tpl', SIMPLE); - - $view = 'private'; - if (!S::logged() || Env::v('view') == 'public') $view = 'public'; - if (S::logged() && Env::v('view') == 'ax') $view = 'ax'; - $login = S::logged() ? User::get($x) : User::getSilent($x); if (!$login) { return PL_NOT_FOUND; } + // Now that we know this is the profile of an existing user, 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') { + $view = 'public'; + } else if (S::logged() && Env::v('view') == 'ax') { + $view = 'ax'; + } else { + $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()) { - $user = get_not_registered_user($x, true); - if ($user->total() != 1) { - return PL_NOT_FOUND; - } - $user = $user->next(); + 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/' . $user['user_id']); + pl_redirect('marketing/public/' . $login->login()); } - $user['forlife'] = $x; - } else { - $new = Env::v('modif') == 'new'; - $user = get_user_details($login->login(), S::v('uid'), $view); } + // Profile view are logged. if (S::logged()) { S::logger()->log('view_profile', $login->login()); } - $title = $user['prenom'] . ' ' . ( empty($user['nom_usage']) ? $user['nom'] : $user['nom_usage'] ); - $page->setTitle($title); + // Sets the title of the html page. + $page->setTitle($login->fullName()); - // photo - - $photo = 'photo/'.$user['forlife'].($new ? '/req' : ''); + // 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"); @@ -255,29 +268,33 @@ class ProfileModule extends PLModule $user['x'] = 160; } - $page->assign('logged', has_user_right('private', $view)); - if (!has_user_right($user['photo_pub'], $view)) { - $photo = ""; - } - - $page->assign_by_ref('x', $user); - $page->assign('photo_url', $photo); - // alias virtual + // 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}'", - $user['user_id'], - $user['forlife'].'@'.$globals->mail->domain, - $user['forlife'].'@'.$globals->mail->domain2); + "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('view', $view); $page->addJsLink('close_on_esc.js'); - header('Last-Modified: ' . date('r', strtotime($user['date']))); + if (isset($user['date'])) { + header('Last-Modified: ' . date('r', strtotime($user['date']))); + } } function handler_ax(&$page, $user = null) @@ -307,7 +324,7 @@ class ProfileModule extends PLModule $page->assign('no_private_key', true); } if (Env::v('synchro_ax') == 'confirm' && !is_ax_key_missing()) { - ax_synchronize(S::v('bestalias'), S::v('uid')); + ax_synchronize(S::user()->login(), S::v('uid')); $page->trigSuccess('Ton profil a été synchronisé avec celui du site polytechniciens.com'); } @@ -412,11 +429,13 @@ class ProfileModule extends PLModule $page->assign('i', $id); $page->assign('job', array()); $page->assign('new', true); - $page->assign('secteurs', XDB::iterator("SELECT id, label - FROM emploi_secteur")); - $page->assign('fonctions', XDB::iterator("SELECT id, fonction_fr, FIND_IN_SET('titre', flags) AS title - FROM fonctions_def - ORDER BY id")); + $res = XDB::query("SELECT id, label + FROM emploi_secteur"); + $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()); } function handler_ajax_secteur(&$page, $id, $sect, $ssect = -1) @@ -494,8 +513,7 @@ class ProfileModule extends PLModule $page->assign('promo_sortie', $promo_sortie); if (Env::has('submit')) { - $myorange = new OrangeReq(S::v('uid'), - $promo_sortie); + $myorange = new OrangeReq(S::user(), $promo_sortie); $myorange->submit(); $page->assign('myorange', $myorange); } @@ -505,39 +523,24 @@ class ProfileModule extends PLModule function handler_referent(&$page, $x = null) { require_once 'user.func.inc.php'; - - if (is_null($x)) { - return PL_NOT_FOUND; - } - $page->changeTpl('profile/fiche_referent.tpl', SIMPLE); - $res = XDB::query( - "SELECT prenom, nom, user_id, promo, cv, a.alias AS bestalias - FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON (u.user_id=a.id - AND FIND_IN_SET('bestalias', a.flags)) - INNER JOIN aliases AS a1 ON (u.user_id=a1.id - AND a1.alias = {?} - AND a1.type!='homonyme')", $x); - - if ($res->numRows() != 1) { + $user = User::get($x); + if ($user == null) { return PL_NOT_FOUND; } - list($prenom, $nom, $user_id, $promo, $cv, $bestalias) = $res->fetchOneRow(); + $res = XDB::query("SELECT cv FROM auth_user_md5 WHERE user_id = {?}", $user->id()); + $cv = $res->fetchOneCell(); - $page->assign('prenom', $prenom); - $page->assign('nom', $nom); - $page->assign('promo', $promo); - $page->assign('cv', MiniWiki::WikiToHTML($cv, true)); - $page->assign('bestalias', $bestalias); - $page->assign('adr_pro', get_user_details_pro($user_id)); + $page->assign_by_ref('user', $user); + $page->assign('cv', MiniWiki::WikiToHTML($cv, true)); + $page->assign('adr_pro', get_user_details_pro($user->id())); ///// recuperations infos referent //expertise - $res = XDB::query("SELECT expertise FROM mentor WHERE uid = {?}", $user_id); + $res = XDB::query("SELECT expertise FROM mentor WHERE uid = {?}", $user->id()); $page->assign('expertise', $res->fetchOneCell()); //secteurs @@ -547,7 +550,7 @@ class ProfileModule extends PLModule FROM mentor_secteurs AS m LEFT JOIN emploi_secteur AS s ON(m.secteur = s.id) LEFT JOIN emploi_ss_secteur AS ss ON(m.secteur = ss.secteur AND m.ss_secteur = ss.id) - WHERE uid = {?}", $user_id); + WHERE uid = {?}", $user->id()); while (list($sec, $ssec) = $res->next()) { $secteurs[] = $sec; $ss_secteurs[] = $ssec; @@ -560,7 +563,7 @@ class ProfileModule extends PLModule "SELECT gp.pays FROM mentor_pays AS m LEFT JOIN geoloc_pays AS gp ON(m.pid = gp.a2) - WHERE uid = {?}", $user_id); + WHERE uid = {?}", $user->id()); $page->assign('pays', $res->fetchColumn()); $page->addJsLink('close_on_esc.js'); @@ -677,6 +680,8 @@ class ProfileModule extends PLModule // on vient de recevoir une requete, differente de l'ancien nom d'usage if ($nom_usage == $nom) { + $page->trigWarning('Le nom d\'usage que tu demandes est identique à ton nom à l\'X, ' + . 'aucune modification n\'a donc été effectuée.'); $page->assign('same', true); } else { // le nom de mariage est distinct du nom à l'X // on calcule l'alias pour l'afficher @@ -684,7 +689,7 @@ class ProfileModule extends PLModule if ($reason == 'other') { $reason = Env::v('other_reason'); } - $myusage = new UsageReq(S::v('uid'), $nom_usage, $reason); + $myusage = new UsageReq(S::user(), $nom_usage, $reason); $myusage->submit(); $page->assign('myusage', $myusage); } @@ -718,26 +723,25 @@ class ProfileModule extends PLModule $x = substr($x, 0, strlen($x) - 4); } - $vcard = new VCard($x); - $vcard->do_page($page); + $vcard = new VCard(); + $vcard->addUser($x); + $vcard->show(); } - function handler_admin_trombino(&$page, $uid = null, $action = null) { + function handler_admin_trombino(&$page, $login = null, $action = null) { $page->changeTpl('profile/admin_trombino.tpl'); $page->setTitle('Administration - Trombino'); - $page->assign('uid', $uid); - $q = XDB::query( - "SELECT a.alias,promo - FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON ( u.user_id = a.id AND type='a_vie' ) - WHERE user_id = {?}", $uid); - list($forlife, $promo) = $q->fetchOneRow(); + if (!$login || !($user = User::get($login))) { + return PL_NOT_FOUND; + } else { + $page->assign_by_ref('user', $user); + } switch ($action) { case "original": header("Content-type: image/jpeg"); - readfile("/home/web/trombino/photos".$promo."/".$forlife.".jpg"); + readfile("/home/web/trombino/photos" . $user->promo() . "/" . $user->login() . ".jpg"); exit; break; @@ -750,17 +754,15 @@ class ProfileModule extends PLModule unlink($_FILES['userfile']['tmp_name']); XDB::execute( "REPLACE INTO photo SET uid={?}, attachmime = {?}, attach={?}, x={?}, y={?}", - $uid, $mimetype, $data, $x, $y); + $user->id(), $mimetype, $data, $x, $y); break; case "delete": S::assert_xsrf_token(); - XDB::execute('DELETE FROM photo WHERE uid = {?}', $uid); + XDB::execute('DELETE FROM photo WHERE uid = {?}', $user->id()); break; } - - $page->assign('forlife', $forlife); } function handler_admin_binets(&$page, $action = 'list', $id = null) { $page->setTitle('Administration - Binets');