<?php
/***************************************************************************
- * Copyright (C) 2003-2010 Polytechnique.org *
+ * Copyright (C) 2003-2011 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
return array(
'id' => '0',
'jobid' => '',
- 'pub' => 'private',
+ 'pub' => 'ax',
'name' => '',
'description' => '',
'w_url' => '',
'w_address' => $address->toFormArray(),
'w_email' => '',
- 'w_email_pub' => 'private',
+ 'w_email_pub' => 'ax',
'w_email_new' => '',
'w_phone' => array(0 => $phone->toFormArray()),
'terms' => array()
}
$it = Phone::iterate(array($page->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
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'];
if (count($job['terms'])) {
$termsid = array();
foreach ($job['terms'] as $term) {
- if (!$term['full_name']) {
+ if (!isset($term['full_name'])) {
$termsid[] = $term['jtid'];
}
}
$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']];
}
}
$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);
unset($job['removed']);
unset($job['new']);
$success = true;
foreach ($value as $key => $job) {
$job['name'] = trim($job['name']);
- if ($job['name'] == '' && $entreprise) {
+ if ($job['name'] == '' && $entreprise[$entr_val]->id == $key) {
$job['tmp_name'] = $entreprise[$entr_val]->name;
++$entr_val;
} else if ($job['name'] == '') {
}
if (isset($job['removed']) && $job['removed']) {
- if ($job['name'] == '' && $entreprise) {
+ if ($job['name'] == '' && $entreprise && isset($entreprise[$entr_val - 1])) {
$entreprise[$entr_val - 1]->clean();
}
unset($value[$key]);
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);
}
public function save(ProfilePage &$page, $field, $value)
{
- XDB::execute("DELETE FROM profile_job
- 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());
- XDB::execute("DELETE FROM profile_job_term
- WHERE pid = {?}",
- $page->pid());
- Address::deleteAddresses($page->pid(), Address::LINK_JOB);
- Phone::deletePhones($page->pid(), Phone::LINK_JOB);
+ Address::deleteAddresses($page->pid(), Address::LINK_JOB, null, $deletePrivate);
+ Phone::deletePhones($page->pid(), Phone::LINK_JOB, null, $deletePrivate);
$terms_values = array();
foreach ($value as $id => &$job) {
if (isset($job['name']) && $job['name']) {
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);
}
{
$success = true;
if (is_null($value)) {
- $res = XDB::query("SELECT original_corpsid AS original, current_corpsid AS current,
- rankid AS rank, corps_pub AS pub
- FROM profile_corps
- WHERE pid = {?}",
+ $res = XDB::query('SELECT c.original_corpsid AS original, e.name AS originalText,
+ c.current_corpsid AS current, c.rankid AS rank, c.corps_pub AS pub
+ FROM profile_corps AS c
+ INNER JOIN profile_corps_enum AS e ON (c.original_corpsid = e.id)
+ WHERE c.pid = {?}',
$page->pid());
return $res->fetchOneAssoc();
}
public function save(ProfilePage &$page, $field, $value)
{
- XDB::execute('INSERT INTO profile_corps (original_corpsid, current_corpsid, rankid, corps_pub, pid)
- VALUES ({?}, {?}, {?}, {?}, {?})
- ON DUPLICATE KEY UPDATE original_corpsid = VALUES(original_corpsid), current_corpsid = VALUES(current_corpsid)
- rankid = VALUES(rankid), corps_pub = VALUES(corps_pub)',
- $value['original'], $value['current'], $value['rank'], $value['pub'], $page->pid());
+ if (!S::user()->isMe($page->owner)) {
+ XDB::execute('INSERT INTO profile_corps (original_corpsid, current_corpsid, rankid, corps_pub, pid)
+ VALUES ({?}, {?}, {?}, {?}, {?})
+ ON DUPLICATE KEY UPDATE original_corpsid = VALUES(original_corpsid), current_corpsid = VALUES(current_corpsid),
+ rankid = VALUES(rankid), corps_pub = VALUES(corps_pub)',
+ $value['original'], $value['current'], $value['rank'], $value['pub'], $page->pid());
+ } else {
+ XDB::execute('INSERT INTO profile_corps (current_corpsid, rankid, corps_pub, pid)
+ VALUES ({?}, {?}, {?}, {?})
+ ON DUPLICATE KEY UPDATE current_corpsid = VALUES(current_corpsid),
+ rankid = VALUES(rankid), corps_pub = VALUES(corps_pub)',
+ $value['current'], $value['rank'], $value['pub'], $page->pid());
+ }
}
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']] . ')';
}
}
require_once 'emails.combobox.inc.php';
fill_email_combobox($page, $this->owner);
- $res = XDB::iterator("SELECT id, name
- FROM profile_corps_enum
- ORDER BY id = 1 DESC, name");
- $page->assign('original_corps', $res->fetchAllAssoc());
+ if (!S::user()->isMe($this->owner)) {
+ $res = XDB::iterator('SELECT id, name
+ FROM profile_corps_enum
+ ORDER BY id = 1 DESC, name');
+ $page->assign('original_corps', $res->fetchAllAssoc());
+ }
$res = XDB::iterator("SELECT id, name
FROM profile_corps_enum
projects / platal.git / blobdiff