projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
calendrier iCal des anniversaires
[platal.git]
/
include
/
notifs.inc.php
diff --git
a/include/notifs.inc.php
b/include/notifs.inc.php
index
b27d4d5
..
46a3aaf
100644
(file)
--- a/
include/notifs.inc.php
+++ b/
include/notifs.inc.php
@@
-78,6
+78,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,
a.alias AS bestalias,
wo.*,
{$our['contact_sql']} AS contact,
a.alias AS bestalias,
wo.*,
{$our['contact_sql']} AS contact,
@@
-146,7
+147,7
@@
function getNbNotifs() {
$res = select_notifs(false, $uid, $watchlast, false);
$n = $res->numRows();
$res->free();
$res = select_notifs(false, $uid, $watchlast, false);
$n = $res->numRows();
$res->free();
- $url =
smarty_modifier_url('carnet/panel.php')
;
+ $url =
$globals->baseurl."/carnet/panel.php"
;
if($n==0) { return; }
if($n==1) { return "<a href='$url'>1 évènement !</a>"; }
return "<a href='$url'>$n évènements !</a>";
if($n==0) { return; }
if($n==1) { return "<a href='$url'>1 évènement !</a>"; }
return "<a href='$url'>$n évènements !</a>";
@@
-174,9
+175,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['sexe'], 'mail_fmt' => $tmp['mail_fmt'],
+ 'dcd'=>$tmp['dcd']);
}
}
- unset($tmp['aprenom'], $tmp['anom'], $tmp['abestalias'], $tmp['aid'], $tmp['sexe'], $tmp['mail_fmt']);
+ unset($tmp['aprenom'], $tmp['anom'], $tmp['abestalias'], $tmp['aid'], $tmp['sexe'], $tmp['mail_fmt']
, $tmp['dcd']
);
$this->_data[$aid]['data'][$tmp['cid']][] = $tmp;
}
}
$this->_data[$aid]['data'][$tmp['cid']][] = $tmp;
}
}