);
}
- function on_subscribe($forlife, $uid, $promo, $password)
- {
- require_once 'notifs.inc.php';
- register_watch_op($uid, WATCH_INSCR);
- inscription_notifs_base($uid);
- }
-
function _add_rss_link(&$page)
{
- if (!S::has('core_rss_hash')) {
+ if (!S::hasAuthToken()) {
return;
}
$page->setRssLink('Polytechnique.org :: Carnet',
- '/carnet/rss/'.S::v('forlife') .'/'.S::v('core_rss_hash').'/rss.xml');
+ '/carnet/rss/'.S::v('hruid').'/'.S::v('token').'/rss.xml');
}
function handler_index(&$page)
{
$page->changeTpl('carnet/index.tpl');
- $page->setTitle('Polytechnique.org - Mon carnet');
+ $page->setTitle('Mon carnet');
$this->_add_rss_link($page);
}
$page->assign_by_ref('watch', $watch);
}
- function _get_list($offset, $limit) {
- $uid = S::v('uid');
- $res = XDB::query("SELECT COUNT(*) FROM contacts WHERE uid = {?}", $uid);
- $total = $res->fetchOneCell();
-
- $order = Get::v('order');
- $orders = Array(
- 'nom' => 'nom DESC, u.prenom, u.promo',
- 'promo' => 'promo DESC, nom, u.prenom',
- 'last' => 'u.date DESC, nom, u.prenom, promo');
- if ($order != 'promo' && $order != 'last')
- $order = 'nom';
- $order = $orders[$order];
- if (Get::v('inv') == '')
- $order = str_replace(" DESC,", ",", $order);
-
- $res = XDB::query("
- SELECT u.prenom, IF(u.nom_usage='',u.nom,u.nom_usage) AS nom, a.alias AS forlife, u.promo
- 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 = {?}
- ORDER BY $order
- LIMIT {?}, {?}", $uid, $offset*$limit, $limit);
- $list = $res->fetchAllAssoc();
-
- return Array($total, $list);
- }
-
- function searchErrorHandler($explain) {
- $page =& Platal::page();
- $page->trigError($explain);
- $this->handler_contacts($page);
- }
-
function handler_contacts(&$page, $action = null, $subaction = null, $ssaction = null)
{
- $page->setTitle('Polytechnique.org - Mes contacts');
+ $page->setTitle('Mes contacts');
$this->_add_rss_link($page);
$uid = S::v('uid');
// 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('core_rss_hash')) {
+ if (Env::v('action') && Env::v('token') !== S::v('token')) {
S::assert_xsrf_token();
}
switch (Env::v('action')) {
require_once 'userset.inc.php';
$base = 'carnet/contacts/search';
- require_once(dirname(__FILE__) . '/search/classes.inc.php');
+ 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");
} else {
function handler_pdf(&$page, $arg0 = null, $arg1 = null)
{
- require_once dirname(__FILE__).'/carnet/contacts.pdf.inc.php';
+ $this->load('contacts.pdf.inc.php');
require_once 'user.func.inc.php';
Platal::session()->close();
function handler_rss(&$page, $user = null, $hash = null)
{
- require_once 'rss.inc.php';
- require_once 'notifs.inc.php';
-
- $uid = init_rss('carnet/rss.tpl', $user, $hash);
- $notifs = new Notifs($uid, false);
- $page->assign('notifs', $notifs);
+ $this->load('feed.inc.php');
+ $feed = new CarnetFeed();
+ return $feed->run($page, $user, $hash);
}
function handler_ical(&$page, $alias = null, $hash = null)
{
- require_once 'rss.inc.php';
- $uid = init_rss(null, $alias, $hash, false);
- if (S::logged()) {
- if (!$uid) {
- $uid = S::i('uid');
- } else if ($uid != S::i('uid')) {
- send_warning_email("Récupération d\'un autre utilisateur ($uid)");
+ $user = Platal::session()->tokenAuth($alias, $hash);
+ if (is_null($user)) {
+ if (S::logged()) {
+ $user == S::user();
+ } else {
+ return PL_FORBIDDEN;
}
- } else if (!$uid) {
- exit;
}
+
require_once 'ical.inc.php';
$page->changeTpl('carnet/calendar.tpl', NO_SKIN);
$page->register_function('display_ical', 'display_ical');
u.naissance,
DATE_ADD(u.naissance, INTERVAL 1 DAY) AS end,
u.date_ins,
- a.alias AS forlife
+ 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 = {?}', $uid);
+ WHERE c.uid = {?}', $user->id());
$annivs = Array();
- while (list($prenom, $nom, $promo, $naissance, $end, $ts, $forlife) = $res->next()) {
+ 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,
- 'forlife' => $forlife,
+ 'hruid' => $hruid,
'summary' => 'Anniversaire de '.$prenom
.' '.$nom.' - x '.$promo,
);
$res = XDB::query('SELECT contact
FROM contacts
WHERE uid = {?}', S::v('uid'));
- $vcard = new VCard($res->fetchColumn(), $photos == 'photos');
- $vcard->do_page(&$page);
+ $vcard = new VCard($photos == 'photos');
+ $vcard->addUsers($res->fetchColumn());
+ $vcard->show();
}
}
projects / platal.git / blobdiff