From 8363b1a50e7e64505ebdac7663ea85c6b6f81b7b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 14 Apr 2020 00:03:13 +0200 Subject: [PATCH] fix search --- htdocs/website/index.php | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/htdocs/website/index.php b/htdocs/website/index.php index 98fd0f43daf..e143795acd7 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -3554,20 +3554,6 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction = print ''."\n"; print '
'; - /*if ($action == 'replacesiteconfirm') - { - print '
'; - print '
'; - print $langs->trans("ReplaceString"); - print '
'; - print '
'; - print ''; - print ''; - print '
'; - print '
'; - print '
'; - }*/ - $param = 'action=replacesiteconfirm&website='.urlencode($website->ref); $param .= '&searchstring='.urlencode($searchkey); if (GETPOST('optioncontent')) $param .= '&optioncontent=content'; @@ -3589,9 +3575,11 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction = if (get_class($answerrecord) == 'WebsitePage') { print ''; + print ''.$langs->trans("Container").' - '; print $langs->trans($answerrecord->type_container); // TODO Use label of container print ''; + print ''; print $answerrecord->getNomUrl(1); print ' ('.($answerrecord->title ? $answerrecord->title : $langs->trans("NoTitle")).')'; @@ -3600,6 +3588,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction = print '
'; print ''.$answerrecord->description.''; print ''; + print ''; $param = '?action=replacesiteconfirm'; $param .= '&websiteid='.$website->id; @@ -3631,8 +3620,8 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction = else { print ''; - print ''; + print ''; $translateofrecordtype = array( 'website_csscontent'=>'WEBSITE_CSS_INLINE', 'website_jscontent'=>'WEBSITE_JS_INLINE', @@ -3648,13 +3637,14 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction = print $answerrecord['type']; } print ''; + print ''; $backtopageurl = $_SERVER["PHP_SELF"].'?action=replacesiteconfirm&searchstring='.urlencode($searchkey).'&optioncontent='.GETPOST('optioncontent', 'aZ09').'&optionmeta='.GETPOST('optionmeta', 'aZ09').'&optionsitefiles='.GETPOST('optionsitefiles', 'aZ09'); print 'ref.'&backtopage='.urlencode($backtopageurl).'">'.$langs->trans("EditCss").''; print ''; + print ''; print ''; - print ''; // Action column print '';