X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=954753ed407144db303ba428942d41f44affba9a;hb=cbdcd130c8e5189a62587da35f37ea51eddf64b5;hp=ff7d9e48e5d5cacc048c7056bc33b5a31a0818f7;hpb=e999a40a812f8a2f350d69c5e1611669ff8937d1;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index ff7d9e4..954753e 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -48,7 +48,6 @@ class ProfileModule extends PLModule '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/name_info' => $this->make_hook('name_info', AUTH_PUBLIC), 'referent' => $this->make_hook('referent', AUTH_COOKIE), 'referent/country' => $this->make_hook('ref_country', AUTH_COOKIE, 'user', NO_AUTH), @@ -69,7 +68,6 @@ class ProfileModule extends PLModule 'admin/trombino' => $this->make_hook('admin_trombino', AUTH_MDP, 'admin'), 'admin/corps_enum' => $this->make_hook('admin_corps_enum', AUTH_MDP, 'admin'), 'admin/corps_rank' => $this->make_hook('admin_corps_rank', AUTH_MDP, 'admin'), - 'admin/names' => $this->make_hook('admin_names', AUTH_MDP, 'admin'), ); } @@ -116,19 +114,6 @@ class ProfileModule extends PLModule exit; } - function handler_name_info($page) - { - pl_content_headers("text/html"); - $page->changeTpl('profile/name_info.tpl', SIMPLE); - $res = XDB::iterator("SELECT name, explanations, - FIND_IN_SET('public', flags) AS public, - FIND_IN_SET('has_particle', flags) AS has_particle - FROM profile_name_enum - WHERE NOT FIND_IN_SET('not_displayed', flags) - ORDER BY NOT FIND_IN_SET('public', flags)"); - $page->assign('types', $res); - } - function handler_networking($page, $mid) { $res = XDB::query("SELECT icon @@ -396,26 +381,15 @@ class ProfileModule extends PLModule $page->assign('medal_list', $mlist); } - function handler_ajax_address($page, $id) + function handler_ajax_address($page, $id, $pid) { pl_content_headers("text/html"); $page->changeTpl('profile/adresses.address.tpl', NO_SKIN); $page->assign('i', $id); $page->assign('address', array()); - } - - function handler_ajax_address_del($page, $hrpid) - { - if ($profile = Profile::get($hrpid)) { - if (S::user()->canEdit($profile)) { - $address = Post::t('address'); - if (is_null(AddressReq::get_request($profile->id(), 0, 0, Address::LINK_PROFILE, $address))) { - $req = new AddressReq(S::user(), $profile, $address, $profile->id(), 0, 0, Address::LINK_PROFILE); - $req->submit(); - } - } - } - exit(); + $page->assign('profile', Profile::get($pid)); + $page->assign('isMe', true); + $page->assign('geocoding_removal', true); } function handler_ajax_tel($page, $prefid, $prefname, $telid, $subField, $mainField, $mainId) @@ -455,13 +429,16 @@ class ProfileModule extends PLModule $page->assign('medal', array('id' => $id, 'grade' => 0, 'valid' => 0)); } - function handler_ajax_job($page, $id) + function handler_ajax_job($page, $id, $pid) { pl_content_headers("text/html"); $page->changeTpl('profile/jobs.job.tpl', NO_SKIN); $page->assign('i', $id); $page->assign('job', array()); $page->assign('new', true); + $page->assign('profile', Profile::get($pid)); + $page->assign('isMe', true); + $page->assign('geocoding_removal', true); require_once "emails.combobox.inc.php"; fill_email_combobox($page, array('redirect', 'job', 'stripped_directory')); } @@ -506,14 +483,11 @@ class ProfileModule extends PLModule function handler_ajax_searchname($page, $id, $isFemale) { pl_content_headers("text/html"); - $page->changeTpl('profile/general.searchname.tpl', NO_SKIN); - $res = XDB::query("SELECT id, name, FIND_IN_SET('public', flags) AS pub - FROM profile_name_enum - WHERE NOT FIND_IN_SET('not_displayed', flags) - AND NOT FIND_IN_SET('always_displayed', flags)"); - $page->assign('sn_type_list', $res->fetchAllAssoc()); + $page->changeTpl('profile/general.private_name.tpl', NO_SKIN); + $page->assign('other_names', array('nickname' => 'Surnom', 'firstname' => 'Autre prénom', 'lastname' => 'Autre nom')); + $page->assign('new_name', true); $page->assign('isFemale', $isFemale); - $page->assign('i', $id); + $page->assign('id', $id); } function handler_ajax_buildnames($page, $data, $isFemale) @@ -726,17 +700,6 @@ class ProfileModule extends PLModule break; } } - function handler_admin_names($page, $action = 'list', $id = null) { - $page->setTitle('Administration - Types de noms'); - $page->assign('title', 'Gestion des types de noms'); - $table_editor = new PLTableEditor('admin/names', 'profile_name_enum', 'id', true); - $table_editor->describe('name', 'Nom', true); - $table_editor->describe('explanations', 'Explications', true); - $table_editor->describe('type', 'Type', true); - $table_editor->describe('flags', 'Flags', true); - $table_editor->describe('score', 'Score', true); - $table_editor->apply($page, $action, $id); - } function handler_admin_binets($page, $action = 'list', $id = null) { $page->setTitle('Administration - Binets'); $page->assign('title', 'Gestion des binets'); @@ -752,7 +715,7 @@ class ProfileModule extends PLModule $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->describe('url', 'site web', false, true); $table_editor->apply($page, $action, $id); } function handler_admin_education_field($page, $action = 'list', $id = null) { @@ -800,7 +763,7 @@ class ProfileModule extends PLModule $page->assign('title', 'Gestion des types de networking'); $table_editor = new PLTableEditor('admin/networking', 'profile_networking_enum', 'nwid'); $table_editor->describe('name', 'intitulé', true); - $table_editor->describe('icon', 'nom de l\'icône', false); + $table_editor->describe('icon', 'nom de l\'icône', false, true); $table_editor->describe('filter', 'filtre', true); $table_editor->describe('link', 'lien web', true); $table_editor->apply($page, $action, $id); @@ -827,7 +790,7 @@ class ProfileModule extends PLModule $page->assign('title', 'Gestion des Distinctions'); $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('img', 'nom de l\'image', false, true); $table_editor->describe('flags', 'valider', true); $table_editor->apply($page, $action, $id); if ($id && $action == 'edit') {