X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=322a13f9fed42b789e164d429d6f5f19de0d0743;hb=73be44347c469de3cf128923e0221b4244915fa6;hp=b6cd6956b7f92f6004b2e1ab3034b6b90e365e95;hpb=de08a5eb35a0daa5ea1817532f02367e0f0edbec;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index b6cd695..322a13f 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -24,43 +24,50 @@ class ProfileModule extends PLModule function handlers() { return array( - 'photo' => $this->make_hook('photo', AUTH_PUBLIC), - 'photo/change' => $this->make_hook('photo_change', AUTH_MDP), - - 'fiche.php' => $this->make_hook('fiche', AUTH_PUBLIC), - 'profile' => $this->make_hook('profile', AUTH_PUBLIC), - 'profile/private' => $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_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), - - 'referent' => $this->make_hook('referent', AUTH_COOKIE), - 'emploi' => $this->make_hook('ref_search', AUTH_COOKIE), - 'referent/search' => $this->make_hook('ref_search', AUTH_COOKIE), - 'referent/ssect' => $this->make_hook('ref_sect', AUTH_COOKIE, 'user', NO_AUTH), - 'referent/country' => $this->make_hook('ref_country', AUTH_COOKIE, 'user', NO_AUTH), - - 'groupes-x' => $this->make_hook('xnet', AUTH_COOKIE), - - 'vcard' => $this->make_hook('vcard', AUTH_COOKIE, 'user', NO_HTTPS), - '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/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'), + 'photo' => $this->make_hook('photo', AUTH_PUBLIC), + 'photo/change' => $this->make_hook('photo_change', AUTH_MDP), + + 'fiche.php' => $this->make_hook('fiche', AUTH_PUBLIC), + 'profile' => $this->make_hook('profile', AUTH_PUBLIC), + 'profile/private' => $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_COOKIE, 'user', NO_AUTH), + 'profile/ajax/tel' => $this->make_hook('ajax_tel', AUTH_COOKIE, 'user', NO_AUTH), + 'profile/ajax/edu' => $this->make_hook('ajax_edu', AUTH_COOKIE, 'user', NO_AUTH), + 'profile/ajax/medal' => $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/skill' => $this->make_hook('ajax_skill', AUTH_COOKIE, 'user', NO_AUTH), + 'profile/ajax/searchname' => $this->make_hook('ajax_searchname', AUTH_COOKIE, 'user', NO_AUTH), + 'javascript/education.js' => $this->make_hook('education_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), + + 'referent' => $this->make_hook('referent', AUTH_COOKIE), + 'emploi' => $this->make_hook('ref_search', AUTH_COOKIE), + 'referent/search' => $this->make_hook('ref_search', AUTH_COOKIE), + 'referent/ssect' => $this->make_hook('ref_sect', AUTH_COOKIE, 'user', NO_AUTH), + 'referent/country' => $this->make_hook('ref_country', AUTH_COOKIE, 'user', NO_AUTH), + + 'groupes-x' => $this->make_hook('xnet', AUTH_COOKIE), + + 'vcard' => $this->make_hook('vcard', AUTH_COOKIE, 'user', NO_HTTPS), + 'admin/binets' => $this->make_hook('admin_binets', AUTH_MDP, 'admin'), + 'admin/medals' => $this->make_hook('admin_medals', AUTH_MDP, 'admin'), + 'admin/education' => $this->make_hook('admin_education', AUTH_MDP, 'admin'), + 'admin/education_field' => $this->make_hook('admin_education_field', AUTH_MDP, 'admin'), + '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'), ); } @@ -123,8 +130,22 @@ class ProfileModule extends PLModule exit; } + function handler_networking(&$page, $mid) + { + $res = XDB::query("SELECT icon + FROM profile_networking_enum + WHERE network_type = {?}", + $mid); + $img = dirname(__FILE__) . '/../htdocs/images/networking/' . $res->fetchOneCell(); + $type = mime_content_type($img); + header("Content-Type: $type"); + echo file_get_contents($img); + exit; + } + function handler_photo_change(&$page) { + global $globals; $page->changeTpl('profile/trombino.tpl'); require_once('validations.inc.php'); @@ -133,6 +154,8 @@ class ProfileModule extends PLModule .'/'.S::v('forlife').'.jpg'; if (Env::has('upload')) { + S::assert_xsrf_token(); + $upload = new PlUpload(S::v('forlife'), 'photo'); if (!$upload->upload($_FILES['userfile']) && !$upload->download(Env::v('photo'))) { $page->trigError('Une erreur est survenue lors du téléchargement du fichier'); @@ -143,6 +166,8 @@ class ProfileModule extends PLModule } } } elseif (Env::has('trombi')) { + S::assert_xsrf_token(); + $upload = new PlUpload(S::v('forlife'), 'photo'); if ($upload->copyFrom($trombi_x)) { $myphoto = new PhotoReq(S::v('uid'), $upload); @@ -152,18 +177,22 @@ 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"', S::v('uid')); - update_NbValid(); + $globals->updateNbValid(); } elseif (Env::v('cancel')) { + S::assert_xsrf_token(); + $sql = XDB::query('DELETE FROM requests WHERE user_id={?} AND type="photo"', S::v('uid')); - update_NbValid(); + $globals->updateNbValid(); } $sql = XDB::query('SELECT COUNT(*) @@ -221,7 +250,7 @@ class ProfileModule extends PLModule } $title = $user['prenom'] . ' ' . ( empty($user['nom_usage']) ? $user['nom'] : $user['nom_usage'] ); - $page->assign('pl_title', $title); + $page->setTitle($title); // photo @@ -304,12 +333,12 @@ class ProfileModule extends PLModule // Build the page $page->addJsLink('ajax.js'); - $page->addJsLink('applis.js'); + $page->addJsLink('education.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 = 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'); @@ -328,18 +357,18 @@ class ProfileModule extends PLModule . " la procédure de récupération de mot de passe si un jour tu le perdais"); } - $page->assign('pl_title', 'Polytechnique.org - Mon Profil'); + $page->setTitle('Mon Profil'); } - function handler_applis_js(&$page) + 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'); - $page->changeTpl('profile/applis.js.tpl', NO_SKIN); - require_once "applis.func.inc.php"; + $page->changeTpl('profile/education.js.tpl', NO_SKIN); + require_once "education.func.inc.php"; } function handler_grades_js(&$page) @@ -377,17 +406,29 @@ class ProfileModule extends PLModule $page->assign('adr', array()); } - function handler_ajax_tel(&$page, $adid, $telid) + function handler_ajax_tel(&$page, $prefid, $prefname, $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->changeTpl('profile/phone.tpl', NO_SKIN); + $page->assign('prefid', $prefid); + $page->assign('prefname', $prefname); + $page->assign('telid', $telid); $page->assign('tel', array()); } + function handler_ajax_edu(&$page, $eduid, $class) + { + header('Content-Type: text/html; charset=utf-8'); + $page->changeTpl('profile/edu.tpl', NO_SKIN); + $res = XDB::iterator("SELECT id, field + FROM profile_education_field_enum + ORDER BY field"); + $page->assign('edu_fields', $res->fetchAllAssoc()); + $page->assign('eduid', $eduid); + $page->assign('class', $class); + require_once "education.func.inc.php"; + } + function handler_ajax_medal(&$page, $id) { header('Content-Type: text/html; charset=utf-8'); @@ -442,6 +483,15 @@ class ProfileModule extends PLModule } } + function handler_ajax_searchname(&$page, $snid) + { + header('Content-Type: text/html; charset=utf-8'); + $page->changeTpl('profile/general.searchname.tpl', NO_SKIN); + $page->assign('i', $snid); + $page->assign('sn', array()); + $page->assign('newsn', true); + } + function handler_p_orange(&$page) { $page->changeTpl('profile/orange.tpl'); @@ -459,6 +509,8 @@ class ProfileModule extends PLModule if (!Env::has('promo_sortie')) { return; + } else { + S::assert_xsrf_token(); } $promo_sortie = Env::i('promo_sortie'); @@ -557,9 +609,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->assign('pl_title', '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"); @@ -661,6 +714,8 @@ class ProfileModule extends PLModule $page->assign('usage_req', $nom_usage); if (Env::has('submit') && ($nom_usage != $usage_old)) { + S::assert_xsrf_token(); + // on vient de recevoir une requete, differente de l'ancien nom d'usage if ($nom_usage == $nom) { $page->assign('same', true); @@ -680,7 +735,7 @@ class ProfileModule extends PLModule function handler_xnet(&$page) { $page->changeTpl('profile/groupesx.tpl'); - $page->assign('pl_title', '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, @@ -704,13 +759,14 @@ 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) { $page->changeTpl('profile/admin_trombino.tpl'); - $page->assign('pl_title','Polytechnique.org - Administration - Trombino'); + $page->setTitle('Administration - Trombino'); $page->assign('uid', $uid); $q = XDB::query( @@ -721,7 +777,6 @@ class ProfileModule extends PLModule list($forlife, $promo) = $q->fetchOneRow(); switch ($action) { - case "original": header("Content-type: image/jpeg"); readfile("/home/web/trombino/photos".$promo."/".$forlife.".jpg"); @@ -729,6 +784,8 @@ class ProfileModule extends PLModule break; case "new": + S::assert_xsrf_token(); + $data = file_get_contents($_FILES['userfile']['tmp_name']); list($x, $y) = getimagesize($_FILES['userfile']['tmp_name']); $mimetype = substr($_FILES['userfile']['type'], 6); @@ -739,6 +796,8 @@ class ProfileModule extends PLModule break; case "delete": + S::assert_xsrf_token(); + XDB::execute('DELETE FROM photo WHERE uid = {?}', $uid); break; } @@ -746,38 +805,64 @@ class ProfileModule extends PLModule $page->assign('forlife', $forlife); } function handler_admin_binets(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','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); $table_editor->describe('text','intitulé',true); $table_editor->apply($page, $action, $id); } - function handler_admin_formations(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','Polytechnique.org - Administration - Formations'); + function handler_admin_education(&$page, $action = 'list', $id = null) { + $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); - $table_editor->describe('text','intitulé',true); - $table_editor->describe('url','site web',false); + $table_editor = new PLTableEditor('admin/education', 'profile_education_enum', 'id'); + $table_editor->add_join_table('profile_education', 'eduid', true); + $table_editor->add_join_table('profile_education_degree', 'eduid', true); + $table_editor->describe('name', 'intitulé', true); + $table_editor->describe('url', 'site web', false); + $table_editor->apply($page, $action, $id); + } + function handler_admin_education_field(&$page, $action = 'list', $id = null) { + $page->setTitle('Administration - Domaines de formation'); + $page->assign('title', 'Gestion des domaines de formation'); + $table_editor = new PLTableEditor('admin/education_field', 'profile_education_field_enum', 'id', true); + $table_editor->add_join_table('profile_education', 'fieldid', true); + $table_editor->describe('field', 'domaine', true); + $table_editor->apply($page, $action, $id); + } + function handler_admin_education_degree(&$page, $action = 'list', $id = null) { + $page->setTitle('Administration - Niveau de formation'); + $page->assign('title', 'Gestion des niveau de formation'); + $table_editor = new PLTableEditor('admin/education_degree', 'profile_education_degree_enum', 'id', true); + $table_editor->add_join_table('profile_education_degree', 'degreeid', true); + $table_editor->add_join_table('profile_education', 'degreeid', true); + $table_editor->describe('degree', 'niveau', true); + $table_editor->apply($page, $action, $id); + } + function handler_admin_education_degree_set(&$page, $action = 'list', $id = null) { + $page->setTitle('Administration - Correspondances formations - niveau de formation'); + $page->assign('title', 'Gestion des correspondances formations - niveau de formation'); + $table_editor = new PLTableEditor('admin/education_degree_set', 'profile_education_degree', 'eduid', true); + $table_editor->describe('eduid', 'formation', true); + $table_editor->describe('degreeid', 'niveau', true); $table_editor->apply($page, $action, $id); } function handler_admin_sections(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','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->assign('pl_title', '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->assign('pl_title', '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); @@ -786,14 +871,24 @@ class ProfileModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_admin_secteurs(&$page, $action = 'list', $id = null) { - $page->assign('pl_title', '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_networking(&$page, $action = 'list', $id = null) { + $page->assign('xorg_title', 'Polytechnique.org - Administration - Networking'); + $page->assign('title', 'Gestion des types de networking'); + $table_editor = new PLTableEditor('admin/networking', 'profile_networking_enum', 'network_type'); + $table_editor->describe('name', 'intitulé', true); + $table_editor->describe('icon', 'nom de l\'icône', false); + $table_editor->describe('filter', 'filtre', true); + $table_editor->describe('link', 'lien web', true); + $table_editor->apply($page, $action, $id); + } function handler_admin_medals(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','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);