lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Can search in several different type of containers

Browse Source
This commit is contained in:
Laurent Destailleur 2020-03-21 19:09:14 +01:00
parent 83b8497d28
commit 792b9228d3
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/core/lib/website.lib.php
View File

@ -709,7 +709,7 @@ function getSocialNetworkSharingLinks()
* Return list of containers object that match a criteria. * Return list of containers object that match a criteria.
* WARNING: This function can be used by websites. * WARNING: This function can be used by websites.
* *
* @param string $type Type of container to search into (Example: 'page') * @param string $type Type of container to search into (Example: '', 'page', 'blogpost', 'page,blogpost', ...)
* @param string $algo Algorithm used for search (Example: 'meta' is searching into meta information like title and description, 'content', 'sitefiles', or any combination, ...) * @param string $algo Algorithm used for search (Example: 'meta' is searching into meta information like title and description, 'content', 'sitefiles', or any combination, ...)
* @param string $searchstring Search string * @param string $searchstring Search string
* @param int $max Max number of answers * @param int $max Max number of answers
@ -737,11 +737,17 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25)
$arrayresult['code'] = 'KO'; $arrayresult['code'] = 'KO';
$arrayresult['message'] = $weblangs->trans("ErrorSearchCriteriaTooSmall"); $arrayresult['message'] = $weblangs->trans("ErrorSearchCriteriaTooSmall");
} }
elseif (!in_array($type, array('', 'page'))) else
{ {
$tmparrayoftype = explode(',', $type);
foreach($tmparrayoftype as $tmptype) {
if (!in_array($tmptype, array('', 'page', 'blogpost'))) {
$error++; $error++;
$arrayresult['code'] = 'KO'; $arrayresult['code'] = 'KO';
$arrayresult['message'] = 'Bad value for parameter $type'; $arrayresult['message'] = 'Bad value for parameter type';
break;
}
}
} }
$searchdone = 0; $searchdone = 0;
@ -751,7 +757,14 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25)
{ {
$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'website_page'; $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'website_page';
$sql .= " WHERE fk_website = ".$website->id; $sql .= " WHERE fk_website = ".$website->id;
if ($type) $sql .= " AND type_container = '".$db->escape($type)."'"; if ($type) {
$tmparrayoftype = explode(',', $type);
$typestring = '';
foreach($tmparrayoftype as $tmptype) {
$typestring .= ($typestring ? ", ": "")."'".trim($tmptype)."'";
}
$sql .= " AND type_container IN (".$typestring.")";
}
$sql .= " AND ("; $sql .= " AND (";
$searchalgo = ''; $searchalgo = '';
if (preg_match('/meta/', $algo)) if (preg_match('/meta/', $algo))