projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes duplicated key when adding a new membre in .net.
[platal.git]
/
include
/
notifs.inc.php
diff --git
a/include/notifs.inc.php
b/include/notifs.inc.php
index
95ae89c
..
d48f010
100644
(file)
--- a/
include/notifs.inc.php
+++ b/
include/notifs.inc.php
@@
-54,8
+54,7
@@
function register_watch_op($uid, $cid, $date='', $info='')
WHERE ni_id={?}', $uid);
XDB::execute('DELETE FROM watch_nonins WHERE ni_id={?}', $uid);
}
WHERE ni_id={?}', $uid);
XDB::execute('DELETE FROM watch_nonins WHERE ni_id={?}', $uid);
}
- require_once 'xorg.misc.inc.php';
- update_NbNotifs();
+ Platal::session()->updateNbNotifs();
}
// }}}
}
// }}}
@@
-82,7
+81,7
@@
function _select_notifs_base($table, $mail, $where)
$sql = "
(
SELECT u.promo, u.prenom, IF(u.nom_usage='',u.nom,u.nom_usage) AS nom,
$sql = "
(
SELECT u.promo, u.prenom, IF(u.nom_usage='',u.nom,u.nom_usage) AS nom,
- u.deces != 0 AS dcd,
+ u.deces != 0 AS dcd,
(u.flags = 'femme') AS sexe,
a.alias AS bestalias,
wo.*,
{$our['contact_sql']} AS contact,
a.alias AS bestalias,
wo.*,
{$our['contact_sql']} AS contact,
@@
-90,7
+89,7
@@
function _select_notifs_base($table, $mail, $where)
if ($mail) {
$sql.=",
w.uid AS aid, v.prenom AS aprenom, IF(v.nom_usage='',v.nom,v.nom_usage) AS anom,
if ($mail) {
$sql.=",
w.uid AS aid, v.prenom AS aprenom, IF(v.nom_usage='',v.nom,v.nom_usage) AS anom,
- b.alias AS abestalias, (v.flags='femme') AS sexe, q.core_mail_fmt AS mail_fmt";
+ b.alias AS abestalias, (v.flags='femme') AS
a
sexe, q.core_mail_fmt AS mail_fmt";
}
$sql .= "
}
$sql .= "
@@
-203,10
+202,10
@@
class AllNotifs
$aid = $tmp['aid'];
if (empty($this->_data[$aid])) {
$this->_data[$aid] = Array("prenom" => $tmp['aprenom'], 'nom' => $tmp['anom'],
$aid = $tmp['aid'];
if (empty($this->_data[$aid])) {
$this->_data[$aid] = Array("prenom" => $tmp['aprenom'], 'nom' => $tmp['anom'],
- 'bestalias'=>$tmp['abestalias'], 'sexe' => $tmp['sexe'], 'mail_fmt' => $tmp['mail_fmt'],
+ 'bestalias'=>$tmp['abestalias'], 'sexe' => $tmp['
a
sexe'], 'mail_fmt' => $tmp['mail_fmt'],
'dcd'=>$tmp['dcd']);
}
'dcd'=>$tmp['dcd']);
}
- unset($tmp['aprenom'], $tmp['anom'], $tmp['abestalias'], $tmp['aid'], $tmp['sexe'], $tmp['mail_fmt'], $tmp['dcd']);
+ unset($tmp['aprenom'], $tmp['anom'], $tmp['abestalias'], $tmp['aid'], $tmp['
a
sexe'], $tmp['mail_fmt'], $tmp['dcd']);
$this->_data[$aid]['data'][$tmp['cid']][] = $tmp;
}
}
$this->_data[$aid]['data'][$tmp['cid']][] = $tmp;
}
}