X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=fd61642c5cc7fc3c6eb53164d6bdb9b68765d396;hb=c6d16b24399ceb05de8f008194103f6dd74979b1;hp=8423d299c4ba2f89257e6b8c9214ff3a79c29437;hpb=0073747ac81cc9cff9e43847eb008f0e815255f0;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index 8423d29..fd61642 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), @@ -210,7 +209,7 @@ class ProfileModule extends PLModule if (is_null($id)) { return PL_NOT_FOUND; } - $pid = (!is_numeric($id) || S::has_perms()) ? Profile::getPID($id) : null; + $pid = (!is_numeric($id) || S::admin()) ? Profile::getPID($id) : null; if (is_null($pid)) { if (S::logged()) { $page->trigError($id . " inconnu dans l'annuaire."); @@ -252,8 +251,8 @@ class ProfileModule extends PLModule $page->assign('virtualalias', $owner->emailAlias()); } - $page->assign_by_ref('p', $profile); - $page->assign_by_ref('o', $owner); + $page->assign_by_ref('profile', $profile); + $page->assign_by_ref('owner', $owner); $page->assign('view', $view); $page->assign('logged', S::logged()); @@ -295,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) { @@ -335,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_medal_enum_grades + FROM profile_medal_grade_enum ORDER BY mid, pos"); $grades = array(); while ($tmp = $res->next()) { @@ -484,58 +483,12 @@ 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 pid = {?} 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, $pf) @@ -839,29 +792,29 @@ class ProfileModule extends PLModule $mid = $id; if (Post::v('act') == 'del') { - XDB::execute('DELETE FROM profile_medal_enum_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_medal_enum_grades + FROM profile_medal_grade_enum WHERE mid = {?}', $mid); $gid = $res->fetchOneCell() + 1; - XDB::execute('INSERT INTO profile_medal_enum_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_medal_enum_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_medal_enum_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); } }