X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fnotifs.inc.php;h=71ef1e980a3375dbd9fd45c7a4ad087601f8b3ae;hb=cab0809050d58f8484608e91f7555ebd69dcb451;hp=b27d4d51a65b94a618012f4d3df0ced29ef9cbaa;hpb=0337d704b62718d7c77106c0e4c4e26fb02beacf;p=platal.git
diff --git a/include/notifs.inc.php b/include/notifs.inc.php
index b27d4d5..71ef1e9 100644
--- a/include/notifs.inc.php
+++ b/include/notifs.inc.php
@@ -1,6 +1,6 @@
xdb->execute('REPLACE INTO watch_sub (uid,cid) SELECT {?},id FROM watch_cat', $uid);
+ XDB::execute('REPLACE INTO watch_sub (uid,cid) SELECT {?},id FROM watch_cat', $uid);
}
// }}}
@@ -37,20 +36,19 @@ function inscription_notifs_base($uid)
function register_watch_op($uid, $cid, $date='', $info='')
{
- global $globals;
if (empty($date)) {
$date = date('Y-m-d');
};
- $globals->xdb->execute('REPLACE INTO watch_ops (uid,cid,known,date,info) VALUES({?},{?},NOW(),{?},{?})',
+ XDB::execute('REPLACE INTO watch_ops (uid,cid,known,date,info) VALUES({?},{?},NOW(),{?},{?})',
$uid, $cid, $date, $info);
if($cid == WATCH_FICHE) {
- $globals->xdb->execute('UPDATE auth_user_md5 SET DATE=NOW() WHERE user_id={?}', $uid);
+ XDB::execute('UPDATE auth_user_md5 SET DATE=NOW() WHERE user_id={?}', $uid);
} elseif($cid == WATCH_INSCR) {
- $globals->xdb->execute('REPLACE INTO contacts (uid,contact)
- SELECT uid,ni_id
- FROM watch_nonins
- WHERE ni_id={?}', $uid);
- $globals->xdb->execute('DELETE FROM watch_nonins WHERE ni_id={?}', $uid);
+ XDB::execute('REPLACE INTO contacts (uid,contact)
+ SELECT uid,ni_id
+ FROM watch_nonins
+ WHERE ni_id={?}', $uid);
+ XDB::execute('DELETE FROM watch_nonins WHERE ni_id={?}', $uid);
}
}
@@ -78,6 +76,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,
+ u.deces != 0 AS dcd,
a.alias AS bestalias,
wo.*,
{$our['contact_sql']} AS contact,
@@ -85,7 +84,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,
- b.alias AS abestalias, (v.flags='femme') AS sexe, q.core_mail_fmt AS mail_fmt";
+ b.alias AS abestalias, (v.flags='femme') AS sexe, q.core_mail_fmt AS mail_fmt";
}
$sql .= "
@@ -118,16 +117,15 @@ function _select_notifs_base($table, $mail, $where)
function select_notifs($mail, $uid=null, $last=null, $iterator=true)
{
- global $globals;
$where = $mail ? 'q.watch_flags=3' : 'w.uid = {?}';
$sql = _select_notifs_base('contacts', $mail, $where.($mail?'':' AND (q.watch_flags=1 OR q.watch_flags=3)')) . " UNION DISTINCT ";
$sql .= _select_notifs_base('watch_promo', $mail, $where) . " UNION DISTINCT ";
$sql .= _select_notifs_base('watch_nonins', $mail, $where);
if ($iterator) {
- return $globals->xdb->iterator($sql . ' ORDER BY cid, promo, date DESC, nom', $last, $uid, $last, $uid, $last, $uid);
+ return XDB::iterator($sql . ' ORDER BY cid, promo, date DESC, nom', $last, $uid, $last, $uid, $last, $uid);
} else {
- return $globals->xdb->query($sql, $last, $uid, $last, $uid, $last, $uid);
+ return XDB::query($sql, $last, $uid, $last, $uid, $last, $uid);
}
}
@@ -136,17 +134,18 @@ function select_notifs($mail, $uid=null, $last=null, $iterator=true)
function getNbNotifs() {
global $globals;
- if (!Session::has('uid')) {
+ if (!S::has('uid')) {
return 0;
}
- $uid = Session::getInt('uid', -1);
- $watchlast = Session::get('watch_last');
+ $uid = S::v('uid', -1);
+ $watchlast = S::v('watch_last');
- // selectionne les notifs de uid, sans detail sur le watcher, depuis $watchlast, meme ceux sans surveillance, non ordonnés
+ // selectionne les notifs de uid, sans detail sur le watcher, depuis
+ // $watchlast, meme ceux sans surveillance, non ordonnés
$res = select_notifs(false, $uid, $watchlast, false);
$n = $res->numRows();
$res->free();
- $url = smarty_modifier_url('carnet/panel.php');
+ $url = $globals->baseurl."/carnet/panel";
if($n==0) { return; }
if($n==1) { return "1 évènement !"; }
return "$n évènements !";
@@ -160,25 +159,25 @@ class AllNotifs {
var $_data = Array();
function AllNotifs() {
- global $globals;
-
- $res = $globals->xdb->iterator("SELECT * FROM watch_cat");
- while($tmp = $res->next()) {
+ $res = XDB::iterator("SELECT * FROM watch_cat");
+ while($tmp = $res->next()) {
$this->_cats[$tmp['id']] = $tmp;
}
- // recupère tous les watchers, avec détails des watchers, a partir du watch_last de chacun, seulement ceux qui sont surveillés, ordonnés
- $res = select_notifs(true);
+ // recupère tous les watchers, avec détails des watchers, a partir du
+ // watch_last de chacun, seulement ceux qui sont surveillés, ordonnés
+ $res = select_notifs(true);
- while($tmp = $res->next()) {
- $aid = $tmp['aid'];
+ while($tmp = $res->next()) {
+ $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']);
- $this->_data[$aid]['data'][$tmp['cid']][] = $tmp;
- }
+ unset($tmp['aprenom'], $tmp['anom'], $tmp['abestalias'], $tmp['aid'], $tmp['sexe'], $tmp['mail_fmt'], $tmp['dcd']);
+ $this->_data[$aid]['data'][$tmp['cid']][] = $tmp;
+ }
}
}
@@ -189,27 +188,27 @@ class Notifs {
var $_uid;
var $_cats = Array();
var $_data = Array();
-
+
function Notifs($uid, $up=false) {
- global $globals;
- $this->_uid = $uid;
-
- $res = $globals->xdb->iterator("SELECT * FROM watch_cat");
- while($tmp = $res->next()) {
+ $this->_uid = $uid;
+
+ $res = XDB::iterator("SELECT * FROM watch_cat");
+ while($tmp = $res->next()) {
$this->_cats[$tmp['id']] = $tmp;
}
- $lastweek = date('YmdHis',mktime() - 7*24*60*60);
+ $lastweek = date('YmdHis',mktime() - 7*24*60*60);
- // recupere les notifs du watcher $uid, sans detail sur le watcher, depuis la semaine dernière, meme ceux sans surveillance, ordonnés
+ // recupere les notifs du watcher $uid, sans detail sur le watcher,
+ // depuis la semaine dernière, meme ceux sans surveillance, ordonnés
$res = select_notifs(false, $uid, $lastweek);
- while($tmp = $res->next()) {
- $this->_data[$tmp['cid']][$tmp['promo']][] = $tmp;
- }
+ while($tmp = $res->next()) {
+ $this->_data[$tmp['cid']][$tmp['promo']][] = $tmp;
+ }
- if($up) {
- $globals->xdb->execute('UPDATE auth_user_quick SET watch_last=NOW() WHERE user_id={?}', $uid);
- }
+ if($up) {
+ XDB::execute('UPDATE auth_user_quick SET watch_last=NOW() WHERE user_id={?}', $uid);
+ }
}
}
@@ -224,47 +223,47 @@ class Watch {
var $_subs;
var $watch_contacts;
var $watch_mail;
-
+
function Watch($uid) {
- global $globals;
- $this->_uid = $uid;
- $this->_promos = new PromoNotifs($uid);
- $this->_nonins = new NoninsNotifs($uid);
- $this->_subs = new WatchSub($uid);
- $res = $globals->xdb->query("SELECT FIND_IN_SET('contacts',watch_flags),FIND_IN_SET('mail',watch_flags)
- FROM auth_user_quick
- WHERE user_id={?}", $uid);
- list($this->watch_contacts,$this->watch_mail) = $res->fetchOneRow();
-
- $res = $globals->xdb->iterator("SELECT * FROM watch_cat");
- while($tmp = $res->next()) {
+ $this->_uid = $uid;
+ $this->_promos = new PromoNotifs($uid);
+ $this->_nonins = new NoninsNotifs($uid);
+ $this->_subs = new WatchSub($uid);
+ $res = XDB::query("SELECT FIND_IN_SET('contacts',watch_flags),FIND_IN_SET('mail',watch_flags)
+ FROM auth_user_quick
+ WHERE user_id={?}", $uid);
+ list($this->watch_contacts,$this->watch_mail) = $res->fetchOneRow();
+
+ $res = XDB::iterator("SELECT * FROM watch_cat");
+ while($tmp = $res->next()) {
$this->_cats[$tmp['id']] = $tmp;
}
}
function saveFlags() {
- global $globals;
- $flags = "";
- if($this->watch_contacts) $flags = "contacts";
- if($this->watch_mail) $flags .= ($flags ? ',' : '')."mail";
- $globals->xdb->execute('UPDATE auth_user_quick SET watch_flags={?} WHERE user_id={?}', $flags, $this->_uid);
-
+ $flags = "";
+ if ($this->watch_contacts)
+ $flags = "contacts";
+ if ($this->watch_mail)
+ $flags .= ($flags ? ',' : '')."mail";
+ XDB::execute('UPDATE auth_user_quick SET watch_flags={?} WHERE user_id={?}',
+ $flags, $this->_uid);
}
function cats() {
- return $this->_cats;
+ return $this->_cats;
}
function subs($i) {
- return $this->_subs->_data[$i];
+ return $this->_subs->_data[$i];
}
-
+
function promos() {
- return $this->_promos->toRanges();
+ return $this->_promos->toRanges();
}
-
+
function nonins() {
- return $this->_nonins->_data;
+ return $this->_nonins->_data;
}
}
@@ -276,24 +275,22 @@ class WatchSub {
var $_data = Array();
function WatchSub($uid) {
- $this->_uid = $uid;
- global $globals;
- $res = $globals->xdb->iterRow('SELECT cid FROM watch_sub WHERE uid={?}', $uid);
- while(list($c) = $res->next()) {
+ $this->_uid = $uid;
+ $res = XDB::iterRow('SELECT cid FROM watch_sub WHERE uid={?}', $uid);
+ while(list($c) = $res->next()) {
$this->_data[$c] = $c;
}
}
function update($ind) {
- global $globals;
- $this->_data = Array();
- $globals->xdb->execute('DELETE FROM watch_sub WHERE uid={?}', $this->_uid);
- foreach(Env::getMixed($ind) as $key=>$val) {
- $globals->xdb->query('INSERT INTO watch_sub SELECT {?},id FROM watch_cat WHERE id={?}', $this->_uid, $key);
- if(mysql_affected_rows()) {
+ $this->_data = Array();
+ XDB::execute('DELETE FROM watch_sub WHERE uid={?}', $this->_uid);
+ foreach(Env::getMixed($ind) as $key=>$val) {
+ XDB::query('INSERT INTO watch_sub SELECT {?},id FROM watch_cat WHERE id={?}', $this->_uid, $key);
+ if(mysql_affected_rows()) {
$this->_data[$key] = $key;
}
- }
+ }
}
}
@@ -305,71 +302,66 @@ class PromoNotifs {
var $_data = Array();
function PromoNotifs($uid) {
- $this->_uid = $uid;
- global $globals;
- $res = $globals->xdb->iterRow('SELECT promo FROM watch_promo WHERE uid={?} ORDER BY promo', $uid);
- while (list($p) = $res->next()) {
+ $this->_uid = $uid;
+ $res = XDB::iterRow('SELECT promo FROM watch_promo WHERE uid={?} ORDER BY promo', $uid);
+ while (list($p) = $res->next()) {
$this->_data[intval($p)] = intval($p);
}
}
function add($p) {
- global $globals;
- $promo = intval($p);
- $globals->xdb->execute('REPLACE INTO watch_promo (uid,promo) VALUES({?},{?})', $this->_uid, $promo);
- $this->_data[$promo] = $promo;
- asort($this->_data);
+ $promo = intval($p);
+ XDB::execute('REPLACE INTO watch_promo (uid,promo) VALUES({?},{?})', $this->_uid, $promo);
+ $this->_data[$promo] = $promo;
+ asort($this->_data);
}
-
+
function del($p) {
- global $globals;
- $promo = intval($p);
- $globals->xdb->execute('DELETE FROM watch_promo WHERE uid={?} AND promo={?}', $this->_uid, $promo);
- unset($this->_data[$promo]);
+ $promo = intval($p);
+ XDB::execute('DELETE FROM watch_promo WHERE uid={?} AND promo={?}', $this->_uid, $promo);
+ unset($this->_data[$promo]);
}
-
+
function addRange($_p1,$_p2) {
- global $globals;
- $p1 = intval($_p1);
- $p2 = intval($_p2);
- $values = Array();
- for($i = min($p1,$p2); $i<=max($p1,$p2); $i++) {
- $values[] = "('{$this->_uid}',$i)";
- $this->_data[$i] = $i;
- }
- $globals->xdb->execute('REPLACE INTO watch_promo (uid,promo) VALUES '.join(',',$values));
- asort($this->_data);
+ $p1 = intval($_p1);
+ $p2 = intval($_p2);
+ $values = Array();
+ for($i = min($p1,$p2); $i<=max($p1,$p2); $i++) {
+ $values[] = "('{$this->_uid}',$i)";
+ $this->_data[$i] = $i;
+ }
+ XDB::execute('REPLACE INTO watch_promo (uid,promo) VALUES '.join(',',$values));
+ asort($this->_data);
}
function delRange($_p1,$_p2) {
- global $globals;
- $p1 = intval($_p1);
- $p2 = intval($_p2);
- $where = Array();
- for($i = min($p1,$p2); $i<=max($p1,$p2); $i++) {
- $where[] = "promo=$i";
- unset($this->_data[$i]);
- }
- $globals->xdb->execute('DELETE FROM watch_promo WHERE uid={?} AND ('.join(' OR ',$where).')', $this->_uid);
+ $p1 = intval($_p1);
+ $p2 = intval($_p2);
+ $where = Array();
+ for($i = min($p1,$p2); $i<=max($p1,$p2); $i++) {
+ $where[] = "promo=$i";
+ unset($this->_data[$i]);
+ }
+ XDB::execute('DELETE FROM watch_promo WHERE uid={?} AND ('.join(' OR ',$where).')', $this->_uid);
}
function toRanges() {
- $ranges = Array();
- $I = Array();
- foreach($this->_data as $promo) {
- if(!isset($I[0])) {
- $I = Array($promo,$promo);
- }
- elseif($I[1]+1 == $promo) {
- $I[1] ++;
- }
- else {
- $ranges[] = $I;
- $I = Array($promo,$promo);
- }
- }
- if(isset($I[0])) $ranges[] = $I;
- return $ranges;
+ $ranges = Array();
+ $I = Array();
+ foreach($this->_data as $promo) {
+ if(!isset($I[0])) {
+ $I = Array($promo,$promo);
+ }
+ elseif($I[1]+1 == $promo) {
+ $I[1] ++;
+ }
+ else {
+ $ranges[] = $I;
+ $I = Array($promo,$promo);
+ }
+ }
+ if(isset($I[0])) $ranges[] = $I;
+ return $ranges;
}
}
@@ -381,34 +373,31 @@ class NoninsNotifs {
var $_data = Array();
function NoninsNotifs($uid) {
- global $globals;
- $this->_uid = $uid;
- $res = $globals->xdb->iterator("SELECT u.prenom,IF(u.nom_usage='',u.nom,u.nom_usage) AS nom, u.promo, u.user_id
+ $this->_uid = $uid;
+ $res = XDB::iterator("SELECT u.prenom,IF(u.nom_usage='',u.nom,u.nom_usage) AS nom, u.promo, u.user_id
FROM watch_nonins AS w
INNER JOIN auth_user_md5 AS u ON (u.user_id = w.ni_id)
WHERE w.uid = {?}
- ORDER BY promo,nom", $uid);
- while($tmp = $res->next()) {
+ ORDER BY promo,nom", $uid);
+ while($tmp = $res->next()) {
$this->_data[$tmp['user_id']] = $tmp;
}
}
function del($p) {
- global $globals;
- unset($this->_data["$p"]);
- $globals->xdb->execute('DELETE FROM watch_nonins WHERE uid={?} AND ni_id={?}', $this->_uid, $p);
+ unset($this->_data["$p"]);
+ XDB::execute('DELETE FROM watch_nonins WHERE uid={?} AND ni_id={?}', $this->_uid, $p);
}
function add($p) {
- global $globals;
- $globals->xdb->execute('INSERT INTO watch_nonins (uid,ni_id) VALUES({?},{?})', $this->_uid, $p);
- $res = $globals->xdb->query('SELECT prenom,IF(nom_usage="",nom,nom_usage) AS nom,promo,user_id
+ XDB::execute('INSERT INTO watch_nonins (uid,ni_id) VALUES({?},{?})', $this->_uid, $p);
+ $res = XDB::query('SELECT prenom,IF(nom_usage="",nom,nom_usage) AS nom,promo,user_id
FROM auth_user_md5
WHERE user_id={?}', $p);
- $this->_data["$p"] = $res->fetchOneAssoc();
+ $this->_data["$p"] = $res->fetchOneAssoc();
}
}
-
+
// }}}
?>