projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release of plat/al 1.1.4
[platal.git]
/
modules
/
profile
/
jobs.inc.php
diff --git
a/modules/profile/jobs.inc.php
b/modules/profile/jobs.inc.php
index
e22791e
..
eada2bd
100644
(file)
--- a/
modules/profile/jobs.inc.php
+++ b/
modules/profile/jobs.inc.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-201
0
Polytechnique.org *
+ * Copyright (C) 2003-201
1
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-68,7
+68,7
@@
class ProfileSettingJob implements ProfileSetting
$jobs = XDB::fetchAllAssoc('SELECT j.id, j.jobid, je.name,
j.description, j.email AS w_email,
j.email_pub AS w_email_pub,
$jobs = XDB::fetchAllAssoc('SELECT j.id, j.jobid, je.name,
j.description, j.email AS w_email,
j.email_pub AS w_email_pub,
- j.url AS w_url, j.pub
+ j.url AS w_url, j.pub
, j.entry_year AS w_entry_year
FROM profile_job AS j
LEFT JOIN profile_job_enum AS je ON (j.jobid = je.id)
WHERE j.pid = {?}
FROM profile_job AS j
LEFT JOIN profile_job_enum AS je ON (j.jobid = je.id)
WHERE j.pid = {?}
@@
-86,13
+86,13
@@
class ProfileSettingJob implements ProfileSetting
$backtrack[$job['id']] = $key;
}
$backtrack[$job['id']] = $key;
}
- $it = Address::iterate(array($page->pid()), array(Address::LINK_JOB));
+ $it = Address::iterate(array($page->pid()), array(Address::LINK_JOB)
, array(), Visibility::get(Visibility::VIEW_PRIVATE)
);
while ($address = $it->next()) {
$jobs[$address->id]['w_address'] = $address->toFormArray();
}
while ($address = $it->next()) {
$jobs[$address->id]['w_address'] = $address->toFormArray();
}
- $it = Phone::iterate(array($page->pid()), array(Phone::LINK_JOB));
+ $it = Phone::iterate(array($page->pid()), array(Phone::LINK_JOB)
, array(), Visibility::get(Visibility::VIEW_PRIVATE)
);
while ($phone = $it->next()) {
while ($phone = $it->next()) {
- $jobs[$phone->link
Id()]['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
}
$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;
}
return $jobs;
}
- private function cleanJob(ProfilePage
&$page, $jobid, array &$job, &$success
)
+ private function cleanJob(ProfilePage
$page, $jobid, array &$job, &$success, $job_level
)
{
if ($job['w_email'] == "new@example.org") {
$job['w_email'] = $job['w_email_new'];
{
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 (count($job['terms'])) {
$termsid = array();
foreach ($job['terms'] as $term) {
- if (!
$term['full_name']
) {
+ if (!
isset($term['full_name'])
) {
$termsid[] = $term['jtid'];
}
}
$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) {
$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']];
}
}
$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) {
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;
$job['jobid'] = null;
- sleep(1);
} else {
$job['jobid'] = $res->fetchOneCell();
}
}
} else {
$job['jobid'] = $res->fetchOneCell();
}
}
- $job['w_phone'] = Phone::formatFormArray($job['w_phone'], $s);
+
+ if (Visibility::isLessRestrictive($job_level, $job['w_email_pub'])) {
+ $job['w_email_pub'] = $job_level;
+ }
+ $job['w_phone'] = Phone::formatFormArray($job['w_phone'], $s, $job_level);
+
+ 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']);
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;
{
$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 (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';
}
if (!isset($job['pub']) || !$job['pub']) {
$job['pub'] = 'private';
@@
-234,40
+244,57
@@
class ProfileSettingJob implements ProfileSetting
foreach ($value as $key => &$job) {
$address = new Address($job['w_address']);
$s = $address->format();
foreach ($value as $key => &$job) {
$address = new Address($job['w_address']);
$s = $address->format();
+
+ // Force the address publicity to be at least as restricted as
+ // the job publicity.
+ $job_level = $job['pub'];
+ if (Visibility::isLessRestrictive($job_level, $address->pub)) {
+ $address->pub = $job_level;
+ }
$job['w_address'] = $address->toFormArray();
$job['w_address'] = $address->toFormArray();
- $this->cleanJob($page, $key, $job, $s);
+ $this->cleanJob($page, $key, $job, $s
, $job_level
);
if (!$init) {
$success = ($success && $s);
}
}
if (!$init) {
$success = ($success && $s);
}
}
+ usort($value, 'Visibility::comparePublicity');
return $value;
}
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());
$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) {
$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']) {
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)
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 {
$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)
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']);
$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(),
}
$address = new Address(array_merge($job['w_address'],
array('pid' => $page->pid(),
@@
-288,6
+315,9
@@
class ProfileSettingJob implements ProfileSetting
VALUES ' . implode(', ', $terms_values) . '
ON DUPLICATE KEY UPDATE computed = VALUES(computed)');
}
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)
}
public function getText($value)
@@
-327,7
+357,7
@@
class ProfileSettingJob implements ProfileSetting
class ProfileSettingCorps 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)) {
{
$success = true;
if (is_null($value)) {
@@
-342,7
+372,7
@@
class ProfileSettingCorps implements ProfileSetting
return $value;
}
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)
{
if (!S::user()->isMe($page->owner)) {
XDB::execute('INSERT INTO profile_corps (original_corpsid, current_corpsid, rankid, corps_pub, pid)
@@
-362,7
+392,7
@@
class ProfileSettingCorps implements ProfileSetting
public function getText($value)
{
static $pubs = array('public' => 'publique', 'ax' => 'annuaire AX', 'private' => 'privé');
public function getText($value)
{
static $pubs = array('public' => 'publique', 'ax' => 'annuaire AX', 'private' => 'privé');
- $corpsList = DirEnum::getOptions(DirEnum::CORPS);
+ $corpsList = DirEnum::getOptions(DirEnum::
ORIGIN
CORPS);
$rankList = DirEnum::getOptions(DirEnum::CORPSRANKS);
return $corpsList[$value['current']] . ', ' . $corpsList[$value['rank']] . ' ('
. 'corps d\'origine : ' . $corpsList[$value['original']] . ', affichage ' . $pubs[$value['pub']] . ')';
$rankList = DirEnum::getOptions(DirEnum::CORPSRANKS);
return $corpsList[$value['current']] . ', ' . $corpsList[$value['rank']] . ' ('
. 'corps d\'origine : ' . $corpsList[$value['original']] . ', affichage ' . $pubs[$value['pub']] . ')';
@@
-373,7
+403,7
@@
class ProfilePageJobs extends ProfilePage
{
protected $pg_template = 'profile/jobs.tpl';
{
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)) {
{
parent::__construct($wiz);
if (S::user()->checkPerms(User::PERM_DIRECTORY_PRIVATE)) {
@@
-382,6
+412,7
@@
class ProfilePageJobs extends ProfilePage
$this->settings['corps'] = new ProfileSettingCorps();
$this->settings['jobs'] = new ProfileSettingJob();
$this->watched = array('cv' => true, 'jobs' => true, 'corps' => true);
$this->settings['corps'] = new ProfileSettingCorps();
$this->settings['jobs'] = new ProfileSettingJob();
$this->watched = array('cv' => true, 'jobs' => true, 'corps' => true);
+ Platal::page()->assign('geocoding_removal', true);
}
protected function _fetchData()
}
protected function _fetchData()
@@
-408,12
+439,12
@@
class ProfilePageJobs extends ProfilePage
}
}
}
}
- public function _prepare(PlPage
&
$page, $id)
+ public function _prepare(PlPage $page, $id)
{
require_once 'emails.combobox.inc.php';
{
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');
$res = XDB::iterator('SELECT id, name
FROM profile_corps_enum
ORDER BY id = 1 DESC, name');