Reorganize file structure.

mkrfile.js

@@ -60,7 +60,7 @@ module.exports = function (suite) {
         var fs = require('fs');
         var jshint = JSON.parse(fs.readFileSync('.jshintrc', 'utf8'));
 
-        $(src + '/_h5ai/js: **/*.js, ! lib/**')
+        $(src + '/_h5ai/public/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/js/*.js')
+        $(src + ': _h5ai/public/js/*.js')
-            .newerThan(mapSrc, $(src + ': _h5ai/js/**'))
+            .newerThan(mapSrc, $(src + ': _h5ai/public/js/**'))
             .includeit()
             .if(!suite.args.uncompressed, function () { this.uglifyjs(); })
             .wrap(header)
             .write(mapSrc, true);
 
-        $(src + ': _h5ai/css/*.less')
+        $(src + ': _h5ai/public/css/*.less')
-            .newerThan(mapSrc, $(src + ': _h5ai/css/**'))
+            .newerThan(mapSrc, $(src + ': _h5ai/public/css/**'))
             .includeit()
             .less()
             .autoprefixer()
@@ -93,7 +93,7 @@ module.exports = function (suite) {
             .jade(env)
             .write(mapSrc, true);
 
-        $(src + ': **, ! _h5ai/js/**, ! _h5ai/css/**, ! **/*.jade')
+        $(src + ': **, ! _h5ai/public/js/**, ! _h5ai/public/css/**, ! **/*.jade')
             .newerThan(mapSrc)
             .handlebars(env)
             .write(mapSrc, true);
@@ -135,13 +135,13 @@ module.exports = function (suite) {
 
         var env = {pkg: pkg};
 
-        $(src + '/_h5ai/css/styles.less')
+        $(src + '/_h5ai/public/css/styles.less')
             .includeit()
             .less()
             .autoprefixer()
             .write(build + '/test/h5ai-styles.css', true);
 
-        $(src + '/_h5ai/js/scripts.js')
+        $(src + '/_h5ai/public/js/scripts.js')
             .includeit()
             .write(build + '/test/h5ai-scripts.js', true);
 

src/_h5ai/.htaccess

@@ -1,27 +1,3 @@
 Satisfy all
-Order allow,deny
+Order deny,allow
-Allow from all
+Deny from all
-
-DirectoryIndex disabled
-
-<IfModule mod_autoindex.c>
-    Options -Indexes
-</IfModule>
-
-AddDefaultCharset utf-8
-
-<IfModule mod_mime.c>
-    AddCharset utf-8 .css .html .js .json .php .svg
-</IfModule>
-
-<IfModule mod_expires.c>
-    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"
-</IfModule>

src/_h5ai/private/php/core/class-setup.php

@@ -102,14 +102,14 @@ class Setup {
             $script_name = preg_replace('#^.*?//#', '/', $script_name);
         }
 
-        $this->set('H5AI_HREF', Util::normalize_path(dirname($script_name), true));
+        $this->set('H5AI_HREF', Util::normalize_path(dirname(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('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('H5AI_HREF') . '/', true));
+        $this->set('PUBLIC_HREF', Util::normalize_path($this->get('H5AI_HREF') . '/public/', true));
-        $this->set('PUBLIC_PATH', Util::normalize_path($this->get('H5AI_PATH') . '/', false));
+        $this->set('PUBLIC_PATH', Util::normalize_path($this->get('H5AI_PATH') . '/public/', 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));

src/_h5ai/public/.htaccess

@@ -0,0 +1,27 @@
+Satisfy all
+Order allow,deny
+Allow from all
+
+DirectoryIndex disabled
+
+<IfModule mod_autoindex.c>
+    Options -Indexes
+</IfModule>
+
+AddDefaultCharset utf-8
+
+<IfModule mod_mime.c>
+    AddCharset utf-8 .css .html .js .json .php .svg
+</IfModule>
+
+<IfModule mod_expires.c>
+    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"
+</IfModule>

src/_h5ai/public/index.php

@@ -8,5 +8,5 @@ if (!function_exists('version_compare') || version_compare(PHP_VERSION, MIN_PHP_
     exit;
 }
 
-require_once __DIR__ . '/private/php/class-bootstrap.php';
+require_once __DIR__ . '/../private/php/class-bootstrap.php';
 Bootstrap::run();