Merge branch 'release/1.1.9'

Added new parameter `remove` for `onBeforeCacheClear` event

.gitignore

@@ -1,6 +1,7 @@
 # Composer
 .composer
-/vendor
+vendor/*
+!*/vendor/*
 
 # Sass
 .sass-cache

.htaccess

@@ -13,6 +13,16 @@ RewriteEngine On
 
 ## End - RewriteBase
 
+## Begin - X-Forwarded-Proto
+# In some hosted or load balanced environments, SSL negotiation happens upstream.
+# In order for Grav to recognize the connection as secure, you need to uncomment
+# the following lines.
+#
+# RewriteCond %{HTTP:X-Forwarded-Proto} https
+# RewriteRule .* - [E=HTTPS:on]
+#
+## End - X-Forwarded-Proto
+
 ## Begin - Exploits
 # If you experience problems on your site block out the operations listed below
 # This attempts to block the most common type of exploit `attempts` to Grav

.travis.yml

@@ -43,8 +43,6 @@ env:
     - secure: "einUtSEkUWy2IrqLXyVjwUU+mwaaoiOXRRVdLBpA3Zye6bZx8cm5h/5AplkPWhM/NmCJoW/MwNZHHkFhlr3mDRov5iOxVmTTYfnXB+I5lxYTSgduOLLErS7mU8hfADpVDU8bHNU44fNGD3UEiG1PD4qQBX4DMlqIFmR20mjs81k="
     # GH_API_USER [for curl]
     - secure: "AQGcX1B2NrI8ajflY4AimZDNcK2kBA3F6mbtEFQ78NkDoWhMipsQHayWXiSTzRc0YJKvQl2Y16MTwQF4VHzjTAiiZFATgA8J88vQUjIPabi/kKjqSmcLFoaAOAxStQbW6e0z2GiQ6KBMcNF1y5iUuI63xVrBvtKrYX/w5y+ako8="
-    # Latest Release version
-    - TRAVIS_TAG=$(curl --fail -s https://api.github.com/repos/getgrav/grav/releases/latest | grep tag_name | head -n 1 | cut -d '"' -f 4)
 
 before_install:
   - export TZ=Pacific/Honolulu
@@ -56,6 +54,7 @@ before_install:
         composer install --dev --prefer-dist;
     fi
   - if [ $TRAVIS_BRANCH != 'develop' ] && [ $TRAVIS_PHP_VERSION == "5.6" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
+        export TRAVIS_TAG=$(curl --fail --user "${GH_API_USER}" -s https://api.github.com/repos/getgrav/grav/releases/latest | grep tag_name | head -n 1 | cut -d '"' -f 4);
         go get github.com/aktau/github-release;
         git clone --quiet --depth=50 --branch=master https://${BB_TOKEN}bitbucket.org/rockettheme/grav-devtools.git $RT_DEVTOOLS  &>/dev/null;
         if [ ! -z "$TRAVIS_TAG" ]; then
@@ -69,7 +68,7 @@ script:
   - if [ $TRAVIS_BRANCH == 'develop' ] || [ $TRAVIS_PULL_REQUEST != 'false' ]; then
         vendor/bin/codecept run;
     fi
-  - echo $TRAVIS_TAG
+  - echo "Latest Release Tag - ${TRAVIS_TAG}"
   - if [ ! -z "$TRAVIS_TAG" ] && [ $TRAVIS_BRANCH != 'develop' ] && [ $TRAVIS_PHP_VERSION == "5.6" ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
       FILES="$RT_DEVTOOLS/grav-dist/*.zip";
       for file in ${FILES[@]}; do

CHANGELOG.md

@@ -1,8 +1,213 @@
+# v1.1.9
+## 12/13/2016
+
+1. [](#new)
+    * RC released as stable
+1. [](#improved)
+    * Better error handling in cache clear
+    * YAML syntax fixes for the future compatibility
+    * Added new parameter `remove` for `onBeforeCacheClear` event
+    * Add support for calling Media object as function to get medium by filename
+1. [](#bugfix)
+    * Added checks before accessing admin reference during `Page::blueprints()` call. Allows to access `page.blueprints` from Twig in the frontend
+
+# v1.1.9-rc.3
+## 12/07/2016
+
+1. [](#new)
+    * Add `ignore_empty` property to be used on array fields, if positive only save options with a value
+    * Use new `permissions` field in user account
+    * Add `range(int start, int end, int step)` twig function to generate an array of numbers between start and end, inclusive
+    * New retina Media image derivatives array support (`![](image.jpg?derivatives=[640,1024,1440])`) [#1147](https://github.com/getgrav/grav/pull/1147)
+    * Added stream support for images (`![Sepia Image](image://image.jpg?sepia)`)
+    * Added stream support for links (`[Download PDF](user://data/pdf/my.pdf)`)
+    * Added new `onBeforeCacheClear` event to add custom paths to cache clearing process
+1. [](#improved)
+    * Added alias `selfupdate` to the `self-upgrade` `bin/gpm` CLI command
+    * Synced `webserver-configs/htaccess.txt` with `.htaccess`
+    * Use permissions field in group details.
+    * Updated vendor libraries
+    * Added a warning on GPM update to update Grav first if needed [#1194](https://github.com/getgrav/grav/pull/1194)
+ 1. [](#bugfix)
+    * Fix page collections problem with `@page.modular` [#1178](https://github.com/getgrav/grav/pull/1178)
+    * Fix issue with using a multiple taxonomy filter of which one had no results, thanks to @hughbris [#1184](https://github.com/getgrav/grav/issues/1184)
+    * Fix saving permissions in group
+    * Fixed issue with redirect of a page getting moved to a different location
+
+# v1.1.9-rc.2
+## 11/26/2016
+
+1. [](#new)
+    * Added two new sort order options for pages: `publish_date` and `unpublish_date` [#1173](https://github.com/getgrav/grav/pull/1173))
+1. [](#improved)
+    * Multisite: Create image cache folder if it doesn't exist
+    * Add 2 new language values for French [#1174](https://github.com/getgrav/grav/issues/1174)
+1. [](#bugfix)
+    * Fixed issue when we have a meta file without corresponding media [#1179](https://github.com/getgrav/grav/issues/1179)
+    * Update class namespace for Admin class [#874](https://github.com/getgrav/grav-plugin-admin/issues/874)
+
+# v1.1.9-rc.1
+## 11/09/2016
+
+1. [](#new)
+    * Added a `CompiledJsonFile` object to better handle Json files.
+    * Added Base32 encode/decode class
+    * Added a new `User::find()` method
+1. [](#improved)
+    * Moved `messages` object into core Grav from login plugin
+    * Added `getTaxonomyItemKeys` to the Taxonomy object [#1124](https://github.com/getgrav/grav/issues/1124)
+    * Added a `redirect_me` Twig function [#1124](https://github.com/getgrav/grav/issues/1124)
+    * Added a Caddyfile for newer Caddy versions [#1115](https://github.com/getgrav/grav/issues/1115)
+    * Allow to override sorting flags for page header-based or default ordering. If the `intl` PHP extension is loaded, only these flags are available: https://secure.php.net/manual/en/collator.asort.php. Otherwise, you can use the PHP standard sorting flags (https://secure.php.net/manual/en/array.constants.php) [#1169](https://github.com/getgrav/grav/issues/1169)
+1. [](#bugfix)
+    * Fixed an issue with site redirects/routes, not processing with extension (.html, .json, etc.)
+    * Don't truncate HTML if content length is less than summary size [#1125](https://github.com/getgrav/grav/issues/1125)
+    * Return max available number when calling random() on a collection passing an int > available items [#1135](https://github.com/getgrav/grav/issues/1135)
+    * Use correct ratio when applying image filters to image alternatives [#1147](https://github.com/getgrav/grav/issues/1147)
+    * Fixed URI path in multi-site when query parameters were used in front page
+
+# v1.1.8
+## 10/22/2016
+
+1. [](#bugfix)
+    * Fixed warning with unset `ssl` option when using GPM [#1132](https://github.com/getgrav/grav/issues/1132)
+
+# v1.1.7
+## 10/22/2016
+
+1. [](#improved)
+    * Improved the capabilities of Image derivatives [#1107](https://github.com/getgrav/grav/pull/1107)
+1. [](#bugfix)
+    * Only pass verify_peer settings to cURL and fopen if the setting is disabled [#1120](https://github.com/getgrav/grav/issues/1120)
+
+# v1.1.6
+## 10/19/2016
+
+1. [](#new)
+    * Added ability for Page to override the output format (`html`, `xml`, etc..) [#1067](https://github.com/getgrav/grav/issues/1067)
+    * Added `Utils::getExtensionByMime()` and cleaned up `Utils::getMimeByExtension` + tests
+    * Added a `cache.check.method: 'hash'` option in `system.yaml` that checks all files + dates inclusively
+    * Include jQuery 3.x in the Grav assets
+    * Added the option to automatically fix orientation on images based on their Exif data, by enabling `system.images.auto_fix_orientation`.
+1. [](#improved)
+    * Add `batch()` function to Page Collection class
+    * Added new `cache.redis.socket` setting that allow to pass a UNIX socket as redis server
+    * It is now possible to opt-out of the SSL verification via the new `system.gpm.verify_peer` setting. This is sometimes necessary when receiving a "GPM Unable to Connect" error. More details in ([#1053](https://github.com/getgrav/grav/issues/1053))
+    * It is now possible to force the use of either `curl` or `fopen` as `Response` connection method, via the new `system.gpm.method` setting. By default this is set to 'auto' and gives priority to 'fopen' first, curl otherwise.
+    * InstallCommand can now handle Licenses
+    * Uses more helpful `1x`, `2x`, `3x`, etc names in the Retina derivatives cache files.
+    * Added new method `Plugins::isPluginActiveAdmin()` to check if plugin route is active in Admin plugin
+    * Added new `Cache::setEnabled` and `Cache::getEnabled` to enable outside control of cache
+    * Updated vendor libs including Twig `1.25.0`
+    * Avoid git ignoring any vendor folder in a Grav site subfolder (but still ignore the main `vendor/` folder)
+    * Added an option to get just a route back from `Uri::convertUrl()` function
+    * Added option to control split session [#1096](https://github.com/getgrav/grav/pull/1096)
+    * Added new `verbosity` levels to `system.error.display` to allow for system error messages [#1091](https://github.com/getgrav/grav/pull/1091)
+    * Improved the API for Grav plugins to access the Parsedown parser directly [#1062](https://github.com/getgrav/grav/pull/1062)
+1. [](#bugfix)
+    * Fixed missing `progress` method in the DirectInstall Command
+    * `Response` class now handles better unsuccessful requests such as 404 and 401
+    * Fixed saving of `external` page types [admin #789](https://github.com/getgrav/grav-plugin-admin/issues/789)
+    * Fixed issue deleting parent folder of folder with `param_sep` in the folder name [admin #796](https://github.com/getgrav/grav-plugin-admin/issues/796)
+    * Fixed an issue with streams in `bin/plugin`
+    * Fixed `jpeg` file format support in Media
+
+# v1.1.5
+## 09/09/2016
+
+1. [](#new)
+    * Added new `bin/gpm direct-install` command to install local and remote zip archives
+1. [](#improved)
+    * Refactored `onPageNotFound` event to fire after `onPageInitialized`
+    * Follow symlinks in `Folder::all()`
+    * Twig variable `base_url` now supports multi-site by path feature
+    * Improved `bin/plugin` to list plugins with commands faster by limiting the depth of recursion
+1. [](#bugfix)
+    * Quietly skip missing streams in `Cache::clearCache()`
+    * Fix issue in calling page.summary when no content is present in a page
+    * Fix for HUGE session timeouts [#1050](https://github.com/getgrav/grav/issues/1050)
+
+# v1.1.4
+## 09/07/2016
+
+1. [](#new)
+    * Added new `tmp` folder at root. Accessible via stream `tmp://`. Can be cleared with `bin/grav clear --tmp-only` as well as `--all`.
+    * Added support for RTL in `LanguageCodes` so you can determine if a language is RTL or not
+    * Ability to set `custom_base_url` in system configuration
+    * Added `override` and `force` options for Streams setup
+1. [](#improved)
+    * Important vendor updates to provide PHP 7.1 beta support!
+    * Added a `Util::arrayFlatten()` static function
+    * Added support for 'external_url' page header to enable easier external URL based menu items
+    * Improved the UI for CLI GPM Index view to use a table
+    * Added `@page.modular` Collection type [#988](https://github.com/getgrav/grav/issues/988)
+    * Added support for `self@`, `page@`, `taxonomy@`, `root@` Collection syntax for cleaner YAML compatibility
+    * Improved GPM commands to allow for `-y` to automate **yes** responses and `-o` for **update** and **selfupgrade** to overwrite installations [#985](https://github.com/getgrav/grav/issues/985)
+    * Added randomization to `safe_email` Twig filter for greater security [#998](https://github.com/getgrav/grav/issues/998)
+    * Allow `Utils::setDotNotation` to merge data, rather than just set
+    * Moved default `Image::filter()` to the `save` action to ensure they are applied last [#984](https://github.com/getgrav/grav/issues/984)
+    * Improved the `Truncator` code to be more reliable [#1019](https://github.com/getgrav/grav/issues/1019)
+    * Moved media blueprints out of core (now in Admin plugin)
+1. [](#bugfix)
+    * Removed 307 redirect code option as it is not well supported [#743](https://github.com/getgrav/grav-plugin-admin/issues/743)
+    * Fixed issue with folders with name `*.md` are not confused with pages [#995](https://github.com/getgrav/grav/issues/995)
+    * Fixed an issue when filtering collections causing null key
+    * Fix for invalid HTML when rendering GIF and Vector media [#1001](https://github.com/getgrav/grav/issues/1001)
+    * Use pages.markdown.extra in the user's system.yaml [#1007](https://github.com/getgrav/grav/issues/1007)
+    * Fix for `Memcached` connection [#1020](https://github.com/getgrav/grav/issues/1020)
+
+# v1.1.3
+## 08/14/2016
+
+1. [](#bugfix)
+    * Fix for lightbox media function throwing error [#981](https://github.com/getgrav/grav/issues/981)
+
+# v1.1.2
+## 08/10/2016
+
+1. [](#new)
+    * Allow forcing SSL by setting `system.force_ssl` (Force SSL in the Admin System Config) [#899](https://github.com/getgrav/grav/pull/899)
+1. [](#improved)
+    * Improved `authorize` Twig extension to accept a nested array of authorizations  [#948](https://github.com/getgrav/grav/issues/948)
+    * Don't add timestamps on remote assets as it can cause conflicts
+    * Grav now looks at types from `media.yaml` when retrieving page mime types [#966](https://github.com/getgrav/grav/issues/966)
+    * Added support for dumping exceptions in the Debugger
+1. [](#bugfix)
+    * Fixed `Folder::delete` method to recursively remove files and folders and causing Upgrade to fail.
+    * Fix [#952](https://github.com/getgrav/grav/issues/952) hyphenize the session name.
+    * If no parent is set and siblings collection is called, return a new and empty collection [grav-plugin-sitemap/issues/22](https://github.com/getgrav/grav-plugin-sitemap/issues/22)
+    * Prevent exception being thrown when calling the Collator constructor failed in a Windows environment with the Intl PHP Extension enabled [#961](https://github.com/getgrav/grav/issues/961)
+    * Fix for markdown images not properly rendering `id` attribute [#956](https://github.com/getgrav/grav/issues/956)
+
+# v1.1.1
+## 07/16/2016
+
+1. [](#improved)
+    * Made `paramsRegex()` static to allow it to be called statically
+1. [](#bugfix)
+    * Fixed backup when using very long site titles with invalid characters [grav-plugin-admin#701](https://github.com/getgrav/grav-plugin-admin/issues/701)
+    * Fixed a typo in the `webserver-configs/nginx.conf` example
+
+# v1.1.0
+## 07/14/2016
+
+1. [](#improved)
+    * Added support for validation of multiple email in the `type: email` field [grav-plugin-email#31](https://github.com/getgrav/grav-plugin-email/issues/31)
+    * Unified PHP code header styling
+    * Added 6 more languages and updated language codes
+    * set default "releases" option to `stable`
+1. [](#bugfix)
+    * Fix backend validation for file fields marked as required [grav-plugin-form#78](https://github.com/getgrav/grav-plugin-form/issues/78)
+
 # v1.1.0-rc.3
 ## 06/21/2016
 
 1. [](#new)
     * Add a onPageFallBackUrl event when starting the fallbackUrl() method to allow the Login plugin to protect the page media
+    * Conveniently allow ability to retrieve user information via config object [#913](https://github.com/getgrav/grav/pull/913) - @Vivalldi
+    * Grav served images can now use header caching [#905](https://github.com/getgrav/grav/pull/905)
+1. [](#improved)
+    * Take asset modification timestamp into consideration in pipelining [#917](https://github.com/getgrav/grav/pull/917) - @Sommerregen
 1. [](#bugfix)
     * Respect `enable_asset_timestamp` settings for pipelined Assets [#906](https://github.com/getgrav/grav/issues/906)
     * Fixed collections end dates for 32-bit systems [#902](https://github.com/getgrav/grav/issues/902)
@@ -793,7 +998,7 @@
     * 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
+    * Use `PHP_BINARY` constant rather than `php` executable
     * Updated Doctrine Cache library
     * Updated Symfony libraries
     * Moved `convertUrl()` method to Uri object

CONTRIBUTING.md

@@ -55,6 +55,8 @@ Guidelines for bug reports:
 6. **Isolate the problem** — create a [reduced test
    case](http://css-tricks.com/reduced-test-cases/) and provide a step-by-step instruction set on how to recreate the problem. Include code samples, page snippets or yaml configurations if needed.
 
+7. **Check the problem on Grav 1.1** — if you're using Grav 1.0, latest stable release, please also check if you can replicate the issue on Grav 1.1 RC as many bugs are already solved in the next Grav release.
+
 A good bug report shouldn't leave others needing to chase you up for more
 information. Please try to be as detailed as possible in your report.
 
@@ -119,4 +121,4 @@ accurate comments, etc.) and any other requirements.
 See [Using Pull Request](https://help.github.com/articles/using-pull-requests/) and [Fork a Repo](https://help.github.com/articles/fork-a-repo/) if you're not familiar with Pull Requests.
 
 **IMPORTANT**: By submitting a patch, you agree to allow the project owner to
-license your work under the same license as that used by the project.
+license your work under the same license as that used by the project.

bin/gpm

@@ -7,6 +7,7 @@ if (!file_exists(__DIR__ . '/../vendor')){
 }
 
 use Grav\Common\Composer;
+use Grav\Common\Config\Setup;
 
 if (!file_exists(__DIR__ . '/../vendor')){
     // Before we can even start, we need to run composer first
@@ -37,9 +38,24 @@ if (!function_exists('curl_version')) {
     exit('FATAL: GPM requires PHP Curl module to be installed');
 }
 
+$climate = new League\CLImate\CLImate;
+$climate->arguments->add([
+    'environment' => [
+        'prefix'        => 'e',
+        'longPrefix'    => 'env',
+        'description'   => 'Configuration Environment',
+        'defaultValue'  => 'localhost'
+    ]
+]);
+$climate->arguments->parse();
+$environment = $climate->arguments->get('environment');
+
+// Set up environment based on params.
+Setup::$environment = $environment;
+
 $grav = Grav::instance(array('loader' => $autoload));
-$grav['config']->init();
 $grav['uri']->init();
+$grav['config']->init();
 $grav['streams'];
 
 $app = new Application('Grav Package Manager', GRAV_VERSION);
@@ -51,7 +67,7 @@ $app->addCommands(array(
     new \Grav\Console\Gpm\UninstallCommand(),
     new \Grav\Console\Gpm\UpdateCommand(),
     new \Grav\Console\Gpm\SelfupgradeCommand(),
+    new \Grav\Console\Gpm\DirectInstallCommand(),
 ));
 
-$app->setDefaultCommand('index');
 $app->run();

bin/plugin

@@ -21,6 +21,7 @@ use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Grav\Common\Grav;
+use Grav\Common\Config\Setup;
 use Grav\Common\Filesystem\Folder;
 
 $autoload = require_once(__DIR__ . '/../vendor/autoload.php');
@@ -37,12 +38,29 @@ if (!file_exists(ROOT_DIR . 'index.php')) {
     exit('FATAL: Must be run from ROOT directory of Grav!');
 }
 
+$climate = new League\CLImate\CLImate;
+$climate->arguments->add([
+    'environment' => [
+        'prefix'        => 'e',
+        'longPrefix'    => 'env',
+        'description'   => 'Configuration Environment',
+        'defaultValue'  => 'localhost'
+    ]
+]);
+$climate->arguments->parse();
+$environment = $climate->arguments->get('environment');
+
+// Set up environment based on params.
+Setup::$environment = $environment;
+
 $grav = Grav::instance(array('loader' => $autoload));
+$grav['uri']->init();
 $grav['config']->init();
 $grav['streams'];
 $grav['plugins']->init();
 $grav['themes']->init();
 
+
 $app     = new Application('Grav Plugins Commands', GRAV_VERSION);
 $pattern = '([A-Z]\w+Command\.php)';
 
@@ -70,7 +88,7 @@ if (!$name) {
     $output->writeln('');
     $output->writeln("<red>Example:</red>");
     $output->writeln("  {$bin} error log -l 1 --trace");
-    $list = Folder::all('plugins://', ['compare' => 'Pathname', 'pattern' => '/\/cli\/' . $pattern . '$/usm']);
+    $list = Folder::all('plugins://', ['compare' => 'Pathname', 'pattern' => '/\/cli\/' . $pattern . '$/usm', 'levels' => 2]);
 
     if (count($list)) {
         $available = [];
@@ -101,14 +119,15 @@ if ($plugin === null) {
 $path = 'plugins://' . $name . '/cli';
 
 try {
-    $commands = Folder::all($path, ['compare' => 'Filename', 'pattern' => '/' . $pattern . '$/usm']);
+    $commands = Folder::all($path, ['compare' => 'Filename', 'pattern' => '/' . $pattern . '$/usm', 'levels' => 1]);
 } catch (\RuntimeException $e) {
     $output->writeln("<red>No Console Commands for <white>'{$name}'</white> where found in <white>'{$path}'</white></red>");
     exit;
 }
 
 foreach ($commands as $command_path) {
-    require_once "plugins://{$name}/cli/{$command_path}";
+    $full_path = $grav['locator']->findResource("plugins://{$name}/cli/{$command_path}");
+    require_once $full_path;
 
     $command_class = 'Grav\Plugin\Console\\' . preg_replace('/.php$/', '', $command_path);
     $command = new $command_class();

composer.json

@@ -19,14 +19,17 @@
         "filp/whoops": "~2.0",
         "matthiasmullie/minify": "^1.3",
         "monolog/monolog": "~1.0",
-        "gregwar/image": "~2.0",
+        "gregwar/image": "dev-master#72568cfbeb77515278f2ccb386fc344e874b7ae8",
         "donatj/phpuseragentparser": "~0.3",
         "pimple/pimple": "~3.0",
-        "rockettheme/toolbox": "dev-develop",
+        "rockettheme/toolbox": "~1.0",
         "maximebf/debugbar": "~1.10",
         "ext-mbstring": "*",
         "ext-openssl": "*",
-        "ext-curl": "*"
+        "ext-curl": "*",
+        "ext-zip": "*",
+        "league/climate": "^3.2",
+        "antoligy/dom-string-iterators": "^1.0"
     },
     "require-dev": {
         "codeception/codeception": "^2.1",

index.php

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Core
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav;
 
 // Ensure vendor libraries exist

system/blueprints/config/system.yaml

@@ -178,8 +178,9 @@ form:
                     help: PLUGIN_ADMIN.REDIRECT_DEFAULT_CODE_HELP
                     options:
                         301: 301 - Permanent
+                        302: 302 - Found
                         303: 303 - Other
-                        307: 307 - Temporary
+                        304: 304 - Not Modified
 
                 pages.redirect_trailing_slash:
                     type: toggle
@@ -513,7 +514,14 @@ form:
                     label: PLUGIN_ADMIN.MEMCACHED_PORT
                     help: PLUGIN_ADMIN.MEMCACHED_PORT_HELP
                     placeholder: "11211"
-                
+
+                cache.redis.socket:
+                    type: text
+                    size: medium
+                    label: PLUGIN_ADMIN.REDIS_SOCKET
+                    help: PLUGIN_ADMIN.REDIS_SOCKET_HELP
+                    placeholder: "/var/run/redis/redis.sock"
+
                 cache.redis.server:
                     type: text
                     size: medium
@@ -756,15 +764,16 @@ form:
 
             fields:
                 errors.display:
-                    type: toggle
+                    type: select
                     label: PLUGIN_ADMIN.DISPLAY_ERRORS
                     help: PLUGIN_ADMIN.DISPLAY_ERRORS_HELP
-                    highlight: 0
+                    size: medium
+                    highlight: 1
                     options:
-                        1: PLUGIN_ADMIN.YES
-                        0: PLUGIN_ADMIN.NO
-                    validate:
-                        type: bool
+                        -1: PLUGIN_ADMIN.ERROR_SYSTEM
+                        0: PLUGIN_ADMIN.ERROR_SIMPLE
+                        1: PLUGIN_ADMIN.ERROR_FULL_BACKTRACE
+
 
                 errors.log:
                     type: toggle
@@ -843,7 +852,6 @@ form:
                         '0755': '0755'
                         '0775': '0775'
 
-
                 images.debug:
                     type: toggle
                     label: PLUGIN_ADMIN.IMAGES_DEBUG
@@ -855,6 +863,17 @@ form:
                     validate:
                         type: bool
 
+                images.auto_fix_orientation:
+                    type: toggle
+                    label: PLUGIN_ADMIN.IMAGES_AUTO_FIX_ORIENTATION
+                    help: PLUGIN_ADMIN.IMAGES_AUTO_FIX_ORIENTATION_HELP
+                    highlight: 0
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
                 media.upload_limit:
                     type: text
                     append: bytes
@@ -953,6 +972,24 @@ form:
                     validate:
                         type: bool
 
+                session.path:
+                    type: text
+                    size: small
+                    label: PLUGIN_ADMIN.SESSION_PATH
+                    help: PLUGIN_ADMIN.SESSION_PATH_HELP
+
+                session.split:
+                    type: toggle
+                    label: PLUGIN_ADMIN.SESSION_SPLIT
+                    help: PLUGIN_ADMIN.SESSION_SPLIT_HELP
+                    highlight: 1
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    default: true
+                    validate:
+                        type: bool
+
         advanced:
             type: section
             title: PLUGIN_ADMIN.ADVANCED
@@ -975,6 +1012,27 @@ form:
                     label: PLUGIN_ADMIN.PROXY_URL
                     help: PLUGIN_ADMIN.PROXY_URL_HELP
 
+                gpm.method:
+                    type: toggle
+                    label: PLUGIN_ADMIN.GPM_METHOD
+                    highlight: auto
+                    help: PLUGIN_ADMIN.GPM_METHOD_HELP
+                    options:
+                        auto: PLUGIN_ADMIN.AUTO
+                        fopen: PLUGIN_ADMIN.FOPEN
+                        curl: PLUGIN_ADMIN.CURL
+
+                gpm.verify_peer:
+                    type: toggle
+                    label: PLUGIN_ADMIN.GPM_VERIFY_PEER
+                    highlight: 1
+                    help: PLUGIN_ADMIN.GPM_VERIFY_PEER_HELP
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
                 reverse_proxy_setup:
                     type: toggle
                     label: PLUGIN_ADMIN.REVERSE_PROXY
@@ -1018,3 +1076,21 @@ form:
                     options:
                         ':': ': (default)'
                         ';': '; (for Apache running on Windows)'
+
+                force_ssl:
+                    type: toggle
+                    label: PLUGIN_ADMIN.FORCE_SSL
+                    highlight: 0
+                    help: PLUGIN_ADMIN.FORCE_SSL_HELP
+                    options:
+                        1: PLUGIN_ADMIN.YES
+                        0: PLUGIN_ADMIN.NO
+                    validate:
+                        type: bool
+
+                custom_base_url:
+                    type: text
+                    size: medium
+                    placeholder: "e.g. http://localhost:8080"
+                    label: PLUGIN_ADMIN.CUSTOM_BASE_URL
+                    help: PLUGIN_ADMIN.CUSTOM_BASE_URL_HELP

system/blueprints/media/meta.yaml

@@ -1,7 +0,0 @@
-form:
-  validation: loose
-  fields:
-
-    alt_text:
-      type: string
-      label: Alt Text

system/blueprints/media/move.yaml

@@ -1,8 +0,0 @@
-form:
-  validation: loose
-  fields:
-    route:
-      type: select
-      label: PLUGIN_ADMIN.PAGE
-      classes: fancy
-      data-options@: '\Grav\Common\Page\Pages::parents'

system/blueprints/media/rename.yaml

@@ -1,8 +0,0 @@
-form:
-  validation: loose
-  fields:
-    new_file_name:
-      type: text
-      label: PLUGIN_ADMIN_PRO.NEW_FILE_NAME
-      validate:
-        required: true

system/blueprints/pages/default.yaml

@@ -2,7 +2,7 @@ title: PLUGIN_ADMIN.DEFAULT
 
 rules:
   slug:
-    pattern: "[a-zа-я][a-zа-я0-9_\-]+"
+    pattern: '[a-zа-я][a-zа-я0-9_\-]+'
     min: 2
     max: 80
 
@@ -139,7 +139,7 @@ form:
                       label: PLUGIN_ADMIN.PARENT
                       classes: fancy
                       data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-                      data-default@: '\Grav\Plugin\admin::rawRoute'
+                      data-default@: '\Grav\Plugin\Admin\Admin::rawRoute'
                       options:
                         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
 

system/blueprints/pages/external.yaml

@@ -0,0 +1,58 @@
+title: PLUGIN_ADMIN:EXTERNAL
+@extends:
+    type: default
+    context: blueprints://pages
+
+rules:
+  slug:
+    pattern: '[a-zа-я][a-zа-я0-9_\-]+'
+    min: 2
+    max: 80
+
+form:
+  validation: loose
+  fields:
+
+    tabs:
+      type: tabs
+      active: 1
+
+      fields:
+
+        content:
+          fields:
+
+            header.title:
+              type: text
+              autofocus: true
+              style: horizontal
+              label: PLUGIN_ADMIN.TITLE
+
+            content:
+              unset@: true
+
+            uploads:
+              unset@: true
+
+            header.external_url:
+                type: text
+                label: PLUGIN_ADMIN.EXTERNAL_URL
+                placeholder: https://getgrav.org
+                validate:
+                    required: true
+        options:
+          fields:
+
+            publishing:
+
+              fields:
+
+                header.date:
+                  unset@: true
+
+                header.metadata:
+                  unset@: true
+
+            taxonomies:
+              unset@: true
+

system/blueprints/pages/modular_new.yaml

@@ -1,6 +1,6 @@
 rules:
   slug:
-    pattern: "[a-z][a-z0-9_\-]+"
+    pattern: '[a-z][a-z0-9_\-]+'
     min: 2
     max: 80
 
@@ -30,7 +30,7 @@ form:
       label: PLUGIN_ADMIN.PAGE
       classes: fancy
       data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-      data-default@: '\Grav\Plugin\admin::rawRoute'
+      data-default@: '\Grav\Plugin\Admin\Admin::rawRoute'
       validate:
         required: true
 

system/blueprints/pages/modular_raw.yaml

@@ -1,6 +1,6 @@
 rules:
   slug:
-    pattern: "[a-z][a-z0-9_\-]+"
+    pattern: '[a-z][a-z0-9_\-]+'
     min: 2
     max: 80
 
@@ -79,7 +79,7 @@ form:
                       label: PLUGIN_ADMIN.PARENT
                       classes: fancy
                       data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-                      data-default@: '\Grav\Plugin\admin::rawRoute'
+                      data-default@: '\Grav\Plugin\Admin\Admin::rawRoute'
                       options:
                         '': PLUGIN_ADMIN.DEFAULT_OPTION_SELECT
                       validate:

system/blueprints/pages/move.yaml

@@ -1,6 +1,6 @@
 rules:
   slug:
-    pattern: "[a-z][a-z0-9_\-]+"
+    pattern: '[a-z][a-z0-9_\-]+'
     min: 2
     max: 80
 
@@ -12,6 +12,6 @@ form:
       label: PLUGIN_ADMIN.PARENT
       classes: fancy
       data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-      data-default@: '\Grav\Plugin\admin::rawRoute'
+      data-default@: '\Grav\Plugin\Admin\Admin::rawRoute'
       options:
         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT

system/blueprints/pages/new.yaml

@@ -1,6 +1,6 @@
 rules:
   slug:
-    pattern: "[a-z][a-z0-9_\-]+"
+    pattern: '[a-z][a-z0-9_\-]+'
     min: 2
     max: 80
 
@@ -32,7 +32,7 @@ form:
       label: PLUGIN_ADMIN.PARENT_PAGE
       classes: fancy
       data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-      data-default@: '\Grav\Plugin\admin::getLastPageRoute'
+      data-default@: '\Grav\Plugin\Admin\Admin::getLastPageRoute'
       options:
         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
       validate:
@@ -44,7 +44,7 @@ form:
       label: PLUGIN_ADMIN.PAGE_FILE
       help: PLUGIN_ADMIN.PAGE_FILE_HELP
       data-options@: '\Grav\Common\Page\Pages::types'
-      data-default@: '\Grav\Plugin\admin::getLastPageName'
+      data-default@: '\Grav\Plugin\Admin\Admin::getLastPageName'
       validate:
         required: true
 

system/blueprints/pages/new_folder.yaml

@@ -1,6 +1,6 @@
 rules:
   slug:
-    pattern: "[a-z][a-z0-9_\-]+"
+    pattern: '[a-z][a-z0-9_\-]+'
     min: 2
     max: 80
 
@@ -25,7 +25,7 @@ form:
       label: PLUGIN_ADMIN.PARENT_PAGE
       classes: fancy
       data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-      data-default@: '\Grav\Plugin\admin::getLastPageRoute'
+      data-default@: '\Grav\Plugin\Admin\Admin::getLastPageRoute'
       options:
         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
       validate:

system/blueprints/pages/raw.yaml

@@ -1,6 +1,6 @@
 rules:
   slug:
-    pattern: "[a-z][a-z0-9_\-]+"
+    pattern: '[a-z][a-z0-9_\-]+'
     min: 2
     max: 80
 
@@ -79,7 +79,7 @@ form:
                       label: PLUGIN_ADMIN.PARENT
                       classes: fancy
                       data-options@: '\Grav\Common\Page\Pages::parentsRawRoutes'
-                      data-default@: '\Grav\Plugin\admin::rawRoute'
+                      data-default@: '\Grav\Plugin\Admin\Admin::rawRoute'
                       options:
                         '/': PLUGIN_ADMIN.DEFAULT_OPTION_ROOT
 

system/blueprints/user/account.yaml

@@ -1,4 +1,4 @@
-title: Site
+title: Account
 form:
     validation: loose
 
@@ -56,7 +56,7 @@ form:
                 label: PLUGIN_ADMIN.LANGUAGE
                 size: medium
                 classes: fancy
-                data-options@: '\Grav\Plugin\admin::adminLanguages'
+                data-options@: '\Grav\Plugin\Admin\Admin::adminLanguages'
                 default: 'en'
                 help: PLUGIN_ADMIN.LANGUAGE_HELP
 
@@ -77,16 +77,9 @@ form:
                         validate:
                             type: commalist
 
-                    access.admin:
-                        type: array
-                        label: PLUGIN_ADMIN.ADMIN_ACCESS
-                        multiple: false
-                        validate:
-                            type: array
-
-                    access.site:
-                        type: array
-                        label: PLUGIN_ADMIN.SITE_ACCESS
-                        multiple: false
+                    access:
+                        type: permissions
+                        label: PLUGIN_ADMIN.PERMISSIONS
+                        ignore_empty: true
                         validate:
                             type: array

system/blueprints/user/group.yaml

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

system/config/media.yaml

@@ -114,6 +114,9 @@ types:
   xlm:
     type: file
     mime: application/vnd.ms-excel
+  xlsm:
+    type: file
+    mime: application/vnd.ms-excel
   xld:
     type: file
     mime: application/vnd.ms-excel

system/config/site.yaml

@@ -16,12 +16,12 @@ summary:
   delimiter: ===                            # The summary delimiter
 
 redirects:
-#  /redirect-test: /                         # Redirect test goes to home page
-#  /old/(.*): /new/$1                        # Would redirect /old/my-page to /new/my-page
+#  '/redirect-test': '/'                         # Redirect test goes to home page
+#  '/old/(.*)': '/new/$1'                        # Would redirect /old/my-page to /new/my-page
 
 routes:
-#  /something/else: '/blog/sample-3'         # Alias for /blog/sample-3
-#  /new/(.*): '/blog/$1'                     # Regex any /new/my-page URL to /blog/my-page Route
+#  '/something/else': '/blog/sample-3'         # Alias for /blog/sample-3
+#  '/new/(.*)': '/blog/$1'                     # Regex any /new/my-page URL to /blog/my-page Route
 
 blog:
   route: '/blog'                            # Custom value added (accessible via system.blog.route)

system/config/system.yaml

@@ -4,7 +4,8 @@ default_locale:                             # Default locale (defaults to system
 param_sep: ':'                              # Parameter separator, use ';' for Apache on windows
 wrapped_site: false                         # For themes/plugins to know if Grav is wrapped by another platform
 reverse_proxy_setup: false                  # Running in a reverse proxy scenario with different webserver ports than proxy
-
+force_ssl: false                            # If enabled, Grav forces to be accessed via HTTPS (NOTE: Not an ideal solution)
+custom_base_url: ''                         # Set the base_url manually
 
 languages:
   supported: []                             # List of languages supported. eg: [en, fr, de]
@@ -37,7 +38,7 @@ pages:
   twig_first: false                         # Process Twig before markdown when processing both on a page
   events:
     page: true                              # Enable page level events
-    twig: true                              # Enable twig level events
+    twig: true                              # Enable Twig level events
   markdown:
     extra: false                            # Enable support for Markdown Extra support (GFM by default)
     auto_line_breaks: false                 # Enable automatic line breaks
@@ -61,19 +62,21 @@ pages:
   url_taxonomy_filters: true                # Enable auto-magic URL-based taxonomy filters for page collections
   frontmatter:
     process_twig: false                     # Should the frontmatter be processed to replace Twig variables?
-    ignore_fields: ['form']                 # Fields that might contain Twig variables and should not be processed
+    ignore_fields: ['form','forms']         # Fields that might contain Twig variables and should not be processed
 
 cache:
   enabled: true                             # Set to true to enable caching
   check:
-    method: file                            # Method to check for updates in pages: file|folder|none
+    method: file                            # Method to check for updates in pages: file|folder|hash|none
   driver: auto                              # One of: auto|file|apc|xcache|memcache|wincache
   prefix: 'g'                               # Cache prefix string (prevents cache conflicts)
   lifetime: 604800                          # Lifetime of cached data in seconds (0 = infinite)
   gzip: false                               # GZip compress the page output
+  redis:
+    socket: false                           # Path to redis unix socket (e.g. /var/run/redis/redis.sock), false = use server and port to connect
 
 twig:
-  cache: true                               # Set to true to enable twig caching
+  cache: true                               # Set to true to enable Twig caching
   debug: true                               # Enable Twig debug
   auto_reload: true                         # Refresh cache on changes
   autoescape: false                         # Autoescape Twig vars
@@ -97,7 +100,7 @@ assets:                                     # Configuration for Assets Manager (
     jquery: system://assets/jquery/jquery-2.x.min.js
 
 errors:
-  display: false                            # Display full backtrace-style error page
+  display: 0                                # Display either (1) Full backtrace | (0) Simple Error | (-1) System Error
   log: true                                 # Log errors to /logs folder
 
 debugger:
@@ -110,6 +113,7 @@ images:
   cache_all: false                          # Cache all image by default
   cache_perms: '0755'                       # MUST BE IN QUOTES!! Default cache folder perms. Usually '0755' or '0775'
   debug: false                              # Show an overlay over images indicating the pixel depth of the image when working with retina for example
+  auto_fix_orientation: false               # Automatically fix the image orientation based on the Exif data
 
 media:
   enable_media_timestamp: false             # Enable media timetsamps
@@ -123,7 +127,11 @@ session:
   name: grav-site                           # Name prefix of the session cookie. Use alphanumeric, dashes or underscores only. Do not use dots in the session name
   secure: false                             # Set session secure. If true, indicates that communication for this cookie must be over an encrypted transmission. Enable this only on sites that run exclusively on HTTPS
   httponly: true                            # Set session HTTP only. If true, indicates that cookies should be used only over HTTP, and JavaScript modification is not allowed.
+  split: true                               # Sessions should be independent between site and plugins (such as admin)
+  path:
 
 gpm:
-  releases: testing                           # Set to either 'stable' or 'testing'
-  proxy_url:                                  # Configure a manual proxy URL for GPM (eg 127.0.0.1:3128)
+  releases: stable                           # Set to either 'stable' or 'testing'
+  proxy_url:                                 # Configure a manual proxy URL for GPM (eg 127.0.0.1:3128)
+  method: 'auto'                             # Either 'curl', 'fopen' or 'auto'. 'auto' will try fopen first and if not available cURL
+  verify_peer: true                          # Sometimes on some systems (Windows most commonly) GPM is unable to connect because the SSL certificate cannot be verified. Disabling this setting might help.

system/defines.php

@@ -1,9 +1,15 @@
 <?php
+/**
+ * @package    Grav.Core
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.1.0-rc.3');
-define('GRAV_TESTING', true);
+define('GRAV_VERSION', '1.1.9');
+define('GRAV_TESTING', false);
 define('DS', '/');
 define('GRAV_PHP_MIN', '5.5.9');
 

system/languages/ar.yaml

@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  العنوان: %1$s
+  ---
+  # خطأ: مادة أمامية غير صحيحة
+  
+  مسار: '%2$s'
+  
+  **%3$s**
+  
+  , , ,
+  
+  %4$s
+  , , ,
+NICETIME:
+  NO_DATE_PROVIDED: لم يتم تقديم التاريخ
+  BAD_DATE: تاريخ خاطئ
+  AGO: من قبل
+  FROM_NOW: من الآن
+  SECOND: ثانية
+  MINUTE: دقيقة
+  HOUR: ساعة
+  DAY: يوم
+  WEEK: أسبوع
+  MONTH: شهر
+  YEAR: سنة
+  DECADE: عقد
+  SEC: ثانية
+  MIN: دقيقة
+  HR: ساعة
+  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: ساعات
+  WK_PLURAL: أسابيع
+  MO_PLURAL: أشهر
+  YR_PLURAL: سنوات
+  DEC_PLURAL: عقود
+FORM:
+  VALIDATION_FAIL: '<b>فشل التحقق من صحة:</b>'
+  INVALID_INPUT: إدخال غير صحيح في
+  MISSING_REQUIRED_FIELD: 'حقل مطلوب مفقود:'
+MONTHS_OF_THE_YEAR:
+  - كانون الثاني
+  - شباط
+  - آذار/ مارس
+  - نيسان
+  - أيار
+  - حزيران
+  - تموز
+  - آب
+  - أيلول
+  - تشرين الأول
+  - تشرين الثاني
+  - كانون الأول
+DAYS_OF_THE_WEEK:
+  - الاثنين
+  - الثلاثاء
+  - الأربعاء
+  - الخميس
+  - الجمعة
+  - السبت
+  - الأحد

system/languages/ca.yaml

@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # S'ha produït un error: Frontmatter invàlid
+  
+  Ruta: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: "No s'ha proporcionat data"
+  BAD_DATE: Data invàlida
+  AGO: abans
+  FROM_NOW: "des d'ara"
+  SECOND: segon
+  MINUTE: minut
+  HOUR: hora
+  DAY: dia
+  WEEK: setmana
+  MONTH: mes
+  YEAR: any
+  DECADE: dècada
+  SEC: s
+  MIN: min
+  HR: h
+  WK: setm.
+  MO: m.
+  YR: a.
+  DEC: dèc.
+  SECOND_PLURAL: segons
+  MINUTE_PLURAL: minuts
+  HOUR_PLURAL: hores
+  DAY_PLURAL: dies
+  WEEK_PLURAL: setmanes
+  MONTH_PLURAL: mesos
+  YEAR_PLURAL: anys
+  DECADE_PLURAL: dècades
+  SEC_PLURAL: s
+  MIN_PLURAL: min
+  HR_PLURAL: h
+  WK_PLURAL: setm.
+  MO_PLURAL: mesos
+  YR_PLURAL: anys
+  DEC_PLURAL: dèc.
+FORM:
+  VALIDATION_FAIL: '<b>Ha fallat la validació:</b>'
+  INVALID_INPUT: Entrada no vàlida a
+  MISSING_REQUIRED_FIELD: 'Falta camp obligatori:'
+MONTHS_OF_THE_YEAR:
+  - Gener
+  - Febrer
+  - Març
+  - Abril
+  - Maig
+  - Juny
+  - Juliol
+  - Agost
+  - Setembre
+  - Octubre
+  - Novembre
+  - Desembre
+DAYS_OF_THE_WEEK:
+  - Dilluns
+  - Dimarts
+  - Dimecres
+  - Dijous
+  - Divendres
+  - Dissabte
+  - Diumenge

system/languages/cs.yaml

@@ -1,3 +1,4 @@
+---
 INFLECTOR_UNCOUNTABLE:
   - vybavení
   - informace
@@ -55,6 +56,7 @@ NICETIME:
   DEC_PLURAL: dek
 FORM:
   VALIDATION_FAIL: '<b>Ověření se nezdařilo:</b>'
+  INVALID_INPUT: Neplatný vstup v
   MISSING_REQUIRED_FIELD: 'Chybí požadované pole:'
 MONTHS_OF_THE_YEAR:
   - ledna

system/languages/da.yaml

@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  Titel: %1$s
+  ---
+  
+  # Fejl: Ugyldigt frontmatter
+  
+  Sti: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: Ingen dato angivet
+  BAD_DATE: Ugyldig dato
+  AGO: siden
+  FROM_NOW: fra nu
+  SECOND: sekund
+  MINUTE: minut
+  HOUR: time
+  DAY: dag
+  WEEK: uge
+  MONTH: måned
+  YEAR: år
+  DECADE: årti
+  SEC: sek
+  MIN: min
+  HR: t
+  WK: u
+  MO: md
+  YR: år
+  DEC: årti
+  SECOND_PLURAL: sekunder
+  MINUTE_PLURAL: minutter
+  HOUR_PLURAL: timer
+  DAY_PLURAL: dage
+  WEEK_PLURAL: uger
+  MONTH_PLURAL: måneder
+  YEAR_PLURAL: år
+  DECADE_PLURAL: årtier
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: timer
+  WK_PLURAL: uger
+  MO_PLURAL: mdr
+  YR_PLURAL: år
+  DEC_PLURAL: årtier
+FORM:
+  VALIDATION_FAIL: '<b>Validering mislykkedes:</b>'
+  INVALID_INPUT: Ugyldigt input i
+  MISSING_REQUIRED_FIELD: 'Mangler obligatorisk felt:'
+MONTHS_OF_THE_YEAR:
+  - Januar
+  - Februar
+  - Marts
+  - April
+  - Maj
+  - Juni
+  - Juli
+  - August
+  - September
+  - Oktober
+  - November
+  - December
+DAYS_OF_THE_WEEK:
+  - Mandag
+  - Tirsdag
+  - Onsdag
+  - Torsdag
+  - Fredag
+  - Lørdag
+  - Søndag

system/languages/de.yaml

@@ -1,13 +1,14 @@
+---
 FRONTMATTER_ERROR_PAGE: |
   ---
   title: %1$s
   ---
   # Fehler: Frontmatter enthält Fehler
-
+  
   Pfad: `%2$s`
-
-  **%3$s **
-
+  
+  **%3$s ** 
+  
   ```
   %4$s
   ```
@@ -21,8 +22,13 @@ INFLECTOR_IRREGULAR:
   child: Kinder
   sex: Geschlecht
   move: Züge
+INFLECTOR_ORDINALS:
+  default: '.'
+  first: '.'
+  second: '.'
+  third: '.'
 NICETIME:
-  NO_DATE_PROVIDED: Keine Daten vorhanden
+  NO_DATE_PROVIDED: Kein Datum angegeben
   BAD_DATE: Falsches Datum
   AGO: her
   FROM_NOW: ab jetzt
@@ -33,13 +39,14 @@ NICETIME:
   WEEK: Woche
   MONTH: Monat
   YEAR: Jahr
-  DECADE: Dekade
-  SEC: sek
-  MIN: Min
-  HR: std
-  WK: wo
-  YR: yh
-  DEC: Jz
+  DECADE: Jahrzehnt
+  SEC: Sek.
+  MIN: Min.
+  HR: Std.
+  WK: Wo.
+  MO: Mo.
+  YR: J.
+  DEC: Dek.
   SECOND_PLURAL: Sekunden
   MINUTE_PLURAL: Minuten
   HOUR_PLURAL: Stunden
@@ -47,14 +54,14 @@ NICETIME:
   WEEK_PLURAL: Wochen
   MONTH_PLURAL: Monate
   YEAR_PLURAL: Jahre
-  DECADE_PLURAL: Dekaden
+  DECADE_PLURAL: Jahrzehnte
   SEC_PLURAL: Sekunden
   MIN_PLURAL: Minuten
   HR_PLURAL: Stunden
   WK_PLURAL: Wochen
   MO_PLURAL: Monate
   YR_PLURAL: Jahre
-  DEC_PLURAL: Dekaden
+  DEC_PLURAL: Jahrzehnten
 FORM:
   VALIDATION_FAIL: '<b>Überprüfung fehlgeschlagen:</b>'
   INVALID_INPUT: Ungültige Eingabe in
@@ -68,7 +75,7 @@ MONTHS_OF_THE_YEAR:
   - Juni
   - Juli
   - August
-  - Semptember
+  - September
   - Oktober
   - November
   - Dezember

system/languages/el.yaml

@@ -1,3 +1,4 @@
+---
 MONTHS_OF_THE_YEAR:
   - Ιανουάριος
   - Φεβρουάριος
@@ -13,9 +14,9 @@ MONTHS_OF_THE_YEAR:
   - Δεκέμβριος
 DAYS_OF_THE_WEEK:
   - Δευτέρα
-  - Τρλιτη
+  - Τρίτη
   - Τετάρτη
   - Πέμπτη
   - Παρασκευή
-  - Σαββάτο
+  - Σάββατο
   - Κυριακή

system/languages/es.yaml

@@ -1,3 +1,18 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Error: Frontmatter Inválido
+  
+  Ruta: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
 INFLECTOR_UNCOUNTABLE:
   0: equipo
   1: información

system/languages/fi.yaml

@@ -0,0 +1,60 @@
+---
+NICETIME:
+  NO_DATE_PROVIDED: Päivämäärää ei annettu
+  BAD_DATE: Virheellinen päivämäärä
+  AGO: sitten
+  FROM_NOW: tästä lähtien
+  SECOND: sekunti
+  MINUTE: minuutti
+  HOUR: tunti
+  DAY: päivä
+  WEEK: viikko
+  MONTH: kuukausi
+  YEAR: vuosi
+  DECADE: vuosikymmen
+  SEC: sek
+  MIN: min
+  HR: h
+  WK: vk
+  MO: kk
+  YR: v
+  DEC: vuosikymmen
+  SECOND_PLURAL: sekuntia
+  MINUTE_PLURAL: minuuttia
+  HOUR_PLURAL: tuntia
+  DAY_PLURAL: päivää
+  WEEK_PLURAL: viikkoa
+  MONTH_PLURAL: kuukautta
+  YEAR_PLURAL: vuotta
+  DECADE_PLURAL: vuosikymmentä
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: h
+  WK_PLURAL: v
+  MO_PLURAL: kk
+  YR_PLURAL: v
+  DEC_PLURAL: vuosikymmentä
+FORM:
+  VALIDATION_FAIL: '<b>Vahvistus epäonnistui:</b>'
+  MISSING_REQUIRED_FIELD: 'Puuttuva pakollinen kenttä:'
+MONTHS_OF_THE_YEAR:
+  - Tammikuu
+  - Helmikuu
+  - Maaliskuu
+  - Huhtikuu
+  - Toukokuu
+  - Kesäkuuta
+  - Heinäkuu
+  - Elokuu
+  - Syyskuu
+  - Lokakuu
+  - Marraskuu
+  - Joulukuu
+DAYS_OF_THE_WEEK:
+  - Maanantai
+  - Tiistai
+  - Keskiviikko
+  - Torstai
+  - Perjantai
+  - Lauantai
+  - Sunnuntai

system/languages/fr.yaml

@@ -1,14 +1,15 @@
+---
 FRONTMATTER_ERROR_PAGE: |
   ---
   title: %1$s
   ---
-
+  
   # Erreur : Frontmatter invalide
-
+  
   Path: `%2$s`
-
+  
   **%3$s**
-
+  
   ```
   %4$s
   ```

system/languages/hr.yaml

@@ -1,3 +1,4 @@
+---
 INFLECTOR_UNCOUNTABLE:
   - oprema
   - informacije

system/languages/hu.yaml

@@ -1,17 +1,70 @@
+---
 FRONTMATTER_ERROR_PAGE: |
   ---
   cím: %1$s
   ---
-
+  
   # Hiba: Érvénytelen Frontmatter
-
+  
   Elérési út: `%2$s`
-
+  
   **%3$s**
-
+  
   ```
   %4$s
   ```
+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'
+INFLECTOR_UNCOUNTABLE:
+  - felszerelés
+  - információ
+  - rizs
+  - pénz
+  - fajok
+  - sorozat
+  - hal
+  - juh
 INFLECTOR_IRREGULAR:
   person: személyek
   man: férfiak
@@ -62,3 +115,24 @@ FORM:
   VALIDATION_FAIL: '<b>A validáció hibát talált:</b>'
   INVALID_INPUT: 'Az itt megadott érték érvénytelen:'
   MISSING_REQUIRED_FIELD: 'Ez a kötelező mező nincs kitöltve:'
+MONTHS_OF_THE_YEAR:
+  - január
+  - február
+  - március
+  - április
+  - május
+  - június
+  - július
+  - augusztus
+  - szeptember
+  - október
+  - november
+  - december
+DAYS_OF_THE_WEEK:
+  - hétfő
+  - kedd
+  - szerda
+  - csütörtök
+  - péntek
+  - szombat
+  - vasárnap

system/languages/it.yaml

@@ -1,6 +1,8 @@
+---
+FRONTMATTER_ERROR_PAGE: "---Titolo: %1$s---# Errore: Frontmatter non valido: '%2$s' * *%3$s * * ' '%4$s ' '"
 NICETIME:
   NO_DATE_PROVIDED: Nessuna data fornita
-  BAD_DATE: Data errata
+  BAD_DATE: Data non valida
   AGO: fa
   FROM_NOW: da adesso
   SECOND: secondo
@@ -10,6 +12,14 @@ NICETIME:
   WEEK: settimana
   MONTH: mese
   YEAR: anno
+  DECADE: decennio
+  SEC: sec
+  MIN: min
+  HR: ora
+  WK: settimana
+  MO: mese
+  YR: anno
+  DEC: decennio
   SECOND_PLURAL: secondi
   MINUTE_PLURAL: minuti
   HOUR_PLURAL: ore
@@ -18,9 +28,16 @@ NICETIME:
   MONTH_PLURAL: mesi
   YEAR_PLURAL: anni
   DECADE_PLURAL: decadi
+  SEC_PLURAL: secondi
+  MIN_PLURAL: minuti
+  HR_PLURAL: ore
+  WK_PLURAL: settimane
+  MO_PLURAL: mesi
+  YR_PLURAL: anni
+  DEC_PLURAL: decenni
 FORM:
   VALIDATION_FAIL: '<b>Validazione fallita:</b>'
-  INVALID_INPUT: Input invalido in
+  INVALID_INPUT: Input non valido in
   MISSING_REQUIRED_FIELD: 'Campo richiesto mancante:'
 MONTHS_OF_THE_YEAR:
   - Gennaio
@@ -36,10 +53,10 @@ MONTHS_OF_THE_YEAR:
   - Novembre
   - Dicembre
 DAYS_OF_THE_WEEK:
-  - Lunedi
-  - Martedi
-  - Mercoledi
-  - Giovedi
-  - Venerdi
+  - Lunedì
+  - Martedì
+  - Mercoledì
+  - Giovedì
+  - Venerdì
   - Sabato
   - Domenica

system/languages/lt.yaml

@@ -1,3 +1,4 @@
+---
 INFLECTOR_UNCOUNTABLE:
   2: ryžiai
   3: pinigai

system/languages/nl.yaml

@@ -1,3 +1,4 @@
+---
 INFLECTOR_IRREGULAR:
   person: personen
   man: mensen
@@ -13,10 +14,15 @@ NICETIME:
   MINUTE: minuut
   HOUR: uur
   DAY: dag
+  WEEK: week
   MONTH: maand
   YEAR: jaar
   DECADE: decenium
+  SEC: s
+  MIN: min
+  HR: u
   MO: ma
+  YR: j
   SECOND_PLURAL: seconden
   MINUTE_PLURAL: minuten
   HOUR_PLURAL: uren
@@ -31,15 +37,23 @@ NICETIME:
   WK_PLURAL: weken
   MO_PLURAL: maanden
   YR_PLURAL: jaren
+FORM:
+  VALIDATION_FAIL: '<b>Validatie mislukt:</b>'
+  INVALID_INPUT: Ongeldige invoer in
+  MISSING_REQUIRED_FIELD: 'Verplicht veld ontbreekt:'
 MONTHS_OF_THE_YEAR:
-  0: Januari
-  1: Februari
-  2: Maart
-  4: Mei
-  5: Juni
-  6: Juli
-  7: Augustus
-  9: Oktober
+  - Januari
+  - Februari
+  - Maart
+  - april
+  - Mei
+  - Juni
+  - Juli
+  - Augustus
+  - september
+  - Oktober
+  - november
+  - december
 DAYS_OF_THE_WEEK:
   - Maandag
   - Dinsdag

system/languages/no.yaml

@@ -1,14 +1,15 @@
+---
 FRONTMATTER_ERROR_PAGE: |
   ---
   Tittel: %1$s
   ---
-
+  
   # Feilmelding: Ugyldig Frontmatter
-
+  
   Pane: '%2$s'
-
+  
   **%3$s **
-
+  
   ```
   %4$s
   ```
@@ -62,7 +63,9 @@ NICETIME:
   MIN_PLURAL: min
   HR_PLURAL: timer
   WK_PLURAL: uker
+  MO_PLURAL: mdr
   YR_PLURAL: år
+  DEC_PLURAL: årtier
 FORM:
   VALIDATION_FAIL: '<b>Validering mislyktes:</b>'
   INVALID_INPUT: Ugyldig innhold i

system/languages/pl.yaml

@@ -1,14 +1,15 @@
+---
 FRONTMATTER_ERROR_PAGE: |
   ---
   title: %1$s
   ---
-
+  
   # Error: Nieprawidłowy Frontmatter
-
+  
   Path: `%2$s`
-
+  
   **%3$s**
-
+  
   ```
   %4$s
   ```
@@ -28,8 +29,8 @@ NICETIME:
   SEC: sek
   MIN: min
   HR: godz
-  WK: tydź
-  MO: mieś
+  WK: tydz
+  MO: m-c
   YR: rok
   DEC: dekada
   SECOND_PLURAL: sekund
@@ -40,16 +41,16 @@ NICETIME:
   MONTH_PLURAL: miesięcy
   YEAR_PLURAL: lat
   DECADE_PLURAL: dekad
-  SEC_PLURAL: sekund
-  MIN_PLURAL: minut
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
   HR_PLURAL: godz
   WK_PLURAL: tyg
-  MO_PLURAL: mieś
+  MO_PLURAL: m-ce
   YR_PLURAL: lat
   DEC_PLURAL: dekad
 FORM:
   VALIDATION_FAIL: '<b>Weryfikacja nie powiodła się:</b>'
-  INVALID_INPUT: Nieprawidłowe dane w
+  INVALID_INPUT: Nieprawidłowe dane wejściowe
   MISSING_REQUIRED_FIELD: 'Opuszczono wymagane pole:'
 MONTHS_OF_THE_YEAR:
   - Styczeń

system/languages/pt.yaml

@@ -1,3 +1,18 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  título: %1$s
+  ---
+  
+  # Erro: Frontmatter inválida
+  
+  Caminho: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
 INFLECTOR_UNCOUNTABLE:
   1: informação
   2: arroz
@@ -6,6 +21,10 @@ INFLECTOR_IRREGULAR:
   man: homens
   sex: sexos
 NICETIME:
+  NO_DATE_PROVIDED: Não foi fornecida data
+  BAD_DATE: Data inválida
+  AGO: atrás
+  FROM_NOW: a partir de agora
   SECOND: segundo
   MINUTE: minuto
   HOUR: hora
@@ -16,8 +35,11 @@ NICETIME:
   DECADE: década
   SEC: seg
   MIN: mín
-  MO: mês
-  YR: ano
+  HR: h
+  WK: sem
+  MO: m
+  YR: a
+  DEC: dec
   SECOND_PLURAL: segundos
   MINUTE_PLURAL: minutos
   HOUR_PLURAL: horas
@@ -29,9 +51,11 @@ NICETIME:
   SEC_PLURAL: seg
   MIN_PLURAL: mins
   HR_PLURAL: hrs
+  WK_PLURAL: sems
   YR_PLURAL: anos
 FORM:
   VALIDATION_FAIL: '<b>Validação falhada: </b>'
+  MISSING_REQUIRED_FIELD: 'Campo obrigatório ausente:'
 MONTHS_OF_THE_YEAR:
   - Janeiro
   - Fevereiro

system/languages/ro.yaml

@@ -1,18 +1,99 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  Titlu: %1$s
+  ---
+  # Eroare: Frontmatter este invalid
+  
+  Calea: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+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'
+INFLECTOR_UNCOUNTABLE:
+  - echipament
+  - informaţie
+  - orez
+  - bani
+  - specii
+  - serii
+  - peşte
+  - oaie
+INFLECTOR_IRREGULAR:
+  person: persoane
+  man: bărbați
+  child: copii
+  sex: sexe
+  move: mutări
+NICETIME:
+  NO_DATE_PROVIDED: Nu există o dată prevăzută
+  BAD_DATE: Dată incorectă
+  AGO: în urmă
+  FROM_NOW: de acum
+  SECOND: secundă
+  MINUTE: minut
+  HOUR: oră
+  DAY: zi
+  WEEK: săptămână
+  MONTH: lună
+  YEAR: an
+  DECADE: decadă
+  SEC: sec
+  MIN: min
+  HR: oră
+  WK: săpt
+  MO: lună
+  YR: an
+  DEC: decadă
+  SECOND_PLURAL: secunde
+  MINUTE_PLURAL: minute
+  HOUR_PLURAL: ore
+  DAY_PLURAL: zile
+  WEEK_PLURAL: săptămâni
+  MONTH_PLURAL: luni
+  YEAR_PLURAL: ani
+  DECADE_PLURAL: decade
+  SEC_PLURAL: sec
+  MIN_PLURAL: min
+  HR_PLURAL: ore
+  WK_PLURAL: săpt
+  MO_PLURAL: luni
+  YR_PLURAL: ani
+  DEC_PLURAL: decenii
+FORM:
+  VALIDATION_FAIL: '<b>Validare nereușită</b>'
+  INVALID_INPUT: Date incorecte în
+  MISSING_REQUIRED_FIELD: 'Câmp obligatoriu lipsă:'
 MONTHS_OF_THE_YEAR:
-  0: Ianuarie
-  1: Februarie
-  2: Martie
-  3: Aprilue
-  4: Mai
-  5: Iunie
-  6: Iulie
-  8: Septembrie
-  9: Octombrie
-  10: Noiembrie
-  11: Decembrie
+  - Ianuarie
+  - Februarie
+  - Martie
+  - Aprilie
+  - Mai
+  - Iunie
+  - Iulie
+  - August
+  - Septembrie
+  - Octombrie
+  - Noiembrie
+  - Decembrie
 DAYS_OF_THE_WEEK:
   - Luni
-  - Marti
+  - Marți
   - Miercuri
   - Joi
   - Vineri

system/languages/ru.yaml

@@ -1,3 +1,18 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Ошибка: Недопустимое содержимое
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
 INFLECTOR_IRREGULAR:
   person: люди
   man: человек
@@ -20,8 +35,8 @@ NICETIME:
   SEC: с
   MIN: мин
   HR: ч
-  WK: нед
-  MO: мес
+  WK: нед.
+  MO: мес.
   YR: г.
   DEC: гг.
   SECOND_PLURAL: секунды

system/languages/sk.yaml

@@ -0,0 +1,42 @@
+---
+NICETIME:
+  NO_DATE_PROVIDED: Neposkytnutý žiaden dátum
+  BAD_DATE: Nesprávny dátum
+  AGO: pred
+  FROM_NOW: odteraz
+  SECOND: sekunda
+  MINUTE: minúta
+  HOUR: hodina
+  DAY: deň
+  WEEK: týždeň
+  MONTH: mesiac
+  YEAR: rok
+  DECADE: desaťročie
+  SEC: sek
+  MIN: min
+  HR: hod
+FORM:
+  VALIDATION_FAIL: '<b>Overenie zlyhalo:</b>'
+  INVALID_INPUT: Neplatný vstup v
+  MISSING_REQUIRED_FIELD: 'Chýba vyžadované pole:'
+MONTHS_OF_THE_YEAR:
+  - Január
+  - Február
+  - Marec
+  - Apríl
+  - Máj
+  - Jún
+  - Júl
+  - August
+  - September
+  - Október
+  - November
+  - December
+DAYS_OF_THE_WEEK:
+  - Pondelok
+  - Utorok
+  - Streda
+  - Štvrtok
+  - Piatok
+  - Sobota
+  - Nedeľa

system/languages/sv.yaml

@@ -1,2 +1,62 @@
+---
+FRONTMATTER_ERROR_PAGE: '--- titel: %1$s --- # Fel: Ogiltig Frontmatter-sökväg: `%2$s` **%3$s** ``` %4$s ```'
 NICETIME:
+  NO_DATE_PROVIDED: Inget datum har angivits
+  BAD_DATE: Ogiltigt datum
+  AGO: sedan
+  FROM_NOW: från nu
+  SECOND: sekund
+  MINUTE: minut
+  HOUR: timme
   DAY: dag
+  WEEK: vecka
+  MONTH: månad
+  YEAR: år
+  DECADE: årtionde
+  SEC: sek
+  MIN: min
+  HR: t
+  WK: v
+  MO: m
+  YR: år
+  DEC: dec
+  SECOND_PLURAL: sekunder
+  MINUTE_PLURAL: minuter
+  HOUR_PLURAL: timmar
+  DAY_PLURAL: dagar
+  WEEK_PLURAL: veckor
+  MONTH_PLURAL: månader
+  YEAR_PLURAL: år
+  DECADE_PLURAL: årtionden
+  SEC_PLURAL: sek
+  MIN_PLURAL: min
+  HR_PLURAL: t
+  WK_PLURAL: v
+  MO_PLURAL: må
+  YR_PLURAL: år
+  DEC_PLURAL: dec
+FORM:
+  VALIDATION_FAIL: '<b>Kontrollen misslyckades:</b>'
+  INVALID_INPUT: Ogiltig indata i
+  MISSING_REQUIRED_FIELD: 'Obligatoriskt fält måste fyllas i:'
+MONTHS_OF_THE_YEAR:
+  - Januari
+  - Februrari
+  - Mars
+  - April
+  - Maj
+  - Juni
+  - Juli
+  - Augusti
+  - September
+  - Oktober
+  - November
+  - December
+DAYS_OF_THE_WEEK:
+  - Måndag
+  - Tisdag
+  - Onsdag
+  - Torsdag
+  - Fredag
+  - Lördag
+  - Söndag

system/languages/th.yaml

@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  ชื่อเรื่อง: %1$s
+  ---
+  
+  # ข้อผิดพลาด: Invalid Frontmatter
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: ไม่มีวันที่ให้
+  BAD_DATE: รูปแบบวันที่ผิด
+  AGO: ที่ผ่านมา
+  FROM_NOW: จากตอนนี้
+  SECOND: วินาที
+  MINUTE: นาที
+  HOUR: ชั่วโมง
+  DAY: วัน
+  WEEK: สัปดาห์
+  MONTH: เดือน
+  YEAR: ปี
+  DECADE: ทศวรรษที่ผ่านมา
+  SEC: วิ
+  MIN: นาที
+  HR: ชม.
+  WK: wk
+  MO: mo
+  YR: yr
+  DEC: dec
+  SECOND_PLURAL: วินาที
+  MINUTE_PLURAL: นาที
+  HOUR_PLURAL: ชั่วโมง
+  DAY_PLURAL: วัน
+  WEEK_PLURAL: สัปดาห์
+  MONTH_PLURAL: เดือน
+  YEAR_PLURAL: ปี
+  DECADE_PLURAL: ทศวรรษที่ผ่านมา
+  SEC_PLURAL: วินาที
+  MIN_PLURAL: นาที
+  HR_PLURAL: ชั่วโมง
+  WK_PLURAL: wks
+  MO_PLURAL: mos
+  YR_PLURAL: ปี
+  DEC_PLURAL: decs
+FORM:
+  VALIDATION_FAIL: '<b>ตรวจสอบล้มเหลว: </b>'
+  INVALID_INPUT: ป้อนข้อมูลไม่ถูกต้องใน
+  MISSING_REQUIRED_FIELD: 'ขาดข้อมูลที่จำเป็น:'
+MONTHS_OF_THE_YEAR:
+  - มกราคม
+  - กุมภาพันธ์
+  - มีนาคม
+  - เมษายน
+  - พฤษภาคม
+  - มิถุนายน
+  - กรกฏาคม
+  - สิงหาคม
+  - กันยายน
+  - ตุลาคม
+  - พฤศจิกายน
+  - ธันวาคม
+DAYS_OF_THE_WEEK:
+  - จันทร์
+  - อังคาร
+  - พุธ
+  - พฤหัสบดี
+  - ศุกร์
+  - เสาร์
+  - อาทิตย์

system/languages/tr.yaml

@@ -1,3 +1,4 @@
+---
 NICETIME:
   NO_DATE_PROVIDED: Tarih yok
   BAD_DATE: Yanlış tarih
@@ -33,3 +34,26 @@ NICETIME:
   MO_PLURAL: ay
   YR_PLURAL: yl
   DEC_PLURAL: onyl
+FORM:
+  VALIDATION_FAIL: '<b>Doğrulama başarısız:</b>'
+MONTHS_OF_THE_YEAR:
+  - Ocak
+  - Şubat
+  - Mart
+  - Nisan
+  - Mayıs
+  - Haziran
+  - Temmuz
+  - Ağustos
+  - Eylül
+  - Ekim
+  - Kasım
+  - Aralık
+DAYS_OF_THE_WEEK:
+  - Pazartesi
+  - Salı
+  - Çarşamba
+  - Perşembe
+  - Cuma
+  - Cumartesi
+  - Pazar

system/languages/uk.yaml

@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Помилка: Недопустимий вміст
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: Не вказана дата
+  BAD_DATE: Невірна дата
+  AGO: назад
+  FROM_NOW: відтепер
+  SECOND: секунда
+  MINUTE: хвилина
+  HOUR: година
+  DAY: день
+  WEEK: тиждень
+  MONTH: місяць
+  YEAR: рік
+  DECADE: десятиріччя
+  SEC: с
+  MIN: хв
+  HR: год
+  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: год
+  WK_PLURAL: тиж.
+  MO_PLURAL: міс.
+  YR_PLURAL: рр.
+  DEC_PLURAL: рр.
+FORM:
+  VALIDATION_FAIL: '<b>Перевірка не вдалася:</b>'
+  INVALID_INPUT: Невірне введення в
+  MISSING_REQUIRED_FIELD: 'Відсутнє необхідне поле:'
+MONTHS_OF_THE_YEAR:
+  - Січень
+  - Лютий
+  - Березень
+  - Квітень
+  - Травень
+  - Червень
+  - Липень
+  - Серпень
+  - Вересень
+  - Жовтень
+  - Листопад
+  - Грудень
+DAYS_OF_THE_WEEK:
+  - Понеділок
+  - Вівторок
+  - Середа
+  - Четвер
+  - "П'ятниця"
+  - Субота
+  - Неділя

system/languages/vi.yaml

@@ -0,0 +1,75 @@
+---
+FRONTMATTER_ERROR_PAGE: |
+  ---
+  title: %1$s
+  ---
+  
+  # Error: Invalid Frontmatter
+  
+  Path: `%2$s`
+  
+  **%3$s**
+  
+  ```
+  %4$s
+  ```
+NICETIME:
+  NO_DATE_PROVIDED: Không có ngày được cung cấp
+  BAD_DATE: Ngày không hợp lệ
+  AGO: cách đây
+  FROM_NOW: từ bây giờ
+  SECOND: giây
+  MINUTE: phút
+  HOUR: giờ
+  DAY: ngày
+  WEEK: tuần
+  MONTH: tháng
+  YEAR: năm
+  DECADE: thập kỷ
+  SEC: giây
+  MIN: phút
+  HR: giờ
+  WK: tuần
+  MO: tháng
+  YR: năm
+  DEC: thập kỷ
+  SECOND_PLURAL: giây
+  MINUTE_PLURAL: phút
+  HOUR_PLURAL: giờ
+  DAY_PLURAL: ngày
+  WEEK_PLURAL: tuần
+  MONTH_PLURAL: tháng
+  YEAR_PLURAL: năm
+  DECADE_PLURAL: thập kỷ
+  SEC_PLURAL: giây
+  MIN_PLURAL: phút
+  HR_PLURAL: giờ
+  WK_PLURAL: tuần
+  MO_PLURAL: tháng
+  YR_PLURAL: năm
+  DEC_PLURAL: thập kỷ
+FORM:
+  VALIDATION_FAIL: '<b>Xác nhận thất bại:</b>'
+  INVALID_INPUT: Dữ liệu nhập không hợp lệ cho
+  MISSING_REQUIRED_FIELD: 'Thiếu trường bắt buộc:'
+MONTHS_OF_THE_YEAR:
+  - Tháng 1
+  - Tháng 2
+  - Tháng 3
+  - Tháng 4
+  - Tháng 5
+  - Tháng 6
+  - Tháng 7
+  - Tháng 8
+  - Tháng 9
+  - Tháng 10
+  - Tháng Mười 11
+  - Tháng 12
+DAYS_OF_THE_WEEK:
+  - Thứ 2
+  - Thứ 3
+  - Thứ 4
+  - Thứ 5
+  - Thứ 6
+  - Thứ 7
+  - Chủ Nhật

system/pages/notfound.md

@@ -0,0 +1,5 @@
+---
+title: Not Found
+routable: false
+notfound: true
+---

system/src/Grav/Common/Assets.php

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
 use Closure;
@@ -13,14 +20,6 @@ use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 define('CSS_ASSET', true);
 define('JS_ASSET', false);
 
-/**
- * Handles Asset management (CSS & JS) and also pipelining (combining into a single file for each asset)
- *
- * Based on stolz/assets (https://github.com/Stolz/Assets) package modified for use with Grav
- *
- * @author  RocketTheme
- * @license MIT
- */
 class Assets
 {
     /** @const Regex to match CSS and JavaScript files */
@@ -208,7 +207,7 @@ class Assets
         $this->assets_url = $locator->findResource('asset://', false);
 
         $this->config($asset_config);
-        $this->base_url = $base_url . '/';
+        $this->base_url = ($config->get('system.absolute_urls') ? '' : '/') . ltrim(ltrim($base_url, '/') . '/', '/');
 
         // Register any preconfigured collections
         foreach ($config->get('system.assets.collections', []) as $name => $collection) {
@@ -282,7 +281,10 @@ class Assets
             return $this;
         }
 
-        if (!$this->isRemoteLink($asset)) {
+        $modified = false;
+        $remote = $this->isRemoteLink($asset);
+        if (!$remote) {
+            $modified = $this->getLastModificationTime($asset);
             $asset = $this->buildLocalLink($asset);
         }
 
@@ -293,10 +295,12 @@ class Assets
 
         $data = [
             'asset'    => $asset,
+            'remote'   => $remote,
             'priority' => intval($priority ?: 10),
             'order'    => count($this->css),
-            'pipeline' => (bool)$pipeline,
-            'group'    => $group ?: 'head'
+            'pipeline' => (bool) $pipeline,
+            'group'    => $group ?: 'head',
+            'modified' => $modified
         ];
 
         // check for dynamic array and merge with defaults
@@ -343,7 +347,10 @@ class Assets
             return $this;
         }
 
-        if (!$this->isRemoteLink($asset)) {
+        $modified = false;
+        $remote = $this->isRemoteLink($asset);
+        if (!$remote) {
+            $modified = $this->getLastModificationTime($asset);
             $asset = $this->buildLocalLink($asset);
         }
 
@@ -354,11 +361,13 @@ class Assets
 
         $data = [
             'asset'    => $asset,
+            'remote'   => $remote ,
             'priority' => intval($priority ?: 10),
             'order'    => count($this->js),
-            'pipeline' => (bool)$pipeline,
+            'pipeline' => (bool) $pipeline,
             'loading'  => $loading ?: '',
-            'group'    => $group ?: 'head'
+            'group'    => $group ?: 'head',
+            'modified' => $modified
         ];
 
         // check for dynamic array and merge with defaults
@@ -553,7 +562,7 @@ class Assets
             foreach ($this->css_no_pipeline as $file) {
                 if ($group && $file['group'] == $group) {
                     $media = isset($file['media']) ? sprintf(' media="%s"', $file['media']) : '';
-                    $output .= '<link href="' . $file['asset'] . $this->timestamp . '"' . $attributes . $media . ' />' . "\n";
+                    $output .= '<link href="' . $file['asset'] . $this->getTimestamp($file) . '"' . $attributes . $media . ' />' . "\n";
                 }
             }
             if (!$this->css_pipeline_before_excludes && $pipeline_result) {
@@ -563,7 +572,7 @@ class Assets
             foreach ($this->css as $file) {
                 if ($group && $file['group'] == $group) {
                     $media = isset($file['media']) ? sprintf(' media="%s"', $file['media']) : '';
-                    $output .= '<link href="' . $file['asset'] . $this->timestamp . '"' . $attributes . $media . ' />' . "\n";
+                    $output .= '<link href="' . $file['asset'] . $this->getTimestamp($file) . '"' . $attributes . $media . ' />' . "\n";
                 }
             }
         }
@@ -631,7 +640,7 @@ class Assets
             }
             foreach ($this->js_no_pipeline as $file) {
                 if ($group && $file['group'] == $group) {
-                    $output .= '<script src="' . $file['asset'] . $this->timestamp . '"' . $attributes . ' ' . $file['loading'] . '></script>' . "\n";
+                    $output .= '<script src="' . $file['asset'] . $this->getTimestamp($file) . '"' . $attributes . ' ' . $file['loading'] . '></script>' . "\n";
                 }
             }
             if (!$this->js_pipeline_before_excludes && $pipeline_result) {
@@ -640,7 +649,7 @@ class Assets
         } else {
             foreach ($this->js as $file) {
                 if ($group && $file['group'] == $group) {
-                    $output .= '<script src="' . $file['asset'] . $this->timestamp . '"' . $attributes . ' ' . $file['loading'] . '></script>' . "\n";
+                    $output .= '<script src="' . $file['asset'] . $this->getTimestamp($file) . '"' . $attributes . ' ' . $file['loading'] . '></script>' . "\n";
                 }
             }
         }
@@ -671,14 +680,11 @@ class Assets
         // temporary list of assets to pipeline
         $temp_css = [];
 
-        /** @var Cache $cache */
-        $cache = Grav::instance()['cache'];
-
         // clear no-pipeline assets lists
         $this->css_no_pipeline = [];
 
         // Compute uid based on assets and timestamp
-        $uid = md5(json_encode($this->css) . $this->css_minify . $this->css_rewrite . $group . $cache->getKey());
+        $uid = md5(json_encode($this->css) . $this->css_minify . $this->css_rewrite . $group);
         $file =  $uid . '.css';
         $inline_file = $uid . '-inline.css';
 
@@ -691,14 +697,14 @@ class Assets
 
         // If pipeline exist return it
         if (file_exists($this->assets_dir . $file)) {
-            return $relative_path . $this->timestamp;
+            return $relative_path . $this->getTimestamp();
         }
 
         // Remove any non-pipeline files
         foreach ($this->css as $id => $asset) {
             if ($asset['group'] == $group) {
                 if (!$asset['pipeline'] ||
-                    ($this->isRemoteLink($asset['asset']) && $this->css_pipeline_include_externals === false)) {
+                    ($asset['remote'] && $this->css_pipeline_include_externals === false)) {
                     $this->css_no_pipeline[$id] = $asset;
                 } else {
                     $temp_css[$id] = $asset;
@@ -738,7 +744,7 @@ class Assets
         if (strlen(trim($buffer)) > 0) {
             file_put_contents($this->assets_dir . $file, $buffer);
 
-            return $relative_path . $this->timestamp;
+            return $relative_path . $this->getTimestamp();
         } else {
             return false;
         }
@@ -756,14 +762,11 @@ class Assets
         // temporary list of assets to pipeline
         $temp_js = [];
 
-        /** @var Cache $cache */
-        $cache = Grav::instance()['cache'];
-
         // clear no-pipeline assets lists
         $this->js_no_pipeline = [];
 
         // Compute uid based on assets and timestamp
-        $uid = md5(json_encode($this->js) . $this->js_minify . $group . $cache->getKey());
+        $uid = md5(json_encode($this->js) . $this->js_minify . $group);
         $file =  $uid . '.js';
         $inline_file = $uid . '-inline.js';
 
@@ -776,14 +779,14 @@ class Assets
 
         // If pipeline exist return it
         if (file_exists($this->assets_dir . $file)) {
-            return $relative_path . $this->timestamp;
+            return $relative_path . $this->getTimestamp();
         }
 
         // Remove any non-pipeline files
         foreach ($this->js as $id => $asset) {
             if ($asset['group'] == $group) {
                 if (!$asset['pipeline'] ||
-                    ($this->isRemoteLink($asset['asset']) && $this->js_pipeline_include_externals === false)) {
+                    ($asset['remote'] && $this->js_pipeline_include_externals === false)) {
                     $this->js_no_pipeline[] = $asset;
                 } else {
                     $temp_js[$id] = $asset;
@@ -813,7 +816,7 @@ class Assets
         if (strlen(trim($buffer)) > 0) {
             file_put_contents($this->assets_dir . $file, $buffer);
 
-            return $relative_path . $this->timestamp;
+            return $relative_path . $this->getTimestamp();
         } else {
             return false;
         }
@@ -1100,18 +1103,37 @@ class Assets
     /**
      * Build local links including grav asset shortcodes
      *
-     * @param  string $asset the asset string reference
+     * @param  string $asset    the asset string reference
+     * @param  bool   $absolute build absolute asset link
      *
-     * @return string        the final link url to the asset
+     * @return string           the final link url to the asset
      */
-    protected function buildLocalLink($asset)
+    protected function buildLocalLink($asset, $absolute = false)
     {
         try {
-            $asset = Grav::instance()['locator']->findResource($asset, false);
+            $asset = Grav::instance()['locator']->findResource($asset, $absolute);
         } catch (\Exception $e) {
         }
 
-        return $asset ? $this->base_url . ltrim($asset, '/') : false;
+        $uri = $absolute ? $asset : $this->base_url . ltrim($asset, '/');
+        return $asset ? $uri : false;
+    }
+
+    /**
+     * Get the last modification time of asset
+     *
+     * @param  string $asset    the asset string reference
+     *
+     * @return string           the last modifcation time or false on error
+     */
+    protected function getLastModificationTime($asset)
+    {
+        $file = GRAV_ROOT . $asset;
+        if (Grav::instance()['locator']->isStream($asset)) {
+            $file = $this->buildLocalLink($asset, true);
+        }
+
+        return file_exists($file) ? filemtime($file) : false;
     }
 
     /**
@@ -1324,6 +1346,21 @@ class Assets
         $this->timestamp = '?' . $value;
     }
 
+    public function getTimestamp($asset = null)
+    {
+        if (is_array($asset)) {
+            if ($asset['remote'] === false) {
+                if (Utils::contains($asset['asset'], '?')) {
+                    return str_replace('?', '&', $this->timestamp);
+                } else {
+                    return $this->timestamp;
+                }
+            }
+        } elseif (empty($asset)) {
+            return $this->timestamp;
+        }
+    }
+
     /**
      * @return string
      */

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

@@ -1,22 +1,24 @@
 <?php
+/**
+ * @package    Grav.Common.Backup
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Backup;
 
 use Grav\Common\Grav;
 use Grav\Common\Inflector;
 
-/**
- * The ZipBackup class lets you create simple zip-backups of a grav site
- *
- * @author RocketTheme
- * @license MIT
- */
 class ZipBackup
 {
     protected static $ignorePaths = [
         'backup',
         'cache',
         'images',
-        'logs'
+        'logs',
+        'tmp'
     ];
 
     protected static $ignoreFolders = [
@@ -45,7 +47,7 @@ class ZipBackup
             }
         }
 
-        $name = Grav::instance()['config']->get('site.title', basename(GRAV_ROOT));
+        $name = substr(strip_tags(Grav::instance()['config']->get('site.title', basename(GRAV_ROOT))), 0, 20);
 
         $inflector = new Inflector();
 

system/src/Grav/Common/Browser.php

@@ -1,13 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
 /**
- * Handles browser and platform versions
- *
  * Internally uses the PhpUserAgent package https://github.com/donatj/PhpUserAgent
- *
- * @author  RocketTheme
- * @license MIT
  */
 class Browser
 {

system/src/Grav/Common/Cache.php

@@ -1,10 +1,17 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
 use \Doctrine\Common\Cache as DoctrineCache;
 use Grav\Common\Config\Config;
 use Grav\Common\Filesystem\Folder;
-use Grav\Common\Grav;
+use RocketTheme\Toolbox\Event\Event;
 
 /**
  * The GravCache object is used throughout Grav to store and retrieve cached data.
@@ -16,9 +23,6 @@ use Grav\Common\Grav;
  * MemCache
  * MemCacheD
  * FileSystem
- *
- * @author  RocketTheme
- * @license MIT
  */
 class Cache extends Getters
 {
@@ -61,7 +65,8 @@ class Cache extends Getters
     protected static $all_remove = [
         'cache://',
         'cache://images',
-        'asset://'
+        'asset://',
+        'tmp://'
     ];
 
     protected static $assets_remove = [
@@ -76,6 +81,10 @@ class Cache extends Getters
         'cache://'
     ];
 
+    protected static $tmp_remove = [
+        'tmp://'
+    ];
+
     /**
      * Constructor
      *
@@ -106,7 +115,9 @@ class Cache extends Getters
 
         $prefix = $this->config->get('system.cache.prefix');
 
-        $this->enabled = (bool)$this->config->get('system.cache.enabled');
+        if (is_null($this->enabled)) {
+            $this->enabled = (bool)$this->config->get('system.cache.enabled');
+        }
 
         // Cache key allows us to invalidate all cache on configuration changes.
         $this->key = ($prefix ? $prefix : 'g') . '-' . substr(md5($uri->rootUrl(true) . $this->config->key() . GRAV_VERSION),
@@ -118,10 +129,36 @@ class Cache extends Getters
 
         // Set the cache namespace to our unique key
         $this->driver->setNamespace($this->key);
+    }
 
-        // Dump Cache state
-        $grav['debugger']->addMessage('Cache: [' . ($this->enabled ? 'true' : 'false') . '] Setting: [' . $this->driver_setting . '] Driver: [' . $this->driver_name . ']');
+    /**
+     * Public accessor to set the enabled state of the cache
+     *
+     * @param $enabled
+     */
+    public function setEnabled($enabled)
+    {
+        $this->enabled = (bool) $enabled;
+    }
 
+    /**
+     * Returns the current enabled state
+     *
+     * @return bool
+     */
+    public function getEnabled()
+    {
+        return $this->enabled;
+    }
+
+    /**
+     * Get cache state
+     *
+     * @return string
+     */
+    public function getCacheStatus()
+    {
+        return 'Cache: [' . ($this->enabled ? 'true' : 'false') . '] Setting: [' . $this->driver_setting . '] Driver: [' . $this->driver_name . ']';
     }
 
     /**
@@ -179,7 +216,7 @@ class Cache extends Getters
 
             case 'memcached':
                 $memcached = new \Memcached();
-                $memcached->connect($this->config->get('system.cache.memcached.server', 'localhost'),
+                $memcached->addServer($this->config->get('system.cache.memcached.server', 'localhost'),
                     $this->config->get('system.cache.memcached.port', 11211));
                 $driver = new DoctrineCache\MemcachedCache();
                 $driver->setMemcached($memcached);
@@ -187,8 +224,15 @@ class Cache extends Getters
 
             case 'redis':
                 $redis = new \Redis();
-                $redis->connect($this->config->get('system.cache.redis.server', 'localhost'),
+                $socket = $this->config->get('system.cache.redis.socket', false);
+
+                if ($socket) {
+                    $redis->connect($socket);
+                } else {
+                    $redis->connect($this->config->get('system.cache.redis.server', 'localhost'),
                     $this->config->get('system.cache.redis.port', 6379));
+                }
+
                 $driver = new DoctrineCache\RedisCache();
                 $driver->setRedis($redis);
                 break;
@@ -305,39 +349,45 @@ class Cache extends Getters
             case 'cache-only':
                 $remove_paths = self::$cache_remove;
                 break;
+            case 'tmp-only':
+                $remove_paths = self::$tmp_remove;
+                break;
             default:
                 $remove_paths = self::$standard_remove;
         }
 
+        // Clearing cache event to add paths to clear
+        Grav::instance()->fireEvent('onBeforeCacheClear', new Event(['remove' => $remove, 'paths' => &$remove_paths]));
 
         foreach ($remove_paths as $stream) {
 
             // Convert stream to a real path
-            $path = $locator->findResource($stream, true, true);
-            // Make sure path exists before proceeding, otherwise we would wipe ROOT_DIR
-            if (!$path) {
-                throw new \RuntimeException("Stream '{$stream}' not found", 500);
-            }
+            try {
+                $path = $locator->findResource($stream, true, true);
 
-            $anything = false;
-            $files = glob($path . '/*');
+                $anything = false;
+                $files = glob($path . '/*');
 
-            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 (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 . '/*';
+                if ($anything) {
+                    $output[] = '<red>Cleared:  </red>' . $path . '/*';
+                }
+            } catch (\Exception $e) {
+                // stream not found or another error while deleting files.
+                $output[] = '<red>ERROR: </red>' . $e->getMessage();
             }
         }
 

system/src/Grav/Common/Composer.php

@@ -1,13 +1,13 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
 
 namespace Grav\Common;
 
-/**
- * Offers composer helper methods.
- *
- * @author  eschmar
- * @license MIT
- */
 class Composer
 {
     /** @const Default composer location */

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

@@ -1,11 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
 use RocketTheme\Toolbox\File\PhpFile;
 
-/**
- * The Compiled base class.
- */
 abstract class CompiledBase
 {
     /**
@@ -192,9 +196,9 @@ abstract class CompiledBase
         }
 
         $this->createObject($cache['data']);
-        
+
         $this->finalizeObject();
-        
+
         return true;
     }
 

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

@@ -1,13 +1,16 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
 namespace Grav\Common\Config;
 
 use Grav\Common\Data\Blueprint;
 use Grav\Common\Data\BlueprintSchema;
 use Grav\Common\Grav;
 
-/**
- * The Compiled Blueprints class.
- */
 class CompiledBlueprints extends CompiledBase
 {
     /**

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

@@ -1,11 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
 use Grav\Common\File\CompiledYamlFile;
 
-/**
- * The Compiled Configuration class.
- */
 class CompiledConfig extends CompiledBase
 {
     /**

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

@@ -1,11 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
 use Grav\Common\File\CompiledYamlFile;
 
-/**
- * The Compiled Languages class.
- */
 class CompiledLanguages extends CompiledBase
 {
     /**

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

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
 use Grav\Common\Debugger;
@@ -6,12 +13,6 @@ use Grav\Common\Grav;
 use Grav\Common\Data\Data;
 use Grav\Common\Service\ConfigServiceProvider;
 
-/**
- * The Config class contains configuration information.
- *
- * @author RocketTheme
- * @license MIT
- */
 class Config extends Data
 {
     protected $checksum;

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

@@ -1,11 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
 use Grav\Common\Filesystem\Folder;
 
-/**
- * The Configuration & Blueprints Finder class.
- */
 class ConfigFileFinder
 {
     protected $base = '';

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

@@ -1,14 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 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 checksum($checksum = null)

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

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Config
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Config;
 
 use Grav\Common\File\CompiledYamlFile;
@@ -8,14 +15,10 @@ use Pimple\Container;
 use RocketTheme\Toolbox\File\YamlFile;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
-/**
- * The Config class contains configuration information.
- *
- * @author RocketTheme
- * @license MIT
- */
 class Setup extends Data
 {
+    public static $environment;
+
     protected $streams = [
         'system' => [
             'type' => 'ReadOnlyStream',
@@ -25,6 +28,7 @@ class Setup extends Data
         ],
         'user' => [
             'type' => 'ReadOnlyStream',
+            'force' => true,
             'prefixes' => [
                 '' => ['user'],
             ]
@@ -77,6 +81,7 @@ class Setup extends Data
         ],
         'cache' => [
             'type' => 'Stream',
+            'force' => true,
             'prefixes' => [
                 '' => ['cache'],
                 'images' => ['images']
@@ -84,16 +89,25 @@ class Setup extends Data
         ],
         'log' => [
             'type' => 'Stream',
+            'force' => true,
             'prefixes' => [
                 '' => ['logs']
             ]
         ],
         'backup' => [
             'type' => 'Stream',
+            'force' => true,
             'prefixes' => [
                 '' => ['backup']
             ]
         ],
+        'tmp' => [
+            'type' => 'Stream',
+            'force' => true,
+            'prefixes' => [
+                '' => ['tmp']
+            ]
+        ],
         'image' => [
             'type' => 'ReadOnlyStream',
             'prefixes' => [
@@ -119,7 +133,7 @@ class Setup extends Data
      */
     public function __construct($container)
     {
-        $environment = $container['uri']->environment() ?: 'localhost';
+        $environment = isset(static::$environment) ? static::$environment : ($container['uri']->environment() ?: 'localhost');
 
         // Pre-load setup.php which contains our initial configuration.
         // Configuration may contain dynamic parts, which is why we need to always load it.
@@ -136,8 +150,8 @@ class Setup extends Data
         parent::__construct($setup);
 
         // Set up environment.
-        $this->def('environment', $environment);
-        $this->def('streams.schemes.environment.prefixes', ['' => ["user://{$this->environment}"]]);
+        $this->def('environment', $environment ?: 'cli');
+        $this->def('streams.schemes.environment.prefixes', ['' => ($environment ? ["user://{$this->environment}"] : [])]);
     }
 
     /**
@@ -193,9 +207,13 @@ class Setup extends Data
             if (isset($config['paths'])) {
                 $locator->addPath($scheme, '', $config['paths']);
             }
+
+            $override = isset($config['override']) ? $config['override'] : false;
+            $force = isset($config['force']) ? $config['force'] : false;
+
             if (isset($config['prefixes'])) {
                 foreach ($config['prefixes'] as $prefix => $paths) {
-                    $locator->addPath($scheme, $prefix, $paths);
+                    $locator->addPath($scheme, $prefix, $paths, $override, $force);
                 }
             }
         }

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

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Data
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Data;
 
 use Grav\Common\File\CompiledYamlFile;
@@ -6,11 +13,6 @@ use Grav\Common\Grav;
 use RocketTheme\Toolbox\Blueprints\BlueprintForm;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
-/**
- * The Config class contains configuration information.
- *
- * @author RocketTheme
- */
 class Blueprint extends BlueprintForm
 {
     /**
@@ -108,6 +110,18 @@ class Blueprint extends BlueprintForm
         return $this->blueprintSchema->filter($data);
     }
 
+    /**
+     * Return blueprint data schema.
+     *
+     * @return BlueprintSchema
+     */
+    public function schema()
+    {
+        $this->initInternals();
+
+        return $this->blueprintSchema;
+    }
+
     /**
      * Initialize validator.
      */

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

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Data
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Data;
 
 use Grav\Common\Grav;
@@ -6,12 +13,6 @@ use RocketTheme\Toolbox\ArrayTraits\Export;
 use RocketTheme\Toolbox\ArrayTraits\ExportInterface;
 use RocketTheme\Toolbox\Blueprints\BlueprintSchema as BlueprintSchemaBase;
 
-/**
- * Blueprint schema handles the internal logic of blueprints.
- *
- * @author RocketTheme
- * @license MIT
- */
 class BlueprintSchema extends BlueprintSchemaBase implements ExportInterface
 {
     use Export;
@@ -132,8 +133,15 @@ class BlueprintSchema extends BlueprintSchemaBase implements ExportInterface
             }
             $field = $this->items[$field];
             if (isset($field['validate']['required'])
-                && $field['validate']['required'] === true
-                && !isset($data[$name])) {
+                && $field['validate']['required'] === true) {
+
+                if (isset($data[$name])) {
+                    continue;
+                }
+                if ($field['type'] == 'file' && isset($data['data']['name'][$name])) { //handle case of file input fields required
+                    continue;
+                }
+
                 $value = isset($field['label']) ? $field['label'] : $field['name'];
                 $language = Grav::instance()['language'];
                 $message  = sprintf($language->translate('FORM.MISSING_REQUIRED_FIELD', null, true) . ' %s', $language->translate($value));

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

@@ -1,15 +1,16 @@
 <?php
+/**
+ * @package    Grav.Common.Data
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Data;
 
 use Grav\Common\Grav;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
-/**
- * Blueprints class keeps track on blueprint instances.
- *
- * @author RocketTheme
- * @license MIT
- */
 class Blueprints
 {
     protected $search;

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

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Data
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Data;
 
 use RocketTheme\Toolbox\ArrayTraits\Countable;
@@ -8,12 +15,6 @@ use RocketTheme\Toolbox\ArrayTraits\NestedArrayAccessWithGetters;
 use RocketTheme\Toolbox\File\File;
 use RocketTheme\Toolbox\File\FileInterface;
 
-/**
- * Recursive data object
- *
- * @author RocketTheme
- * @license MIT
- */
 class Data implements DataInterface, \ArrayAccess, \Countable, ExportInterface
 {
     use NestedArrayAccessWithGetters, Countable, Export;

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

@@ -1,14 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.Data
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Data;
 
 use RocketTheme\Toolbox\File\FileInterface;
 
-/**
- * Data interface
- *
- * @author RocketTheme
- * @license MIT
- */
 interface DataInterface
 {
     /**

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

@@ -1,17 +1,19 @@
 <?php
+/**
+ * @package    Grav.Common.Data
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Data;
 
 use Grav\Common\Grav;
+use Grav\Common\Utils;
 use Symfony\Component\Yaml\Exception\ParseException;
 use Symfony\Component\Yaml\Parser;
 use Symfony\Component\Yaml\Yaml;
 
-/**
- * Data validation.
- *
- * @author RocketTheme
- * @license MIT
- */
 class Validation
 {
     /**
@@ -36,12 +38,6 @@ class Validation
             $field['type'] = 'text';
         }
 
-        // Special case for files, value is never empty and errors with code 4 instead.
-        if (empty($validate['required']) && $field['type'] == 'file' && isset($value['error'])
-                && ($value['error'] == UPLOAD_ERR_NO_FILE || in_array(UPLOAD_ERR_NO_FILE, $value['error']))) {
-            return $messages;
-        }
-
         // Get language class.
         $language = Grav::instance()['language'];
 
@@ -100,12 +96,6 @@ class Validation
             $field['type'] = 'text';
         }
 
-        // Special case for files, value is never empty and errors with code 4 instead.
-        if (empty($validate['required']) && $field['type'] == 'file' && isset($value['error'])
-            && ($value['error'] == UPLOAD_ERR_NO_FILE || in_array(UPLOAD_ERR_NO_FILE, $value['error']))) {
-            return null;
-        }
-
         // If this is a YAML field, simply parse it and return the value.
         if (isset($field['yaml']) && $field['yaml'] === true) {
             try {
@@ -404,7 +394,15 @@ class Validation
      */
     public static function typeEmail($value, array $params, array $field)
     {
-        return self::typeText($value, $params, $field) && filter_var($value, FILTER_VALIDATE_EMAIL);
+        $values = !is_array($value) ? explode(',', preg_replace('/\s+/', '', $value)) : $value;
+
+        foreach ($values as $value) {
+            if (!(self::typeText($value, $params, $field) && filter_var($value, FILTER_VALIDATE_EMAIL))) {
+                return false;
+            }
+        }
+
+        return true;
     }
 
     /**
@@ -572,6 +570,7 @@ class Validation
             return null;
         }
 
+
         if ($options) {
             $useKey = isset($field['use']) && $field['use'] == 'keys';
             foreach ($values as $key => $value) {
@@ -589,6 +588,18 @@ class Validation
             }
         }
 
+        if (isset($field['ignore_empty']) && Utils::isPositive($field['ignore_empty'])) {
+            foreach ($values as $key => $value) {
+                foreach ($value as $inner_key => $inner_value) {
+                    if ($inner_value == '') {
+                        unset($value[$inner_key]);
+                    }
+                }
+
+                $values[$key] = $value;
+            }
+        }
+
         return $values;
     }
 

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

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Data
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Data;
 
 use Grav\Common\Grav;

system/src/Grav/Common/Debugger.php

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common;
 
 use DebugBar\DataCollector\ConfigCollector;
@@ -6,10 +13,6 @@ use DebugBar\JavascriptRenderer;
 use DebugBar\StandardDebugBar;
 use Grav\Common\Config\Config;
 
-/**
- * Class Debugger
- * @package Grav\Common
- */
 class Debugger
 {
     /** @var Grav $grav */
@@ -214,4 +217,19 @@ class Debugger
 
         return $this;
     }
+
+    /**
+     * Dump exception into the Messages tab of the Debug Bar
+     *
+     * @param \Exception $e
+     * @return Debugger
+     */
+    public function addException(\Exception $e)
+    {
+        if ($this->enabled()) {
+            $this->debugbar['exceptions']->addException($e);
+        }
+
+        return $this;
+    }
 }

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

@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package    Grav.Common.Errors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Errors;
+
+use Whoops\Handler\Handler;
+
+class BareHandler extends Handler
+{
+
+    /**
+     * @return int|null
+     */
+    public function handle()
+    {
+        return Handler::QUIT;
+    }
+
+}

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

@@ -1,13 +1,16 @@
 <?php
+/**
+ * @package    Grav.Common.Errors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Errors;
 
 use Grav\Common\Grav;
 use Whoops;
 
-/**
- * Class Debugger
- * @package Grav\Common
- */
 class Errors
 {
     public function resetHandlers()
@@ -19,16 +22,30 @@ class Errors
         // Setup Whoops-based error handler
         $whoops = new \Whoops\Run;
 
+        $verbosity = 1;
+
         if (isset($config['display'])) {
-            if ($config['display']) {
+            if (is_int($config['display'])) {
+                $verbosity = $config['display'];
+            } else {
+                $verbosity = $config['display'] ? 1 : 0;
+            }
+        }
+
+        switch ($verbosity) {
+            case 1:
                 $error_page = new Whoops\Handler\PrettyPageHandler;
                 $error_page->setPageTitle('Crikey! There was an error...');
                 $error_page->addResourcePath(GRAV_ROOT . '/system/assets');
                 $error_page->addCustomCss('whoops.css');
                 $whoops->pushHandler($error_page);
-            } else {
+                break;
+            case -1:
+                $whoops->pushHandler(new BareHandler);
+                break;
+            default:
                 $whoops->pushHandler(new SimplePageHandler);
-            }
+                break;
         }
 
         if (method_exists('Whoops\Util\Misc', 'isAjaxRequest')) { //Whoops 2.0

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

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.Errors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Errors;
 
 use Whoops\Handler\Handler;

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

@@ -1,17 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.File
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\File;
 
 use RocketTheme\Toolbox\File\PhpFile;
 
-/**
- * Class CompiledFile
- * @package Grav\Common\File
- *
- * @property string $filename
- * @property string $extension
- * @property string $raw
- * @property array|string $content
- */
 trait CompiledFile
 {
     /**
@@ -25,58 +23,63 @@ trait CompiledFile
         // 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 . DS . "compiled/files/{$key}{$this->extension}.php");
+        try {
+            // 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 . DS . "compiled/files/{$key}{$this->extension}.php");
 
-            $modified = $this->modified();
+                $modified = $this->modified();
 
-            if (!$modified) {
-                return $this->decode($this->raw());
-            }
-
-            $class = get_class($this);
-
-            $cache = $file->exists() ? $file->content() : null;
-
-            // Load real file if cache isn't up to date (or is invalid).
-            if (
-                !isset($cache['@class'])
-                || $cache['@class'] != $class
-                || $cache['modified'] != $modified
-                || $cache['filename'] != $this->filename
-            ) {
-                // Attempt to lock the file for writing.
-                try {
-                    $file->lock(false);
-                } catch (\Exception $e) {
-                    // Another process has locked the file; we will check this in a bit.
+                if (!$modified) {
+                    return $this->decode($this->raw());
                 }
 
-                // Decode RAW file into compiled array.
-                $data = (array) $this->decode($this->raw());
-                $cache = [
-                    '@class' => $class,
-                    'filename' => $this->filename,
-                    'modified' => $modified,
-                    'data' => $data
-                ];
+                $class = get_class($this);
 
-                // If compiled file wasn't already locked by another process, save it.
-                if ($file->locked() !== false) {
-                    $file->save($cache);
-                    $file->unlock();
+                $cache = $file->exists() ? $file->content() : null;
 
-                    // Compile cached file into bytecode cache
-                    if (function_exists('opcache_invalidate')) {
-                        opcache_invalidate($file->filename(), true);
+                // Load real file if cache isn't up to date (or is invalid).
+                if (
+                    !isset($cache['@class'])
+                    || $cache['@class'] != $class
+                    || $cache['modified'] != $modified
+                    || $cache['filename'] != $this->filename
+                ) {
+                    // Attempt to lock the file for writing.
+                    try {
+                        $file->lock(false);
+                    } catch (\Exception $e) {
+                        // Another process has locked the file; we will check this in a bit.
+                    }
+
+                    // Decode RAW file into compiled array.
+                    $data = (array)$this->decode($this->raw());
+                    $cache = [
+                        '@class' => $class,
+                        'filename' => $this->filename,
+                        'modified' => $modified,
+                        'data' => $data
+                    ];
+
+                    // If compiled file wasn't already locked by another process, save it.
+                    if ($file->locked() !== false) {
+                        $file->save($cache);
+                        $file->unlock();
+
+                        // Compile cached file into bytecode cache
+                        if (function_exists('opcache_invalidate')) {
+                            opcache_invalidate($file->filename(), true);
+                        }
                     }
                 }
-            }
-            $file->free();
+                $file->free();
 
-            $this->content = $cache['data'];
+                $this->content = $cache['data'];
+            }
+
+        } catch (\Exception $e) {
+            throw new \RuntimeException(sprintf('Failed to read %s: %s', basename($this->filename), $e->getMessage()), 500, $e);
         }
 
         return parent::content($var);

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

@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package    Grav.Common.File
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\File;
+
+use RocketTheme\Toolbox\File\JsonFile;
+
+class CompiledJsonFile extends JsonFile
+{
+    use CompiledFile;
+
+    /**
+     * Decode RAW string into contents.
+     *
+     * @param string $var
+     * @param bool $assoc
+     * @return array mixed
+     */
+    protected function decode($var, $assoc = true)
+    {
+        return (array) json_decode($var, $assoc);
+    }
+}

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

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.File
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\File;
 
 use RocketTheme\Toolbox\File\MarkdownFile;

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

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.File
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\File;
 
 use RocketTheme\Toolbox\File\YamlFile;

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

@@ -1,15 +1,16 @@
 <?php
+/**
+ * @package    Grav.Common.FileSystem
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Filesystem;
 
 use Grav\Common\Grav;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
-/**
- * Folder helper class.
- *
- * @author RocketTheme
- * @license MIT
- */
 abstract class Folder
 {
     /**
@@ -78,6 +79,34 @@ abstract class Folder
         return $last_modified;
     }
 
+    /**
+     * Recursively md5 hash all files in a path
+     *
+     * @param $path
+     * @return string
+     */
+    public static function hashAllFiles($path)
+    {
+        $flags = \RecursiveDirectoryIterator::SKIP_DOTS;
+        $files = [];
+
+        /** @var UniformResourceLocator $locator */
+        $locator = Grav::instance()['locator'];
+        if ($locator->isStream($path)) {
+            $directory = $locator->getRecursiveIterator($path, $flags);
+        } else {
+            $directory = new \RecursiveDirectoryIterator($path, $flags);
+        }
+
+        $iterator = new \RecursiveIteratorIterator($directory, \RecursiveIteratorIterator::SELF_FIRST);
+
+        foreach ($iterator as $filepath => $file) {
+            $files[] = $file->getPath() . $file->getMTime();
+        }
+
+        return md5(serialize($files));
+    }
+
     /**
      * Get relative path between target and base path. If path isn't relative, return full path.
      *
@@ -178,7 +207,8 @@ abstract class Folder
         /** @var UniformResourceLocator $locator */
         $locator = Grav::instance()['locator'];
         if ($recursive) {
-            $flags = \RecursiveDirectoryIterator::SKIP_DOTS + \FilesystemIterator::UNIX_PATHS + \FilesystemIterator::CURRENT_AS_SELF;
+            $flags = \RecursiveDirectoryIterator::SKIP_DOTS + \FilesystemIterator::UNIX_PATHS
+                + \FilesystemIterator::CURRENT_AS_SELF + \FilesystemIterator::FOLLOW_SYMLINKS;
             if ($locator->isStream($path)) {
                 $directory = $locator->getRecursiveIterator($path, $flags);
             } else {
@@ -356,7 +386,6 @@ abstract class Folder
     /**
      * @param  string  $folder
      * @throws \RuntimeException
-     * @internal
      */
     public static function mkdir($folder)
     {
@@ -366,7 +395,6 @@ abstract class Folder
     /**
      * @param  string  $folder
      * @throws \RuntimeException
-     * @internal
      */
     public static function create($folder)
     {
@@ -401,10 +429,7 @@ abstract class Folder
 
         // 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;
-            }
+            Folder::mkdir($dest);
         }
 
         // Open the source directory to read in files
@@ -435,22 +460,11 @@ abstract class Folder
             return @unlink($folder);
         }
 
-        $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;
-                }
-            }
+        // 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);
         }
 
         return $include_target ? @rmdir($folder) : true;

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

@@ -1,12 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.FileSystem
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\Filesystem;
 
 use Grav\Common\Grav;
 
-/**
- * Class RecursiveFolderFilterIterator
- * @package Grav\Common\Filesystem
- */
 class RecursiveFolderFilterIterator extends \RecursiveFilterIterator
 {
     protected static $folder_ignores;

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

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM;
 
 use Grav\Common\Iterator;

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

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM\Common;
 
 use Grav\Common\Iterator;

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

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM\Common;
 
 use Grav\Common\Iterator;

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

@@ -1,19 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM\Common;
 
 use Grav\Common\Data\Data;
 
-/**
- * @property string name
- * @property string version
- * @property string available
- * @property string package_type
- * @property string description_plain
- * @property string slug
- * @property array author
- * @property mixed changelog
- */
-
 class Package {
 
     protected $data;

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

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM;
 
 use Grav\Common\Grav;
@@ -32,32 +39,58 @@ class GPM extends Iterator
      */
     protected $cache;
 
-    protected $install_paths = ['plugins' => 'user/plugins/%name%', 'themes' => 'user/themes/%name%', 'skeletons' => 'user/'];
+    protected $install_paths = [
+        'plugins' => 'user/plugins/%name%',
+        'themes' => 'user/themes/%name%',
+        'skeletons' => 'user/'
+    ];
 
     /**
      * Creates a new GPM instance with Local and Remote packages available
-     * @param boolean  $refresh  Applies to Remote Packages only and forces a refetch of data
+     * @param boolean $refresh Applies to Remote Packages only and forces a refetch of data
      * @param callable $callback Either a function or callback in array notation
      */
     public function __construct($refresh = false, $callback = null)
     {
-        $this->installed  = new Local\Packages();
+        $this->installed = new Local\Packages();
         try {
             $this->repository = new Remote\Packages($refresh, $callback);
-            $this->grav       = new Remote\GravCore($refresh, $callback);
+            $this->grav = new Remote\GravCore($refresh, $callback);
         } catch (\Exception $e) {
         }
     }
 
     /**
-     * Returns the Locally installed packages
-     * @return Iterator The installed packages
+     * Return the locally installed packages
+     *
+     * @return Local\Packages
      */
     public function getInstalled()
     {
         return $this->installed;
     }
 
+    /**
+     * Returns the Locally installable packages
+     *
+     * @param array $list_type_installed
+     * @return Iterator The installed packages
+     */
+    public function getInstallable($list_type_installed = ['plugins' => true, 'themes' => true])
+    {
+        $items = ['total' => 0];
+        foreach ($list_type_installed as $type => $type_installed) {
+            if ($type_installed === false) {
+                continue;
+            }
+            $methodInstallableType = 'getInstalled' . ucfirst($type);
+            $to_install = $this->$methodInstallableType();
+            $items[$type] = $to_install;
+            $items['total'] += count($to_install);
+        }
+        return $items;
+    }
+
     /**
      * Returns the amount of locally installed packages
      * @return integer Amount of installed packages
@@ -72,7 +105,7 @@ class GPM extends Iterator
     /**
      * Return the instance of a specific Package
      *
-     * @param  string  $slug The slug of the Package
+     * @param  string $slug The slug of the Package
      * @return Local\Package The instance of the Package
      */
     public function getInstalledPackage($slug)
@@ -88,7 +121,7 @@ class GPM extends Iterator
 
     /**
      * Return the instance of a specific Plugin
-     * @param  string  $slug The slug of the Plugin
+     * @param  string $slug The slug of the Plugin
      * @return Local\Package The instance of the Plugin
      */
     public function getInstalledPlugin($slug)
@@ -107,7 +140,7 @@ class GPM extends Iterator
 
     /**
      * Checks if a Plugin is installed
-     * @param  string  $slug The slug of the Plugin
+     * @param  string $slug The slug of the Plugin
      * @return boolean True if the Plugin has been installed. False otherwise
      */
     public function isPluginInstalled($slug)
@@ -122,7 +155,7 @@ class GPM extends Iterator
 
     /**
      * Return the instance of a specific Theme
-     * @param  string  $slug The slug of the Theme
+     * @param  string $slug The slug of the Theme
      * @return Local\Package The instance of the Theme
      */
     public function getInstalledTheme($slug)
@@ -141,7 +174,7 @@ class GPM extends Iterator
 
     /**
      * Checks if a Theme is installed
-     * @param  string  $slug The slug of the Theme
+     * @param  string $slug The slug of the Theme
      * @return boolean True if the Theme has been installed. False otherwise
      */
     public function isThemeInstalled($slug)
@@ -166,20 +199,23 @@ class GPM extends Iterator
     /**
      * Returns an array of Plugins and Themes that can be updated.
      * Plugins and Themes are extended with the `available` property that relies to the remote version
+     * @param $list_type_update specifies what type of package to update
      * @return array Array of updatable Plugins and Themes.
      *               Format: ['total' => int, 'plugins' => array, 'themes' => array]
      */
-    public function getUpdatable()
+    public function getUpdatable($list_type_update = ['plugins' => true, 'themes' => true])
     {
-        $plugins = $this->getUpdatablePlugins();
-        $themes  = $this->getUpdatableThemes();
-
-        $items = [
-            'total'   => count($plugins)+count($themes),
-            'plugins' => $plugins,
-            'themes'  => $themes
-        ];
 
+        $items = ['total' => 0];
+        foreach ($list_type_update as $type => $type_updatable) {
+            if ($type_updatable === false) {
+                continue;
+            }
+            $methodUpdatableType = 'getUpdatable' . ucfirst($type);
+            $to_update = $this->$methodUpdatableType();
+            $items[$type] = $to_update;
+            $items['total'] += count($to_update);
+        }
         return $items;
     }
 
@@ -190,7 +226,7 @@ class GPM extends Iterator
      */
     public function getUpdatablePlugins()
     {
-        $items      = [];
+        $items = [];
         $repository = $this->repository['plugins'];
 
         // local cache to speed things up
@@ -203,15 +239,15 @@ class GPM extends Iterator
                 continue;
             }
 
-            $local_version  = $plugin->version ? $plugin->version : 'Unknown';
+            $local_version = $plugin->version ? $plugin->version : 'Unknown';
             $remote_version = $repository[$slug]->version;
 
             if (version_compare($local_version, $remote_version) < 0) {
                 $repository[$slug]->available = $remote_version;
-                $repository[$slug]->version   = $local_version;
-                $repository[$slug]->name     = $repository[$slug]->name;
-                $repository[$slug]->type      = $repository[$slug]->release_type;
-                $items[$slug]                 = $repository[$slug];
+                $repository[$slug]->version = $local_version;
+                $repository[$slug]->name = $repository[$slug]->name;
+                $repository[$slug]->type = $repository[$slug]->release_type;
+                $items[$slug] = $repository[$slug];
             }
         }
 
@@ -245,7 +281,7 @@ class GPM extends Iterator
 
     /**
      * Check if a Plugin or Theme is updatable
-     * @param  string  $slug The slug of the package
+     * @param  string $slug The slug of the package
      * @return boolean True if updatable. False otherwise or if not found
      */
     public function isUpdatable($slug)
@@ -255,12 +291,12 @@ class GPM extends Iterator
 
     /**
      * Checks if a Plugin is updatable
-     * @param  string  $plugin The slug of the Plugin
+     * @param  string $plugin The slug of the Plugin
      * @return boolean True if the Plugin is updatable. False otherwise
      */
     public function isPluginUpdatable($plugin)
     {
-        return array_key_exists($plugin, (array) $this->getUpdatablePlugins());
+        return array_key_exists($plugin, (array)$this->getUpdatablePlugins());
     }
 
     /**
@@ -270,7 +306,7 @@ class GPM extends Iterator
      */
     public function getUpdatableThemes()
     {
-        $items      = [];
+        $items = [];
         $repository = $this->repository['themes'];
 
         // local cache to speed things up
@@ -283,14 +319,14 @@ class GPM extends Iterator
                 continue;
             }
 
-            $local_version  = $plugin->version ? $plugin->version : 'Unknown';
+            $local_version = $plugin->version ? $plugin->version : 'Unknown';
             $remote_version = $repository[$slug]->version;
 
             if (version_compare($local_version, $remote_version) < 0) {
                 $repository[$slug]->available = $remote_version;
-                $repository[$slug]->version   = $local_version;
-                $repository[$slug]->type      = $repository[$slug]->release_type;
-                $items[$slug]                 = $repository[$slug];
+                $repository[$slug]->version = $local_version;
+                $repository[$slug]->type = $repository[$slug]->release_type;
+                $items[$slug] = $repository[$slug];
             }
         }
 
@@ -301,12 +337,12 @@ class GPM extends Iterator
 
     /**
      * Checks if a Theme is Updatable
-     * @param  string  $theme The slug of the Theme
+     * @param  string $theme The slug of the Theme
      * @return boolean True if the Theme is updatable. False otherwise
      */
     public function isThemeUpdatable($theme)
     {
-        return array_key_exists($theme, (array) $this->getUpdatableThemes());
+        return array_key_exists($theme, (array)$this->getUpdatableThemes());
     }
 
     /**
@@ -409,7 +445,7 @@ class GPM extends Iterator
 
     /**
      * Searches for a Package in the repository
-     * @param  string  $search Can be either the slug or the name
+     * @param  string $search Can be either the slug or the name
      * @return Remote\Package Package if found, FALSE if not
      */
     public function findPackage($search)
@@ -437,15 +473,19 @@ class GPM extends Iterator
             throw new \RuntimeException("GPM not reachable. Please check your internet connection or check the Grav site is reachable");
         }
 
-        if ($themes) foreach ($themes as $slug => $theme) {
-            if ($search == $slug || $search == $theme->name) {
-                return $theme;
+        if ($themes) {
+            foreach ($themes as $slug => $theme) {
+                if ($search == $slug || $search == $theme->name) {
+                    return $theme;
+                }
             }
         }
 
-        if ($plugins) foreach ($plugins as $slug => $plugin) {
-            if ($search == $slug || $search == $plugin->name) {
-                return $plugin;
+        if ($plugins) {
+            foreach ($plugins as $slug => $plugin) {
+                if ($search == $slug || $search == $plugin->name) {
+                    return $plugin;
+                }
             }
         }
 
@@ -467,7 +507,7 @@ class GPM extends Iterator
             $repository = '';
             // if this is an object, get the search data from the key
             if (is_object($search)) {
-                $search = (array) $search;
+                $search = (array)$search;
                 $key = key($search);
                 $repository = $search[$key];
                 $search = $key;
@@ -521,9 +561,9 @@ class GPM extends Iterator
 
         $dependent_packages = [];
 
-        foreach($packages as $package_name => $package) {
+        foreach ($packages as $package_name => $package) {
             if (isset($package['dependencies'])) {
-                foreach($package['dependencies'] as $dependency) {
+                foreach ($package['dependencies'] as $dependency) {
                     if (is_array($dependency)) {
                         $dependency = array_keys($dependency)[0];
                     }
@@ -550,7 +590,7 @@ class GPM extends Iterator
     public function getVersionOfDependencyRequiredByPackage($package_slug, $dependency_slug)
     {
         $dependencies = $this->getInstalledPackage($package_slug)->dependencies;
-        foreach($dependencies as $dependency) {
+        foreach ($dependencies as $dependency) {
             if (isset($dependency[$dependency_slug])) {
                 return $dependency[$dependency_slug];
             }
@@ -562,22 +602,27 @@ class GPM extends Iterator
      * Thrown an exception if it cannot be updated because another package installed requires it to be at an older version.
      *
      * @param string $slug
-     * @param string  $version_with_operator
+     * @param string $version_with_operator
      * @param array $ignore_packages_list
      *
      * @return bool
      * @throws \Exception
      */
-    public function checkNoOtherPackageNeedsThisDependencyInALowerVersion($slug, $version_with_operator, $ignore_packages_list) {
+    public function checkNoOtherPackageNeedsThisDependencyInALowerVersion(
+        $slug,
+        $version_with_operator,
+        $ignore_packages_list
+    ) {
 
         // check if any of the currently installed package need this in a lower version than the one we need. In case, abort and tell which package
         $dependent_packages = $this->getPackagesThatDependOnPackage($slug);
         $version = $this->calculateVersionNumberFromDependencyVersion($version_with_operator);
 
         if (count($dependent_packages)) {
-            foreach($dependent_packages as $dependent_package) {
-                $other_dependency_version_with_operator = $this->getVersionOfDependencyRequiredByPackage($dependent_package, $slug);
-                $other_dependency_version= $this->calculateVersionNumberFromDependencyVersion($other_dependency_version_with_operator);
+            foreach ($dependent_packages as $dependent_package) {
+                $other_dependency_version_with_operator = $this->getVersionOfDependencyRequiredByPackage($dependent_package,
+                    $slug);
+                $other_dependency_version = $this->calculateVersionNumberFromDependencyVersion($other_dependency_version_with_operator);
 
                 // check version is compatible with the one needed by the current package
                 if ($this->versionFormatIsNextSignificantRelease($other_dependency_version_with_operator)) {
@@ -606,7 +651,8 @@ class GPM extends Iterator
     public function checkPackagesCanBeInstalled($packages_names_list)
     {
         foreach ($packages_names_list as $package_name) {
-            $this->checkNoOtherPackageNeedsThisDependencyInALowerVersion($package_name, $this->getLatestVersionOfPackage($package_name), $packages_names_list);
+            $this->checkNoOtherPackageNeedsThisDependencyInALowerVersion($package_name,
+                $this->getLatestVersionOfPackage($package_name), $packages_names_list);
         }
     }
 
@@ -623,7 +669,8 @@ class GPM extends Iterator
      * @return mixed
      * @throws \Exception
      */
-    public function getDependencies($packages) {
+    public function getDependencies($packages)
+    {
         $dependencies = $this->calculateMergedDependenciesOfPackages($packages);
         foreach ($dependencies as $dependency_slug => $dependencyVersionWithOperator) {
             if (in_array($dependency_slug, $packages)) {
@@ -633,7 +680,9 @@ class GPM extends Iterator
 
             //First, check for Grav dependency. If a dependency requires Grav > the current version, abort and tell.
             if ($dependency_slug == 'grav') {
-                if (version_compare($this->calculateVersionNumberFromDependencyVersion($dependencyVersionWithOperator), GRAV_VERSION) === 1) {
+                if (version_compare($this->calculateVersionNumberFromDependencyVersion($dependencyVersionWithOperator),
+                        GRAV_VERSION) === 1
+                ) {
                     //Needs a Grav update first
                     throw new \Exception("<red>One of the packages require Grav " . $dependencies['grav'] . ". Please update Grav to the latest release.");
                 } else {
@@ -674,7 +723,8 @@ class GPM extends Iterator
 
                 if ($this->firstVersionIsLower($latestRelease, $dependencyVersion)) {
                     //throw an exception if a required version cannot be found in the GPM yet
-                    throw new \Exception('Dependency <cyan>' . $package_yaml['name'] . '</cyan> is required in version <cyan>' . $dependencyVersion . '</cyan> which is higher than the latest release, <cyan>' . $latestRelease . '</cyan>. Try running `bin/gpm -f index` to force a refresh of the GPM cache', 1);
+                    throw new \Exception('Dependency <cyan>' . $package_yaml['name'] . '</cyan> is required in version <cyan>' . $dependencyVersion . '</cyan> which is higher than the latest release, <cyan>' . $latestRelease . '</cyan>. Try running `bin/gpm -f index` to force a refresh of the GPM cache',
+                        1);
                 }
 
                 if ($this->firstVersionIsLower($currentlyInstalledVersion, $dependencyVersion)) {
@@ -717,18 +767,20 @@ class GPM extends Iterator
     public function checkNoOtherPackageNeedsTheseDependenciesInALowerVersion($dependencies_slugs)
     {
         foreach ($dependencies_slugs as $dependency_slug) {
-            $this->checkNoOtherPackageNeedsThisDependencyInALowerVersion($dependency_slug, $this->getLatestVersionOfPackage($dependency_slug), $dependencies_slugs);
+            $this->checkNoOtherPackageNeedsThisDependencyInALowerVersion($dependency_slug,
+                $this->getLatestVersionOfPackage($dependency_slug), $dependencies_slugs);
         }
     }
 
-    private function firstVersionIsLower($firstVersion, $secondVersion) {
+    private function firstVersionIsLower($firstVersion, $secondVersion)
+    {
         return version_compare($firstVersion, $secondVersion) == -1;
     }
 
     /**
      * Calculates and merges the dependencies of a package
      *
-     * @param string $packageName  The package information
+     * @param string $packageName The package information
      *
      * @param array $dependencies The dependencies array
      *
@@ -758,8 +810,7 @@ class GPM extends Iterator
 
                     //Factor in the package dependencies too
                     $dependencies = $this->calculateMergedDependenciesOfPackage($current_package_name, $dependencies);
-                }
-                else {
+                } else {
                     // Dependency already added by another package
                     //if this package requires a version higher than the currently stored one, store this requirement instead
                     if (isset($current_package_version_information) && $current_package_version_information !== '*') {
@@ -778,7 +829,8 @@ class GPM extends Iterator
 
                         $current_package_version_number = $this->calculateVersionNumberFromDependencyVersion($current_package_version_information);
                         if (!$current_package_version_number) {
-                            throw new \Exception('Bad format for version of dependency ' . $current_package_name . ' for package ' . $packageName, 1);
+                            throw new \Exception('Bad format for version of dependency ' . $current_package_name . ' for package ' . $packageName,
+                                1);
                         }
 
                         $current_package_version_is_in_next_significant_release_format = false;
@@ -792,13 +844,17 @@ class GPM extends Iterator
                         } else {
                             if (!$currently_stored_version_is_in_next_significant_release_format && !$current_package_version_is_in_next_significant_release_format) {
                                 //Comparing versions equals or higher, a simple version_compare is enough
-                                if (version_compare($currently_stored_version_number, $current_package_version_number) == -1) { //Current package version is higher
+                                if (version_compare($currently_stored_version_number,
+                                        $current_package_version_number) == -1
+                                ) { //Current package version is higher
                                     $dependencies[$current_package_name] = $current_package_version_information;
                                 }
                             } else {
-                                $compatible = $this->checkNextSignificantReleasesAreCompatible($currently_stored_version_number, $current_package_version_number);
+                                $compatible = $this->checkNextSignificantReleasesAreCompatible($currently_stored_version_number,
+                                    $current_package_version_number);
                                 if (!$compatible) {
-                                    throw new \Exception('Dependency ' . $current_package_name . ' is required in two incompatible versions', 2);
+                                    throw new \Exception('Dependency ' . $current_package_name . ' is required in two incompatible versions',
+                                        2);
                                 }
                             }
                         }
@@ -866,7 +922,8 @@ class GPM extends Iterator
      *
      * @return bool
      */
-    public function versionFormatIsNextSignificantRelease($version) {
+    public function versionFormatIsNextSignificantRelease($version)
+    {
         return substr($version, 0, 1) == '~';
     }
 
@@ -879,7 +936,8 @@ class GPM extends Iterator
      *
      * @return bool
      */
-    public function versionFormatIsEqualOrHigher($version) {
+    public function versionFormatIsEqualOrHigher($version)
+    {
         return substr($version, 0, 2) == '>=';
     }
 

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

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM;
 
 use Grav\Common\Filesystem\Folder;
@@ -22,6 +29,8 @@ class Installer
     const ZIP_OPEN_ERROR = 32;
     /** @const Error while trying to extract the ZIP package */
     const ZIP_EXTRACT_ERROR = 64;
+    /** @const Invalid source file */
+    const INVALID_SOURCE = 128;
 
     /**
      * Destination folder on which validation checks are applied
@@ -55,13 +64,13 @@ class Installer
     /**
      * Installs a given package to a given destination.
      *
-     * @param  string $package     The local path to the ZIP package
+     * @param  string $zip the local path to ZIP package
      * @param  string $destination The local path to the Grav Instance
-     * @param  array  $options     Options to use for installing. ie, ['install_path' => 'user/themes/antimatter']
-     *
-     * @return boolean True if everything went fine, False otherwise.
+     * @param  array $options Options to use for installing. ie, ['install_path' => 'user/themes/antimatter']
+     * @param  string $extracted The local path to the extacted ZIP package
+     * @return bool True if everything went fine, False otherwise.
      */
-    public static function install($package, $destination, $options = [])
+    public static function install($zip, $destination, $options = [], $extracted = null)
     {
         $destination = rtrim($destination, DS);
         $options = array_merge(self::$options, $options);
@@ -79,34 +88,26 @@ class Installer
             return false;
         }
 
-        $zip = new \ZipArchive();
-        $archive = $zip->open($package);
-        $cache_dir = Grav::instance()['locator']->findResource('cache://', true);
-        $tmp = $cache_dir . DS . 'tmp/Grav-' . uniqid();
+        // Create a tmp location
+        $tmp_dir = Grav::instance()['locator']->findResource('tmp://', true, true);
+        $tmp = $tmp_dir . '/Grav-' . uniqid();
 
-        if ($archive !== true) {
-            self::$error = self::ZIP_OPEN_ERROR;
+        if (!$extracted) {
+            $extracted = self::unZip($zip, $tmp);
+            if (!$extracted) {
+                Folder::delete($tmp);
+                return false;
+            }
+        }
 
+        if (!file_exists($extracted)) {
+            self::$error = self::INVALID_SOURCE;
             return false;
         }
 
-        Folder::mkdir($tmp);
-
-        $unzip = $zip->extractTo($tmp);
-
-        if (!$unzip) {
-            self::$error = self::ZIP_EXTRACT_ERROR;
-            $zip->close();
-            Folder::delete($tmp);
-
-            return false;
-        }
-
-        $package_folder_name = $zip->getNameIndex(0);
-        $installer_file_folder = $tmp . '/' . $package_folder_name;
 
         $is_install = true;
-        $installer = self::loadInstaller($installer_file_folder, $is_install);
+        $installer = self::loadInstaller($extracted, $is_install);
 
         if (isset($options['is_update']) && $options['is_update'] === true) {
             $method = 'preUpdate';
@@ -128,16 +129,15 @@ class Installer
 
         if (!$options['sophisticated']) {
             if ($options['theme']) {
-                self::copyInstall($zip, $install_path, $tmp);
+                self::copyInstall($extracted, $install_path);
             } else {
-                self::moveInstall($zip, $install_path, $tmp);
+                self::moveInstall($extracted, $install_path);
             }
         } else {
-            self::sophisticatedInstall($zip, $install_path, $tmp);
+            self::sophisticatedInstall($extracted, $install_path);
         }
 
         Folder::delete($tmp);
-        $zip->close();
 
         if (isset($options['is_update']) && $options['is_update'] === true) {
             $method = 'postUpdate';
@@ -156,6 +156,43 @@ class Installer
 
     }
 
+    /**
+     * Unzip a file to somewhere
+     *
+     * @param $zip_file
+     * @param $destination
+     * @return bool|string
+     */
+    public static function unZip($zip_file, $destination)
+    {
+        $zip = new \ZipArchive();
+        $archive = $zip->open($zip_file);
+
+        if ($archive === true) {
+            Folder::mkdir($destination);
+
+            $unzip = $zip->extractTo($destination);
+
+
+            if (!$unzip) {
+                self::$error = self::ZIP_EXTRACT_ERROR;
+                Folder::delete($destination);
+                $zip->close();
+                return false;
+            }
+
+            $package_folder_name = $zip->getNameIndex(0);
+            $zip->close();
+            $extracted_folder = $destination . '/' . $package_folder_name;
+
+            return $extracted_folder;
+        }
+
+        self::$error = self::ZIP_EXTRACT_ERROR;
+        return false;
+    }
+
+
     /**
      * Instantiates and returns the package installer class
      *
@@ -204,80 +241,67 @@ class Installer
     }
 
     /**
-     * @param \ZipArchive $zip
+     * @param             $source_path
      * @param             $install_path
-     * @param             $tmp
      *
      * @return bool
      */
-    public static function moveInstall(\ZipArchive $zip, $install_path, $tmp)
+    public static function moveInstall($source_path, $install_path)
     {
-        $container = $zip->getNameIndex(0);
         if (file_exists($install_path)) {
             Folder::delete($install_path);
         }
 
-        Folder::move($tmp . DS . $container, $install_path);
+        Folder::move($source_path, $install_path);
 
         return true;
     }
 
     /**
-     * @param \ZipArchive $zip
+     * @param             $source_path
      * @param             $install_path
-     * @param             $tmp
      *
      * @return bool
      */
-    public static function copyInstall(\ZipArchive $zip, $install_path, $tmp)
+    public static function copyInstall($source_path, $install_path)
     {
-        $firstDir = $zip->getNameIndex(0);
-        if (empty($firstDir)) {
-            throw new \RuntimeException("Directory $firstDir is missing");
+        if (empty($source_path)) {
+            throw new \RuntimeException("Directory $source_path is missing");
         } else {
-            $tmp = realpath($tmp . DS . $firstDir);
-            Folder::rcopy($tmp, $install_path);
+            Folder::rcopy($source_path, $install_path);
         }
 
         return true;
     }
 
     /**
-     * @param \ZipArchive $zip
+     * @param             $source_path
      * @param             $install_path
-     * @param             $tmp
      *
      * @return bool
      */
-    public static function sophisticatedInstall(\ZipArchive $zip, $install_path, $tmp)
+    public static function sophisticatedInstall($source_path, $install_path)
     {
-        for ($i = 0, $l = $zip->numFiles; $i < $l; $i++) {
-            $filename = $zip->getNameIndex($i);
-            $fileinfo = pathinfo($filename);
-            $depth = count(explode(DS, rtrim($filename, '/')));
+        foreach (new \DirectoryIterator($source_path) as $file) {
 
-            if ($depth > 2) {
+            if ($file->isLink() || $file->isDot()) {
                 continue;
             }
 
-            $path = $install_path . DS . $fileinfo['basename'];
+            $path = $install_path . DS . $file->getBasename();
 
-            if (is_link($path)) {
-                continue;
-            } else {
-                if (is_dir($path)) {
-                    Folder::delete($path);
-                    Folder::move($tmp . DS . $filename, $path);
+            if ($file->isDir()) {
+                Folder::delete($path);
+                Folder::move($file->getPathname(), $path);
 
-                    if ($fileinfo['basename'] == 'bin') {
-                        foreach (glob($path . DS . '*') as $file) {
-                            @chmod($file, 0755);
-                        }
+                if ($file->getBasename() == 'bin') {
+                    foreach (glob($path . DS . '*') as $bin_file) {
+                           @chmod($bin_file, 0755);
                     }
-                } else {
-                    @unlink($path);
-                    @copy($tmp . DS . $filename, $path);
                 }
+            } else {
+                @unlink($path);
+                @copy($file->getPathname(), $path);
             }
         }
 

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

@@ -0,0 +1,126 @@
+<?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\GPM;
+
+use Grav\Common\File\CompiledYamlFile;
+use Grav\Common\Grav;
+
+/**
+ * Class Licenses
+ *
+ * @package Grav\Common\GPM
+ */
+class Licenses
+{
+
+    /**
+     * Regex to validate the format of a License
+     *
+     * @var string
+     */
+    protected static $regex = '^(?:[A-F0-9]{8}-){3}(?:[A-F0-9]{8}){1}$';
+
+    protected static $file;
+
+
+    /**
+     * Returns the license for a Premium package
+     *
+     * @param $slug
+     * @param $license
+     *
+     * @return boolean
+     */
+    public static function set($slug, $license)
+    {
+        $licenses = self::getLicenseFile();
+        $data = $licenses->content();
+        $slug = strtolower($slug);
+
+        if ($license && !self::validate($license)) {
+            return false;
+        }
+
+        if (!is_string($license)) {
+            if (isset($data['licenses'][$slug])) {
+                unset($data['licenses'][$slug]);
+            } else {
+                return false;
+            }
+        } else {
+            $data['licenses'][$slug] = $license;
+        }
+
+        $licenses->save($data);
+        $licenses->free();
+
+        return true;
+    }
+
+    /**
+     * Returns the license for a Premium package
+     *
+     * @param $slug
+     *
+     * @return string
+     */
+    public static function get($slug = null)
+    {
+        $licenses = self::getLicenseFile();
+        $data = $licenses->content();
+        $licenses->free();
+        $slug = strtolower($slug);
+
+        if (!$slug) {
+            return isset($data['licenses']) ? $data['licenses'] : [];
+        }
+
+        if (!isset($data['licenses']) || !isset($data['licenses'][$slug])) {
+            return '';
+        }
+
+        return $data['licenses'][$slug];
+    }
+
+
+    /**
+     * Validates the License format
+     *
+     * @param $license
+     *
+     * @return bool
+     */
+    public static function validate($license = null)
+    {
+        if (!is_string($license)) {
+            return false;
+        }
+
+        return preg_match('#' . self::$regex. '#', $license);
+    }
+
+    /**
+     * Get's the License File object
+     *
+     * @return \RocketTheme\Toolbox\File\FileInterface
+     */
+    public static function getLicenseFile()
+
+    {
+        if (!isset(self::$file)) {
+            $path = Grav::instance()['locator']->findResource('user://data') . '/licenses.yaml';;
+            if (!file_exists($path)) {
+                touch($path);
+            }
+            self::$file = CompiledYamlFile::instance($path);
+        }
+
+        return self::$file;
+    }
+}

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

@@ -1,4 +1,10 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
 
 namespace Grav\Common\GPM\Local;
 

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

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM\Local;
 
 use Grav\Common\Data\Data;

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

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM\Local;
 
 use Grav\Common\GPM\Common\CachedCollection;

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

@@ -1,12 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM\Local;
 
 use Grav\Common\Grav;
 
-/**
- * Class Plugins
- * @package Grav\Common\GPM\Local
- */
 class Plugins extends AbstractPackageCollection
 {
     /**

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

@@ -1,12 +1,15 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM\Local;
 
 use Grav\Common\Grav;
 
-/**
- * Class Themes
- * @package Grav\Common\GPM\Local
- */
 class Themes extends AbstractPackageCollection
 {
     /**

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

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM\Remote;
 
 use Grav\Common\Grav;
@@ -6,10 +13,6 @@ use Grav\Common\GPM\Common\AbstractPackageCollection as BaseCollection;
 use Grav\Common\GPM\Response;
 use \Doctrine\Common\Cache\FilesystemCache;
 
-/**
- * Class AbstractPackageCollection
- * @package Grav\Common\GPM\Remote
- */
 class AbstractPackageCollection extends BaseCollection
 {
     /**

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

@@ -1,4 +1,11 @@
 <?php
+/**
+ * @package    Grav.Common.GPM
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
 namespace Grav\Common\GPM\Remote;
 
 use Grav\Common\Grav;