projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into xnet_accounts
[platal.git]
/
modules
/
profile
/
mentor.inc.php
diff --git
a/modules/profile/mentor.inc.php
b/modules/profile/mentor.inc.php
index
e85318c
..
17d9cdd
100644
(file)
--- a/
modules/profile/mentor.inc.php
+++ b/
modules/profile/mentor.inc.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-20
09
Polytechnique.org *
+ * Copyright (C) 2003-20
10
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 *
@@
-19,7
+19,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************/
-class ProfileSectors implements ProfileSetting
+class ProfileSe
ttingSe
ctors implements ProfileSetting
{
public function value(ProfilePage &$page, $field, $value, &$success)
{
{
public function value(ProfilePage &$page, $field, $value, &$success)
{
@@
-30,8
+30,8
@@
class ProfileSectors implements ProfileSetting
FROM profile_mentor_sector AS m
INNER JOIN profile_job_sector_enum AS s ON (m.sectorid = s.id)
INNER JOIN profile_job_subsector_enum AS ss ON (s.id = ss.sectorid AND m.subsectorid = ss.id)
FROM profile_mentor_sector AS m
INNER JOIN profile_job_sector_enum AS s ON (m.sectorid = s.id)
INNER JOIN profile_job_subsector_enum AS ss ON (s.id = ss.sectorid AND m.subsectorid = ss.id)
- WHERE m.
u
id = {?}",
-
S::i('uid'
));
+ WHERE m.
p
id = {?}",
+
$page->pid(
));
while (list($s, $ss, $ssname) = $res->next()) {
if (!isset($value[$s])) {
$value[$s] = array($ss => $ssname);
while (list($s, $ss, $ssname) = $res->next()) {
if (!isset($value[$s])) {
$value[$s] = array($ss => $ssname);
@@
-56,22
+56,32
@@
class ProfileSectors implements ProfileSetting
{
XDB::execute("DELETE FROM profile_mentor_sector
{
XDB::execute("DELETE FROM profile_mentor_sector
- WHERE
u
id = {?}",
-
S::i('uid'
));
+ WHERE
p
id = {?}",
+
$page->pid(
));
if (!count($value)) {
return;
}
foreach ($value as $id => $sect) {
foreach ($sect as $sid => $name) {
if (!count($value)) {
return;
}
foreach ($value as $id => $sect) {
foreach ($sect as $sid => $name) {
- XDB::execute("INSERT INTO profile_mentor_sector (
u
id, sectorid, subsectorid)
+ XDB::execute("INSERT INTO profile_mentor_sector (
p
id, sectorid, subsectorid)
VALUES ({?}, {?}, {?})",
VALUES ({?}, {?}, {?})",
-
S::i('uid'
), $id, $sid);
+
$page->pid(
), $id, $sid);
}
}
}
}
}
}
+
+ public function getText($value) {
+ $sectors = array();
+ foreach ($value as $sector) {
+ foreach ($sector as $subsector) {
+ $sectors[] = $subsector;
+ }
+ }
+ return implode(', ', $sectors);
+ }
}
}
-class ProfileCountry implements ProfileSetting
+class Profile
Setting
Country implements ProfileSetting
{
public function value(ProfilePage &$page, $field, $value, &$success)
{
{
public function value(ProfilePage &$page, $field, $value, &$success)
{
@@
-81,8
+91,8
@@
class ProfileCountry implements ProfileSetting
$res = XDB::iterRow("SELECT m.country, gc.countryFR
FROM profile_mentor_country AS m
INNER JOIN geoloc_countries AS gc ON (m.country = gc.iso_3166_1_a2)
$res = XDB::iterRow("SELECT m.country, gc.countryFR
FROM profile_mentor_country AS m
INNER JOIN geoloc_countries AS gc ON (m.country = gc.iso_3166_1_a2)
- WHERE m.
u
id = {?}",
-
S::i('uid'
));
+ WHERE m.
p
id = {?}",
+
$page->pid(
));
while (list($id, $name) = $res->next()) {
$value[$id] = $name;
}
while (list($id, $name) = $res->next()) {
$value[$id] = $name;
}
@@
-99,18
+109,22
@@
class ProfileCountry implements ProfileSetting
public function save(ProfilePage &$page, $field, $value)
{
XDB::execute("DELETE FROM profile_mentor_country
public function save(ProfilePage &$page, $field, $value)
{
XDB::execute("DELETE FROM profile_mentor_country
- WHERE
u
id = {?}",
-
S::i('uid'
));
+ WHERE
p
id = {?}",
+
$page->pid(
));
foreach ($value as $id=>&$name) {
foreach ($value as $id=>&$name) {
- XDB::execute("INSERT INTO profile_mentor_country (
u
id, country)
+ XDB::execute("INSERT INTO profile_mentor_country (
p
id, country)
VALUES ({?}, {?})",
VALUES ({?}, {?})",
-
S::i('uid'
), $id);
+
$page->pid(
), $id);
}
}
}
}
+
+ public function getText($value) {
+ return implode(', ', $value);
+ }
}
}
-class ProfileMentor extends ProfilePage
+class Profile
Setting
Mentor extends ProfilePage
{
protected $pg_template = 'profile/mentor.tpl';
{
protected $pg_template = 'profile/mentor.tpl';
@@
-118,16
+132,16
@@
class ProfileMentor extends ProfilePage
{
parent::__construct($wiz);
$this->settings['expertise'] = null;
{
parent::__construct($wiz);
$this->settings['expertise'] = null;
- $this->settings['sectors'] = new ProfileSectors();
- $this->settings['countries'] = new ProfileCountry();
+ $this->settings['sectors'] = new ProfileSe
ttingSe
ctors();
+ $this->settings['countries'] = new Profile
Setting
Country();
}
protected function _fetchData()
{
$res = XDB::query("SELECT expertise
FROM profile_mentor
}
protected function _fetchData()
{
$res = XDB::query("SELECT expertise
FROM profile_mentor
- WHERE
u
id = {?}",
-
S::i('uid'
));
+ WHERE
p
id = {?}",
+
$this->pid(
));
$this->values['expertise'] = $res->fetchOneCell();
}
$this->values['expertise'] = $res->fetchOneCell();
}
@@
-137,13
+151,13
@@
class ProfileMentor extends ProfilePage
$expertise = trim($this->values['expertise']);
if (empty($expertise)) {
XDB::execute("DELETE FROM profile_mentor
$expertise = trim($this->values['expertise']);
if (empty($expertise)) {
XDB::execute("DELETE FROM profile_mentor
- WHERE
u
id = {?}",
-
S::i('uid'
));
+ WHERE
p
id = {?}",
+
$this->pid(
));
$this->values['expertise'] = null;
} else {
$this->values['expertise'] = null;
} else {
- XDB::execute("REPLACE INTO profile_mentor (
u
id, expertise)
+ XDB::execute("REPLACE INTO profile_mentor (
p
id, expertise)
VALUES ({?}, {?})",
VALUES ({?}, {?})",
-
S::i('uid'
), $expertise);
+
$this->pid(
), $expertise);
$this->values['expertise'] = $expertise;
}
}
$this->values['expertise'] = $expertise;
}
}
@@
-157,6
+171,7
@@
class ProfileMentor extends ProfilePage
$page->assign('countryList', XDB::iterator("SELECT iso_3166_1_a2, countryFR
FROM geoloc_countries
ORDER BY countryFR"));
$page->assign('countryList', XDB::iterator("SELECT iso_3166_1_a2, countryFR
FROM geoloc_countries
ORDER BY countryFR"));
+ $page->assign('hrpid', $this->profile->hrpid);
}
}
}
}