projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix networking display on profiles
[platal.git]
/
modules
/
search.php
diff --git
a/modules/search.php
b/modules/search.php
index
7b4b302
..
4386c99
100644
(file)
--- a/
modules/search.php
+++ b/
modules/search.php
@@
-48,10
+48,20
@@
class SearchModule extends PLModule
global $globals;
if (Env::has('quick') || $action == 'geoloc') {
global $globals;
if (Env::has('quick') || $action == 'geoloc') {
- $quick =
trim(Env::t('quick')
);
+ $quick =
Env::t('quick'
);
if (S::logged() && !Env::has('page')) {
S::logger()->log('search', 'quick=' . $quick);
}
if (S::logged() && !Env::has('page')) {
S::logger()->log('search', 'quick=' . $quick);
}
+
+ if ($quick == '') {
+ $page->trigWarning('Aucun critère de recherche n\'est spécifié.');
+ $page->changeTpl('search/index.tpl');
+ $page->setTitle('Annuaire');
+ $page->assign('formulaire', 1);
+ $page->addJsLink('ajax.js');
+ return;
+ }
+
$list = 'profile|prf|fiche|fic|referent|ref|mentor';
if (S::admin()) {
$list .= '|admin|adm|ax';
$list = 'profile|prf|fiche|fic|referent|ref|mentor';
if (S::admin()) {
$list .= '|admin|adm|ax';
@@
-243,6
+253,10
@@
class SearchModule extends PLModule
function handler_list(&$page, $type = null, $idVal = null)
{
function handler_list(&$page, $type = null, $idVal = null)
{
+ $page->assign('name', $type);
+ $page->assign('with_text_value', true);
+ $page->assign('onchange', "document.forms.recherche.{$type}Txt.value = this.options[this.selectedIndex].text");
+
// Give the list of all values possible of type and builds a select input for it
$ids = null;
// Give the list of all values possible of type and builds a select input for it
$ids = null;
@@
-270,9
+284,9
@@
class SearchModule extends PLModule
case 'nationalite':
$ids = DirEnum::getOptionsIter(DirEnum::NATIONALITIES);
break;
case 'nationalite':
$ids = DirEnum::getOptionsIter(DirEnum::NATIONALITIES);
break;
- case 'region':
- if (
$isset($_REQUEST['country']
)) {
- $ids = DirEnum::getOptionsIter(DirEnum::ADMINAREAS,
$_REQUEST['country']
);
+
case 'region':
+ if (
Env::has('country'
)) {
+ $ids = DirEnum::getOptionsIter(DirEnum::ADMINAREAS,
Env::v('country')
);
} else {
$ids = DirEnum::getOptionsIter(DirEnum::ADMINAREAS);
}
} else {
$ids = DirEnum::getOptionsIter(DirEnum::ADMINAREAS);
}
@@
-296,10
+310,7
@@
class SearchModule extends PLModule
}
pl_content_headers("text/xml");
$page->changeTpl('include/field.select.tpl', NO_SKIN);
}
pl_content_headers("text/xml");
$page->changeTpl('include/field.select.tpl', NO_SKIN);
- $page->assign('name', $type);
$page->assign('list', $ids);
$page->assign('list', $ids);
- $page->assign('with_text_value', true);
- $page->assign('onchange', "document.forms.recherche.{$type}Txt.value = this.options[this.selectedIndex].text");
}
}
}
}