projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'xorg/maint' into xorg/master
[platal.git]
/
modules
/
profile
/
jobs.inc.php
diff --git
a/modules/profile/jobs.inc.php
b/modules/profile/jobs.inc.php
index
0970503
..
eada2bd
100644
(file)
--- a/
modules/profile/jobs.inc.php
+++ b/
modules/profile/jobs.inc.php
@@
-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, $
maxPublicity
)
+ 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'];
@@
-172,20
+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();
}
}
- if ($maxPublicity->isVisible($job['w_email_pub'])) {
- $job['w_email_pub'] = $maxPublicity->level();
+ 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;
}
}
- $job['w_phone'] = Phone::formatFormArray($job['w_phone'], $s, $maxPublicity);
unset($job['removed']);
unset($job['new']);
unset($job['removed']);
unset($job['new']);
@@
-243,45
+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();
- $maxPublicity = new ProfileVisibility($job['pub']);
- if ($maxPublicity->isVisible($address->pub)) {
- $address->pub = $maxPublicity->level();
+
+ // 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, $
maxPublicity
);
+ $this->cleanJob($page, $key, $job, $s, $
job_level
);
if (!$init) {
$success = ($success && $s);
}
}
if (!$init) {
$success = ($success && $s);
}
}
- usort($value, '
Profile
Visibility::comparePublicity');
+ usort($value, 'Visibility::comparePublicity');
return $value;
}
public function save(ProfilePage $page, $field, $value)
{
return $value;
}
public function save(ProfilePage $page, $field, $value)
{
+
$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());
$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, null, $deletePrivate);
+ Address::deleteAddresses($page->pid(), Address::LINK_JOB, null,
null,
$deletePrivate);
Phone::deletePhones($page->pid(), Phone::LINK_JOB, 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 (($job['pub'] != 'private' || $deletePrivate) && (isset($job['name']) && $job['name'])) {
if (isset($job['jobid']) && $job['jobid']) {
$terms_values = array();
foreach ($value as $id => &$job) {
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)
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(),
@@
-379,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']] . ')';
@@
-399,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()
@@
-428,7
+442,7
@@
class ProfilePageJobs extends ProfilePage
public function _prepare(PlPage $page, $id)
{
require_once 'emails.combobox.inc.php';
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($this->owner)) {
$res = XDB::iterator('SELECT id, name
if (!S::user()->isMe($this->owner)) {
$res = XDB::iterator('SELECT id, name