X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fprofile.php;h=eed29c2a9444d8d0e757fcd7893a1e7b94e7a1b9;hb=3c6bedb05f56db670e5555d0cbddb4e1c183b15f;hp=62e44d848a332aeaba6fda8269135f43041f9923;hpb=2998edf118b3d6243171dd3294247ad1324ac343;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index 62e44d8..eed29c2 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -84,17 +84,17 @@ class ProfileModule extends PLModule function handler_photo(&$page, $x = null, $req = null) { - if (!$x || !($user = User::getSilent($x))) { + if (!$x || !($profile = Profile::get($x))) { return PL_NOT_FOUND; } // Retrieve the photo and its mime type. if ($req && S::logged()) { include 'validations.inc.php'; - $myphoto = PhotoReq::get_request($user->id()); + $myphoto = PhotoReq::get_request($profile->owner()->id()); $photo = PlImage::fromData($myphoto->data, $myphoto->mimetype); } else { - $photo = $user->profile()->getPhoto(true); + $photo = $profile->getPhoto(true); } // Display the photo, or a default one when not available. @@ -107,7 +107,7 @@ class ProfileModule extends PLModule $mid = $thumb ? @func_get_arg(2) : $mid; $res = XDB::query("SELECT img - FROM profile_medals + FROM profile_medal_enum WHERE id = {?}", $mid); $img = $thumb ? @@ -181,23 +181,23 @@ class ProfileModule extends PLModule XDB::execute('DELETE FROM profile_photos WHERE pid = {?}', S::user()->profile()->id()); - XDB::execute('DELETE FROM requests - WHERE user_id = {?} AND type="photo"', + XDB::execute("DELETE FROM requests + WHERE uid = {?} AND type = 'photo'", S::v('uid')); $globals->updateNbValid(); $page->trigSuccess("Ta photo a bien été supprimée. Elle ne sera plus visible sur le site dans au plus une heure."); } elseif (Env::v('cancel')) { S::assert_xsrf_token(); - $sql = XDB::query('DELETE FROM requests - WHERE user_id={?} AND type="photo"', + $sql = XDB::query("DELETE FROM requests + WHERE uid = {?} AND type = 'photo'", S::v('uid')); $globals->updateNbValid(); } - $sql = XDB::query('SELECT COUNT(*) + $sql = XDB::query("SELECT COUNT(*) FROM requests - WHERE user_id={?} AND type="photo"', + WHERE uid = {?} AND type = 'photo'", S::v('uid')); $page->assign('submited', $sql->fetchOneCell()); $page->assign('has_trombi_x', file_exists($trombi_x)); @@ -228,7 +228,6 @@ class ProfileModule extends PLModule // 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') { @@ -381,7 +380,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_medals_grades + FROM profile_medal_enum_grades ORDER BY mid, pos"); $grades = array(); while ($tmp = $res->next()) { @@ -390,7 +389,7 @@ class ProfileModule extends PLModule $page->assign('grades', $grades); $res = XDB::iterator("SELECT *, FIND_IN_SET('validation', flags) AS validate - FROM profile_medals + FROM profile_medal_enum ORDER BY type, text"); $mlist = array(); while ($tmp = $res->next()) { @@ -569,7 +568,7 @@ class ProfileModule extends PLModule } elseif ($promo_sortie == $promo + 3) { XDB::execute('UPDATE profile_education SET grad_year = {?} - WHERE uid = {?} AND FIND_IN_SET(\'primary\', flags)', + 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); @@ -586,7 +585,6 @@ class ProfileModule extends PLModule function handler_referent(&$page, $user) { - require_once 'user.func.inc.php'; $page->changeTpl('profile/fiche_referent.tpl', SIMPLE); $user = Profile::get($user); @@ -604,7 +602,7 @@ class ProfileModule extends PLModule //expertise $res = XDB::query('SELECT expertise FROM profile_mentor - WHERE uid = {?}', $user->id()); + WHERE pid = {?}', $user->id()); $page->assign('expertise', $res->fetchOneCell()); // Sectors @@ -614,7 +612,7 @@ class ProfileModule extends PLModule FROM profile_mentor_sector AS m LEFT JOIN profile_job_sector_enum AS s ON(m.sectorid = s.id) LEFT JOIN profile_job_subsector_enum AS ss ON(m.sectorid = ss.sectorid AND m.subsectorid = ss.id) - WHERE uid = {?}", $user->id()); + WHERE pid = {?}", $user->id()); while (list($sector, $subSector) = $res->next()) { $sectors[] = $sector; $subSectors[] = $subSector; @@ -627,7 +625,7 @@ class ProfileModule extends PLModule "SELECT gc.countryFR FROM profile_mentor_country AS m LEFT JOIN geoloc_countries AS gc ON (m.country = gc.iso_3166_1_a2) - WHERE uid = {?}", $user->id()); + WHERE pid = {?}", $user->id()); $page->assign('pays', $res->fetchColumn()); $page->addJsLink('close_on_esc.js'); @@ -640,8 +638,6 @@ class ProfileModule extends PLModule $page->setTitle('Conseil Pro'); - require_once "directory.enums.inc.php"; - // Retrieval of sector names $sectors = DirEnum::getOptions(DirEnum::SECTORS); $sectors[''] = ''; @@ -690,7 +686,7 @@ class ProfileModule extends PLModule $it = XDB::iterator("SELECT gc.iso_3166_1_a2 AS id, gc.countryFR AS field FROM geoloc_countries AS gc INNER JOIN profile_mentor_country AS mp ON (mp.country = gc.iso_3166_1_a2) - INNER JOIN profile_mentor_sector AS ms ON (ms.uid = mp.uid) + INNER JOIN profile_mentor_sector AS ms ON (ms.pid = mp.pid) WHERE ms.sectorid = {?} " . $where . " GROUP BY iso_3166_1_a2 ORDER BY countryFR", $sect, $ssect); @@ -799,8 +795,8 @@ class ProfileModule extends PLModule function handler_admin_binets(&$page, $action = 'list', $id = null) { $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 = new PLTableEditor('admin/binets', 'profile_binet_enum', 'id'); + $table_editor->add_join_table('profile_binets','binet_id',true); $table_editor->describe('text','intitulé',true); $table_editor->apply($page, $action, $id); } @@ -842,7 +838,7 @@ class ProfileModule extends PLModule function handler_admin_sections(&$page, $action = 'list', $id = null) { $page->setTitle('Administration - Sections'); $page->assign('title', 'Gestion des sections'); - $table_editor = new PLTableEditor('admin/sections','sections','id'); + $table_editor = new PLTableEditor('admin/sections','profile_section_enum','id'); $table_editor->describe('text','intitulé',true); $table_editor->apply($page, $action, $id); } @@ -886,7 +882,7 @@ class ProfileModule extends PLModule function handler_admin_medals(&$page, $action = 'list', $id = null) { $page->setTitle('Administration - Distinctions'); $page->assign('title', 'Gestion des Distinctions'); - $table_editor = new PLTableEditor('admin/medals','profile_medals','id'); + $table_editor = new PLTableEditor('admin/medals','profile_medal_enum','id'); $table_editor->describe('text', 'intitulé', true); $table_editor->describe('img', 'nom de l\'image', false); $table_editor->describe('flags', 'valider', true); @@ -897,29 +893,29 @@ class ProfileModule extends PLModule $mid = $id; if (Post::v('act') == 'del') { - XDB::execute('DELETE FROM profile_medals_grades + XDB::execute('DELETE FROM profile_medal_enum_grades 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_medals_grades + FROM profile_medal_enum_grades WHERE mid = {?}', $mid); $gid = $res->fetchOneCell() + 1; - XDB::execute('INSERT INTO profile_medals_grades (mid, gid, text, pos) + XDB::execute('INSERT INTO profile_medal_enum_grades (mid, gid, text, pos) VALUES ({?}, {?}, {?}, {?})', $mid, $gid, $text, $_POST['pos']['0']); } } else { - XDB::execute('UPDATE profile_medals_grades + XDB::execute('UPDATE profile_medal_enum_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); + $res = XDB::iterator('SELECT gid, text, pos FROM profile_medal_enum_grades WHERE mid={?} ORDER BY pos', $mid); $page->assign('grades', $res); } }