X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=0a16d146a1f3e40fe7e86fb42d7896de2e656328;hb=89cb2025f5f2aed0be3994c89ac473aa11535853;hp=635d42e9bf4cbcfc89ba9187901a6daa220f8d9a;hpb=4f247453ac4a734953df893117b72168c60dd22e;p=platal.git
diff --git a/modules/events.php b/modules/events.php
index 635d42e..0a16d14 100644
--- a/modules/events.php
+++ b/modules/events.php
@@ -41,9 +41,9 @@ class EventsModule extends PLModule
global $globals;
// Add a new special tip when changing plat/al version
if ($globals->version != S::v('last_version') && is_null($exclude)) {
- XDB::execute('UPDATE auth_user_quick
+ XDB::execute('UPDATE accounts
SET last_version = {?}
- WHERE user_id = {?}',
+ WHERE uid = {?}',
$globals->version, S::i('uid'));
return array('id' => 0,
'titre' => 'Bienvenue sur la nouvelle version du site !',
@@ -108,29 +108,29 @@ class EventsModule extends PLModule
// Profile update (appears when profile is > 400d old), and birthday
// oneboxes.
- $res = XDB::query(
- "SELECT date < DATE_SUB(NOW(), INTERVAL 400 DAY) AS is_profile_old,
- MONTH(naissance) = MONTH(NOW()) AND DAYOFMONTH(naissance) = DAYOFMONTH(NOW()) AS is_birthday,
- date AS profile_date, YEAR(NOW()) - YEAR(naissance) AS age
- FROM auth_user_md5
- WHERE user_id = {?}", S::user()->id());
- list($is_profile_old, $is_birthday, $profile_date, $age) = $res->fetchOneRow();
-
- if ($is_profile_old) {
- $page->assign('fiche_incitation', $profile_date);
- }
- if ($is_birthday) {
- $page->assign('birthday', $age);
+ $user = S::user();
+ $profile = $user->profile();
+ if (!is_null($profile)) {
+ if (strtotime($profile->last_change) < time() - (400 * 86400)) {
+ $page->assign('fiche_incitation', $profile->last_change);
+ }
+ if ($profile->next_birthday == date('Y-m-d')) {
+ $birthyear = (int)date('Y', strtotime($profile->birthdate));
+ $curyear = (int)date('Y');
+ $page->assign('birthday', $curyear - $birthyear);
+ }
}
// No-photo onebox.
- $res = XDB::query("SELECT COUNT(*) FROM photo WHERE uid = {?}", S::user()->id());
+ $res = XDB::query("SELECT COUNT(*)
+ FROM photo
+ WHERE uid = {?}",
+ S::user()->id());
$page->assign('photo_incitation', $res->fetchOneCell() == 0);
// Geo-location onebox.
- require_once 'geoloc.inc.php';
- $res = localize_addresses(S::user()->id());
- $page->assign('geoloc_incitation', count($res));
+ require_once "geocoding.inc.php";
+ $page->assign('geoloc_incitation', Geocoder::countNonGeocoded(S::user()->id()));
// Direct link to the RSS feed, when available.
if (S::hasAuthToken()) {
@@ -157,30 +157,6 @@ class EventsModule extends PLModule
pl_redirect('events#newsid'.$eid);
}
-
- $uf = new UserFilter(new UFC_And(new UFC_Group('Polytechnique.org'),
- new UFC_Promo('=', UserFilter::GRADE_ING, 2000),
- new UFC_Not(new UFC_Sex(User::GENDER_FEMALE))),
- array(new UFO_Name(UserFilter::LASTNAME),
- new UFO_Name(UserFilter::FIRSTNAME)));
- $users = $uf->getUsers(3);
- foreach ($users as $user) {
- echo $user->fullName() . '
';
- }
- echo '... ' . ($uf->getTotalCount() - 3) . ' others
';
-
- function next_event(PlIterator &$it)
- {
- $user = S::user();
- while ($body = $it->next()) {
- $uf = UserFilter::getLegacy($body['promo_min'], $body['promo_max']);
- if ($uf->checkUser($user)) {
- return $body;
- }
- }
- return null;
- }
-
// Fetch the events to display, along with their metadata.
$array = array();
$it = XDB::iterator("SELECT e.id, e.titre, e.texte, e.post_id, e.user_id,
@@ -196,7 +172,10 @@ class EventsModule extends PLModule
ORDER BY important DESC, news DESC, end DESC, e.peremption, e.creation_date DESC",
S::i('uid'));
$cats = array('important', 'news', 'end', 'body');
- $body = next_event($it);
+
+ $this->load('feed.inc.php');
+ $user = S::user();
+ $body = EventFeed::nextEvent($it, $user);
foreach ($cats as $cat) {
$data = array();
if (!$body) {
@@ -208,7 +187,7 @@ class EventsModule extends PLModule
} else {
break;
}
- $body = next_event($it);
+ $body = EventFeed::nextEvent($it, $user);
} while ($body);
if (!empty($data)) {
$array[$cat] = $data;
@@ -482,16 +461,14 @@ class EventsModule extends PLModule
}
$pid = ($eid && $action == 'preview') ? $eid : -1;
- $sql = "SELECT e.id, e.titre, e.texte,e.id = $pid AS preview,
+ $sql = "SELECT e.id, e.titre, e.texte,e.id = $pid AS preview, e.user_id,
DATE_FORMAT(e.creation_date,'%d/%m/%Y %T') AS creation_date,
DATE_FORMAT(e.peremption,'%d/%m/%Y') AS peremption,
e.promo_min, e.promo_max,
FIND_IN_SET('valide', e.flags) AS fvalide,
FIND_IN_SET('archive', e.flags) AS farch,
- u.promo, u.nom, u.prenom, u.hruid,
FIND_IN_SET('wiki', e.flags) AS wiki
FROM evenements AS e
- INNER JOIN auth_user_md5 AS u ON(e.user_id = u.user_id)
WHERE ".($arch ? "" : "!")."FIND_IN_SET('archive',e.flags)
ORDER BY FIND_IN_SET('valide',e.flags), e.peremption DESC";
$page->assign('evs', XDB::iterator($sql));