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

Work on search on global site files

Browse Source
This commit is contained in:
Laurent Destailleur 2019-09-02 16:39:56 +02:00
parent ddae5315f1
commit c068177027
3 changed files with 65 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -636,10 +636,11 @@ function getStructuredData($type, $data = array())
}
/**
* 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.
*
* @param string $type Type of container to search into (Example: 'page')
* @param string $algo Algorithm used for search (Example: 'meta' is searching into meta information like title and description, 'metacontent')
* @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 int $max Max number of answers
* @return string HTML content
@ -674,20 +675,21 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25)
}
$searchdone = 0;
$found = 0;
if (! $error && in_array($algo, array('meta', 'metacontent', 'content')))
if (! $error && (empty($max) || ($found < $max)) && (preg_match('/meta/', $algo) || preg_match('/content/', $algo)))
{
$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'website_page';
$sql.= " WHERE fk_website = ".$website->id;
if ($type) $sql.= " AND type_container = '".$db->escape($type)."'";
$sql.= " AND (";
$searchalgo = '';
if ($algo == 'meta' || $algo == 'metacontent')
if (preg_match('/meta/', $algo))
{
$searchalgo.= ($searchalgo?' OR ':'')."title LIKE '%".$db->escape($searchstring)."%' OR description LIKE '%".$db->escape($searchstring)."%'";
$searchalgo.= ($searchalgo?' OR ':'')."keywords LIKE '".$db->escape($searchstring).",%' OR keywords LIKE '% ".$db->escape($searchstring)."%'"; // TODO Use a better way to scan keywords
}
if ($algo == 'metacontent' || $algo == 'content')
if (preg_match('/content/', $algo))
{
$searchalgo.= ($searchalgo?' OR ':'')."content LIKE '%".$db->escape($searchstring)."%'";
}
@ -706,16 +708,10 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25)
$tmpwebsitepage = new WebsitePage($db);
$tmpwebsitepage->fetch($obj->rowid);
if ($tmpwebsitepage->id > 0) $arrayresult['list'][]=$tmpwebsitepage;
$found++;
}
$i++;
}
$arrayresult['code']='OK';
if (empty($arrayresult['list']))
{
$arrayresult['code']='KO';
$arrayresult['message']=$weblangs->trans("NoRecordFound");
}
}
else
{
@ -727,11 +723,61 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25)
$searchdone = 1;
}
if (! $searchdone)
if (! $error && (empty($max) || ($found < $max)) && (preg_match('/sitefiles/', $algo)))
{
$error++;
$arrayresult['code']='KO';
$arrayresult['message']='No supported algorithm found';
$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'website';
$sql.= " WHERE rowid = ".$website->id;
$sql.= " AND (";
$searchalgo = '';
// TODO
$searchalgo.= '...';
$sql.=$searchalgo;
$sql.= ")";
$sql.= $db->plimit($max);
$resql = $db->query($sql);
if ($resql)
{
$i = 0;
while (($obj = $db->fetch_object($resql)) && ($i < $max || $max == 0))
{
if ($obj->rowid > 0)
{
$tmpwebsitepage = new WebsitePage($db);
$tmpwebsitepage->fetch($obj->rowid);
if ($tmpwebsitepage->id > 0) $arrayresult['list'][]=$tmpwebsitepage;
}
$i++;
}
}
else
{
$error++;
$arrayresult['code']=$db->lasterrno();
$arrayresult['message']=$db->lasterror();
}
$searchdone = 1;
}
if (! $error)
{
if ($searchdone)
{
$arrayresult['code']='OK';
if (empty($arrayresult['list']))
{
$arrayresult['code']='KO';
$arrayresult['message']=$weblangs->trans("NoRecordFound");
}
}
else
{
$error++;
$arrayresult['code']='KO';
$arrayresult['message']='No supported algorithm found';
}
}
return $arrayresult;

1
htdocs/langs/en_US/website.lang
View File

@ -116,3 +116,4 @@ Dynamiccontent=Sample of a page with dynamic content
ImportSite=Import site
EditInLineOnOff=Mode 'Edit inline' is %s
ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
GlobalCSSorJS=Global CSS/JS/Header file of web site

2
htdocs/website/index.php
View File

@ -3216,6 +3216,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm')
print '<div class="tagtd">';
print '<input type="checkbox" name="optioncontent" value="content"'.((! GETPOSTISSET('buttonreplacesitesearch') || GETPOST('optioncontent', 'aZ09'))?' checked':'').'> '.$langs->trans("Content");
print '<input type="checkbox" class="marginleftonly" name="optionmeta" value="meta"'.(GETPOST('optionmeta', 'aZ09')?' checked':'').'> '.$langs->trans("Title").' | '.$langs->trans("Description").' | '.$langs->trans("Keywords");
print '<input type="checkbox" class="marginleftonly" name="optionsitefiles" value="sitefiles"'.(GETPOST('optionsitefiles', 'aZ09')?' checked':'').'> '.$langs->trans("GlobalCSSorJS");
print '</div>';
print '</div>';
@ -3239,6 +3240,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm')
$algo = '';
if (GETPOST('optionmeta')) $algo.='meta';
if (GETPOST('optioncontent')) $algo.='content';
if (GETPOST('optionsitefiles')) $algo.='sitefiles';
$listofpages = getPagesFromSearchCriterias('', $algo, GETPOST('searchstring', 'none'), 1000);