diff --git a/extension/Resources/Private/Report/searchRefactor.qfqr b/extension/Resources/Private/Report/searchRefactor.qfqr index c9eccd21edcf46817e605c0d177496940fe1247f..b7d0741e7b0c1c063683165f6ace106b35a51510 100644 --- a/extension/Resources/Private/Report/searchRefactor.qfqr +++ b/extension/Resources/Private/Report/searchRefactor.qfqr @@ -28,9 +28,10 @@ form={{form:SE}} 30 { # GET parameter: {{search}} - sql = SELECT REPLACE(REPLACE(TRIM('{{search:CE:allbut}}'), '"', '"'), "'", ''') AS _displaySearch - , TRIM('{{search:CE:allbut}}') AS _search - , TRIM('{{excludedContent:CE:allbut}}') AS _excludedContent + sql = SELECT REPLACE(REPLACE(TRIM('{{search:CE:all:Sm}}'), '"', '"'), "'", ''') AS _displaySearch + , REPLACE(REPLACE(REPLACE(TRIM('{{search:CE:all:Sm}}'), '%', '\%'), '_', '\_'), '/', '\/') AS _prepareFinalSearch + , TRIM('{{search:CE:all:Sm}}') AS _search + , REPLACE(REPLACE(REPLACE(TRIM('{{excludedContent:CE:all:Sm}}'), '%', '\%'), '_', '\_'), '/', '\/') AS _excludedContent , IF('{{checkExactMatch:CE:allbut}}' = 'yes', 'checked', '') AS _checkExactMatchState , IF('{{checkLimit:CE:allbut}}' = 'yes', 'checked', '') AS _checkLimitState , IF('{{checkLimit:CE:allbut}}' = 'yes', 'LIMIT 100', '') AS _queryLimit @@ -56,10 +57,10 @@ form={{form:SE}} </tr> <tr> <td> - <input class='form-control' type='text' id='search' name='search' placeholder='String' value="{{displaySearch:RE:all}}" autofocus='autofocus' style='width:90%;'> + <input class='form-control' type='text' id='search' name='search' placeholder='String' value="{{displaySearch:RE:all:S}}" autofocus='autofocus' style='width:90%;'> </td> <td> - <input class='form-control' type='text' id='excludedContent' name='excludedContent' placeholder='Optional' value='{{excludedContent:RE:alnumx}}' style='width:80%;'> + <input class='form-control' type='text' id='excludedContent' name='excludedContent' placeholder='Optional' value='{{excludedContent:RE:all:Sm}}' style='width:80%;'> <input class='btn btn-default form-control' type='submit' value='Search' style='width:15%;'> </td> </tr> @@ -84,12 +85,12 @@ form={{form:SE}} # Prepare value with or without wildcard and escape underscore character 50 { - sql = SELECT REPLACE(IF('{{checkExactMatchState:RE:alnumx}}' = 'checked', '{{search:RE:allbut}}', CONCAT('%', '{{search:RE:allbut}}', '%')), '_', '\_') AS _finalSearch + sql = SELECT IF('{{checkExactMatchState:RE:alnumx}}' = 'checked', '{{prepareFinalSearch:RE:all:Sm}}', CONCAT('%', '{{prepareFinalSearch:RE:all:Sm}}', '%')) AS _finalSearch } # Check for empty search and first page load 60 { - sql = SELECT '' FROM (SELECT '') AS fake WHERE '{{firstPageLoad:RE:alnumx}}' = 'no' AND '{{search:RE:allbut}}' != '' + sql = SELECT '' FROM (SELECT '') AS fake WHERE '{{firstPageLoad:RE:alnumx}}' = 'no' AND '{{search:RE:all:Sm}}' != '' # Search from checked tables 70 { @@ -102,19 +103,19 @@ form={{form:SE}} , 'ID', 'FormId', 'Name', 'Enabled', 'Class', 'Found' FROM FormElement AS fe - WHERE '{{finalSearch:RE:all}}' <> '' - AND (fe.label LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', fe.label NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR fe.note LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', fe.note NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR fe.value LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', fe.value NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR fe.sql1 LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', fe.sql1 NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR fe.parameter LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', fe.parameter NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR fe.modeSql LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', fe.modeSql NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1)) + WHERE '{{finalSearch:RE:all:Sm}}' <> '' + AND (fe.label LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', fe.label NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR fe.note LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', fe.note NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR fe.value LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', fe.value NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR fe.sql1 LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', fe.sql1 NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR fe.parameter LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', fe.parameter NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR fe.modeSql LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', fe.modeSql NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1)) LIMIT 1 @@ -135,39 +136,39 @@ form={{form:SE}} , fe.enabled , fe.class , CONCAT( - IF(fe.label LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', fe.label NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - , CONCAT('<strong>Label:</strong><br>', QMARK(fe.label, '{{search:RE:allbut}}')), '') - , IF(fe.note LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', fe.note NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - , CONCAT('<strong>Note:</strong><br>', QMARK(fe.note, '{{search:RE:allbut}}')), '') - , IF(fe.value LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', fe.value NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - , CONCAT('<strong>Value:</strong><br>', QMARK(fe.value, '{{search:RE:allbut}}')), '') - , IF(fe.sql1 LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', fe.sql1 NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - , CONCAT('<strong>SQL1:</strong><br>', QMARK(fe.sql1, '{{search:RE:allbut}}')), '') - , IF(fe.parameter LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', fe.parameter NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - , CONCAT('<strong>Parameter:</strong><br>', QMARK(fe.parameter, '{{search:RE:allbut}}')), '') - , IF(fe.modeSql LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', fe.modeSql NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - , CONCAT('<strong>ModeSql:</strong><br>', QMARK(fe.modeSql, '{{search:RE:allbut}}')), '')) + IF(fe.label LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', fe.label NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + , CONCAT('<strong>Label:</strong><br>', QMARK(fe.label, '{{search:RE:all:Sm}}')), '') + , IF(fe.note LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', fe.note NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + , CONCAT('<strong>Note:</strong><br>', QMARK(fe.note, '{{search:RE:all:Sm}}')), '') + , IF(fe.value LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', fe.value NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + , CONCAT('<strong>Value:</strong><br>', QMARK(fe.value, '{{search:RE:all:Sm}}')), '') + , IF(fe.sql1 LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', fe.sql1 NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + , CONCAT('<strong>SQL1:</strong><br>', QMARK(fe.sql1, '{{search:RE:all:Sm}}')), '') + , IF(fe.parameter LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', fe.parameter NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + , CONCAT('<strong>Parameter:</strong><br>', QMARK(fe.parameter, '{{search:RE:all:Sm}}')), '') + , IF(fe.modeSql LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', fe.modeSql NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + , CONCAT('<strong>ModeSql:</strong><br>', QMARK(fe.modeSql, '{{search:RE:all:Sm}}')), '')) FROM FormElement AS fe - WHERE '{{finalSearch:RE:all}}' <> '' - AND (fe.label LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', fe.label NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR fe.note LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', fe.note NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR fe.value LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', fe.value NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR fe.sql1 LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', fe.sql1 NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR fe.parameter LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', fe.parameter NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR fe.modeSql LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', fe.modeSql NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1)) + WHERE '{{finalSearch:RE:all:Sm}}' <> '' + AND (fe.label LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', fe.label NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR fe.note LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', fe.note NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR fe.value LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', fe.value NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR fe.sql1 LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', fe.sql1 NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR fe.parameter LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', fe.parameter NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR fe.modeSql LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', fe.modeSql NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1)) {{queryLimit:RE:alnumx}} @@ -191,15 +192,15 @@ form={{form:SE}} , 'ID', 'Name', 'TableName', 'Found' FROM Form AS f - WHERE '{{finalSearch:RE:all}}' <> '' - AND (f.title LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', f.title NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR f.forwardPage LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', f.forwardPage NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR f.tableName LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', f.tableName NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR f.parameter LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', f.parameter NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1)) + WHERE '{{finalSearch:RE:all:Sm}}' <> '' + AND (f.title LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', f.title NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR f.forwardPage LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', f.forwardPage NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR f.tableName LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', f.tableName NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR f.parameter LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', f.parameter NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1)) LIMIT 1 @@ -215,29 +216,29 @@ form={{form:SE}} , f.id , f.name , f.tableName - , CONCAT(IF(f.title LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', f.title NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - , CONCAT('<strong>Title:</strong><br>', QMARK(f.title, '{{search:RE:allbut}}')),'') - , IF(f.forwardPage LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', f.forwardPage NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - , CONCAT('<strong>Forward Page:</strong><br>', QMARK(f.forwardPage, '{{search:RE:allbut}}')),'') - , IF(f.parameter LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', f.parameter NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - , CONCAT('<strong>Parameter:</strong><br>', QMARK(f.parameter, '{{search:RE:allbut}}')),'') - , IF(f.tableName LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', f.tableName NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - , CONCAT('<strong>TableName:</strong><br>', QMARK(f.tableName, '{{search:RE:allbut}}')),'')) + , CONCAT(IF(f.title LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', f.title NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + , CONCAT('<strong>Title:</strong><br>', QMARK(f.title, '{{search:RE:all:Sm}}')),'') + , IF(f.forwardPage LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', f.forwardPage NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + , CONCAT('<strong>Forward Page:</strong><br>', QMARK(f.forwardPage, '{{search:RE:all:Sm}}')),'') + , IF(f.parameter LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', f.parameter NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + , CONCAT('<strong>Parameter:</strong><br>', QMARK(f.parameter, '{{search:RE:all:Sm}}')),'') + , IF(f.tableName LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', f.tableName NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + , CONCAT('<strong>TableName:</strong><br>', QMARK(f.tableName, '{{search:RE:all:Sm}}')),'')) FROM Form AS f - WHERE '{{finalSearch:RE:all}}' <> '' - AND (f.title LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', f.title NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR f.forwardPage LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', f.forwardPage NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR f.tableName LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', f.tableName NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR f.parameter LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', f.parameter NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1)) + WHERE '{{finalSearch:RE:all:Sm}}' <> '' + AND (f.title LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', f.title NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR f.forwardPage LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', f.forwardPage NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR f.tableName LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', f.tableName NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR f.parameter LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', f.parameter NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1)) {{queryLimit:RE:alnumx}} @@ -262,13 +263,13 @@ form={{form:SE}} FROM {{dbNameT3:Y}}.tt_content AS r - WHERE '{{finalSearch:RE:all}}' != '' - AND (r.bodytext LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' != '', r.bodytext NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR r.header LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' != '', r.header NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR r.subheader LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' != '', r.subheader NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1)) + WHERE '{{finalSearch:RE:all:Sm}}' != '' + AND (r.bodytext LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' != '', r.bodytext NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR r.header LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' != '', r.header NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR r.subheader LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' != '', r.subheader NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1)) LIMIT 1 @@ -286,25 +287,25 @@ form={{form:SE}} , r.header , r.subheader , IF(r.hidden = 0, 'No', 'Yes') - , CONCAT(IF(r.bodytext LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', r.bodytext NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - , CONCAT('<strong>Bodytext:</strong><br>', QMARK(r.bodytext, '{{search:RE:allbut}}')),'') - , IF(r.header LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', r.header NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - , CONCAT('<strong>Header:</strong><br>', QMARK(r.header, '{{search:RE:allbut}}')),'') - , IF(r.subheader LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', r.subheader NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - , CONCAT('<strong>Subheader:</strong><br>', QMARK(r.subheader, '{{search:RE:allbut}}')),'')) + , CONCAT(IF(r.bodytext LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', r.bodytext NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + , CONCAT('<strong>Bodytext:</strong><br>', QMARK(r.bodytext, '{{search:RE:all:Sm}}')),'') + , IF(r.header LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', r.header NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + , CONCAT('<strong>Header:</strong><br>', QMARK(r.header, '{{search:RE:all:Sm}}')),'') + , IF(r.subheader LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', r.subheader NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + , CONCAT('<strong>Subheader:</strong><br>', QMARK(r.subheader, '{{search:RE:all:Sm}}')),'')) FROM {{dbNameT3:Y}}.tt_content AS r - WHERE '{{finalSearch:RE:all}}' != '' - AND (r.bodytext LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' != '', r.bodytext NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR r.header LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' != '', r.header NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR r.subheader LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' != '', r.subheader NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1)) + WHERE '{{finalSearch:RE:all:Sm}}' != '' + AND (r.bodytext LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' != '', r.bodytext NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR r.header LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' != '', r.header NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR r.subheader LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' != '', r.subheader NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1)) AND r.deleted = 0 {{queryLimit:RE:alnumx}} @@ -329,13 +330,13 @@ form={{form:SE}} FROM {{dbNameT3:Y}}.pages AS p - WHERE '{{finalSearch:RE:all}}' != '' - AND (p.title LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' != '', p.title NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR p.subtitle LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' != '', p.subtitle NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR p.{{columnNameAliasSlug:XE}} LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' != '', p.{{columnNameAliasSlug:XE}} NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1)) + WHERE '{{finalSearch:RE:all:Sm}}' != '' + AND (p.title LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' != '', p.title NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR p.subtitle LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' != '', p.subtitle NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR p.{{columnNameAliasSlug:XE}} LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' != '', p.{{columnNameAliasSlug:XE}} NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1)) AND p.deleted = 0 LIMIT 1 @@ -354,26 +355,26 @@ form={{form:SE}} , p.subtitle , p.{{columnNameAliasSlug:XE}} , IF(p.hidden = 0, 'No', 'Yes') - , CONCAT(IF(p.title LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', p.title NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - , CONCAT('<strong>Title:</strong><br>', QMARK(p.title, '{{search:RE:allbut}}')),'') - , IF(p.subtitle LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', p.subtitle NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - , CONCAT('<strong>Subtitle:</strong><br>', QMARK(p.subtitle, '{{search:RE:allbut}}')),'') - , IF(p.{{columnNameAliasSlug:XE}} LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' <> '', p.{{columnNameAliasSlug:XE}} NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - , CONCAT('<strong>Alias:</strong><br>', QMARK(p.{{columnNameAliasSlug:XE}}, '{{search:RE:allbut}}')),'')) + , CONCAT(IF(p.title LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', p.title NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + , CONCAT('<strong>Title:</strong><br>', QMARK(p.title, '{{search:RE:all:Sm}}')),'') + , IF(p.subtitle LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', p.subtitle NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + , CONCAT('<strong>Subtitle:</strong><br>', QMARK(p.subtitle, '{{search:RE:all:Sm}}')),'') + , IF(p.{{columnNameAliasSlug:XE}} LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' <> '', p.{{columnNameAliasSlug:XE}} NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + , CONCAT('<strong>Alias:</strong><br>', QMARK(p.{{columnNameAliasSlug:XE}}, '{{search:RE:all:Sm}}')),'')) , p.uid AS _pageId FROM {{dbNameT3:Y}}.pages AS p - WHERE '{{finalSearch:RE:all}}' != '' - AND (p.title LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' != '', p.title NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR p.subtitle LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' != '', p.subtitle NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1) - OR p.{{columnNameAliasSlug:XE}} LIKE '{{finalSearch:RE:all}}' - AND IF('{{excludedContent:RE:alnumx}}' != '', p.{{columnNameAliasSlug:XE}} NOT LIKE CONCAT('%', '{{excludedContent:RE:alnumx}}', '%'), 1=1)) + WHERE '{{finalSearch:RE:all:Sm}}' != '' + AND (p.title LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' != '', p.title NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR p.subtitle LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' != '', p.subtitle NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1) + OR p.{{columnNameAliasSlug:XE}} LIKE '{{finalSearch:RE:all:Sm}}' + AND IF('{{excludedContent:RE:all:Sm}}' != '', p.{{columnNameAliasSlug:XE}} NOT LIKE CONCAT('%', '{{excludedContent:RE:all:Sm}}', '%'), 1=1)) AND p.deleted = 0 {{queryLimit:RE:alnumx}}