X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=47fd7358fae905833c6ae7a02fa0a3b9259ab289;hb=954cfb01db8efa584c72aead14be2146e1ca98c5;hp=63e3370eb633a071ef71a0939c9473d51b6c10ff;hpb=a62886091365824f04a967638dee269196c3899d;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index 63e3370..47fd735 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -73,35 +73,40 @@ class ProfileModule extends PLModule function handler_photo(&$page, $x = null, $req = null) { - if (is_null($x)) { + if (!$x || !($user = User::getSilent($x))) { return PL_NOT_FOUND; } - $res = XDB::query("SELECT id, pub FROM aliases - LEFT JOIN photo ON(id = uid) - WHERE alias = {?}", $x); - list($uid, $photo_pub) = $res->fetchOneRow(); + // 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($uid); - Header('Content-type: image/'.$myphoto->mimetype); - echo $myphoto->data; + $myphoto = PhotoReq::get_request($user->id()); + if ($myphoto) { + $photo_data = $myphoto->data; + $photo_type = $myphoto->mimetype; + } } else { $res = XDB::query( - "SELECT attachmime, attach + "SELECT attachmime, attach, pub FROM photo - WHERE uid={?}", $uid); - - if ((list($type, $data) = $res->fetchOneRow()) - && ($photo_pub == 'public' || S::logged())) { - Header("Content-type: image/$type"); - echo $data; - } else { - Header('Content-type: image/png'); - echo file_get_contents(dirname(__FILE__).'/../htdocs/images/none.png'); + WHERE uid = {?}", $user->id()); + list($photo_type, $photo_data, $photo_pub) = $res->fetchOneRow(); + if ($photo_pub != 'public' && !S::logged()) { + $photo_type = $photo_data = null; } } + + // 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; } @@ -136,7 +141,7 @@ class ProfileModule extends PLModule if (Env::has('upload')) { S::assert_xsrf_token(); - $upload = new PlUpload(S::v('forlife'), 'photo'); + $upload = new PlUpload(S::user()->login(), 'photo'); if (!$upload->upload($_FILES['userfile']) && !$upload->download(Env::v('photo'))) { $page->trigError('Une erreur est survenue lors du téléchargement du fichier'); } else { @@ -148,7 +153,7 @@ class ProfileModule extends PLModule } elseif (Env::has('trombi')) { S::assert_xsrf_token(); - $upload = new PlUpload(S::v('forlife'), 'photo'); + $upload = new PlUpload(S::user()->login(), 'photo'); if ($upload->copyFrom($trombi_x)) { $myphoto = new PhotoReq(S::v('uid'), $upload); if ($myphoto->isValid()) { @@ -198,19 +203,15 @@ class ProfileModule extends PLModule if (!S::logged() || Env::v('view') == 'public') $view = 'public'; if (S::logged() && Env::v('view') == 'ax') $view = 'ax'; - if (is_numeric($x)) { - $res = XDB::query( - "SELECT alias - FROM aliases AS a - INNER JOIN auth_user_md5 AS u ON (a.id=u.user_id AND a.type='a_vie') - WHERE matricule={?}", $x); - $login = $res->fetchOneCell(); - } else { - $login = get_user_forlife($x, S::logged() ? '_default_user_callback' - : '_silent_user_callback'); + $login = S::logged() ? User::get($x) : User::getSilent($x); + if (!$login) { + return PL_NOT_FOUND; } - if (empty($login)) { + $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; @@ -222,11 +223,11 @@ class ProfileModule extends PLModule $user['forlife'] = $x; } else { $new = Env::v('modif') == 'new'; - $user = get_user_details($login, S::v('uid'), $view); + $user = get_user_details($login->login(), S::v('uid'), $view); } if (S::logged()) { - S::logger()->log('view_profile', $login); + S::logger()->log('view_profile', $login->login()); } $title = $user['prenom'] . ' ' . ( empty($user['nom_usage']) ? $user['nom'] : $user['nom_usage'] ); @@ -281,18 +282,17 @@ class ProfileModule extends PLModule function handler_ax(&$page, $user = null) { - require_once 'user.func.inc.php'; - $user = get_user_forlife($user); + $user = User::get($user); if (!$user) { return PL_NOT_FOUND; } - $res = XDB::query('SELECT matricule_ax - FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON (a.type = "a_vie" AND a.id = u.user_id) - WHERE a.alias = {?}', $user); + + $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 est inconnu"); + $page->kill("Le matricule AX de {$user->login()} est inconnu"); } http_redirect("http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&anc_id=$mat"); } @@ -317,8 +317,8 @@ class ProfileModule extends PLModule $page->addJsLink('grades.js'); $page->addJsLink('profile.js'); $page->addJsLink('jquery.autocomplete.js'); - $wiz = new PlWizard('Profil', 'core/plwizard.tpl', true, true); - require_once dirname(__FILE__) . '/profile/page.inc.php'; + $wiz = new PlWizard('Profil', PlPage::getCoreTpl('plwizard.tpl'), true, true); + $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'); @@ -337,7 +337,7 @@ class ProfileModule extends PLModule . " la procédure de récupération de mot de passe si un jour tu le perdais"); } - $page->setTitle('Polytechnique.org - Mon Profil'); + $page->setTitle('Mon Profil'); } function handler_applis_js(&$page) @@ -568,9 +568,10 @@ class ProfileModule extends PLModule function handler_ref_search(&$page, $action = null, $subaction = null) { - require_once 'wiki.inc.php'; - wiki_require_page('Docs.Emploi'); - $page->setTitle('Polytechnique.org - Conseil Pro'); + $wp = new PlWikiPage('Docs.Emploi'); + $wp->buildCache(); + + $page->setTitle('Conseil Pro'); //recuperation des noms de secteurs $res = XDB::iterRow("SELECT id, label FROM emploi_secteur"); @@ -693,7 +694,7 @@ class ProfileModule extends PLModule function handler_xnet(&$page) { $page->changeTpl('profile/groupesx.tpl'); - $page->setTitle('Polytechnique.org - Promo, Groupes X, Binets'); + $page->setTitle('Promo, Groupes X, Binets'); $req = XDB::query(' SELECT m.asso_id, a.nom, diminutif, a.logo IS NOT NULL AS has_logo, @@ -723,7 +724,7 @@ class ProfileModule extends PLModule function handler_admin_trombino(&$page, $uid = null, $action = null) { $page->changeTpl('profile/admin_trombino.tpl'); - $page->setTitle('Polytechnique.org - Administration - Trombino'); + $page->setTitle('Administration - Trombino'); $page->assign('uid', $uid); $q = XDB::query( @@ -762,7 +763,7 @@ class ProfileModule extends PLModule $page->assign('forlife', $forlife); } function handler_admin_binets(&$page, $action = 'list', $id = null) { - $page->setTitle('Polytechnique.org - Administration - Binets'); + $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); @@ -770,7 +771,7 @@ class ProfileModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_admin_formations(&$page, $action = 'list', $id = null) { - $page->setTitle('Polytechnique.org - Administration - Formations'); + $page->setTitle('Administration - Formations'); $page->assign('title', 'Gestion des formations'); $table_editor = new PLTableEditor('admin/formations','applis_def','id'); $table_editor->add_join_table('applis_ins','aid',true); @@ -779,21 +780,21 @@ class ProfileModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_admin_sections(&$page, $action = 'list', $id = null) { - $page->setTitle('Polytechnique.org - Administration - Sections'); + $page->setTitle('Administration - Sections'); $page->assign('title', 'Gestion des sections'); $table_editor = new PLTableEditor('admin/sections','sections','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('Polytechnique.org - Administration - Sous-secteurs'); + $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('Polytechnique.org - Administration - Fonctions'); + $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); @@ -802,14 +803,14 @@ class ProfileModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_admin_secteurs(&$page, $action = 'list', $id = null) { - $page->setTitle('Polytechnique.org - Administration - Secteurs'); + $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->apply($page, $action, $id); } function handler_admin_medals(&$page, $action = 'list', $id = null) { - $page->setTitle('Polytechnique.org - Administration - Distinctions'); + $page->setTitle('Administration - Distinctions'); $page->assign('title', 'Gestion des Distinctions'); $table_editor = new PLTableEditor('admin/medals','profile_medals','id'); $table_editor->describe('text', 'intitulé', true);