X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=9f434cb0a97ae3c173988b9cfe8569eb9fff14dc;hb=22648cc50eaad7a5bac5fac29c8a2258c2917992;hp=b8d1a60cd594d21a374f7ca36f3ea833737c6205;hpb=054c3ffea2af7591c5664e6aba7ba789d3739313;p=platal.git diff --git a/modules/events.php b/modules/events.php index b8d1a60..9f434cb 100644 --- a/modules/events.php +++ b/modules/events.php @@ -104,10 +104,19 @@ class EventsModule extends PLModule { $page->changeTpl('events/index.tpl'); $page->addJsLink('ajax.js'); - $page->assign('tips', $this->get_tips()); - // Adds a reminder onebox to the page. $user = S::user(); + + /** XXX: Tips and reminder only for user with 'email' permission. + * We can do better in the future by storing a userfilter + * with the tip/reminder. + */ + if ($user->checkPerms(User::PERM_MAIL)) { + $page->assign('tips', $this->get_tips()); + + } + + // Adds a reminder onebox to the page. require_once 'reminder.inc.php'; if (($reminder = Reminder::GetCandidateReminder($user))) { $reminder->Prepare($page); @@ -135,8 +144,9 @@ class EventsModule extends PLModule FROM announce_read AS ev INNER JOIN announces AS e ON e.id = ev.evt_id WHERE expiration < NOW()'); - XDB::execute('REPLACE INTO announce_read VALUES({?},{?})', - $eid, S::v('uid')); + XDB::execute('INSERT IGNORE INTO announce_read (evt_id, uid) + VALUES ({?}, {?})', + $eid, S::v('uid')); pl_redirect('events#'.$pound); } @@ -199,7 +209,6 @@ class EventsModule extends PLModule exit; } } elseif ($eid == 'valid') { - require_once 'validations.inc.php'; $valid = Validate::get_request_by_id($valid); if ($valid && $valid->img) { pl_cached_dynamic_content_headers("image/" . $valid->imgtype); @@ -286,7 +295,6 @@ class EventsModule extends PLModule } elseif ($action) { S::assert_xsrf_token(); - require_once 'validations.inc.php'; $evtreq = new EvtReq($titre, $texte, $promo_min, $promo_max, $expiration, $valid_mesg, S::user(), $upload); $evtreq->submit(); @@ -375,9 +383,10 @@ class EventsModule extends PLModule Post::v('promo_min'), Post::v('promo_max'), $flags, $eid); if ($upload->exists() && list($x, $y, $type) = $upload->imageInfo()) { - XDB::execute('REPLACE INTO announce_photos - SET eid = {?}, attachmime = {?}, x = {?}, y = {?}, attach = {?}', - $eid, $type, $x, $y, $upload->getContents()); + XDB::execute('INSERT INTO announce_photos (eid, attachmime, attach, x, y) + VALUES ({?}, {?}, {?}, {?}, {?}) + ON DUPLICATE KEY UPDATE attachmime = VALUES(attachmime), attach = VALUES(attach), x = VALUES(x), y = VALUES(y)', + $eid, $type, $upload->getContents(), $x, $y); $upload->rm(); } }