Merge remote-tracking branch 'origin/V4.0' into V5

Author: sanluan

publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/base/AbstractCkEditorController.java

@@ -45,8 +45,8 @@ public class AbstractCkEditorController {
     private static final String RESULT_FILENAME = "fileName";
     private static final String RESULT_URL = "url";
 
-    protected Map<String, Object> upload(SysSite site, SysUser user, MultipartFile upload, String ckCsrfToken, String channel,
-            String csrfToken, HttpServletRequest request) {
+    protected Map<String, Object> upload(SysSite site, SysUser user, MultipartFile upload, String ckCsrfToken, 
+            String csrfToken, String channel, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         int uploaded = 0;
         if (null != upload && !upload.isEmpty() && csrfToken.equals(ckCsrfToken)) {

publiccms-parent/publiccms-core/src/main/java/com/publiccms/logic/component/site/SiteComponent.java

@@ -371,7 +371,7 @@ public String getWebBackupFilePath(short siteId, String filepath) {
      * @return site file path
      */
     public String getSiteFilePath(String path) {
-        return CommonUtils.joinString(rootPath, BACKUP_PATH, Constants.SEPARATOR, SITE_FILE_PATH, Constants.SEPARATOR, path);
+        return CommonUtils.joinString(rootPath, BACKUP_PATH, Constants.SEPARATOR, SITE_FILE_PATH, Constants.SEPARATOR, CmsFileUtils.getSafeFileName(path));
     }
 
     /**

publiccms-parent/publiccms-core/src/main/java/com/publiccms/logic/dao/cms/CmsContentSearchDao.java

@@ -140,20 +140,22 @@ public FacetPageHandler facetQuery(CmsContentSearchQuery queryEntity, String ord
     }
 
     private void initHighLighterQuery(HighLighterQuery highLighterQuery, String text) {
-        if (highLighterQuery.isHighlight() && CommonUtils.notEmpty(text)) {
+        if (highLighterQuery.isHighlight()) {
             highLighterQuery.setFields(highLighterTextFields);
-            Backend backend = dao.getSearchBackend();
-            Optional<? extends Analyzer> analyzer;
-            if (backend instanceof LuceneBackend) {
-                analyzer = backend.unwrap(LuceneBackend.class).analyzer(CmsContentAttributeBinder.ANALYZER_NAME);
-            } else {
-                analyzer = Optional.of(new StandardAnalyzer());
-            }
-            if (analyzer.isPresent()) {
-                MultiFieldQueryParser queryParser = new MultiFieldQueryParser(highLighterTextFields, analyzer.get());
-                try {
-                    highLighterQuery.setQuery(queryParser.parse(text));
-                } catch (ParseException e) {
+            if (CommonUtils.notEmpty(text)) {
+                Backend backend = dao.getSearchBackend();
+                Optional<? extends Analyzer> analyzer;
+                if (backend instanceof LuceneBackend) {
+                    analyzer = backend.unwrap(LuceneBackend.class).analyzer(CmsContentAttributeBinder.ANALYZER_NAME);
+                } else {
+                    analyzer = Optional.of(new StandardAnalyzer());
+                }
+                if (analyzer.isPresent()) {
+                    MultiFieldQueryParser queryParser = new MultiFieldQueryParser(highLighterTextFields, analyzer.get());
+                    try {
+                        highLighterQuery.setQuery(queryParser.parse(text));
+                    } catch (ParseException e) {
+                    }
                 }
             }
         }