Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Antoine
ae2
Commits
58c7b39b
Commit
58c7b39b
authored
Nov 14, 2014
by
Root
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update fsearch
parent
4fd248a6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
include/cts/fsearch.inc.php
include/cts/fsearch.inc.php
+8
-7
No files found.
include/cts/fsearch.inc.php
View file @
58c7b39b
...
...
@@ -110,10 +110,17 @@ class fsearch extends stdcontents
'WHERE (CONCAT(prenom_utl,\' \',nom_utl) REGEXP \'^'
.
$sqlpattern
.
'\' '
.
$force_sql
.
') OR '
.
'(CONCAT(nom_utl,\' \',prenom_utl) REGEXP \'^'
.
$sqlpattern
.
'\' '
.
$force_sql
.
') OR '
.
'(surnom_utbm!=\'\' AND surnom_utbm REGEXP \'^'
.
$sqlpattern
.
'\' '
.
$force_sql
.
') LIMIT 1'
);
if
(
$req
->
lines
>
0
)
{
$req
=
new
requete
(
$site
->
db
,
'SELECT CONCAT(prenom_utl,\' \',nom_utl),\'1\' as method, utilisateurs.*'
.
'SELECT surnom_utbm, \'4\' as method, utilisateurs.*'
.
' FROM utl_etu_utbm'
.
' INNER JOIN utilisateurs USING (id_utilisateur)'
.
' LEFT JOIN utl_etu USING ( id_utilisateur )'
.
' WHERE surnom_utbm!=\'\' AND surnom_utbm REGEXP \'^'
.
$sqlpattern
.
'\''
.
' AND CONCAT(prenom_utl,\' \',nom_utl) NOT REGEXP \'^'
.
$sqlpattern
.
'\' '
.
$force_sql
.
' UNION DISTINCT SELECT CONCAT(prenom_utl,\' \',nom_utl),\'1\' as method, utilisateurs.*'
.
' FROM utilisateurs'
.
' LEFT JOIN utl_etu USING ( id_utilisateur )'
.
' WHERE CONCAT(prenom_utl,\' \',nom_utl) REGEXP \'^'
.
$sqlpattern
.
'\' '
.
$force_sql
.
...
...
@@ -121,12 +128,6 @@ class fsearch extends stdcontents
' FROM utilisateurs'
.
' LEFT JOIN utl_etu USING ( id_utilisateur )'
.
' WHERE CONCAT(nom_utl,\' \',prenom_utl) REGEXP \'^'
.
$sqlpattern
.
'\' '
.
$force_sql
.
' UNION DISTINCT SELECT surnom_utbm, \'4\' as method, utilisateurs.*'
.
' FROM utl_etu_utbm'
.
' INNER JOIN utilisateurs USING (id_utilisateur)'
.
' LEFT JOIN utl_etu USING ( id_utilisateur )'
.
' WHERE surnom_utbm!=\'\' AND surnom_utbm REGEXP \'^'
.
$sqlpattern
.
'\''
.
' AND CONCAT(prenom_utl,\' \',nom_utl) NOT REGEXP \'^'
.
$sqlpattern
.
'\' '
.
$force_sql
.
' LIMIT 3'
);
$this
->
buffer
.
=
"<h2>Personnes</h2>"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment