X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fcarnet.php;h=afd1a315d3641d6198adf7f9e0aed5ba40dc7a74;hb=b270577e919c58455a3629a4d9d61bd38ea49e11;hp=8109acbb761171b3d7ca739a14324d1816de4e46;hpb=5b2c99878fc75a6acffb2239e284f2cb1782142c;p=platal.git diff --git a/modules/carnet.php b/modules/carnet.php index 8109acb..afd1a31 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/rss' => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS), ); @@ -79,8 +79,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; @@ -107,7 +107,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(); @@ -255,7 +255,7 @@ class CarnetModule extends PLModule $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. @@ -267,7 +267,7 @@ class CarnetModule extends PLModule if (($user = User::get(Env::v('user')))) { if (XDB::execute("DELETE FROM contacts WHERE uid = {?} AND contact = {?}", $uid, $user->id())) { - $page->trigSuccess("Contact retiré !"); + $page->trigSuccess("Contact retiré !"); } } break; @@ -276,15 +276,18 @@ class CarnetModule extends PLModule if (($user = User::get(Env::v('user')))) { if (XDB::execute("REPLACE INTO contacts (uid, contact) VALUES ({?}, {?})", $uid, $user->id())) { - $page->trigSuccess('Contact ajouté !'); + $page->trigSuccess('Contact ajouté !'); } else { - $page->trigWarning('Contact déjà dans la liste !'); + $page->trigWarning('Contact déjà dans la liste !'); } } break; } -/* $search = false; + $search = false; + + require_once 'userset.inc.php'; + if ($action == 'search') { $action = $subaction; $subaction = $ssaction; @@ -292,21 +295,16 @@ class CarnetModule extends PLModule } if ($search && trim(Env::v('quick'))) { $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)); + } - require_once 'userset.inc.php'; - $user = S::user(); - $view = new UserSet(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')); + // 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'); @@ -316,32 +314,23 @@ class CarnetModule extends PLModule 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(); @@ -355,6 +344,20 @@ 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_ical(&$page, $alias = null, $hash = null) { $user = Platal::session()->tokenAuth($alias, $hash); @@ -370,44 +373,18 @@ 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(); } }