projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/fusionax' into account
[platal.git]
/
modules
/
profile
/
decos.inc.php
diff --git
a/modules/profile/decos.inc.php
b/modules/profile/decos.inc.php
index
ebd8f12
..
9d46347
100644
(file)
--- a/
modules/profile/decos.inc.php
+++ b/
modules/profile/decos.inc.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-200
7
Polytechnique.org *
+ * Copyright (C) 2003-200
9
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 *
@@
-30,10
+30,10
@@
class ProfileDeco implements ProfileSetting
FROM profile_medals_sub AS s
INNER JOIN profile_medals AS m ON ( s.mid = m.id )
WHERE s.uid = {?}",
FROM profile_medals_sub AS s
INNER JOIN profile_medals AS m ON ( s.mid = m.id )
WHERE s.uid = {?}",
-
S::i('uid'
));
+
$page->pid(
));
$value = array();
while (list($id, $grade) = $res->next()) {
$value = array();
while (list($id, $grade) = $res->next()) {
- $value[$id] = array('grade' => $grade,
+ $value[$id] = array('grade' => $grade,
'valid' => '1');
}
'valid' => '1');
}
@@
-63,7
+63,7
@@
class ProfileDeco implements ProfileSetting
if ($val['valid']) {
XDB::execute("DELETE FROM profile_medals_sub
WHERE uid = {?} AND mid = {?}",
if ($val['valid']) {
XDB::execute("DELETE FROM profile_medals_sub
WHERE uid = {?} AND mid = {?}",
-
S::i('uid'
), $id);
+
$page->pid(
), $id);
} else {
$req = MedalReq::get_request(S::i('uid'), $id);
if ($req) {
} else {
$req = MedalReq::get_request(S::i('uid'), $id);
if ($req) {
@@
-76,8
+76,9
@@
class ProfileDeco implements ProfileSetting
// Add new ones
foreach ($value as $id=>&$val) {
if (!isset($orig[$id]) || $orig[$id]['grade'] != $val['grade']) {
// Add new ones
foreach ($value as $id=>&$val) {
if (!isset($orig[$id]) || $orig[$id]['grade'] != $val['grade']) {
- $req = new MedalReq(S::
i('uid'
), $id, $val['grade']);
+ $req = new MedalReq(S::
user(
), $id, $val['grade']);
$req->submit();
$req->submit();
+ sleep(1);
}
}
}
}
}
}
@@
-92,41
+93,30
@@
class ProfileDecos extends ProfilePage
parent::__construct($wiz);
$this->settings['medals'] = new ProfileDeco();
$this->settings['medals_pub'] = new ProfilePub();
parent::__construct($wiz);
$this->settings['medals'] = new ProfileDeco();
$this->settings['medals_pub'] = new ProfilePub();
+ $this->watched['medals'] = true;
}
}
- protected function fetchData()
+ protected function
_
fetchData()
{
{
- $res = XDB::query("SELECT
profile_
medals_pub
- FROM
auth_user_quick
- WHERE
user_
id = {?}",
-
S::i('uid'
));
+ $res = XDB::query("SELECT medals_pub
+ FROM
profiles
+ WHERE
p
id = {?}",
+
$this->pid(
));
$this->values['medals_pub'] = $res->fetchOneCell();
$this->values['medals_pub'] = $res->fetchOneCell();
- parent::fetchData();
}
}
- protected function saveData()
+ protected function
_
saveData()
{
{
- parent::saveData();
if ($this->changed['medals_pub']) {
if ($this->changed['medals_pub']) {
- XDB::execute("UPDATE
auth_user_quick
- SET
profile_
medals_pub = {?}
- WHERE
user_
id = {?}",
- $this->values['medals_pub'],
S::i('uid'
));
+ XDB::execute("UPDATE
profiles
+ SET medals_pub = {?}
+ WHERE
p
id = {?}",
+ $this->values['medals_pub'],
$this->pid(
));
}
}
}
}
- public function
prepare(PlatalPage &$page
)
+ public function
_prepare(PlPage &$page, $id
)
{
{
- parent::prepare($page);
- $res = XDB::iterator("SELECT *
- FROM profile_medals_grades
- ORDER BY mid, pos");
- $grades = array();
- while ($tmp = $res->next()) {
- $grades[$tmp['mid']][] = $tmp;
- }
- $page->assign('grades', $grades);
-
$res = XDB::iterator("SELECT *, FIND_IN_SET('validation', flags) AS validate
FROM profile_medals
ORDER BY type, text");
$res = XDB::iterator("SELECT *, FIND_IN_SET('validation', flags) AS validate
FROM profile_medals
ORDER BY type, text");
@@
-135,7
+125,6
@@
class ProfileDecos extends ProfilePage
$mlist[$tmp['type']][] = $tmp;
}
$page->assign('medal_list', $mlist);
$mlist[$tmp['type']][] = $tmp;
}
$page->assign('medal_list', $mlist);
-
$trad = Array('ordre' => 'Ordres',
'croix' => 'Croix',
'militaire' => 'Médailles militaires',
$trad = Array('ordre' => 'Ordres',
'croix' => 'Croix',
'militaire' => 'Médailles militaires',