X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fnotifs.inc.php;h=bae71b021c6040498249617edba759d831867d37;hb=b20ef4deed1b6fa6334bc57c0166a88e2beac9e4;hp=4295b16d6d3b3280dcb1248712519ae2dfc64203;hpb=787bb3d745141f2f85bd947ad7dd775d2c63f908;p=platal.git diff --git a/include/notifs.inc.php b/include/notifs.inc.php index 4295b16..bae71b0 100644 --- a/include/notifs.inc.php +++ b/include/notifs.inc.php @@ -1,6 +1,6 @@ updateNbNotifs(); } // }}} @@ -64,11 +69,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)' ) ); @@ -76,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, - 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, @@ -84,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, - b.alias AS abestalias, (v.flags='femme') AS sexe, q.core_mail_fmt AS mail_fmt"; + b.alias AS abestalias, (v.flags='femme') AS asexe, q.core_mail_fmt AS mail_fmt"; } $sql .= " @@ -130,29 +135,53 @@ 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('search_names' => 'L\'un de ses noms', + 'freetext' => 'Le texte libre', + 'mobile' => 'Son numéro de téléphone portable', + 'nationalite' => 'Sa nationalité', + 'nationalite2' => 'Sa seconde nationalité', + 'nationalite3' => 'Sa troisième nationalité', + 'nick' => 'Son surnom', + 'networking' => 'La liste de ses adresses de networking', + 'edus' => 'Ses formations', + 'addresses' => 'Ses adresses', + 'section' => 'Sa section sportive', + 'binets' => 'La liste de ses binets', + 'medals' => 'Ses décorations', + 'cv' => 'Son Curriculum Vitae', + 'corps' => 'Son Corps d\'Ãtat', + '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 '