projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change sorting order on ML display to use sort_name.
[platal.git]
/
modules
/
gadgets.php
diff --git
a/modules/gadgets.php
b/modules/gadgets.php
index
188dc57
..
a274478
100644
(file)
--- a/
modules/gadgets.php
+++ b/
modules/gadgets.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-201
0
Polytechnique.org *
+ * Copyright (C) 2003-201
4
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-31,25
+31,24
@@
class GadgetsModule extends PLModule
);
}
);
}
- function handler_ig_events_xml(
&
$page)
+ function handler_ig_events_xml($page)
{
require_once 'gadgets/gadgets.inc.php';
init_igoogle_xml('gadgets/ig-events.xml.tpl');
}
{
require_once 'gadgets/gadgets.inc.php';
init_igoogle_xml('gadgets/ig-events.xml.tpl');
}
- function handler_ig_events(
&
$page)
+ function handler_ig_events($page)
{
require_once 'gadgets/gadgets.inc.php';
init_igoogle_html('gadgets/ig-events.tpl', AUTH_COOKIE);
{
require_once 'gadgets/gadgets.inc.php';
init_igoogle_html('gadgets/ig-events.tpl', AUTH_COOKIE);
- $events = XDB::iterator(
'
SELECT SQL_CALC_FOUND_ROWS
+ $events = XDB::iterator(
"
SELECT SQL_CALC_FOUND_ROWS
e.id, e.titre, UNIX_TIMESTAMP(e.creation_date) AS creation_date,
e.id, e.titre, UNIX_TIMESTAMP(e.creation_date) AS creation_date,
- IF(u.nom_usage = "", u.nom, u.nom_usage) AS nom, u.prenom, u.promo,
- ev.user_id IS NULL AS nonlu, e.uid
- FROM announces AS e
+ ev.uid IS NULL AS nonlu, e.uid
+ FROM announces AS e
LEFT JOIN announce_read AS ev ON (e.id = ev.evt_id AND ev.uid = {?})
LEFT JOIN announce_read AS ev ON (e.id = ev.evt_id AND ev.uid = {?})
- WHERE FIND_IN_SET(
"valide"
, e.flags) AND expiration >= NOW()
- ORDER BY e.creation_date DESC
'
, S::i('uid'));
+ WHERE FIND_IN_SET(
'valide'
, e.flags) AND expiration >= NOW()
+ ORDER BY e.creation_date DESC
"
, S::i('uid'));
$page->assign('event_count', XDB::query("SELECT FOUND_ROWS()")->fetchOneCell());
Platal::load('events', 'feed.inc.php');
$page->assign('event_count', XDB::query("SELECT FOUND_ROWS()")->fetchOneCell());
Platal::load('events', 'feed.inc.php');
@@
-64,16
+63,18
@@
class GadgetsModule extends PLModule
$page->assign('events', $data);
}
$page->assign('events', $data);
}
- function handler_ig_search_xml(
&
$page) {
+ function handler_ig_search_xml($page) {
require_once 'gadgets/gadgets.inc.php';
init_igoogle_xml('gadgets/ig-search.xml.tpl');
}
require_once 'gadgets/gadgets.inc.php';
init_igoogle_xml('gadgets/ig-search.xml.tpl');
}
- function handler_ig_search(
&
$page)
+ function handler_ig_search($page)
{
if (Env::has('quick') && Env::s('quick') != '') {
{
if (Env::has('quick') && Env::s('quick') != '') {
+ global $globals;
require_once 'userset.inc.php';
require_once 'userset.inc.php';
- $view = new SearchSet(true);
+
+ $view = new QuickSearchSet();
$view->addMod('gadget', 'Gadget', true);
$view->apply(null, $page);
$view->addMod('gadget', 'Gadget', true);
$view->apply(null, $page);
@@
-86,6
+87,8
@@
class GadgetsModule extends PLModule
$page->assign('error', 'Recherche trop générale.');
} elseif (empty($nb_tot)) {
$page->assign('error', 'Il n\'existe personne correspondant à ces critères dans la base !');
$page->assign('error', 'Recherche trop générale.');
} elseif (empty($nb_tot)) {
$page->assign('error', 'Il n\'existe personne correspondant à ces critères dans la base !');
+ } else {
+ $page->assign('error', false);
}
}
}
}
@@
-94,5
+97,5
@@
class GadgetsModule extends PLModule
}
}
}
}
-// 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
f
enc=utf-8:
?>
?>