adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-08 01:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

- back to revision 1.63 + add author in fields list for allwords search

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@710 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2005-01-19 23:52:59 +00:00
parent da60b94ca0
commit 351aae658f
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_category.inc.php
+10 -8
View File
@@ -425,25 +425,27 @@ function initialize_category( $calling_page = 'category' )
// construction
$clauses = array();
// Author Search
if (isset($search['fields']['author']))
$textfields = array('file', 'name', 'comment', 'keywords', 'author');
foreach ($textfields as $textfield)
{
if (isset($search['fields'][$textfield]))
{
$local_clauses = array();
foreach ($search['fields']['author']['words'] as $word)
foreach ($search['fields'][$textfield]['words'] as $word)
{
array_push($local_clauses, "author LIKE '%".$word."%'");
array_push($local_clauses, $textfield." LIKE '%".$word."%'");
}
// adds brackets around where clauses
array_walk($local_clauses,create_function('&$s','$s="(".$s.")";'));
array_push($clauses,
implode(' '.$search['fields']['author']['mode'].' ',
implode(' '.$search['fields'][$textfield]['mode'].' ',
$local_clauses));
}
}
// All words search (author included)
if (isset($search['fields']['allwords']))
{
$textfields = array('file', 'name', 'comment', 'keywords', 'author');
$fields = array('file', 'name', 'comment', 'keywords', 'author');
// in the OR mode, request bust be :
// ((field1 LIKE '%word1%' OR field2 LIKE '%word1%')
// OR (field1 LIKE '%word2%' OR field2 LIKE '%word2%'))
@@ -455,7 +457,7 @@ function initialize_category( $calling_page = 'category' )
foreach ($search['fields']['allwords']['words'] as $word)
{
$field_clauses = array();
foreach ($textfields as $field)
foreach ($fields as $field)
{
array_push($field_clauses, $field." LIKE '%".$word."%'");
}