Merge branch 'release/1.6.20'

Release 1.6.18

.dependencies

@@ -11,9 +11,9 @@ git:
         url: https://github.com/getgrav/grav-plugin-markdown-notices
         path: user/plugins/markdown-notices
         branch: master
-    antimatter:
-        url: https://github.com/getgrav/grav-theme-antimatter
-        path: user/themes/antimatter
+    quark:
+        url: https://github.com/getgrav/grav-theme-quark
+        path: user/themes/quark
         branch: master
 links:
     problems:
@@ -28,7 +28,7 @@ links:
         src: grav-plugin-markdown-notices
         path: user/plugins/markdown-notices
         scm: github
-    antimatter:
-        src: grav-theme-antimatter
-        path: user/themes/antimatter
+    quark:
+        src: grav-theme-quark
+        path: user/themes/quark
         scm: github

.editorconfig

@@ -13,6 +13,5 @@ indent_style = space
 indent_size = 4
 
 # 2 space indentation
-[*.yaml, *.yml]
-indent_style = space
+[*.{yaml,.yml}]
 indent_size = 2

.github/FUNDING.yml

@@ -0,0 +1,8 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: grav
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+custom: # Replace with a single custom sponsorship URL

.gitignore

@@ -1,6 +1,7 @@
 # Composer
 .composer
-/vendor
+vendor/*
+!*/vendor/*
 
 # Sass
 .sass-cache
@@ -25,6 +26,7 @@ user/plugins/*
 user/themes/*
 !user/themes/.*
 user/localhost/config/security.yaml
+user/config/security.yaml
 
 # OS Generated
 .DS_Store*
@@ -35,9 +37,10 @@ Thumbs.db
 
 # phpstorm
 .idea/*
-user/config/security.yaml
 
+# testing stuff
 tests/_output/*
 tests/_support/_generated/*
 tests/cache/*
 tests/error.log
+system/templates/testing/*

.htaccess

@@ -13,6 +13,16 @@ RewriteEngine On
 
 ## End - RewriteBase
 
+## Begin - X-Forwarded-Proto
+# In some hosted or load balanced environments, SSL negotiation happens upstream.
+# In order for Grav to recognize the connection as secure, you need to uncomment
+# the following lines.
+#
+# RewriteCond %{HTTP:X-Forwarded-Proto} https
+# RewriteRule .* - [E=HTTPS:on]
+#
+## End - X-Forwarded-Proto
+
 ## Begin - Exploits
 # If you experience problems on your site block out the operations listed below
 # This attempts to block the most common type of exploit `attempts` to Grav
@@ -44,17 +54,17 @@ RewriteRule .* index.php [L]
 
 ## Begin - Security
 # Block all direct access for these folders
-RewriteRule ^(.git|cache|bin|logs|backup|webserver-configs|tests)/(.*) error [F]
+RewriteRule ^(\.git|cache|bin|logs|backup|webserver-configs|tests)/(.*) error [F]
 # Block access to specific file types for these system folders
-RewriteRule ^(system|vendor)/(.*)\.(txt|xml|md|html|yaml|php|pl|py|cgi|twig|sh|bat)$ error [F]
+RewriteRule ^(system|vendor)/(.*)\.(txt|xml|md|html|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ error [F]
 # Block access to specific file types for these user folders
-RewriteRule ^(user)/(.*)\.(txt|md|yaml|php|pl|py|cgi|twig|sh|bat)$ error [F]
+RewriteRule ^(user)/(.*)\.(txt|md|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ error [F]
 # Block all direct access to .md files:
 RewriteRule \.md$ error [F]
 # Block all direct access to files and folders beginning with a dot
 RewriteRule (^|/)\.(?!well-known) - [F]
 # Block access to specific files in the root folder
-RewriteRule ^(LICENSE.txt|composer.lock|composer.json|\.htaccess)$ error [F]
+RewriteRule ^(LICENSE\.txt|composer\.lock|composer\.json|\.htaccess)$ error [F]
 ## End - Security
 
 </IfModule>

.travis.yml

@@ -1,9 +1,8 @@
 language: php
 php:
-  - '5.5'
-  - '5.6'
-  - '7.0'
-  - hhvm
+  - '7.1'
+  - '7.2'
+  - '7.3'
 branches:
   only:
     - develop
@@ -13,13 +12,6 @@ notifications:
   email:
     on_success: never
     on_failure: always
-  hipchat:
-  # hipchat_api@grav
-    rooms:
-      - secure: "bqO0wM1B7bJnQw2fuhquSXEqI9gw6WmFytIh9sEWXzbYTzTUP5t0PcKOd3FT2BNMRaDxPJLVl+vG/oqmqDUBkEmOGcG504IQjeNzZqnMz0tXQMIcCc22Las9tFfc4Jf6RVi/qGomFtHGE9Wgii+TAN4zqZaufbNjwd8SyjO0+W8="
-    template:
-      - '%{repository}#%{build_number} (%{branch}): Travis Job Finished [%{duration}] (<a href="%{build_url}">Details</a>)'
-    format: html
   slack:
     secure: dowksPsxxCxGKT6nis5hUgkp6+ZDAhoqzQHF9rJnx4hx0iEygPhVBs7pKl9yL2jubYJoLs+EXwE7z1dYgDAEJh4BnfrCokCMLpFGcxVxQC/HeAUdSQ2/RtdBYR5PRT75ScaFpqM/SfXXZVtnwVXAw9Z+JC6BjQ9vmn23m51Jw4k=
 env:
@@ -38,13 +30,11 @@ env:
     - GOPATH="$HOME/go"
     - PATH="$GOPATH/bin:$PATH"
     # GH_TOKEN [API Key]
-    - secure: "jS+c+g2v33vypG4VtqiSDW2qQ4dGJZlrUKBRCztoy1yrOrYRPvc5Vzi/AS3fDmZ4yizukEwmUNNzyZQcgFvLPpmCCml46Dovp8R9OXhbNe8OnULmaSn2Zkr71oblMYu6ZP+RpYvNq0BIdSB3u2TiFriHMiTIkX9UwZNaUCOX1ig="
+    - secure: "NR9pV7YteY9OoPmjDTQG0fDfocVu+tCeiDH1F2GFhXCu71UOIvqWXpOxp0RHkG5GIXdCFHx59yu+ZO275lbaHkbF8+4lVSVrV4RcGn+pIncvxr6iZCVW05dbAxV3H8alK+xYJRGmbyfQl5wIM49WvmuGHZjcmIloS4t/omQ3N+I="
     # BB_TOKEN value => "user:pass@"
     - secure: "einUtSEkUWy2IrqLXyVjwUU+mwaaoiOXRRVdLBpA3Zye6bZx8cm5h/5AplkPWhM/NmCJoW/MwNZHHkFhlr3mDRov5iOxVmTTYfnXB+I5lxYTSgduOLLErS7mU8hfADpVDU8bHNU44fNGD3UEiG1PD4qQBX4DMlqIFmR20mjs81k="
     # GH_API_USER [for curl]
     - secure: "AQGcX1B2NrI8ajflY4AimZDNcK2kBA3F6mbtEFQ78NkDoWhMipsQHayWXiSTzRc0YJKvQl2Y16MTwQF4VHzjTAiiZFATgA8J88vQUjIPabi/kKjqSmcLFoaAOAxStQbW6e0z2GiQ6KBMcNF1y5iUuI63xVrBvtKrYX/w5y+ako8="
-    # Latest Release version
-    - TRAVIS_TAG=$(curl --fail --user "${GH_API_USER}" -s https://api.github.com/repos/getgrav/grav/releases/latest | grep tag_name | head -n 1 | cut -d '"' -f 4)
 
 before_install:
   - export TZ=Pacific/Honolulu
@@ -55,7 +45,9 @@ before_install:
   - if [ $TRAVIS_BRANCH == 'develop' ] || [ $TRAVIS_PULL_REQUEST != 'false' ]; then
         composer install --dev --prefer-dist;
     fi
-  - if [ $TRAVIS_BRANCH != 'develop' ] && [ $TRAVIS_PHP_VERSION == "5.6" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
+  - if [ $TRAVIS_BRANCH != 'develop' ] && [ $TRAVIS_PHP_VERSION == "7.1" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
+        export TRAVIS_TAG=$(curl --fail --user "${GH_API_USER}" -s https://api.github.com/repos/getgrav/grav/releases/latest | grep tag_name | head -n 1 | cut -d '"' -f 4);
+        eval "$(curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | GIMME_GO_VERSION=1.8 bash)";
         go get github.com/aktau/github-release;
         git clone --quiet --depth=50 --branch=master https://${BB_TOKEN}bitbucket.org/rockettheme/grav-devtools.git $RT_DEVTOOLS  &>/dev/null;
         if [ ! -z "$TRAVIS_TAG" ]; then
@@ -69,8 +61,8 @@ script:
   - if [ $TRAVIS_BRANCH == 'develop' ] || [ $TRAVIS_PULL_REQUEST != 'false' ]; then
         vendor/bin/codecept run;
     fi
-  - echo $TRAVIS_TAG
-  - if [ ! -z "$TRAVIS_TAG" ] && [ $TRAVIS_BRANCH != 'develop' ] && [ $TRAVIS_PHP_VERSION == "5.6" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
+  - echo "Latest Release Tag - ${TRAVIS_TAG}"
+  - if [ ! -z "$TRAVIS_TAG" ] && [ $TRAVIS_BRANCH != 'develop' ] && [ $TRAVIS_PHP_VERSION == "7.1" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
       FILES="$RT_DEVTOOLS/grav-dist/*.zip";
       for file in ${FILES[@]}; do
         NAME=${file##*/};

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at contact@getgrav.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

@@ -12,7 +12,7 @@ patches and features.
 
 ## Grav, Plugins, Themes and Skeletons
 
-Grav is a large open source project—it's made up of over 100 repositories. When you initially consider contributing to Grav, you might be unsure about which of those 200 repositories implements the functionality you want to change or report a bug for.
+Grav is a large open source project — it's made up of over 100 repositories. When you initially consider contributing to Grav, you might be unsure about which of those 200 repositories implements the functionality you want to change or report a bug for.
 
 [https://github.com/getgrav/grav](https://github.com/getgrav/grav) is the main Grav repository. The core of Grav is provided by this repo.
 
@@ -29,7 +29,7 @@ The issue tracker is the preferred channel for [bug reports](#bugs),
 requests](#pull-requests), but please respect the following restrictions:
 
 * Please **do not** use the issue tracker for support requests. Use
-  [the Forum](http://getgrav.org/forum) or [the Gitter chat](https://gitter.im/getgrav/grav).
+  [the Forum](http://getgrav.org/forum) or [the Chat](https://chat.getgrav.org/).
 
 
 <a name="bugs"></a>
@@ -60,20 +60,20 @@ Guidelines for bug reports:
 A good bug report shouldn't leave others needing to chase you up for more
 information. Please try to be as detailed as possible in your report.
 
-What is your environment? Is it localhost, OSX, Linux, on a remote server? Same happening locally and or the server, or just locally or just on Linux?
+- What is your environment? Is it localhost, OSX, Linux, on a remote server? Same happening locally and or the server, or just locally or just on Linux?
 
-What steps will reproduce the issue? What browser(s) and OS experience the problem?
+- What steps will reproduce the issue? What browser(s) and OS experience the problem?
 
-What would you expect to be the outcome?
+- What would you expect to be the outcome?
 
-Did the problem start happening recently (e.g. after updating to a new version of Grav) or was this always a problem?
+- Did the problem start happening recently (e.g. after updating to a new version of Grav) or was this always a problem?
 
-If the problem started happening recently, can you reproduce the problem in an older version of Grav? What's the most recent version in which the problem doesn't happen? You can download older versions of Grav from the releases page on Github.
+- If the problem started happening recently, can you reproduce the problem in an older version of Grav? What's the most recent version in which the problem doesn't happen? You can download older versions of Grav from the releases page on Github.
 
-Can you reliably reproduce the issue? If not, provide details about how often the problem happens and under which conditions it normally happens.
+- Can you reliably reproduce the issue? If not, provide details about how often the problem happens and under which conditions it normally happens.
 
 
-All these details will help people to fix any potential bugs.
+All these details will help contributors to fix any potential bugs.
 
 Important: [include Code Samples in triple backticks](https://help.github.com/articles/github-flavored-markdown/#fenced-code-blocks) so that Github will provide a proper indentation. [Add the language name after the backticks](https://help.github.com/articles/github-flavored-markdown/#syntax-highlighting) to add syntax highlighting to the code snippets.
 
@@ -110,7 +110,8 @@ Good pull requests - patches, improvements, new features - are a fantastic
 help. They should remain focused in scope and avoid containing unrelated
 commits.
 
-**Please ask first** in Gitter or in the Forum before embarking on any significant pull request (e.g.
+**Please ask first** in [the Forum](http://getgrav.org/forum) or [the Chat](https://chat.getgrav.org/) 
+before embarking on any significant pull request (e.g.
 implementing features, refactoring code..),
 otherwise you risk spending a lot of time working on something that the
 project's developers might not want to merge into the project.
@@ -120,5 +121,18 @@ accurate comments, etc.) and any other requirements.
 
 See [Using Pull Request](https://help.github.com/articles/using-pull-requests/) and [Fork a Repo](https://help.github.com/articles/fork-a-repo/) if you're not familiar with Pull Requests.
 
+Any pull request should be based on the `develop` branch. We will not consider pull requests made to master.
+
 **IMPORTANT**: By submitting a patch, you agree to allow the project owner to
 license your work under the same license as that used by the project.
+
+<a name="translations"></a>
+### Translations
+Translations for Grav core and the Admin plugin are managed through Crowdin:
+
+- Admin: https://crowdin.com/project/grav-admin
+- Core: https://crowdin.com/project/grav-core
+
+Please do not post translations PRs for core or admin translations on GitHub, with the exception of fixes for the english language.
+
+All other plugins and themes translations are handled directly in their GitHub repository, and the string are usually found in the `languages.yaml` file at the root of each project.

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Grav
+Copyright (c) 2018 Grav
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,25 +1,28 @@
 # ![](https://avatars1.githubusercontent.com/u/8237355?v=2&s=50) Grav
 
-[![SensioLabsInsight](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad/mini.png)](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad) [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/getgrav/grav?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.org/getgrav/grav.svg?branch=develop)](https://travis-ci.org/getgrav/grav)
+[![PHPStan](https://img.shields.io/badge/PHPStan-enabled-brightgreen.svg?style=flat)](https://github.com/phpstan/phpstan)
+[![SensioLabsInsight](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad/mini.png)](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad)
+[![Discord](https://img.shields.io/discord/501836936584101899.svg?logo=discord&colorB=728ADA&label=Discord%20Chat)](https://chat.getgrav.org)
+ [![Build Status](https://travis-ci.org/getgrav/grav.svg?branch=develop)](https://travis-ci.org/getgrav/grav) [![OpenCollective](https://opencollective.com/grav/backers/badge.svg)](#backers) [![OpenCollective](https://opencollective.com/grav/sponsors/badge.svg)](#sponsors)
 
 Grav is a **Fast**, **Simple**, and **Flexible**, file-based Web-platform.  There is **Zero** installation required.  Just extract the ZIP archive, and you are already up and running.  It follows similar principles to other flat-file CMS platforms, but has a different design philosophy than most. Grav comes with a powerful **Package Management System** to allow for simple installation and upgrading of plugins and themes, as well as simple updating of Grav itself.
 
 The underlying architecture of Grav is designed to use well-established and _best-in-class_ technologies to ensure that Grav is simple to use and easy to extend. Some of these key technologies include:
 
-* [Twig Templating](http://twig.sensiolabs.org/): for powerful control of the user interface
-* [Markdown](http://en.wikipedia.org/wiki/Markdown): for easy content creation
-* [YAML](http://yaml.org): for simple configuration
-* [Parsedown](http://parsedown.org/): for fast Markdown and Markdown Extra support
-* [Doctrine Cache](http://doctrine-orm.readthedocs.io/projects/doctrine-orm/en/latest/reference/caching.html): layer for performance
-* [Pimple Dependency Injection Container](http://pimple.sensiolabs.org/): for extensibility and maintainability
-* [Symfony Event Dispatcher](http://symfony.com/doc/current/components/event_dispatcher/introduction.html): for plugin event handling
-* [Symfony Console](http://symfony.com/doc/current/components/console/introduction.html): for CLI interface
+* [Twig Templating](https://twig.sensiolabs.org/): for powerful control of the user interface
+* [Markdown](https://en.wikipedia.org/wiki/Markdown): for easy content creation
+* [YAML](https://yaml.org): for simple configuration
+* [Parsedown](https://parsedown.org/): for fast Markdown and Markdown Extra support
+* [Doctrine Cache](https://www.doctrine-project.org/projects/doctrine-orm/en/latest/reference/caching.html): layer for performance
+* [Pimple Dependency Injection Container](https://pimple.sensiolabs.org/): for extensibility and maintainability
+* [Symfony Event Dispatcher](https://symfony.com/doc/current/components/event_dispatcher/introduction.html): for plugin event handling
+* [Symfony Console](https://symfony.com/doc/current/components/console/introduction.html): for CLI interface
 * [Gregwar Image Library](https://github.com/Gregwar/Image): for dynamic image manipulation
 
 # Requirements
 
-- PHP 5.5.9 or higher. Check the [required modules list](http://learn.getgrav.org/basics/requirements#php-requirements)
-- Check the [Apache](http://learn.getgrav.org/basics/requirements#apache-requirements) or [IIS](http://learn.getgrav.org/basics/requirements#iis-requirements) requirements
+- PHP 7.1.3 or higher. Check the [required modules list](https://learn.getgrav.org/basics/requirements#php-requirements)
+- Check the [Apache](https://learn.getgrav.org/basics/requirements#apache-requirements) or [IIS](https://learn.getgrav.org/basics/requirements#iis-requirements) requirements
 
 # QuickStart
 
@@ -27,7 +30,7 @@ These are the options to get Grav:
 
 ### Downloading a Grav Package
 
-You can download a **ready-built** package from the [Downloads page on http://getgrav.org](http://getgrav.org/downloads)
+You can download a **ready-built** package from the [Downloads page on https://getgrav.org](https://getgrav.org/downloads)
 
 ### With Composer
 
@@ -45,17 +48,17 @@ $ composer create-project getgrav/grav ~/webroot/grav
    $ git clone https://github.com/getgrav/grav.git
    ```
 
-2. Install the **plugin** and **theme dependencies** by using the [Grav CLI application](http://learn.getgrav.org/advanced/grav-cli) `bin/grav`:
+2. Install the **plugin** and **theme dependencies** by using the [Grav CLI application](https://learn.getgrav.org/advanced/grav-cli) `bin/grav`:
    ```
    $ cd ~/webroot/grav
    $ bin/grav install
    ```
 
-Check out the [install procedures](http://learn.getgrav.org/basics/installation) for more information.
+Check out the [install procedures](https://learn.getgrav.org/basics/installation) for more information.
 
 # Adding Functionality
 
-You can download [plugins](http://getgrav.org/downloads/plugins) or [themes](http://getgrav.org/downloads/themes) manually from the appropriate tab on the [Downloads page on http://getgrav.org](http://getgrav.org/downloads), but the preferred solution is to use the [Grav Package Manager](http://learn.getgrav.org/advanced/grav-gpm) or `GPM`:
+You can download [plugins](https://getgrav.org/downloads/plugins) or [themes](https://getgrav.org/downloads/themes) manually from the appropriate tab on the [Downloads page on https://getgrav.org](https://getgrav.org/downloads), but the preferred solution is to use the [Grav Package Manager](https://learn.getgrav.org/advanced/grav-gpm) or `GPM`:
 
 ```
 $ bin/gpm index
@@ -69,7 +72,7 @@ $ bin/gpm install <plugin/theme>
 
 # Updating
 
-To update Grav you should use the [Grav Package Manager](http://learn.getgrav.org/advanced/grav-gpm) or `GPM`:
+To update Grav you should use the [Grav Package Manager](https://learn.getgrav.org/advanced/grav-gpm) or `GPM`:
 
 ```
 $ bin/gpm selfupgrade
@@ -83,31 +86,37 @@ $ bin/gpm update
 
 
 # Contributing
-We appreciate any contribution to Grav, whether it is related to bugs, grammar, or simply a suggestion or improvement.
-However, we ask that any contributions follow our simple guidelines in order to be properly received.
+We appreciate any contribution to Grav, whether it is related to bugs, grammar, or simply a suggestion or improvement! Please refer to the [Contributing guide](CONTRIBUTING.md) for more guidance on this topic.
 
-All our projects follow the [GitFlow branching model][gitflow-model], from development to release. If you are not familiar with it, there are several guides and tutorials to make you understand what it is about.
-
-You will probably want to get started by installing [this very good collection of git extensions][gitflow-extensions].
-
-What you mainly want to know is that:
-
-- All the main activity happens in the `develop` branch. Any pull request should be addressed only to that branch. We will not consider pull requests made to the `master`.
-- It's very well appreciated, and highly suggested, to start a new feature whenever you want to make changes or add functionalities. It will make it much easier for us to just checkout your feature branch and test it, before merging it into `develop`
+## Security issues
+If you discover a possible security issue related to Grav or one of its plugins, please email the core team at contact@getgrav.org and we'll address it as soon as possible.
 
 # Getting Started
 
-* [What is Grav?](http://learn.getgrav.org/basics/what-is-grav)
-* [Install](http://learn.getgrav.org/basics/installation) Grav in few seconds
-* Understand the [Configuration](http://learn.getgrav.org/basics/grav-configuration)
-* Take a peek at our available free [Skeletons](http://getgrav.org/downloads/skeletons)
-* If you have questions, jump on our [Gitter Room](https://gitter.im/getgrav/grav)!
+* [What is Grav?](https://learn.getgrav.org/basics/what-is-grav)
+* [Install](https://learn.getgrav.org/basics/installation) Grav in few seconds
+* Understand the [Configuration](https://learn.getgrav.org/basics/grav-configuration)
+* Take a peek at our available free [Skeletons](https://getgrav.org/downloads/skeletons)
+* If you have questions, jump on our [Discord Chat Server](https://chat.getgrav.org)!
 * Have fun!
 
 # Exploring More
 
-* Have a look at our [Basic Tutorial](http://learn.getgrav.org/basics/basic-tutorial)
-* Dive into more [advanced](http://learn.getgrav.org/advanced) functions
+* Have a look at our [Basic Tutorial](https://learn.getgrav.org/basics/basic-tutorial)
+* Dive into more [advanced](https://learn.getgrav.org/advanced) functions
+* Learn about the [Grav CLI](https://learn.getgrav.org/cli-console/grav-cli)
+* Review examples in the [Grav Cookbook](https://learn.getgrav.org/cookbook)
+* More [Awesome Grav Stuff](https://github.com/getgrav/awesome-grav)
+
+# Backers
+Support Grav with a monthly donation to help us continue development. [[Become a backer](https://opencollective.com/grav#backer)]
+
+<img src="https://opencollective.com/grav/tiers/backers.svg?avatarHeight=36&width=600" />
+
+# Sponsors
+Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/grav#sponsor)]
+
+<img src="https://opencollective.com/grav/tiers/sponsors.svg?avatarHeight=36&width=600" />
 
 # License
 
@@ -121,5 +130,5 @@ See [LICENSE](LICENSE.txt)
 
 First install the dev dependencies by running `composer update` from the Grav root.
 Then `composer test` will run the Unit Tests, which should be always executed successfully on any site.
-
+Windows users should use the `composer test-windows` command.
 You can also run a single unit test file, e.g. `composer test tests/unit/Grav/Common/AssetsTest.php`

bin/gpm

@@ -1,26 +1,24 @@
 #!/usr/bin/env php
 <?php
-define('GRAV_CLI', true);
-
-if (!file_exists(__DIR__ . '/../vendor')){
-    require_once __DIR__ . '/../system/src/Grav/Common/Composer.php';
-}
 
 use Grav\Common\Composer;
-use Grav\Common\Config\Setup;
+use Symfony\Component\Console\Application;
+use Grav\Common\Grav;
 
-if (!file_exists(__DIR__ . '/../vendor')){
+\define('GRAV_CLI', true);
+\define('GRAV_REQUEST_TIME', microtime(true));
+
+if (!file_exists(__DIR__ . '/../vendor/autoload.php')){
     // Before we can even start, we need to run composer first
+    require_once __DIR__ . '/../system/src/Grav/Common/Composer.php';
+
     $composer = Composer::getComposerExecutor();
     echo "Preparing to install vendor dependencies...\n\n";
     echo system($composer.' --working-dir="'.__DIR__.'/../" --no-interaction --no-dev --prefer-dist -o install');
     echo "\n\n";
 }
 
-use Symfony\Component\Console\Application;
-use Grav\Common\Grav;
-
-$autoload = require_once(__DIR__ . '/../vendor/autoload.php');
+$autoload = require __DIR__ . '/../vendor/autoload.php';
 
 if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
     exit(sprintf("You are running PHP %s, but Grav needs at least PHP %s to run.\n", $ver, $req));
@@ -30,7 +28,7 @@ if (!ini_get('date.timezone')) {
     date_default_timezone_set('UTC');
 }
 
-if (!file_exists(ROOT_DIR . 'index.php')) {
+if (!file_exists(GRAV_ROOT . '/index.php')) {
     exit('FATAL: Must be run from ROOT directory of Grav!');
 }
 
@@ -48,15 +46,16 @@ $climate->arguments->add([
     ]
 ]);
 $climate->arguments->parse();
-$environment = $climate->arguments->get('environment');
 
 // Set up environment based on params.
-Setup::$environment = $environment;
+$environment = $climate->arguments->get('environment');
 
 $grav = Grav::instance(array('loader' => $autoload));
-$grav['uri']->init();
+$grav->setup($environment);
+
 $grav['config']->init();
-$grav['streams'];
+$grav['uri']->init();
+$grav['users'];
 
 $app = new Application('Grav Package Manager', GRAV_VERSION);
 $app->addCommands(array(
@@ -67,6 +66,7 @@ $app->addCommands(array(
     new \Grav\Console\Gpm\UninstallCommand(),
     new \Grav\Console\Gpm\UpdateCommand(),
     new \Grav\Console\Gpm\SelfupgradeCommand(),
+    new \Grav\Console\Gpm\DirectInstallCommand(),
 ));
 
 $app->run();

bin/grav

@@ -1,34 +1,52 @@
 #!/usr/bin/env php
 <?php
-define('GRAV_CLI', true);
-
-if (!file_exists(__DIR__ . '/../vendor')){
-    require_once __DIR__ . '/../system/src/Grav/Common/Composer.php';
-}
 
 use Grav\Common\Composer;
+use Grav\Common\Grav;
+use League\CLImate\CLImate;
+use Symfony\Component\Console\Application;
 
-if (!file_exists(__DIR__ . '/../vendor')){
+\define('GRAV_CLI', true);
+\define('GRAV_REQUEST_TIME', microtime(true));
+
+if (!file_exists(__DIR__ . '/../vendor/autoload.php')){
     // Before we can even start, we need to run composer first
+    require_once __DIR__ . '/../system/src/Grav/Common/Composer.php';
+
     $composer = Composer::getComposerExecutor();
     echo "Preparing to install vendor dependencies...\n\n";
     echo system($composer.' --working-dir="'.__DIR__.'/../" --no-interaction --no-dev --prefer-dist -o install');
     echo "\n\n";
 }
 
-use Symfony\Component\Console\Application;
-
-require_once __DIR__ . '/../vendor/autoload.php';
+$autoload = require __DIR__ . '/../vendor/autoload.php';
 
 if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
     exit(sprintf("You are running PHP %s, but Grav needs at least PHP %s to run.\n", $ver, $req));
 }
 
+$climate = new League\CLImate\CLImate;
+$climate->arguments->add([
+    'environment' => [
+        'prefix'        => 'e',
+        'longPrefix'    => 'env',
+        'description'   => 'Configuration Environment',
+        'defaultValue'  => 'localhost'
+    ]
+]);
+$climate->arguments->parse();
+
+// Set up environment based on params.
+$environment = $climate->arguments->get('environment');
+
+$grav = Grav::instance(array('loader' => $autoload));
+$grav->setup($environment);
+
 if (!ini_get('date.timezone')) {
     date_default_timezone_set('UTC');
 }
 
-if (!file_exists(ROOT_DIR . 'index.php')) {
+if (!file_exists(GRAV_ROOT . '/index.php')) {
     exit('FATAL: Must be run from ROOT directory of Grav!');
 }
 
@@ -41,5 +59,9 @@ $app->addCommands(array(
     new \Grav\Console\Cli\ClearCacheCommand(),
     new \Grav\Console\Cli\BackupCommand(),
     new \Grav\Console\Cli\NewProjectCommand(),
+    new \Grav\Console\Cli\SchedulerCommand(),
+    new \Grav\Console\Cli\SecurityCommand(),
+    new \Grav\Console\Cli\LogViewerCommand(),
+    new \Grav\Console\Cli\YamlLinterCommand(),
 ));
 $app->run();

bin/plugin

@@ -1,30 +1,28 @@
 #!/usr/bin/env php
 <?php
-define('GRAV_CLI', true);
-
-if (!file_exists(__DIR__ . '/../vendor')) {
-    require_once __DIR__ . '/../system/src/Grav/Common/Composer.php';
-}
 
 use Grav\Common\Composer;
-
-if (!file_exists(__DIR__ . '/../vendor')) {
-    // Before we can even start, we need to run composer first
-    $composer = Composer::getComposerExecutor();
-    echo "Preparing to install vendor dependencies...\n\n";
-    echo system($composer . ' --working-dir="' . __DIR__ . '/../" --no-interaction --no-dev --prefer-dist -o install');
-    echo "\n\n";
-}
-
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Grav\Common\Grav;
-use Grav\Common\Config\Setup;
 use Grav\Common\Filesystem\Folder;
 
-$autoload = require_once(__DIR__ . '/../vendor/autoload.php');
+\define('GRAV_CLI', true);
+\define('GRAV_REQUEST_TIME', microtime(true));
+
+if (!file_exists(__DIR__ . '/../vendor/autoload.php')){
+    // Before we can even start, we need to run composer first
+    require_once __DIR__ . '/../system/src/Grav/Common/Composer.php';
+
+    $composer = Composer::getComposerExecutor();
+    echo "Preparing to install vendor dependencies...\n\n";
+    echo system($composer.' --working-dir="'.__DIR__.'/../" --no-interaction --no-dev --prefer-dist -o install');
+    echo "\n\n";
+}
+
+$autoload = require __DIR__ . '/../vendor/autoload.php';
 
 if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
     exit(sprintf("You are running PHP %s, but Grav needs at least PHP %s to run.\n", $ver, $req));
@@ -34,7 +32,7 @@ if (!ini_get('date.timezone')) {
     date_default_timezone_set('UTC');
 }
 
-if (!file_exists(ROOT_DIR . 'index.php')) {
+if (!file_exists(GRAV_ROOT . '/index.php')) {
     exit('FATAL: Must be run from ROOT directory of Grav!');
 }
 
@@ -48,19 +46,18 @@ $climate->arguments->add([
     ]
 ]);
 $climate->arguments->parse();
+
 $environment = $climate->arguments->get('environment');
 
-// Set up environment based on params.
-Setup::$environment = $environment;
-
 $grav = Grav::instance(array('loader' => $autoload));
-$grav['uri']->init();
+$grav->setup($environment);
+
 $grav['config']->init();
-$grav['streams'];
+$grav['uri']->init();
+$grav['users'];
 $grav['plugins']->init();
 $grav['themes']->init();
 
-
 $app     = new Application('Grav Plugins Commands', GRAV_VERSION);
 $pattern = '([A-Z]\w+Command\.php)';
 
@@ -75,6 +72,7 @@ $argv = array_merge([$bin], $argv);
 
 $input = new ArgvInput($argv);
 
+/** @var \Grav\Common\Data\Data $plugin */
 $plugin = $grav['plugins']->get($name);
 
 $output = new ConsoleOutput();
@@ -83,13 +81,14 @@ $output->getFormatter()->setStyle('white', new OutputFormatterStyle('white', nul
 
 if (!$name) {
     $output->writeln('');
-    $output->writeln("<red>Usage:</red>");
+    $output->writeln('<red>Usage:</red>');
     $output->writeln("  {$bin} [slug] [command] [arguments]");
     $output->writeln('');
-    $output->writeln("<red>Example:</red>");
+    $output->writeln('<red>Example:</red>');
     $output->writeln("  {$bin} error log -l 1 --trace");
-    $list = Folder::all('plugins://', ['compare' => 'Pathname', 'pattern' => '/\/cli\/' . $pattern . '$/usm']);
+    $list = Folder::all('plugins://', ['compare' => 'Pathname', 'pattern' => '/\/cli\/' . $pattern . '$/usm', 'levels' => 2]);
 
+    $total = 0;
     if (count($list)) {
         $available = [];
         $output->writeln('');
@@ -98,17 +97,31 @@ if (!$name) {
             $split = explode('/', $entry);
             $entry = array_shift($split);
             $index = str_pad($index++ + 1, 2, '0', STR_PAD_LEFT);
-
-            if (in_array($entry, $available)) {
+            $total = str_pad($total++ + 1, 2, '0', STR_PAD_LEFT);
+            if (\in_array($entry, $available, true)) {
+                $total--;
                 continue;
             }
 
             $available[] = $entry;
-            $output->writeln('  ' . $index . ". <red>" . str_pad($entry, 15) . "</red> <white>${bin} ${entry} list</white>");
+            $commands_count = $index - $total + 1;
+            $output->writeln('  ' . $total . '. <red>' . str_pad($entry, 15) . "</red> <white>{$bin} {$entry} list</white>");
         }
     }
 
     exit;
+} else {
+    if (is_null($plugin)) {
+        $output->writeln('');
+        $output->writeln("<red>$name plugin not found</red>");
+        die;
+    }
+
+    if (!$plugin->enabled) {
+        $output->writeln('');
+        $output->writeln("<red>$name not enabled</red>");
+        die;
+    }
 }
 
 if ($plugin === null) {
@@ -119,14 +132,15 @@ if ($plugin === null) {
 $path = 'plugins://' . $name . '/cli';
 
 try {
-    $commands = Folder::all($path, ['compare' => 'Filename', 'pattern' => '/' . $pattern . '$/usm']);
+    $commands = Folder::all($path, ['compare' => 'Filename', 'pattern' => '/' . $pattern . '$/usm', 'levels' => 1]);
 } catch (\RuntimeException $e) {
     $output->writeln("<red>No Console Commands for <white>'{$name}'</white> where found in <white>'{$path}'</white></red>");
     exit;
 }
 
 foreach ($commands as $command_path) {
-    require_once "plugins://{$name}/cli/{$command_path}";
+    $full_path = $grav['locator']->findResource("plugins://{$name}/cli/{$command_path}");
+    require_once $full_path;
 
     $command_class = 'Grav\Plugin\Console\\' . preg_replace('/.php$/', '', $command_path);
     $command = new $command_class();

composer.json

@@ -2,51 +2,105 @@
     "name": "getgrav/grav",
     "type": "project",
     "description": "Modern, Crazy Fast, Ridiculously Easy and Amazingly Powerful Flat-File CMS",
-    "keywords": ["cms","flat-file cms","flat cms","flatfile cms","php"],
-    "homepage": "http://getgrav.org",
+    "keywords": [
+        "cms",
+        "flat-file cms",
+        "flat cms",
+        "flatfile cms",
+        "php"
+    ],
+    "homepage": "https://getgrav.org",
     "license": "MIT",
     "require": {
-        "php": ">=5.5.9",
-        "twig/twig": "~1.24",
-        "erusev/parsedown": "dev-master as 1.6.0",
-        "erusev/parsedown-extra": "~0.7",
-        "symfony/yaml": "~2.8",
-        "symfony/console": "~2.8",
-        "symfony/event-dispatcher": "~2.8",
-        "symfony/var-dumper": "~2.8",
-        "symfony/polyfill-iconv": "~1.0",
-        "doctrine/cache": "~1.5",
-        "filp/whoops": "~2.0",
-        "matthiasmullie/minify": "^1.3",
-        "monolog/monolog": "~1.0",
-        "gregwar/image": "~2.0",
-        "donatj/phpuseragentparser": "~0.3",
-        "pimple/pimple": "~3.0",
-        "rockettheme/toolbox": "dev-develop",
-        "maximebf/debugbar": "~1.10",
+        "php": ">=7.1.3",
+        "ext-json": "*",
         "ext-mbstring": "*",
         "ext-openssl": "*",
         "ext-curl": "*",
         "ext-zip": "*",
-        "league/climate": "^3.2",
-        "antoligy/dom-string-iterators": "^1.0"
+        "ext-dom": "*",
+        "symfony/polyfill-iconv": "^1.9",
+        "symfony/polyfill-php72": "^1.9",
+        "symfony/polyfill-php73": "^1.9",
+        "psr/simple-cache": "^1.0",
+        "psr/http-message": "^1.0",
+        "psr/http-server-middleware": "^1.0",
+        "kodus/psr7-server": "*",
+        "nyholm/psr7": "^1.0",
+        "twig/twig": "~1.40",
+        "erusev/parsedown": "1.6.4",
+        "erusev/parsedown-extra": "~0.7",
+        "symfony/yaml": "~4.2.0",
+        "symfony/console": "~4.2.0",
+        "symfony/event-dispatcher": "~4.2.0",
+        "symfony/var-dumper": "~4.2.0",
+        "symfony/process": "~4.2.0",
+        "doctrine/cache": "^1.8",
+        "doctrine/collections": "^1.5",
+        "guzzlehttp/psr7": "^1.4",
+        "filp/whoops": "~2.2",
+        "matthiasmullie/minify": "^1.3",
+        "monolog/monolog": "~1.0",
+        "gregwar/image": "2.*",
+        "donatj/phpuseragentparser": "~0.10",
+        "pimple/pimple": "~3.2",
+        "rockettheme/toolbox": "~1.4.0",
+        "maximebf/debugbar": "~1.15",
+        "league/climate": "^3.4",
+        "antoligy/dom-string-iterators": "^1.0",
+        "miljar/php-exif": "^0.6.4",
+        "composer/ca-bundle": "^1.0",
+        "dragonmantank/cron-expression": "^1.2",
+        "phive/twig-extensions-deferred": "^1.0",
+        "willdurand/negotiation": "^2.3"
     },
     "require-dev": {
-        "codeception/codeception": "^2.1",
-        "phpunit/php-code-coverage": "~2.0",
-        "fzaninotto/faker": "^1.5"
+        "codeception/codeception": "^2.4",
+        "phpstan/phpstan": "^0.11",
+        "phpstan/phpstan-deprecation-rules": "^0.11.0",
+        "phpunit/php-code-coverage": "~6.0",
+        "fzaninotto/faker": "^1.8",
+        "victorjonsson/markdowndocs": "dev-master"
     },
+    "suggest": {
+        "ext-zend-opcache": "Recommended for better performance",
+        "ext-intl": "Recommended for multi-language sites",
+        "ext-memcache": "Needed to support Memcache servers",
+        "ext-memcached": "Needed to support Memcached servers",
+        "ext-redis": "Needed to support Redis servers"
+    },
+    "config": {
+        "apcu-autoloader": true,
+        "platform": {
+            "php": "7.1.3"
+        }
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/trilbymedia/PHP-Markdown-Documentation-Generator"
+        }
+    ],
     "autoload": {
         "psr-4": {
             "Grav\\": "system/src/Grav"
         },
-        "files": ["system/defines.php"]
+        "files": [
+            "system/defines.php"
+        ]
     },
     "archive": {
-        "exclude": ["VERSION"]
+        "exclude": [
+            "VERSION"
+        ]
     },
     "scripts": {
+        "api-16": "vendor/bin/phpdoc-md generate system/src > user/pages/14.api/default.16.md",
+        "api-15": "vendor/bin/phpdoc-md generate system/src > user/pages/14.api/default.md",
         "post-create-project-cmd": "bin/grav install",
+        "phpstan": "vendor/bin/phpstan analyse -l 2 -c ./tests/phpstan/phpstan.neon system/src --memory-limit=256M",
+        "phpstan-framework": "vendor/bin/phpstan analyse -l 5 -c ./tests/phpstan/phpstan.neon system/src/Grav/Framework --memory-limit=256M",
+        "phpstan-plugins": "vendor/bin/phpstan analyse -l 0 -c ./tests/phpstan/plugins.neon user/plugins --memory-limit=256M",
         "test": "vendor/bin/codecept run unit",
         "test-windows": "vendor\\bin\\codecept run unit"
     },

index.php

@@ -1,34 +1,42 @@
 <?php
+
 /**
  * @package    Grav.Core
  *
- * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 namespace Grav;
 
-// Ensure vendor libraries exist
-$autoload = __DIR__ . '/vendor/autoload.php';
-if (!is_file($autoload)) {
-    die("Please run: <i>bin/grav install</i>");
-}
-
-use Grav\Common\Grav;
-use RocketTheme\Toolbox\Event\Event;
-
-// Register the auto-loader.
-$loader = require_once $autoload;
+\define('GRAV_REQUEST_TIME', microtime(true));
+\define('GRAV_PHP_MIN', '7.1.3');
 
 if (version_compare($ver = PHP_VERSION, $req = GRAV_PHP_MIN, '<')) {
     die(sprintf('You are running PHP %s, but Grav needs at least <strong>PHP %s</strong> to run.', $ver, $req));
 }
 
+if (PHP_SAPI === 'cli-server' && !isset($_SERVER['PHP_CLI_ROUTER'])) {
+    die("PHP webserver requires a router to run Grav, please use: <pre>php -S {$_SERVER['SERVER_NAME']}:{$_SERVER['SERVER_PORT']} system/router.php</pre>");
+}
+
+// Ensure vendor libraries exist
+$autoload = __DIR__ . '/vendor/autoload.php';
+if (!is_file($autoload)) {
+    die('Please run: <i>bin/grav install</i>');
+}
+
+// Register the auto-loader.
+$loader = require $autoload;
+
+use Grav\Common\Grav;
+use RocketTheme\Toolbox\Event\Event;
+
 // Set timezone to default, falls back to system if php.ini not set
 date_default_timezone_set(@date_default_timezone_get());
 
 // Set internal encoding if mbstring loaded
-if (!extension_loaded('mbstring')) {
+if (!\extension_loaded('mbstring')) {
     die("'mbstring' extension is not loaded.  This is required for Grav to run correctly");
 }
 mb_internal_encoding('UTF-8');
@@ -43,7 +51,10 @@ $grav = Grav::instance(
 // Process the page
 try {
     $grav->process();
+} catch (\Error $e) {
+    $grav->fireEvent('onFatalException', new Event(array('exception' => $e)));
+    throw $e;
 } catch (\Exception $e) {
-    $grav->fireEvent('onFatalException', new Event(['exception' => $e]));
+    $grav->fireEvent('onFatalException', new Event(array('exception' => $e)));
     throw $e;
 }

now.json

@@ -0,0 +1,4 @@
+    {
+  "version": 2,
+  "builds": [{ "src": "*.php", "use": "@now/php" }]
+}

robots.txt

@@ -9,3 +9,5 @@ Disallow: /vendor/
 Disallow: /user/
 Allow: /user/pages/
 Allow: /user/themes/
+Allow: /user/images/
+Allow: /

system/assets/debugger.css

@@ -30,9 +30,25 @@ div.phpdebugbar {
 }
 
 .phpdebugbar .phpdebugbar-widgets-toolbar {
+    border-top: 1px solid #ddd;
     padding-left: 5px;
+    padding-right: 2px;
+    padding-top: 2px;
+    background-color: #fafafa !important;
+    width: auto !important;
+    left: 0;
+    right: 0;
 }
 
+.phpdebugbar .phpdebugbar-widgets-toolbar input {
+    background: transparent !important;
+}
+
+.phpdebugbar .phpdebugbar-widgets-toolbar .phpdebugbar-widgets-filter {
+
+}
+
+
 .phpdebugbar input[type=text] {
     padding: 0;
     display: inline;

system/assets/whoops.css

@@ -1,5 +1,5 @@
 body header {
-    background: #8552A2;
+    background: #3085EE;
 }
 
 body .left-panel {

system/blueprints/config/backups.yaml

@@ -0,0 +1,125 @@
+title: PLUGIN_ADMIN.BACKUPS
+
+form:
+    validation: loose
+
+    fields:
+        history_title:
+            type: section
+            title: PLUGIN_ADMIN.BACKUPS_HISTORY
+            underline: true
+
+        history:
+            type: backupshistory
+
+        config_title:
+            type: section
+            title: PLUGIN_ADMIN.BACKUPS_PURGE_CONFIG
+            underline: true
+
+        purge.trigger:
+            type: select
+            label: PLUGIN_ADMIN.BACKUPS_STORAGE_PURGE_TRIGGER
+            size: medium
+            default: space
+            options:
+                space: Maximum Backup Space
+                number: Maximum Number of Backups
+                time: maximum Retention Time
+            validate:
+                required: true
+
+        purge.max_backups_count:
+            type: number
+            label: PLUGIN_ADMIN.BACKUPS_MAX_COUNT
+            default: 25
+            size: x-small
+            help: PLUGIN_ADMIN.BACKUPS_MAX_COUNT
+            validate:
+                min: 0
+                type: number
+                required: true
+                message: Must be a number 0 or greater
+
+        purge.max_backups_space:
+            type: number
+            label: PLUGIN_ADMIN.BACKUPS_MAX_SPACE
+            append: in GB
+            size: x-small
+            default: 5
+            validate:
+                min: 1
+                type: number
+                required: true
+                message: Space must be 1GB or greater
+
+        purge.max_backups_time:
+            type: number
+            label: PLUGIN_ADMIN.BACKUPS_MAX_RETENTION_TIME
+            append: PLUGIN_ADMIN.BACKUPS_MAX_RETENTION_TIME_APPEND
+            size: x-small
+            default: 365
+            validate:
+                min: 7
+                type: number
+                required: true
+                message: Rentenion days must be 7 or greater
+
+        profiles_title:
+          type: section
+          title: PLUGIN_ADMIN.BACKUPS_PROFILES
+          underline: true
+
+        profiles:
+          type: list
+          style: vertical
+          label:
+          classes: backups-list compact
+          sort: false
+
+          fields:
+            .name:
+              type: text
+              label: PLUGIN_ADMIN.NAME
+              placeholder: PLUGIN_ADMIN.BACKUPS_PROFILE_NAME
+              validate:
+                  max: 20
+                  message: 'Name must be less than 20 characters'
+                  required: true
+            .root:
+              type: text
+              label: PLUGIN_ADMIN.BACKUPS_PROFILE_ROOT_FOLDER
+              help: PLUGIN_ADMIN.BACKUPS_PROFILE_ROOT_FOLDER_HELP
+              placeholder: '/'
+              default: '/'
+              validate:
+                  required: true
+            .exclude_paths:
+              type: textarea
+              label: PLUGIN_ADMIN.BACKUPS_PROFILE_EXCLUDE_PATHS
+              rows: 5
+              placeholder: "/backup\r/cache\r/images\r/logs\r/tmp"
+              help: PLUGIN_ADMIN.BACKUPS_PROFILE_EXCLUDE_PATHS_HELP
+            .exclude_files:
+                type: textarea
+                label: PLUGIN_ADMIN.BACKUPS_PROFILE_EXCLUDE_FILES
+                rows: 5
+                placeholder: ".DS_Store\r.git\r.svn\r.hg\r.idea\r.vscode\rnode_modules"
+                help: PLUGIN_ADMIN.BACKUPS_PROFILE_EXCLUDE_FILES_HELP
+            .schedule:
+                type: toggle
+                label: PLUGIN_ADMIN.BACKUPS_PROFILE_SCHEDULE
+                highlight: 1
+                default: 1
+                options:
+                    1: PLUGIN_ADMIN.YES
+                    0: PLUGIN_ADMIN.NO
+                validate:
+                    type: bool
+            .schedule_at:
+                type: cron
+                label: PLUGIN_ADMIN.BACKUPS_PROFILE_SCHEDULE_AT
+                default: '* 3 * * *'
+                validate:
+                    required: true
+

system/blueprints/config/scheduler.yaml

@@ -0,0 +1,76 @@
+title: PLUGIN_ADMIN.SCHEDULER
+
+form:
+    validation: loose
+
+    fields:
+
+        status_title:
+            type: section
+            title: PLUGIN_ADMIN.SCHEDULER_STATUS
+            underline: true
+
+        status:
+            type: cronstatus
+            validate:
+                type: commalist
+
+        jobs_title:
+            type: section
+            title: PLUGIN_ADMIN.SCHEDULER_JOBS
+            underline: true
+
+        custom_jobs:
+          type: list
+          style: vertical
+          label:
+          classes: cron-job-list compact
+          key: id
+          fields:
+            .id:
+              type: key
+              label: ID
+              placeholder: 'process-name'
+              validate:
+                  required: true
+                  pattern: '[a-zа-я0-9_\-]+'
+                  max: 20
+                  message: 'ID must be lowercase with dashes/underscores only and less than 20 characters'
+            .command:
+              type: text
+              label: PLUGIN_ADMIN.COMMAND
+              placeholder: 'cd ~;ls -lah;'
+              validate:
+                  required: true
+            .args:
+              type: text
+              label: PLUGIN_ADMIN.EXTRA_ARGUMENTS
+            .at:
+              type: cron
+              label: PLUGIN_ADMIN.SCHEDULER_RUNAT
+              help: PLUGIN_ADMIN.SCHEDULER_RUNAT_HELP
+              placeholder: '* * * * *'
+              validate:
+                  required: true
+            .output:
+              type: text
+              label: PLUGIN_ADMIN.SCHEDULER_OUTPUT
+              help: PLUGIN_ADMIN.SCHEDULER_OUTPUT_HELP
+              placeholder: 'logs/ls-cron.out'
+            .output_mode:
+              type: select
+              label: PLUGIN_ADMIN.SCHEDULER_OUTPUT_TYPE
+              help: PLUGIN_ADMIN.SCHEDULER_OUTPUT_TYPE_HELP
+              default: append
+              options:
+                  append: Append
+                  overwrite: Overwrite
+            .email:
+                type: text
+                label: PLUGIN_ADMIN.SCHEDULER_EMAIL
+                help: PLUGIN_ADMIN.SCHEDULER_EMAIL_HELP
+                placeholder: 'notifications@yoursite.com'
+
+
+
+

system/blueprints/config/security.yaml

@@ -0,0 +1,107 @@
+title: PLUGIN_ADMIN.SECURITY
+
+form:
+    validation: loose
+    fields:
+
+        xss_section:
+            type: section
+            title: PLUGIN_ADMIN.XSS_SECURITY
+            underline: true
+
+        xss_whitelist:
+            type: selectize
+            size: large
+            label: PLUGIN_ADMIN.XSS_WHITELIST_PERMISSIONS
+            help: PLUGIN_ADMIN.XSS_WHITELIST_PERMISSIONS_HELP
+            placeholder: 'admin.super'
+            classes: fancy
+            validate:
+                type: commalist
+
+        xss_enabled.on_events:
+            type: toggle
+            label: PLUGIN_ADMIN.XSS_ON_EVENTS
+            highlight: 1
+            options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+            default: true
+            validate:
+                type: bool
+
+        xss_enabled.invalid_protocols:
+            type: toggle
+            label: PLUGIN_ADMIN.XSS_INVALID_PROTOCOLS
+            highlight: 1
+            options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+            default: true
+            validate:
+                type: bool
+
+        xss_invalid_protocols:
+            type: selectize
+            size: large
+            label: PLUGIN_ADMIN.XSS_INVALID_PROTOCOLS_LIST
+            classes: fancy
+            validate:
+                type: commalist
+
+        xss_enabled.moz_binding:
+            type: toggle
+            label: PLUGIN_ADMIN.XSS_MOZ_BINDINGS
+            highlight: 1
+            options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+            default: true
+            validate:
+                type: bool
+
+        xss_enabled.html_inline_styles:
+            type: toggle
+            label: PLUGIN_ADMIN.XSS_HTML_INLINE_STYLES
+            highlight: 1
+            options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+            default: true
+            validate:
+                type: bool
+
+        xss_enabled.dangerous_tags:
+            type: toggle
+            label: PLUGIN_ADMIN.XSS_DANGEROUS_TAGS
+            highlight: 1
+            options:
+                1: PLUGIN_ADMIN.YES
+                0: PLUGIN_ADMIN.NO
+            default: true
+            validate:
+                type: bool
+
+        xss_dangerous_tags:
+            type: selectize
+            size: large
+            label: PLUGIN_ADMIN.XSS_DANGEROUS_TAGS_LIST
+            classes: fancy
+            validate:
+                type: commalist
+
+        uploads_section:
+            type: section
+            title: PLUGIN_ADMIN.UPLOADS_SECURITY
+            underline: true
+
+
+        uploads_dangerous_extensions:
+            type: selectize
+            size: large
+            label: PLUGIN_ADMIN.UPLOADS_DANGEROUS_EXTENSIONS
+            help: PLUGIN_ADMIN.UPLOADS_DANGEROUS_EXTENSIONS_HELP
+            classes: fancy
+            validate:
+                type: commalist
+

system/blueprints/config/site.yaml

@@ -16,6 +16,13 @@ form:
                     placeholder: PLUGIN_ADMIN.SITE_TITLE_PLACEHOLDER
                     help: PLUGIN_ADMIN.SITE_TITLE_HELP
 
+                default_lang:
+                    type: text
+                    label: PLUGIN_ADMIN.SITE_DEFAULT_LANG
+                    size: x-small
+                    placeholder: PLUGIN_ADMIN.SITE_DEFAULT_LANG_PLACEHOLDER
+                    help: PLUGIN_ADMIN.SITE_DEFAULT_LANG_HELP
+
                 author.name:
                     type: text
                     size: large
@@ -58,7 +65,7 @@ form:
 
                 summary.size:
                     type: text
-                    size: x-small
+                    size: small
                     append: PLUGIN_ADMIN.CHARACTERS
                     label: PLUGIN_ADMIN.SUMMARY_SIZE
                     help: PLUGIN_ADMIN.SUMMARY_SIZE_HELP

system/blueprints/pages/default.yaml

@@ -2,9 +2,9 @@ title: PLUGIN_ADMIN.DEFAULT
 
 rules:
   slug:
-    pattern: "[a-zа-я][a-zа-я0-9_\-]+"
-    min: 2
-    max: 80
+    pattern: '[a-zA-Zа-яA-Я0-9_\-]+'
+    min: 1
+    max: 200
 
 form:
   validation: loose
@@ -21,6 +21,9 @@ form:
           title: PLUGIN_ADMIN.CONTENT
 
           fields:
+            xss_check:
+              type: xss
+
             header.title:
               type: text
               autofocus: true
@@ -32,7 +35,7 @@ form:
                 validate:
                   type: textarea
 
-            uploads:
+            header.media_order:
               type: pagemedia
               label: PLUGIN_ADMIN.PAGE_MEDIA
 
@@ -117,31 +120,16 @@ form:
                       title: PLUGIN_ADMIN.SETTINGS
                       underline: true
 
-                    ordering:
-                      type: toggle
-                      label: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX
-                      help: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX_HELP
-                      highlight: 1
-                      options:
-                        1: PLUGIN_ADMIN.ENABLED
-                        0: PLUGIN_ADMIN.DISABLED
-                      validate:
-                        type: bool
-
                     folder:
                       type: text
                       label: PLUGIN_ADMIN.FOLDER_NAME
                       validate:
-                        type: slug
+                        rule: slug
 
                     route:
-                      type: select
+                      type: parents
                       label: PLUGIN_ADMIN.PARENT
                       classes: fancy
-                      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-                      data-default@: '\Grav\Plugin\admin::rawRoute'
-                      options:
-                        '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
 
                     name:
                       type: select
@@ -165,9 +153,20 @@ form:
                       title: PLUGIN_ADMIN.ORDERING
                       underline: true
 
+                    ordering:
+                      type: toggle
+                      label: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX
+                      help: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX_HELP
+                      highlight: 1
+                      options:
+                        1: PLUGIN_ADMIN.ENABLED
+                        0: PLUGIN_ADMIN.DISABLED
+                      validate:
+                        type: bool
+
                     order:
                       type: order
-                      label: PLUGIN_ADMIN.PAGE_ORDER
+                      label: PLUGIN_ADMIN.SORTABLE_PAGES
                       sitemap:
 
             overrides:
@@ -224,6 +223,30 @@ form:
                     twig: Twig
                   use: keys
 
+                header.twig_first:
+                  type: toggle
+                  toggleable: true
+                  label: PLUGIN_ADMIN.TWIG_FIRST
+                  help: PLUGIN_ADMIN.TWIG_FIRST_HELP
+                  highlight: 0
+                  options:
+                    1: PLUGIN_ADMIN.YES
+                    0: PLUGIN_ADMIN.NO
+                  validate:
+                    type: bool
+
+                header.never_cache_twig:
+                  type: toggle
+                  toggleable: true
+                  label: PLUGIN_ADMIN.NEVER_CACHE_TWIG
+                  help: PLUGIN_ADMIN.NEVER_CACHE_TWIG_HELP
+                  highlight: 0
+                  options:
+                    1: PLUGIN_ADMIN.YES
+                    0: PLUGIN_ADMIN.NO
+                  validate:
+                    type: bool
+
                 header.child_type:
                   type: select
                   toggleable: true
@@ -267,6 +290,18 @@ form:
                   validate:
                     type: bool
 
+                header.debugger:
+                  type: toggle
+                  toggleable: true
+                  label: PLUGIN_ADMIN.DEBUGGER
+                  help: PLUGIN_ADMIN.DEBUGGER_HELP
+                  highlight: 1
+                  options:
+                    1: PLUGIN_ADMIN.ENABLED
+                    0: PLUGIN_ADMIN.DISABLED
+                  validate:
+                    type: bool
+
                 header.template:
                   type: text
                   toggleable: true
@@ -278,6 +313,50 @@ form:
                   toggleable: true
                   help: PLUGIN_ADMIN.APPEND_URL_EXT_HELP
 
+            routes_only:
+              type: section
+              title: PLUGIN_ADMIN.ROUTE_OVERRIDES
+              underline: true
+
+              fields:
+
+                header.routes.default:
+                  type: text
+                  toggleable: true
+                  label: PLUGIN_ADMIN.ROUTE_DEFAULT
+
+                header.routes.canonical:
+                  type: text
+                  toggleable: true
+                  label: PLUGIN_ADMIN.ROUTE_CANONICAL
+
+                header.routes.aliases:
+                  type: array
+                  toggleable: true
+                  value_only: true
+                  size: large
+                  label: PLUGIN_ADMIN.ROUTE_ALIASES
+
+
+            admin_only:
+              type: section
+              title: PLUGIN_ADMIN.ADMIN_SPECIFIC_OVERRIDES
+              underline: true
+
+              fields:
+
+                header.admin.children_display_order:
+                  type: select
+                  label: PLUGIN_ADMIN.ADMIN_CHILDREN_DISPLAY_ORDER
+                  help: PLUGIN_ADMIN.ADMIN_CHILDREN_DISPLAY_ORDER_HELP
+                  toggleable: true
+                  classes: fancy
+                  default: 'collection'
+                  options:
+                    'default': 'Ordered by Folder name (default)'
+                    'collection': 'Ordered by Collection definition'
+
+
                 header.order_by:
                   type: hidden
 

system/blueprints/pages/external.yaml

@@ -1,12 +1,10 @@
-rules:
-  slug:
-    pattern: "[a-zа-я][a-zа-я0-9_\-]+"
-    min: 2
-    max: 80
+title: PLUGIN_ADMIN:EXTERNAL
+extends@:
+    type: default
+    context: blueprints://pages
 
 form:
   validation: loose
-
   fields:
 
     tabs:
@@ -14,17 +12,22 @@ form:
       active: 1
 
       fields:
-        content:
-          type: tab
-          title: PLUGIN_ADMIN.CONTENT
 
+        content:
           fields:
 
             header.title:
               type: text
               autofocus: true
+              style: horizontal
               label: PLUGIN_ADMIN.TITLE
 
+            content:
+              unset@: true
+
+            header.media_order:
+              unset@: true
+
             header.external_url:
                 type: text
                 label: PLUGIN_ADMIN.EXTERNAL_URL
@@ -32,5 +35,18 @@ form:
                 validate:
                     required: true
         options:
-          type: tab
-          title: PLUGIN_ADMIN.OPTIONS
+          fields:
+
+            publishing:
+
+              fields:
+
+                header.date:
+                  unset@: true
+
+                header.metadata:
+                  unset@: true
+
+            taxonomies:
+              unset@: true
+

system/blueprints/pages/modular.yaml

@@ -1,7 +1,5 @@
 title: PLUGIN_ADMIN.MODULAR
-@extends:
-    type: default
-    context: blueprints://pages
+extends@: default
 
 form:
   fields:
@@ -13,35 +11,28 @@ form:
         content:
           fields:
 
+            modular_title:
+              type: spacer
+              title: PLUGIN_ADMIN.MODULAR_SETUP
+
             header.content.items:
-              type: select
+              type: text
               label: PLUGIN_ADMIN.ITEMS
               default: '@self.modular'
-              options:
-                '@self.modular': Modular Children
+              size: medium
 
             header.content.order.by:
-              type: select
+              type: text
               label: PLUGIN_ADMIN.ORDER_BY
-              default: date
-              options:
-                folder: PLUGIN_ADMIN.FOLDER
-                title: PLUGIN_ADMIN.TITLE
-                date: PLUGIN_ADMIN.DATE
-                default: PLUGIN_ADMIN.DEFAULT
+              placeholder: date
+              help:
+              size: small
 
             header.content.order.dir:
-              type: select
+              type: text
               label: PLUGIN_ADMIN.ORDER
-              default: desc
-              options:
-                asc: PLUGIN_ADMIN.ASCENDING
-                desc: PLUGIN_ADMIN.DESCENDING
+              help: '"desc" or "asc" are valid values'
+              placeholder: desc
+              size: small
 
-            header.process:
-              type: ignore
-            content:
-              type: ignore
-            uploads:
-              type: ignore
 

system/blueprints/pages/modular_new.yaml

@@ -1,54 +0,0 @@
-rules:
-  slug:
-    pattern: "[a-z][a-z0-9_\-]+"
-    min: 2
-    max: 80
-
-form:
-  validation: loose
-  fields:
-
-    section:
-        type: section
-        title: PLUGIN_ADMIN.ADD_MODULAR_CONTENT
-
-    title:
-      type: text
-      label: PLUGIN_ADMIN.PAGE_TITLE
-      validate:
-        required: true
-
-    folder:
-      type: text
-      label: PLUGIN_ADMIN.FOLDER_NAME
-      validate:
-        type: slug
-        required: true
-
-    route:
-      type: select
-      label: PLUGIN_ADMIN.PAGE
-      classes: fancy
-      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-      data-default@: '\Grav\Plugin\admin::rawRoute'
-      validate:
-        required: true
-
-    name:
-      type: select
-      classes: fancy
-      label: PLUGIN_ADMIN.MODULAR_TEMPLATE
-      help: PLUGIN_ADMIN.PAGE_FILE_HELP
-      default: default
-      data-options@: '\Grav\Common\Page\Pages::modularTypes'
-      validate:
-        required: true
-
-    modular:
-      type: hidden
-      default: 1
-      validate:
-        type: bool
-
-    blueprint:
-      type: blueprint

system/blueprints/pages/modular_raw.yaml

@@ -1,106 +0,0 @@
-rules:
-  slug:
-    pattern: "[a-z][a-z0-9_\-]+"
-    min: 2
-    max: 80
-
-form:
-  validation: loose
-  fields:
-
-    tabs:
-      type: tabs
-      active: 1
-
-      fields:
-        content:
-          type: tab
-          title: PLUGIN_ADMIN.CONTENT
-
-          fields:
-            frontmatter:
-              classes: frontmatter
-              type: editor
-              label: PLUGIN_ADMIN.FRONTMATTER
-              autofocus: true
-              codemirror:
-                mode: 'yaml'
-                indentUnit: 4
-                autofocus: true
-                indentWithTabs: false
-                lineNumbers: true
-                styleActiveLine: true
-                gutters: ['CodeMirror-lint-markers']
-                lint: true
-
-            content:
-              type: markdown
-
-            uploads:
-              type: pagemedia
-              label: PLUGIN_ADMIN.PAGE_MEDIA
-
-
-        options:
-          type: tab
-          title: PLUGIN_ADMIN.OPTIONS
-
-          fields:
-
-            columns:
-              type: columns
-
-              fields:
-                column1:
-                  type: column
-
-                  fields:
-
-                    ordering:
-                      type: toggle
-                      label: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX
-                      help: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX_HELP
-                      highlight: 1
-                      options:
-                        1: PLUGIN_ADMIN.ENABLED
-                        0: PLUGIN_ADMIN.DISABLED
-                      validate:
-                        type: bool
-
-                    folder:
-                      type: text
-                      label: PLUGIN_ADMIN.FILENAME
-                      validate:
-                        type: slug
-                        required: true
-
-                    route:
-                      type: select
-                      label: PLUGIN_ADMIN.PARENT
-                      classes: fancy
-                      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-                      data-default@: '\Grav\Plugin\admin::rawRoute'
-                      options:
-                        '': PLUGIN_ADMIN.DEFAULT_OPTION_SELECT
-                      validate:
-                        required: true
-
-                    name:
-                      type: select
-                      classes: fancy
-                      label: PLUGIN_ADMIN.MODULAR_TEMPLATE
-                      default: default
-                      data-options@: '\Grav\Common\Page\Pages::modularTypes'
-                      validate:
-                        required: true
-
-                column2:
-                    type: column
-
-                    fields:
-                      order:
-                        type: order
-                        label: PLUGIN_ADMIN.ORDERING
-
-            blueprint:
-              type: blueprint

system/blueprints/pages/move.yaml

@@ -1,17 +0,0 @@
-rules:
-  slug:
-    pattern: "[a-z][a-z0-9_\-]+"
-    min: 2
-    max: 80
-
-form:
-  validation: loose
-  fields:
-    route:
-      type: select
-      label: PLUGIN_ADMIN.PARENT
-      classes: fancy
-      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-      data-default@: '\Grav\Plugin\admin::rawRoute'
-      options:
-        '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT

system/blueprints/pages/new.yaml

@@ -1,66 +0,0 @@
-rules:
-  slug:
-    pattern: "[a-z][a-z0-9_\-]+"
-    min: 2
-    max: 80
-
-form:
-  validation: loose
-  fields:
-
-    section:
-        type: section
-        title: PLUGIN_ADMIN.ADD_PAGE
-
-    title:
-      type: text
-      label: PLUGIN_ADMIN.PAGE_TITLE
-      help: PLUGIN_ADMIN.PAGE_TITLE_HELP
-      validate:
-        required: true
-
-    folder:
-      type: text
-      label: PLUGIN_ADMIN.FOLDER_NAME
-      help: PLUGIN_ADMIN.FOLDER_NAME_HELP
-      validate:
-        type: slug
-        required: true
-
-    route:
-      type: select
-      label: PLUGIN_ADMIN.PARENT_PAGE
-      classes: fancy
-      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-      data-default@: '\Grav\Plugin\admin::getLastPageRoute'
-      options:
-        '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
-      validate:
-        required: true
-
-    name:
-      type: select
-      classes: fancy
-      label: PLUGIN_ADMIN.PAGE_FILE
-      help: PLUGIN_ADMIN.PAGE_FILE_HELP
-      data-options@: '\Grav\Common\Page\Pages::types'
-      data-default@: '\Grav\Plugin\admin::getLastPageName'
-      validate:
-        required: true
-
-    visible:
-      type: toggle
-      label: PLUGIN_ADMIN.VISIBLE
-      help: PLUGIN_ADMIN.VISIBLE_HELP
-      highlight: ''
-      default: ''
-      options:
-        '': Auto
-        1: PLUGIN_ADMIN.YES
-        0: PLUGIN_ADMIN.NO
-      validate:
-        type: bool
-        required: true
-
-    blueprint:
-      type: blueprint

system/blueprints/pages/new_folder.yaml

@@ -1,35 +0,0 @@
-rules:
-  slug:
-    pattern: "[a-z][a-z0-9_\-]+"
-    min: 2
-    max: 80
-
-form:
-  validation: loose
-  fields:
-
-    section:
-        type: section
-        title: PLUGIN_ADMIN.ADD_FOLDER
-
-    folder:
-      type: text
-      label: PLUGIN_ADMIN.FOLDER_NAME
-      help: PLUGIN_ADMIN.FOLDER_NAME_HELP
-      validate:
-        type: slug
-        required: true
-
-    route:
-      type: select
-      label: PLUGIN_ADMIN.PARENT_PAGE
-      classes: fancy
-      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-      data-default@: '\Grav\Plugin\admin::getLastPageRoute'
-      options:
-        '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
-      validate:
-        required: true
-
-    blueprint:
-      type: blueprint

system/blueprints/pages/raw.yaml

@@ -1,105 +0,0 @@
-rules:
-  slug:
-    pattern: "[a-z][a-z0-9_\-]+"
-    min: 2
-    max: 80
-
-form:
-  validation: loose
-  fields:
-
-    tabs:
-      type: tabs
-      active: 1
-
-      fields:
-        content:
-          type: tab
-          title: PLUGIN_ADMIN.CONTENT
-
-          fields:
-            frontmatter:
-              classes: frontmatter
-              type: editor
-              label: PLUGIN_ADMIN.FRONTMATTER
-              autofocus: true
-              codemirror:
-                mode: 'yaml'
-                indentUnit: 4
-                autofocus: true
-                indentWithTabs: false
-                lineNumbers: true
-                styleActiveLine: true
-                gutters: ['CodeMirror-lint-markers']
-                lint: true
-
-            content:
-              type: markdown
-
-            uploads:
-              type: pagemedia
-              label: PLUGIN_ADMIN.PAGE_MEDIA
-
-        options:
-          type: tab
-          title: PLUGIN_ADMIN.OPTIONS
-
-          fields:
-
-            columns:
-              type: columns
-
-              fields:
-                column1:
-                  type: column
-
-                  fields:
-
-                    ordering:
-                      type: toggle
-                      label: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX
-                      help: PLUGIN_ADMIN.FOLDER_NUMERIC_PREFIX_HELP
-                      highlight: 1
-                      options:
-                        1: PLUGIN_ADMIN.ENABLED
-                        0: PLUGIN_ADMIN.DISABLED
-                      validate:
-                        type: bool
-
-                    folder:
-                      type: text
-                      label: PLUGIN_ADMIN.FOLDER_NAME
-                      help: PLUGIN_ADMIN.FOLDER_NAME_HELP
-                      validate:
-                        type: slug
-                        required: true
-
-                    route:
-                      type: select
-                      label: PLUGIN_ADMIN.PARENT
-                      classes: fancy
-                      data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-                      data-default@: '\Grav\Plugin\admin::rawRoute'
-                      options:
-                        '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
-
-                    name:
-                      type: select
-                      classes: fancy
-                      label: PLUGIN_ADMIN.DISPLAY_TEMPLATE
-                      help: PLUGIN_ADMIN.DISPLAY_TEMPLATE_HELP
-                      default: default
-                      data-options@: '\Grav\Common\Page\Pages::types'
-                      validate:
-                        required: true
-
-                column2:
-                    type: column
-
-                    fields:
-                      order:
-                        type: order
-                        label: PLUGIN_ADMIN.ORDERING
-
-            blueprint:
-              type: blueprint

system/blueprints/user/account.yaml

@@ -1,92 +1,127 @@
-title: Site
+title: Account
 form:
     validation: loose
 
     fields:
 
-            info:
-                type: userinfo
-                size: large
+        info:
+            type: userinfo
+            size: large
 
-            content:
-                type: section
-                title: PLUGIN_ADMIN.ACCOUNT
-                underline: true
+        avatar:
+            type: file
+            size: large
+            destination: 'user://accounts/avatars'
+            multiple: false
+            random_name: true
+
+        content:
+            type: section
+            title: PLUGIN_ADMIN.ACCOUNT
+            underline: true
+
+        username:
+            type: text
+            size: large
+            label: PLUGIN_ADMIN.USERNAME
+            disabled: true
+            readonly: true
+
+        email:
+            type: email
+            size: large
+            label: PLUGIN_ADMIN.EMAIL
+            validate:
+              type: email
+              message: PLUGIN_ADMIN.EMAIL_VALIDATION_MESSAGE
+              required: true
+
+        password:
+            type: password
+            size: large
+            label: PLUGIN_ADMIN.PASSWORD
+            autocomplete: new-password
+            validate:
+              required: false
+              message: PLUGIN_ADMIN.PASSWORD_VALIDATION_MESSAGE
+              config-pattern@: system.pwd_regex
+
+        fullname:
+            type: text
+            size: large
+            label: PLUGIN_ADMIN.FULL_NAME
+            validate:
+              required: true
+
+        title:
+            type: text
+            size: large
+            label: PLUGIN_ADMIN.TITLE
+
+        language:
+            type: select
+            label: PLUGIN_ADMIN.LANGUAGE
+            size: medium
+            classes: fancy
+            data-options@: '\Grav\Plugin\Admin\Admin::adminLanguages'
+            default: 'en'
+            help: PLUGIN_ADMIN.LANGUAGE_HELP
+
+        twofa_check:
+            type: conditional
+            condition: config.plugins.admin.twofa_enabled
+
+            fields:
+
+                twofa:
+                    title: PLUGIN_ADMIN.2FA_TITLE
+                    type: section
+                    underline: true
+
+                twofa_enabled:
+                    type: toggle
+                    label: PLUGIN_ADMIN.2FA_ENABLED
+                    classes: twofa-toggle
+                    highlight: 1
+                    default: 0
+                    options:
+                      1: PLUGIN_ADMIN.YES
+                      0: PLUGIN_ADMIN.NO
+                    validate:
+                      type: bool
 
 
-            username:
-                type: text
-                size: large
-                label: PLUGIN_ADMIN.USERNAME
-                disabled: true
-                readonly: true
+                twofa_secret:
+                    type: 2fa_secret
+                    outerclasses: 'twofa-secret'
+                    markdown: true
+                    label: PLUGIN_ADMIN.2FA_SECRET
+                    sublabel: PLUGIN_ADMIN.2FA_SECRET_HELP
 
-            email:
-                type: email
-                size: large
-                label: PLUGIN_ADMIN.EMAIL
-                validate:
-                  type: email
-                  message: PLUGIN_ADMIN.EMAIL_VALIDATION_MESSAGE
-                  required: true
 
-            password:
-                type: password
-                size: large
-                label: PLUGIN_ADMIN.PASSWORD
-                validate:
-                  required: false
-                  message: PLUGIN_ADMIN.PASSWORD_VALIDATION_MESSAGE
-                  pattern: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}'
+        security:
+            security@: admin.super
+            title: PLUGIN_ADMIN.ACCESS_LEVELS
+            type: section
+            underline: true
 
-            fullname:
-                type: text
-                size: large
-                label: PLUGIN_ADMIN.FULL_NAME
-                validate:
-                  required: true
+            fields:
+                groups:
+                    security@: admin.super
+                    type: select
+                    multiple: true
+                    size: large
+                    label: PLUGIN_ADMIN.GROUPS
+                    data-options@: '\Grav\Common\User\Group::groupNames'
+                    classes: fancy
+                    help: PLUGIN_ADMIN.GROUPS_HELP
+                    validate:
+                        type: commalist
 
-            title:
-                type: text
-                size: large
-                label: PLUGIN_ADMIN.TITLE
-
-            language:
-                type: select
-                label: PLUGIN_ADMIN.LANGUAGE
-                size: medium
-                classes: fancy
-                data-options@: '\Grav\Plugin\admin::adminLanguages'
-                default: 'en'
-                help: PLUGIN_ADMIN.LANGUAGE_HELP
-
-            security:
-                title: PLUGIN_ADMIN.ACCESS_LEVELS
-                type: section
-                security: admin.super
-                underline: true
-
-                fields:
-                    groups:
-                        type: selectize
-                        size: large
-                        label: PLUGIN_ADMIN.GROUPS
-                        data-options@: '\Grav\User\Groups::groups'
-                        classes: fancy
-                        help: PLUGIN_ADMIN.GROUPS_HELP
-                        validate:
-                            type: commalist
-
-                    access.admin:
+                access:
+                    security@: admin.super
+                    type: permissions
+                    label: PLUGIN_ADMIN.PERMISSIONS
+                    ignore_empty: true
+                    validate:
                         type: array
-                        label: PLUGIN_ADMIN.ADMIN_ACCESS
-                        multiple: false
-                        validate:
-                            type: array
-
-                    access.site:
-                        type: array
-                        label: PLUGIN_ADMIN.SITE_ACCESS
-                        multiple: false
-                        validate:
-                            type: array

system/blueprints/user/account_new.yaml

@@ -12,5 +12,7 @@ form:
       type: text
       label: PLUGIN_ADMIN.USERNAME
       help: PLUGIN_ADMIN.USERNAME_HELP
+      unset-disabled@: true
+      unset-readonly@: true
       validate:
         required: true

system/blueprints/user/accounts.yaml

@@ -0,0 +1,39 @@
+title: User Accounts
+description: User Accounts
+type: flex-objects
+
+extends@: 'user/account'
+
+config:
+  admin:
+    list:
+      fields:
+        username:
+          link: edit
+          search: true
+        email:
+          search: true
+        fullname:
+          search: true
+      options:
+        per_page: 20
+        order:
+          by: username
+          dir: asc
+
+    menu:
+      list:
+        route: '/accounts'
+        title: Accounts
+        icon: fa-users
+        authorize: ['admin.users', 'admin.accounts', 'admin.super']
+
+form:
+  fields:
+    username:
+      flex-disabled@: exists
+      disabled: false
+      flex-readonly@: exists
+      readonly: false
+      validate:
+        required: true

system/blueprints/user/group.yaml

@@ -29,16 +29,9 @@ form:
             size: small
             label: PLUGIN_ADMIN_PRO.ICON
 
-        access.admin:
-            type: array
-            label: PLUGIN_ADMIN.ADMIN_ACCESS
-            multiple: false
-            validate:
-                type: array
-
-        access.site:
-            type: array
-            label: PLUGIN_ADMIN.SITE_ACCESS
-            multiple: false
+        access:
+            type: permissions
+            label: PLUGIN_ADMIN.PERMISSIONS
+            ignore_empty: true
             validate:
                 type: array

system/config/backups.yaml

@@ -0,0 +1,15 @@
+purge:
+    trigger: space
+    max_backups_count: 25
+    max_backups_space: 5
+    max_backups_time: 365
+
+profiles:
+  -
+    name: 'Default Site Backup'
+    root: '/'
+    schedule: false
+    schedule_at: '0 3 * * *'
+    exclude_paths: "/backup\r\n/cache\r\n/images\r\n/logs\r\n/tmp"
+    exclude_files: ".DS_Store\r\n.git\r\n.svn\r\n.hg\r\n.idea\r\n.vscode\r\nnode_modules"
+

system/config/media.yaml

@@ -18,7 +18,7 @@ types:
     mime: image/jpeg
   jpeg:
     type: image
-    thumb: media/thumb-jpeg.png
+    thumb: media/thumb-jpg.png
     mime: image/jpeg
   png:
     type: image
@@ -28,12 +28,10 @@ types:
     type: animated
     thumb: media/thumb-gif.png
     mime: image/gif
-
   svg:
     type: vector
-    thumb: media/thumb.png
+    thumb: media/thumb-svg.png
     mime: image/svg+xml
-
   mp4:
     type: video
     thumb: media/thumb-mp4.png
@@ -56,13 +54,12 @@ types:
     mime: video/x-flv
   webm:
     type: video
-    thumb: media/thumb.png
+    thumb: media/thumb-webm.png
     mime: video/webm
   ogv:
     type: video
     thumb: media/thumb-ogg.png
     mime: video/ogg
-
   mp3:
     type: audio
     thumb: media/thumb-mp3.png
@@ -85,11 +82,12 @@ types:
     mime: audio/wav
   aiff:
     type: audio
+    thumb: media/thumb-aif.png
     mime: audio/aiff
   aif:
     type: audio
+    thumb: media/thumb-aif.png
     mime: audio/aif
-
   txt:
     type: file
     thumb: media/thumb-txt.png
@@ -104,63 +102,60 @@ types:
     mime: application/msword
   docx:
     type: file
+    thumb: media/thumb-docx.png
     mime: application/msword
   xls:
     type: file
+    thumb: media/thumb-xls.png
     mime: application/vnd.ms-excel
-  xlt:
-    type: file
-    mime: application/vnd.ms-excel
-  xlm:
-    type: file
-    mime: application/vnd.ms-excel
-  xld:
-    type: file
-    mime: application/vnd.ms-excel
-  xla:
-    type: file
-    mime: application/vnd.ms-excel
-  xlc:
-    type: file
-    mime: application/vnd.ms-excel
-  xlw:
-    type: file
-    mime: application/vnd.ms-excel
-  xll:
+  xlsx:
     type: file
+    thumb: media/thumb-xlsx.png
     mime: application/vnd.ms-excel
   ppt:
     type: file
+    thumb: media/thumb-ppt.png
+    mime: application/vnd.ms-powerpoint
+  pptx:
+    type: file
+    thumb: media/thumb-pptx.png
     mime: application/vnd.ms-powerpoint
   pps:
     type: file
+    thumb: media/thumb-pps.png
     mime: application/vnd.ms-powerpoint
   rtf:
     type: file
+    thumb: media/thumb-rtf.png
     mime: application/rtf
-
   bmp:
     type: file
+    thumb: media/thumb-bmp.png
     mime: image/bmp
   tiff:
     type: file
+    thumb: media/thumb-tiff.png
     mime: image/tiff
   mpeg:
     type: file
+    thumb: media/thumb-mpg.png
     mime: video/mpeg
   mpg:
     type: file
+    thumb: media/thumb-mpg.png
     mime: video/mpeg
   mpe:
     type: file
+    thumb: media/thumb-mpe.png
     mime: video/mpeg
   avi:
     type: file
+    thumb: media/thumb-avi.png
     mime: video/msvideo
   wmv:
     type: file
+    thumb: media/thumb-wmv.png
     mime: video/x-ms-wmv
-
   html:
     type: file
     thumb: media/thumb-html.png
@@ -169,17 +164,29 @@ types:
     type: file
     thumb: media/thumb-html.png
     mime: text/html
+  ics:
+    type: iCal
+    thumb: media/thumb-ics.png
+    mime: text/calendar
   pdf:
     type: file
     thumb: media/thumb-pdf.png
     mime: application/pdf
+  ai:
+    type: file
+    thumb: media/thumb-ai.png
+    mime: image/ai
+  psd:
+    type: file
+    thumb: media/thumb-psd.png
+    mime: image/psd
   zip:
     type: file
     thumb: media/thumb-zip.png
     mime: application/zip
   7z:
     type: file
-    thumb: media/thumb-7zip.png
+    thumb: media/thumb-7z.png
     mime: application/x-7z-compressed
   gz:
     type: file
@@ -187,6 +194,7 @@ types:
     mime: application/gzip
   tar:
     type: file
+    thumb: media/thumb-tar.png
     mime: application/x-tar
   css:
     type: file
@@ -200,4 +208,3 @@ types:
     type: file
     thumb: media/thumb-json.png
     mime: application/json
-

system/config/security.yaml

@@ -0,0 +1,38 @@
+xss_whitelist: [admin.super] # Whitelist of user access that should 'skip' XSS checking
+xss_enabled:
+    on_events: true
+    invalid_protocols: true
+    moz_binding: true
+    html_inline_styles: true
+    dangerous_tags: true
+xss_invalid_protocols:
+    - javascript
+    - livescript
+    - vbscript
+    - mocha
+    - feed
+    - data
+xss_dangerous_tags:
+    - applet
+    - meta
+    - xml
+    - blink
+    - link
+    - style
+    - script
+    - embed
+    - object
+    - iframe
+    - frame
+    - frameset
+    - ilayer
+    - layer
+    - bgsound
+    - title
+    - base
+uploads_dangerous_extensions:
+    - php
+    - html
+    - htm
+    - js
+    - exe

system/config/site.yaml

@@ -1,8 +1,9 @@
 title: Grav                                 # Name of the site
+default_lang: en                            # Default language for site (potentially used by theme)
 
 author:
   name: John Appleseed                      # Default author name
-  email: 'john@email.com'                   # Default author email
+  email: 'john@example.com'                 # Default author email
 
 taxonomies: [category,tag]                  # Arbitrary list of taxonomy types
 
@@ -16,17 +17,17 @@ summary:
   delimiter: ===                            # The summary delimiter
 
 redirects:
-#  '/redirect-test': '/'                         # Redirect test goes to home page
-#  '/old/(.*)': '/new/$1'                        # Would redirect /old/my-page to /new/my-page
+#  '/redirect-test': '/'                    # Redirect test goes to home page
+#  '/old/(.*)': '/new/$1'                   # Would redirect /old/my-page to /new/my-page
 
 routes:
-#  '/something/else': '/blog/sample-3'         # Alias for /blog/sample-3
-#  '/new/(.*)': '/blog/$1'                     # Regex any /new/my-page URL to /blog/my-page Route
+#  '/something/else': '/blog/sample-3'      # Alias for /blog/sample-3
+#  '/new/(.*)': '/blog/$1'                  # Regex any /new/my-page URL to /blog/my-page Route
 
 blog:
   route: '/blog'                            # Custom value added (accessible via system.blog.route)
 
-#menu:                                      # Sample Menu Example
+#menu:                                      # Menu Example
 #    - text: Source
 #      icon: github
 #      url: https://github.com/getgrav/grav

system/config/streams.yaml

@@ -1,6 +1,6 @@
 schemes:
   image:
-    type: ReadOnlyStream
+    type: Stream
     paths:
       - user://images
       - system://images

system/config/system.yaml

@@ -1,132 +1,169 @@
-absolute_urls: false                        # Absolute or relative URLs for `base_url`
-timezone: ''                                # Valid values: http://php.net/manual/en/timezones.php
-default_locale:                             # Default locale (defaults to system)
-param_sep: ':'                              # Parameter separator, use ';' for Apache on windows
-wrapped_site: false                         # For themes/plugins to know if Grav is wrapped by another platform
-reverse_proxy_setup: false                  # Running in a reverse proxy scenario with different webserver ports than proxy
-force_ssl: false                            # If enabled, Grav forces to be accessed via HTTPS
+absolute_urls: false                             # Absolute or relative URLs for `base_url`
+timezone: ''                                     # Valid values: http://php.net/manual/en/timezones.php
+default_locale:                                  # Default locale (defaults to system)
+param_sep: ':'                                   # Parameter separator, use ';' for Apache on windows
+wrapped_site: false                              # For themes/plugins to know if Grav is wrapped by another platform
+reverse_proxy_setup: false                       # Running in a reverse proxy scenario with different webserver ports than proxy
+force_ssl: false                                 # If enabled, Grav forces to be accessed via HTTPS (NOTE: Not an ideal solution)
+force_lowercase_urls: true                       # If you want to support mixed cased URLs set this to false
+custom_base_url: ''                              # Set the base_url manually, e.g. http://yoursite.com/yourpath
+username_regex: '^[a-z0-9_-]{3,16}$'             # Only lowercase chars, digits, dashes, underscores. 3 - 16 chars
+pwd_regex: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}' # At least one number, one uppercase and lowercase letter, and be at least 8+ chars
+intl_enabled: true                               # Special logic for PHP International Extension (mod_intl)
 
 languages:
-  supported: []                             # List of languages supported. eg: [en, fr, de]
-  include_default_lang: true                # Include the default lang prefix in all URLs
-  translations: true                        # Enable translations by default
-  translations_fallback: true               # Fallback through supported translations if active lang doesn't exist
-  session_store_active: false               # Store active language in session
-  http_accept_language: false               # Attempt to set the language based on http_accept_language header in the browser
-  override_locale: false                    # Override the default or system locale with language specific one
+  supported: []                                  # List of languages supported. eg: [en, fr, de]
+  default_lang:                                  # Default is the first supported language. Must be one of the supported languages
+  include_default_lang: true                     # Include the default lang prefix in all URLs
+  pages_fallback_only: false                     # Only fallback to find page content through supported languages
+  translations: true                             # Enable translations by default
+  translations_fallback: true                    # Fallback through supported translations if active lang doesn't exist
+  session_store_active: false                    # Store active language in session
+  http_accept_language: false                    # Attempt to set the language based on http_accept_language header in the browser
+  override_locale: false                         # Override the default or system locale with language specific one
 
 home:
-  alias: '/home'                            # Default path for home, ie /
-  hide_in_urls: false                       # Hide the home route in URLs
+  alias: '/home'                                 # Default path for home, ie /
+  hide_in_urls: false                            # Hide the home route in URLs
 
 pages:
-  theme: antimatter                         # Default theme (defaults to "antimatter" theme)
+  theme: quark                                   # Default theme (defaults to "quark" theme)
   order:
-    by: default                             # Order pages by "default", "alpha" or "date"
-    dir: asc                                # Default ordering direction, "asc" or "desc"
+    by: default                                  # Order pages by "default", "alpha" or "date"
+    dir: asc                                     # Default ordering direction, "asc" or "desc"
   list:
-    count: 20                               # Default item count per page
+    count: 20                                    # Default item count per page
   dateformat:
-    default:                                # The default date format Grav expects in the `date: ` field
-    short: 'jS M Y'                         # Short date format
-    long: 'F jS \a\t g:ia'                  # Long date format
-  publish_dates: true                       # automatically publish/unpublish based on dates
+    default:                                     # The default date format Grav expects in the `date: ` field
+    short: 'jS M Y'                              # Short date format
+    long: 'F jS \a\t g:ia'                       # Long date format
+  publish_dates: true                            # automatically publish/unpublish based on dates
   process:
-    markdown: true                          # Process Markdown
-    twig: false                             # Process Twig
-  twig_first: false                         # Process Twig before markdown when processing both on a page
+    markdown: true                               # Process Markdown
+    twig: false                                  # Process Twig
+  twig_first: false                              # Process Twig before markdown when processing both on a page
+  never_cache_twig: false                        # Only cache content, never cache twig processed in content (incompatible with `twig_first: true`)
   events:
-    page: true                              # Enable page level events
-    twig: true                              # Enable twig level events
+    page: true                                   # Enable page level events
+    twig: true                                   # Enable Twig level events
   markdown:
-    extra: false                            # Enable support for Markdown Extra support (GFM by default)
-    auto_line_breaks: false                 # Enable automatic line breaks
-    auto_url_links: false                   # Enable automatic HTML links
-    escape_markup: false                    # Escape markup tags into entities
-    special_chars:                          # List of special characters to automatically convert to entities
+    extra: false                                 # Enable support for Markdown Extra support (GFM by default)
+    auto_line_breaks: false                      # Enable automatic line breaks
+    auto_url_links: false                        # Enable automatic HTML links
+    escape_markup: false                         # Escape markup tags into entities
+    special_chars:                               # List of special characters to automatically convert to entities
       '>': 'gt'
       '<': 'lt'
-  types: [txt,xml,html,htm,json,rss,atom]   # list of valid page types
-  append_url_extension: ''                  # Append page's extension in Page urls (e.g. '.html' results in /path/page.html)
-  expires: 604800                           # Page expires time in seconds (604800 seconds = 7 days)
-  last_modified: false                      # Set the last modified date header based on file modifcation timestamp
-  etag: false                               # Set the etag header tag
-  vary_accept_encoding: false               # Add `Vary: Accept-Encoding` header
-  redirect_default_route: false             # Automatically redirect to a page's default route
-  redirect_default_code: 301                # Default code to use for redirects
-  redirect_trailing_slash: true             # Handle automatically or 301 redirect a trailing / URL
-  ignore_files: [.DS_Store]                 # Files to ignore in Pages
-  ignore_folders: [.git, .idea]             # Folders to ignore in Pages
-  ignore_hidden: true                       # Ignore all Hidden files and folders
-  url_taxonomy_filters: true                # Enable auto-magic URL-based taxonomy filters for page collections
+  types: [html,htm,xml,txt,json,rss,atom]        # list of valid page types
+  append_url_extension: ''                       # Append page's extension in Page urls (e.g. '.html' results in /path/page.html)
+  expires: 604800                                # Page expires time in seconds (604800 seconds = 7 days)
+  cache_control:                                 # Can be blank for no setting, or a valid `cache-control` text value
+  last_modified: false                           # Set the last modified date header based on file modification timestamp
+  etag: false                                    # Set the etag header tag
+  vary_accept_encoding: false                    # Add `Vary: Accept-Encoding` header
+  redirect_default_route: false                  # Automatically redirect to a page's default route
+  redirect_default_code: 302                     # Default code to use for redirects
+  redirect_trailing_slash: true                  # Handle automatically or 302 redirect a trailing / URL
+  ignore_files: [.DS_Store]                      # Files to ignore in Pages
+  ignore_folders: [.git, .idea]                  # Folders to ignore in Pages
+  ignore_hidden: true                            # Ignore all Hidden files and folders
+  hide_empty_folders: false                      # If folder has no .md file, should it be hidden
+  url_taxonomy_filters: true                     # Enable auto-magic URL-based taxonomy filters for page collections
   frontmatter:
-    process_twig: false                     # Should the frontmatter be processed to replace Twig variables?
-    ignore_fields: ['form','forms']         # Fields that might contain Twig variables and should not be processed
+    process_twig: false                          # Should the frontmatter be processed to replace Twig variables?
+    ignore_fields: ['form','forms']              # Fields that might contain Twig variables and should not be processed
 
 cache:
-  enabled: true                             # Set to true to enable caching
+  enabled: true                                  # Set to true to enable caching
   check:
-    method: file                            # Method to check for updates in pages: file|folder|none
-  driver: auto                              # One of: auto|file|apc|xcache|memcache|wincache
-  prefix: 'g'                               # Cache prefix string (prevents cache conflicts)
-  lifetime: 604800                          # Lifetime of cached data in seconds (0 = infinite)
-  gzip: false                               # GZip compress the page output
+    method: file                                 # Method to check for updates in pages: file|folder|hash|none
+  driver: auto                                   # One of: auto|file|apcu|memcache|wincache
+  prefix: 'g'                                    # Cache prefix string (prevents cache conflicts)
+  purge_at: '0 4 * * *'                          # How often to purge old file cache (using new scheduler)
+  clear_at: '0 3 * * *'                           # How often to clear cache (using new scheduler)
+  clear_job_type: 'standard'                     # Type to clear when processing the scheduled clear job `standard`|`all`
+  clear_images_by_default: true                  # By default grav will include processed images in cache clear, this can be disabled
+  cli_compatibility: false                       # Ensures only non-volatile drivers are used (file, redis, memcache, etc.)
+  lifetime: 604800                               # Lifetime of cached data in seconds (0 = infinite)
+  gzip: false                                    # GZip compress the page output
+  allow_webserver_gzip: false                    # If true, `content-encoding: identity` but connection isn't closed before `onShutDown()` event
+  redis:
+    socket: false                                # Path to redis unix socket (e.g. /var/run/redis/redis.sock), false = use server and port to connect
 
 twig:
-  cache: true                               # Set to true to enable twig caching
-  debug: true                               # Enable Twig debug
-  auto_reload: true                         # Refresh cache on changes
-  autoescape: false                         # Autoescape Twig vars
-  undefined_functions: true                 # Allow undefined functions
-  undefined_filters: true                   # Allow undefined filters
-  umask_fix: false                          # By default Twig creates cached files as 755, fix switches this to 775
+  cache: true                                    # Set to true to enable Twig caching
+  debug: true                                    # Enable Twig debug
+  auto_reload: true                              # Refresh cache on changes
+  autoescape: false                              # Autoescape Twig vars (DEPRECATED, always enabled in strict mode)
+  undefined_functions: true                      # Allow undefined functions
+  undefined_filters: true                        # Allow undefined filters
+  umask_fix: false                               # By default Twig creates cached files as 755, fix switches this to 775
 
-assets:                                     # Configuration for Assets Manager (JS, CSS)
-  css_pipeline: false                       # The CSS pipeline is the unification of multiple CSS resources into one file
-  css_pipeline_include_externals: true      # Include external URLs in the pipeline by default
-  css_pipeline_before_excludes: true        # Render the pipeline before any excluded files
-  css_minify: true                          # Minify the CSS during pipelining
-  css_minify_windows: false                 # Minify Override for Windows platforms. False by default due to ThreadStackSize
-  css_rewrite: true                         # Rewrite any CSS relative URLs during pipelining
-  js_pipeline: false                        # The JS pipeline is the unification of multiple JS resources into one file
-  js_pipeline_include_externals: true       # Include external URLs in the pipeline by default
-  js_pipeline_before_excludes: true         # Render the pipeline before any excluded files
-  js_minify: true                           # Minify the JS during pipelining
-  enable_asset_timestamp: false             # Enable asset timestamps
+assets:                                          # Configuration for Assets Manager (JS, CSS)
+  css_pipeline: false                            # The CSS pipeline is the unification of multiple CSS resources into one file
+  css_pipeline_include_externals: true           # Include external URLs in the pipeline by default
+  css_pipeline_before_excludes: true             # Render the pipeline before any excluded files
+  css_minify: true                               # Minify the CSS during pipelining
+  css_minify_windows: false                      # Minify Override for Windows platforms. False by default due to ThreadStackSize
+  css_rewrite: true                              # Rewrite any CSS relative URLs during pipelining
+  js_pipeline: false                             # The JS pipeline is the unification of multiple JS resources into one file
+  js_pipeline_include_externals: true            # Include external URLs in the pipeline by default
+  js_pipeline_before_excludes: true              # Render the pipeline before any excluded files
+  js_minify: true                                # Minify the JS during pipelining
+  enable_asset_timestamp: false                  # Enable asset timestamps
   collections:
     jquery: system://assets/jquery/jquery-2.x.min.js
 
 errors:
-  display: false                            # Display full backtrace-style error page
-  log: true                                 # Log errors to /logs folder
+  display: 0                                     # Display either (1) Full backtrace | (0) Simple Error | (-1) System Error
+  log: true                                      # Log errors to /logs folder
+
+log:
+  handler: file                                 # Log handler. Currently supported: file | syslog
+  syslog:
+    facility: local6                            # Syslog facilities output
 
 debugger:
-  enabled: false                            # Enable Grav debugger and following settings
+  enabled: false                                 # Enable Grav debugger and following settings
   shutdown:
-    close_connection: true                  # Close the connection before calling onShutdown(). false for debugging
+    close_connection: true                       # Close the connection before calling onShutdown(). false for debugging
 
 images:
-  default_image_quality: 85                 # Default image quality to use when resampling images (85%)
-  cache_all: false                          # Cache all image by default
-  cache_perms: '0755'                       # MUST BE IN QUOTES!! Default cache folder perms. Usually '0755' or '0775'
-  debug: false                              # Show an overlay over images indicating the pixel depth of the image when working with retina for example
+  default_image_quality: 85                      # Default image quality to use when resampling images (85%)
+  cache_all: false                               # Cache all image by default
+  cache_perms: '0755'                            # MUST BE IN QUOTES!! Default cache folder perms. Usually '0755' or '0775'
+  debug: false                                   # Show an overlay over images indicating the pixel depth of the image when working with retina for example
+  auto_fix_orientation: false                    # Automatically fix the image orientation based on the Exif data
+  seofriendly: false                             # SEO-friendly processed image names
 
 media:
-  enable_media_timestamp: false             # Enable media timetsamps
-  upload_limit: 0                           # Set maximum upload size in bytes (0 is unlimited)
-  unsupported_inline_types: []              # Array of supported media types to try to display inline
-  allowed_fallback_types: []                # Array of allowed media types of files found if accessed via Page route
+  enable_media_timestamp: false                  # Enable media timestamps
+  unsupported_inline_types: []                   # Array of supported media types to try to display inline
+  allowed_fallback_types: []                     # Array of allowed media types of files found if accessed via Page route
+  auto_metadata_exif: false                      # Automatically create metadata files from Exif data where possible
 
 session:
-  enabled: true                             # Enable Session support
-  timeout: 1800                             # Timeout in seconds
-  name: grav-site                           # Name prefix of the session cookie. Use alphanumeric, dashes or underscores only. Do not use dots in the session name
-  secure: false                             # Set session secure. If true, indicates that communication for this cookie must be over an encrypted transmission. Enable this only on sites that run exclusively on HTTPS
-  httponly: true                            # Set session HTTP only. If true, indicates that cookies should be used only over HTTP, and JavaScript modification is not allowed.
+  enabled: true                                  # Enable Session support
+  initialize: true                               # Initialize session from Grav (if false, plugin needs to start the session)
+  timeout: 1800                                  # Timeout in seconds
+  name: grav-site                                # Name prefix of the session cookie. Use alphanumeric, dashes or underscores only. Do not use dots in the session name
+  uniqueness: path                               # Should sessions be `path` based or `security.salt` based
+  secure: false                                  # Set session secure. If true, indicates that communication for this cookie must be over an encrypted transmission. Enable this only on sites that run exclusively on HTTPS
+  httponly: true                                 # Set session HTTP only. If true, indicates that cookies should be used only over HTTP, and JavaScript modification is not allowed.
+  split: true                                    # Sessions should be independent between site and plugins (such as admin)
   path:
 
 gpm:
-  releases: stable                           # Set to either 'stable' or 'testing'
-  proxy_url:                                 # Configure a manual proxy URL for GPM (eg 127.0.0.1:3128)
+  releases: stable                               # Set to either 'stable' or 'testing'
+  proxy_url:                                     # Configure a manual proxy URL for GPM (eg 127.0.0.1:3128)
+  method: 'auto'                                 # Either 'curl', 'fopen' or 'auto'. 'auto' will try fopen first and if not available cURL
+  verify_peer: true                              # Sometimes on some systems (Windows most commonly) GPM is unable to connect because the SSL certificate cannot be verified. Disabling this setting might help.
+  official_gpm_only: true                        # By default GPM direct-install will only allow URLs via the official GPM proxy to ensure security
 
-custom_base_url: ''
+accounts:
+  type: data                                     # Account type: data or flex
+  storage: file                                  # Flex storage type: file or folder
+
+strict_mode:
+  yaml_compat: true                              # Grav 1.5+: Enables YAML backwards compatibility
+  twig_compat: true                              # Grav 1.5+: Enables deprecated Twig autoescape setting (autoescape: false)

system/defines.php

@@ -1,17 +1,20 @@
 <?php
 /**
- * @package    Grav.Core
+ * @package    Grav\Core
  *
- * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @copyright  Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
  * @license    MIT License; see LICENSE file for details.
  */
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.1.4');
+define('GRAV_VERSION', '1.6.20');
 define('GRAV_TESTING', false);
 define('DS', '/');
-define('GRAV_PHP_MIN', '5.5.9');
+
+if (!defined('GRAV_PHP_MIN')) {
+    define('GRAV_PHP_MIN', '7.1.3');
+}
 
 // Directories and Paths
 if (!defined('GRAV_ROOT')) {