Merge branch 'release/1.0.0-rc.4'

Addresses # 12 (form-plugin) Trim fields before validation

.dependencies

@@ -2,15 +2,15 @@ git:
     problems:
         url: https://github.com/getgrav/grav-plugin-problems
         path: user/plugins/problems
-        branch: develop
+        branch: master
     error:
         url: https://github.com/getgrav/grav-plugin-error
         path: user/plugins/error
-        branch: develop
+        branch: master
     antimatter:
         url: https://github.com/getgrav/grav-theme-antimatter
         path: user/themes/antimatter
-        branch: develop
+        branch: master
 links:
     problems:
         src: grav-plugin-problems

.gitignore

@@ -1,5 +1,4 @@
 # Composer
-composer.lock
 .composer
 vendor/
 
@@ -7,6 +6,8 @@ vendor/
 .sass-cache
 
 # Grav Specific
+backup/*
+!backup/.*
 cache/*
 !cache/.*
 assets/*

.htaccess

@@ -44,13 +44,20 @@ RewriteRule .* index.php [L]
 
 ## Begin - Security
 # Block all direct access for these folders
-RewriteRule ^(cache|bin|logs)/(.*) error [L]
+RewriteRule ^(.git|cache|bin|logs|backup)/(.*) error [L]
 # Block access to specific file types for these folders
 RewriteRule ^(system|user|vendor)/(.*)\.(txt|md|html|yaml|php|twig|sh|bat)$ error [L]
+# Block all direct access to .md files:
+RewriteRule \.md$ error [L]
+# Block all direct access to files and folders beginning with a dot
+RewriteRule (^\.|/\.) - [F]
+# Block access to specific files in the root folder
+RewriteRule ^(LICENSE|composer.lock|composer.json|nginx.conf|web.config)$ error [F]
 ## End - Security
 
 </IfModule>
 
-# Begin - Prevent Browsing
+# Begin - Prevent Browsing and Set Default Resources
 Options -Indexes
-# End - Prevent Browsing
+DirectoryIndex index.php index.html index.htm
+# End - Prevent Browsing and Set Default Resources

.travis.yml

@@ -0,0 +1,82 @@
+language: php
+php: 5.6
+branches:
+  only:
+    - master
+    - build_test
+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}): Grav Core and Skeletons packages have been uploaded. (<a href="%{build_url}">Details</a>)'
+    format: html
+env:
+  global:
+    # Colors!
+    - TEXTRESET=$(tput sgr0) # reset the foreground colour
+    - RED=$(tput setaf 1)
+    - GREEN=$(tput setaf 2)
+    - YELLOW=$(tput setaf 3)
+    - BLUE=$(tput setaf 4)
+    - BOLD=$(tput bold)
+    # User
+    - GH_USER="getgrav"
+    # Paths
+    - RT_DEVTOOLS=$HOME/devtools
+    - GOPATH="$HOME/go"
+    - PATH="$GOPATH/bin:$PATH"
+    # GH_TOKEN [API Key]
+    - secure: "jS+c+g2v33vypG4VtqiSDW2qQ4dGJZlrUKBRCztoy1yrOrYRPvc5Vzi/AS3fDmZ4yizukEwmUNNzyZQcgFvLPpmCCml46Dovp8R9OXhbNe8OnULmaSn2Zkr71oblMYu6ZP+RpYvNq0BIdSB3u2TiFriHMiTIkX9UwZNaUCOX1ig="
+    # BB_TOKEN value => "user:pass@"
+    - secure: "einUtSEkUWy2IrqLXyVjwUU+mwaaoiOXRRVdLBpA3Zye6bZx8cm5h/5AplkPWhM/NmCJoW/MwNZHHkFhlr3mDRov5iOxVmTTYfnXB+I5lxYTSgduOLLErS7mU8hfADpVDU8bHNU44fNGD3UEiG1PD4qQBX4DMlqIFmR20mjs81k="
+    # GH_API_USER [for curl]
+    - secure: "Xbk/V9aIys0NxccJGR3Zrm2GRxDnA0RuazBs1puIboTYDhbi0Z7JTL+mOx3xp5Kfoniad/xAuijQESTM9MMrKqq/qCzhAMaC1+vcL4pCHZH4NSG6DBxB9BPkKVFq+1llu5FTEf8bkxHzwGR0l1ARW6TVRcgTHr5B58bCEIwEOrI="
+    # 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:
+  - composer self-update
+  - 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
+      cd "${RT_DEVTOOLS}";
+      ./build-grav.sh skeletons.txt;
+    fi
+script:
+  - if [ ! -z "$TRAVIS_TAG" ]; then
+      FILES="$RT_DEVTOOLS/grav-dist/*.zip";
+      for file in ${FILES[@]}; do
+        NAME=${file##*/};
+        if [[ "$NAME" == *"-rc"* ]]; then
+            REPO="$(echo ${NAME} | rev | cut -f 3- -d "-" | rev)";
+        else
+            REPO="$(echo ${NAME} | rev | cut -f 2- -d "-" | rev)";
+        fi;
+        if [[ $REPO == 'grav' || $REPO == 'grav-admin' || $REPO == 'grav-update' ]]; then
+          REPO="grav";
+        fi;
+        API="$(curl --fail --user "${GH_API_USER}" -s https://api.github.com/repos/${GH_USER}/${REPO}/releases/latest)";
+        ASSETS="$(echo "${API}" | node gh-assets.js)";
+        TAG="$(echo "${API}" | grep tag_name | head -n 1 | cut -d '"' -f 4)";
+        if [ $REPO == "grav" ]; then
+          TAG="$TRAVIS_TAG";
+        fi;
+        if [ ! -z "$ASSETS" ]; then
+          for asset in ${ASSETS[@]}; do
+            asset_id=$(echo ${asset} | cut -d ':' -f 1);
+            asset_name=$(echo ${asset} | cut -d ':' -f 2);
+            if [ "${NAME}" == "${asset_name}" ]; then
+              echo -e "\nAsset ${BOLD}${BLUE}${NAME}${TEXTRESET} already exists in ${YELLOW}${REPO}${TEXTRESET}@${BOLD}${YELLOW}${TAG}${TEXTRESET}... deleting id ${BOLD}${RED}${asset_id}${TEXTRESET}...";
+              curl -X DELETE --fail --user "${GH_API_USER}" "https://api.github.com/repos/${GH_USER}/${REPO}/releases/assets/${asset_id}";
+            fi;
+          done;
+        fi;
+        echo "Uploading package ${BOLD}${BLUE}${NAME}${TEXTRESET} to ${YELLOW}${REPO}${TEXTRESET}@${YELLOW}${TAG}${TEXTRESET}";
+        github-release upload --security-token $GH_TOKEN --user ${GH_USER} --repo $REPO --tag "$TAG" --name "$NAME" --file "$file";
+      done;
+    fi

CHANGELOG.md

@@ -1,3 +1,426 @@
+# v1.0.0-rc.4
+## 10/29/2015
+
+1. [](#bugfix)
+    * Fixed a fatal error if you have a collection with missing or invalid `@page: /route`
+
+# v1.0.0-rc.3
+## 10/29/2015
+
+1. [](#new)
+    * New Page collection options! `@self.parent, @self.siblings, @self.descendants` + more
+    * Whitelist of file types for fallback route functionality (images by default)
+1. [](#improved)
+    * Assets switched from defines to streams
+1. [](#bugfix)
+    * README.md typos fixed
+    * Fixed issue with routes that have lang string in them (`/en/english`)
+    * Trim strings before validation so whitespace is not satisfy 'required'
+
+# v1.0.0-rc.2
+## 10/27/2015
+
+1. [](#new)
+    * Added support for CSS Asset groups
+    * Added a `wrapped_site` system option for themes/plugins to use
+    * Pass `Page` object as event to `onTwigPageVariables()` event hook
+    * New `Data.items()` method to get all items
+1. [](#improved)
+    * Missing pipelined remote asset will now fail quietly
+    * More reliably handle inline JS and CSS to remove only surrounding HTML tags
+    * `Medium.meta` returns new Data object so null checks are possible
+    * Improved Medium metadata merging to allow for automatic title/alt/class attributes
+    * Moved Grav object to global variable rather than template variable (useful for macros)
+    * German language improvements
+    * Updated bundled composer
+1. [](#bugfix)
+    * Accept variety of `true` values in `User.authorize()` method 
+    * Fix for `Validation` throwing an error if no label set
+
+# v1.0.0-rc.1
+## 10/23/2015
+
+1. [](#new)
+    * Use native PECL YAML parser if installed for 4X speed boost in parsing YAML files
+    * Support for inherited theme class
+    * Added new default language prepend system configuration option
+    * New `|evaluate` Twig filter to evaluate a string as twig
+    * New system option to ignore all **hidden** files and folders
+    * New system option for default redirect code
+    * Added ability to append specific `[30x]` codes to redirect URLs
+    * Added `url_taxonomy_filters` for page collections
+    * Added `@root` page and `recurse` flag for page collections
+    * Support for **multiple** page collection types as an array
+    * Added Dutch language file
+    * Added Russian language file
+    * Added `remove` method to User object
+1. [](#improved)
+    * Moved hardcoded mimetypes to `media.yaml` to be treated as Page media files
+    * Set `errors: display: false` by default in `system.yaml`
+    * Strip out extra slashes in the URI
+    * Validate hostname to ensure it is valid
+    * Ignore more SCM folders in Backups
+    * Removed `home_redirect` settings from `system.yaml`
+    * Added Page `media` as root twig object for consistency
+    * Updated to latest vendor libraries
+    * Optimizations to Asset pipeline logic for minor speed increase
+    * Block direct access to a variety of files in `.htaccess` for increased security
+    * Debugbar vendor library update
+    * Always fallback to english if other translations are not available
+1. [](#bugfix)
+    * Fix for redirecting external URL with multi-language
+    * Fix for Asset pipeline not respecting asset groups
+    * Fix language files with child/parent theme relationships
+    * Fixed a regression issue resulting in incorrect default language
+    * Ensure error handler is initialized before URI is processed
+    * Use default language in Twig if active language is not set
+    * Fixed issue with `safeEmailFilter()` Twig filter not separating with `;` properly
+    * Fixed empty YAML file causing error with native PECL YAML parser
+    * Fixed `SVG` mimetype
+    * Fixed incorrect `Cache-control: max-age` value format
+
+# v0.9.45
+## 10/08/2015
+
+1. [](#bugfix)
+    * Fixed a regression issue resulting in incorrect default language
+
+# v0.9.44
+## 10/07/2015
+
+1. [](#new)
+    * Added Redis back as a supported cache mechanism
+    * Allow Twig `nicetime` translations
+    * Added `-y` option for 'Yes to all' in `bin/gpm update`
+    * Added CSS `media` attribute to the Assets manager
+    * New German language support
+    * New Czech language support
+    * New French language support
+    * Added `modulus` twig filter
+1. [](#improved)
+    * URL decode in medium actions to allow complex syntax
+    * Take into account `HTTP_HOST` before `SERVER_NAME` (helpful with Nginx)
+    * More friendly cache naming to ease manual management of cache systems
+    * Added default Apache resource for `DirectoryIndex`
+1. [](#bugfix)
+    * Fix GPM failure when offline
+    * Fix `open_basedir` error in `bin/gpm install`
+    * Fix an HHVM error in Truncator
+    * Fix for XSS vulnerability with params
+    * Fix chaining for responsive size derivatives
+    * Fix for saving pages when removing the page title and all other header elements
+    * Fix when saving array fields
+    * Fix for ports being included in `HTTP_HOST`
+    * Fix for Truncator to handle PHP tags gracefully
+    * Fix for locate style lang codes in `getNativeName()`
+    * Urldecode image basenames in markdown
+
+# v0.9.43
+## 09/16/2015
+
+1. [](#new)
+    * Added new `AudioMedium` for HTML5 audio
+    * Added ability for Assets to be added and displayed in separate *groups*
+    * New support for responsive image derivative sizes
+1. [](#improved)
+    * GPM theme install now uses a `copy` method so new files are not lost (e.g. `/css/custom.css`)
+    * Code analysis improvements and cleanup
+    * Removed Twig panel from debugger (no longer supported in Twig 1.20)
+    * Updated composer packages
+    * Prepend active language to `convertUrl()` when used in markdown links
+    * Added some pre/post flight options for installer via blueprints
+    * Hyphenize the site name in the backup filename
+1. [](#bugfix)
+    * Fix broken routable logic
+    * Check for `phpinfo()` method in case it is restricted by hosting provider
+    * Fixes for windows when running GPM
+    * Fix for ampersand (`&`) causing error in `truncateHtml()` via `Page.summary()`
+
+# v0.9.42
+## 09/11/2015
+
+1. [](#bugfix)
+    * Fixed `User.authorise()` to be backwards compabile
+
+# v0.9.41
+## 09/11/2015
+
+1. [](#new)
+    * New and improved multibyte-safe TruncateHTML function and filter
+    * Added support for custom page date format
+    * Added a `string` Twig filter to render as json_encoded string
+    * Added `authorize` Twig filter
+    * Added support for theme inheritance in the admin
+    * Support for multiple content collections on a page
+    * Added configurable files/folders ignores for pages
+    * Added the ability to set the default PHP locale and override via multi-lang configuration
+    * Added ability to save as YAML via admin
+    * Added check for `mbstring` support
+    * Added new `redirect` header for pages
+1. [](#improved)
+    * Changed dependencies from `develop` to `master`
+    * Updated logging to log everything from `debug` level on (was `warning`)
+    * Added missing `accounts/` folder
+    * Default to performing a 301 redirect for URIs with trailing slashes
+    * Improved Twig error messages
+    * Allow validating of forms from anywhere such as plugins
+    * Added logic so modular pages are by default non-routable
+    * Hide password input in `bin/grav newuser` command
+1. [](#bugfix)
+    * Fixed `Pages.all()` not returning modular pages
+    * Fix for modular template types not getting found
+    * Fix for `markdown_extra:` overriding `markdown:extra:` setting
+    * Fix for multi-site routing
+    * Fix for multi-lang page name error
+    * Fixed a redirect loop in `URI` class
+    * Fixed a potential error when `unsupported_inline_types` is empty
+    * Correctly generate 2x retina image
+    * Typo fixes in page publish/unpublish blueprint
+
+# v0.9.40
+## 08/31/2015
+
+1. [](#new)
+    * Added some new Twig filters: `defined`, `rtrim`, `ltrim`
+    * Admin support for customizable page file name + template override
+1. [](#improved)
+    * Better message for incompatible/unsupported Twig template
+    * Improved User blueprints with better help
+    * Switched to composer **install** rather than **update** by default
+    * Admin autofocus on page title
+    * `.htaccess` hardening (`.htaccess` & `htaccess.txt`)
+    * Cache safety checks for missing folders
+1. [](#bugfix)
+    * Fixed issue with unescaped `o` character in date formats
+
+# v0.9.39
+## 08/25/2015
+
+1. [](#bugfix)
+    * `Page.active()` not triggering on **homepage**
+    * Fix for invalid session name in Opera browser
+
+# v0.9.38
+## 08/24/2015
+
+1. [](#new)
+    * Added `language` to **user** blueprint
+    * Added translations to blueprints
+    * New extending logic for blueprints
+    * Blueprints are now loaded with Streams to allow for better overrides
+    * Added new Symfony `dump()` method
+1. [](#improved)
+    * Catch YAML header parse exception so site doesn't die
+    * Better `Page.parent()` logic
+    * Improved GPM display layout
+    * Tweaked default page layout
+    * Unset route and slug for improved reliability of route changes
+    * Added requirements to README.md
+    * Updated various libraries
+    * Allow use of custom page date field for dateRange collections
+1. [](#bugfix)
+    * Slug fixes with GPM
+    * Unset plaintext password on save
+    * Fix for trailing `/` not matching active children
+
+# v0.9.37
+## 08/12/2015
+
+3. [](#bugfix)
+    * Fixed issue when saving `header.process` in page forms via the **admin plugin**
+    * Fixed error due to use of `set_time_limit` that might be disabled on some hosts
+
+# v0.9.36
+## 08/11/2015
+
+1. [](#new)
+    * Added a new `newuser` CLI command to create user accounts
+    * Added `default` blueprint for all templates
+    * Support `user` and `system` language translation merging
+1. [](#improved)
+    * Added isSymlink method in GPM to determine if Grav is symbolically linked or not
+    * Refactored page recursing
+    * Updated blueprints to use new toggles
+    * Updated blueprints to use current date for date format fields
+    * Updated composer.phar
+    * Use sessions for admin even when disabled for site
+    * Use `GRAV_ROOT` in session identifier
+
+# v0.9.35
+## 08/06/2015
+
+1. [](#new)
+    * Added `body_classes` field
+    * Added `visiblity` toggle and help tooltips on new page form
+    * Added new `Page.unsetRoute()` method to allow admin to regenerate the route
+2. [](#improved)
+    * User save no longer stores username each time
+    * Page list form field now shows all pages except root
+    * Removed required option from page title
+    * Added configuration settings for running Nginx in sub directory
+3. [](#bugfix)
+    * Fixed deep translation merging
+    * Fixed broken **metadata** merging with site defaults
+    * Fixed broken **summary** field
+    * Fixed broken robots field
+    * Fixed GPM issue when using cURL, throwing an `Undefined offset: 1` exception
+    * Removed duplicate hidden page `type` field
+
+# v0.9.34
+## 08/04/2015
+
+1. [](#new)
+    * Added new `cache_all` system setting + media `cache()` method
+    * Added base languages configuration
+    * Added property language to page to help plugins identify page language
+    * New `Utils::arrayFilterRecursive()` method
+2. [](#improved)
+    * Improved Session handling to support site and admin independently
+    * Allow Twig variables to be modified in other events
+    * Blueprint updates in preparation for Admin plugin
+    * Changed `Inflector` from static to object and added multi-language support
+    * Support for admin override of a page's blueprints
+3. [](#bugfix)
+    * Removed unused `use` in `VideoMedium` that was causing error
+    * Array fix in `User.authorise()` method
+    * Fix for typo in `translations_fallback`
+    * Fixed moving page to the root
+
+# v0.9.33
+## 07/21/2015
+
+1. [](#new)
+    * Added new `onImageMediumSaved()` event (useful for post-image processing)
+    * Added `Vary: Accept-Encoding` option
+2. [](#improved)
+    * Multilang-safe delimeter position
+    * Refactored Twig classes and added optional umask setting
+    * Removed `pageinit()` timing
+    * `Page->routable()` now takes `published()` state into account
+    * Improved how page extension is set
+    * Support `Language->translate()` method taking string and array
+3. [](#bugfix)
+    * Fixed `backup` command to include empty folders
+
+# v0.9.32
+## 07/14/2015
+
+1. [](#new)
+    * Detect users preferred language via `http_accept_language` setting
+    * Added new `translateArray()` language method
+2. [](#improved)
+    * Support `en` translations by default for plugins & themes
+    * Improved default generator tag
+    * Minor language tweaks and fixes
+3. [](#bugfix)
+    * Fix for session active language and homepage redirects
+    * Ignore root-level page rather than throwing error
+
+# v0.9.31
+## 07/09/2015
+
+1. [](#new)
+    * Added xml, json, css and js to valid media file types
+2. [](#improved)
+    * Better handling of unsupported media type downloads
+    * Improved `bin/grav backup` command to mimic admin plugin location/name
+3. [](#bugfix)
+    * Critical fix for broken language translations
+    * Fix for Twig markdown filter error
+    * Safety check for download extension
+
+# v0.9.30
+## 07/08/2015
+
+1. [](#new)
+    * BIG NEWS! Extensive Multi-Language support is all new in 0.9.30!
+    * Translation support via Twig filter/function and PHP method
+    * Page specific default route
+    * Page specific route aliases
+    * Canonical URL route support
+    * Added built-in session support
+    * New `Page.rawRoute()` to get a consistent folder-based route to a page
+    * Added option to always redirect to default page on alias URL
+    * Added language safe redirect function for use in core and plugins
+2. [](#improved)
+    * Improved `Page.active()` and `Page.activeChild()` methods to support route aliases
+    * Various spelling corrections in `.php` comments, `.md` and `.yaml` files
+    * `Utils::startsWith()` and `Utils::endsWith()` now support needle arrays
+    * Added a new timer around `pageInitialized` event
+    * Updated jQuery library to v2.1.4
+3. [](#bugfix)
+    * In-page CSS and JS files are now handled properly
+    * Fix for `enable_media_timestamp` not working properly
+
+# v0.9.29
+## 06/22/2015
+
+1. [](#new)
+    * New and improved Regex-powered redirect and route alias logic
+    * Added new `onBuildPagesInitialized` event for memory critical or time-consuming plugins
+    * Added a `setSummary()` method for pages
+2. [](#improved)
+    * Improved `MergeConfig()` logic for more control
+    * Travis skeleton build trigger implemented
+    * Set composer.json versions to stable versions where possible
+    * Disabled `last_modified` and `etag` page headers by default (causing too much page caching)
+3. [](#bugfix)
+    * Preload classes during `bin/gpm selfupgrade` to avoid issues with updated classes
+    * Fix for directory relative _down_ links
+
+# v0.9.28
+## 06/16/2015
+
+1. [](#new)
+    * Added method to set raw markdown on a page
+    * Added ability to enabled system and page level `etag` and `last_modified` headers
+2. [](#improved)
+    * Improved image path processing
+    * Improved query string handling
+    * Optimization to image handling supporting URL encoded filenames
+    * Use global `composer` when available rather than Grv provided one
+    * Use `PHP_BINARY` contant rather than `php` executable
+    * Updated Doctrine Cache library
+    * Updated Symfony libraries
+    * Moved `convertUrl()` method to Uri object
+3. [](#bugfix)
+    * Fix incorrect slug causing problems with CLI `uninstall`
+    * Fix Twig runtime error with assets pipeline in sufolder installations
+    * Fix for `+` in image filenames
+    * Fix for dot files causing issues with page processing
+    * Fix for Uri path detection on Windows platform
+    * Fix for alternative media resolutions
+    * Fix for modularTypes key properties
+
+# v0.9.27
+## 05/09/2015
+
+1. [](#new)
+    * Added new composer CLI command
+    * Added page-level summary header overrides
+    * Added `size` back for Media objects
+    * Refactored Backup command in preparation for admin plugin
+    * Added a new `parseLinks` method to Plugins class
+    * Added `starts_with` and `ends_with` Twig filters
+2. [](#improved)
+    * Optimized install of vendor libraries for speed improvement
+    * Improved configuration handling in preparation for admin plugin
+    * Cache optimization: Don't cache Twig templates when you pass dynamic params
+    * Moved `Utils::rcopy` to `Folder::rcopy`
+    * Improved `Folder::doDelete`
+    * Added check for required Curl in GPM
+    * Updated included composer.phar to latest version
+    * Various blueprint fixes for admin plugin
+    * Various PSR and code cleanup tasks
+3. [](#bugfix)
+    * Fix issue with Gzip not working with `onShutDown()` event
+    * Fix for URLs with trailing slashes
+    * Handle condition where certain errors resulted in blank page
+    * Fix for issue with theme name equal to base_url and asset pipeline
+    * Fix to properly normalize font rewrite path
+    * Fix for absolute URLs below the current page
+    * Fix for `..` page references
+
 # v0.9.26
 ## 04/24/2015
 
@@ -12,7 +435,7 @@
 2. [](#improved)
     * Refactored media image handling to make it more flexible and support absolute paths
     * Refactored page modification check process to make it faster
-    * User account improvements in preparation for Admin plugin
+    * User account improvements in preparation for admin plugin
     * Protect against timing attacks
     * Reset default system expires time to 0 seconds (can override if you need to)
 3. [](#bugfix)
@@ -140,7 +563,7 @@
     * Improved the markdown Lightbox functionality to better mimic Twig version
     * Fullsize Lightbox can now have filters applied
     * Added a new `mergeConfig()` method to Plugin class to merge system + page header configuration
-    * Added a new `disable()` method to Plugin class to programatically disable a plugin
+    * Added a new `disable()` method to Plugin class to programmatically disable a plugin
     * Updated Parsedown and Parsedown Extra to address bugs
     * Various PSR fixes
 3. [](#bugfix)
@@ -193,7 +616,7 @@
     * Added `publish_date` in page headers to automatically publish page
     * Added `unpublish_date` in page headers to automatically unpublish page
     * Added `dateRange()` capability for collections
-    * Added ability to dynamically control Cache lifetime programatically
+    * Added ability to dynamically control Cache lifetime programmatically
     * Added ability to sort by anything in the page header. E.g. `sort: header.taxonomy.year`
     * Added various helper methods to collections: `copy, nonVisible, modular, nonModular, published, nonPublished, nonRoutable`
 2. [](#improved)
@@ -368,7 +791,7 @@
     * Broke cache types out into multiple directories in the cache folder
     * Removed vendor libs from github repository
     * Various PSR cleanup of code
-    * Various Blueprint updates to support upcoming Admin plugin
+    * Various Blueprint updates to support upcoming admin plugin
     * Added ability to filter page children for normal/modular/all
     * Added `sort_by_key` twig filter
     * Added `visible()` and `routable()` filters to page collections
@@ -441,7 +864,7 @@
     * Addition of Dependency Injection Container
     * Refactored plugins to use Symfony Event Dispatcher
     * New Asset Manager to provide unified management of JavaScript and CSS
-    * Asset Pipelining to provide unification, minify, and optimazation of JavaScript and CSS
+    * Asset Pipelining to provide unification, minify, and optimization of JavaScript and CSS
     * Grav Media support directly in Markdown syntax
     * Additional Grav Generator meta tag in default themes
     * Added support for PHP Stream Wrapper for resource location

README.md

@@ -4,18 +4,23 @@
 
 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:
+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 Mardown Extra support
+* [Parsedown](http://parsedown.org/): for fast Markdown and Markdown Extra support
 * [Doctrine Cache](http://docs.doctrine-project.org/en/2.0.x/reference/caching.html): layer for performance
 * [Pimple Dependency Injection Container](http://pimple.sensiolabs.org/): for extensibility and maintainability
-* [Symfony Event Dispacher](http://symfony.com/doc/current/components/event_dispatcher/introduction.html): for plugin event handling
+* [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
 * [Gregwar Image Library](https://github.com/Gregwar/Image): for dynamic image manipulation
 
+# Requirements
+
+- PHP 5.4 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
+
 # QuickStart
 
 You have two options to get Grav:
@@ -42,13 +47,13 @@ Check out the [install procedures](http://learn.getgrav.org/basics/installation)
 
 # Adding Functionality
 
-You can download manually from 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](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`:
 
 ```
 $ bin/gpm index
 ```
 
-This will display all the available plugins and then you can install one ore more with:
+This will display all the available plugins and then you can install one or more with:
 
 ```
 $ bin/gpm install <plugin/theme>
@@ -71,7 +76,7 @@ $ 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 contribution follow our simple guidelines in order to be properly received.
+However, we ask that any contributions follow our simple guidelines in order to be properly received.
 
 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.
 

bin/gpm

@@ -6,10 +6,17 @@ if (version_compare($ver = PHP_VERSION, $req = '5.4.0', '<')) {
     exit(sprintf("You are running PHP %s, but Grav needs at least PHP %s to run.\n", $ver, $req));
 }
 
+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('php bin/composer.phar --working-dir="'.__DIR__.'/../" --no-interaction install');
+    echo system($composer.' --working-dir="'.__DIR__.'/../" --no-interaction --no-dev --prefer-dist -o install');
     echo "\n\n";
 }
 
@@ -26,6 +33,10 @@ if (!file_exists(ROOT_DIR . 'index.php')) {
     exit('FATAL: Must be run from ROOT directory of Grav!');
 }
 
+if (!function_exists('curl_version')) {
+    exit('FATAL: GPM requires PHP Curl module to be installed');
+}
+
 $grav = Grav::instance(array('loader' => $autoload));
 $grav['config']->init();
 $grav['streams'];

bin/grav

@@ -6,10 +6,17 @@ if (version_compare($ver = PHP_VERSION, $req = '5.4.0', '<')) {
     exit(sprintf("You are running PHP %s, but Grav needs at least PHP %s to run.\n", $ver, $req));
 }
 
+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('php bin/composer.phar --working-dir="'.__DIR__.'/../" --no-interaction install');
+    echo system($composer.' --working-dir="'.__DIR__.'/../" --no-interaction --no-dev --prefer-dist -o install');
     echo "\n\n";
 }
 
@@ -28,10 +35,12 @@ if (!file_exists(ROOT_DIR . 'index.php')) {
 $app = new Application('Grav CLI Application', '0.1.0');
 $app->addCommands(array(
     new Grav\Console\Cli\InstallCommand(),
+    new Grav\Console\Cli\ComposerCommand(),
     new Grav\Console\Cli\SandboxCommand(),
     new Grav\Console\Cli\CleanCommand(),
     new Grav\Console\Cli\ClearCacheCommand(),
     new Grav\Console\Cli\BackupCommand(),
     new Grav\Console\Cli\NewProjectCommand(),
+    new Grav\Console\Cli\NewUserCommand(),
 ));
 $app->run();

composer.json

@@ -9,19 +9,20 @@
         "php": ">=5.4.0",
         "twig/twig": "~1.16",
         "erusev/parsedown-extra": "~0.7",
-        "symfony/yaml": "~2.6",
-        "symfony/console": "~2.6",
-        "symfony/event-dispatcher": "~2.6",
-        "doctrine/cache": "~1.3",
-        "maximebf/debugbar": "dev-master",
+        "symfony/yaml": "~2.7",
+        "symfony/console": "~2.7",
+        "symfony/event-dispatcher": "~2.7",
+        "symfony/var-dumper": "~2.7",
+        "doctrine/cache": "~1.4",
         "filp/whoops": "1.2.*@dev",
         "monolog/monolog": "~1.0",
         "gregwar/image": "~2.0",
         "ircmaxell/password-compat": "1.0.*",
-        "mrclay/minify": "dev-master",
-        "donatj/phpuseragentparser": "dev-master",
+        "mrclay/minify": "~2.2",
+        "donatj/phpuseragentparser": "~0.3",
         "pimple/pimple": "~3.0",
-        "rockettheme/toolbox": "1.0.*"
+        "rockettheme/toolbox": "1.1.*",
+        "maximebf/debugbar": "~1.10"
     },
     "autoload": {
         "psr-4": {

htaccess.txt

@@ -44,13 +44,20 @@ RewriteRule .* index.php [L]
 
 ## Begin - Security
 # Block all direct access for these folders
-RewriteRule ^(cache|bin|logs)/(.*) error [L]
+RewriteRule ^(.git|cache|bin|logs|backup)/(.*) error [L]
 # Block access to specific file types for these folders
 RewriteRule ^(system|user|vendor)/(.*)\.(txt|md|html|yaml|php|twig|sh|bat)$ error [L]
+# Block all direct access to .md files:
+RewriteRule \.md$ error [L]
+# Block all direct access to files and folders beginning with a dot
+RewriteRule (^\.|/\.) - [F]
+# Block access to specific files in the root folder
+RewriteRule ^(LICENSE|composer.lock|composer.json|nginx.conf|web.config)$ error [F]
 ## End - Security
 
 </IfModule>
 
-# Begin - Prevent Browsing
+# Begin - Prevent Browsing and Set Default Resources
 Options -Indexes
-# End - Prevent Browsing
+DirectoryIndex index.php index.html index.htm
+# End - Prevent Browsing and Set Default Resources

index.php

@@ -19,6 +19,12 @@ $loader = require_once $autoload;
 // 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')) {
+    throw new \RuntimeException("'mbstring' extension is not loaded.  This is required for Grav to run correctly");
+}
+mb_internal_encoding('UTF-8');
+
 // Get the Grav instance
 $grav = Grav::instance(
     array(

nginx.conf

@@ -1,69 +1,87 @@
-worker_processes  1;
+worker_processes 1;
 
 events {
-    worker_connections  1024;
+    worker_connections 1024;
 }
 
-
 http {
-    include       mime.types;
-    default_type  application/octet-stream;
-    sendfile        on;
-    keepalive_timeout  65;
+    include mime.types;
+    default_type application/octet-stream;
+    sendfile on;
+    keepalive_timeout 65;
 
     server {
-        listen       80;
-        server_name  localhost;
+        listen 80;
+        server_name localhost;
 
-        error_page   500 502 503 504  /50x.html;
+        error_page 500 502 503 504 /50x.html;
         location = /50x.html {
-            root   html;
+            root html;
         }
 
-	location / {
-	     	root   html;
-             	index  index.php;
-		if (!-e $request_filename){ rewrite ^(.*)$ /index.php last; }
-	}
-	
-	location /images/ {
-		# Serve images as static
-	}
+        location / {
+            root html;
+            index index.php;
+            if (!-e $request_filename){ rewrite ^(.*)$ /index.php last; }
+        }
 
-	location /user {
-	        rewrite ^/user/accounts/(.*)$ /error redirect;
-	        rewrite ^/user/config/(.*)$ /error redirect;
-	        rewrite ^/user/(.*)\.(txt|md|html|php|yaml|json|twig|sh|bat)$ /error redirect;
-    	}
+        # if you want grav in a sub-directory of your main site
+        # (for example, example.com/mygrav) then you need this rewrite:
+        location /mygrav {
+            index index.php;
+            if (!-e $request_filename){ rewrite ^(.*)$ /mygrav/$2 last; }
+            try_files $uri $uri/ /index.php?$args;
+        }
 
-    	location /cache {
-		rewrite ^/cache/(.*) /error redirect;
-    	}
+        # if using grav in a sub-directory of your site,
+        # prepend the actual path to each location
+        # for example: /mygrav/images
+        # and: /mygrav/user
+        # and: /mygrav/cache
+        # and so on
 
-    	location /bin {
-        	rewrite ^/bin/(.*)$ /error redirect;
-    	}
+        location /images/ {
+            # Serve images as static
+        }
 
-    	location /system {
-        	rewrite ^/system/(.*)\.(txt|md|html|php|yaml|json|twig|sh|bat)$ /error redirect;
-    	}
+        location /user {
+            rewrite ^/user/accounts/(.*)$ /error redirect;
+            rewrite ^/user/config/(.*)$ /error redirect;
+            rewrite ^/user/(.*)\.(txt|md|html|php|yaml|json|twig|sh|bat)$ /error redirect;
+        }
 
-    	location /vendor {
-        	rewrite ^/vendor/(.*)\.(txt|md|html|php|yaml|json|twig|sh|bat)$ /error redirect;
-    	}
+        location /cache {
+            rewrite ^/cache/(.*) /error redirect;
+        }
 
-	# Remember to change 127.0.0.1:9000 to the Ip/port
-	# you configured php-cgi.exe to run from
+        location /bin {
+            rewrite ^/bin/(.*)$ /error redirect;
+        }
+
+        location /backup {
+            rewrite ^/backup/(.*) /error redirect;
+        }
+
+        location /system {
+            rewrite ^/system/(.*)\.(txt|md|html|php|yaml|json|twig|sh|bat)$ /error redirect;
+        }
+
+        location /vendor {
+            rewrite ^/vendor/(.*)\.(txt|md|html|php|yaml|json|twig|sh|bat)$ /error redirect;
+        }
+
+        # Remember to change 127.0.0.1:9000 to the Ip/port
+        # you configured php-cgi.exe to run from
 
         location ~ \.php$ {
-	    try_files $uri =404;
+            try_files $uri =404;
             fastcgi_split_path_info ^(.+\.php)(/.+)$;
-            fastcgi_pass   127.0.0.1:9000;
-            fastcgi_index  index.php;
-            fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        fastcgi_params;
+            fastcgi_pass 127.0.0.1:9000;
+            fastcgi_index index.php;
+            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+            include fastcgi_params;
         }
 
-   }
+    }
 
 }

system/blueprints/config/media.yaml

@@ -1,4 +1,4 @@
-title: Media
+title: PLUGIN_ADMIN.MEDIA
 
 form:
   validation: loose

system/blueprints/config/site.yaml

@@ -1,70 +1,116 @@
-title: Site
+title: PLUGIN_ADMIN.SITE
 form:
     validation: loose
     fields:
 
         content:
             type: section
-            title: Defaults
+            title: PLUGIN_ADMIN.DEFAULTS
+            underline: true
 
             fields:
                 title:
                     type: text
-                    label: Site Title
+                    label: PLUGIN_ADMIN.SITE_TITLE
                     size: large
-                    placeholder: "Site wide title"
-                    help: Default title for your site
+                    placeholder: PLUGIN_ADMIN.SITE_TITLE_PLACEHOLDER
+                    help: PLUGIN_ADMIN.SITE_TITLE_HELP
 
                 author.name:
                     type: text
                     size: large
-                    label: Default Author
+                    label: PLUGIN_ADMIN.DEFAULT_AUTHOR
+                    help: PLUGIN_ADMIN.DEFAULT_AUTHOR_HELP
 
                 author.email:
                     type: text
                     size: large
-                    label: Default Email
+                    label: PLUGIN_ADMIN.DEFAULT_EMAIL
+                    help: PLUGIN_ADMIN.DEFAULT_EMAIL_HELP
+                    validate:
+                        type: email
 
                 taxonomies:
-                    type: text
+                    type: selectize
                     size: large
-                    label: Taxonomy Types
+                    label: PLUGIN_ADMIN.TAXONOMY_TYPES
                     classes: fancy
+                    help: PLUGIN_ADMIN.TAXONOMY_TYPES_HELP
                     validate:
                         type: commalist
 
-                metadata:
-                    type: array
-                    label: Metadata
-                    placeholder_key: Name
-                    placeholder_value: Content
-
-        blog:
+        summary:
             type: section
-            title: Blog
+            title: PLUGIN_ADMIN.PAGE_SUMMARY
+            underline: true
 
             fields:
-                blog.route:
-                    type: text
-                    size: large
-                    label: Blog URL
+                summary.enabled:
+                    type: toggle
+                    label: PLUGIN_ADMIN.ENABLED
+                    highlight: 1
+                    help: PLUGIN_ADMIN.ENABLED_HELP
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
 
                 summary.size:
                     type: text
                     size: x-small
-                    label: Summary Size
+                    label: PLUGIN_ADMIN.SUMMARY_SIZE
+                    help: PLUGIN_ADMIN.SUMMARY_SIZE_HELP
                     validate:
-                    type: int
-                    min: 0
-                    max: 65536
+                        type: int
+                        min: 0
+                        max: 65536
+
+                summary.format:
+                    type: toggle
+                    label: PLUGIN_ADMIN.FORMAT
+                    classes: fancy
+                    help: PLUGIN_ADMIN.FORMAT_HELP
+                    highlight: short
+                    options:
+                        'short': PLUGIN_ADMIN.SHORT
+                        'long': PLUGIN_ADMIN.LONG
+
+                summary.delimiter:
+                    type: text
+                    size: x-small
+                    label: PLUGIN_ADMIN.DELIMITER
+                    help: PLUGIN_ADMIN.DELIMITER_HELP
+
+        metadata:
+            type: section
+            title: PLUGIN_ADMIN.METADATA
+            underline: true
+
+            fields:
+                metadata:
+                   type: array
+                   label: PLUGIN_ADMIN.METADATA
+                   help: PLUGIN_ADMIN.METADATA_HELP
+                   placeholder_key: PLUGIN_ADMIN.METADATA_KEY
+                   placeholder_value: PLUGIN_ADMIN.METADATA_VALUE
 
         routes:
             type: section
-            title: Routes
+            title: PLUGIN_ADMIN.REDIRECTS_AND_ROUTES
+            underline: true
 
             fields:
+                redirects:
+                    type: array
+                    label: PLUGIN_ADMIN.CUSTOM_REDIRECTS
+                    help: PLUGIN_ADMIN.CUSTOM_REDIRECTS_HELP
+                    placeholder_key: PLUGIN_ADMIN.CUSTOM_REDIRECTS_PLACEHOLDER_KEY
+                    placeholder_value: PLUGIN_ADMIN.CUSTOM_REDIRECTS_PLACEHOLDER_VALUE
+
                 routes:
                     type: array
-                    label: Custom
-                    placeholder_key: /your/alias
-                    placeholder_value: /your/route
+                    label: PLUGIN_ADMIN.CUSTOM_ROUTES
+                    help: PLUGIN_ADMIN.CUSTOM_ROUTES_HELP
+                    placeholder_key: PLUGIN_ADMIN.CUSTOM_ROUTES_PLACEHOLDER_KEY
+                    placeholder_value: PLUGIN_ADMIN.CUSTOM_ROUTES_PLACEHOLDER_VALUE

system/blueprints/config/streams.yaml

@@ -1,4 +1,4 @@
-title: File Streams
+title: PLUGIN_ADMIN.FILE_STREAMS
 
 form:
   validation: loose

system/blueprints/config/system.yaml

@@ -1,4 +1,4 @@
-title: System
+title: PLUGIN_ADMIN.SYSTEM
 
 form:
     validation: loose
@@ -6,7 +6,7 @@ form:
 
         content:
             type: section
-            title: Content
+            title: PLUGIN_ADMIN.CONTENT
             underline: true
 
             fields:
@@ -14,135 +14,405 @@ form:
                     type: pages
                     size: medium
                     classes: fancy
-                    label: Home Page
+                    label: PLUGIN_ADMIN.HOME_PAGE
                     show_all: false
                     show_modular: false
                     show_root: false
-                    help: "The page that Grav will use as the default landing page"
+                    help: PLUGIN_ADMIN.HOME_PAGE_HELP
 
                 pages.theme:
                     type: themeselect
                     classes: fancy
+                    selectize: true
                     size: medium
-                    label: Default Theme
-                    help: "Set the theme (defaults to 'default')"
-
-                pages.markdown_extra:
-                    type: toggle
-                    label: Markdown Extra
-                    highlight: 1
-                    options:
-                        1: Yes
-                        0: No
-                    validate:
-                        type: bool
+                    label: PLUGIN_ADMIN.DEFAULT_THEME
+                    help: PLUGIN_ADMIN.DEFAULT_THEME_HELP
 
                 pages.process:
                     type: checkboxes
-                    label: Process
+                    label: PLUGIN_ADMIN.PROCESS
+                    help: PLUGIN_ADMIN.PROCESS_HELP
                     default: [markdown: true, twig: true]
                     options:
                         markdown: Markdown
                         twig: Twig
                     use: keys
 
-                pages.dateformat.short:
+                timezone:
                     type: select
+                    label: PLUGIN_ADMIN.TIMEZONE
                     size: medium
                     classes: fancy
-                    label: Short Date Format
-                    help: "Set the short date format"
-                    default: 'jS M Y'
+                    help: PLUGIN_ADMIN.TIMEZONE_HELP
+                    '@data-options': '\Grav\Common\Utils::timezones'
+                    default: ''
                     options:
-                        'F jS \\a\\t g:ia': "January 1st at 11:59pm"
-                        'l jS of F g:i A': "Monday 1st of January at 11:59 PM"
-                        'D, m M Y G:i:s': "Mon, 01 Jan 2014 23:59:00"
-                        'd-m-y G:i': "01-01-14 23:59"
-                        'jS M Y': "10th Feb 2014"
+                        '': 'Default (Server Timezone)'
+
+                pages.dateformat.default:
+                    type: select
+                    size: medium
+                    selectize:
+                        create: true
+                    label: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT
+                    help: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_HELP
+                    placeholder: PLUGIN_ADMIN.DEFAULT_DATE_FORMAT_PLACEHOLDER
+                    '@data-options': '\Grav\Common\Utils::dateFormats'
+                    options:
+                        "": Auto Guess or Enter Custom
+                    validate:
+                        type: string
+
+                pages.dateformat.short:
+                    type: dateformat
+                    size: medium
+                    classes: fancy
+                    label: PLUGIN_ADMIN.SHORT_DATE_FORMAT
+                    help: PLUGIN_ADMIN.SHORT_DATE_FORMAT_HELP
+                    default: "jS M Y"
+                    options:
+                        "F jS \\a\\t g:ia": Date1
+                        "l jS \\of F g:i A": Date2
+                        "D, m M Y G:i:s": Date3
+                        "d-m-y G:i": Date4
+                        "jS M Y": Date5
 
                 pages.dateformat.long:
-                    type: select
+                    type: dateformat
                     size: medium
                     classes: fancy
-                    label: Long Date Format
-                    help: "Set the long date format"
+                    label: PLUGIN_ADMIN.LONG_DATE_FORMAT
+                    help: PLUGIN_ADMIN.LONG_DATE_FORMAT_HELP
                     options:
-                        'F jS \a\t g:ia': "January 1st at 11:59pm"
-                        'l jS of F g:i A': "Monday 1st of January at 11:59 PM"
-                        'D, m M Y G:i:s': "Mon, 01 Jan 2014 23:59:00"
-                        'd-m-y G:i': "01-01-14 23:59"
-                        'jS M Y': "10th Feb 2014"
+                        "F jS \\a\\t g:ia": Date1
+                        "l jS \\of F g:i A": Date2
+                        "D, m M Y G:i:s": Date3
+                        "d-m-y G:i": Date4
+                        "jS M Y": Date5
 
                 pages.order.by:
                     type: select
-                    size: medium
+                    size: long
                     classes: fancy
-                    label: Default Ordering
+                    label: PLUGIN_ADMIN.DEFAULT_ORDERING
+                    help: PLUGIN_ADMIN.DEFAULT_ORDERING_HELP
                     options:
-                        default: Default - based on folder name
-                        folder: Folder - based on prefix-less folder name
-                        title: Title - based on title field in header
-                        date: Date - based on date field in header
+                        default: PLUGIN_ADMIN.DEFAULT_ORDERING_DEFAULT
+                        folder: PLUGIN_ADMIN.DEFAULT_ORDERING_FOLDER
+                        title: PLUGIN_ADMIN.DEFAULT_ORDERING_TITLE
+                        date: PLUGIN_ADMIN.DEFAULT_ORDERING_DATE
 
                 pages.order.dir:
                     type: toggle
-                    label: Default Order Direction
+                    label: PLUGIN_ADMIN.DEFAULT_ORDER_DIRECTION
                     highlight: asc
                     default: desc
+                    help: PLUGIN_ADMIN.DEFAULT_ORDER_DIRECTION_HELP
                     options:
-                        asc: Ascending
-                        desc: Descending
+                        asc: PLUGIN_ADMIN.ASCENDING
+                        desc: PLUGIN_ADMIN.DESCENDING
 
                 pages.list.count:
                     type: text
                     size: x-small
-                    label: Default Item Count
-                    help: "Default max pages count"
+                    label: PLUGIN_ADMIN.DEFAULT_PAGE_COUNT
+                    help: PLUGIN_ADMIN.DEFAULT_PAGE_COUNT_HELP
                     validate:
                         type: number
                         min: 1
 
-
-
-        events:
-            type: section
-            title: Events
-            underline: true
-
-            fields:
-                pages.events.page:
+                pages.publish_dates:
                     type: toggle
-                    label: Page events
+                    label: PLUGIN_ADMIN.DATE_BASED_PUBLISHING
+                    help: PLUGIN_ADMIN.DATE_BASED_PUBLISHING_HELP
                     highlight: 1
                     options:
-                        1: Yes
-                        0: No
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
                     validate:
                         type: bool
 
-                pages.events.twig:
+                pages.events:
+                     type: checkboxes
+                     label: PLUGIN_ADMIN.EVENTS
+                     help: PLUGIN_ADMIN.EVENTS_HELP
+                     default: [page: true, twig: true]
+                     options:
+                         page: Page Events
+                         twig: Twig Events
+                     use: keys
+
+                pages.redirect_default_route:
                     type: toggle
-                    label: Twig events
+                    label: PLUGIN_ADMIN.REDIRECT_DEFAULT_ROUTE
+                    help: PLUGIN_ADMIN.REDIRECT_DEFAULT_ROUTE_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                pages.redirect_default_code:
+                    type: select
+                    size: medium
+                    classes: fancy
+                    label: PLUGIN_ADMIN.REDIRECT_DEFAULT_CODE
+                    help: PLUGIN_ADMIN.REDIRECT_DEFAULT_CODE_HELP
+                    options:
+                        301: 301 - Permanent
+                        303: 303 - Other
+                        307: 307 - Temporary
+
+                pages.redirect_trailing_slash:
+                    type: toggle
+                    label: PLUGIN_ADMIN.REDIRECT_TRAILING_SLASH
+                    help: PLUGIN_ADMIN.REDIRECT_TRAILING_SLASH_HELP
                     highlight: 1
                     options:
-                        1: Yes
-                        0: No
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                pages.ignore_hidden:
+                    type: toggle
+                    label: PLUGIN_ADMIN.IGNORE_HIDDEN
+                    help: PLUGIN_ADMIN.IGNORE_HIDDEN_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                pages.ignore_files:
+                    type: selectize
+                    size: large
+                    label: PLUGIN_ADMIN.IGNORE_FILES
+                    help: PLUGIN_ADMIN.IGNORE_FILES_HELP
+                    classes: fancy
+                    validate:
+                        type: commalist
+
+                pages.ignore_folders:
+                    type: selectize
+                    size: large
+                    label: PLUGIN_ADMIN.IGNORE_FOLDERS
+                    help: PLUGIN_ADMIN.IGNORE_FOLDERS_HELP
+                    classes: fancy
+                    validate:
+                        type: commalist
+
+                pages.url_taxonomy_filters:
+                    type: toggle
+                    label: PLUGIN_ADMIN.ALLOW_URL_TAXONOMY_FILTERS
+                    help: PLUGIN_ADMIN.ALLOW_URL_TAXONOMY_FILTERS_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                pages.fallback_types:
+                    type: selectize
+                    size: large
+                    label: PLUGIN_ADMIN.FALLBACK_TYPES
+                    help: PLUGIN_ADMIN.FALLBACK_TYPES_HELP
+                    classes: fancy
+                    validate:
+                        type: commalist
+
+        languages:
+            type: section
+            title: PLUGIN_ADMIN.LANGUAGES
+            underline: true
+
+            fields:
+
+                languages.supported:
+                    type: selectize
+                    size: large
+                    label: PLUGIN_ADMIN.SUPPORTED
+                    help: PLUGIN_ADMIN.SUPPORTED_HELP
+                    classes: fancy
+                    validate:
+                        type: commalist
+
+                languages.include_default_lang:
+                    type: toggle
+                    label: PLUGIN_ADMIN.INCLUDE_DEFAULT_LANG
+                    help: PLUGIN_ADMIN.INCLUDE_DEFAULT_LANG_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+
+                languages.translations:
+                    type: toggle
+                    label: PLUGIN_ADMIN.TRANSLATIONS_ENABLED
+                    help: PLUGIN_ADMIN.TRANSLATIONS_ENABLED_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                languages.translations_fallback:
+                    type: toggle
+                    label: PLUGIN_ADMIN.TRANSLATIONS_FALLBACK
+                    help: PLUGIN_ADMIN.TRANSLATIONS_FALLBACK_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                languages.session_store_active:
+                    type: toggle
+                    label: PLUGIN_ADMIN.ACTIVE_LANGUAGE_IN_SESSION
+                    help: PLUGIN_ADMIN.ACTIVE_LANGUAGE_IN_SESSION_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                languages.http_accept_language:
+                    type: toggle
+                    label: PLUGIN_ADMIN.HTTP_ACCEPT_LANGUAGE
+                    help: PLUGIN_ADMIN.HTTP_ACCEPT_LANGUAGE_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                languages.override_locale:
+                    type: toggle
+                    label: PLUGIN_ADMIN.OVERRIDE_LOCALE
+                    help: PLUGIN_ADMIN.OVERRIDE_LOCALE_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+        http_headers:
+            type: section
+            title: PLUGIN_ADMIN.HTTP_HEADERS
+            underline: true
+
+            fields:
+                pages.expires:
+                    type: text
+                    size: small
+                    label: PLUGIN_ADMIN.EXPIRES
+                    help: PLUGIN_ADMIN.EXPIRES_HELP
+                    validate:
+                        type: number
+                        min: 1
+                pages.last_modified:
+                    type: toggle
+                    label: PLUGIN_ADMIN.LAST_MODIFIED
+                    help: PLUGIN_ADMIN.LAST_MODIFIED_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+                pages.etag:
+                    type: toggle
+                    label: PLUGIN_ADMIN.ETAG
+                    help: PLUGIN_ADMIN.ETAG_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+                pages.vary_accept_encoding:
+                    type: toggle
+                    label: PLUGIN_ADMIN.VARY_ACCEPT_ENCODING
+                    help: PLUGIN_ADMIN.VARY_ACCEPT_ENCODING_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+        markdown:
+            type: section
+            title: Markdown
+            underline: true
+
+            fields:
+                pages.markdown.extra:
+                    type: toggle
+                    label: Markdown extra
+                    help: PLUGIN_ADMIN.MARKDOWN_EXTRA_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+                pages.markdown.auto_line_breaks:
+                    type: toggle
+                    label: PLUGIN_ADMIN.AUTO_LINE_BREAKS
+                    help: PLUGIN_ADMIN.AUTO_LINE_BREAKS_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+                pages.markdown.auto_url_links:
+                    type: toggle
+                    label: PLUGIN_ADMIN.AUTO_URL_LINKS
+                    help: PLUGIN_ADMIN.AUTO_URL_LINKS_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+                pages.markdown.escape_markup:
+                    type: toggle
+                    label: PLUGIN_ADMIN.ESCAPE_MARKUP
+                    help: PLUGIN_ADMIN.ESCAPE_MARKUP_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
                     validate:
                         type: bool
 
         caching:
             type: section
-            title: Caching
+            title: PLUGIN_ADMIN.CACHING
             underline: true
 
             fields:
                 cache.enabled:
                     type: toggle
-                    label: Caching
+                    label: PLUGIN_ADMIN.CACHING
+                    help: PLUGIN_ADMIN.CACHING_HELP
                     highlight: 1
                     options:
-                        1: Yes
-                        0: No
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
                     validate:
                         type: bool
 
@@ -150,7 +420,8 @@ form:
                     type: select
                     size: small
                     classes: fancy
-                    label: Cache Check Method
+                    label: PLUGIN_ADMIN.CACHE_CHECK_METHOD
+                    help: PLUGIN_ADMIN.CACHE_CHECK_METHOD_HELP
                     options:
                         file: File
                         folder: Folder
@@ -160,7 +431,8 @@ form:
                     type: select
                     size: small
                     classes: fancy
-                    label: Cache driver
+                    label: PLUGIN_ADMIN.CACHE_DRIVER
+                    help: PLUGIN_ADMIN.CACHE_DRIVER_HELP
                     options:
                         auto: Auto detect
                         file: File
@@ -172,193 +444,350 @@ form:
                 cache.prefix:
                     type: text
                     size: x-small
-                    label: Cache Prefix
-                    placeholder: "Derived from base URL (override by entering random string)"
+                    label: PLUGIN_ADMIN.CACHE_PREFIX
+                    help: PLUGIN_ADMIN.CACHE_PREFIX_HELP
+                    placeholder: PLUGIN_ADMIN.CACHE_PREFIX_PLACEHOLDER
+
+                cache.lifetime:
+                    type: text
+                    size: small
+                    label: PLUGIN_ADMIN.LIFETIME
+                    help: PLUGIN_ADMIN.LIFETIME_HELP
+                    validate:
+                        type: number
+
+                cache.gzip:
+                    type: toggle
+                    label: PLUGIN_ADMIN.GZIP_COMPRESSION
+                    help: PLUGIN_ADMIN.GZIP_COMPRESSION_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
 
         twig:
             type: section
-            title: Twig Templating
+            title: PLUGIN_ADMIN.TWIG_TEMPLATING
             underline: true
 
             fields:
                 twig.cache:
                     type: toggle
-                    label: Twig caching
+                    label: PLUGIN_ADMIN.TWIG_CACHING
+                    help: PLUGIN_ADMIN.TWIG_CACHING_HELP
                     highlight: 1
                     options:
-                        1: Yes
-                        0: No
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
                     validate:
                         type: bool
 
                 twig.debug:
                     type: toggle
-                    label: Twig debug
-                    highlight: 1
+                    label: PLUGIN_ADMIN.TWIG_DEBUG
+                    help: PLUGIN_ADMIN.TWIG_DEBUG_HELP
+                    highlight: 0
                     options:
-                        1: Yes
-                        0: No
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
                     validate:
                         type: bool
 
                 twig.auto_reload:
                     type: toggle
-                    label: Detect changes
+                    label: PLUGIN_ADMIN.DETECT_CHANGES
+                    help: PLUGIN_ADMIN.DETECT_CHANGES_HELP
                     highlight: 1
                     options:
-                        1: Yes
-                        0: No
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
                     validate:
                         type: bool
 
                 twig.autoescape:
                     type: toggle
-                    label: Autoescape variables
-                    highlight: 1
+                    label: PLUGIN_ADMIN.AUTOESCAPE_VARIABLES
+                    help: PLUGIN_ADMIN.AUTOESCAPE_VARIABLES_HELP
+                    highlight: 0
                     options:
-                        1: Yes
-                        0: No
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
                     validate:
                         type: bool
 
         assets:
             type: section
-            title: Assets
+            title: PLUGIN_ADMIN.ASSETS
             underline: true
 
             fields:
                 assets.css_pipeline:
                     type: toggle
-                    label: CSS Pipeline
-                    highlight: 1
+                    label: PLUGIN_ADMIN.CSS_PIPELINE
+                    help: PLUGIN_ADMIN.CSS_PIPELINE_HELP
+                    highlight: 0
                     options:
-                        1: Yes
-                        0: No
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
                     validate:
                        type: bool
 
                 assets.css_minify:
                     type: toggle
-                    label: CSS Minify
+                    label: PLUGIN_ADMIN.CSS_MINIFY
+                    help: PLUGIN_ADMIN.CSS_MINIFY_HELP
                     highlight: 1
                     options:
-                        1: Yes
-                        0: No
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
                     validate:
                        type: bool
 
                 assets.css_minify_windows:
                     type: toggle
-                    label: CSS Minify Windows Override
-                    highlight: 1
+                    label: PLUGIN_ADMIN.CSS_MINIFY_WINDOWS_OVERRIDE
+                    help: PLUGIN_ADMIN.CSS_MINIFY_WINDOWS_OVERRIDE_HELP
+                    highlight: 0
                     options:
-                        1: Yes
-                        0: No
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
                     validate:
                         type: bool
 
                 assets.css_rewrite:
                     type: toggle
-                    label: CSS Rewrite
+                    label: PLUGIN_ADMIN.CSS_REWRITE
+                    help: PLUGIN_ADMIN.CSS_REWRITE_HELP
                     highlight: 1
                     options:
-                        1: Yes
-                        0: No
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
                     validate:
                         type: bool
 
                 assets.js_pipeline:
                     type: toggle
-                    label: JavaScript Pipeline
-                    highlight: 01
+                    label: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE
+                    help: PLUGIN_ADMIN.JAVASCRIPT_PIPELINE_HELP
+                    highlight: 0
                     options:
-                        1: Yes
-                        0: No
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
                     validate:
                         type: bool
 
                 assets.js_minify:
                     type: toggle
-                    label: JavaScript Minify
+                    label: PLUGIN_ADMIN.JAVASCRIPT_MINIFY
+                    help: PLUGIN_ADMIN.JAVASCRIPT_MINIFY_HELP
                     highlight: 1
                     options:
-                        1: Yes
-                        0: No
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                assets.enable_asset_timestamp:
+                    type: toggle
+                    label: PLUGIN_ADMIN.ENABLED_TIMESTAMPS_ON_ASSETS
+                    help: PLUGIN_ADMIN.ENABLED_TIMESTAMPS_ON_ASSETS_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                assets.collections:
+                    type: array
+                    label: PLUGIN_ADMIN.COLLECTIONS
+                    placeholder_key: collection_name
+                    placeholder_value: collection_path
+
+        errors:
+            type: section
+            title: PLUGIN_ADMIN.ERROR_HANDLER
+            underline: true
+
+            fields:
+                errors.display:
+                    type: toggle
+                    label: PLUGIN_ADMIN.DISPLAY_ERRORS
+                    help: PLUGIN_ADMIN.DISPLAY_ERRORS_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                errors.log:
+                    type: toggle
+                    label: PLUGIN_ADMIN.LOG_ERRORS
+                    help: PLUGIN_ADMIN.LOG_ERRORS_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
                     validate:
                         type: bool
 
         debugger:
             type: section
-            title: Debugger
+            title: PLUGIN_ADMIN.DEBUGGER
             underline: true
 
             fields:
                 debugger.enabled:
                     type: toggle
-                    label: Debugger
-                    highlight: 1
+                    label: PLUGIN_ADMIN.DEBUGGER
+                    help: PLUGIN_ADMIN.DEBUGGER_HELP
+                    highlight: 0
                     options:
-                        1: Yes
-                        0: No
-                    validate:
-                        type: bool
-
-                debugger.mode:
-                    type: select
-                    size: small
-                    classes: fancy
-                    label: Mode
-                    options:
-                        detect: Auto-Detect
-                        development: Development
-                        production: Production
-
-                debugger.strict:
-                    type: toggle
-                    label: Strict
-                    highlight: 1
-                    options:
-                        1: Yes
-                        0: No
-                    validate:
-                        type: bool
-
-                debugger.max_depth:
-                    type: select
-                    size: small
-                    classes: fancy
-                    label: Detail Level
-                    placeholder: "How many nested levels to display for objects or arrays"
-                    options:
-                        1: 1 level
-                        2: 2 levels
-                        3: 3 levels
-                        4: 4 levels
-                        5: 5 levels
-                        6: 6 levels
-                        7: 7 levels
-                        8: 8 levels
-                        9: 9 levels
-                        10: 10 levels
-                    validate:
-                        type: number
-
-                debugger.log.enabled:
-                    type: toggle
-                    label: Logging
-                    highlight: 1
-                    options:
-                        1: Yes
-                        0: No
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
                     validate:
                         type: bool
 
                 debugger.shutdown.close_connection:
                     type: toggle
-                    label: Shutdown Close Connection
+                    label: PLUGIN_ADMIN.SHUTDOWN_CLOSE_CONNECTION
+                    help: PLUGIN_ADMIN.SHUTDOWN_CLOSE_CONNECTION_HELP
                     highlight: 1
                     options:
-                        1: Yes
-                        0: No
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
                     validate:
                         type: bool
+
+        media:
+            type: section
+            title: PLUGIN_ADMIN.MEDIA
+            underline: true
+
+            fields:
+                images.default_image_quality:
+                    type: text
+                    label: PLUGIN_ADMIN.DEFAULT_IMAGE_QUALITY
+                    help: PLUGIN_ADMIN.DEFAULT_IMAGE_QUALITY_HELP
+                    classes: x-small
+                    validate:
+                        type: number
+                        min: 1
+                        max: 100
+
+                images.cache_all:
+                    type: toggle
+                    label: PLUGIN_ADMIN.CACHE_ALL
+                    help: PLUGIN_ADMIN.CACHE_ALL_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                images.debug:
+                    type: toggle
+                    label: PLUGIN_ADMIN.IMAGES_DEBUG
+                    help: PLUGIN_ADMIN.IMAGES_DEBUG_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                media.upload_limit:
+                    type: text
+                    label: PLUGIN_ADMIN.UPLOAD_LIMIT
+                    help: PLUGIN_ADMIN.UPLOAD_LIMIT_HELP
+                    classes: small
+                    validate:
+                        type: number
+
+                media.enable_media_timestamp:
+                    type: toggle
+                    label: PLUGIN_ADMIN.ENABLE_MEDIA_TIMESTAMP
+                    help: PLUGIN_ADMIN.ENABLE_MEDIA_TIMESTAMP_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+        session:
+            type: section
+            title: PLUGIN_ADMIN.SESSION
+            underline: true
+
+            fields:
+                session.enabled:
+                    type: toggle
+                    label: PLUGIN_ADMIN.ENABLED
+                    help: PLUGIN_ADMIN.SESSION_ENABLED_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                session.timeout:
+                    type: text
+                    size: small
+                    label: PLUGIN_ADMIN.TIMEOUT
+                    help: PLUGIN_ADMIN.TIMEOUT_HELP
+                    validate:
+                        type: number
+                        min: 1
+
+                session.name:
+                    type: text
+                    size: small
+                    label: PLUGIN_ADMIN.NAME
+                    help: PLUGIN_ADMIN.SESSION_NAME_HELP
+
+
+        advanced:
+            type: section
+            title: PLUGIN_ADMIN.ADVANCED
+            underline: true
+
+            fields:
+                wrapped_site:
+                    type: toggle
+                    label: PLUGIN_ADMIN.WRAPPED_SITE
+                    highlight: 0
+                    help: PLUGIN_ADMIN.WRAPPED_SITE_HELP
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                absolute_urls:
+                    type: toggle
+                    label: PLUGIN_ADMIN.ABSOLUTE_URLS
+                    highlight: 0
+                    help: PLUGIN_ADMIN.ABSOLUTE_URLS_HELP
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                param_sep:
+                    type: select
+                    size: medium
+                    label: PLUGIN_ADMIN.PARAMETER_SEPARATOR
+                    classes: fancy
+                    help: PLUGIN_ADMIN.PARAMETER_SEPARATOR_HELP
+                    default: ''
+                    options:
+                        ':': ': (default)'
+                        ';': '; (for Apache running on Windows)'

system/blueprints/pages/default.yaml

@@ -0,0 +1,276 @@
+title: PLUGIN_ADMIN.DEFAULT
+
+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:
+            header.title:
+              type: text
+              autofocus: true
+              style: vertical
+              label: PLUGIN_ADMIN.TITLE
+
+            content:
+                type: markdown
+                label: PLUGIN_ADMIN.CONTENT
+                validate:
+                  type: textarea
+
+            uploads:
+              type: pagemedia
+              label: PLUGIN_ADMIN.PAGE_MEDIA
+
+        options:
+          type: tab
+          title: PLUGIN_ADMIN.OPTIONS
+
+          fields:
+
+            publishing:
+              type: section
+              title: Publishing
+              underline: true
+
+              fields:
+                header.published:
+                  type: toggle
+                  toggleable: true
+                  label: PLUGIN_ADMIN.PUBLISHED
+                  help: PLUGIN_ADMIN.PUBLISHED_HELP
+                  highlight: 1
+                  size: medium
+                  options:
+                    1: PLUGIN_ADMIN.YES
+                    0: PLUGIN_ADMIN.NO
+                  validate:
+                    type: bool
+
+                header.date:
+                  type: datetime
+                  label: PLUGIN_ADMIN.DATE
+                  toggleable: true
+                  help: PLUGIN_ADMIN.DATE_HELP
+
+                header.publish_date:
+                  type: datetime
+                  label: PLUGIN_ADMIN.PUBLISHED_DATE
+                  toggleable: true
+                  help: PLUGIN_ADMIN.PUBLISHED_DATE_HELP
+
+                header.unpublish_date:
+                  type: datetime
+                  label: PLUGIN_ADMIN.UNPUBLISHED_DATE
+                  toggleable: true
+                  help: PLUGIN_ADMIN.UNPUBLISHED_DATE_HELP
+
+                header.metadata:
+                  toggleable: true
+                  type: array
+                  label: PLUGIN_ADMIN.METADATA
+                  help: PLUGIN_ADMIN.METADATA_HELP
+                  placeholder_key: PLUGIN_ADMIN.METADATA_KEY
+                  placeholder_value: PLUGIN_ADMIN.METADATA_VALUE
+
+
+            taxonomies:
+              type: section
+              title: PLUGIN_ADMIN.TAXONOMIES
+              underline: true
+
+              fields:
+                header.taxonomy:
+                  type: taxonomy
+                  label: PLUGIN_ADMIN.TAXONOMY
+                  multiple: true
+                  validate:
+                    type: array
+
+        advanced:
+          type: tab
+          title: PLUGIN_ADMIN.ADVANCED
+
+          fields:
+            columns:
+              type: columns
+              fields:
+                column1:
+                  type: column
+                  fields:
+
+                    settings:
+                      type: section
+                      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
+
+                    route:
+                      type: select
+                      label: PLUGIN_ADMIN.PARENT
+                      classes: fancy
+                      '@data-options': '\Grav\Common\Page\Pages::parents'
+                      '@data-default': '\Grav\Plugin\admin::route'
+                      options:
+                        '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
+
+                    name:
+                      type: select
+                      classes: fancy
+                      label: PLUGIN_ADMIN.PAGE_FILE
+                      help: PLUGIN_ADMIN.PAGE_FILE_HELP
+                      default: default
+                      '@data-options': '\Grav\Common\Page\Pages::pageTypes'
+
+                    header.body_classes:
+                      type: text
+                      label: PLUGIN_ADMIN.BODY_CLASSES
+
+
+                column2:
+                  type: column
+
+                  fields:
+                    order_title:
+                      type: section
+                      title: PLUGIN_ADMIN.ORDERING
+                      underline: true
+
+                    order:
+                      type: order
+                      label: PLUGIN_ADMIN.PAGE_ORDER
+                      sitemap:
+
+            overrides:
+              type: section
+              title: PLUGIN_ADMIN.OVERRIDES
+              underline: true
+
+              fields:
+
+                header.menu:
+                  type: text
+                  label: PLUGIN_ADMIN.MENU
+                  toggleable: true
+                  help: PLUGIN_ADMIN.MENU_HELP
+
+                header.slug:
+                  type: text
+                  label: PLUGIN_ADMIN.SLUG
+                  toggleable: true
+                  help: PLUGIN_ADMIN.SLUG_HELP
+                  validate:
+                    message: PLUGIN_ADMIN.SLUG_VALIDATE_MESSAGE
+                    rule: slug
+
+                header.redirect:
+                  type: text
+                  label: PLUGIN_ADMIN.REDIRECT
+                  toggleable: true
+                  help: PLUGIN_ADMIN.REDIRECT_HELP
+
+                header.process:
+                  type: checkboxes
+                  label: PLUGIN_ADMIN.PROCESS
+                  toggleable: true
+                  '@config-default': system.pages.process
+                  default:
+                    markdown: true
+                    twig: false
+                  options:
+                    markdown: Markdown
+                    twig: Twig
+                  use: keys
+
+                header.child_type:
+                  type: select
+                  toggleable: true
+                  label: PLUGIN_ADMIN.DEFAULT_CHILD_TYPE
+                  default: default
+                  placeholder: PLUGIN_ADMIN.USE_GLOBAL
+                  '@data-options': '\Grav\Common\Page\Pages::types'
+
+                header.routable:
+                  type: toggle
+                  toggleable: true
+                  label: PLUGIN_ADMIN.ROUTABLE
+                  help: PLUGIN_ADMIN.ROUTABLE_HELP
+                  highlight: 1
+                  options:
+                    1: PLUGIN_ADMIN.ENABLED
+                    0: PLUGIN_ADMIN.DISABLED
+                  validate:
+                    type: bool
+
+                header.cache_enable:
+                  type: toggle
+                  toggleable: true
+                  label: PLUGIN_ADMIN.CACHING
+                  highlight: 1
+                  options:
+                    1: PLUGIN_ADMIN.ENABLED
+                    0: PLUGIN_ADMIN.DISABLED
+                  validate:
+                    type: bool
+
+                header.visible:
+                  type: toggle
+                  toggleable: true
+                  label: PLUGIN_ADMIN.VISIBLE
+                  help: PLUGIN_ADMIN.VISIBLE_HELP
+                  highlight: 1
+                  options:
+                    1: PLUGIN_ADMIN.ENABLED
+                    0: PLUGIN_ADMIN.DISABLED
+                  validate:
+                    type: bool
+
+                header.template:
+                  type: select
+                  toggleable: true
+                  classes: fancy
+                  label: PLUGIN_ADMIN.DISPLAY_TEMPLATE
+                  default: default
+                  '@data-options': '\Grav\Common\Page\Pages::types'
+
+                header.order_by:
+                  type: hidden
+
+                header.order_manual:
+                  type: hidden
+                  validate:
+                    type: commalist
+
+                blueprint:
+                  type: blueprint

system/blueprints/pages/modular.yaml

@@ -0,0 +1,47 @@
+title: PLUGIN_ADMIN.MODULAR
+@extends:
+    type: default
+    context: blueprints://pages
+
+form:
+  fields:
+    tabs:
+      type: tabs
+      active: 1
+
+      fields:
+        content:
+          fields:
+
+            header.content.items:
+              type: select
+              label: PLUGIN_ADMIN.ITEMS
+              default: '@self.modular'
+              options:
+                '@self.modular': Children
+
+            header.content.order.by:
+              type: select
+              label: PLUGIN_ADMIN.ORDER_BY
+              default: date
+              options:
+                folder: PLUGIN_ADMIN.FOLDER
+                title: PLUGIN_ADMIN.TITLE
+                date: PLUGIN_ADMIN.DATE
+                default: PLUGIN_ADMIN.DEFAULT
+
+            header.content.order.dir:
+              type: select
+              label: PLUGIN_ADMIN.ORDER
+              default: desc
+              options:
+                asc: PLUGIN_ADMIN.ASCENDING
+                desc: PLUGIN_ADMIN.DESCENDING
+
+            header.process:
+              type: ignore
+            content:
+              type: ignore
+            uploads:
+              type: ignore
+

system/blueprints/pages/modular_new.yaml

@@ -10,40 +10,39 @@ form:
 
     section:
         type: section
-        title: Add Modular Content
+        title: PLUGIN_ADMIN.ADD_MODULAR_CONTENT
 
     title:
       type: text
-      label: Page Title
+      label: PLUGIN_ADMIN.PAGE_TITLE
       validate:
         required: true
 
     folder:
       type: text
-      label: Folder Name
+      label: PLUGIN_ADMIN.FOLDER_NAME
       validate:
         type: slug
         required: true
 
-
-
     route:
       type: select
-      label: Page
+      label: PLUGIN_ADMIN.PAGE
       classes: fancy
-      @data-options: '\Grav\Common\Page\Pages::parents'
-      @data-default: '\Grav\Plugin\admin::route'
+      '@data-options': '\Grav\Common\Page\Pages::parents'
+      '@data-default': '\Grav\Plugin\admin::route'
       options:
-        '': '- Select -'
+        '': PLUGIN_ADMIN.DEFAULT_OPTION_SELECT
       validate:
         required: true
 
-    type:
+    name:
       type: select
       classes: fancy
-      label: Modular Template
+      label: PLUGIN_ADMIN.MODULAR_TEMPLATE
+      help: PLUGIN_ADMIN.PAGE_FILE_HELP
       default: default
-      @data-options: '\Grav\Common\Page\Pages::modularTypes'
+      '@data-options': '\Grav\Common\Page\Pages::modularTypes'
       validate:
         required: true
 
@@ -52,3 +51,6 @@ form:
       default: 1
       validate:
         type: bool
+
+    blueprint:
+      type: blueprint

system/blueprints/pages/modular_raw.yaml

@@ -15,26 +15,26 @@ form:
       fields:
         content:
           type: tab
-          title: Content
+          title: PLUGIN_ADMIN.CONTENT
 
           fields:
             frontmatter:
               type: frontmatter
-              label: Frontmatter
+              label: PLUGIN_ADMIN.FRONTMATTER
 
 
             content:
               type: markdown
-              label: Content
+              label: PLUGIN_ADMIN.CONTENT
 
             uploads:
-              type: uploads
-              label: Page Media
+              type: pagemedia
+              label: PLUGIN_ADMIN.PAGE_MEDIA
 
 
         options:
           type: tab
-          title: Options
+          title: PLUGIN_ADMIN.OPTIONS
 
           fields:
 
@@ -47,30 +47,41 @@ form:
 
                   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: Filename
+                      label: PLUGIN_ADMIN.FILENAME
                       validate:
                         type: slug
                         required: true
 
                     route:
                       type: select
-                      label: Parent
+                      label: PLUGIN_ADMIN.PARENT
                       classes: fancy
-                      @data-options: '\Grav\Common\Page\Pages::parents'
-                      @data-default: '\Grav\Plugin\admin::route'
+                      '@data-options': '\Grav\Common\Page\Pages::parents'
+                      '@data-default': '\Grav\Plugin\admin::route'
                       options:
-                        '/': '- Root -'
+                        '': PLUGIN_ADMIN.DEFAULT_OPTION_SELECT
                       validate:
                         required: true
 
-                    type:
+                    name:
                       type: select
                       classes: fancy
-                      label: Modular Template
+                      label: PLUGIN_ADMIN.MODULAR_TEMPLATE
                       default: default
-                      @data-options: '\Grav\Common\Page\Pages::modularTypes'
+                      '@data-options': '\Grav\Common\Page\Pages::modularTypes'
                       validate:
                         required: true
 
@@ -80,5 +91,7 @@ form:
                     fields:
                       order:
                         type: order
-                        label: Ordering
+                        label: PLUGIN_ADMIN.ORDERING
 
+            blueprint:
+              type: blueprint

system/blueprints/pages/move.yaml

@@ -0,0 +1,17 @@
+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::parents'
+      '@data-default': '\Grav\Plugin\admin::route'
+      options:
+        '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT

system/blueprints/pages/new.yaml

@@ -10,39 +10,57 @@ form:
 
     section:
         type: section
-        title: Add Page
+        title: PLUGIN_ADMIN.ADD_PAGE
 
     title:
       type: text
-      label: Page Title
+      label: PLUGIN_ADMIN.PAGE_TITLE
+      help: PLUGIN_ADMIN.PAGE_TITLE_HELP
       validate:
         required: true
 
     folder:
       type: text
-      label: Folder Name
+      label: PLUGIN_ADMIN.FOLDER_NAME
+      help: PLUGIN_ADMIN.FOLDER_NAME_HELP
       validate:
         type: slug
         required: true
 
-
-
     route:
       type: select
-      label: Parent Page
+      label: PLUGIN_ADMIN.PARENT_PAGE
       classes: fancy
-      @data-options: '\Grav\Common\Page\Pages::parents'
-      @data-default: '\Grav\Plugin\admin::route'
+      '@data-options': '\Grav\Common\Page\Pages::parents'
+      '@data-default': '\Grav\Plugin\admin::getLastPageRoute'
       options:
-        '/': '- Root -'
+        '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
       validate:
         required: true
 
-    type:
+    name:
       type: select
       classes: fancy
-      label: Display Template
-      default: default
-      @data-options: '\Grav\Common\Page\Pages::types'
+      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/page.yaml

@@ -1,42 +0,0 @@
-rules:
-  slug:
-    pattern: "[a-z][a-z0-9_\-]+"
-    min: 2
-    max: 80
-
-form:
-  validation: loose
-  fields:
-
-    title:
-      type: text
-      label: Title
-      validate:
-        required: true
-
-    folder:
-      type: text
-      label: Folder
-      validate:
-        type: slug
-        required: true
-
-    route:
-      type: select
-      label: Parent
-      classes: fancy
-      @data-options: '\Grav\Common\Page\Pages::parents'
-      @data-default: '\Grav\Plugin\admin::route'
-      options:
-        '/': '- Root -'
-      validate:
-        required: true
-
-    type:
-      type: select
-      classes: fancy
-      label: Display Template
-      default: default
-      @data-options: '\Grav\Common\Page\Pages::types'
-      validate:
-        required: true

system/blueprints/pages/raw.yaml

@@ -15,26 +15,25 @@ form:
       fields:
         content:
           type: tab
-          title: Content
+          title: PLUGIN_ADMIN.CONTENT
 
           fields:
             frontmatter:
               type: frontmatter
-              label: Frontmatter
-
+              label: PLUGIN_ADMIN.FRONTMATTER
+              autofocus: true
 
             content:
               type: markdown
-              label: Content
+              label: PLUGIN_ADMIN.CONTENT
 
             uploads:
-              type: uploads
-              label: Page Media
-
+              type: pagemedia
+              label: PLUGIN_ADMIN.PAGE_MEDIA
 
         options:
           type: tab
-          title: Options
+          title: PLUGIN_ADMIN.OPTIONS
 
           fields:
 
@@ -47,30 +46,41 @@ form:
 
                   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: Folder Name
+                      label: PLUGIN_ADMIN.FOLDER_NAME
+                      help: PLUGIN_ADMIN.FOLDER_NAME_HELP
                       validate:
                         type: slug
                         required: true
 
                     route:
                       type: select
-                      label: Parent
+                      label: PLUGIN_ADMIN.PARENT
                       classes: fancy
-                      @data-options: '\Grav\Common\Page\Pages::parents'
-                      @data-default: '\Grav\Plugin\admin::route'
+                      '@data-options': '\Grav\Common\Page\Pages::parents'
+                      '@data-default': '\Grav\Plugin\admin::route'
                       options:
-                        '/': '- Root -'
-                      validate:
-                        required: true
+                        '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
 
-                    type:
+                    name:
                       type: select
                       classes: fancy
-                      label: Display Template
+                      label: PLUGIN_ADMIN.DISPLAY_TEMPLATE
+                      help: PLUGIN_ADMIN.DISPLAY_TEMPLATE_HELP
                       default: default
-                      @data-options: '\Grav\Common\Page\Pages::types'
+                      '@data-options': '\Grav\Common\Page\Pages::types'
                       validate:
                         required: true
 
@@ -80,5 +90,7 @@ form:
                     fields:
                       order:
                         type: order
-                        label: Ordering
+                        label: PLUGIN_ADMIN.ORDERING
 
+            blueprint:
+              type: blueprint

system/blueprints/user/account.yaml

@@ -5,82 +5,52 @@ form:
 
         content:
             type: section
-            title: Account
+            title: PLUGIN_ADMIN.ACCOUNT
 
             fields:
                 username:
                     type: text
                     size: large
-                    label: Username
+                    label: PLUGIN_ADMIN.USERNAME
+                    disabled: true
                     readonly: true
 
                 email:
-                    type: text
+                    type: email
                     size: large
-                    label: Email
+                    label: PLUGIN_ADMIN.EMAIL
                     validate:
+                      type: email
+                      message: PLUGIN_ADMIN.EMAIL_VALIDATION_MESSAGE
                       required: true
 
                 password:
                     type: password
                     size: large
-                    label: Password
+                    label: PLUGIN_ADMIN.PASSWORD
                     validate:
                       required: true
-
-
+                      message: PLUGIN_ADMIN.PASSWORD_VALIDATION_MESSAGE
+                      pattern: '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}'
 
                 fullname:
                     type: text
                     size: large
-                    label: Full name
+                    label: PLUGIN_ADMIN.FULL_NAME
                     validate:
                       required: true
 
                 title:
                     type: text
                     size: large
-                    label: Title
+                    label: PLUGIN_ADMIN.TITLE
 
-        admin:
-            type: section
-            title: Admin Access
+                language:
+                    type: select
+                    label: PLUGIN_ADMIN.LANGUAGE
+                    size: medium
+                    classes: fancy
+                    '@data-options': '\Grav\Plugin\admin::adminLanguages'
+                    default: 'en'
+                    help: PLUGIN_ADMIN.LANGUAGE_HELP
 
-            fields:
-                access.admin.super:
-                    type: toggle
-                    label: Super user
-                    default: 0
-                    highlight: 1
-                    options:
-                        1: Yes
-                        0: No
-                    validate:
-                        type: bool
-
-                access.admin.login:
-                    type: toggle
-                    label: Admin login
-                    default: 0
-                    highlight: 1
-                    options:
-                        1: Yes
-                        0: No
-                    validate:
-                        type: bool
-
-        site:
-            type: section
-            title: Site Access
-
-            fields:
-                access.site.login:
-                    type: toggle
-                    label: Site login
-                    default: 1
-                    highlight: 1
-                    options:
-                        1: Yes
-                        0: No
-                    validate:
-                        type: bool

system/blueprints/user/account_new.yaml

@@ -1,4 +1,4 @@
-title: Add Account
+title: PLUGIN_ADMIN.ADD_ACCOUNT
 
 form:
   validation: loose
@@ -6,10 +6,11 @@ form:
 
     content:
       type: section
-      title: Add Account
+      title: PLUGIN_ADMIN.ADD_ACCOUNT
 
     username:
       type: text
-      label: Username
+      label: PLUGIN_ADMIN.USERNAME
+      help: PLUGIN_ADMIN.USERNAME_HELP
       validate:
         required: true

system/config/media.yaml

@@ -11,6 +11,10 @@ jpg:
   type: image
   thumb: media/thumb-jpg.png
   mime: image/jpeg
+jpe:
+  type: image
+  thumb: media/thumb-jpg.png
+  mime: image/jpeg
 jpeg:
   type: image
   thumb: media/thumb-jpeg.png
@@ -70,19 +74,92 @@ wav:
   type: audio
   thumb: media/thumb-wav.png
   mime: audio/wav
+aiff:
+  type: audio
+  mime: audio/aiff
+aif:
+  type: audio
+  mime: audio/aif
 
 txt:
   type: file
   thumb: media/thumb-txt.png
   mime: text/plain
+xml:
+  type: file
+  thumb: media/thumb-xml.png
+  mime: application/xml
 doc:
   type: file
   thumb: media/thumb-doc.png
   mime: application/msword
+docx:
+  type: file
+  mime: application/msword
+xls:
+  type: file
+  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:
+  type: file
+  mime: application/vnd.ms-excel
+ppt:
+  type: file
+  mime: application/vnd.ms-powerpoint
+pps:
+  type: file
+  mime: application/vnd.ms-powerpoint
+rtf:
+  type: file
+  mime: application/rtf
+
+bmp:
+  type: file
+  mime: image/bmp
+tiff:
+  type: file
+  mime: image/tiff
+mpeg:
+  type: file
+  mime: video/mpeg
+mpg:
+  type: file
+  mime: video/mpeg
+mpe:
+  type: file
+  mime: video/mpeg
+avi:
+  type: file
+  mime: video/msvideo
+wmv:
+  type: file
+  mime: video/x-ms-wmv
+
 html:
   type: file
   thumb: media/thumb-html.png
   mime: text/html
+htm:
+  type: file
+  thumb: media/thumb-html.png
+  mime: text/html
 pdf:
   type: file
   thumb: media/thumb-pdf.png
@@ -95,3 +172,19 @@ gz:
   type: file
   thumb: media/thumb-gz.png
   mime: application/gzip
+tar:
+  type: file
+  mime: application/x-tar
+css:
+  type: file
+  thumb: media/thumb-css.png
+  mime: text/css
+js:
+  type: file
+  thumb: media/thumb-js.png
+  mime: application/javascript
+json:
+  type: file
+  thumb: media/thumb-json.png
+  mime: application/json
+

system/config/site.yaml

@@ -1,18 +1,34 @@
 title: Grav                                 # Name of the site
+
 author:
   name: John Appleseed                      # Default author name
   email: 'john@email.com'                   # Default author email
+
 taxonomies: [category,tag]                  # Arbitrary list of taxonomy types
-blog:
-  route: '/blog'                            # Route to blog
+
 metadata:
   description: 'My Grav Site'               # Site description
+
 summary:
   enabled: true                             # enable or disable summary of page
-  format: short                             # long = summary delimiter will be ignored; short = use the first occurence of delimter or size
+  format: short                             # long = summary delimiter will be ignored; short = use the first occurrence of delimiter or size
   size: 300                                 # Maximum length of summary (characters)
   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
+
 routes:
   /something/else: '/blog/sample-3'         # Alias for /blog/sample-3
-  /another/one/here: '/blog/sample-3'       # Another alias for /blog/sample-3
-  /new/*: '/blog/*'                         # Wildcard any /new/my-page URL to /blog/my-page Route
+  /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
+#    - text: Source
+#      icon: github
+#      url: https://github.com/getgrav/grav
+#    - icon: twitter
+#      url: http://twitter.com/getgrav

system/config/system.yaml

@@ -1,6 +1,17 @@
 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
+
+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
 
 home:
   alias: '/home'                       # Default path for home, ie /
@@ -8,11 +19,12 @@ home:
 pages:
   theme: antimatter                    # Default theme (defaults to "antimatter" theme)
   order:
-    by: defaults                       # Order pages by "default", "alpha" or "date"
+    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
   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
@@ -30,8 +42,19 @@ pages:
     special_chars:                     # List of special characters to automatically convert to entities
       '>': 'gt'
       '<': 'lt'
-  types: 'txt|xml|html|json|rss|atom'  # Pipe separated list of valid page types
-  expires: 0                           # Page expires time in seconds (604800 seconds = 7 days)
+  types: [txt,xml,html,json,rss,atom]  # list of valid page types
+  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
+  fallback_types: [png,jpg,jpeg,gif]   # Allowed types of files found if accessed via Page route
 
 cache:
   enabled: true                        # Set to true to enable caching
@@ -42,7 +65,6 @@ cache:
   lifetime: 604800                     # Lifetime of cached data in seconds (0 = infinite)
   gzip: false                          # GZip compress the page output
 
-
 twig:
   cache: true                          # Set to true to enable twig caching
   debug: false                         # Enable Twig debug
@@ -58,26 +80,33 @@ assets:                                # Configuration for Assets Manager (JS, C
   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_minify: true                      # Minify the JS during pipelining
-  enable_asset_timestamp: false        # Enable asset timetsamps
+  enable_asset_timestamp: false        # Enable asset timestamps
   collections:
-    jquery: system://assets/jquery/jquery-2.1.3.min.js
+    jquery: system://assets/jquery/jquery-2.1.4.min.js
 
 errors:
-  display: true                        # Display full backtrace-style error page
+  display: false                       # Display full backtrace-style error page
   log: true                            # Log errors to /logs folder
 
 debugger:
   enabled: false                       # Enable Grav debugger and following settings
-  twig: true                           # Enable debugging of Twig templates
   shutdown:
     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
   debug: false                         # Show an overlay over images indicating the pixel depth of the image when working with retina for example
 
 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 unsupported media file types to try to display inline
+
+session:
+  enabled: true                        # Enable Session support
+  timeout: 1800                        # Timeout in seconds
+  name: grav-site                      # Name prefix of the session cookie
 
 security:
   default_hash: $2y$10$kwsyMVwM8/7j0K/6LHT.g.Fs49xOCTp2b8hh/S5.dPJuJcJB6T.UK

system/defines.php

@@ -2,7 +2,7 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '0.9.26');
+define('GRAV_VERSION', '1.0.0-rc.4');
 define('DS', '/');
 
 // Directories and Paths
@@ -13,14 +13,14 @@ define('ROOT_DIR', GRAV_ROOT . '/');
 define('USER_PATH', 'user/');
 define('USER_DIR', ROOT_DIR . USER_PATH);
 define('SYSTEM_DIR', ROOT_DIR .'system/');
-define('ASSETS_DIR', ROOT_DIR . 'assets/');
 define('CACHE_DIR', ROOT_DIR . 'cache/');
-define('IMAGES_DIR', ROOT_DIR . 'images/');
 define('LOG_DIR', ROOT_DIR .'logs/');
-define('ACCOUNTS_DIR', USER_DIR .'accounts/');
-define('PAGES_DIR', USER_DIR .'pages/');
 
 // DEPRECATED: Do not use!
+define('ASSETS_DIR', ROOT_DIR . 'assets/');
+define('IMAGES_DIR', ROOT_DIR . 'images/');
+define('ACCOUNTS_DIR', USER_DIR .'accounts/');
+define('PAGES_DIR', USER_DIR .'pages/');
 define('DATA_DIR', USER_DIR .'data/');
 define('LIB_DIR', SYSTEM_DIR .'src/');
 define('PLUGINS_DIR', USER_DIR .'plugins/');

system/languages/cs.yaml

@@ -0,0 +1,37 @@
+NICETIME:
+    NO_DATE_PROVIDED: Datum nebylo vloženo
+    BAD_DATE: Chybné datum
+    AGO: zpět
+    FROM_NOW: od teď
+    SECOND: sekunda
+    MINUTE: minuta
+    HOUR: hodina
+    DAY: den
+    WEEK: týden
+    MONTH: měsíc
+    YEAR: rok
+    DECADE: dekáda
+    SEC: sek
+    MIN: min
+    HR: hod
+    DAY: den
+    WK: t
+    MO: m
+    YR: r
+    DEC: dek
+    SECOND_PLURAL: sekundy
+    MINUTE_PLURAL: minuty
+    HOUR_PLURAL: hodiny
+    DAY_PLURAL: dny
+    WEEK_PLURAL: týdny
+    MONTH_PLURAL: měsíce
+    YEAR_PLURAL: roky
+    DECADE_PLURAL: dekády
+    SEC_PLURAL: sek
+    MIN_PLURAL: min
+    HR_PLURAL: hod
+    DAY_PLURAL: dny
+    WK_PLURAL: t
+    MO_PLURAL: m
+    YR_PLURAL: r
+    DEC_PLURAL: dek

system/languages/de.yaml

@@ -0,0 +1,43 @@
+INFLECTOR_IRREGULAR:
+    'person': 'Personen'
+    'man': 'Menschen'
+    'child': 'Kinder'
+    'sex': 'Geschlecht'
+    'move': 'Züge'
+NICETIME:
+    NO_DATE_PROVIDED: Keine Daten vorhanden
+    BAD_DATE: Falsches Datum
+    AGO: her
+    FROM_NOW: ab jetzt
+    SECOND: Sekunde
+    MINUTE: Minute
+    HOUR: Stunde
+    DAY: Tag
+    WEEK: Woche
+    MONTH: Monat
+    YEAR: Jahr
+    DECADE: Dekade
+    SEC: sek
+    MIN: min
+    HR: std
+    DAY: Tag
+    WK: wo
+    MO: mo
+    YR: yh
+    DEC: dec
+    SECOND_PLURAL: Sekunden
+    MINUTE_PLURAL: Minuten
+    HOUR_PLURAL: Stunden
+    DAY_PLURAL: Tage
+    WEEK_PLURAL: Wochen
+    MONTH_PLURAL: Monate
+    YEAR_PLURAL: Jahre
+    DECADE_PLURAL: Dekaden
+    SEC_PLURAL: Sekunden
+    MIN_PLURAL: Minuten
+    HR_PLURAL: Stunden
+    DAY_PLURAL: Tage
+    WK_PLURAL: Wochen
+    MO_PLURAL: Monate
+    YR_PLURAL: Jahre
+    DEC_PLURAL: Dekaden

system/languages/en.yaml

@@ -0,0 +1,94 @@
+FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Error: Invalid Frontmatter\n\nPath: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```"
+INFLECTOR_PLURALS:
+    '/(quiz)$/i': '\1zes'
+    '/^(ox)$/i': '\1en'
+    '/([m|l])ouse$/i': '\1ice'
+    '/(matr|vert|ind)ix|ex$/i': '\1ices'
+    '/(x|ch|ss|sh)$/i': '\1es'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([^aeiouy]|qu)y$/i': '\1ies'
+    '/(hive)$/i': '\1s'
+    '/(?:([^f])fe|([lr])f)$/i': '\1\2ves'
+    '/sis$/i': 'ses'
+    '/([ti])um$/i': '\1a'
+    '/(buffal|tomat)o$/i': '\1oes'
+    '/(bu)s$/i': '\1ses'
+    '/(alias|status)/i': '\1es'
+    '/(octop|vir)us$/i': '\1i'
+    '/(ax|test)is$/i': '\1es'
+    '/s$/i': 's'
+    '/$/': 's'
+INFLECTOR_SINGULAR:
+    '/(quiz)zes$/i': '\1'
+    '/(matr)ices$/i': '\1ix'
+    '/(vert|ind)ices$/i': '\1ex'
+    '/^(ox)en/i': '\1'
+    '/(alias|status)es$/i': '\1'
+    '/([octop|vir])i$/i': '\1us'
+    '/(cris|ax|test)es$/i': '\1is'
+    '/(shoe)s$/i': '\1'
+    '/(o)es$/i': '\1'
+    '/(bus)es$/i': '\1'
+    '/([m|l])ice$/i': '\1ouse'
+    '/(x|ch|ss|sh)es$/i': '\1'
+    '/(m)ovies$/i': '\1ovie'
+    '/(s)eries$/i': '\1eries'
+    '/([^aeiouy]|qu)ies$/i': '\1y'
+    '/([lr])ves$/i': '\1f'
+    '/(tive)s$/i': '\1'
+    '/(hive)s$/i': '\1'
+    '/([^f])ves$/i': '\1fe'
+    '/(^analy)ses$/i': '\1sis'
+    '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis'
+    '/([ti])a$/i': '\1um'
+    '/(n)ews$/i': '\1ews'
+    '/s$/i': ''
+INFLECTOR_UNCOUNTABLE: ['equipment', 'information', 'rice', 'money', 'species', 'series', 'fish', 'sheep']
+INFLECTOR_IRREGULAR:
+    'person': 'people'
+    'man': 'men'
+    'child': 'children'
+    'sex': 'sexes'
+    'move': 'moves'
+INFLECTOR_ORDINALS:
+    'default': 'th'
+    'first': 'st'
+    'second': 'nd'
+    'third': 'rd'
+NICETIME:
+    NO_DATE_PROVIDED: No date provided
+    BAD_DATE: Bad date
+    AGO: ago
+    FROM_NOW: from now
+    SECOND: second
+    MINUTE: minute
+    HOUR: hour
+    DAY: day
+    WEEK: week
+    MONTH: month
+    YEAR: year
+    DECADE: decade
+    SEC: sec
+    MIN: min
+    HR: hr
+    DAY: day
+    WK: wk
+    MO: mo
+    YR: yr
+    DEC: dec
+    SECOND_PLURAL: seconds
+    MINUTE_PLURAL: minutes
+    HOUR_PLURAL: hours
+    DAY_PLURAL: days
+    WEEK_PLURAL: weeks
+    MONTH_PLURAL: months
+    YEAR_PLURAL: years
+    DECADE_PLURAL: decades
+    SEC_PLURAL: secs
+    MIN_PLURAL: mins
+    HR_PLURAL: hrs
+    DAY_PLURAL: days
+    WK_PLURAL: wks
+    MO_PLURAL: mos
+    YR_PLURAL: yrs
+    DEC_PLURAL: decs

system/languages/fr.yaml

@@ -0,0 +1,60 @@
+INFLECTOR_PLURALS:
+    '/$/': 's'
+    '/(bijou|caillou|chou|genou|hibou|joujou|pou|au|eu|eau)$/': '\1x'
+    '/(bleu|émeu|landau|lieu|pneu|sarrau)$/': '\1s'
+    '/(b|cor|ém|gemm|soupir|trav|vant|vitr)ail$/': '\1aux'
+    '/(s|x|z)$/': '\1'
+    '/ail$/': 'ails'
+    '/al$/': 'aux'
+    '/s$/i': 's'
+INFLECTOR_SINGULAR:
+    '/(bijou|caillou|chou|genou|hibou|joujou|pou|au|eu|eau)x$/': '\1'
+    '/(b|cor|ém|gemm|soupir|trav|vant|vitr)aux$/': '\1ail'
+    '/(journ|chev)aux$/': '\1al'
+    '/ails$/': 'ail'
+    '/s$/i': ''
+INFLECTOR_IRREGULAR:
+    'madame': 'mesdames'
+    'mademoiselle': 'mesdemoiselles'
+    'monsieur': 'messieurs'
+INFLECTOR_ORDINALS:
+    'default': 'ème'
+    'first': 'er'
+    'second': 'nd'
+NICETIME:
+    NO_DATE_PROVIDED: Aucune date
+    BAD_DATE: Date erronée
+    AGO: plus tôt
+    FROM_NOW: à partir de maintenant
+    SECOND: seconde
+    MINUTE: minute
+    HOUR: heure
+    DAY: jour
+    WEEK: semaine
+    MONTH: mois
+    YEAR: an
+    DECADE: décennie
+    SEC: s
+    MIN: m
+    HR: h
+    DAY: j
+    WK: s
+    MO: m
+    YR: a
+    DEC: d
+    SECOND_PLURAL: secondes
+    MINUTE_PLURAL: minutes
+    HOUR_PLURAL: heures
+    DAY_PLURAL: jours
+    WEEK_PLURAL: semaines
+    MONTH_PLURAL: mois
+    YEAR_PLURAL: ans
+    DECADE_PLURAL: décennies
+    SEC_PLURAL: s
+    MIN_PLURAL: m
+    HR_PLURAL: h
+    DAY_PLURAL: j
+    WK_PLURAL: s
+    MO_PLURAL: m
+    YR_PLURAL: a
+    DEC_PLURAL: d

system/languages/it.yaml

@@ -0,0 +1,21 @@
+NICETIME:
+    NO_DATE_PROVIDED: Nessuna data fornita
+    BAD_DATE: Data errata
+    AGO: fa
+    FROM_NOW: da adesso
+    SECOND: secondo
+    MINUTE: minuto
+    HOUR: ora
+    DAY: giorno
+    WEEK: settimana
+    MONTH: mese
+    YEAR: anno
+    DECADE: decade
+    SECOND_PLURAL: secondi
+    MINUTE_PLURAL: minuti
+    HOUR_PLURAL: ore
+    DAY_PLURAL: giorni
+    WEEK_PLURAL: settimane
+    MONTH_PLURAL: mesi
+    YEAR_PLURAL: anni
+    DECADE_PLURAL: decadi

system/languages/nl.yaml

@@ -0,0 +1,43 @@
+INFLECTOR_IRREGULAR:
+    'person': 'personen'
+    'man': 'mensen'
+    'child': 'kinderen'
+    'sex': 'geslacht'
+    'move': 'verplaatsen'
+NICETIME:
+    NO_DATE_PROVIDED: geen datum opgegeven
+    BAD_DATE: Datumformaat onjuist
+    AGO: geleden
+    FROM_NOW: vanaf nu
+    SECOND: seconde
+    MINUTE: minuut
+    HOUR: uur
+    DAY: dag
+    WEEK: week
+    MONTH: maand
+    YEAR: jaar
+    DECADE: decenium
+    SEC: sec
+    MIN: min
+    HR: hr
+    DAY: dag
+    WK: wk
+    MO: ma
+    YR: yr
+    DEC: dec
+    SECOND_PLURAL: seconden
+    MINUTE_PLURAL: minuten
+    HOUR_PLURAL: uren
+    DAY_PLURAL: dagen
+    WEEK_PLURAL: weken
+    MONTH_PLURAL: maanden
+    YEAR_PLURAL: jaren
+    DECADE_PLURAL: decennia
+    SEC_PLURAL: seconden
+    MIN_PLURAL: minuten
+    HR_PLURAL: uren
+    DAY_PLURAL: dagen
+    WK_PLURAL: weken
+    MO_PLURAL: maanden
+    YR_PLURAL: jaren
+    DEC_PLURAL: decs

system/languages/ru.yaml

@@ -0,0 +1,43 @@
+INFLECTOR_IRREGULAR:
+    'person': 'люди'
+    'man': 'человек'
+    'child': 'ребенок'
+    'sex': 'пол'
+    'move': 'движется'
+NICETIME:
+    NO_DATE_PROVIDED: Дата не указана
+    BAD_DATE: Неверная дата
+    AGO: назад
+    FROM_NOW: теперь
+    SECOND: секунда
+    MINUTE: минута
+    HOUR: час
+    DAY: день
+    WEEK: неделя
+    MONTH: месяц
+    YEAR: год
+    DECADE: десятилетие
+    SEC: с
+    MIN: мин
+    HR: ч
+    DAY: д
+    WK: нед
+    MO: мес
+    YR: г.
+    DEC: гг.
+    SECOND_PLURAL: секунды
+    MINUTE_PLURAL: минуты
+    HOUR_PLURAL: часы
+    DAY_PLURAL: дни
+    WEEK_PLURAL: недели
+    MONTH_PLURAL: месяцы
+    YEAR_PLURAL: годы
+    DECADE_PLURAL: десятилетия
+    SEC_PLURAL: с
+    MIN_PLURAL: мин
+    HR_PLURAL: ч
+    DAY_PLURAL: д
+    WK_PLURAL: нед
+    MO_PLURAL: мес
+    YR_PLURAL: г.
+    DEC_PLURAL: гг.

system/src/Grav/Common/Assets.php

@@ -42,12 +42,14 @@ class Assets
     /** @const Regex to match CSS import content */
     const CSS_IMPORT_REGEX = '{@import(.*);}';
 
+    const HTML_TAG_REGEX = '#(<([A-Z][A-Z0-9]*)>)+(.*)(<\/\2>)#is';
+
 
     /**
      * Closure used by the pipeline to fetch assets.
      *
      * Useful when file_get_contents() function is not available in your PHP
-     * instalation or when you want to apply any kind of preprocessing to
+     * installation or when you want to apply any kind of preprocessing to
      * your assets before they get pipelined.
      *
      * The closure will receive as the only parameter a string with the path/URL of the asset and
@@ -72,6 +74,8 @@ class Assets
     protected $config;
     protected $base_url;
     protected $timestamp = '';
+    protected $assets_dir;
+    protected $assets_url;
 
     // Default values for pipeline settings
     protected $css_minify = true;
@@ -115,7 +119,7 @@ class Assets
         }
 
         // Pipeline requires public dir
-        if (($this->js_pipeline || $this->css_pipeline) && !is_dir(ASSETS_DIR)) {
+        if (($this->js_pipeline || $this->css_pipeline) && !is_dir($this->assets_dir)) {
             throw new \Exception('Assets: Public dir not found');
         }
 
@@ -173,6 +177,11 @@ class Assets
         $base_url = self::getGrav()['base_url'];
         $asset_config = (array)$config->get('system.assets');
 
+        /** @var Locator $locator */
+        $locator = self::$grav['locator'];
+        $this->assets_dir = self::getGrav()['locator']->findResource('asset://') . DS;
+        $this->assets_url = self::getGrav()['locator']->findResource('asset://', false);
+
         $this->config($asset_config);
         $this->base_url = $base_url . '/';
 
@@ -194,7 +203,7 @@ class Assets
      *
      * @return $this
      */
-    public function add($asset, $priority = 10, $pipeline = true)
+    public function add($asset, $priority = null, $pipeline = null)
     {
         // More than one asset
         if (is_array($asset)) {
@@ -228,20 +237,21 @@ class Assets
      * You may add more than one asset passing an array as argument.
      *
      * @param  mixed $asset
-     * @param  int   $priority the priority, bigger comes first
-     * @param  bool  $pipeline false if this should not be pipelined
+     * @param  int $priority the priority, bigger comes first
+     * @param  bool $pipeline false if this should not be pipelined
+     * @param null $group
      *
      * @return $this
      */
-    public function addCss($asset, $priority = 10, $pipeline = true)
+    public function addCss($asset, $priority = null, $pipeline = null, $group = null)
     {
         if (is_array($asset)) {
             foreach ($asset as $a) {
-                $this->addCss($a, $priority, $pipeline);
+                $this->addCss($a, $priority, $pipeline, $group);
             }
             return $this;
         } elseif (isset($this->collections[$asset])) {
-            $this->add($this->collections[$asset], $priority, $pipeline);
+            $this->add($this->collections[$asset], $priority, $pipeline, $group);
             return $this;
         }
 
@@ -249,14 +259,26 @@ class Assets
             $asset = $this->buildLocalLink($asset);
         }
 
+        $data = [
+            'asset'    => $asset,
+            'priority' => intval($priority ?: 10),
+            'order'    => count($this->css),
+            'pipeline' => $pipeline ?: true,
+            'group' => $group ?: 'head'
+        ];
+
+        // check for dynamic array and merge with defaults
+        $count_args = func_num_args();
+        if (func_num_args() == 2) {
+            $dynamic_arg = func_get_arg(1);
+            if (is_array($dynamic_arg)) {
+                $data = array_merge($data, $dynamic_arg);
+            }
+        }
+
         $key = md5($asset);
         if ($asset) {
-            $this->css[$key] = [
-                'asset'    => $asset,
-                'priority' => $priority,
-                'order'    => count($this->css),
-                'pipeline' => $pipeline
-            ];
+            $this->css[$key] = $data;
         }
 
         return $this;
@@ -269,21 +291,21 @@ class Assets
      * You may add more than one asset passing an array as argument.
      *
      * @param  mixed $asset
-     * @param  int   $priority the priority, bigger comes first
-     * @param  bool  $pipeline false if this should not be pipelined
-     * @param string $loading how the asset is loaded (async/defer)
-     *
+     * @param  int $priority the priority, bigger comes first
+     * @param  bool $pipeline false if this should not be pipelined
+     * @param  string $loading how the asset is loaded (async/defer)
+     * @param  string $group name of the group
      * @return $this
      */
-    public function addJs($asset, $priority = 10, $pipeline = true, $loading = '')
+    public function addJs($asset, $priority = null, $pipeline = null, $loading = null, $group = null)
     {
         if (is_array($asset)) {
             foreach ($asset as $a) {
-                $this->addJs($a, $priority, $pipeline);
+                $this->addJs($a, $priority, $pipeline, $loading, $group);
             }
             return $this;
         } elseif (isset($this->collections[$asset])) {
-            $this->add($this->collections[$asset], $priority, $pipeline);
+            $this->add($this->collections[$asset], $priority, $pipeline, $loading, $group);
             return $this;
         }
 
@@ -291,15 +313,27 @@ class Assets
             $asset = $this->buildLocalLink($asset);
         }
 
+        $data = [
+            'asset'    => $asset,
+            'priority' => intval($priority ?: 10),
+            'order'    => count($this->js),
+            'pipeline' => $pipeline ?: true,
+            'loading'  => $loading ?: '',
+            'group' => $group ?: 'head'
+        ];
+
+        // check for dynamic array and merge with defaults
+        $count_args = func_num_args();
+        if (func_num_args() == 2) {
+            $dynamic_arg = func_get_arg(1);
+            if (is_array($dynamic_arg)) {
+               $data = array_merge($data, $dynamic_arg);
+            }
+        }
+
         $key = md5($asset);
         if ($asset) {
-            $this->js[$key] = [
-                'asset'    => $asset,
-                'priority' => $priority,
-                'order'    => count($this->js),
-                'pipeline' => $pipeline,
-                'loading'  => $loading
-            ];
+            $this->js[$key] = $data;
         }
 
         return $this;
@@ -311,12 +345,15 @@ class Assets
      * @param      $asset
      * @param int  $priority
      * @param bool $pipeline
+     * @param string $group name of the group
+     *
+     * @deprecated Please use dynamic method with ['loading' => 'async']
      *
      * @return \Grav\Common\Assets
      */
-    public function addAsyncJs($asset, $priority = 10, $pipeline = true)
+    public function addAsyncJs($asset, $priority = null, $pipeline = null, $group = null)
     {
-        return $this->addJs($asset, $priority, $pipeline, 'async');
+        return $this->addJs($asset, $priority, $pipeline, 'async', $group);
     }
 
     /**
@@ -325,12 +362,15 @@ class Assets
      * @param      $asset
      * @param int  $priority
      * @param bool $pipeline
+     * @param string $group name of the group
+     *
+     * @deprecated Please use dynamic method with ['loading' => 'defer']
      *
      * @return \Grav\Common\Assets
      */
-    public function addDeferJs($asset, $priority = 10, $pipeline = true)
+    public function addDeferJs($asset, $priority = null, $pipeline = null, $group = null)
     {
-        return $this->addJs($asset, $priority, $pipeline, 'defer');
+        return $this->addJs($asset, $priority, $pipeline, 'defer', $group);
     }
 
     /**
@@ -340,22 +380,41 @@ class Assets
      * For adding chunks of string-based inline CSS
      *
      * @param  mixed $asset
-     * @param  int   $priority the priority, bigger comes first
+     * @param  int $priority the priority, bigger comes first
+     * @param null $group
      *
      * @return $this
      */
-    public function addInlineCss($asset, $priority = 10)
+    public function addInlineCss($asset, $priority = null, $group = null)
     {
+        $asset = trim($asset);
+
         if (is_a($asset, 'Twig_Markup')) {
-            $asset = strip_tags((string)$asset);
+            preg_match(self::HTML_TAG_REGEX, $asset, $matches );
+            if (isset($matches[3]))  {
+                $asset = $matches[3];
+            }
         }
+
+        $data = [
+            'priority'  => intval($priority ?: 10),
+            'order'     => count($this->inline_css),
+            'asset'     => $asset,
+            'group'     => $group ?: 'head'
+        ];
+
+        // check for dynamic array and merge with defaults
+        $count_args = func_num_args();
+        if (func_num_args() == 2) {
+            $dynamic_arg = func_get_arg(1);
+            if (is_array($dynamic_arg)) {
+                $data = array_merge($data, $dynamic_arg);
+            }
+        }
+
         $key = md5($asset);
         if (is_string($asset) && !array_key_exists($key, $this->inline_css)) {
-            $this->inline_css[$key] = [
-                'priority'  => $priority,
-                'order'     => count($this->inline_css),
-                'asset'     => $asset
-            ];
+            $this->inline_css[$key] = $data;
         }
 
         return $this;
@@ -369,21 +428,40 @@ class Assets
      *
      * @param  mixed $asset
      * @param  int   $priority the priority, bigger comes first
+     * @param string $group name of the group
      *
      * @return $this
      */
-    public function addInlineJs($asset, $priority = 10)
+    public function addInlineJs($asset, $priority = null, $group = null)
     {
+        $asset = trim($asset);
+
         if (is_a($asset, 'Twig_Markup')) {
-            $asset = strip_tags((string)$asset);
+            preg_match(self::HTML_TAG_REGEX, $asset, $matches );
+            if (isset($matches[3]))  {
+                $asset = $matches[3];
+            }
         }
+
+        $data = [
+            'asset'    => $asset,
+            'priority' => intval($priority ?: 10),
+            'order'    => count($this->js),
+            'group' => $group ?: 'head'
+        ];
+
+        // check for dynamic array and merge with defaults
+        $count_args = func_num_args();
+        if (func_num_args() == 2) {
+            $dynamic_arg = func_get_arg(1);
+            if (is_array($dynamic_arg)) {
+                $data = array_merge($data, $dynamic_arg);
+            }
+        }
+
         $key = md5($asset);
         if (is_string($asset) && !array_key_exists($key, $this->inline_js)) {
-            $this->inline_js[$key] = [
-                'priority'  => $priority,
-                'order'     => count($this->inline_js),
-                'asset'     => $asset
-            ];
+            $this->inline_js[$key] = $data;
         }
 
         return $this;
@@ -392,11 +470,12 @@ class Assets
     /**
      * Build the CSS link tags.
      *
+     * @param  string $group name of the group
      * @param  array $attributes
      *
      * @return string
      */
-    public function css($attributes = [])
+    public function css($group = 'head', $attributes = [])
     {
         if (!$this->css) {
             return null;
@@ -424,25 +503,37 @@ class Assets
         $attributes = $this->attributes(array_merge(['type' => 'text/css', 'rel' => 'stylesheet'], $attributes));
 
         $output = '';
-        if ($this->css_pipeline) {
-            $output .= '<link href="' . $this->pipeline(CSS_ASSET) . '"' . $attributes . ' />' . "\n";
+        $inline_css = '';
 
+        if ($this->css_pipeline) {
+            $pipeline_result = $this->pipelineCss($group);
+            if ($pipeline_result) {
+                $output .= '<link href="' . $pipeline_result . '"' . $attributes . ' />' . "\n";
+            }
             foreach ($this->css_no_pipeline as $file) {
-                $output .= '<link href="' . $file['asset'] . $this->timestamp . '"' . $attributes . ' />' . "\n";
+                if ($group && $file['group'] == $group) {
+                    $media = isset($file['media']) ? sprintf(' media="%s"', $file['media']) : '';
+                    $output .= '<link href="' . $file['asset'] . $this->timestamp . '"' . $attributes . $media . ' />' . "\n";
+                }
             }
         } else {
             foreach ($this->css as $file) {
-                $output .= '<link href="' . $file['asset'] . $this->timestamp . '"' . $attributes . ' />' . "\n";
+                if ($group && $file['group'] == $group) {
+                    $media = isset($file['media']) ? sprintf(' media="%s"', $file['media']) : '';
+                    $output .= '<link href="' . $file['asset'] . $this->timestamp . '"' . $attributes . $media . ' />' . "\n";
+                }
             }
         }
 
         // Render Inline CSS
-        if (count($this->inline_css) > 0) {
-            $output .= "<style>\n";
-            foreach ($this->inline_css as $inline) {
-                $output .= $inline['asset'] . "\n";
+        foreach ($this->inline_css as $inline) {
+            if ($group && $inline['group'] == $group) {
+                $inline_css .= $inline['asset'] . "\n";
             }
-            $output .= "</style>\n";
+        }
+
+        if ($inline_css) {
+            $output .= "\n<style>\n" . $inline_css . "\n</style>\n";
         }
 
 
@@ -452,11 +543,12 @@ class Assets
     /**
      * Build the JavaScript script tags.
      *
+     * @param  string $group name of the group
      * @param  array $attributes
      *
      * @return string
      */
-    public function js($attributes = [])
+    public function js($group = 'head', $attributes = [])
     {
         if (!$this->js) {
             return null;
@@ -483,68 +575,83 @@ class Assets
         $attributes = $this->attributes(array_merge(['type' => 'text/javascript'], $attributes));
 
         $output = '';
+        $inline_js = '';
+
         if ($this->js_pipeline) {
-            $output .= '<script src="' . $this->pipeline(JS_ASSET) . '"' . $attributes . ' ></script>' . "\n";
+            $pipeline_result = $this->pipelineJs($group);
+            if ($pipeline_result) {
+                $output .= '<script src="' . $pipeline_result . '"' . $attributes . ' ></script>' . "\n";
+            }
             foreach ($this->js_no_pipeline as $file) {
-                $output .= '<script src="' . $file['asset'] . $this->timestamp . '"' . $attributes . ' ' . $file['loading']. '></script>' . "\n";
+                if ($group && $file['group'] == $group) {
+                    $output .= '<script src="' . $file['asset'] . $this->timestamp . '"' . $attributes . ' ' . $file['loading']. '></script>' . "\n";
+                }
             }
         } else {
             foreach ($this->js as $file) {
-                $output .= '<script src="' . $file['asset'] . $this->timestamp . '"' . $attributes . ' ' . $file['loading'].'></script>' . "\n";
+                if ($group && $file['group'] == $group) {
+                    $output .= '<script src="' . $file['asset'] . $this->timestamp . '"' . $attributes . ' ' . $file['loading'] . '></script>' . "\n";
+                }
             }
         }
 
         // Render Inline JS
-        if (count($this->inline_js) > 0) {
-            $output .= "<script>\n";
-            foreach ($this->inline_js as $inline) {
-                $output .= $inline['asset'] . "\n";
+        foreach ($this->inline_js as $inline) {
+            if ($group && $inline['group'] == $group) {
+                $inline_js .= $inline['asset'] . "\n";
             }
-            $output .= "</script>\n";
+        }
+
+        if ($inline_js) {
+            $output .= "\n<script>\n" . $inline_js . "\n</script>\n";
         }
 
         return $output;
     }
 
-
-
     /**
-     * Minifiy and concatenate CSS / JS files.
+     * Minify and concatenate CSS.
      *
      * @return string
      */
-    protected function pipeline($css = true)
+    protected function pipelineCss($group = 'head')
     {
         /** @var Cache $cache */
         $cache = self::getGrav()['cache'];
         $key = '?' . $cache->getKey();
 
-        if ($css) {
-            $file = md5(json_encode($this->css) . $this->js_minify . $this->css_minify . $this->css_rewrite) . '.css';
-            foreach ($this->css as $id => $asset) {
-                if (!$asset['pipeline']) {
-                    $this->css_no_pipeline[] = $asset;
-                    unset($this->css[$id]);
-                }
-            }
-        } else {
-            $file = md5(json_encode($this->js) . $this->js_minify . $this->css_minify . $this->css_rewrite) . '.js';
-            foreach ($this->js as $id => $asset) {
-                if (!$asset['pipeline']) {
-                    $this->js_no_pipeline[] = $asset;
-                    unset($this->js[$id]);
-                }
-            }
-        }
+        // temporary list of assets to pipeline
+        $temp_css = [];
 
-        $relative_path = "{$this->base_url}" . basename(ASSETS_DIR) . "/{$file}";
-        $absolute_path = ASSETS_DIR . $file;
+        // clear no-pipeline assets lists
+        $this->css_no_pipeline = [];
+
+        $file = md5(json_encode($this->css) . $this->css_minify . $this->css_rewrite . $group) . '.css';
+
+        $relative_path = "{$this->base_url}{$this->assets_url}/{$file}";
+        $absolute_path = $this->assets_dir . $file;
 
         // If pipeline exist return it
         if (file_exists($absolute_path)) {
             return $relative_path . $key;
         }
 
+        // Remove any non-pipeline files
+        foreach ($this->css as $id => $asset) {
+            if ($asset['group'] == $group) {
+                if (!$asset['pipeline']) {
+                    $this->css_no_pipeline[$id] = $asset;
+                } else {
+                    $temp_css[$id] = $asset;
+                }
+            }
+        }
+
+        //if nothing found get out of here!
+        if (count($temp_css) == 0) {
+            return false;
+        }
+
         $css_minify = $this->css_minify;
 
         // If this is a Windows server, and minify_windows is false (default value) skip the
@@ -555,23 +662,77 @@ class Assets
         }
 
         // Concatenate files
-        if ($css) {
-            $buffer = $this->gatherLinks($this->css, CSS_ASSET);
-            if ($css_minify) {
-                $min = new \CSSmin();
-                $buffer = $min->run($buffer);
-            }
-        } else {
-            $buffer = $this->gatherLinks($this->js, JS_ASSET);
-            if ($this->js_minify) {
-                $buffer = \JSMin::minify($buffer);
-            }
+        $buffer = $this->gatherLinks($temp_css, CSS_ASSET);
+        if ($css_minify) {
+            $min = new \CSSmin();
+            $buffer = $min->run($buffer);
         }
 
         // Write file
-        file_put_contents($absolute_path, $buffer);
+        if (strlen(trim($buffer)) > 0) {
+            file_put_contents($absolute_path, $buffer);
+            return $relative_path . $key;
+        } else {
+            return false;
+        }
+    }
 
-        return $relative_path . $key;
+    /**
+     * Minify and concatenate JS files.
+     *
+     * @return string
+     */
+    protected function pipelineJs($group = 'head')
+    {
+        /** @var Cache $cache */
+        $cache = self::getGrav()['cache'];
+        $key = '?' . $cache->getKey();
+
+        // temporary list of assets to pipeline
+        $temp_js = [];
+
+        // clear no-pipeline assets lists
+        $this->js_no_pipeline = [];
+
+        $file = md5(json_encode($this->js) . $this->js_minify . $group) . '.js';
+
+        $relative_path = "{$this->base_url}{$this->assets_url}/{$file}";
+        $absolute_path = $this->assets_dir . $file;
+
+        // If pipeline exist return it
+        if (file_exists($absolute_path)) {
+            return $relative_path . $key;
+        }
+
+        // Remove any non-pipeline files
+        foreach ($this->js as $id => $asset) {
+            if ($asset['group'] == $group) {
+                if (!$asset['pipeline']) {
+                    $this->js_no_pipeline[] = $asset;
+                } else {
+                    $temp_js[$id] = $asset;
+                }
+            }
+        }
+
+        //if nothing found get out of here!
+        if (count($temp_js) == 0) {
+            return false;
+        }
+
+        // Concatenate files
+        $buffer = $this->gatherLinks($temp_js, JS_ASSET);
+        if ($this->js_minify) {
+            $buffer = \JSMin::minify($buffer);
+        }
+
+        // Write file
+        if (strlen(trim($buffer)) > 0) {
+            file_put_contents($absolute_path, $buffer);
+            return $relative_path . $key;
+        } else {
+            return false;
+        }
     }
 
     /**
@@ -698,12 +859,12 @@ class Assets
     public function addDir($directory, $pattern = self::DEFAULT_REGEX)
     {
         // Check if public_dir exists
-        if (!is_dir(ASSETS_DIR)) {
+        if (!is_dir($this->assets_dir)) {
             throw new Exception('Assets: Public dir not found');
         }
 
         // Get files
-        $files = $this->rglob(ASSETS_DIR . DIRECTORY_SEPARATOR . $directory, $pattern, ASSETS_DIR);
+        $files = $this->rglob($this->assets_dir . DIRECTORY_SEPARATOR . $directory, $pattern, $this->assets_dir);
 
         // No luck? Nothing to do
         if (!$files) {
@@ -741,7 +902,7 @@ class Assets
     /**
      * Determine whether a link is local or remote.
      *
-     * Undestands both "http://" and "https://" as well as protocol agnostic links "//"
+     * Understands both "http://" and "https://" as well as protocol agnostic links "//"
      *
      * @param  string $link
      *
@@ -803,6 +964,7 @@ class Assets
      * Download and concatenate the content of several links.
      *
      * @param  array $links
+     * @param  bool $css
      *
      * @return string
      */
@@ -825,14 +987,20 @@ class Assets
             } else {
                 // Fix to remove relative dir if grav is in one
                 if (($this->base_url != '/') && (strpos($this->base_url, $link) == 0)) {
-                    $relative_path = str_replace($this->base_url, '/', $link);
+                    $base_url = '#' . preg_quote($this->base_url, '#') . '#';
+                    $relative_path = ltrim(preg_replace($base_url, '/', $link, 1), '/');
                 }
 
                 $relative_dir = dirname($relative_path);
                 $link = ROOT_DIR . $relative_path;
             }
 
-            $file = ($this->fetch_command instanceof Closure) ? $this->fetch_command->__invoke($link) : file_get_contents($link);
+            $file = ($this->fetch_command instanceof Closure) ? @$this->fetch_command->__invoke($link) : @file_get_contents($link);
+
+            // No file found, skip it...
+            if ($file === false) {
+                continue;
+            }
 
             // Double check last character being
             if (!$css) {
@@ -881,18 +1049,7 @@ class Assets
                     return $matches[0];
                 }
 
-                $newpath = array();
-                $paths = explode('/', $old_url);
-
-                foreach ($paths as $path) {
-                    if ($path == '..') {
-                        $relative_path = dirname($relative_path);
-                    } else {
-                        $newpath[] = $path;
-                    }
-                }
-
-                $new_url = rtrim($this->base_url, '/') . $relative_path . '/' . implode('/', $newpath);
+                $new_url = $this->base_url . ltrim(Utils::normalizePath($relative_path . '/' . $old_url), '/');
 
                 return str_replace($old_url, $new_url, $matches[0]);
             },
@@ -930,7 +1087,7 @@ class Assets
      *
      * @param  string $directory
      * @param  string $pattern (regex)
-     * @param  string $ltrim   Will be trimed from the left of the file path
+     * @param  string $ltrim   Will be trimmed from the left of the file path
      *
      * @return array
      */

system/src/Grav/Common/Backup/ZipBackup.php

@@ -0,0 +1,130 @@
+<?php
+namespace Grav\Common\Backup;
+
+use Grav\Common\GravTrait;
+use Grav\Common\Filesystem\Folder;
+use Grav\Common\Inflector;
+
+/**
+ * The ZipBackup class lets you create simple zip-backups of a grav site
+ *
+ * @author RocketTheme
+ * @license MIT
+ */
+class ZipBackup
+{
+    use GravTrait;
+
+    protected static $ignorePaths = [
+        'backup',
+        'cache',
+        'images',
+        'logs'
+    ];
+
+    protected static $ignoreFolders = [
+        '.git',
+        '.svn',
+        '.hg',
+        '.idea'
+    ];
+
+    public static function backup($destination = null, callable $messager = null)
+    {
+        if (!$destination) {
+            $destination = self::getGrav()['locator']->findResource('backup://', true);
+
+            if (!$destination)
+                throw new \RuntimeException('The backup folder is missing.');
+
+            Folder::mkdir($destination);
+        }
+
+        $name = self::getGrav()['config']->get('site.title', basename(GRAV_ROOT));
+
+        $inflector = new Inflector();
+
+        if (is_dir($destination)) {
+            $date = date('YmdHis', time());
+            $filename = trim($inflector->hyphenize($name), '-') . '-' . $date . '.zip';
+            $destination = rtrim($destination, DS) . DS . $filename;
+        }
+
+        $messager && $messager([
+            'type' => 'message',
+            'level' => 'info',
+            'message' => 'Creating new Backup "' . $destination . '"'
+        ]);
+        $messager && $messager([
+            'type' => 'message',
+            'level' => 'info',
+            'message' => ''
+        ]);
+
+        $zip = new \ZipArchive();
+        $zip->open($destination, \ZipArchive::CREATE);
+
+        static::folderToZip(GRAV_ROOT, $zip, strlen(rtrim(GRAV_ROOT, DS) . DS), $messager);
+
+        $messager && $messager([
+            'type' => 'progress',
+            'percentage' => false,
+            'complete' => true
+        ]);
+
+        $messager && $messager([
+            'type' => 'message',
+            'level' => 'info',
+            'message' => ''
+        ]);
+        $messager && $messager([
+            'type' => 'message',
+            'level' => 'info',
+            'message' => 'Saving and compressing archive...'
+        ]);
+
+        $zip->close();
+
+        return $destination;
+    }
+
+    /**
+     * @param $folder
+     * @param $zipFile
+     * @param $exclusiveLength
+     * @param $messager
+     */
+    private static function folderToZip($folder, \ZipArchive &$zipFile, $exclusiveLength, callable $messager = null)
+    {
+        $handle = opendir($folder);
+        while (false !== $f = readdir($handle)) {
+            if ($f != '.' && $f != '..') {
+                $filePath = "$folder/$f";
+                // Remove prefix from file path before add to zip.
+                $localPath = substr($filePath, $exclusiveLength);
+
+                if (in_array($f, static::$ignoreFolders)) {
+                    continue;
+                } elseif (in_array($localPath, static::$ignorePaths)) {
+                    $zipFile->addEmptyDir($f);
+                    continue;
+                }
+
+                if (is_file($filePath)) {
+                    $zipFile->addFile($filePath, $localPath);
+
+                    $messager && $messager([
+                        'type' => 'progress',
+                        'percentage' => false,
+                        'complete' => false
+                    ]);
+                } elseif (is_dir($filePath)) {
+                    // Add sub-directory.
+                    $zipFile->addEmptyDir($localPath);
+                    static::folderToZip($filePath, $zipFile, $exclusiveLength, $messager);
+                }
+            }
+        }
+        closedir($handle);
+    }
+}

system/src/Grav/Common/Browser.php

@@ -38,4 +38,21 @@ class Browser
         $version = explode('.', $this->getLongVersion());
         return intval($version[0]);
     }
+
+    /**
+     * Determine if the request comes from a human, or from a bot/crawler
+     */
+    public function isHuman()
+    {
+        $browser = $this->getBrowser();
+        if (empty($browser)) {
+            return false;
+        }
+
+        if (preg_match('~(bot|crawl)~i', $browser)) {
+            return false;
+        }
+
+        return true;
+    }
 }

system/src/Grav/Common/Cache.php

@@ -102,7 +102,7 @@ class Cache extends Getters
         $this->enabled = (bool) $this->config->get('system.cache.enabled');
 
         // Cache key allows us to invalidate all cache on configuration changes.
-        $this->key = substr(md5(($prefix ? $prefix : 'g') . $uri->rootUrl(true) . $this->config->key() . GRAV_VERSION), 2, 8);
+        $this->key = ($prefix ? $prefix : 'g') . '-' . substr(md5($uri->rootUrl(true) . $this->config->key() . GRAV_VERSION), 2, 8);
 
         $this->driver = $this->getCacheDriver();
 
@@ -155,6 +155,15 @@ class Cache extends Getters
                 $driver->setMemcache($memcache);
                 break;
 
+            case 'redis':
+                $redis = new \Redis();
+                $redis->connect($this->config->get('system.cache.redis.server','localhost'),
+                                $this->config->get('system.cache.redis.port', 6379));
+
+                $driver = new \Doctrine\Common\Cache\RedisCache();
+                $driver->setRedis($redis);
+                break;
+
             default:
                 $driver = new \Doctrine\Common\Cache\FilesystemCache($this->cache_dir);
                 break;
@@ -239,19 +248,20 @@ class Cache extends Getters
             $anything = false;
             $files = glob(ROOT_DIR . $path . '*');
 
-            foreach ($files as $file) {
-                if (is_file($file)) {
-                    if (@unlink($file)) {
-                        $anything = true;
-                    }
-                } elseif (is_dir($file)) {
-                    if (@Folder::delete($file)) {
-                        $anything = true;
+            if (is_array($files)) {
+                foreach ($files as $file) {
+                    if (is_file($file)) {
+                        if (@unlink($file)) {
+                            $anything = true;
+                        }
+                    } elseif (is_dir($file)) {
+                        if (@Folder::delete($file)) {
+                            $anything = true;
+                        }
                     }
                 }
             }
 
-
             if ($anything) {
                 $output[] = '<red>Cleared:  </red>' . $path . '*';
             }
@@ -271,7 +281,7 @@ class Cache extends Getters
 
 
     /**
-     * Set the cache lifetime programatically
+     * Set the cache lifetime programmatically
      *
      * @param int $future timestamp
      */

system/src/Grav/Common/Composer.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Grav\Common;
+
+/**
+ * Offers composer helper methods.
+ *
+ * @author  eschmar
+ * @license MIT
+ */
+class Composer
+{
+    /** @const Default composer location */
+    const DEFAULT_PATH = "bin/composer.phar";
+
+    /**
+     * Returns the location of composer.
+     *
+     * @return string
+     */
+    public static function getComposerLocation()
+    {
+        if (!function_exists('shell_exec') || strtolower(substr(PHP_OS, 0, 3)) === 'win') {
+            return self::DEFAULT_PATH;
+        }
+
+        // check for global composer install
+        $path = trim(shell_exec("command -v composer"));
+
+        // fall back to grav bundled composer
+        if (!$path || !preg_match('/(composer|composer\.phar)$/', $path)) {
+            $path = self::DEFAULT_PATH;
+        }
+
+        return $path;
+    }
+
+    public static function getComposerExecutor()
+    {
+        $executor = PHP_BINARY . ' ';
+        $composer = static::getComposerLocation();
+
+        if ($composer !== static::DEFAULT_PATH && is_executable($composer)) {
+            $file = fopen($composer, 'r');
+            $firstLine = fgets($file);
+            fclose($file);
+
+            if (!preg_match('/^#!.+php/i', $firstLine)) {
+                $executor = '';
+            }
+        }
+
+        return $executor . $composer;
+    }
+}

system/src/Grav/Common/Config/Config.php

@@ -60,6 +60,12 @@ class Config extends Data
                 '' => ['user://themes'],
             ]
         ],
+        'languages' => [
+            'type' => 'ReadOnlyStream',
+            'prefixes' => [
+                '' => ['user://languages', 'system/languages'],
+            ]
+        ],
         'cache' => [
             'type' => 'Stream',
             'prefixes' => [
@@ -72,49 +78,52 @@ class Config extends Data
             'prefixes' => [
                 '' => ['logs']
             ]
+        ],
+        'backup' => [
+            'type' => 'Stream',
+            'prefixes' => [
+                '' => ['backup']
+            ]
         ]
     ];
 
+    protected $setup = [];
+
     protected $blueprintFiles = [];
     protected $configFiles = [];
+    protected $languageFiles = [];
     protected $checksum;
     protected $timestamp;
 
     protected $configLookup;
     protected $blueprintLookup;
     protected $pluginLookup;
+    protected $languagesLookup;
 
     protected $finder;
     protected $environment;
     protected $messages = [];
 
-    public function __construct(array $items = array(), Grav $grav = null, $environment = null)
+    protected $languages;
+
+    public function __construct(array $setup = array(), Grav $grav = null, $environment = null)
     {
         $this->grav = $grav ?: Grav::instance();
         $this->finder = new ConfigFinder;
         $this->environment = $environment ?: 'localhost';
         $this->messages[] = 'Environment Name: ' . $this->environment;
 
-        if (isset($items['@class'])) {
-            if ($items['@class'] != get_class($this)) {
-                throw new \InvalidArgumentException('Unrecognized config cache file!');
-            }
-            // Loading pre-compiled configuration.
-            $this->timestamp = (int) $items['timestamp'];
-            $this->checksum = $items['checksum'];
-            $this->items = (array) $items['data'];
-        } else {
-            // Make sure that
-            if (!isset($items['streams']['schemes'])) {
-                $items['streams']['schemes'] = [];
-            }
-            $items['streams']['schemes'] += $this->streams;
-
-            $items = $this->autoDetectEnvironmentConfig($items);
-            $this->messages[] = $items['streams']['schemes']['config']['prefixes'][''];
-
-            parent::__construct($items);
+        // Make sure that
+        if (!isset($setup['streams']['schemes'])) {
+            $setup['streams']['schemes'] = [];
         }
+        $setup['streams']['schemes'] += $this->streams;
+
+        $setup = $this->autoDetectEnvironmentConfig($setup);
+
+        $this->setup = $setup;
+        parent::__construct($setup);
+
         $this->check();
     }
 
@@ -125,8 +134,10 @@ class Config extends Data
 
     public function reload()
     {
+        $this->items = $this->setup;
         $this->check();
         $this->init();
+        $this->debug();
 
         return $this;
     }
@@ -150,6 +161,7 @@ class Config extends Data
         foreach ($this->messages as $message) {
             $this->grav['debugger']->addMessage($message);
         }
+        $this->messages = [];
     }
 
     public function init()
@@ -161,51 +173,57 @@ class Config extends Data
         $this->blueprintLookup = $locator->findResources('blueprints://config');
         $this->pluginLookup = $locator->findResources('plugins://');
 
-        if (!isset($this->checksum)) {
-            $this->messages[] = 'No cached configuration, compiling new configuration..';
-        } elseif ($this->checksum() != $this->checksum) {
-            $this->messages[] = 'Configuration checksum mismatch, reloading configuration..';
-        } else {
-            $this->messages[] = 'Configuration checksum matches, using cached version.';
-            return;
-        }
 
         $this->loadCompiledBlueprints($this->blueprintLookup, $this->pluginLookup, 'master');
         $this->loadCompiledConfig($this->configLookup, $this->pluginLookup, 'master');
 
+        // process languages if supported
+        if ($this->get('system.languages.translations', true)) {
+            $this->languagesLookup = $locator->findResources('languages://');
+            $this->loadCompiledLanguages($this->languagesLookup, $this->pluginLookup, 'master');
+        }
+
         $this->initializeLocator($locator);
     }
 
     public function checksum()
     {
-        $checkBlueprints = $this->get('system.cache.check.blueprints', false);
-        $checkConfig = $this->get('system.cache.check.config', true);
-        $checkSystem = $this->get('system.cache.check.system', true);
+        if (empty($this->checksum)) {
+            $checkBlueprints = $this->get('system.cache.check.blueprints', false);
+            $checkLanguages = $this->get('system.cache.check.languages', false);
+            $checkConfig = $this->get('system.cache.check.config', true);
+            $checkSystem = $this->get('system.cache.check.system', true);
 
-        if (!$checkBlueprints && !$checkConfig && !$checkSystem) {
-            $this->messages[] = 'Skip configuration timestamp check.';
-            return false;
+            if (!$checkBlueprints && !$checkLanguages && !$checkConfig && !$checkSystem) {
+                $this->messages[] = 'Skip configuration timestamp check.';
+                return false;
+            }
+
+            // Generate checksum according to the configuration settings.
+            if (!$checkConfig) {
+                // Just check changes in system.yaml files and ignore all the other files.
+                $cc = $checkSystem ? $this->finder->locateConfigFile($this->configLookup, 'system') : [];
+            } else {
+                // Check changes in all configuration files.
+                $cc = $this->finder->locateConfigFiles($this->configLookup, $this->pluginLookup);
+            }
+
+            if ($checkBlueprints) {
+                $cb = $this->finder->locateBlueprintFiles($this->blueprintLookup, $this->pluginLookup);
+            } else {
+                $cb = [];
+            }
+
+            if ($checkLanguages) {
+                $cl = $this->finder->locateLanguageFiles($this->languagesLookup, $this->pluginLookup);
+            } else {
+                $cl = [];
+            }
+
+            $this->checksum = md5(json_encode([$cc, $cb, $cl]));
         }
 
-        // Generate checksum according to the configuration settings.
-        if (!$checkConfig) {
-            $this->messages[] = 'Check configuration timestamps from system.yaml files.';
-            // Just check changes in system.yaml files and ignore all the other files.
-            $cc = $checkSystem ? $this->finder->locateConfigFile($this->configLookup, 'system') : [];
-        } else {
-            $this->messages[] = 'Check configuration timestamps from all configuration files.';
-            // Check changes in all configuration files.
-            $cc = $this->finder->locateConfigFiles($this->configLookup, $this->pluginLookup);
-        }
-
-        if ($checkBlueprints) {
-            $this->messages[] = 'Check blueprint timestamps from all blueprint files.';
-            $cb = $this->finder->locateBlueprintFiles($this->blueprintLookup, $this->pluginLookup);
-        } else {
-            $cb = [];
-        }
-
-        return md5(json_encode([$cc, $cb]));
+        return $this->checksum;
     }
 
     protected function autoDetectEnvironmentConfig($items)
@@ -255,7 +273,6 @@ class Config extends Data
                 'files' => $blueprintFiles,
                 'data' => $this->blueprints->toArray()
             ];
-
             // If compiled file wasn't already locked by another process, save it.
             if ($file->locked() !== false) {
                 $this->messages[] = 'Saving compiled blueprints.';
@@ -269,14 +286,71 @@ class Config extends Data
 
     protected function loadCompiledConfig($configs, $plugins, $filename = null)
     {
-        $checksum = md5(json_encode($configs));
         $filename = $filename
             ? CACHE_DIR . 'compiled/config/' . $filename . '-' . $this->environment . '.php'
             : CACHE_DIR . 'compiled/config/' . $checksum . '-' . $this->environment . '.php';
         $file = PhpFile::instance($filename);
         $cache = $file->exists() ? $file->content() : null;
+        $class = get_class($this);
+        $checksum = $this->checksum();
+
+        if (
+            !is_array($cache)
+            || !isset($cache['checksum'])
+            || !isset($cache['@class'])
+            || $cache['@class'] != $class
+        ) {
+            $this->messages[] = 'No cached configuration, compiling new configuration..';
+        } else if ($cache['checksum'] !== $checksum) {
+            $this->messages[] = 'Configuration checksum mismatch, reloading configuration..';
+        } else {
+            $this->messages[] = 'Configuration checksum matches, using cached version.';
+
+            $this->items = $cache['data'];
+            return;
+        }
+
         $configFiles = $this->finder->locateConfigFiles($configs, $plugins);
-        $checksum .= ':'.md5(json_encode($configFiles));
+
+        // Attempt to lock the file for writing.
+        $file->lock(false);
+
+        // Load configuration.
+        foreach ($configFiles as $files) {
+            $this->loadConfigFiles($files);
+        }
+        $cache = [
+            '@class' => $class,
+            'timestamp' => time(),
+            'checksum' => $checksum,
+            'data' => $this->toArray()
+        ];
+
+        // If compiled file wasn't already locked by another process, save it.
+        if ($file->locked() !== false) {
+            $this->messages[] = 'Saving compiled configuration.';
+            $file->save($cache);
+            $file->unlock();
+        }
+
+        $this->items = $cache['data'];
+    }
+
+    /**
+     * @param      $languages
+     * @param      $plugins
+     * @param null $filename
+     */
+    protected function loadCompiledLanguages($languages, $plugins, $filename = null)
+    {
+        $checksum = md5(json_encode($languages));
+        $filename = $filename
+            ? CACHE_DIR . 'compiled/languages/' . $filename . '-' . $this->environment . '.php'
+            : CACHE_DIR . 'compiled/languages/' . $checksum . '-' . $this->environment . '.php';
+        $file = PhpFile::instance($filename);
+        $cache = $file->exists() ? $file->content() : null;
+        $languageFiles = $this->finder->locateLanguageFiles($languages, $plugins);
+        $checksum .= ':' . md5(json_encode($languageFiles));
         $class = get_class($this);
 
         // Load real file if cache isn't up to date (or is invalid).
@@ -290,26 +364,43 @@ class Config extends Data
             // Attempt to lock the file for writing.
             $file->lock(false);
 
-            // Load configuration.
-            foreach ($configFiles as $files) {
-                $this->loadConfigFiles($files);
+            // Load languages.
+            $this->languages = new Languages;
+            $pluginPaths = str_ireplace(GRAV_ROOT . '/', '', array_reverse($plugins));
+            foreach ($pluginPaths as $path) {
+                if (isset($languageFiles[$path])) {
+                    foreach ((array) $languageFiles[$path] as $plugin => $item) {
+                        $lang_file = CompiledYamlFile::instance($item['file']);
+                        $content = $lang_file->content();
+                        $this->languages->mergeRecursive($content);
+                    }
+                    unset($languageFiles[$path]);
+                }
             }
-            $cache = [
-                '@class' => $class,
-                'timestamp' => time(),
-                'checksum' => $this->checksum(),
-                'data' => $this->toArray()
-            ];
 
+            foreach ($languageFiles as $location) {
+                foreach ($location as $lang => $item) {
+                    $lang_file = CompiledYamlFile::instance($item['file']);
+                    $content = $lang_file->content();
+                    $this->languages->join($lang, $content, '/');
+                }
+            }
+
+            $cache = [
+                '@class'   => $class,
+                'checksum' => $checksum,
+                'files'    => $languageFiles,
+                'data'     => $this->languages->toArray()
+            ];
             // If compiled file wasn't already locked by another process, save it.
             if ($file->locked() !== false) {
-                $this->messages[] = 'Saving compiled configuration.';
+                $this->messages[] = 'Saving compiled languages.';
                 $file->save($cache);
                 $file->unlock();
             }
+        } else {
+            $this->languages = new Languages($cache['data']);
         }
-
-        $this->items = $cache['data'];
     }
 
     /**
@@ -380,4 +471,9 @@ class Config extends Data
 
         return $schemes;
     }
+
+    public function getLanguages()
+    {
+        return $this->languages;
+    }
 }

system/src/Grav/Common/Config/ConfigFinder.php

@@ -49,6 +49,18 @@ class ConfigFinder
         return $list;
     }
 
+    public function locateLanguageFiles(array $languages, array $plugins)
+    {
+        $list = [];
+        foreach (array_reverse($plugins) as $folder) {
+            $list += $this->detectLanguagesInFolder($folder, 'languages');
+        }
+        foreach (array_reverse($languages) as $folder) {
+            $list += $this->detectRecursive($folder);
+        }
+        return $list;
+    }
+
     /**
      * Get all locations for a single configuration file.
      *
@@ -90,11 +102,11 @@ class ConfigFinder
         $list = [];
 
         if (is_dir($folder)) {
-            $iterator = new \DirectoryIterator($folder);
+            $iterator = new \FilesystemIterator($folder);
 
             /** @var \DirectoryIterator $directory */
             foreach ($iterator as $directory) {
-                if (!$directory->isDir() || $directory->isDot()) {
+                if (!$directory->isDir()) {
                     continue;
                 }
 
@@ -111,6 +123,34 @@ class ConfigFinder
         return [$path => $list];
     }
 
+    protected function detectLanguagesInFolder($folder, $lookup = null)
+    {
+        $path = trim(Folder::getRelativePath($folder), '/');
+
+        $list = [];
+
+        if (is_dir($folder)) {
+            $iterator = new \FilesystemIterator($folder);
+
+            /** @var \DirectoryIterator $directory */
+            foreach ($iterator as $directory) {
+                if (!$directory->isDir()) {
+                    continue;
+                }
+
+                $name = $directory->getBasename();
+                $find = ($lookup ?: $name) . '.yaml';
+                $filename = "{$path}/{$name}/$find";
+
+                if (file_exists($filename)) {
+                    $list[$name] = ['file' => $filename, 'modified' => filemtime($filename)];
+                }
+            }
+        }
+
+        return [$path => $list];
+    }
+
     /**
      * Detects all plugins with a configuration file and returns them with last modification time.
      *

system/src/Grav/Common/Config/Languages.php

@@ -0,0 +1,27 @@
+<?php
+namespace Grav\Common\Config;
+
+use Grav\Common\Data\Data;
+
+/**
+ * The Languages class contains configuration rules.
+ *
+ * @author RocketTheme
+ * @license MIT
+ */
+class Languages extends Data
+{
+
+    public function reformat()
+    {
+        if (isset($this->items['plugins'])) {
+            $this->items = array_merge_recursive($this->items, $this->items['plugins']);
+            unset($this->items['plugins']);
+        }
+    }
+
+    public function mergeRecursive(array $data)
+    {
+        $this->items = array_merge_recursive($this->items, $data);
+    }
+}

system/src/Grav/Common/Data/Blueprint.php

@@ -1,6 +1,7 @@
 <?php
 namespace Grav\Common\Data;
 
+use Grav\Common\GravTrait;
 use RocketTheme\Toolbox\ArrayTraits\Export;
 
 /**
@@ -11,7 +12,7 @@ use RocketTheme\Toolbox\ArrayTraits\Export;
  */
 class Blueprint
 {
-    use Export, DataMutatorTrait;
+    use Export, DataMutatorTrait, GravTrait;
 
     public $name;
 
@@ -75,7 +76,7 @@ class Blueprint
         try {
             $this->validateArray($data, $this->nested);
         } catch (\RuntimeException $e) {
-            throw new \RuntimeException(sprintf('Page validation failed: %s', $e->getMessage()));
+            throw new \RuntimeException(sprintf('<b>Validation failed:</b> %s', $e->getMessage()));
         }
     }
 
@@ -117,7 +118,17 @@ class Blueprint
     {
         // Initialize data
         $this->fields();
-        return $this->extraArray($data, $this->nested, $prefix);
+        $rules = $this->nested;
+
+        // Drill down to prefix level
+        if (!empty($prefix)) {
+            $parts = explode('.', trim($prefix, '.'));
+            foreach ($parts as $part) {
+                $rules = isset($rules[$part]) ? $rules[$part] : [];
+            }
+        }
+
+        return $this->extraArray($data, $rules, $prefix);
     }
 
     /**
@@ -227,6 +238,9 @@ class Blueprint
 
             if ($rule) {
                 // Item has been defined in blueprints.
+                if (is_array($field) && count($field) == 1 && reset($field) == '') {
+                    continue;
+                }
                 $field = Validation::filter($field, $rule);
             } elseif (is_array($field) && is_array($val)) {
                 // Array has been defined in blueprints.
@@ -286,7 +300,7 @@ class Blueprint
                 // Item has been defined in blueprints.
             } elseif (is_array($field) && is_array($val)) {
                 // Array has been defined in blueprints.
-                $array += $this->ExtraArray($field, $val, $prefix);
+                $array += $this->ExtraArray($field, $val, $prefix . $key . '.');
             } else {
                 // Undefined/extra item.
                 $array[$prefix.$key] = $field;
@@ -313,11 +327,11 @@ class Blueprint
             $field['name'] = $prefix . $key;
             $field += $params;
 
-            if (isset($field['fields'])) {
+            if (isset($field['fields']) && (!isset($field['type']) || $field['type'] !== 'list')) {
                 // Recursively get all the nested fields.
                 $newParams = array_intersect_key($this->filter, $field);
                 $this->parseFormFields($field['fields'], $newParams, $prefix, $current[$key]['fields']);
-            } else {
+            } else if ($field['type'] !== 'ignore') {
                 // Add rule.
                 $this->rules[$prefix . $key] = &$field;
                 $this->addProperty($prefix . $key);
@@ -362,10 +376,20 @@ class Blueprint
                             }
                         }
                     }
+
+                    elseif (substr($name, 0, 8) == '@config-') {
+                        $property = substr($name, 8);
+                        $default = isset($field[$property]) ? $field[$property] : null;
+                        $config = self::getGrav()['config']->get($value, $default);
+
+                        if (!is_null($config)) {
+                            $field[$property] = $config;
+                        }
+                    }
                 }
 
                 // Initialize predefined validation rule.
-                if (isset($field['validate']['rule'])) {
+                if (isset($field['validate']['rule']) && $field['type'] !== 'ignore') {
                     $field['validate'] += $this->getRule($field['validate']['rule']);
                 }
             }

system/src/Grav/Common/Data/Blueprints.php

@@ -2,6 +2,8 @@
 namespace Grav\Common\Data;
 
 use Grav\Common\File\CompiledYamlFile;
+use Grav\Common\GravTrait;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
 /**
  * Blueprints class keeps track on blueprint instances.
@@ -11,6 +13,8 @@ use Grav\Common\File\CompiledYamlFile;
  */
 class Blueprints
 {
+    use GravTrait;
+
     protected $search;
     protected $types;
     protected $instances = array();
@@ -20,11 +24,7 @@ class Blueprints
      */
     public function __construct($search)
     {
-        if (!is_string($search)) {
-            $this->search = $search;
-        } else {
-            $this->search = rtrim($search, '\\/') . '/';
-        }
+        $this->search = $search;
     }
 
     /**
@@ -37,8 +37,18 @@ class Blueprints
     public function get($type)
     {
         if (!isset($this->instances[$type])) {
+            $parents = [];
             if (is_string($this->search)) {
                 $filename = $this->search . $type . YAML_EXT;
+
+                // Check if search is a stream and resolve the path.
+                if (strpos($filename, '://')) {
+                    $grav = static::getGrav();
+                    /** @var UniformResourceLocator $locator */
+                    $locator = $grav['locator'];
+                    $parents = $locator->findResources($filename);
+                    $filename = array_shift($parents);
+                }
             } else {
                 $filename = isset($this->search[$type]) ? $this->search[$type] : '';
             }
@@ -55,8 +65,41 @@ class Blueprints
             if (isset($blueprints['@extends'])) {
                 // Extend blueprint by other blueprints.
                 $extends = (array) $blueprints['@extends'];
-                foreach ($extends as $extendType) {
-                    $blueprint->extend($this->get($extendType));
+
+                if (is_string(key($extends))) {
+                    $extends = [ $extends ];
+                }
+
+                foreach ($extends as $extendConfig) {
+                    $extendType = !is_string($extendConfig) ? empty($extendConfig['type']) ? false : $extendConfig['type'] : $extendConfig;
+
+                    if (!$extendType) {
+                        continue;
+                    } elseif ($extendType === '@parent') {
+                        $parentFile = array_shift($parents);
+                        if (!$parentFile || !is_file($parentFile)) {
+                            continue;
+                        }
+                        $blueprints = CompiledYamlFile::instance($parentFile)->content();
+                        $parent = new Blueprint($type.'-parent', $blueprints, $this);
+                        $blueprint->extend($parent);
+                        continue;
+                    }
+
+                    if (is_string($extendConfig) || empty($extendConfig['context'])) {
+                        $context = $this;
+                    } else {
+                        // Load blueprints from external context.
+                        $array = explode('://', $extendConfig['context'], 2);
+                        $scheme = array_shift($array);
+                        $path = array_shift($array);
+                        if ($path) {
+                            $scheme .= '://';
+                            $extendType = $path ? "{$path}/{$extendType}" : $extendType;
+                        }
+                        $context = new self($scheme);
+                    }
+                    $blueprint->extend($context->get($extendType));
                 }
             }
 
@@ -76,7 +119,18 @@ class Blueprints
         if ($this->types === null) {
             $this->types = array();
 
-            $iterator   = new \DirectoryIterator($this->search);
+            // Check if search is a stream.
+            if (strpos($this->search, '://')) {
+                // Stream: use UniformResourceIterator.
+                $grav = static::getGrav();
+                /** @var UniformResourceLocator $locator */
+                $locator = $grav['locator'];
+                $iterator = $locator->getIterator($this->search, null);
+            } else {
+                // Not a stream: use DirectoryIterator.
+                $iterator = new \DirectoryIterator($this->search);
+            }
+
             /** @var \DirectoryIterator $file */
             foreach ($iterator as $file) {
                 if (!$file->isFile() || '.' . $file->getExtension() != YAML_EXT) {

system/src/Grav/Common/Data/DataMutatorTrait.php

@@ -32,7 +32,7 @@ trait DataMutatorTrait
     }
 
     /**
-     * Sey value by using dot notation for nested arrays/objects.
+     * Set value by using dot notation for nested arrays/objects.
      *
      * @example $value = $data->set('this.is.my.nested.variable', true);
      *

system/src/Grav/Common/Data/Validation.php

@@ -1,5 +1,8 @@
 <?php
 namespace Grav\Common\Data;
+use Grav\Common\GravTrait;
+use Symfony\Component\Yaml\Exception\ParseException;
+use Symfony\Component\Yaml\Parser;
 
 /**
  * Data validation.
@@ -9,6 +12,8 @@ namespace Grav\Common\Data;
  */
 class Validation
 {
+    use GravTrait;
+
     /**
      * Validate value against a blueprint field definition.
      *
@@ -25,17 +30,22 @@ class Validation
             return;
         }
 
+        // Get language class
+        $language = self::getGrav()['language'];
+
         // Validate type with fallback type text.
         $type = (string) isset($field['validate']['type']) ? $field['validate']['type'] : $field['type'];
         $method = 'type'.strtr($type, '-', '_');
+        $name = ucfirst(isset($field['label']) ? $field['label'] : $field['name']);
+        $message = (string) isset($field['validate']['message']) ? $field['validate']['message'] : 'Invalid input in "' . $language->translate($name) . '""';
+
         if (method_exists(__CLASS__, $method)) {
             $success = self::$method($value, $validate, $field);
         } else {
             $success = self::typeText($value, $validate, $field);
         }
         if (!$success) {
-            $name = $field['label'] ? $field['label'] : $field['name'];
-            throw new \RuntimeException("invalid input in {$name}");
+            throw new \RuntimeException($message);
         }
 
         // Check individual rules
@@ -43,8 +53,9 @@ class Validation
             $method = 'validate'.strtr($rule, '-', '_');
             if (method_exists(__CLASS__, $method)) {
                 $success = self::$method($value, $params);
+
                 if (!$success) {
-                    throw new \RuntimeException('Failed');
+                    throw new \RuntimeException($message);
                 }
             }
         }
@@ -66,6 +77,16 @@ class Validation
             return null;
         }
 
+        // if this is a YAML field, simply parse it and return the value
+        if (isset($field['yaml']) && $field['yaml'] === true) {
+            try {
+                $yaml = new Parser();
+                return $yaml->parse($value);
+            } catch (ParseException $e) {
+                throw new \RuntimeException($e->getMessage());
+            }
+        }
+
         // Validate type with fallback type text.
         $type = (string) isset($field['validate']['type']) ? $field['validate']['type'] : $field['type'];
         $method = 'filter'.strtr($type, '-', '_');
@@ -285,6 +306,17 @@ class Validation
         return (int) $value;
     }
 
+    protected static function filterDateTime($value, array $params, array $field)
+    {
+        $format = self::getGrav()['config']->get('system.pages.dateformat.default');
+        if ($format) {
+            $converted = new \DateTime($value);
+            return $converted->format($format);
+        }
+        return $value;
+    }
+
+
     /**
      * HTML5 input: range
      *
@@ -353,7 +385,6 @@ class Validation
      */
     public static function typeDatetime($value, array $params, array $field)
     {
-        // TODO: add min, max and range.
         if ($value instanceof \DateTime) {
             return true;
         } elseif (!is_string($value)) {
@@ -489,6 +520,7 @@ class Validation
     {
         $values = (array) $value;
         $options = isset($field['options']) ? array_keys($field['options']) : array();
+        $multi = isset($field['multiple']) ? $field['multiple'] : false;
 
         if ($options) {
             $useKey = isset($field['use']) && $field['use'] == 'keys';
@@ -497,9 +529,43 @@ class Validation
             }
         }
 
+        if ($multi) {
+            foreach ($values as $key => $value) {
+                if (is_array($value)) {
+                    $value = implode(',', $value);
+                }
+
+                $values[$key] =  array_map('trim', explode(',', $value));
+            }
+        }
+
         return $values;
     }
 
+    public static function typeList($value, array $params, array $field)
+    {
+        if (!is_array($value)) {
+            return false;
+        }
+
+        if (isset($field['fields'])) {
+            foreach ($value as $key => $item) {
+                foreach ($field['fields'] as $subKey => $subField) {
+                    $subKey = trim($subKey, '.');
+                    $subValue = isset($item[$subKey]) ? $item[$subKey] : null;
+                    self::validate($subValue, $subField);
+                }
+            }
+        }
+
+        return true;
+    }
+
+    protected static function filterList($value, array $params, array $field)
+    {
+        return (array) $value;
+    }
+
     /**
      * Custom input: ignore (will not validate)
      *
@@ -513,10 +579,19 @@ class Validation
         return true;
     }
 
+    public static function filterIgnore($value, array $params, array $field)
+    {
+        return $value;
+    }
+
     // HTML5 attributes (min, max and range are handled inside the types)
 
     public static function validateRequired($value, $params)
     {
+        if (is_string($value)) {
+            $value = trim($value);
+        }
+        
         return (bool) $params !== true || !empty($value);
     }
 

system/src/Grav/Common/Debugger.php

@@ -94,10 +94,10 @@ class Debugger
         return $this;
     }
 
-    public function startTimer($name, $desription = null)
+    public function startTimer($name, $description = null)
     {
         if ($name[0] == '_' || $this->grav['config']->get('system.debugger.enabled')) {
-            $this->debugbar['time']->startMeasure($name, $desription);
+            $this->debugbar['time']->startMeasure($name, $description);
         }
         return $this;
     }

system/src/Grav/Common/Errors/Resources/error.css

@@ -48,4 +48,5 @@ h6 {
 
 code {
     font-weight: bold;
+    font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
 }

system/src/Grav/Common/Errors/Resources/layout.html.php

@@ -16,10 +16,14 @@
             <header>
                 Server Error
             </header>
-            <p>We're sorry! The server has encountered an internal error and was unable to complete your request.
-                Please contact the system administrator for more information.</p>
-            <h6>For further details please review your <code>logs/</code> folder, or enable displaying of errors in your system configuration.</h6>
-            <h6>Error Code: <b><?php echo $code ?></b></h6>
+
+
+
+            <p>Sorry, something went terribly wrong!</p>
+
+            <h3><?php echo $code ?> - <?php echo $message ?></h3>
+
+            <h5>For further details please review your <code>logs/</code> folder, or enable displaying of errors in your system configuration.</h5>
         </div>
     </div>
 </body>

system/src/Grav/Common/Errors/SimplePageHandler.php

@@ -28,6 +28,7 @@ class SimplePageHandler extends Handler
         $cssFile      = $this->getResource("error.css");
 
         $code = $inspector->getException()->getCode();
+        $message = $inspector->getException()->getMessage();
 
         if ($inspector->getException() instanceof \ErrorException) {
             $code = Misc::translateErrorCode($code);
@@ -36,6 +37,7 @@ class SimplePageHandler extends Handler
         $vars = array(
             "stylesheet" => file_get_contents($cssFile),
             "code"        => $code,
+            "message"     => $message,
         );
 
         $helper->setVariables($vars);

system/src/Grav/Common/File/CompiledFile.php

@@ -22,10 +22,13 @@ trait CompiledFile
      */
     public function content($var = null)
     {
+        // Set some options
+        $this->settings(['native' => true, 'compat' => true]);
+
         // If nothing has been loaded, attempt to get pre-compiled version of the file first.
         if ($var === null && $this->raw === null && $this->content === null) {
             $key = md5($this->filename);
-            $file = PhpFile::instance(CACHE_DIR . "/compiled/files/{$key}{$this->extension}.php");
+            $file = PhpFile::instance(CACHE_DIR . "compiled/files/{$key}{$this->extension}.php");
             $modified = $this->modified();
 
             if (!$modified) {
@@ -47,7 +50,7 @@ trait CompiledFile
                 $file->lock(false);
 
                 // Decode RAW file into compiled array.
-                $data = $this->decode($this->raw());
+                $data = (array) $this->decode($this->raw());
                 $cache = [
                     '@class' => $class,
                     'filename' => $this->filename,

system/src/Grav/Common/Filesystem/Folder.php

@@ -38,12 +38,12 @@ abstract class Folder
      * Recursively find the last modified time under given path by file.
      *
      * @param  string $path
+     * @param string  $extensions   which files to search for specifically
+     *
      * @return int
      */
-    public static function lastModifiedFile($path)
+    public static function lastModifiedFile($path, $extensions = 'md|yaml')
     {
-        // pipe separated list of extensions to search for changes with
-        $extensions = 'md|yaml';
         $last_modified = 0;
 
         $dirItr = new \RecursiveDirectoryIterator($path, \RecursiveDirectoryIterator::SKIP_DOTS);
@@ -244,7 +244,7 @@ abstract class Folder
     public static function delete($target)
     {
         if (!is_dir($target)) {
-            throw new \RuntimeException('Cannot delete non-existing folder.');
+            return;
         }
 
         $success = self::doDelete($target);
@@ -278,6 +278,46 @@ abstract class Folder
         }
     }
 
+    /**
+     * Recursive copy of one directory to another
+     *
+     * @param $src
+     * @param $dest
+     *
+     * @return bool
+     */
+    public static function rcopy($src, $dest)
+    {
+
+        // If the src is not a directory do a simple file copy
+        if (!is_dir($src)) {
+            copy($src, $dest);
+            return true;
+        }
+
+        // If the destination directory does not exist create it
+        if (!is_dir($dest)) {
+            if (!mkdir($dest)) {
+                // If the destination directory could not be created stop processing
+                return false;
+            }
+        }
+
+        // Open the source directory to read in files
+        $i = new \DirectoryIterator($src);
+        /** @var \DirectoryIterator $f */
+        foreach ($i as $f) {
+            if ($f->isFile()) {
+                copy($f->getRealPath(), "$dest/" . $f->getFilename());
+            } else {
+                if (!$f->isDot() && $f->isDir()) {
+                    static::rcopy($f->getRealPath(), "$dest/$f");
+                }
+            }
+        }
+        return true;
+    }
+
     /**
      * @param  string $folder
      * @return bool
@@ -290,13 +330,24 @@ abstract class Folder
             return @unlink($folder);
         }
 
-        // Go through all items in filesystem and recursively remove everything.
-        $files = array_diff(scandir($folder), array('.', '..'));
-        foreach ($files as $file) {
-            $path = "{$folder}/{$file}";
-            (is_dir($path)) ? self::doDelete($path) : @unlink($path);
+        $files = new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($folder, \RecursiveDirectoryIterator::SKIP_DOTS),
+            \RecursiveIteratorIterator::CHILD_FIRST
+        );
+
+        /** @var \DirectoryIterator $fileinfo */
+        foreach ($files as $fileinfo) {
+            if ($fileinfo->isDir()) {
+                if (false === rmdir($fileinfo->getRealPath())) {
+                    return false;
+                }
+            } else {
+                if (false === unlink($fileinfo->getRealPath())) {
+                    return false;
+                }
+            }
         }
 
-        return @rmdir($folder);
+        return rmdir($folder);
     }
 }

system/src/Grav/Common/Filesystem/RecursiveFolderFilterIterator.php

@@ -1,11 +1,31 @@
 <?php
 namespace Grav\Common\Filesystem;
 
+use Grav\Common\GravTrait;
+
 class RecursiveFolderFilterIterator extends \RecursiveFilterIterator
 {
+    use GravTrait;
+
+    protected static $folder_ignores;
+
+    public function __construct(\RecursiveIterator $iterator)
+    {
+        parent::__construct($iterator);
+        if (empty($this::$folder_ignores)) {
+            $this::$folder_ignores = self::getGrav()['config']->get('system.pages.ignore_folders');
+        }
+    }
+
     public function accept()
     {
-        // only accept directories
-        return $this->current()->isDir();
+
+        /** @var $current \SplFileInfo */
+        $current = $this->current();
+
+        if ($current->isDir() && !in_array($current->getFilename(), $this::$folder_ignores)) {
+            return true;
+        }
+        return false;
     }
 }

system/src/Grav/Common/GPM/GPM.php

@@ -40,8 +40,11 @@ class GPM extends Iterator
     public function __construct($refresh = false, $callback = null)
     {
         $this->installed  = new Local\Packages();
-        $this->repository = new Remote\Packages($refresh, $callback);
-        $this->grav       = new Remote\Grav($refresh, $callback);
+        try {
+            $this->repository = new Remote\Packages($refresh, $callback);
+            $this->grav       = new Remote\Grav($refresh, $callback);
+        } catch (\Exception $e) {
+        }
     }
 
     /**
@@ -349,6 +352,7 @@ class GPM extends Iterator
     public function findPackages($searches = [])
     {
         $packages = ['total' => 0, 'not_found' => []];
+        $inflector = new Inflector();
 
         foreach ($searches as $search) {
             $repository = '';
@@ -361,7 +365,7 @@ class GPM extends Iterator
             }
 
             if ($found = $this->findPackage($search)) {
-                // set override respository if provided
+                // set override repository if provided
                 if ($repository) {
                     $found->override_repository = $repository;
                 }
@@ -380,7 +384,7 @@ class GPM extends Iterator
                 }
 
                 $not_found = new \stdClass();
-                $not_found->name = Inflector::camelize($search);
+                $not_found->name = $inflector->camelize($search);
                 $not_found->slug = $search;
                 $not_found->package_type = $type;
                 $not_found->install_path = str_replace('%name%', $search, $this->install_paths[$type]);

system/src/Grav/Common/GPM/Installer.php

@@ -2,6 +2,7 @@
 namespace Grav\Common\GPM;
 
 use Grav\Common\Filesystem\Folder;
+use Symfony\Component\Yaml\Yaml;
 
 class Installer
 {
@@ -42,6 +43,7 @@ class Installer
         'overwrite'       => true,
         'ignore_symlinks' => true,
         'sophisticated'   => false,
+        'theme'            => false,
         'install_path'    => '',
         'exclude_checks'  => [self::EXISTS, self::NOT_FOUND, self::IS_LINK]
     ];
@@ -70,9 +72,12 @@ class Installer
             return false;
         }
 
+        // Pre install checks
+        static::flightProcessing('pre_install', $install_path);
+
         $zip = new \ZipArchive();
         $archive = $zip->open($package);
-        $tmp = CACHE_DIR . DS . 'tmp/Grav-' . uniqid();
+        $tmp = CACHE_DIR . 'tmp/Grav-' . uniqid();
 
         if ($archive !== true) {
             self::$error = self::ZIP_OPEN_ERROR;
@@ -95,7 +100,11 @@ class Installer
 
 
         if (!$options['sophisticated']) {
-            self::nonSophisticatedInstall($zip, $install_path, $tmp);
+            if ($options['theme']) {
+                self::copyInstall($zip, $install_path, $tmp);
+            } else {
+                self::moveInstall($zip, $install_path, $tmp);
+            }
         } else {
             self::sophisticatedInstall($zip, $install_path, $tmp);
         }
@@ -103,15 +112,37 @@ class Installer
         Folder::delete($tmp);
         $zip->close();
 
+        // Post install checks
+        static::flightProcessing('post_install', $install_path);
+
         self::$error = self::OK;
 
         return true;
 
     }
 
-    public static function nonSophisticatedInstall(\ZipArchive $zip, $install_path, $tmp)
+    protected static function flightProcessing($state, $install_path)
     {
-        $container = $zip->getNameIndex(0); // TODO: better way of determining if zip has container folder
+        $blueprints_path = $install_path . DS . 'blueprints.yaml';
+
+        if (file_exists($blueprints_path)) {
+            $package_yaml = Yaml::parse(file_get_contents($blueprints_path));
+            if (isset($package_yaml['install'][$state]['create'])) {
+                foreach ((array) $package_yaml['install']['pre_install']['create'] as $file) {
+                    Folder::mkdir($install_path . '/' . ltrim($file, '/'));
+                }
+            }
+            if (isset($package_yaml['install'][$state]['remove'])) {
+                foreach ((array) $package_yaml['install']['pre_install']['remove'] as $file) {
+                    Folder::delete($install_path . '/' . ltrim($file, '/'));
+                }
+            }
+        }
+    }
+
+    public static function moveInstall(\ZipArchive $zip, $install_path, $tmp)
+    {
+        $container = $zip->getNameIndex(0);
         if (file_exists($install_path)) {
             Folder::delete($install_path);
         }
@@ -121,6 +152,19 @@ class Installer
         return true;
     }
 
+    public static function copyInstall(\ZipArchive $zip, $install_path, $tmp)
+    {
+        $firstDir = $zip->getNameIndex(0);
+        if (empty($firstDir)) {
+            throw new \RuntimeException("Directory $firstDir is missing");
+        } else {
+            $tmp = realpath($tmp . DS . $firstDir);
+            Folder::rcopy($tmp, $install_path);
+        }
+
+        return true;
+    }
+
     public static function sophisticatedInstall(\ZipArchive $zip, $install_path, $tmp)
     {
         for ($i = 0, $l = $zip->numFiles; $i < $l; $i++) {
@@ -156,11 +200,10 @@ class Installer
         return true;
     }
 
-
     /**
-     * Unnstalls one or more given package
+     * Uninstalls one or more given package
      *
-     * @param  string $package     The slug of the package(s)
+     * @param  string $path     The slug of the package(s)
      * @param  array  $options     Options to use for uninstalling
      *
      * @return boolean True if everything went fine, False otherwise.
@@ -287,4 +330,14 @@ class Installer
     {
         return self::$error;
     }
+
+    /**
+     * Allows to manually set an error
+     * @param $error the Error code
+     */
+
+    public static function setError($error)
+    {
+        self::$error = $error;
+    }
 }

system/src/Grav/Common/GPM/Local/AbstractPackageCollection.php

@@ -10,6 +10,7 @@ abstract class AbstractPackageCollection extends BaseCollection {
     public function __construct($items)
     {
         foreach ($items as $name => $data) {
+            $data->set('slug', $name);
             $this->items[$name] = new Package($data, $this->type);
         }
     }

system/src/Grav/Common/GPM/Local/Package.php

@@ -16,7 +16,7 @@ class Package extends BasePackage
         $this->settings = $package->toArray();
 
         $html_description = \Parsedown::instance()->line($this->description);
-        $this->data->set('slug', $this->name);
+        $this->data->set('slug', $package->slug);
         $this->data->set('description_html', $html_description);
         $this->data->set('description_plain', strip_tags($html_description));
         $this->data->set('symlink', is_link(USER_DIR . $package_type . DS . $this->name));

system/src/Grav/Common/GPM/Remote/Grav.php

@@ -27,7 +27,7 @@ class Grav extends AbstractPackageCollection
         $this->version = isset($this->data['version']) ? $this->data['version'] : '-';
         $this->date = isset($this->data['date']) ? $this->data['date'] : '-';
 
-        foreach ($this->data['assets'] as $slug => $data) {
+        if (isset($this->data['assets'])) foreach ($this->data['assets'] as $slug => $data) {
             $this->items[$slug] = new Package($data);
         }
     }
@@ -87,4 +87,9 @@ class Grav extends AbstractPackageCollection
     {
         return version_compare(GRAV_VERSION, $this->getVersion(), '<');
     }
+
+    public function isSymlink()
+    {
+        return is_link(GRAV_ROOT . DS . 'index.php');
+    }
 }

system/src/Grav/Common/GPM/Response.php

@@ -9,7 +9,7 @@ class Response
      */
     public static $callback = null;
 
-    /**
+     /**
      * Which method to use for HTTP calls, can be 'curl', 'fopen' or 'auto'. Auto is default and fopen is the preferred method
      * @var string
      */
@@ -160,6 +160,8 @@ class Response
     private static function getCurl()
     {
         $args     = func_get_args();
+        $args     = count($args) > 1 ? $args : array_shift($args);
+
         $uri      = $args[0];
         $options  = $args[1];
         $callback = $args[2];

system/src/Grav/Common/GPM/Upgrader.php

@@ -65,7 +65,7 @@ class Upgrader
      * Returns the changelog list for each version of Grav
      * @param string $diff the version number to start the diff from
      *
-     * @return array return the chagenlog list for each version
+     * @return array return the changelog list for each version
      */
     public function getChangelog($diff = null)
     {
@@ -80,4 +80,14 @@ class Upgrader
     {
         return version_compare($this->getLocalVersion(), $this->getRemoteVersion(), "<");
     }
+
+    /**
+     * Checks if Grav is currently symbolically linked
+     * @return boolean True if Grav is symlinked, False otherwise.
+     */
+
+    public function isSymlink()
+    {
+        return $this->remote->isSymlink();
+    }
 }

system/src/Grav/Common/Grav.php

@@ -1,13 +1,14 @@
 <?php
 namespace Grav\Common;
 
-use Grav\Common\Filesystem\Folder;
+use Grav\Common\Language\Language;
 use Grav\Common\Page\Medium\ImageMedium;
 use Grav\Common\Page\Pages;
 use Grav\Common\Service\ConfigServiceProvider;
 use Grav\Common\Service\ErrorServiceProvider;
 use Grav\Common\Service\LoggerServiceProvider;
 use Grav\Common\Service\StreamsServiceProvider;
+use Grav\Common\Twig\Twig;
 use RocketTheme\Toolbox\DI\Container;
 use RocketTheme\Toolbox\Event\Event;
 use RocketTheme\Toolbox\Event\EventDispatcher;
@@ -56,6 +57,8 @@ class Grav extends Container
 
         $container['grav'] = $container;
 
+
+
         $container['debugger'] = new Debugger();
         $container['debugger']->startTimer('_init', 'Initialize');
 
@@ -77,8 +80,11 @@ class Grav extends Container
         $container['cache'] = function ($c) {
             return new Cache($c);
         };
+        $container['session'] = function ($c) {
+            return new Session($c);
+        };
         $container['plugins'] = function ($c) {
-            return new Plugins($c);
+            return new Plugins();
         };
         $container['themes'] = function ($c) {
             return new Themes($c);
@@ -89,46 +95,52 @@ class Grav extends Container
         $container['taxonomy'] = function ($c) {
             return new Taxonomy($c);
         };
+        $container['language'] = function ($c) {
+            return new Language($c);
+        };
+
         $container['pages'] = function ($c) {
             return new Page\Pages($c);
         };
-        $container['assets'] = function ($c) {
-            return new Assets();
-        };
+
+        $container['assets'] = new Assets();
+
         $container['page'] = function ($c) {
             /** @var Pages $pages */
             $pages = $c['pages'];
+            /** @var Language $language */
+            $language = $c['language'];
 
             /** @var Uri $uri */
             $uri = $c['uri'];
 
-            $path = $uri->path();
+            $path = rtrim($uri->path(), '/');
+            $path = $path ?: '/';
 
             $page = $pages->dispatch($path);
 
-            if (!$page || !$page->routable()) {
-                $path_parts = pathinfo($path);
-                $page = $c['pages']->dispatch($path_parts['dirname'], true);
-                if ($page) {
-                    $media = $page->media()->all();
-
-                    $parsed_url = parse_url(urldecode($uri->basename()));
-
-                    $media_file = $parsed_url['path'];
-
-                    // if this is a media object, try actions first
-                    if (isset($media[$media_file])) {
-                        $medium = $media[$media_file];
-                        foreach ($uri->query(null, true) as $action => $params) {
-                            if (in_array($action, ImageMedium::$magic_actions)) {
-                                call_user_func_array(array(&$medium, $action), explode(',', $params));
-                            }
-                        }
-                        Utils::download($medium->path(), false);
-                    } else {
-                        Utils::download($page->path() . DIRECTORY_SEPARATOR . $uri->basename(), true);
+            // Redirection tests
+            if ($page) {
+                // Language-specific redirection scenarios
+                if ($language->enabled()) {
+                    if ($language->isLanguageInUrl() && !$language->isIncludeDefaultLanguage()) {
+                        $c->redirect($page->route());
+                    }
+                    if (!$language->isLanguageInUrl() && $language->isIncludeDefaultLanguage()) {
+                        $c->redirectLangSafe($page->route());
                     }
                 }
+                // Default route test and redirect
+                if ($c['config']->get('system.pages.redirect_default_route') && $page->route() != $path) {
+                    $c->redirectLangSafe($page->route());
+                }
+            }
+
+            // if page is not found, try some fallback stuff
+            if (!$page || !$page->routable()) {
+
+                // Try fallback URL stuff...
+                $c->fallbackUrl($page, $path);
 
                 // If no page found, fire event
                 $event = $c->fireEvent('onPageNotFound');
@@ -161,6 +173,8 @@ class Grav extends Container
         $container->register(new StreamsServiceProvider);
         $container->register(new ConfigServiceProvider);
 
+        $container['inflector'] = new Inflector();
+
         $container['debugger']->stopTimer('_init');
 
         return $container;
@@ -168,29 +182,40 @@ class Grav extends Container
 
     public function process()
     {
+        /** @var Debugger $debugger */
+        $debugger = $this['debugger'];
+
+
+
+        // Initialize configuration.
+        $debugger->startTimer('_config', 'Configuration');
+        $this['config']->init();
+        $this['errors']->resetHandlers();
+        $this['uri']->init();
+        $this['session']->init();
+
+        $debugger->init();
+        $this['config']->debug();
+        $debugger->stopTimer('_config');
+
         // Use output buffering to prevent headers from being sent too early.
         ob_start();
         if ($this['config']->get('system.cache.gzip')) {
             ob_start('ob_gzhandler');
         }
 
-        /** @var Debugger $debugger */
-        $debugger = $this['debugger'];
-
-        // Initialize configuration.
-        $debugger->startTimer('_config', 'Configuration');
-        $this['config']->init();
-        $this['uri']->init();
-        $this['errors']->resetHandlers();
-        $debugger->init();
-        $this['config']->debug();
-        $debugger->stopTimer('_config');
-
         // Initialize the timezone
         if ($this['config']->get('system.timezone')) {
             date_default_timezone_set($this['config']->get('system.timezone'));
         }
 
+        // Initialize Locale if set and configured
+        if ($this['language']->enabled() && $this['config']->get('system.languages.override_locale')) {
+            setlocale(LC_ALL, $this['language']->getLanguage());
+        } elseif ($this['config']->get('system.default_locale')) {
+            setlocale(LC_ALL, $this['config']->get('system.default_locale'));
+        }
+
         $debugger->startTimer('streams', 'Streams');
         $this['streams'];
         $debugger->stopTimer('streams');
@@ -221,7 +246,6 @@ class Grav extends Container
         $this['pages']->init();
         $this->fireEvent('onPagesInitialized');
         $debugger->stopTimer('pages');
-
         $this->fireEvent('onPageInitialized');
 
         $debugger->addAssets();
@@ -248,16 +272,28 @@ class Grav extends Container
      * @param string $route Internal route.
      * @param int $code Redirection code (30x)
      */
-    public function redirect($route, $code = 303)
+    public function redirect($route, $code = null)
     {
         /** @var Uri $uri */
         $uri = $this['uri'];
 
+        //Check for code in route
+        $regex = '/.*(\[(30[1-7])\])$/';
+        preg_match($regex, $route, $matches);
+        if ($matches) {
+            $route = str_replace($matches[1], '', $matches[0]);
+            $code = $matches[2];
+        }
+
+        if ($code == null) {
+            $code = $this['config']->get('system.pages.redirect_default_code', 301);
+        }
+
         if (isset($this['session'])) {
             $this['session']->close();
         }
 
-        if ($this['uri']->isExternal($route)) {
+        if ($uri->isExternal($route)) {
             $url = $route;
         } else {
             $url = rtrim($uri->rootUrl(), '/') .'/'. trim($route, '/');
@@ -267,6 +303,24 @@ class Grav extends Container
         exit();
     }
 
+    /**
+     * Redirect browser to another location taking language into account (preferred)
+     *
+     * @param string $route Internal route.
+     * @param int $code Redirection code (30x)
+     */
+    public function redirectLangSafe($route, $code = null)
+    {
+        /** @var Language $language */
+        $language = $this['language'];
+
+        if (!$this['uri']->isExternal($route) && $language->enabled() && $language->isIncludeDefaultLanguage()) {
+            return $this->redirect($language->getLanguage() . $route, $code);
+        } else {
+            return $this->redirect($route, $code);
+        }
+    }
+
     /**
      * Returns mime type for the file format.
      *
@@ -307,16 +361,20 @@ class Grav extends Container
 
         if ($expires > 0) {
             $expires_date = gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT';
-            header('Cache-Control: max-age=' . $expires_date);
+            header('Cache-Control: max-age=' . $expires);
             header('Expires: '. $expires_date);
         }
 
         // Set the last modified time
-        $last_modified_date = gmdate('D, d M Y H:i:s', $page->modified()) . ' GMT';
-        header('Last-Modified: ' . $last_modified_date);
+        if ($page->lastModified()) {
+            $last_modified_date = gmdate('D, d M Y H:i:s', $page->modified()) . ' GMT';
+            header('Last-Modified: ' . $last_modified_date);
+        }
 
         // Calculate a Hash based on the raw file
-        header('ETag: ' . md5($page->raw().$page->modified()));
+        if ($page->eTag()) {
+            header('ETag: ' . md5($page->raw() . $page->modified()));
+        }
 
         // Set debugger data in headers
         if (!($extension === null || $extension == 'html')) {
@@ -327,6 +385,11 @@ class Grav extends Container
         if (isset($this['page']->header()->http_response_code)) {
             http_response_code($this['page']->header()->http_response_code);
         }
+
+        // Vary: Accept-Encoding
+        if ($this['config']->get('system.pages.vary_accept_encoding', false)) {
+            header('Vary: Accept-Encoding');
+        }
     }
 
     /**
@@ -350,26 +413,31 @@ class Grav extends Container
     public function shutdown()
     {
         if ($this['config']->get('system.debugger.shutdown.close_connection')) {
-
+            //stop user abort
             if (function_exists('ignore_user_abort')) {
                 @ignore_user_abort(true);
             }
 
+            // close the session
             if (isset($this['session'])) {
                 $this['session']->close();
             }
 
+            // flush buffer if gzip buffer was started
             if ($this['config']->get('system.cache.gzip')) {
                 ob_end_flush(); // gzhandler buffer
             }
 
+            // get lengh and close the connection
             header('Content-Length: ' . ob_get_length());
-            header("Connection: close\r\n");
+            header("Connection: close");
 
-            ob_end_flush(); // regular buffer
+            // flush the regular buffer
+            ob_end_flush();
             @ob_flush();
             flush();
 
+            // fix for fastcgi close connection issue
             if (function_exists('fastcgi_finish_request')) {
                 @fastcgi_finish_request();
             }
@@ -378,4 +446,65 @@ class Grav extends Container
 
         $this->fireEvent('onShutdown');
     }
+
+    /**
+     * This attempts to find media, other files, and download them
+     * @param $page
+     * @param $path
+     */
+    protected function fallbackUrl($page, $path)
+    {
+        /** @var Uri $uri */
+        $uri = $this['uri'];
+
+        /** @var Config $config */
+        $config = $this['config'];
+
+        $uri_extension = $uri->extension();
+
+        // Only allow whitelisted types to fallback
+        if (!in_array($uri_extension, $config->get('system.pages.fallback_types'))) {
+            return;
+        }
+
+        $path_parts = pathinfo($path);
+        $page = $this['pages']->dispatch($path_parts['dirname'], true);
+        if ($page) {
+            $media = $page->media()->all();
+
+            $parsed_url = parse_url(urldecode($uri->basename()));
+
+            $media_file = $parsed_url['path'];
+
+            // if this is a media object, try actions first
+            if (isset($media[$media_file])) {
+                $medium = $media[$media_file];
+                foreach ($uri->query(null, true) as $action => $params) {
+                    if (in_array($action, ImageMedium::$magic_actions)) {
+                        call_user_func_array(array(&$medium, $action), explode(',', $params));
+                    }
+                }
+                Utils::download($medium->path(), false);
+            }
+
+            // unsupported media type, try to download it...
+            if ($uri_extension) {
+                $extension = $uri_extension;
+            } else {
+                if (isset($path_parts['extension'])) {
+                    $extension = $path_parts['extension'];
+                } else {
+                    $extension = null;
+                }
+            }
+
+            if ($extension) {
+                $download = true;
+                if (in_array(ltrim($extension, '.'), $config->get('system.media.unsupported_inline_types', []))) {
+                    $download = false;
+                }
+                Utils::download($page->path() . DIRECTORY_SEPARATOR . $uri->basename(), $download);
+            }
+        }
+    }
 }

system/src/Grav/Common/Helpers/Truncator.php

@@ -0,0 +1,194 @@
+<?php
+namespace Grav\Common\Helpers;
+
+use DOMDocument;
+
+/**
+ * This file is part of urodoz/truncateHTML.
+ *
+ * (c) Albert Lacarta <urodoz@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class Truncator {
+
+    public static $default_options = array(
+        'ellipsis' => '…',
+        'break' => ' ',
+        'length_in_chars' => false,
+        'word_safe' => false,
+    );
+
+    // These tags are allowed to have an ellipsis inside
+    public static $ellipsable_tags = array(
+        'p', 'ol', 'ul', 'li',
+        'div', 'header', 'article', 'nav',
+        'section', 'footer', 'aside',
+        'dd', 'dt', 'dl',
+    );
+
+    public static $self_closing_tags = array(
+        'br', 'hr', 'img',
+    );
+
+    /**
+     * Truncate given HTML string to specified length.
+     * If length_in_chars is false it's trimmed by number
+     * of words, otherwise by number of characters.
+     *
+     * @param  string        $html
+     * @param  integer       $length
+     * @param  string|array  $opts
+     * @return string
+     */
+    public static function truncate($html, $length, $opts=array())
+    {
+        if (is_string($opts)) $opts = array('ellipsis' => $opts);
+        $opts = array_merge(static::$default_options, $opts);
+        // wrap the html in case it consists of adjacent nodes like <p>foo</p><p>bar</p>
+        $html = mb_convert_encoding("<div>".$html."</div>", 'HTML-ENTITIES', 'UTF-8');
+
+        $root_node = null;
+        // Parse using HTML5Lib if it's available.
+        if (class_exists('HTML5Lib\\Parser')) {
+            try {
+                $doc = \HTML5Lib\Parser::parse($html);
+                $root_node = $doc->documentElement->lastChild->lastChild;
+            }
+            catch (\Exception $e) {
+                ;
+            }
+        }
+        if ($root_node === null) {
+            // HTML5Lib not available so we'll have to use DOMDocument
+            // We'll only be able to parse HTML5 if it's valid XML
+            $doc = new DOMDocument('4.01', 'utf-8');
+            $doc->formatOutput = false;
+            $doc->preserveWhiteSpace = true;
+            // loadHTML will fail with HTML5 tags (article, nav, etc)
+            // so we need to suppress errors and if it fails to parse we
+            // retry with the XML parser instead
+            $prev_use_errors = libxml_use_internal_errors(true);
+            if ($doc->loadHTML($html)) {
+                $root_node = $doc->documentElement->lastChild->lastChild;
+            }
+            else if ($doc->loadXML($html)) {
+                $root_node = $doc->documentElement;
+            }
+            else {
+                libxml_use_internal_errors($prev_use_errors);
+                throw new \RuntimeException;
+            }
+            libxml_use_internal_errors($prev_use_errors);
+        }
+        list($text, $_, $opts) = static::truncateNode($doc, $root_node, $length, $opts);
+
+        $text = mb_substr(mb_substr($text, 0, -6), 5);
+
+        return $text;
+    }
+
+    protected static function truncateNode($doc, $node, $length, $opts)
+    {
+        if ($length === 0 && !static::ellipsable($node)) {
+            return array('', 1, $opts);
+        }
+        list($inner, $remaining, $opts) = static::innerTruncate($doc, $node, $length, $opts);
+        if (0 === mb_strlen($inner)) {
+            return array(in_array(mb_strtolower($node->nodeName), static::$self_closing_tags) ? $doc->saveXML($node) : "", $length - $remaining, $opts);
+        }
+        while($node->firstChild) {
+            $node->removeChild($node->firstChild);
+        }
+        $newNode = $doc->createDocumentFragment();
+        // handle the ampersand
+        $newNode->appendXml(static::xmlEscape($inner));
+        $node->appendChild($newNode);
+        return array($doc->saveXML($node), $length - $remaining, $opts);
+    }
+
+    protected static function innerTruncate($doc, $node, $length, $opts)
+    {
+        $inner = '';
+        $remaining = $length;
+        foreach($node->childNodes as $childNode) {
+            if ($childNode->nodeType === XML_ELEMENT_NODE) {
+                list($txt, $nb, $opts) = static::truncateNode($doc, $childNode, $remaining, $opts);
+            }
+            else if ($childNode->nodeType === XML_TEXT_NODE) {
+                list($txt, $nb, $opts) = static::truncateText($doc, $childNode, $remaining, $opts);
+            } else {
+                $txt = '';
+                $nb  = 0;
+            }
+
+            // unhandle the ampersand
+            $txt = static::xmlUnescape($txt);
+
+            $remaining -= $nb;
+            $inner .= $txt;
+            if ($remaining < 0) {
+                if (static::ellipsable($node)) {
+                    $inner = preg_replace('/(?:[\s\pP]+|(?:&(?:[a-z]+|#[0-9]+);?))*$/', '', $inner).$opts['ellipsis'];
+                    $opts['ellipsis'] = '';
+                    $opts['was_truncated'] = true;
+                }
+                break;
+            }
+        }
+        return array($inner, $remaining, $opts);
+    }
+
+    protected static function truncateText($doc, $node, $length, $opts)
+    {
+        $string = $node->textContent;
+
+        if ($opts['length_in_chars']) {
+            $count = mb_strlen($string);
+            if ($count <= $length && $length > 0) {
+                return array($string, $count, $opts);
+            }
+            if ($opts['word_safe']) {
+                if (false !== ($breakpoint = mb_strpos($string, $opts['break'], $length))) {
+                    if ($breakpoint < mb_strlen($string) - 1) {
+                        $string = mb_substr($string, 0, $breakpoint) . $opts['break'];
+                    }
+                }
+                return array($string, $count, $opts);
+            }
+            return array(mb_substr($node->textContent, 0, $length), $count, $opts);
+        }
+        else {
+            preg_match_all('/\s*\S+/', $string, $words);
+            $words = $words[0];
+            $count = count($words);
+            if ($count <= $length && $length > 0) {
+                return array($xhtml, $count, $opts);
+            }
+            return array(implode('', array_slice($words, 0, $length)), $count, $opts);
+        }
+    }
+
+    protected static function ellipsable($node)
+    {
+        return ($node instanceof DOMDocument)
+        || in_array(mb_strtolower($node->nodeName), static::$ellipsable_tags)
+            ;
+    }
+
+    protected static function xmlEscape($string)
+    {
+        $string = str_replace('&', '&amp;', $string);
+        $string = str_replace('<?', '&lt;?', $string);
+        return $string;
+    }
+
+    protected static function xmlUnescape($string)
+    {
+        $string = str_replace('&amp;', '&', $string);
+        $string = str_replace('&lt;?', '<?', $string);
+        return $string;
+    }
+}

system/src/Grav/Common/Inflector.php

@@ -4,6 +4,7 @@ namespace Grav\Common;
 /**
 * This file was originally part of the Akelos Framework
 */
+use Grav\Common\Language\Language;
 
 /**
 * Inflector for pluralize and singularize English nouns.
@@ -20,65 +21,55 @@ namespace Grav\Common;
 
 class Inflector
 {
+    use GravTrait;
+
+    protected $plural;
+    protected $singular;
+    protected $uncountable;
+    protected $irregular;
+    protected $ordinals;
+
+    public function init()
+    {
+        if (empty($this->plural)) {
+            $language = self::getGrav()['language'];
+            $this->plural = $language->translate('INFLECTOR_PLURALS', null, true);
+            $this->singular = $language->translate('INFLECTOR_SINGULAR', null, true);
+            $this->uncountable = $language->translate('INFLECTOR_UNCOUNTABLE', null, true);
+            $this->irregular = $language->translate('INFLECTOR_IRREGULAR', null, true);
+            $this->ordinals = $language->translate('INFLECTOR_ORDINALS', null, true);
+        }
+    }
 
     /**
     * Pluralizes English nouns.
     *
-    * @access static public
-    * @static
     * @param    string    $word    English noun to pluralize
     * @return string Plural noun
     */
-    public static function pluralize($word, $count = 2)
+    public function pluralize($word, $count = 2)
     {
+        $this->init();
+
         if ($count == 1) {
             return $word;
         }
 
-        $plural = array(
-            '/(quiz)$/i' => '\1zes',
-            '/^(ox)$/i' => '\1en',
-            '/([m|l])ouse$/i' => '\1ice',
-            '/(matr|vert|ind)ix|ex$/i' => '\1ices',
-            '/(x|ch|ss|sh)$/i' => '\1es',
-            '/([^aeiouy]|qu)ies$/i' => '\1y',
-            '/([^aeiouy]|qu)y$/i' => '\1ies',
-            '/(hive)$/i' => '\1s',
-            '/(?:([^f])fe|([lr])f)$/i' => '\1\2ves',
-            '/sis$/i' => 'ses',
-            '/([ti])um$/i' => '\1a',
-            '/(buffal|tomat)o$/i' => '\1oes',
-            '/(bu)s$/i' => '\1ses',
-            '/(alias|status)/i'=> '\1es',
-            '/(octop|vir)us$/i'=> '\1i',
-            '/(ax|test)is$/i'=> '\1es',
-            '/s$/i'=> 's',
-            '/$/'=> 's');
-
-        $uncountable = array('equipment', 'information', 'rice', 'money', 'species', 'series', 'fish', 'sheep');
-
-        $irregular = array(
-            'person' => 'people',
-            'man' => 'men',
-            'child' => 'children',
-            'sex' => 'sexes',
-            'move' => 'moves');
-
         $lowercased_word = strtolower($word);
 
-        foreach ($uncountable as $_uncountable) {
+        foreach ($this->uncountable as $_uncountable) {
             if (substr($lowercased_word, (-1*strlen($_uncountable))) == $_uncountable) {
                 return $word;
             }
         }
 
-        foreach ($irregular as $_plural => $_singular) {
+        foreach ($this->irregular as $_plural => $_singular) {
             if (preg_match('/('.$_plural.')$/i', $word, $arr)) {
                 return preg_replace('/('.$_plural.')$/i', substr($arr[0], 0, 1).substr($_singular, 1), $word);
             }
         }
 
-        foreach ($plural as $rule => $replacement) {
+        foreach ($this->plural as $rule => $replacement) {
             if (preg_match($rule, $word)) {
                 return preg_replace($rule, $replacement, $word);
             }
@@ -94,62 +85,28 @@ class Inflector
     * @param    int       $count
     * @return string Singular noun.
     */
-    public static function singularize($word, $count = 1)
+    public function singularize($word, $count = 1)
     {
+        $this->init();
+
         if ($count != 1) {
             return $word;
         }
 
-        $singular = array (
-            '/(quiz)zes$/i' => '\1',
-            '/(matr)ices$/i' => '\1ix',
-            '/(vert|ind)ices$/i' => '\1ex',
-            '/^(ox)en/i' => '\1',
-            '/(alias|status)es$/i' => '\1',
-            '/([octop|vir])i$/i' => '\1us',
-            '/(cris|ax|test)es$/i' => '\1is',
-            '/(shoe)s$/i' => '\1',
-            '/(o)es$/i' => '\1',
-            '/(bus)es$/i' => '\1',
-            '/([m|l])ice$/i' => '\1ouse',
-            '/(x|ch|ss|sh)es$/i' => '\1',
-            '/(m)ovies$/i' => '\1ovie',
-            '/(s)eries$/i' => '\1eries',
-            '/([^aeiouy]|qu)ies$/i' => '\1y',
-            '/([lr])ves$/i' => '\1f',
-            '/(tive)s$/i' => '\1',
-            '/(hive)s$/i' => '\1',
-            '/([^f])ves$/i' => '\1fe',
-            '/(^analy)ses$/i' => '\1sis',
-            '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
-            '/([ti])a$/i' => '\1um',
-            '/(n)ews$/i' => '\1ews',
-            '/s$/i' => '',
-            );
-
-        $uncountable = array('equipment', 'information', 'rice', 'money', 'species', 'series', 'fish', 'sheep');
-
-        $irregular = array(
-            'person' => 'people',
-            'man' => 'men',
-            'child' => 'children',
-            'sex' => 'sexes',
-            'move' => 'moves');
-
         $lowercased_word = strtolower($word);
-        foreach ($uncountable as $_uncountable) {
+        foreach ($this->uncountable as $_uncountable) {
             if (substr($lowercased_word, (-1*strlen($_uncountable))) == $_uncountable) {
                 return $word;
             }
         }
 
-        foreach ($irregular as $_plural => $_singular) {
+        foreach ($this->irregular as $_plural => $_singular) {
             if (preg_match('/('.$_singular.')$/i', $word, $arr)) {
                 return preg_replace('/('.$_singular.')$/i', substr($arr[0], 0, 1).substr($_plural, 1), $word);
             }
         }
 
-        foreach ($singular as $rule => $replacement) {
+        foreach ($this->singular as $rule => $replacement) {
             if (preg_match($rule, $word)) {
                 return preg_replace($rule, $replacement, $word);
             }
@@ -162,24 +119,22 @@ class Inflector
     * Converts an underscored or CamelCase word into a English
     * sentence.
     *
-    * The titleize static public function converts text like "WelcomePage",
+    * The titleize public function converts text like "WelcomePage",
     * "welcome_page" or  "welcome page" to this "Welcome
     * Page".
     * If second parameter is set to 'first' it will only
     * capitalize the first character of the title.
     *
-    * @access static public
-    * @static
     * @param    string    $word    Word to format as tile
     * @param    string    $uppercase    If set to 'first' it will only uppercase the
     * first character. Otherwise it will uppercase all
     * the words in the title.
     * @return string Text formatted as title
     */
-    public static function titleize($word, $uppercase = '')
+    public function titleize($word, $uppercase = '')
     {
         $uppercase = $uppercase == 'first' ? 'ucfirst' : 'ucwords';
-        return $uppercase(static::humanize(static::underscorize($word)));
+        return $uppercase($this->humanize($this->underscorize($word)));
     }
 
     /**
@@ -189,13 +144,11 @@ class Inflector
     * will remove non alphanumeric character from the word, so
     * "who's online" will be converted to "WhoSOnline"
     *
-    * @access static public
-    * @static
     * @see variablize
     * @param    string    $word    Word to convert to camel case
     * @return string UpperCamelCasedWord
     */
-    public static function camelize($word)
+    public function camelize($word)
     {
         return str_replace(' ', '', ucwords(preg_replace('/[^A-Z^a-z^0-9]+/', ' ', $word)));
     }
@@ -208,12 +161,10 @@ class Inflector
     *
     * This can be really useful for creating friendly URLs.
     *
-    * @access static public
-    * @static
     * @param    string    $word    Word to underscore
     * @return string Underscored word
     */
-    public static function underscorize($word)
+    public function underscorize($word)
     {
         $regex1 = preg_replace('/([A-Z]+)([A-Z][a-z])/', '\1_\2', $word);
         $regex2 = preg_replace('/([a-zd])([A-Z])/', '\1_\2', $regex1);
@@ -229,12 +180,10 @@ class Inflector
     *
     * This can be really useful for creating friendly URLs.
     *
-    * @access static public
-    * @static
     * @param    string    $word    Word to hyphenate
     * @return string hyphenized word
     */
-    public static function hyphenize($word)
+    public function hyphenize($word)
     {
         $regex1 = preg_replace('/([A-Z]+)([A-Z][a-z])/', '\1-\2', $word);
         $regex2 = preg_replace('/([a-zd])([A-Z])/', '\1-\2', $regex1);
@@ -252,14 +201,12 @@ class Inflector
     * If you need to uppercase all the words you just have to
     * pass 'all' as a second parameter.
     *
-    * @access static public
-    * @static
     * @param    string    $word    String to "humanize"
     * @param    string    $uppercase    If set to 'all' it will uppercase all the words
     * instead of just the first one.
     * @return string Human-readable word
     */
-    public static function humanize($word, $uppercase = '')
+    public function humanize($word, $uppercase = '')
     {
         $uppercase = $uppercase == 'all' ? 'ucwords' : 'ucfirst';
         return $uppercase(str_replace('_', ' ', preg_replace('/_id$/', '', $word)));
@@ -272,15 +219,13 @@ class Inflector
     * will remove non alphanumeric character from the word, so
     * "who's online" will be converted to "whoSOnline"
     *
-    * @access static public
-    * @static
     * @see camelize
     * @param    string    $word    Word to lowerCamelCase
     * @return string Returns a lowerCamelCasedWord
     */
-    public static function variablize($word)
+    public function variablize($word)
     {
-        $word = static::camelize($word);
+        $word = $this->camelize($word);
         return strtolower($word[0]).substr($word, 1);
     }
 
@@ -290,15 +235,13 @@ class Inflector
     *
     * Converts "Person" to "people"
     *
-    * @access static public
-    * @static
     * @see classify
     * @param    string    $class_name    Class name for getting related table_name.
     * @return string plural_table_name
     */
-    public static function tableize($class_name)
+    public function tableize($class_name)
     {
-        return static::pluralize(static::underscore($class_name));
+        return $this->pluralize($this->underscore($class_name));
     }
 
     /**
@@ -307,15 +250,13 @@ class Inflector
     *
     * Converts "people" to "Person"
     *
-    * @access static public
-    * @static
     * @see tableize
     * @param    string    $table_name    Table name for getting related ClassName.
     * @return string SingularClassName
     */
-    public static function classify($table_name)
+    public function classify($table_name)
     {
-        return static::camelize(static::singularize($table_name));
+        return $this->camelize($this->singularize($table_name));
     }
 
     /**
@@ -323,34 +264,34 @@ class Inflector
     *
     * This method converts 13 to 13th, 2 to 2nd ...
     *
-    * @access static public
-    * @static
     * @param    integer    $number    Number to get its ordinal value
     * @return string Ordinal representation of given string.
     */
-    public static function ordinalize($number)
+    public function ordinalize($number)
     {
+        $this->init();
+        
         if (in_array(($number % 100), range(11, 13))) {
-            return $number.'th';
+            return $number.$this->ordinals['default'];
         } else {
             switch (($number % 10)) {
                 case 1:
-                    return $number.'st';
+                    return $number.$this->ordinals['first'];
                     break;
                 case 2:
-                    return $number.'nd';
+                    return $number.$this->ordinals['second'];
                     break;
                 case 3:
-                    return $number.'rd';
+                    return $number.$this->ordinals['third'];
                     break;
                 default:
-                    return $number.'th';
+                    return $number.$this->ordinals['default'];
                     break;
             }
         }
     }
 
-    public static function monthize($days)
+    public function monthize($days)
     {
         $now = new \DateTime();
         $end = new \DateTime();

system/src/Grav/Common/Iterator.php

@@ -49,7 +49,6 @@ class Iterator implements \ArrayAccess, \Iterator, \Countable, \Serializable
      * Convents iterator to a comma separated list.
      *
      * @return string
-     * @todo Add support to nested sets.
      */
     public function __toString()
     {

system/src/Grav/Common/Language/Language.php

@@ -0,0 +1,467 @@
+<?php
+namespace Grav\Common\Language;
+
+use Grav\Common\Grav;
+
+/**
+ * Language and translation functionality for Grav
+ */
+class Language
+{
+    protected $grav;
+    protected $enabled = true;
+    protected $languages = [];
+    protected $page_extensions = [];
+    protected $fallback_languages = [];
+    protected $default;
+    protected $active = null;
+    protected $config;
+    protected $http_accept_language;
+    protected $lang_in_url = false;
+
+    /**
+     * Constructor
+     *
+     * @param \Grav\Common\Grav $grav
+     */
+    public function __construct(Grav $grav)
+    {
+        $this->grav = $grav;
+        $this->config = $grav['config'];
+        $this->languages = $this->config->get('system.languages.supported', []);
+        $this->init();
+    }
+
+    /**
+     * Initialize the default and enabled languages
+     */
+    public function init()
+    {
+        $this->default = reset($this->languages);
+
+        if (empty($this->languages)) {
+            $this->enabled = false;
+        }
+    }
+
+    /**
+     * Ensure that languages are enabled
+     *
+     * @return bool
+     */
+    public function enabled()
+    {
+        return $this->enabled;
+    }
+
+    /**
+     * Gets the array of supported languages
+     *
+     * @return array
+     */
+    public function getLanguages()
+    {
+        return $this->languages;
+    }
+
+    /**
+     * Sets the current supported languages manually
+     *
+     * @param $langs
+     */
+    public function setLanguages($langs)
+    {
+        $this->languages = $langs;
+        $this->init();
+    }
+
+    /**
+     * Gets a pipe-separated string of available languages
+     *
+     * @return string
+     */
+    public function getAvailable()
+    {
+        $languagesArray = $this->languages; //Make local copy
+        sort($languagesArray);
+        return implode('|', array_reverse($languagesArray));
+    }
+
+    /**
+     * Gets language, active if set, else default
+     *
+     * @return mixed
+     */
+    public function getLanguage()
+    {
+        return $this->active ? $this->active : $this->default;
+    }
+
+    /**
+     * Gets current default language
+     *
+     * @return mixed
+     */
+    public function getDefault()
+    {
+        return $this->default;
+    }
+
+    /**
+     * Sets default language manually
+     *
+     * @param $lang
+     *
+     * @return bool
+     */
+    public function setDefault($lang)
+    {
+        if ($this->validate($lang)) {
+            $this->default = $lang;
+
+            return $lang;
+        }
+
+        return false;
+    }
+
+    /**
+     * Gets current active language
+     *
+     * @return mixed
+     */
+    public function getActive()
+    {
+        return $this->active;
+    }
+
+    /**
+     * Sets active language manually
+     *
+     * @param $lang
+     *
+     * @return bool
+     */
+    public function setActive($lang)
+    {
+        if ($this->validate($lang)) {
+            $this->active = $lang;
+
+            return $lang;
+        }
+
+        return false;
+    }
+
+    /**
+     * Sets the active language based on the first part of the URL
+     *
+     * @param $uri
+     *
+     * @return mixed
+     */
+    public function setActiveFromUri($uri)
+    {
+        $regex = '/(^\/(' . $this->getAvailable() . '))(?:\/.*|$)/i';
+
+        // if languages set
+        if ($this->enabled()) {
+            // try setting from prefix of URL (/en/blah/blah)
+            if (preg_match($regex, $uri, $matches)) {
+                $this->lang_in_url = true;
+                $this->active = $matches[2];
+                $uri = preg_replace("/\\" . $matches[1] . "/", '', $matches[0], 1);
+
+                // store in session if different
+                if ($this->config->get('system.session.enabled', false)
+                    && $this->config->get('system.languages.session_store_active', true)
+                    && $this->grav['session']->active_language != $this->active
+                ) {
+                    $this->grav['session']->active_language = $this->active;
+                }
+            } else {
+                // try getting from session, else no active
+                if ($this->config->get('system.session.enabled', false) &&
+                    $this->config->get('system.languages.session_store_active', true)) {
+                    $this->active = $this->grav['session']->active_language ?: null;
+                }
+                // if still null, try from http_accept_language header
+                if ($this->active === null && $this->config->get('system.languages.http_accept_language')) {
+                    $preferred = $this->getBrowserLanguages();
+                    foreach ($preferred as $lang) {
+                        if ($this->validate($lang)) {
+                            $this->active = $lang;
+                            break;
+                        }
+                    }
+
+                }
+            }
+        }
+
+        return $uri;
+    }
+
+    /**
+     * Get's a URL prefix based on configuration
+     *
+     * @param null $lang
+     * @return string
+     */
+    public function getLanguageURLPrefix($lang = null)
+    {
+        // if active lang is not passed in, use current active
+        if (!$lang) {
+            $lang = $this->getLanguage();
+        }
+
+        return $this->isIncludeDefaultLanguage($lang) ? '/' . $lang : '';
+    }
+
+    /**
+     * Test to see if language is default and language should be included in the URL
+     *
+     * @param null $lang
+     * @return bool
+     */
+    public function isIncludeDefaultLanguage($lang = null)
+    {
+        // if active lang is not passed in, use current active
+        if (!$lang) {
+            $lang = $this->getLanguage();
+        }
+
+        if ($this->default == $lang && $this->config->get('system.languages.include_default_lang') === false) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * Simple getter to tell if a language was found in the URL
+     *
+     * @return bool
+     */
+    public function isLanguageInUrl()
+    {
+        return (bool) $this->lang_in_url;
+    }
+
+
+    /**
+     * Gets an array of valid extensions with active first, then fallback extensions
+     *
+     * @return array
+     */
+    public function getFallbackPageExtensions($file_ext = null)
+    {
+        if (empty($this->page_extensions)) {
+            if (empty($file_ext)) {
+                $file_ext = CONTENT_EXT;
+            }
+
+            if ($this->enabled()) {
+                $valid_lang_extensions = [];
+                foreach ($this->languages as $lang) {
+                    $valid_lang_extensions[] = '.' . $lang . $file_ext;
+                }
+
+                if ($this->active) {
+                    $active_extension = '.' . $this->active . $file_ext;
+                    $key = array_search($active_extension, $valid_lang_extensions);
+                    unset($valid_lang_extensions[$key]);
+                    array_unshift($valid_lang_extensions, $active_extension);
+                }
+
+                $this->page_extensions = array_merge($valid_lang_extensions, (array)$file_ext);
+            } else {
+                $this->page_extensions = (array)$file_ext;
+            }
+        }
+
+        return $this->page_extensions;
+    }
+
+    /**
+     * Gets an array of languages with active first, then fallback languages
+     *
+     * @return array
+     */
+    public function getFallbackLanguages()
+    {
+        if (empty($this->fallback_languages)) {
+            if ($this->enabled()) {
+                $fallback_languages = $this->languages;
+
+                if ($this->active) {
+                    $active_extension = $this->active;
+                    $key = array_search($active_extension, $fallback_languages);
+                    unset($fallback_languages[$key]);
+                    array_unshift($fallback_languages, $active_extension);
+                }
+                $this->fallback_languages = $fallback_languages;
+            }
+            // always add english in case a translation doesn't exist
+            $this->fallback_languages[] = 'en';
+        }
+
+        return $this->fallback_languages;
+    }
+
+    /**
+     * Ensures the language is valid and supported
+     *
+     * @param $lang
+     *
+     * @return bool
+     */
+    public function validate($lang)
+    {
+        if (in_array($lang, $this->languages)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Translate a key and possibly arguments into a string using current lang and fallbacks
+     *
+     * @param       $args       first argument is the lookup key value
+     *                          other arguments can be passed and replaced in the translation with sprintf syntax
+     * @param Array $languages
+     * @param bool  $array_support
+     * @param bool  $html_out
+     *
+     * @return string
+     */
+    public function translate($args, Array $languages = null, $array_support = false, $html_out = false)
+    {
+        if (is_array($args)) {
+            $lookup = array_shift($args);
+        } else {
+            $lookup = $args;
+            $args = [];
+        }
+
+
+        if ($this->config->get('system.languages.translations', true)) {
+            if ($this->enabled() && $lookup) {
+                if (empty($languages)) {
+                    if ($this->config->get('system.languages.translations_fallback', true)) {
+                        $languages = $this->getFallbackLanguages();
+                    } else {
+                        $languages = (array)$this->getDefault();
+                    }
+                }
+            } else {
+                $languages = ['en'];
+            }
+
+            foreach ((array)$languages as $lang) {
+                $translation = $this->getTranslation($lang, $lookup, $array_support);
+
+                if ($translation) {
+                    if (count($args) >= 1) {
+                        return vsprintf($translation, $args);
+                    } else {
+                        return $translation;
+                    }
+                }
+            }
+        }
+
+        if ($html_out) {
+            return '<span class="untranslated">' . $lookup . '</span>';
+        } else {
+            return $lookup;
+        }
+    }
+
+    /**
+     * Translate Array
+     *
+     * @param      $key
+     * @param      $index
+     * @param null $languages
+     * @param bool $html_out
+     *
+     * @return string
+     */
+    public function translateArray($key, $index, $languages = null, $html_out = false)
+    {
+        if ($this->config->get('system.languages.translations', true)) {
+            if ($this->enabled() && $key) {
+                if (empty($languages)) {
+                    if ($this->config->get('system.languages.translations_fallback', true)) {
+                        $languages = $this->getFallbackLanguages();
+                    } else {
+                        $languages = (array)$this->getDefault();
+                    }
+                }
+            } else {
+                $languages = ['en'];
+            }
+
+            foreach ((array)$languages as $lang) {
+                $translation_array = (array)$this->config->getLanguages()->get($lang . '.' . $key, null);
+                if ($translation_array && array_key_exists($index, $translation_array)) {
+                    return $translation_array[$index];
+                }
+            }
+        }
+
+        if ($html_out) {
+            return '<span class="untranslated">' . $key . '[' . $index . ']</span>';
+        } else {
+            return $key . '[' . $index . ']';
+        }
+    }
+
+    /**
+     * Lookup the translation text for a given lang and key
+     *
+     * @param      $lang lang code
+     * @param      $key  key to lookup with
+     * @param bool $array_support
+     *
+     * @return string
+     */
+    public function getTranslation($lang, $key, $array_support = false)
+    {
+        $translation = $this->config->getLanguages()->get($lang . '.' . $key, null);
+        if (!$array_support && is_array($translation)) {
+            return (string)array_shift($translation);
+        }
+
+        return $translation;
+    }
+
+    public function getBrowserLanguages($accept_langs = [])
+    {
+        if (empty($this->http_accept_language)) {
+            if (empty($accept_langs) && isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+                $accept_langs = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+            } else {
+                return $accept_langs;
+            }
+
+            foreach (explode(',', $accept_langs) as $k => $pref) {
+                // split $pref again by ';q='
+                // and decorate the language entries by inverted position
+                if (false !== ($i = strpos($pref, ';q='))) {
+                    $langs[substr($pref, 0, $i)] = array((float)substr($pref, $i + 3), -$k);
+                } else {
+                    $langs[$pref] = array(1, -$k);
+                }
+            }
+            arsort($langs);
+
+            // no need to undecorate, because we're only interested in the keys
+            $this->http_accept_language = array_keys($langs);
+        }
+        return $this->http_accept_language;
+    }
+
+}

system/src/Grav/Common/Language/LanguageCodes.php

@@ -0,0 +1,774 @@
+<?php
+namespace Grav\Common\Language;
+
+/**
+ * Language and translation functionality for Grav
+ */
+class LanguageCodes
+{
+    protected static $codes = [
+        "ab" => [
+            "name"       => "Abkhaz",
+            "nativeName" => "аҧсуа"
+        ],
+        "aa" => [
+            "name"       => "Afar",
+            "nativeName" => "Afaraf"
+        ],
+        "af" => [
+            "name"       => "Afrikaans",
+            "nativeName" => "Afrikaans"
+        ],
+        "ak" => [
+            "name"       => "Akan",
+            "nativeName" => "Akan"
+        ],
+        "sq" => [
+            "name"       => "Albanian",
+            "nativeName" => "Shqip"
+        ],
+        "am" => [
+            "name"       => "Amharic",
+            "nativeName" => "አማርኛ"
+        ],
+        "ar" => [
+            "name"       => "Arabic",
+            "nativeName" => "العربية"
+        ],
+        "an" => [
+            "name"       => "Aragonese",
+            "nativeName" => "Aragonés"
+        ],
+        "hy" => [
+            "name"       => "Armenian",
+            "nativeName" => "Հայերեն"
+        ],
+        "as" => [
+            "name"       => "Assamese",
+            "nativeName" => "অসমীয়া"
+        ],
+        "av" => [
+            "name"       => "Avaric",
+            "nativeName" => "авар мацӀ"
+        ],
+        "ae" => [
+            "name"       => "Avestan",
+            "nativeName" => "avesta"
+        ],
+        "ay" => [
+            "name"       => "Aymara",
+            "nativeName" => "aymar aru"
+        ],
+        "az" => [
+            "name"       => "Azerbaijani",
+            "nativeName" => "azərbaycan dili"
+        ],
+        "bm" => [
+            "name"       => "Bambara",
+            "nativeName" => "bamanankan"
+        ],
+        "ba" => [
+            "name"       => "Bashkir",
+            "nativeName" => "башҡорт теле"
+        ],
+        "eu" => [
+            "name"       => "Basque",
+            "nativeName" => "euskara"
+        ],
+        "be" => [
+            "name"       => "Belarusian",
+            "nativeName" => "Беларуская"
+        ],
+        "bn" => [
+            "name"       => "Bengali",
+            "nativeName" => "বাংলা"
+        ],
+        "bh" => [
+            "name"       => "Bihari",
+            "nativeName" => "भोजपुरी"
+        ],
+        "bi" => [
+            "name"       => "Bislama",
+            "nativeName" => "Bislama"
+        ],
+        "bs" => [
+            "name"       => "Bosnian",
+            "nativeName" => "bosanski jezik"
+        ],
+        "br" => [
+            "name"       => "Breton",
+            "nativeName" => "brezhoneg"
+        ],
+        "bg" => [
+            "name"       => "Bulgarian",
+            "nativeName" => "български език"
+        ],
+        "my" => [
+            "name"       => "Burmese",
+            "nativeName" => "ဗမာစာ"
+        ],
+        "ca" => [
+            "name"       => "Catalan",
+            "nativeName" => "Català"
+        ],
+        "ch" => [
+            "name"       => "Chamorro",
+            "nativeName" => "Chamoru"
+        ],
+        "ce" => [
+            "name"       => "Chechen",
+            "nativeName" => "нохчийн мотт"
+        ],
+        "ny" => [
+            "name"       => "Chichewa",
+            "nativeName" => "chiCheŵa"
+        ],
+        "zh" => [
+            "name"       => "Chinese",
+            "nativeName" => "中文"
+        ],
+        "cv" => [
+            "name"       => "Chuvash",
+            "nativeName" => "чӑваш чӗлхи"
+        ],
+        "kw" => [
+            "name"       => "Cornish",
+            "nativeName" => "Kernewek"
+        ],
+        "co" => [
+            "name"       => "Corsican",
+            "nativeName" => "corsu"
+        ],
+        "cr" => [
+            "name"       => "Cree",
+            "nativeName" => "ᓀᐦᐃᔭᐍᐏᐣ"
+        ],
+        "hr" => [
+            "name"       => "Croatian",
+            "nativeName" => "hrvatski"
+        ],
+        "cs" => [
+            "name"       => "Czech",
+            "nativeName" => "česky"
+        ],
+        "da" => [
+            "name"       => "Danish",
+            "nativeName" => "dansk"
+        ],
+        "dv" => [
+            "name"       => "Divehi",
+            "nativeName" => "ދިވެހި"
+        ],
+        "nl" => [
+            "name"       => "Dutch",
+            "nativeName" => "Nederlands"
+        ],
+        "en" => [
+            "name"       => "English",
+            "nativeName" => "English"
+        ],
+        "eo" => [
+            "name"       => "Esperanto",
+            "nativeName" => "Esperanto"
+        ],
+        "et" => [
+            "name"       => "Estonian",
+            "nativeName" => "eesti"
+        ],
+        "ee" => [
+            "name"       => "Ewe",
+            "nativeName" => "Eʋegbe"
+        ],
+        "fo" => [
+            "name"       => "Faroese",
+            "nativeName" => "føroyskt"
+        ],
+        "fj" => [
+            "name"       => "Fijian",
+            "nativeName" => "vosa Vakaviti"
+        ],
+        "fi" => [
+            "name"       => "Finnish",
+            "nativeName" => "suomi"
+        ],
+        "fr" => [
+            "name"       => "French",
+            "nativeName" => "français"
+        ],
+        "ff" => [
+            "name"       => "Fula",
+            "nativeName" => "Fulfulde"
+        ],
+        "gl" => [
+            "name"       => "Galician",
+            "nativeName" => "Galego"
+        ],
+        "ka" => [
+            "name"       => "Georgian",
+            "nativeName" => "ქართული"
+        ],
+        "de" => [
+            "name"       => "German",
+            "nativeName" => "Deutsch"
+        ],
+        "el" => [
+            "name"       => "Greek",
+            "nativeName" => "Ελληνικά"
+        ],
+        "gn" => [
+            "name"       => "Guaraní",
+            "nativeName" => "Avañeẽ"
+        ],
+        "gu" => [
+            "name"       => "Gujarati",
+            "nativeName" => "ગુજરાતી"
+        ],
+        "ht" => [
+            "name"       => "Haitian",
+            "nativeName" => "Kreyòl ayisyen"
+        ],
+        "ha" => [
+            "name"       => "Hausa",
+            "nativeName" => "هَوُسَ"
+        ],
+        "he" => [
+            "name"       => "Hebrew",
+            "nativeName" => "עברית"
+        ],
+        "hz" => [
+            "name"       => "Herero",
+            "nativeName" => "Otjiherero"
+        ],
+        "hi" => [
+            "name"       => "Hindi",
+            "nativeName" => "हिन्दी"
+        ],
+        "ho" => [
+            "name"       => "Hiri Motu",
+            "nativeName" => "Hiri Motu"
+        ],
+        "hu" => [
+            "name"       => "Hungarian",
+            "nativeName" => "Magyar"
+        ],
+        "ia" => [
+            "name"       => "Interlingua",
+            "nativeName" => "Interlingua"
+        ],
+        "id" => [
+            "name"       => "Indonesian",
+            "nativeName" => "Bahasa Indonesia"
+        ],
+        "ie" => [
+            "name"       => "Interlingue",
+            "nativeName" => "Interlingue"
+        ],
+        "ga" => [
+            "name"       => "Irish",
+            "nativeName" => "Gaeilge"
+        ],
+        "ig" => [
+            "name"       => "Igbo",
+            "nativeName" => "Asụsụ Igbo"
+        ],
+        "ik" => [
+            "name"       => "Inupiaq",
+            "nativeName" => "Iñupiaq"
+        ],
+        "io" => [
+            "name"       => "Ido",
+            "nativeName" => "Ido"
+        ],
+        "is" => [
+            "name"       => "Icelandic",
+            "nativeName" => "Íslenska"
+        ],
+        "it" => [
+            "name"       => "Italian",
+            "nativeName" => "Italiano"
+        ],
+        "iu" => [
+            "name"       => "Inuktitut",
+            "nativeName" => "ᐃᓄᒃᑎᑐᑦ"
+        ],
+        "ja" => [
+            "name"       => "Japanese",
+            "nativeName" => "日本語"
+        ],
+        "jv" => [
+            "name"       => "Javanese",
+            "nativeName" => "basa Jawa"
+        ],
+        "kl" => [
+            "name"       => "Kalaallisut",
+            "nativeName" => "kalaallisut"
+        ],
+        "kn" => [
+            "name"       => "Kannada",
+            "nativeName" => "ಕನ್ನಡ"
+        ],
+        "kr" => [
+            "name"       => "Kanuri",
+            "nativeName" => "Kanuri"
+        ],
+        "ks" => [
+            "name"       => "Kashmiri",
+            "nativeName" => "कश्मीरी"
+        ],
+        "kk" => [
+            "name"       => "Kazakh",
+            "nativeName" => "Қазақ тілі"
+        ],
+        "km" => [
+            "name"       => "Khmer",
+            "nativeName" => "ភាសាខ្មែរ"
+        ],
+        "ki" => [
+            "name"       => "Kikuyu",
+            "nativeName" => "Gĩkũyũ"
+        ],
+        "rw" => [
+            "name"       => "Kinyarwanda",
+            "nativeName" => "Ikinyarwanda"
+        ],
+        "ky" => [
+            "name"       => "Kirghiz",
+            "nativeName" => "кыргыз тили"
+        ],
+        "kv" => [
+            "name"       => "Komi",
+            "nativeName" => "коми кыв"
+        ],
+        "kg" => [
+            "name"       => "Kongo",
+            "nativeName" => "KiKongo"
+        ],
+        "ko" => [
+            "name"       => "Korean",
+            "nativeName" => "한국어"
+        ],
+        "ku" => [
+            "name"       => "Kurdish",
+            "nativeName" => "كوردی‎"
+        ],
+        "kj" => [
+            "name"       => "Kwanyama",
+            "nativeName" => "Kuanyama"
+        ],
+        "la" => [
+            "name"       => "Latin",
+            "nativeName" => "latine"
+        ],
+        "lb" => [
+            "name"       => "Luxembourgish",
+            "nativeName" => "Lëtzebuergesch"
+        ],
+        "lg" => [
+            "name"       => "Luganda",
+            "nativeName" => "Luganda"
+        ],
+        "li" => [
+            "name"       => "Limburgish",
+            "nativeName" => "Limburgs"
+        ],
+        "ln" => [
+            "name"       => "Lingala",
+            "nativeName" => "Lingála"
+        ],
+        "lo" => [
+            "name"       => "Lao",
+            "nativeName" => "ພາສາລາວ"
+        ],
+        "lt" => [
+            "name"       => "Lithuanian",
+            "nativeName" => "lietuvių kalba"
+        ],
+        "lu" => [
+            "name"       => "Luba-Katanga",
+            "nativeName" => "Luba-Katanga"
+        ],
+        "lv" => [
+            "name"       => "Latvian",
+            "nativeName" => "latviešu valoda"
+        ],
+        "gv" => [
+            "name"       => "Manx",
+            "nativeName" => "Gaelg"
+        ],
+        "mk" => [
+            "name"       => "Macedonian",
+            "nativeName" => "македонски јазик"
+        ],
+        "mg" => [
+            "name"       => "Malagasy",
+            "nativeName" => "Malagasy fiteny"
+        ],
+        "ms" => [
+            "name"       => "Malay",
+            "nativeName" => "بهاس ملايو‎"
+        ],
+        "ml" => [
+            "name"       => "Malayalam",
+            "nativeName" => "മലയാളം"
+        ],
+        "mt" => [
+            "name"       => "Maltese",
+            "nativeName" => "Malti"
+        ],
+        "mi" => [
+            "name"       => "Māori",
+            "nativeName" => "te reo Māori"
+        ],
+        "mr" => [
+            "name"       => "Marathi",
+            "nativeName" => "मराठी"
+        ],
+        "mh" => [
+            "name"       => "Marshallese",
+            "nativeName" => "Kajin M̧ajeļ"
+        ],
+        "mn" => [
+            "name"       => "Mongolian",
+            "nativeName" => "монгол"
+        ],
+        "na" => [
+            "name"       => "Nauru",
+            "nativeName" => "Ekakairũ Naoero"
+        ],
+        "nv" => [
+            "name"       => "Navajo",
+            "nativeName" => "Diné bizaad"
+        ],
+        "nb" => [
+            "name"       => "Norwegian Bokmål",
+            "nativeName" => "Norsk bokmål"
+        ],
+        "nd" => [
+            "name"       => "North Ndebele",
+            "nativeName" => "isiNdebele"
+        ],
+        "ne" => [
+            "name"       => "Nepali",
+            "nativeName" => "नेपाली"
+        ],
+        "ng" => [
+            "name"       => "Ndonga",
+            "nativeName" => "Owambo"
+        ],
+        "nn" => [
+            "name"       => "Norwegian Nynorsk",
+            "nativeName" => "Norsk nynorsk"
+        ],
+        "no" => [
+            "name"       => "Norwegian",
+            "nativeName" => "Norsk"
+        ],
+        "ii" => [
+            "name"       => "Nuosu",
+            "nativeName" => "ꆈꌠ꒿ Nuosuhxop"
+        ],
+        "nr" => [
+            "name"       => "South Ndebele",
+            "nativeName" => "isiNdebele"
+        ],
+        "oc" => [
+            "name"       => "Occitan",
+            "nativeName" => "Occitan"
+        ],
+        "oj" => [
+            "name"       => "Ojibwe, Ojibwa",
+            "nativeName" => "ᐊᓂᔑᓈᐯᒧᐎᓐ"
+        ],
+        "cu" => [
+            "name"       => "Church Slavic",
+            "nativeName" => "ѩзыкъ словѣньскъ"
+        ],
+        "om" => [
+            "name"       => "Oromo",
+            "nativeName" => "Afaan Oromoo"
+        ],
+        "or" => [
+            "name"       => "Oriya",
+            "nativeName" => "ଓଡ଼ିଆ"
+        ],
+        "os" => [
+            "name"       => "Ossetian",
+            "nativeName" => "ирон æвзаг"
+        ],
+        "pa" => [
+            "name"       => "Panjabi",
+            "nativeName" => "ਪੰਜਾਬੀ"
+        ],
+        "pi" => [
+            "name"       => "Pāli",
+            "nativeName" => "पाऴि"
+        ],
+        "fa" => [
+            "name"       => "Persian",
+            "nativeName" => "فارسی"
+        ],
+        "pl" => [
+            "name"       => "Polish",
+            "nativeName" => "polski"
+        ],
+        "ps" => [
+            "name"       => "Pashto",
+            "nativeName" => "پښتو"
+        ],
+        "pt" => [
+            "name"       => "Portuguese",
+            "nativeName" => "Português"
+        ],
+        "qu" => [
+            "name"       => "Quechua",
+            "nativeName" => "Runa Simi"
+        ],
+        "rm" => [
+            "name"       => "Romansh",
+            "nativeName" => "rumantsch grischun"
+        ],
+        "rn" => [
+            "name"       => "Kirundi",
+            "nativeName" => "kiRundi"
+        ],
+        "ro" => [
+            "name"       => "Romanian",
+            "nativeName" => "română"
+        ],
+        "ru" => [
+            "name"       => "Russian",
+            "nativeName" => "Русский"
+        ],
+        "sa" => [
+            "name"       => "Sanskrit",
+            "nativeName" => "संस्कृतम्"
+        ],
+        "sc" => [
+            "name"       => "Sardinian",
+            "nativeName" => "sardu"
+        ],
+        "sd" => [
+            "name"       => "Sindhi",
+            "nativeName" => "सिन्धी"
+        ],
+        "se" => [
+            "name"       => "Northern Sami",
+            "nativeName" => "Davvisámegiella"
+        ],
+        "sm" => [
+            "name"       => "Samoan",
+            "nativeName" => "gagana faa Samoa"
+        ],
+        "sg" => [
+            "name"       => "Sango",
+            "nativeName" => "yângâ tî sängö"
+        ],
+        "sr" => [
+            "name"       => "Serbian",
+            "nativeName" => "српски језик"
+        ],
+        "gd" => [
+            "name"       => "Scottish Gaelic",
+            "nativeName" => "Gàidhlig"
+        ],
+        "sn" => [
+            "name"       => "Shona",
+            "nativeName" => "chiShona"
+        ],
+        "si" => [
+            "name"       => "Sinhala",
+            "nativeName" => "සිංහල"
+        ],
+        "sk" => [
+            "name"       => "Slovak",
+            "nativeName" => "slovenčina"
+        ],
+        "sl" => [
+            "name"       => "Slovene",
+            "nativeName" => "slovenščina"
+        ],
+        "so" => [
+            "name"       => "Somali",
+            "nativeName" => "Soomaaliga"
+        ],
+        "st" => [
+            "name"       => "Southern Sotho",
+            "nativeName" => "Sesotho"
+        ],
+        "es" => [
+            "name"       => "Spanish",
+            "nativeName" => "Español"
+        ],
+        "su" => [
+            "name"       => "Sundanese",
+            "nativeName" => "Basa Sunda"
+        ],
+        "sw" => [
+            "name"       => "Swahili",
+            "nativeName" => "Kiswahili"
+        ],
+        "ss" => [
+            "name"       => "Swati",
+            "nativeName" => "SiSwati"
+        ],
+        "sv" => [
+            "name"       => "Swedish",
+            "nativeName" => "svenska"
+        ],
+        "ta" => [
+            "name"       => "Tamil",
+            "nativeName" => "தமிழ்"
+        ],
+        "te" => [
+            "name"       => "Telugu",
+            "nativeName" => "తెలుగు"
+        ],
+        "tg" => [
+            "name"       => "Tajik",
+            "nativeName" => "тоҷикӣ"
+        ],
+        "th" => [
+            "name"       => "Thai",
+            "nativeName" => "ไทย"
+        ],
+        "ti" => [
+            "name"       => "Tigrinya",
+            "nativeName" => "ትግርኛ"
+        ],
+        "bo" => [
+            "name"       => "Tibetan",
+            "nativeName" => "བོད་ཡིག"
+        ],
+        "tk" => [
+            "name"       => "Turkmen",
+            "nativeName" => "Türkmen"
+        ],
+        "tl" => [
+            "name"       => "Tagalog",
+            "nativeName" => "Wikang Tagalog"
+        ],
+        "tn" => [
+            "name"       => "Tswana",
+            "nativeName" => "Setswana"
+        ],
+        "to" => [
+            "name"       => "Tonga",
+            "nativeName" => "faka Tonga"
+        ],
+        "tr" => [
+            "name"       => "Turkish",
+            "nativeName" => "Türkçe"
+        ],
+        "ts" => [
+            "name"       => "Tsonga",
+            "nativeName" => "Xitsonga"
+        ],
+        "tt" => [
+            "name"       => "Tatar",
+            "nativeName" => "татарча"
+        ],
+        "tw" => [
+            "name"       => "Twi",
+            "nativeName" => "Twi"
+        ],
+        "ty" => [
+            "name"       => "Tahitian",
+            "nativeName" => "Reo Tahiti"
+        ],
+        "ug" => [
+            "name"       => "Uighur",
+            "nativeName" => "Uyƣurqə"
+        ],
+        "uk" => [
+            "name"       => "Ukrainian",
+            "nativeName" => "українська"
+        ],
+        "ur" => [
+            "name"       => "Urdu",
+            "nativeName" => "اردو"
+        ],
+        "uz" => [
+            "name"       => "Uzbek",
+            "nativeName" => "zbek"
+        ],
+        "ve" => [
+            "name"       => "Venda",
+            "nativeName" => "Tshivenḓa"
+        ],
+        "vi" => [
+            "name"       => "Vietnamese",
+            "nativeName" => "Tiếng Việt"
+        ],
+        "vo" => [
+            "name"       => "Volapük",
+            "nativeName" => "Volapük"
+        ],
+        "wa" => [
+            "name"       => "Walloon",
+            "nativeName" => "Walon"
+        ],
+        "cy" => [
+            "name"       => "Welsh",
+            "nativeName" => "Cymraeg"
+        ],
+        "wo" => [
+            "name"       => "Wolof",
+            "nativeName" => "Wollof"
+        ],
+        "fy" => [
+            "name"       => "Western Frisian",
+            "nativeName" => "Frysk"
+        ],
+        "xh" => [
+            "name"       => "Xhosa",
+            "nativeName" => "isiXhosa"
+        ],
+        "yi" => [
+            "name"       => "Yiddish",
+            "nativeName" => "ייִדיש"
+        ],
+        "yo" => [
+            "name"       => "Yoruba",
+            "nativeName" => "Yorùbá"
+        ],
+        "za" => [
+            "name"       => "Zhuang",
+            "nativeName" => "Saɯ cueŋƅ"
+        ]
+    ];
+
+    public static function getName($code)
+    {
+        return static::get($code, 'name');
+    }
+
+    public static function getNativeName($code)
+    {
+        if (strlen($code) == 2) {
+            return static::get($code, 'nativeName');
+        } else {
+            return static::get(substr($code, 0, 2), 'nativeName') . ' (' . substr($code, -2) . ')';
+        }
+    }
+
+    public static function getNames(array $keys)
+    {
+        $results = [];
+        foreach ($keys as $key) {
+            if (isset(static::$codes[$key])) {
+                $results[$key] = static::$codes[$key];
+            }
+
+        }
+        return $results;
+    }
+
+    protected static function get($code, $type)
+    {
+        if (isset(static::$codes[$code][$type])) {
+            return static::$codes[$code][$type];
+        } else {
+            return false;
+        }
+    }
+}

system/src/Grav/Common/Markdown/ParsedownGravTrait.php

@@ -23,7 +23,7 @@ trait ParsedownGravTrait
     protected $twig_link_regex = '/\!*\[(?:.*)\]\((\{([\{%#])\s*(.*?)\s*(?:\2|\})\})\)/';
 
     /**
-     * Initialiazation function to setup key variables needed by the MarkdownGravLinkTrait
+     * Initialization function to setup key variables needed by the MarkdownGravLinkTrait
      *
      * @param $page
      * @param $defaults
@@ -37,7 +37,7 @@ trait ParsedownGravTrait
         $this->pages_dir = self::getGrav()['locator']->findResource('page://');
         $this->special_chars = array('>' => 'gt', '<' => 'lt', '"' => 'quot');
 
-        if ($defaults == null) {
+        if ($defaults === null) {
             $defaults = self::getGrav()['config']->get('system.pages.markdown');
         }
 
@@ -111,6 +111,7 @@ trait ParsedownGravTrait
             $excerpt['extent'] = $excerpt['extent'] + strlen($matches[1]) - 1;
             return $excerpt;
         } else {
+            $excerpt['type'] = 'image';
             $excerpt = parent::inlineImage($excerpt);
         }
 
@@ -132,11 +133,10 @@ trait ParsedownGravTrait
                 $path_parts = pathinfo($url['path']);
 
                 // get the local path to page media if possible
-                if ($path_parts['dirname'] == $this->page->url()) {
-                    $url['path'] = ltrim(str_replace($this->page->url(), '', $url['path']), '/');
+                if ($path_parts['dirname'] == $this->page->url(false, false, false)) {
+                    $url['path'] = urldecode($path_parts['basename']);
                     // get the media objects for this page
                     $media = $this->page->media();
-
                 } else {
                     // see if this is an external page to this one
                     $page_route = str_replace($this->base_url, '', $path_parts['dirname']);
@@ -144,7 +144,7 @@ trait ParsedownGravTrait
                     $ext_page = $this->pages->dispatch($page_route, true);
                     if ($ext_page) {
                         $media = $ext_page->media();
-                        $url['path'] = $path_parts['basename'];
+                        $url['path'] = urldecode($path_parts['basename']);
                     }
                 }
 
@@ -166,7 +166,7 @@ trait ParsedownGravTrait
 
                     // loop through actions for the image and call them
                     foreach ($actions as $action) {
-                        $medium = call_user_func_array(array($medium, $action['method']), explode(',', $action['params']));
+                        $medium = call_user_func_array(array($medium, $action['method']), explode(',', urldecode($action['params'])));
                     }
 
                     if (isset($url['fragment'])) {
@@ -187,6 +187,12 @@ trait ParsedownGravTrait
 
     protected function inlineLink($excerpt)
     {
+        if (isset($excerpt['type'])) {
+            $type = $excerpt['type'];
+        } else {
+            $type = 'link';
+        }
+
         // do some trickery to get around Parsedown requirement for valid URL if its Twig in there
         if (preg_match($this->twig_link_regex, $excerpt['text'], $matches)) {
             $excerpt['text'] = str_replace($matches[1], '/', $excerpt['text']);
@@ -205,73 +211,10 @@ trait ParsedownGravTrait
             // if there is no scheme, the file is local
             if (!isset($url['scheme']) && (count($url) > 0)) {
                 // convert the URl is required
-                $excerpt['element']['attributes']['href'] = $this->convertUrl(Uri::buildUrl($url));
+                $excerpt['element']['attributes']['href'] = Uri::convertUrl($this->page, Uri::buildUrl($url), $type);
             }
         }
 
         return $excerpt;
     }
-
-    /**
-     * Converts links from absolute '/' or relative (../..) to a grav friendly format
-     * @param  string $markdown_url the URL as it was written in the markdown
-     * @return string               the more friendly formatted url
-     */
-    protected function convertUrl($markdown_url)
-    {
-        // if absolute and starts with a base_url move on
-        if ($this->base_url != '' && Utils::startsWith($markdown_url, $this->base_url)) {
-            return $markdown_url;
-            // if contains only a fragment
-        } elseif (Utils::startsWith($markdown_url, '#')) {
-            return $markdown_url;
-        } else {
-            $target = null;
-            // see if page is relative to this or absolute
-            if (Utils::startsWith($markdown_url, '/')) {
-                $normalized_path = Utils::normalizePath($this->pages_dir . $markdown_url);
-                $normalized_url = Utils::normalizePath($this->base_url . $markdown_url);
-            } else {
-                // contains path, so need to normalize it
-                if (Utils::contains($markdown_url, '/')) {
-                    $normalized_path = Utils::normalizePath($this->page->path() . '/' . $markdown_url);
-                } else {
-                    $normalized_path = false;
-                }
-                $normalized_url = $this->base_url . Utils::normalizePath($this->page->route() . '/' . $markdown_url);
-            }
-
-            // if this file exits, get the page and work with that
-            if ($normalized_path) {
-                $url_bits = parse_url($normalized_path);
-                $full_path = $url_bits['path'];
-
-                if ($full_path && file_exists($full_path)) {
-                    $path_info = pathinfo($full_path);
-                    $page_path = $path_info['dirname'];
-                    $filename = '';
-
-                    // save the filename if a file is part of the path
-                    $filename_regex = "/([\w\d-_]+\.([a-zA-Z]{2,4}))$/";
-                    if (preg_match($filename_regex, $full_path, $matches)) {
-                        if ($matches[2] != 'md') {
-                            $filename = '/' . $matches[1];
-                        }
-                    } else {
-                        $page_path = $full_path;
-                    }
-
-                    // get page instances and try to find one that fits
-                    $instances = $this->pages->instances();
-                    if (isset($instances[$page_path])) {
-                        $target = $instances[$page_path];
-                        $url_bits['path'] = $this->base_url . $target->route() . $filename;
-                        return Uri::buildUrl($url_bits);
-                    }
-                }
-            }
-
-            return $normalized_url;
-        }
-    }
 }

system/src/Grav/Common/Page/Collection.php

@@ -3,6 +3,7 @@ namespace Grav\Common\Page;
 
 use Grav\Common\Grav;
 use Grav\Common\Iterator;
+use Grav\Common\Utils;
 
 /**
  * Collection of Pages.
@@ -35,6 +36,18 @@ class Collection extends Iterator
         return $this->params;
     }
 
+    /**
+     * Add a single page to a collection
+     *
+     * @param Page $page
+     * @return $this
+     */
+    public function addPage(Page $page)
+    {
+        $this->items[$page->path()] = ['slug' => $page->slug()];
+        return $this;
+    }
+
     /**
      *
      * Create a copy of this collection
@@ -95,6 +108,7 @@ class Collection extends Iterator
      * Remove item from the list.
      *
      * @param Page|string|null $key
+     * @return $this|void
      * @throws \InvalidArgumentException
      */
     public function remove($key = null)
@@ -109,6 +123,7 @@ class Collection extends Iterator
         }
 
         parent::remove($key);
+        return $this;
     }
 
     /**
@@ -211,27 +226,33 @@ class Collection extends Iterator
     }
 
     /**
-     * Returns the items between a set of date ranges where second value is optional
+     * Returns the items between a set of date ranges of either the page date field (default) or
+     * an arbitrary datetime page field where end date is optional
      * Dates can be passed in as text that strtotime() can process
      * http://php.net/manual/en/function.strtotime.php
      *
      * @param      $startDate
      * @param bool $endDate
+     * @param      $field
      *
      * @return $this
      * @throws \Exception
      */
-    public function dateRange($startDate, $endDate = false)
+    public function dateRange($startDate, $endDate = false, $field = false)
     {
-        $start = strtotime($startDate);
-        $end = $endDate ? strtotime($endDate) : strtotime("now +1000 years");
+        $start = Utils::date2timestamp($startDate);
+        $end = $endDate ? Utils::date2timestamp($endDate) : strtotime("now +1000 years");
 
         $date_range = [];
 
         foreach ($this->items as $path => $slug) {
             $page = $this->pages->get($path);
-            if ($page->date() > $start && $page->date() < $end) {
-                $date_range[$path] = $slug;
+            if ($page !== null) {
+                $date = $field ? strtotime($page->value($field)) : $page->date();
+
+                if ($date > $start && $date < $end) {
+                    $date_range[$path] = $slug;
+                }
             }
         }
         $this->items = $date_range;
@@ -249,7 +270,7 @@ class Collection extends Iterator
 
         foreach ($this->items as $path => $slug) {
             $page = $this->pages->get($path);
-            if ($page->visible()) {
+            if ($page !== null && $page->visible()) {
                 $visible[$path] = $slug;
             }
         }
@@ -268,7 +289,7 @@ class Collection extends Iterator
 
         foreach ($this->items as $path => $slug) {
             $page = $this->pages->get($path);
-            if (!$page->visible()) {
+            if ($page !== null && !$page->visible()) {
                 $visible[$path] = $slug;
             }
         }
@@ -287,7 +308,7 @@ class Collection extends Iterator
 
         foreach ($this->items as $path => $slug) {
             $page = $this->pages->get($path);
-            if ($page->modular()) {
+            if ($page !== null && $page->modular()) {
                 $modular[$path] = $slug;
             }
         }
@@ -306,7 +327,7 @@ class Collection extends Iterator
 
         foreach ($this->items as $path => $slug) {
             $page = $this->pages->get($path);
-            if (!$page->modular()) {
+            if ($page !== null && !$page->modular()) {
                 $modular[$path] = $slug;
             }
         }
@@ -325,7 +346,7 @@ class Collection extends Iterator
 
         foreach ($this->items as $path => $slug) {
             $page = $this->pages->get($path);
-            if ($page->published()) {
+            if ($page !== null && $page->published()) {
                 $published[$path] = $slug;
             }
         }
@@ -344,7 +365,7 @@ class Collection extends Iterator
 
         foreach ($this->items as $path => $slug) {
             $page = $this->pages->get($path);
-            if (!$page->published()) {
+            if ($page !== null && !$page->published()) {
                 $published[$path] = $slug;
             }
         }
@@ -363,7 +384,8 @@ class Collection extends Iterator
 
         foreach ($this->items as $path => $slug) {
             $page = $this->pages->get($path);
-            if ($page->routable()) {
+
+            if ($page !== null && $page->routable()) {
                 $routable[$path] = $slug;
             }
         }
@@ -383,11 +405,54 @@ class Collection extends Iterator
 
         foreach ($this->items as $path => $slug) {
             $page = $this->pages->get($path);
-            if (!$page->routable()) {
+            if ($page !== null && !$page->routable()) {
                 $routable[$path] = $slug;
             }
         }
         $this->items = $routable;
         return $this;
     }
+
+    /**
+     * Creates new collection with only pages of the specified type
+     *
+     * @return Collection The collection
+     */
+    public function ofType($type)
+    {
+        $items = [];
+
+        foreach ($this->items as $path => $slug) {
+            $page = $this->pages->get($path);
+            if ($page !== null && $page->template() == $type) {
+                $items[$path] = $slug;
+            }
+        }
+
+        $this->items = $items;
+        return $this;
+    }
+
+    /**
+     * Creates new collection with only pages of one of the specified types
+     *
+     * @return Collection The collection
+     */
+    public function ofOneOfTheseTypes($types)
+    {
+        $items = [];
+
+        foreach ($this->items as $path => $slug) {
+            $page = $this->pages->get($path);
+            if ($page !== null && in_array($page->template(), $types)) {
+                $items[$path] = $slug;
+            }
+        }
+
+        $this->items = $items;
+        return $this;
+    }
+
+
+
 }

system/src/Grav/Common/Page/Media.php

@@ -47,7 +47,7 @@ class Media extends Getters
         /** @var \DirectoryIterator $info */
         foreach ($iterator as $path => $info) {
             // Ignore folders and Markdown files.
-            if (!$info->isFile() || $info->getExtension() == 'md') {
+            if (!$info->isFile() || $info->getExtension() == 'md' || $info->getBasename() === '.DS_Store') {
                 continue;
             }
 
@@ -58,28 +58,37 @@ class Media extends Getters
 
             if ($type === 'alternative') {
                 $media["{$basename}.{$ext}"][$type] = isset($media["{$basename}.{$ext}"][$type]) ? $media["{$basename}.{$ext}"][$type] : [];
-                $media["{$basename}.{$ext}"][$type][$extra] = $path;
+                $media["{$basename}.{$ext}"][$type][$extra] = [ 'file' => $path, 'size' => $info->getSize() ];
             } else {
-                $media["{$basename}.{$ext}"][$type] = $path;
+                $media["{$basename}.{$ext}"][$type] = [ 'file' => $path, 'size' => $info->getSize() ];
             }
         }
 
         foreach ($media as $name => $types) {
             // First prepare the alternatives in case there is no base medium
             if (!empty($types['alternative'])) {
-                foreach ($types['alternative'] as $ratio => &$file) {
-                    $file = MediumFactory::fromFile($file);
+                foreach ($types['alternative'] as $ratio => &$alt) {
+                    $alt['file'] = MediumFactory::fromFile($alt['file']);
+
+                    if (!$alt['file']) {
+                        unset($types['alternative'][$ratio]);
+                    } else {
+                        $alt['file']->set('size', $alt['size']);
+                    }
                 }
             }
 
             // Create the base medium
             if (!empty($types['base'])) {
-                $medium = MediumFactory::fromFile($types['base']);
+                $medium = MediumFactory::fromFile($types['base']['file']);
+                $medium && $medium->set('size', $types['base']['size']);
             } else if (!empty($types['alternative'])) {
                 $altMedium = reset($types['alternative']);
                 $ratio = key($types['alternative']);
 
-                $medium = MediumFactory::scaledFromMedium($altMedium, $ratio, 1);
+                $altMedium = $altMedium['file'];
+
+                $medium = MediumFactory::scaledFromMedium($altMedium, $ratio, 1)['file'];
             }
 
             if (!$medium) {
@@ -87,13 +96,13 @@ class Media extends Getters
             }
 
             if (!empty($types['meta'])) {
-                $medium->addMetaFile($types['meta']);
+                $medium->addMetaFile($types['meta']['file']);
             }
 
             if (!empty($types['thumb'])) {
                 // We will not turn it into medium yet because user might never request the thumbnail
                 // not wasting any resources on that, maybe we should do this for medium in general?
-                $medium->set('thumbnails.page', $types['thumb']);
+                $medium->set('thumbnails.page', $types['thumb']['file']);
             }
 
             // Build missing alternatives
@@ -107,11 +116,11 @@ class Media extends Getters
                         continue;
                     }
 
-                    $types['alternative'][$i] = MediumFactory::scaledFromMedium($alternatives[$max], $max, $i);
+                    $types['alternative'][$i] = MediumFactory::scaledFromMedium($alternatives[$max]['file'], $max, $i);
                 }
 
                 foreach ($types['alternative'] as $ratio => $altMedium) {
-                    $medium->addAlternative($ratio, $altMedium);
+                    $medium->addAlternative($ratio, $altMedium['file']);
                 }
             }
 

system/src/Grav/Common/Page/Medium/AudioMedium.php

@@ -0,0 +1,45 @@
+<?php
+namespace Grav\Common\Page\Medium;
+
+use Grav\Common\Config\Config;
+use Grav\Common\File\CompiledYamlFile;
+use Grav\Common\Grav;
+use Grav\Common\GravTrait;
+use Grav\Common\Data\Blueprint;
+use Grav\Common\Data\Data;
+
+class AudioMedium extends Medium
+{
+    use StaticResizeTrait;
+
+    /**
+     * Parsedown element for source display mode
+     *
+     * @param  array $attributes
+     * @param  boolean $reset
+     * @return array
+     */
+    protected function sourceParsedownElement(array $attributes, $reset = true)
+    {
+        $location = $this->url($reset);
+
+        return [
+            'name' => 'audio',
+            'text' => '<source src="' . $location . '">Your browser does not support the audio tag.',
+            'attributes' => $attributes
+        ];
+    }
+
+    /**
+     * Reset medium.
+     *
+     * @return $this
+     */
+    public function reset()
+    {
+        parent::reset();
+
+        $this->attributes['controls'] = true;
+        return $this;
+    }
+}

system/src/Grav/Common/Page/Medium/ImageFile.php

@@ -0,0 +1,84 @@
+<?php
+namespace Grav\Common\Page\Medium;
+
+use Grav\Common\GravTrait;
+use Gregwar\Image\Exceptions\GenerationError;
+use RocketTheme\Toolbox\Event\Event;
+
+class ImageFile extends \Gregwar\Image\Image
+{
+    use GravTrait;
+
+    /**
+     * This is the same as the Gregwar Image class except this one fires a Grav Event on creation of new cached file
+     *
+     * @param string $type    the image type
+     * @param int    $quality the quality (for JPEG)
+     * @param bool   $actual
+     *
+     * @return mixed|string
+     */
+    public function cacheFile($type = 'jpg', $quality = 80, $actual = false)
+    {
+        if ($type == 'guess') {
+            $type = $this->guessType();
+        }
+
+        if (!count($this->operations) && $type == $this->guessType() && !$this->forceCache) {
+            return $this->getFilename($this->getFilePath());
+        }
+
+        // Computes the hash
+        $this->hash = $this->getHash($type, $quality);
+
+        // Generates the cache file
+        $cacheFile = '';
+
+        if (!$this->prettyName || $this->prettyPrefix) {
+            $cacheFile .= $this->hash;
+        }
+
+        if ($this->prettyPrefix) {
+            $cacheFile .= '-';
+        }
+
+        if ($this->prettyName) {
+            $cacheFile .= $this->prettyName;
+        }
+
+        $cacheFile .= '.'.$type;
+
+        // If the files does not exists, save it
+        $image = $this;
+
+        // Target file should be younger than all the current image
+        // dependencies
+        $conditions = array(
+            'younger-than' => $this->getDependencies()
+        );
+
+        // The generating function
+        $generate = function ($target) use ($image, $type, $quality) {
+            $result = $image->save($target, $type, $quality);
+
+            if ($result != $target) {
+                throw new GenerationError($result);
+            }
+
+            self::getGrav()->fireEvent('onImageMediumSaved', new Event(['image' => $target]));
+        };
+
+        // Asking the cache for the cacheFile
+        try {
+            $file = $this->cache->getOrCreateFile($cacheFile, $conditions, $generate, $actual);
+        } catch (GenerationError $e) {
+            $file = $e->getNewFile();
+        }
+
+        if ($actual) {
+            return $file;
+        } else {
+            return $this->getFilename($file);
+        }
+    }
+}

system/src/Grav/Common/Page/Medium/ImageMedium.php

@@ -2,7 +2,6 @@
 namespace Grav\Common\Page\Medium;
 
 use Grav\Common\Data\Blueprint;
-use Gregwar\Image\Image as ImageFile;
 
 class ImageMedium extends Medium
 {
@@ -57,6 +56,16 @@ class ImageMedium extends Medium
         'zoomCrop' => [ 0, 1 ]
     ];
 
+    /**
+     * @var array
+     */
+    protected $derivatives = [];
+
+    /**
+     * @var string
+     */
+    protected $sizes = '100vw';
+
     /**
      * Construct.
      *
@@ -67,17 +76,23 @@ class ImageMedium extends Medium
     {
         parent::__construct($items, $blueprint);
 
+        $config = self::$grav['config'];
+
         $image_info = getimagesize($this->get('filepath'));
         $this->def('width', $image_info[0]);
         $this->def('height', $image_info[1]);
         $this->def('mime', $image_info['mime']);
-        $this->def('debug', self::$grav['config']->get('system.images.debug'));
+        $this->def('debug', $config->get('system.images.debug'));
 
         $this->set('thumbnails.media', $this->get('filepath'));
 
-        $this->default_quality = self::$grav['config']->get('system.images.default_image_quality', 85);
+        $this->default_quality = $config->get('system.images.default_image_quality', 85);
 
         $this->reset();
+
+        if ($config->get('system.images.cache_all', false)) {
+            $this->cache();
+        }
     }
 
     /**
@@ -130,6 +145,19 @@ class ImageMedium extends Medium
         return self::$grav['base_url'] . $output . $this->querystring() . $this->urlHash();
     }
 
+    /**
+     * Simply processes with no extra methods.  Useful for triggering events.
+     *
+     * @return $this
+     */
+    public function cache()
+    {
+        if (!$this->image) {
+            $this->image();
+        }
+        return $this;
+    }
+
 
     /**
      * Return srcset string for this Medium and its alternatives.
@@ -139,22 +167,68 @@ class ImageMedium extends Medium
      */
     public function srcset($reset = true)
     {
-        if (empty($this->alternatives)) {
+        if (empty($this->alternatives) && empty($this->derivatives)) {
             if ($reset) {
                 $this->reset();
             }
             return '';
         }
 
-        $srcset = [ $this->url($reset) . ' ' . $this->get('width') . 'w' ];
+        if (!empty($this->derivatives)) {
+          asort($this->derivatives);
 
-        foreach ($this->alternatives as $ratio => $medium) {
-            $srcset[] = $medium->url($reset) . ' ' . $medium->get('width') . 'w';
+          foreach ($this->derivatives as $url => $width) {
+              $srcset[] = $url . ' ' . $width . 'w';
+          }
+
+          $srcset[] = $this->url($reset) . ' ' . $this->get('width') . 'w';
+        }
+        else {
+          $srcset = [ $this->url($reset) . ' ' . $this->get('width') . 'w' ];
+          foreach ($this->alternatives as $ratio => $medium) {
+              $srcset[] = $medium->url($reset) . ' ' . $medium->get('width') . 'w';
+          }
         }
 
         return implode(', ', $srcset);
     }
 
+    /**
+     * Generate derivatives
+     *
+     * @param  int $min_width
+     * @param  int $max_width
+     * @param  int $step
+     * @return $this
+     */
+    public function derivatives($min_width, $max_width, $step = 200) {
+      $width = $min_width;
+
+      // Do not upscale images.
+      if ($max_width > $this->get('width')) {
+        $max_width = $this->get('width');
+      }
+
+      while ($width <= $max_width) {
+        $ratio = $width / $this->get('width');
+        $derivative = MediumFactory::scaledFromMedium($this, 1, $ratio);
+        if (is_array($derivative)) {
+          $this->addDerivative($derivative['file']);
+        }
+        $width += $step;
+      }
+      return $this;
+    }
+
+    /**
+     * Add a derivative
+     *
+     * @param  ImageMedium $image
+     */
+    public function addDerivative(ImageMedium $image) {
+      $this->derivatives[$image->url()] = $image->get('width');
+    }
+
     /**
      * Parsedown element for source display mode
      *
@@ -169,7 +243,7 @@ class ImageMedium extends Medium
         $srcset = $this->srcset($reset);
         if ($srcset) {
             empty($attributes['srcset']) && $attributes['srcset'] = $srcset;
-            empty($attributes['sizes']) && $attributes['sizes'] = $this->sizes();
+            $attributes['sizes'] = $this->sizes();
         }
 
         return [ 'name' => 'img', 'attributes' => $attributes ];
@@ -216,7 +290,7 @@ class ImageMedium extends Medium
     }
 
     /**
-     * Turn the current Medium inta a Link with lightbox enabled
+     * Turn the current Medium into a Link with lightbox enabled
      *
      * @param  int  $width
      * @param  int  $height
@@ -278,11 +352,11 @@ class ImageMedium extends Medium
     {
 
         if ($sizes) {
-            $this->attributes['sizes'] = $sizes;
+            $this->sizes = $sizes;
             return $this;
         }
 
-        return empty($this->attributes['sizes']) ? '100vw' : $this->attributes['sizes'];
+        return empty($this->sizes) ? '100vw' : $this->sizes;
     }
 
     /**
@@ -308,7 +382,7 @@ class ImageMedium extends Medium
         }
 
         try {
-            $result = call_user_func_array([$this->image, $method], $args);
+            call_user_func_array([$this->image, $method], $args);
 
             foreach ($this->alternatives as $ratio => $medium) {
                 $args_copy = $args;
@@ -364,6 +438,10 @@ class ImageMedium extends Medium
             return parent::path(false);
         }
 
+        if (isset($this->result)) {
+            return $this->result;
+        }
+
         if ($this->get('debug') && !$this->debug_watermarked) {
             $ratio = $this->get('ratio');
             if (!$ratio) {
@@ -375,9 +453,7 @@ class ImageMedium extends Medium
             $this->image->merge(ImageFile::open($overlay));
         }
 
-        $result = $this->image->cacheFile($this->format, $this->quality);
-
-        return $result;
+        return $this->image->cacheFile($this->format, $this->quality);
     }
 
     /**

system/src/Grav/Common/Page/Medium/Link.php

@@ -60,6 +60,6 @@ class Link implements RenderableInterface
 
         // Don't start nesting links, if user has multiple link calls in his
         // actions, we will drop the previous links.
-        return $this->source instanceof LinkMedium ? $this->source : $this;
+        return $this->source instanceof Link ? $this->source : $this;
     }
 }

system/src/Grav/Common/Page/Medium/Medium.php

@@ -60,7 +60,7 @@ class Medium extends Data implements RenderableInterface
     {
         parent::__construct($items, $blueprint);
 
-        if (self::getGrav()['config']->get('media.enable_media_timestamp', true)) {
+        if (self::getGrav()['config']->get('system.media.enable_media_timestamp', true)) {
             $this->querystring('&' . self::getGrav()['cache']->getKey());
         }
 
@@ -68,6 +68,16 @@ class Medium extends Data implements RenderableInterface
         $this->reset();
     }
 
+    /**
+     * Return just metadata from the Medium object
+     *
+     * @return $this
+     */
+    public function meta()
+    {
+        return new Data($this->items);
+    }
+
     /**
      * Add meta file for the medium.
      *
@@ -203,9 +213,29 @@ class Medium extends Data implements RenderableInterface
         }
         $attributes['style'] = $style;
 
-        !empty($title) && empty($attributes['title']) && $attributes['title'] = $title;
-        !empty($alt) && empty($attributes['alt']) && $attributes['alt'] = $alt;
-        !empty($class) && empty($attributes['class']) && $attributes['class'] = $class;
+        if (empty($attributes['title'])) {
+            if (!empty($title)) {
+                $attributes['title'] = $title;
+            } elseif (!empty($this->items['title'])) {
+                $attributes['title'] = $this->items['title'];
+            }
+        }
+
+        if (empty($attributes['alt'])) {
+            if (!empty($alt)) {
+                $attributes['alt'] = $alt;
+            } elseif (!empty($this->items['alt'])) {
+                $attributes['alt'] = $this->items['alt'];
+            }
+        }
+
+        if (empty($attributes['class'])) {
+            if (!empty($class)) {
+                $attributes['class'] = $class;
+            } elseif (!empty($this->items['class'])) {
+                $attributes['class'] = $this->items['class'];
+            }
+        }
 
         switch ($this->mode) {
             case 'text':
@@ -339,7 +369,7 @@ class Medium extends Data implements RenderableInterface
     }
 
     /**
-     * Turn the current Medium inta a Link with lightbox enabled
+     * Turn the current Medium into a Link with lightbox enabled
      *
      * @param  int  $width
      * @param  int  $height
@@ -376,8 +406,6 @@ class Medium extends Data implements RenderableInterface
             $this->querystring($this->querystring(null, false) . '&' . $qs);
         }
 
-        self::$grav['debugger']->addMessage($this->querystring());
-
         return $this;
     }
 
@@ -399,7 +427,7 @@ class Medium extends Data implements RenderableInterface
                 $thumb = $this->get('thumbnails.' . $type, false);
 
                 if ($thumb) {
-                    $thumb = $thumb instanceof ThumbnailMedium ? $thumb : MediumFactory::fromFile($thumb, ['type' => 'thumbnail']);
+                    $thumb = $thumb instanceof ThumbnailImageMedium ? $thumb : MediumFactory::fromFile($thumb, ['type' => 'thumbnail']);
                     $thumb->parent = $this;
                 }
 

system/src/Grav/Common/Page/Medium/MediumFactory.php

@@ -97,6 +97,9 @@ class MediumFactory
             case 'video':
                 return new VideoMedium($items, $blueprint);
                 break;
+            case 'audio':
+                return new AudioMedium($items, $blueprint);
+                break;
             default:
                 return new Medium($items, $blueprint);
                 break;
@@ -140,6 +143,6 @@ class MediumFactory
         $medium = self::fromFile($file);
         $medium->set('size', $size);
 
-        return $medium;
+        return ['file' => $medium, 'size' => $size];
     }
 }

system/src/Grav/Common/Page/Medium/ThumbnailImageMedium.php

@@ -90,7 +90,7 @@ class ThumbnailImageMedium extends ImageMedium
     }
 
     /**
-     * Turn the current Medium inta a Link with lightbox enabled
+     * Turn the current Medium into a Link with lightbox enabled
      *
      * @param  int  $width
      * @param  int  $height

system/src/Grav/Common/Page/Medium/VideoMedium.php

@@ -7,7 +7,6 @@ use Grav\Common\Grav;
 use Grav\Common\GravTrait;
 use Grav\Common\Data\Blueprint;
 use Grav\Common\Data\Data;
-use Gregwar\Image\Image as ImageFile;
 
 class VideoMedium extends Medium
 {

system/src/Grav/Common/Page/Pages.php

@@ -6,11 +6,14 @@ use Grav\Common\Config\Config;
 use Grav\Common\Utils;
 use Grav\Common\Cache;
 use Grav\Common\Taxonomy;
+use Grav\Common\Language;
 use Grav\Common\Data\Blueprint;
 use Grav\Common\Data\Blueprints;
 use Grav\Common\Filesystem\Folder;
+use Grav\Plugin\Admin;
 use RocketTheme\Toolbox\Event\Event;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use Whoops\Exception\ErrorException;
 
 /**
  * GravPages is the class that is the entry point into the hierarchy of pages
@@ -60,11 +63,17 @@ class Pages
      */
     protected $last_modified;
 
+    protected $ignore_files;
+    protected $ignore_folders;
+    protected $ignore_hidden;
+
     /**
      * @var Types
      */
     static protected $types;
 
+    static protected $home_route;
+
     /**
      * Constructor
      *
@@ -97,6 +106,11 @@ class Pages
      */
     public function init()
     {
+        $config = $this->grav['config'];
+        $this->ignore_files = $config->get('system.pages.ignore_files');
+        $this->ignore_folders = $config->get('system.pages.ignore_folders');
+        $this->ignore_hidden = $config->get('system.pages.ignore_hidden');
+
         $this->buildPages();
     }
 
@@ -259,31 +273,48 @@ class Pages
         // Fetch page if there's a defined route to it.
         $page = isset($this->routes[$url]) ? $this->get($this->routes[$url]) : null;
 
+        // Are we in the admin? this is important!
+        $not_admin = !isset($this->grav['admin']);
+
         // If the page cannot be reached, look into site wide redirects, routes + wildcards
-        if (!$all && (!$page || !$page->routable())) {
+        if (!$all && $not_admin && (!$page || ($page && !$page->routable()) || ($page && $page->redirect()))) {
+
+            // If the page is a simple redirect, just do it.
+            if ($page && $page->redirect()) {
+                $this->grav->redirectLangSafe($page->redirect());
+            }
+
             /** @var Config $config */
             $config = $this->grav['config'];
 
-            // Try redirects
-            $redirect = $config->get("site.redirects.{$url}");
-            if ($redirect) {
-                $this->grav->redirect($redirect);
-            }
-
             // See if route matches one in the site configuration
             $route = $config->get("site.routes.{$url}");
             if ($route) {
                 $page = $this->dispatch($route, $all);
             } else {
-                // Try looking for wildcards
-                foreach ($config->get("site.routes") as $alias => $route) {
-                    $match = rtrim($alias, '*');
-                    if (strpos($alias, '*') !== false && strpos($url, $match) !== false) {
-                        $wildcard_url = str_replace('*', str_replace($match, '', $url), $route);
-                        $page = isset($this->routes[$wildcard_url]) ? $this->get($this->routes[$wildcard_url]) : null;
-                        if ($page) {
-                            return $page;
+                // Try Regex style redirects
+                foreach ((array)$config->get("site.redirects") as $pattern => $replace) {
+                    $pattern = '#' . $pattern . '#';
+                    try {
+                        $found = preg_replace($pattern, $replace, $url);
+                        if ($found != $url) {
+                            $this->grav->redirectLangSafe($found);
                         }
+                    } catch (ErrorException $e) {
+                        $this->grav['log']->error('site.redirects: ' . $pattern . '-> ' . $e->getMessage());
+                    }
+                }
+
+                // Try Regex style routes
+                foreach ((array)$config->get("site.routes") as $pattern => $replace) {
+                    $pattern = '#' . $pattern . '#';
+                    try {
+                        $found = preg_replace($pattern, $replace, $url);
+                        if ($found != $url) {
+                            $page = $this->dispatch($found, $all);
+                        }
+                    } catch (ErrorException $e) {
+                        $this->grav['log']->error('site.routes: '. $pattern . '-> ' . $e->getMessage());
                     }
                 }
             }
@@ -340,9 +371,11 @@ class Pages
     public function all(Page $current = null)
     {
         $all = new Collection();
+
+        /** @var Page $current */
         $current = $current ?: $this->root();
 
-        if ($current->routable()) {
+        if (!$current->root()) {
             $all[$current->path()] = [ 'slug' => $current->slug() ];
         }
 
@@ -372,7 +405,8 @@ class Pages
         }
 
         $list = array();
-        if ($current->routable()) {
+
+        if (!$current->root()) {
             $list[$current->route()] = str_repeat('  ', ($level-1)*2) . $current->title();
         }
 
@@ -390,10 +424,11 @@ class Pages
      */
     public static function getTypes()
     {
+        $locator = Grav::instance()['locator'];
         if (!self::$types) {
             self::$types = new Types();
-            self::$types->scanBlueprints('theme://blueprints/');
-            self::$types->scanTemplates('theme://templates/');
+            file_exists('theme://blueprints/') && self::$types->scanBlueprints($locator->findResources('theme://blueprints/'));
+            file_exists('theme://templates/') && self::$types->scanTemplates($locator->findResources('theme://templates/'));
 
             $event = new Event();
             $event->types = self::$types;
@@ -427,6 +462,26 @@ class Pages
         return $types->modularSelect();
     }
 
+    /**
+     * Get template types based on page type (standard or modular)
+     *
+     * @return array
+     */
+    public static function pageTypes()
+    {
+        /** @var Admin $admin */
+        $admin = Grav::instance()['admin'];
+
+        /** @var Page $page */
+        $page = $admin->getPage($admin->route);
+
+        if ($page && $page->modular()) {
+            return static::modularTypes();
+        }
+
+        return static::types();
+    }
+
     /**
      * Get available parents.
      *
@@ -442,6 +497,48 @@ class Pages
         return $pages->getList();
     }
 
+    /**
+     * Get's the home route
+     *
+     * @return string
+     */
+    public static function getHomeRoute()
+    {
+        if (empty(self::$home)) {
+            $grav = Grav::instance();
+
+            /** @var Config $config */
+            $config = $grav['config'];
+
+            /** @var Language $language */
+            $language = $grav['language'];
+
+            $home = $config->get('system.home.alias');
+
+            if ($language->enabled()) {
+                $home_aliases = $config->get('system.home.aliases');
+                if ($home_aliases) {
+                    $active = $language->getActive();
+                    $default = $language->getDefault();
+
+                    try {
+                        if ($active) {
+                            $home = $home_aliases[$active];
+                        } else {
+                            $home = $home_aliases[$default];
+                        }
+                    } catch (ErrorException $e) {
+                        $home = $home_aliases[$default];
+                    }
+
+                }
+            }
+
+            self::$home_route = trim($home, '/');
+        }
+        return self::$home_route;
+    }
+
     /**
      * Builds pages.
      *
@@ -454,9 +551,12 @@ class Pages
         /** @var Config $config */
         $config = $this->grav['config'];
 
+        /** @var Language $language */
+        $language = $this->grav['language'];
+
         /** @var UniformResourceLocator $locator */
         $locator = $this->grav['locator'];
-        $pagesDir = $locator->findResource('page://');
+        $pages_dir = $locator->findResource('page://');
 
         if ($config->get('system.cache.enabled')) {
             /** @var Cache $cache */
@@ -471,36 +571,58 @@ class Pages
                     $last_modified = 0;
                     break;
                 case 'folder':
-                    $last_modified = Folder::lastModifiedFolder($pagesDir);
+                    $last_modified = Folder::lastModifiedFolder($pages_dir);
                     break;
                 default:
-                    $last_modified = Folder::lastModifiedFile($pagesDir);
+                    $last_modified = Folder::lastModifiedFile($pages_dir);
             }
 
-            $page_cache_id = md5(USER_DIR.$last_modified.$config->checksum());
+            $page_cache_id = md5(USER_DIR.$last_modified.$language->getActive().$config->checksum());
 
             list($this->instances, $this->routes, $this->children, $taxonomy_map, $this->sort) = $cache->fetch($page_cache_id);
             if (!$this->instances) {
                 $this->grav['debugger']->addMessage('Page cache missed, rebuilding pages..');
-                $this->recurse($pagesDir);
-                $this->buildRoutes();
 
-                // save pages, routes, taxonomy, and sort to cache
-                $cache->save(
-                    $page_cache_id,
-                    array($this->instances, $this->routes, $this->children, $taxonomy->taxonomy(), $this->sort)
-                );
+                // recurse pages and cache result
+                $this->resetPages($pages_dir, $page_cache_id);
+
             } else {
                 // If pages was found in cache, set the taxonomy
                 $this->grav['debugger']->addMessage('Page cache hit.');
                 $taxonomy->taxonomy($taxonomy_map);
             }
         } else {
-            $this->recurse($pagesDir);
+            $this->recurse($pages_dir);
             $this->buildRoutes();
         }
     }
 
+    /**
+     * Accessible method to manually reset the pages cache
+     *
+     * @param $pages_dir
+     * @param $page_cache_id
+     */
+    public function resetPages($pages_dir, $page_cache_id)
+    {
+        $this->recurse($pages_dir);
+        $this->buildRoutes();
+
+        // cache if needed
+        if ($this->grav['config']->get('system.cache.enabled')) {
+                /** @var Cache $cache */
+            $cache = $this->grav['cache'];
+            /** @var Taxonomy $taxonomy */
+            $taxonomy = $this->grav['taxonomy'];
+
+            // save pages, routes, taxonomy, and sort to cache
+            $cache->save(
+                $page_cache_id,
+                array($this->instances, $this->routes, $this->children, $taxonomy->taxonomy(), $this->sort)
+            );
+        }
+    }
+
     /**
      * Recursive function to load & build page relationships.
      *
@@ -513,12 +635,23 @@ class Pages
     protected function recurse($directory, Page &$parent = null)
     {
         $directory  = rtrim($directory, DS);
-        $iterator   = new \DirectoryIterator($directory);
         $page       = new Page;
 
         /** @var Config $config */
         $config     = $this->grav['config'];
 
+        /** @var Language $language */
+        $language = $this->grav['language'];
+
+        // stuff to do at root page
+        if ($parent === null) {
+
+            // Fire event for memory and time consuming plugins...
+            if ($config->get('system.pages.events.page')) {
+                $this->grav->fireEvent('onBuildPagesInitialized');
+            }
+        }
+
         $page->path($directory);
         if ($parent) {
             $page->parent($parent);
@@ -537,35 +670,53 @@ class Pages
             throw new \RuntimeException('Fatal error when creating page instances.');
         }
 
+        $content_exists = false;
+        $pages_found = glob($directory.'/*'.CONTENT_EXT);
+        $page_extensions = $language->getFallbackPageExtensions();
+
+        if ($pages_found) {
+            foreach ($page_extensions as $extension) {
+                foreach ($pages_found as $found) {
+                    if (preg_match('/^.*\/[0-9A-Za-z\-\_]+('.$extension.')$/', $found)) {
+                        $page_found = $found;
+                        $page_extension = $extension;
+                        break 2;
+                    }
+                }
+            }
+        }
+
+        if ($parent && !empty($page_found)) {
+            $file = new \SplFileInfo($page_found);
+            $page->init($file, $page_extension);
+
+            $content_exists = true;
+
+            if ($config->get('system.pages.events.page')) {
+                $this->grav->fireEvent('onPageProcessed', new Event(['page' => $page]));
+            }
+        }
+
         // set current modified of page
         $last_modified = $page->modified();
 
-        // flat for content availability
-        $content_exists = false;
-
         /** @var \DirectoryIterator $file */
-        foreach ($iterator as $file) {
-            if ($file->isDot()) {
-                continue;
-            }
-
+        foreach (new \FilesystemIterator($directory) as $file) {
             $name = $file->getFilename();
 
+            // Ignore all hidden files if set.
+            if ($this->ignore_hidden) {
+                if ($name && $name[0] == '.') {
+                    continue;
+                }
+            }
+
             if ($file->isFile()) {
                 // Update the last modified if it's newer than already found
-                if ($file->getBasename() !== '.DS_Store' && ($modified = $file->getMTime()) > $last_modified) {
+                if (!in_array($file->getBasename(), $this->ignore_files) && ($modified = $file->getMTime()) > $last_modified) {
                     $last_modified = $modified;
                 }
-
-                if (Utils::endsWith($name, CONTENT_EXT)) {
-                    $page->init($file);
-                    $content_exists = true;
-
-                    if ($config->get('system.pages.events.page')) {
-                        $this->grav->fireEvent('onPageProcessed', new Event(['page' => $page]));
-                    }
-                }
-            } elseif ($file->isDir()) {
+            } elseif ($file->isDir() && !in_array($file->getFilename(), $this->ignore_folders)) {
                 if (!$page->path()) {
                     $page->path($file->getPath());
                 }
@@ -608,29 +759,45 @@ class Pages
         /** @var $taxonomy Taxonomy */
         $taxonomy = $this->grav['taxonomy'];
 
+        // Get the home route
+        $home = self::getHomeRoute();
+
         // Build routes and taxonomy map.
         /** @var $page Page */
         foreach ($this->instances as $page) {
-            $parent = $page->parent();
-
-            if ($parent) {
-                $route = rtrim($parent->route(), '/') . '/' . $page->slug();
-                $this->routes[$route] = $page->path();
-                $page->route($route);
-            }
-
-            if (!empty($route)) {
+            if (!$page->root()) {
+                // process taxonomy
                 $taxonomy->addTaxonomy($page);
-            } else {
-                $page->routable(false);
+
+                $route =  $page->route();
+                $raw_route = $page->rawRoute();
+                $page_path = $page->path();
+
+                // add regular route
+                $this->routes[$route] = $page_path;
+
+                // add raw route
+                if ($raw_route != $route) {
+                    $this->routes[$raw_route] = $page_path;
+                }
+
+                // add canonical route
+                $route_canonical = $page->routeCanonical();
+                if ($route_canonical && ($route !== $route_canonical)) {
+                    $this->routes[$route_canonical] = $page_path;
+                }
+
+                // add aliases to routes list if they are provided
+                $route_aliases = $page->routeAliases();
+                if ($route_aliases) {
+                    foreach ($route_aliases as $alias) {
+                        $this->routes[$alias] = $page_path;
+                    }
+                }
             }
         }
 
-        /** @var Config $config */
-        $config = $this->grav['config'];
-
         // Alias and set default route to home page.
-        $home = trim($config->get('system.home.alias'), '/');
         if ($home && isset($this->routes['/' . $home])) {
             $this->routes['/'] = $this->routes['/' . $home];
             $this->get($this->routes['/' . $home])->route('/');
@@ -728,7 +895,6 @@ class Pages
 
         foreach ($list as $key => $sort) {
             $info = $pages[$key];
-            // TODO: order by manual needs a hash from the passed variables if we make this more general.
             $this->sort[$path][$order_by][$key] = $info;
         }
     }

system/src/Grav/Common/Page/Types.php

@@ -13,30 +13,27 @@ class Types implements \ArrayAccess, \Iterator, \Countable
     use ArrayAccess, Constructor, Iterator, Countable, Export;
 
     protected $items;
+    protected $systemBlueprints;
 
     public function register($type, $blueprint = null)
     {
+        if (!$blueprint && $this->systemBlueprints && isset($this->systemBlueprints[$type])) {
+            $useBlueprint = $this->systemBlueprints[$type];
+        } else {
+            $useBlueprint = $blueprint;
+        }
+
         if ($blueprint || empty($this->items[$type])) {
-            $this->items[$type] = $blueprint;
+            $this->items[$type] = $useBlueprint;
         }
     }
 
-    public function scanBlueprints($path)
+    public function scanBlueprints($paths)
     {
-        $options = [
-            'compare' => 'Filename',
-            'pattern' => '|\.yaml$|',
-            'filters' => [
-                'key' => '|\.yaml$|'
-                ],
-            'key' => 'SubPathName',
-            'value' => 'PathName',
-        ];
-
-        $this->items = Folder::all($path, $options) + $this->items;
+        $this->items = $this->findBlueprints($paths) + $this->items;
     }
 
-    public function scanTemplates($path)
+    public function scanTemplates($paths)
     {
         $options = [
             'compare' => 'Filename',
@@ -48,12 +45,22 @@ class Types implements \ArrayAccess, \Iterator, \Countable
             'recursive' => false
         ];
 
-        foreach (Folder::all($path, $options) as $type) {
-            $this->register($type);
+        if (!$this->systemBlueprints) {
+            $this->systemBlueprints = $this->findBlueprints('blueprints://pages');
         }
-        if (file_exists($path . 'modular/')) {
-            foreach (Folder::all($path . 'modular/', $options) as $type) {
-                $this->register('modular/' . $type);
+
+        // register default by default
+        $this->register('default');
+
+        foreach ((array) $paths as $path) {
+            foreach (Folder::all($path, $options) as $type) {
+                $this->register($type);
+            }
+            $modular_path = rtrim($path, '/') . '/modular';
+            if (file_exists($modular_path)) {
+                foreach (Folder::all($modular_path, $options) as $type) {
+                    $this->register('modular/' . $type);
+                }
             }
         }
     }
@@ -83,4 +90,21 @@ class Types implements \ArrayAccess, \Iterator, \Countable
         ksort($list);
         return $list;
     }
+
+    private function findBlueprints($paths)
+    {
+        $options = [
+            'compare' => 'Filename',
+            'pattern' => '|\.yaml$|',
+            'filters' => [
+                'key' => '|\.yaml$|'
+                ],
+            'key' => 'SubPathName',
+            'value' => 'PathName',
+        ];
+
+        foreach ((array) $paths as $path) {
+            return Folder::all($path, $options);
+        }
+    }
 }

system/src/Grav/Common/Plugin.php

@@ -114,48 +114,72 @@ class Plugin implements EventSubscriberInterface
         }
     }
 
+    /**
+     * This function will search a string for markdown links in a specific format.  The link value can be
+     * optionally compared against via the $internal_regex and operated on by the callback $function
+     * provided.
+     *
+     * format: [plugin:myplugin_name](function_data)
+     *
+     * @param        $content           The string to perform operations upon
+     * @param        $function          The anonymous callback function
+     * @param string $internal_regex    Optional internal regex to extra data from
+     *
+     * @return string
+     */
+    protected function parseLinks($content, $function, $internal_regex = '(.*)')
+    {
+        $regex = '/\[plugin:(?:'.$this->name.')\]\('.$internal_regex.'\)/i';
+        return preg_replace_callback($regex, $function, $content);
+    }
+
     /**
      * Merge global and page configurations.
      *
-     * @param  Page $page   The page to merge the configurations with the
-     *                      plugin settings.
-     *
-     * @param bool  $deep   Should you use deep or shallow merging
+     * @param Page  $page    The page to merge the configurations with the
+     *                       plugin settings.
+     * @param bool  $deep    Should you use deep or shallow merging
+     * @param array $params  Array of additional configuration options to
+     *                       merge with the plugin settings.
      *
      * @return \Grav\Common\Data\Data
      */
-    protected function mergeConfig(Page $page, $deep = false)
+    protected function mergeConfig(Page $page, $deep = false, $params = [])
     {
         $class_name = $this->name;
         $class_name_merged = $class_name . '.merged';
-        $defaults = $this->config->get('plugins.' . $class_name, array());
-        $header = array();
-
-        if (isset($page->header()->$class_name_merged)) {
-            $merged = $page->header()->$class_name_merged;
-            if (count($merged) > 0) {
-                return $merged;
-            } else {
-                return new Data($defaults);
+        $defaults = $this->config->get('plugins.'. $class_name, []);
+        $page_header = $page->header();
+        $header = [];
+        if (!isset($page_header->$class_name_merged) && isset($page_header->$class_name)) {
+            // Get default plugin configurations and retrieve page header configuration
+            $config = $page_header->$class_name;
+            if (is_bool($config)) {
+                // Overwrite enabled option with boolean value in page header
+                $config = ['enabled' => $config];
             }
-        }
-
-        // Get default plugin configurations and retrieve page header configuration
-        if (isset($page->header()->$class_name)) {
+            // Merge page header settings using deep or shallow merging technique
             if ($deep) {
-                $header =  array_replace_recursive($defaults, $page->header()->$class_name);
+                $header = array_replace_recursive($defaults, $config);
             } else {
-                $header =  array_merge($defaults, $page->header()->$class_name);
+                $header = array_merge($defaults, $config);
             }
-        } else {
+            // Create new config object and set it on the page object so it's cached for next time
+            $page->modifyHeader($class_name_merged, new Data($header));
+        } else if (isset($page_header->$class_name_merged)) {
+            $merged = $page_header->$class_name_merged;
+            $header = $merged->toArray();
+        }
+        if (empty($header)) {
             $header = $defaults;
         }
-
-        // Create new config object and set it on the page object so it's cached for next time
-        $config = new Data($header);
-        $page->modifyHeader($class_name_merged, $config);
-
+        // Merge additional parameter with configuration options
+        if ($deep) {
+            $header = array_replace_recursive($header, $params);
+        } else {
+            $header = array_merge($header, $params);
+        }
         // Return configurations as a new data config class
-        return $config;
+        return new Data($header);
     }
 }

system/src/Grav/Common/Plugins.php

@@ -4,6 +4,7 @@ namespace Grav\Common;
 use Grav\Common\Config\Config;
 use Grav\Common\Data\Blueprints;
 use Grav\Common\Data\Data;
+use Grav\Common\GravTrait;
 use Grav\Common\File\CompiledYamlFile;
 use RocketTheme\Toolbox\Event\EventDispatcher;
 use RocketTheme\Toolbox\Event\EventSubscriberInterface;
@@ -17,12 +18,7 @@ use RocketTheme\Toolbox\Event\EventSubscriberInterface;
  */
 class Plugins extends Iterator
 {
-    protected $grav;
-
-    public function __construct(Grav $grav)
-    {
-        $this->grav = $grav;
-    }
+    use GravTrait;
 
     /**
      * Recurses through the plugins directory creating Plugin objects for each plugin it finds.
@@ -33,11 +29,13 @@ class Plugins extends Iterator
     public function init()
     {
         /** @var Config $config */
-        $config = $this->grav['config'];
+        $config = self::getGrav()['config'];
         $plugins = (array) $config->get('plugins');
 
+        $inflector = self::getGrav()['inflector'];
+
         /** @var EventDispatcher $events */
-        $events = $this->grav['events'];
+        $events = self::getGrav()['events'];
 
         foreach ($plugins as $plugin => $data) {
             if (empty($data['enabled'])) {
@@ -45,9 +43,10 @@ class Plugins extends Iterator
                 continue;
             }
 
-            $filePath = $this->grav['locator']('plugins://' . $plugin . DS . $plugin . PLUGIN_EXT);
+            $locator = self::getGrav()['locator'];
+            $filePath = $locator->findResource('plugins://' . $plugin . DS . $plugin . PLUGIN_EXT);
             if (!is_file($filePath)) {
-                $this->grav['log']->addWarning(sprintf("Plugin '%s' enabled but not found! Try clearing cache with `bin/grav clear-cache`", $plugin));
+                self::getGrav()['log']->addWarning(sprintf("Plugin '%s' enabled but not found! Try clearing cache with `bin/grav clear-cache`", $plugin));
                 continue;
             }
 
@@ -55,7 +54,7 @@ class Plugins extends Iterator
 
             $pluginClassFormat = [
                 'Grav\\Plugin\\'.ucfirst($plugin).'Plugin',
-                'Grav\\Plugin\\'.Inflector::camelize($plugin).'Plugin'
+                'Grav\\Plugin\\'.$inflector->camelize($plugin).'Plugin'
             ];
             $pluginClassName = false;
 
@@ -70,7 +69,7 @@ class Plugins extends Iterator
                 throw new \RuntimeException(sprintf("Plugin '%s' class not found! Try reinstalling this plugin.", $plugin));
             }
 
-            $instance = new $pluginClassName($plugin, $this->grav, $config);
+            $instance = new $pluginClassName($plugin, self::getGrav(), $config);
             if ($instance instanceof EventSubscriberInterface) {
                 $events->addSubscriber($instance);
             }
@@ -95,18 +94,21 @@ class Plugins extends Iterator
     {
         $list = array();
         $locator = Grav::instance()['locator'];
-        $iterator = new \DirectoryIterator($locator->findResource('plugins://', false));
 
-        /** @var \DirectoryIterator $directory */
-        foreach ($iterator as $directory) {
-            if (!$directory->isDir() || $directory->isDot()) {
-                continue;
+        $plugins = (array) $locator->findResources('plugins://', false);
+        foreach ($plugins as $path) {
+            $iterator = new \DirectoryIterator($path);
+
+            /** @var \DirectoryIterator $directory */
+            foreach ($iterator as $directory) {
+                if (!$directory->isDir() || $directory->isDot()) {
+                    continue;
+                }
+
+                $type = $directory->getBasename();
+                $list[$type] = self::get($type);
             }
-
-            $type = $directory->getBasename();
-            $list[$type] = self::get($type);
         }
-
         ksort($list);
 
         return $list;
@@ -114,8 +116,8 @@ class Plugins extends Iterator
 
     public static function get($name)
     {
-        $blueprints = new Blueprints("plugins://{$name}");
-        $blueprint = $blueprints->get('blueprints');
+        $blueprints = new Blueprints('plugins://');
+        $blueprint = $blueprints->get("{$name}/blueprints");
         $blueprint->name = $name;
 
         // Load default configuration.
@@ -123,10 +125,10 @@ class Plugins extends Iterator
         $obj = new Data($file->content(), $blueprint);
 
         // Override with user configuration.
-        $file = CompiledYamlFile::instance("user://config/plugins/{$name}.yaml");
-        $obj->merge($file->content());
+        $obj->merge(self::getGrav()['config']->get('plugins.' . $name) ?: []);
 
         // Save configuration always to user/config.
+        $file = CompiledYamlFile::instance("config://plugins/{$name}.yaml");
         $obj->file($file);
 
         return $obj;

system/src/Grav/Common/Service/ConfigServiceProvider.php

@@ -38,18 +38,8 @@ class ConfigServiceProvider implements ServiceProviderInterface
     public function loadMasterConfig(Container $container)
     {
         $environment = $this->getEnvironment($container);
-        $file = CACHE_DIR . 'compiled/config/master-'.$environment.'.php';
-        $data = is_file($file) ? (array) include $file : [];
-        if ($data) {
-            try {
-                $config = new Config($data, $container, $environment);
-            } catch (\Exception $e) {
-            }
-        }
 
-        if (!isset($config)) {
-            $config = new Config($this->setup, $container, $environment);
-        }
+        $config = new Config($this->setup, $container, $environment);
 
         return $config;
     }

system/src/Grav/Common/Service/ErrorServiceProvider.php

@@ -30,7 +30,11 @@ class ErrorServiceProvider implements ServiceProviderInterface
 
         $logger = $container['log'];
         $errors->pushHandler(function (\Exception $exception, $inspector, $run) use ($logger) {
-            $logger->addCritical($exception->getMessage(). ' - Trace: '. $exception->getTraceAsString());
+            try {
+                $logger->addCritical($exception->getMessage() . ' - Trace: ' . $exception->getTraceAsString());
+            } catch (\Exception $e) {
+                echo $e;
+            }
         }, 'log');
 
         $errors->register();

system/src/Grav/Common/Service/LoggerServiceProvider.php

@@ -13,7 +13,7 @@ class LoggerServiceProvider implements ServiceProviderInterface
         $log = new Logger('grav');
         $log_file = LOG_DIR.'grav.log';
 
-        $log->pushHandler(new StreamHandler($log_file, Logger::WARNING));
+        $log->pushHandler(new StreamHandler($log_file, Logger::DEBUG));
 
         $container['log'] = $log;
     }

system/src/Grav/Common/Service/StreamsServiceProvider.php

@@ -13,9 +13,7 @@ class StreamsServiceProvider implements ServiceProviderInterface
 {
     public function register(Container $container)
     {
-        $self = $this;
-
-        $container['locator'] = function($c) use ($self) {
+        $container['locator'] = function($c) {
             $locator = new UniformResourceLocator(ROOT_DIR);
 
             /** @var Config $config */
@@ -25,7 +23,7 @@ class StreamsServiceProvider implements ServiceProviderInterface
             return $locator;
         };
 
-        $container['streams'] = function($c) use ($self) {
+        $container['streams'] = function($c) {
             /** @var Config $config */
             $config = $c['config'];
 

system/src/Grav/Common/Session.php

@@ -0,0 +1,53 @@
+<?php
+namespace Grav\Common;
+
+/**
+ * Wrapper for Session
+ */
+class Session extends \RocketTheme\Toolbox\Session\Session
+{
+    protected $grav;
+    protected $session;
+
+    public function __construct(Grav $grav)
+    {
+        $this->grav = $grav;
+    }
+
+    public function init()
+    {
+        /** @var Uri $uri */
+        $uri = $this->grav['uri'];
+        $config = $this->grav['config'];
+
+        $is_admin = false;
+
+        $session_timeout = $config->get('system.session.timeout', 1800);
+        $session_path = $config->get('system.session.path', '/' . ltrim($uri->rootUrl(false), '/'));
+
+        // Activate admin if we're inside the admin path.
+        if ($config->get('plugins.admin.enabled')) {
+            $route = $config->get('plugins.admin.route');
+            $base = '/' . trim($route, '/');
+            if (substr($uri->route(), 0, strlen($base)) == $base) {
+                $session_timeout = $config->get('plugins.admin.session.timeout', 1800);
+                $is_admin = true;
+            }
+        }
+
+        if ($config->get('system.session.enabled') || $is_admin) {
+
+
+            // Define session service.
+            parent::__construct(
+                $session_timeout,
+                $session_path
+            );
+
+            $unique_identifier = GRAV_ROOT;
+            $this->setName($config->get('system.session.name', 'grav_site') . '-' . substr(md5($unique_identifier), 0, 7) . ($is_admin ? '-admin' : ''));
+            $this->start();
+            setcookie(session_name(), session_id(), time() + $session_timeout, $session_path);
+        }
+    }
+}

system/src/Grav/Common/Taxonomy.php

@@ -52,17 +52,16 @@ class Taxonomy
             $page_taxonomy = $page->taxonomy();
         }
 
-        if (!$page->published()) {
+        if (!$page->published() || empty($page_taxonomy)) {
             return;
         }
 
         /** @var Config $config */
         $config = $this->grav['config'];
-        if ($config->get('site.taxonomies') && count($page_taxonomy) > 0) {
+        if ($config->get('site.taxonomies')) {
             foreach ((array) $config->get('site.taxonomies') as $taxonomy) {
                 if (isset($page_taxonomy[$taxonomy])) {
                     foreach ((array) $page_taxonomy[$taxonomy] as $item) {
-                        // TODO: move to pages class?
                         $this->taxonomy_map[$taxonomy][(string) $item][$page->path()] = array('slug' => $page->slug());
                     }
                 }
@@ -76,7 +75,7 @@ class Taxonomy
      *
      * @param  array $taxonomies taxonomies to search, eg ['tag'=>['animal','cat']]
      * @param  string $operator can be 'or' or 'and' (defaults to 'or')
-     * @return Colleciton       Collection object set to contain matches found in the taxonomy map
+     * @return Collection       Collection object set to contain matches found in the taxonomy map
      */
     public function findTaxonomy($taxonomies, $operator = 'and')
     {

system/src/Grav/Common/Themes.php

@@ -27,6 +27,9 @@ class Themes extends Iterator
     {
         $this->grav = $grav;
         $this->config = $grav['config'];
+
+        // Register instance as autoloader for theme inheritance
+        spl_autoload_register([$this, 'autoloadTheme']);
     }
 
     public function init()
@@ -60,18 +63,21 @@ class Themes extends Iterator
     {
         $list = array();
         $locator = Grav::instance()['locator'];
-        $iterator = new \DirectoryIterator($locator->findResource('themes://', false));
 
-        /** @var \DirectoryIterator $directory */
-        foreach ($iterator as $directory) {
-            if (!$directory->isDir() || $directory->isDot()) {
-                continue;
+        $themes = (array) $locator->findResources('themes://', false);
+        foreach ($themes as $path) {
+            $iterator = new \DirectoryIterator($path);
+
+            /** @var \DirectoryIterator $directory */
+            foreach ($iterator as $directory) {
+                if (!$directory->isDir() || $directory->isDot()) {
+                    continue;
+                }
+
+                $type = $directory->getBasename();
+                $list[$type] = self::get($type);
             }
-
-            $type = $directory->getBasename();
-            $list[$type] = self::get($type);
         }
-
         ksort($list);
 
         return $list;
@@ -90,15 +96,14 @@ class Themes extends Iterator
             throw new \RuntimeException('Theme name not provided.');
         }
 
-        $blueprints = new Blueprints("themes://{$name}");
-        $blueprint = $blueprints->get('blueprints');
+        $blueprints = new Blueprints('themes://');
+        $blueprint = $blueprints->get("{$name}/blueprints");
         $blueprint->name = $name;
 
         // Find thumbnail.
         $thumb = "themes://{$name}/thumbnail.jpg";
-
-        if (file_exists($thumb)) {
-            $blueprint->set('thumbnail', $this->grav['base_url'] . "/user/themes/{$name}/thumbnail.jpg");
+        if ($path = $this->grav['locator']->findResource($thumb, false)) {
+            $blueprint->set('thumbnail', $this->grav['base_url'] . '/' . $path);
         }
 
         // Load default configuration.
@@ -106,10 +111,10 @@ class Themes extends Iterator
         $obj = new Data($file->content(), $blueprint);
 
         // Override with user configuration.
-        $file = CompiledYamlFile::instance("user://config/themes/{$name}" . YAML_EXT);
-        $obj->merge($file->content());
+        $obj->merge($this->grav['config']->get('themes.' . $name) ?: []);
 
         // Save configuration always to user/config.
+        $file = CompiledYamlFile::instance("config://themes/{$name}" . YAML_EXT);
         $obj->file($file);
 
         return $obj;
@@ -141,15 +146,16 @@ class Themes extends Iterator
         $locator = $grav['locator'];
         $file = $locator('theme://theme.php') ?: $locator("theme://{$name}.php");
 
+        $inflector = $grav['inflector'];
+
         if ($file) {
             // Local variables available in the file: $grav, $config, $name, $file
             $class = include $file;
 
             if (!is_object($class)) {
-
                 $themeClassFormat = [
                     'Grav\\Theme\\'.ucfirst($name),
-                    'Grav\\Theme\\'.Inflector::camelize($name)
+                    'Grav\\Theme\\'.$inflector->camelize($name)
                 ];
                 $themeClassName = false;
 
@@ -187,7 +193,6 @@ class Themes extends Iterator
         /** @var UniformResourceLocator $locator */
         $locator = $this->grav['locator'];
 
-        // TODO: move
         $registered = stream_get_wrappers();
         $schemes = $config->get(
             "themes.{$name}.streams.schemes",
@@ -216,12 +221,76 @@ class Themes extends Iterator
                 throw new \InvalidArgumentException("Stream '{$type}' could not be initialized.");
             }
         }
+
+        // Load languages after streams has been properly initialized
+        $this->loadLanguages($this->config);
     }
 
+    /**
+     * Load theme configuration.
+     *
+     * @param string  $name    Theme name
+     * @param Config  $config  Configuration class
+     */
     protected function loadConfiguration($name, Config $config)
     {
         $themeConfig = CompiledYamlFile::instance("themes://{$name}/{$name}" . YAML_EXT)->content();
-
         $config->joinDefaults("themes.{$name}", $themeConfig);
     }
+
+    /**
+     * Load theme languages.
+     *
+     * @param Config  $config  Configuration class
+     */
+    protected function loadLanguages(Config $config)
+    {
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->grav['locator'];
+
+        if ($config->get('system.languages.translations', true)) {
+            $languageFiles = array_reverse($locator->findResources("theme://languages" . YAML_EXT));
+
+            $languages = [];
+            foreach ($languageFiles as $language) {
+                $languages[] = CompiledYamlFile::instance($language)->content();
+            }
+
+            if ($languages) {
+                $languages = call_user_func_array('array_replace_recursive', $languages);
+                $config->getLanguages()->mergeRecursive($languages);
+            }
+        }
+    }
+
+    /**
+     * Autoload theme classes for inheritance
+     *
+     * @param  string $class Class name
+     *
+     * @return mixed  false  FALSE if unable to load $class; Class name if
+     *                       $class is successfully loaded
+     */
+    protected function autoloadTheme($class)
+    {
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->grav['locator'];
+
+        $prefix = "Grav\\Theme";
+        if (false !== strpos($class, $prefix)) {
+            // Remove prefix from class
+            $class = substr($class, strlen($prefix));
+
+            // Replace namespace tokens to directory separators
+            $path = ltrim(preg_replace('#\\\|_(?!.+\\\)#', '/', $class), '/');
+            $file = $locator->findResource("themes://{$path}/{$path}.php");
+
+            // Load class
+            if (stream_resolve_include_path($file)) {
+              return include_once($file);
+            }
+        }
+
+        return false;
+    }
 }

system/src/Grav/Common/Twig/Twig.php

@@ -1,9 +1,13 @@
 <?php
-namespace Grav\Common;
+namespace Grav\Common\Twig;
 
+use Grav\Common\Grav;
 use Grav\Common\Config\Config;
 use Grav\Common\Page\Page;
+use Grav\Common\Inflector;
+use Grav\Common\Utils;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+use RocketTheme\Toolbox\Event\Event;
 
 /**
  * The Twig object handles all the Twig template rendering for Grav. It's a singleton object
@@ -57,6 +61,7 @@ class Twig
     public function __construct(Grav $grav)
     {
         $this->grav = $grav;
+        $this->twig_paths = [];
     }
 
     /**
@@ -72,7 +77,23 @@ class Twig
             $locator = $this->grav['locator'];
             $debugger = $this->grav['debugger'];
 
-            $this->twig_paths = $locator->findResources('theme://templates');
+            /** @var Language $language */
+            $language = $this->grav['language'];
+
+            $active_language = $language->getActive();
+
+            $language_append = $active_language ? '/'.$active_language : '';
+
+            // handle language templates if available
+            if ($language->enabled()) {
+                $lang_templates = $locator->findResource('theme://templates/'.($active_language ? $active_language : $language->getDefault()));
+                if ($lang_templates) {
+                    $this->twig_paths[] = $lang_templates;
+                }
+            }
+
+            $this->twig_paths = array_merge($this->twig_paths, $locator->findResources('theme://templates'));
+
             $this->grav->fireEvent('onTwigTemplatePaths');
 
             $this->loader = new \Twig_Loader_Filesystem($this->twig_paths);
@@ -84,12 +105,7 @@ class Twig
                 $params['cache'] = $locator->findResource('cache://twig', true, true);
             }
 
-            $this->twig = new \Twig_Environment($loader_chain, $params);
-            if ($debugger->enabled() && $config->get('system.debugger.twig')) {
-                $this->twig = new \DebugBar\Bridge\Twig\TraceableTwigEnvironment($this->twig);
-                $collector = new \DebugBar\Bridge\Twig\TwigCollector($this->twig);
-                $debugger->addCollector($collector);
-            }
+            $this->twig = new TwigEnvironment($loader_chain, $params);
 
             if ($config->get('system.twig.undefined_functions')) {
                 $this->twig->registerUndefinedFunctionCallback(function ($name) {
@@ -127,13 +143,13 @@ class Twig
 
             // Set some standard variables for twig
             $this->twig_vars = array(
-                'grav' => $this->grav,
                 'config' => $config,
                 'uri' => $this->grav['uri'],
                 'base_dir' => rtrim(ROOT_DIR, '/'),
-                'base_url' => $this->grav['base_url'],
-                'base_url_absolute' => $this->grav['base_url_absolute'],
-                'base_url_relative' => $this->grav['base_url_relative'],
+                'base_url' => $this->grav['base_url'] . $language_append,
+                'base_url_simple' => $this->grav['base_url'],
+                'base_url_absolute' => $this->grav['base_url_absolute'] . $language_append,
+                'base_url_relative' => $this->grav['base_url_relative'] . $language_append,
                 'theme_dir' => $locator->findResource('theme://'),
                 'theme_url' => $this->grav['base_url'] .'/'. $locator->findResource('theme://', false),
                 'site' => $config->get('site'),
@@ -186,7 +202,7 @@ class Twig
         $content = $content !== null ? $content : $item->content();
 
         // override the twig header vars for local resolution
-        $this->grav->fireEvent('onTwigPageVariables');
+        $this->grav->fireEvent('onTwigPageVariables',  new Event(['page' => $item]));
         $twig_vars = $this->twig_vars;
 
         $twig_vars['page'] = $item;
@@ -283,30 +299,40 @@ class Twig
         $this->grav->fireEvent('onTwigSiteVariables');
         $pages = $this->grav['pages'];
         $page = $this->grav['page'];
+        $content = $page->content();
+        $config = $this->grav['config'];
 
         $twig_vars = $this->twig_vars;
 
         $twig_vars['pages'] = $pages->root();
         $twig_vars['page'] = $page;
         $twig_vars['header'] = $page->header();
-        $twig_vars['content'] = $page->content();
+        $twig_vars['media'] = $page->media();
+        $twig_vars['content'] = $content;
         $ext = '.' . ($format ? $format : 'html') . TWIG_EXT;
 
+        // determine if params are set, if so disable twig cache
+        $params = $this->grav['uri']->params(null, true);
+        if (!empty($params)) {
+            $this->twig->setCache(false);
+        }
+
         // Get Twig template layout
         $template = $this->template($page->template() . $ext);
 
         try {
             $output = $this->twig->render($template, $twig_vars);
         } catch (\Twig_Error_Loader $e) {
-            // If loader error, and not .html.twig, try it as fallback
+            $error_msg = $e->getMessage();
+            // Try html version of this template if initial template was NOT html
             if ($ext != '.html'.TWIG_EXT) {
                 try {
                     $output = $this->twig->render($page->template().'.html'.TWIG_EXT, $twig_vars);
                 } catch (\Twig_Error_Loader $e) {
-                    throw new \RuntimeException($e->getRawMessage(), 404, $e);
+                    throw new \RuntimeException($error_msg, 400, $e);
                 }
             } else {
-                throw new \RuntimeException($e->getRawMessage(), 404, $e);
+                throw new \RuntimeException($error_msg, 400, $e);
             }
         }
 

system/src/Grav/Common/Twig/TwigEnvironment.php

@@ -0,0 +1,16 @@
+<?php
+namespace Grav\Common\Twig;
+
+use Grav\Common\GravTrait;
+
+/**
+ * The Twig Environment class is a wrapper that handles configurable permissions
+ * for the Twig cache files
+ *
+ * @author RocketTheme
+ * @license MIT
+ */
+class TwigEnvironment extends \Twig_Environment
+{
+    use WriteCacheFileTrait;
+}

system/src/Grav/Common/Twig/TwigExtension.php

@@ -1,11 +1,12 @@
 <?php
-namespace Grav\Common;
+namespace Grav\Common\Twig;
 
+use Grav\Common\Grav;
+use Grav\Common\Utils;
 use Grav\Common\Markdown\Parsedown;
 use Grav\Common\Markdown\ParsedownExtra;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
-
 /**
  * The Twig extension adds some filters and functions that are useful for Grav
  *
@@ -16,11 +17,13 @@ class TwigExtension extends \Twig_Extension
 {
     protected $grav;
     protected $debugger;
+    protected $config;
 
     public function __construct()
     {
         $this->grav = Grav::instance();
         $this->debugger = isset($this->grav['debugger']) ? $this->grav['debugger'] : null;
+        $this->config = $this->grav['config'];
     }
 
     /**
@@ -33,6 +36,18 @@ class TwigExtension extends \Twig_Extension
         return 'GravTwigExtension';
     }
 
+    /**
+     * Register some standard globals
+     *
+     * @return array
+     */
+    public function getGlobals()
+    {
+        return array(
+            'grav' => $this->grav,
+        );
+    }
+
     /**
      * Return a list of all filters.
      *
@@ -41,18 +56,29 @@ class TwigExtension extends \Twig_Extension
     public function getFilters()
     {
         return [
-            new \Twig_SimpleFilter('fieldName', [$this,'fieldNameFilter']),
-            new \Twig_SimpleFilter('safe_email', [$this,'safeEmailFilter']),
-            new \Twig_SimpleFilter('randomize', [$this,'randomizeFilter']),
-            new \Twig_SimpleFilter('truncate', [$this,'truncateFilter']),
             new \Twig_SimpleFilter('*ize', [$this,'inflectorFilter']),
-            new \Twig_SimpleFilter('md5', [$this,'md5Filter']),
-            new \Twig_SimpleFilter('sort_by_key', [$this,'sortByKeyFilter']),
-            new \Twig_SimpleFilter('ksort', [$this,'ksortFilter']),
-            new \Twig_SimpleFilter('contains', [$this, 'containsFilter']),
-            new \Twig_SimpleFilter('nicetime', [$this, 'nicetimeFilter']),
             new \Twig_SimpleFilter('absolute_url', [$this, 'absoluteUrlFilter']),
-            new \Twig_SimpleFilter('markdown', [$this, 'markdownFilter'])
+            new \Twig_SimpleFilter('contains', [$this, 'containsFilter']),
+            new \Twig_SimpleFilter('defined', [$this, 'definedDefaultFilter']),
+            new \Twig_SimpleFilter('ends_with', [$this, 'endsWithFilter']),
+            new \Twig_SimpleFilter('fieldName', [$this,'fieldNameFilter']),
+            new \Twig_SimpleFilter('ksort', [$this,'ksortFilter']),
+            new \Twig_SimpleFilter('ltrim', [$this, 'ltrimFilter']),
+            new \Twig_SimpleFilter('markdown', [$this, 'markdownFilter']),
+            new \Twig_SimpleFilter('md5', [$this,'md5Filter']),
+            new \Twig_SimpleFilter('nicetime', [$this, 'nicetimeFilter']),
+            new \Twig_SimpleFilter('randomize', [$this,'randomizeFilter']),
+            new \Twig_SimpleFilter('modulus', [$this,'modulusFilter']),
+            new \Twig_SimpleFilter('rtrim', [$this, 'rtrimFilter']),
+            new \Twig_SimpleFilter('safe_email', [$this,'safeEmailFilter']),
+            new \Twig_SimpleFilter('safe_truncate', ['\Grav\Common\Utils','safeTruncate']),
+            new \Twig_SimpleFilter('safe_truncate_html', ['\Grav\Common\Utils','safeTruncateHTML']),
+            new \Twig_SimpleFilter('sort_by_key', [$this,'sortByKeyFilter']),
+            new \Twig_SimpleFilter('starts_with', [$this, 'startsWithFilter']),
+            new \Twig_SimpleFilter('t', [$this, 'translate']),
+            new \Twig_SimpleFilter('ta', [$this, 'translateArray']),
+            new \Twig_SimpleFilter('truncate', ['\Grav\Common\Utils','truncate']),
+            new \Twig_SimpleFilter('truncate_html', ['\Grav\Common\Utils','truncateHTML']),
         ];
     }
 
@@ -64,12 +90,18 @@ class TwigExtension extends \Twig_Extension
     public function getFunctions()
     {
         return [
-            new \Twig_SimpleFunction('repeat', [$this, 'repeatFunc']),
-            new \Twig_SimpleFunction('url', [$this, 'urlFunc']),
-            new \Twig_SimpleFunction('dump', [$this, 'dump'], ['needs_context' => true, 'needs_environment' => true]),
+            new \Twig_SimpleFunction('array', [$this, 'arrayFunc']),
+            new \Twig_simpleFunction('authorize', [$this, 'authorize']),
             new \Twig_SimpleFunction('debug', [$this, 'dump'], ['needs_context' => true, 'needs_environment' => true]),
+            new \Twig_SimpleFunction('dump', [$this, 'dump'], ['needs_context' => true, 'needs_environment' => true]),
             new \Twig_SimpleFunction('gist', [$this, 'gistFunc']),
             new \Twig_simpleFunction('random_string', [$this, 'randomStringFunc']),
+            new \Twig_SimpleFunction('repeat', [$this, 'repeatFunc']),
+            new \Twig_SimpleFunction('string', [$this, 'stringFunc']),
+            new \Twig_simpleFunction('t', [$this, 'translate']),
+            new \Twig_simpleFunction('ta', [$this, 'translateArray']),
+            new \Twig_SimpleFunction('url', [$this, 'urlFunc']),
+            new \Twig_SimpleFunction('evaluate', [$this, 'evaluateFunc']),
         ];
     }
 
@@ -97,38 +129,11 @@ class TwigExtension extends \Twig_Extension
         $email = '';
         $str_len = strlen($str);
         for ($i = 0; $i < $str_len; $i++) {
-            $email .= "&#" . ord($str[$i]);
+            $email .= "&#" . ord($str[$i]). ";";
         }
         return $email;
     }
 
-    /**
-     * Truncate content by a limit.
-     *
-     * @param  string $string
-     * @param  int    $limit    Nax number of characters.
-     * @param  string $break    Break point.
-     * @param  string $pad      Appended padding to the end of the string.
-     * @return string
-     */
-    public function truncateFilter($string, $limit = 150, $break = ".", $pad = "&hellip;")
-    {
-        // return with no change if string is shorter than $limit
-        if (strlen($string) <= $limit) {
-            return $string;
-        }
-
-        // is $break present between $limit and the end of the string?
-        if (false !== ($breakpoint = strpos($string, $break, $limit))) {
-            if ($breakpoint < strlen($string) - 1) {
-                $string = substr($string, 0, $breakpoint) . $pad;
-            }
-        }
-
-        return $string;
-    }
-
-
     /**
      * Returns array in a random order.
      *
@@ -161,6 +166,32 @@ class TwigExtension extends \Twig_Extension
         return $sorted;
     }
 
+    /**
+     * Returns the modulus of an integer
+     *
+     * @param  int $number
+     * @param  int $divider
+     * @param  array $items array of items to select from to return
+     * @return int
+     */
+     public function modulusFilter($number, $divider, $items = null)
+     {
+         if (is_string($number)) {
+             $number = strlen($number);
+         }
+
+         $remainder = $number % $divider;
+
+         if (is_array($items)) {
+             if (isset($items[$remainder])) {
+                 return $items[$remainder];
+             } else {
+                 return $items[0];
+             }
+         }
+         return $remainder;
+     }
+
     /**
      * Inflector supports following notations:
      *
@@ -181,19 +212,20 @@ class TwigExtension extends \Twig_Extension
      */
     public function inflectorFilter($action, $data, $count = null)
     {
-        // TODO: check this and fix the docblock if needed.
         $action = $action.'ize';
 
+        $inflector = $this->grav['inflector'];
+
         if (in_array(
             $action,
             ['titleize','camelize','underscorize','hyphenize', 'humanize','ordinalize','monthize']
         )) {
-            return Inflector::$action($data);
+            return $inflector->$action($data);
         } elseif (in_array($action, ['pluralize','singularize'])) {
             if ($count) {
-                return Inflector::$action($data, $count);
+                return $inflector->$action($data, $count);
             } else {
-                return Inflector::$action($data);
+                return $inflector->$action($data);
             }
         } else {
             return $data;
@@ -274,13 +306,13 @@ class TwigExtension extends \Twig_Extension
     public function nicetimeFilter($date, $long_strings = true)
     {
         if (empty($date)) {
-            return "No date provided";
+            return $this->grav['language']->translate('NICETIME.NO_DATE_PROVIDED', null, true);
         }
 
         if ($long_strings) {
-            $periods = array("second", "minute", "hour", "day", "week", "month", "year", "decade");
+            $periods = array("NICETIME.SECOND", "NICETIME.MINUTE", "NICETIME.HOUR", "NICETIME.DAY", "NICETIME.WEEK", "NICETIME.MONTH", "NICETIME.YEAR", "NICETIME.DECADE");
         } else {
-            $periods = array("sec", "min", "hr", "day", "wk", "mo", "yr", "dec");
+            $periods = array("NICETIME.SEC", "NICETIME.MIN", "NICETIME.HR", "NICETIME.DAY", "NICETIME.WK", "NICETIME.MO", "NICETIME.YR", "NICETIME.DEC");
         }
 
         $lengths         = array("60","60","24","7","4.35","12","10");
@@ -296,17 +328,17 @@ class TwigExtension extends \Twig_Extension
 
         // check validity of date
         if (empty($unix_date)) {
-            return "Bad date";
+            return $this->grav['language']->translate('NICETIME.BAD_DATE', null, true);
         }
 
         // is it future date or past date
         if ($now > $unix_date) {
             $difference     = $now - $unix_date;
-            $tense         = "ago";
+            $tense         = $this->grav['language']->translate('NICETIME.AGO', null, true);
 
         } else {
             $difference     = $unix_date - $now;
-            $tense         = "from now";
+            $tense         = $this->grav['language']->translate('NICETIME.FROM_NOW', null, true);
         }
 
         for ($j = 0; $difference >= $lengths[$j] && $j < count($lengths)-1; $j++) {
@@ -316,9 +348,11 @@ class TwigExtension extends \Twig_Extension
         $difference = round($difference);
 
         if ($difference != 1) {
-            $periods[$j].= "s";
+            $periods[$j] .= '_PLURAL';
         }
 
+        $periods[$j] = $this->grav['language']->translate($periods[$j], null, true);
+
         return "$difference $periods[$j] {$tense}";
     }
 
@@ -333,7 +367,7 @@ class TwigExtension extends \Twig_Extension
     public function markdownFilter($string)
     {
         $page = $this->grav['page'];
-        $defaults = $this->grav['config']->get('system.pages.markdown');
+        $defaults = $this->config->get('system.pages.markdown');
 
         // Initialize the preferred variant of Parsedown
         if ($defaults['extra']) {
@@ -347,6 +381,45 @@ class TwigExtension extends \Twig_Extension
         return $string;
     }
 
+    public function startsWithFilter($haystack, $needle)
+    {
+        return Utils::startsWith($haystack, $needle);
+    }
+
+    public function endsWithFilter($haystack, $needle)
+    {
+        return Utils::endsWith($haystack, $needle);
+    }
+
+    public function definedDefaultFilter($value, $default = null)
+    {
+        if (isset($value)) {
+            return $value;
+        } else {
+            return $default;
+        }
+    }
+
+    public function rtrimFilter($value, $chars = null)
+    {
+        return rtrim($value, $chars);
+    }
+
+    public function ltrimFilter($value, $chars = null)
+    {
+        return ltrim($value, $chars);
+    }
+
+    public function translate()
+    {
+        return $this->grav['language']->translate(func_get_args());
+    }
+
+    public function translateArray($key, $index, $lang = null)
+    {
+        return $this->grav['language']->translateArray($key, $index, $lang);
+    }
+
     /**
      * Repeat given string x times.
      *
@@ -390,6 +463,19 @@ class TwigExtension extends \Twig_Extension
         return $resource ? rtrim($uri->rootUrl($domain), '/') . '/' . $resource : null;
     }
 
+    /**
+     * Evaluate a string
+     *
+     * @example {{ evaluate('grav.language.getLanguage') }}
+     *
+     * @param  string $input    String to be evaluated
+     * @return string           Returns the evaluated string
+     */
+    public function evaluateFunc($input)
+    {
+        return $this->grav['twig']->processString("{{ $input }}");
+    }
+
     /**
      * Based on Twig_Extension_Debug / twig_var_dump
      * (c) 2011 Fabien Potencier
@@ -447,4 +533,66 @@ class TwigExtension extends \Twig_Extension
     {
         return Utils::generateRandomString($count);
     }
+
+    /**
+     * Cast a value to array
+     *
+     * @param $value
+     *
+     * @return array
+     */
+    public function arrayFunc($value)
+    {
+        return (array) $value;
+    }
+
+    /**
+     * Returns a string from a value. If the value is array, return it json encoded
+     *
+     * @param $value
+     *
+     * @return string
+     */
+    public function stringFunc($value)
+    {
+        if (is_array($value)) { //format the array as a string
+            return json_encode($value);
+        } else {
+            return $value;
+        }
+    }
+
+    /**
+     * Translate a string
+     *
+     * @return string
+     */
+    public function translateFunc()
+    {
+        return $this->grav['language']->translate(func_get_args());
+    }
+
+    /**
+     * Authorize an action. Returns true if the user is logged in and has the right to execute $action.
+     *
+     * @param string $action
+     *
+     * @return bool
+     */
+    public function authorize($action)
+    {
+        if (!$this->grav['user']->authenticated) {
+            return false;
+        }
+
+        $action = (array)$action;
+
+        foreach ($action as $a) {
+            if ($this->grav['user']->authorize($a)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }