X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fnotifs.inc.php;h=9b367c24538af0dfd9328a869fa97517cf3d979c;hb=b16ea6f895109cfc82f0914b992e41ac5b3b4314;hp=4295b16d6d3b3280dcb1248712519ae2dfc64203;hpb=eaf30d86cc99df2414cf4f171a9b0f11b0561e3b;p=platal.git diff --git a/include/notifs.inc.php b/include/notifs.inc.php index 4295b16..9b367c2 100644 --- a/include/notifs.inc.php +++ b/include/notifs.inc.php @@ -39,9 +39,13 @@ function register_watch_op($uid, $cid, $date='', $info='') if (empty($date)) { $date = date('Y-m-d'); }; - XDB::execute('REPLACE INTO watch_ops (uid,cid,known,date,info) VALUES({?},{?},NOW(),{?},{?})', - $uid, $cid, $date, $info); + XDB::execute('REPLACE INTO watch_ops (uid,cid,known,date,info) + VALUES ({?}, {?}, NOW(), {?}, {?})', + $uid, $cid, $date, $info); if($cid == WATCH_FICHE) { + if ($info) { + register_profile_update($uid, $info); + } XDB::execute('UPDATE auth_user_md5 SET DATE=NOW() WHERE user_id={?}', $uid); } elseif($cid == WATCH_INSCR) { XDB::execute('REPLACE INTO contacts (uid,contact) @@ -50,6 +54,8 @@ function register_watch_op($uid, $cid, $date='', $info='') WHERE ni_id={?}', $uid); XDB::execute('DELETE FROM watch_nonins WHERE ni_id={?}', $uid); } + require_once 'xorg.misc.inc.php'; + update_NbNotifs(); } // }}} @@ -64,11 +70,11 @@ function _select_notifs_base($table, $mail, $where) ), 'watch_promo' => Array('wfield' => 'promo', 'ufield' => 'promo', 'need_contact' => true, 'freq_sql' => ' AND ( wc.type = "basic" OR wc.type="near" AND (u.promo <= v.promo_sortie-2 AND u.promo_sortie >= v.promo+2) )', - 'contact_sql' => 'NOT (c.contact IS NULL)' + 'contact_sql' => 'IF(c.contact IS NULL, 0, 1)' ), - 'watch_nonins' => Array('wfield' => 'ni_id', 'ufield' => 'user_id', 'need_contact' => false, + 'watch_nonins' => Array('wfield' => 'ni_id', 'ufield' => 'user_id', 'need_contact' => true, 'freq_sql' => '', - 'contact_sql' => '0' + 'contact_sql' => 'IF(c.contact IS NULL, 0, 1)' ) ); @@ -130,29 +136,51 @@ function select_notifs($mail, $uid=null, $last=null, $iterator=true) } // }}} -// {{{ function getNbNotifs - -function getNbNotifs() -{ - if (!S::has('uid')) { - return 0; - } - $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 - $res = select_notifs(false, $uid, $watchlast, false); - $n = $res->numRows(); - $res->free(); - if ($n == 0) { - return; +// {{{ + +global $prf_desc; +$prf_desc = array('nom' => 'Son patronyme', + 'freetext' => 'Le texte libre', + 'mobile' => 'Son numéro de téléphone portable', + 'nationalite' => 'Sa nationalité', + 'nick' => 'Son surnom', + 'web' => 'L\'adresse de son site web', + 'appli1' => 'Son école d\'application', + 'appli2' => 'Son école de post-application', + 'addresses' => 'Ses adresses', + 'section' => 'Sa section sportive', + 'binets' => 'La liste de ses binets', + 'medals' => 'Ses décorations', + 'cv' => 'Son Curriculum Vitae', + 'jobs' => 'Ses informations professionnelles', + 'photo' => 'Sa photographie'); + +function get_profile_change_details($event, $limit) { + global $prf_desc; + $res = XDB::iterRow("SELECT field + FROM watch_profile + WHERE uid = {?} AND ts > {?} + ORDER BY ts DESC", + $event['uid'], $limit); + if ($res->total() > 0) { + $data = array(); + while (list($field) = $res->next()) { + $data[] .= $prf_desc[$field]; + } + return '