X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fprofile%2Fjobs.inc.php;h=37b8f3d9da9e556fdb78c4f2ec6afc3c3400c956;hb=17c6e7bbf0eaf0dcef64a24a727da024ca2fb651;hp=da10f88331c36737a69586c662afc90b4fabf7a3;hpb=7f7b00425f9cb2dc2a611cd1ca985813893d5bfe;p=platal.git diff --git a/modules/profile/jobs.inc.php b/modules/profile/jobs.inc.php index da10f88..37b8f3d 100644 --- a/modules/profile/jobs.inc.php +++ b/modules/profile/jobs.inc.php @@ -1,6 +1,6 @@ pid()), array(Phone::LINK_JOB)); while ($phone = $it->next()) { - $jobs[$phone->linkId()]['w_phone'][$phone->id()] = $phone->toFormArray(); + $jobs[$phone->link_id]['w_phone'][$phone->id] = $phone->toFormArray(); } $res = XDB::iterator("SELECT e.jtid, e.full_name, j.jid FROM profile_job_term_enum AS e @@ -131,7 +131,7 @@ class ProfileSettingJob implements ProfileSetting return $jobs; } - private function cleanJob(ProfilePage &$page, $jobid, array &$job, &$success) + private function cleanJob(ProfilePage $page, $jobid, array &$job, &$success, $maxPublicity) { if ($job['w_email'] == "new@example.org") { $job['w_email'] = $job['w_email_new']; @@ -149,7 +149,7 @@ class ProfileSettingJob implements ProfileSetting if (count($job['terms'])) { $termsid = array(); foreach ($job['terms'] as $term) { - if (!$term['full_name']) { + if (!isset($term['full_name'])) { $termsid[] = $term['jtid']; } } @@ -160,7 +160,7 @@ class ProfileSettingJob implements ProfileSetting $termsid); $term_id_to_name = $res->fetchAllAssoc('jtid', false); foreach ($job['terms'] as &$term) { - if (!$term['full_name']) { + if (!isset($term['full_name'])) { $term['full_name'] = $term_id_to_name[$term['jtid']]; } } @@ -172,16 +172,21 @@ class ProfileSettingJob implements ProfileSetting WHERE name = {?}", $job['name']); if ($res->numRows() != 1) { - $req = new EntrReq(S::user(), $page->profile, $jobid, $job['name'], $job['hq_acronym'], $job['hq_url'], - $job['hq_email'], $job['hq_fixed'], $job['hq_fax'], $job['hq_address']); - $req->submit(); $job['jobid'] = null; - sleep(1); } else { $job['jobid'] = $res->fetchOneCell(); } } - $job['w_phone'] = Phone::formatFormArray($job['w_phone'], $s); + + if ($maxPublicity->isVisible($job['w_email_pub'])) { + $job['w_email_pub'] = $maxPublicity->level(); + } + $job['w_phone'] = Phone::formatFormArray($job['w_phone'], $s, $maxPublicity); + + if ($job['w_entry_year'] && strlen($job['w_entry_year']) != 4) { + $job['w_entry_year_error'] = true; + $success = false; + } unset($job['removed']); unset($job['new']); @@ -189,7 +194,7 @@ class ProfileSettingJob implements ProfileSetting - public function value(ProfilePage &$page, $field, $value, &$success) + public function value(ProfilePage $page, $field, $value, &$success) { $entreprise = ProfileValidate::get_typed_requests($page->pid(), 'entreprise'); $entr_val = 0; @@ -220,11 +225,16 @@ class ProfileSettingJob implements ProfileSetting } if (isset($job['removed']) && $job['removed']) { - if ($job['name'] == '' && $entreprise) { - $entreprise[$entr_val - 1]->clean(); + if (!S::user()->checkPerms('directory_private') + && (Phone::hasPrivate($job['w_phone']) || Address::hasPrivate($job['w_address']) || $job['w_email_pub'] == 'private')) { + Platal::page()->trigWarning("L'entreprise ne peut être supprimée car elle contient des informations pour lesquelles vous n'avez pas le droit d'édition."); + } else { + if ($job['name'] == '' && $entreprise && isset($entreprise[$entr_val - 1])) { + $entreprise[$entr_val - 1]->clean(); + } + unset($value[$key]); + continue; } - unset($value[$key]); - continue; } if (!isset($job['pub']) || !$job['pub']) { $job['pub'] = 'private'; @@ -234,40 +244,54 @@ class ProfileSettingJob implements ProfileSetting foreach ($value as $key => &$job) { $address = new Address($job['w_address']); $s = $address->format(); + $maxPublicity = new ProfileVisibility($job['pub']); + if ($maxPublicity->isVisible($address->pub)) { + $address->pub = $maxPublicity->level(); + } $job['w_address'] = $address->toFormArray(); - $this->cleanJob($page, $key, $job, $s); + $this->cleanJob($page, $key, $job, $s, $maxPublicity); if (!$init) { $success = ($success && $s); } } + usort($value, 'ProfileVisibility::comparePublicity'); return $value; } - public function save(ProfilePage &$page, $field, $value) + public function save(ProfilePage $page, $field, $value) { - XDB::execute("DELETE FROM profile_job - WHERE pid = {?}", - $page->pid()); - XDB::execute("DELETE FROM profile_job_term - WHERE pid = {?}", + + $deletePrivate = S::user()->isMe($page->owner) || S::admin(); + XDB::execute('DELETE FROM pj, pjt + USING profile_job AS pj + LEFT JOIN profile_job_term AS pjt ON (pj.pid = pjt.pid AND pj.id = pjt.jid) + WHERE pj.pid = {?}' . (($deletePrivate) ? '' : ' AND pj.pub IN (\'public\', \'ax\')'), $page->pid()); - Address::deleteAddresses($page->pid(), Address::LINK_JOB); - Phone::deletePhones($page->pid(), Phone::LINK_JOB); + Address::deleteAddresses($page->pid(), Address::LINK_JOB, null, null, $deletePrivate); + Phone::deletePhones($page->pid(), Phone::LINK_JOB, null, $deletePrivate); + $previous_requests = EntrReq::get_typed_requests($page->pid(), 'entreprise'); + foreach ($previous_requests as $request) { + $request->clean(); + } $terms_values = array(); foreach ($value as $id => &$job) { - if (isset($job['name']) && $job['name']) { + if (($job['pub'] != 'private' || $deletePrivate) && (isset($job['name']) && $job['name'])) { if (isset($job['jobid']) && $job['jobid']) { - XDB::execute('INSERT INTO profile_job (pid, id, description, email, + XDB::execute('INSERT INTO profile_job (pid, id, description, email, entry_year, url, pub, email_pub, jobid) - VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})', - $page->pid(), $id, $job['description'], $job['w_email'], + VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})', + $page->pid(), $id, $job['description'], $job['w_email'], $job['w_entry_year'], $job['w_url'], $job['pub'], $job['w_email_pub'], $job['jobid']); } else { - XDB::execute('INSERT INTO profile_job (pid, id, description, email, + XDB::execute('INSERT INTO profile_job (pid, id, description, email, entry_year, url, pub, email_pub) - VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?})', - $page->pid(), $id, $job['description'], $job['w_email'], + VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})', + $page->pid(), $id, $job['description'], $job['w_email'], $job['w_entry_year'], $job['w_url'], $job['pub'], $job['w_email_pub']); + $request = new EntrReq(S::user(), $page->profile, $id, $job['name'], $job['hq_acronym'], $job['hq_url'], + $job['hq_email'], $job['hq_fixed'], $job['hq_fax'], $job['hq_address']); + $request->submit(); + sleep(1); } $address = new Address(array_merge($job['w_address'], array('pid' => $page->pid(), @@ -288,19 +312,41 @@ class ProfileSettingJob implements ProfileSetting VALUES ' . implode(', ', $terms_values) . ' ON DUPLICATE KEY UPDATE computed = VALUES(computed)'); } + if (S::user()->isMe($page->owner) && count($value) > 1) { + Platal::page()->trigWarning('Attention, tu as plusieurs emplois sur ton profil. Pense à supprimer ceux qui sont obsolètes.'); + } } public function getText($value) { + static $pubs = array('public' => 'publique', 'ax' => 'annuaire AX', 'private' => 'privé'); $jobs = array(); foreach ($value as $id => $job) { $address = Address::formArrayToString(array($job['w_address'])); $phones = Phone::formArrayToString($job['w_phone']); - // TODO: add jobterms here. - $jobs[] = 'Entreprise : ' . $job['name'] - . ', description : ' . $job['description'] . ', web : ' . $job['w_url'] - . ', email : ' . $job['w_email'] - . ($phones ? ', ' . $phones : '') . ($address ? ', ' . $address : ''); + $jobs[$id] = $job['name']; + $jobs[$id] .= ($job['description'] ? (', ' . $job['description']) : ''); + $jobs[$id] .= ' (affichage ' . $pubs[$job['pub']]; + if (count($job['terms'])) { + $terms = array(); + foreach ($job['terms'] as $term) { + $terms[] = $term['full_name']; + } + $jobs[$id] .= ', mots-clefs : ' . implode(', ', $terms); + } + if ($job['w_url']) { + $jobs[$id] .= ', page perso : ' . $job['w_url']; + } + if ($address) { + $jobs[$id] .= ', adresse : ' . $address; + } + if ($job['w_email']) { + $jobs[$id] .= ', email : ' . $job['w_email']; + } + if ($phones) { + $jobs[$id] .= ', téléphones : ' . $phones; + } + $jobs[$id] .= ')'; } return implode(' ; ' , $jobs); } @@ -308,7 +354,7 @@ class ProfileSettingJob implements ProfileSetting class ProfileSettingCorps implements ProfileSetting { - public function value(ProfilePage &$page, $field, $value, &$success) + public function value(ProfilePage $page, $field, $value, &$success) { $success = true; if (is_null($value)) { @@ -323,7 +369,7 @@ class ProfileSettingCorps implements ProfileSetting return $value; } - public function save(ProfilePage &$page, $field, $value) + public function save(ProfilePage $page, $field, $value) { if (!S::user()->isMe($page->owner)) { XDB::execute('INSERT INTO profile_corps (original_corpsid, current_corpsid, rankid, corps_pub, pid) @@ -342,10 +388,11 @@ class ProfileSettingCorps implements ProfileSetting public function getText($value) { + static $pubs = array('public' => 'publique', 'ax' => 'annuaire AX', 'private' => 'privé'); $corpsList = DirEnum::getOptions(DirEnum::CORPS); $rankList = DirEnum::getOptions(DirEnum::CORPSRANKS); - return 'Corps actuel : ' . $corpsList[$value['current']] . ' , rang : ' . $corpsList[$value['rank']] - . ' , corps d\'origine : ' . $corpsList[$value['original']] . ' , affichage : ' . $value['pub']; + return $corpsList[$value['current']] . ', ' . $corpsList[$value['rank']] . ' (' + . 'corps d\'origine : ' . $corpsList[$value['original']] . ', affichage ' . $pubs[$value['pub']] . ')'; } } @@ -353,7 +400,7 @@ class ProfilePageJobs extends ProfilePage { protected $pg_template = 'profile/jobs.tpl'; - public function __construct(PlWizard &$wiz) + public function __construct(PlWizard $wiz) { parent::__construct($wiz); if (S::user()->checkPerms(User::PERM_DIRECTORY_PRIVATE)) { @@ -388,12 +435,12 @@ class ProfilePageJobs extends ProfilePage } } - public function _prepare(PlPage &$page, $id) + public function _prepare(PlPage $page, $id) { require_once 'emails.combobox.inc.php'; - fill_email_combobox($page, $this->owner); + fill_email_combobox($page, array('redirect', 'job', 'stripped_directory'), $this->owner); - if (!S::user()->isMe($page->owner)) { + if (!S::user()->isMe($this->owner)) { $res = XDB::iterator('SELECT id, name FROM profile_corps_enum ORDER BY id = 1 DESC, name');