From befe84f21ba2c46af273d2d8dab16a7caf2dd957 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Wed, 29 Jun 2016 19:19:06 +0900 Subject: [PATCH 1/5] Replace all symlinks with actual empty files --- modules/admin/tpl/css/admin.min.css | 2 +- modules/admin/tpl/js/admin.min.js | 2 +- modules/admin/tpl/js/config.min.js | 2 +- modules/admin/tpl/js/menu_setup.min.js | 2 +- modules/board/m.skins/default/css/mboard.min.css | 2 +- modules/board/m.skins/default/js/mboard.min.js | 2 +- modules/board/m.skins/simpleGray/css/mboard.min.css | 2 +- modules/board/m.skins/simpleGray/js/mboard.min.js | 2 +- modules/board/skins/default/board.default.min.css | 2 +- modules/board/skins/default/board.default.min.js | 2 +- modules/board/skins/xedition/board.default.min.css | 2 +- modules/board/skins/xedition/board.default.min.js | 2 +- modules/board/tpl/js/board.min.js | 2 +- modules/board/tpl/js/board_admin.min.js | 2 +- modules/editor/skins/ckeditor/js/default.min.js | 2 +- modules/editor/skins/ckeditor/js/xe_interface.min.js | 2 +- modules/editor/skins/ckeditor/js/xe_textarea.min.js | 2 +- modules/editor/skins/xpresseditor/css/default.min.css | 2 +- modules/editor/skins/xpresseditor/js/xe_textarea.min.js | 2 +- modules/editor/skins/xpresseditor/js/xpresseditor.min.js | 2 +- modules/editor/tpl/js/editor.app.min.js | 2 +- modules/editor/tpl/js/editor.min.js | 2 +- modules/editor/tpl/js/editor_common.min.js | 2 +- modules/editor/tpl/js/editor_module_config.min.js | 2 +- modules/editor/tpl/js/swfupload.min.js | 2 +- modules/editor/tpl/js/uploader.min.js | 2 +- modules/widget/tpl/css/widget.min.css | 2 +- modules/widget/tpl/js/generate_code.min.js | 2 +- modules/widget/tpl/js/widget.min.js | 2 +- modules/widget/tpl/js/widget_admin.min.js | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) mode change 120000 => 100644 modules/admin/tpl/css/admin.min.css mode change 120000 => 100644 modules/admin/tpl/js/admin.min.js mode change 120000 => 100644 modules/admin/tpl/js/config.min.js mode change 120000 => 100644 modules/admin/tpl/js/menu_setup.min.js mode change 120000 => 100644 modules/board/m.skins/default/css/mboard.min.css mode change 120000 => 100644 modules/board/m.skins/default/js/mboard.min.js mode change 120000 => 100644 modules/board/m.skins/simpleGray/css/mboard.min.css mode change 120000 => 100644 modules/board/m.skins/simpleGray/js/mboard.min.js mode change 120000 => 100644 modules/board/skins/default/board.default.min.css mode change 120000 => 100644 modules/board/skins/default/board.default.min.js mode change 120000 => 100644 modules/board/skins/xedition/board.default.min.css mode change 120000 => 100644 modules/board/skins/xedition/board.default.min.js mode change 120000 => 100644 modules/board/tpl/js/board.min.js mode change 120000 => 100644 modules/board/tpl/js/board_admin.min.js mode change 120000 => 100644 modules/editor/skins/ckeditor/js/default.min.js mode change 120000 => 100644 modules/editor/skins/ckeditor/js/xe_interface.min.js mode change 120000 => 100644 modules/editor/skins/ckeditor/js/xe_textarea.min.js mode change 120000 => 100644 modules/editor/skins/xpresseditor/css/default.min.css mode change 120000 => 100644 modules/editor/skins/xpresseditor/js/xe_textarea.min.js mode change 120000 => 100644 modules/editor/skins/xpresseditor/js/xpresseditor.min.js mode change 120000 => 100644 modules/editor/tpl/js/editor.app.min.js mode change 120000 => 100644 modules/editor/tpl/js/editor.min.js mode change 120000 => 100644 modules/editor/tpl/js/editor_common.min.js mode change 120000 => 100644 modules/editor/tpl/js/editor_module_config.min.js mode change 120000 => 100644 modules/editor/tpl/js/swfupload.min.js mode change 120000 => 100644 modules/editor/tpl/js/uploader.min.js mode change 120000 => 100644 modules/widget/tpl/css/widget.min.css mode change 120000 => 100644 modules/widget/tpl/js/generate_code.min.js mode change 120000 => 100644 modules/widget/tpl/js/widget.min.js mode change 120000 => 100644 modules/widget/tpl/js/widget_admin.min.js diff --git a/modules/admin/tpl/css/admin.min.css b/modules/admin/tpl/css/admin.min.css deleted file mode 120000 index f33959b31..000000000 --- a/modules/admin/tpl/css/admin.min.css +++ /dev/null @@ -1 +0,0 @@ -admin.css \ No newline at end of file diff --git a/modules/admin/tpl/css/admin.min.css b/modules/admin/tpl/css/admin.min.css new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/admin/tpl/css/admin.min.css @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/admin/tpl/js/admin.min.js b/modules/admin/tpl/js/admin.min.js deleted file mode 120000 index 3af4da56d..000000000 --- a/modules/admin/tpl/js/admin.min.js +++ /dev/null @@ -1 +0,0 @@ -admin.js \ No newline at end of file diff --git a/modules/admin/tpl/js/admin.min.js b/modules/admin/tpl/js/admin.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/admin/tpl/js/admin.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/admin/tpl/js/config.min.js b/modules/admin/tpl/js/config.min.js deleted file mode 120000 index a2d72a240..000000000 --- a/modules/admin/tpl/js/config.min.js +++ /dev/null @@ -1 +0,0 @@ -config.js \ No newline at end of file diff --git a/modules/admin/tpl/js/config.min.js b/modules/admin/tpl/js/config.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/admin/tpl/js/config.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/admin/tpl/js/menu_setup.min.js b/modules/admin/tpl/js/menu_setup.min.js deleted file mode 120000 index 96e51c1e4..000000000 --- a/modules/admin/tpl/js/menu_setup.min.js +++ /dev/null @@ -1 +0,0 @@ -menu_setup.js \ No newline at end of file diff --git a/modules/admin/tpl/js/menu_setup.min.js b/modules/admin/tpl/js/menu_setup.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/admin/tpl/js/menu_setup.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/board/m.skins/default/css/mboard.min.css b/modules/board/m.skins/default/css/mboard.min.css deleted file mode 120000 index 95059eb90..000000000 --- a/modules/board/m.skins/default/css/mboard.min.css +++ /dev/null @@ -1 +0,0 @@ -mboard.css \ No newline at end of file diff --git a/modules/board/m.skins/default/css/mboard.min.css b/modules/board/m.skins/default/css/mboard.min.css new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/board/m.skins/default/css/mboard.min.css @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/board/m.skins/default/js/mboard.min.js b/modules/board/m.skins/default/js/mboard.min.js deleted file mode 120000 index 17941c710..000000000 --- a/modules/board/m.skins/default/js/mboard.min.js +++ /dev/null @@ -1 +0,0 @@ -mboard.js \ No newline at end of file diff --git a/modules/board/m.skins/default/js/mboard.min.js b/modules/board/m.skins/default/js/mboard.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/board/m.skins/default/js/mboard.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/board/m.skins/simpleGray/css/mboard.min.css b/modules/board/m.skins/simpleGray/css/mboard.min.css deleted file mode 120000 index 95059eb90..000000000 --- a/modules/board/m.skins/simpleGray/css/mboard.min.css +++ /dev/null @@ -1 +0,0 @@ -mboard.css \ No newline at end of file diff --git a/modules/board/m.skins/simpleGray/css/mboard.min.css b/modules/board/m.skins/simpleGray/css/mboard.min.css new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/board/m.skins/simpleGray/css/mboard.min.css @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/board/m.skins/simpleGray/js/mboard.min.js b/modules/board/m.skins/simpleGray/js/mboard.min.js deleted file mode 120000 index 17941c710..000000000 --- a/modules/board/m.skins/simpleGray/js/mboard.min.js +++ /dev/null @@ -1 +0,0 @@ -mboard.js \ No newline at end of file diff --git a/modules/board/m.skins/simpleGray/js/mboard.min.js b/modules/board/m.skins/simpleGray/js/mboard.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/board/m.skins/simpleGray/js/mboard.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/board/skins/default/board.default.min.css b/modules/board/skins/default/board.default.min.css deleted file mode 120000 index 86f375577..000000000 --- a/modules/board/skins/default/board.default.min.css +++ /dev/null @@ -1 +0,0 @@ -board.default.css \ No newline at end of file diff --git a/modules/board/skins/default/board.default.min.css b/modules/board/skins/default/board.default.min.css new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/board/skins/default/board.default.min.css @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/board/skins/default/board.default.min.js b/modules/board/skins/default/board.default.min.js deleted file mode 120000 index 6daf7cb73..000000000 --- a/modules/board/skins/default/board.default.min.js +++ /dev/null @@ -1 +0,0 @@ -board.default.js \ No newline at end of file diff --git a/modules/board/skins/default/board.default.min.js b/modules/board/skins/default/board.default.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/board/skins/default/board.default.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/board/skins/xedition/board.default.min.css b/modules/board/skins/xedition/board.default.min.css deleted file mode 120000 index 86f375577..000000000 --- a/modules/board/skins/xedition/board.default.min.css +++ /dev/null @@ -1 +0,0 @@ -board.default.css \ No newline at end of file diff --git a/modules/board/skins/xedition/board.default.min.css b/modules/board/skins/xedition/board.default.min.css new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/board/skins/xedition/board.default.min.css @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/board/skins/xedition/board.default.min.js b/modules/board/skins/xedition/board.default.min.js deleted file mode 120000 index 6daf7cb73..000000000 --- a/modules/board/skins/xedition/board.default.min.js +++ /dev/null @@ -1 +0,0 @@ -board.default.js \ No newline at end of file diff --git a/modules/board/skins/xedition/board.default.min.js b/modules/board/skins/xedition/board.default.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/board/skins/xedition/board.default.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/board/tpl/js/board.min.js b/modules/board/tpl/js/board.min.js deleted file mode 120000 index 15e20460d..000000000 --- a/modules/board/tpl/js/board.min.js +++ /dev/null @@ -1 +0,0 @@ -board.js \ No newline at end of file diff --git a/modules/board/tpl/js/board.min.js b/modules/board/tpl/js/board.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/board/tpl/js/board.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/board/tpl/js/board_admin.min.js b/modules/board/tpl/js/board_admin.min.js deleted file mode 120000 index e0588aa3a..000000000 --- a/modules/board/tpl/js/board_admin.min.js +++ /dev/null @@ -1 +0,0 @@ -board_admin.js \ No newline at end of file diff --git a/modules/board/tpl/js/board_admin.min.js b/modules/board/tpl/js/board_admin.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/board/tpl/js/board_admin.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/editor/skins/ckeditor/js/default.min.js b/modules/editor/skins/ckeditor/js/default.min.js deleted file mode 120000 index a6e0200ab..000000000 --- a/modules/editor/skins/ckeditor/js/default.min.js +++ /dev/null @@ -1 +0,0 @@ -default.js \ No newline at end of file diff --git a/modules/editor/skins/ckeditor/js/default.min.js b/modules/editor/skins/ckeditor/js/default.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/editor/skins/ckeditor/js/default.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/editor/skins/ckeditor/js/xe_interface.min.js b/modules/editor/skins/ckeditor/js/xe_interface.min.js deleted file mode 120000 index 81b8653bf..000000000 --- a/modules/editor/skins/ckeditor/js/xe_interface.min.js +++ /dev/null @@ -1 +0,0 @@ -xe_interface.js \ No newline at end of file diff --git a/modules/editor/skins/ckeditor/js/xe_interface.min.js b/modules/editor/skins/ckeditor/js/xe_interface.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/editor/skins/ckeditor/js/xe_interface.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/editor/skins/ckeditor/js/xe_textarea.min.js b/modules/editor/skins/ckeditor/js/xe_textarea.min.js deleted file mode 120000 index be4ba54fc..000000000 --- a/modules/editor/skins/ckeditor/js/xe_textarea.min.js +++ /dev/null @@ -1 +0,0 @@ -xe_textarea.js \ No newline at end of file diff --git a/modules/editor/skins/ckeditor/js/xe_textarea.min.js b/modules/editor/skins/ckeditor/js/xe_textarea.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/editor/skins/ckeditor/js/xe_textarea.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/editor/skins/xpresseditor/css/default.min.css b/modules/editor/skins/xpresseditor/css/default.min.css deleted file mode 120000 index 3eb503bbb..000000000 --- a/modules/editor/skins/xpresseditor/css/default.min.css +++ /dev/null @@ -1 +0,0 @@ -default.css \ No newline at end of file diff --git a/modules/editor/skins/xpresseditor/css/default.min.css b/modules/editor/skins/xpresseditor/css/default.min.css new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/editor/skins/xpresseditor/css/default.min.css @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/editor/skins/xpresseditor/js/xe_textarea.min.js b/modules/editor/skins/xpresseditor/js/xe_textarea.min.js deleted file mode 120000 index be4ba54fc..000000000 --- a/modules/editor/skins/xpresseditor/js/xe_textarea.min.js +++ /dev/null @@ -1 +0,0 @@ -xe_textarea.js \ No newline at end of file diff --git a/modules/editor/skins/xpresseditor/js/xe_textarea.min.js b/modules/editor/skins/xpresseditor/js/xe_textarea.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/editor/skins/xpresseditor/js/xe_textarea.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/editor/skins/xpresseditor/js/xpresseditor.min.js b/modules/editor/skins/xpresseditor/js/xpresseditor.min.js deleted file mode 120000 index 723921ac9..000000000 --- a/modules/editor/skins/xpresseditor/js/xpresseditor.min.js +++ /dev/null @@ -1 +0,0 @@ -xpresseditor.js \ No newline at end of file diff --git a/modules/editor/skins/xpresseditor/js/xpresseditor.min.js b/modules/editor/skins/xpresseditor/js/xpresseditor.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/editor/skins/xpresseditor/js/xpresseditor.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/editor/tpl/js/editor.app.min.js b/modules/editor/tpl/js/editor.app.min.js deleted file mode 120000 index 7738d04fc..000000000 --- a/modules/editor/tpl/js/editor.app.min.js +++ /dev/null @@ -1 +0,0 @@ -editor.app.js \ No newline at end of file diff --git a/modules/editor/tpl/js/editor.app.min.js b/modules/editor/tpl/js/editor.app.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/editor/tpl/js/editor.app.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/editor/tpl/js/editor.min.js b/modules/editor/tpl/js/editor.min.js deleted file mode 120000 index 5cbc0ea2f..000000000 --- a/modules/editor/tpl/js/editor.min.js +++ /dev/null @@ -1 +0,0 @@ -editor.js \ No newline at end of file diff --git a/modules/editor/tpl/js/editor.min.js b/modules/editor/tpl/js/editor.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/editor/tpl/js/editor.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/editor/tpl/js/editor_common.min.js b/modules/editor/tpl/js/editor_common.min.js deleted file mode 120000 index 2aa89699c..000000000 --- a/modules/editor/tpl/js/editor_common.min.js +++ /dev/null @@ -1 +0,0 @@ -editor_common.js \ No newline at end of file diff --git a/modules/editor/tpl/js/editor_common.min.js b/modules/editor/tpl/js/editor_common.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/editor/tpl/js/editor_common.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/editor/tpl/js/editor_module_config.min.js b/modules/editor/tpl/js/editor_module_config.min.js deleted file mode 120000 index aaeefa74d..000000000 --- a/modules/editor/tpl/js/editor_module_config.min.js +++ /dev/null @@ -1 +0,0 @@ -editor_module_config.js \ No newline at end of file diff --git a/modules/editor/tpl/js/editor_module_config.min.js b/modules/editor/tpl/js/editor_module_config.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/editor/tpl/js/editor_module_config.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/editor/tpl/js/swfupload.min.js b/modules/editor/tpl/js/swfupload.min.js deleted file mode 120000 index b44431e5d..000000000 --- a/modules/editor/tpl/js/swfupload.min.js +++ /dev/null @@ -1 +0,0 @@ -swfupload.js \ No newline at end of file diff --git a/modules/editor/tpl/js/swfupload.min.js b/modules/editor/tpl/js/swfupload.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/editor/tpl/js/swfupload.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/editor/tpl/js/uploader.min.js b/modules/editor/tpl/js/uploader.min.js deleted file mode 120000 index 908e505f1..000000000 --- a/modules/editor/tpl/js/uploader.min.js +++ /dev/null @@ -1 +0,0 @@ -uploader.js \ No newline at end of file diff --git a/modules/editor/tpl/js/uploader.min.js b/modules/editor/tpl/js/uploader.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/editor/tpl/js/uploader.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/widget/tpl/css/widget.min.css b/modules/widget/tpl/css/widget.min.css deleted file mode 120000 index 010c2858c..000000000 --- a/modules/widget/tpl/css/widget.min.css +++ /dev/null @@ -1 +0,0 @@ -widget.css \ No newline at end of file diff --git a/modules/widget/tpl/css/widget.min.css b/modules/widget/tpl/css/widget.min.css new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/widget/tpl/css/widget.min.css @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/widget/tpl/js/generate_code.min.js b/modules/widget/tpl/js/generate_code.min.js deleted file mode 120000 index 4c8571c7b..000000000 --- a/modules/widget/tpl/js/generate_code.min.js +++ /dev/null @@ -1 +0,0 @@ -generate_code.js \ No newline at end of file diff --git a/modules/widget/tpl/js/generate_code.min.js b/modules/widget/tpl/js/generate_code.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/widget/tpl/js/generate_code.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/widget/tpl/js/widget.min.js b/modules/widget/tpl/js/widget.min.js deleted file mode 120000 index 7a2156d61..000000000 --- a/modules/widget/tpl/js/widget.min.js +++ /dev/null @@ -1 +0,0 @@ -widget.js \ No newline at end of file diff --git a/modules/widget/tpl/js/widget.min.js b/modules/widget/tpl/js/widget.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/widget/tpl/js/widget.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. diff --git a/modules/widget/tpl/js/widget_admin.min.js b/modules/widget/tpl/js/widget_admin.min.js deleted file mode 120000 index 82b6cddae..000000000 --- a/modules/widget/tpl/js/widget_admin.min.js +++ /dev/null @@ -1 +0,0 @@ -widget_admin.js \ No newline at end of file diff --git a/modules/widget/tpl/js/widget_admin.min.js b/modules/widget/tpl/js/widget_admin.min.js new file mode 100644 index 000000000..b2e2a5875 --- /dev/null +++ b/modules/widget/tpl/js/widget_admin.min.js @@ -0,0 +1 @@ +// This file is not used in Rhymix. From aef4797c1c0ed715747653b8e8722ae81792b2e3 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Wed, 29 Jun 2016 19:20:53 +0900 Subject: [PATCH 2/5] Update routine for broken symlink detection --- classes/frontendfile/FrontEndFileHandler.class.php | 2 +- common/js/common.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/frontendfile/FrontEndFileHandler.class.php b/classes/frontendfile/FrontEndFileHandler.class.php index 18a5ebbc7..4cd781529 100644 --- a/classes/frontendfile/FrontEndFileHandler.class.php +++ b/classes/frontendfile/FrontEndFileHandler.class.php @@ -181,7 +181,7 @@ class FrontEndFileHandler extends Handler // Fix incorrectly minified URL if($file->isMinified && !$file->isExternalURL && (!file_exists($file->fileFullPath) || is_link($file->fileFullPath) || - (filesize($file->fileFullPath) < 32 && trim(file_get_contents($file->fileFullPath)) === $file->keyName))) + (filesize($file->fileFullPath) < 40 && trim(file_get_contents($file->fileFullPath)) === $file->keyName))) { if(file_exists($file->fileRealPath . '/' . $file->fileNameNoExt . '.' . $file->fileExtension)) { diff --git a/common/js/common.js b/common/js/common.js index 9d594bd2c..0448b32d1 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -20,7 +20,7 @@ /* Intercept getScript error due to broken minified script URL */ $(document).ajaxError(function(event, jqxhr, settings, thrownError) { - if(settings.dataType === "script" && (jqxhr.status >= 400 || (jqxhr.responseText && jqxhr.responseText.length < 32))) { + if(settings.dataType === "script" && (jqxhr.status >= 400 || (jqxhr.responseText && jqxhr.responseText.length < 40))) { var match = /^(.+)\.min\.(css|js)($|\?)/.exec(settings.url); if(match) { $.getScript(match[1] + "." + match[2], settings.success); From ffd6c42447778be1f563fbe97671be8249d78310 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Wed, 29 Jun 2016 19:41:30 +0900 Subject: [PATCH 3/5] Add rewrite rules to map nonexistent minified scripts to original file --- .htaccess | 2 ++ common/manual/server_config/rhymix-nginx-subdir.conf | 5 +++++ common/manual/server_config/rhymix-nginx.conf | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/.htaccess b/.htaccess index 611fb8968..11b997abc 100644 --- a/.htaccess +++ b/.htaccess @@ -11,6 +11,8 @@ RewriteRule ^(\.|codeception\.|composer\.|Gruntfile\.js|package\.json|CONTRIBUTI # static files RewriteCond %{SCRIPT_FILENAME} !-f RewriteRule ^(.+)/(addons|files|layouts|m\.layouts|modules|widgets|widgetstyles)/(.*) ./$2/$3 [L] +RewriteCond %{SCRIPT_FILENAME} !-f +RewriteRule ^(.+)\.min\.(css|js)$ ./$1.$2 [L] # rss, blogAPI RewriteRule ^(rss|atom)$ ./index.php?module=rss&act=$1 [L] diff --git a/common/manual/server_config/rhymix-nginx-subdir.conf b/common/manual/server_config/rhymix-nginx-subdir.conf index b5adaf849..3fbed27c1 100644 --- a/common/manual/server_config/rhymix-nginx-subdir.conf +++ b/common/manual/server_config/rhymix-nginx-subdir.conf @@ -23,6 +23,11 @@ location ~ ^/rhymix/(.+)/(addons|files|layouts|m\.layouts|modules|widgets|widget try_files $uri $uri/ /rhymix/$2/$3; } +# fix incorrect minified URLs (for legacy support) +location ~ ^/rhymix/(.+)\.min\.(css|js)$ { + try_files $uri $uri/ /rhymix/$1.$2; +} + # rss, blogAPI rewrite ^/rhymix/(rss|atom)$ /rhymix/index.php?module=rss&act=$1 last; rewrite ^/rhymix/([a-zA-Z0-9_]+)/(rss|atom|api)$ /rhymix/index.php?mid=$1&act=$2 last; diff --git a/common/manual/server_config/rhymix-nginx.conf b/common/manual/server_config/rhymix-nginx.conf index dc9ddc3b6..c780a7c21 100644 --- a/common/manual/server_config/rhymix-nginx.conf +++ b/common/manual/server_config/rhymix-nginx.conf @@ -23,6 +23,11 @@ location ~ ^/(.+)/(addons|files|layouts|m\.layouts|modules|widgets|widgetstyles) try_files $uri $uri/ /$2/$3; } +# fix incorrect minified URLs (for legacy support) +location ~ ^/(.+)\.min\.(css|js)$ { + try_files $uri $uri/ /$1.$2; +} + # rss, blogAPI rewrite ^/(rss|atom)$ /index.php?module=rss&act=$1 last; rewrite ^/([a-zA-Z0-9_]+)/(rss|atom|api)$ /index.php?mid=$1&act=$2 last; From ce4188b05ced955db75ba9f669a820b7494e4c17 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Wed, 29 Jun 2016 19:47:45 +0900 Subject: [PATCH 4/5] Use CSS comment syntax for minified CSS placeholders --- modules/admin/tpl/css/admin.min.css | 2 +- modules/board/m.skins/default/css/mboard.min.css | 2 +- modules/board/m.skins/simpleGray/css/mboard.min.css | 2 +- modules/board/skins/default/board.default.min.css | 2 +- modules/board/skins/xedition/board.default.min.css | 2 +- modules/editor/skins/xpresseditor/css/default.min.css | 2 +- modules/widget/tpl/css/widget.min.css | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/admin/tpl/css/admin.min.css b/modules/admin/tpl/css/admin.min.css index b2e2a5875..303be945e 100644 --- a/modules/admin/tpl/css/admin.min.css +++ b/modules/admin/tpl/css/admin.min.css @@ -1 +1 @@ -// This file is not used in Rhymix. +/* This file is not used in Rhymix. */ diff --git a/modules/board/m.skins/default/css/mboard.min.css b/modules/board/m.skins/default/css/mboard.min.css index b2e2a5875..303be945e 100644 --- a/modules/board/m.skins/default/css/mboard.min.css +++ b/modules/board/m.skins/default/css/mboard.min.css @@ -1 +1 @@ -// This file is not used in Rhymix. +/* This file is not used in Rhymix. */ diff --git a/modules/board/m.skins/simpleGray/css/mboard.min.css b/modules/board/m.skins/simpleGray/css/mboard.min.css index b2e2a5875..303be945e 100644 --- a/modules/board/m.skins/simpleGray/css/mboard.min.css +++ b/modules/board/m.skins/simpleGray/css/mboard.min.css @@ -1 +1 @@ -// This file is not used in Rhymix. +/* This file is not used in Rhymix. */ diff --git a/modules/board/skins/default/board.default.min.css b/modules/board/skins/default/board.default.min.css index b2e2a5875..303be945e 100644 --- a/modules/board/skins/default/board.default.min.css +++ b/modules/board/skins/default/board.default.min.css @@ -1 +1 @@ -// This file is not used in Rhymix. +/* This file is not used in Rhymix. */ diff --git a/modules/board/skins/xedition/board.default.min.css b/modules/board/skins/xedition/board.default.min.css index b2e2a5875..303be945e 100644 --- a/modules/board/skins/xedition/board.default.min.css +++ b/modules/board/skins/xedition/board.default.min.css @@ -1 +1 @@ -// This file is not used in Rhymix. +/* This file is not used in Rhymix. */ diff --git a/modules/editor/skins/xpresseditor/css/default.min.css b/modules/editor/skins/xpresseditor/css/default.min.css index b2e2a5875..303be945e 100644 --- a/modules/editor/skins/xpresseditor/css/default.min.css +++ b/modules/editor/skins/xpresseditor/css/default.min.css @@ -1 +1 @@ -// This file is not used in Rhymix. +/* This file is not used in Rhymix. */ diff --git a/modules/widget/tpl/css/widget.min.css b/modules/widget/tpl/css/widget.min.css index b2e2a5875..303be945e 100644 --- a/modules/widget/tpl/css/widget.min.css +++ b/modules/widget/tpl/css/widget.min.css @@ -1 +1 @@ -// This file is not used in Rhymix. +/* This file is not used in Rhymix. */ From 222be43303885721813820394174f276775cb357 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Wed, 29 Jun 2016 20:50:30 +0900 Subject: [PATCH 5/5] Remove condition of checking the content of minified scripts --- classes/frontendfile/FrontEndFileHandler.class.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/classes/frontendfile/FrontEndFileHandler.class.php b/classes/frontendfile/FrontEndFileHandler.class.php index 4cd781529..c06220a9d 100644 --- a/classes/frontendfile/FrontEndFileHandler.class.php +++ b/classes/frontendfile/FrontEndFileHandler.class.php @@ -180,8 +180,7 @@ class FrontEndFileHandler extends Handler $file->vars = (array)$vars; // Fix incorrectly minified URL - if($file->isMinified && !$file->isExternalURL && (!file_exists($file->fileFullPath) || is_link($file->fileFullPath) || - (filesize($file->fileFullPath) < 40 && trim(file_get_contents($file->fileFullPath)) === $file->keyName))) + if($file->isMinified && !$file->isExternalURL && (!file_exists($file->fileFullPath) || is_link($file->fileFullPath) || filesize($file->fileFullPath) < 40)) { if(file_exists($file->fileRealPath . '/' . $file->fileNameNoExt . '.' . $file->fileExtension)) { @@ -190,7 +189,7 @@ class FrontEndFileHandler extends Handler $file->fileFullPath = $file->fileRealPath . '/' . $file->fileNameNoExt . '.' . $file->fileExtension; } } - + // Do not minify common JS plugins if (strpos($file->filePath, 'common/js/plugins') !== false) {