X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=b503016f2ea65fb6b7288ff386c2a4a4be069279;hb=732e5855cffcd5e2eaaf5bd66760c4432d437244;hp=a4c2d571a4540742af079603e85aee687142098b;hpb=a7c28fffa54b53f05ef4245b73a8dfb9597be877;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index a4c2d57..b503016 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -1,6 +1,6 @@ $this->make_hook('profile', AUTH_COOKIE), 'profile/ax' => $this->make_hook('ax', AUTH_COOKIE, 'admin'), 'profile/edit' => $this->make_hook('p_edit', AUTH_MDP), - 'profile/ajax/address' => $this->make_hook('ajax_address', AUTH_PUBLIC, 'user', NO_AUTH), - 'profile/ajax/tel' => $this->make_hook('ajax_tel', AUTH_COOKIE, 'user', NO_AUTH), + 'profile/ajax/address' => $this->make_hook('ajax_address', AUTH_COOKIE, 'user', NO_AUTH), + 'profile/ajax/tel' => $this->make_hook('ajax_tel', AUTH_COOKIE, 'user', NO_AUTH), + 'profile/ajax/medal' => $this->make_hook('ajax_medal', AUTH_COOKIE, 'user', NO_AUTH), + '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/skill' => $this->make_hook('ajax_skill', AUTH_COOKIE, 'user', NO_AUTH), + 'javascript/applis.js' => $this->make_hook('applis_js', AUTH_COOKIE), + 'javascript/grades.js' => $this->make_hook('grades_js', AUTH_COOKIE), + 'profile/medal' => $this->make_hook('medal', AUTH_PUBLIC), 'profile/orange' => $this->make_hook('p_orange', AUTH_MDP), 'profile/usage' => $this->make_hook('p_usage', AUTH_MDP), @@ -49,10 +56,11 @@ class ProfileModule extends PLModule 'admin/binets' => $this->make_hook('admin_binets', AUTH_MDP, 'admin'), 'admin/medals' => $this->make_hook('admin_medals', AUTH_MDP, 'admin'), 'admin/formations' => $this->make_hook('admin_formations', AUTH_MDP, 'admin'), - 'admin/groupes-x' => $this->make_hook('admin_groupesx', AUTH_MDP, 'admin'), 'admin/sections' => $this->make_hook('admin_sections', AUTH_MDP, 'admin'), 'admin/secteurs' => $this->make_hook('admin_secteurs', 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'), ); } @@ -97,6 +105,24 @@ class ProfileModule extends PLModule exit; } + function handler_medal(&$page, $mid) + { + $thumb = ($mid == 'thumb'); + $mid = $thumb ? @func_get_arg(2) : $mid; + + $res = XDB::query("SELECT img + FROM profile_medals + 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"); + echo file_get_contents($img); + exit; + } + function handler_photo_change(&$page) { $page->changeTpl('profile/trombino.tpl'); @@ -109,7 +135,7 @@ class ProfileModule extends PLModule if (Env::has('upload')) { $upload = new PlUpload(S::v('forlife'), 'photo'); if (!$upload->upload($_FILES['userfile']) && !$upload->download(Env::v('photo'))) { - $page->trig('Une erreur est survenue lors du téléchargement du fichier'); + $page->trigError('Une erreur est survenue lors du téléchargement du fichier'); } else { $myphoto = new PhotoReq(S::v('uid'), $upload); if ($myphoto->isValid()) { @@ -126,19 +152,23 @@ class ProfileModule extends PLModule } } } elseif (Env::v('suppr')) { - XDB::execute('DELETE FROM photo WHERE uid = {?}', - S::v('uid')); - XDB::execute('DELETE FROM requests - WHERE user_id = {?} AND type="photo"', - S::v('uid')); + XDB::execute('DELETE FROM photo + WHERE uid = {?}', + S::v('uid')); + XDB::execute('DELETE FROM requests + WHERE user_id = {?} AND type="photo"', + S::v('uid')); + update_NbValid(); } elseif (Env::v('cancel')) { - $sql = XDB::query('DELETE FROM requests - WHERE user_id={?} AND type="photo"', - S::v('uid')); + $sql = XDB::query('DELETE FROM requests + WHERE user_id={?} AND type="photo"', + S::v('uid')); + update_NbValid(); } - $sql = XDB::query('SELECT COUNT(*) FROM requests - WHERE user_id={?} AND type="photo"', + $sql = XDB::query('SELECT COUNT(*) + FROM requests + WHERE user_id={?} AND type="photo"', S::v('uid')); $page->assign('submited', $sql->fetchOneCell()); $page->assign('has_trombi_x', file_exists($trombi_x)); @@ -167,29 +197,29 @@ class ProfileModule extends PLModule WHERE matricule={?}", $x); $login = $res->fetchOneCell(); } else { - $login = get_user_forlife($x); + $login = get_user_forlife($x, S::logged() ? '_default_user_callback' + : '_silent_user_callback'); } if (empty($login)) { - if (preg_match('/([-a-z]+)\.([-a-z]+)\.([0-9]{4})/i', $x, $matches)) { - $matches = str_replace('-', '_', $matches); - $res = XDB::query("SELECT user_id - FROM auth_user_md5 - WHERE prenom LIKE {?} AND nom LIKE {?} AND promo = {?} - AND perms = 'pending'", - $matches[1], $matches[2], $matches[3]); - if ($res->numRows() == 1) { - $uid = $res->fetchOneCell(); - pl_redirect('marketing/public/' . $uid); - } + $user = get_not_registered_user($x, true); + if ($user->total() != 1) { + return PL_NOT_FOUND; } - return PL_NOT_FOUND; + $user = $user->next(); + if (S::logged()) { + pl_redirect('marketing/public/' . $user['user_id']); + } + $user['forlife'] = $x; + } else { + $new = Env::v('modif') == 'new'; + $user = get_user_details($login, S::v('uid'), $view); + } + + if (S::logged()) { + S::logger()->log('view_profile', $login); } - $new = Env::v('modif') == 'new'; - $user = get_user_details($login, S::v('uid'), $view); - $user['freetext'] = MiniWiki::WikiToHTML($user['freetext']); - $user['cv'] = MiniWiki::WikiToHTML($user['cv'], true); $title = $user['prenom'] . ' ' . ( empty($user['nom_usage']) ? $user['nom'] : $user['nom_usage'] ); $page->assign('xorg_title', $title); @@ -230,10 +260,11 @@ class ProfileModule extends PLModule INNER JOIN auth_user_quick ON ( user_id = {?} AND emails_alias_pub = 'public' ) WHERE ( redirect={?} OR redirect={?} ) AND alias LIKE '%@{$globals->mail->alias_dom}'", - S::v('uid'), + $user['user_id'], $user['forlife'].'@'.$globals->mail->domain, $user['forlife'].'@'.$globals->mail->domain2); $page->assign('virtualalias', $res->fetchOneCell()); + $page->assign('view', $view); $page->addJsLink('close_on_esc.js'); header('Last-Modified: ' . date('r', strtotime($user['date']))); @@ -257,48 +288,10 @@ class ProfileModule extends PLModule http_redirect("http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&anc_id=$mat"); } - function handler_p_edit(&$page, $opened_tab = null) + function handler_p_edit(&$page, $opened_tab = null, $mode = null) { global $globals; - // Finish registration procedure - if (Post::v('register_from_ax_question')) { - XDB::execute('UPDATE auth_user_quick - SET profile_from_ax = 1 - WHERE user_id = {?}', - S::v('uid')); - } - if (Post::v('add_to_nl')) { - require_once 'newsletter.inc.php'; - NewsLetter::subscribe(); - } - if (Post::v('add_to_ax')) { - require_once dirname(__FILE__) . '/axletter/axletter.inc.php'; - AXLetter::subscribe(); - } - if (Post::v('add_to_promo')) { - $r = XDB::query('SELECT id FROM groupex.asso WHERE diminutif = {?}', - S::v('promo')); - $asso_id = $r->fetchOneCell(); - XDB::execute('REPLACE INTO groupex.membres (uid,asso_id) - VALUES ({?}, {?})', - S::v('uid'), $asso_id); - $mmlist = new MMList(S::v('uid'), S::v('password')); - $mmlist->subscribe("promo".S::v('promo')); - } - if (Post::v('sub_ml')) { - $subs = array_keys(Post::v('sub_ml')); - $current_domain = null; - foreach ($subs as $list) { - list($sub, $domain) = explode('@', $list); - if ($domain != $current_domain) { - $current_domain = $domain; - $client = new MMList(S::v('uid'), S::v('password'), $domain); - } - $client->subscribe($sub); - } - } - // AX Synchronization require_once 'synchro_ax.inc.php'; if (is_ax_key_missing()) { @@ -306,46 +299,147 @@ class ProfileModule extends PLModule } if (Env::v('synchro_ax') == 'confirm' && !is_ax_key_missing()) { ax_synchronize(S::v('bestalias'), S::v('uid')); - $page->trig('Ton profil a été synchronisé avec celui du site polytechniciens.com'); + $page->trigSuccess('Ton profil a été synchronisé avec celui du site polytechniciens.com'); } - // Misc checks - // TODO: Block if birth date is missing ? - + // Build the page $page->addJsLink('ajax.js'); - $page->addJsLink('jquery.js'); - $wiz = new PlWizard('Profil', 'core/plwizard.tpl', true); + $page->addJsLink('applis.js'); + $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->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('ProfilePro', 'Informations professionnelles', 'emploi'); + $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); + $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()) { + $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->addCssLink('profil.css'); - $page->assign('xorg_title', 'Polytechnique.org - Mon Profil'); + $page->assign('xorg_title', 'Polytechnique.org - Mon Profil'); + } + + function handler_applis_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'); + $page->changeTpl('profile/applis.js.tpl', NO_SKIN); + require_once "applis.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'); + $page->changeTpl('profile/grades.js.tpl', NO_SKIN); + $res = XDB::iterator("SELECT * + FROM profile_medals_grades + ORDER BY mid, pos"); + $grades = array(); + while ($tmp = $res->next()) { + $grades[$tmp['mid']][] = $tmp; + } + $page->assign('grades', $grades); + + $res = XDB::iterator("SELECT *, FIND_IN_SET('validation', flags) AS validate + FROM profile_medals + ORDER BY type, text"); + $mlist = array(); + while ($tmp = $res->next()) { + $mlist[$tmp['type']][] = $tmp; + } + $page->assign('medal_list', $mlist); } function handler_ajax_address(&$page, $adid) { + header('Content-Type: text/html; charset=utf-8'); $page->changeTpl('profile/adresses.address.tpl', NO_SKIN); $page->assign('i', $adid); $page->assign('adr', array()); - $page->assign('ajaxadr', true); } function handler_ajax_tel(&$page, $adid, $telid) { + header('Content-Type: text/html; charset=utf-8'); $page->changeTpl('profile/adresses.tel.tpl', NO_SKIN); $page->assign('i', $adid); $page->assign('adid', "addresses_$adid"); $page->assign('adpref', "addresses[$adid]"); $page->assign('t', $telid); $page->assign('tel', array()); - $page->assign('ajaxtel', true); + } + + function handler_ajax_medal(&$page, $id) + { + header('Content-Type: text/html; charset=utf-8'); + $page->changeTpl('profile/deco.medal.tpl', NO_SKIN); + $page->assign('id', $id); + $page->assign('medal', array('valid' => 0, 'grade' => 0)); + } + + function handler_ajax_job(&$page, $id) + { + header('Content-Type: text/html; charset=utf-8'); + $page->changeTpl('profile/jobs.job.tpl', NO_SKIN); + $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")); + } + + function handler_ajax_secteur(&$page, $id, $sect, $ssect = -1) + { + header('Content-Type: text/html; charset=utf-8'); + $res = XDB::iterator("SELECT id, label + FROM emploi_ss_secteur + WHERE secteur = {?}", $sect); + $page->changeTpl('profile/jobs.secteur.tpl', NO_SKIN); + $page->assign('id', $id); + $page->assign('ssecteurs', $res); + $page->assign('sel', $ssect); + } + + function handler_ajax_skill(&$page, $cat, $id) + { + header('Content-Type: text/html; charset=utf-8'); + $page->changeTpl('profile/skill.skill.tpl', NO_SKIN); + $page->assign('cat', $cat); + $page->assign('id', $id); + if ($cat == 'competences') { + $page->assign('levels', array('initié' => 'initié', + 'bonne connaissance' => 'bonne connaissance', + 'expert' => 'expert')); + } else { + $page->assign('levels', array(1 => 'connaissance basique', + 2 => 'maîtrise des bases', + 3 => 'maîtrise limitée', + 4 => 'maîtrise générale', + 5 => 'bonne maîtrise', + 6 => 'maîtrise complète')); + } } function handler_p_orange(&$page) @@ -371,19 +465,19 @@ class ProfileModule extends PLModule $promo_sortie = Env::i('promo_sortie'); if ($promo_sortie < 1000 || $promo_sortie > 9999) { - $page->trig('L\'année de sortie doit être un nombre de quatre chiffres'); + $page->trigError('L\'année de sortie doit être un nombre de quatre chiffres'); } elseif ($promo_sortie < $promo + 3) { - $page->trig('Trop tôt'); + $page->trigError('Trop tôt'); } elseif ($promo_sortie == $promo_sortie_old) { - $page->trig('Tu appartiens déjà à la promotion correspondante à cette année de sortie.'); + $page->trigWarning('Tu appartiens déjà à la promotion correspondante à cette année de sortie.'); } elseif ($promo_sortie == $promo + 3) { XDB::execute( "UPDATE auth_user_md5 set promo_sortie={?} WHERE user_id={?}", $promo_sortie, S::v('uid')); - $page->trig('Ton statut "orange" a été supprimé.'); + $page->trigSuccess('Ton statut "orange" a été supprimé.'); $page->assign('promo_sortie_old', $promo_sortie); } else { @@ -560,7 +654,7 @@ class ProfileModule extends PLModule WHERE user_id={?}", S::v('uid')); list($nom, $usage_old, $flags, $alias_old) = $res->fetchOneRow(); - $flags = new flagset($flags); + $flags = new PlFlagSet($flags); $page->assign('usage_old', $usage_old); $page->assign('alias_old', $alias_old); @@ -670,27 +764,34 @@ class ProfileModule extends PLModule $table_editor->describe('url','site web',false); $table_editor->apply($page, $action, $id); } - function handler_admin_groupesx(&$page, $action = 'list', $id = null) { - $page->assign('xorg_title','Polytechnique.org - Administration - Groupes X'); - $page->assign('title', 'Gestion des Groupes X'); - $table_editor = new PLTableEditor('admin/groupes-x','groupesx_def','id'); - $table_editor->add_join_table('groupesx_ins','gid',true); - $table_editor->describe('text','intitulé',true); - $table_editor->describe('url','site web',false); - $table_editor->apply($page, $action, $id); - } function handler_admin_sections(&$page, $action = 'list', $id = null) { $page->assign('xorg_title','Polytechnique.org - Administration - Sections'); - $page->assign('title', 'Gestion des 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->assign('xorg_title', 'Polytechnique.org - 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->assign('xorg_title', 'Polytechnique.org - 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) { - $page->assign('xorg_title','Polytechnique.org - Administration - Secteurs'); - $page->assign('title', 'Gestion des Secteurs'); - $table_editor = new PLTableEditor('admin/secteurs','emploi_secteur','id'); - $table_editor->describe('label','intitulé',true); + $page->assign('xorg_title', 'Polytechnique.org - 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) { @@ -707,13 +808,26 @@ class ProfileModule extends PLModule $mid = $id; if (Post::v('act') == 'del') { - XDB::execute('DELETE FROM profile_medals_grades WHERE mid={?} AND gid={?}', $mid, Post::i('gid')); - } elseif (Post::v('act') == 'new') { - XDB::execute('INSERT INTO profile_medals_grades (mid,gid) VALUES({?},{?})', - $mid, max(array_keys(Post::v('grades', array(0))))+1); + XDB::execute('DELETE FROM profile_medals_grades + WHERE mid={?} AND gid={?}', $mid, Post::i('gid')); } else { foreach (Post::v('grades', array()) as $gid=>$text) { - XDB::execute('UPDATE profile_medals_grades SET pos={?}, text={?} WHERE gid={?}', $_POST['pos'][$gid], $text, $gid); + if ($gid === 0) { + if (!empty($text)) { + $res = XDB::query('SELECT MAX(gid) + FROM profile_medals_grades + WHERE mid = {?}', $mid); + $gid = $res->fetchOneCell() + 1; + + XDB::execute('INSERT INTO profile_medals_grades (mid, gid, text, pos) + VALUES ({?}, {?}, {?}, {?})', + $mid, $gid, $text, $_POST['pos']['0']); + } + } else { + XDB::execute('UPDATE profile_medals_grades + 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);