diff --git a/README.md b/README.md index 0c0e9f21..f9a206d5 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ install instructions on the [project page][web]. In short you have to take the following two steps: * place folder `_h5ai` in the document root folder of the web server -* append `/_h5ai/public/index.php` to the end of the default index-file list +* append `/_h5ai/index.php` to the end of the default index-file list ## Build diff --git a/mkrfile.js b/mkrfile.js index 7603fc07..c3b723cb 100644 --- a/mkrfile.js +++ b/mkrfile.js @@ -60,7 +60,7 @@ module.exports = function (suite) { var fs = require('fs'); var jshint = JSON.parse(fs.readFileSync('.jshintrc', 'utf8')); - $(src + '/_h5ai/public/js: **/*.js, ! lib/**') + $(src + '/_h5ai/js: **/*.js, ! lib/**') .jshint(jshint, jshint.globals); }); @@ -72,15 +72,15 @@ module.exports = function (suite) { var mapSrc = $.map.p(src, build).s('.less', '.css').s('.jade', ''); var mapRoot = $.map.p(root, path.join(build, '_h5ai')); - $(src + ': _h5ai/public/js/*.js') - .newerThan(mapSrc, $(src + ': _h5ai/public/js/**')) + $(src + ': _h5ai/js/*.js') + .newerThan(mapSrc, $(src + ': _h5ai/js/**')) .includeit() .if(!suite.args.uncompressed, function () { this.uglifyjs(); }) .wrap(header) .write(mapSrc, true); - $(src + ': _h5ai/public/css/*.less') - .newerThan(mapSrc, $(src + ': _h5ai/public/css/**')) + $(src + ': _h5ai/css/*.less') + .newerThan(mapSrc, $(src + ': _h5ai/css/**')) .includeit() .less() .autoprefixer() @@ -93,7 +93,7 @@ module.exports = function (suite) { .jade(env) .write(mapSrc, true); - $(src + ': **, ! _h5ai/public/js/**, ! _h5ai/public/css/**, ! **/*.jade') + $(src + ': **, ! _h5ai/js/**, ! _h5ai/css/**, ! **/*.jade') .newerThan(mapSrc) .handlebars(env) .write(mapSrc, true); @@ -135,13 +135,13 @@ module.exports = function (suite) { var env = {pkg: pkg}; - $(src + '/_h5ai/public/css/styles.less') + $(src + '/_h5ai/css/styles.less') .includeit() .less() .autoprefixer() .write(build + '/test/h5ai-styles.css', true); - $(src + '/_h5ai/public/js/scripts.js') + $(src + '/_h5ai/js/scripts.js') .includeit() .write(build + '/test/h5ai-scripts.js', true); diff --git a/src/_h5ai/.htaccess b/src/_h5ai/.htaccess index f65b82f9..a891b9ba 100644 --- a/src/_h5ai/.htaccess +++ b/src/_h5ai/.htaccess @@ -1,3 +1,27 @@ Satisfy all -Order deny,allow -Deny from all +Order allow,deny +Allow from all + +DirectoryIndex disabled + + + Options -Indexes + + +AddDefaultCharset utf-8 + + + AddCharset utf-8 .css .html .js .json .php .svg + + + + ExpiresActive on + ExpiresDefault "access plus 1 month" + + ExpiresByType text/html "access plus 0 seconds" + ExpiresByType application/json "access plus 0 seconds" + + ExpiresByType text/css "access plus 1 week" + ExpiresByType application/javascript "access plus 1 week" + ExpiresByType image/x-icon "access plus 1 week" + diff --git a/src/_h5ai/public/cache/README.md b/src/_h5ai/cache/README.md similarity index 100% rename from src/_h5ai/public/cache/README.md rename to src/_h5ai/cache/README.md diff --git a/src/_h5ai/public/css/inc/colors.less b/src/_h5ai/css/inc/colors.less similarity index 100% rename from src/_h5ai/public/css/inc/colors.less rename to src/_h5ai/css/inc/colors.less diff --git a/src/_h5ai/public/css/inc/ext/contextmenu.less b/src/_h5ai/css/inc/ext/contextmenu.less similarity index 100% rename from src/_h5ai/public/css/inc/ext/contextmenu.less rename to src/_h5ai/css/inc/ext/contextmenu.less diff --git a/src/_h5ai/public/css/inc/ext/crumb.less b/src/_h5ai/css/inc/ext/crumb.less similarity index 100% rename from src/_h5ai/public/css/inc/ext/crumb.less rename to src/_h5ai/css/inc/ext/crumb.less diff --git a/src/_h5ai/public/css/inc/ext/custom.less b/src/_h5ai/css/inc/ext/custom.less similarity index 100% rename from src/_h5ai/public/css/inc/ext/custom.less rename to src/_h5ai/css/inc/ext/custom.less diff --git a/src/_h5ai/public/css/inc/ext/filter.less b/src/_h5ai/css/inc/ext/filter.less similarity index 100% rename from src/_h5ai/public/css/inc/ext/filter.less rename to src/_h5ai/css/inc/ext/filter.less diff --git a/src/_h5ai/public/css/inc/ext/info.less b/src/_h5ai/css/inc/ext/info.less similarity index 100% rename from src/_h5ai/public/css/inc/ext/info.less rename to src/_h5ai/css/inc/ext/info.less diff --git a/src/_h5ai/public/css/inc/ext/preview-aud.less b/src/_h5ai/css/inc/ext/preview-aud.less similarity index 100% rename from src/_h5ai/public/css/inc/ext/preview-aud.less rename to src/_h5ai/css/inc/ext/preview-aud.less diff --git a/src/_h5ai/public/css/inc/ext/preview-img.less b/src/_h5ai/css/inc/ext/preview-img.less similarity index 100% rename from src/_h5ai/public/css/inc/ext/preview-img.less rename to src/_h5ai/css/inc/ext/preview-img.less diff --git a/src/_h5ai/public/css/inc/ext/preview-txt.less b/src/_h5ai/css/inc/ext/preview-txt.less similarity index 100% rename from src/_h5ai/public/css/inc/ext/preview-txt.less rename to src/_h5ai/css/inc/ext/preview-txt.less diff --git a/src/_h5ai/public/css/inc/ext/preview-vid.less b/src/_h5ai/css/inc/ext/preview-vid.less similarity index 100% rename from src/_h5ai/public/css/inc/ext/preview-vid.less rename to src/_h5ai/css/inc/ext/preview-vid.less diff --git a/src/_h5ai/public/css/inc/ext/preview.less b/src/_h5ai/css/inc/ext/preview.less similarity index 100% rename from src/_h5ai/public/css/inc/ext/preview.less rename to src/_h5ai/css/inc/ext/preview.less diff --git a/src/_h5ai/public/css/inc/ext/search.less b/src/_h5ai/css/inc/ext/search.less similarity index 100% rename from src/_h5ai/public/css/inc/ext/search.less rename to src/_h5ai/css/inc/ext/search.less diff --git a/src/_h5ai/public/css/inc/ext/select.less b/src/_h5ai/css/inc/ext/select.less similarity index 100% rename from src/_h5ai/public/css/inc/ext/select.less rename to src/_h5ai/css/inc/ext/select.less diff --git a/src/_h5ai/public/css/inc/ext/tree.less b/src/_h5ai/css/inc/ext/tree.less similarity index 100% rename from src/_h5ai/public/css/inc/ext/tree.less rename to src/_h5ai/css/inc/ext/tree.less diff --git a/src/_h5ai/public/css/inc/fonts.less b/src/_h5ai/css/inc/fonts.less similarity index 100% rename from src/_h5ai/public/css/inc/fonts.less rename to src/_h5ai/css/inc/fonts.less diff --git a/src/_h5ai/public/css/inc/main/info.less b/src/_h5ai/css/inc/main/info.less similarity index 100% rename from src/_h5ai/public/css/inc/main/info.less rename to src/_h5ai/css/inc/main/info.less diff --git a/src/_h5ai/public/css/inc/misc.less b/src/_h5ai/css/inc/misc.less similarity index 100% rename from src/_h5ai/public/css/inc/misc.less rename to src/_h5ai/css/inc/misc.less diff --git a/src/_h5ai/public/css/inc/mixins.less b/src/_h5ai/css/inc/mixins.less similarity index 100% rename from src/_h5ai/public/css/inc/mixins.less rename to src/_h5ai/css/inc/mixins.less diff --git a/src/_h5ai/public/css/inc/responsive.less b/src/_h5ai/css/inc/responsive.less similarity index 100% rename from src/_h5ai/public/css/inc/responsive.less rename to src/_h5ai/css/inc/responsive.less diff --git a/src/_h5ai/public/css/inc/view/content.less b/src/_h5ai/css/inc/view/content.less similarity index 100% rename from src/_h5ai/public/css/inc/view/content.less rename to src/_h5ai/css/inc/view/content.less diff --git a/src/_h5ai/public/css/inc/view/fallback.less b/src/_h5ai/css/inc/view/fallback.less similarity index 100% rename from src/_h5ai/public/css/inc/view/fallback.less rename to src/_h5ai/css/inc/view/fallback.less diff --git a/src/_h5ai/public/css/inc/view/mainrow.less b/src/_h5ai/css/inc/view/mainrow.less similarity index 100% rename from src/_h5ai/public/css/inc/view/mainrow.less rename to src/_h5ai/css/inc/view/mainrow.less diff --git a/src/_h5ai/public/css/inc/view/notification.less b/src/_h5ai/css/inc/view/notification.less similarity index 100% rename from src/_h5ai/public/css/inc/view/notification.less rename to src/_h5ai/css/inc/view/notification.less diff --git a/src/_h5ai/public/css/inc/view/root.less b/src/_h5ai/css/inc/view/root.less similarity index 100% rename from src/_h5ai/public/css/inc/view/root.less rename to src/_h5ai/css/inc/view/root.less diff --git a/src/_h5ai/public/css/inc/view/sidebar.less b/src/_h5ai/css/inc/view/sidebar.less similarity index 100% rename from src/_h5ai/public/css/inc/view/sidebar.less rename to src/_h5ai/css/inc/view/sidebar.less diff --git a/src/_h5ai/public/css/inc/view/topbar.less b/src/_h5ai/css/inc/view/topbar.less similarity index 100% rename from src/_h5ai/public/css/inc/view/topbar.less rename to src/_h5ai/css/inc/view/topbar.less diff --git a/src/_h5ai/public/css/inc/view/view-details.less b/src/_h5ai/css/inc/view/view-details.less similarity index 100% rename from src/_h5ai/public/css/inc/view/view-details.less rename to src/_h5ai/css/inc/view/view-details.less diff --git a/src/_h5ai/public/css/inc/view/view-grid.less b/src/_h5ai/css/inc/view/view-grid.less similarity index 100% rename from src/_h5ai/public/css/inc/view/view-grid.less rename to src/_h5ai/css/inc/view/view-grid.less diff --git a/src/_h5ai/public/css/inc/view/view-icons.less b/src/_h5ai/css/inc/view/view-icons.less similarity index 100% rename from src/_h5ai/public/css/inc/view/view-icons.less rename to src/_h5ai/css/inc/view/view-icons.less diff --git a/src/_h5ai/public/css/inc/view/view.less b/src/_h5ai/css/inc/view/view.less similarity index 100% rename from src/_h5ai/public/css/inc/view/view.less rename to src/_h5ai/css/inc/view/view.less diff --git a/src/_h5ai/public/css/lib/h5bp-main-footer.less b/src/_h5ai/css/lib/h5bp-main-footer.less similarity index 100% rename from src/_h5ai/public/css/lib/h5bp-main-footer.less rename to src/_h5ai/css/lib/h5bp-main-footer.less diff --git a/src/_h5ai/public/css/lib/h5bp-main-header.less b/src/_h5ai/css/lib/h5bp-main-header.less similarity index 100% rename from src/_h5ai/public/css/lib/h5bp-main-header.less rename to src/_h5ai/css/lib/h5bp-main-header.less diff --git a/src/_h5ai/public/css/lib/h5bp-normalize.less b/src/_h5ai/css/lib/h5bp-normalize.less similarity index 100% rename from src/_h5ai/public/css/lib/h5bp-normalize.less rename to src/_h5ai/css/lib/h5bp-normalize.less diff --git a/src/_h5ai/public/css/styles.less b/src/_h5ai/css/styles.less similarity index 100% rename from src/_h5ai/public/css/styles.less rename to src/_h5ai/css/styles.less diff --git a/src/_h5ai/public/ext/README.md b/src/_h5ai/ext/README.md similarity index 100% rename from src/_h5ai/public/ext/README.md rename to src/_h5ai/ext/README.md diff --git a/src/_h5ai/public/images/fallback/file.png b/src/_h5ai/images/fallback/file.png similarity index 100% rename from src/_h5ai/public/images/fallback/file.png rename to src/_h5ai/images/fallback/file.png diff --git a/src/_h5ai/public/images/fallback/folder-parent.png b/src/_h5ai/images/fallback/folder-parent.png similarity index 100% rename from src/_h5ai/public/images/fallback/folder-parent.png rename to src/_h5ai/images/fallback/folder-parent.png diff --git a/src/_h5ai/public/images/fallback/folder.png b/src/_h5ai/images/fallback/folder.png similarity index 100% rename from src/_h5ai/public/images/fallback/folder.png rename to src/_h5ai/images/fallback/folder.png diff --git a/src/_h5ai/public/images/favicon/favicon-152.png b/src/_h5ai/images/favicon/favicon-152.png similarity index 100% rename from src/_h5ai/public/images/favicon/favicon-152.png rename to src/_h5ai/images/favicon/favicon-152.png diff --git a/src/_h5ai/public/images/favicon/favicon-16-32.ico b/src/_h5ai/images/favicon/favicon-16-32.ico similarity index 100% rename from src/_h5ai/public/images/favicon/favicon-16-32.ico rename to src/_h5ai/images/favicon/favicon-16-32.ico diff --git a/src/_h5ai/public/images/favicon/favicon-16.png b/src/_h5ai/images/favicon/favicon-16.png similarity index 100% rename from src/_h5ai/public/images/favicon/favicon-16.png rename to src/_h5ai/images/favicon/favicon-16.png diff --git a/src/_h5ai/public/images/favicon/favicon-32.png b/src/_h5ai/images/favicon/favicon-32.png similarity index 100% rename from src/_h5ai/public/images/favicon/favicon-32.png rename to src/_h5ai/images/favicon/favicon-32.png diff --git a/src/_h5ai/public/images/favicon/favicon.svg b/src/_h5ai/images/favicon/favicon.svg similarity index 100% rename from src/_h5ai/public/images/favicon/favicon.svg rename to src/_h5ai/images/favicon/favicon.svg diff --git a/src/_h5ai/public/images/themes/README.md b/src/_h5ai/images/themes/README.md similarity index 100% rename from src/_h5ai/public/images/themes/README.md rename to src/_h5ai/images/themes/README.md diff --git a/src/_h5ai/public/images/themes/comity/ar-apk.svg b/src/_h5ai/images/themes/comity/ar-apk.svg similarity index 100% rename from src/_h5ai/public/images/themes/comity/ar-apk.svg rename to src/_h5ai/images/themes/comity/ar-apk.svg diff --git a/src/_h5ai/public/images/themes/comity/ar-deb.svg b/src/_h5ai/images/themes/comity/ar-deb.svg similarity index 100% rename from src/_h5ai/public/images/themes/comity/ar-deb.svg rename to src/_h5ai/images/themes/comity/ar-deb.svg diff --git a/src/_h5ai/public/images/themes/comity/ar-rpm.svg b/src/_h5ai/images/themes/comity/ar-rpm.svg similarity index 100% rename from src/_h5ai/public/images/themes/comity/ar-rpm.svg rename to src/_h5ai/images/themes/comity/ar-rpm.svg diff --git a/src/_h5ai/public/images/themes/comity/txt-css.svg b/src/_h5ai/images/themes/comity/txt-css.svg similarity index 100% rename from src/_h5ai/public/images/themes/comity/txt-css.svg rename to src/_h5ai/images/themes/comity/txt-css.svg diff --git a/src/_h5ai/public/images/themes/comity/txt-go.svg b/src/_h5ai/images/themes/comity/txt-go.svg similarity index 100% rename from src/_h5ai/public/images/themes/comity/txt-go.svg rename to src/_h5ai/images/themes/comity/txt-go.svg diff --git a/src/_h5ai/public/images/themes/comity/txt-html.svg b/src/_h5ai/images/themes/comity/txt-html.svg similarity index 100% rename from src/_h5ai/public/images/themes/comity/txt-html.svg rename to src/_h5ai/images/themes/comity/txt-html.svg diff --git a/src/_h5ai/public/images/themes/comity/txt-js.svg b/src/_h5ai/images/themes/comity/txt-js.svg similarity index 100% rename from src/_h5ai/public/images/themes/comity/txt-js.svg rename to src/_h5ai/images/themes/comity/txt-js.svg diff --git a/src/_h5ai/public/images/themes/comity/txt-less.svg b/src/_h5ai/images/themes/comity/txt-less.svg similarity index 100% rename from src/_h5ai/public/images/themes/comity/txt-less.svg rename to src/_h5ai/images/themes/comity/txt-less.svg diff --git a/src/_h5ai/public/images/themes/comity/txt-md.svg b/src/_h5ai/images/themes/comity/txt-md.svg similarity index 100% rename from src/_h5ai/public/images/themes/comity/txt-md.svg rename to src/_h5ai/images/themes/comity/txt-md.svg diff --git a/src/_h5ai/public/images/themes/comity/txt-php.svg b/src/_h5ai/images/themes/comity/txt-php.svg similarity index 100% rename from src/_h5ai/public/images/themes/comity/txt-php.svg rename to src/_h5ai/images/themes/comity/txt-php.svg diff --git a/src/_h5ai/public/images/themes/comity/txt-py.svg b/src/_h5ai/images/themes/comity/txt-py.svg similarity index 100% rename from src/_h5ai/public/images/themes/comity/txt-py.svg rename to src/_h5ai/images/themes/comity/txt-py.svg diff --git a/src/_h5ai/public/images/themes/comity/txt-rb.svg b/src/_h5ai/images/themes/comity/txt-rb.svg similarity index 100% rename from src/_h5ai/public/images/themes/comity/txt-rb.svg rename to src/_h5ai/images/themes/comity/txt-rb.svg diff --git a/src/_h5ai/public/images/themes/comity/txt-script.svg b/src/_h5ai/images/themes/comity/txt-script.svg similarity index 100% rename from src/_h5ai/public/images/themes/comity/txt-script.svg rename to src/_h5ai/images/themes/comity/txt-script.svg diff --git a/src/_h5ai/public/images/themes/comity/x-pdf.svg b/src/_h5ai/images/themes/comity/x-pdf.svg similarity index 100% rename from src/_h5ai/public/images/themes/comity/x-pdf.svg rename to src/_h5ai/images/themes/comity/x-pdf.svg diff --git a/src/_h5ai/public/images/themes/default/ar.svg b/src/_h5ai/images/themes/default/ar.svg similarity index 100% rename from src/_h5ai/public/images/themes/default/ar.svg rename to src/_h5ai/images/themes/default/ar.svg diff --git a/src/_h5ai/public/images/themes/default/aud.svg b/src/_h5ai/images/themes/default/aud.svg similarity index 100% rename from src/_h5ai/public/images/themes/default/aud.svg rename to src/_h5ai/images/themes/default/aud.svg diff --git a/src/_h5ai/public/images/themes/default/bin.svg b/src/_h5ai/images/themes/default/bin.svg similarity index 100% rename from src/_h5ai/public/images/themes/default/bin.svg rename to src/_h5ai/images/themes/default/bin.svg diff --git a/src/_h5ai/public/images/themes/default/file.svg b/src/_h5ai/images/themes/default/file.svg similarity index 100% rename from src/_h5ai/public/images/themes/default/file.svg rename to src/_h5ai/images/themes/default/file.svg diff --git a/src/_h5ai/public/images/themes/default/folder-page.svg b/src/_h5ai/images/themes/default/folder-page.svg similarity index 100% rename from src/_h5ai/public/images/themes/default/folder-page.svg rename to src/_h5ai/images/themes/default/folder-page.svg diff --git a/src/_h5ai/public/images/themes/default/folder-parent.svg b/src/_h5ai/images/themes/default/folder-parent.svg similarity index 100% rename from src/_h5ai/public/images/themes/default/folder-parent.svg rename to src/_h5ai/images/themes/default/folder-parent.svg diff --git a/src/_h5ai/public/images/themes/default/folder.svg b/src/_h5ai/images/themes/default/folder.svg similarity index 100% rename from src/_h5ai/public/images/themes/default/folder.svg rename to src/_h5ai/images/themes/default/folder.svg diff --git a/src/_h5ai/public/images/themes/default/img.svg b/src/_h5ai/images/themes/default/img.svg similarity index 100% rename from src/_h5ai/public/images/themes/default/img.svg rename to src/_h5ai/images/themes/default/img.svg diff --git a/src/_h5ai/public/images/themes/default/txt.svg b/src/_h5ai/images/themes/default/txt.svg similarity index 100% rename from src/_h5ai/public/images/themes/default/txt.svg rename to src/_h5ai/images/themes/default/txt.svg diff --git a/src/_h5ai/public/images/themes/default/vid.svg b/src/_h5ai/images/themes/default/vid.svg similarity index 100% rename from src/_h5ai/public/images/themes/default/vid.svg rename to src/_h5ai/images/themes/default/vid.svg diff --git a/src/_h5ai/public/images/themes/default/x.svg b/src/_h5ai/images/themes/default/x.svg similarity index 100% rename from src/_h5ai/public/images/themes/default/x.svg rename to src/_h5ai/images/themes/default/x.svg diff --git a/src/_h5ai/public/images/ui/back.svg b/src/_h5ai/images/ui/back.svg similarity index 100% rename from src/_h5ai/public/images/ui/back.svg rename to src/_h5ai/images/ui/back.svg diff --git a/src/_h5ai/public/images/ui/crumb.svg b/src/_h5ai/images/ui/crumb.svg similarity index 100% rename from src/_h5ai/public/images/ui/crumb.svg rename to src/_h5ai/images/ui/crumb.svg diff --git a/src/_h5ai/public/images/ui/download.svg b/src/_h5ai/images/ui/download.svg similarity index 100% rename from src/_h5ai/public/images/ui/download.svg rename to src/_h5ai/images/ui/download.svg diff --git a/src/_h5ai/public/images/ui/filter.svg b/src/_h5ai/images/ui/filter.svg similarity index 100% rename from src/_h5ai/public/images/ui/filter.svg rename to src/_h5ai/images/ui/filter.svg diff --git a/src/_h5ai/public/images/ui/info-toggle.svg b/src/_h5ai/images/ui/info-toggle.svg similarity index 100% rename from src/_h5ai/public/images/ui/info-toggle.svg rename to src/_h5ai/images/ui/info-toggle.svg diff --git a/src/_h5ai/public/images/ui/paypal.svg b/src/_h5ai/images/ui/paypal.svg similarity index 100% rename from src/_h5ai/public/images/ui/paypal.svg rename to src/_h5ai/images/ui/paypal.svg diff --git a/src/_h5ai/public/images/ui/preview-close.svg b/src/_h5ai/images/ui/preview-close.svg similarity index 100% rename from src/_h5ai/public/images/ui/preview-close.svg rename to src/_h5ai/images/ui/preview-close.svg diff --git a/src/_h5ai/public/images/ui/preview-fullscreen.svg b/src/_h5ai/images/ui/preview-fullscreen.svg similarity index 100% rename from src/_h5ai/public/images/ui/preview-fullscreen.svg rename to src/_h5ai/images/ui/preview-fullscreen.svg diff --git a/src/_h5ai/public/images/ui/preview-next.svg b/src/_h5ai/images/ui/preview-next.svg similarity index 100% rename from src/_h5ai/public/images/ui/preview-next.svg rename to src/_h5ai/images/ui/preview-next.svg diff --git a/src/_h5ai/public/images/ui/preview-no-fullscreen.svg b/src/_h5ai/images/ui/preview-no-fullscreen.svg similarity index 100% rename from src/_h5ai/public/images/ui/preview-no-fullscreen.svg rename to src/_h5ai/images/ui/preview-no-fullscreen.svg diff --git a/src/_h5ai/public/images/ui/preview-prev.svg b/src/_h5ai/images/ui/preview-prev.svg similarity index 100% rename from src/_h5ai/public/images/ui/preview-prev.svg rename to src/_h5ai/images/ui/preview-prev.svg diff --git a/src/_h5ai/public/images/ui/preview-raw.svg b/src/_h5ai/images/ui/preview-raw.svg similarity index 100% rename from src/_h5ai/public/images/ui/preview-raw.svg rename to src/_h5ai/images/ui/preview-raw.svg diff --git a/src/_h5ai/public/images/ui/search.svg b/src/_h5ai/images/ui/search.svg similarity index 100% rename from src/_h5ai/public/images/ui/search.svg rename to src/_h5ai/images/ui/search.svg diff --git a/src/_h5ai/public/images/ui/selected.svg b/src/_h5ai/images/ui/selected.svg similarity index 100% rename from src/_h5ai/public/images/ui/selected.svg rename to src/_h5ai/images/ui/selected.svg diff --git a/src/_h5ai/public/images/ui/sidebar.svg b/src/_h5ai/images/ui/sidebar.svg similarity index 100% rename from src/_h5ai/public/images/ui/sidebar.svg rename to src/_h5ai/images/ui/sidebar.svg diff --git a/src/_h5ai/public/images/ui/sort.svg b/src/_h5ai/images/ui/sort.svg similarity index 100% rename from src/_h5ai/public/images/ui/sort.svg rename to src/_h5ai/images/ui/sort.svg diff --git a/src/_h5ai/public/images/ui/spinner.svg b/src/_h5ai/images/ui/spinner.svg similarity index 100% rename from src/_h5ai/public/images/ui/spinner.svg rename to src/_h5ai/images/ui/spinner.svg diff --git a/src/_h5ai/public/images/ui/tree-indicator.svg b/src/_h5ai/images/ui/tree-indicator.svg similarity index 100% rename from src/_h5ai/public/images/ui/tree-indicator.svg rename to src/_h5ai/images/ui/tree-indicator.svg diff --git a/src/_h5ai/public/images/ui/tree-toggle.svg b/src/_h5ai/images/ui/tree-toggle.svg similarity index 100% rename from src/_h5ai/public/images/ui/tree-toggle.svg rename to src/_h5ai/images/ui/tree-toggle.svg diff --git a/src/_h5ai/public/images/ui/view-details.svg b/src/_h5ai/images/ui/view-details.svg similarity index 100% rename from src/_h5ai/public/images/ui/view-details.svg rename to src/_h5ai/images/ui/view-details.svg diff --git a/src/_h5ai/public/images/ui/view-grid.svg b/src/_h5ai/images/ui/view-grid.svg similarity index 100% rename from src/_h5ai/public/images/ui/view-grid.svg rename to src/_h5ai/images/ui/view-grid.svg diff --git a/src/_h5ai/public/images/ui/view-icons.svg b/src/_h5ai/images/ui/view-icons.svg similarity index 100% rename from src/_h5ai/public/images/ui/view-icons.svg rename to src/_h5ai/images/ui/view-icons.svg diff --git a/src/_h5ai/public/index.php b/src/_h5ai/index.php similarity index 57% rename from src/_h5ai/public/index.php rename to src/_h5ai/index.php index 029d7ba8..7a5fffa1 100644 --- a/src/_h5ai/public/index.php +++ b/src/_h5ai/index.php @@ -4,9 +4,9 @@ define('MIN_PHP_VERSION', '5.4.0'); if (!function_exists('version_compare') || version_compare(PHP_VERSION, MIN_PHP_VERSION, '<')) { header('Content-type: text/plain;charset=utf-8'); - echo '[err] {{pkg.name}} requires PHP ' . MIN_PHP_VERSION . ' or later, but found PHP ' . PHP_VERSION; + echo '[err] h5ai requires PHP ' . MIN_PHP_VERSION . ' or later, but found PHP ' . PHP_VERSION; exit; } -require_once __DIR__ . '/../backend/php/class-bootstrap.php'; +require_once __DIR__ . '/private/php/class-bootstrap.php'; Bootstrap::run(); diff --git a/src/_h5ai/public/js/inc/boot.js b/src/_h5ai/js/inc/boot.js similarity index 100% rename from src/_h5ai/public/js/inc/boot.js rename to src/_h5ai/js/inc/boot.js diff --git a/src/_h5ai/public/js/inc/core/event.js b/src/_h5ai/js/inc/core/event.js similarity index 100% rename from src/_h5ai/public/js/inc/core/event.js rename to src/_h5ai/js/inc/core/event.js diff --git a/src/_h5ai/public/js/inc/core/format.js b/src/_h5ai/js/inc/core/format.js similarity index 100% rename from src/_h5ai/public/js/inc/core/format.js rename to src/_h5ai/js/inc/core/format.js diff --git a/src/_h5ai/public/js/inc/core/langs.js b/src/_h5ai/js/inc/core/langs.js similarity index 100% rename from src/_h5ai/public/js/inc/core/langs.js rename to src/_h5ai/js/inc/core/langs.js diff --git a/src/_h5ai/public/js/inc/core/location.js b/src/_h5ai/js/inc/core/location.js similarity index 100% rename from src/_h5ai/public/js/inc/core/location.js rename to src/_h5ai/js/inc/core/location.js diff --git a/src/_h5ai/public/js/inc/core/resource.js b/src/_h5ai/js/inc/core/resource.js similarity index 100% rename from src/_h5ai/public/js/inc/core/resource.js rename to src/_h5ai/js/inc/core/resource.js diff --git a/src/_h5ai/public/js/inc/core/server.js b/src/_h5ai/js/inc/core/server.js similarity index 100% rename from src/_h5ai/public/js/inc/core/server.js rename to src/_h5ai/js/inc/core/server.js diff --git a/src/_h5ai/public/js/inc/core/settings.js b/src/_h5ai/js/inc/core/settings.js similarity index 100% rename from src/_h5ai/public/js/inc/core/settings.js rename to src/_h5ai/js/inc/core/settings.js diff --git a/src/_h5ai/public/js/inc/core/store.js b/src/_h5ai/js/inc/core/store.js similarity index 100% rename from src/_h5ai/public/js/inc/core/store.js rename to src/_h5ai/js/inc/core/store.js diff --git a/src/_h5ai/public/js/inc/core/types.js b/src/_h5ai/js/inc/core/types.js similarity index 100% rename from src/_h5ai/public/js/inc/core/types.js rename to src/_h5ai/js/inc/core/types.js diff --git a/src/_h5ai/public/js/inc/core/util.js b/src/_h5ai/js/inc/core/util.js similarity index 100% rename from src/_h5ai/public/js/inc/core/util.js rename to src/_h5ai/js/inc/core/util.js diff --git a/src/_h5ai/public/js/inc/ext/autorefresh.js b/src/_h5ai/js/inc/ext/autorefresh.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/autorefresh.js rename to src/_h5ai/js/inc/ext/autorefresh.js diff --git a/src/_h5ai/public/js/inc/ext/contextmenu.js b/src/_h5ai/js/inc/ext/contextmenu.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/contextmenu.js rename to src/_h5ai/js/inc/ext/contextmenu.js diff --git a/src/_h5ai/public/js/inc/ext/crumb.js b/src/_h5ai/js/inc/ext/crumb.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/crumb.js rename to src/_h5ai/js/inc/ext/crumb.js diff --git a/src/_h5ai/public/js/inc/ext/custom.js b/src/_h5ai/js/inc/ext/custom.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/custom.js rename to src/_h5ai/js/inc/ext/custom.js diff --git a/src/_h5ai/public/js/inc/ext/download.js b/src/_h5ai/js/inc/ext/download.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/download.js rename to src/_h5ai/js/inc/ext/download.js diff --git a/src/_h5ai/public/js/inc/ext/filter.js b/src/_h5ai/js/inc/ext/filter.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/filter.js rename to src/_h5ai/js/inc/ext/filter.js diff --git a/src/_h5ai/public/js/inc/ext/google-analytics.js b/src/_h5ai/js/inc/ext/google-analytics.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/google-analytics.js rename to src/_h5ai/js/inc/ext/google-analytics.js diff --git a/src/_h5ai/public/js/inc/ext/info.js b/src/_h5ai/js/inc/ext/info.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/info.js rename to src/_h5ai/js/inc/ext/info.js diff --git a/src/_h5ai/public/js/inc/ext/l10n.js b/src/_h5ai/js/inc/ext/l10n.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/l10n.js rename to src/_h5ai/js/inc/ext/l10n.js diff --git a/src/_h5ai/public/js/inc/ext/peer5.js b/src/_h5ai/js/inc/ext/peer5.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/peer5.js rename to src/_h5ai/js/inc/ext/peer5.js diff --git a/src/_h5ai/public/js/inc/ext/piwik-analytics.js b/src/_h5ai/js/inc/ext/piwik-analytics.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/piwik-analytics.js rename to src/_h5ai/js/inc/ext/piwik-analytics.js diff --git a/src/_h5ai/public/js/inc/ext/preview-aud.js b/src/_h5ai/js/inc/ext/preview-aud.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/preview-aud.js rename to src/_h5ai/js/inc/ext/preview-aud.js diff --git a/src/_h5ai/public/js/inc/ext/preview-img.js b/src/_h5ai/js/inc/ext/preview-img.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/preview-img.js rename to src/_h5ai/js/inc/ext/preview-img.js diff --git a/src/_h5ai/public/js/inc/ext/preview-txt.js b/src/_h5ai/js/inc/ext/preview-txt.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/preview-txt.js rename to src/_h5ai/js/inc/ext/preview-txt.js diff --git a/src/_h5ai/public/js/inc/ext/preview-vid.js b/src/_h5ai/js/inc/ext/preview-vid.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/preview-vid.js rename to src/_h5ai/js/inc/ext/preview-vid.js diff --git a/src/_h5ai/public/js/inc/ext/preview.js b/src/_h5ai/js/inc/ext/preview.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/preview.js rename to src/_h5ai/js/inc/ext/preview.js diff --git a/src/_h5ai/public/js/inc/ext/search.js b/src/_h5ai/js/inc/ext/search.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/search.js rename to src/_h5ai/js/inc/ext/search.js diff --git a/src/_h5ai/public/js/inc/ext/select.js b/src/_h5ai/js/inc/ext/select.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/select.js rename to src/_h5ai/js/inc/ext/select.js diff --git a/src/_h5ai/public/js/inc/ext/sort.js b/src/_h5ai/js/inc/ext/sort.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/sort.js rename to src/_h5ai/js/inc/ext/sort.js diff --git a/src/_h5ai/public/js/inc/ext/thumbnails.js b/src/_h5ai/js/inc/ext/thumbnails.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/thumbnails.js rename to src/_h5ai/js/inc/ext/thumbnails.js diff --git a/src/_h5ai/public/js/inc/ext/title.js b/src/_h5ai/js/inc/ext/title.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/title.js rename to src/_h5ai/js/inc/ext/title.js diff --git a/src/_h5ai/public/js/inc/ext/tree.js b/src/_h5ai/js/inc/ext/tree.js similarity index 100% rename from src/_h5ai/public/js/inc/ext/tree.js rename to src/_h5ai/js/inc/ext/tree.js diff --git a/src/_h5ai/public/js/inc/main/index.js b/src/_h5ai/js/inc/main/index.js similarity index 100% rename from src/_h5ai/public/js/inc/main/index.js rename to src/_h5ai/js/inc/main/index.js diff --git a/src/_h5ai/public/js/inc/main/info.js b/src/_h5ai/js/inc/main/info.js similarity index 98% rename from src/_h5ai/public/js/inc/main/info.js rename to src/_h5ai/js/inc/main/info.js index cacac055..44dce715 100644 --- a/src/_h5ai/public/js/inc/main/info.js +++ b/src/_h5ai/js/inc/main/info.js @@ -15,7 +15,7 @@ modulejs.define('main/info', ['$', 'config', 'core/resource', 'core/server'], fu 'logout' + '
' + 'The preset password is the empty string, just click login. ' + - 'Change it in \'_h5ai/conf/options.json\'.' + + 'Change it in \'_h5ai/private/conf/options.json\'.' + '
' + ''; var tplSupport = diff --git a/src/_h5ai/public/js/inc/model/item.js b/src/_h5ai/js/inc/model/item.js similarity index 100% rename from src/_h5ai/public/js/inc/model/item.js rename to src/_h5ai/js/inc/model/item.js diff --git a/src/_h5ai/public/js/inc/view/content.js b/src/_h5ai/js/inc/view/content.js similarity index 100% rename from src/_h5ai/public/js/inc/view/content.js rename to src/_h5ai/js/inc/view/content.js diff --git a/src/_h5ai/public/js/inc/view/mainrow.js b/src/_h5ai/js/inc/view/mainrow.js similarity index 100% rename from src/_h5ai/public/js/inc/view/mainrow.js rename to src/_h5ai/js/inc/view/mainrow.js diff --git a/src/_h5ai/public/js/inc/view/notification.js b/src/_h5ai/js/inc/view/notification.js similarity index 100% rename from src/_h5ai/public/js/inc/view/notification.js rename to src/_h5ai/js/inc/view/notification.js diff --git a/src/_h5ai/public/js/inc/view/root.js b/src/_h5ai/js/inc/view/root.js similarity index 100% rename from src/_h5ai/public/js/inc/view/root.js rename to src/_h5ai/js/inc/view/root.js diff --git a/src/_h5ai/public/js/inc/view/sidebar.js b/src/_h5ai/js/inc/view/sidebar.js similarity index 100% rename from src/_h5ai/public/js/inc/view/sidebar.js rename to src/_h5ai/js/inc/view/sidebar.js diff --git a/src/_h5ai/public/js/inc/view/topbar.js b/src/_h5ai/js/inc/view/topbar.js similarity index 100% rename from src/_h5ai/public/js/inc/view/topbar.js rename to src/_h5ai/js/inc/view/topbar.js diff --git a/src/_h5ai/public/js/inc/view/view.js b/src/_h5ai/js/inc/view/view.js similarity index 100% rename from src/_h5ai/public/js/inc/view/view.js rename to src/_h5ai/js/inc/view/view.js diff --git a/src/_h5ai/public/js/inc/view/viewmode.js b/src/_h5ai/js/inc/view/viewmode.js similarity index 100% rename from src/_h5ai/public/js/inc/view/viewmode.js rename to src/_h5ai/js/inc/view/viewmode.js diff --git a/src/_h5ai/public/js/lib/jquery-2.1.3.min.js b/src/_h5ai/js/lib/jquery-2.1.3.min.js similarity index 100% rename from src/_h5ai/public/js/lib/jquery-2.1.3.min.js rename to src/_h5ai/js/lib/jquery-2.1.3.min.js diff --git a/src/_h5ai/public/js/lib/jquery.qrcode-0.11.0.min.js b/src/_h5ai/js/lib/jquery.qrcode-0.11.0.min.js similarity index 100% rename from src/_h5ai/public/js/lib/jquery.qrcode-0.11.0.min.js rename to src/_h5ai/js/lib/jquery.qrcode-0.11.0.min.js diff --git a/src/_h5ai/public/js/lib/lodash-3.8.0.min.js b/src/_h5ai/js/lib/lodash-3.8.0.min.js similarity index 100% rename from src/_h5ai/public/js/lib/lodash-3.8.0.min.js rename to src/_h5ai/js/lib/lodash-3.8.0.min.js diff --git a/src/_h5ai/public/js/lib/marked-0.3.2.min.js b/src/_h5ai/js/lib/marked-0.3.2.min.js similarity index 100% rename from src/_h5ai/public/js/lib/marked-0.3.2.min.js rename to src/_h5ai/js/lib/marked-0.3.2.min.js diff --git a/src/_h5ai/public/js/lib/modernizr-2.8.3.min.js b/src/_h5ai/js/lib/modernizr-2.8.3.min.js similarity index 100% rename from src/_h5ai/public/js/lib/modernizr-2.8.3.min.js rename to src/_h5ai/js/lib/modernizr-2.8.3.min.js diff --git a/src/_h5ai/public/js/lib/modulejs-1.5.0.min.js b/src/_h5ai/js/lib/modulejs-1.5.0.min.js similarity index 100% rename from src/_h5ai/public/js/lib/modulejs-1.5.0.min.js rename to src/_h5ai/js/lib/modulejs-1.5.0.min.js diff --git a/src/_h5ai/public/js/lib/prism-2015-04-05.min.js b/src/_h5ai/js/lib/prism-2015-04-05.min.js similarity index 100% rename from src/_h5ai/public/js/lib/prism-2015-04-05.min.js rename to src/_h5ai/js/lib/prism-2015-04-05.min.js diff --git a/src/_h5ai/public/js/scripts.js b/src/_h5ai/js/scripts.js similarity index 100% rename from src/_h5ai/public/js/scripts.js rename to src/_h5ai/js/scripts.js diff --git a/src/_h5ai/private/.htaccess b/src/_h5ai/private/.htaccess new file mode 100644 index 00000000..f65b82f9 --- /dev/null +++ b/src/_h5ai/private/.htaccess @@ -0,0 +1,3 @@ +Satisfy all +Order deny,allow +Deny from all diff --git a/src/_h5ai/backend/cache/README.md b/src/_h5ai/private/cache/README.md similarity index 100% rename from src/_h5ai/backend/cache/README.md rename to src/_h5ai/private/cache/README.md diff --git a/src/_h5ai/conf/l10n/af.json b/src/_h5ai/private/conf/l10n/af.json similarity index 100% rename from src/_h5ai/conf/l10n/af.json rename to src/_h5ai/private/conf/l10n/af.json diff --git a/src/_h5ai/conf/l10n/bg.json b/src/_h5ai/private/conf/l10n/bg.json similarity index 100% rename from src/_h5ai/conf/l10n/bg.json rename to src/_h5ai/private/conf/l10n/bg.json diff --git a/src/_h5ai/conf/l10n/cs.json b/src/_h5ai/private/conf/l10n/cs.json similarity index 100% rename from src/_h5ai/conf/l10n/cs.json rename to src/_h5ai/private/conf/l10n/cs.json diff --git a/src/_h5ai/conf/l10n/da.json b/src/_h5ai/private/conf/l10n/da.json similarity index 100% rename from src/_h5ai/conf/l10n/da.json rename to src/_h5ai/private/conf/l10n/da.json diff --git a/src/_h5ai/conf/l10n/de.json b/src/_h5ai/private/conf/l10n/de.json similarity index 100% rename from src/_h5ai/conf/l10n/de.json rename to src/_h5ai/private/conf/l10n/de.json diff --git a/src/_h5ai/conf/l10n/el.json b/src/_h5ai/private/conf/l10n/el.json similarity index 100% rename from src/_h5ai/conf/l10n/el.json rename to src/_h5ai/private/conf/l10n/el.json diff --git a/src/_h5ai/conf/l10n/en.json b/src/_h5ai/private/conf/l10n/en.json similarity index 100% rename from src/_h5ai/conf/l10n/en.json rename to src/_h5ai/private/conf/l10n/en.json diff --git a/src/_h5ai/conf/l10n/es.json b/src/_h5ai/private/conf/l10n/es.json similarity index 100% rename from src/_h5ai/conf/l10n/es.json rename to src/_h5ai/private/conf/l10n/es.json diff --git a/src/_h5ai/conf/l10n/fi.json b/src/_h5ai/private/conf/l10n/fi.json similarity index 100% rename from src/_h5ai/conf/l10n/fi.json rename to src/_h5ai/private/conf/l10n/fi.json diff --git a/src/_h5ai/conf/l10n/fr.json b/src/_h5ai/private/conf/l10n/fr.json similarity index 100% rename from src/_h5ai/conf/l10n/fr.json rename to src/_h5ai/private/conf/l10n/fr.json diff --git a/src/_h5ai/conf/l10n/he.json b/src/_h5ai/private/conf/l10n/he.json similarity index 100% rename from src/_h5ai/conf/l10n/he.json rename to src/_h5ai/private/conf/l10n/he.json diff --git a/src/_h5ai/conf/l10n/hi.json b/src/_h5ai/private/conf/l10n/hi.json similarity index 100% rename from src/_h5ai/conf/l10n/hi.json rename to src/_h5ai/private/conf/l10n/hi.json diff --git a/src/_h5ai/conf/l10n/hr.json b/src/_h5ai/private/conf/l10n/hr.json similarity index 100% rename from src/_h5ai/conf/l10n/hr.json rename to src/_h5ai/private/conf/l10n/hr.json diff --git a/src/_h5ai/conf/l10n/hu.json b/src/_h5ai/private/conf/l10n/hu.json similarity index 100% rename from src/_h5ai/conf/l10n/hu.json rename to src/_h5ai/private/conf/l10n/hu.json diff --git a/src/_h5ai/conf/l10n/it.json b/src/_h5ai/private/conf/l10n/it.json similarity index 100% rename from src/_h5ai/conf/l10n/it.json rename to src/_h5ai/private/conf/l10n/it.json diff --git a/src/_h5ai/conf/l10n/ja.json b/src/_h5ai/private/conf/l10n/ja.json similarity index 100% rename from src/_h5ai/conf/l10n/ja.json rename to src/_h5ai/private/conf/l10n/ja.json diff --git a/src/_h5ai/conf/l10n/ko.json b/src/_h5ai/private/conf/l10n/ko.json similarity index 100% rename from src/_h5ai/conf/l10n/ko.json rename to src/_h5ai/private/conf/l10n/ko.json diff --git a/src/_h5ai/conf/l10n/lv.json b/src/_h5ai/private/conf/l10n/lv.json similarity index 100% rename from src/_h5ai/conf/l10n/lv.json rename to src/_h5ai/private/conf/l10n/lv.json diff --git a/src/_h5ai/conf/l10n/nb.json b/src/_h5ai/private/conf/l10n/nb.json similarity index 100% rename from src/_h5ai/conf/l10n/nb.json rename to src/_h5ai/private/conf/l10n/nb.json diff --git a/src/_h5ai/conf/l10n/nl.json b/src/_h5ai/private/conf/l10n/nl.json similarity index 100% rename from src/_h5ai/conf/l10n/nl.json rename to src/_h5ai/private/conf/l10n/nl.json diff --git a/src/_h5ai/conf/l10n/pl.json b/src/_h5ai/private/conf/l10n/pl.json similarity index 100% rename from src/_h5ai/conf/l10n/pl.json rename to src/_h5ai/private/conf/l10n/pl.json diff --git a/src/_h5ai/conf/l10n/pt.json b/src/_h5ai/private/conf/l10n/pt.json similarity index 100% rename from src/_h5ai/conf/l10n/pt.json rename to src/_h5ai/private/conf/l10n/pt.json diff --git a/src/_h5ai/conf/l10n/ro.json b/src/_h5ai/private/conf/l10n/ro.json similarity index 100% rename from src/_h5ai/conf/l10n/ro.json rename to src/_h5ai/private/conf/l10n/ro.json diff --git a/src/_h5ai/conf/l10n/ru.json b/src/_h5ai/private/conf/l10n/ru.json similarity index 100% rename from src/_h5ai/conf/l10n/ru.json rename to src/_h5ai/private/conf/l10n/ru.json diff --git a/src/_h5ai/conf/l10n/sk.json b/src/_h5ai/private/conf/l10n/sk.json similarity index 100% rename from src/_h5ai/conf/l10n/sk.json rename to src/_h5ai/private/conf/l10n/sk.json diff --git a/src/_h5ai/conf/l10n/sl.json b/src/_h5ai/private/conf/l10n/sl.json similarity index 100% rename from src/_h5ai/conf/l10n/sl.json rename to src/_h5ai/private/conf/l10n/sl.json diff --git a/src/_h5ai/conf/l10n/sr.json b/src/_h5ai/private/conf/l10n/sr.json similarity index 100% rename from src/_h5ai/conf/l10n/sr.json rename to src/_h5ai/private/conf/l10n/sr.json diff --git a/src/_h5ai/conf/l10n/sv.json b/src/_h5ai/private/conf/l10n/sv.json similarity index 100% rename from src/_h5ai/conf/l10n/sv.json rename to src/_h5ai/private/conf/l10n/sv.json diff --git a/src/_h5ai/conf/l10n/tr.json b/src/_h5ai/private/conf/l10n/tr.json similarity index 100% rename from src/_h5ai/conf/l10n/tr.json rename to src/_h5ai/private/conf/l10n/tr.json diff --git a/src/_h5ai/conf/l10n/uk.json b/src/_h5ai/private/conf/l10n/uk.json similarity index 100% rename from src/_h5ai/conf/l10n/uk.json rename to src/_h5ai/private/conf/l10n/uk.json diff --git a/src/_h5ai/conf/l10n/zh-cn.json b/src/_h5ai/private/conf/l10n/zh-cn.json similarity index 100% rename from src/_h5ai/conf/l10n/zh-cn.json rename to src/_h5ai/private/conf/l10n/zh-cn.json diff --git a/src/_h5ai/conf/l10n/zh-tw.json b/src/_h5ai/private/conf/l10n/zh-tw.json similarity index 100% rename from src/_h5ai/conf/l10n/zh-tw.json rename to src/_h5ai/private/conf/l10n/zh-tw.json diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/private/conf/options.json similarity index 97% rename from src/_h5ai/conf/options.json rename to src/_h5ai/private/conf/options.json index 855c17f5..84574e67 100644 --- a/src/_h5ai/conf/options.json +++ b/src/_h5ai/private/conf/options.json @@ -1,5 +1,5 @@ /* -{{pkg.name}} {{pkg.version}} +h5ai {{pkg.version}} {{pkg.homepage}} Options @@ -59,7 +59,7 @@ Options is given the view size is fixed and the selector buttons are hidden. The user selected view size is also stored local in modern browsers so that it will be persistent. - - theme: string, name of one of the folders in "_{{pkg.name}}/images/themes", defaults to "default" + - theme: string, name of one of the folders in "_h5ai/images/themes", defaults to "default" - unmanaged: array of strings, don't manage folders containing one of those files - unmanagedInNewWindow: boolean, open unmanaged links in new window/tab */ @@ -68,7 +68,7 @@ Options "fastBrowsing": true, "fonts": ["Ubuntu", "Roboto", "Helvetica", "Arial", "sans-serif"], "fontsMono": ["Ubuntu Mono", "Monaco", "Lucida Sans Typewriter", "monospace"], - "hidden": ["^\\.", "^_{{pkg.name}}"], + "hidden": ["^\\.", "^_h5ai"], "hideFolders": false, "hideIf403": true, "hideParentFolder": false, @@ -356,7 +356,7 @@ Options }, /* - Show thumbnails for image files. Needs the "/_{{pkg.name}}/cache" folder to be + Show thumbnails for image files. Needs the "/_h5ai/cache" folder to be writable for the web Server. - img: array of strings diff --git a/src/_h5ai/conf/types.json b/src/_h5ai/private/conf/types.json similarity index 99% rename from src/_h5ai/conf/types.json rename to src/_h5ai/private/conf/types.json index c07d5228..bac127c0 100644 --- a/src/_h5ai/conf/types.json +++ b/src/_h5ai/private/conf/types.json @@ -1,5 +1,5 @@ /* -{{pkg.name}} {{pkg.version}} +h5ai {{pkg.version}} {{pkg.homepage}} File types mapped to file extensions diff --git a/src/_h5ai/backend/php/class-bootstrap.php b/src/_h5ai/private/php/class-bootstrap.php similarity index 100% rename from src/_h5ai/backend/php/class-bootstrap.php rename to src/_h5ai/private/php/class-bootstrap.php diff --git a/src/_h5ai/backend/php/core/class-api.php b/src/_h5ai/private/php/core/class-api.php similarity index 100% rename from src/_h5ai/backend/php/core/class-api.php rename to src/_h5ai/private/php/core/class-api.php diff --git a/src/_h5ai/backend/php/core/class-context.php b/src/_h5ai/private/php/core/class-context.php similarity index 93% rename from src/_h5ai/backend/php/core/class-context.php rename to src/_h5ai/private/php/core/class-context.php index 71a4098d..4a268ce7 100644 --- a/src/_h5ai/backend/php/core/class-context.php +++ b/src/_h5ai/private/php/core/class-context.php @@ -17,7 +17,7 @@ class Context { $this->request = $request; $this->setup = $setup; - $this->options = Json::load($this->setup->get('APP_PATH') . '/conf/options.json'); + $this->options = Json::load($this->setup->get('CONF_PATH') . '/options.json'); $this->passhash = $this->query_option('passhash', ''); $this->options['hasCustomPasshash'] = strcasecmp($this->passhash, Context::$DEFAULT_PASSHASH) !== 0; @@ -51,7 +51,7 @@ class Context { public function get_types() { - return Json::load($this->setup->get('APP_PATH') . '/conf/types.json'); + return Json::load($this->setup->get('CONF_PATH') . '/types.json'); } public function login_admin($pass) { @@ -78,7 +78,7 @@ class Context { public function is_info_request() { - return Util::starts_with($this->setup->get('REQUEST_HREF') . '/', $this->setup->get('APP_HREF')); + return Util::starts_with($this->setup->get('REQUEST_HREF') . '/', $this->setup->get('H5AI_HREF')); } public function to_href($path, $trailing_slash = true) { @@ -147,7 +147,7 @@ class Context { return false; } - if ($path === $this->setup->get('APP_PATH') || strpos($path, $this->setup->get('APP_PATH') . '/') === 0) { + if ($path === $this->setup->get('H5AI_PATH') || strpos($path, $this->setup->get('H5AI_PATH') . '/') === 0) { return false; } @@ -158,7 +158,7 @@ class Context { } while ($path !== $this->setup->get('ROOT_PATH')) { - if (@is_dir($path . '/_h5ai/server')) { + if (@is_dir($path . '/_h5ai/private/conf')) { return false; } $parent_path = Util::normalize_path(dirname($path)); @@ -217,7 +217,7 @@ class Context { public function get_langs() { $langs = []; - $l10n_path = $this->setup->get('APP_PATH') . '/conf/l10n'; + $l10n_path = $this->setup->get('CONF_PATH') . '/l10n'; if (is_dir($l10n_path)) { if ($dir = opendir($l10n_path)) { while (($file = readdir($dir)) !== false) { @@ -238,7 +238,7 @@ class Context { $results = []; foreach ($iso_codes as $iso_code) { - $file = $this->setup->get('APP_PATH') . '/conf/l10n/' . $iso_code . '.json'; + $file = $this->setup->get('CONF_PATH') . '/l10n/' . $iso_code . '.json'; $results[$iso_code] = Json::load($file); $results[$iso_code]['isoCode'] = $iso_code; } diff --git a/src/_h5ai/backend/php/core/class-fallback.php b/src/_h5ai/private/php/core/class-fallback.php similarity index 100% rename from src/_h5ai/backend/php/core/class-fallback.php rename to src/_h5ai/private/php/core/class-fallback.php diff --git a/src/_h5ai/backend/php/core/class-item.php b/src/_h5ai/private/php/core/class-item.php similarity index 100% rename from src/_h5ai/backend/php/core/class-item.php rename to src/_h5ai/private/php/core/class-item.php diff --git a/src/_h5ai/backend/php/core/class-json.php b/src/_h5ai/private/php/core/class-json.php similarity index 100% rename from src/_h5ai/backend/php/core/class-json.php rename to src/_h5ai/private/php/core/class-json.php diff --git a/src/_h5ai/backend/php/core/class-logger.php b/src/_h5ai/private/php/core/class-logger.php similarity index 100% rename from src/_h5ai/backend/php/core/class-logger.php rename to src/_h5ai/private/php/core/class-logger.php diff --git a/src/_h5ai/backend/php/core/class-request.php b/src/_h5ai/private/php/core/class-request.php similarity index 100% rename from src/_h5ai/backend/php/core/class-request.php rename to src/_h5ai/private/php/core/class-request.php diff --git a/src/_h5ai/backend/php/core/class-session.php b/src/_h5ai/private/php/core/class-session.php similarity index 100% rename from src/_h5ai/backend/php/core/class-session.php rename to src/_h5ai/private/php/core/class-session.php diff --git a/src/_h5ai/backend/php/core/class-setup.php b/src/_h5ai/private/php/core/class-setup.php similarity index 89% rename from src/_h5ai/backend/php/core/class-setup.php rename to src/_h5ai/private/php/core/class-setup.php index 5bcef6cc..dd83f5cb 100644 --- a/src/_h5ai/backend/php/core/class-setup.php +++ b/src/_h5ai/private/php/core/class-setup.php @@ -74,9 +74,9 @@ class Setup { private function add_app_metadata() { - $this->set('NAME', '{{pkg.name}}'); + $this->set('NAME', 'h5ai'); $this->set('VERSION', '{{pkg.version}}'); - $this->set('FILE_PREFIX', '_{{pkg.name}}'); + $this->set('FILE_PREFIX', '_h5ai'); } private function add_server_metadata_and_check() { @@ -102,22 +102,23 @@ class Setup { $script_name = preg_replace('#^.*?//#', '/', $script_name); } - $this->set('APP_HREF', Util::normalize_path(dirname(dirname($script_name)), true)); - $this->set('APP_PATH', Util::normalize_path(dirname(dirname(dirname(dirname(__FILE__)))), false)); + $this->set('H5AI_HREF', Util::normalize_path(dirname($script_name), true)); + $this->set('H5AI_PATH', Util::normalize_path(dirname(dirname(dirname(dirname(__FILE__)))), false)); - $this->set('ROOT_HREF', Util::normalize_path(dirname($this->get('APP_HREF')), true)); - $this->set('ROOT_PATH', Util::normalize_path(dirname($this->get('APP_PATH')), false)); + $this->set('ROOT_HREF', Util::normalize_path(dirname($this->get('H5AI_HREF')), true)); + $this->set('ROOT_PATH', Util::normalize_path(dirname($this->get('H5AI_PATH')), false)); - $this->set('PUBLIC_HREF', Util::normalize_path($this->get('APP_HREF') . '/public', true)); - $this->set('PUBLIC_PATH', Util::normalize_path($this->get('APP_PATH') . '/public', false)); + $this->set('PUBLIC_HREF', Util::normalize_path($this->get('H5AI_HREF') . '/', true)); + $this->set('PUBLIC_PATH', Util::normalize_path($this->get('H5AI_PATH') . '/', false)); $this->set('INDEX_HREF', Util::normalize_path($this->get('PUBLIC_HREF') . '/index.php', false)); - $this->set('CACHE_PUB_HREF', Util::normalize_path($this->get('PUBLIC_HREF') . '/cache', true)); $this->set('CACHE_PUB_PATH', Util::normalize_path($this->get('PUBLIC_PATH') . '/cache', false)); $this->set('HAS_WRITABLE_CACHE_PUB', @is_writable($this->get('CACHE_PUB_PATH'))); - $this->set('CACHE_PRV_PATH', Util::normalize_path($this->get('APP_PATH') . '/backend/cache', false)); + $this->set('PRIVATE_PATH', Util::normalize_path($this->get('H5AI_PATH') . '/private', false)); + $this->set('CONF_PATH', Util::normalize_path($this->get('PRIVATE_PATH') . '/conf', false)); + $this->set('CACHE_PRV_PATH', Util::normalize_path($this->get('PRIVATE_PATH') . '/cache', false)); $this->set('HAS_WRITABLE_CACHE_PRV', @is_writable($this->get('CACHE_PRV_PATH'))); } diff --git a/src/_h5ai/backend/php/core/class-theme.php b/src/_h5ai/private/php/core/class-theme.php similarity index 100% rename from src/_h5ai/backend/php/core/class-theme.php rename to src/_h5ai/private/php/core/class-theme.php diff --git a/src/_h5ai/backend/php/core/class-util.php b/src/_h5ai/private/php/core/class-util.php similarity index 100% rename from src/_h5ai/backend/php/core/class-util.php rename to src/_h5ai/private/php/core/class-util.php diff --git a/src/_h5ai/backend/php/ext/class-archive.php b/src/_h5ai/private/php/ext/class-archive.php similarity index 100% rename from src/_h5ai/backend/php/ext/class-archive.php rename to src/_h5ai/private/php/ext/class-archive.php diff --git a/src/_h5ai/backend/php/ext/class-custom.php b/src/_h5ai/private/php/ext/class-custom.php similarity index 100% rename from src/_h5ai/backend/php/ext/class-custom.php rename to src/_h5ai/private/php/ext/class-custom.php diff --git a/src/_h5ai/backend/php/ext/class-search.php b/src/_h5ai/private/php/ext/class-search.php similarity index 100% rename from src/_h5ai/backend/php/ext/class-search.php rename to src/_h5ai/private/php/ext/class-search.php diff --git a/src/_h5ai/backend/php/ext/class-thumb.php b/src/_h5ai/private/php/ext/class-thumb.php similarity index 100% rename from src/_h5ai/backend/php/ext/class-thumb.php rename to src/_h5ai/private/php/ext/class-thumb.php diff --git a/src/_h5ai/backend/php/pages/index.php.jade b/src/_h5ai/private/php/pages/index.php.jade similarity index 53% rename from src/_h5ai/backend/php/pages/index.php.jade rename to src/_h5ai/private/php/pages/index.php.jade index 6c89cc6b..a0349771 100644 --- a/src/_h5ai/backend/php/pages/index.php.jade +++ b/src/_h5ai/private/php/pages/index.php.jade @@ -2,7 +2,7 @@ extends ./page.tpl.jade block init - - var title = 'index - powered by ' + pkg.name + ' v' + pkg.version + ' (' + pkg.homepage + ')' + - var title = 'index - powered by h5ai v' + pkg.version + ' (' + pkg.homepage + ')' - var module = 'index' block body diff --git a/src/_h5ai/backend/php/pages/info.php.jade b/src/_h5ai/private/php/pages/info.php.jade similarity index 50% rename from src/_h5ai/backend/php/pages/info.php.jade rename to src/_h5ai/private/php/pages/info.php.jade index 9db6d1e7..ab58e983 100644 --- a/src/_h5ai/backend/php/pages/info.php.jade +++ b/src/_h5ai/private/php/pages/info.php.jade @@ -2,11 +2,11 @@ extends ./page.tpl.jade block init - - var title = pkg.name + ' info page - v' + pkg.version + - var title = 'h5ai info page - v' + pkg.version - var module = 'info' block body div#content h1#header - a(href='#{pkg.homepage}') #{pkg.name} + a(href='#{pkg.homepage}') h5ai diff --git a/src/_h5ai/backend/php/pages/page.tpl.jade b/src/_h5ai/private/php/pages/page.tpl.jade similarity index 88% rename from src/_h5ai/backend/php/pages/page.tpl.jade rename to src/_h5ai/private/php/pages/page.tpl.jade index ffc523b9..06e1d920 100644 --- a/src/_h5ai/backend/php/pages/page.tpl.jade +++ b/src/_h5ai/private/php/pages/page.tpl.jade @@ -21,6 +21,6 @@ html(class='no-js', lang='en') div#fallback-hints span.noJsMsg Works best with JavaScript enabled! span.noBrowserMsg Works best in #[a(href='http://browsehappy.com') modern browsers]! - span.backlink #[a(href='#{pkg.homepage}', title='#{pkg.name} v#{pkg.version} - #{pkg.description}') powered by #{pkg.name}] + span.backlink #[a(href='#{pkg.homepage}', title='h5ai v#{pkg.version} - #{pkg.description}') powered by h5ai] block body diff --git a/src/_h5ai/public/.htaccess b/src/_h5ai/public/.htaccess deleted file mode 100644 index a891b9ba..00000000 --- a/src/_h5ai/public/.htaccess +++ /dev/null @@ -1,27 +0,0 @@ -Satisfy all -Order allow,deny -Allow from all - -DirectoryIndex disabled - - - Options -Indexes - - -AddDefaultCharset utf-8 - - - AddCharset utf-8 .css .html .js .json .php .svg - - - - ExpiresActive on - ExpiresDefault "access plus 1 month" - - ExpiresByType text/html "access plus 0 seconds" - ExpiresByType application/json "access plus 0 seconds" - - ExpiresByType text/css "access plus 1 week" - ExpiresByType application/javascript "access plus 1 week" - ExpiresByType image/x-icon "access plus 1 week" - diff --git a/test/index.html.jade b/test/index.html.jade index 7c7a54f6..5c7c2cee 100644 --- a/test/index.html.jade +++ b/test/index.html.jade @@ -3,7 +3,7 @@ html head meta( charset="utf-8" ) meta( http-equiv="x-ua-compatible", content="ie=edge" ) - title #{pkg.name} test suite - v#{pkg.version} + title h5ai test suite - v#{pkg.version} meta( name="viewport", content="width=device-width, initial-scale=1" ) link( rel="stylesheet", href="h5ai-styles.css" ) link( rel="stylesheet", href="styles.css" ) diff --git a/test/tests/integration/view.js b/test/tests/integration/view.js index 50585c2d..de79a32e 100644 --- a/test/tests/integration/view.js +++ b/test/tests/integration/view.js @@ -9,7 +9,7 @@ describe('view', function () { this.storeKey = '_h5ai'; this.xConfig = { setup: { - APP_HREF: util.uniqPath('-APP/'), + H5AI_HREF: util.uniqPath('-H5AI/'), ROOT_HREF: util.uniqPath('-ROOT/') } };