X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fcarnet.php;h=aee28901b1888192d1bbe01d6768ad84888e4228;hb=05978b09201b86278849d6448a15b4a59e2ed852;hp=5dbf71a5dab119ed85655efabf2620c3f36dc1b6;hpb=d6ccc6055edaf8aa9d33c5d27c96b6e1c8ef9aa1;p=platal.git diff --git a/modules/carnet.php b/modules/carnet.php index 5dbf71a..aee2890 100644 --- a/modules/carnet.php +++ b/modules/carnet.php @@ -1,6 +1,6 @@ $this->make_hook('index', AUTH_COOKIE), - 'carnet/panel' => $this->make_hook('panel', AUTH_COOKIE), - 'carnet/notifs' => $this->make_hook('notifs', AUTH_COOKIE), - - 'carnet/contacts' => $this->make_hook('contacts', AUTH_COOKIE), - '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/rss' => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS), + 'carnet' => $this->make_hook('index', AUTH_COOKIE, 'directory_private'), + 'carnet/panel' => $this->make_hook('panel', AUTH_COOKIE, 'directory_private'), + 'carnet/notifs' => $this->make_hook('notifs', AUTH_COOKIE, 'directory_private'), + + 'carnet/contacts' => $this->make_hook('contacts', AUTH_COOKIE, 'directory_private'), + 'carnet/contacts/pdf' => $this->make_hook('pdf', AUTH_COOKIE, 'directory_private'), + 'carnet/contacts/vcard' => $this->make_hook('vcard', AUTH_COOKIE, 'directory_private'), + 'carnet/contacts/ical' => $this->make_token_hook('ical', AUTH_COOKIE, 'directory_private'), + 'carnet/contacts/csv' => $this->make_token_hook('csv', AUTH_COOKIE, 'directory_private'), + 'carnet/contacts/csv/birthday' => $this->make_token_hook('csv_birthday', AUTH_COOKIE, 'directory_private'), + + 'carnet/rss' => $this->make_token_hook('rss', AUTH_COOKIE, 'directory_private'), ); } - function _add_rss_link(&$page) + function _add_rss_link($page) { if (!S::hasAuthToken()) { return; } $page->setRssLink('Polytechnique.org :: Carnet', - '/carnet/rss/'.S::v('hruid').'/'.S::v('token').'/rss.xml'); + '/carnet/rss/' . S::v('hruid') . '/' . S::user()->token . '/rss.xml'); } - function handler_index(&$page) + function handler_index($page) { $page->changeTpl('carnet/index.tpl'); $page->setTitle('Mon carnet'); $this->_add_rss_link($page); } - function handler_panel(&$page) + function handler_panel($page) { $page->changeTpl('carnet/panel.tpl'); @@ -62,7 +64,7 @@ class CarnetModule extends PLModule SET last = FROM_UNIXTIME({?}) WHERE uid = {?}', Get::i('read'), S::i('uid')); - S::set('watch_last', Get::i('read')); + S::user()->invalidWatchCache(); Platal::session()->updateNbNotifs(); pl_redirect('carnet/panel'); } @@ -77,16 +79,16 @@ class CarnetModule extends PLModule $this->_add_rss_link($page); } - private function getSinglePromotion(PlPage &$page, $promo) + private function getSinglePromotion(PlPage $page, $promo) { - if (!ctype_digit($promo) || $promo < 1920 || $promo > date('Y')) { + if (!(is_int($promo) || ctype_digit($promo)) || $promo < 1920 || $promo > date('Y')) { $page->trigError('Promotion invalide : ' . $promo . '.'); return null; } return (int)$promo; } - private function getPromo(PlPage &$page, $promo) + private function getPromo(PlPage $page, $promo) { if (strpos($promo, '-') === false) { $promo = $this->getSinglePromotion($page, $promo); @@ -117,7 +119,7 @@ class CarnetModule extends PLModule return $array; } - private function addPromo(PlPage &$page, $promo) + private function addPromo(PlPage $page, $promo) { $promos = $this->getPromo($page, $promo); if (!$promos || count($promos) == 0) { @@ -129,9 +131,11 @@ 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) + private function delPromo(PlPage $page, $promo) { $promos = $this->getPromo($page, $promo); if (!$promos || count($promos) == 0) { @@ -144,22 +148,28 @@ 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) + 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) + public function delNonRegistered(PlPage $page, PlUser $user) { 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) + public function handler_notifs($page, $action = null, $arg = null) { $page->changeTpl('carnet/notifs.tpl'); @@ -199,6 +209,8 @@ 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')) { @@ -206,6 +218,8 @@ class CarnetModule extends PLModule XDB::execute('UPDATE watch SET ' . XDB::changeFlag('flags', 'contacts', Env::b('contacts')) . ' WHERE uid = {?}', S::i('uid')); + S::user()->invalidWatchCache(); + Platal::session()->updateNbNotifs(); } if (Env::has('flags_mail')) { @@ -213,6 +227,8 @@ class CarnetModule extends PLModule XDB::execute('UPDATE watch SET ' . XDB::changeFlag('flags', 'mail', Env::b('mail')) . ' WHERE uid = {?}', S::i('uid')); + S::user()->invalidWatchCache(); + Platal::session()->updateNbNotifs(); } $user = S::user(); @@ -249,33 +265,38 @@ class CarnetModule extends PLModule $page->assign('actions', $actions); } - function handler_contacts(&$page, $action = null, $subaction = null, $ssaction = null) + function handler_contacts($page, $action = null, $subaction = null, $ssaction = null) { $page->setTitle('Mes contacts'); $this->_add_rss_link($page); $uid = S::i('uid'); - $user = Env::v('user'); + $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. - if (Env::v('action') && Env::v('token') !== S::v('token')) { + if (Env::v('action') && Env::v('token') !== S::user()->token) { S::assert_xsrf_token(); } 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())) { + 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 (XDB::execute("REPLACE INTO contacts (uid, contact) - VALUES ({?}, {?})", $uid, $user->id())) { + if (($contact = User::get(Env::v('user')))) { + XDB::execute('INSERT IGNORE INTO contacts (uid, contact) + VALUES ({?}, {?})', + $uid, $contact->id()); + if (XDB::affectedRows() > 0) { + Platal::session()->updateNbNotifs(); $page->trigSuccess('Contact ajouté !'); } else { $page->trigWarning('Contact déjà dans la liste !'); @@ -285,7 +306,6 @@ class CarnetModule extends PLModule } $search = false; - $user = S::user(); require_once 'userset.inc.php'; @@ -296,9 +316,7 @@ class CarnetModule extends PLModule } if ($search && trim(Env::v('quick'))) { $base = 'carnet/contacts/search'; - - Platal::load('search', 'classes.inc.php'); - $view = new SearchSet(true, false, new UFC_Contact($user)); + $view = new QuickSearchSet(new UFC_Contact($user)); } else { $base = 'carnet/contacts'; $view = new ProfileSet(new UFC_Contact($user)); @@ -314,14 +332,14 @@ class CarnetModule extends PLModule //} } - function handler_pdf(&$page, $arg0 = null, $arg1 = null) + function handler_pdf($page, $arg0 = null, $arg1 = null) { $this->load('contacts.pdf.inc.php'); $user = S::user(); Platal::session()->close(); - $order = array(new UFO_Name(UserFilter::LASTNAME), new UFO_Name(UserFilter::FIRSTNAME)); + $order = array(new UFO_Name(Profile::LASTNAME), new UFO_Name(Profile::FIRSTNAME)); if ($arg0 == 'promo') { $order = array_unshift($order, new UFO_Promo()); } else { @@ -331,8 +349,8 @@ class CarnetModule extends PLModule $pdf = new ContactsPDF(); - $profiles = $filter->getProfiles(); - foreach ($profiles as $p) { + $it = $filter->iterProfiles(); + while ($p = $it->next()) { $pdf = ContactsPDF::addContact($pdf, $p, $arg0 == 'photos' || $arg1 == 'photos'); } $pdf->Output(); @@ -340,56 +358,78 @@ class CarnetModule extends PLModule exit; } - function handler_rss(&$page, $user = null, $hash = null) + function handler_rss(PlPage $page, PlUser $user) { $this->load('feed.inc.php'); $feed = new CarnetFeed(); - return $feed->run($page, $user, $hash); + return $feed->run($page, $user); } - function handler_ical(&$page, $alias = null, $hash = null) + function buildBirthRef(Profile $profile) { - $user = Platal::session()->tokenAuth($alias, $hash); - if (is_null($user)) { - if (S::logged()) { - $user == S::user(); - } else { - return PL_FORBIDDEN; - } + $date = strtotime($profile->birthdate); + $tomorrow = $date + 86400; + return array( + 'timestamp' => $date, + 'date' => date('Ymd', $date), + 'tomorrow' => date('Ymd', $tomorrow), + 'email' => $profile->owner()->bestEmail(), + 'summary' => 'Anniversaire de ' . $profile->fullName(true) + ); + } + + function handler_csv_birthday(PlPage $page, PlUser $user) + { + $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(PlPage $page, PlUser $user) + { require_once 'ical.inc.php'; $page->changeTpl('carnet/calendar.tpl', NO_SKIN); $page->register_function('display_ical', 'display_ical'); $filter = new UserFilter(new UFC_Contact($user)); - $annivs = Array(); - foreach ($filter->getUsers() as $u) { - $profile = $u->profile(); - $date = strtotime($profile->birthdate); - $tomorrow = $date + 86400; - $annivs[] = array( - 'timestamp' => strtotime($user->registration_date), - 'date' => date('Ymd', $date), - 'tomorrow' => date('Ymd', $tomorrow), - 'hruid' => $profile->hrid(), - 'summary' => 'Anniversaire de ' . $profile->fullName(true) - ); - } - $page->assign('events', $annivs); + $profiles = $filter->iterProfiles(); + $page->assign('events', PlIteratorUtils::map($profiles, array($this, 'buildBirthRef'))); pl_content_headers("text/calendar"); } - function handler_vcard(&$page, $photos = null) + 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(null, Profile::FETCH_ALL)); $vcard->show(); } + + function handler_csv(PlPage $page, PlUser $user) + { + $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: