From 89d164f615bc7f47523aacb23e30389a954e48c0 Mon Sep 17 00:00:00 2001 From: Sam Stevens Date: Wed, 21 Mar 2018 19:17:31 +0000 Subject: [PATCH] Restructed project and added docker support. --- .dockerignore | 1 + .gitignore | 1 + Dockerfile | 12 ++ Saved/.gitkeep | 0 Saved/.htaccess | 4 - includer.php | 32 ---- default.htaccess => src/.htaccess | 0 {Classes => src/Classes}/HtRule/Form.php | 0 {Classes => src/Classes}/HtRule/HtRule.php | 0 {Classes => src/Classes}/HtRule/List.php | 2 +- {Classes => src/Classes}/HtRule/Param.php | 0 .../Classes}/HtRule/Rule/AppendSlash.php | 0 .../Classes}/HtRule/Rule/Comment.php | 0 .../Classes}/HtRule/Rule/Custom.php | 0 .../Classes}/HtRule/Rule/DenyFiles.php | 0 .../Classes}/HtRule/Rule/EnableRewrite.php | 0 .../Classes}/HtRule/Rule/FromWWW.php | 0 .../Classes}/HtRule/Rule/IndexToRoot.php | 0 .../Classes}/HtRule/Rule/MapIndex.php | 0 .../Classes}/HtRule/Rule/RedirectDomain.php | 0 .../Classes}/HtRule/Rule/RedirectUrls.php | 0 .../Classes}/HtRule/Rule/ToWWW.php | 0 .../Classes}/HtRule/Rule/UseHttps.php | 0 {Classes => src/Classes}/System.php | 4 +- {Media => src/Media}/Images/loading.gif | Bin {Media => src/Media}/Images/menu-wrapper.jpg | Bin .../Media}/Images/page-fullwidth.jpg | Bin {Media => src/Media}/Images/page.jpg | Bin {Media => src/Media}/Images/pagebottom.jpg | Bin .../Media}/Images/pagetop-fullwidth.jpg | Bin {Media => src/Media}/Images/pagetop.jpg | Bin {Media => src/Media}/Images/post.jpg | Bin {Media => src/Media}/Images/sidebar.jpg | Bin {Media => src/Media}/impromptu.css | 0 {Media => src/Media}/index.js | 0 .../Media}/jquery-impromptu.3.2.min.js | 0 {Media => src/Media}/jquery.min.js | 0 {Media => src/Media}/nicEdit.js | 0 {Media => src/Media}/nicEditorIcons.gif | Bin {Media => src/Media}/rules.js | 0 {Media => src/Media}/style.css | 0 .../css/themes/tooltipster-chocolate.css | 0 .../css/themes/tooltipster-clean-cut.css | 0 .../css/themes/tooltipster-smoke.css | 0 .../tooltipster-1.2/css/tooltipster.css | 0 .../tooltipster-1.2/js/jquery.tooltipster.js | 0 .../js/jquery.tooltipster.min.js | 0 ajax.php => src/ajax.php | 0 config.php => src/config.php | 18 +-- download.php => src/download.php | 0 functions.php => src/functions.php | 0 {html => src/html}/ajax/edit.php | 0 {html => src/html}/ajax/rules.php | 0 {html => src/html}/bottom.php | 40 ++--- {html => src/html}/creator.php | 0 {html => src/html}/footer.php | 0 {html => src/html}/messages.php | 0 {html => src/html}/sidebar.php | 0 {html => src/html}/top.php | 146 +++++++++--------- src/includer.php | 35 +++++ index.php => src/index.php | 0 recall.php => src/recall.php | 0 save.php => src/save.php | 0 63 files changed, 155 insertions(+), 140 deletions(-) create mode 100644 .dockerignore create mode 100644 Dockerfile create mode 100644 Saved/.gitkeep delete mode 100644 Saved/.htaccess delete mode 100644 includer.php rename default.htaccess => src/.htaccess (100%) rename {Classes => src/Classes}/HtRule/Form.php (100%) rename {Classes => src/Classes}/HtRule/HtRule.php (100%) rename {Classes => src/Classes}/HtRule/List.php (99%) rename {Classes => src/Classes}/HtRule/Param.php (100%) rename {Classes => src/Classes}/HtRule/Rule/AppendSlash.php (100%) rename {Classes => src/Classes}/HtRule/Rule/Comment.php (100%) rename {Classes => src/Classes}/HtRule/Rule/Custom.php (100%) rename {Classes => src/Classes}/HtRule/Rule/DenyFiles.php (100%) rename {Classes => src/Classes}/HtRule/Rule/EnableRewrite.php (100%) rename {Classes => src/Classes}/HtRule/Rule/FromWWW.php (100%) rename {Classes => src/Classes}/HtRule/Rule/IndexToRoot.php (100%) rename {Classes => src/Classes}/HtRule/Rule/MapIndex.php (100%) rename {Classes => src/Classes}/HtRule/Rule/RedirectDomain.php (100%) rename {Classes => src/Classes}/HtRule/Rule/RedirectUrls.php (100%) rename {Classes => src/Classes}/HtRule/Rule/ToWWW.php (100%) rename {Classes => src/Classes}/HtRule/Rule/UseHttps.php (100%) rename {Classes => src/Classes}/System.php (74%) rename {Media => src/Media}/Images/loading.gif (100%) rename {Media => src/Media}/Images/menu-wrapper.jpg (100%) rename {Media => src/Media}/Images/page-fullwidth.jpg (100%) rename {Media => src/Media}/Images/page.jpg (100%) rename {Media => src/Media}/Images/pagebottom.jpg (100%) rename {Media => src/Media}/Images/pagetop-fullwidth.jpg (100%) rename {Media => src/Media}/Images/pagetop.jpg (100%) rename {Media => src/Media}/Images/post.jpg (100%) rename {Media => src/Media}/Images/sidebar.jpg (100%) rename {Media => src/Media}/impromptu.css (100%) rename {Media => src/Media}/index.js (100%) rename {Media => src/Media}/jquery-impromptu.3.2.min.js (100%) rename {Media => src/Media}/jquery.min.js (100%) rename {Media => src/Media}/nicEdit.js (100%) rename {Media => src/Media}/nicEditorIcons.gif (100%) rename {Media => src/Media}/rules.js (100%) rename {Media => src/Media}/style.css (100%) rename {Media => src/Media}/tooltipster-1.2/css/themes/tooltipster-chocolate.css (100%) rename {Media => src/Media}/tooltipster-1.2/css/themes/tooltipster-clean-cut.css (100%) rename {Media => src/Media}/tooltipster-1.2/css/themes/tooltipster-smoke.css (100%) rename {Media => src/Media}/tooltipster-1.2/css/tooltipster.css (100%) rename {Media => src/Media}/tooltipster-1.2/js/jquery.tooltipster.js (100%) rename {Media => src/Media}/tooltipster-1.2/js/jquery.tooltipster.min.js (100%) rename ajax.php => src/ajax.php (100%) rename config.php => src/config.php (96%) rename download.php => src/download.php (100%) rename functions.php => src/functions.php (100%) rename {html => src/html}/ajax/edit.php (100%) rename {html => src/html}/ajax/rules.php (100%) rename {html => src/html}/bottom.php (96%) rename {html => src/html}/creator.php (100%) rename {html => src/html}/footer.php (100%) rename {html => src/html}/messages.php (100%) rename {html => src/html}/sidebar.php (100%) rename {html => src/html}/top.php (97%) create mode 100644 src/includer.php rename index.php => src/index.php (100%) rename recall.php => src/recall.php (100%) rename save.php => src/save.php (100%) diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..191381e --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +.git \ No newline at end of file diff --git a/.gitignore b/.gitignore index 3bac851..335b106 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /html/head-custom.php /config.local.php /.htaccess +/.idea \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..456cc8e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +FROM php:7.0-apache + +COPY . /srv/app + +RUN chown -R www-data:www-data /srv/app + +ENV APACHE_DOCUMENT_ROOT /srv/app/src + +RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf +RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf + +EXPOSE 80 \ No newline at end of file diff --git a/Saved/.gitkeep b/Saved/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/Saved/.htaccess b/Saved/.htaccess deleted file mode 100644 index 7b353d0..0000000 --- a/Saved/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ -Order deny,allow -Deny From All -Allow From home.xnet.tk -Options +Indexes \ No newline at end of file diff --git a/includer.php b/includer.php deleted file mode 100644 index 2b08f63..0000000 --- a/includer.php +++ /dev/null @@ -1,32 +0,0 @@ -id = uniqid(); $ds = DIRECTORY_SEPARATOR; - $dir = BASE_PATH.$ds.'Saved'.$ds; + $dir = SAVED_PATH.$ds; $dir .= substr($this->id, 0,2).$ds; $dir .= substr($this->id, 2,2).$ds; diff --git a/Classes/HtRule/Param.php b/src/Classes/HtRule/Param.php similarity index 100% rename from Classes/HtRule/Param.php rename to src/Classes/HtRule/Param.php diff --git a/Classes/HtRule/Rule/AppendSlash.php b/src/Classes/HtRule/Rule/AppendSlash.php similarity index 100% rename from Classes/HtRule/Rule/AppendSlash.php rename to src/Classes/HtRule/Rule/AppendSlash.php diff --git a/Classes/HtRule/Rule/Comment.php b/src/Classes/HtRule/Rule/Comment.php similarity index 100% rename from Classes/HtRule/Rule/Comment.php rename to src/Classes/HtRule/Rule/Comment.php diff --git a/Classes/HtRule/Rule/Custom.php b/src/Classes/HtRule/Rule/Custom.php similarity index 100% rename from Classes/HtRule/Rule/Custom.php rename to src/Classes/HtRule/Rule/Custom.php diff --git a/Classes/HtRule/Rule/DenyFiles.php b/src/Classes/HtRule/Rule/DenyFiles.php similarity index 100% rename from Classes/HtRule/Rule/DenyFiles.php rename to src/Classes/HtRule/Rule/DenyFiles.php diff --git a/Classes/HtRule/Rule/EnableRewrite.php b/src/Classes/HtRule/Rule/EnableRewrite.php similarity index 100% rename from Classes/HtRule/Rule/EnableRewrite.php rename to src/Classes/HtRule/Rule/EnableRewrite.php diff --git a/Classes/HtRule/Rule/FromWWW.php b/src/Classes/HtRule/Rule/FromWWW.php similarity index 100% rename from Classes/HtRule/Rule/FromWWW.php rename to src/Classes/HtRule/Rule/FromWWW.php diff --git a/Classes/HtRule/Rule/IndexToRoot.php b/src/Classes/HtRule/Rule/IndexToRoot.php similarity index 100% rename from Classes/HtRule/Rule/IndexToRoot.php rename to src/Classes/HtRule/Rule/IndexToRoot.php diff --git a/Classes/HtRule/Rule/MapIndex.php b/src/Classes/HtRule/Rule/MapIndex.php similarity index 100% rename from Classes/HtRule/Rule/MapIndex.php rename to src/Classes/HtRule/Rule/MapIndex.php diff --git a/Classes/HtRule/Rule/RedirectDomain.php b/src/Classes/HtRule/Rule/RedirectDomain.php similarity index 100% rename from Classes/HtRule/Rule/RedirectDomain.php rename to src/Classes/HtRule/Rule/RedirectDomain.php diff --git a/Classes/HtRule/Rule/RedirectUrls.php b/src/Classes/HtRule/Rule/RedirectUrls.php similarity index 100% rename from Classes/HtRule/Rule/RedirectUrls.php rename to src/Classes/HtRule/Rule/RedirectUrls.php diff --git a/Classes/HtRule/Rule/ToWWW.php b/src/Classes/HtRule/Rule/ToWWW.php similarity index 100% rename from Classes/HtRule/Rule/ToWWW.php rename to src/Classes/HtRule/Rule/ToWWW.php diff --git a/Classes/HtRule/Rule/UseHttps.php b/src/Classes/HtRule/Rule/UseHttps.php similarity index 100% rename from Classes/HtRule/Rule/UseHttps.php rename to src/Classes/HtRule/Rule/UseHttps.php diff --git a/Classes/System.php b/src/Classes/System.php similarity index 74% rename from Classes/System.php rename to src/Classes/System.php index 0ef2b64..210ee4b 100644 --- a/Classes/System.php +++ b/src/Classes/System.php @@ -20,7 +20,9 @@ class System header('Cache-Control: no-cache, no-store, must-revalidate'); header('Pragma: no-cache'); - session_set_cookie_params(60*60*24, self::$config->BasePath, $_SERVER['HTTP_HOST'], False, True); + $path = parse_url(self::$config->BasePath, PHP_URL_PATH); + + session_set_cookie_params(60*60*24, $path, $_SERVER['HTTP_HOST'], False, True); session_start(); } } diff --git a/Media/Images/loading.gif b/src/Media/Images/loading.gif similarity index 100% rename from Media/Images/loading.gif rename to src/Media/Images/loading.gif diff --git a/Media/Images/menu-wrapper.jpg b/src/Media/Images/menu-wrapper.jpg similarity index 100% rename from Media/Images/menu-wrapper.jpg rename to src/Media/Images/menu-wrapper.jpg diff --git a/Media/Images/page-fullwidth.jpg b/src/Media/Images/page-fullwidth.jpg similarity index 100% rename from Media/Images/page-fullwidth.jpg rename to src/Media/Images/page-fullwidth.jpg diff --git a/Media/Images/page.jpg b/src/Media/Images/page.jpg similarity index 100% rename from Media/Images/page.jpg rename to src/Media/Images/page.jpg diff --git a/Media/Images/pagebottom.jpg b/src/Media/Images/pagebottom.jpg similarity index 100% rename from Media/Images/pagebottom.jpg rename to src/Media/Images/pagebottom.jpg diff --git a/Media/Images/pagetop-fullwidth.jpg b/src/Media/Images/pagetop-fullwidth.jpg similarity index 100% rename from Media/Images/pagetop-fullwidth.jpg rename to src/Media/Images/pagetop-fullwidth.jpg diff --git a/Media/Images/pagetop.jpg b/src/Media/Images/pagetop.jpg similarity index 100% rename from Media/Images/pagetop.jpg rename to src/Media/Images/pagetop.jpg diff --git a/Media/Images/post.jpg b/src/Media/Images/post.jpg similarity index 100% rename from Media/Images/post.jpg rename to src/Media/Images/post.jpg diff --git a/Media/Images/sidebar.jpg b/src/Media/Images/sidebar.jpg similarity index 100% rename from Media/Images/sidebar.jpg rename to src/Media/Images/sidebar.jpg diff --git a/Media/impromptu.css b/src/Media/impromptu.css similarity index 100% rename from Media/impromptu.css rename to src/Media/impromptu.css diff --git a/Media/index.js b/src/Media/index.js similarity index 100% rename from Media/index.js rename to src/Media/index.js diff --git a/Media/jquery-impromptu.3.2.min.js b/src/Media/jquery-impromptu.3.2.min.js similarity index 100% rename from Media/jquery-impromptu.3.2.min.js rename to src/Media/jquery-impromptu.3.2.min.js diff --git a/Media/jquery.min.js b/src/Media/jquery.min.js similarity index 100% rename from Media/jquery.min.js rename to src/Media/jquery.min.js diff --git a/Media/nicEdit.js b/src/Media/nicEdit.js similarity index 100% rename from Media/nicEdit.js rename to src/Media/nicEdit.js diff --git a/Media/nicEditorIcons.gif b/src/Media/nicEditorIcons.gif similarity index 100% rename from Media/nicEditorIcons.gif rename to src/Media/nicEditorIcons.gif diff --git a/Media/rules.js b/src/Media/rules.js similarity index 100% rename from Media/rules.js rename to src/Media/rules.js diff --git a/Media/style.css b/src/Media/style.css similarity index 100% rename from Media/style.css rename to src/Media/style.css diff --git a/Media/tooltipster-1.2/css/themes/tooltipster-chocolate.css b/src/Media/tooltipster-1.2/css/themes/tooltipster-chocolate.css similarity index 100% rename from Media/tooltipster-1.2/css/themes/tooltipster-chocolate.css rename to src/Media/tooltipster-1.2/css/themes/tooltipster-chocolate.css diff --git a/Media/tooltipster-1.2/css/themes/tooltipster-clean-cut.css b/src/Media/tooltipster-1.2/css/themes/tooltipster-clean-cut.css similarity index 100% rename from Media/tooltipster-1.2/css/themes/tooltipster-clean-cut.css rename to src/Media/tooltipster-1.2/css/themes/tooltipster-clean-cut.css diff --git a/Media/tooltipster-1.2/css/themes/tooltipster-smoke.css b/src/Media/tooltipster-1.2/css/themes/tooltipster-smoke.css similarity index 100% rename from Media/tooltipster-1.2/css/themes/tooltipster-smoke.css rename to src/Media/tooltipster-1.2/css/themes/tooltipster-smoke.css diff --git a/Media/tooltipster-1.2/css/tooltipster.css b/src/Media/tooltipster-1.2/css/tooltipster.css similarity index 100% rename from Media/tooltipster-1.2/css/tooltipster.css rename to src/Media/tooltipster-1.2/css/tooltipster.css diff --git a/Media/tooltipster-1.2/js/jquery.tooltipster.js b/src/Media/tooltipster-1.2/js/jquery.tooltipster.js similarity index 100% rename from Media/tooltipster-1.2/js/jquery.tooltipster.js rename to src/Media/tooltipster-1.2/js/jquery.tooltipster.js diff --git a/Media/tooltipster-1.2/js/jquery.tooltipster.min.js b/src/Media/tooltipster-1.2/js/jquery.tooltipster.min.js similarity index 100% rename from Media/tooltipster-1.2/js/jquery.tooltipster.min.js rename to src/Media/tooltipster-1.2/js/jquery.tooltipster.min.js diff --git a/ajax.php b/src/ajax.php similarity index 100% rename from ajax.php rename to src/ajax.php diff --git a/config.php b/src/config.php similarity index 96% rename from config.php rename to src/config.php index e8f6151..ab59f4b 100644 --- a/config.php +++ b/src/config.php @@ -1,10 +1,10 @@ -  - - - - - - - - - - -
 
- - - - + + + + + + + + + +
 
+ + + + \ No newline at end of file diff --git a/html/creator.php b/src/html/creator.php similarity index 100% rename from html/creator.php rename to src/html/creator.php diff --git a/html/footer.php b/src/html/footer.php similarity index 100% rename from html/footer.php rename to src/html/footer.php diff --git a/html/messages.php b/src/html/messages.php similarity index 100% rename from html/messages.php rename to src/html/messages.php diff --git a/html/sidebar.php b/src/html/sidebar.php similarity index 100% rename from html/sidebar.php rename to src/html/sidebar.php diff --git a/html/top.php b/src/html/top.php similarity index 97% rename from html/top.php rename to src/html/top.php index 544eb37..7cd0220 100644 --- a/html/top.php +++ b/src/html/top.php @@ -1,74 +1,74 @@ - - - - - - - Htaccess Builder - - - - - - - - - - - - - - - Debug): ?> - - - - - - - Fork me on GitHub -
-
- -
- - -
> -
> -
> -
> - -
- -
- - - - + + + + + + + Htaccess Builder + + + + + + + + + + + + + + + Debug): ?> + + + + + + + Fork me on GitHub +
+
+ +
+ + +
> +
> +
> +
> + +
+ +
+ + + + \ No newline at end of file diff --git a/src/includer.php b/src/includer.php new file mode 100644 index 0000000..b1aaafb --- /dev/null +++ b/src/includer.php @@ -0,0 +1,35 @@ +