Merge pull request #63 from NetCommons3/fix/escape

fix: escape

Author: s-nakajima

.github/workflows/tests.yml

@@ -15,7 +15,7 @@ name: tests
 jobs:
   setup:
     name: setup
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - name: Slack Notification on Start
         uses: rtCamp/action-slack-notify@v2.2.0
@@ -28,7 +28,7 @@ jobs:
   tests:
     name: tests
     needs: setup
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         php: [ '7.1', '7.2', '7.3', '7.4' ]
@@ -92,46 +92,54 @@ jobs:
           docker-compose exec -T nc3app bash /opt/scripts/app-build.sh
 
       - name: phpcs (PHP CodeSniffer)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/phpcs.sh
 
       - name: phpmd (PHP Mess Detector)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/phpmd.sh
 
       - name: phpcpd (PHP Copy/Paste Detector)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/phpcpd.sh
 
       - name: gjslint (JavaScript Style Check)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/gjslint.sh
 
       - name: phpdoc (PHP Documentor)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/phpdoc.sh
 
       - name: phpunit (PHP UnitTest)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/phpunit.sh
           sudo -s chmod a+w -R ${NC3_BUILD_DIR}/build
 
-      - name: push coveralls
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          COVERALLS_FLAG_NAME: ${{ matrix.php }}
-        run: |
-          cd ${NC3_BUILD_DIR}
-          ls -la ${NC3_BUILD_DIR}
-          vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v
+#      - name: push coveralls
+#        if: success()
+#        env:
+#          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#          COVERALLS_FLAG_NAME: ${{ matrix.php }}
+#        run: |
+#          cd ${NC3_BUILD_DIR}
+#          ls -la ${NC3_BUILD_DIR}
+#          vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v
 
       - name: docker-compose remove
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose rm -f
@@ -148,7 +156,7 @@ jobs:
 
   teardown:
     name: teardown
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: tests
     steps:
       # テスト成功時はこちらのステップが実行される

View/Helper/MultidatabaseContentViewElementHelper.php

@@ -161,7 +161,7 @@ private function __renderViewElementFile($content, $colNo, $showCounter = 0) {
 			$result .= '<a href="' . $fileUrl . '" target="_blank">';
 			// 表示が全てダウンロードとなる。ファイル名を表示する
 			//$result .= __d('multidatabases', 'Download');
-			$result .= $fileInfo['UploadFile']['original_name'];
+			$result .= h($fileInfo['UploadFile']['original_name']);
 			$result .= '</a>';
 		} else {
 			$result = $this->__renderViewElementFileReqAuth($content, $colNo, $fileInfo);