X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fcarnet.php;h=1d065af009ce5743951104a7bb98e852e9324b92;hb=0554f70a322c69cf35b622bcf76f2c25013c43c1;hp=7cd93202e759031de62414f15ce5cf04c119bf32;hpb=4e7bf1e01f3896d22bea3e23abf4cd7db2c12754;p=platal.git diff --git a/modules/carnet.php b/modules/carnet.php index 7cd9320..1d065af 100644 --- a/modules/carnet.php +++ b/modules/carnet.php @@ -1,6 +1,6 @@ $this->make_hook('notifs', AUTH_COOKIE), 'carnet/contacts' => $this->make_hook('contacts', AUTH_COOKIE), - 'carnet/contacts/pdf' => $this->make_hook('pdf', AUTH_COOKIE, 'user', NO_HTTPS), + 'carnet/contacts/pdf' => $this->make_hook('pdf', AUTH_COOKIE), + 'carnet/contacts/vcard' => $this->make_hook('vcard', AUTH_COOKIE), 'carnet/contacts/ical' => $this->make_hook('ical', AUTH_PUBLIC, 'user', NO_HTTPS), - 'carnet/contacts/vcard' => $this->make_hook('vcard', AUTH_COOKIE, 'user', NO_HTTPS), + 'carnet/contacts/csv' => $this->make_hook('csv', AUTH_PUBLIC, 'user', NO_HTTPS), + 'carnet/contacts/csv/birthday' => $this->make_hook('csv_birthday', AUTH_PUBLIC, 'user', NO_HTTPS), 'carnet/rss' => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS), ); @@ -58,16 +60,20 @@ class CarnetModule extends PLModule $page->changeTpl('carnet/panel.tpl'); if (Get::has('read')) { - S::set('watch_last', Get::v('read')); + XDB::execute('UPDATE watch + SET last = FROM_UNIXTIME({?}) + WHERE uid = {?}', + Get::i('read'), S::i('uid')); + S::user()->invalidWatchCache(); Platal::session()->updateNbNotifs(); pl_redirect('carnet/panel'); } require_once 'notifs.inc.php'; + $page->assign('now', time()); - $page->assign('now',date('YmdHis')); - $notifs = new Notifs(S::v('uid'), true); - + $user = S::user(); + $notifs = Watch::getEvents($user, time() - (7 * 86400)); $page->assign('notifs', $notifs); $page->assign('today', date('Y-m-d')); $this->_add_rss_link($page); @@ -75,8 +81,8 @@ class CarnetModule extends PLModule private function getSinglePromotion(PlPage &$page, $promo) { - if (!ctype_digit($promo) || $promo < 1920 || $promo > date('Y')) { - $page->trigError('Promotion invalide : ' . $promo); + if (!(is_int($promo) || ctype_digit($promo)) || $promo < 1920 || $promo > date('Y')) { + $page->trigError('Promotion invalide : ' . $promo . '.'); return null; } return (int)$promo; @@ -103,7 +109,7 @@ class CarnetModule extends PLModule return null; } if ($promo1 > $promo2) { - $page->trigError("Intervale non valide : " . $promo); + $page->trigError('Intervalle non valide : ' . $promo . '.'); return null; } $array = array(); @@ -125,6 +131,8 @@ class CarnetModule extends PLModule } XDB::execute('INSERT IGNORE INTO watch_promo (uid, promo) VALUES ' . implode(', ', $to_add)); + S::user()->invalidWatchCache(); + Platal::session()->updateNbNotifs(); } private function delPromo(PlPage &$page, $promo) @@ -140,12 +148,16 @@ class CarnetModule extends PLModule XDB::execute('DELETE FROM watch_promo WHERE ' . XDB::format('uid = {?}', S::i('uid')) . ' AND promo IN (' . implode(', ', $to_delete) . ')'); + S::user()->invalidWatchCache(); + Platal::session()->updateNbNotifs(); } public function addNonRegistered(PlPage &$page, PlUser &$user) { XDB::execute('INSERT IGNORE INTO watch_nonins (uid, ni_id) VALUES ({?}, {?})', S::i('uid'), $user->id()); + S::user()->invalidWatchCache(); + Platal::session()->updateNbNotifs(); } public function delNonRegistered(PlPage &$page, PlUser &$user) @@ -153,6 +165,8 @@ class CarnetModule extends PLModule XDB::execute('DELETE FROM watch_nonins WHERE uid = {?} AND ni_id = {?}', S::i('uid'), $user->id()); + S::user()->invalidWatchCache(); + Platal::session()->updateNbNotifs(); } public function handler_notifs(&$page, $action = null, $arg = null) @@ -195,20 +209,26 @@ class CarnetModule extends PLModule XDB::execute('UPDATE watch SET actions = {?} WHERE uid = {?}', $flags, S::i('uid')); + S::user()->invalidWatchCache(); + Platal::session()->updateNbNotifs(); } if (Env::has('flags_contacts')) { S::assert_xsrf_token(); XDB::execute('UPDATE watch SET ' . XDB::changeFlag('flags', 'contacts', Env::b('contacts')) . ' - WHERE uid = {?}', S::i('uid')); + WHERE uid = {?}', S::i('uid')); + S::user()->invalidWatchCache(); + Platal::session()->updateNbNotifs(); } if (Env::has('flags_mail')) { S::assert_xsrf_token(); XDB::execute('UPDATE watch SET ' . XDB::changeFlag('flags', 'mail', Env::b('mail')) . ' - WHERE uid = {?}', S::i('uid')); + WHERE uid = {?}', S::i('uid')); + S::user()->invalidWatchCache(); + Platal::session()->updateNbNotifs(); } $user = S::user(); @@ -250,8 +270,8 @@ class CarnetModule extends PLModule $page->setTitle('Mes contacts'); $this->_add_rss_link($page); - $uid = S::v('uid'); - $user = Env::v('user'); + $uid = S::i('uid'); + $user = S::user(); // For XSRF protection, checks both the normal xsrf token, and the special RSS token. // It allows direct linking to contact adding in the RSS feed. @@ -260,81 +280,77 @@ class CarnetModule extends PLModule } switch (Env::v('action')) { case 'retirer': - if (($user = User::get(Env::v('user')))) { + if (($contact = User::get(Env::v('user')))) { if (XDB::execute("DELETE FROM contacts - WHERE uid = {?} AND contact = {?}", $uid, $user->id())) { - $page->trigSuccess("Contact retiré !"); + WHERE uid = {?} AND contact = {?}", + $uid, $contact->id())) { + Platal::session()->updateNbNotifs(); + $page->trigSuccess("Contact retiré !"); } } break; case 'ajouter': - if (($user = User::get(Env::v('user')))) { + if (($contact = User::get(Env::v('user')))) { if (XDB::execute("REPLACE INTO contacts (uid, contact) - VALUES ({?}, {?})", $uid, $user->id())) { - $page->trigSuccess('Contact ajouté !'); + VALUES ({?}, {?})", + $uid, $contact->id())) { + Platal::session()->updateNbNotifs(); + $page->trigSuccess('Contact ajouté !'); } else { - $page->trigWarning('Contact déjà dans la liste !'); + $page->trigWarning('Contact déjà dans la liste !'); } } break; } $search = false; + + require_once 'userset.inc.php'; + if ($action == 'search') { $action = $subaction; $subaction = $ssaction; $search = true; } if ($search && trim(Env::v('quick'))) { - require_once 'userset.inc.php'; $base = 'carnet/contacts/search'; - - Platal::load('search', 'classes.inc.php'); - ThrowError::$throwHook = array($this, 'searchErrorHandler'); - $view = new SearchSet(true, false, "INNER JOIN contacts AS c2 ON (u.user_id = c2.contact)", "c2.uid = $uid"); + $view = new SearchSet(true, false, new UFC_Contact($user)); } else { $base = 'carnet/contacts'; - $view = new UserSet("INNER JOIN contacts AS c2 ON (u.user_id = c2.contact)", " c2.uid = $uid "); + $view = new ProfileSet(new UFC_Contact($user)); } + $view->addMod('minifiche', 'Mini-fiches', true); $view->addMod('trombi', 'Trombinoscope', false, array('with_admin' => false, 'with_promo' => true)); - $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'carnet/contacts/search')); - $view->apply($base, $page, $action, $subaction); - if ($action != 'geoloc' || ($search && !$ssaction) || (!$search && !$subaction)) { - $page->changeTpl('carnet/mescontacts.tpl'); - } + // TODO: Reactivate when the new map is completed. + // $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'carnet/contacts/search')); + $view->apply('carnet/contacts', $page, $action, $subaction); + //if ($action != 'geoloc' || ($search && !$ssaction) || (!$search && !$subaction)) { + $page->changeTpl('carnet/mescontacts.tpl'); + //} } function handler_pdf(&$page, $arg0 = null, $arg1 = null) { $this->load('contacts.pdf.inc.php'); - require_once 'user.func.inc.php'; + $user = S::user(); Platal::session()->close(); - $sql = "SELECT a.alias - FROM aliases AS a - INNER JOIN auth_user_md5 AS u ON ( a.id = u.user_id ) - INNER JOIN contacts AS c ON ( a.id = c.contact ) - WHERE c.uid = {?} AND a.type='a_vie'"; + $order = array(new UFO_Name(Profile::LASTNAME), new UFO_Name(Profile::FIRSTNAME)); if ($arg0 == 'promo') { - $sql .= ' ORDER BY u.promo, u.nom, u.prenom'; + $order = array_unshift($order, new UFO_Promo()); } else { - $sql .= ' ORDER BY u.nom, u.prenom, u.promo'; + $order[] = new UFO_Promo(); } + $filter = new UserFilter(new UFC_Contact($user), $order); - $citer = XDB::iterRow($sql, S::v('uid')); $pdf = new ContactsPDF(); - while (list($alias) = $citer->next()) { - $user = get_user_details($alias); - foreach ($user as &$value) { - if (is_utf8($value)) { - $value = utf8_decode($value); - } - } - $pdf = ContactsPDF::addContact($pdf, $user, $arg0 == 'photos' || $arg1 == 'photos'); + $it = $filter->iterProfiles(); + while ($p = $it->next()) { + $pdf = ContactsPDF::addContact($pdf, $p, $arg0 == 'photos' || $arg1 == 'photos'); } $pdf->Output(); @@ -348,6 +364,52 @@ class CarnetModule extends PLModule return $feed->run($page, $user, $hash); } + function buildBirthRef(Profile $profile) + { + $date = strtotime($profile->birthdate); + $tomorrow = $date + 86400; + return array( + 'timestamp' => $date, + 'date' => date('Ymd', $date), + 'tomorrow' => date('Ymd', $tomorrow), + 'hruid' => $profile->hrid(), + 'summary' => 'Anniversaire de ' . $profile->fullName(true) + ); + } + + function handler_csv_birthday(&$page, $alias = null, $hash = null) + { + $user = Platal::session()->tokenAuth($alias, $hash); + if (is_null($user)) { + if (S::logged()) { + $user == S::user(); + } else { + return PL_FORBIDDEN; + } + } + + $page->changeTpl('carnet/calendar.outlook.tpl', NO_SKIN); + $filter = new UserFilter(new UFC_Contact($user)); + $profiles = $filter->iterProfiles(); + $page->assign('events', PlIteratorUtils::map($profiles, array($this, 'buildBirthRef'))); + $years = array(date("Y")); + for ($i = 1; $i <= 10; ++$i) { + $years[] = $years[0] + $i; + } + $page->assign('years', $years); + $lang = 'fr'; + if (preg_match('/([a-zA-Z]{2,8})($|[^a-zA-Z])/', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches)) { + $lang = strtolower($matches[1]); + } + $page->assign('lang', $lang); + if ($lang == 'fr') { + $encoding = 'iso8859-15'; + } else { + $encoding = 'utf-8'; + } + pl_content_headers("text/comma-separated-values;charset=".$encoding); + } + function handler_ical(&$page, $alias = null, $hash = null) { $user = Platal::session()->tokenAuth($alias, $hash); @@ -363,46 +425,37 @@ class CarnetModule extends PLModule $page->changeTpl('carnet/calendar.tpl', NO_SKIN); $page->register_function('display_ical', 'display_ical'); - $res = XDB::iterRow( - 'SELECT u.prenom, - IF(u.nom_usage = \'\',u.nom,u.nom_usage) AS nom, - u.promo, - u.naissance, - DATE_ADD(u.naissance, INTERVAL 1 DAY) AS end, - u.date_ins, - u.hruid - FROM contacts AS c - INNER JOIN auth_user_md5 AS u ON (u.user_id = c.contact) - INNER JOIN aliases AS a ON (u.user_id = a.id AND a.type = \'a_vie\') - WHERE c.uid = {?}', $user->id()); - - $annivs = Array(); - while (list($prenom, $nom, $promo, $naissance, $end, $ts, $hruid) = $res->next()) { - $naissance = str_replace('-', '', $naissance); - $end = str_replace('-', '', $end); - $annivs[] = array( - 'timestamp' => strtotime($ts), - 'date' => $naissance, - 'tomorrow' => $end, - 'hruid' => $hruid, - 'summary' => 'Anniversaire de '.$prenom - .' '.$nom.' - x '.$promo, - ); - } - $page->assign('events', $annivs); + $filter = new UserFilter(new UFC_Contact($user)); + $profiles = $filter->iterProfiles(); + $page->assign('events', PlIteratorUtils::map($profiles, array($this, 'buildBirthRef'))); - header('Content-Type: text/calendar; charset=utf-8'); + pl_content_headers("text/calendar"); } function handler_vcard(&$page, $photos = null) { - $res = XDB::query('SELECT contact - FROM contacts - WHERE uid = {?}', S::v('uid')); + $pf = new ProfileFilter(new UFC_Contact(S::user())); $vcard = new VCard($photos == 'photos'); - $vcard->addUsers($res->fetchColumn()); + $vcard->addProfiles($pf->getProfiles()); $vcard->show(); } + + function handler_csv(&$page, $alias = null, $hash = null) + { + $user = Platal::session()->tokenAuth($alias, $hash); + if (is_null($user)) { + if (S::logged()) { + $user == S::user(); + } else { + return PL_FORBIDDEN; + } + } + + $page->changeTpl('carnet/mescontacts.outlook.tpl', NO_SKIN); + $pf = new ProfileFilter(new UFC_Contact($user)); + require_once 'carnet/outlook.inc.php'; + Outlook::output_profiles($pf->getProfiles(), 'fr'); + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: