X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fcarnet.php;h=588be5dc4b639477facabdca294d49b2fafcede1;hb=d403dec425845818c5e614a14527d4b1779ecace;hp=7479b3ce1b027a07bc028c94b16f541f22cd0bbc;hpb=b3ad574ddfd8697b6342356fb23e756ba8cabb0f;p=platal.git diff --git a/modules/carnet.php b/modules/carnet.php index 7479b3c..588be5d 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/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), + '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/batch' => $this->make_hook('batch', 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'); @@ -64,7 +65,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'); } @@ -79,7 +80,7 @@ class CarnetModule extends PLModule $this->_add_rss_link($page); } - private function getSinglePromotion(PlPage &$page, $promo) + private function getSinglePromotion(PlPage $page, $promo) { if (!(is_int($promo) || ctype_digit($promo)) || $promo < 1920 || $promo > date('Y')) { $page->trigError('Promotion invalide : ' . $promo . '.'); @@ -88,7 +89,7 @@ class CarnetModule extends PLModule return (int)$promo; } - private function getPromo(PlPage &$page, $promo) + private function getPromo(PlPage $page, $promo) { if (strpos($promo, '-') === false) { $promo = $this->getSinglePromotion($page, $promo); @@ -119,7 +120,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) { @@ -131,9 +132,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) { @@ -146,22 +149,105 @@ 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) + private function getGroup(PlPage $page, $group) + { + $groupid = XDB::fetchOneCell("SELECT id + FROM groups + WHERE (nom = {?} OR diminutif = {?}) AND NOT FIND_IN_SET('private', pub)", + $group, $group); + if (is_null($groupid)) { + $search = XDB::formatWildcards(XDB::WILDCARD_CONTAINS, $group); + $res = XDB::query('SELECT id + FROM groups + WHERE (nom ' . $search . ' OR diminutif ' . $search . ") AND NOT FIND_IN_SET('private', pub)", + $search, $search); + if ($res->numRows() == 1) { + $groupid = $res->fetchOneCell(); + } + } + return $groupid; + } + + private function addGroup(PlPage $page, $group) + { + $groupid = $this->getGroup($page, $group); + if (is_null($groupid)) { + return; + } + XDB::execute('INSERT IGNORE INTO watch_group (uid, groupid) + VALUES ({?}, {?})', + S::i('uid'), $groupid); + S::user()->invalidWatchCache(); + Platal::session()->updateNbNotifs(); + } + + private function delGroup(PlPage $page, $group) + { + $groupid = $this->getGroup($page, $group); + if (is_null($groupid)) { + return; + } + XDB::execute('DELETE FROM watch_group + WHERE uid = {?} AND groupid = {?}', + S::i('uid'), $groupid); + 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()); + if (XDB::affectedRows() > 0) { + S::user()->invalidWatchCache(); + Platal::session()->updateNbNotifs(); + $page->trigSuccess('Contact ajouté : ' . $user->fullName(true)); + } else { + $page->trigWarning('Contact déjà dans la liste : ' . $user->fullName(true)); + } } - 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 addRegistered(PlPage $page, Profile $profile) + { + XDB::execute('INSERT IGNORE INTO contacts (uid, contact) + VALUES ({?}, {?})', + S::i('uid'), $profile->id()); + if (XDB::affectedRows() > 0) { + S::user()->invalidWatchCache(); + Platal::session()->updateNbNotifs(); + $page->trigSuccess('Contact ajouté : ' . $profile->fullName(true)); + } else { + $page->trigWarning('Contact déjà dans la liste : ' . $profile->fullName(true)); + } + } + + public function delRegistered(PlPage $page, Profile $profile) + { + XDB::execute('DELETE FROM contacts + WHERE uid = {?} AND contact = {?}', + S::i('uid'), $profile->id()); + if (XDB::affectedRows() > 0) { + S::user()->invalidWatchCache(); + Platal::session()->updateNbNotifs(); + $page->trigSuccess("Contact retiré !"); + } + + } + + public function handler_notifs($page, $action = null, $arg = null) { $page->changeTpl('carnet/notifs.tpl'); @@ -176,6 +262,14 @@ class CarnetModule extends PLModule $this->delPromo($page, $arg); break; + case 'add_group': + $this->addGroup($page, $arg); + break; + + case 'del_group': + $this->delGroup($page, $arg); + break; + case 'del_nonins': $user = User::get($arg); if ($user) { @@ -201,6 +295,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')) { @@ -208,6 +304,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')) { @@ -215,6 +313,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(); @@ -242,6 +342,14 @@ class CarnetModule extends PLModule $page->assign('promo_ranges', $ranges); $page->assign('nonins', $nonins->getUsers()); + $groups = XDB::fetchColumn('SELECT g.nom + FROM watch_group AS w + INNER JOIN groups AS g ON (g.id = w.groupid) + WHERE w.uid = {?} + ORDER BY g.nom', + S::i('uid')); + $page->assign('groups', $groups); + $page->assign('groups_count', count($groups)); list($flags, $actions) = XDB::fetchOneRow('SELECT flags, actions FROM watch WHERE uid = {?}', S::i('uid')); @@ -251,42 +359,32 @@ 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 = 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 (XDB::execute("DELETE FROM contacts - WHERE uid = {?} AND contact = {?}", $uid, $user->id())) { - $page->trigSuccess("Contact retiré !"); - } + if (($contact = Profile::get(Env::v('user')))) { + $this->delRegistered($page, $contact); } break; case 'ajouter': - if (($user = User::get(Env::v('user')))) { - if (XDB::execute("REPLACE INTO contacts (uid, contact) - VALUES ({?}, {?})", $uid, $user->id())) { - $page->trigSuccess('Contact ajouté !'); - } else { - $page->trigWarning('Contact déjà dans la liste !'); - } + if (($contact = Profile::get(Env::v('user')))) { + $this->addRegistered($page, $contact); } break; } $search = false; + $user = S::user(); require_once 'userset.inc.php'; @@ -297,7 +395,7 @@ class CarnetModule extends PLModule } if ($search && trim(Env::v('quick'))) { $base = 'carnet/contacts/search'; - $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)); @@ -305,22 +403,19 @@ class CarnetModule extends PLModule $view->addMod('minifiche', 'Mini-fiches', true); $view->addMod('trombi', 'Trombinoscope', false, array('with_admin' => false, 'with_promo' => true)); - // TODO: Reactivate when the new map is completed. - // $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'carnet/contacts/search')); + $view->addMod('map', 'Planisphère'); $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) + 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(Profile::LASTNAME), new UFO_Name(Profile::FIRSTNAME)); + $order = array(new UFO_Name()); if ($arg0 == 'promo') { $order = array_unshift($order, new UFO_Promo()); } else { @@ -339,11 +434,11 @@ 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 buildBirthRef(Profile $profile) @@ -354,22 +449,13 @@ class CarnetModule extends PLModule 'timestamp' => $date, 'date' => date('Ymd', $date), 'tomorrow' => date('Ymd', $tomorrow), - 'hruid' => $profile->hrid(), + 'email' => $profile->owner()->bestEmail(), 'summary' => 'Anniversaire de ' . $profile->fullName(true) ); } - function handler_csv_birthday(&$page, $alias = null, $hash = null) + function handler_csv_birthday(PlPage $page, PlUser $user) { - $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(); @@ -389,20 +475,11 @@ class CarnetModule extends PLModule } else { $encoding = 'utf-8'; } - pl_content_headers("text/comma-separated-values;charset=".$encoding); + pl_cached_content_headers('text/comma-separated-values; charset=' . $encoding, 1); } - function handler_ical(&$page, $alias = null, $hash = null) + function handler_ical(PlPage $page, PlUser $user) { - $user = Platal::session()->tokenAuth($alias, $hash); - if (is_null($user)) { - if (S::logged()) { - $user == S::user(); - } else { - return PL_FORBIDDEN; - } - } - require_once 'ical.inc.php'; $page->changeTpl('carnet/calendar.tpl', NO_SKIN); $page->register_function('display_ical', 'display_ical'); @@ -411,34 +488,104 @@ class CarnetModule extends PLModule $profiles = $filter->iterProfiles(); $page->assign('events', PlIteratorUtils::map($profiles, array($this, 'buildBirthRef'))); - pl_content_headers("text/calendar"); + pl_cached_content_headers('text/calendar', 1); } - function handler_vcard(&$page, $photos = null) + function handler_vcard($page, $photos = null) { $pf = new ProfileFilter(new UFC_Contact(S::user())); $vcard = new VCard($photos == 'photos'); - $vcard->addProfiles($pf->getProfiles()); + $vcard->addProfiles($pf->getProfiles(null, Profile::FETCH_ALL)); $vcard->show(); } - function handler_csv(&$page, $alias = null, $hash = null) + function handler_csv(PlPage $page, PlUser $user) { - $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'); } + + function handler_batch($page) + { + $page->changeTpl('carnet/batch.tpl'); + $errors = false; + $incomplete = array(); + + if (Post::has('add')) { + S::assert_xsrf_token(); + require_once 'userset.inc.php'; + require_once 'emails.inc.php'; + require_once 'marketing.inc.php'; + + $list = explode("\n", Post::v('list')); + $origin = Post::v('origin'); + + foreach ($list as $item) { + if ($item = trim($item)) { + $elements = preg_split("/\s/", $item); + $email = array_pop($elements); + if (!isvalid_email($email)) { + $page->trigError('Email invalide : ' . $email); + $incomplete[] = $item; + $errors = true; + continue; + } + + $user = User::getSilent($email); + if (is_null($user)) { + $details = implode(' ', $elements); + $promo = trim(array_pop($elements)); + $cond = new PFC_And(); + if (preg_match('/^[MDX]\d{4}$/', $promo)) { + $cond->addChild(new UFC_Promo('=', UserFilter::DISPLAY, $promo)); + } else { + $cond->addChild(new UFC_NameTokens($promo)); + } + foreach ($elements as $element) { + $cond->addChild(new UFC_NameTokens($element)); + } + $uf = new UserFilter($cond); + $count = $uf->getTotalCount(); + if ($count == 0) { + $page->trigError('Les informations : « ' . $item . ' » ne correspondent à aucun camarade.'); + $incomplete[] = $item; + $errors = true; + continue; + } elseif ($count > 1) { + $page->trigError('Les informations : « ' . $item . ' » sont ambigues et correspondent à plusieurs camarades.'); + $incomplete[] = $item; + $errors = true; + continue; + } else { + $user = $uf->getUser(); + } + } + + if ($user->state == 'active') { + $this->addRegistered($page, $user->profile()); + } else { + if (!User::isForeignEmailAddress($email)) { + $page->trigError('Email pas encore attribué : ' . $email); + $incomplete[] = $item; + $errors = true; + } else { + $this->addNonRegistered($page, $user); + if (!Marketing::get($user->id(), $email, true)) { + check_email($email, "Une adresse surveillée est proposée au marketing par " . S::user()->login()); + $market = new Marketing($user->id(), $email, 'default', null, $origin, S::v('uid'), null); + $market->add(); + } + } + } + } + } + } + $page->assign('errors', $errors); + $page->assign('incomplete', $incomplete); + } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?>