Fix small typo in phpdoc fix per @matjazpotocnik

Co-authored-by: LostKobrakai <benni@kobrakai.de>

.gitattributes

@@ -0,0 +1,2 @@
+$ cat .gitattributes
+*.module linguist-language=PHP

CONTRIBUTING.md

@@ -48,7 +48,7 @@ of contributions in different repositories. Please review the instructions for e
 ## Pull Requests (PRs)
 
 - Pull requests should be submitted to the [processwire](https://github.com/processwire/processwire/pulls)
-  repository.
+  repository, and based on the [dev branch](https://github.com/processwire/processwire/tree/dev). 
 
 - Before submitting a PR, read the Contributor License Agreement (CLA) at
   <https://processwire.com/about/license/cla/> and indicate your agreement (electronic signature) 
@@ -63,8 +63,6 @@ of contributions in different repositories. Please review the instructions for e
   before submitting a PR. While it's not required that you adhere to the style guide, it does increase
   the odds that we may be able to directly merge your PR. 
   
-- Please base pull requests off of the latest ProcessWire 3.x development (dev) branch.   
-
 - Please only submit code that you feel confident is stable and you have thoroughly tested. 
   Verbose code comments are also appreciated when possible. 
   

LICENSE.TXT

@@ -410,7 +410,7 @@ https://processwire.com/about/license/mit/
 
 The MIT License (MIT)
 
-Copyright (c) 2015 Ryan Cramer <or other year/person if indicated in file>
+Copyright (c) 2020 Ryan Cramer <or other year/person if indicated in file>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -9,111 +9,150 @@ can be read at: https://github.com/processwire/processwire/blob/master/README.md
 1. [About](#about-processwire)
 2. [Installation](#installing-processwire)
 3. [Upgrading](#upgrading-processwire)
-4. [Troubleshooting](https://processwire.com/docs/install/troubleshooting/)
+4. [Troubleshooting](https://processwire.com/docs/start/install/troubleshooting/)
 5. [Support](#support-and-links)
 
 
 ## About ProcessWire
 
-ProcessWire is an open source content management system (CMS) and web 
-application framework aimed at the needs of designers, developers and their 
-clients. ProcessWire gives you more control over your fields, templates and 
-markup than other platforms, and provides a powerful template system that 
-works the way you do. Not to mention, ProcessWire's API makes working with 
-your content easy and enjoyable. Managing and developing a site in 
-ProcessWire is shockingly simple compared to what you may be used to.
+ProcessWire is a friendly and powerful open source CMS with an API that is a 
+joy to use at any scale. It is both a content management system (CMS) and 
+framework (CMF) built to save you time and work the way you do. With all custom 
+fields, a secure foundation, proven scalability and performance, ProcessWire 
+connects all of your content seamlessly, making your job fast, easy and fun.
 
-* [ProcessWire Home](https://processwire.com)
-* [API Reference](https://processwire.com/api/ref/)
-* [Download](https://processwire.com/download/)
-* [Support](https://processwire.com/talk/)
-* [Modules/Plugins](http://modules.processwire.com)
+ProcessWire gives you more control over your fields, templates and markup than 
+other platforms, while ProcessWire’s API makes working with your content easy and 
+enjoyable. Managing and developing a site in ProcessWire is shockingly simple 
+compared to what you may be used to.
 
+ProcessWire is widely trusted by web professionals for its exceptional consistency, 
+stability and security; revered by web developers for its API that saves time and 
+makes work fun; valued by web designers for its adaptability and flexibility with 
+modern website/application content management needs; and loved by clients for its 
+no-nonsense interface and ease-of-use in adding, updating and maintaining content. 
+New versions of ProcessWire are released just about every week on the
+development branch. 
+
+
+### Background
+
+ProcessWire is a timeless tool for web professionals that has always been 
+committed to the long term. It started in 2003, gained the name ProcessWire
+in 2006, and has been in active development as an open source project since 2010. 
+Now more than a decade later (2021), we’re just getting started, as ProcessWire 
+continues to grow and develop into the next 10 years and beyond. 
+
+While ProcessWire has been around for a long time, don’t feel bad if you haven’t 
+heard of it till today. We are fundamentally different from other projects in 
+that we don’t make a lot of noise, we’re not into promotion, we value quality 
+over quantity, sustainability over growth, and a friendly community over 
+popularity. ProcessWire is designed to be a silent partner, not easily 
+identified from the front-end of any website. We don’t aim to be big, we are 
+instead focused on being best-in-class. 
+
+Web developers find ProcessWire when the time is right, after they’ve tried 
+some other platforms. And once they start using ProcessWire, they tend to 
+stay. ProcessWire is addictive, easy to maintain for the long term, and doesn’t
+have the security and upgrade woes of other platforms. But don’t take our word 
+for it; unless your livelihood depends on some other platform, find out for 
+yourself. 
+
+
+### Community
+
+ProcessWire is more than just software, it is also a friendly community
+of web professionals dedicated to building great sites and applications, and 
+helping others do so too. 
+
+Please visit and join our 
+[friendly community](https://processwire.com/talk/)
+in the ProcessWire forums, subscribe to our
+[weekly newsletter](https://processwire.com/community/newsletter/subscribe/)
+for the latest ProcessWire news, check out our
+[website showcase](https://processwire.com/sites/)
+to see what others are building with ProcessWire, and read our 
+[blog](https://processwire.com/blog/) 
+to stay up-to-date with the latest ProcessWire versions.
+
+Weekly ProcessWire news is posted by Teppo Koivula on his site 
+[ProcessWire Weekly](https://weekly.pw). 
+Weekly core updates and related topics are posted by Ryan Cramer in the 
+ProcessWire support forum 
+[News and Announcements](https://processwire.com/talk/forum/7-news-amp-announcements/) 
+board. 
+
+### Learn more 
+
+* [ProcessWire website](https://processwire.com)
+* [About ProcessWire](https://processwire.com/about/)
+* [Support forums](https://processwire.com/talk/)
+* [Documentation](https://processwire.com/docs/)
+* [API reference](https://processwire.com/api/ref/)
+* [Downloads](https://processwire.com/download/)
+* [Modules/plugins](https://processwire.com/modules/)
+* [Showcase](https://processwire.com/sites/)
+
+-----------------------------------------------------------------
 
 ## Installing ProcessWire
 
 Simply extract the ProcessWire files to an http accessible location and
 load the URL in your web browser. This will start the installer. See our
-[Installation Guide](https://processwire.com/docs/install/new/) for more 
+[Installation Guide](https://processwire.com/docs/start/install/new/) for more 
 details and instructions. If you run into any trouble, please see our 
-[Troubleshooting Guide](https://processwire.com/docs/install/troubleshooting/). 
+[Troubleshooting Guide](https://processwire.com/docs/start/install/troubleshooting/). 
 
 
 ## Upgrading ProcessWire
 
-Before proceeding with any version upgrade, please read the
-[Upgrading ProcessWire](https://processwire.com/docs/install/upgrade/)
-guide and keep it open during your upgrade in case you need to refer back to it. 
+Upgrading is easy and usually just a matter of replacing your `/wire/` directory
+with the one from the new version. But to be safe, before proceeding with any version upgrade, please see the
+[Upgrading ProcessWire](https://processwire.com/docs/start/install/upgrade/)
+guide and perhaps keep it open during your upgrade in case you need to refer back to it. 
 
-If upgrading from one 3.x version to another, please use the 
-[General Upgrade Process](https://processwire.com/docs/install/upgrade/#general-upgrade-process).
-Chances are that you can upgrade simply by replacing the /wire/ directory. 
+When upgrading from one 3.x version to another, please use the 
+[general upgrade process](https://processwire.com/docs/start/install/upgrade/#general-upgrade-process).
+This consists primarily of making sure you've got everything backed up and then just 
+replacing your `/wire/` directory with the one from the newer version.
+
+- If you are upgrading from a 3.x version prior to 3.0.135 then please also follow 
+  [these instructions](https://processwire.com/docs/start/install/upgrade/from-3.x/). 
+
+- If you are upgrading from any 2.x version then please see 
+  [upgrading from ProcessWire 2.x](https://processwire.com/docs/start/install/upgrade/from-2.x/).
+
+- If you run into any trouble upgrading, please see our 
+  [troubleshooting upgrades guide](https://processwire.com/docs/start/install/troubleshooting/#troubleshooting-upgrades).
 
 
-### Upgrading from ProcessWire 2.x
+### Pro module version upgrade notes (if applicable)
 
-If upgrading from ProcessWire 2.5 or older, we recommend that you upgrade
-to ProcessWire [2.8](https://github.com/processwire/processwire-legacy) or
-[2.7](https://github.com/ryancramerdesign/processwire) first. Both of those 
-versions include details in the README file on how to upgrade from these 
-older versions of ProcessWire. To upgrade from ProcessWire 2.6 (or newer) 
-to ProcessWire 3.x, please follow the instructions below. 
-
-1. Login to the admin of your site. 
-
-2. Edit your `/site/config.php` file and set `$config->debug = true;` to ensure 
-   you can see error messages. This is optional but recommended.
-
-3. Replace your `/wire/` directory and `/index.php` file with the new ones from here.
-   
-4. Click a navigation link in your admin, such as "Pages". You may notice a delay. 
-   This is ProcessWire compiling 3rd party modules into a format that is
-   compatible with version 3.x. Keep an eye out for any error messages. 
-   If you see any issues, it's possible you may need to upgrade one or more
-   3rd party modules. If you see messages about it applying updates, keep hitting
-   reload in your browser until you no longer see any update messages. 
-   
-5. Once you've resolved error messages in your admin, you'll want to test out 
-   the front end of your site. Again, expect a delay while ProcessWire compiles
-   any files to make them compatible with 3.x. Depending on your template file 
-   strategy, updates may or may not be necessary. If you run into any pages 
-   that aren't working, see the section further down on troubleshooting. 
-   Thoroughly test every aspect if your site to ensure that everything is 
-   working as you expect. 
-   
-6. When you've confirmed a successful upgrade, remember to restore the 
-   `$config->debug` setting back to `false` in your /site/config.php file. 
-   
-**Troubleshooting a 3.x upgrade**
-If you run into any trouble upgrading, please see our troubleshooting guide
-located at <https://processwire.com/download/troubleshooting/#upgrades>.
-
-
-### Pro module upgrade notes
-
-- If using [FormBuilder](https://processwire.com/api/modules/form-builder/),
-  we recommend using only v0.3.0 or newer.
-- If using [ProCache](https://processwire.com/api/modules/procache/), 
-  we recommend using only v3.1.4 or newer. 
-- If using [ListerPro](https://processwire.com/api/modules/lister-pro/), 
-  we recommend using only v1.0.9 or newer.
-- If using [ProFields](https://processwire.com/api/modules/profields/), 
-  we recommend grabbing the latest versions in the ProFields support board. 
-- If using ProCache and you upgraded your .htaccess file, you should 
-  go to your ProCache settings after the upgrade to have it update 
-  your .htaccess file again. If no upgrades to your .htaccess file
-  are necessary, then the ProCache settings page won't mention it.
-  
+- [FormBuilder](https://processwire.com/store/form-builder/)
+  version 0.4.0 or newer required, 0.5.0 or newer recommended.
+- [ListerPro](https://processwire.com/store/lister-pro/)
+  version 1.0.9 or newer required, 1.1.3 or newer recommended. 
+- [ProFields](https://processwire.com/store/pro-fields/)
+  the latest versions of all ProFields (10 modules) are recommended.
+- [LoginRegisterPro](https://processwire.com/store/login-register-pro/)
+  all versions supported but version 5 or newer recommended.   
+- [ProCache](https://processwire.com/store/pro-cache/)
+  version 3.1.4 or newer required, 4.0.0 or newer recommended.
+  After upgrading, go to your ProCache settings in the admin (Setup > ProCache)
+  and see if it suggests any modifications to your .htaccess file.
+- For all other Pro modules not mentioned above (ProMailer, ProDrafts, 
+  ProDevTools, Likes) there are no specific version requirements but we 
+  recommend using the latest available versions when possible.
 
 ## Debug Mode
 
-Debug mode causes all errors to be reported to the screen, which can be
+Debug mode causes all errors to be reported to the screen. This can be
 helpful during development or troubleshooting. When in the admin, it also
-enables reporting of extra information in the footer. Debug mode is not
-intended for live or production sites, as the information reported could
-be a problem for security. So be sure not to leave debug mode on for
-any live/production sites. However, we think you'll find it very handy
-during development or when resolving issues. 
+enables a “Debug” link (see footer) for reporting of extra information in a 
+panel. Debug mode is not intended for live or production sites, as the 
+information reported is for the developer only. Do not leave debug mode 
+on for any live/production sites, as it could be a security concern. However, 
+we think you'll find it very handy during development or when resolving issues. 
 
 1. Edit this file: `/site/config.php`
 2. Find this line: `$config->debug = false;` 
@@ -131,14 +170,16 @@ resolved any issues.
 
 ## Support and Links
 
-* [ProcessWire Support](https://processwire.com/talk/)
-* [ProcessWire Weekly](https://weekly.pw/)
+* [ProcessWire Support Forums](https://processwire.com/talk/)
+* [ProcessWire Weekly News](https://weekly.pw/)
 * [ProcessWire Blog](https://processwire.com/blog/)
+* [Sites running ProcessWire](https://processwire.com/sites/)
+* [Subscribe to ProcessWire Weekly email](https://processwire.com/community/newsletter/subscribe/)
+* [Submit your site to our directory](https://processwire.com/sites/submit/)
 * [Follow @processwire on Twitter](http://twitter.com/processwire/)
 * [Contact ProcessWire](https://processwire.com/contact/)
-* [Sites running ProcessWire](https://processwire.com/about/sites/)
 
 ------
 
-Copyright 2016 by Ryan Cramer / Ryan Cramer Design, LLC
+Copyright 2021 by Ryan Cramer / Ryan Cramer Design, LLC
 

composer.json

@@ -19,6 +19,5 @@
   },
   "autoload": {
     "files": [ "wire/core/ProcessWire.php" ]
-  },
-  "minimum-stability": "dev"
+  }
 }

htaccess.txt

@@ -1,26 +1,78 @@
 #################################################################################################
 # START PROCESSWIRE HTACCESS DIRECTIVES
 # @version 3.0
-# @indexVersion 300
+# @htaccessVersion 301
 #################################################################################################
+#
+# Upgrading htaccess (or index) version 300 to 301
+# -----------------------------------------------------------------------------------------------
+# If you never modified your previous .htaccess file, then you can simply replace it with this
+# one. If you have modified your .htaccess file, then you will want to copy/paste some updates
+# to the old one instead:
+
+# If your htaccess/index version is 300, upgrade to this version by replacing all of sections #5
+# and #15 (Access Restrictions). Also take a look at section #9, which you might also consider 
+# replacing if using HTTPS, though it is not required. (For instance, HSTS might be worthwhile)
+# 
+# Following that, optionally review the rest of the file to see if there are any other changes 
+# you also want to apply. Sections tagged "(v301)" are new or have significant changes. 
+# 
+# When finished, add a line at the top identical to the "htaccessVersion 301" that you see at 
+# the top of this file. This tells ProcessWire your .htaccess file is up-to-date. 
+# 
+# Resolving 500 errors
+# -----------------------------------------------------------------------------------------------
+# Depending on your server, some htaccess rules may not be compatible and result in a 500 error.
+# If you experience this, find all instances of the term "(500)" in this file for suggestions on
+# things you can change to resolve 500 errors.
+#
+# Optional features
+# -----------------------------------------------------------------------------------------------
+# Many of the rules in this .htaccess file are optional and commented out by default. While the
+# defaults are okay for many, you may want to review each section in this .htaccess file for
+# optional rules that you can enable to increase security, speed or best practices. To quickly
+# locate all optional rules, search this file for all instances of "(O)". 
+#
+# If using a load balancer
+# -----------------------------------------------------------------------------------------------
+# If using a load balancer (like those available from AWS) some htaccess rules will need to 
+# change. Search this file for instances of "(L)" for details. 
+#
+
 
 # -----------------------------------------------------------------------------------------------
-# 1. Don't show directory indexes, but do follow symbolic links 
-# 500 NOTE: Some cloud hosting companies don't allow +FollowSymLinks. 
-# Uncomment +SymLinksifOwnerMatch and comment +FollowSymLinks if you have 500 errors. 
-# If that doesn't resolve the error, then set it back to +FollowSymLinks. 
+# 1. Apache Options 
+#
+# Note: If you experience a (500) error, it may indicate your host does not allow setting one or
+# more of these options. First try replacing the +FollowSymLinks with +SymLinksifOwnerMatch.
+# If that does not work, try commenting them all out, then uncommenting one at a time to 
+# determine which one is the source of the 500 error. 
 # -----------------------------------------------------------------------------------------------
 
+# Do not show directory indexes (strongly recommended)
 Options -Indexes
+
+# Do not use multiviews (v301)
+Options -MultiViews
+
+# Do follow symbolic links
 Options +FollowSymLinks
 # Options +SymLinksifOwnerMatch
 
+# Character encoding: Serve text/html or text/plain as UTF-8
+AddDefaultCharset UTF-8
+
+
 # -----------------------------------------------------------------------------------------------
-# 2. Let ProcessWire handle 404s
+# 2. ErrorDocument settings: Have ProcessWire handle 404s 
+#
+# For options and optimizations (O) see: 
+# https://processwire.com/blog/posts/optimizing-404s-in-processwire/
 # -----------------------------------------------------------------------------------------------
 
 ErrorDocument 404 /index.php
 
+
 # -----------------------------------------------------------------------------------------------
 # 3. Handle request for missing favicon.ico/robots.txt files (no ending quote for Apache 1.3)
 # -----------------------------------------------------------------------------------------------
@@ -33,6 +85,7 @@ ErrorDocument 404 /index.php
   ErrorDocument 404 "The requested file robots.txt was not found.
 </Files>
 
+
 # -----------------------------------------------------------------------------------------------
 # 4. Protect from XSS with Apache headers
 # -----------------------------------------------------------------------------------------------
@@ -42,18 +95,25 @@ ErrorDocument 404 /index.php
   # you will need to remove this one if you want to allow external iframes
   Header always append X-Frame-Options SAMEORIGIN 
 
-  # to prevent cross site scripting (IE8+ proprietary)
+  # To prevent cross site scripting (IE8+ proprietary)
   Header set X-XSS-Protection "1; mode=block"
 
-  # prevent mime-based attacks via content sniffing (IE+Chrome)
+  # Optionally (O) prevent mime-based attacks via content sniffing (IE+Chrome)
   # Header set X-Content-Type-Options "nosniff" 
 </IfModule>
 
+
 # -----------------------------------------------------------------------------------------------
-# 5. Protect ProcessWire system files 
+# 5. Prevent access to various types of files (v301)
+#
+# Note that some of these rules are duplicated by RewriteRules or other .htaccess files, as we
+# try to maintain two layers of protection when/where possible. 
 # -----------------------------------------------------------------------------------------------
 
-<FilesMatch "\.(inc|info|info\.json|module|sh|sql)$|^\..*$|composer\.(json|lock)$">
+# 5A. Block access to inc, info, info.json/php, module/php, sh, sql and composer files
+# -----------------------------------------------------------------------------------------------
+
+<FilesMatch "\.(inc|info|info\.(json|php)|module|module\.php|sh|sql)$|^\..*$|composer\.(json|lock)$">
   <IfModule mod_authz_core.c>
     Require all denied
   </IfModule>
@@ -62,9 +122,23 @@ ErrorDocument 404 /index.php
   </IfModule>
 </FilesMatch>
 
+
+# 5B. Block bak, conf, dist, ini, log, orig, sh, sql, swo, swp, ~, and more
+# -----------------------------------------------------------------------------------------------
+
+<FilesMatch "(^#.*#|\.(bak|conf|dist|in[ci]|log|orig|sh|sql|sw[op])|~)$">
+  <IfModule mod_authz_core.c>
+     Require all denied
+  </IfModule>
+  <IfModule !mod_authz_core.c>
+    Order allow,deny
+  </IfModule>
+</FilesMatch>
+
+
 # -----------------------------------------------------------------------------------------------
 # 6. Override a few PHP settings that can't be changed at runtime (not required)
-# 500 NOTE: Try commenting out this entire section below if getting Apache 500 errors.
+# Note: try commenting out this entire section below if getting Apache (500) errors.
 # -----------------------------------------------------------------------------------------------
 
 <IfModule mod_php5.c>
@@ -73,63 +147,197 @@ ErrorDocument 404 /index.php
   php_flag register_globals		off
 </IfModule>
 
+
 # -----------------------------------------------------------------------------------------------
 # 7. Set default directory index files
 # -----------------------------------------------------------------------------------------------
 
 DirectoryIndex index.php index.html index.htm
 
+
 # -----------------------------------------------------------------------------------------------
-# 8. ProcessWire requires mod_rewrite
+# 8. Enable Apache mod_rewrite (required)
 # -----------------------------------------------------------------------------------------------
 
 <IfModule mod_rewrite.c>
 
   RewriteEngine On
-  AddDefaultCharset UTF-8
+ 
+  
+  # 8A. Optionally (O) set a rewrite base if rewrites are not working properly on your server.
+  # -----------------------------------------------------------------------------------------------
+  # In addition, if your site directory starts with a "~" you will most likely have to use this.
+  # https://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritebase
+ 
+  # Examples of RewriteBase (root and subdirectories): 
+  # RewriteBase /
+  # RewriteBase /pw/
+  # RewriteBase /~user/
 
+  
+  # 8B. Set an environment variable so the installer can detect that mod_rewrite is active.
   # -----------------------------------------------------------------------------------------------
-  # 9. If you only want to allow HTTPS, uncomment the RewriteCond and RewriteRule lines below.
-  # -----------------------------------------------------------------------------------------------
-  # RewriteCond %{HTTPS} off
-  # RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
-
-  # -----------------------------------------------------------------------------------------------
-  # 10. Set an environment variable so the installer can detect that mod_rewrite is active.
-  # Note that some web hosts don't support this. If you get a 500 error, you might try 
-  # commenting out this SetEnv line below. 
-  # -----------------------------------------------------------------------------------------------
+  # Note that some web hosts don't support this. If you get a (500) error, try commenting out this 
+  # SetEnv line below. 
 
   <IfModule mod_env.c>
     SetEnv HTTP_MOD_REWRITE On
   </IfModule>
 
-  # -----------------------------------------------------------------------------------------------
-  # 11. OPTIONAL: Set a rewrite base if rewrites aren't working properly on your server.
-  # And if your site directory starts with a "~" you will most likely have to use this.
-  # -----------------------------------------------------------------------------------------------
-
-  # RewriteBase /
-  # RewriteBase /pw/
-  # RewriteBase /~user/
 
   # -----------------------------------------------------------------------------------------------
-  # 12. Access Restrictions: Keep web users out of dirs that begin with a period,
+  # 9. Optionally Force HTTPS (O) 
+  # -----------------------------------------------------------------------------------------------
+  # Note that on some web hosts you may need to replace %{HTTPS} with %{ENV:HTTPS} in order
+  # for it to work (in sections 9A and 9D below). If on a load balancer or proxy setup, you will
+  # likely need to use 9B rather than 9A, and 9E rather than 9D.  
+  # -----------------------------------------------------------------------------------------------
+
+  # 9A. To redirect HTTP requests to HTTPS, uncomment the lines below (also see note above):
+  # -----------------------------------------------------------------------------------------------
+  # RewriteCond %{HTTPS} !=on
+  # RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
+
+
+  # 9B. If using load balancer/AWS or behind proxy, use the following rather than 9A above: (L)
+  # -----------------------------------------------------------------------------------------------
+  # RewriteCond %{HTTP:X-Forwarded-Proto} =http 
+  # RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
+
+  
+  # 9C. If using cPanel AutoSSL or Let's Encrypt webroot you may need to MOVE one of the below
+  # lines after the first RewriteCond in 9A or 9B to allow certificate validation:
+  # -----------------------------------------------------------------------------------------------
+  # RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/
+  # RewriteCond %{REQUEST_URI} !^/\.well-known/cpanel-dcv/[\w-]+$
+  # RewriteCond %{REQUEST_URI} !^/\.well-known/pki-validation/[A-F0-9]{32}\.txt(?:\ Comodo\ DCV)?$
+ 
+  
+  # 9D. Store current scheme in a 'proto' environment variable for later use
+  # -----------------------------------------------------------------------------------------------
+  RewriteCond %{HTTPS} =on
+  RewriteRule ^ - [env=proto:https]
+  RewriteCond %{HTTPS} !=on
+  RewriteRule ^ - [env=proto:http]
+  
+ 
+  # 9E. If using load balancer/AWS or behind proxy, use lines below rather than 9D: (L)
+  # -----------------------------------------------------------------------------------------------
+  # RewriteCond %{HTTP:X-Forwarded-Proto} =https 
+  # RewriteRule ^ - [env=proto:https]
+  # RewriteCond %{HTTP:X-Forwarded-Proto} =http 
+  # RewriteRule ^ - [env=proto:http]
+ 
+  
+  # 9F. Tell web browsers to only allow access via HSTS: Strict-Transport-Security (O) (v301)
+  # -----------------------------------------------------------------------------------------------
+  # This forces client-side SSL redirection. Before enabling be absolutely certain you can 
+  # always serve via HTTPS because it becomes non-revokable for the duration of your max-age. 
+  # See link below for details and options (note 'max-age=31536000' is 1-year):
+  # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Strict-Transport-Security
+  
+  <IfModule mod_headers.c>
+    # Uncomment one (1) line below & adjust as needed to enable Strict-Transport-Security (HSTS):
+    # Header always set Strict-Transport-Security "max-age=31536000;"
+    # Header always set Strict-Transport-Security "max-age=31536000; includeSubdomains"
+    # Header always set Strict-Transport-Security "max-age=31536000; preload"
+    # Header always set Strict-Transport-Security "max-age=31536000; includeSubDomains; preload"
+  </IfModule>
+
+
+  # Section 10 intentionally omitted for future use
+ 
+  # -----------------------------------------------------------------------------------------------
+  # 11. Nuisance blocking/firewall
+  # -----------------------------------------------------------------------------------------------
+  # None of these are enabled by default, but are here for convenience when the need arises.
+  # Review and uncomment as needed. For more complete firewall (and more overhead), the 7G firewall
+  # (or latest version) is worth considering, see: https://perishablepress.com/7g-firewall/
+  # -----------------------------------------------------------------------------------------------
+ 
+  # 11A. Block via IP addresses
+  # -----------------------------------------------------------------------------------------------
+  # Note that IP addresses here are examples only and should be replaced with actual IPs.
+  
+  # Block single IP address
+  # Deny from 111.222.333.444
+  
+  # Block multiple IP addresses
+  # Deny from 111.222.333.444 44.33.22.11
+  
+  # Block IP address ranges (999.88.*, 99.88.77.*, 1.2.3.*)
+  # Deny from 999.888 99.88.77 1.2.3
+  
+  # 11B. Block via request URI (matches strings anywhere in request URL)
+  # -----------------------------------------------------------------------------------------------
+  # RewriteCond %{REQUEST_URI} (bad-word|wp-admin|wp-content) [NC]
+  # RewriteRule .* - [F,L]
+	  
+  # 11B. Block via user agent strings (matches strings anywhere in user-agent)
+  # -----------------------------------------------------------------------------------------------
+  # RewriteCond %{HTTP_USER_AGENT} (bad-bot|mean-bot) [NC]
+  # RewriteRule .* - [F,L]  
+  
+  # 11C. Block via remote hosts 
+  # -----------------------------------------------------------------------------------------------
+  # RewriteCond %{REMOTE_HOST} (bad-host|annoying-host) [NC]
+  # RewriteRule .* - [F,L]
+  
+  # 11D. Block via HTTP referrer (matches anywhere in referrer URL)
+  # -----------------------------------------------------------------------------------------------
+  # RewriteCond %{HTTP_REFERER} (bad-referrer|gross-referrer) [NC]
+  # RewriteRule .* - [F,L]
+  
+  # 11E. Block unneeded request methods (only if you do not need them)
+  # -----------------------------------------------------------------------------------------------
+  # RewriteCond %{REQUEST_METHOD} ^(connect|debug|delete|move|put|trace|track) [NC]
+  # RewriteRule .* - [F,L]  
+  
+  # 11F. Limit file upload size from Apache (i.e. 10240000=10 MB, adjust as needed)
+  # -----------------------------------------------------------------------------------------------
+  # LimitRequestBody 10240000
+  
+ 
+  
+  # -----------------------------------------------------------------------------------------------
+  # 12. Access Restrictions: Keep web users out of dirs or files that begin with a period,
   # but let services like Lets Encrypt use the webroot authentication method.
   # -----------------------------------------------------------------------------------------------
 
   RewriteRule "(^|/)\.(?!well-known)" - [F]
 
+
   # -----------------------------------------------------------------------------------------------
-  # 13. OPTIONAL: Redirect users to the 'www.' version of the site (uncomment to enable).
-  # For example: http://processwire.com/ would be redirected to http://www.processwire.com/
+  # 13. Optional domain redirects (O)
+  # 
+  # Redirect domain.com to www.domain.com redirect (or www to domain.com redirect). 
+  # To use, uncomment either 13A, 13B or 13C. Do not use more than one of them. 13A and 13B 
+  # redirect non-www hosts to www.domain.com, 13C redirects www.domain.com host to domain.com.
   # -----------------------------------------------------------------------------------------------
 
+  # 13A. Redirect domain.com and *.domain.com to www.domain.com (see also 13B as alternate):
+  # -----------------------------------------------------------------------------------------------
   # RewriteCond %{HTTP_HOST} !^www\. [NC]
-  # RewriteRule ^ http://www.%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
+  # RewriteCond %{SERVER_ADDR} !=127.0.0.1
+  # RewriteCond %{SERVER_ADDR} !=::1
+  # RewriteRule ^ %{ENV:PROTO}://www.%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
+  
+  # 13B. Alternate www redirect if 13A does not work for your server: 
+  # -----------------------------------------------------------------------------------------------
+  # RewriteCond %{HTTP_HOST} !^www\. [NC]
+  # RewriteRule ^ %{ENV:PROTO}://www.%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
+ 
+  # 13C. Redirect www.domain.com to domain.com (do not combine with 13A or 13B):
+  # -----------------------------------------------------------------------------------------------
+  # RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
+  # RewriteRule ^ %{ENV:PROTO}://%1%{REQUEST_URI} [R=301,L]
+
 
   # ----------------------------------------------------------------------------------------------- 
-  # 14. OPTIONAL: Send URLs with non-ASCII name-format characters to 404 page (optimization)
+  # 14. Optionally send URLs with non-ASCII name-format characters to 404 page (optimization).
+  # 
+  # This ensures that ProcessWire does not spend time processing URLs that we know ahead of time
+  # are going to result in 404s. Uncomment lines below to enable. (O)
   # ----------------------------------------------------------------------------------------------- 
 
   # RewriteCond %{REQUEST_URI} "[^-_.a-zA-Z0-9/~]"
@@ -137,49 +345,92 @@ DirectoryIndex index.php index.html index.htm
   # RewriteCond %{REQUEST_FILENAME} !-d
   # RewriteRule ^(.*)$ index.php?it=/http404/ [L,QSA]
 
+
   # -----------------------------------------------------------------------------------------------
-  # 15. Access Restrictions: Protect ProcessWire system files
+  # 15. Access Restrictions (v301)
+  # -----------------------------------------------------------------------------------------------
+  
+  # 15A. Keep http requests out of specific files and directories
   # -----------------------------------------------------------------------------------------------
 
-  # Allow screenshot files (for install.php only: this 1 line below may be removed after install)
-  RewriteCond %{REQUEST_URI} !(^|/)site-[^/]+/install/[^/]+\.(jpg|jpeg|png|gif)$
+  # Prevent all the following rules from blocking images in site install directories 
+  RewriteCond %{REQUEST_URI} !(^|/)site-[^/]+/install/[^/]+\.(jpg|jpeg|png|gif|webp|svg)$
+  
   # Block access to any htaccess files
-  RewriteCond %{REQUEST_URI} (^|/)\.htaccess$ [NC,OR]
-  # Block access to protected assets directories
-  RewriteCond %{REQUEST_URI} (^|/)(site|site-[^/]+)/assets/(cache|logs|backups|sessions|config|install|tmp)($|/.*$) [OR]
-  # Block acceess to the /site/install/ directory
-  RewriteCond %{REQUEST_URI} (^|/)(site|site-[^/]+)/install($|/.*$) [OR]
-  # Block dirs in /site/assets/ dirs that start with a hyphen
-  RewriteCond %{REQUEST_URI} (^|/)(site|site-[^/]+)/assets.*/-.+/.* [OR]
-  # Block access to /wire/config.php, /site/config.php, /site/config-dev.php, and /wire/index.config.php
-  RewriteCond %{REQUEST_URI} (^|/)(wire|site|site-[^/]+)/(config|index\.config|config-dev)\.php$ [OR]
-  # Block access to any PHP-based files in /templates-admin/
-  RewriteCond %{REQUEST_URI} (^|/)(wire|site|site-[^/]+)/templates-admin($|/|/.*\.(php|html?|tpl|inc))$ [OR]
-  # Block access to any PHP or markup files in /site/templates/
-  RewriteCond %{REQUEST_URI} (^|/)(site|site-[^/]+)/templates($|/|/.*\.(php|html?|tpl|inc))$ [OR]
-  # Block access to any PHP files in /site/assets/
-  RewriteCond %{REQUEST_URI} (^|/)(site|site-[^/]+)/assets($|/|/.*\.php)$ [OR]
-  # Block access to any PHP files in core or core module directories
-  RewriteCond %{REQUEST_URI} (^|/)wire/(core|modules)/.*\.(php|inc|tpl|module|info\.json)$ [OR]
-  # Block access to any PHP files in /site/modules/
-  RewriteCond %{REQUEST_URI} (^|/)(site|site-[^/]+)/modules/.*\.(php|inc|tpl|module|info\.json)$ [OR]
-  # Block access to any software identifying txt files
-  RewriteCond %{REQUEST_URI} (^|/)(COPYRIGHT|INSTALL|README|htaccess)\.(txt|md|textile)$ [OR]
+  RewriteCond %{REQUEST_URI} (^|/)(\.htaccess|htaccess\..*)$ [NC,OR]
+  
+  # Block access to various assets directories
+  RewriteCond %{REQUEST_URI} (^|/)(site|site-[^/]+)/assets/(cache|logs|backups|sessions|config|install|tmp)($|/.*$) [NC,OR]
+  
+  # Block access to the /site/install/ directories
+  RewriteCond %{REQUEST_URI} (^|/)(site|site-[^/]+)/install($|/.*$) [NC,OR]
+  
+  # Block dirs in /site/assets/dirs that start with a hyphen (see config.pagefileSecure)
+  RewriteCond %{REQUEST_URI} (^|/)(site|site-[^/]+)/assets.*/-.+/.* [NC,OR]
+  
+  # Block access to /wire/config.php, /site/config.php, /site/config-dev.php, /wire/index.config.php, etc.
+  RewriteCond %{REQUEST_URI} (^|/)(wire|site|site-[^/]+)/(config|index\.config|config-dev)\.php($|/) [NC,OR]
+  
+  # Block access to any PHP-based files in /site/templates-admin/ or /wire/templates-admin/
+  RewriteCond %{REQUEST_URI} (^|/)(wire|site|site-[^/]+)/templates-admin($|/|/.*\.(php|html?|tpl|inc))($|/) [NC,OR]
+  
+  # Block access to any PHP or markup files in /site/templates/ or /site-*/templates/
+  RewriteCond %{REQUEST_URI} (^|/)(site|site-[^/]+)/templates($|/|/.*\.(php|html?|tpl|inc))($|/) [NC,OR]
+  
+  # Block access to any files in /site/classes/ or /site-*/classes/
+  RewriteCond %{REQUEST_URI} (^|/)(site|site-[^/]+)/classes($|/.*) [NC,OR]
+  
+  # Block access to any PHP files within /site/assets/ and further
+  RewriteCond %{REQUEST_URI} (^|/)(site|site-[^/]+)/assets($|/|/.*\.ph(p|ps|tml|p[0-9]))($|/) [NC,OR]
+  
+  # Block access to any PHP, module, inc or info files in core or core modules directories
+  RewriteCond %{REQUEST_URI} (^|/)wire/(core|modules)/.*\.(php|inc|tpl|module|info\.json)($|/) [NC,OR]
+  
+  # Block access to any PHP, tpl or info.json files in /site/modules/ or /site-*/modules/
+  RewriteCond %{REQUEST_URI} (^|/)(site|site-[^/]+)/modules/.*\.(php|inc|tpl|module|info\.json)$ [NC,OR]
+  
+  # Block access to any software identifying txt, markdown or textile files
+  RewriteCond %{REQUEST_URI} (^|/)(COPYRIGHT|INSTALL|README|htaccess)\.(txt|md|textile)$ [NC,OR]
+  
+  # Block potential arbitrary backup files within site directories for things like config
+  RewriteCond %{REQUEST_URI} (^|/)(site|site-[^/]+)/(config[^/]*/?|[^/]+\.php.*)$ [NC,OR]
+  
+  # Block access throughout to temporary files ending with tilde created by certain editors
+  RewriteCond %{REQUEST_URI} \.(html?|inc|json|lock|module|php|py|rb|sh|sql|tpl|tmpl|twig)~$ [NC,OR]
+  
+  # Block access to names of potential backup file extensions within wire or site directories
+  RewriteCond %{REQUEST_URI} (^|/)(wire/|site[-/]).+\.(bak|old|sql|sw[op]|(bak|php|sql)[./]+.*)[\d.]*$ [NC,OR]
+  
   # Block all http access to the default/uninstalled site-default directory
   RewriteCond %{REQUEST_URI} (^|/)site-default/
+  
   # If any conditions above match, issue a 403 forbidden
   RewriteRule ^.*$ - [F,L]
 
+ 
+  # 15B. Block archive file types commonly used for backup purposes (O)
+  # -----------------------------------------------------------------------------------------------
+  # This blocks requests for zip, rar, tar, gz, and tgz files that are sometimes left on servers
+  # as backup files, and thus can be problematic for security. This rule blocks those files 
+  # unless they are located within the /site/assets/files/ directory. This is not enabled by 
+  # default since there are many legitimate use cases for these files, so uncomment the lines 
+  # below if you want to enable this.
+
+  # RewriteCond %{REQUEST_URI} \.(zip|rar|tar|gz|tgz)$ [NC]
+  # RewriteCond %{REQUEST_URI} !(^|/)(site|site-[^/]+)/assets/files/\d+/ [NC]
+  # RewriteRule ^.*$ - [F,L]
+
+
   # PW-PAGENAME
   # ----------------------------------------------------------------------------------------------- 
-  # 16a. Ensure that the URL follows the name-format specification required by PW
+  # 16A. Ensure that the URL follows the name-format specification required by PW
   # See also directive 16b below, you should choose and use either 16a or 16b. 
   # ----------------------------------------------------------------------------------------------- 
 
   RewriteCond %{REQUEST_URI} "^/~?[-_.a-zA-Z0-9/]*$"
   
   # ----------------------------------------------------------------------------------------------- 
-  # 16b. Alternative name-format specification for UTF8 page name support.
+  # 16B. Alternative name-format specification for UTF8 page name support. (O)
   # If used, comment out section 16a above and uncomment the directive below. If you have updated 
   # your $config->pageNameWhitelist make the characters below consistent with that. 
   # ----------------------------------------------------------------------------------------------- 
@@ -197,25 +448,30 @@ DirectoryIndex index.php index.html index.htm
   RewriteCond %{REQUEST_FILENAME} !(favicon\.ico|robots\.txt)
 
   # -----------------------------------------------------------------------------------------------
-  # 18. OPTIONAL: Prevent ProcessWire from attempting to serve images or anything in /site/assets/. 
+  # 18. Optionally (O) prevent PW from attempting to serve images or anything in /site/assets/. 
   # Both of these lines are optional, but can help to reduce server load. However, they
   # are not compatible with the $config->pagefileSecure option (if enabled) and they 
   # may produce an Apache 404 rather than your regular 404. You may uncomment the two lines
-  # below if you don't need to use the $config->pagefileSecure option.
+  # below if you don't need to use the $config->pagefileSecure option. After uncommenting, test
+  # a URL like domain.com/site/assets/files/test.jpg to make sure you are getting a 404 and not
+  # your homepage. If getting your homepage, then either: do not use this option, or comment out 
+  # section #2 above that makes ProcessWire the 404 handler. 
   # ----------------------------------------------------------------------------------------------- 
 
-  # RewriteCond %{REQUEST_FILENAME} !\.(jpg|jpeg|gif|png|ico)$ [NC]
+  # RewriteCond %{REQUEST_URI} !\.(jpg|jpeg|gif|png|ico|webp|svg)$ [NC]
   # RewriteCond %{REQUEST_FILENAME} !(^|/)site/assets/
 
   # ----------------------------------------------------------------------------------------------- 
   # 19. Pass control to ProcessWire if all the above directives allow us to this point.
   # For regular VirtualHosts (most installs)
   # ----------------------------------------------------------------------------------------------- 
+  
   RewriteRule ^(.*)$ index.php?it=$1 [L,QSA]
 
   # ----------------------------------------------------------------------------------------------- 
-  # 20. If using VirtualDocumentRoot (500 NOTE): comment out the one above and use this one instead
+  # 20. If using VirtualDocumentRoot (500): comment out the one above and use this one instead
   # ----------------------------------------------------------------------------------------------- 
+  
   # RewriteRule ^(.*)$ /index.php?it=$1 [L,QSA]
 
 </IfModule>

index.php

@@ -10,7 +10,7 @@
  * do so after you have installed the site, as the installer is not informed
  * of any changes made in this file. 
  * 
- * ProcessWire 3.x, Copyright 2016 by Ryan Cramer
+ * ProcessWire 3.x, Copyright 2020 by Ryan Cramer
  * https://processwire.com
  *
  * @version 3.0
@@ -29,7 +29,7 @@ $rootPath = __DIR__;
 if(DIRECTORY_SEPARATOR != '/') $rootPath = str_replace(DIRECTORY_SEPARATOR, '/', $rootPath);
 $composerAutoloader = $rootPath . '/vendor/autoload.php'; // composer autoloader
 if(file_exists($composerAutoloader)) require_once($composerAutoloader);
-if(!class_exists("ProcessWire", false)) require_once("$rootPath/wire/core/ProcessWire.php");
+if(!class_exists("ProcessWire\\ProcessWire", false)) require_once("$rootPath/wire/core/ProcessWire.php");
 $config = ProcessWire::buildConfig($rootPath);
 
 if(!$config->dbName) {
@@ -50,7 +50,7 @@ $wire = null;
 try { 
 	// Bootstrap ProcessWire's core and make the API available with $wire
 	$wire = new ProcessWire($config);
-	$process = $wire->modules->get('ProcessPageView');
+	$process = $wire->modules->get('ProcessPageView'); /** @var ProcessPageView $process */
 	$wire->wire('process', $process); 
 	echo $process->execute($config->internal);
 	$config->internal ? $process->finished() : extract($wire->wire('all')->getArray());

site-beginner/config.php

@@ -17,7 +17,7 @@
  * This file is licensed under the MIT license
  * https://processwire.com/about/license/mit/
  *
- * ProcessWire 3.x, Copyright 2016 by Ryan Cramer
+ * ProcessWire 3.x, Copyright 2019 by Ryan Cramer
  * https://processwire.com
  *
  */
@@ -26,17 +26,7 @@ if(!defined("PROCESSWIRE")) die();
 
 /*** SITE CONFIG *************************************************************************/
 
-/**
- * Enable debug mode?
- *
- * Debug mode causes additional info to appear for use during dev and debugging.
- * This is almost always recommended for sites in development. However, you should
- * always have this disabled for live/production sites.
- *
- * @var bool
- *
- */
-$config->debug = false;
+/** @var Config $config */
 
 /**
  * Prepend template file
@@ -49,5 +39,19 @@ $config->debug = false;
  */
 $config->prependTemplateFile = '_init.php';
 
+/**
+ * Allow core API variables to also be accessed as functions? 
+ * 
+ * Recommended. This enables API varibles like $pages to also be accessed as pages(),
+ * as an example. And so on for most other core variables.
+ * 
+ * Benefits are better type hinting, always in scope, and potentially shorter API calls.
+ * See the file /wire/core/FunctionsAPI.php for details on these functions.
+ * 
+ * @var bool 
+ * 
+ */
+$config->useFunctionsAPI = true; 
+
 
 /*** INSTALLER CONFIG ********************************************************************/

site-beginner/templates/_foot.php

@@ -1,9 +1,9 @@
 
 
-	</div><!--/#main-->
+	</main>
 
 	<!-- footer -->
-	<footer id='footer'>
+	<footer id='footer' role="contentinfo">
 		<p>
 		Powered by <a href='http://processwire.com'>ProcessWire CMS</a>  &nbsp; / &nbsp; 
 		<?php 

site-beginner/templates/_func.php

@@ -22,7 +22,7 @@ function renderNav(PageArray $items) {
 
 	if(!$items->count()) return;
 
-	echo "<ul class='nav'>";
+	echo "<ul class='nav' role='navigation'>";
 
 	// cycle through all the items
 	foreach($items as $item) {
@@ -30,7 +30,7 @@ function renderNav(PageArray $items) {
 		// render markup for each navigation item as an <li>
 		if($item->id == wire('page')->id) {
 			// if current item is the same as the page being viewed, add a "current" class to it
-			echo "<li class='current'>";
+			echo "<li class='current' aria-current='true'>";
 		} else {
 			// otherwise just a regular list item
 			echo "<li>";
@@ -67,15 +67,16 @@ function renderNavTree($items, $maxDepth = 3) {
 
 	// $out is where we store the markup we are creating in this function
 	// start our <ul> markup
-	echo "<ul class='nav nav-tree'>";
+	echo "<ul class='nav nav-tree' role='navigation'>";
 
 	// cycle through all the items
 	foreach($items as $item) {
 
 		// markup for the list item...
-		// if current item is the same as the page being viewed, add a "current" class to it
+		// if current item is the same as the page being viewed, add a "current" class and
+		// visually hidden text for screen readers to it
 		if($item->id == wire('page')->id) {
-			echo "<li class='current'>";
+			echo "<li class='current' aria-current='true'><span class='visually-hidden'>Current page: </span>";
 		} else {
 			echo "<li>";
 		}

site-beginner/templates/_head.php

@@ -11,7 +11,7 @@
 <body class='has-sidebar'>
 
 	<!-- top navigation -->
-	<ul class='topnav'><?php 
+	<ul class='topnav' role='navigation'><?php
 
 		// top navigation consists of homepage and its visible children
 		$homepage = $pages->get('/'); 
@@ -25,7 +25,7 @@
 			if($child->id == $page->rootParent->id) {
 				// this $child page is currently being viewed (or one of it's children/descendents)
 				// so we highlight it as the current page in the navigation
-				echo "<li class='current'><a href='$child->url'>$child->title</a></li>";
+				echo "<li class='current' aria-current='true'><span class='visually-hidden'>Current page: </span><a href='$child->url'>$child->title</a></li>";
 			} else {
 				echo "<li><a href='$child->url'>$child->title</a></li>";
 			}
@@ -40,12 +40,13 @@
 
 	<!-- search form -->
 	<form class='search' action='<?php echo $pages->get('template=search')->url; ?>' method='get'>
-		<input type='text' name='q' placeholder='Search' value='' />
-		<button type='submit' name='submit'>Search</button>
+		<label for='search' class='visually-hidden'>Search:</label>
+		<input type='text' name='q' id='search' placeholder='Search' value='' />
+		<button type='submit' name='submit' class='visually-hidden'>Search</button>
 	</form>
 
 	<!-- breadcrumbs -->
-	<div class='breadcrumbs'><?php 
+	<div class='breadcrumbs' role='navigation' aria-label='You are here:'><?php
 
 		// breadcrumbs are the current page's parents
 		foreach($page->parents() as $item) {
@@ -56,5 +57,5 @@
 
 	?></div>
 
-	<div id='main'>
+	<main id='main'>
 

site-beginner/templates/admin.php

@@ -12,4 +12,5 @@
  * 
  */
 
-require($config->paths->adminTemplates . 'controller.php'); 
+/** @var Config $config */
+require($config->paths->core . "admin.php"); 

site-beginner/templates/basic-page.php

@@ -23,7 +23,7 @@ include('./_head.php'); // include header markup ?>
 	
 	?></div><!-- end content -->
 
-	<div id='sidebar'><?php
+	<aside id='sidebar'><?php
 	
 		// rootParent is the parent page closest to the homepage
 		// you can think of this as the "section" that the user is in
@@ -40,6 +40,6 @@ include('./_head.php'); // include header markup ?>
 		// output sidebar text if the page has it
 		echo $page->sidebar; 
 	
-	?></div><!-- end sidebar -->
+	?></aside><!-- end sidebar -->
 
 <?php include('./_foot.php'); // include footer markup ?>

site-beginner/templates/styles/main.css

@@ -6,6 +6,7 @@
  * 3. Main content and sidebar
  * 4. Footer
  * 5. Media queries for responsive layout
+ * 6. Accessibility helpers
  * 
  */
 
@@ -124,9 +125,6 @@ form.search {
 		border: 1px solid #ccc; 
 		width: 100%; 
 	}
-	form.search button {
-		display: none; 
-	}
 
 .breadcrumbs {
 	clear: both; 
@@ -291,3 +289,43 @@ figure figcaption {
 		font-size: 115%; 
 	}
 }
+
+/*********************************************************************
+ * 6. Accessibility helpers
+ *
+ */
+
+/* Hide visually, but remain approachable for screenreader */
+
+.visually-hidden {
+	position: absolute;
+	width: 1px;
+	height: 1px;
+	padding: 0;
+	margin: -1px;
+	white-space: nowrap;
+	overflow: hidden;
+	clip: rect(1px, 1px, 1px, 1px);
+	border: 0;
+}
+
+/* Show bypass link on hover */
+
+.element-focusable:focus {
+	clip: auto;
+	overflow: visible;
+	height: auto;
+}
+
+/* Sample styling for bypass link */
+
+.bypass-to-main:focus {
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 40px;
+	line-height: 40px;
+	text-align: center;
+	background: #333;
+	color: #fff;
+}

site-blank/config.php

@@ -17,7 +17,7 @@
  * This file is licensed under the MIT license
  * https://processwire.com/about/license/mit/
  *
- * ProcessWire 3.x, Copyright 2016 by Ryan Cramer
+ * ProcessWire 3.x, Copyright 2019 by Ryan Cramer
  * https://processwire.com
  *
  */
@@ -26,17 +26,21 @@ if(!defined("PROCESSWIRE")) die();
 
 /*** SITE CONFIG *************************************************************************/
 
+/** @var Config $config */
+
 /**
- * Enable debug mode?
+ * Allow core API variables to also be accessed as functions?
  *
- * Debug mode causes additional info to appear for use during dev and debugging.
- * This is almost always recommended for sites in development. However, you should
- * always have this disabled for live/production sites.
+ * Recommended. This enables API varibles like $pages to also be accessed as pages(),
+ * as an example. And so on for most other core variables.
+ *
+ * Benefits are better type hinting, always in scope, and potentially shorter API calls.
+ * See the file /wire/core/FunctionsAPI.php for details on these functions.
  *
  * @var bool
  *
  */
-$config->debug = false;
+$config->useFunctionsAPI = true;
 
 
 /*** INSTALLER CONFIG ********************************************************************/

site-blank/templates/admin.php

@@ -12,4 +12,5 @@
  * 
  */
 
-require($config->paths->adminTemplates . 'controller.php'); 
+/** @var Config $config */
+require($config->paths->core . "admin.php"); 

site-classic/config.php

@@ -17,7 +17,7 @@
  * This file is licensed under the MIT license
  * https://processwire.com/about/license/mit/
  *
- * ProcessWire 3.x, Copyright 2016 by Ryan Cramer
+ * ProcessWire 3.x, Copyright 2019 by Ryan Cramer
  * https://processwire.com
  *
  */
@@ -26,17 +26,21 @@ if(!defined("PROCESSWIRE")) die();
 
 /*** SITE CONFIG *************************************************************************/
 
+/** @var Config $config */
+
 /**
- * Enable debug mode?
+ * Allow core API variables to also be accessed as functions?
  *
- * Debug mode causes additional info to appear for use during dev and debugging.
- * This is almost always recommended for sites in development. However, you should
- * always have this disabled for live/production sites.
+ * Recommended. This enables API varibles like $pages to also be accessed as pages(),
+ * as an example. And so on for most other core variables.
+ *
+ * Benefits are better type hinting, always in scope, and potentially shorter API calls.
+ * See the file /wire/core/FunctionsAPI.php for details on these functions.
  *
  * @var bool
  *
  */
-$config->debug = false;
+$config->useFunctionsAPI = true;
 
 
 /*** INSTALLER CONFIG ********************************************************************/

site-classic/templates/admin.php

@@ -12,4 +12,5 @@
  * 
  */
 
-require($config->paths->adminTemplates . 'controller.php'); 
+/** @var Config $config */
+require($config->paths->core . "admin.php"); 

site-classic/templates/foot.inc

@@ -6,7 +6,7 @@
 
 if($page->numChildren) {
 
-	echo "<ul class='nav'>";
+	echo "<ul class='nav' role='navigation'>";
 
 	foreach($page->children as $child) {
 		echo "<li><p><a href='{$child->url}'>{$child->title}</a><br />";
@@ -24,7 +24,7 @@ if($page->numChildren) {
 
 	</div><!--/content-->
 
-	<div id="footer" class="footer">
+	<div id="footer" class="footer" role="contentinfo">
 		<div class="container">
 			<p>Powered by <a href='http://processwire.com'>ProcessWire Open Source CMS/CMF</a></p>
 		</div>

site-classic/templates/head.inc

@@ -32,6 +32,8 @@
 </head>
 <body>
 
+	<a href="#bodycopy" class="visually-hidden element-focusable bypass-to-main">Skip to content</a>
+
 	<p id='bgtitle'><?php 
 
 		// print the section title as big faded text that appears near the top left of the page
@@ -45,11 +47,12 @@
 
 			<a href='<?php echo $config->urls->root; ?>'><p id='logo'>ProcessWire</p></a>
 		
-			<ul id='topnav'><?php
+			<ul id='topnav' role='navigation'><?php
 			
 				// Create the top navigation list by listing the children of the homepage. 
 				// If the section we are in is the current (identified by $page->rootParent)
-				// then note it with <a class='on'> so we can style it differently in our CSS. 
+				// then note it with <a class='on'> so we can style it differently in our CSS
+				// and add a text that is visually hidden, but available for screen readers.
 				// In this case we also want the homepage to be part of our top navigation, 
 				// so we prepend it to the pages we cycle through:
 				
@@ -58,19 +61,24 @@
 				$children->prepend($homepage); 
 		
 				foreach($children as $child) {
+					if ($child === $page->rootParent) {
+						$class = " class='on'";
+						$indicator = "<span class='visually-hidden'>Current page: </span>";
+						$ariaState = " aria-current='true' ";
+					}
 					$class = $child === $page->rootParent ? " class='on'" : '';
-					echo "<li><a$class href='{$child->url}'>{$child->title}</a></li>";
+					echo "<li><a$class$ariaState href='{$child->url}'>$indicator{$child->title}</a></li>";
 				}
 
 			?></ul>
 
-			<ul id='breadcrumb'><?php
+			<ul id='breadcrumb' role='navigation' aria-label='You are here:'><?php
 
 				// Create breadcrumb navigation by cycling through the current $page's
 				// parents in order, linking to each:
 
 				foreach($page->parents as $parent) {
-					echo "<li><a href='{$parent->url}'>{$parent->title}</a> &gt; </li>";
+					echo "<li><a href='{$parent->url}'>{$parent->title}</a> <span class='visually-hidden'>&gt;</span> </li>";
 				}
 
 			?></ul>
@@ -87,6 +95,7 @@
 			?></h1>
 
 			<form id='search_form' action='<?php echo $config->urls->root?>search/' method='get'>
+				<label for='search_query' class='visually-hidden'>Search:</label>
 				<input type='text' name='q' id='search_query' value='<?php echo htmlentities($input->whitelist('q'), ENT_QUOTES, 'UTF-8'); ?>' />
 				<button type='submit' id='search_submit'>Search</button>
 			</form>
@@ -111,7 +120,7 @@
 
 		<div class="container">
 
-			<div id="sidebar">
+			<div id="sidebar" role='complementary'>
 
 				<?php
 
@@ -128,11 +137,12 @@
 					// We have determined that we're not on the homepage
 					// and that this section has child pages, so make navigation: 
 
-					echo "<ul id='subnav' class='nav'>";
+					echo "<ul id='subnav' class='nav' role='navigation'>";
 
 					foreach($page->rootParent->children as $child) {
 						$class = $page === $child ? " class='on'" : '';
-						echo "<li><a$class href='{$child->url}'>{$child->title}</a></li>";	
+						$ariaState = $page === $child ? " aria-current='true' " : '';
+						echo "<li><a$class$ariaState href='{$child->url}'>{$child->title}</a></li>";
 					}
 
 					echo "</ul>";
@@ -156,5 +166,5 @@
 
 			</div><!--/sidebar-->
 
-			<div id="bodycopy">
+			<div id="bodycopy" role="main">
 			

site-classic/templates/styles/main.css

@@ -502,3 +502,45 @@ body, input, textarea, table {
 	z-index: 9999;
 }
 
+/*********************************************************************
+ * 6. Accessibility helpers
+ *
+ */
+
+/* Hide visually, but remain approachable for screenreader */
+
+.visually-hidden {
+	position: absolute;
+	width: 1px;
+	height: 1px;
+	padding: 0;
+	margin: -1px;
+	white-space: nowrap;
+	overflow: hidden;
+	clip: rect(1px, 1px, 1px, 1px);
+	border: 0;
+}
+
+/* Show bypass link on hover */
+
+.element-focusable:focus {
+	clip: auto;
+	overflow: visible;
+	height: auto;
+}
+
+/* Sample styling for bypass link */
+
+.bypass-to-main:focus {
+	top: 0;
+	left: 0;
+	z-index: 10;
+	width: 100%;
+	height: 40px;
+	line-height: 40px;
+	text-align: center;
+	background: #333;
+	color: #fff;
+}
+
+

site-default/config.php

@@ -17,7 +17,7 @@
  * This file is licensed under the MIT license
  * https://processwire.com/about/license/mit/
  *
- * ProcessWire 3.x, Copyright 2016 by Ryan Cramer
+ * ProcessWire 3.x, Copyright 2019 by Ryan Cramer
  * https://processwire.com
  *
  */
@@ -26,17 +26,7 @@ if(!defined("PROCESSWIRE")) die();
 
 /*** SITE CONFIG *************************************************************************/
 
-/**
- * Enable debug mode?
- *
- * Debug mode causes additional info to appear for use during dev and debugging.
- * This is almost always recommended for sites in development. However, you should
- * always have this disabled for live/production sites.
- *
- * @var bool
- *
- */
-$config->debug = false;
+/** @var Config $config */
 
 /**
  * Prepend template file
@@ -60,7 +50,19 @@ $config->prependTemplateFile = '_init.php';
  */
 $config->appendTemplateFile = '_main.php';
 
-
+/**
+ * Allow core API variables to also be accessed as functions?
+ *
+ * Recommended. This enables API varibles like $pages to also be accessed as pages(),
+ * as an example. And so on for most other core variables.
+ *
+ * Benefits are better type hinting, always in scope, and potentially shorter API calls.
+ * See the file /wire/core/FunctionsAPI.php for details on these functions.
+ *
+ * @var bool
+ *
+ */
+$config->useFunctionsAPI = true;
 
 
 /*** INSTALLER CONFIG ********************************************************************/

site-default/finished.php

@@ -1,5 +1,7 @@
 <?php namespace ProcessWire;
 
+if(!defined("PROCESSWIRE")) die();
+
 /**
  * ProcessWire Request Finished
  * ============================

site-default/htaccess.txt

@@ -0,0 +1,12 @@
+# Start ProcessWire:pwbphp (install) 
+# Block PHP files from direct access (optional fallback if root .htaccess missing)
+<FilesMatch "\.(php|module|inc)$">
+  <IfModule mod_authz_core.c>
+    Require all denied
+  </IfModule>
+  <IfModule !mod_authz_core.c>
+    Order allow,deny
+    Deny from all
+  </IfModule>
+</FilesMatch>
+# End ProcessWire:pwbphp

site-default/init.php

@@ -1,5 +1,7 @@
 <?php namespace ProcessWire;
 
+if(!defined("PROCESSWIRE")) die();
+
 /**
  * ProcessWire Bootstrap Initialization
  * ====================================

site-default/modules/Helloworld/Helloworld.module

@@ -27,17 +27,17 @@ class Helloworld extends WireData implements Module {
 
 		return array(
 
-			// The module'ss title, typically a little more descriptive than the class name
+			// The module's title, typically a little more descriptive than the class name
 			'title' => 'Hello World', 
 
 			// version number 
-			'version' => 2, 
+			'version' => 3, 
 
 			// summary is brief description of what this module is
-			'summary' => 'An example module used for demonstration purposes. See the /site/modules/Helloworld.module file for details.',
+			'summary' => 'An example module used for demonstration purposes.',
 			
 			// Optional URL to more information about the module
-			'href' => 'http://processwire.com',
+			'href' => 'https://processwire.com',
 
 			// singular=true: indicates that only one instance of the module is allowed.
 			// This is usually what you want for modules that attach hooks. 
@@ -80,9 +80,12 @@ class Helloworld extends WireData implements Module {
 
 	/**
 	 * Example1 hooks into the pages->save method and displays a notice every time a page is saved
+	 * 
+	 * @param HookEvent $event
 	 *
 	 */
 	public function example1($event) {
+		/** @var Page $page */
 		$page = $event->arguments[0]; 
 		$this->message("Hello World! You saved {$page->path}."); 
 	}
@@ -90,10 +93,13 @@ class Helloworld extends WireData implements Module {
 
 	/**
 	 * Example2 hooks into every page after it's rendered and adds "Hello World" text at the bottom
+	 * 
+	 * @param HookEvent $event
 	 *
 	 */
 	public function example2($event) {
 
+		/** @var Page $page */
 		$page = $event->object; 
 
 		// don't add this to the admin pages
@@ -105,6 +111,8 @@ class Helloworld extends WireData implements Module {
 
 	/**
 	 * Example3 adds a 'hello' method (not property) to every page that simply returns "Hello World"
+	 * 
+	 * @param HookEvent $event
 	 *
 	 */
 	public function example3($event) {
@@ -113,6 +121,8 @@ class Helloworld extends WireData implements Module {
 
 	/**
 	 * Example 4 adds a 'hello_world' property (not method) to every page that returns "Hello [user]"
+	 * 
+	 * @param HookEvent $event
 	 *
 	 */
 	public function example4($event) {

site-default/modules/README.txt

@@ -69,9 +69,6 @@ learning module development:
 There is a module development forum located at:
 https://processwire.com/talk/forum/19-moduleplugin-development/
 
-For a tutorial on how to create modules, see:
-http://wiki.processwire.com/index.php/Module_Creation
-
 
 Additional resources
 --------------------

site-default/ready.php

@@ -1,5 +1,7 @@
 <?php namespace ProcessWire;
 
+if(!defined("PROCESSWIRE")) die();
+
 /**
  * ProcessWire Bootstrap API Ready 
  * ===============================

site-default/templates/README.txt

@@ -162,7 +162,7 @@ steps outlined above:
      But we might also do something more like append some navigation 
      under the body copy or prepend a photo... the sky is the limit. 
 
-     $content = "<img src='/photo.jpg'>" . $page->body;
+     $content = "<img src='/photo.jpg' alt='…'>" . $page->body;
 
      Our search.php template file for example, populates $content with 
      a list of search results. 

site-default/templates/_main.php

@@ -41,12 +41,14 @@
 </head>
 <body class="<?php if($sidebar) echo "has-sidebar "; ?>">
 
+	<a href="#main" class="visually-hidden element-focusable bypass-to-main">Skip to content</a>
+
 	<!-- top navigation -->
-	<ul class='topnav'><?php 
+	<ul class='topnav' role='navigation'><?php
 		// top navigation consists of homepage and its visible children
 		foreach($homepage->and($homepage->children) as $item) {
 			if($item->id == $page->rootParent->id) {
-				echo "<li class='current'>";
+				echo "<li class='current' aria-current='true'><span class='visually-hidden'>Current page: </span>";
 			} else {
 				echo "<li>";
 			}
@@ -59,12 +61,13 @@
 
 	<!-- search form-->
 	<form class='search' action='<?php echo $pages->get('template=search')->url; ?>' method='get'>
-		<input type='text' name='q' placeholder='Search' value='<?php echo $sanitizer->entities($input->whitelist('q')); ?>' />
-		<button type='submit' name='submit'>Search</button>
+		<label for='search' class='visually-hidden'>Search:</label>
+		<input type='text' name='q' placeholder='Search' id='search' value='<?php echo $sanitizer->entities($input->whitelist('q')); ?>' />
+		<button type='submit' name='submit' class='visually-hidden'>Search</button>
 	</form>
 
 	<!-- breadcrumbs -->
-	<div class='breadcrumbs'><?php 
+	<div class='breadcrumbs' role='navigation' aria-label='You are here:'><?php
 		// breadcrumbs are the current page's parents
 		foreach($page->parents() as $item) {
 			echo "<span><a href='$item->url'>$item->title</a></span> "; 
@@ -83,9 +86,9 @@
 
 		<!-- sidebar content -->
 		<?php if($sidebar): ?>
-		<div id='sidebar'>
+		<aside id='sidebar'>
 			<?php echo $sidebar; ?>
-		</div>
+		</aside>
 		<?php endif; ?>
 
 	</div>

site-default/templates/admin.php

@@ -11,5 +11,5 @@
  * but remember to leave the require() statement below at the end.
  * 
  */
-
-require($config->paths->adminTemplates . 'controller.php'); 
+/** @var Config $config */
+require($config->paths->core . "admin.php"); 

site-default/templates/styles/main.css

@@ -6,6 +6,7 @@
  * 3. Main content and sidebar
  * 4. Footer
  * 5. Media queries for responsive layout
+ * 6. Accessibility helpers
  * 
  */
 
@@ -124,9 +125,6 @@ form.search {
 		border: 1px solid #ccc; 
 		width: 100%; 
 	}
-	form.search button {
-		display: none; 
-	}
 
 .breadcrumbs {
 	clear: both; 
@@ -297,3 +295,42 @@ figure figcaption {
 		font-size: 115%; 
 	}
 }
+/*********************************************************************
+ * 6. Accessibility helpers
+ *
+ */
+
+/* Hide visually, but remain approachable for screenreader */
+
+.visually-hidden {
+	position: absolute;
+	width: 1px;
+	height: 1px;
+	padding: 0;
+	margin: -1px;
+	white-space: nowrap;
+	overflow: hidden;
+	clip: rect(1px, 1px, 1px, 1px);
+	border: 0;
+}
+
+/* Show bypass link on hover */
+
+.element-focusable:focus {
+	clip: auto;
+	overflow: visible;
+	height: auto;
+}
+
+/* Sample styling for bypass link */
+
+.bypass-to-main:focus {
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 40px;
+	line-height: 40px;
+	text-align: center;
+	background: #333;
+	color: #fff;
+}

site-languages/config.php

@@ -17,7 +17,7 @@
  * This file is licensed under the MIT license
  * https://processwire.com/about/license/mit/
  *
- * ProcessWire 3.x, Copyright 2016 by Ryan Cramer
+ * ProcessWire 3.x, Copyright 2019 by Ryan Cramer
  * https://processwire.com
  *
  */
@@ -26,17 +26,7 @@ if(!defined("PROCESSWIRE")) die();
 
 /*** SITE CONFIG *************************************************************************/
 
-/**
- * Enable debug mode?
- *
- * Debug mode causes additional info to appear for use during dev and debugging.
- * This is almost always recommended for sites in development. However, you should
- * always have this disabled for live/production sites.
- *
- * @var bool
- *
- */
-$config->debug = false;
+/** @var Config $config */
 
 /**
  * Prepend template file
@@ -60,6 +50,20 @@ $config->prependTemplateFile = '_init.php';
  */
 $config->appendTemplateFile = '_main.php';
 
+/**
+ * Allow core API variables to also be accessed as functions?
+ *
+ * Recommended. This enables API varibles like $pages to also be accessed as pages(),
+ * as an example. And so on for most other core variables.
+ *
+ * Benefits are better type hinting, always in scope, and potentially shorter API calls.
+ * See the file /wire/core/FunctionsAPI.php for details on these functions.
+ *
+ * @var bool
+ *
+ */
+$config->useFunctionsAPI = true;
+
 
 /*** INSTALLER CONFIG ********************************************************************/
 

site-languages/install/files/1012/wire--modules--inputfield--inputfieldckeditor--inputfieldckeditor-module.json

@@ -144,10 +144,10 @@
             "text": "Pfade sollten relativ zum Root-Verzeichnis ihrer ProcessWire Installation sein (d.h. wenn die Seite in einem Unterverzeichnis l\u00e4uft, diesen Teil weglassen)."
         },
         "9728a8f280cf7e8b0b89b52749f7e800": {
-            "text": "Bitte lesen Sie die [Anweisungen](https:\/\/github.com\/ryancramerdesign\/ProcessWire\/blob\/dev\/wire\/modules\/Inputfield\/InputfieldCKEditor\/README.md#custom-editor-css-file) zur Benutzung."
+            "text": "Bitte lesen Sie die [Anweisungen](https:\/\/github.com\/processwire\/processwire\/blob\/master\/wire\/modules\/Inputfield\/InputfieldCKEditor\/README.md#custom-editor-css-file) zur Benutzung."
         },
         "63ba0561c6027fed354e6c5af252a77b": {
-            "text": "Bitte lesen Sie die [Anweisungen](https:\/\/github.com\/ryancramerdesign\/ProcessWire\/blob\/dev\/wire\/modules\/Inputfield\/InputfieldCKEditor\/README.md#custom-editor-js-styles-set) zur Benutzung."
+            "text": "Bitte lesen Sie die [Anweisungen](https:\/\/github.com\/processwire\/processwire\/blob\/master\/wire\/modules\/Inputfield\/InputfieldCKEditor\/README.md#custom-editor-js-styles-set) zur Benutzung."
         },
         "8cd140c060d298234e0079cb77ee8190": {
             "text": "Folgende Plugins wurden gefunden. Markieren Sie die Box neben jedem Plugin welches geladen werden soll."

site-languages/templates/_main.php

@@ -60,8 +60,10 @@
 </head>
 <body class="<?php if($sidebar) echo "has-sidebar"; ?>">
 
+	<a href="#main" class="visually-hidden element-focusable bypass-to-main"><?php echo _x('Skip to content', 'bypass'); ?></a>
+
 	<!-- language switcher / navigation -->
-	<ul class='languages'><?php
+	<ul class='languages' role='navigation'><?php
 		foreach($languages as $language) {
 			if(!$page->viewable($language)) continue; // is page viewable in this language?
 			if($language->id == $user->language->id) {
@@ -76,11 +78,11 @@
 	?></ul>
 
 	<!-- top navigation -->
-	<ul class='topnav'><?php 
+	<ul class='topnav' role='navigation'><?php
 		// top navigation consists of homepage and its visible children
 		foreach($homepage->and($homepage->children) as $item) {
 			if($item->id == $page->rootParent->id) {
-				echo "<li class='current'>";
+				echo "<li class='current' aria-current='true'><span class='visually-hidden'>" . _x('Current page:', 'navigation') . " </span>";
 			} else {
 				echo "<li>";
 			}
@@ -92,7 +94,7 @@
 	?></ul>
 
 	<!-- breadcrumbs -->
-	<div class='breadcrumbs'><?php 
+	<div class='breadcrumbs' role='navigation' aria-label='<?php echo _x('You are here:', 'breadcrumbs'); ?>'><?php
 		// breadcrumbs are the current page's parents
 		foreach($page->parents() as $item) {
 			echo "<span><a href='$item->url'>$item->title</a></span> "; 
@@ -103,12 +105,13 @@
 
 	<!-- search engine -->
 	<form class='search' action='<?php echo $pages->get('template=search')->url; ?>' method='get'>
-		<input type='text' name='q' placeholder='<?php echo _x('Search', 'placeholder'); ?>' />
-		<button type='submit' name='submit'><?php echo _x('Search', 'button'); ?></button>
+		<label for='search' class='visually-hidden'><?php echo _x('Search:', 'label'); ?></label>
+		<input type='text' name='q' id='search' placeholder='<?php echo _x('Search', 'placeholder'); ?>' />
+		<button type='submit' name='submit' class='visually-hidden'><?php echo _x('Search', 'button'); ?></button>
 	</form>
 
 
-	<div id='main'>
+	<main id='main'>
 
 		<!-- main content -->
 		<div id='content'>
@@ -121,15 +124,15 @@
 		<!-- sidebar content -->
 		<?php if($sidebar): ?>
 			
-		<div id='sidebar'>
+		<aside id='sidebar'>
 			
 			<?php echo $sidebar; ?>
 			
-		</div>
+		</aside>
 			
 		<?php endif; ?>
 
-	</div>
+	</main>
 
 	<!-- footer -->
 	<footer id='footer'>

site-languages/templates/admin.php

@@ -12,4 +12,5 @@
  * 
  */
 
-require($config->paths->adminTemplates . 'controller.php'); 
+/** @var Config $config */
+require($config->paths->core . "admin.php"); 

site-languages/templates/styles/main.css

@@ -6,6 +6,7 @@
  * 3. Main content and sidebar
  * 4. Footer
  * 5. Media queries for responsive layout
+ * 6. Accessibility helpers
  * 
  */
 
@@ -156,9 +157,6 @@ form.search {
 		border: 1px solid #ccc; 
 		width: 100%; 
 	}
-	form.search button {
-		display: none; 
-	}
 
 .breadcrumbs {
 	font-size: 80%; 
@@ -351,3 +349,43 @@ figure figcaption {
 		font-size: 115%; 
 	}
 }
+
+/*********************************************************************
+ * 6. Accessibility helpers
+ *
+ */
+
+/* Hide visually, but remain approachable for screenreader */
+
+.visually-hidden {
+	position: absolute;
+	width: 1px;
+	height: 1px;
+	padding: 0;
+	margin: -1px;
+	white-space: nowrap;
+	overflow: hidden;
+	clip: rect(1px, 1px, 1px, 1px);
+	border: 0;
+}
+
+/* Show bypass link on hover */
+
+.element-focusable:focus {
+	clip: auto;
+	overflow: visible;
+	height: auto;
+}
+
+/* Sample styling for bypass link */
+
+.bypass-to-main:focus {
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 40px;
+	line-height: 40px;
+	text-align: center;
+	background: #333;
+	color: #fff;
+}

site-regular/assets/index.php

@@ -0,0 +1,4 @@
+<?php
+// Intentionally left blank to test that htaccess rewrite rules are working. 
+// Accessing this file from http should produce a '403 forbidden' error,
+// since all PHP files are blocked under /assets/.

site-regular/config.php

@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * ProcessWire Configuration File
+ *
+ * Site-specific configuration for ProcessWire.
+ * https://processwire.com/api/ref/config/
+ *
+ * Please see the file /wire/config.php which contains all configuration options you may
+ * specify here. Simply copy any of the configuration options from that file and paste
+ * them into this file in order to modify them.
+ *
+ * ProcessWire 3.x
+ * Copyright (C) 2019 by Ryan Cramer
+ *
+ * https://processwire.com
+ *
+ */
+
+if(!defined("PROCESSWIRE")) die();
+
+/*** SITE CONFIG *************************************************************************/
+
+$config->prependTemplateFile = '_init.php';
+$config->appendTemplateFile = '_main.php';
+$config->useMarkupRegions = true;
+$config->useFunctionsAPI = true; 
+
+
+/*** INSTALLER CONFIG ********************************************************************/
+
+

site-regular/install/info.php

@@ -0,0 +1,6 @@
+<?php if(!defined("PROCESSWIRE_INSTALL")) die();
+$info = array(
+	'title' => "Regular Uikit 3.x site/blog profile", 
+	'summary' => "This is a simple/regular blog site profile that uses Uikit 3 on the front-end and demonstrates several features new to ProcessWire 3.x.", 
+	'screenshot' => "screen_shot_2017-01-27_at_1_30_19_pm.png"
+);

site-regular/install/install.sql

@@ -0,0 +1,718 @@
+# --- WireDatabaseBackup {"time":"2017-01-27 13:32:39","user":"","dbName":"pw_xyz","description":"","tables":[],"excludeTables":["pages_drafts","pages_roles","permissions","roles","roles_permissions","users","users_roles","user","role","permission"],"excludeCreateTables":[],"excludeExportTables":["field_roles","field_permissions","field_email","field_pass","caches","session_login_throttle","page_path_history"]}
+
+DROP TABLE IF EXISTS `caches`;
+CREATE TABLE `caches` (
+  `name` varchar(191) NOT NULL,
+  `data` mediumtext NOT NULL,
+  `expires` datetime NOT NULL,
+  PRIMARY KEY (`name`),
+  KEY `expires` (`expires`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `field_body`;
+CREATE TABLE `field_body` (
+  `pages_id` int(10) unsigned NOT NULL,
+  `data` mediumtext NOT NULL,
+  PRIMARY KEY (`pages_id`),
+  FULLTEXT KEY `data` (`data`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+INSERT INTO `field_body` (`pages_id`, `data`) VALUES('1', '<p>This is a simple <a href=\"https://processwire.com\">ProcessWire</a> site profile that is somewhat like our default site profile, but also includes a blog. It demonstrates development of various features including some new to ProcessWire 3.x. The front-end of this profile uses the <a href=\"http://www.getuikit.com\" target=\"_blank\" rel=\"noreferrer\">Uikit 3</a> library and includes a library of time-saving functions for working with Uikit 3. Below are a few highlights you\'ll find in this site profile:</p>\n\n<ul><li>Use of markup regions and the new ProcessWire functions API.</li>\n	<li>Use of Uikit 3 in template files and includes a handy PHP library of Uikit-specific functions.</li>\n	<li>Demonstrates front-end editing features on <a	data-pwid=1024	href=\"/about/front-end-editor-demo/\">this page</a>.</li>\n	<li>Uses pagination (after 10+ blog posts) and demonstrates use of comments as well.</li>\n	<li>Demonstrates caching of markup (see mobile off-canvas navigation).</li>\n	<li>Demonstrates use of a Page reference field, as used by categories in the blog.</li>\n	<li>The template files are easy-to-read and modify, and serve as a good platform to build from.</li>\n	<li>Demonstrates implementation of a custom hook function (see in the /site/ready.php file).</li>\n</ul>');
+INSERT INTO `field_body` (`pages_id`, `data`) VALUES('27', '<h3>The page you were looking for is not found.</h3>\n\n<p>Please use the navigation above to find the page, or use the search engine in the footer. </p>');
+INSERT INTO `field_body` (`pages_id`, `data`) VALUES('1001', '<p>Dolore ad nunc, mos accumsan paratus duis suscipit luptatum facilisis macto uxor iaceo quadrum. Demoveo, appellatio elit neque ad commodo ea. Wisi, iaceo, tincidunt at commoveo rusticus et, ludus. Feugait at blandit bene blandit suscipere abdo duis ideo bis commoveo pagus ex, velit. Consequat commodo roto accumsan, duis transverbero.</p>');
+INSERT INTO `field_body` (`pages_id`, `data`) VALUES('1002', '<p>Iusto incassum appellatio cui macto genitus vel. Lobortis aliquam luctus, roto enim, imputo wisi tamen. Ratis odio, genitus acsi, neo illum consequat consectetuer ut.</p>\n\n<p>Patria iriure vel vel autem proprius indoles ille sit. Tation blandit refoveo, accumsan ut ulciscor lucidus inhibeo capto aptent opes, foras.</p>\n\n<h3>Dolore ea valde refero feugait utinam luctus</h3>\n\n<p><img alt=\"Copyright by Austin Cramer for DesignIntelligence. This is a placeholder while he makes new ones for us.\" class=\"align_right hidpi\"	src=\"/site/assets/files/1002/psych_cartoon_4-20.300x0-is-hidpi.jpg\" width=\"300\" />Usitas, nostrud transverbero, in, amet, nostrud ad. Ex feugiat opto diam os aliquam regula lobortis dolore ut ut quadrum. Esse eu quis nunc jugis iriure volutpat wisi, fere blandit inhibeo melior, hendrerit, saluto velit. Eu bene ideo dignissim delenit accumsan nunc. Usitas ille autem camur consequat typicus feugait elit ex accumsan nutus accumsan nimis pagus, occuro. Immitto populus, qui feugiat opto pneum letalis paratus. Mara conventio torqueo nibh caecus abigo sit eum brevitas. Populus, duis ex quae exerci hendrerit, si antehabeo nobis, consequat ea praemitto zelus.</p>\n\n<p>Immitto os ratis euismod conventio erat jus caecus sudo. code test Appellatio consequat, et ibidem ludus nulla dolor augue abdo tego euismod plaga lenis. Sit at nimis venio venio tego os et pecus enim pneum magna nobis ad pneum. Saepius turpis probo refero molior nonummy aliquam neque appellatio jus luctus acsi. Ulciscor refero pagus imputo eu refoveo valetudo duis dolore usitas. Consequat suscipere quod torqueo ratis ullamcorper, dolore lenis, letalis quia quadrum plaga minim.</p>');
+INSERT INTO `field_body` (`pages_id`, `data`) VALUES('1004', '<p>Magna in gemino, gilvus iusto capto jugis abdo mos aptent acsi qui. Utrum inhibeo humo humo duis quae. Lucidus paulatim facilisi scisco quibus hendrerit conventio adsum.</p>\n\n<h2>Si lobortis singularis genitus ibidem saluto</h2>\n\n<ul><li>Feugiat eligo foras ex elit sed indoles hos elit ex antehabeo defui et nostrud.</li>\n	<li>Letatio valetudo multo consequat inhibeo ille dignissim pagus et in quadrum eum eu.</li>\n	<li>Aliquam si consequat, ut nulla amet et turpis exerci, adsum luctus ne decet, delenit.</li>\n	<li>Commoveo nunc diam valetudo cui, aptent commoveo at obruo uxor nulla aliquip augue.</li>\n</ul><p>Iriure, ex velit, praesent vulpes delenit capio vero gilvus inhibeo letatio aliquip metuo qui eros. Transverbero demoveo euismod letatio torqueo melior. Ut odio in suscipit paulatim amet huic letalis suscipere eros causa, letalis magna.</p>\n\n<ol><li>Feugiat eligo foras ex elit sed indoles hos elit ex antehabeo defui et nostrud.</li>\n	<li>Letatio valetudo multo consequat inhibeo ille dignissim pagus et in quadrum eum eu.</li>\n	<li>Aliquam si consequat, ut nulla amet et turpis exerci, adsum luctus ne decet, delenit.</li>\n	<li>Commoveo nunc diam valetudo cui, aptent commoveo at obruo uxor nulla aliquip augue.</li>\n</ol>');
+INSERT INTO `field_body` (`pages_id`, `data`) VALUES('1015', '<p>Fixed effect pulse current remote integer potentiometer anomoly. Gigabyte recognition deviation active sequential bypass echo distributed. Embedded encapsulated mainframe reducer logarithmic potentiometer duplex. Software metafile reducer deviation boolean overflow bridgeware.</p>\n\n<p>Patch internet nano. Converter a inversion recursive adaptive encapsulated transport floating-point transistorized plasma microscopic node. PC duplex partitioned. Network scalar dithering encapsulated generator normalizing. Remote interval fixed plasma normalizing microscopic procedural scalar dynamic read-only high boolean.</p>\n\n<h3>Reducer hybrid force key</h3>\n\n<p>Cascading wave network logarithmic digital powered scan. Frequency coordinated particle transmission supporting. Log distributed bus scan force particle computer inversion servicing reverberated device. In coordinated services backbone silicon hyperlinked. Scalar error fiber transponder digital.</p>\n\n<p>Vector developer connectivity connectivity modular supporting broadband solution. For modular vector timer indeterminate debugged optical kilohertz procedural procedural. Infrared fuzzy procedural capacitance fiber. Algorithm direct procedural echo. Digital bridgeware by timer fragmentation ethernet inducer phase network.</p>\n\n<p>Transaction active by. Effect partitioned by timer system services computer. Spawned coordinated developer fuzzy. Technician fuzzy supporting protocol coordinated ethernet. Bridgeware video remote prototype development.</p>');
+INSERT INTO `field_body` (`pages_id`, `data`) VALUES('1021', '<p>Grown plus industry open for when when sharpest ordinary offer by. Better huggable opportunity too. Rosy sleek while exclusive gentle not on. Offer colossal silky this sweet magically announcing durable sold soaking our try. Sold one zesty velvety awesome flavored ever with effervescent gentle. Screamin\' improved permanent treat now tasty we space 100%.</p>\n\n<p>Think affordable artificial blast while choice. Appetizing available really thank-you out proven desire fresh rich. Natural and flash power effective grand premium. Secret lifetime grand quenches by ocean as comfort golden youthful fast. Disposable zesty dazzling open sure spacious multi-purpose the super market rare.</p>\n\n<p>Spring special bigger wherever only this comfort tummy extravaganza save. Very messy keen leading incredible.</p>\n\n<p>Hearty brand chocolatey comfort admire ultra. Want kids touch discount love appetizing talking inside buttery. For keeps admire youthful. Wherever super thirsty lasting limited discover picky can\'t.</p>\n\n<p>Good appreciate flexible product best. Full-bodied don\'t customer gigantic also.</p>');
+INSERT INTO `field_body` (`pages_id`, `data`) VALUES('1022', '<p>Genuine symphony solid educated de-jour regal gifted guests. Using gilded member silk dignified gilded panoramic art politically. Diamond upper brokerage pleasure society reserved. First-class topiary treasure travel is the best wishlist vacation solid penthouse world.</p>\n\n<p>Board marquis estate career blissfull treasure saphire. Delegate cultered regal marquis cigar sterling penthouse.</p>\n\n<p>Sterling butler solid penthouse gilded gilded pedigree wine using investments cigar. Cultered doctoral symphony extra accredited. Private benefactor monogram high-rise a.</p>\n\n<p>Career gilded extra aristocratic cruise brilliant impresario. European ambassador acumen ambassador. Rare suite cruise club crafted butler grande.</p>\n\n<p>Distinctly rich auction penthouse travel.</p>');
+INSERT INTO `field_body` (`pages_id`, `data`) VALUES('1024', '<p>If you are logged in with edit access to this page, you can double-click this body copy to edit it. You can also do the same to edit the headline above, or the sidebar text to the right.</p>\n\n<p>Illum aliquip loquor. Hendrerit interdico dolor zelus diam metuo causa lobortis scisco. Euismod damnum quibus ideo patria opto. Haero odio jus virtus haero pagus erat cogo diam minim vulputate autem.</p>\n\n<h3>Ullamcorper venio bene</h3>\n\n<p>Amet ea oppeto nullus esse meus immitto sudo dignissim. Letalis velit utrum luptatum ullamcorper illum ad fere molior populus ut. Et augue eligo jumentum populus nonummy virtus. Valetudo odio ex opes mos delenit immitto ex. Illum tincidunt commoveo nostrud et ratis ne vulputate vereor tego.</p>\n\n<ul><li>Capto elit vel eu esse quia</li>\n	<li>Te gemino natu et augue ad</li>\n	<li>Amet aliquip valde blandit olim facilisi</li>\n</ul><p>Nulla iusto pertineo camur similis enim abigo luptatum ymo nullus. Inhibeo nutus pagus capto dolus capio pecus. Pala vereor esse melior nisl bis. Veniam eros consequat.</p>');
+
+DROP TABLE IF EXISTS `field_categories`;
+CREATE TABLE `field_categories` (
+  `pages_id` int(10) unsigned NOT NULL,
+  `data` int(11) NOT NULL,
+  `sort` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`pages_id`,`sort`),
+  KEY `data` (`data`,`pages_id`,`sort`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+INSERT INTO `field_categories` (`pages_id`, `data`, `sort`) VALUES('1015', '1017', '0');
+INSERT INTO `field_categories` (`pages_id`, `data`, `sort`) VALUES('1015', '1018', '1');
+INSERT INTO `field_categories` (`pages_id`, `data`, `sort`) VALUES('1021', '1018', '1');
+INSERT INTO `field_categories` (`pages_id`, `data`, `sort`) VALUES('1021', '1019', '0');
+INSERT INTO `field_categories` (`pages_id`, `data`, `sort`) VALUES('1022', '1019', '0');
+INSERT INTO `field_categories` (`pages_id`, `data`, `sort`) VALUES('1022', '1020', '1');
+INSERT INTO `field_categories` (`pages_id`, `data`, `sort`) VALUES('1021', '1027', '2');
+
+DROP TABLE IF EXISTS `field_comments`;
+CREATE TABLE `field_comments` (
+  `pages_id` int(10) unsigned NOT NULL,
+  `data` text NOT NULL,
+  `sort` int(10) unsigned NOT NULL,
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `status` tinyint(3) NOT NULL DEFAULT '0',
+  `cite` varchar(128) NOT NULL DEFAULT '',
+  `email` varchar(250) NOT NULL DEFAULT '',
+  `created` int(10) unsigned NOT NULL,
+  `created_users_id` int(10) unsigned NOT NULL,
+  `ip` varchar(15) NOT NULL DEFAULT '',
+  `user_agent` varchar(250) NOT NULL DEFAULT '',
+  `website` varchar(250) NOT NULL DEFAULT '',
+  `parent_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `code` varchar(128) DEFAULT NULL,
+  `subcode` varchar(40) DEFAULT NULL,
+  `upvotes` int(10) unsigned NOT NULL DEFAULT '0',
+  `downvotes` int(10) unsigned NOT NULL DEFAULT '0',
+  `stars` tinyint(3) unsigned DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `pages_id_sort` (`pages_id`,`sort`),
+  KEY `status` (`status`,`email`(191)),
+  KEY `pages_id` (`pages_id`,`status`,`created`),
+  KEY `created` (`created`,`status`),
+  KEY `code` (`code`),
+  KEY `subcode` (`subcode`),
+  FULLTEXT KEY `data` (`data`)
+) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
+
+INSERT INTO `field_comments` (`pages_id`, `data`, `sort`, `id`, `status`, `cite`, `email`, `created`, `created_users_id`, `ip`, `user_agent`, `website`, `parent_id`, `flags`, `code`, `subcode`, `upvotes`, `downvotes`, `stars`) VALUES('1021', 'They good night the piper good night good queen white as snow they magical beans winding path up the hill dragon beautiful dress. So loud magic wand took fought angry lion ding-dong. Winding path fought ran away whale swallowed crystal ball poison apple took the piper sang twinkled.', '2', '1', '1', 'Jim', 'jim@processwire.com', '1485450830', '41', '0.0.0.0', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.95 Safari/537.36', '', '0', '0', 'aeHvmkn88ncb4214OXegP8uUrQy6D5UZcaD9pPxT9gPFDdEOf1EqCM6UD6JUnY7Jtv9MPNjcPrJWUxKhyh89r1H6nywk1Se_GdwAoj2guU_9YYa9MEgiuJUekuk93YvE', 'JzPW6751GqTqk1Oh__k0IbNfOi_Nc6nYvPPa2wl6', '0', '0', NULL);
+INSERT INTO `field_comments` (`pages_id`, `data`, `sort`, `id`, `status`, `cite`, `email`, `created`, `created_users_id`, `ip`, `user_agent`, `website`, `parent_id`, `flags`, `code`, `subcode`, `upvotes`, `downvotes`, `stars`) VALUES('1021', 'LED harmonic nominal femtosecond data solid alphanumeric alphanumeric. By sampling bus recursive null. Modular timer recognition passive interval. Theory capacitance application fragmentation with supporting indeterminate. Microscopic record indeterminate scalar concept deviation system.', '3', '2', '1', 'ryan', 'ryan@processwire.com', '1485453231', '41', '0.0.0.0', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.95 Safari/537.36', 'https://processwire.com', '0', '0', 'eWwAZPZHyC4JcShlKDPrr5Y_rC8sntJOildm2ecqUegXPwgfwmRhyOn5ssyQhABWwaweM74e_TApOLMQu4MGt9lSf7VcxH994ciwggF0f3lpEdJ3OMtjYe4MvW4gDzNF', 'CcaWnsxrcWYxfCgnnvYc2DEN7qU3bd_7HVm3NK_0', '0', '0', NULL);
+INSERT INTO `field_comments` (`pages_id`, `data`, `sort`, `id`, `status`, `cite`, `email`, `created`, `created_users_id`, `ip`, `user_agent`, `website`, `parent_id`, `flags`, `code`, `subcode`, `upvotes`, `downvotes`, `stars`) VALUES('1022', 'Run Spot play help I am hungry I can help too oh no. He wants to play oh no for a ride I can help for a ride too on our bikes chase the cat for a ride. Bring it here walk we have two bark I am hungry jump high now he is funny it is Sally for a ride oh please. We can oh please down the toy I can help no Jane is looking she is happy share with them.\n\nLook too eating cake he wants to play he wants to play down don\'t worry on our bikes on our bikes. I am hungry down jump high they are silly and oh no help but. Thank you over there I can help Dick said over there on our bikes see Puff over there do it Jane is looking I can see he is fast. Quick in the wagon no jump high.', '2', '3', '1', 'Ryan', 'ryan@processwire.com', '1485528109', '41', '0.0.0.0', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.95 Safari/537.36', 'https://processwire.com', '0', '0', 'CVaOB64FqwwVlmAXUbhP5KbZQDFM7OarKON1ZIb_PYP9cDkpcb0NCYp56iAPHTZoIjJEZNQ4mnuEyLkYw97XkfOgmtRDd33rfZB0Zt1yfDKOjY4tdkWP08BKUbI_MImr', 'ySOMziIfOxoi_BfPVBNxNaGVrKHGzHGtFbnbkodo', '0', '0', NULL);
+
+DROP TABLE IF EXISTS `field_comments_votes`;
+CREATE TABLE `field_comments_votes` (
+  `comment_id` int(10) unsigned NOT NULL,
+  `vote` tinyint(4) NOT NULL,
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `ip` varchar(15) NOT NULL DEFAULT '',
+  `user_id` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`comment_id`,`ip`,`vote`),
+  KEY `created` (`created`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+DROP TABLE IF EXISTS `field_date`;
+CREATE TABLE `field_date` (
+  `pages_id` int(10) unsigned NOT NULL,
+  `data` datetime NOT NULL,
+  PRIMARY KEY (`pages_id`),
+  KEY `data` (`data`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+INSERT INTO `field_date` (`pages_id`, `data`) VALUES('1015', '2017-01-25 00:00:00');
+INSERT INTO `field_date` (`pages_id`, `data`) VALUES('1022', '2017-01-26 00:00:00');
+INSERT INTO `field_date` (`pages_id`, `data`) VALUES('1021', '2017-01-27 00:00:00');
+
+DROP TABLE IF EXISTS `field_email`;
+CREATE TABLE `field_email` (
+  `pages_id` int(10) unsigned NOT NULL,
+  `data` varchar(191) NOT NULL DEFAULT '',
+  PRIMARY KEY (`pages_id`),
+  KEY `data_exact` (`data`),
+  FULLTEXT KEY `data` (`data`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `field_headline`;
+CREATE TABLE `field_headline` (
+  `pages_id` int(10) unsigned NOT NULL,
+  `data` text NOT NULL,
+  PRIMARY KEY (`pages_id`),
+  FULLTEXT KEY `data` (`data`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+INSERT INTO `field_headline` (`pages_id`, `data`) VALUES('1', 'Uikit 3 site/blog profile');
+INSERT INTO `field_headline` (`pages_id`, `data`) VALUES('27', '404 Page Not Found');
+INSERT INTO `field_headline` (`pages_id`, `data`) VALUES('1001', 'About Us');
+INSERT INTO `field_headline` (`pages_id`, `data`) VALUES('1024', 'Demonstration of front-end-editing');
+
+DROP TABLE IF EXISTS `field_images`;
+CREATE TABLE `field_images` (
+  `pages_id` int(10) unsigned NOT NULL,
+  `data` varchar(191) NOT NULL,
+  `sort` int(10) unsigned NOT NULL,
+  `description` text NOT NULL,
+  `modified` datetime DEFAULT NULL,
+  `created` datetime DEFAULT NULL,
+  PRIMARY KEY (`pages_id`,`sort`),
+  KEY `data` (`data`),
+  KEY `modified` (`modified`),
+  KEY `created` (`created`),
+  FULLTEXT KEY `description` (`description`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+INSERT INTO `field_images` (`pages_id`, `data`, `sort`, `description`, `modified`, `created`) VALUES('1002', 'psych_cartoon_4-20.jpg', '0', 'Copyright by Austin Cramer for DesignIntelligence. This is a placeholder while he makes new ones for us.', '2017-01-24 06:11:43', '2017-01-24 06:11:43');
+INSERT INTO `field_images` (`pages_id`, `data`, `sort`, `description`, `modified`, `created`) VALUES('1021', 'screen_shot_2017-01-27_at_10_46_35_am.png', '0', '', '2017-01-27 10:56:13', '2017-01-27 10:56:13');
+
+
+DROP TABLE IF EXISTS `field_pass`;
+CREATE TABLE `field_pass` (
+  `pages_id` int(10) unsigned NOT NULL,
+  `data` char(40) NOT NULL,
+  `salt` char(32) NOT NULL,
+  PRIMARY KEY (`pages_id`),
+  KEY `data` (`data`)
+) ENGINE=MyISAM DEFAULT CHARSET=ascii;
+
+DROP TABLE IF EXISTS `field_permissions`;
+CREATE TABLE `field_permissions` (
+  `pages_id` int(10) unsigned NOT NULL,
+  `data` int(11) NOT NULL,
+  `sort` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`pages_id`,`sort`),
+  KEY `data` (`data`,`pages_id`,`sort`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `field_process`;
+CREATE TABLE `field_process` (
+  `pages_id` int(11) NOT NULL DEFAULT '0',
+  `data` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`pages_id`),
+  KEY `data` (`data`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('10', '7');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('23', '10');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('3', '12');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('8', '12');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('9', '14');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('6', '17');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('11', '47');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('16', '48');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('21', '50');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('29', '66');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('30', '68');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('22', '76');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('28', '76');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('2', '87');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('300', '104');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('301', '109');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('302', '121');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('303', '129');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('31', '136');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('304', '138');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('1007', '150');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('1009', '158');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('1011', '159');
+INSERT INTO `field_process` (`pages_id`, `data`) VALUES('1025', '165');
+
+DROP TABLE IF EXISTS `field_roles`;
+CREATE TABLE `field_roles` (
+  `pages_id` int(10) unsigned NOT NULL,
+  `data` int(11) NOT NULL,
+  `sort` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`pages_id`,`sort`),
+  KEY `data` (`data`,`pages_id`,`sort`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `field_sidebar`;
+CREATE TABLE `field_sidebar` (
+  `pages_id` int(10) unsigned NOT NULL,
+  `data` mediumtext NOT NULL,
+  PRIMARY KEY (`pages_id`),
+  FULLTEXT KEY `data` (`data`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+INSERT INTO `field_sidebar` (`pages_id`, `data`) VALUES('1', '<h3>Requirements</h3>\n\n<p>This site profile requires ProcessWire 3.0.105 or newer, Uikit 3, and the server must be running on PHP 5.4 or newer.</p>');
+INSERT INTO `field_sidebar` (`pages_id`, `data`) VALUES('1002', '<h3>Sudo nullus</h3>\r\n\r\n<p>Et torqueo vulpes vereor luctus augue quod consectetuer antehabeo causa patria tation ex plaga ut. Abluo delenit wisi iriure eros feugiat probo nisl aliquip nisl, patria. Antehabeo esse camur nisl modo utinam. Sudo nullus ventosus ibidem facilisis saepius eum sino pneum, vicis odio voco opto.</p>');
+INSERT INTO `field_sidebar` (`pages_id`, `data`) VALUES('1024', '<h3>Double click me</h3>\n\n<p>Esca demoveo exputo sagaciter ullamcorper inhibeo ut nimis refoveo praemitto defui ut. Hendrerit ratis dignissim ea eligo. Genitus utinam suscipere caecus ad neque verto at regula saluto esse turpis. Refero autem et nulla ibidem caecus fere acsi plaga in turpis. Nobis sit nunc esse capio suscipit vulpes facilisis brevitas. Pagus odio eros accumsan et interdico nunc abdo eligo epulae.</p>');
+
+DROP TABLE IF EXISTS `field_summary`;
+CREATE TABLE `field_summary` (
+  `pages_id` int(10) unsigned NOT NULL,
+  `data` mediumtext NOT NULL,
+  PRIMARY KEY (`pages_id`),
+  FULLTEXT KEY `data` (`data`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+INSERT INTO `field_summary` (`pages_id`, `data`) VALUES('1', 'A simple blog site about nothing in particular.');
+INSERT INTO `field_summary` (`pages_id`, `data`) VALUES('1001', 'This is a placeholder page with two child pages to serve as an example. ');
+INSERT INTO `field_summary` (`pages_id`, `data`) VALUES('1002', 'Dolore ea valde refero feugait utinam luctus. Probo velit commoveo et, delenit praesent, suscipit zelus, hendrerit zelus illum facilisi, regula. ');
+INSERT INTO `field_summary` (`pages_id`, `data`) VALUES('1004', 'Mos erat reprobo in praesent, mara premo, obruo iustum pecus velit lobortis te sagaciter populus.');
+INSERT INTO `field_summary` (`pages_id`, `data`) VALUES('1005', 'View this template\'s source for a demonstration of how to create a basic site map. ');
+INSERT INTO `field_summary` (`pages_id`, `data`) VALUES('1024', 'If you are logged in with edit access, pages using the basic-page-edit template (like this one) are editable on the front-end.');
+
+DROP TABLE IF EXISTS `field_title`;
+CREATE TABLE `field_title` (
+  `pages_id` int(10) unsigned NOT NULL,
+  `data` text NOT NULL,
+  PRIMARY KEY (`pages_id`),
+  KEY `data_exact` (`data`(191)),
+  FULLTEXT KEY `data` (`data`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1', 'Home');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('2', 'Admin');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('3', 'Pages');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('6', 'Add Page');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('7', 'Trash');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('8', 'Tree');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('9', 'Save Sort');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('10', 'Edit');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('11', 'Templates');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('16', 'Fields');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('21', 'Modules');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('22', 'Setup');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('23', 'Login');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('27', '404 Page');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('28', 'Access');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('29', 'Users');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('30', 'Roles');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('31', 'Permissions');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('32', 'Edit pages');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('34', 'Delete pages');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('35', 'Move pages (change parent)');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('36', 'View pages');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('50', 'Sort child pages');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('51', 'Change templates on pages');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('52', 'Administer users');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('53', 'User can update profile/password');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('54', 'Lock or unlock a page');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('300', 'Search');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('301', 'Empty Trash');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('302', 'Insert Link');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('303', 'Insert Image');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('304', 'Profile');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1000', 'Search');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1001', 'About');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1002', 'Child page example 1');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1004', 'Child page example 2');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1005', 'Site Map');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1006', 'Use Page Lister');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1007', 'Find');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1009', 'Recent');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1010', 'Can see recently edited pages');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1011', 'Logs');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1012', 'Can view system logs');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1013', 'Can manage system logs');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1014', 'Blog');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1015', 'Phase data extended transaction');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1016', 'Categories');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1017', 'Coffee');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1018', 'Beer');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1019', 'Plants');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1020', 'Cats');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1021', 'Think affordable artificial blast');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1022', 'Genuine symphony');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1023', 'Use the front-end page editor');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1024', 'Front-end editing demo');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1025', 'Comments');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1026', 'Use the comments manager');
+INSERT INTO `field_title` (`pages_id`, `data`) VALUES('1027', 'Recipes');
+
+DROP TABLE IF EXISTS `fieldgroups`;
+CREATE TABLE `fieldgroups` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(191) CHARACTER SET ascii NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=MyISAM AUTO_INCREMENT=102 DEFAULT CHARSET=utf8;
+
+INSERT INTO `fieldgroups` (`id`, `name`) VALUES('2', 'admin');
+INSERT INTO `fieldgroups` (`id`, `name`) VALUES('83', 'basic-page');
+INSERT INTO `fieldgroups` (`id`, `name`) VALUES('101', 'basic-page-edit');
+INSERT INTO `fieldgroups` (`id`, `name`) VALUES('98', 'blog');
+INSERT INTO `fieldgroups` (`id`, `name`) VALUES('97', 'blog-post');
+INSERT INTO `fieldgroups` (`id`, `name`) VALUES('99', 'categories');
+INSERT INTO `fieldgroups` (`id`, `name`) VALUES('100', 'category');
+INSERT INTO `fieldgroups` (`id`, `name`) VALUES('1', 'home');
+INSERT INTO `fieldgroups` (`id`, `name`) VALUES('5', 'permission');
+INSERT INTO `fieldgroups` (`id`, `name`) VALUES('4', 'role');
+INSERT INTO `fieldgroups` (`id`, `name`) VALUES('80', 'search');
+INSERT INTO `fieldgroups` (`id`, `name`) VALUES('88', 'sitemap');
+INSERT INTO `fieldgroups` (`id`, `name`) VALUES('3', 'user');
+
+DROP TABLE IF EXISTS `fieldgroups_fields`;
+CREATE TABLE `fieldgroups_fields` (
+  `fieldgroups_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `fields_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `sort` int(11) unsigned NOT NULL DEFAULT '0',
+  `data` text,
+  PRIMARY KEY (`fieldgroups_id`,`fields_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('1', '1', '0', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('1', '44', '5', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('1', '76', '3', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('1', '78', '1', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('1', '79', '2', '{\"label\":\"Site tagline\"}');
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('1', '82', '4', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('2', '1', '0', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('2', '2', '1', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('3', '3', '0', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('3', '4', '2', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('3', '92', '1', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('4', '5', '0', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('5', '1', '0', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('80', '1', '0', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('83', '1', '0', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('83', '44', '5', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('83', '76', '3', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('83', '78', '1', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('83', '79', '2', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('83', '82', '4', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('88', '1', '0', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('88', '79', '1', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('97', '1', '0', '{\"columnWidth\":75}');
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('97', '44', '3', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('97', '76', '2', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('97', '97', '1', '{\"columnWidth\":25}');
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('97', '98', '4', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('97', '99', '5', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('98', '1', '0', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('99', '1', '0', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('100', '1', '0', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('101', '1', '0', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('101', '44', '5', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('101', '76', '3', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('101', '78', '1', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('101', '79', '2', NULL);
+INSERT INTO `fieldgroups_fields` (`fieldgroups_id`, `fields_id`, `sort`, `data`) VALUES('101', '82', '4', NULL);
+
+DROP TABLE IF EXISTS `fields`;
+CREATE TABLE `fields` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `type` varchar(128) CHARACTER SET ascii NOT NULL,
+  `name` varchar(191) CHARACTER SET ascii NOT NULL,
+  `flags` int(11) NOT NULL DEFAULT '0',
+  `label` varchar(191) NOT NULL DEFAULT '',
+  `data` text NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`),
+  KEY `type` (`type`)
+) ENGINE=MyISAM AUTO_INCREMENT=100 DEFAULT CHARSET=utf8;
+
+INSERT INTO `fields` (`id`, `type`, `name`, `flags`, `label`, `data`) VALUES('1', 'FieldtypePageTitle', 'title', '13', 'Title', '{\"required\":1,\"textformatters\":[\"TextformatterEntities\"],\"size\":0,\"maxlength\":255}');
+INSERT INTO `fields` (`id`, `type`, `name`, `flags`, `label`, `data`) VALUES('2', 'FieldtypeModule', 'process', '25', 'Process', '{\"description\":\"The process that is executed on this page. Since this is mostly used by ProcessWire internally, it is recommended that you don\'t change the value of this unless adding your own pages in the admin.\",\"collapsed\":1,\"required\":1,\"moduleTypes\":[\"Process\"],\"permanent\":1}');
+INSERT INTO `fields` (`id`, `type`, `name`, `flags`, `label`, `data`) VALUES('3', 'FieldtypePassword', 'pass', '24', 'Set Password', '{\"collapsed\":1,\"size\":50,\"maxlength\":128}');
+INSERT INTO `fields` (`id`, `type`, `name`, `flags`, `label`, `data`) VALUES('4', 'FieldtypePage', 'roles', '24', 'Roles', '{\"derefAsPage\":0,\"parent_id\":30,\"labelFieldName\":\"name\",\"inputfield\":\"InputfieldCheckboxes\",\"description\":\"User will inherit the permissions assigned to each role. You may assign multiple roles to a user. When accessing a page, the user will only inherit permissions from the roles that are also assigned to the page\'s template.\"}');
+INSERT INTO `fields` (`id`, `type`, `name`, `flags`, `label`, `data`) VALUES('5', 'FieldtypePage', 'permissions', '24', 'Permissions', '{\"derefAsPage\":0,\"parent_id\":31,\"labelFieldName\":\"title\",\"inputfield\":\"InputfieldCheckboxes\"}');
+INSERT INTO `fields` (`id`, `type`, `name`, `flags`, `label`, `data`) VALUES('44', 'FieldtypeImage', 'images', '0', 'Images', '{\"extensions\":\"gif jpg jpeg png\",\"adminThumbs\":1,\"inputfieldClass\":\"InputfieldImage\",\"maxFiles\":0,\"descriptionRows\":1,\"fileSchema\":2,\"textformatters\":[\"TextformatterEntities\"],\"outputFormat\":1,\"defaultValuePage\":0,\"defaultGrid\":0,\"icon\":\"camera\"}');
+INSERT INTO `fields` (`id`, `type`, `name`, `flags`, `label`, `data`) VALUES('76', 'FieldtypeTextarea', 'body', '0', 'Body', '{\"inputfieldClass\":\"InputfieldCKEditor\",\"rows\":10,\"contentType\":1,\"toolbar\":\"Format, Bold, Italic, -, RemoveFormat\\nNumberedList, BulletedList, -, Blockquote\\nPWLink, Unlink, Anchor\\nPWImage, Table, HorizontalRule, SpecialChar\\nPasteText, PasteFromWord\\nScayt, -, Sourcedialog\",\"inlineMode\":0,\"useACF\":1,\"usePurifier\":1,\"formatTags\":\"p;h2;h3;h4;h5;h6;pre;address\",\"extraPlugins\":[\"pwimage\",\"pwlink\",\"sourcedialog\"],\"removePlugins\":\"image,magicline\",\"toggles\":[2,4,8],\"htmlOptions\":[2],\"collapsed\":0,\"minlength\":0,\"maxlength\":0,\"showCount\":0}');
+INSERT INTO `fields` (`id`, `type`, `name`, `flags`, `label`, `data`) VALUES('78', 'FieldtypeText', 'headline', '0', 'Headline', '{\"description\":\"Use this instead of the Title if a longer headline is needed than what you want to appear in navigation.\",\"textformatters\":[\"TextformatterEntities\"],\"collapsed\":2,\"size\":0,\"maxlength\":1024,\"minlength\":0,\"showCount\":0}');
+INSERT INTO `fields` (`id`, `type`, `name`, `flags`, `label`, `data`) VALUES('79', 'FieldtypeTextarea', 'summary', '1', 'Summary', '{\"textformatters\":[\"TextformatterEntities\"],\"inputfieldClass\":\"InputfieldTextarea\",\"collapsed\":2,\"rows\":3,\"contentType\":0}');
+INSERT INTO `fields` (`id`, `type`, `name`, `flags`, `label`, `data`) VALUES('82', 'FieldtypeTextarea', 'sidebar', '0', 'Sidebar', '{\"inputfieldClass\":\"InputfieldCKEditor\",\"rows\":5,\"contentType\":1,\"toolbar\":\"Format, Bold, Italic, -, RemoveFormat\\r\\nNumberedList, BulletedList, -, Blockquote\\r\\nPWLink, Unlink, Anchor\\r\\nPWImage, Table, HorizontalRule, SpecialChar\\r\\nPasteText, PasteFromWord\\r\\nScayt, -, Sourcedialog\",\"inlineMode\":0,\"useACF\":1,\"usePurifier\":1,\"formatTags\":\"p;h2;h3;h4;h5;h6;pre;address\",\"extraPlugins\":[\"pwimage\",\"pwlink\",\"sourcedialog\"],\"removePlugins\":\"image,magicline\",\"toggles\":[2,4,8],\"collapsed\":2}');
+INSERT INTO `fields` (`id`, `type`, `name`, `flags`, `label`, `data`) VALUES('92', 'FieldtypeEmail', 'email', '9', 'E-Mail Address', '{\"size\":70,\"maxlength\":255}');
+INSERT INTO `fields` (`id`, `type`, `name`, `flags`, `label`, `data`) VALUES('97', 'FieldtypeDatetime', 'date', '0', 'Date', '{\"dateOutputFormat\":\"j F Y\",\"collapsed\":0,\"size\":25,\"datepicker\":3,\"timeInputSelect\":0,\"dateInputFormat\":\"Y\\/m\\/d\",\"defaultToday\":1,\"placeholder\":\"yyyy\\/mm\\/dd\",\"icon\":\"calendar\"}');
+INSERT INTO `fields` (`id`, `type`, `name`, `flags`, `label`, `data`) VALUES('98', 'FieldtypePage', 'categories', '0', 'Categories', '{\"derefAsPage\":0,\"inputfield\":\"InputfieldAsmSelect\",\"parent_id\":1016,\"template_id\":46,\"labelFieldName\":\"title\",\"addable\":1,\"collapsed\":0}');
+INSERT INTO `fields` (`id`, `type`, `name`, `flags`, `label`, `data`) VALUES('99', 'FieldtypeComments', 'comments', '0', 'Comments', '{\"schemaVersion\":6,\"moderate\":1,\"redirectAfterPost\":1,\"quietSave\":1,\"useNotify\":0,\"deleteSpamDays\":3,\"depth\":0,\"useWebsite\":1,\"dateFormat\":\"relative\",\"useVotes\":0,\"useStars\":0,\"useGravatar\":\"g\",\"collapsed\":0}');
+
+DROP TABLE IF EXISTS `modules`;
+CREATE TABLE `modules` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `class` varchar(128) CHARACTER SET ascii NOT NULL,
+  `flags` int(11) NOT NULL DEFAULT '0',
+  `data` text NOT NULL,
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `class` (`class`)
+) ENGINE=MyISAM AUTO_INCREMENT=167 DEFAULT CHARSET=utf8;
+
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('1', 'FieldtypeTextarea', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('2', 'FieldtypeNumber', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('3', 'FieldtypeText', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('4', 'FieldtypePage', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('6', 'FieldtypeFile', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('7', 'ProcessPageEdit', '1', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('10', 'ProcessLogin', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('12', 'ProcessPageList', '0', '{\"pageLabelField\":\"title\",\"paginationLimit\":25,\"limit\":50}', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('14', 'ProcessPageSort', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('15', 'InputfieldPageListSelect', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('17', 'ProcessPageAdd', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('25', 'InputfieldAsmSelect', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('27', 'FieldtypeModule', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('28', 'FieldtypeDatetime', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('29', 'FieldtypeEmail', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('30', 'InputfieldForm', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('32', 'InputfieldSubmit', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('33', 'InputfieldWrapper', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('34', 'InputfieldText', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('35', 'InputfieldTextarea', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('36', 'InputfieldSelect', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('37', 'InputfieldCheckbox', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('38', 'InputfieldCheckboxes', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('39', 'InputfieldRadios', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('40', 'InputfieldHidden', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('41', 'InputfieldName', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('43', 'InputfieldSelectMultiple', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('45', 'JqueryWireTabs', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('46', 'ProcessPage', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('47', 'ProcessTemplate', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('48', 'ProcessField', '32', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('50', 'ProcessModule', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('55', 'InputfieldFile', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('56', 'InputfieldImage', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('57', 'FieldtypeImage', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('60', 'InputfieldPage', '0', '{\"inputfieldClasses\":[\"InputfieldSelect\",\"InputfieldSelectMultiple\",\"InputfieldCheckboxes\",\"InputfieldRadios\",\"InputfieldAsmSelect\",\"InputfieldPageListSelect\",\"InputfieldPageListSelectMultiple\",\"InputfieldPageAutocomplete\"]}', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('61', 'TextformatterEntities', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('66', 'ProcessUser', '0', '{\"showFields\":[\"name\",\"email\",\"roles\"]}', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('67', 'MarkupAdminDataTable', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('68', 'ProcessRole', '0', '{\"showFields\":[\"name\"]}', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('76', 'ProcessList', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('78', 'InputfieldFieldset', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('79', 'InputfieldMarkup', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('80', 'InputfieldEmail', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('83', 'ProcessPageView', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('84', 'FieldtypeInteger', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('85', 'InputfieldInteger', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('86', 'InputfieldPageName', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('87', 'ProcessHome', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('89', 'FieldtypeFloat', '1', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('90', 'InputfieldFloat', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('94', 'InputfieldDatetime', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('97', 'FieldtypeCheckbox', '1', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('98', 'MarkupPagerNav', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('103', 'JqueryTableSorter', '1', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('104', 'ProcessPageSearch', '1', '{\"searchFields\":\"title\",\"displayField\":\"title path\"}', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('105', 'FieldtypeFieldsetOpen', '1', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('106', 'FieldtypeFieldsetClose', '1', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('107', 'FieldtypeFieldsetTabOpen', '1', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('108', 'InputfieldURL', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('109', 'ProcessPageTrash', '1', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('111', 'FieldtypePageTitle', '1', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('112', 'InputfieldPageTitle', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('113', 'MarkupPageArray', '3', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('114', 'PagePermissions', '3', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('115', 'PageRender', '3', '{\"clearCache\":1}', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('116', 'JqueryCore', '1', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('117', 'JqueryUI', '1', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('121', 'ProcessPageEditLink', '1', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('122', 'InputfieldPassword', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('125', 'SessionLoginThrottle', '11', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('129', 'ProcessPageEditImageSelect', '1', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('131', 'InputfieldButton', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('133', 'FieldtypePassword', '1', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('134', 'ProcessPageType', '33', '{\"showFields\":[]}', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('135', 'FieldtypeURL', '1', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('136', 'ProcessPermission', '1', '{\"showFields\":[\"name\",\"title\"]}', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('137', 'InputfieldPageListSelectMultiple', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('138', 'ProcessProfile', '1', '{\"profileFields\":[\"pass\",\"email\"]}', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('139', 'SystemUpdater', '1', '{\"systemVersion\":15,\"coreVersion\":\"3.0.50\"}', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('148', 'AdminThemeDefault', '10', '{\"colors\":\"classic\"}', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('149', 'InputfieldSelector', '42', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('150', 'ProcessPageLister', '32', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('151', 'JqueryMagnific', '1', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('152', 'PagePathHistory', '3', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('155', 'InputfieldCKEditor', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('156', 'MarkupHTMLPurifier', '0', '', '2017-01-24 06:11:43');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('158', 'ProcessRecentPages', '1', '', '2017-01-24 06:12:09');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('159', 'ProcessLogger', '1', '', '2017-01-24 06:12:17');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('160', 'InputfieldIcon', '0', '', '2017-01-24 06:12:17');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('161', 'FieldtypeComments', '1', '', '2017-01-26 11:32:48');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('162', 'InputfieldCommentsAdmin', '0', '', '2017-01-26 11:32:48');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('163', 'InputfieldPageAutocomplete', '0', '', '2017-01-27 11:18:20');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('164', 'PageFrontEdit', '2', '', '2017-01-27 11:32:31');
+INSERT INTO `modules` (`id`, `class`, `flags`, `data`, `created`) VALUES('165', 'ProcessCommentsManager', '1', '', '2017-01-27 12:17:47');
+
+DROP TABLE IF EXISTS `page_path_history`;
+CREATE TABLE `page_path_history` (
+  `path` varchar(191) NOT NULL,
+  `pages_id` int(10) unsigned NOT NULL,
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`path`),
+  KEY `pages_id` (`pages_id`),
+  KEY `created` (`created`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `pages`;
+CREATE TABLE `pages` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `parent_id` int(11) unsigned NOT NULL DEFAULT '0',
+  `templates_id` int(11) unsigned NOT NULL DEFAULT '0',
+  `name` varchar(128) CHARACTER SET ascii NOT NULL,
+  `status` int(10) unsigned NOT NULL DEFAULT '1',
+  `modified` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `modified_users_id` int(10) unsigned NOT NULL DEFAULT '2',
+  `created` timestamp NOT NULL DEFAULT '2015-12-18 06:09:00',
+  `created_users_id` int(10) unsigned NOT NULL DEFAULT '2',
+  `published` datetime DEFAULT NULL,
+  `sort` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name_parent_id` (`name`,`parent_id`),
+  KEY `parent_id` (`parent_id`),
+  KEY `templates_id` (`templates_id`),
+  KEY `modified` (`modified`),
+  KEY `created` (`created`),
+  KEY `status` (`status`),
+  KEY `published` (`published`)
+) ENGINE=MyISAM AUTO_INCREMENT=1029 DEFAULT CHARSET=utf8;
+
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1', '0', '1', 'home', '9', '2017-01-27 13:29:31', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '0');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('2', '1', '2', 'processwire', '1035', '2017-01-24 06:12:10', '40', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '6');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('3', '2', '2', 'page', '21', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '0');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('6', '3', '2', 'add', '21', '2017-01-24 06:12:22', '40', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '0');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('7', '1', '2', 'trash', '1039', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '7');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('8', '3', '2', 'list', '1045', '2017-01-24 06:15:58', '40', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '1');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('9', '3', '2', 'sort', '1047', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '2');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('10', '3', '2', 'edit', '1045', '2017-01-24 06:15:58', '40', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '3');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('11', '22', '2', 'template', '21', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '0');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('16', '22', '2', 'field', '21', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '2');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('21', '2', '2', 'module', '21', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '2');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('22', '2', '2', 'setup', '21', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '1');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('23', '2', '2', 'login', '1035', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '4');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('27', '1', '29', 'http404', '1035', '2017-01-27 12:25:04', '41', '2017-01-24 06:11:43', '3', '2017-01-24 06:11:43', '5');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('28', '2', '2', 'access', '13', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '3');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('29', '28', '2', 'users', '29', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '0');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('30', '28', '2', 'roles', '29', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '1');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('31', '28', '2', 'permissions', '29', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '2');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('32', '31', '5', 'page-edit', '25', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '2');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('34', '31', '5', 'page-delete', '25', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '3');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('35', '31', '5', 'page-move', '25', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '4');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('36', '31', '5', 'page-view', '25', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '0');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('37', '30', '4', 'guest', '25', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '0');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('38', '30', '4', 'superuser', '25', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '1');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('40', '29', '3', 'guest', '25', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '1');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('41', '29', '3', 'admin', '1', '2017-01-24 06:12:10', '40', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '0');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('50', '31', '5', 'page-sort', '25', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '5');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('51', '31', '5', 'page-template', '25', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '6');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('52', '31', '5', 'user-admin', '25', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '10');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('53', '31', '5', 'profile-edit', '1', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '13');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('54', '31', '5', 'page-lock', '1', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '8');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('300', '3', '2', 'search', '1045', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '5');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('301', '3', '2', 'trash', '1047', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '5');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('302', '3', '2', 'link', '1041', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '6');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('303', '3', '2', 'image', '1041', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '7');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('304', '2', '2', 'profile', '1025', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '41', '2017-01-24 06:11:43', '5');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1000', '1', '26', 'search', '1025', '2017-01-26 09:55:14', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '4');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1001', '1', '29', 'about', '1', '2017-01-25 08:36:43', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '0');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1002', '1001', '29', 'what', '1', '2017-01-27 12:08:45', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '0');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1004', '1001', '29', 'background', '1', '2017-01-27 09:45:20', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '1');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1005', '1', '34', 'site-map', '1', '2017-01-26 09:55:10', '41', '2017-01-24 06:11:43', '2', '2017-01-24 06:11:43', '3');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1006', '31', '5', 'page-lister', '1', '2017-01-24 06:11:43', '40', '2017-01-24 06:11:43', '40', '2017-01-24 06:11:43', '9');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1007', '3', '2', 'lister', '1', '2017-01-24 06:11:43', '40', '2017-01-24 06:11:43', '40', '2017-01-24 06:11:43', '8');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1009', '3', '2', 'recent-pages', '1', '2017-01-24 06:12:09', '40', '2017-01-24 06:12:09', '40', '2017-01-24 06:12:09', '9');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1010', '31', '5', 'page-edit-recent', '1', '2017-01-24 06:12:09', '40', '2017-01-24 06:12:09', '40', '2017-01-24 06:12:09', '10');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1011', '22', '2', 'logs', '1', '2017-01-24 06:12:17', '40', '2017-01-24 06:12:17', '40', '2017-01-24 06:12:17', '2');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1012', '31', '5', 'logs-view', '1', '2017-01-24 06:12:17', '40', '2017-01-24 06:12:17', '40', '2017-01-24 06:12:17', '11');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1013', '31', '5', 'logs-edit', '1', '2017-01-24 06:12:17', '40', '2017-01-24 06:12:17', '40', '2017-01-24 06:12:17', '12');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1014', '1', '44', 'blog', '1', '2017-01-25 15:22:52', '41', '2017-01-25 15:22:52', '41', '2017-01-25 15:22:52', '1');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1015', '1014', '43', 'phase-data-extended-transaction', '1', '2017-01-26 06:18:13', '41', '2017-01-25 15:23:04', '41', '2017-01-25 15:23:20', '0');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1016', '1', '45', 'categories', '1', '2017-01-26 05:55:33', '41', '2017-01-26 05:54:06', '41', '2017-01-26 05:54:06', '2');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1017', '1016', '46', 'coffee', '1', '2017-01-26 05:54:49', '41', '2017-01-26 05:54:46', '41', '2017-01-26 05:54:46', '0');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1018', '1016', '46', 'beer', '1', '2017-01-26 05:54:53', '41', '2017-01-26 05:54:53', '41', '2017-01-26 05:54:53', '1');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1019', '1016', '46', 'plants', '1', '2017-01-26 05:56:01', '41', '2017-01-26 05:56:01', '41', '2017-01-26 05:56:01', '2');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1020', '1016', '46', 'cats', '1', '2017-01-26 06:10:41', '41', '2017-01-26 06:10:41', '41', '2017-01-26 06:10:41', '3');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1021', '1014', '43', 'think-affordable-artificial-blast', '1', '2017-01-27 12:37:31', '41', '2017-01-26 06:38:37', '41', '2017-01-26 06:39:03', '1');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1022', '1014', '43', 'genuine-symphony', '1', '2017-01-27 12:18:48', '41', '2017-01-26 09:50:20', '41', '2017-01-26 09:50:54', '2');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1023', '31', '5', 'page-edit-front', '1', '2017-01-27 11:32:31', '41', '2017-01-27 11:32:31', '41', '2017-01-27 11:32:31', '13');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1024', '1001', '47', 'front-end-editor-demo', '1', '2017-01-27 12:31:38', '41', '2017-01-27 12:01:56', '41', '2017-01-27 12:03:43', '2');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1025', '22', '2', 'comments', '1', '2017-01-27 12:17:47', '41', '2017-01-27 12:17:47', '41', '2017-01-27 12:17:47', '3');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1026', '31', '5', 'comments-manager', '1', '2017-01-27 12:17:47', '41', '2017-01-27 12:17:47', '41', '2017-01-27 12:17:47', '14');
+INSERT INTO `pages` (`id`, `parent_id`, `templates_id`, `name`, `status`, `modified`, `modified_users_id`, `created`, `created_users_id`, `published`, `sort`) VALUES('1027', '1016', '46', 'recipes', '1', '2017-01-27 12:37:06', '41', '2017-01-27 12:37:06', '41', '2017-01-27 12:37:06', '4');
+
+DROP TABLE IF EXISTS `pages_access`;
+CREATE TABLE `pages_access` (
+  `pages_id` int(11) NOT NULL,
+  `templates_id` int(11) NOT NULL,
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`pages_id`),
+  KEY `templates_id` (`templates_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('32', '2', '2017-01-24 06:11:43');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('34', '2', '2017-01-24 06:11:43');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('35', '2', '2017-01-24 06:11:43');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('36', '2', '2017-01-24 06:11:43');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('37', '2', '2017-01-24 06:11:43');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('38', '2', '2017-01-24 06:11:43');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('50', '2', '2017-01-24 06:11:43');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('51', '2', '2017-01-24 06:11:43');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('52', '2', '2017-01-24 06:11:43');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('53', '2', '2017-01-24 06:11:43');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('54', '2', '2017-01-24 06:11:43');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('1006', '2', '2017-01-24 06:11:43');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('1010', '2', '2017-01-24 06:12:09');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('1012', '2', '2017-01-24 06:12:17');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('1013', '2', '2017-01-24 06:12:17');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('1014', '1', '2017-01-25 15:22:52');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('1015', '1', '2017-01-25 15:23:04');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('1016', '1', '2017-01-26 05:54:06');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('1017', '1', '2017-01-26 05:54:46');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('1018', '1', '2017-01-26 05:54:53');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('1019', '1', '2017-01-26 05:56:01');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('1020', '1', '2017-01-26 06:10:41');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('1021', '1', '2017-01-26 06:38:37');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('1022', '1', '2017-01-26 09:50:20');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('1023', '2', '2017-01-27 11:32:31');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('1024', '1', '2017-01-27 12:01:56');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('1026', '2', '2017-01-27 12:17:47');
+INSERT INTO `pages_access` (`pages_id`, `templates_id`, `ts`) VALUES('1027', '1', '2017-01-27 12:37:06');
+
+DROP TABLE IF EXISTS `pages_parents`;
+CREATE TABLE `pages_parents` (
+  `pages_id` int(10) unsigned NOT NULL,
+  `parents_id` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`pages_id`,`parents_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('2', '1');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('3', '1');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('3', '2');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('7', '1');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('22', '1');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('22', '2');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('28', '1');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('28', '2');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('29', '1');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('29', '2');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('29', '28');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('30', '1');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('30', '2');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('30', '28');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('31', '1');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('31', '2');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('31', '28');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('1001', '1');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('1002', '1');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('1002', '1001');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('1004', '1');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('1004', '1001');
+INSERT INTO `pages_parents` (`pages_id`, `parents_id`) VALUES('1005', '1');
+
+DROP TABLE IF EXISTS `pages_sortfields`;
+CREATE TABLE `pages_sortfields` (
+  `pages_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `sortfield` varchar(20) NOT NULL DEFAULT '',
+  PRIMARY KEY (`pages_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+INSERT INTO `pages_sortfields` (`pages_id`, `sortfield`) VALUES('1016', 'name');
+
+
+DROP TABLE IF EXISTS `session_login_throttle`;
+CREATE TABLE `session_login_throttle` (
+  `name` varchar(128) NOT NULL,
+  `attempts` int(10) unsigned NOT NULL DEFAULT '0',
+  `last_attempt` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `templates`;
+CREATE TABLE `templates` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(191) CHARACTER SET ascii NOT NULL,
+  `fieldgroups_id` int(10) unsigned NOT NULL DEFAULT '0',
+  `flags` int(11) NOT NULL DEFAULT '0',
+  `cache_time` mediumint(9) NOT NULL DEFAULT '0',
+  `data` text NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`),
+  KEY `fieldgroups_id` (`fieldgroups_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=48 DEFAULT CHARSET=utf8;
+
+INSERT INTO `templates` (`id`, `name`, `fieldgroups_id`, `flags`, `cache_time`, `data`) VALUES('1', 'home', '1', '0', '0', '{\"useRoles\":1,\"noParents\":1,\"slashUrls\":1,\"compile\":3,\"label\":\"Home\",\"modified\":1485537359,\"ns\":\"ProcessWire\",\"roles\":[37]}');
+INSERT INTO `templates` (`id`, `name`, `fieldgroups_id`, `flags`, `cache_time`, `data`) VALUES('2', 'admin', '2', '8', '0', '{\"useRoles\":1,\"parentTemplates\":[2],\"allowPageNum\":1,\"redirectLogin\":23,\"slashUrls\":1,\"noGlobal\":1,\"compile\":3,\"modified\":1453457709,\"ns\":\"ProcessWire\"}');
+INSERT INTO `templates` (`id`, `name`, `fieldgroups_id`, `flags`, `cache_time`, `data`) VALUES('3', 'user', '3', '8', '0', '{\"useRoles\":1,\"noChildren\":1,\"parentTemplates\":[2],\"slashUrls\":1,\"pageClass\":\"User\",\"noGlobal\":1,\"noMove\":1,\"noTrash\":1,\"noSettings\":1,\"noChangeTemplate\":1,\"nameContentTab\":1}');
+INSERT INTO `templates` (`id`, `name`, `fieldgroups_id`, `flags`, `cache_time`, `data`) VALUES('4', 'role', '4', '8', '0', '{\"noChildren\":1,\"parentTemplates\":[2],\"slashUrls\":1,\"pageClass\":\"Role\",\"noGlobal\":1,\"noMove\":1,\"noTrash\":1,\"noSettings\":1,\"noChangeTemplate\":1,\"nameContentTab\":1}');
+INSERT INTO `templates` (`id`, `name`, `fieldgroups_id`, `flags`, `cache_time`, `data`) VALUES('5', 'permission', '5', '8', '0', '{\"noChildren\":1,\"parentTemplates\":[2],\"slashUrls\":1,\"guestSearchable\":1,\"pageClass\":\"Permission\",\"noGlobal\":1,\"noMove\":1,\"noTrash\":1,\"noSettings\":1,\"noChangeTemplate\":1,\"nameContentTab\":1}');
+INSERT INTO `templates` (`id`, `name`, `fieldgroups_id`, `flags`, `cache_time`, `data`) VALUES('26', 'search', '80', '0', '0', '{\"noChildren\":1,\"noParents\":1,\"allowPageNum\":1,\"slashUrls\":1,\"compile\":3,\"label\":\"Search\",\"modified\":1485526981,\"ns\":\"ProcessWire\"}');
+INSERT INTO `templates` (`id`, `name`, `fieldgroups_id`, `flags`, `cache_time`, `data`) VALUES('29', 'basic-page', '83', '0', '0', '{\"slashUrls\":1,\"compile\":3,\"label\":\"Basic page\",\"modified\":1485526981,\"ns\":\"ProcessWire\"}');
+INSERT INTO `templates` (`id`, `name`, `fieldgroups_id`, `flags`, `cache_time`, `data`) VALUES('34', 'sitemap', '88', '0', '0', '{\"noChildren\":1,\"noParents\":1,\"redirectLogin\":23,\"slashUrls\":1,\"compile\":3,\"label\":\"Sitemap\",\"modified\":1485427810,\"ns\":\"ProcessWire\"}');
+INSERT INTO `templates` (`id`, `name`, `fieldgroups_id`, `flags`, `cache_time`, `data`) VALUES('43', 'blog-post', '97', '0', '0', '{\"parentTemplates\":[44],\"slashUrls\":1,\"compile\":3,\"label\":\"Blog post\",\"modified\":1485532830,\"ns\":\"ProcessWire\"}');
+INSERT INTO `templates` (`id`, `name`, `fieldgroups_id`, `flags`, `cache_time`, `data`) VALUES('44', 'blog', '98', '0', '0', '{\"sortfield\":\"-97\",\"noParents\":-1,\"childTemplates\":[43],\"allowPageNum\":1,\"slashUrls\":1,\"compile\":3,\"label\":\"Blog\",\"modified\":1485530079,\"ns\":\"ProcessWire\"}');
+INSERT INTO `templates` (`id`, `name`, `fieldgroups_id`, `flags`, `cache_time`, `data`) VALUES('45', 'categories', '99', '0', '0', '{\"noParents\":-1,\"childTemplates\":[46],\"slashUrls\":1,\"compile\":3,\"label\":\"Categories\",\"modified\":1485541446,\"ns\":\"ProcessWire\"}');
+INSERT INTO `templates` (`id`, `name`, `fieldgroups_id`, `flags`, `cache_time`, `data`) VALUES('46', 'category', '100', '0', '0', '{\"noChildren\":1,\"parentTemplates\":[45],\"allowPageNum\":1,\"slashUrls\":1,\"compile\":3,\"label\":\"Category\",\"modified\":1485530079,\"ns\":\"ProcessWire\"}');
+INSERT INTO `templates` (`id`, `name`, `fieldgroups_id`, `flags`, `cache_time`, `data`) VALUES('47', 'basic-page-edit', '101', '0', '0', '{\"slashUrls\":1,\"compile\":3,\"label\":\"Basic page (front-end editable)\",\"modified\":1485536717,\"ns\":\"ProcessWire\"}');
+
+UPDATE pages SET created_users_id=41, modified_users_id=41, created=NOW(), modified=NOW();
+
+# --- /WireDatabaseBackup {"numTables":26,"numCreateTables":33,"numInserts":416,"numSeconds":0}

site-regular/modules/README.txt

@@ -0,0 +1,88 @@
+ABOUT /SITE/MODULES/ 
+====================
+This directory /site/modules/ is where you may install additional plugin modules.
+These modules are specific to your site only. There is also a corresponding 
+/wire/modules/ directory, which contains ProcessWire's core modules (and best to 
+leave those alone). 
+
+If safe for your hosting environment, you may wish to make this directory 
+writable to PHP so that the installation of your modules can be managed from 
+ProcessWire's admin. However, this is not necessarily safe in all shared hosting
+environments and is completely optional. 
+
+
+Where to get modules?
+---------------------
+Visit the modules directory at: http://modules.processwire.com
+
+
+Installing modules from the ProcessWire admin
+---------------------------------------------
+If your /site/modules/ directory is writable, you can install modules from 
+ProcessWire's admin directly from the Modules Directory, from a ZIP file or from
+a URL to a ZIP file. In your ProcessWire admin, see Modules > New for
+installation options. 
+
+
+Installing modules from the file system 
+---------------------------------------
+Each module (and any related files) should live in a directory of its own. The 
+directory should generally carry the same name as the module. For instance, if
+you are installing a module named ProcessDatabaseBackups.module, then it should 
+live in the directory /site/modules/ProcessDatabaseBackups/. 
+
+Once you have placed a new module in this directory, you need to let ProcessWire
+know about it. Login to the admin and click "Modules". Then click the "Check for
+new modules" button. It will find your new module(s). Click the "Install" button
+next to any new modules that you want to install.
+
+
+Removing modules
+----------------
+The first step in removing a module is to uninstall it from ProcessWire (if it
+isn't already). You do this by going to the "Modules" page, and "Site" tab in 
+your ProcessWire admin. Click the "Uninstall" button next to the module you 
+want to remove. 
+
+After the module is uninstalled, you may remove the module files. If your 
+modules file system is writable to ProcessWire, it will give you a "Delete" 
+button next to the module in your "Modules" admin page. You may click that to
+remove the module files. 
+
+If your file system is not writable, you may remove the module files manually
+from the file system (via SFTP or whatever tool you are using to manage your
+files on the server). 
+
+
+Interested in learning how to make your own modules?
+----------------------------------------------------
+We've created two "Hello World" modules as examples for those interested in
+learning module development: 
+
+- Helloworld.module demonstrates the basics of modules and hooks. 
+  http://modules.processwire.com/modules/helloworld/
+
+- ProcessHello.module demonstrates the basics of how to create a Process
+  module. Process modules are those that create applications in the admin.
+  http://modules.processwire.com/modules/process-hello/
+
+There is a module development forum located at:
+https://processwire.com/talk/forum/19-moduleplugin-development/
+
+For a tutorial on how to create modules, see:
+http://wiki.processwire.com/index.php/Module_Creation
+
+
+Additional resources
+--------------------
+
+To find and download new modules, see the modules directory at:
+http://modules.processwire.com/ 
+
+For more information about modules, see the documentation at:
+http://processwire.com/api/modules/
+
+For discussion and support of modules, see:
+http://processwire.com/talk/forum/4-modulesplugins/
+
+

site-regular/ready.php

@@ -0,0 +1,47 @@
+<?php namespace ProcessWire;
+
+/**
+ * ProcessWire Bootstrap API Ready 
+ * ===============================
+ * This ready.php file is called during ProcessWire bootstrap initialization process.
+ * This occurs after the current page has been determined and the API is fully ready 
+ * to use, but before the current page has started rendering. This file receives a 
+ * copy of all ProcessWire API variables. This file is an idea place for adding your
+ * own hook methods. 
+ *
+ */
+
+if(!defined("PROCESSWIRE")) die();
+
+/** @var ProcessWire $wire */
+
+/**
+ * Example of a custom hook method
+ * 
+ * This hook adds a “numPosts” method to pages using template “category”.
+ * The return value is the quantity of posts in category.
+ *
+ * Usage:
+ * ~~~~~
+ * $numPosts = $page->numPosts(); // returns integer
+ * numPosts = $page->numPosts(true); // returns string like "5 posts"
+ * ~~~~~
+ *
+ */
+$wire->addHook('Page(template=category)::numPosts', function($event) {
+	/** @var Page $page */
+	$page = $event->object;
+
+	// only category pages have numPosts
+	if($page->template != 'category') return;
+
+	// find number of posts
+	$numPosts = $event->pages->count("template=blog-post, categories=$page");
+
+	if($event->arguments(0) === true) {
+		// if true argument was specified, format it as a "5 posts" type string
+		$numPosts = sprintf(_n('%d post', '%d posts', $numPosts), $numPosts);
+	}
+
+	$event->return = $numPosts;
+}); 

site-regular/templates/_init.php

@@ -0,0 +1,11 @@
+<?php namespace ProcessWire;
+
+/**
+ * This _init.php file is called automatically by ProcessWire before every page render
+ * 
+ */
+
+/** @var ProcessWire $wire */
+
+include_once('./_uikit.php'); 
+

site-regular/templates/_main.php

@@ -0,0 +1,137 @@
+<?php namespace ProcessWire;
+// _main.php template file, called after a page’s template file	
+$home = pages()->get('/'); // homepage
+$siteTitle = 'Regular';	
+$siteTagline = $home->summary; 
+
+// as a convenience, set location of our 3rd party resources (Uikit and jQuery)...
+urls()->set('uikit', 'wire/modules/AdminTheme/AdminThemeUikit/uikit/dist/');
+urls()->set('jquery', 'wire/modules/Jquery/JqueryCore/JqueryCore.js');
+// ...or if you prefer to use CDN hosted resources, use these instead:
+// urls()->set('uikit', 'https://cdnjs.cloudflare.com/ajax/libs/uikit/3.0.0-beta.40/');
+// urls()->set('jquery', 'https://code.jquery.com/jquery-2.2.4.min.js'); 
+	
+?><!DOCTYPE html>
+<html lang='en'>
+<head id='html-head'>
+	<meta http-equiv="content-type" content="text/html; charset=utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<title id='html-title'><?=page()->title?></title>
+	<meta name="description" content="<?=page()->summary?>">
+	
+	<link rel="stylesheet" href="<?=urls()->uikit?>css/uikit.min.css" />
+	<link rel="stylesheet" href="<?=urls()->templates?>styles/main.css">
+	
+	<script src="<?=urls()->jquery?>"></script>
+	<script src="<?=urls()->uikit?>js/uikit.min.js"></script>
+	<script src="<?=urls()->uikit?>js/uikit-icons.min.js"></script>
+</head>
+<body id='html-body'>
+
+	<!-- MASTHEAD -->
+	<header class='uk-background-muted'>
+		<div id='masthead' class="uk-container">
+			<h2 id='masthead-logo' class='uk-text-center uk-margin-medium-top uk-margin-small-bottom'>
+				<a href='<?=urls()->root?>'>
+					<img src='<?=urls()->templates?>styles/images/coffee4.svg' alt='coffee'><br />
+				</a>	
+				<?=$siteTitle?>
+			</h2>
+			<p id='masthead-tagline' class='uk-text-center uk-text-small uk-text-muted uk-margin-remove'>
+				<?=$siteTagline?>
+			</p>
+			<nav id='masthead-navbar' class="uk-navbar-container" uk-navbar>
+				<div class="uk-navbar-center uk-visible@m">
+					<?=ukNavbarNav($home->and($home->children), [ 
+						'dropdown' => [ 'basic-page', 'categories' ]
+					])?>
+				</div>
+			</nav>
+		</div>
+	</header>	
+
+	<!-- MAIN CONTENT -->
+	<main id='main' class='uk-container uk-margin uk-margin-large-bottom'>
+		<?php if(page()->parent->id > $home->id) echo ukBreadcrumb(page(), [ 'class' => 'uk-visible@m' ]); ?>
+		<div class='uk-grid uk-grid-large' uk-grid>
+			<div id='content' class='uk-width-expand'>
+				<h1 id='content-head' class='uk-margin-small-top'>
+					<?=page()->get('headline|title')?>
+				</h1>
+				<div id='content-body'>
+					<?=page()->body?>
+				</div>
+			</div>
+			<aside id='sidebar' class='uk-width-1-3@m'>
+				<?=page()->sidebar?>
+			</aside>
+		</div>
+	</main>
+
+	<?php if(config()->debug && user()->isSuperuser()): // display region debugging info ?>
+	<section id='debug' class='uk-section uk-section-muted'>	
+		<div class='uk-container'>
+			<!--PW-REGION-DEBUG-->
+		</div>	
+	</section>	
+	<?php endif; ?>
+
+	<!-- FOOTER -->
+	<footer class='uk-section uk-section-secondary'>
+		<div id='footer' class='uk-container'>
+			<div class='uk-grid' uk-grid>
+				<div class='uk-width-1-3@m uk-flex-last@m uk-text-center'>
+					<form class='uk-search uk-search-default' action='<?=pages()->get('template=search')->url?>' method='get'>
+						<button type='submit' class='uk-search-toggle uk-search-icon-flip' uk-search-icon></button>
+						<input type='search' id='search-query' name='q' class='uk-search-input' placeholder='Search&hellip;'>
+					</form>
+				</div>	
+				<div class='uk-width-2-3@m uk-flex-first@m uk-text-center uk-text-left@m'>
+					<h3 class='uk-margin-remove'>
+						<?=$siteTitle?>
+						<small class='uk-text-small uk-text-muted'><?=$siteTagline?></small>
+					</h3>
+					<p class='uk-margin-remove'>
+						<small class='uk-text-small uk-text-muted'>&copy; <?=date('Y')?> &bull;</small>
+						<a href='https://processwire.com'>Powered by ProcessWire CMS</a>
+					</p>
+				</div>	
+			</div>	
+		</div>
+	</footer>
+	
+	<!-- OFFCANVAS NAV TOGGLE -->
+	<a id='offcanvas-toggle' class='uk-hidden@m' href="#offcanvas-nav" uk-toggle>
+		<?=ukIcon('menu', 1.3)?>
+	</a>
+
+	<!-- OFFCANVAS NAVIGATION -->
+	<div id="offcanvas-nav" uk-offcanvas>
+		<div class="uk-offcanvas-bar">
+			<h3><a href='<?=urls()->root?>'><?=$siteTitle?></a></h3>
+			<?php 
+			// offcanvas navigation
+			// example of caching generated markup (for 600 seconds/10 minutes)
+			echo cache()->get('offcanvas-nav', 10, function() {
+				return ukNav(pages()->get('/')->children(), [
+					'depth' => 1,
+					'accordion' => true,
+					'blockParents' => [ 'blog' ],
+					'repeatParent' => true,
+					'noNavQty' => 20
+				]);
+			});
+			?>
+		</div>
+	</div>
+
+	<?php if(page()->editable): ?>
+	<!-- PAGE EDIT LINK -->
+	<a id='edit-page' href='<?=page()->editUrl?>'>
+		<?=ukIcon('pencil')?> Edit
+	</a>
+	<?php endif; ?>
+
+</body>
+</html>
+

site-regular/templates/admin.php

@@ -0,0 +1,16 @@
+<?php namespace ProcessWire;
+
+/**
+ * Admin template just loads the admin application controller, 
+ * and admin is just an application built on top of ProcessWire. 
+ *
+ * This demonstrates how you can use ProcessWire as a front-end 
+ * to another application. 
+ *
+ * Feel free to hook admin-specific functionality from this file, 
+ * but remember to leave the require() statement below at the end.
+ * 
+ */
+
+/** @var Config $config */
+require($config->paths->core . "admin.php"); 

site-regular/templates/basic-page-edit.php

@@ -0,0 +1,21 @@
+<?php namespace ProcessWire;
+
+// this template is very much like the basic-page template except that it
+// demonstrates making the headline, body and sidebar fields editable on the
+// front-end, using the <edit> tags
+
+?>
+
+<h1 id='content-head'>
+	<edit field='headline'><?=page()->headline?></edit>
+</h1>
+
+<div id='content-body'>
+	<edit field='body'><?=page()->body?></edit>
+	<?=ukDescriptionListPages(page()->children)?> 
+</div>
+
+<aside id='sidebar'>
+	<?=ukNav(page()->rootParent, "depth=3, class=uk-margin-medium-bottom")?>
+	<edit field='sidebar'><?=page()->sidebar?></edit>
+</aside>

site-regular/templates/basic-page.php

@@ -0,0 +1,10 @@
+<?php namespace ProcessWire; ?>
+
+<nav pw-append='content-body'>
+	<?=ukDescriptionListPages(page()->children)?> 
+</nav>
+
+<aside id='sidebar' pw-prepend>
+	<?=ukNav(page()->rootParent, "depth=3")?>
+</aside>
+

site-regular/templates/blog-post.php

@@ -0,0 +1,49 @@
+<?php namespace ProcessWire; ?>
+
+<head id='html-head' pw-append>
+	<script src='<?=urls()->FieldtypeComments?>comments.min.js'></script>
+	<link rel="stylesheet" href="<?=urls()->FieldtypeComments?>comments.css">
+</head>	
+
+<div id='content'>
+	<?php 
+	
+	// blog post content
+	echo ukBlogPost(page());
+	
+	// comments
+	$comments = page()->comments;
+
+	// comment list 
+	if(count($comments)) {
+		echo ukHeading3("Comments", "icon=comments");
+		echo ukComments($comments);
+	}
+
+	// comment form
+	echo ukHeading3("Post a comment", "icon=comment"); 
+	echo ukCommentForm($comments);
+	
+	// link to the next blog post, if there is one
+	$nextPost = page()->next();
+	if($nextPost->id): ?>	
+		<p class='next-blog-post'>
+			Next <?=ukIcon('chevron-right')?>
+			<a href='<?=$nextPost->url?>'><?=$nextPost->title?></a>
+		</p>
+	<?php endif; ?> 
+</div>
+
+<aside id='sidebar' pw-prepend>
+	<?php 
+	$img = page()->images->first(); 
+	if($img) {
+		$img = $img->width(600);
+		echo "<p class='uk-text-center'><img src='$img->url' alt='$img->description'></p>";
+	}
+	?>
+	
+	<?=ukNav(page()->parent->children('limit=10'), [ 'heading' => 'Recent blog posts' ])?>
+	<p><a href='<?=page()->parent->url?>'>More posts<?=ukIcon('arrow-right')?></a></p>
+</aside>
+

site-regular/templates/blog.php

@@ -0,0 +1,20 @@
+<?php namespace ProcessWire; 
+// This is the template file for main /blog/ page that lists blog post summaries.
+// If there are more than 10 posts, it also paginates them. 
+?>
+
+<div id='content'>
+	<?php
+	echo ukHeading1(page()->title, 'divider'); 
+	$posts = page()->children('limit=10');
+	echo ukBlogPosts($posts); 
+	?>
+</div>
+
+<aside id='sidebar'>
+	<?php 
+	$categories = pages()->get('/categories/'); 
+	echo ukNav($categories->children, [ 'header' => $categories->title ]); 
+	?>		
+</aside>
+

site-regular/templates/categories.php

@@ -0,0 +1,16 @@
+<?php namespace ProcessWire; ?>
+
+<div class='uk-child-width-1-2@s uk-child-width-1-3@m uk-grid uk-grid-match uk-margin-large-bottom' pw-append='content' uk-grid>
+	<?php foreach(page()->children as $category): ?>
+	<a class='uk-link-reset' href='<?=$category->url?>'>
+		<div class='uk-card uk-card-default uk-card-hover uk-card-body'>
+			<h3 class='uk-card-title uk-margin-remove'><?=$category->title?></h3>
+			<span class='uk-text-muted'><?=$category->numPosts(true)?></span>
+		</div>	
+	</a>	
+	<?php endforeach; ?>
+</div>	
+
+<aside id='sidebar'>
+	<?=ukNav(pages()->get('/blog/')->children('limit=3'), [ 'header' => 'Recent posts' ])?>
+</aside>

site-regular/templates/category.php

@@ -0,0 +1,16 @@
+<?php namespace ProcessWire; ?>
+
+<div id='content'>
+	<?php
+	echo ukHeading1(page()->title, 'divider');
+	$posts = pages()->get('/blog/')->children("categories=$page, limit=10");
+	echo ukBlogPosts($posts); 
+	?>
+</div>
+
+<aside id='sidebar'>
+	<?php
+	$categories = page()->parent->children();
+	echo ukNav($categories); 
+	?>		
+</aside>

site-regular/templates/errors/500.html

@@ -0,0 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+<html>
+<head>
+	<title>500 Internal Server Error</title>
+</head>
+<body>
+	<h1>Internal Server Error</h1>
+	<p>The server encountered an internal error or misconfiguration and was unable to complete your request.</p>
+	<p>{message}</p>
+</body>
+</html>

site-regular/templates/errors/README.txt

@@ -0,0 +1,21 @@
+When a fatal error occurs, ProcessWire displays the message:
+
+"Unable to complete this request due to an error."
+
+The message is intentionally vague for security purposes. 
+Details will be logged to /site/assets/logs/errors.txt.
+
+When present in this directory, the file 500.html will be 
+displayed instead of the generic error message above. Feel 
+free to modify this file to show whatever you would like.
+Please note the following:
+
+* 500.html is plain HTML and has no PHP or API access.
+
+* You may enter the tag {message} and ProcessWire will
+  replace this with additional details when applicable.
+  When not applicable, it will make it blank.
+
+* If you are logged in as an admin, ProcessWire will 
+  give you a detailed error message rather than 500.html. 
+

site-regular/templates/home.php

@@ -0,0 +1,32 @@
+<?php namespace ProcessWire; 
+
+// get most recent blog post
+$blog = pages()->get('/blog/');
+$blogPost = $blog->child();
+
+?>
+
+<h1 id='content-head'>
+	<?=page()->headline?>
+</h1>
+
+<div class='uk-margin-top' id='content-body'>
+	<?=page()->body?>
+	<hr>
+	<p class='uk-margin-small'>
+		<a class='uk-button uk-button-link uk-link-muted' href='<?=$blog->url?>'>
+			In the blog
+		</a>
+	</p>
+	<?=ukBlogPost($blogPost)?>
+	<p class='uk-margin-small'>
+		<a href='<?=$blog->url?>'>More blog posts <?=ukIcon('arrow-right')?></a>
+	</p>
+</div>
+
+<aside id='sidebar'>
+	<?=ukNav(pages()->get('/categories/')->children)?>
+	<div class='uk-card uk-card-default uk-card-hover uk-card-body uk-margin-medium-top'>
+		<?=page()->sidebar?>
+	</div>
+</aside>

site-regular/templates/scripts/README.txt

@@ -0,0 +1,4 @@
+We typically use this directory for javascript files, 
+but this site profile does not have any at present.
+This file is a placeholder so that this directory
+exists in Git. 

site-regular/templates/search.php

@@ -0,0 +1,49 @@
+<?php namespace ProcessWire;
+
+// look for a GET variable named 'q' and sanitize it
+$q = input()->get('q');
+
+// sanitize to text, which removes markup, newlines, too long, etc.
+$q = sanitizer()->text($q);
+
+// did $q have anything in it after sanitizing to text?
+if($q) {
+
+	// Make the search query appear in the top-right search box.
+	// Always entity encode any user input that also gets output
+	echo '<input id="search-query" value="' . sanitizer()->entities($q) . '">';
+
+	// Sanitize for placement within a selector string. This is important for any 
+	// values that you plan to bundle in a selector string like we are doing here.
+	// It quotes them when necessary, and removes characters that might cause issues.
+	$q = sanitizer()->selectorValue($q);
+
+	// Search the title and body fields for our query text.
+	// Limit the results to 50 pages. The has_parent!=2 excludes irrelevant admin
+	// pages from the search, for when an admin user performs a search. 
+	$selector = "title|body~=$q, limit=50, has_parent!=2";
+
+	// Find pages that match the selector
+	$matches = pages()->find($selector);
+	
+} else {
+	$matches = array();
+}
+
+// unset the variable that we no longer need, since it can contain user input
+unset($q);
+
+?>
+<div id='content-body'>
+	<?php
+	// did we find any matches?
+	if(count($matches)) {
+		// yes we did, render them
+		echo ukAlert("Found $matches->count page(s)", "default", "search");
+		echo ukDescriptionListPages($matches);
+	} else {
+		// we didn't find any
+		echo ukAlert("Sorry, no results were found.", "danger", "warning");
+	}
+	?>
+</div>

site-regular/templates/sitemap.php

@@ -0,0 +1,9 @@
+<?php namespace ProcessWire; ?>
+
+<div id='content-body'>
+	<?php
+	$home = pages()->get('/');
+	echo ukNav($home, [ 'depth' => 4 ])
+	?>
+</div>	
+

site-regular/templates/styles/images/coffee4.svg

@@ -0,0 +1,382 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:svg="http://www.w3.org/2000/svg"
+    xmlns:ns1="http://sozi.baierouge.fr"
+    id="svg2"
+    sodipodi:docname="coffeecup-3d.svg"
+    inkscape:export-filename="D:\mocholand\Development\vectorial-cofee-cup\coffeecup-3d.png"
+    viewBox="0 0 444.47 310.87"
+    inkscape:export-xdpi="90"
+    version="1.1"
+    inkscape:export-ydpi="90"
+    inkscape:version="0.47pre3 "
+  >
+  <defs
+      id="defs4"
+    >
+    <radialGradient
+        id="radialGradient4309"
+        gradientUnits="userSpaceOnUse"
+        cy="351.05"
+        cx="368.58"
+        gradientTransform="matrix(1 0 0 .54810 0 141.63)"
+        r="185.64"
+        inkscape:collect="always"
+      >
+      <stop
+          id="stop4197"
+          style="stop-color:#e2e2e2"
+          offset="0"
+      />
+      <stop
+          id="stop4199"
+          style="stop-color:#989898"
+          offset="1"
+      />
+    </radialGradient
+    >
+    <linearGradient
+        id="linearGradient4311"
+        y2="321.49"
+        gradientUnits="userSpaceOnUse"
+        x2="369.95"
+        y1="346.56"
+        x1="369.95"
+        inkscape:collect="always"
+      >
+      <stop
+          id="stop4220"
+          style="stop-color:#838383"
+          offset="0"
+      />
+      <stop
+          id="stop4222"
+          style="stop-color:#c6c6c6;stop-opacity:0"
+          offset="1"
+      />
+    </linearGradient
+    >
+    <linearGradient
+        id="linearGradient4313"
+        y2="378.81"
+        gradientUnits="userSpaceOnUse"
+        x2="388.13"
+        gradientTransform="translate(0 -60)"
+        y1="327.72"
+        x1="368.58"
+        inkscape:collect="always"
+      >
+      <stop
+          id="stop4265"
+          style="stop-color:#461f00"
+          offset="0"
+      />
+      <stop
+          id="stop4267"
+          style="stop-color:#753300"
+          offset="1"
+      />
+    </linearGradient
+    >
+    <linearGradient
+        id="linearGradient4315"
+        y2="327.72"
+        gradientUnits="userSpaceOnUse"
+        x2="368.58"
+        gradientTransform="translate(0 -60)"
+        y1="362.58"
+        x1="368.58"
+        inkscape:collect="always"
+      >
+      <stop
+          id="stop4275"
+          style="stop-color:#ffffff"
+          offset="0"
+      />
+      <stop
+          id="stop4277"
+          style="stop-color:#ffffff;stop-opacity:0"
+          offset="1"
+      />
+    </linearGradient
+    >
+    <filter
+        id="filter4335"
+        height="2.8094"
+        width="1.3596"
+        color-interpolation-filters="sRGB"
+        y="-.90469"
+        x="-.17981"
+        inkscape:collect="always"
+      >
+      <feGaussianBlur
+          id="feGaussianBlur4337"
+          stdDeviation="12.0625"
+          inkscape:collect="always"
+      />
+    </filter
+    >
+    <radialGradient
+        id="radialGradient4339"
+        gradientUnits="userSpaceOnUse"
+        cy="582.55"
+        cx="408.1"
+        gradientTransform="matrix(1 0 0 .18691 0 409.16)"
+        r="222.23"
+        inkscape:collect="always"
+      >
+      <stop
+          id="stop4109"
+          style="stop-color:#e9e9e9"
+          offset="0"
+      />
+      <stop
+          id="stop4119"
+          style="stop-color:#b3b3b3"
+          offset="1"
+      />
+    </radialGradient
+    >
+  </defs
+  >
+  <sodipodi:namedview
+      id="base"
+      bordercolor="#666666"
+      inkscape:pageshadow="2"
+      inkscape:window-y="-4"
+      pagecolor="#ffffff"
+      inkscape:window-height="816"
+      inkscape:window-maximized="1"
+      inkscape:zoom="1"
+      inkscape:window-x="-4"
+      showgrid="false"
+      borderopacity="1.0"
+      inkscape:current-layer="layer1"
+      inkscape:cx="238.91057"
+      inkscape:cy="148.53567"
+      inkscape:window-width="1152"
+      inkscape:pageopacity="0.0"
+      inkscape:document-units="px"
+  />
+  <g
+      id="layer1"
+      inkscape:label="Layer 1"
+      inkscape:groupmode="layer"
+      transform="translate(-145.59 -250.53)"
+    >
+    <path
+        id="path4182"
+        sodipodi:rx="222.23357"
+        sodipodi:ry="62.629459"
+        style="fill-rule:evenodd;fill:#595959"
+        sodipodi:type="arc"
+        d="m630.34 492.74c0 34.589-99.497 62.629-222.23 62.629-122.74 0-222.23-28.04-222.23-62.629s99.497-62.629 222.23-62.629c122.74 0 222.23 28.04 222.23 62.629z"
+        transform="matrix(.94938 0 0 1.0617 -20.871 -28.258)"
+        sodipodi:cy="492.73767"
+        sodipodi:cx="408.10162"
+    />
+    <path
+        id="path4159"
+        sodipodi:rx="222.23357"
+        sodipodi:ry="62.629459"
+        style="fill-rule:evenodd;fill:#f2f2f2"
+        sodipodi:type="arc"
+        d="m630.34 492.74c0 34.589-99.497 62.629-222.23 62.629-122.74 0-222.23-28.04-222.23-62.629s99.497-62.629 222.23-62.629c122.74 0 222.23 28.04 222.23 62.629z"
+        transform="translate(-40.279 -1.7029)"
+        sodipodi:cy="492.73767"
+        sodipodi:cx="408.10162"
+    />
+    <path
+        id="path3333"
+        sodipodi:rx="222.23357"
+        sodipodi:ry="62.629459"
+        style="fill-rule:evenodd;fill:url(#radialGradient4339)"
+        sodipodi:type="arc"
+        d="m630.34 492.74c0 34.589-99.497 62.629-222.23 62.629-122.74 0-222.23-28.04-222.23-62.629s99.497-62.629 222.23-62.629c122.74 0 222.23 28.04 222.23 62.629z"
+        transform="translate(-40.279 -5.7029)"
+        sodipodi:cy="492.73767"
+        sodipodi:cx="408.10162"
+    />
+    <path
+        id="path4186"
+        sodipodi:rx="123.3854"
+        sodipodi:ry="29.52813"
+        style="fill-opacity:.40698;fill:#858585"
+        sodipodi:type="arc"
+        d="m487.21 550.38c0 16.308-55.242 29.528-123.39 29.528-68.144 0-123.39-13.22-123.39-29.528s55.242-29.528 123.39-29.528c68.144 0 123.39 13.22 123.39 29.528z"
+        transform="translate(6 -66)"
+        sodipodi:cy="550.38397"
+        sodipodi:cx="363.82874"
+    />
+    <path
+        id="path4317"
+        sodipodi:rx="80.5"
+        sodipodi:ry="16"
+        style="opacity:.75;filter:url(#filter4335);fill:#000000"
+        sodipodi:type="arc"
+        d="m448 483.36c0 8.8366-36.041 16-80.5 16s-80.5-7.1634-80.5-16 36.041-16 80.5-16 80.5 7.1634 80.5 16z"
+        transform="matrix(.93409 0 0 .91146 23.008 44.818)"
+        sodipodi:cy="483.36218"
+        sodipodi:cx="367.5"
+    />
+    <g
+        id="g4295"
+        transform="translate(0,4)"
+      >
+      <path
+          id="path4188"
+          style="fill:url(#radialGradient4309)"
+          d="m182.94 284.44c18.733 116.39 94.715 203.5 185.62 203.5 90.911 0 166.92-87.107 185.66-203.5h-371.28z"
+      />
+      <path
+          id="path4193"
+          sodipodi:rx="181.46394"
+          sodipodi:ry="25.064081"
+          style="fill:#eaeaea"
+          sodipodi:type="arc"
+          d="m551.41 346.56c0 13.843-81.244 25.064-181.46 25.064s-181.46-11.222-181.46-25.064c0-13.843 81.244-25.064 181.46-25.064s181.46 11.222 181.46 25.064z"
+          transform="matrix(1.0234 0 0 1.6116 -10.017 -271.57)"
+          sodipodi:cy="346.55768"
+          sodipodi:cx="369.94583"
+      />
+      <path
+          id="path4216"
+          sodipodi:rx="181.46394"
+          sodipodi:ry="25.064081"
+          style="fill:url(#linearGradient4311)"
+          sodipodi:type="arc"
+          d="m551.41 346.56c0 13.843-81.244 25.064-181.46 25.064s-181.46-11.222-181.46-25.064c0-13.843 81.244-25.064 181.46-25.064s181.46 11.222 181.46 25.064z"
+          transform="matrix(.98128 0 0 1.4117 5.5602 -205.8)"
+          sodipodi:cy="346.55768"
+          sodipodi:cx="369.94583"
+      />
+      <path
+          id="path4255"
+          style="fill:url(#linearGradient4313)"
+          d="m368.59 267.72c-91.89 0-166.42 12.631-166.62 28.219 25.429 13.369 90.44 22.875 166.62 22.875 76.175 0 141.16-9.5089 166.59-22.875-0.2008-15.588-74.704-28.219-166.59-28.219z"
+      />
+      <path
+          id="path4271"
+          sodipodi:nodetypes="cccc"
+          style="opacity:0.04;fill:url(#linearGradient4315)"
+          d="m368.59 267.72c-87.769 0-159.71 11.539-166.16 26.156 107.47-8.4524 217.07-11.433 332.28 0-6.4479-14.617-78.356-26.156-166.12-26.156z"
+      />
+      <path
+          id="path4293"
+          sodipodi:nodetypes="cccc"
+          style="fill-opacity:.15116;fill:#ffffff"
+          d="m213.75 309.23c9.0001 2.9648 14.241 3.9652 20.516 5.5258 0 0 1.2916 65.75 23.592 103.41-24.432-33.615-44.951-65.463-44.108-108.94z"
+      />
+    </g
+    >
+  </g
+  >
+  <metadata
+    >
+    <rdf:RDF
+      >
+      <cc:Work
+        >
+        <dc:format
+          >image/svg+xml</dc:format
+        >
+        <dc:type
+            rdf:resource="http://purl.org/dc/dcmitype/StillImage"
+        />
+        <cc:license
+            rdf:resource="http://creativecommons.org/licenses/publicdomain/"
+        />
+        <dc:publisher
+          >
+          <cc:Agent
+              rdf:about="http://openclipart.org/"
+            >
+            <dc:title
+              >Openclipart</dc:title
+            >
+          </cc:Agent
+          >
+        </dc:publisher
+        >
+        <dc:title
+          >Realistic Coffee cup - Front 3D view</dc:title
+        >
+        <dc:date
+          >2009-10-17T06:56:28</dc:date
+        >
+        <dc:description
+          >Realistic Coffee cup, with a shiny 3d look, front view.</dc:description
+        >
+        <dc:source
+          >https://openclipart.org/detail/27828/realistic-coffee-cup---front-3d-view-by-mokush</dc:source
+        >
+        <dc:creator
+          >
+          <cc:Agent
+            >
+            <dc:title
+              >mokush</dc:title
+            >
+          </cc:Agent
+          >
+        </dc:creator
+        >
+        <dc:subject
+          >
+          <rdf:Bag
+            >
+            <rdf:li
+              >cofe</rdf:li
+            >
+            <rdf:li
+              >cofee</rdf:li
+            >
+            <rdf:li
+              >coffe</rdf:li
+            >
+            <rdf:li
+              >coffee</rdf:li
+            >
+            <rdf:li
+              >coffeecup</rdf:li
+            >
+            <rdf:li
+              >cup</rdf:li
+            >
+            <rdf:li
+              >photorealistic</rdf:li
+            >
+          </rdf:Bag
+          >
+        </dc:subject
+        >
+      </cc:Work
+      >
+      <cc:License
+          rdf:about="http://creativecommons.org/licenses/publicdomain/"
+        >
+        <cc:permits
+            rdf:resource="http://creativecommons.org/ns#Reproduction"
+        />
+        <cc:permits
+            rdf:resource="http://creativecommons.org/ns#Distribution"
+        />
+        <cc:permits
+            rdf:resource="http://creativecommons.org/ns#DerivativeWorks"
+        />
+      </cc:License
+      >
+    </rdf:RDF
+    >
+  </metadata
+  >
+</svg
+>

site-regular/templates/styles/main.css

@@ -0,0 +1,111 @@
+
+#html-body, h1, h2, h3, h4, h5 {
+	/* default font */
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+#masthead-logo img {
+	/* image for masthead logo */
+	width: 100px;
+}
+
+#edit-page {
+	/* the edit page link that appears when page is editable */
+	position: absolute;
+	top: 10px;
+	right: 10px
+}
+
+#offcanvas-toggle {
+	/* the hamburger icon that toggles the mobile navigation */
+	position: absolute;
+	top: 10px;
+	left: 15px; 
+}
+
+#offcanvas-nav .uk-search-input {
+	/* the search box that appears in offcanvas nav */
+	width: 100%;
+}
+
+img.uk-comment-avatar {
+	/* avatar that appears in comments */
+	width: 60px;
+	height: 60px; 
+}
+
+@media only screen and (max-width: 959px) {
+	/* custom adjustments for mobile layouts under 960px */
+	#masthead {
+		/* primary nav is not visible, so it needs some padding here */
+		padding-bottom: 20px;
+	}
+}
+
+
+/****************************************************************
+ * Bodycopy text and images
+ *
+ * These styles are good to have on any ProcessWire site
+ *
+ */
+
+.align_left {
+	/* for images placed in rich text editor */ 
+	float: left;
+	margin: 0 1em 0.5em 0; 
+	position: relative;
+	top: 0.5em;
+	max-width: 50%; 
+}
+
+.align_right {
+	/* for images placed in rich text editor */ 
+	float: right;
+	margin: 0 0 0.5em 1em;
+	max-width: 50%; 
+}
+
+.align_center {
+	/* for images placed in rich text editor */ 
+	display: block;
+	margin: 1em auto; 
+	position: relative;
+	top: 0.5em;
+}
+
+figure {
+	/* figure for image that has a caption */
+	display: table;
+	margin: 1em 0;
+}
+
+figure figcaption {
+	/* display caption text below image contained to image width */
+	display: table-caption;
+	caption-side: bottom;
+	font-size: 13px;
+	line-height: 1.4em;
+	margin-top: 5px;
+	color: #777;
+}
+
+@media only screen and (max-width: 767px) {
+	/* common PW mobile layout adjustments for widths under 768px */ 
+
+	.align_left, .align_right, .align_center {
+		/* display images in center rather than aligned */
+		display: block;
+		float: none; 
+		margin: 1em auto;
+		max-width: 100%; 
+	}
+	
+	figure,
+    figure figcaption {
+		/* let figcaption display as wide as needed below image */
+	    display: block;
+	    text-align: center;
+    }
+}
+

wire/.editorconfig

@@ -0,0 +1,28 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://editorconfig.org
+
+
+root = true
+
+
+[*]
+charset = utf-8
+end_of_line = lf
+
+
+[*.{php,inc,module}]
+indent_style = tab
+trim_trailing_whitespace = false
+insert_final_newline = true
+
+
+[*.js]
+indent_style = tab
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+
+[*.{css,less,scss}]
+indent_style = tab
+trim_trailing_whitespace = true
+insert_final_newline = true

wire/core/.phpstorm.meta.php

@@ -1,4 +1,4 @@
-<?php
+<?php 
 /**
  * ProcessWire PhpStorm Meta
  *
@@ -14,64 +14,66 @@ namespace PHPSTORM_META {
 	$STATIC_METHOD_TYPES = [
 		\wire('') => [
 			'' == '@',
-			'config' instanceof Config,
-			'wire' instanceof ProcessWire,
-			'log' instanceof WireLog,
-			'notices' instanceof Notices,
-			'sanitizer' instanceof Sanitizer,
-			'database' instanceof WireDatabasePDO,
-			'db' instanceof DatabaseMysqli,
-			'cache' instanceof MarkupCache,
-			'modules' instanceof Modules,
-			'procache' instanceof ProCache,
-			'fieldtypes' instanceof Fieldtypes,
-			'fields' instanceof Fields,
-			'fieldgroups' instanceof Fieldgroups,
-			'templates' instanceof Templates,
-			'pages' instanceof Pages,
-			'permissions' instanceof Permissions,
-			'roles' instanceof Roles,
-			'users' instanceof Users,
-			'user' instanceof User,
-			'session' instanceof Session,
-			'input' instanceof WireInput,
-			'languages' instanceof Languages,
-			'page' instanceof Page,
-			'hooks' instanceof WireHooks,
-			'files' instanceof WireFileTools,
-			'datetime' instanceof WireDateTime,
-			'mail' instanceof WireMailTools
+			'config' instanceof \ProcessWire\Config,
+			'cache' instanceof \ProcessWire\WireCache,
+			'wire' instanceof \ProcessWire\ProcessWire,
+			'log' instanceof \ProcessWire\WireLog,
+			'notices' instanceof \ProcessWire\Notices,
+			'sanitizer' instanceof \ProcessWire\Sanitizer,
+			'database' instanceof \ProcessWire\WireDatabasePDO,
+			'db' instanceof \ProcessWire\DatabaseMysqli,
+			'cache' instanceof \ProcessWire\MarkupCache,
+			'modules' instanceof \ProcessWire\Modules,
+			'procache' instanceof \ProCache,
+			'fieldtypes' instanceof \ProcessWire\Fieldtypes,
+			'fields' instanceof \ProcessWire\Fields,
+			'fieldgroups' instanceof \ProcessWire\Fieldgroups,
+			'templates' instanceof \ProcessWire\Templates,
+			'pages' instanceof \ProcessWire\Pages,
+			'permissions' instanceof \ProcessWire\Permissions,
+			'roles' instanceof \ProcessWire\Roles,
+			'users' instanceof \ProcessWire\Users,
+			'user' instanceof \ProcessWire\User,
+			'session' instanceof \ProcessWire\Session,
+			'input' instanceof \ProcessWire\WireInput,
+			'languages' instanceof \ProcessWire\Languages,
+			'page' instanceof \ProcessWire\Page,
+			'hooks' instanceof \ProcessWire\WireHooks,
+			'files' instanceof \ProcessWire\WireFileTools,
+			'datetime' instanceof \ProcessWire\WireDateTime,
+			'mail' instanceof \ProcessWire\WireMailTools
 		],
 		\Wire::wire('') => [ 
 			// this one does not appear to work, leaving in case someone knows how to make it work
 			'' == '@',
-			'config' instanceof Config,
-			'wire' instanceof ProcessWire,
-			'log' instanceof WireLog,
-			'notices' instanceof Notices,
-			'sanitizer' instanceof Sanitizer,
-			'database' instanceof WireDatabasePDO,
-			'db' instanceof DatabaseMysqli,
-			'cache' instanceof MarkupCache,
-			'modules' instanceof Modules,
-			'procache' instanceof ProCache,
-			'fieldtypes' instanceof Fieldtypes,
-			'fields' instanceof Fields,
-			'fieldgroups' instanceof Fieldgroups,
-			'templates' instanceof Templates,
-			'pages' instanceof Pages,
-			'permissions' instanceof Permissions,
-			'roles' instanceof Roles,
-			'users' instanceof Users,
-			'user' instanceof User,
-			'session' instanceof Session,
-			'input' instanceof WireInput,
-			'languages' instanceof Languages,
-			'page' instanceof Page,
-			'hooks' instanceof WireHooks,
-			'files' instanceof WireFileTools,
-			'datetime' instanceof WireDateTime,
-			'mail' instanceof WireMailTools
+			'config' instanceof \ProcessWire\Config,
+			'cache' instanceof \ProcessWire\WireCache,
+			'wire' instanceof \ProcessWire\ProcessWire,
+			'log' instanceof \ProcessWire\WireLog,
+			'notices' instanceof \ProcessWire\Notices,
+			'sanitizer' instanceof \ProcessWire\Sanitizer,
+			'database' instanceof \ProcessWire\WireDatabasePDO,
+			'db' instanceof \ProcessWire\DatabaseMysqli,
+			'cache' instanceof \ProcessWire\MarkupCache,
+			'modules' instanceof \ProcessWire\Modules,
+			'procache' instanceof \ProCache,
+			'fieldtypes' instanceof \ProcessWire\Fieldtypes,
+			'fields' instanceof \ProcessWire\Fields,
+			'fieldgroups' instanceof \ProcessWire\Fieldgroups,
+			'templates' instanceof \ProcessWire\Templates,
+			'pages' instanceof \ProcessWire\Pages,
+			'permissions' instanceof \ProcessWire\Permissions,
+			'roles' instanceof \ProcessWire\Roles,
+			'users' instanceof \ProcessWire\Users,
+			'user' instanceof \ProcessWire\User,
+			'session' instanceof \ProcessWire\Session,
+			'input' instanceof \ProcessWire\WireInput,
+			'languages' instanceof \ProcessWire\Languages,
+			'page' instanceof \ProcessWire\Page,
+			'hooks' instanceof \ProcessWire\WireHooks,
+			'files' instanceof \ProcessWire\WireFileTools,
+			'datetime' instanceof \ProcessWire\WireDateTime,
+			'mail' instanceof \ProcessWire\WireMailTools
 		]
 	];
 }

wire/core/AdminTheme.php

@@ -10,13 +10,16 @@
  * This file is licensed under the MIT license. 
  * https://processwire.com/about/license/mit/
  * 
- * ProcessWire 3.x, Copyright 2016 by Ryan Cramer
+ * ProcessWire 3.x, Copyright 2021 by Ryan Cramer
  * https://processwire.com
  * 
  * @property int|string $version Current admin theme version
+ * @property string $url URL to admin theme
+ * @property string $path Disk path to admin theme
  * 
  * @method void install()
  * @method void uninstall()
+ * @method array getExtraMarkup()
  *
  */
 
@@ -61,6 +64,30 @@ abstract class AdminTheme extends WireData implements Module {
 	 */
 	protected $bodyClasses = array();
 
+	/**
+	 * General purpose classes indexed by name
+	 *
+	 * @var array
+	 *
+	 */
+	protected $classes = array();
+
+	/**
+	 * Extra markup regions
+	 * 
+	 * @var array
+	 * 
+	 */
+	protected $extraMarkup = array(
+		'head' => '',
+		'notices' => '',
+		'body' => '',
+		'masthead' => '',
+		'content' => '',
+		'footer' => '',
+		'sidebar' => '', // sidebar not used in all admin themes
+	);
+	
 	/**
 	 * URLs to place in link prerender tags
 	 * 
@@ -78,72 +105,199 @@ abstract class AdminTheme extends WireData implements Module {
 	}
 
 	/**
-	 * Initialize the admin theme systme and determine which admin theme should be used
+	 * Initialize the admin theme system and determine which admin theme should be used
 	 *
 	 * All admin themes must call this init() method to register themselves. 
+	 * 
+	 * Note: this should be called after API ready. 
 	 *
 	 */
 	public function init() { 
 		self::$numAdminThemes++;
 		
-		$info = $this->wire('modules')->getModuleInfo($this);
+		$info = $this->wire()->modules->getModuleInfo($this);
 		$this->version = $info['version'];
+		$page = $this->wire()->page;
 
 		// if module has been called when it shouldn't (per the 'autoload' conditional)
 		// then module author probably forgot the right 'autoload' string, so this 
 		// serves as secondary stopgap to keep this module from loading when it shouldn't.
-		if(!$this->wire('page') || $this->wire('page')->template != 'admin') return;
+		if(!$page || $page->template->name !== 'admin') return;
 		
-		if(self::$numAdminThemes > 1 && !$this->wire('fields')->get('admin_theme')) $this->install();
+		if(self::$numAdminThemes > 1 && !$this->wire()->fields->get('admin_theme')) $this->install();
 
 		// if admin theme has already been set, then no need to continue
 		if($this->wire('adminTheme')) return; 
 
+		$config = $this->wire()->config;
+		$user = $this->wire()->user;
+		$adminTheme = $user->admin_theme; /** @var string $adminTheme */
 		$isCurrent = false;
-		$adminTheme = $this->wire('user')->admin_theme; 
 
 		if($adminTheme) {
 			// there is user specified admin theme
 			// check if this is the one that should be used
-			if($adminTheme == $this->className()) $isCurrent = true; 
+			if($adminTheme == $this->className()) {
+				$isCurrent = true;
+				$this->setCurrent();
+			}
 			
-		} else if($this->wire('config')->defaultAdminTheme == $this->className()) {
+		} else if($config->defaultAdminTheme == $this->className()) {
 			// there is no user specified admin theme, so use this one
-			$isCurrent = true; 
+			$isCurrent = true;
+			$this->setCurrent();
 		}
-
-		// set as an API variable and populate configuration variables
-		if($isCurrent) {
-			$this->wire('adminTheme', $this); 
-			$this->config->paths->set('adminTemplates', $this->config->paths->get($this->className())); 
-			$this->config->urls->set('adminTemplates', $this->config->urls->get($this->className())); 
-		}
-
-		// adjust $config adminThumbOptions[scale] for auto detect when requested
-		$o = $this->wire('config')->adminThumbOptions; 
-		if($o && isset($o['scale']) && $o['scale'] === 1) {
-			$o['scale'] = $this->wire('session')->hidpi ? 0.5 : 1.0; 
-			$this->wire('config')->adminThumbOptions = $o;
-		}
-
-		$this->config->js('modals', $this->config->modals); 
 		
-		if($this->wire('session')->hidpi) $this->addBodyClass('hidpi-device');
-		if($this->wire('session')->touch) $this->addBodyClass('touch-device'); 
+		if($isCurrent) $this->initConfig();
+	}
+
+	/**
+	 * Initialize configuration properties and JS config for when this is current admin theme
+	 * 
+	 * @since 3.0.173
+	 * 
+	 */
+	protected function initConfig() {
+		
+		$config = $this->wire()->config;
+		$user = $this->wire()->user;
+		$session = $this->wire()->session;
+		$page = $this->wire()->page;
+		$urls = $config->urls;
+		
+		// adjust $config adminThumbOptions[scale] for auto detect when requested
+		$o = $config->adminThumbOptions;
+		if($o && isset($o['scale']) && $o['scale'] === 1) {
+			$o['scale'] = $session->get('hidpi') ? 0.5 : 1.0;
+			$config->adminThumbOptions = $o;
+		}
+
+		$config->jsConfig('urls', array(
+			'root' => $urls->root,
+			'admin' => $urls->admin,
+			'modules' => $urls->modules,
+			'core' => $urls->core,
+			'files' => $urls->files,
+			'templates' => $urls->templates,
+			'adminTemplates' => $urls->adminTemplates,
+		));
+
+		$config->js('modals', true); // share at render time
+		$config->jsConfig('debug', $config->debug); 
+		
+		if($user) {
+			$userInfo = array(
+				'id' => $user->id,
+				'name' => $user->name,
+				'roles' => array(),
+			);
+			$roles = $user->isLoggedin() ? $user->roles : null;
+			$guestRoleID = $config->guestUserRolePageID;
+			if($roles) foreach($roles as $role) {
+				if($role->id !== $guestRoleID) $userInfo['roles'][] = $role->name;
+			}
+			$config->jsConfig('user', $userInfo);
+		}
+		
+		if($page) {
+			$config->jsConfig('page', array(
+				'id' => $page->id,
+				'name' => $page->name,
+				'process' => (string) $page->process,
+			));
+		}
+		
+		if($session->get('hidpi')) $this->addBodyClass('hidpi-device');
+		if($session->get('touch')) $this->addBodyClass('touch-device');
+		
 		$this->addBodyClass($this->className());
 	}
-	
+
+	/**
+	 * Get property
+	 * 
+	 * @param string $key
+	 * @return int|mixed|null|string
+	 * 
+	 */
 	public function get($key) {
-		if($key == 'version') return $this->version;
+		if($key === 'version') return $this->version;
+		if($key === 'url') return $this->url();
+		if($key === 'path') return $this->path();
 		return parent::get($key); 
 	}
+	
+	/**
+	 * Get URL to this admin theme
+	 *
+	 * @return string
+	 * @since 3.0.171
+	 *
+	 */
+	public function url() {
+		return $this->wire()->config->urls($this->className());
+	}
+
+	/**
+	 * Get disk path to this admin theme
+	 * 
+	 * @return string
+	 * @since 3.0.171
+	 * 
+	 */
+	public function path() {
+		$config = $this->wire()->config;
+		$path = $config->paths($this->className());
+		if(empty($path)) {
+			$class = $this->className();
+			$path = $config->paths->modules . "AdminTheme/$class/";
+			if(!is_dir($path)) {
+				$path = $config->paths->siteModules . "$class/";
+				if(!is_dir($path)) $path = __DIR__;
+			}
+		}
+		return $path;
+	}
+
+	/**
+	 * Get predefined translated label by key for labels shared among admin themes
+	 * 
+	 * @param string $key
+	 * @param string $val Value to return if label not available
+	 * @return string
+	 * @since 3.0.162
+	 * 
+	 */
+	public function getLabel($key, $val = '') {
+		switch($key) {
+			case 'search-help': return $this->_('help'); // Localized term to type for search-engine help (3+ chars) 
+			case 'search-tip': return $this->_('Try “help”'); // // Search tip (indicating your translated “help” term)
+			case 'advanced-mode': return $this->_('Advanced Mode');
+			case 'debug': return $this->_('Debug'); 
+		}
+		return $val;
+	}
 
 	/**
 	 * Returns true if this admin theme is the one that will be used for this request
 	 *
 	 */
 	public function isCurrent() {
-		return $this->wire('adminTheme') === $this; 
+		$adminTheme = $this->wire()->adminTheme;
+		return $adminTheme && $adminTheme->className() === $this->className();
+	}
+
+	/**
+	 * Set this admin theme as the current one
+	 * 
+	 */
+	protected function setCurrent() {
+		$config = $this->wire('config');
+		$name = $this->className();
+		$config->paths->set('adminTemplates', $config->paths->get($name));
+		$config->urls->set('adminTemplates', $config->urls->get($name)); 
+		$config->set('defaultAdminTheme', $name);
+		$this->wire('adminTheme', $this);
 	}
 
 	/**
@@ -160,15 +314,7 @@ abstract class AdminTheme extends WireData implements Module {
 	 * 
 	 */
 	public function ___getExtraMarkup() {
-		$parts = array(
-			'head' => '',
-			'notices' => '', 
-			'body' => '',
-			'masthead' => '',
-			'content' => '',
-			'footer' => '',
-			'sidebar' => '', // sidebar not used in all admin themes
-		);
+		$parts = $this->extraMarkup;
 		$isLoggedin = $this->wire('user')->isLoggedin();
 		if($isLoggedin && $this->wire('modules')->isInstalled('InputfieldCKEditor') 
 			&& $this->wire('process') instanceof WirePageEditor) {
@@ -177,21 +323,118 @@ abstract class AdminTheme extends WireData implements Module {
 				"window.CKEDITOR_BASEPATH='" . $this->wire('config')->urls->InputfieldCKEditor . 
 				'ckeditor-' . InputfieldCKEditor::CKEDITOR_VERSION . "/';</script>";
 		}
+		/*
 		if($isLoggedin && $this->wire('config')->advanced) {
 			$parts['footer'] = "<p class='AdvancedMode'><i class='fa fa-flask'></i> " . $this->_('Advanced Mode') . "</p>";
 		}
+		*/
 		foreach($this->preRenderURLs as $url) {
 			$parts['head'] .= "<link rel='prerender' href='$url'>";
 		}
 		return $parts; 
 	}
-	
-	public function addBodyClass($className) {
-		$this->bodyClasses[$className] = $className; 
+
+	/**
+	 * Add extra markup to a region in the admin theme
+	 * 
+	 * @param string $name
+	 * @param string $value
+	 * 
+	 */
+	public function addExtraMarkup($name, $value) {
+		if(!empty($this->extraMarkup[$name])) {
+			$this->extraMarkup[$name] .= "\n$value";
+		} else {
+			$this->extraMarkup[$name] = $value;
+		}
 	}
-	
+
+	/**
+	 * Add a <body> class to the admin theme
+	 * 
+	 * @param string $className
+	 * 
+	 */
+	public function addBodyClass($className) {
+		$this->addClass('body', $className);
+	}
+
+	/**
+	 * Get the body[class] attribute string
+	 * 
+	 * @return string
+	 * 
+	 */
 	public function getBodyClass() {
-		return trim(implode(' ', $this->bodyClasses)); 
+		return $this->getClass('body'); 
+	}
+
+	/**
+	 * Return class for a given named item or blank if none available
+	 * 
+	 * Omit the first argument to return all classes in an array.
+	 * 
+	 * @param string $name Tag or item name, i.e. “input”, or omit to return all defined [tags=classes]
+	 * @param bool $getArray Specify true to return array of class name(s) rather than string (default=false). $name argument required.
+	 * @return string|array Returns string or array of class names, or array of all [tags=classes] or $tagName argument is empty.
+	 * 
+	 */
+	public function getClass($name = '', $getArray = false) {
+		if(empty($name)) {
+			return $this->classes;
+		} else if(isset($this->classes[$name])) {
+			return $getArray ? explode(' ', $this->classes[$name]) : $this->classes[$name];
+		} else {
+			return $getArray ? array() : '';
+		}
+	}
+
+	/**
+	 * Add class for given named item
+	 * 
+	 * Default behavior is to merge classes if existing classes are already present for given item $name.
+	 * 
+	 * #pw-internal
+	 * 
+	 * @param string $name
+	 * @param string|array $class
+	 * @param bool $replace Specify true to replace any existing classes rather than merging them
+	 * 
+	 */
+	public function addClass($name, $class, $replace = false) {
+		if(is_array($class)) {
+			foreach($class as $c) {
+				$this->addClass($name, $c);
+			}
+		} else if(!$replace && isset($this->classes[$name])) {
+			$classes = $this->classes[$name];
+			if(strpos($classes, $class) !== false) {
+				// avoid re-adding class if it is already present
+				if(array_search($class, explode(' ', $classes)) !== false) return; 
+			}
+			$this->classes[$name] = trim($classes . ' ' . ltrim($class));	
+		} else {
+			$this->classes[$name] = trim($class);
+		}
+	}
+
+	/**
+	 * Set classes for multiple tags
+	 * 
+	 * #pw-internal
+	 * 
+	 * @param array $classes Array of strings (class names) where keys are tag names
+	 * @param bool $replace Specify true to replace any existing classes rather than merge them (default=false)
+	 * 
+	 */
+	public function setClasses(array $classes, $replace = false) {
+		if($replace || empty($this->classes)) {
+			$this->classes = $classes;	
+		} else {
+			foreach($classes as $name => $class) {
+				$this->addClass($name, $class);
+			}
+		}
 	}
 
 	/**
@@ -213,36 +456,44 @@ abstract class AdminTheme extends WireData implements Module {
 		// we already have this field installed, no need to continue
 		if($field) {
 			$this->message($toUseNote); 
-			return;
+		} else {
+			// this will be the 2nd admin theme installed, so add a field that lets them select admin theme
+			$field = $this->wire(new Field());
+			$field->name = 'admin_theme';
+			$field->type = $this->wire('modules')->get('FieldtypeModule');
+			$field->set('moduleTypes', array('AdminTheme'));
+			$field->set('labelField', 'title');
+			$field->set('inputfieldClass', 'InputfieldRadios');
+			$field->label = 'Admin Theme';
+			$field->flags = Field::flagSystem;
+			try {
+				$field->save();
+			} catch(\Exception $e) {
+				// $this->error("Error creating 'admin_theme' field: " . $e->getMessage());
+			}
 		}
 
-		// this will be the 2nd admin theme installed, so add a field that lets them select admin theme
-		$field = $this->wire(new Field());
-		$field->name = 'admin_theme';
-		$field->type = $this->wire('modules')->get('FieldtypeModule'); 
-		$field->set('moduleTypes', array('AdminTheme')); 
-		$field->set('labelField', 'title'); 
-		$field->set('inputfieldClass', 'InputfieldRadios'); 
-		$field->label = 'Admin Theme';
-		$field->flags = Field::flagSystem; 
-		$field->save();	
-
-		$fieldgroup = $this->wire('fieldgroups')->get('user'); 
-		$fieldgroup->add($field); 
-		$fieldgroup->save();
-
-		// make this field one that the user is allowed to configure in their profile
-		$data = $this->wire('modules')->getModuleConfigData('ProcessProfile'); 
-		$data['profileFields'][] = 'admin_theme';
-		$this->wire('modules')->saveModuleConfigData('ProcessProfile', $data); 
-
-		$this->message($this->_('Installed field "admin_theme" and added to user profile settings.')); 
-		$this->message($toUseNote); 
+		if($field && $field->id) {
+			/** @var Fieldgroup $fieldgroup */
+			$fieldgroup = $this->wire('fieldgroups')->get('user');
+			if(!$fieldgroup->hasField($field)) {
+				$fieldgroup->add($field);
+				$fieldgroup->save();
+				$this->message($this->_('Installed field "admin_theme" and added to user profile settings.'));
+				$this->message($toUseNote);
+			}
+			// make this field one that the user is allowed to configure in their profile
+			$data = $this->wire('modules')->getModuleConfigData('ProcessProfile');
+			$data['profileFields'][] = 'admin_theme';
+			$this->wire('modules')->saveModuleConfigData('ProcessProfile', $data); 
+		}
 	}
 
 	/**
 	 * Set a pre-render URL or get currently pre-render URL(s)
 	 * 
+	 * #pw-internal
+	 * 
 	 * @param string $url
 	 * @return array
 	 * 
@@ -253,6 +504,14 @@ abstract class AdminTheme extends WireData implements Module {
 	}
 	
 	public function ___uninstall() { 
+	
+		$defaultAdminTheme = $this->wire('config')->defaultAdminTheme;
+		if($defaultAdminTheme == $this->className()) {
+			throw new WireException(
+				"Cannot uninstall this admin theme because \$config->defaultAdminTheme = '$defaultAdminTheme'; " . 
+				"Please add this setting with a different value in /site/config.php"
+			); 
+		}
 
 		/*
 		if(self::$numAdminThemes > 1) return;

wire/core/AdminThemeFramework.php

@@ -0,0 +1,827 @@
+<?php namespace ProcessWire;
+
+/**
+ * AdminTheme Framework
+ * 
+ * The methods in this class may eventually be merged to AdminTheme.php, 
+ * but are isolated to this class during development.
+ * 
+ * This file is licensed under the MIT license.
+ * https://processwire.com/about/license/mit/
+ * 
+ * ProcessWire 3.x, Copyright 2021 by Ryan Cramer
+ * https://processwire.com
+ *
+ * @property bool $isSuperuser
+ * @property bool $isEditor
+ * @property bool $isLoggedIn
+ * @property bool|string $isModal
+ * @property bool|int $useAsLogin
+ * @method array getUserNavArray()
+ * @method array getPrimaryNavArray()
+ *
+ */
+abstract class AdminThemeFramework extends AdminTheme {
+
+	/**
+	 * Is there currently a logged in user?
+	 *
+	 * @var bool
+	 *
+	 */
+	protected $isLoggedIn = false;
+
+	/**
+	 * Is user logged in with page-edit permission?
+	 *
+	 * @var bool
+	 *
+	 */
+	protected $isEditor = false;
+
+	/**
+	 * Is current user a superuser?
+	 *
+	 * @var bool
+	 *
+	 */
+	protected $isSuperuser = false;
+
+	/**
+	 * Is the current request a modal request? 
+	 * 
+	 * @var bool|string Either false, true, or "inline"
+	 * 
+	 */
+	protected $isModal = false;
+
+	/**
+	 * @var Sanitizer
+	 * 
+	 */
+	protected $sanitizer;
+
+	/**
+	 * Construct
+	 *
+	 */
+	public function __construct() {
+		parent::__construct();
+		$this->set('useAsLogin', false);
+	}
+	
+	public function wired() {
+		$this->sanitizer = $this->wire('sanitizer');
+		$user = $this->wire()->user;
+		$this->isLoggedIn = $user && $user->isLoggedin();
+		parent::wired();
+	}
+
+	/**
+	 * Override get() method from WireData to support additional properties
+	 *
+	 * @param string $key
+	 * @return bool|int|mixed|null|string
+	 *
+	 */
+	public function get($key) {
+		switch($key) {
+			case 'isSuperuser': $value = $this->isSuperuser; break;
+			case 'isEditor': $value = $this->isEditor; break;
+			case 'isLoggedIn': $value = $this->isLoggedIn; break;
+			case 'isModal': $value = $this->isModal; break;
+			default: $value = parent::get($key);
+		}
+		return $value;
+	}
+
+	/**
+	 * Initialize and attach hooks
+	 * 
+	 * Note: descending classes should call this after API ready
+	 *
+	 */
+	public function init() {
+		
+		$user = $this->wire('user');
+		if(!$this->isLoggedIn && $this->useAsLogin) $this->setCurrent();
+		parent::init();
+		
+		// if this is not the current admin theme, exit now so no hooks are attached
+		if(!$this->isCurrent()) return;
+
+		$this->isSuperuser = $this->isLoggedIn && $user->isSuperuser();
+		$this->isEditor = $this->isLoggedIn && ($this->isSuperuser || $user->hasPermission('page-edit'));
+		$this->includeInitFile();
+		
+		$modal = $this->wire('input')->get('modal');
+		if($modal) $this->isModal = $modal == 'inline' ? 'inline' : true; 	
+
+		// test notices when requested
+		if($this->wire('input')->get('test_notices') && $this->isLoggedIn) $this->testNotices();
+	}
+	
+	/**
+	 * Include the admin theme init file
+	 *
+	 */
+	public function includeInitFile() {
+		$config = $this->wire('config');
+		$initFile = $this->path() . 'init.php';
+		if(file_exists($initFile)) {
+			if(strpos($initFile, $config->paths->site) === 0) {
+				// admin themes in /site/modules/ may be compiled
+				$initFile = $this->wire('files')->compile($initFile);
+			}
+			/** @noinspection PhpIncludeInspection */
+			include_once($initFile);
+		}
+	}
+
+
+	/**
+	 * Perform a translation, based on text from shared admin file: /wire/templates-admin/default.php
+	 *
+	 * @param string $text
+	 * @return string
+	 *
+	 */
+	public function _($text) {
+		static $translate = null;
+		if(is_null($translate)) $translate = $this->wire('languages') !== null;
+		if($translate === false) return $text;
+		$value = __($text, $this->wire('config')->paths->root . 'wire/templates-admin/default.php');
+		if($value === $text) $value = parent::_($text);
+		return $value;
+	}
+
+	/**
+	 * Get the current page headline
+	 *
+	 * @return string
+	 *
+	 */
+	public function getHeadline() {
+		$headline = $this->wire('processHeadline');
+		if(!$headline) $headline = $this->wire('page')->get('title|name');
+		if($headline !== 'en' && $this->wire('languages')) $headline = $this->_($headline);
+		return $this->sanitizer->entities1($headline);
+	}
+
+	/**
+	 * Get navigation title for the given page, return blank if page should not be shown
+	 *
+	 * @param Page $p
+	 * @return string
+	 *
+	 */
+	public function getPageTitle(Page $p) {
+
+		if($p->name == 'add' && $p->parent->name == 'page') {
+
+			$title = $this->getAddNewLabel();
+
+		} else {
+			$title = $this->_($p->title);
+		}
+
+		$title = $this->sanitizer->entities1($title);
+
+		return $title;
+	}
+
+	/**
+	 * Get icon used by the given page
+	 *
+	 * @param Page $p
+	 * @return mixed|null|string
+	 *
+	 */
+	public function getPageIcon(Page $p) {
+		$icon = '';
+		if($p->template == 'admin') {
+			$info = $this->wire('modules')->getModuleInfo($p->process);
+			if(!empty($info['icon'])) $icon = $info['icon'];
+		}
+		// allow for option of an admin field overriding the module icon
+		$pageIcon = $p->get('page_icon');
+		if($pageIcon) $icon = $pageIcon;
+		if(!$icon) switch($p->id) {
+			case 22: $icon = 'gears'; break; // Setup
+			case 21: $icon = 'plug'; break; // Modules
+			case 28: $icon = 'key'; break; // Access
+		}
+		if(!$icon && $p->parent->id != $this->wire('config')->adminRootPageID) {
+			$icon = 'file-o ui-priority-secondary';
+		}
+		return $icon;
+	}
+
+	/**
+	 * Get “Add New” button actions
+	 *
+	 * - Returns array of arrays, each with 'url', 'label' and 'icon' properties.
+	 * - Returns empty array if Add New button should not be displayed.
+	 *
+	 * @return array
+	 *
+	 */
+	public function getAddNewActions() {
+
+		$page = $this->wire('page');
+		$process = $this->wire('process');
+		$input = $this->wire('input');
+
+		if(!$this->isEditor) return array();
+		if($page->name != 'page' || $this->wire('input')->urlSegment1) return array();
+		if($input->urlSegment1 || $input->get('modal')) return array();
+		if(strpos($process, 'ProcessPageList') !== 0) return array();
+
+		/** @var ProcessPageAdd $module */
+		$module = $this->wire('modules')->getModule('ProcessPageAdd', array('noInit' => true));
+		$data = $module->executeNavJSON(array('getArray' => true));
+		$actions = array();
+
+		foreach($data['list'] as $item) {
+			$item['url'] = $data['url'] . $item['url'];
+			$actions[] = $item;
+		}
+
+		return $actions;
+	}
+
+	/**
+	 * Get the translated “Add New” label that’s used in a couple spots
+	 *
+	 * @return string
+	 *
+	 */
+	public function getAddNewLabel() {
+		return $this->_('Add New');
+	}
+
+	/**
+	 * Get the classes that will be used in the <body class=''> tag
+	 *
+	 * @return string
+	 *
+	 */
+	public function getBodyClass() {
+
+		$page = $this->wire('page');
+		$process = $this->wire('process');
+
+		$classes = array(
+			"id-{$page->id}",
+			"template-{$page->template->name}",
+			"pw-init",
+			parent::getBodyClass(),
+		);
+
+		if($this->isModal) $classes[] = 'modal';
+		if($this->isModal === 'inline') $classes[] = 'modal-inline';
+		if($this->wire('input')->urlSegment1) $classes[] =  'hasUrlSegments';
+		if($process) $classes[] = $process->className();
+		if(!$this->isLoggedIn) $classes[] = 'pw-guest';
+
+		return implode(' ', $classes);
+	}
+
+	/**
+	 * Get Javascript that must be present in the document <head>
+	 *
+	 * @return string
+	 *
+	 */
+	public function getHeadJS() {
+		$config = $this->wire()->config;
+		return
+			"var ProcessWire = { config: " . wireEncodeJSON($config->js(), true, $config->debug) . " }; " .
+			"var config = ProcessWire.config;\n"; // legacy support
+	}
+
+
+	/**
+	 * Allow the given Page to appear in admin theme navigation?
+	 *
+	 * @param Page $p Page to test
+	 * @param PageArray|array $children Children of page, if applicable (optional)
+	 * @param string|null $permission Specify required permission (optional)
+	 * @return bool
+	 *
+	 */
+	public function allowPageInNav(Page $p, $children = array(), $permission = null) {
+
+		if($this->isSuperuser) return true;
+		
+		$pageViewable = $p->viewable();
+		if(!$pageViewable) return false;
+		
+		$allow = false;
+		$numChildren = count($children);
+		
+		if($p->process == 'ProcessPageAdd') {
+			// ProcessPageAdd: avoid showing this menu item if there are no predefined family settings to use
+			$numAddable = $this->wire('session')->getFor('ProcessPageAdd', 'numAddable');
+			if($numAddable === null) {
+				/** @var ProcessPageAdd $processPageAdd */
+				$processPageAdd = $this->wire('modules')->getModule('ProcessPageAdd', array('noInit' => true));
+				if($processPageAdd) {
+					$addData = $processPageAdd->executeNavJSON(array('getArray' => true));
+					$numAddable = $addData['list'];
+					$this->wire('session')->setFor('ProcessPageAdd', 'numAddable', $numAddable);
+				}
+			}
+			// no addable options, so do not show the "Add New" item
+			if(!$numAddable) return false;
+			
+		} else if(empty($permission)) {
+			// no permission specified
+			
+			if(!$p->process) {
+				// no process module present, so we delegate to just the page viewable state if no children to check
+				if($pageViewable && !$numChildren) return true;
+				
+			} else if($p->process == 'ProcessList') {
+				// page just serves as a list for children
+				
+			} else {
+				// determine permission from Process module, if present
+				$moduleInfo = $this->wire('modules')->getModuleInfo($p->process);
+				if(!empty($moduleInfo['permission'])) $permission = $moduleInfo['permission'];
+			}
+		}
+		
+		if($permission) {
+			// specific permission required to determine view access
+			$allow = $this->wire('user')->hasPermission($permission);
+			
+		} else if($pageViewable && $p->parent_id == $this->wire('config')->adminRootPageID) {
+			// primary nav page requires that at least one child is viewable
+			foreach($children as $child) {
+				if($this->allowPageInNav($child)) {
+					$allow = true;
+					break;
+				}
+			}
+		}
+
+		return $allow;
+	}
+
+	/**
+	 * Return nav array of primary navigation
+	 *
+	 * @return array
+	 *
+	 */
+	public function ___getPrimaryNavArray() {
+
+		$items = array();
+		$config = $this->wire('config');
+		$admin = $this->wire('pages')->get($config->adminRootPageID);
+
+		foreach($admin->children("check_access=0") as $p) {
+			$item = $this->pageToNavArray($p);
+			if($item) $items[] = $item;
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Get navigation array from a Process module
+	 *
+	 * @param array|Module|string $module Module info array or Module object or string
+	 * @param Page $p Page upon which the Process module is contained
+	 * @return array
+	 *
+	 */
+	public function moduleToNavArray($module, Page $p) {
+
+		$config = $this->wire('config');
+		$modules = $this->wire('modules');
+		$textdomain = str_replace($config->paths->root, '/', $modules->getModuleFile($p->process));
+		$user = $this->wire('user');
+		$navArray = array();
+
+		if(is_array($module)) {
+			$moduleInfo = $module;
+		} else {
+			$moduleInfo = $modules->getModuleInfo($module);
+		}
+
+		foreach($moduleInfo['nav'] as $navItem) {
+
+			$permission = empty($navItem['permission']) ? '' : $navItem['permission'];
+			if($permission && !$user->hasPermission($permission)) continue;
+
+			$navArray[] = array(
+				'id' => 0,
+				'parent_id' => $p->id,
+				'title' => $this->sanitizer->entities1(__($navItem['label'], $textdomain)), // translate from context of Process module
+				'name' => '',
+				'url' => $p->url . $navItem['url'],
+				'icon' => empty($navItem['icon']) ? '' : $navItem['icon'],
+				'children' => array(),
+				'navJSON' => empty($navItem['navJSON']) ? '' : $p->url . $navItem['navJSON'],
+			);
+		}
+
+		return $navArray;
+	}
+
+	/**
+	 * Get a navigation array the given Page, or null if page not allowed in nav
+	 *
+	 * @param Page $p
+	 * @return array|null
+	 *
+	 */
+	public function pageToNavArray(Page $p) {
+
+		$children = $p->numChildren ? $p->children("check_access=0") : array();
+
+		if(!$this->allowPageInNav($p, $children)) return null;
+
+		$navArray = array(
+			'id' => $p->id,
+			'parent_id' => $p->parent_id,
+			'url' => $p->url,
+			'name' => $p->name,
+			'title' => $this->getPageTitle($p),
+			'icon' => $this->getPageIcon($p),
+			'children' => array(),
+			'navJSON' => '',
+		);
+
+		if(!count($children)) {
+			// no children available
+			if($p->template == 'admin' && $p->process) {
+				// see if process module defines its own navigation
+				$moduleInfo = $this->wire('modules')->getModuleInfo($p->process);
+				if(!empty($moduleInfo['nav'])) {
+					$navArray['children'] = $this->moduleToNavArray($moduleInfo, $p);
+				}
+			} else {
+				// The /page/ and /page/list/ are the same process, so just keep them on /page/ instead. 
+				if(strpos($navArray['url'], '/page/list/') !== false) {
+					$navArray['url'] = str_replace('/page/list/', '/page/', $navArray['url']);
+				}
+			}
+			return $navArray;
+		}
+
+		// if we reach this point, then we have a PageArray of children
+
+		$modules = $this->wire('modules');
+
+		foreach($children as $c) {
+
+			if(!$c->process) continue;
+			$moduleInfo = $modules->getModuleInfo($c->process);
+			$permission = empty($moduleInfo['permission']) ? '' : $moduleInfo['permission'];
+			if(!$this->allowPageInNav($c, array(), $permission)) continue;
+
+			$childItem = array(
+				'id' => $c->id,
+				'parent_id' => $c->parent_id,
+				'title' => $this->getPageTitle($c),
+				'name' => $c->name,
+				'url' => $c->url,
+				'icon' => $this->getPageIcon($c),
+				'children' => array(),
+				'navJSON' => empty($moduleInfo['useNavJSON']) ? '' : $c->url . 'navJSON/',
+			);
+
+			if(!empty($moduleInfo['nav'])) {
+				$childItem['children'] = $this->moduleToNavArray($moduleInfo, $c);  
+			}
+
+			$navArray['children'][] = $childItem;
+
+		} // foreach
+
+		return $navArray;
+	}
+
+	/**
+	 * Get navigation items for the “user” menu
+	 *
+	 * This is hookable so that something else could add stuff to it.
+	 * See the method body for details on format used.
+	 *
+	 * @return array
+	 *
+	 */
+	public function ___getUserNavArray() {
+		$urls = $this->wire('urls');
+		$navArray = array();
+		
+		$navArray[] = array(
+			'url' => $urls->root,
+			'title' => $this->_('View site'),
+			'target' => '_top',
+			'icon' => 'eye',
+		);
+		
+		if($this->wire('user')->hasPermission('profile-edit')) $navArray[] = array(
+			'url' => $urls->admin . 'profile/',
+			'title' => $this->_('Profile'),
+			'icon' => 'user',
+			'permission' => 'profile-edit',
+		);
+		
+		$navArray[] = array(
+			'url' => $urls->admin . 'login/logout/',
+			'title' => $this->_('Logout'),
+			'target' => '_top',
+			'icon' => 'power-off',
+		);
+		
+		return $navArray;
+	}
+
+	/**
+	 * Get the browser <title>
+	 *
+	 * @return string
+	 *
+	 */
+	public function getBrowserTitle() {
+
+		$browserTitle = $this->wire('processBrowserTitle');
+		$modal = $this->wire('input')->get('modal');
+
+		if(!$browserTitle) {
+			if($modal) return $this->wire('processHeadline');
+			$browserTitle = $this->_(strip_tags($this->wire('page')->get('title|name'))) . ' • ProcessWire';
+		}
+
+		if(!$modal) {
+			$httpHost = $this->wire('config')->httpHost;
+			if(strpos($httpHost, 'www.') === 0) $httpHost = substr($httpHost, 4); // remove www
+			if(strpos($httpHost, ':')) $httpHost = preg_replace('/:\d+/', '', $httpHost); // remove port
+			$browserTitle .= " • $httpHost";
+		}
+
+		return $this->sanitizer->entities1($browserTitle);
+	}
+
+	/**
+	 * Test all notice types
+	 * 
+	 * @return bool
+	 *
+	 */
+	public function testNotices() {
+		if(!$this->wire('user')->isLoggedin()) return false;
+		$this->message('Message test');
+		$this->message('Message test debug', Notice::debug);
+		$this->message('Message test markup <a href="#">example</a>', Notice::allowMarkup);
+		$this->warning('Warning test');
+		$this->warning('Warning test debug', Notice::debug);
+		$this->warning('Warning test markup <a href="#">example</a>', Notice::allowMarkup);
+		$this->error('Error test');
+		$this->error('Error test debug', Notice::debug);
+		$this->error('Error test markup <a href="#">example</a>', Notice::allowMarkup);
+		return true;
+	}
+	
+	/**
+	 * Render runtime notices div#notices
+	 *
+	 * @param Notices|bool $notices Notices object or specify boolean true to return array of all available $options
+	 * @param array $options See defaults in method 
+	 * @return string|array Returns string unless you specify true for $notices argument, then it returns an array.
+	 *
+	 */
+	public function renderNotices($notices, array $options = array()) {
+
+		$defaults = array(
+			'messageClass' => 'NoticeMessage', // class for messages
+			'messageIcon' => 'check-square', // default icon to show with notices
+			'warningClass' => 'NoticeWarning', // class for warnings
+			'warningIcon' => 'exclamation-circle', // icon for warnings
+			'errorClass' => 'NoticeError', // class for errors
+			'errorIcon' => 'exclamation-triangle', // icon for errors
+			'debugClass' => 'NoticeDebug', // class for debug items (appended)
+			'debugIcon' => 'bug', // icon for debug notices
+			'closeClass' => 'pw-notice-remove notice-remove', // class for close notices link <a>
+			'closeIcon' => 'times', // icon for close notices link
+			'listMarkup' => "<ul class='pw-notices' id='notices'>{out}</ul><!--/notices-->",
+			'itemMarkup' => "<li class='{class}'>{remove}{icon}{text}</li>",
+			// the following apply only when groupByType==true
+			'groupByType' => true, // Group notices by type
+			'groupParentClass' => 'pw-notice-group-parent', // class for parent notices
+			'groupChildClass' => 'pw-notice-group-child', // class for children (of parent notices)
+			'groupToggleMarkup' => "<a class='pw-notice-group-toggle' href='#'>{label}" . 
+				"<i class='fa fa-fw fa-bell-o' data-toggle='fa-bell-o fa-bell'></i>" . 
+				"<i class='fa fa-fw fa-angle-right' data-toggle='fa-angle-right fa-angle-down'></i></a>", 
+			'groupToggleLabel' => $this->_("+{n-1}"), 
+		);
+		
+		$options = array_merge($defaults, $options);
+		if($notices === true) return $options;
+		$config = $this->wire('config');
+		$noticesArray = array();
+		$out = '';
+		
+		$removeIcon = $this->renderIcon($options['closeIcon']);
+		$removeLabel = $this->_('Close all');
+		$removeLink = "<a class='$options[closeClass]' href='#' title='$removeLabel'>$removeIcon</a>";
+		
+		if($this->isLoggedIn && $this->wire('modules')->isInstalled('SystemNotifications')) {
+			$defaults['groupByType'] = false;
+			//$systemNotifications = $this->wire('modules')->get('SystemNotifications');
+			//if(!$systemNotifications->placement) return '';
+		}
+
+		foreach($notices as $n => $notice) {
+
+			$text = $notice->text;
+			$allowMarkup = $notice->flags & Notice::allowMarkup;
+			$groupByType = $options['groupByType'] && !($notice->flags & Notice::noGroup) && !($notice instanceof NoticeError); 
+			
+			if($allowMarkup) {
+				// leave $text alone
+			} else {
+				// unencode + re-encode entities, just in case module already entity some or all of output
+				if(strpos($text, '&') !== false) $text = $this->sanitizer->unentities($text);
+				$text = $this->sanitizer->entities($text);
+				$text = nl2br($text);
+			}
+
+			if($notice instanceof NoticeError) {
+				$class = $options['errorClass'];
+				$icon = $options['errorIcon'];
+				$noticeType = 'errors';
+
+			} else if($notice instanceof NoticeWarning) {
+				$class = $options['warningClass'];
+				$icon = $options['warningIcon'];
+				$noticeType = 'warnings';
+
+			} else {
+				$class = $options['messageClass'];
+				$icon = $options['messageIcon'];
+				$noticeType = 'messages';
+			}
+
+			if($notice->flags & Notice::debug) {
+				$class .= " " . $options['debugClass'];
+				$icon = $options['debugIcon'];
+				// ensure non-debug version is set as well
+				if(!isset($noticesArray[$noticeType])) $noticesArray[$noticeType] = array();
+				$noticeType .= "-debug";
+			}
+
+			// indicate which class the notice originated from in debug mode
+			if($notice->class && $config->debug) $text = "{$notice->class}: $text";
+
+			$replacements = array(
+				'{class}' => $class,
+				'{remove}' => '', 
+				'{icon}' => $this->renderNavIcon($notice->icon ? $notice->icon : $icon),
+				'{text}' => $text,
+			);
+			
+			if($groupByType) {
+				if(!isset($noticesArray[$noticeType])) $noticesArray[$noticeType] = array();
+				$noticesArray[$noticeType][] = $replacements;
+			} else {
+				if($n === 0) $replacements['{remove}'] = $removeLink;
+				$out .= str_replace(array_keys($replacements), array_values($replacements), $options['itemMarkup']);
+			}
+		}
+	
+		if($options['groupByType']) {
+			$cnt = 0;
+			foreach($noticesArray as $noticeType => $noticeReplacements) {
+				if(strpos($noticeType, '-debug')) continue;
+				if(isset($noticesArray["$noticeType-debug"])) {
+					$noticeReplacements = array_merge($noticeReplacements, $noticesArray["$noticeType-debug"]);
+				}
+				$n = count($noticeReplacements);
+				if($n > 1) {
+					$notice =& $noticeReplacements[0];
+					$label = str_replace(array('{n}', '{n-1}'), array($n, $n-1), $options['groupToggleLabel']); 
+					$notice['{text}'] .= ' ' . str_replace(array('{label}'), array($label), $options['groupToggleMarkup']); 
+					$notice['{class}'] .= ' ' . $options['groupParentClass'];
+					$childClass = $options['groupChildClass'];
+				} else {
+					$childClass = '';
+				}
+				foreach($noticeReplacements as $i => $replacements) {
+					if(!$cnt) $replacements['{remove}'] = $removeLink;
+					if($childClass && $i > 0) $replacements['{class}'] .= ' ' . $childClass;
+					$out .= str_replace(array_keys($replacements), array_values($replacements), $options['itemMarkup']);
+					$cnt++;
+				}
+			}
+		}
+
+		$out = str_replace('{out}', $out, $options['listMarkup']);
+		$out .= $this->renderExtraMarkup('notices');
+
+		return $out;
+	}
+	
+	/**
+	 * Render markup for a font-awesome icon
+	 *
+	 * @param string $icon Name of icon to render, excluding the “fa-” prefix
+	 * @param bool $fw Specify true to make fixed width (default=false).
+	 * @return string
+	 *
+	 */
+	public function renderIcon($icon, $fw = false) {
+		if($fw) $icon .= ' fa-fw';
+		return "<i class='fa fa-$icon'></i>";
+	}
+
+	/**
+	 * Render markup for a font-awesome icon that precedes a navigation label
+	 *
+	 * This is the same as renderIcon() except that fixed-width is assumed and a "nav-nav-icon"
+	 * class is added to it.
+	 *
+	 * @param string $icon Name of icon to render, excluding the “fa-” prefix
+	 * @return string
+	 *
+	 */
+	public function renderNavIcon($icon) {
+		return $this->renderIcon("$icon pw-nav-icon", true);
+	}
+	
+	/**
+	 * Render an extra markup region
+	 *
+	 * @param string $for
+	 * @return mixed|string
+	 *
+	 */
+	public function renderExtraMarkup($for) {
+		static $extras = array();
+		if(empty($extras)) $extras = $this->getExtraMarkup();
+		return isset($extras[$for]) ? $extras[$for] : '';
+	}
+
+	/**
+	 * Module Configuration
+	 * 
+	 * @param InputfieldWrapper $inputfields
+	 * 
+	 */
+	public function getModuleConfigInputfields(InputfieldWrapper $inputfields) {
+		$modules = $this->wire()->modules;
+		$input = $this->wire()->input; 
+		$roles = $this->wire()->roles;
+
+		/** @var InputfieldCheckbox $f */
+		$f = $modules->get('InputfieldCheckbox'); 
+		$f->name = 'useAsLogin';
+		$f->label = $this->_('Use this admin theme for login screen?');
+		$f->description = $this->_('When checked, this admin theme will be used on the user login screen.');
+		$f->icon = 'sign-in';
+		$f->columnWidth = 50;
+		if($this->get('useAsLogin')) $f->attr('checked', 'checked');
+		$inputfields->add($f);
+		
+		if($f->attr('checked') && $input->requestMethod('GET')) {
+			$themes = $modules->findByPrefix('AdminTheme');
+			$class = $this->className();
+			foreach($themes as $name) {
+				if($name === $class) continue;
+				$cfg = $modules->getConfig($name);
+				if(!empty($cfg['useAsLogin'])) {
+					unset($cfg['useAsLogin']);
+					$modules->saveConfig($name, $cfg);
+					$this->message("Removed 'useAsLogin' setting from $name", Notice::debug);
+				}
+			}
+		}
+		
+		/** @var InputfieldSelect $f */
+		$f = $modules->get('InputfieldSelect');
+		$f->name = '_setAdminThemeRoleId'; 
+		$f->label = $this->_('Change users to this admin theme');
+		$f->description = $this->_('Select user role to update matching users to this admin theme.'); 
+		$f->columnWidth = 50;
+		$f->icon = 'users';
+		foreach($roles as $role) {
+			if($role->name === 'guest') continue;
+			$f->addOption($role->id, sprintf($this->_('Role: %s'), $role->name));
+		}
+		$inputfields->add($f);
+		
+		$roleId = (int) $input->post('_setAdminThemeRoleId');
+		$role = $roleId ? $roles->get($roleId) : null;
+		if($role) {
+			$n = $this->wire()->users->setAdminThemeByRole($this, $role); 
+			$this->message(sprintf($this->_('Set %d user(s) to have this admin theme'), $n), Notice::noGroup);
+		}
+	}
+
+}
+

wire/core/CacheFile.php

@@ -210,7 +210,7 @@ class CacheFile extends Wire {
 		foreach($dir as $file) {
 			if($file->isDir() || $file->isDot()) continue; 
 			//if(strpos($file->getFilename(), self::cacheFileExtension)) @unlink($file->getPathname()); 
-			if(self::isCacheFile($file->getPathname())) @unlink($file->getPathname()); 
+			if(self::isCacheFile($file->getPathname())) $this->wire('files')->unlink($file->getPathname()); 
 		}
 
 		return @rmdir($this->path); 
@@ -223,7 +223,7 @@ class CacheFile extends Wire {
 	 *
 	 */
 	protected function removeFilename($filename) {
-		@unlink($filename); 
+		$this->wire('files')->unlink($filename); 
 	}
 
 
@@ -250,7 +250,7 @@ class CacheFile extends Wire {
 				$numRemoved += self::removeAll($pathname, true); 
 
 			} else if($file->isFile() && (self::isCacheFile($pathname) || ($file->getFilename() == self::globalExpireFilename))) {
-				if(unlink($pathname)) $numRemoved++;
+				if(wire('files')->unlink($pathname)) $numRemoved++;
 			}
 		}
 

wire/core/Config.php

@@ -8,23 +8,30 @@
  * This file is licensed under the MIT license
  * https://processwire.com/about/license/mit/
  * 
- * ProcessWire 3.x, Copyright 2016 by Ryan Cramer
+ * ProcessWire 3.x, Copyright 2021 by Ryan Cramer
  * https://processwire.com
  * 
  * #pw-summary Holds ProcessWire configuration settings as defined in /wire/config.php and /site/config.php. 
+ * #pw-body =
+ * For more detailed descriptions of these $config properties, including default values, see the
+ * [/wire/config.php](https://github.com/processwire/processwire/blob/master/wire/config.php) file. 
+ * #pw-body
  *
  *
  * @see /wire/config.php for more detailed descriptions of all config properties. 
  *
  * @property bool $ajax If the current request is an ajax (asynchronous javascript) request, this is set to true. #pw-group-runtime
+ * @property bool|int $modal If the current request is in a modal window, this is set to a positive number. False if not. #pw-group-runtime
+ * @property bool|int $admin Is current request for logged-in user in admin? True, false, or 0 if not yet known. @since 3.0.142 #pw-group-runtime
  * @property string $httpHost Current HTTP host name. #pw-group-HTTP-and-input
  * @property bool $https If the current request is an HTTPS request, this is set to true. #pw-group-runtime
  * @property string $version Current ProcessWire version string (i.e. "2.2.3") #pw-group-system #pw-group-runtime
+ * @property int $systemVersion System version, used by SystemUpdater to determine when updates must be applied. #pw-group-system #pw-group-runtime
  * 
  * @property FilenameArray $styles Array used by ProcessWire admin to keep track of what stylesheet files its template should load. It will be blank otherwise. Feel free to use it for the same purpose in your own sites. #pw-group-runtime
  * @property FilenameArray $scripts Array used by ProcessWire admin to keep track of what javascript files its template should load. It will be blank otherwise. Feel free to use it for the same purpose in your own sites. #pw-group-runtime
  * 
- * @property Paths $urls Items from $config->urls reflect the http path one would use to load a given location in the web browser. URLs retrieved from $config->urls always end with a trailing slash. #pw-group-runtime
+ * @property Paths $urls Items from $config->urls reflect the http path one would use to load a given location in the web browser. URLs retrieved from $config->urls always end with a trailing slash. This is the same as the $urls API variable. #pw-group-runtime #pw-group-URLs
  * @property Paths $paths All of what can be accessed from $config->urls can also be accessed from $config->paths, with one important difference: the returned value is the full disk path on the server. There are also a few items in $config->paths that aren't in $config->urls. All entries in $config->paths always end with a trailing slash. #pw-group-runtime
  * 
  * @property string $templateExtension Default is 'php' #pw-group-template-files
@@ -33,10 +40,13 @@
  * 
  * @property bool $protectCSRF Enables CSRF (cross site request forgery) protection on all PW forms, recommended for security. #pw-group-HTTP-and-input
  * 
- * @property array $imageSizerOptions Default value is array('upscaling' => true, 'cropping' => true, 'quality' => 90) #pw-group-images
+ * @property array $imageSizes Predefined image sizes (and options) indexed by name. See /wire/config.php for example. #pw-group-images @since 3.0.151
+ * @property array $imageSizerOptions Options to set image sizing defaults. Please see the /wire/config.php file for all options and defaults. #pw-group-images
+ * @property array $webpOptions Options for webp images. Please see /wire/config.php for all options. #pw-group-images
  * 
  * @property bool $pagefileSecure When used, files in /site/assets/files/ will be protected with the same access as the page. Routines files through a passthrough script. #pw-group-files
  * @property string $pagefileSecurePathPrefix One or more characters prefixed to the pathname of protected file dirs. This should be some prefix that the .htaccess file knows to block requests for. #pw-group-files
+ * @property string $pagefileUrlPrefix Deprecated property that was a string that prefixes filenames in PW URLs, becoming a shortcut to a page’s file’s URL (do not use, here for backwards compatibility only). #pw-internal
  * 
  * @property array $contentTypes Array of extensions and the associated MIME type for each (for template file output). #pw-group-template-files
  * @property array $fileContentTypes Array of extensions and the associated MIME type for each (for file output). See /wire/config.php for details and defaults. #pw-group-files
@@ -51,33 +61,43 @@
  * @property string $sessionName Default session name to use (default='wire') #pw-group-session
  * @property string $sessionNameSecure Session name when on HTTPS. Used when the sessionCookieSecure option is enabled (default). When blank (default), it will assume sessionName + 's'. #pw-group-session
  * @property bool|int $sessionCookieSecure Use secure cookies when on HTTPS? When enabled, separate sessions will be maintained for HTTP vs. HTTPS. Good for security but tradeoff is login session may be lost when switching (default=1 or true). #pw-group-session
+ * @property null|string $sessionCookieDomain Domain to use for sessions, which enables a session to work across subdomains, or NULL to disable (default/recommended). #pw-group-session
+ * @property string $sessionCookieSameSite Cookie “SameSite” value for sessions - “Lax” (default) or “Strict”. #pw-group-session @since 3.0.178
  * @property bool|callable $sessionAllow Are sessions allowed? Typically boolean true, unless provided a callable function that returns boolean. See /wire/config.php for an example.  #pw-group-session
  * @property int $sessionExpireSeconds How many seconds of inactivity before session expires? #pw-group-session
  * @property bool $sessionChallenge Should login sessions have a challenge key? (for extra security, recommended) #pw-group-session
- * @property bool $sessionFingerprint Should login sessions be tied to IP and user agent? May conflict with dynamic IPs. #pw-group-session
+ * @property int|bool $sessionFingerprint Should login sessions be tied to IP and user agent? 0 or false: Fingerprint off. 1 or true: Fingerprint on with default/recommended setting (currently 10). 2: Fingerprint only the remote IP. 4: Fingerprint only the forwarded/client IP (can be spoofed). 8: Fingerprint only the useragent. 10: Fingerprint the remote IP and useragent (default). 12: Fingerprint the forwarded/client IP and useragent. 14: Fingerprint the remote IP, forwarded/client IP and useragent (all). #pw-group-session
  * @property int $sessionHistory Number of session entries to keep (default=0, which means off). #pw-group-session
+ * @property string $sessionForceIP Force the client IP address returned by $session->getIP() to be this rather than auto-detect (useful with load balancer). Use for setting value only. #pw-group-session
+ * @property array $loginDisabledRoles Array of role name(s) or ID(s) of roles where login is disallowed. #pw-group-session
  * 
  * @property string $prependTemplateFile PHP file in /site/templates/ that will be loaded before each page's template file (default=none) #pw-group-template-files
  * @property string $appendTemplateFile PHP file in /site/templates/ that will be loaded after each page's template file (default=none) #pw-group-template-files
  * @property bool $templateCompile Allow use of compiled templates? #pw-group-template-files
  * 
- * @property string $uploadUnzipCommand Shell command to unzip archives, used by WireUpload class. @deprecated #pw-group-deprecated
+ * @property string $uploadUnzipCommand Shell command to unzip archives, used by WireUpload class (deprecated, no longer in use). #pw-internal
  * @property string $uploadTmpDir Optionally override PHP's upload_tmp_dir with your own. Should include a trailing slash. #pw-group-files
  * @property string $uploadBadExtensions Space separated list of file extensions that are always disallowed from uploads. #pw-group-files
  * 
  * @property string $adminEmail Email address to send fatal error notifications to. #pw-group-system
+ * @property array $adminTemplates Names of templates that ProcessWire should consider exclusive to the admin. #pw-group-system @since 3.0.142
  * 
  * @property string $pageNameCharset Character set for page names, must be 'ascii' (default, lowercase) or 'UTF8' (uppercase). #pw-group-URLs
  * @property string $pageNameWhitelist Whitelist of characters allowed in UTF8 page names. #pw-group-URLs
+ * @property string $pageNameUntitled Name to use for untitled pages (default="untitled"). #pw-group-URLs
  * @property string $pageNumUrlPrefix Prefix used for pagination URLs. Default is "page", resulting in "/page1", "/page2", etc. #pw-group-URLs
  * @property array $pageNumUrlPrefixes Multiple prefixes that may be used for detecting pagination (internal use, for multi-language) #pw-group-URLs
  * @property int $maxUrlSegments Maximum number of extra stacked URL segments allowed in a page's URL (including page numbers)  #pw-group-URLs
+ * @property int $maxUrlSegmentLength Maximum length of any individual URL segment (default=128). #pw-group-URLs
  * @property int $maxUrlDepth Maximum URL/path slashes (depth) for request URLs. (Min=10, Max=60) #pw-group-URLs
  * @property string $wireInputOrder Order that variables with the $input API var are handled when you access $input->var. #pw-group-HTTP-and-input
+ * @property bool $wireInputLazy Specify true for $input API var to load input data in a lazy fashion and potentially use less memory. Default is false. #pw-group-HTTP-and-input
+ * @property int $wireInputArrayDepth Maximum multi-dimensional array depth for input variables accessed from $input or 1 to only allow single dimension arrays. #pw-group-HTTP-and-input @since 3.0.178
+ * @property array $cookieOptions Options for setting cookies from $input->cookie #pw-group-HTTP-and-input
  * 
  * @property bool $advanced Special mode for ProcessWire system development. Not recommended for regular site development or production use. #pw-group-system
  * @property bool $demo Special mode for demonstration use that causes POST requests to be disabled. Applies to core, but may not be safe with 3rd party modules. #pw-group-system
- * @property bool $debug Special mode for use when debugging or developing a site. Recommended TRUE when site is in development and FALSE when not. #pw-group-system
+ * @property bool|int $debug Special mode for use when debugging or developing a site. Recommended TRUE when site is in development and FALSE when not. Or set to Config::debugVerbose for verbose debug mode. #pw-group-system
  * @property string $debugIf Enable debug mode if condition is met #pw-group-system
  * @property array $debugTools Tools, and their order, to show in debug mode (admin) #pw-group-system
  * 
@@ -86,69 +106,122 @@
  * @property array $adminThumbOptions Admin thumbnail image options #pw-group-images
  * @property array $httpHosts HTTP hosts For added security, specify the host names ProcessWire should recognize. #pw-group-HTTP-and-input
  * @property int $maxPageNum Maximum number of recognized paginations #pw-group-URLs
+ * @property bool|string|array $noHTTPS When boolean true, pages requiring HTTPS will not enforce it (useful for dev environments). May also specify hostname (string) or hostnames (array) to disable HTTPS for. #pw-group-HTTP-and-input
  * 
  * @property string $dbHost Database host #pw-group-database
  * @property string $dbName Database name #pw-group-database
  * @property string $dbUser Database user #pw-group-database
  * @property string $dbPass Database password #pw-group-database
  * @property string $dbPort Database port (default=3306) #pw-group-database
- * @property string $dbCharset Default is 'utf8' #pw-group-database
+ * @property string $dbCharset Default is 'utf8' but 'utf8mb4' is also supported. #pw-group-database
+ * @property string $dbEngine Database engine (MyISAM or InnoDB) #pw-group-database
  * @property string $dbSocket Optional DB socket config for sites that need it.  #pw-group-database
  * @property bool $dbCache Whether to allow MySQL query caching. #pw-group-database
  * @property bool $dbLowercaseTables Force any created field_* tables to be lowercase. #pw-group-database
- * @property string $dbEngine Database engine (MyISAM or InnoDB) #pw-group-database
  * @property string $dbPath MySQL database exec path (Path to mysqldump) #pw-group-database
+ * @property array $dbOptions Any additional driver options to pass as $options argument to "new PDO(...)". #pw-group-database
+ * @property array $dbSqlModes Set or adjust SQL mode per MySQL version, where array keys are MySQL version and values are SQL mode command(s). #pw-group-database
  * @property int $dbQueryLogMax Maximum number of queries WireDatabasePDO will log in memory, when debug mode is enabled (default=1000). #pw-group-database
+ * @property string $dbInitCommand Database init command, for PDO::MYSQL_ATTR_INIT_COMMAND. Note placeholder {charset} gets replaced with $config->dbCharset. #pw-group-database
+ * @property bool $dbStripMB4 When dbEngine is not utf8mb4 and this is true, we will attempt to remove 4-byte characters (like emoji) from inserts when possible. Note that this adds some overhead. #pw-group-database
+ * @property array|null $dbReader Configuration values for read-only database connection (if available). #pw-group-database @since 3.0.175
  * 
  * @property array $pageList Settings specific to Page lists. #pw-group-modules
  * @property array $pageEdit Settings specific to Page editors. #pw-group-modules
+ * @property array $pageAdd Settings specific to Page adding. #pw-group-modules
  * @property string $moduleServiceURL URL where the modules web service can be accessed #pw-group-modules
  * @property string $moduleServiceKey API key for modules web service #pw-group-modules
  * @property bool $moduleCompile Allow use of compiled modules? #pw-group-modules
+ * @property array $wireMail Default WireMail module settings. See /wire/config.php $config->wireMail for details. #pw-group-system
+ * @property array $moduleInstall Admin module install options you allow. #pw-group-modules
  * 
- * @property array $substituteModules Associative array with names of substitutute modules for when requested module doesn't exist #pw-group-modules
+ * @property array $substituteModules Associative array with names of substitute modules for when requested module doesn't exist #pw-group-modules
  * @property array $logs Additional core logs to keep #pw-group-admin
- * @property string $defaultAdminTheme Default admin theme: AdminThemeDefault or AdminThemeReno #pw-group-admin
+ * @property bool $logIP Include IP address in logs, when applicable? #pw-group-admin
+ * @property string $defaultAdminTheme Default admin theme: AdminThemeUikit, AdminThemeDefault or AdminThemeReno. #pw-group-admin
+ * @property array $AdminThemeUikit Settings specific to AdminThemeUikit module (see this setting in /wire/config.php). #pw-group-admin @since 3.0.179
  * @property string $fatalErrorHTML HTML used for fatal error messages in HTTP mode. #pw-group-system
+ * @property int $fatalErrorCode HTTP code to send on fatal error (typically 500 or 503). #pw-group-system
  * @property array $modals Settings for modal windows #pw-group-admin
  * @property array $preloadCacheNames Cache names to preload at beginning of request #pw-group-system
  * @property bool $allowExceptions Allow Exceptions to propagate? (default=false, specify true only if you implement your own exception handler) #pw-group-system
  * @property bool $usePoweredBy Use the x-powered-by header? Set to false to disable. #pw-group-system
+ * @property bool $useFunctionsAPI Allow most API variables to be accessed as functions? (see /wire/core/FunctionsAPI.php) #pw-group-system
+ * @property bool $useMarkupRegions Enable support for front-end markup regions? #pw-group-system
+ * @property bool $usePageClasses Use custom Page classes in `/site/classes/[TemplateName]Page.php`? #pw-group-system @since 3.0.152
+ * @property int $lazyPageChunkSize Chunk size for for $pages->findMany() calls. #pw-group-system
  * 
  * @property string $userAuthSalt Salt generated at install time to be used as a secondary/non-database salt for the password system. #pw-group-session
  * @property string $userAuthHashType Default is 'sha1' - used only if Blowfish is not supported by the system. #pw-group-session
+ * @property string $tableSalt Additional hash for other (non-authentication) purposes. #pw-group-system @since 3.0.164
  * 
  * @property bool $internal This is automatically set to FALSE when PW is externally bootstrapped. #pw-group-runtime
  * @property bool $external This is automatically set to TRUE when PW is externally bootstrapped. #pw-internal
  * @property bool $cli This is automatically set to TRUE when PW is booted as a command line (non HTTP) script. #pw-group-runtime
+ * @property string $serverProtocol Current server protocol, one of: HTTP/1.1, HTTP/1.0, HTTP/2, or HTTP/2.0. #pw-group-runtime @since 3.0.166
  * @property string $versionName This is automatically populated with the current PW version name (i.e. 2.5.0 dev) #pw-group-runtime
  * @property int $inputfieldColumnWidthSpacing Used by some admin themes to commmunicate to InputfieldWrapper at runtime. #pw-internal
+ * @property array InputfieldWrapper Settings specific to InputfieldWrapper class #pw-internal
  * @property bool $debugMarkupQA Set to true to make the MarkupQA class report verbose debugging messages (to superusers). #pw-internal
+ * @property array $markupQA Optional settings for MarkupQA class used by FieldtypeTextarea module. #pw-group-modules
+ * @property string|null $pagerHeadTags Populated at runtime to contain `<link rel=prev|next />` tags for document head, after pagination has been rendered by MarkupPagerNav module. #pw-group-runtime 
+ * @property array $statusFiles File inclusions for ProcessWire’s runtime statuses/states. #pw-group-system @since 3.0.142
+ * @property int $status Value of current system status/state corresponding to ProcessWire::status* constants. #pw-internal
+ * @property null|bool $disableUnknownMethodException Disable the “Method does not exist or is not callable in this context” exception. (default=null) #pw-internal
+ * @property string|null $phpMailAdditionalParameters Additional params to pass to PHP’s mail() function (when used), see $additional_params argument at https://www.php.net/manual/en/function.mail.php #pw-group-system
  * 
- * @property int $rootPageID ID of homepage (usually 1) #pw-group-system-IDs
- * @property int $adminRootPageID ID of admin root page #pw-group-system-IDs
- * @property int $trashPageID #pw-group-system-IDs
- * @property int $loginPageID #pw-group-system-IDs
- * @property int $http404PageID #pw-group-system-IDs
- * @property int $usersPageID #pw-group-system-IDs
+ * @property int $rootPageID Page ID of homepage (usually 1) #pw-group-system-IDs
+ * @property int $adminRootPageID Page ID of admin root page #pw-group-system-IDs
+ * @property int $trashPageID Page ID of the trash page. #pw-group-system-IDs
+ * @property int $loginPageID Page ID of the admin login page. #pw-group-system-IDs
+ * @property int $http404PageID Page ID of the 404 “page not found” page. #pw-group-system-IDs
+ * @property int $usersPageID Page ID of the page having users as children. #pw-group-system-IDs
  * @property array $usersPageIDs Populated if multiple possible users page IDs (parent for users pages) #pw-group-system-IDs
- * @property int $rolesPageID #pw-group-system-IDs
- * @property int $permissionsPageID #pw-group-system-IDs
- * @property int $guestUserPageID #pw-group-system-IDs
- * @property int $superUserPageID #pw-group-system-IDs
- * @property int $guestUserRolePageID #pw-group-system-IDs
- * @property int $superUserRolePageID #pw-group-system-IDs
- * @property int $userTemplateID #pw-group-system-IDs
+ * @property int $rolesPageID Page ID of the page having roles as children. #pw-group-system-IDs
+ * @property int $permissionsPageID Page ID of the page having permissions as children. #pw-group-system-IDs
+ * @property int $guestUserPageID Page ID of the guest (default/not-logged-in) user. #pw-group-system-IDs
+ * @property int $superUserPageID Page ID of the original superuser (created during installation). #pw-group-system-IDs
+ * @property int $guestUserRolePageID Page ID of the guest user role (inherited by all users, not just guest). #pw-group-system-IDs
+ * @property int $superUserRolePageID Page ID of the superuser role. #pw-group-system-IDs
+ * @property int $userTemplateID Template ID of the user template. #pw-group-system-IDs
  * @property array $userTemplateIDs Array of template IDs when multiple allowed for users.  #pw-group-system-IDs
- * @property int $roleTemplateID #pw-group-system-IDs
- * @property int $permissionTemplateID #pw-group-system-IDs
- * @property int $externalPageID ID of page assigned to $page API variable when externally bootstrapped #pw-group-system-IDs
- * @property array $preloadPageIDs IDs of pages that will be preloaded at beginning of request #pw-group-system-IDs
- * @property int $installed Timestamp of when this PW was installed, set automatically for compatibility detection. #pw-group-system
+ * @property int $roleTemplateID Template ID of the role template. #pw-group-system-IDs
+ * @property int $permissionTemplateID Template ID of the permission template. #pw-group-system-IDs
+ * @property int $externalPageID Page ID of page assigned to $page API variable when externally bootstrapped #pw-group-system-IDs
+ * @property array $preloadPageIDs Page IDs of pages that will always be preloaded at beginning of request #pw-group-system-IDs
+ * @property int $installed Timestamp of when this PW was installed, set automatically by the installer for future compatibility detection. #pw-group-system
  *
  */
 class Config extends WireData {
 
+	/**
+	 * Constant for verbose debug mode (uses more memory)
+	 * 
+	 */
+	const debugVerbose = 2;
+
+	/**
+	 * Get config property
+	 * 
+	 * @param string $key
+	 * @return string|array|int|bool|object|callable|null
+	 * 
+	 */
+	public function get($key) {
+		$value = parent::get($key);
+		if($value === null) {
+			// runtime properties
+			if($key === 'serverProtocol') {
+				$value = $this->serverProtocol();
+			} else if($key === 'tableSalt') {
+				$value = parent::get('installed');
+				if(!$value) $value = @filemtime($this->paths->assets . 'active.php'); 
+				$this->data['tableSalt'] = $value;
+			}
+		}
+		return $value;
+	}
+
 	/**
 	 * Get URL for requested resource or module
 	 * 
@@ -162,7 +235,7 @@ class Config extends WireData {
 	 * $url = $config->urls->admin; 
 	 * ~~~~~
 	 * 
-	 * @param string $for Predefined ProcessWire URLs property or module name
+	 * @param string|Wire $for Predefined ProcessWire URLs property or module name
 	 * @return string|null
 	 * 
 	 */
@@ -171,15 +244,161 @@ class Config extends WireData {
 	}
 
 	/**
-	 * Alias for the url() method
+	 * Get URL for requested resource or module or get all URLs if no argument
 	 * 
 	 * #pw-internal
 	 * 
-	 * @param string $for Predefined ProcessWire URLs property or module name
-	 * @return null|string
+	 * @param string|Wire $for Predefined ProcessWire URLs property or module name
+	 * @return null|string|Paths
+	 * @since 3.0.130
 	 * 
 	 */
-	public function urls($for) { return $this->url($for); }
+	public function urls($for = '') { 
+		return $for === '' ? $this->urls : $this->url($for); 
+	}
+
+	/**
+	 * Given a directory to a named location, updates $config->paths and $config->urls for it
+	 * 
+	 * - Paths relative to PW installation root should omit the leading slash, i.e. use `site/templates/` and NOT `/site/templates/`.
+	 * 
+	 * - If specifying just the `$dir` argument, it updates both `$config->paths` and `$config->urls` for it.
+	 * 
+	 * - If specifying both `$dir` and `$url` arguments, then `$dir` refers to `$config->paths` and `$url` refers to `$config->urls`.
+	 * 
+	 * - The `$for` argument can be: `cache`, `logs`, `files`, `tmp`, `templates`, or one of your own. Other named locations may
+	 *   also work, but since they can potentially be used before PW’s “ready” state, they may not be reliable.
+	 * 
+	 * - **Warning:** anything that changes a system URL may make the URL no longer have the protection of the root .htaccess file.
+	 *   As a result, if you modify system URLs for anything on a live server, you should also update your .htaccess file to
+	 *   reflect your changes (while leaving existing rules for original URL in place).
+	 * 
+	 * The following example would be in /site/init.php or /site/ready.php (or equivalent module method). In this example we
+	 * are changing the location (path and URL) of our /site/templates/ to use a new version of the files in /site/dev-templates/
+	 * so that we can test them out with user 'karen', while all other users on the site get our regular templates. 
+	 * ~~~~~
+	 * // change templates path and URL to /site/dev-templates/ when user name is 'karen'
+	 * if($user->name == 'karen') {
+	 *   $config->setLocation('templates', 'site/dev-templates/'); 
+	 * }
+	 * ~~~~~
+	 * 
+	 * @param string $for Named location from `$config->paths` or `$config->urls`, one of: `cache`, `logs`, `files`, `tmp`, `templates`, or your own. 
+	 * @param string $dir Directory or URL to the location. Should be either a path or URL relative to current installation root (recommended), 
+	 *   or an absolute disk path that resolves somewhere in current installation root. If specifying an absolute path outside of the installation
+	 *   root, then you’ll also want to provide the $url argument since PW won’t know it. You may also specify a blank string for this argument 
+	 *   if you only want to set the $url argument. 
+	 * @param string|bool $url If the $dir argument represents both the path and URL relative to site root, you can omit this argument. 
+	 *   If path and URL cannot be derived from one another, or you only want to modify the $url (leaving $dir blank), you 
+	 *   can specify the URL in this argument. Specify boolean false if you only want to set the $dir (path) and not detect the $url from it. 
+	 * @return self
+	 * @throws WireException If request cannot be accommodated
+	 * @since 3.0.141
+	 * 
+	 */
+	public function setLocation($for, $dir, $url = '') {
+		
+		if($for === 'root') throw new WireException('Root path can only be changed at boot');
+		
+		if(!empty($dir)) {
+			$rootPath = $this->paths->get('root');
+			
+			// make sure path uses unix-style slashes
+			$dir = Paths::normalizeSeparators($dir);
+
+			// if given path is inclusive of root path, make path relative to site root
+			if(strpos($dir, $rootPath) === 0) $dir = substr($dir, strlen($rootPath));
+
+			// ensure trailing slash
+			if(substr($dir, -1) !== '/') $dir .= '/';
+		}
+		
+		// now determine the URL to set
+		if($url === false) {
+			// arguments say to skip setting URL
+		} else if(empty($url)) {
+			// URL and path are the same relative to site root
+			if(!empty($dir)) $url = $dir;
+		} else {
+			// given a custom URL
+			$rootUrl = $this->urls->get('root');
+			// if URL begins at PW installation root, remove the root part of the URL
+			if(strpos($url, $rootUrl) === 0) $url = substr($url, strlen($rootUrl)); 
+			// ensure trailing slash
+			if(substr($url, -1) !== '/' && strpos($url, '?') === false && strpos($url, '#') === false) $url .= '/';
+		}
+		
+		if(!empty($dir)) $this->paths->set($for, $dir);
+		if(!empty($url)) $this->urls->set($for, $url);
+		
+		return $this;
+	}
+
+	/**
+	 * Change or set just the server disk path for the named location (leaving URL as-is)
+	 * 
+	 * - If you want to update both disk path and URL at the same time, or if URL and path are going to be the same relative to 
+	 *   installation root, use the `setLocation()` method instead.
+	 * 
+	 * - Paths relative to PW installation root should omit the leading slash, i.e. use `site/templates/` and NOT `/site/templates/`.
+	 * 
+	 * - The `$for` argument can be: `cache`, `logs`, `files`, `tmp`, `templates`, or one of your own. Other named locations may
+	 *   also work, but since they can potentially be used before PW’s “ready” state, they may not be reliable.
+	 * 
+	 * @param string $for Named location from `$config->paths`, one of: `cache`, `logs`, `files`, `tmp`, `templates`, or your own. 
+	 * @param string $path Path relative to PW installation root (no leading slash), or absolute path if not. 
+	 * @return self
+	 * @throws WireException
+	 * @since 3.0.141
+	 * 
+	 */
+	public function setPath($for, $path) {
+		return $this->setLocation($for, $path, false);
+	}
+
+	/**
+	 * Change or set just the URL for the named location (leaving server disk path as-is)
+	 * 
+	 * - If you want to update both disk path and URL at the same time, or if URL and path are going to be the same relative to 
+	 *   installation root, use the `setLocation()` method instead.
+	 *
+	 * - Paths relative to PW installation root should omit the leading slash, i.e. use `site/templates/` and NOT `/site/templates/`.
+	 *
+	 * - The `$for` argument can be: `cache`, `logs`, `files`, `tmp`, `templates`, or one of your own. Other named locations may
+	 *   also work, but since they can potentially be used before PW’s “ready” state, they may not be reliable.
+	 * 
+	 * - **Warning:** anything that changes a system URL may make the URL no longer have the protection of the root .htaccess file.
+	 *   As a result, if you modify system URLs for anything on a live server, you should also update your .htaccess file to
+	 *   reflect your changes (while leaving existing rules for original URL in place).
+	 * 
+	 * The following examples would go in /site/ready.php. 
+	 * 
+	 * Let’s say we created a symbolic link in our web root `/tiedostot/` (Finnish for “files”) that points to /site/assets/files/.
+	 * We want all of our file URLs to appear as “/tiedostot/1234/img.jpg” rather than “/site/assets/files/1234/img.jpg”. We would
+	 * change the URL for ProcessWire’s `$config->urls->files` to point there like this example below. (Please also see warning above)
+	 * ~~~~~
+	 * if($page->template != 'admin') {
+	 *   $config->setUrl('files', 'tiedostot/'); 
+	 * }
+	 * ~~~~~
+	 * In this next example, we are changing all of our file URLs on the front-end to point a cookieless subdomain that maps all 
+	 * requests to the root path of https://files.domain.com to /site/assets/files/. The example works for CDNs as well. 
+	 * ~~~~~
+	 * if($page->template != 'admin) {
+	 *   $config->setUrl('files', 'https://files.domain.com/'); 
+	 * }
+	 * ~~~~~
+	 *
+	 * @param string $for Named location from `$config->urls`, one of: `cache`, `logs`, `files`, `tmp`, `templates`, or your own. 
+	 * @param string $url URL relative to PW installation root (no leading slash) or absolute URL if not (optionally including scheme and domain).
+	 * @return self
+	 * @throws WireException
+	 * @since 3.0.141
+	 *
+	 */
+	public function setUrl($for, $url) {
+		return $this->setLocation($for, '', $url);
+	}
 
 	/**
 	 * Get disk path for requested resource or module
@@ -203,26 +422,41 @@ class Config extends WireData {
 	}
 
 	/**
-	 * Alias for the path() method
+	 * Get disk path for requested resource or module or get all paths if no argument
 	 *
 	 * #pw-internal
 	 *
 	 * @param string $for Predefined ProcessWire paths property or module name
-	 * @return null|string
+	 * @return null|string|Paths
+	 * @since 3.0.130
 	 *
 	 */
-	public function paths($for) { return $this->paths($for); }
+	public function paths($for = '') { 
+		return $for === '' ? $this->paths : $this->path($for); 
+	}
 
 	/**
 	 * List of config keys that are also exported in javascript
 	 *
 	 */
 	protected $jsFields = array();
+	
+	/**
+	 * Values $config->jsConfig()
+	 *
+	 * @var array
+	 *
+	 */
+	protected $jsData = array();
 
 	/**
 	 * Set or retrieve a config value to be shared with javascript
 	 * 
-	 * Values are set to the Javascript variable `ProcessWire.config[key]`. 
+	 * Values are set to the Javascript variable `ProcessWire.config[key]`.
+	 * 
+	 * Note: In ProcessWire 3.0.173+ when setting new values, it is preferable to use 
+	 * $config->jsConfig() instead, unless your intended use is to share an 
+	 * existing $config property with JS. 
 	 * 
 	 * 1. Specify a $key and $value to set a JS config value. 
 	 *
@@ -266,6 +500,7 @@ class Config extends WireData {
 			foreach($this->jsFields as $field) {
 				$data[$field] = $this->get($field); 
 			}
+			$data = array_merge($data, $this->jsData);
 			return $data; 
 
 		} else if(is_null($value)) {
@@ -279,6 +514,7 @@ class Config extends WireData {
 				return $a;
 			} else {
 				// return value for just one key
+				if(isset($this->jsData[$key])) return $this->jsData[$key];
 				return in_array($key, $this->jsFields) ? $this->get($key) : null;
 			}
 			
@@ -302,6 +538,56 @@ class Config extends WireData {
 		$this->jsFields[] = $key; 
 		return parent::set($key, $value); 
 	}
+
+	/**
+	 * Set or retrieve a config value exclusive to Javascript (ProcessWire.config)
+	 *
+	 * Values are set to the Javascript variable `ProcessWire.config[key]`.
+	 * 
+	 * Unlike $config->js(), values get or set are exclusive to JS config only. 
+	 * 
+	 * Values set with this method can be retrieved via $config->js() or $config->jsConfig(),
+	 * but they cannot be retrieved from $config->['key'] or $config->get('key').
+	 * 
+	 * If setting a new property for the JS config it is recommended that you use this
+	 * method rather than $config->js() in ProcessWire 3.0.173+. If backwards compatibility
+	 * is needed then you should still use $config->js().
+	 *
+	 * 1. Specify a $key and $value to set a JS config value.
+	 *
+	 * 2. Specify only a $key and omit the $value in order to retrieve an existing set value.
+	 *
+	 * 3. Specify no params to retrieve in array of all existing set values.
+	 *
+	 * ~~~~~
+	 * // Set a property from PHP
+	 * $config->jsConfig('mySettings', [
+	 *   'foo' => 'bar',
+	 *   'bar' => 123,
+	 * ]);
+	 *
+	 * // Get a property (from PHP)
+	 * $mySettings = $config->jsConfig('mySettings');
+	 * ~~~~~
+	 * ~~~~~
+	 * // Get a property (from Javascript):
+	 * var mySettings = ProcessWire.config.mySettings;
+	 * console.log(mySettings.foo);
+	 * console.log(mySettings.bar);
+	 * ~~~~~
+	 *
+	 * @param string $key Name of property to get or set or omit to return all data
+	 * @param mixed|null $value Specify value to set or omit (null) to get
+	 * @return mixed|null|array|self Returns null if $key not found, value when getting, self when setting, or array when getting all
+	 * @since 3.0.173
+	 *
+	 */
+	public function jsConfig($key = null, $value = null) {
+		if($key === null) return $this->jsData; // get all
+		if($value === null) return isset($this->jsData[$key]) ? $this->jsData[$key] : null; // get property
+		$this->jsData[$key] = $value; // set property
+		return $this;
+	}
 	
 	/**
 	 * Allow for getting/setting config properties via method call
@@ -324,6 +610,9 @@ class Config extends WireData {
 	 *   'siteOnly' => true, 
 	 *   'cachePath' => $config->paths->root . '.my-cache/'
 	 * ]);
+	 * 
+	 * // To unset a property specify null for first argument and property to unset as second argument
+	 * $config->fileCompilerOptions(null, 'siteOnly'); 
 	 * ~~~~~
 	 *
 	 * #pw-internal
@@ -358,7 +647,14 @@ class Config extends WireData {
 				}
 			} else {
 				// property and value provided
-				$value[$property] = $arguments[1];
+				if($property === null && is_string($arguments[1])) {
+					// unset property
+					$property = $arguments[1];
+					unset($value[$property]); 
+				} else {
+					// set property with value
+					$value[$property] = $arguments[1];
+				}
 				parent::set($method, $value);
 			}
 		} else if($numArgs === 1) {
@@ -368,5 +664,248 @@ class Config extends WireData {
 		
 		return $this;
 	}
+
+	/**
+	 * Return true if current PHP version is equal to or newer than the given version 
+	 * 
+	 * ~~~~~
+	 * if($config->phpVersion('7.0.0')) {
+	 *   // PHP version is 7.x
+	 * }
+	 * ~~~~~
+	 * 
+	 * #pw-group-tools
+	 * 
+	 * @param string|null $minVersion
+	 * @return bool
+	 * @since 3.0.101
+	 * 
+	 */
+	public function phpVersion($minVersion) {
+		return version_compare(PHP_VERSION, $minVersion) >= 0;
+	}
+
+	/**
+	 * Check if current ProcessWire version is equal to or newer than given version, or return current version
+	 * 
+	 * If no version argument is given, it simply returns the current ProcessWire version (3.0.130+)
+	 * 
+	 * ~~~~~
+	 * if($config->version('3.0.100')) {
+	 *   // ProcessWire version is 3.0.100 or newer
+	 * }
+	 * ~~~~~
+	 * 
+	 * #pw-group-tools
+	 * 
+	 * @param string $minVersion Specify version string if you want to compare against current version
+	 * @return bool|string Returns current version if no argument given (3.0.130+), OR boolean if given a version argument: 
+	 *  - If given version is older than current, returns false.
+	 *  - If given version is equal to or newer than current, returns true.
+	 * @since 3.0.106 with no-argument behavior added in 3.0.130
+	 * 
+	 */
+	public function version($minVersion = '') {
+		if($minVersion === '') return $this->version;
+		return version_compare($this->version, $minVersion) >= 0;
+	}
+
+	/**
+	 * Was this ProcessWire installation installed after a particular date?
+	 * 
+	 * #pw-group-tools
+	 * 
+	 * @param int|string $date Unix timestamp or strtotime() compatible date string
+	 * @return bool
+	 * @see Config::installedBefore(), Config::installed
+	 * @since 3.0.129
+	 * 
+	 */
+	public function installedAfter($date) {
+		if(!ctype_digit("$date")) $date = strtotime($date);
+		return $this->installed > $date; 
+	}
+
+	/**
+	 * Was this ProcessWire installation installed before a particular date?
+	 * 
+	 * #pw-group-tools
+	 *
+	 * @param int|string $date Unix timestamp or strtotime() compatible date string
+	 * @return bool
+	 * @see Config::installedAfter(), Config::installed
+	 * @since 3.0.129
+	 *
+	 */
+	public function installedBefore($date) {
+		if(!ctype_digit("$date")) $date = strtotime($date);
+		return $this->installed < $date; 
+	}
+
+	/**
+	 * Get current server protocol (for example: "HTTP/1.1")
+	 * 
+	 * This can be accessed by property `$config->serverProtocol`
+	 * 
+	 * #pw-group-tools
+	 * #pw-group-runtime
+	 * 
+	 * @return string
+	 * @since 3.0.166
+	 * 
+	 */
+	protected function serverProtocol() {
+		$protos = array('HTTP/1.1', 'HTTP/1.0', 'HTTP/2', 'HTTP/2.0');
+		$proto = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1';
+		return $protos[(int) array_search($proto, $protos, true)];
+	}
+
+	/**
+	 * Current unsanitized request URL
+	 * 
+	 * - This is an alternative to `$input->url()` that’s available prior to API ready state.
+	 * - Useful if you need to know request URL from /site/config.php or other boot file.
+	 * - Returned value does not include query string, if present. 
+	 * - Returned value includes installation subdirectory, if present. 
+	 * 
+	 * ~~~~~
+	 * if($config->requestUrl() === '/products/2021/') {
+	 *   // current request URL is exactly “/products/2021/”
+	 * }
+	 * if($config->requestUrl('/products/2021/')) {
+	 *   // current request matches “/products/2021/” somewhere in URL
+	 * }
+	 * if($config->requestUrl([ 'foo', 'bar', 'baz' ])) {
+	 *   // current request has one or more of 'foo', 'bar', 'baz' in the URL
+	 * }
+	 * ~~~~~
+	 * 
+	 * #pw-group-tools
+	 * #pw-group-runtime
+	 *
+	 * @param string|array $match Optionally return URL only if some part matches given string(s) (default='')
+	 * @param string $get Specify 'path' to get and/or match path, 'query' to get and/or match query string, or omit for URL (default='')
+	 * @return string Returns URL string or blank string if $match argument used and doesn’t match.
+	 * @since 3.0.175
+	 * 
+	 */
+	public function requestUrl($match = '', $get = '') {
+		if(empty($_SERVER['REQUEST_URI'])) return '';
+		$url = $_SERVER['REQUEST_URI'];
+		$query = '';
+		if(strpos($url, '?') !== false) {
+			list($url, $query) = explode('?', $url, 2);
+		}
+		if($get === 'query') {
+			$url = $query;
+		} else if($get === 'path') {
+			$rootUrl = $this->urls->root;
+			if($rootUrl !== '/' && strpos($url, $rootUrl) === 0) {
+				$url = substr($url, strlen($rootUrl) - 1);
+			}
+		}
+		if(!strlen($url)) return '';
+		if(is_array($match)) {
+			$found = false;
+			foreach($match as $m) {
+				if(strpos($url, $m) !== false) $found = true;
+				if($found) break;
+			}
+			if(count($match) && !$found) $url = '';
+		} else if(strlen($match)) {
+			if(strpos($url, $match) === false) $url = '';
+		}
+		return $url;
+	}
+
+	/**
+	 * Current unsanitized request path (URL sans ProcessWire installation subdirectory, if present)
+	 * 
+	 * This excludes any subdirectories leading to ProcessWire installation root, if present.
+	 * Useful if you need to know request path from /site/config.php or other boot file.
+	 * 
+	 * ~~~~~
+	 * if(strpos($config->requestPath(), '/processwire/') === 0) {
+	 *   // current request path starts with “/processwire/”
+	 * }
+	 * if($config->requestPath('/processwire/')) {
+	 *   // the text “/processwire/” appears somewhere in current request path
+	 * }
+	 * if($config->requestPath([ 'foo', 'bar', 'baz' ])) {
+	 *   // current request has one or more of 'foo', 'bar', 'baz' in the path
+	 * }
+	 * ~~~~~
+	 * 
+	 * #pw-group-tools
+	 * #pw-group-runtime
+	 *
+	 * @param string|array $match Optionally return path only if some part matches given string(s) (default='')
+	 * @return string Returns path string or blank string if $match argument used and doesn’t match.
+	 * @since 3.0.175
+	 *
+	 */
+	public function requestPath($match = '') {
+		return $this->requestUrl($match, 'path');
+	}
+
+	/**
+	 * Current request method
+	 * 
+	 * This is an alternative to `$input->requestMethod()` that’s available prior to API ready state.
+	 * Useful if you need to match request method from /site/config.php or other boot file.
+	 * 
+	 * ~~~~~
+	 * if($config->requestMethod('post')) { 
+	 *   // request method is POST
+	 * }
+	 * if($config->requestMethod() === 'GET') {
+	 *   // request method is GET
+	 * }
+	 * $method = $config->requestMethod([ 'POST', 'get' ]);
+	 * if($method) {
+	 *   // method is either 'POST' or 'GET'
+	 * }
+	 * ~~~~~
+	 * 
+	 * #pw-group-tools
+	 * #pw-group-runtime
+	 * 
+	 * @param string|array $match Return found method if request method equals one given (blank if not), not case sensitive (default='')
+	 * @return string Returns one of GET, POST, HEAD, PUT, DELETE, OPTIONS, PATCH, OTHER or blank string if no match
+	 * @since 3.0.175
+	 * 
+	 */
+	public function requestMethod($match = '') {
+		$methods = array('GET', 'POST', 'HEAD', 'PUT', 'DELETE', 'OPTIONS', 'PATCH');
+		$method = isset($_SERVER['REQUEST_METHOD']) ? strtoupper($_SERVER['REQUEST_METHOD']) : '';
+		$key = array_search($method, $methods);
+		$method = $key === false ? 'OTHER' : $methods[$key];
+		if(is_array($match)) {
+			$found = '';
+			foreach($match as $m) {
+				$m = strtoupper($m);
+				if($m === $method) $found = $method;
+				if($found) break;
+			}
+			return $found;
+		}
+		return ($match ? strtoupper($match) === $method : $method);
+	}
+	
+	/**
+	 * Set the current ProcessWire instance for this object
+	 *
+	 * #pw-internal
+	 *
+	 * @param ProcessWire $wire
+	 *
+	 */
+	public function setWire(ProcessWire $wire) {
+		parent::setWire($wire);
+		$paths = $this->paths;
+		if($paths) $paths->setWire($wire);
+		$urls = $this->urls;
+		if($urls) $urls->setWire($wire);
+	}
 }
 

wire/core/ConfigurableModule.php

@@ -1,41 +1,57 @@
 <?php namespace ProcessWire;
 
 /**
- * ProcessWire ConfigurableModule Interface
+ * ProcessWire ConfigurableModule and ConfigModule Interfaces
  *
  * Provides the base interfaces required by modules.
  * 
  * This file is licensed under the MIT license
  * https://processwire.com/about/license/mit/
  *
- * ProcessWire 3.x, Copyright 2016 by Ryan Cramer
+ * ProcessWire 3.x, Copyright 2021 by Ryan Cramer
  * https://processwire.com
  *
  * 
  * About the ConfigurableModule interface
  * ======================================
  * ConfigurableModule is an interface that indicates the module is configurable by providing
- * __get() and __set() methods for getting and setting config values. Modules implementing 
- * this interface are assumed to also implement the 'Module' interface.
+ * `__get()` and `__set()` methods for getting and setting config values. Modules implementing 
+ * this interface are assumed to also implement the `Module` interface.
  * 
  * The module must also provide one (1) of the following:
  *
- * 1. A getModuleConfigInputfields([$data]) method (static or non-static); OR
- * 2. A separate ModuleName.config.php file that just populates $config array; OR
- * 3. A separate ModuleNameConfig.php file that contains a ModuleConfig class.
+ * 1. A `getModuleConfigInputfields([$data])` method (static or non-static); OR
+ * 2. A separate `ModuleName.config.php` file that just populates $config array; OR
+ * 3. A separate `ModuleNameConfig.php` file that contains a ModuleConfig class.
  *
  * For more details about the above options, see the commented methods within
  * the interface.
  *
- * When you use this as an interface, you MUST also use 'Module' as an interface,
- * i.e. "class Something implements Module, ConfigurableModule"
+ * When you use this as an interface, you MUST also use `Module` as an interface,
+ * i.e. `class Something implements Module, ConfigurableModule`
  *
- * Hint: Make your ConfigurableModule classes inherit from WireData, which already has
+ * Hint: Make your ConfigurableModule classes inherit from `WireData`, which already has
  * the get/set required methods.
  *
- * You may optionally specify a handler method for configuration data: setConfigData().
+ * You may optionally specify a handler method for configuration data: `setConfigData()`.
  * If present, it will be used. See commented function reference in the interface below.
  * 
+ * 
+ * About the ConfigModule interface (3.0.179+)
+ * ===========================================
+ * This interface indicates the module can receive config settings, but is not
+ * interactively configurable. Use this for modules where configuration will
+ * only be managed from the API/code side. Config settings must be saved using
+ * `$modules->saveConfig()`. Settings will be automatically populated to the module
+ * when it is loaded, or may be retrieved with `$modules->getConfig()`.
+ *
+ * Beyond the difference mentioned above, this interface is identical to the
+ * ConfigurableModule interface except that it needs no getModuleConfigInputfields()
+ * method nor will it use a configuration php or json file. 
+ * 
+ * A module *must not* contain both the ConfigModule and ConfigurableModule interfaces 
+ * in their implements definition at the same time, so choose just one. 
+ * 
  *
  */
 interface ConfigurableModule {
@@ -152,3 +168,16 @@ interface ConfigurableModule {
 	 */
 
 }
+
+/**
+ * ProcessWire ConfigModule interface
+ * 
+ * See notes about this interface and its differences in the ConfigurableModule documentation.
+ * 
+ * @since 3.0.179
+ *
+ */
+interface ConfigModule {
+	public function __get($key);
+	public function __set($key, $value);
+}

wire/core/Database.php

@@ -104,7 +104,7 @@ class Database extends \mysqli implements WireDatabase {
 
 		if($this->debug) {
 			$timerKey = Debug::timer();
-			if(!$timerFirstStartTime) $timerFirstStartTime = $timerKey; 
+			if(!$timerFirstStartTime) $timerFirstStartTime = (float) $timerKey; 
 		} else $timerKey = null; 
 
 		$result = @parent::query($sql, $resultmode); 
@@ -113,9 +113,9 @@ class Database extends \mysqli implements WireDatabase {
 			if($this->debug) { 
 				if(isset($result->num_rows)) $sql .= " [" . $result->num_rows . " rows]";
 				if(!is_null($timerKey)) {
-					$elapsed = Debug::timer($timerKey); 
+					$elapsed = (float) Debug::timer($timerKey); 
 					$timerTotalQueryTime += $elapsed; 
-					$timerTotalSinceStart = Debug::timer() - $timerFirstStartTime; 
+					$timerTotalSinceStart = ((float) Debug::timer()) - $timerFirstStartTime; 
 					$sql .= " [{$elapsed}s, {$timerTotalQueryTime}s, {$timerTotalSinceStart}s]";
 				}
 				$this->queryLog($sql); 

wire/core/DatabaseQuery.php

@@ -10,7 +10,7 @@
  * of what other methods/objects have done to it. It also means being able
  * to build a complex query without worrying about correct syntax placement.
  * 
- * ProcessWire 3.x, Copyright 2016 by Ryan Cramer
+ * ProcessWire 3.x, Copyright 2021 by Ryan Cramer
  * https://processwire.com
  *
  * This file is licensed under the MIT license
@@ -18,7 +18,12 @@
  * 
  * @property array $where
  * @property array $bindValues
- * @properety array $bindIndex
+ * @property array $bindKeys
+ * @property array $bindOptions
+ * @property string $query
+ * @property string $sql
+ * 
+ * @method $this where($sql, array $params = array())
  *
  */
 abstract class DatabaseQuery extends WireData {
@@ -32,63 +37,397 @@ abstract class DatabaseQuery extends WireData {
 	protected $bindValues = array();
 
 	/**
-	 * Index of bound values per originating method
+	 * Bound parameter types of name => \PDO::PARAM_* type constant
 	 * 
-	 * Indexed by originating method, with values as the bound parameter names as in $bindValues.
-	 * This is populated by the setupBindValues() method
+	 * Populated only when a type is provided to the bindValue() call
 	 * 
-	 * @var array 
+	 * @var array
 	 * 
 	 */
-	protected $bindIndex = array();
+	protected $bindTypes = array();
+	
+	/**
+	 * @var array
+	 *
+	 */
+	protected $bindKeys = array();
+
+	/**
+	 * Method names for building DB queries
+	 * 
+	 * @var array
+	 * 
+	 */
+	protected $queryMethods = array();
+
+	/**
+	 * @var int
+	 * 
+	 */
+	protected $instanceNum = 0;
+
+	/**
+	 * @var int
+	 * 
+	 */
+	protected $keyNum = 0;
+
+	/**
+	 * @var array
+	 * 
+	 */
+	protected $bindOptions = array(
+		'prefix' => 'pw', // prefix for auto-generated global keys
+		'suffix' => 'X', // 1-character suffix for auto-generated keys
+		'global' => false // globally unique among all bind keys in all instances?
+	);
+	
+	/**
+	 * @var int
+	 * 
+	 */
+	static $numInstances =  0;
+
+	/**
+	 * Construct
+	 * 
+	 */
+	public function __construct() {
+		self::$numInstances++;
+		$this->instanceNum = self::$numInstances;
+		$this->addQueryMethod('where', " \nWHERE ", " \nAND ");
+		parent::__construct();
+	}
+
+	/**
+	 * Add a query method
+	 * 
+	 * #pw-internal
+	 * 
+	 * @param string $name
+	 * @param string $prepend Prepend first statement with this
+	 * @param string $split Split multiple statements with this
+	 * @param string $append Append this to last statement (if needed)
+	 * @since 3.0.157
+	 * 
+	 */
+	protected function addQueryMethod($name, $prepend = '', $split = '', $append = '') {
+		$this->queryMethods[$name] = array($prepend, $split, $append);
+		$this->set($name, array());
+	}
+	
+	/**
+	 * Get or set a bind option
+	 *
+	 * @param string|bool $optionName One of 'prefix' or 'global', boolean true to get/set all 
+	 * @param null|int|string|array $optionValue Omit when getting, Specify option value to set, or array when setting all
+	 * @return string|int|array
+	 * @since 3.0.157
+	 *
+	 */
+	public function bindOption($optionName, $optionValue = null) {
+		if($optionName === true) {
+			if(is_array($optionValue)) $this->bindOptions = array_merge($this->bindOptions, $optionValue);
+			return $this->bindOptions;
+		} else if($optionValue !== null) {
+			$this->bindOptions[$optionName] = $optionValue;
+		}
+		return isset($this->bindOptions[$optionName]) ? $this->bindOptions[$optionName] : null;
+	}
 
 	/**
 	 * Bind a parameter value
 	 * 
 	 * @param string $key Parameter name
 	 * @param mixed $value Parameter value
+	 * @param null|int|string Optionally specify value type: string, int, bool, null or PDO::PARAM_* constant. 
 	 * @return $this
 	 * 
 	 */
-	public function bindValue($key, $value) {
+	public function bindValue($key, $value, $type = null) {
+		if(strpos($key, ':') !== 0) $key = ":$key";
 		$this->bindValues[$key] = $value; 
+		$this->bindKeys[$key] = $key;
+		if($type !== null) $this->setBindType($key, $type);
 		return $this; 
 	}
 
 	/**
-	 * Get bound parameter values, optionally for a specific method call
+	 * Bind value and get unique key that refers to it in one step
 	 * 
-	 * @param string $method
-	 * @return array
+	 * @param string|int|float $value
+	 * @param null|int|string $type
+	 * @return string
+	 * @since 3.0.157
 	 * 
 	 */
-	public function getBindValues($method = '') {
-		if(empty($method)) return $this->bindValues;
-		if(!isset($this->bindIndex[$method])) return array();
-		$names = $this->bindIndex[$method];
-		$values = array();
-		foreach($names as $name) {
-			$values[$name] = $this->bindValues[$name];
+	public function bindValueGetKey($value, $type = null) {
+		$key = $this->getUniqueBindKey(array('value' => $value)); 
+		$this->bindValue($key, $value, $type);
+		return $key;
+	}
+	
+	/**
+	 * Get or set multiple parameter values
+	 *
+	 * #pw-internal
+	 *
+	 * @param array|null $bindValues Omit to get or specify array to set
+	 * @return $this|array Returns array when getting or $this when setting
+	 * @since 3.0.156
+	 *
+	 */
+	public function bindValues($bindValues = null) {
+		if(is_array($bindValues)) {
+			foreach($bindValues as $key => $value) {
+				$this->bindValue($key, $value);
+			}
+			return $this;
+		} else {
+			return $this->bindValues;
 		}
-		return $values;	
 	}
 
+	/**
+	 * Set bind type
+	 * 
+	 * #pw-internal
+	 * 
+	 * @param string $key
+	 * @param int|string $type
+	 * 
+	 */
+	public function setBindType($key, $type) {
+		
+		if(is_int($type) || ctype_digit("$type")) {
+			$this->bindTypes[$key] = (int) $type;
+		}
+		
+		switch(strtolower(substr($type, 0, 3))) {
+			case 'str': $type = \PDO::PARAM_STR; break;
+			case 'int': $type = \PDO::PARAM_INT; break;
+			case 'boo': $type = \PDO::PARAM_BOOL; break;
+			case 'nul': $type = \PDO::PARAM_NULL; break;
+			default: $type = null;
+		}
+		
+		if($type !== null) $this->bindTypes[$key] = $type;
+	}
+
+	/**
+	 * Get or set all bind types
+	 * 
+	 * #pw-internal
+	 * 
+	 * @param array|null $bindTypes Omit to get, or specify associative array of [ ":bindKey" => int ] to set
+	 * @return array|$this Returns array when getting or $this when setting
+	 * @since 3.0.157
+	 * 
+	 */
+	public function bindTypes($bindTypes = null) {
+		if(is_array($bindTypes)) {
+			$this->bindTypes = array_merge($this->bindTypes, $bindTypes); // set
+			return $this;
+		} 
+		return $this->bindTypes; // get
+	}
+
+	/**
+	 * Get a unique key to use for bind value
+	 * 
+	 * Note if you given a `key` option, it will only be used if it is determined unique,
+	 * otherwise it’ll auto-generate one. When using your specified key, it is the only
+	 * option that applies, unless it is not unique and the method has to auto-generate one.
+	 * 
+	 * @param array $options 
+	 *  - `key` (string): Preferred bind key, or omit (blank) to auto-generate (digit only keys not accepted)
+	 *  - `value` (string|int): Value to use as part of the generated key
+	 *  - `prefix` (string): Prefix to override default
+	 *  - `global` (bool): Require globally unique among all instances?
+	 * @return string Returns bind key/name in format ":name" (with leading colon)
+	 * @since 3.0.156
+	 * 
+	 */
+	public function getUniqueBindKey(array $options = array()) {
+		
+		if(empty($options['key'])) {
+			// auto-generate key
+			$key = ':';
+			$prefix = (isset($options['prefix']) ? $options['prefix'] : $this->bindOptions['prefix']);
+			$suffix = isset($option['suffix']) && $options['suffix'] ? $options['suffix'] : $this->bindOptions['suffix'];
+			$value = isset($options['value']) ? $options['value'] : null;
+			$global = isset($options['global']) ? $options['global'] : $this->bindOptions['global'];
+			
+			if($global) $key .= $prefix . $this->instanceNum;
+			
+			if($value !== null) {
+				if(is_int($value)) {
+					$key .= "i";
+				} else if(is_string($value)) {
+					$key .= "s";
+				} else if(is_array($value)) {
+					$key .= "a";
+				} else {
+					$key .= "o";
+				}
+			} else if($prefix && !$global) {
+				$key .= $prefix;
+			} else {
+				$key .= "v";
+			}
+			
+			$n = 0;
+			$k = $key;
+			$key = $k . '0' . $suffix;
+			
+			while(isset($this->bindKeys[$key]) && ++$n) {
+				$key = $k . $n . $suffix;
+			}
+			
+		} else {
+			// provided key, make sure it is valid and unique (this part is not typically used)
+			$key = ltrim($options['key'], ':') . 'X';
+			if(!ctype_alnum(str_replace('_', '', $key))) $key = $this->wire('database')->escapeCol($key);
+			if(empty($key) || ctype_digit($key[0]) || isset($this->bindKeys[":$key"])) {
+				// if key is not valid, then auto-generate one instead
+				unset($options['key']);
+				$key = $this->getUniqueBindKey($options);
+			} else {
+				$key = ":$key";
+			}
+		}
+		
+		$this->bindKeys[$key] = $key;
+		
+		return $key;
+	}
+
+	/**
+	 * Get bind values, with options
+	 * 
+	 * - If given a \PDOStatement or DatabaseQuery, it is assumed to be the `query` option. 
+	 * - When copying, you may prefer to use the copyBindValuesTo() method instead (more readable).
+	 * 
+	 * Note: The $options argument was added in 3.0.156, prior to this it was a $method argument, 
+	 * which was never used so has been removed. 
+	 * 
+	 * @param string|\PDOStatement|DatabaseQuery|array $options Optionally specify an option:
+	 *  - `query` (\PDOStatement|DatabaseQuery): Copy bind values to this query object (default=null)
+	 *  - `count` (bool): Get a count of values rather than array of values (default=false) 3.0.157+
+	 *  - `inSQL` (string): Only get bind values referenced in this given SQL statement
+	 * @return array|int Returns one of the following:
+	 *  - Associative array in format [ ":column" => "value" ] where each "value" is int, string or NULL. 
+	 *  - if `count` option specified as true then it returns a count of values instead. 
+	 * 
+	 */
+	public function getBindValues($options = array()) {
+		
+		$defaults = array(
+			'query' => is_object($options) ? $options : null, 
+			'count' => false,
+			'inSQL' => '', 
+		);
+		
+		$options = is_array($options) ? array_merge($defaults, $options) : $defaults;
+		$query = $options['query'];
+		$bindValues = $this->bindValues;
+		
+		if(!empty($options['inSQL'])) {
+			foreach(array_keys($bindValues) as $bindKey) {
+				if(strpos($options['inSQL'], $bindKey) === false) {
+					unset($bindValues[$bindKey]);
+				} else if(!preg_match('/' . $bindKey . '\b/', $options['inSQL'])) {
+					unset($bindValues[$bindKey]);
+				}
+			}
+		}
+	
+		if(is_object($query)) {
+			if($query instanceof \PDOStatement) {
+				foreach($bindValues as $k => $v) {
+					$type = isset($this->bindTypes[$k]) ? $this->bindTypes[$k] : $this->pdoParamType($v);
+					$query->bindValue($k, $v, $type);
+				}
+			} else if($query instanceof DatabaseQuery && $query !== $this) {
+				$query->bindValues($bindValues);
+				$query->bindTypes($this->bindTypes);
+			}
+		}
+		
+		return $options['count'] ? count($bindValues) : $bindValues;	
+	}
+
+	/**
+	 * Copy bind values from this query to another given DatabaseQuery or \PDOStatement
+	 * 
+	 * This is a more readable interface to the getBindValues() method and does the same 
+	 * thing as passing a DatabaseQuery or PDOStatement to the getBindValues() method. 
+	 * 
+	 * @param DatabaseQuery|\PDOStatement $query
+	 * @param array $options Additional options
+	 *  - `inSQL` (string): Only copy bind values that are referenced in given SQL string
+	 * @return int Number of bind values that were copied
+	 * @since 3.0.157
+	 * 
+	 */
+	public function copyBindValuesTo($query, array $options = array()) {
+		$options['query'] = $query;
+		if(!isset($options['count'])) $options['count'] = true;
+		return $this->getBindValues($options);
+	}
+
+	/**
+	 * Copy queries from this DatabaseQuery to another DatabaseQuery 
+	 * 
+	 * If you want to copy bind values you should also call copyBindValuesTo($query) afterwards.
+	 * 
+	 * @param DatabaseQuery $query Query to copy data to
+	 * @param array $methods Optionally specify the names of methods to copy, otherwise all are copied
+	 * @return int Total items copied
+	 * @since 3.0.157
+	 * 
+	 */
+	public function copyTo(DatabaseQuery $query, array $methods = array()) {
+		
+		$numCopied = 0;
+		if($query === $this) return 0;
+		if(!count($methods)) $methods = array_keys($this->queryMethods); 
+		
+		foreach($methods as $method) {
+			if($method === 'bindValues') continue;
+			$fromValues = $this->$method; // array
+			if(!is_array($fromValues)) continue; // nothing to import
+			$toValues = $query->$method; 
+			if(!is_array($toValues)) continue; // query does not have this method
+			$query->set($method, array_merge($toValues, $fromValues)); 
+			$numCopied += count($fromValues);
+		}
+		
+		return $numCopied;
+	}
+	
 	/**
 	 * Enables calling the various parts of a query as functions for a fluent interface.
 	 * 
 	 * Examples (all in context of DatabaseQuerySelect): 
+	 * ~~~~~
+	 * $query->select("id")->from("mytable")->orderby("name"); 
+	 * ~~~~~
+	 * To bind one or more named parameters, specify associative array as second argument: 
+	 * ~~~~~
+	 * $query->where("name=:name", [ ':name' => $page->name ]); 
+	 * ~~~~~
+	 * To bind one or more implied parameters, use question marks and specify regular array:
+	 * ~~~~~
+	 * $query->where("name=?, id=?", [ $page->name, $page->id ]);
+	 * ~~~~~
+	 * When there is only one implied parameter, specifying an array is optional:
+	 * ~~~~~
+	 * $query->where("name=?", $page->name); 
+	 * ~~~~~
 	 * 
-	 *   $query->select("id")->from("mytable")->orderby("name"); 
-	 * 
-	 * To bind parameters, specify associative array as second argument: 
-	 * 
-	 *   $query->where("name=:name", array(':name' => $page->name)); 
-	 * 
-	 * To import query/method and bound values from another DatabaseQuery: 
-	 * 
-	 *   $query->select($anotherQuery); 
-	 * 
-	 * The "select" may be any method supported by the class. 
+	 * The "select" or "where" methods above may be any method supported by the class. 
+	 * Implied parameters (using "?") was added in 3.0.157. 
 	 * 
 	 * @param string $method
 	 * @param array $args
@@ -96,83 +435,142 @@ abstract class DatabaseQuery extends WireData {
 	 *
 	 */
 	public function __call($method, $args) {
-		if(!$this->has($method)) return parent::__call($method, $args); 
-		$curValue = $this->get($method); 
-		$value = $args[0]; 
-		if(empty($value)) return $this;
+		
+		// if(!$this->has($method)) return parent::__call($method, $args);
+		if(!isset($this->queryMethods[$method])) return parent::__call($method, $args);
+		if(!count($args)) return $this;
+		$curValue = $this->get($method);
+		if(!is_array($curValue)) $curValue = array();
+		$value = $args[0];
+		
 		if(is_object($value) && $value instanceof DatabaseQuery) {
-			// if we've been given another DatabaseQuery, load from it's $method
+			// if we've been given another DatabaseQuery, load from its $method
+			// note that if using bindValues you should also copy them separately
+			// behavior deprecated in 3.l0.157+, please use the copyTo() method instead
+			/** @var DatabaseQuery $query */
 			$query = $value;
-			$value = $query->$method; 
+			$value = $query->$method; // array
 			if(!is_array($value) || !count($value)) return $this; // nothing to import
-			$params = $query->getBindValues($method);
-		} else {
-			$params = isset($args[1]) && is_array($args[1]) ? $args[1] : null;
-		}
-		if(!empty($params)) {
-			$value = $this->setupBindValues($value, $params, $method);
+			
+		} else if(is_string($value)) {
+			// value is SQL string, number or array
+			$params = isset($args[1]) ? $args[1] : null;
+			if($params !== null && !is_array($params)) $params = array($params);
+			if(is_array($params) && count($params)) $value = $this->methodBindValues($value, $params);
+			
+		} else if(!empty($args[1])) {
+			throw new WireException("Argument error in $this::$method('string required here when using bind values', [ bind values ])"); 
 		}
+		
 		if(is_array($value)) {
 			$curValue = array_merge($curValue, $value);
 		} else {
 			$curValue[] = trim($value, ", ");
 		}
+		
 		$this->set($method, $curValue); 
+		
 		return $this; 
 	}
 
 	/**
-	 * Setup bound parameters for the given query, returning an updated $value if any renames needed to be made
+	 * Setup bind params for the given SQL provided to method call
 	 * 
-	 * @param string|array $sql
-	 * @param array $params
-	 * @param string $method Method name that the bound values are for
+	 * This is only used when params are provided as part of a method call like: 
+	 * ~~~~~
+	 * $query->where("foo=:bar", [ ":bar" => "baz" ]); // named
+	 * $query->where("foo=?", [ "baz" ]);  // implied
+	 * ~~~~~
+	 * 
+	 * #pw-internal
+	 * 
+	 * @param string $sql
+	 * @param array $values Bind values
 	 * @return string
+	 * @throws WireException
 	 * 
 	 */
-	public function setupBindValues($sql, array $params, $method) {
-		foreach($params as $name => $value) {
-			if(strpos($name, ':') !== 0) $name = ":$name";
-			$newName = $name;
-			$n = 0;
-			while(isset($this->bindValues[$newName])) {
-				$newName = $name . (++$n);
-			}
-			if($n) {
-				if(is_array($sql)) {
-					foreach($sql as $k => $v) {
-						if(strpos($v, $name) === false) continue;
-						$sql[$k] = preg_replace('/' . $name . '\b/', $newName, $v);
-					}
-				} else {
-					$sql = preg_replace('/' . $name . '\b/', $newName, $sql);
+	protected function methodBindValues($sql, array $values) {
+		
+		$numImplied = 0;
+		$numNamed = 0;
+		$_sql = $sql;
+		
+		if(!is_string($sql)) {
+			throw new WireException('methodBindValues requires a string for $sql argument');
+		}
+		
+		foreach($values as $name => $value) {
+			if(is_int($name)) {
+				// implied parameter 
+				$numImplied++;
+				if(strpos($sql, '?') === false) {
+					throw new WireException("No place for given param $name in: $_sql"); 
+				}
+				do {
+					$name = $this->getUniqueBindKey(array('value' => $value));
+				} while(strpos($sql, $name) !== false); // highly unlikely, but just in case
+				list($a, $b) = explode('?', $sql, 2);
+				$sql = $a . $name . $b;
+				
+			} else {
+				// named parameter
+				$numNamed++;
+				if(strpos($name, ':') !== 0) $name = ":$name";
+				if(strpos($sql, $name) === false) {
+					throw new WireException("Param $name not found in: $_sql"); 
 				}
-				$name = $newName;
 			}
 			$this->bindValue($name, $value);
-			if(!isset($this->bindIndex[$method])) $this->bindIndex[$method] = array();
-			$this->bindIndex[$method][] = $name;
 		}
-		return $sql;	
+		
+		if($numImplied && strpos($sql, '?') !== false) {
+			throw new WireException("Missing implied “?” param in: $_sql"); 
+		} else if($numImplied && $numNamed) {
+			throw new WireException("You may not mix named and implied params in: $_sql"); 
+		}
+		
+		return $sql;
 	}
 
+	/**
+	 * @param string $key
+	 * @param mixed $value
+	 * 
+	 */
 	public function __set($key, $value) {
 		if(is_array($this->$key)) $this->__call($key, array($value)); 
 	}
 
+	/**
+	 * @param string $key
+	 * @return array|mixed|null
+	 * 
+	 */
 	public function __get($key) {
-		if($key == 'query') return $this->getQuery();
-			else if($key == 'bindValues') return $this->bindValues;	
-			else if($key == 'bindIndex') return $this->bindIndex;
-			else return parent::__get($key); 
+		
+		if($key === 'query' || $key === 'sql') {
+			return $this->getQuery();
+		} else if($key === 'bindValues') {
+			return $this->bindValues;
+		} else if($key === 'bindOptions') {
+			return $this->bindOptions;
+		} else if($key === 'bindKeys') {
+			return $this->bindKeys;
+		}
+		
+		return parent::__get($key); 
 	}
 
 	/**
 	 * Merge the contents of current query with another (experimental/incomplete)
 	 * 
+	 * #pw-internal
+	 * 
 	 * @internal
 	 * @param DatabaseQuery $query
 	 * @return $this
+	 * @deprecated
 	 *
 	 */
 	public function merge(DatabaseQuery $query) {
@@ -184,22 +582,89 @@ abstract class DatabaseQuery extends WireData {
 
 	/** 
 	 * Generate the SQL query based on everything set in this DatabaseQuery object
+	 * 
+	 * @return string
 	 *
 	 */
 	abstract public function getQuery();
 
 	/**
-	 * Get the WHERE portion of the query
-	 *
+	 * Get SQL query with bind params populated for debugging purposes (not to be used as actual query)
+	 * 
+	 * @return string
+	 * 
 	 */
-	protected function getQueryWhere() {
-		if(!count($this->where)) return '';
-		$where = $this->where; 
-		$sql = "\nWHERE " . array_shift($where) . " ";
-		foreach($where as $s) $sql .= "\nAND $s ";
+	public function getDebugQuery() {
+		$sql = $this->getQuery();
+		$suffix = $this->bindOptions['suffix'];
+		$database = $this->wire('database');
+		foreach($this->bindValues as $bindKey => $bindValue) {
+			if(is_string($bindValue)) $bindValue = $database->quote($bindValue);
+			if($bindKey[strlen($bindKey)-1] === $suffix) {
+				$sql = strtr($sql, array($bindKey => $bindValue));
+			} else {
+				$sql = preg_replace('/' . $bindKey . '\b/', $bindValue, $sql);
+			}
+		}
 		return $sql;
 	}
 
+	/**
+	 * Return generated SQL for entire query or specific method
+	 *
+	 * @param string $method Optionally specify method name to get SQL for
+	 * @return string
+	 * @since 3.0.157
+	 *
+	 */
+	public function getSQL($method = '') {
+		return $method ? $this->getQueryMethod($method) : $this->getQuery();
+	}
+
+	/**
+	 * Return the generated SQL for specific query method
+	 *
+	 * @param string $method Specify method name to get SQL for, or blank string for entire query
+	 * @return string
+	 * @since 3.0.157
+	 *
+	 */
+	public function getQueryMethod($method) {
+		
+		if(!$method) return $this->getQuery();
+		if(!isset($this->queryMethods[$method])) return '';
+		
+		$methodName = 'getQuery' . ucfirst($method);
+		
+		if(method_exists($this, $methodName)) {
+			$sql = $this->$methodName();
+		} else {
+			list($prepend, $split, $append) = $this->queryMethods[$method];
+			$values = $this->$method;
+			if(!is_array($values)) return ''; 
+			foreach($values as $key => $value) {
+				if(!strlen(trim($value))) unset($values[$key]); // remove any blank values
+			}
+			if(!count($values)) return '';
+			$sql = trim(implode($split, $values)); 
+			if(!strlen($sql) || $sql === trim($split)) return '';
+			$sql = $prepend . $sql . $append;
+		}
+		
+		return $sql;	
+	}
+
+	/**
+	 * Get the WHERE portion of the query
+	 * 
+	protected function getQueryWhere() {
+		$where = $this->where; 
+		if(!count($where)) return '';
+		$sql = "\nWHERE " . implode(" \nAND ", $where)  . " ";
+		return $sql;
+	}
+	 */
+
 	/**
 	 * Prepare and return a PDOStatement
 	 * 
@@ -207,29 +672,87 @@ abstract class DatabaseQuery extends WireData {
 	 * 
 	 */
 	public function prepare() {
-		$query = $this->wire('database')->prepare($this->getQuery()); 
+		$query = $this->wire()->database->prepare($this->getQuery()); 
 		foreach($this->bindValues as $key => $value) {
-			$query->bindValue($key, $value); 
+			$type = isset($this->bindTypes[$key]) ? $this->bindTypes[$key] : $this->pdoParamType($value);
+			$query->bindValue($key, $value, $type); 
 		}
 		return $query; 
 	}
 
+	/**
+	 * Get the PDO::PARAM_* type for given value
+	 * 
+	 * @param string|int|null $value
+	 * @return int
+	 * 
+	 */
+	protected function pdoParamType($value) {
+		if(is_int($value)) {
+			$type = \PDO::PARAM_INT;
+		} else if($value === null) {
+			$type = \PDO::PARAM_NULL;
+		} else {
+			$type = \PDO::PARAM_STR;
+		}
+		return $type;
+	}
+
 	/**
 	 * Execute the query with the current database handle
+	 * 
+	 * @param array $options
+	 *  - `throw` (bool): Throw exceptions? (default=true)
+	 *  - `maxTries` (int): Max times to retry if connection lost during query. (default=3)
+	 *  - `returnQuery` (bool): Return PDOStatement query? If false, returns bool result of execute. (default=true)
+	 * @return \PDOStatement|bool
+	 * @throws WireDatabaseQueryException|\PDOException
 	 *
 	 */
-	public function execute() {
-		$database = $this->wire('database');
-		try { 
-			$query = $this->prepare();
-			$query->execute();
-		} catch(\Exception $e) {
-			$msg = $e->getMessage();
-			if(stripos($msg, 'MySQL server has gone away') !== false) $database->closeConnection();
-			if($this->wire('config')->allowExceptions) throw $e; // throw original
-			throw new WireException($msg); // throw WireException
+	public function execute(array $options = array()) {
+		
+		$defaults = array(
+			'throw' => true, 
+			'maxTries' => 3, 
+			'returnQuery' => true,
+		);
+	
+		$options = array_merge($defaults, $options);
+		$numTries = 0;
+		
+		do {
+			$retry = false;
+			$exception = null;
+			$result = false;
+			$query = null;
+			
+			try {
+				$query = $this->prepare();
+				$result = $query->execute();
+			} catch(\PDOException $e) {
+				$msg = $e->getMessage();
+				$code = (int) $e->getCode();
+				$retry = $code === 2006 || stripos($msg, 'MySQL server has gone away') !== false;
+				if($retry && $numTries < $options['maxTries']) {
+					$this->wire()->database->closeConnection(); // note: it reconnects automatically
+					$numTries++;
+				} else {
+					$exception = $e;
+					$retry = false;
+				}
+			}
+		} while($retry);
+		
+		if($exception && $options['throw']) {
+			if($this->wire()->config->allowExceptions) throw $exception; // throw original
+			$message = (string) $exception->getMessage();
+			$code = (int) $exception->getCode();
+			// note: re-throw below complains about wrong arguments if the above two 
+			// lines are called in the line below, so variables are intermediary
+			throw new WireDatabaseQueryException($message, $code, $exception);
 		}
-		return $query;
+		
+		return $options['returnQuery'] ? $query : $result;
 	}
 
 }

wire/core/DatabaseQuerySelect.php

@@ -46,19 +46,27 @@
  */
 class DatabaseQuerySelect extends DatabaseQuery {
 
+	/**
+	 * DB cache setting from $config
+	 * 
+	 * @var null
+	 * 
+	 */
+	static $dbCache = null;
+
 	/**
 	 * Setup the components of a SELECT query
 	 *
 	 */
 	public function __construct() {
-		$this->set('select', array()); 
-		$this->set('join', array()); 
-		$this->set('from', array()); 
-		$this->set('leftjoin', array()); 
-		$this->set('where', array()); 
-		$this->set('orderby', array()); 
-		$this->set('groupby', array()); 
-		$this->set('limit', array()); 
+		parent::__construct();
+		$this->addQueryMethod('select', 'SELECT ', ', ');
+		$this->addQueryMethod('from', " \nFROM `", '`,`', '` ');
+		$this->addQueryMethod('join', " \nJOIN ", " \nJOIN ");
+		$this->addQueryMethod('leftjoin', " \nLEFT JOIN ", " \nLEFT JOIN ");
+		$this->addQueryMethod('orderby', " \nORDER BY ", ",");
+		$this->addQueryMethod('groupby', " \nGROUP BY ", ',');
+		$this->addQueryMethod('limit', " \nLIMIT ", ',');
 		$this->set('comment', ''); 
 	}
 
@@ -68,15 +76,16 @@ class DatabaseQuerySelect extends DatabaseQuery {
 	 */
 	public function getQuery() {
 
-		$sql = 	
-			$this->getQuerySelect() . 
-			$this->getQueryFrom() . 
-			$this->getQueryJoin($this->join, "JOIN") . 
-			$this->getQueryJoin($this->leftjoin, "LEFT JOIN") . 
-			$this->getQueryWhere() . 
-			$this->getQueryGroupby() . 
-			$this->getQueryOrderby() . 
-			$this->getQueryLimit(); 
+		$sql = trim(	
+			$this->getQueryMethod('select') . 
+			$this->getQueryMethod('from') . 
+			$this->getQueryMethod('join') . 
+			$this->getQueryMethod('leftjoin') . 
+			$this->getQueryMethod('where') . 
+			$this->getQueryMethod('groupby') . 
+			$this->getQueryMethod('orderby') . 
+			$this->getQueryMethod('limit')
+		) . ' ';
 
 		if($this->get('comment') && $this->wire('config')->debug) {
 			// NOTE: PDO thinks ? and :str param identifiers in /* comments */ are real params
@@ -89,7 +98,7 @@ class DatabaseQuerySelect extends DatabaseQuery {
 	}
 
 	/**
-	 * Add an 'order by' element to the query
+	 * Add an ORDER BY section to the query
 	 *
 	 * @param string|array $value
 	 * @param bool $prepend Should the value be prepended onto the existing value? default is to append rather than prepend.
@@ -124,10 +133,20 @@ class DatabaseQuerySelect extends DatabaseQuery {
 		return $this; 
 	}
 
+	/**
+	 * Get SELECT portion of SQL 
+	 * 
+	 * @return string
+	 * 
+	 */
 	protected function getQuerySelect() {
+		
+		if(self::$dbCache === null) {
+			self::$dbCache = $this->wire('config')->dbCache === false ? false : true;
+		}
 
-		$sql = '';
 		$select = $this->select; 
+		$sql = '';
 
 		// ensure that an SQL_CALC_FOUND_ROWS request comes first
 		while(($key = array_search("SQL_CALC_FOUND_ROWS", $select)) !== false) {
@@ -135,36 +154,17 @@ class DatabaseQuerySelect extends DatabaseQuery {
 			unset($select[$key]); 
 		}
 		if(!$sql) $sql = "SELECT ";
-
-		// $config->dbCache option for debugging purposes
-		if($this->wire('config')->dbCache === false) $sql .= "SQL_NO_CACHE "; 
-
-		foreach($select as $s) $sql .= "$s,";
-		$sql = rtrim($sql, ",") . " "; 
-		return $sql;
-	}
-
-	protected function getQueryFrom() {
-		$sql = "\nFROM ";
-		foreach($this->from as $s) $sql .= "`$s`,";	
-		$sql = rtrim($sql, ",") . " "; 
-		return $sql; 
-	}
-
-	protected function getQueryJoin(array $join, $type) {
-		$sql = '';
-		foreach($join as $s) $sql .= "\n$type $s ";
-		return $sql;
-	}
-
-	protected function getQueryOrderby() {
-		if(!count($this->orderby)) return '';
-		$sql = "\nORDER BY ";
-		foreach($this->orderby as $s) $sql .= "$s,";
-		$sql = rtrim($sql, ",") . " ";
-		return $sql;
+		if(self::$dbCache === false) $sql .= "SQL_NO_CACHE "; 
+		
+		return $sql . implode(',', $select) . ' ';
 	}
 
+	/**
+	 * Get GROUP BY section of SQL
+	 * 
+	 * @return string
+	 * 
+	 */
 	protected function getQueryGroupby() {
 		if(!count($this->groupby)) return '';
 		$sql = "\nGROUP BY ";
@@ -185,23 +185,31 @@ class DatabaseQuerySelect extends DatabaseQuery {
 			foreach($having as $n => $h) {
 				if($n > 0) $sql .= " AND ";
 				$sql .= $h;
-				
 			}
 		}
 
-		$sql = rtrim($sql, ",") . " ";
-
-
-		return $sql;
+		return rtrim($sql, ",") . " ";
 	}
 
+	/**
+	 * Get LIMIT section of SQL
+	 * 
+	 * @return string
+	 * 
+	 */
 	protected function getQueryLimit() {
 		if(!count($this->limit)) return '';
 		$limit = $this->limit; 
-		$sql = "\nLIMIT " . reset($limit) . " ";
-		return $sql; 
+		$limit = reset($limit);
+		if(strpos($limit, ',') !== false) {
+			list($start, $limit) = explode(',', $limit);
+			$start = (int) trim($start);
+			$limit = (int) trim($limit); 
+			$limit = "$start,$limit";
+		} else {
+			$limit = (int) $limit;
+		}
+		return "\nLIMIT $limit ";
 	}
-
-	
 }
 

wire/core/DatabaseStopwords.php

@@ -3,7 +3,7 @@
 /**
  * ProcessWire DatabaseStopwords
  *
- * MySQL stopwords, primarily for use with filtering fulltext queries
+ * MySQL stopwords, primarily for use with filtering fulltext queries (MyISAM only)
  * 
  * ProcessWire 3.x, Copyright 2016 by Ryan Cramer
  * https://processwire.com
@@ -49,8 +49,8 @@ class DatabaseStopwords {
 		"various", "very", "via", "viz", "vs", "want", "wants", "was", "wasn't", "way", "we", "we'd", "we'll", "we're", "we've", "welcome", "well", "went", "were", 
 		"weren't", "what", "what's", "whatever", "when", "whence", "whenever", "where", "where's", "whereafter", "whereas", "whereby", "wherein", "whereupon", 
 		"wherever", "whether", "which", "while", "whither", "who", "who's", "whoever", "whole", "whom", "whose", "why", "will", "willing", "wish", "with", "within", 
-		"without", "won't", "wonder", "would", "would", "wouldn't", "yes", "yet", "you", "you'd", "you'll", "you're", "you've", "your", "yours", "yourself", 
-		"yourselves", "zero"); 
+		"without", "won't", "wonder", "would", "wouldn't", "yes", "yet", "you", "you'd", "you'll", "you're", "you've", "your", "yours", "yourself", "yourselves", "zero"
+	); 
 
 	/**
 	 * Get all stopwords

wire/core/Debug.php

@@ -10,8 +10,14 @@
  * This file is licensed under the MIT license
  * https://processwire.com/about/license/mit/
  * 
- * ProcessWire 3.x, Copyright 2016 by Ryan Cramer
+ * ProcessWire 3.x, Copyright 2020 by Ryan Cramer
  * https://processwire.com
+ * 
+ * ~~~~~
+ * $timer = Debug::startTimer();
+ * execute_some_code();
+ * $elapsed = Debug::stopTimer($timer);
+ * ~~~~~
  *
  */
 
@@ -41,6 +47,37 @@ class Debug {
 	 */
 	static protected $savedTimerNotes = array();
 
+	/**
+	 * Use hrtime()?
+	 * 
+	 * @var null|bool
+	 * 
+	 */
+	static protected $useHrtime = null;
+
+	/**
+	 * Key of last started timer
+	 * 
+	 * @var string
+	 * 
+	 */
+	static protected $lastTimerKey = '';
+
+	/**
+	 * Timer precision (digits after decimal)
+	 * 
+	 * @var int
+	 * 
+	 */
+	static protected $timerSettings = array(
+		'useMS' => false, // use milliseconds?
+		'precision' => 4, 
+		'precisionMS' => 1,
+		'useHrtime' => null,
+		'suffix' => '',
+		'suffixMS' => 'ms',
+	);
+
 	/**
 	 * Measure time between two events
 	 *
@@ -58,24 +95,114 @@ class Debug {
 	 *
 	 */
 	static public function timer($key = '', $reset = false) {
+		
 		// returns number of seconds elapsed since first call
 		if($reset && $key) self::removeTimer($key);
 
 		if(!$key || !isset(self::$timers[$key])) {
-			// start new timer
-			$startTime = -microtime(true);
-			if(!$key) {
-				$key = (string) $startTime; 
-				while(isset(self::$timers[$key])) $key .= ".";
-			}
-			self::$timers[(string) $key] = $startTime; 
-			$value = $key; 
+			$value = self::startTimer($key);
 		} else {
-			// return existing timer
-			$value = number_format(self::$timers[$key] + microtime(true), 4);
+			$value = self::stopTimer($key, null, false);
+		}
+		
+		return $value; 
+	}
+
+	/**
+	 * Start a new timer
+	 * 
+	 * @param string $key Optionally specify name for new timer
+	 * @return string
+	 * 
+	 */
+	static public function startTimer($key = '') {
+		
+		if(self::$timerSettings['useHrtime'] === null) {
+			self::$timerSettings['useHrtime'] = function_exists("\\hrtime");
 		}
 
-		return $value; 
+		$startTime = self::$timerSettings['useHrtime'] ? hrtime(true) : -microtime(true);
+		
+		if($key === '') {
+			$key = (string) $startTime;
+			while(isset(self::$timers[$key])) $key .= "0";
+		}
+		
+		$key = (string) $key;
+		
+		self::$timers[$key] = $startTime;
+		self::$lastTimerKey = $key;
+		
+		return $key;
+	}
+
+	/**
+	 * Get elapsed time for given timer and stop
+	 * 
+	 * @param string $key Timer key returned by startTimer(), or omit for last started timer
+	 * @param null|int|string $option Specify override precision (int), suffix (string), or "ms" for milliseconds and suffix.
+	 * @param bool $clear Also clear the timer? (default=true)
+	 * @return string
+	 * @since 3.0.158
+	 * 
+	 */
+	static public function stopTimer($key = '', $option = null, $clear = true) {
+	
+		if(empty($key) && self::$lastTimerKey) $key = self::$lastTimerKey;
+		if(!isset(self::$timers[$key])) return '';
+
+		$value = self::$timers[$key];
+		$useMS = $option === 'ms' || (self::$timerSettings['useMS'] && $option !== 's');
+		$suffix = $useMS ? self::$timerSettings['suffixMS'] : self::$timerSettings['suffix'];
+		$precision = $useMS ? self::$timerSettings['precisionMS'] : self::$timerSettings['precision'];
+		
+		if(self::$timerSettings['useHrtime']) {
+			// existing hrtime timer
+			$value = ((hrtime(true) - $value) / 1e+6) / 1000;
+		} else {
+			// existing microtime timer
+			$value = $value + microtime(true);
+		}
+		
+		if($option === null) {
+			// no option specified
+		} else if(is_int($option)) {
+			// precision override
+			$precision = $option;
+		} else if(is_string($option)) {
+			// suffix specified
+			$suffix = $option;
+		}
+		
+		if($useMS) {
+			$value = round($value * 1000, $precision);
+		} else {
+			$value = number_format($value, $precision);
+		}
+		
+		if($clear) self::removeTimer($key);
+		if($suffix) $value .= $suffix;
+		
+		return $value;
+	}
+
+	/**
+	 * Get or set timer setting
+	 * 
+	 * ~~~~~~
+	 * // Example of changing precision to 2
+	 * Debug::timerSetting('precision', 2); 
+	 * ~~~~~~
+	 * 
+	 * @param string $key
+	 * @param mixed|null $value
+	 * @return mixed
+	 * @since 3.0.154
+	 * 
+	 */
+	static public function timerSetting($key, $value = null) {
+		if($value !== null) self::$timerSettings[$key] = $value;
+		return self::$timerSettings[$key];
 	}
 
 	/**
@@ -85,17 +212,16 @@ class Debug {
 	 * 
 	 * @param string $key
 	 * @param string $note Optional note to include in getSavedTimer
-	 * @return bool Returns false if timer didn't exist in the first place
+	 * @return bool|string Returns elapsed time, or false if timer didn't exist
 	 *
 	 */
 	static public function saveTimer($key, $note = '') {
 		if(!isset(self::$timers[$key])) return false;
-		self::$savedTimers[$key] = self::timer($key); 
-		self::removeTimer($key); 
+		self::$savedTimers[$key] = self::stopTimer($key); 
 		if($note) self::$savedTimerNotes[$key] = $note; 
-		return true; 
+		return self::$savedTimers[$key]; 
 	}
-
+	
 	/**
 	 * Return the time recorded in the saved timer $key
 	 * 
@@ -153,5 +279,253 @@ class Debug {
 	static public function removeAll() {
 		self::$timers = array();
 	}
+	
+	/**
+	 * Get all active timers in array with timer name (key) and start time (value)
+	 *
+	 * @return array
+	 * @since 3.0.158
+	 *
+	 */
+	static public function getAll() {
+		return self::$timers;
+	}
 
+	/**
+	 * Return a backtrace array that is simpler and more PW-specific relative to PHP’s debug_backtrace
+	 * 
+	 * @param array $options
+	 * @return array|string
+	 * @since 3.0.136
+	 * 
+	 */
+	static public function backtrace(array $options = array()) {
+		
+		$defaults = array(
+			'limit' => 0, // the limit argument for the debug_backtrace call
+			'flags' => DEBUG_BACKTRACE_PROVIDE_OBJECT, // flags for PHP debug_backtrace method
+			'showHooks' => false, // show internal methods for hook calls?
+			'getString' => false, // get newline separated string rather than array?
+			'getCnt' => true, // get index number count (for getString only)
+			'getFile' => true,  // get filename? true, false or 'basename'
+			'maxCount' => 10, // max size for arrays
+			'maxStrlen' => 100, // max length for strings
+			'maxDepth' => 5, // max allowed recursion depth when converting variables to strings
+			'ellipsis' => ' …', // show this ellipsis when a long value is truncated
+			'skipCalls' => array(), // method/function calls to skip
+		);
+		
+		$options = array_merge($defaults, $options);
+		if($options['limit']) $options['limit']++;
+		$traces = @debug_backtrace($options['flags'], $options['limit']);
+		$config = wire('config');
+		$rootPath = ProcessWire::getRootPath(true);
+		$rootPath2 = $config && $config->paths ? $config->paths->root : $rootPath;
+		array_shift($traces); // shift of the simpleBacktrace call, which is not needed
+		$apiVars = array();
+		$result = array();
+		$cnt = 0;
+		
+		foreach(wire('all') as $name => $value) {
+			if(!is_object($value)) continue;
+			$apiVars[wireClassName($value)] = '$' . $name;
+		}
+		
+		foreach($traces as $n => $trace) {
+			
+			if(!is_array($trace) || !isset($trace['function']) || !isset($trace['file'])) {
+				continue;
+			} else if(count($options['skipCalls']) && in_array($trace['function'], $options['skipCalls'])) {
+				continue;
+			}
+
+			$obj = null;
+			$class = '';
+			$type = '';
+			$args = $trace['args'];
+			$argStr = '';
+			$file = $trace['file'];
+			$basename = basename($file); 
+			$function = $trace['function'];	
+			$isHookableCall = false;
+			
+			if(isset($trace['object'])) {
+				$obj = $trace['object'];
+				$class = wireClassName($obj);
+			} else if(isset($trace['class'])) {
+				$class = wireClassName($trace['class']); 
+			}
+			
+			if($class) {
+				$type = isset($trace['type']) ? $trace['type'] : '.';
+			}
+
+			if(!$options['showHooks']) {
+				if($basename === 'Wire.php' && !wireMethodExists('Wire', $function)) continue;
+				if($class === 'WireHooks' || $basename === 'WireHooks.php') continue;
+			}
+			
+			if(strpos($function, '___') === 0) {
+				$isHookableCall = '___';
+			} else if($obj && !method_exists($obj, $function) && method_exists($obj, "___$function")) {
+				$isHookableCall = true;
+			}
+			
+			if($type === '->' && isset($apiVars[$class])) {
+				// use API var name when available
+				if(strtolower($class) === strtolower(ltrim($apiVars[$class], '$'))) {
+					$class = $apiVars[$class];
+				} else {
+					$class = "$class " . $apiVars[$class];
+				}
+			}
+			
+			if($basename === 'Wire.php' && $class !== 'Wire') {
+				$ref = new \ReflectionClass($trace['class']);
+				$file = $ref->getFileName();
+			}
+
+			// rootPath and rootPath2 can be different if one of them represented by a symlink
+			$file = str_replace($rootPath, '/', $file);
+			if($rootPath2 !== $rootPath) $file = str_replace($rootPath2, '/', $file);
+			
+			if(($function === '__call' || $function == '_callMethod') && count($args)) {
+				$function = array_shift($args); 
+			}
+			
+			if(!$options['showHooks'] && $isHookableCall === '___') {
+				$function = substr($function, 3);
+			}
+			
+			if(!empty($args)) {
+				$newArgs = array();
+				if($isHookableCall && count($args) === 1 && is_array($args[0])) {
+					$newArgs = $args[0];
+				}
+				foreach($args as $arg) {
+					if(is_object($arg)) {
+						$arg = wireClassName($arg) . ' $obj';
+					} else if(is_array($arg)) { 
+						$count = count($arg); 
+						if($count < 4) {
+							$arg = $count ? self::toStr($arg, array('maxDepth' => 2)) : '[]';
+						} else {
+							$arg = 'array(' . count($arg) . ')';
+						}
+					} else if(is_string($arg)) {
+						if(strlen("$arg") > $options['maxStrlen']) $arg = substr($arg, 0, $options['maxStrlen']) . ' …';
+						$arg = '"' . $arg . '"';
+					} else if(is_bool($arg)) {
+						$arg = $arg ? 'true' : 'false';
+					} else {
+						// leave as-is
+					}
+					$newArgs[] = $arg;
+				}
+				$argStr = implode(', ', $newArgs); 
+				if($argStr === '[]') $argStr = '';
+			}
+
+			if($options['getFile'] === 'basename') $file = basename($file);
+			
+			$call = "$class$type$function($argStr)";
+			$file = "$file:$trace[line]";
+			
+			if($options['getString']) {
+				$str = '';
+				if($options['getCnt']) $str .= "$cnt. ";
+				$str .= "$file » $call";
+				$result[] = $str;
+			} else {
+				$result[] = array(
+					'file' => $file,
+					'call' => $call,
+				);
+			}
+			
+			$cnt++;
+		}
+		
+		if($options['getString']) $result = implode("\n", $result); 
+		
+		return $result;
+	}
+
+	/**
+	 * Convert value to string for backtrace method
+	 * 
+	 * @param $value
+	 * @param array $options
+	 * @return null|string
+	 * 
+	 */
+	static protected function toStr($value, array $options = array()) {
+		
+		$defaults = array(
+			'maxCount' => 10, // max size for arrays
+			'maxStrlen' => 100, // max length for strings
+			'maxDepth' => 5,
+			'ellipsis' => ' …'
+		);
+
+		static $depth = 0;
+		$options = count($options) ? array_merge($defaults, $options) : $defaults; 
+		$depth++;
+		
+		if(is_object($value)) {
+			// object
+			$str = wireClassName($value);
+			if($str === 'HookEvent') {
+				$str .= ' $event';
+			} else if(method_exists($value, '__toString')) {
+				$value = (string) $value;
+				if($value !== $str) {
+					if(strlen($value) > $options['maxStrlen']) {
+						$value = substr($value, 0, $options['maxStrlen']) . $options['ellipsis'];
+					}
+					$str .= "($value)";
+				}
+			}
+		} else if(is_array($value)) {
+			// array
+			if(empty($value)) {
+				$str = '[]';
+			} else if($depth >= $options['maxDepth']) {
+				$str = "array(" . count($value) . ")";
+			} else {
+				$suffix = '';
+				if(count($value) > $options['maxCount']) {
+					$value = array_slice($value, 0, $options['maxCount']);
+					$suffix = $options['ellipsis'];
+				}
+				foreach($value as $k => $v) {
+					$value[$k] = self::toStr($v, $options); 
+				}
+				$str = '[ ' . implode(', ', $value) . $suffix . ' ]';
+			}
+		} else if(is_string($value)) {
+			// string
+			if(strlen($value) > $options['maxStrlen']) {
+				$value = substr($value, 0, $options['maxStrlen']) . $options['ellipsis'];
+			}
+			$hasDQ = strpos($value, '"') !== false;
+			$hasSQ = strpos($value, "'") !== false;
+			if(($hasDQ && $hasSQ) || $hasSQ) {
+				$value = str_replace('"', '\\"', $value);
+				$str = '"' . $value . '"';
+			} else {
+				$str = "'$value'";
+			}
+		} else if(is_bool($value)) {
+			// true or false
+			$str = $value ? 'true' : 'false';
+		} else {
+			// int, float or other
+			$str = $value;
+		}
+		
+		$depth--;
+		
+		return $str;
+	}
 }

wire/core/Exceptions.php

@@ -8,7 +8,7 @@
  * This file is licensed under the MIT license
  * https://processwire.com/about/license/mit/
  *
- * ProcessWire 3.x, Copyright 2016 by Ryan Cramer
+ * ProcessWire 3.x, Copyright 2020 by Ryan Cramer
  * https://processwire.com
  *
  */
@@ -17,24 +17,157 @@
  * Generic ProcessWire exception
  *
  */
-class WireException extends \Exception {}
+class WireException extends \Exception {
+	/**
+	 * Replace previously set message
+	 * 
+	 * @param string $message
+	 * @since 3.0.150
+	 * 
+	 */
+	protected function setMessage($message) {
+		$this->message = $message;
+	}
+
+	/**
+	 * Replace previously set code
+	 * 
+	 * @param int $code
+	 * @since 3.0.150
+	 * 
+	 */
+	protected function setCode($code) {
+		$this->code = $code;
+	}
+}
 
 /**
- * Triggered when access to a resource is not allowed
+ * Thrown when access to a resource is not allowed
  *
  */
 class WirePermissionException extends WireException {}
 
 /**
- * Triggered when a requested item does not exist and generates a fatal error
+ * Thrown when a requested page does not exist, or can be thrown manually to show the 404 page
  *
  */
-class Wire404Exception extends WireException {}
+class Wire404Exception extends WireException {
+	
+	/**
+	 * 404 is because core determined requested resource by URL does not physically exist
+	 * 
+	 * #pw-internal
+	 *
+	 */ 
+	const codeNonexist = 404;
+	
+	/**
+	 * 404 is a result of a resource that might exist but there is no access
+	 * 
+	 * Similar to a WirePermissionException except always still a 404 externally
+	 * 
+	 * #pw-internal
+	 *
+	 */
+	const codePermission = 4041;
+	
+	/**
+	 * 404 is a result of a secondary non-file asset that does not exist, even if page does
+	 * 
+	 * For example: /foo/bar/?id=123 where /foo/bar/ exists but 123 points to non-existent asset.
+	 * 
+	 * #pw-internal
+	 *
+	 */
+	const codeSecondary = 4042;
+
+	/**
+	 * 404 is a result of content not available in requested language
+	 * 
+	 * #pw-internal
+	 *
+	 */
+	const codeLanguage = 4043;
+	
+	/**
+	 * 404 is a result of a physical file that does not exist on the file system
+	 * 
+	 * #pw-internal
+	 *
+	 */
+	const codeFile = 4044;
+
+	/**
+	 * 404 is a result of a front-end wire404() function call
+	 * 
+	 * #pw-internal
+	 * 
+	 */
+	const codeFunction = 4045;
+	
+	/**
+	 * Anonymous 404 with no code provided 
+	 *
+	 * #pw-internal
+	 *
+	 */
+	const codeAnonymous = 0;
+
+}
 
 /**
- * WireDatabaseException is the exception thrown by the Database class
- *
- * If you use this class without ProcessWire, change 'extends WireException' below to be just 'extends Exception'
+ * Thrown when ProcessWire is unable to connect to the database at boot
  *
  */
 class WireDatabaseException extends WireException {}
+
+/**
+ * Thrown by DatabaseQuery classes on query exception
+ * 
+ * May have \PDOException populated with call to its getPrevious(); method, 
+ * in which can it also has same getCode() and getMessage() as \PDOException.
+ * 
+ * @since 3.0.156
+ * 
+ */
+class WireDatabaseQueryException extends WireException {}
+
+/**
+ * Thrown when cross site request forgery detected by SessionCSRF::validate()
+ *
+ */
+class WireCSRFException extends WireException {}
+
+/**
+ * Thrown when fatal error from $files API var (or related) occurs
+ * 
+ * @since 3.0.178
+ *
+ */
+class WireFilesException extends WireException {}
+
+/**
+ * Thrown when a requested Process or Process method is requested that doesn’t exist
+ *
+ */
+class ProcessController404Exception extends Wire404Exception { }
+
+/**
+ * Thrown when the user doesn’t have access to execute the requested Process or method
+ *
+ */
+class ProcessControllerPermissionException extends WirePermissionException { }
+
+/**
+ * Thrown by PageFinder when an error occurs trying to find pages
+ * 
+ */
+class PageFinderException extends WireException { }
+
+/**
+ * Thrown by PageFinder when it detects an error in the syntax of a given page-finding selector
+ *
+ */
+class PageFinderSyntaxException extends PageFinderException { }
+
+

wire/core/Field.php

@@ -7,28 +7,45 @@
  * and is managed by the 'Fields' class.
  * 
  * #pw-summary Field represents a custom field that is used on a Page.
+ * #pw-var $field
+ * #pw-instantiate $field = $fields->get('field_name');
  * #pw-body Field objects are managed by the `$fields` API variable. 
  * #pw-use-constants
  * 
- * ProcessWire 3.x, Copyright 2016 by Ryan Cramer
+ * ProcessWire 3.x, Copyright 2019 by Ryan Cramer
  * https://processwire.com
  *
  * @property int $id Numeric ID of field in the database #pw-group-properties
  * @property string $name Name of field  #pw-group-properties
  * @property string $table Database table used by the field #pw-group-properties
  * @property string $prevTable Previously database table (if field was renamed) #pw-group-properties
+ * @property string $prevName Previously used name (if field was renamed), 3.0.164+ #pw-group-properties
  * @property Fieldtype|null $type Fieldtype module that represents the type of this field #pw-group-properties
- * @property Fieldtype $prevFieldtype Previous Fieldtype, of type was changed #pw-group-properties
+ * @property Fieldtype|null $prevFieldtype Previous Fieldtype, if type was changed #pw-group-properties
  * @property int $flags Bitmask of flags used by this field #pw-group-properties
+ * @property-read string $flagsStr Names of flags used by this field (readonly) #pw-group-properties
  * @property string $label Text string representing the label of the field #pw-group-properties
  * @property string $description Longer description text for the field #pw-group-properties
  * @property string $notes Additional notes text about the field #pw-group-properties
  * @property string $icon Icon name used by the field, if applicable #pw-group-properties
+ * @property string $tags Tags that represent this field, if applicable (space separated string). #pw-group-properties
+ * @property-read array $tagList Same as $tags property, but as an array. #pw-group-properties
  * @property bool $useRoles Whether or not access control is enabled #pw-group-access
  * @property array $editRoles Role IDs with edit access, applicable only if access control is enabled. #pw-group-access
  * @property array $viewRoles Role IDs with view access, applicable only if access control is enabled. #pw-group-access
  * @property array|null $orderByCols Columns that WireArray values are sorted by (default=null), Example: "sort" or "-created". #pw-internal
  * @property int|null $paginationLimit Used by paginated WireArray values to indicate limit to use during load. #pw-internal
+ * @property array $allowContexts Names of settings that are custom configured to be allowed for context. #pw-group-properties
+ * @property bool|int|null $flagUnique Non-empty value indicates request for, or presence of, Field::flagUnique flag. #pw-internal
+ * @property Fieldgroup|null $_contextFieldgroup Fieldgroup field is in context for or null if not in context. #pw-internal
+ *
+ * Common Inputfield properties that Field objects store:  
+ * @property int|bool|null $required Whether or not this field is required during input #pw-group-properties
+ * @property string|null $requiredIf A selector-style string that defines the conditions under which input is required #pw-group-properties
+ * @property string|null $showIf A selector-style string that defines the conditions under which the Inputfield is shown #pw-group-properties
+ * @property int|null $columnWidth The Inputfield column width (percent) 10-100. #pw-group-properties
+ * @property int|null $collapsed The Inputfield 'collapsed' value (see Inputfield collapsed constants). #pw-group-properties
+ * @property int|null $textFormat The Inputfield 'textFormat' value (see Inputfield textFormat constants). #pw-group-properties
  * 
  * @method bool viewable(Page $page = null, User $user = null) Is the field viewable on the given $page by the given $user? #pw-group-access
  * @method bool editable(Page $page = null, User $user = null) Is the field editable on the given $page by the given $user? #pw-group-access
@@ -42,6 +59,7 @@ class Field extends WireData implements Saveable, Exportable {
 
 	/**
 	 * Field should be automatically joined to the page at page load time
+	 * 
 	 * #pw-group-flags
 	 *
 	 */
@@ -49,6 +67,7 @@ class Field extends WireData implements Saveable, Exportable {
 
 	/**
 	 * Field used by all fieldgroups - all fieldgroups required to contain this field
+	 * 
 	 * #pw-group-flags
 	 *
 	 */
@@ -56,6 +75,7 @@ class Field extends WireData implements Saveable, Exportable {
 
 	/**
 	 * Field is a system field and may not be deleted, have it's name changed, or be converted to non-system
+	 * 
 	 * #pw-group-flags
 	 *
 	 */
@@ -63,6 +83,7 @@ class Field extends WireData implements Saveable, Exportable {
 
 	/**
 	 * Field is permanent in any fieldgroups/templates where it exists - it may not be removed from them
+	 * 
 	 * #pw-group-flags
 	 *
 	 */
@@ -70,6 +91,7 @@ class Field extends WireData implements Saveable, Exportable {
 
 	/**
 	 * Field is access controlled
+	 * 
 	 * #pw-group-flags
 	 *
 	 */
@@ -79,6 +101,7 @@ class Field extends WireData implements Saveable, Exportable {
 	 * If field is access controlled, this flag says that values are still front-end API accessible
 	 * 
 	 * Without this flag, non-viewable values are made blank when output formatting is ON.
+	 * 
 	 * #pw-group-flags
 	 * 
 	 */
@@ -88,13 +111,28 @@ class Field extends WireData implements Saveable, Exportable {
 	 * If field is access controlled and user has no edit access, they can still view in the editor (if they have view permission)
 	 * 
 	 * Without this flag, non-editable values are simply not shown in the editor at all.
+	 * 
 	 * #pw-group-flags
 	 * 
 	 */
-	const flagAccessEditor = 128; 
+	const flagAccessEditor = 128;
+
+	/**
+	 * Field requires that the same value is not repeated more than once in its table 'data' column (when supported by Fieldtype)
+	 * 
+	 * When this flag is set and there is a non-empty $flagUnique property on the field, then it indicates a unique index 
+	 * is currently present. When only this flag is present (no property), it indicates a request to remove the index and flag. 
+	 * When only the property is present (no flag), it indicates a pending request to add unique index and flag. 
+	 * 
+	 * #pw-group-flags
+	 * @since 3.0.150
+	 * 
+	 */
+	const flagUnique = 256;
 
 	/**
 	 * Field has been placed in a runtime state where it is contextual to a specific fieldgroup and is no longer saveable
+	 * 
 	 * #pw-group-flags
 	 *
 	 */
@@ -102,6 +140,7 @@ class Field extends WireData implements Saveable, Exportable {
 
 	/**
 	 * Set this flag to override system/permanent flags if necessary - once set, system/permanent flags can be removed, but not in the same set().
+	 * 
 	 * #pw-group-flags
 	 *
 	 */
@@ -109,6 +148,7 @@ class Field extends WireData implements Saveable, Exportable {
 
 	/**
 	 * Prefix for database tables
+	 * 
 	 * #pw-internal
 	 * 
 	 */
@@ -127,10 +167,10 @@ class Field extends WireData implements Saveable, Exportable {
 	 */
 	protected $settings = array(
 		'id'    => 0,
-		'type'  => null,
-		'flags' => 0,
 		'name'  => '',
 		'label' => '',
+		'flags' => 0,
+		'type'  => null,
 	);
 
 	/**
@@ -140,18 +180,26 @@ class Field extends WireData implements Saveable, Exportable {
 	protected $prevTable;
 
 	/**
-	 * A specifically set table name by setTable() for override purposes
+	 * If the field name changed, this is the previous name
 	 * 
 	 * @var string
 	 * 
 	 */
-	protected $setTable = '';
+	protected $prevName = '';
 
 	/**
 	 * If the field type changed, this is the previous fieldtype so that it can be changed at save time
 	 *
 	 */
 	protected $prevFieldtype;
+	
+	/**
+	 * A specifically set table name by setTable() for override purposes
+	 *
+	 * @var string
+	 *
+	 */
+	protected $setTable = '';
 
 	/**
 	 * Accessed properties, becomes array when set to true, null when set to false
@@ -194,6 +242,14 @@ class Field extends WireData implements Saveable, Exportable {
 	 */
 	protected $inputfieldSettings = array();
 
+	/**
+	 * Tags assigned to this field, keys are lowercase version of tag, values can possibly contain mixed case
+	 * 
+	 * @var null|array
+	 * 
+	 */
+	protected $tagList = null;
+
 	/**
 	 * True if lowercase tables should be enforce, false if not (null = unset). Cached from $config
 	 *
@@ -210,7 +266,7 @@ class Field extends WireData implements Saveable, Exportable {
 	 *
 	 * @param string $key Property name to set
 	 * @param mixed $value
-	 * @return $this
+	 * @return Field|WireData
 	 *
 	 */
 	public function set($key, $value) {
@@ -222,6 +278,9 @@ class Field extends WireData implements Saveable, Exportable {
 		} else if($key == 'prevTable') {
 			$this->prevTable = $value;
 			return $this;
+		} else if($key == 'prevName') {
+			$this->prevName = $value;
+			return $this;
 		} else if($key == 'prevFieldtype') {
 			$this->prevFieldtype = $value;
 			return $this;
@@ -332,17 +391,28 @@ class Field extends WireData implements Saveable, Exportable {
 	 *
 	 */
 	public function get($key) {
+		
+		if($key === 'type' && isset($this->settings['type'])) {
+			$value = $this->settings['type'];
+			if($value) $value->setLastAccessField($this);
+			return $value;
+		}
 		if($key == 'viewRoles') return $this->viewRoles;
-		else if($key == 'editRoles') return $this->editRoles;
-		else if($key == 'table') return $this->getTable();
-		else if($key == 'prevTable') return $this->prevTable;
-		else if($key == 'prevFieldtype') return $this->prevFieldtype;
-		else if(isset($this->settings[$key])) return $this->settings[$key];
-		else if($key == 'icon') return $this->getIcon(true);
-		else if($key == 'useRoles') return ($this->settings['flags'] & self::flagAccess) ? true : false;
-		else if($key == 'flags') return $this->settings['flags'];
+			else if($key == 'editRoles') return $this->editRoles;
+			else if($key == 'table') return $this->getTable();
+			else if($key == 'prevTable') return $this->prevTable;
+			else if($key == 'prevName') return $this->prevName;
+			else if($key == 'prevFieldtype') return $this->prevFieldtype;
+			else if(isset($this->settings[$key])) return $this->settings[$key];
+			else if($key == 'icon') return $this->getIcon(true);
+			else if($key == 'useRoles') return ($this->settings['flags'] & self::flagAccess) ? true : false;
+			else if($key == 'flags') return $this->settings['flags'];
+			else if($key == 'flagsStr') return $this->wire('fields')->getFlagNames($this->settings['flags'], true);
+			else if($key == 'tagList') return $this->getTags();
+			else if($key == 'tags') return $this->getTags(true);
 
 		$value = parent::get($key);
+		if($key === 'allowContexts' && !is_array($value)) $value = array();
 		if(is_array($this->trackGets)) $this->trackGets($key);
 		return $value;
 	}
@@ -438,6 +508,20 @@ class Field extends WireData implements Saveable, Exportable {
 			if(strpos($key, '_') === 0) unset($data[$key]);
 		}
 
+		// convert access roles from IDs to names
+		if($this->useRoles) {
+			foreach(array('viewRoles', 'editRoles') as $roleType) {
+				if(!is_array($data[$roleType])) $data[$roleType] = array();
+				$roleNames = array();
+				foreach($data[$roleType] as $key => $roleID) {
+					$role = $this->wire('roles')->get($roleID);
+					if(!$role || !$role->id) continue;
+					$roleNames[] = $role->name;
+				}
+				$data[$roleType] = $roleNames;
+			}
+		}
+
 		return $data;
 	}
 
@@ -487,13 +571,17 @@ class Field extends WireData implements Saveable, Exportable {
 			$this->type = $this->wire('fieldtypes')->get($data['type']);
 		}
 
-		if(!$this->type) $this->type = $this->wire('fieldtypes')->get('FieldtypeText');
+		if(!$this->type) {
+			if(!empty($data['type'])) $this->error("Unable to locate field type: $data[type]"); 
+			$this->type = $this->wire('fieldtypes')->get('FieldtypeText');
+		}
+
 		$data = $this->type->importConfigData($this, $data);
 
 		// populate import data
 		foreach($changes as $key => $change) {
 			$this->errors('clear all');
-			$this->set($key, $data[$key]);
+			if(isset($data[$key])) $this->set($key, $data[$key]);
 			if(!empty($data['errors'][$key])) {
 				$error = $data['errors'][$key];
 				// just in case they switched it to an array of multiple errors, convert back to string
@@ -541,7 +629,10 @@ class Field extends WireData implements Saveable, Exportable {
 				throw new WireException("You may not change the name of field '{$this->settings['name']}' because it is a system field.");
 			}
 			$this->trackChange('name');
-			if($this->settings['name']) $this->prevTable = $this->getTable(); // so that Fields can perform a table rename
+			if($this->settings['name']) {
+				$this->prevName = $this->settings['name'];
+				$this->prevTable = $this->getTable(); // so that Fields can perform a table rename
+			}
 		}
 
 		$this->settings['name'] = $name;
@@ -566,7 +657,7 @@ class Field extends WireData implements Saveable, Exportable {
 
 		} else if(is_string($type)) {
 			$typeStr = $type;
-			$fieldtypes = $this->wire('fieldtypes');
+			$fieldtypes = $this->wire('fieldtypes'); /** @var Fieldtypes $fieldtypes */
 			if(!$type = $fieldtypes->get($type)) {
 				$this->error("Fieldtype '$typeStr' does not exist");
 				return $this;
@@ -599,6 +690,77 @@ class Field extends WireData implements Saveable, Exportable {
 		return $this->type; 
 	}
 
+	/**
+	 * Get this field in context of a Page/Template
+	 * 
+	 * #pw-group-retrieval
+	 * 
+	 * @param Page|Template|Fieldgroup|string $for Specify Page, Template, or template name string
+	 * @param string $namespace Optional namespace (internal use)
+	 * @param bool $has Return boolean rather than Field to check if context exists? (default=false)
+	 * @return Field|bool
+	 * @since 3.0.162
+	 * @see Fieldgroup::getFieldContext(), Field::hasContext()
+	 * 
+	 */
+	public function getContext($for, $namespace = '', $has = false) {
+		/** @var Fieldgroup|null $fieldgroup */
+		$fieldgroup = null;
+		if(is_string($for)) {
+			$for = $this->wire()->templates->get($for);
+		}
+		if($for instanceof Page) {
+			/** @var Page $context */
+			$template = $for instanceof NullPage ? null : $for->template;
+			if(!$template) throw new WireException('Page must have template to get context');
+			$fieldgroup = $template->fieldgroup;
+		} else if($for instanceof Template) {
+			/** @var Template $context */
+			$fieldgroup = $for->fieldgroup;
+		} else if($for instanceof Fieldgroup) {
+			$fieldgroup = $for;
+		}
+		if(!$fieldgroup) throw new WireException('Cannot get Fieldgroup for field context'); 
+		
+		if($has) return $fieldgroup->hasFieldContext($this->id, $namespace);
+
+		return $fieldgroup->getFieldContext($this->id, $namespace);
+	}
+
+	/**
+	 * Does this field have context settings for given Page/Template?
+	 *
+	 * #pw-group-retrieval
+	 *
+	 * @param Page|Template|Fieldgroup|string $for Specify Page, Template, or template name string
+	 * @param string $namespace Optional namespace (internal use)
+	 * @return Field|bool
+	 * @since 3.0.163
+	 * @see Field::getContext()
+	 *
+	 */
+	public function hasContext($for, $namespace = '') {
+		return $this->getContext($for, $namespace, true);
+	}
+
+	/**
+	 * Get all contexts this field is used in
+	 * 
+	 * @return array Array of 'fieldgroup-name' => [ contexts ]
+	 * @since 3.0.182
+	 * 
+	 */
+	public function getContexts() {
+		$contexts = array();
+		foreach($this->wire()->fieldgroups as $fieldgroup) {
+			/** @var Fieldgroup $fieldgroup */
+			$context = $fieldgroup->getFieldContextArray($this->id);
+			if(empty($context)) continue;
+			$contexts[$fieldgroup->name] = $context;
+		}
+		return $contexts;	
+	}
+
 	/**
 	 * Set the roles that are allowed to view or edit this field on pages.
 	 *
@@ -622,6 +784,15 @@ class Field extends WireData implements Saveable, Exportable {
 				$ids[] = (int) $role;
 			} else if($role instanceof Role) {
 				$ids[] = (int) $role->id;
+			} else if(is_string($role) && strlen($role)) {
+				$rolePage = $this->wire('roles')->get($role); 
+				if($rolePage && $rolePage->id) {
+					$ids[] = $rolePage->id;
+				} else {
+					$this->error("Unknown role '$role'"); 
+				}
+			} else {
+				// invalid
 			}
 		}
 		if($type == 'view') {
@@ -707,7 +878,7 @@ class Field extends WireData implements Saveable, Exportable {
 	 *
 	 */ 
 	public function numFieldgroups() {
-		return count($this->getFieldgroups()); 
+		return $this->getFieldgroups(true); 
 	}
 
 	/**
@@ -715,20 +886,23 @@ class Field extends WireData implements Saveable, Exportable {
 	 * 
 	 * #pw-group-retrieval
 	 *
-	 * @return FieldgroupsArray WireArray of Fieldgroup objects. 
+	 * @param bool $getCount Get count rather than FieldgroupsArray? (default=false) 3.0.182+
+	 * @return FieldgroupsArray|int WireArray of Fieldgroup objects or count if requested
 	 *
 	 */ 
-	public function getFieldgroups() {
-		$fieldgroups = $this->wire(new FieldgroupsArray());
-		foreach($this->wire('fieldgroups') as $fieldgroup) {
+	public function getFieldgroups($getCount = false) {
+		$fieldgroups = $getCount ? null : $this->wire(new FieldgroupsArray());
+		$count = 0;
+		foreach($this->wire()->fieldgroups as $fieldgroup) {
 			foreach($fieldgroup as $field) {
 				if($field->id == $this->id) {
-					$fieldgroups->add($fieldgroup); 
+					if($fieldgroups) $fieldgroups->add($fieldgroup); 
+					$count++;
 					break;
 				}
 			}
 		}
-		return $fieldgroups; 
+		return $getCount ? $count : $fieldgroups; 
 	}
 
 	/**
@@ -736,10 +910,18 @@ class Field extends WireData implements Saveable, Exportable {
 	 * 
 	 * #pw-group-retrieval
 	 *
-	 * @return TemplatesArray WireArray of Template objects. 
+	 * @param bool $getCount Get count rather than FieldgroupsArray? (default=false) 3.0.182+
+	 * @return TemplatesArray|int WireArray of Template objects or count when requested. 
 	 *
 	 */ 
-	public function getTemplates() {
+	public function getTemplates($getCount = false) {
+		if($getCount) {
+			$count = 0;
+			foreach($this->templates as $template) {
+				if($template->hasField($this)) $count++;
+			}
+			return $count;
+		}
 		$templates = $this->wire(new TemplatesArray());
 		$fieldgroups = $this->getFieldgroups();
 		foreach($this->templates as $template) {
@@ -802,8 +984,10 @@ class Field extends WireData implements Saveable, Exportable {
 		$inputfield->attr('name', $this->name . $contextStr); 
 		$inputfield->set('label', $this->label);
 
-		// just in case an Inputfield needs to know it's Fieldtype context, or lack of it
-		$inputfield->set('hasFieldtype', $this->type); 
+		// just in case an Inputfield needs to know its Fieldtype/Field context, or lack of it
+		$inputfield->set('hasFieldtype', $this->type);
+		$inputfield->set('hasField', $this);
+		$inputfield->set('hasPage', $page); 
 		
 		// custom field settings
 		foreach($this->data as $key => $value) {
@@ -906,6 +1090,7 @@ class Field extends WireData implements Saveable, Exportable {
 		if($fieldgroupContext) {
 			$allowContext = $this->type->getConfigAllowContext($this); 
 			if(!is_array($allowContext)) $allowContext = array();
+			$allowContext = array_merge($allowContext, $this->allowContexts); 
 		} else {
 			$allowContext = array();
 		}
@@ -916,6 +1101,8 @@ class Field extends WireData implements Saveable, Exportable {
 			if(!$fieldgroupContext) $inputfields->head = $this->_('Field type details');
 			$inputfields->attr('title', $this->_('Details'));
 			$inputfields->attr('id+name', 'fieldtypeConfig');
+			$remainingNames = array();
+			foreach($allowContext as $name) $remainingNames[$name] = $name;
 
 			try {
 				$fieldtypeInputfields = $this->type->getConfigInputfields($this); 
@@ -930,7 +1117,19 @@ class Field extends WireData implements Saveable, Exportable {
 				foreach($fieldtypeInputfields as $inputfield) {
 					if($fieldgroupContext && !in_array($inputfield->name, $allowContext)) continue;
 					$inputfields->append($inputfield);
+					unset($remainingNames[$inputfield->name]);
 				}
+				// now capture those that may have been stuck in a fieldset
+				if($fieldgroupContext) {
+					foreach($remainingNames as $name) {
+						if($inputfields->getChildByName($name)) continue;
+						$inputfield = $fieldtypeInputfields->getChildByName($name);
+						if(!$inputfield) continue;
+						$inputfields->append($inputfield);
+						unset($remainingNames[$inputfield->name]);
+					}
+				}
+				
 			} catch(\Exception $e) {
 				$this->trackException($e, false, true); 
 			}
@@ -945,13 +1144,18 @@ class Field extends WireData implements Saveable, Exportable {
 		if($inputfield) {
 			if($fieldgroupContext) {
 				$allowContext = array('visibility', 'collapsed', 'columnWidth', 'required', 'requiredIf', 'showIf');
-				$allowContext = array_merge($allowContext, $inputfield->getConfigAllowContext($this)); 
+				$allowContext = array_merge($allowContext, $this->allowContexts, $inputfield->getConfigAllowContext($this)); 
 			} else {
 				$allowContext = array();
 				$inputfields->head = $this->_('Input field settings');
 			}
+			$remainingNames = array();
+			foreach($allowContext as $name) {
+				$remainingNames[$name] = $name;
+			}
 			$inputfields->attr('title', $this->_('Input')); 
 			$inputfields->attr('id+name', 'inputfieldConfig');
+			/** @var InputfieldWrapper $inputfieldInputfields */
 			$inputfieldInputfields = $inputfield->getConfigInputfields();
 			if(!$inputfieldInputfields) $inputfieldInputfields = $this->wire(new InputfieldWrapper());
 			$configArray = $inputfield->getConfigArray(); 
@@ -964,6 +1168,16 @@ class Field extends WireData implements Saveable, Exportable {
 			foreach($inputfieldInputfields as $i) { 
 				if($fieldgroupContext && !in_array($i->name, $allowContext)) continue; 
 				$inputfields->append($i); 
+				unset($remainingNames[$i->name]); 
+			}
+			if($fieldgroupContext) {
+				foreach($remainingNames as $name) {
+					if($inputfields->getChildByName($name)) continue;
+					$inputfield = $inputfieldInputfields->getChildByName($name);
+					if(!$inputfield) continue;
+					$inputfields->append($inputfield);
+					unset($remainingNames[$inputfield->name]);
+				}
 			}
 		}
 
@@ -997,6 +1211,8 @@ class Field extends WireData implements Saveable, Exportable {
 	/**
 	 * Set an override table name, or omit (or null) to restore default table name
 	 * 
+	 * #pw-group-advanced
+	 * 
 	 * @param null|string $table
 	 * 
 	 */
@@ -1179,6 +1395,124 @@ class Field extends WireData implements Saveable, Exportable {
 		return $this; 
 	}
 
+	/**
+	 * Get tags
+	 * 
+	 * @param bool|string $getString Optionally specify true for space-separated string, or delimiter string (default=false)
+	 * @return array|string Returns array of tags unless $getString option is requested
+	 * @since 3.0.106
+	 * 
+	 */
+	public function getTags($getString = false) {
+		if($this->tagList === null) {
+			$tagList = $this->setTags(parent::get('tags'));
+		} else {
+			$tagList = $this->tagList;
+		}
+		if($getString !== false) {
+			$delimiter = $getString === true ? ' ' : $getString;
+			return implode($delimiter, $tagList);
+		}
+		return $tagList;
+	}
+
+	/**
+	 * Set all tags
+	 * 
+	 * #pw-internal
+	 * 
+	 * @param array|string $tagList Array of tags to add (or space-separated string)
+	 * @param bool $reindex Set to false to set given $tagsList exactly as-is (assumes it's already in correct format)
+	 * @return array Array of tags that were set
+	 * @since 3.0.106
+	 * 
+	 */
+	public function setTags($tagList, $reindex = true) {
+		if($tagList === null || $tagList === '') {
+			$tagList = array();
+		} else if(!is_array($tagList)) {
+			$tagList = explode(' ', $tagList);
+		}
+		if($reindex && count($tagList)) {
+			$tags = array();
+			foreach($tagList as $tag) {
+				$tag = trim($tag);
+				if(strlen($tag)) $tags[strtolower($tag)] = $tag;
+			}
+			$tagList = $tags;
+		}
+		if($this->tagList !== $tagList) {
+			$this->tagList = $tagList;
+			parent::set('tags', implode(' ', $tagList)); 
+			$this->wire('fields')->getTags('reset');
+		}
+		return $tagList;
+	}
+
+	/**
+	 * Add one or more tags
+	 * 
+	 * @param string $tag
+	 * @return array Returns current tag list
+	 * @since 3.0.106
+	 * 
+	 */
+	public function addTag($tag) {
+		$tagList = $this->getTags();
+		$tagList[strtolower($tag)] = $tag;
+		$this->setTags($tagList, false);
+		return $tagList;
+	}
+
+	/**
+	 * Return true if this field has the given tag or false if not
+	 * 
+	 * @param string $tag
+	 * @return bool
+	 * @since 3.0.106
+	 * 
+	 */
+	public function hasTag($tag) {
+		$tagList = $this->getTags();
+		return isset($tagList[strtolower(trim(ltrim($tag, '-')))]);
+	}
+
+	/**
+	 * Remove a tag
+	 * 
+	 * @param string $tag
+	 * @return array Returns current tag list
+	 * @since 3.0.106
+	 * 
+	 */
+	public function removeTag($tag) {
+		$tagList = $this->getTags();
+		$tag = strtolower($tag);
+		if(!isset($tagList[$tag])) return $tagList;
+		unset($tagList[$tag]); 
+		return $this->setTags($tagList, false);
+	}
+
+	/**
+	 * Get URL to edit field in the admin
+	 * 
+	 * @param array|bool|string $options Specify array of options, string for find option, or bool for http option.
+	 *  - `find` (string): Name of field to find in editor form 
+	 *  - `http` (bool): True to force inclusion of scheme and hostname
+	 * @return string
+	 * @since 3.0.151
+	 * 
+	 */
+	public function editUrl($options = array()) {
+		if(is_string($options)) $options = array('find' => $options);
+		if(is_bool($options)) $options = array('http' => $options);
+		if(!is_array($options)) $options = array();
+		$url = $this->wire('config')->urls(empty($options['http']) ? 'admin' : 'httpAdmin');
+		$url .= "setup/field/edit?id=$this->id";
+		if(!empty($options['find'])) $url .= '#find-' . $this->wire('sanitizer')->fieldName($options['find']);
+		return $url;
+	}
+
 	/**
 	 * debugInfo PHP 5.6+ magic method
 	 *
@@ -1188,9 +1522,11 @@ class Field extends WireData implements Saveable, Exportable {
 	 *
 	 */
 	public function __debugInfo() {
-		$info = parent::__debugInfo();
-		$info['settings'] = $this->settings; 
+		$info = $this->settings;
+		$info['flags'] = $info['flags'] ? "$this->flagsStr ($info[flags])" : "";
+		$info = array_merge($info, parent::__debugInfo());
 		if($this->prevTable) $info['prevTable'] = $this->prevTable;
+		if($this->prevName) $info['prevName'] = $this->prevName;
 		if($this->prevFieldtype) $info['prevFieldtype'] = (string) $this->prevFieldtype;
 		if(!empty($this->trackGets)) $info['trackGets'] = $this->trackGets;
 		if($this->useRoles) {
@@ -1200,5 +1536,14 @@ class Field extends WireData implements Saveable, Exportable {
 		return $info; 
 	}
 	
+	public function debugInfoSmall() {
+		return array(
+			'id' => $this->id, 
+			'name' => $this->name,
+			'label' => $this->getLabel(), 
+			'type' => $this->type ? wireClassName($this->type) : '',
+		);
+	}
+	
 }
 

wire/core/FieldSelectorInfo.php

@@ -13,7 +13,7 @@
  * This file is licensed under the MIT license
  * https://processwire.com/about/license/mit/
  *
- * ProcessWire 3.x, Copyright 2016 by Ryan Cramer
+ * ProcessWire 3.x, Copyright 2020 by Ryan Cramer
  * https://processwire.com
  * 
  */
@@ -41,17 +41,31 @@ class FieldSelectorInfo extends Wire {
 	 * CSV keywords from schema mapped to input types to auto-determine input type from schema
 	 *
 	 */
-	protected $schemaToInput = array(); 
-
+	protected $schemaToInput = array();
 
+	/**
+	 * Construct
+	 * 
+	 */
 	public function __construct() {
 
+		$ftNops = array();
+		$ftOps = Selectors::getOperators(array(
+			'compareType' => Selector::compareTypeFind,
+			'getValueType' => 'operator',
+			'getIndexType' => 'none',
+		));
+		
+		foreach($ftOps as $op) {
+			$ftNops[] = "!$op";
+		}
+		
 		$this->operators = array(
 			'number' => array('=', '!=', '>', '<', '>=', '<=', '=""', '!=""'),
-			'text' => array('=', '!=', '%=', '^=', '$=', '=""', '!=""'),
-			'fulltext' => array('%=', '*=', '~=', '^=', '$=', '=', '!=', '=""', '!=""', '!%=', '!*=', '!~=', '!^=', '!$='),
+			'text' => array('=', '!=', '%=', '%^=', '%$=', '=""', '!=""'),
+			'fulltext' => array_merge($ftOps, array('=', '!=', '=""', '!=""'), $ftNops),
 			'select' => array('=', '!=')
-			);
+		);
 
 		$this->infoTemplate = array(
 			// name of the field
@@ -68,7 +82,7 @@ class FieldSelectorInfo extends Wire {
 			'options' => array(), 
 			// if field has subfields, this contains array of all above, indexed by subfield name (blank if not applicable)
 			'subfields' => array(), 
-			);
+		);
 
 		$this->schemaToInput = array(
 			'TEXT,TINYTEXT,MEDIUMTEXT,LONGTEXT,VARCHAR,CHAR' => 'text', 
@@ -76,8 +90,7 @@ class FieldSelectorInfo extends Wire {
 			'DATE' => 'date', 
 			'INT,DECIMAL,FLOAT,DOUBLE' => 'number',
 			'ENUM,SET' => 'select',
-			);
-
+		);
 	}
 
 	/**
@@ -98,6 +111,7 @@ class FieldSelectorInfo extends Wire {
 
 			// skip over native properties that aren't used in selectors
 			if(in_array($name, array('pages_id', 'keys', 'xtra', 'sort'))) continue; 
+			if(!is_string($schemaType)) continue;
 
 			if($name == 'data') {
 				// base property
@@ -187,21 +201,19 @@ class FieldSelectorInfo extends Wire {
 	 *
 	 */
 	public function getOperatorLabels() {
-		if(empty($this->operatorLabels)) $this->operatorLabels = array(
-			'=' => $this->_('Equals'),
-			'!=' => $this->_('Not Equals'),
-			'>' => $this->_('Greater Than'),
-			'<' => $this->_('Less Than'),
-			'>=' => $this->_('Greater Than or Equal'),
-			'<=' => $this->_('Less Than or Equal'),
-			'%=' => $this->_('Contains Text'),
-			'*=' => $this->_('Contains Phrase'),
-			'~=' => $this->_('Contains Words'),
-			'^=' => $this->_('Starts With'),
-			'$=' => $this->_('Ends With'),
-			'=""' => $this->_('Is Empty'),
-			'!=""' => $this->_('Is Not Empty')
-			);
+		if(!empty($this->operatorLabels)) return $this->operatorLabels;
+		$this->operatorLabels = Selectors::getOperators(array(
+			'getIndexType' => 'operator',
+			'getValueType' => 'label', 
+		));
+		$this->operatorLabels['=""'] = $this->_('Is Empty');
+		$this->operatorLabels['!=""'] = $this->_('Is Not Empty');
+		foreach($this->operators as $operator) {
+			if(isset($this->operatorLabels[$operator])) continue; 
+			if(strpos($operator, '!') !== 0) continue;
+			$op = ltrim($operator, '!'); 
+			$this->operatorLabels[$operator] = sprintf($this->_('Not: %s'), $this->operatorLabels[$op]); 
+		}
 		return $this->operatorLabels;
 	}
 }

wire/core/Fieldgroup.php

@@ -18,6 +18,8 @@
  * 
  * @property int $id Fieldgroup database ID #pw-group-retrieval
  * @property string $name Fieldgroup name #pw-group-retrieval
+ * @property array $fields_id Array of all field IDs in this Fieldgroup
+ * @property null|FieldsArray $removedFields Null when there are no removed fields, or FieldsArray when there are. 
  *
  */
 class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupItems {
@@ -39,6 +41,8 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 
 	/**
 	 * Any fields that were removed from this instance are noted so that Fieldgroups::save() can delete unused data
+	 * 
+	 * @var FieldsArray|null
 	 *
 	 */
 	protected $removedFields = null;
@@ -133,7 +137,7 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 	/**
 	 * Remove a field from this fieldgroup
 	 * 
-	 * Note that this must be followed up with a `$field->save()` before it does anything destructive. 
+	 * Note that this must be followed up with a `$fieldgroup->save()` before it does anything destructive. 
 	 * This method does nothing more than queue the removal.
 	 *
 	 * _Technical Details_   
@@ -177,7 +181,7 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 	 * #pw-internal
 	 * 
 	 * @param Field $field
-	 * @return bool
+	 * @return Fieldgroup|WireArray $this
 	 *
 	 */
 	public function finishRemove(Field $field) {
@@ -194,7 +198,7 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 	 * #pw-group-manipulation
 	 *
 	 * @param Field|string|int $field Field object, name or id. 
-	 * @return bool
+	 * @return bool|Fieldgroup|WireArray
 	 *
 	 */
 	public function softRemove($field) {
@@ -264,6 +268,7 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 
 		if($useFieldgroupContext && $value) {
 			$value->flags = $value->flags | Field::flagFieldgroupContext;
+			$value->setQuietly('_contextFieldgroup', $this); 
 		}
 
 		return $value; 
@@ -314,7 +319,7 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 	}
 
 	/**
-	 * Does this fieldgroup having the given field?
+	 * Does this fieldgroup have the given field?
 	 * 
 	 * #pw-group-retrieval
 	 *
@@ -335,7 +340,7 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 	 * #pw-group-retrieval
 	 *
 	 * @param string|int $key Property name to retrieve, or Field name
-	 * @return Field|string|int|null
+	 * @return Field|string|int|null|array
 	 *
 	 */
 	public function get($key) {
@@ -379,7 +384,7 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 	 *
 	 * @param string $key Name of property to set
 	 * @param string|int|object $value Value of property
-	 * @return Fieldgroup $this
+	 * @return Fieldgroup|WireArray $this
 	 * @throws WireException if passed invalid data
 	 *
 	 */
@@ -448,7 +453,9 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 	 *
 	 */
 	public function getExportData() {
-		return $this->wire('fieldgroups')->getExportData($this); 
+		/** @var Fieldgroups $fieldgroups */
+		$fieldgroups = $this->wire('fieldgroups');
+		return $fieldgroups->getExportData($this); 
 	}
 
 	/**
@@ -469,7 +476,9 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 	 * 
 	 */
 	public function setImportData(array $data) {
-		return $this->wire('fieldgroups')->setImportData($this, $data); 
+		/** @var Fieldgroups $fieldgroups */
+		$fieldgroups = $this->wire('fieldgroups');
+		return $fieldgroups->setImportData($this, $data); 
 	}
 
 	/**
@@ -520,6 +529,7 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 		$container = $this->wire(new InputfieldWrapper());
 		$containers = array();
 		$inFieldset = false;
+		$inHiddenFieldset = false;
 		$inModalGroup = '';
 	
 		// for multiple named fields
@@ -562,6 +572,14 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 					continue; 
 				}
 			}
+			if($inHiddenFieldset) {
+				// we are in a modal group that should be skipped since all the inputs require the modal
+				if($field->name == $inHiddenFieldset . "_END") {
+					$inHiddenFieldset = false;
+				} else {
+					continue;
+				}
+			}
 			
 			if($fieldName) {
 				// limit to specific field name
@@ -591,6 +609,10 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 				// field requires modal
 				$inModalGroup = $field->name;
 
+			} else if($field->type instanceof FieldtypeFieldsetOpen && $field->collapsed == Inputfield::collapsedHidden) {
+				$inHiddenFieldset = $field->name;
+				continue;
+
 			} else if(!$flat && $field->type instanceof FieldtypeFieldsetOpen) {
 				// new fieldset in non-flat mode
 				if($field->type instanceof FieldtypeFieldsetClose) {
@@ -612,7 +634,10 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 			if(!$inputfield) continue;
 			if($inputfield->collapsed == Inputfield::collapsedHidden) continue;
 
-			$inputfield->value = $page->get($field->name); 
+			if(!$page instanceof NullPage) {
+				$value = $page->get($field->name);
+				$inputfield->setAttribute('value', $value);
+			}
 			
 			if($multiMode) {
 				$fieldInputfields[$field->id] = $inputfield;
@@ -640,7 +665,9 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 	 *
 	 */
 	public function getTemplates() {
-		return $this->wire('fieldgroups')->getTemplates($this); 
+		/** @var Fieldgroups $fieldgroups */
+		$fieldgroups = $this->wire('fieldgroups');
+		return $fieldgroups->getTemplates($this); 
 	}
 
 	/**
@@ -686,7 +713,7 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 					return $this->fieldContexts[$field_id][$namespace];
 				}
 				return array();
-			} else {
+			} else if(isset($this->fieldContexts[$field_id])) {
 				return $this->fieldContexts[$field_id];
 			}
 		}
@@ -699,8 +726,8 @@ class Fieldgroup extends WireArray implements Saveable, Exportable, HasLookupIte
 	 * #pw-internal
 	 * 
 	 * @param int $field_id Field ID
-	 * @param string $namespace Optional namespace
 	 * @param array $data
+	 * @param string $namespace Optional namespace
 	 * 
 	 */
 	public function setFieldContextArray($field_id, $data, $namespace = '') {

wire/core/Fieldgroups.php

@@ -3,7 +3,9 @@
 /**
  * ProcessWire Fieldgroups
  *
- * Maintains collections of Fieldgroup instances. 
+ * #pw-summary Maintains collections of Fieldgroup object instances and represents the `$fieldgroups` API variable.
+ * #pw-body For full details on all methods available in a Fieldgroup, be sure to also see the `WireArray` class.
+ * #pw-var $fieldgroups
  * 
  * ProcessWire 3.x, Copyright 2016 by Ryan Cramer
  * https://processwire.com
@@ -19,6 +21,8 @@ class Fieldgroups extends WireSaveableItemsLookup {
 
 	/**
 	 * Instances of FieldgroupsArray
+	 * 
+	 * @var FieldgroupsArray
 	 *
 	 */
 	protected $fieldgroupsArray; 
@@ -60,6 +64,8 @@ class Fieldgroups extends WireSaveableItemsLookup {
 
 	/**
 	 * Per WireSaveableItems interface, return all available Fieldgroup instances
+	 * 
+	 * @return FieldgroupsArray
 	 *
 	 */
 	public function getAll() {
@@ -68,6 +74,8 @@ class Fieldgroups extends WireSaveableItemsLookup {
 
 	/**
 	 * Per WireSaveableItems interface, create a blank instance of a Fieldgroup
+	 * 
+	 * @return Fieldgroup
 	 *
 	 */
 	public function makeBlankItem() {
@@ -76,6 +84,8 @@ class Fieldgroups extends WireSaveableItemsLookup {
 
 	/**
 	 * Per WireSaveableItems interface, return the name of the table that Fieldgroup instances are stored in
+	 * 
+	 * @return string
 	 *
 	 */
 	public function getTable() {
@@ -84,6 +94,8 @@ class Fieldgroups extends WireSaveableItemsLookup {
 
 	/**
 	 * Per WireSaveableItemsLookup interface, return the name of the table that Fields are linked to Fieldgroups 
+	 * 
+	 * @return string
 	 *
 	 */
 	public function getLookupTable() {
@@ -137,21 +149,12 @@ class Fieldgroups extends WireSaveableItemsLookup {
 		if($item->id && $item->removedFields) {
 
 			foreach($this->wire('templates') as $template) {
-
 				if($template->fieldgroup->id !== $item->id) continue; 
-
 				foreach($item->removedFields as $field) {
-
 					// make sure the field is valid to delete from this template
-					if(($field->flags & Field::flagGlobal) && !$template->noGlobal) {
-						throw new WireException("Field '$field' may not be removed from fieldgroup '{$item->name}' because it is globally required (Field::flagGlobal)");
-					}
-
-					if($field->flags & Field::flagPermanent) {
-						throw new WireException("Field '$field' may not be removed from fieldgroup '{$item->name}' because it is permanent.");
-					}
-
-					$field->type->deleteTemplateField($template, $field); 
+					$error = $this->isFieldNotRemoveable($field, $item, $template);
+					if($error !== false) throw new WireException("$error Save of fieldgroup changes aborted.");
+					if($field->type) $field->type->deleteTemplateField($template, $field); 
 					$item->finishRemove($field); 
 				}
 			}
@@ -196,7 +199,7 @@ class Fieldgroups extends WireSaveableItemsLookup {
 	 * Also deletes the references in fieldgroups_fields table
 	 *
 	 * @param Saveable|Fieldgroup $item
-	 * @return Fieldgroups $this
+	 * @return bool
 	 * @throws WireException
 	 *
 	 */
@@ -208,7 +211,10 @@ class Fieldgroups extends WireSaveableItemsLookup {
 		}
 
 		if(count($templates)) {
-			throw new WireException("Can't delete fieldgroup '{$item->name}' because it is in use by template(s): " . implode(', ', $templates)); 
+			throw new WireException(
+				"Can't delete fieldgroup '{$item->name}' because it is in use by template(s): " . 
+				implode(', ', $templates)
+			); 
 		}
 
 		return parent::___delete($item); 
@@ -262,7 +268,8 @@ class Fieldgroups extends WireSaveableItemsLookup {
 		$contexts = $fieldgroup->getFieldContextArray();
 		$numSaved = 0;
 		foreach($contexts as $fieldID => $context) {
-			$field = $fieldgroup->getFieldContext($fieldID); 
+			$field = $fieldgroup->getFieldContext((int) $fieldID); 
+			if(!$field) continue;
 			if($this->wire('fields')->saveFieldgroupContext($field, $fieldgroup)) $numSaved++;
 		}
 		return $numSaved; 
@@ -444,5 +451,40 @@ class Fieldgroups extends WireSaveableItemsLookup {
 		return $return;
 	}
 
+	/**
+	 * Is the given Field not allowed to be removed from given Template?
+	 *
+	 * #pw-internal
+	 *
+	 * @param Field $field
+	 * @param Template $template
+	 * @param Fieldgroup $fieldgroup
+	 * @return bool|string Returns error message string if not removeable or boolean false if it is removeable
+	 *
+	 */
+	public function isFieldNotRemoveable(Field $field, Fieldgroup $fieldgroup, Template $template = null) {
+		
+		if(is_null($template)) $template = $this->wire('templates')->get($fieldgroup->name);
+
+		if(($field->flags & Field::flagGlobal) && (!$template || !$template->noGlobal)) {
+			if($template && $template->getConnectedField()) {
+				// if template has a 1-1 relationship with a field, noGlobal is not enforced
+				return false;
+			} else {
+				return
+					"Field '$field' may not be removed from fieldgroup '$fieldgroup->name' " .
+					"because it is globally required (Field::flagGlobal).";
+			}
+		}
+
+		if($field->flags & Field::flagPermanent) {
+			return 
+				"Field '$field' may not be removed from fieldgroup '$fieldgroup->name' " . 
+				"because it is permanent (Field::flagPermanent).";
+		}
+
+		return false;
+	}
+
 }
 

wire/core/Fields.php

@@ -5,10 +5,19 @@
  *
  * Manages collection of ALL Field instances, not specific to any particular Fieldgroup
  * 
- * ProcessWire 3.x, Copyright 2016 by Ryan Cramer
+ * ProcessWire 3.x, Copyright 2018 by Ryan Cramer
  * https://processwire.com
  * 
- * #pw-summary Manages all custom fields in ProcessWire
+ * #pw-summary Manages all custom fields in ProcessWire, independently of any Fieldgroup. 
+ * #pw-var $fields
+ * #pw-body = 
+ * Each field returned is an object of type `Field`. The $fields API variable is iterable: 
+ * ~~~~~
+ * foreach($fields as $field) {
+ *   echo "<p>Name: $field->name, Type: $field->type, Label: $field->label</p>";
+ * }
+ * ~~~~~
+ * #pw-body
  * 
  * @method Field|null get($key) Get a field by name or id
  * @method bool changeFieldtype(Field $field1, $keepSettings = false)
@@ -16,6 +25,8 @@
  * @method bool deleteFieldDataByTemplate(Field $field, Template $template) #pw-hooker
  * @method void changedType(Saveable $item, Fieldtype $fromType, Fieldtype $toType) #pw-hooker
  * @method void changeTypeReady(Saveable $item, Fieldtype $fromType, Fieldtype $toType) #pw-hooker
+ * @method bool|Field clone(Field $item, $name = '') Clone a field and return it or return false on fail. 
+ * @method array getTags($getFieldNames = false) Get tags for all fields (3.0.179+) #pw-advanced
  *
  */
 
@@ -34,60 +45,100 @@ class Fields extends WireSaveableItems {
 	 *
 	 */
 	static protected $nativeNamesSystem = array(
-		'id', 
-		'parent_id', 
-		'parent', // alias
-		'parents', 
-		'templates_id', 
-		'template', // alias
-		'name', 
-		'status',
+		'child',
+		'children',
+		'count',
+		'check_access',
+		'created_users_id',
 		'created',
-		'createdUser', 
+		'createdUser',
 		'createdUserID',
 		'createdUsersID',
-		'created_users_id', 
+		'data',
+		'description',
+		'editUrl',
+		'end',
+		'fieldgroup',
+		'fields',
+		'find',
+		'flags',
+		'get',
+		'has_parent',
+		'hasParent',
+		'httpUrl',
+		'id',
 		'include',
-		'modified', 
-		'modifiedUser', 
+		'isNew',
+		'limit',
+		'modified_users_id',
+		'modified',
+		'modifiedUser',
 		'modifiedUserID',
 		'modifiedUsersID',
-		'modified_users_id', 
-		'published',
+		'name',
 		'num_children',
-		'numChildren', 
-		'sort', 
-		'sortfield', 
-		'flags', 
-		'find',
-		'get',
-		'child', 
-		'children', 
-		'siblings', 
-		//'roles', 
-		'url', 
-		'path', 
-		'templatePrevious', 
-		'rootParent', 
-		'fieldgroup',
-		'fields', 
-		'description',
-		'data',
-		'isNew',
-		);
+		'numChildren',
+		'parent_id',
+		'parent', 
+		'parents',
+		'path',
+		'published',
+		'rootParent',
+		'siblings',
+		'sort',
+		'sortfield',
+		'start',
+		'status',
+		'template',
+		'templatePrevious',
+		'templates_id',
+		'url',
+		'_custom',
+	);
+
+	protected $flagNames = array();
 
 	/**
 	 * Field names that are native/permanent to this instance of ProcessWire (configurable at runtime)
+	 * 
+	 * Array indexes are the names and values are all boolean true. 
 	 *
 	 */
 	protected $nativeNamesLocal = array();
 
+	/**
+	 * Cache of all tags for all fields, populated to array when asked for the first time
+	 * 
+	 * @var array|null
+	 * 
+	 */
+	protected $tagList = null;
+
+	/**
+	 * @var FieldsTableTools|null
+	 * 
+	 */
+	protected $tableTools = null;
+
 	/**
 	 * Construct
 	 *
 	 */
 	public function __construct() {
 		$this->fieldsArray = new FieldsArray();
+		$this->flagNames = array(
+			Field::flagAutojoin => 'autojoin',
+			Field::flagGlobal => 'global',
+			Field::flagSystem => 'system',
+			Field::flagPermanent => 'permanent',
+			Field::flagAccess => 'access',
+			Field::flagAccessAPI => 'access-api',
+			Field::flagAccessEditor => 'access-editor',
+			Field::flagFieldgroupContext => 'fieldgroup-context',
+			Field::flagSystemOverride => 'system-override',
+		);
+		// convert so that keys are names so that isset() can be used rather than in_array()
+		if(isset(self::$nativeNamesSystem[0])) self::$nativeNamesSystem = array_flip(self::$nativeNamesSystem);
 	}
 
 	/**
@@ -111,6 +162,46 @@ class Fields extends WireSaveableItems {
 		return $this->wire(new Field());
 	}
 
+	/**
+	 * Make an item and populate with given data
+	 *
+	 * @param array $a Associative array of data to populate
+	 * @return Saveable|Wire
+	 * @throws WireException
+	 * @since 3.0.146
+	 *
+	 */
+	public function makeItem(array $a = array()) {
+		
+		if(empty($a['type'])) return parent::makeItem($a);
+		
+		/** @var Fieldtypes $fieldtypes */
+		$fieldtypes = $this->wire('fieldtypes');
+		if(!$fieldtypes) return parent::makeItem($a);
+		
+		/** @var Fieldtype $fieldtype */
+		$fieldtype = $fieldtypes->get($a['type']);
+		if(!$fieldtype) return parent::makeItem($a);
+		
+		$class = $fieldtype->getFieldClass($a);
+		if(empty($class) || $class === 'Field') return parent::makeItem($a);
+		
+		if(strpos($class, "\\") === false) $class = wireClassName($class, true);
+		if(!class_exists($class)) return parent::makeItem($a);
+	
+		/** @var Field $field */
+		$field = new $class();
+		$this->wire($field);
+		
+		foreach($a as $key => $value) {
+			$field->$key = $value;
+		}
+		
+		$field->resetTrackChanges(true);
+		
+		return $field;
+	}
+
 	/**
 	 * Per WireSaveableItems interface, return all available Field instances
 	 * 
@@ -176,9 +267,13 @@ class Fields extends WireSaveableItems {
 				$database->exec("RENAME TABLE `$prevTable` TO `tmp_$table`"); // QA
 				$database->exec("RENAME TABLE `tmp_$table` TO `$table`"); // QA
 			}
-			$item->type->renamedField($item, str_replace(Field::tablePrefix, '', $prevTable));
 			$item->prevTable = '';
 		}
+		
+		if(!$isNew && $item->prevName && $item->prevName != $item->name) {
+			$item->type->renamedField($item, $item->prevName);
+			$item->prevName = '';
+		}
 
 		if($item->prevFieldtype && $item->prevFieldtype->name != $item->type->name) {
 			if(!$this->changeFieldtype($item)) {
@@ -205,6 +300,10 @@ class Fields extends WireSaveableItems {
 				}
 			}	
 		}
+		
+		if($item->type) $item->type->savedField($item);
+		
+		$this->getTags('reset');
 
 		return true; 
 	}
@@ -281,11 +380,10 @@ class Fields extends WireSaveableItems {
 
 	/**
 	 * Create and return a cloned copy of the given Field
-	 *
+	 * 
 	 * @param Field|Saveable $item Field to clone
 	 * @param string $name Optionally specify name for new cloned item
 	 * @return bool|Saveable $item Returns the new clone on success, or false on failure
-	 * @throws WireException
 	 *
 	 */
 	public function ___clone(Saveable $item, $name = '') {
@@ -333,7 +431,7 @@ class Fields extends WireSaveableItems {
 
 		$field_id = (int) $field->id;
 		$fieldgroup_id = (int) $fieldgroup->id; 
-		$database = $this->wire('database');
+		$database = $this->wire()->database;
 
 		$newValues = $field->getArray();
 		$oldValues = $fieldOriginal->getArray();
@@ -411,13 +509,12 @@ class Fields extends WireSaveableItems {
 		// if there is something in data, then JSON encode it. If it's empty then make it null.
 		$data = count($data) ? wireEncodeJSON($data, true) : null;
 
-		if(is_null($data)) {
-			$data = 'NULL';
+		$query = $database->prepare('UPDATE fieldgroups_fields SET data=:data WHERE fields_id=:field_id AND fieldgroups_id=:fieldgroup_id');
+		if(empty($data)) {
+			$query->bindValue(':data', null, \PDO::PARAM_NULL); 
 		} else {
-			$data = "'" . $this->wire('database')->escapeStr($data) . "'";
+			$query->bindValue(':data', $data, \PDO::PARAM_STR); 
 		}
-		
-		$query = $database->prepare("UPDATE fieldgroups_fields SET data=$data WHERE fields_id=:field_id AND fieldgroups_id=:fieldgroup_id"); // QA
 		$query->bindValue(':field_id', $field_id, \PDO::PARAM_INT);
 		$query->bindValue(':fieldgroup_id', $fieldgroup_id, \PDO::PARAM_INT); 
 		$result = $query->execute();
@@ -505,7 +602,8 @@ class Fields extends WireSaveableItems {
 		if($exception) {
 			$this->error("Field type change failed. Database reports: $error"); 
 			$database->exec("DROP TABLE `$table2`"); // QA
-			if($exception) $this->trackException($exception, true); 
+			$severe = $this->wire()->process != 'ProcessField';
+			if($exception) $this->trackException($exception, $severe); 
 			return false; 
 		}
 
@@ -622,14 +720,14 @@ class Fields extends WireSaveableItems {
 		
 		if($success) {
 			$this->message(
-				sprintf($this->_('Deleted field "%1$s" data in %2$d row(s) from %3$d page(s).'), 
-					$field->name, $numRows, $numPages) . " [$deleteType]",
+				sprintf($this->_('Deleted field "%1$s" data in %2$d row(s) from %3$d page(s) using template "%4$s".'), 
+					$field->name, $numRows, $numPages, $template->name) . " [$deleteType]",
 				Notice::log
 			);
 		} else {
 			$this->error(
-				sprintf($this->_('Error deleting field "%1$s" data, %2$d row(s), %3$d page(s).'), 
-					$field->name, $numRows, $numPages) . " [$deleteType]",
+				sprintf($this->_('Error deleting field "%1$s" data, %2$d row(s), %3$d page(s) using template "%4$s".'), 
+					$field->name, $numRows, $numPages, $template->name) . " [$deleteType]",
 				Notice::log
 			);
 		}
@@ -676,6 +774,8 @@ class Fields extends WireSaveableItems {
 			'countPages' => false,
 			'getPageIDs' => false, 
 		);
+		
+		if(!$field->type) return 0;
 
 		$options = array_merge($defaults, $options);
 		$database = $this->wire('database');
@@ -802,8 +902,8 @@ class Fields extends WireSaveableItems {
 	 *
 	 */
 	public function isNative($name) {
-		if(in_array($name, self::$nativeNamesSystem)) return true; 
-		if(in_array($name, $this->nativeNamesLocal)) return true;
+		if(isset(self::$nativeNamesSystem[$name])) return true;
+		if(isset($this->nativeNamesLocal[$name])) return true; 
 		return false; 
 	}
 
@@ -816,12 +916,108 @@ class Fields extends WireSaveableItems {
 	 *
 	 */
 	public function setNative($name) {
-		$this->nativeNamesLocal[] = $name; 
+		$this->nativeNamesLocal[$name] = true; 
+	}
+
+	/**
+	 * Get list of all tags used by fields
+	 * 
+	 * - By default it returns an array of tag names where both keys and values are the tag names. 
+	 * - If you specify true for the `$getFields` argument, it returns an array where the keys are 
+	 *   tag names and the values are arrays of field names in the tag. 
+	 * - If you specify "reset" for the `$getFields` argument it returns a blank array and resets 
+	 *   internal tags cache.
+	 * 
+	 * #pw-advanced
+	 * 
+	 * @param bool|string $getFieldNames Specify true to return associative array where keys are tags and values are field names
+	 *   …or specify the string "reset" to force getTags() to reset its cache, forcing it to reload on the next call. 
+	 * @return array Both keys and values are tags in return value
+	 * @since 3.0.106 + made hookable in 3.0.179
+	 * 
+	 */
+	public function ___getTags($getFieldNames = false) {
+		
+		if($getFieldNames === 'reset') {
+			$this->tagList = null;
+			return array();
+		}
+		
+		if($this->tagList === null) {
+			$tagList = array();
+			foreach($this as $field) {
+				/** @var Field $field */
+				$fieldTags = $field->getTags();
+				foreach($fieldTags as $tag) {
+					if(!isset($tagList[$tag])) $tagList[$tag] = array();
+					$tagList[$tag][] = $field->name;
+				}
+			}
+			ksort($tagList);
+			$this->tagList = $tagList;
+		}
+		
+		if($getFieldNames) return $this->tagList;
+		
+		$tagList = array();
+		foreach($this->tagList as $tag => $fieldNames) {
+			$tagList[$tag] = $tag;
+		}
+		
+		return $tagList;
+	}
+
+	/**
+	 * Return all fields that have the given $tag
+	 * 
+	 * Returns an associative array of `['field_name' => 'field_name']` if `$getFieldNames` argument is true, 
+	 * or `['field_name => Field instance]` if not (which is the default). 
+	 * 
+	 * @param string $tag Tag to find fields for
+	 * @param bool $getFieldNames If true, returns array of field names rather than Field objects (default=false). 
+	 * @return array Array of Field objects, or array of field names if requested. Array keys are always field names.
+	 * @since 3.0.106
+	 * 
+	 */
+	public function findByTag($tag, $getFieldNames = false) {
+		$tags = $this->getTags(true);
+		$items = array();
+		if(!isset($tags[$tag])) return $items;
+		foreach($tags[$tag] as $fieldName) {
+			$items[$fieldName] = ($getFieldNames ? $fieldName : $this->get($fieldName));
+		}
+		ksort($items);
+		return $items;
+	}
+
+	/**
+	 * Get all flag names or get all flag names for given flags or Field
+	 * 
+	 * #pw-internal
+	 * 
+	 * @param int|Field|null $flags Specify flags or Field or omit to get all flag names
+	 * @param bool $getString Get a string of flag names rather than array? (default=false)
+	 * @return array|string When array is returned, array is of strings indexed by flag value (int)
+	 * 
+	 */
+	public function getFlagNames($flags = null, $getString = false) {
+		if($flags === null) {
+			$a = $this->flagNames;
+		} else {
+			$a = array();
+			if($flags instanceof Field) $flags = $flags->flags;
+			foreach($this->flagNames as $flag => $name) {
+				if($flags & $flag) $a[$flag] = $name;
+			}
+		}
+		return $getString ? implode(' ', $a) : $a;	
 	}
 
 	/**
 	 * Overridden from WireSaveableItems to retain keys with 0 values and remove defaults we don't need saved
 	 * 
+	 * #pw-internal
+	 * 
 	 * @param array $value
 	 * @return string of JSON
 	 *
@@ -906,5 +1102,46 @@ class Fields extends WireSaveableItems {
 	 */
 	public function ___changeTypeReady(Saveable $item, Fieldtype $fromType, Fieldtype $toType) { }
 
+	/**
+	 * Get Fieldtypes compatible (for type change) with given Field
+	 * 
+	 * #pw-internal
+	 *
+	 * @param Field $field
+	 * @return array Array of Fieldtype objects indexed by class name
+	 * @since 3.0.140
+	 *
+	 */
+	public function getCompatibleFieldtypes(Field $field) {
+		$fieldtype = $field->type;
+		if($fieldtype) {
+			// ask fieldtype what is compatible
+			$fieldtypes = $fieldtype->getCompatibleFieldtypes($field);
+			if(!$fieldtypes || !$fieldtypes instanceof WireArray) {
+				$fieldtypes = $this->wire(new Fieldtypes());
+			}
+			// ensure original is present
+			$fieldtypes->prepend($fieldtype);
+		} else {
+			// allow all
+			$fieldtypes = $this->wire('fieldtypes');
+		}
+		return $fieldtypes;
+	}
+
+	/**
+	 * Get FieldsIndexTools instance
+	 * 
+	 * #pw-internal
+	 * 
+	 * @return FieldsTableTools
+	 * @since 3.0.150
+	 * 
+	 */
+	public function tableTools() {
+		if($this->tableTools === null) $this->tableTools = $this->wire(new FieldsTableTools());
+		return $this->tableTools;
+	}
+
 }
 

wire/core/FieldsTableTools.php

@@ -0,0 +1,402 @@
+<?php namespace ProcessWire;
+/**
+ * ProcessWire Fields Table and Index tools
+ *
+ * #pw-summary Methods for managing DB tables and indexes for fields, and related methods. Accessed from `$fields->tableTools()`.
+ *
+ * ProcessWire 3.x, Copyright 2020 by Ryan Cramer
+ * https://processwire.com
+ * 
+ * @since 3.0.150
+ * 
+ * #pw-internal
+ * 
+ */ 
+class FieldsTableTools extends Wire {
+	
+	/**
+	 * Find duplicate rows for a specific column in a field’s table
+	 *
+	 * #pw-internal
+	 *
+	 * @param Field $field
+	 * @param array $options
+	 *  - `column` (string): Name of column to find duplicate values in (default='data')
+	 *  - `value` (bool|string): Value to find duplicates of, or false to find all duplicate values (default=false)
+	 *  - `verbose` (bool): Include entire DB rows in returned result? (default=false)
+	 * @return array Returns array of arrays where each item contains indexes of 'count' (int) and 'value' (int|string), plus,
+	 *  if the `verbose` option is true, returned value also adds a `rows` index (array) containing contents of entire matching DB rows.
+	 *
+	 */
+	public function findDuplicateRows(Field $field, array $options = array()) {
+
+		$defaults = array(
+			'column' => 'data',
+			'value' => false,
+			'verbose' => false,
+		);
+
+		$options = array_merge($defaults, $options);
+		$result = array();
+
+		/** @var WireDatabasePDO $database */
+		$database = $this->wire('database');
+		$table = $database->escapeTable($field->getTable());
+		$col = $database->escapeCol($options['column']);
+		$sql = "SELECT $col, COUNT($col) FROM $table ";
+
+		if($options['value'] !== false) {
+			if($options['value'] === null) {
+				$sql .= "WHERE $col IS NULL ";
+			} else {
+				$sql .= "WHERE $col=:val ";
+			}
+		}
+
+		$sql .= "GROUP BY $col HAVING COUNT($col) > 1";
+		$query = $database->prepare($sql);
+
+		if($options['value'] !== false && $options['value'] !== null) {
+			$query->bindValue(':val', $options['value']);
+		}
+
+		$query->execute();
+
+		while($row = $query->fetch(\PDO::FETCH_NUM)) {
+			$result[] = array('value' => $row[0], 'count' => (int) $row[1]);
+		}
+
+		$query->closeCursor();
+
+		if($options['verbose']) {
+			foreach($result as $key => $item) {
+				$result[$key]['rows'] = array();
+				$sql = "SELECT * FROM $table WHERE $col=:val";
+				$query = $database->prepare($sql);
+				$query->bindValue(':val', $item['value']);
+				$query->execute();
+				while($row = $query->fetch(\PDO::FETCH_ASSOC)) {
+					$result[$key]['rows'][] = $row;
+				}
+				$query->closeCursor();
+			}
+		}
+
+		return $result;
+	}
+	
+	/**
+	 * Add or remove a unique index for a field on its 'data' column
+	 *
+	 * #pw-internal
+	 *
+	 * @param Field $field
+	 * @param bool $add Specify false to remove index rather than add (default=true)
+	 * @return bool|int Returns one of the following when adding index:
+	 *  - `true` (bool): When index successfully added.
+	 *  - `false` (bool): Index cannot be added because there are non-unique rows already present (not allowed).
+	 *  - `1` (int): Unique index already present so was not necessary (not needed).
+	 *  - `0` (int): Requested column does not exist in table so cannot be added as index (not allowed).
+	 *  Returns one of the following when removing index:
+	 *  - `true` (bool): When index successfully removed.
+	 *  - `false` (bool): When index failed to remove.
+	 *  - `1` (int): When remove index but there is no unique index to remove (not needed).
+	 *  - `0` (int): When remove index that is not one we have previously added (not allowed).
+	 * @throws \PDOException When given invalid column name or unknown error condition
+	 *
+	 */
+	public function setUniqueIndex(Field $field, $add = true) { 
+
+		/** @var WireDatabasePDO $database */
+		$database = $this->wire('database');
+		$col = 'data';
+		$table = $database->escapeTable($field->getTable());
+		$uniqueIndexName = $this->hasUniqueIndex($field, $col);
+		$requireIndexName = $database->escapeCol($col . '_unique');
+		$action = ''; // whether to 'add' or 'remove' flag and property from Field 
+
+		if($uniqueIndexName) {
+			// already has unique index for indicated column
+			if($add) {
+				// already has unique index name
+				$result = 1;
+				$action = 'add';
+				
+			} else {
+				// remove requested
+				if($uniqueIndexName === $requireIndexName) {
+					// remove the unique index
+					$sql = "ALTER TABLE $table DROP INDEX `$requireIndexName`";
+					try {
+						$result = $database->exec($sql) !== false;
+						if($result) $action = 'remove';
+					} catch(\Exception $e) {
+						$result = false;
+					}
+				} else {
+					// unique index present but it’s not one we previously added
+					$result = 0;
+					$action = 'remove';
+				}
+			}
+
+		} else if($add) {
+			// no unique index yet exists for column, so add one
+			$col = $database->escapeCol($col);
+			$sql = "ALTER TABLE $table ADD UNIQUE `$requireIndexName` (`$col`)";
+			try {
+				$result = $database->exec($sql) !== false;
+				if($result) $action = 'add';
+			} catch(\Exception $e) {
+				$action = 'remove';
+				if($e->getCode() == 23000) {
+					// non unique rows already present
+					$result = false;
+				} else if($e->getCode() == 42000) {
+					// requested column does not exist
+					$result = 0;
+				} else {
+					throw $e;
+				}
+			}
+			
+		} else {
+			// remove properties indicating unique
+			if($field->hasFlag(Field::flagUnique) || $field->flagUnique) $action = 'remove';
+			$result = 1;
+		}
+		
+		if($action) {
+			$save = false;
+			if($action === 'add') {
+				if(!$field->hasFlag(Field::flagUnique)) $save = $field->addFlag(Field::flagUnique);
+				if(!$field->flagUnique) $save = $field->set('flagUnique', true);
+			} else if($action === 'remove') {
+				if($field->hasFlag(Field::flagUnique)) $save = $field->removeFlag(Field::flagUnique);
+				if($field->flagUnique) $save = $field->remove('flagUnique');
+			}
+			if($save) $field->save();
+		}
+		
+		return $result;
+	}
+
+	/**
+	 * Does given field have a unique index on column?
+	 *
+	 * #pw-internal
+	 *
+	 * @param Field $field
+	 * @param string $col
+	 * @return bool|string Returns index name when present, or boolean false when not
+	 *
+	 */
+	public function hasUniqueIndex(Field $field, $col = 'data') {
+		/** @var WireDatabasePDO $database */
+		$database = $this->wire('database');
+		$table = $database->escapeTable($field->getTable());
+		$sql = "SHOW INDEX FROM $table";
+		$query = $database->prepare($sql);
+		$query->execute();
+		$has = false;
+		while($row = $query->fetch(\PDO::FETCH_ASSOC)) {
+			if($row['Column_name'] === $col && !$row['Non_unique']) {
+				$has = $row['Key_name'];
+				break;
+			}
+		}
+		$query->closeCursor();
+		return $has;
+	}
+
+	/**
+	 * Check state of field unique 'data' index and update as needed
+	 * 
+	 * @param Field $field
+	 * @param bool $verbose Show messages when changes made? (default=true)
+	 * @throws WireException
+	 * 
+	 */
+	public function checkUniqueIndex(Field $field, $verbose = true) {
+		
+		static $checking = false;
+		if($checking) return;
+		
+		$col = 'data';
+
+		// is unique index requested?
+		$useUnique = (bool) $field->get('flagUnique');
+		
+		// is unique index already present?
+		$hasUnique = (bool) $field->hasFlag(Field::flagUnique);
+		
+		if($useUnique === $hasUnique) return;
+		
+		if(!$this->database->tableExists($field->getTable())) return;
+	
+		$checking = true;
+
+		if($useUnique && !$hasUnique) {
+			// add unique index
+			$qty = $this->deleteEmptyRows($field, $col);
+			
+			if($qty && $verbose) {
+				$this->message(sprintf($this->_('Deleted %d empty row(s) for field %s'), $qty, $field->name));
+			}
+			
+			$result = $this->setUniqueIndex($field, true);
+			
+			if($result === false && $verbose) {
+				$pageEditUrl = $this->wire()->config->urls->admin . 'page/edit/?id=';
+				$msg = $this->_('Unique index cannot be added yet because there are already non-unique row(s) present:') . ' ';
+				$rows = $this->findDuplicateRows($field, array('verbose' => true, 'column' => $col));
+				foreach($rows as $row) {
+					$ids = array();
+					foreach($row['rows'] as $a) {
+						$ids[] = '[' . $a['pages_id'] . '](' . $pageEditUrl . $a['pages_id'] . ')';
+					}
+					$msg .= "[br]• $row[value] — " . 
+						sprintf($this->_('Appears %d times'), $row['count']) . ' ' . 
+						sprintf($this->_('(page IDs: %s)'), implode(', ', $ids)) . ' ';
+				}
+				$this->error($msg, Notice::noGroup | Notice::allowMarkdown);
+				
+			} else if($result && $verbose) {
+				$this->message($this->_('Added unique index') . " ($field->name)", Notice::noGroup);
+			}
+
+		} else if($hasUnique && !$useUnique) {
+			// remove unique index
+			$result = $this->setUniqueIndex($field, false);
+			if($result && $verbose) $this->message($this->_('Removed unique index') . " ($field->name)", Notice::noGroup);
+		}
+	
+		$checking = false;
+	}
+
+	/**
+	 * Delete rows having empty column value
+	 * 
+	 * @param Field $field
+	 * @param string $col Column name (default='data')
+	 * @param bool $strict When true, delete not allowed if there are columns other than one given and 'pages_id' (default=true)
+	 * @return bool|int Returns false if delete not allowed, otherwise returns int with # of rows deleted
+	 * @throws WireException
+	 * 
+	 */
+	public function deleteEmptyRows(Field $field, $col = 'data', $strict = true) {
+		
+		/** @var WireDatabasePDO $database */
+		$database = $this->wire('database');
+		$table = $database->escapeTable($field->getTable());
+		$fieldtype = $field->type;
+		$schema = $fieldtype->getDatabaseSchema($field);
+		$wheres = array();
+		
+		$types = array(
+			'INT', 'TINYINT', 'SMALLINT', 'MEDIUMINT', 'BIGINT',
+			'TEXT', 'TINYTEXT', 'MEDIUMTEXT', 'LONGTEXT',
+			'DATE', 'TIME', 'DATETIME', 'TIMESTAMP',
+			'CHAR', 'VARCHAR', 
+		);
+		
+		unset($schema['keys'], $schema['pages_id'], $schema['xtra']);
+
+		if(!isset($schema[$col])) return false; // if there's no schema for this column, fail
+		if($strict && count($schema) > 1) return false; // if there are other columns too, fail
+
+		$type = strtoupper($schema[$col]);
+		$allowNull = strpos($type, 'NOT NULL') === false;
+		
+		if(strpos($type, ' ')) list($type,) = explode(' ', $type, 2);
+		if(strpos($type, '(')) list($type,) = explode('(', $type, 2);
+		
+		if(!in_array(trim($type), $types)) return false; // if not in allowed col types, fail
+		
+		if($col !== 'data') {
+			$col = $database->escapeCol($this->sanitizer->fieldName($col));
+			if(empty($col)) return false;
+		}
+
+		if(strpos($type, 'INT') !== false) {
+			if($fieldtype->isEmptyValue($field, 0)) {
+				$wheres[] = "$col=0";
+			}
+		} else if($fieldtype->isEmptyValue($field, '')) {
+			$wheres[] = "$col=''";
+		}
+		
+		if($allowNull) {
+			$wheres[] = "$col IS NULL";
+		}
+	
+		if(count($wheres)) {
+			// delete empty rows matching our conditions
+			$sql = "DELETE FROM $table WHERE " . implode(' OR ', $wheres);
+			$query = $database->prepare($sql);
+			$result = $query->execute() ? $query->rowCount() : 0;
+			$query->closeCursor();
+		} else {
+			// no empty rows possible
+			$result = true;
+		}
+		
+		return $result;
+	}
+
+	/**
+	 * Create a checkbox Inputfield to configure unique value state
+	 * 
+	 * @param Field $field
+	 * @return InputfieldCheckbox
+	 * 
+	 */
+	public function getUniqueIndexInputfield(Field $field) {
+	
+		$col = 'data';
+		$modules = $this->wire('modules'); /** @var Modules $modules */
+		
+		if((bool) $field->flagUnique != $field->hasFlag(Field::flagUnique)) {
+			$this->checkUniqueIndex($field, true);
+		}
+
+		$f = $modules->get('InputfieldCheckbox'); /** @var InputfieldCheckbox $f */
+		$f->attr('name', "flagUnique");
+		$f->label = $this->_('Unique');
+		$f->icon = 'hand-stop-o';
+		$f->description = $this->_('When checked, a given value may not be used more than once in this field, and thus may not appear on more than one page.');
+		
+		if($this->hasUniqueIndex($field, $col)) {
+			$f->attr('checked', 'checked');
+			if(!$field->hasFlag(Field::flagUnique)) $field->addFlag(Field::flagUnique);
+			if(!$field->flagUnique) $field->flagUnique = true;
+		}
+	
+		return $f;
+	}
+
+	/**
+	 * Does given value exist anywhere in field table?
+	 * 
+	 * @param Field $field
+	 * @param string|int $value
+	 * @param string $col
+	 * @return int Returns page ID where value exists, if found. Otherwise returns 0. 
+	 * @throws WireException
+	 * 
+	 */
+	public function valueExists(Field $field, $value, $col = 'data') {
+		/** @var WireDatabasePDO $database */
+		$database = $this->wire('database');
+		$table = $database->escapeTable($field->getTable());
+		if($col !== 'data') $col = $database->escapeCol($this->sanitizer->fieldName($col)); 
+		$sql = "SELECT pages_id FROM $table WHERE $col=:val LIMIT 1";
+		$query = $database->prepare($sql);
+		$query->bindValue(':val', $value); 
+		$query->execute();
+		$pageId = $query->rowCount() ? (int) $query->fetchColumn() : 0;
+		$query->closeCursor();
+		return $pageId;
+	}
+	
+}

wire/core/Fieldtype.php

@@ -33,6 +33,7 @@
  * @method mixed wakeupValue(Page $page, Field $field, $value)
  * @method string|int|array sleepValue(Page $page, Field $field, $value)
  * @method string|float|int|array exportValue(Page $page, Field $field, $value, array $options = array())
+ * @method string|float|int|array|object importValue(Page $page, Field $field, $value, array $options = array())
  * @method bool createField(Field $field)
  * @method array getSelectorInfo(Field $field, array $data = array())
  * @method mixed|null loadPageField(Page $page, Field $field)
@@ -45,12 +46,14 @@
  * @method bool deleteTemplateField(Template $template, Field $field)
  * @method Field cloneField(Field $field)
  * @method void renamedField(Field $field, $prevName) 
+ * @method void savedField(Field $field)
  * @method void install()
  * @method void uninstall()
  * 
  * @property bool $_exportMode True when Fieldtype is exporting config data, false otherwise.  #pw-internal
  * @property string $name Name of Fieldtype module. #pw-group-other
  * @property string $shortName Short name of Fieldtype, which excludes the "Fieldtype" prefix. #pw-group-other
+ * @property string $longName Long name of Fieldtype, which is typically the module title. #pw-group-other
  * 
  */
 abstract class Fieldtype extends WireData implements Module {
@@ -75,6 +78,14 @@ abstract class Fieldtype extends WireData implements Module {
 	 */
 	protected $loadPageFieldFilters = null;
 
+	/**
+	 * Field that last referenced this Fieldtype from $field->type
+	 * 
+	 * @var Field|null
+	 * 
+	 */
+	protected $lastAccessField = null;
+
 	/**
 	 * Construct
 	 * 
@@ -89,6 +100,30 @@ abstract class Fieldtype extends WireData implements Module {
 	 */
 	public function init() { }
 
+	/**
+	 * Set last access field
+	 * 
+	 * #pw-internal
+	 * 
+	 * @param Field $field
+	 * 
+	 */
+	public function setLastAccessField(Field $field) {
+		$this->lastAccessField = $field;
+	}
+
+	/**
+	 * Return field that last accessed this Fieldtype via $field->type
+	 * 
+	 * #pw-internal
+	 * 
+	 * @return null|Field
+	 * 
+	 */
+	public function getLastAccessField() {
+		return $this->lastAccessField;
+	}
+
 	/**
 	 * Fieldtype modules are singular, in that only one instance is needed per request
 	 * 
@@ -396,13 +431,11 @@ abstract class Fieldtype extends WireData implements Module {
 	 * need to have some text formatting applied to them, like Markdown, SmartyPants, Textile, etc. As a result, 
 	 * Fieldtype modules don't need to implement this unless it's applicable. 
 	 *
-	 * Fieldtype modules that implement this do not need to call this parent method, as it doesn't do anything.
-	 * 
 	 * #pw-group-formatting
 	 * 
-	 * @param Page $page
-	 * @param Field $field
-	 * @param string|int|object $value
+	 * @param Page $page Page that the value lives on
+	 * @param Field $field Field that represents the value
+	 * @param string|int|object $value The value to format
 	 * @return mixed
 	 *
 	 */
@@ -462,6 +495,23 @@ abstract class Fieldtype extends WireData implements Module {
 		return '';
 	}
 
+	/**
+	 * Is given value one that should cause the DB row(s) to be deleted rather than saved?
+	 * 
+	 * Not applicable to Fieldtypes that override the savePageField() method with their own
+	 * implementation, unless they also use this method. 
+	 * 
+	 * @param Page $page
+	 * @param Field $field
+	 * @param mixed $value
+	 * @return bool
+	 * @since 3.0.150
+	 * 
+	 */
+	public function isDeleteValue(Page $page, Field $field, $value) {
+		return $value === $this->getBlankValue($page, $field); 
+	}
+
 	/**
 	 * Return whether the given value is considered empty or not.
 	 * 
@@ -472,6 +522,16 @@ abstract class Fieldtype extends WireData implements Module {
 	 * Example: an integer or text Fieldtype might not consider a "0" to be empty,
 	 * whereas a Page reference would. 
 	 * 
+	 * This method is primarily used by the PageFinder::whereEmptyValuePossible()
+	 * method to determine whether to include non-present (null) rows. 
+	 * 
+	 * 3.0.164+: If given a Selector object for $value, PageFinder is proposing 
+	 * handling the empty-value match condition internally rather than calling
+	 * the Fieldtype’s getMatchQuery() method. Return true if this Fieldtype would
+	 * prefer to handle the match, or false if not. Fieldtype modules do not need
+	 * to consider this unless they want to override the default empty value match
+	 * behavior in PageFinder::whereEmptyValuePossible().
+	 * 
 	 * #pw-group-finding
 	 * 
 	 * @param Field $field
@@ -522,6 +582,7 @@ abstract class Fieldtype extends WireData implements Module {
 	 * @param Field $field
 	 * @param string|int|float|array|object $value
 	 * @return string|int|float|array
+	 * @see Fieldtype::wakeupValue()
 	 *
 	 */
 	public function ___sleepValue(Page $page, Field $field, $value) {
@@ -532,24 +593,69 @@ abstract class Fieldtype extends WireData implements Module {
 	/**
 	 * Given a value originally generated by exportValue() convert it to a live/runtime value. 
 	 *
-	 * This is intended for importing from PW-driven web services. 
+	 * This is intended for importing from PW-driven web services. If not overridden, it does
+	 * the same thing as the `Fieldtype::wakeupValue()` method. 
+	 * 
+	 * #pw-internal
 	 *
 	 * @param Page $page
 	 * @param Field $field
-	 * @param string|int|array $value
+	 * @param string|int|float|array|null $value
+	 * @param array $options Additional options if needed/applicable
 	 * @return string|int|array|object $value
+	 * @see Fieldtype::exportValue()
 	 *
-	public function ___importValue(Page $page, Field $field, $value) {
+	 */
+	public function ___importValue(Page $page, Field $field, $value, array $options = array()) {
+		if($options) {}
 		$value = $this->wakeupValue($page, $field, $value); 
 		return $value; 
 	}
+
+	/**
+	 * Get associative array of options and info (name => value) that Fieldtype supports for importValue
+	 * 
+	 * Current recognized options include the following: 
+	 * 
+	 * - `importable` (bool): Is the field importable (and exportable)? (default=auto-detect)
+	 * 
+	 * - `test` (bool): Indicates Fieldtype supports testing import before committing & populates notices to 
+	 *    returned Wire object. (default=false)
+	 * 
+	 * - `returnsPageValue` (bool): True if it returns the value that should set back to Page? False if return 
+	 *    value should not be set to Page. When false, it indicates the Fieldtype::importValue() handles the 
+	 *    actual commit to DB of import data. (default=true)
+	 * 
+	 * - `requiresExportValue` (bool): Indicates Fieldtype::importValue() requires an 'exportValue' of the 
+	 *    current value from Page in $options. (default=false)
+	 * 
+	 * - `restoreOnException` (bool): Restore previous value if Exception thrown during import (default=false). 
+	 * 
+	 * #pw-internal
+	 * 
+	 * @param Field $field
+	 * @return array
+	 * 
 	 */
+	public function getImportValueOptions(Field $field) {
+		$schema = $this->getDatabaseSchema($field); 
+		$options = array(
+			'importable' => (!isset($schema['xtra']['all']) || $schema['xtra']['all'] !== true) ? false : true,
+			'test' => false,
+			'returnsPageValue' => true,
+			'requiresExportValue' => false,
+			'restoreOnException' => false,
+		);
+		return $options; 
+	}
 
 	/**
 	 * Given a value, return an portable version of it as either a string, int, float or array
 	 *
 	 * If an array is returned, it should only contain: strings, ints, floats or more arrays of those types.
 	 * This is intended for web service exports. 
+	 * 
+	 * When applicable, this method should map things like internal IDs to named equivalents (name, path, etc.).
  	 *
 	 * If not overridden, this takes on the same behavior as `Fieldtype::sleepValue()`. However, if overridden, 
 	 * it is intended to be more verbose than wakeupValue, where applicable. 
@@ -558,8 +664,10 @@ abstract class Fieldtype extends WireData implements Module {
 	 *
 	 * @param Page $page
 	 * @param Field $field
-	 * @param string|int|array|object $value
-	 * @param array $options Optional settings to shape the exported value, if needed. 
+	 * @param string|int|float|array|object|null $value
+	 * @param array $options Optional settings to shape the exported value, if needed:
+	 *  - `system` (boolean): Indicates value is being used for a system export via $pages->export() call (default=false). 
+	 *  - `human` (boolean): When true, Fieldtype may optionally emphasize human readability over importability (default=false). 
 	 * @return string|float|int|array
 	 *
 	 */
@@ -592,34 +700,81 @@ abstract class Fieldtype extends WireData implements Module {
 	/**
 	 * Get the database query that matches a Fieldtype table’s data with a given value.
 	 *
-	 * Possible template method: If overridden, children should not call this parent method. 
+	 * Possible template method: If overridden, children do not need to call this method
+	 * if they update the $query themselves. 
+	 *
+	 * Note the following additional properties are available from the $query argument: 
+	 * 
+	 *  - `$query->field` (Field): Field instance that being referred to match.
+	 *  - `$query->group` (string): Original group of the field in the selector (when applicable).
+	 *  - `$query->selector` (Selector): Original Selector object (matching the $field).
+	 *  - `$query->selectors` (Selectors): Original Selectors object (matching $field and others).
+	 *  - `$query->parentQuery` (DatabaseQuerySelect): Parent database query that $query will be merged into.
+	 *  - `$query->pageFinder` (PageFinder): The PageFinder instance that initiated the query, for additional info.
 	 * 
 	 * #pw-group-finding
 	 *
-	 * @param DatabaseQuerySelect $query
+	 * @param PageFinderDatabaseQuerySelect $query
 	 * @param string $table The table name to use
 	 * @param string $subfield Name of the subfield (typically 'data', unless selector explicitly specified another)
-	 * @param string $operator The comparison operator
-	 * @param mixed $value The value to find
-	 * @return DatabaseQuery $query
+	 * @param string $operator The comparison operator. 
+	 *  - This base Fieldtype class accepts only database operators (=, !=, >, >=, <, <=, &). 
+	 *  - Other Fieldtypes may choose to accept more operators according to need of Fieldtype.
+	 * @param mixed $value Value to find. 
+	 *  - If given array, this base Fieldtype class (only) will match via OR condition. (3.0.182+)
+	 *  - Other Fieldtypes may choose to interpret array values differently according need of Fieldtype.
+	 * @return PageFinderDatabaseQuerySelect|DatabaseQuerySelect $query
 	 * @throws WireException
 	 *
 	 */
 	public function getMatchQuery($query, $table, $subfield, $operator, $value) {
 
-		$database = $this->wire('database');
+		$database = $this->wire()->database;
 
-		if(!$database->isOperator($operator)) 
-			throw new WireException("Operator '{$operator}' is not implemented in {$this->className}"); 
+		if(!$database->isOperator($operator)) {
+			throw new WireException("Operator '{$operator}' is not implemented in {$this->className}");
+		}
 
 		$table = $database->escapeTable($table); 
 		$subfield = $database->escapeCol($subfield);
-		$quoteValue = $database->quote($value); 
-
-		$query->where("{$table}.{$subfield}{$operator}$quoteValue"); // QA
+		$operator = $database->escapeOperator($operator, WireDatabasePDO::operatorTypeComparison); 
+		
+		if(is_array($value)) {
+			$a = array();
+			foreach($value as $v) {
+				$bindKey = $query->bindValueGetKey($v);
+				$a[] = "{$table}.{$subfield}{$operator}{$bindKey}";
+			}
+			$query->where('(' . implode(' OR ', $a) . ')'); 
+		} else {
+			$query->where("{$table}.{$subfield}{$operator}?", $value); // QA
+		}
+		
 		return $query; 
 	}
 
+	/**
+	 * Get or update query to sort by given $field or $subfield
+	 * 
+	 * Return false if this Fieldtype does not have built-in sort logic and PageFinder should handle it. 
+	 * Return string of query to add to ORDER BY statement, or boolean true if method added it already. 
+	 * 
+	 * #pw-internal
+	 *
+	 * @param Field $field
+	 * @param DatabaseQuerySelect $query
+	 * @param string $table
+	 * @param string $subfield
+	 * @param bool $desc True for descending, false for ascending
+	 * @return bool|string
+	 * @since 3.0.167
+	 * 
+	 */
+	public function getMatchQuerySort(Field $field, $query, $table, $subfield, $desc) {
+		if($query && $table && $field && $subfield && $desc) {}
+		return false;
+	}
+
 	/**
 	 * Create a new field table in the database.
 	 *
@@ -733,6 +888,21 @@ abstract class Fieldtype extends WireData implements Module {
 		return $schema; 
 	}
 
+	/**
+	 * Get class name to use Field objects of this type (must be class that extends Field class)
+	 * 
+	 * Return blank if default class (Field) should be used. 
+	 * 
+	 * @param array $a Field data from DB (if needed)
+	 * @return string Return class name or blank to use default Field class
+	 * @since 3.0.146
+	 * 
+	 */
+	public function getFieldClass(array $a = array()) {
+		if($a) {} // ignore
+		return '';
+	}
+
 	/**
 	 * Returns verbose array of database schema information
 	 * 
@@ -823,16 +993,73 @@ abstract class Fieldtype extends WireData implements Module {
 	
 
 	/**
-	 * Return trimmed database schema array of any parts that aren't needed for data loading
+	 * Trim and/or filter database schema
+	 * 
+	 * Returns schema with all native columns and schema settings removed,
+	 * leaving just the custom columns for the schema, optionally filtered
+	 * by given $options array. 
 	 * 
 	 * #pw-internal
 	 * 
-	 * @param array $schema
+	 * @param array $schema Schema from getDatabaseSchema() call (not verbose schema)
+	 * @param array $options Additional options (since 3.0.158)
+	 *  - `trimMeta` (bool): Trim meta data from schema, like 'keys' and 'xtra'? (default=true)
+	 *  - `trimDefault` (bool): Trim default columns from schema, like 'pages_id' and 'sort'? (default=true)
+	 *  - `findDefaultNULL` (bool): When true, return all columns that specify NULL as their default. 
+	 *  - `findAutoIncrement` (bool): When true, return all columns that specify AUTO_INCREMENT.
+	 *  - `findType` (string): Return all columns that match the given column type (i.e. "int", "varchar", "text")
+	 *     Precede types like "int" or "text" with "*" to match all of type (i.e. "*int" matches "tinyint", "int", etc.)
 	 * @return array
 	 *
 	 */
-	public function trimDatabaseSchema(array $schema) {
-		unset($schema['pages_id'], $schema['keys'], $schema['xtra'], $schema['sort']); 
+	public function trimDatabaseSchema(array $schema, array $options = array()) {
+		
+		$defaults = array(
+			'trimMeta' => true, 
+			'trimDefault' => true, // trim default columns (like pages_id and sort) from result?
+			'findType' => '',
+			'findAutoIncrement' => false,
+			'findDefaultNULL' => false,
+		);
+		
+		$options = array_merge($defaults, $options);
+
+		if($options['trimMeta']) unset($schema['keys'], $schema['xtra']); 
+		if($options['trimDefault']) unset($schema['pages_id'], $schema['sort']); 
+		
+		$findType = $options['findType'] ? strtolower(trim($options['findType'], '*')) : false; // find in column type
+		$findAllType = $findType && $findType !== $options['findType']; // find all variations of findType
+		$useFind = $findType || $options['findAutoIncrement'] || $options['findDefaultNULL'];
+	
+		// exit early if no finds are requested
+		if(!$useFind) return $schema;
+		
+		foreach($schema as $colName => $colSchema) {
+			$match = null;
+			$colSchema = strtolower($colSchema) . ' ';
+			list($colType, $colMeta) = explode(' ', $colSchema, 2);
+			
+			if($options['findAutoIncrement'] && $match !== false) {
+				$match = strpos($colMeta, 'auto_increment') !== false;
+			}
+			
+			if($options['findDefaultNULL'] && $match !== false) {
+				$match = strpos($colMeta, 'default null') !== false;
+			}
+			
+			if($findType && $match !== false && strpos($colType, $findType) !== false) {
+				if($colType === $findType || strpos($colType, "$findType ") === 0 || strpos($colType, "$findType(") === 0) {
+					$match = true; // exact match
+				} else if($findAllType && strpos($colType, $findType) === 0) {
+					$match = true; // partial match at front, i.e. "int" matching integer
+				} else if($findAllType && preg_match('/^[a-z]*' . $findType . '\b/i', $colType)) {
+					$match = true; // partial match at rear, i.e. "int" matching "tinyint", "smallint", "mediumint", etc.
+				}
+			}
+			
+			if(!$match) unset($schema[$colName]); 
+		}
+		
 		return $schema; 
 	}
 
@@ -872,16 +1099,18 @@ abstract class Fieldtype extends WireData implements Module {
 
 		if(!$page->id || !$field->id) return null;
 
+		/** @var WireDatabasePDO $database */
 		$database = $this->wire('database');
-		$page_id = (int) $page->id; 
 		$schema = $this->getDatabaseSchema($field);
 		$table = $database->escapeTable($field->table);
 		$value = null;
 		$stmt = null;
-		
+	
+		/** @var DatabaseQuerySelect $query */
 		$query = $this->wire(new DatabaseQuerySelect());
 		$query = $this->getLoadQuery($field, $query); 
-		$query->where("$table.pages_id='$page_id'"); 
+		$bindKey = $query->bindValueGetKey($page->id); 
+		$query->where("$table.pages_id=$bindKey"); 
 		$query->from($table); 
 
 		try {
@@ -932,6 +1161,7 @@ abstract class Fieldtype extends WireData implements Module {
 	 *
 	 */
 	public function ___loadPageFieldFilter(Page $page, Field $field, $selector) {
+		if(false) throw new WireException(); // a gift for the ide
 		$this->setLoadPageFieldFilters($field, $selector);
 		$value = $this->loadPageField($page, $field);
 		$this->setLoadPageFieldFilters($field, null);
@@ -1023,7 +1253,7 @@ abstract class Fieldtype extends WireData implements Module {
 	 * @param Page $page Page object to save. 
 	 * @param Field $field Field to retrieve from the page. 
 	 * @return bool True on success, false on DB save failure.
-	 * @throws WireException
+	 * @throws WireException|\PDOException|WireDatabaseException
 	 *
 	 */
 	public function ___savePageField(Page $page, Field $field) {
@@ -1037,20 +1267,24 @@ abstract class Fieldtype extends WireData implements Module {
 		$database = $this->wire('database');
 		$value = $page->get($field->name);
 
-		// if the value is the same as the default, then remove the field from the database because it's redundant
-		if($value === $this->getBlankValue($page, $field)) return $this->deletePageField($page, $field); 
+		// if the value is one that should be deleted, then remove the field from the database because it's redundant
+		if($this->isDeleteValue($page, $field, $value)) {
+			return $this->deletePageField($page, $field);
+		}
 
 		$value = $this->sleepValue($page, $field, $value); 
 
 		$page_id = (int) $page->id; 
 		$table = $database->escapeTable($field->table); 
 		$schema = array();
+		$bindValues = array(':page_id' => $page_id);
 
 		if(is_array($value)) { 
 
 			$sql1 = "INSERT INTO `$table` (pages_id";
-			$sql2 = "VALUES('$page_id'";
+			$sql2 = "VALUES(:page_id";
 			$sql3 = "ON DUPLICATE KEY UPDATE ";
+			$n = 0;
 
 			foreach($value as $k => $v) {
 				$k = $database->escapeCol($k);
@@ -1061,8 +1295,9 @@ abstract class Fieldtype extends WireData implements Module {
 					if(empty($schema)) $schema = $this->getDatabaseSchema($field); 
 					$sql2 .= isset($schema[$k]) && stripos($schema[$k], ' DEFAULT NULL') ? ",NULL" : ",''";
 				} else {
-					$v = $database->escapeStr($v);
-					$sql2 .= ",'$v'";
+					$bindKey = ':v' . (++$n);
+					$bindValues[$bindKey] = $v;
+					$sql2 .= ",$bindKey";
 				}
 				
 				$sql3 .= "`$k`=VALUES(`$k`), ";
@@ -1075,18 +1310,36 @@ abstract class Fieldtype extends WireData implements Module {
 			if(is_null($value)) {
 				// check if schema explicitly allows NULL
 				$schema = $this->getDatabaseSchema($field); 
-				$value = isset($schema['data']) && stripos($schema['data'], ' DEFAULT NULL') ? "NULL" : "''";
+				$null = isset($schema['data']) && stripos($schema['data'], ' DEFAULT NULL') ? "NULL" : "''";
+				$sql = "INSERT INTO `$table` (pages_id, data) VALUES(:page_id, $null) ";	
 			} else {
-				$value = "'" . $database->escapeStr($value) . "'";
+				$bindValues[":value"] = $value;
+				$sql = "INSERT INTO `$table` (pages_id, data) VALUES(:page_id, :value) ";	
 			}
-
-			$sql = 	"INSERT INTO `$table` (pages_id, data) " . 
-					"VALUES('$page_id', $value) " . 
-					"ON DUPLICATE KEY UPDATE data=VALUES(data)";	
+			
+			$sql .= 'ON DUPLICATE KEY UPDATE data=VALUES(data)';
 		}
 		
 		$query = $database->prepare($sql);
-		$result = $query->execute();
+		foreach($bindValues as $bindKey => $bindValue) {
+			if(is_int($bindValue)) {
+				$query->bindValue($bindKey, $bindValue, \PDO::PARAM_INT);
+			} else {
+				$query->bindValue($bindKey, $bindValue);
+			}
+		}
+		
+		try {
+			$result = $query->execute();
+			
+		} catch(\PDOException $e) {
+			if($e->getCode() == 23000) {
+				$message = sprintf($this->_('Value not allowed for field “%s” because it is already in use'), $field->name);
+				throw new WireDatabaseException($message, $e->getCode(), $e);
+			} else {
+				throw $e;
+			}
+		}
 
 		return $result; 
 	}
@@ -1186,12 +1439,12 @@ abstract class Fieldtype extends WireData implements Module {
 	 *
 	 */
 	public function ___replacePageField(Page $src, Page $dst, Field $field) {
-		$database = $this->wire('database');
+		$database = $this->wire()->database;
 		$table = $database->escapeTable($field->table);
 		$this->emptyPageField($dst, $field); 
 		// move the data
 		$sql = "UPDATE `$table` SET pages_id=:dstID WHERE pages_id=:srcID";
-		$query = $this->wire('database')->prepare($sql);
+		$query = $database->prepare($sql);
 		$query->bindValue(':dstID', (int) $dst->id);
 		$query->bindValue(':srcID', (int) $src->id);
 		$result = $query->execute();
@@ -1216,7 +1469,7 @@ abstract class Fieldtype extends WireData implements Module {
 	 * 
 	 */
 	public function ___deleteTemplateField(Template $template, Field $field) {
-		return $this->wire('fields')->deleteFieldDataByTemplate($field, $template); 
+		return $this->wire()->fields->deleteFieldDataByTemplate($field, $template); 
 	}
 
 	/**
@@ -1248,6 +1501,19 @@ abstract class Fieldtype extends WireData implements Module {
 		if($field && $prevName) {}
 	}
 
+	/**
+	 * Called when Field using this Fieldtype has been saved 
+	 * 
+	 * This is primarily so that Fieldtype modules can identify when their fields are 
+	 * saved without having to add a hook to the $fields API var. 
+	 * 
+	 * @param Field $field
+	 * @since 3.0.171
+	 * 
+	 */
+	public function ___savedField(Field $field) {
+	}
+
 	/**
 	 * Get a property from this Fieldtype’s data
 	 * 
@@ -1259,7 +1525,12 @@ abstract class Fieldtype extends WireData implements Module {
 	 */
 	public function get($key) {
 		if($key == 'name') return $this->className();
-		if($key == 'shortName') return str_replace('Fieldtype', '', $this->className()); 
+		if($key == 'shortName') {
+			return str_replace('Fieldtype', '', $this->className());
+		} else if($key == 'longName' && method_exists($this, 'getModuleInfo')) {
+			$info = $this->getModuleInfo($this);
+			return $info['title'];
+		}
 		return parent::get($key); 
 	}
 
@@ -1276,6 +1547,7 @@ abstract class Fieldtype extends WireData implements Module {
 	 *
 	 */
 	public function ___install() {
+		if(false) throw new WireException(); // an offering for phpstorm
 		return true; 
 	}
 
@@ -1289,7 +1561,7 @@ abstract class Fieldtype extends WireData implements Module {
 	 * 
 	 * #pw-group-other
 	 * 
-	 * @throws WireException Should throw an Exception if uninstsall can't be completed.
+	 * @throws WireException Should throw an Exception if uninstall can't be completed.
 	 *
 	 */
 	public function ___uninstall() {
@@ -1318,6 +1590,7 @@ abstract class Fieldtype extends WireData implements Module {
 	 */
 	public function ___upgrade($fromVersion, $toVersion) {
 		// any code needed to upgrade between versions
+		if($fromVersion && $toVersion && false) throw new WireException(); // to make the ide stop complaining
 	}
 
 	/**

wire/core/FieldtypeMulti.php

@@ -42,6 +42,14 @@ abstract class FieldtypeMulti extends Fieldtype {
 	 */
 	protected static $getMatchQueryCount = 0;
 
+	/**
+	 * Do we currently have a locked table?
+	 * 
+	 * @var bool
+	 * 
+	 */
+	protected $lockedTable = false;
+
 	/**
 	 * Modify the default schema provided by Fieldtype to include a 'sort' field, and integrate that into the primary key.
 	 * 
@@ -192,27 +200,28 @@ abstract class FieldtypeMulti extends Fieldtype {
 		}
 		return $values; 
 	}
-
+	
 	/**
 	 * Per the Fieldtype interface, Save the given Field from the given Page to the database
 	 *
 	 * Because the number of values may have changed, this method plays it safe and deletes all the old values
-	 * and reinserts them as new. 
+	 * and reinserts them as new.
 	 *
 	 * @param Page $page
 	 * @param Field $field
 	 * @return bool
-	 * @throws \Exception|WireException on failure
+	 * @throws \PDOException|WireException|WireDatabaseQueryException on failure
 	 *
 	 */
 	public function ___savePageField(Page $page, Field $field) {
 
 		if(!$page->id || !$field->id) return false;
-		
-		$database = $this->wire('database');
+
+		$database = $this->wire('database'); /** @var WireDatabasePDO $database */
+		$config = $this->wire('config'); /** @var Config $config */
+		$useTransaction = $database->allowTransaction();
 		$values = $page->get($field->name);
-		$schema = array();
-		
+
 		if(is_object($values)) {
 			if(!$values->isChanged() && !$page->isChanged($field->name)) return true;
 		} else if(!$page->isChanged($field->name)) {
@@ -224,83 +233,123 @@ abstract class FieldtypeMulti extends Fieldtype {
 			return $this->savePageFieldRows($page, $field, $values);
 		}
 
-		$values = $this->sleepValue($page, $field, $values); 
-		$table = $database->escapeTable($field->table); 
-		$page_id = (int) $page->id; 
+		$values = $this->sleepValue($page, $field, $values);
+		$table = $database->escapeTable($field->table);
+		$page_id = (int) $page->id;
+		$schema = $this->getDatabaseSchema($field);
+		$useSort = isset($schema['sort']); 
 
-		// since we don't manage IDs of existing values for multi fields, we delete the existing data and insert all of it again
-		$query = $database->prepare("DELETE FROM `$table` WHERE pages_id=:page_id"); // QA
-		$query->bindValue(":page_id", $page_id, \PDO::PARAM_INT); 
-		$query->execute();
+		// use transaction when possible
+		if($useTransaction) $database->beginTransaction();
+
+		try {
+			// since we don't manage IDs of existing values for multi fields, we delete the existing data and insert all of it again
+			$query = $database->prepare("DELETE FROM `$table` WHERE pages_id=:page_id"); // QA
+			$query->bindValue(":page_id", $page_id, \PDO::PARAM_INT);
+			$query->execute();
+		} catch(\Exception $e) {
+			if($useTransaction) $database->rollBack();
+			if($config->allowExceptions) throw $e; // throw original
+			throw new WireDatabaseQueryException($e->getMessage(), $e->getCode(), $e);
+		}
 		
-		if(count($values)) {
+		if(!count($values)) {
+			// no values to insert, exit early
+			if($useTransaction) $database->commit();
+			return true;
+		}
 
-			// get first value to find key definition
-			$value = reset($values); 
+		// if the first value is not an associative (key indexed) array, then force it to be with 'data' as the key.
+		// this is to allow for this method to be able to save fields that have more than just a 'data' field,
+		// even though most instances will probably just use only the data field
 
-			// if the first value is not an associative (key indexed) array, then force it to be with 'data' as the key.
-			// this is to allow for this method to be able to save fields that have more than just a 'data' field,
-			// even though most instances will probably just use only the data field
+		$value = reset($values); // first value to find definitions
+		if(is_array($value)) {
+			unset($value['pages_id'], $value['sort']); // likely not present, but just in case
+			$keys = array_keys($value);
+			foreach($keys as $k => $v) $keys[$k] = $database->escapeTableCol($v);
+		} else {
+			$keys = array('data');
+		}
+	
+		// $keys is just the columns unique to the Fieldtype
+		// whereas $cols is same as keys except it also has pages_id and sort
 
-			if(is_array($value)) {
-				$keys = array_keys($value); 
-				foreach($keys as $k => $v) $keys[$k] = $database->escapeTableCol($v); 
-			} else {
-				$keys = array('data'); 
+		$cols = array('pages_id');
+		if($useSort) $cols[] = 'sort';
+		foreach($keys as $col) $cols[] = $col;
+		$intCols = $this->trimDatabaseSchema($schema, array('findType' => '*int', 'trimDefault' => false)); 
+		$nullers = false;
+
+		$sql = "INSERT INTO `$table` (`" . implode('`, `', $cols) . "`) VALUES(:" . implode(', :', $cols) . ")";
+		$query = $database->prepare($sql);
+		$query->bindValue(':pages_id', $page_id, \PDO::PARAM_INT);
+		$sort = 0;
+		$result = true;
+		$exception = false;
+
+		// cycle through the values to generate the query
+		foreach($values as $value) {
+			
+			if($useSort) {
+				$query->bindValue(':sort', $sort, \PDO::PARAM_INT);
 			}
 
-			$sql = "INSERT INTO `$table` (pages_id, sort, `" . implode('`, `', $keys) . "`) VALUES";
-			$sort = 0; 	
+			// if the value is not an associative array, then force it to be one
+			if(!is_array($value)) {
+				$value = array('data' => $value);
+			}
 
-			// cycle through the values to generate the query
-			foreach($values as $value) {
-				$sql .= "($page_id, $sort, ";
-
-				// if the value is not an associative array, then force it to be one
-				if(!is_array($value)) $value = array('data' => $value); 
-
-				// cycle through the keys, which represent DB fields (i.e. data, description, etc.) and generate the insert query
-				foreach($keys as $key) {
-					$v = isset($value[$key]) ? $value[$key] : null;
-					if(is_null($v)) {
-						// value is NULL, determine how to handle it
-						if(empty($schema)) $schema = $this->getDatabaseSchema($field); 
-						$useNULL = false;
-						if(isset($schema[$key])) {
-							if(stripos($schema[$key], ' DEFAULT NULL')) {
-								// use the default NULL value
-								$useNULL = true;
-							} else if(stripos($schema[$key], ' AUTO_INCREMENT')) {
-								// potentially a primary key, some SQL modes require NULL (rather than blank) for auto increment
-								$useNULL = true;
-							}
-						}
-						$sql .= $useNULL ? "NULL, " : "'', ";
+			// cycle through the keys, which represent DB fields (i.e. data, description, etc.) and generate the insert query
+			foreach($keys as $key) {
+				$val = isset($value[$key]) ? $value[$key] : null;
+				
+				if($val === null) {
+					// null column
+					// some SQL modes require NULL for auto_increment primary key (rather than blank)
+					if(isset($schema[$key]) && $nullers === false) $nullers = array_merge(
+						$this->trimDatabaseSchema($schema, array('findDefaultNULL' => true)),
+						$this->trimDatabaseSchema($schema, array('findAutoIncrement' => true))
+					);
+					if($nullers && isset($nullers[$key])) {
+						$query->bindValue(":$key", null, \PDO::PARAM_NULL); 
 					} else {
-						$sql .= "'" . $database->escapeStr("$v") . "', ";
+						$query->bindValue(":$key", '');
 					}
+					
+				} else if(isset($intCols[$key])) {
+					// integer column
+					$query->bindValue(":$key", (int) $val, \PDO::PARAM_INT); 
+					
+				} else {
+					// string column
+					$query->bindValue(":$key", $val); 
 				}
-				$sql = rtrim($sql, ", ") . "), ";
-				$sort++; 	
-			}	
-
-			$sql = rtrim($sql, ", "); 
-			$query = $database->prepare($sql);	
+			}
+			
 			try {
 				$result = $query->execute();
 			} catch(\Exception $e) {
-				if($this->wire('config')->allowExceptions) throw $e; // throw original
-				$msg = $e->getMessage();
-				if($this->wire('config')->debug && $this->wire('config')->advanced) $msg .= "\n$sql";
-				throw new WireException($msg); // throw WireException
+				$exception = $e;
 			}
 			
-			return $result; 
+			if($exception) break;
+
+			$sort++;
+		}
+	
+		if($exception) {
+			/** @var \PDOException $exception */
+			if($useTransaction) $database->rollBack();
+			if($config->allowExceptions) throw $exception; // throw original
+			throw new WireDatabaseQueryException($exception->getMessage(), $exception->getCode(), $exception); 
+		} else {
+			if($useTransaction) $database->commit();
 		}
 
-		return true; 
+		return $result;
 	}
-	
+
 	/**
 	 * Load the given page field from the database table and return the value.
 	 *
@@ -327,15 +376,17 @@ abstract class FieldtypeMulti extends Fieldtype {
 
 		if(!$page->id || !$field->id) return null;
 
+		/** @var WireDatabasePDO $database */
 		$database = $this->wire('database');
-		$page_id = (int) $page->id;
 		$schema = $this->getDatabaseSchema($field);
 		$table = $database->escapeTable($field->table);
 		$stmt = null;
 
+		/** @var DatabaseQuerySelect $query */
 		$query = $this->wire(new DatabaseQuerySelect());
 		$query = $this->getLoadQuery($field, $query);
-		$query->where("$table.pages_id='$page_id'");
+		$bindKey = $query->bindValueGetKey($page->id); 
+		$query->where("$table.pages_id=$bindKey");
 		$query->from($table);
 		
 		try {
@@ -371,7 +422,7 @@ abstract class FieldtypeMulti extends Fieldtype {
 		if((int) $query->data('_limit') > 0) {
 			// accommodate paginated value by collecting and passing in pagination details from $query
 			// determine total number of results
-			$query->select('COUNT(*) as _total');
+			$query->set('select', array('COUNT(*) as _total'));
 			$query->set('limit', array()); // clear
 			$query->set('orderby', array()); // clear
 			$stmt = $query->prepare();
@@ -403,7 +454,8 @@ abstract class FieldtypeMulti extends Fieldtype {
 
 		$database = $this->wire('database');
 		$table = $database->escapeTable($field->table);
-		$schema = $this->trimDatabaseSchema($this->getDatabaseSchema($field));
+		$schemaAll = $this->getDatabaseSchema($field);
+		$schema = $this->trimDatabaseSchema($schemaAll);
 		$fieldName = $database->escapeCol($field->name);
 		$sanitizer = $this->wire('sanitizer');
 		$orderByCols = array();
@@ -425,12 +477,19 @@ abstract class FieldtypeMulti extends Fieldtype {
 			$query->data('_schema', $schema);
 			$query->data('_field', $field);
 			$query->data('_table', $table);
+			$query->data('_filters', $filters);
 			
 			foreach($filters as $selector) {
-				// @todo add support for OR values of $col or $value
-				$col = $sanitizer->fieldName($selector->field);
+				
+				$col = $selector->field;
 				$op = $selector->operator;
 				$value = $selector->value;
+			
+				if(is_array($col)) {
+					foreach($col as $k => $v) $col[$k] = $sanitizer->fieldName($v);
+				} else {
+					$col = $sanitizer->fieldName($col);
+				}
 				
 				if($col === 'sort') {
 					$desc = strpos($value, '-') === 0 ? '-' : '';
@@ -463,7 +522,7 @@ abstract class FieldtypeMulti extends Fieldtype {
 		if(empty($orderByCols)) {
 			// if there are no orderByCols defined, pagination & sorting not supported
 			// default sort for FieldtypeMulti fields is by column 'sort'
-			$query->orderby('sort');
+			if(isset($schemaAll['sort'])) $query->orderby("$table.sort");
 
 		} else {
 			// one or more orderByCols is defined, enabling sorting and potential pagination
@@ -526,7 +585,6 @@ abstract class FieldtypeMulti extends Fieldtype {
 		$table = $database->escapeTable($table);
 		// note the Fulltext class can handle non-text values as well (when using non-partial text matching operators)
 		$ft = new DatabaseQuerySelectFulltext($query);
-		$this->wire($ft);
 		$ft->match($table, $col, $operator, $value);
 		return $query;
 	}
@@ -600,7 +658,7 @@ abstract class FieldtypeMulti extends Fieldtype {
 		if(count($primaryKeys) !== 1) throw new WireException("savePageFieldRows() can only be used on fieldtypes with 1 primary key");
 		
 		$value = $this->setupPageFieldRows($page, $field, $value);
-		$database = $this->wire('database');
+		$database = $this->wire()->database;
 		$table = $database->escapeTable($info['table']);
 		$primaryKey = $database->escapeCol(reset($primaryKeys));
 		$hasInserts = false;
@@ -610,31 +668,23 @@ abstract class FieldtypeMulti extends Fieldtype {
 		
 		// sleep the values for storage
 		$sleepValue = $this->sleepValue($page, $field, $value);
-
-		try {
-			// attempt lock if possible
-			if($database->exec("LOCK TABLES `$table` WRITE")); 
-			$locked = true;
-		} catch(\Exception $e) {
-			// nothing ever happened, it's all just stories
-		}
 	
 		if(isset($schema['sort'])) {
 			// determine if there are any INSERTs and what the next sort value(s) should be
 			// this is because "pages_id,sort" are generally a unique index with FieldtypeMulti
+			$maxSort = 0; 
 			foreach($sleepValue as $v) {
 				if(!is_array($v)) continue;
 				$id = isset($v[$primaryKey]) ? $v[$primaryKey] : 0;
 				if(!$id) $hasInserts = true;
+				if(isset($v['sort']) && $v['sort'] > $maxSort) $maxSort = $v['sort'];
 			}
 			if($hasInserts) {
+				// we will need a locked table for inserts
+				if(!$locked) $locked = $this->lockForWriting($field);
 				// determine max sort value for new items inserted
-				$sql = "SELECT MAX(sort) FROM `$table` WHERE pages_id=:pages_id";
-				$query = $database->prepare($sql);
-				$query->bindValue(':pages_id', $page->id, \PDO::PARAM_INT);
-				$query->execute();
-				$sort = (int) $query->fetchColumn();
-				$query->closeCursor();
+				$sort = $this->getMaxColumnValue($page, $field, 'sort', -1);
+				if($maxSort > $sort) $sort = $maxSort;
 			}
 		}
 	
@@ -676,21 +726,99 @@ abstract class FieldtypeMulti extends Fieldtype {
 			try {
 				if($query->execute()) $numSaved++;
 			} catch(\Exception $e) {
-				$this->error($e->getMessage(), $this->wire('user')->isSuperuser() ? Notice::logOnly : Notice::log);
-			}
-		}
-		
-		if($locked) {
-			try {
-				$database->exec("UNLOCK TABLES");
-			} catch(\Exception $e) {
-				// indeed there is no thing here
+				$this->trackException($e, false);
+				if($this->wire()->user->isSuperuser()) {
+					$this->error($e->getMessage(), Notice::log);
+				} else {
+					$this->error($e->getMessage(), Notice::logOnly);
+				}
 			}
 		}
+	
+		if($locked) $this->unlockForWriting();
 
 		return $numSaved;
 	}
 
+	/**
+	 * Lock field table for writing
+	 * 
+	 * @param Field $field
+	 * @return bool
+	 * 
+	 */
+	protected function lockForWriting(Field $field) {
+		
+		$database = $this->wire()->database;
+		$table = $database->escapeTable($field->getTable());
+		$locked = false;
+		$numAttempts = 0;
+		$maxAttempts = 100;
+		$lastException = null;
+		
+		do {
+			try {
+				// attempt lock if possible
+				if($database->exec("LOCK TABLES `$table` WRITE") !== false) {
+					$this->lockedTable = true;
+					$locked = true;
+				}
+			} catch(\Exception $e) {
+				$lastException = $e;
+			}
+		} while(!$locked && $numAttempts++ < $maxAttempts);
+		
+		if(!$locked && $lastException) $this->trackException($lastException, false);
+		
+		return $locked;
+	}
+
+	/**
+	 * Unlock for writing
+	 * 
+	 * @return bool
+	 * 
+	 */
+	protected function unlockForWriting() {
+		$result = false;
+		if($this->lockedTable) try {
+			$this->wire()->database->exec("UNLOCK TABLES");
+			$this->lockedTable = false;
+			$result = true;
+		} catch(\Exception $e) {
+			$this->trackException($e, false);
+		}
+		return $result;
+	}
+
+	/**
+	 * Get max value of column for given Page and Field or boolean false (or specified $noValue) if no rows present
+	 * 
+	 * @param Page $page
+	 * @param Field $field
+	 * @param string $column
+	 * @param int|bool $noValue Return this value if there are no rows to count from (default=false)
+	 * @return int|bool|mixed
+	 * @throws WireException
+	 * @since 3.0.154
+	 * 
+	 */
+	protected function getMaxColumnValue(Page $page, Field $field, $column, $noValue = false) {
+		/** @var WireDatabasePDO $database */
+		$database = $this->wire('database'); 
+		$table = $database->escapeTable($field->getTable());
+		$column = $database->escapeCol($column);
+		$sql = "SELECT MAX($column) FROM `$table` WHERE pages_id=:pages_id";
+		$query = $database->prepare($sql);
+		$query->bindValue(':pages_id', $page->id, \PDO::PARAM_INT);
+		$query->execute();
+		$value = $query->fetchColumn();
+		$query->closeCursor();
+		if($value === null) return $noValue;
+		if(!is_int($value) && ctype_digit(ltrim($value, '-'))) $value = (int) $value;
+		return $value;
+	}
+
 	/**
 	 * Delete specific rows (for tables with single primary key)
 	 * 
@@ -755,12 +883,12 @@ abstract class FieldtypeMulti extends Fieldtype {
 	 *
 	 * Possible template method: If overridden, children should NOT call this parent method. 
 	 *
-	 * @param DatabaseQuerySelect $query
+	 * @param PageFinderDatabaseQuerySelect $query
 	 * @param string $table The table name to use
 	 * @param string $subfield Name of the field (typically 'data', unless selector explicitly specified another)
 	 * @param string $operator The comparison operator
 	 * @param mixed $value The value to find
-	 * @return DatabaseQuery $query
+	 * @return PageFinderDatabaseQuerySelect|DatabaseQuerySelect $query
 	 *
 	 */
 	public function getMatchQuery($query, $table, $subfield, $operator, $value) {
@@ -772,12 +900,14 @@ abstract class FieldtypeMulti extends Fieldtype {
 		$database = $this->wire('database'); 
 		$table = $database->escapeTable($table);
 
-		if($subfield === 'count' && (empty($value) || ctype_digit(ltrim("$value", '-'))) 
-			&& in_array($operator, array("=", "!=", ">", "<", ">=", "<="))) {
+		if($subfield === 'count' 
+			&& (empty($value) || ctype_digit(ltrim("$value", '-'))) 
+			&& $database->isOperator($operator, WireDatabasePDO::operatorTypeComparison)) {
 
 			$value = (int) $value;
 			$t = $table . "_" . $n;
 			$c = $database->escapeTable($this->className()) . "_" . $n;
+			$operator = $database->escapeOperator($operator); 
 
 			$query->select("$t.num_$t AS num_$t");
 			$query->leftjoin(
@@ -791,18 +921,25 @@ abstract class FieldtypeMulti extends Fieldtype {
 				(in_array($operator, array('>', '>=')) && $value < 0) ||
 				(in_array($operator, array('=', '>=')) && !$value)) {
 				// allow for possible zero values	
-				$query->where("(num_$t{$operator}$value OR num_$t IS NULL)"); // QA
+				$bindKey = $query->bindValueGetKey($value);
+				$query->where("(num_$t{$operator}$bindKey OR num_$t IS NULL)"); // QA
 			} else {
 				// non zero values
-				$query->where("num_$t{$operator}$value"); // QA
+				$bindKey = $query->bindValueGetKey($value);
+				$query->where("num_$t{$operator}$bindKey"); // QA
 			}
 
 			// only allow matches using templates with the requested field
-			$sql = 'pages.templates_id IN(';
-			foreach($field->getTemplates() as $template) {
-				$sql .= ((int) $template->id) . ',';	
+			$templates = $field->getTemplates();
+			if(count($templates)) {
+				$ids = array();
+				foreach($templates as $template) {
+					$ids[] = (int) $template->id;
+				}
+				$sql = 'pages.templates_id IN(' . implode(',', $ids) . ')'; // QA
+			} else {
+				$sql = 'pages.templates_id=0';
 			}
-			$sql = rtrim($sql, ',') . ')';
 			$query->where($sql); // QA
 
 		} else {

wire/core/Fieldtypes.php

@@ -4,12 +4,74 @@
  * ProcessWire Fieldtypes
  *
  * #pw-summary Maintains a collection of Fieldtype modules.
+ * #pw-var $fieldtypes
  * 
- * ProcessWire 3.x, Copyright 2016 by Ryan Cramer
+ * ProcessWire 3.x, Copyright 2020 by Ryan Cramer
  * https://processwire.com
  *
+ * @property FieldtypeCheckbox $FieldtypeCheckbox
+ * @property FieldtypeCheckbox $checkbox
+ * 
+ * @property FieldtypeComments|null $FieldtypeComments
+ * @property FieldtypeComments|null $comments
+ * 
+ * @property FieldtypeDatetime $FieldtypeDatetime
+ * @property FieldtypeDatetime $datetime
+ * 
+ * @property FieldtypeEmail $FieldtypeEmail
+ * @property FieldtypeEmail $email
+ * 
+ * @property FieldtypeFile $file
+ * @property FieldtypeFile $FieldtypeFile
+ * 
+ * @property FieldtypeFloat $FieldtypeFloat
+ * @property FieldtypeFloat $float
+ * 
+ * @property FieldtypeImage $FieldtypeImage
+ * @property FieldtypeImage $image
+ * 
+ * @property FieldtypeInteger $FieldtypeInteger
+ * @property FieldtypeInteger $integer
+ * 
+ * @property FieldtypeModule $FieldtypeModule
+ * @property FieldtypeModule $module
+ * 
+ * @property FieldtypeOptions|null $FieldtypeOptions
+ * @property FieldtypeOptions|null $options
+ * 
+ * @property FieldtypePage $FieldtypePage
+ * @property FieldtypePage $page
+ * 
+ * @property FieldtypePageTable $FieldtypePageTable
+ * @property FieldtypePageTable $pageTable
+ * 
+ * @property FieldtypePageTitle $FieldtypePageTitle
+ * @property FieldtypePageTitle $pageTitle
+ * 
+ * @property FieldtypePassword $FieldtypePassword
+ * @property FieldtypePassword $password
+ * 
+ * @property FieldtypeRepeater|null $FieldtypeRepeater
+ * @property FieldtypeRepeater|null $repeater
+ * 
+ * @property FieldtypeSelector|null $FieldtypeSelector
+ * @property FieldtypeSelector|null $selector
+ * 
+ * @property FieldtypeText $FieldtypeText
+ * @property FieldtypeText $text
+ * 
+ * @property FieldtypeTextarea $FieldtypeTextarea
+ * @property FieldtypeTextarea $textarea
+ * 
+ * @property FieldtypeToggle|null $FieldtypeToggle
+ * @property FieldtypeToggle|null $toggle
+ * 
+ * @property FieldtypeURL $FieldtypeURL
+ * @property FieldtypeURL $URL
+ *
  *
  */
+
 class Fieldtypes extends WireArray {
 
 	/**
@@ -19,15 +81,21 @@ class Fieldtypes extends WireArray {
 	protected $preloaded = false;
 
 	/**
-	 * Construct this Fieldtypes object and load all Fieldtype modules 
+	 * Is this the $fieldtypes API var?
+	 * 
+	 * @var bool
+	 * 
+	 */
+	protected $isAPI = false;
+
+	/**
+	 * Construct the $fieldtypes API var (load all Fieldtype modules into it)
 	 *
  	 */
 	public function init() {
-		foreach($this->wire('modules') as $module) {
-			if(strpos($module->className(), 'Fieldtype') === 0) {
-				// if($module instanceof ModulePlaceholder) $module = $this->wire('modules')->get($module->className());
-				$this->add($module); 
-			}
+		$this->isAPI = true;
+		foreach($this->wire()->modules->findByPrefix('Fieldtype', 3) as $name => $module) {
+			$this->add($module); 
 		}
 	}
 
@@ -37,12 +105,13 @@ class Fieldtypes extends WireArray {
 	 */
 	protected function preload() {
 		if($this->preloaded) return;
-		$debug = $this->wire('config')->debug; 
+		$debug = $this->isAPI && $this->wire('config')->debug; 
 		if($debug) Debug::timer('Fieldtypes.preload'); 
-		foreach($this->data as $key => $module) {
+		$modules = $this->wire('modules'); /** @var Modules $modules */
+		foreach($this->data as $moduleName => $module) {
 			if($module instanceof ModulePlaceholder) {
-				$fieldtype = $this->wire('modules')->get($module->className()); 
-				$this->data[$key] = $fieldtype; 
+				$fieldtype = $modules->getModule($moduleName); 
+				if($fieldtype) $this->data[$moduleName] = $fieldtype; 
 			}
 		}
 		if($debug) Debug::saveTimer('Fieldtypes.preload'); 
@@ -57,11 +126,13 @@ class Fieldtypes extends WireArray {
 	 *
 	 */
 	public function isValidItem($item) {
-		return $item instanceof Fieldtype || $item instanceof ModulePlaceholder; 
+		if($item instanceof Fieldtype) return true;
+		if($item instanceof ModulePlaceholder && strpos($item->className(), 'Fieldtype') === 0) return true;
+		return false;
 	}
 
 	/**
-	 * Per the WireArray interface, keys must be strings (field names)
+	 * Per the WireArray interface, keys must be strings (fieldtype class names)
 	 * 
 	 * @param string|int $key
 	 * @return bool
@@ -115,15 +186,18 @@ class Fieldtypes extends WireArray {
 	 */
 	public function get($key) {
 
-		if(strpos($key, 'Fieldtype') !== 0) $key = "Fieldtype" . ucfirst($key); 
+		if(stripos($key, 'Fieldtype') !== 0) $key = 'Fieldtype' . ucfirst($key); 
 
-		if(!$fieldtype = parent::get($key)) {
-			$fieldtype = $this->wire('modules')->get($key); 
+		$fieldtype = parent::get($key);
+		
+		if(!$fieldtype) {
+			$fieldtype = $this->wire()->modules->getModule($key);
+			if($fieldtype) $this->set($key, $fieldtype);
 		}
 
 		if($fieldtype instanceof ModulePlaceholder) {
-			$fieldtype = $this->wire('modules')->get($fieldtype->className()); 			
-			$this->set($key, $fieldtype); 
+			$fieldtype = $this->wire()->modules->getModule($fieldtype->className()); 			
+			if($fieldtype) $this->set($key, $fieldtype); 
 		}
 
 		return $fieldtype; 
@@ -146,7 +220,7 @@ class Fieldtypes extends WireArray {
 	public function eq($num) { $this->preload(); return parent::eq($num); }
 	public function first() { $this->preload(); return parent::first(); }
 	public function last() { $this->preload(); return parent::last(); }
-	public function sort($properties) { $this->preload(); return parent::sort($properties); }
+	public function sort($properties, $flags = null) { $this->preload(); return parent::sort($properties, $flags); }
 	protected function filterData($selectors, $not = false) { $this->preload(); return parent::filterData($selectors, $not); }
 	public function makeCopy() { $this->preload(); return parent::makeCopy(); }
 	public function makeNew() { $this->preload(); return parent::makeNew(); }

wire/core/FileCompiler.php

@@ -99,6 +99,22 @@ class FileCompiler extends Wire {
 	 */
 	protected $ns = '';
 
+	/**
+	 * String with raw PHP blocks only, and with any quoted values removed. 
+	 * 
+	 * @var string
+	 * 
+	 */
+	protected $rawPHP = '';
+
+	/**
+	 * Same as raw PHP but with all quoted values converted to literal "string"
+	 * 
+	 * @var string
+	 * 
+	 */
+	protected $rawDequotedPHP = '';
+	
 	/**
 	 * Construct
 	 * 
@@ -107,33 +123,43 @@ class FileCompiler extends Wire {
 	 * 
 	 */
 	public function __construct($sourcePath, array $options = array()) {
-		
 		$this->options = array_merge($this->options, $options);
-		$globalOptions = $this->wire('config')->fileCompilerOptions; 
+		if(strpos($sourcePath, '..') !== false) $sourcePath = realpath($sourcePath);
+		if(DIRECTORY_SEPARATOR != '/') $sourcePath = str_replace(DIRECTORY_SEPARATOR, '/', $sourcePath);
+		$this->sourcePath = rtrim($sourcePath, '/') . '/';
+	}
+
+	/**
+	 * Wired to instance
+	 * 
+	 */
+	public function wired() {
 		
+		/** @var Config $config */
+		$config = $this->wire('config');
+		$globalOptions = $config->fileCompilerOptions;
+
 		if(is_array($globalOptions)) {
 			$this->globalOptions = array_merge($this->globalOptions, $globalOptions);
 		}
-		
+
 		if(!empty($this->globalOptions['extensions'])) {
 			$this->extensions = $this->globalOptions['extensions'];
 		}
-		
+
 		if(empty($this->globalOptions['cachePath'])) {
-			$this->cachePath = $this->wire('config')->paths->cache . $this->className() . '/';
+			$this->cachePath = $config->paths->cache . $this->className() . '/';
 		} else {
 			$this->cachePath = rtrim($this->globalOptions['cachePath'], '/') . '/';
 		}
-		
+
 		if(!strlen(__NAMESPACE__)) {
 			// when PW compiled without namespace support
 			$this->options['skipIfNamespace'] = false;
 			$this->options['namespace'] = true;
 		}
-		
-		if(strpos($sourcePath, '..') !== false) $sourcePath = realpath($sourcePath);
-		if(DIRECTORY_SEPARATOR != '/') $sourcePath = str_replace(DIRECTORY_SEPARATOR, '/', $sourcePath);
-		$this->sourcePath = rtrim($sourcePath, '/') . '/';
+
+		parent::wired();
 	}
 
 	/**
@@ -143,6 +169,7 @@ class FileCompiler extends Wire {
 	 * 
 	 */
 	protected function init() {
+		if(!$this->isWired()) $this->wired();
 		
 		static $preloaded = false;
 		$config = $this->wire('config');
@@ -214,6 +241,52 @@ class FileCompiler extends Wire {
 		}
 	}
 
+	/**
+	 * Populate the $this->rawPHP data which contains only raw php without quoted values
+	 * 
+	 * @param string $data
+	 * 
+	 */
+	protected function initRawPHP(&$data) {
+		
+		$this->rawPHP = '';
+		$this->rawDequotedPHP = '';
+		
+		$phpOpen = '<' . '?';
+		$phpClose = '?' . '>';
+		$phpBlocks = explode($phpOpen, $data);
+		
+		foreach($phpBlocks as $key => $phpBlock) {
+			$pos = strpos($phpBlock, $phpClose);
+			if($pos !== false) {
+				$closeBlock = substr($phpBlock, strlen($phpClose) + 2);
+				if(strrpos($closeBlock, '{') && strrpos($closeBlock, '}') && strrpos($closeBlock, '=')
+					&& strrpos($closeBlock, '(') && strrpos($closeBlock, ')')
+					&& preg_match('/\sif\s*\(/', $closeBlock) 
+					&& preg_match('/\$[_a-zA-Z][_a-zA-Z0-9]+/', $closeBlock)) {
+					// closeBlock still looks a lot like PHP, leave $phpBlock as-is
+					// happens when for example a phpClose is within a PHP string
+				} else {
+					$phpBlock = substr($phpBlock, 0, $pos);
+				}
+			}
+			$this->rawPHP .= $phpOpen . $phpBlock . $phpClose . "\n";
+		}
+	
+		// remove docblocks/comments
+		// $this->rawPHP = preg_replace('!/\*.+?\*/!s', '', $this->rawPHP);
+		
+		// remove escaped quotes
+		$this->rawDequotedPHP = str_replace(array('\\"', "\\'"), '', $this->rawPHP); 
+		
+		// remove double quoted blocks
+		$this->rawDequotedPHP = preg_replace('/([\s(.=,])"[^"]*"/s', '$1"string"', $this->rawDequotedPHP);
+		
+		// remove single quoted blocks
+		$this->rawDequotedPHP = preg_replace('/([\s(.=,])\'[^\']*\'/s', '$1\'string\'', $this->rawDequotedPHP);
+	
+	}	
+
 	/**
 	 * Allow the given filename to be compiled?
 	 * 
@@ -326,7 +399,7 @@ class FileCompiler extends Wire {
 			$targetData = $this->compileData($targetData, $sourcePathname);
 			if(false !== file_put_contents($targetPathname, $targetData, LOCK_EX)) {
 				$this->chmod($targetPathname); 
-				touch($targetPathname, filemtime($sourcePathname));
+				$this->touch($targetPathname, filemtime($sourcePathname));
 				$targetHash = md5_file($targetPathname);
 				$cacheData = array(
 					'source' => array(
@@ -384,9 +457,13 @@ class FileCompiler extends Wire {
 			// file already declares a namespace and options indicate we shouldn't compile
 			return $data;
 		}
+
+		$this->initRawPHP($data);
 			
 		if($this->options['includes']) {
+			$dataHash = md5($data);
 			$this->compileIncludes($data, $sourceFile);
+			if(md5($data) != $dataHash) $this->initRawPHP($data);
 		}
 		
 		if($this->options['namespace']) {
@@ -424,11 +501,16 @@ class FileCompiler extends Wire {
 		}
 	
 		if(!strlen(__NAMESPACE__)) {
-			if(strpos($data, "ProcessWire\\")) {
+			if(strpos($this->rawPHP, "ProcessWire\\")) {
 				$data = str_replace(array("\\ProcessWire\\", "ProcessWire\\"), "\\", $data);
 			}
 		}
 		
+		if(stripos($data, "FileCompiler=?") !== false) {
+			// Allow for a token that gets replaced so a file can detect if it's compiled
+			$data = str_replace("FileCompiler=?", "FileCompiler=Yes", $data);
+		}
+		
 		return $data;
 	}
 
@@ -507,11 +589,14 @@ class FileCompiler extends Wire {
 	protected function compileIncludes(&$data, $sourceFile) {
 		
 		// other related to includes
-		if(strpos($data, '__DIR__') !== false) {
+		$rawPHP = $this->rawPHP;
+		if(strpos($rawPHP, '__DIR__') !== false) {
 			$data = str_replace('__DIR__', "'" . dirname($sourceFile) . "'", $data);
+			$rawPHP = str_replace('__DIR__', "'" . dirname($sourceFile) . "'", $rawPHP);
 		}
-		if(strpos($data, '__FILE__') !== false) {
+		if(strpos($rawPHP, '__FILE__') !== false) {
 			$data = str_replace('__FILE__', "'" . $sourceFile . "'", $data);
+			$rawPHP = str_replace('__FILE__', "'" . $sourceFile . "'", $rawPHP);
 		}
 		
 		$optionsStr = $this->optionsToString($this->options);
@@ -535,10 +620,15 @@ class FileCompiler extends Wire {
 			'([;\r\n])' . // 5:close, whatever the last character is on the line
 			'/im';
 		
-		if(!preg_match_all($re, $data, $matches)) return;
-		
+		if(!preg_match_all($re, $rawPHP, $matches)) return;
+	
 		foreach($matches[0] as $key => $fullMatch) {
-		
+	
+			// if the include statement looks like one of these below then skip compilation for included file
+			// include(/*NoCompile*/__DIR__ . '/file.php');
+			// include(__DIR__ . '/file.php'/*NoCompile*/); 
+			if(strpos($fullMatch, 'NoCompile') !== false) continue;
+			
 			$open = $matches[1][$key];
 			$funcMatch = $matches[2][$key];
 			$argOpen = trim($matches[3][$key]);
@@ -550,45 +640,10 @@ class FileCompiler extends Wire {
 				// only include, include_once, require, require_once can be used without opening parenthesis
 				continue; 
 			}
-			
-			if(strpos($fileMatch, '$') === 0) {
-				// fileMatch stars with a var name
-			} else if(strpos($fileMatch, '"') !== strrpos($fileMatch, '"')) {
-				// fileMatch has both open and close double quotes
-			} else if(strpos($fileMatch, "'") !== strrpos($fileMatch, "'")) {
-				// fileMatch has both open and close single quotes
-			} else if(strpos($fileMatch, '(') !== false && strpos($fileMatch, ')') !== false) {
-				// likely a function call 
-			} else {
-				// likely NOT a valid file match, as it doesn't have any of the expected characters
-				continue;
-			}
-			
-			if(strlen($open)) {
-				$skipMatch = false;
-				$test = $open;
-				foreach(array('"', "'") as $quote) {
-					// skip when words like "require" are in a string
-					if(strpos($test, $quote) === false) continue;
-					$test = str_replace('\\' . $quote, '', $test); // ignore quotes that are escaped
-					if(strpos($test, $quote) === false) continue;
-					if(substr_count($test, $quote) % 2 > 0) {
-						// there are an uneven number of quotes, indicating that
-						// our $funcMatch is likely part of a quoted string
-						$skipMatch = true;
-						break;
-					}
-					if($quote == '"' && strpos($test, "'") !== false) {
-						// remove quoted apostrophes so they don't confuse the next iteration
-						$test = preg_replace('/"[^"\']*\'[^"]*"/', '', $test);	
-					}
-				}
-				if($skipMatch) continue;
-				if(preg_match('/^[$_a-zA-Z0-9]+$/', substr($open, -1))) {
-					// skip things like: something_include(... and $include
-					continue;
-				}
-			}
+		
+			$fileMatchType = $this->compileIncludesFileMatchType($fileMatch, $funcMatch);
+			if(!$fileMatchType) continue;
+			if(!$this->compileIncludesValidLineOpen($open)) continue;
 
 			if(strpos($fileMatch, '?' . '>')) {
 				// move closing PHP tag out of the fileMatch and into the close
@@ -641,14 +696,6 @@ class FileCompiler extends Wire {
 		// replace absolute root path references with runtime generated versions
 		$rootPath = $this->wire('config')->paths->root; 
 		if(strpos($data, $rootPath)) {
-			/*
-			$data = preg_replace('%([\'"])' . preg_quote($rootPath) . '([^\'"\s\r\n]*[\'"])%', 
-				'(isset($this) && $this instanceof \\ProcessWire\\Wire ? ' . 
-					'$this->wire("config")->paths->root : ' . 
-					'\\ProcessWire\\wire("config")->paths->root' . 
-				') . $1$2', 
-				$data);
-			*/
 			$ns = __NAMESPACE__ ? "\\ProcessWire" : "";
 			$data = preg_replace('%([\'"])' . preg_quote($rootPath) . '([^\'"\s\r\n]*[\'"])%',
 				$ns . '\\wire("config")->paths->root . $1$2',
@@ -657,6 +704,98 @@ class FileCompiler extends Wire {
 
 	}
 
+	/**
+	 * Test the given line $open preceding an include statement for validity
+	 * 
+	 * @param string $open
+	 * @return bool Returns true if valid, false if not
+	 * 
+	 */
+	protected function compileIncludesValidLineOpen($open) {
+		if(!strlen($open)) return true;
+		$skipMatch = false;
+		$test = $open;
+		foreach(array('"', "'") as $quote) {
+			// skip when words like "require" are in a string
+			if(strpos($test, $quote) === false) continue;
+			$test = str_replace('\\' . $quote, '', $test); // ignore quotes that are escaped
+			if(strpos($test, $quote) === false) continue;
+			if(substr_count($test, $quote) % 2 > 0) {
+				// there are an uneven number of quotes, indicating that
+				// our $funcMatch is likely part of a quoted string
+				$skipMatch = true;
+				break;
+			}
+			if($quote == '"' && strpos($test, "'") !== false) {
+				// remove quoted apostrophes so they don't confuse the next iteration
+				$test = preg_replace('/"[^"\']*\'[^"]*"/', '', $test);
+			}
+		}
+		if(!$skipMatch && preg_match('/^[$_a-zA-Z0-9]+$/', substr($open, -1))) {
+			// skip things like: something_include(... and $include
+			$skipMatch = true;
+		}
+		return $skipMatch ? false : true;
+	}
+
+	/**
+	 * Returns fileMatch type of 'var', 'file', 'func' or boolean false if not valid
+	 * 
+	 * @param string $fileMatch The $fileMatch var from compileIncludes() method
+	 * @param string $funcMatch include function name
+	 * @return string|bool 
+	 * 
+	 */
+	protected function compileIncludesFileMatchType($fileMatch, $funcMatch) {
+
+		$fileMatch = trim($fileMatch);
+		$isValid = false;
+
+		$phpVarSign = strpos($fileMatch, '$');
+		$doubleQuote1 = strpos($fileMatch, '"');
+		$doubleQuote2 = strrpos($fileMatch, '"');
+		$singleQuote1 = strpos($fileMatch, "'");
+		$singleQuote2 = strrpos($fileMatch, "'");
+		$parenthesis1 = strpos($fileMatch, '(');
+		$parenthesis2 = strrpos($fileMatch, ')');
+		$testFile = '';
+
+		if($phpVarSign === 0) {
+			// fileMatch starts with a var name, make sure it at least starts in PHP var format
+			if(preg_match('/^\$[_a-zA-Z]/', $fileMatch)) $isValid = 'var';
+			
+		} else if($doubleQuote1 !== false && $doubleQuote2 > $doubleQuote1) {
+			// fileMatch has both open and close double quotes with possibly a filename, so validate extension
+			$testFile = substr($fileMatch, $doubleQuote1 + 1, $doubleQuote2 - $doubleQuote1 - 1);
+
+		} else if($singleQuote1 !== false && $singleQuote2 > $singleQuote1) {
+			// fileMatch has both open and close single quotes with possibly a filename, so validate extension
+			$testFile = substr($fileMatch, $singleQuote1 + 1, $singleQuote2 - $singleQuote1 - 1);
+
+		} else if($parenthesis1 > 0 && $parenthesis2 > $parenthesis1) {
+			// likely a function call, make sure open parenthesis is preceded by PHP name format
+			if(preg_match('/[_a-zA-Z][_a-zA-Z0-9]+\(/', $fileMatch)) $isValid = 'func';
+
+		} else {
+			// likely NOT a valid file match, as it doesn't have any of the expected characters
+			$isValid = false;
+		}
+
+		if($testFile) {
+			if(strrpos($testFile, '.')) {
+				// test contains a filename that needs extension validated
+				$parts = explode('.', $testFile);
+				$testExt = array_pop($parts);
+				if($testExt && in_array(strtolower($testExt), $this->extensions)) $isValid = 'file';
+			} else if($funcMatch == 'wireRenderFile' || $funcMatch == 'wireIncludeFile') {
+				// these methods don't require a file extension
+				$isValid = 'file';
+			}
+		}
+		
+		return $isValid;
+	}
+
 	/**
 	 * Compile global class/interface/function references to namespaced versions
 	 * 
@@ -677,7 +816,6 @@ class FileCompiler extends Wire {
 			}
 		}
 		*/
-		
 		$classes = get_declared_classes();
 		$classes = array_merge($classes, get_declared_interfaces());
 	
@@ -703,6 +841,9 @@ class FileCompiler extends Wire {
 		$classes = array_merge($classes, $files);
 		if(!__NAMESPACE__) $classes = array_merge($classes, array_keys($this->wire('modules')->getInstallable()));
 		
+		$rawPHP = $this->rawPHP;
+		$rawDequotedPHP = $this->rawDequotedPHP;
+		
 		// update classes and interfaces
 		foreach($classes as $class) {
 			
@@ -714,7 +855,7 @@ class FileCompiler extends Wire {
 				$ns = '';
 			}
 			if($ns) {}
-			if(stripos($data, $class) === false) continue; // quick exit if class name not referenced in data
+			if(stripos($rawDequotedPHP, $class) === false) continue; // quick exit if class name not referenced in data
 			
 			$patterns = array(
 				// 1=open 2=close
@@ -727,26 +868,28 @@ class FileCompiler extends Wire {
 				"instanceof" => '(\sinstanceof\s+)' . $class . '([^_a-zA-Z0-9]|$)', // 'instanceof Page'
 				"$class " => '(\(\s*|,\s*)' . $class . '(\s+\$)', // type hinted '(Page $something' or '($foo, Page $something'
 			);
-			
+		
 			foreach($patterns as $check => $regex) {
 				
-				if(stripos($data, $check) === false) continue;
-				if(!preg_match_all('/' . $regex . '/im', $data, $matches)) continue;
-				//echo "<pre>" . print_r($matches, true) . "</pre>";
+				if(stripos($rawDequotedPHP, $check) === false) continue;
+				if(!preg_match_all('/' . $regex . '/im', $rawDequotedPHP, $matches)) continue;
 				
 				foreach($matches[0] as $key => $fullMatch) {
 					$open = $matches[1][$key];
 					$close = $matches[2][$key];
 					if(substr($open, -1) == '\\') continue; // if last character in open is '\' then skip the replacement
 					$className = __NAMESPACE__ ? '\\' . __NAMESPACE__ . '\\' . $class : '\\' . $class;
-					$data = str_replace($fullMatch, $open . $className . $close, $data);
+					$repl = $open . $className . $close;
+					$data = str_replace($fullMatch, $repl, $data);
+					$rawPHP = str_replace($fullMatch, $repl, $rawPHP);
+					$rawDequotedPHP = str_replace($fullMatch, $repl, $rawDequotedPHP);
 				}
 			}
 		}
 	
 		// update PW procedural function calls
 		$functions = get_defined_functions();
-		$hasFunctionExists = strpos($data, 'function_exists') !== false; 
+		$hasFunctionExists = strpos($rawDequotedPHP, 'function_exists') !== false; 
 		
 		foreach($functions['user'] as $function) {
 			
@@ -761,14 +904,16 @@ class FileCompiler extends Wire {
 			}
 			if($ns) {}
 			/** @noinspection PhpUnusedLocalVariableInspection */
-			if(stripos($data, $function) === false) continue; // if function name not mentioned in data, quick exit
+			if(stripos($rawDequotedPHP, $function) === false) continue; // if function name not mentioned in data, quick exit
 		
 			$n = 0;
-			while(preg_match_all('/^(.*?[()!;,@\[=\s.])' . $function . '\s*\(/im', $data, $matches)) {
+			while(preg_match_all('/^(.*?[()!;,@\[=\s.])' . $function . '\s*\(/im', $rawPHP, $matches)) {
 				foreach($matches[0] as $key => $fullMatch) {
 					$open = $matches[1][$key];
 					if(strpos($open, 'function') !== false) continue; // skip function defined with same name
-					$data = str_replace($fullMatch, $open . $functionName . '(', $data);
+					$repl = $open . $functionName . '(';
+					$data = str_replace($fullMatch, $repl, $data);
+					$rawPHP = str_replace($fullMatch, $repl, $rawPHP);
 				}
 				if(++$n > 5) break;
 			}
@@ -782,10 +927,10 @@ class FileCompiler extends Wire {
 		
 		// update other function calls
 		$ns = __NAMESPACE__ ? "\\ProcessWire" : "";
-		if(strpos($data, 'class_parents(') !== false) {
+		if(strpos($rawDequotedPHP, 'class_parents(') !== false) {
 			$data = preg_replace('/\bclass_parents\(/', $ns . '\\wireClassParents(', $data);
 		}
-		if(strpos($data, 'class_implements(') !== false) {
+		if(strpos($rawDequotedPHP, 'class_implements(') !== false) {
 			$data = preg_replace('/\bclass_implements\(/', $ns . '\\wireClassImplements(', $data);
 		}
 		
@@ -843,7 +988,7 @@ class FileCompiler extends Wire {
 			
 			copy($sourceFile, $targetFile);
 			$this->chmod($targetFile);
-			touch($targetFile, filemtime($sourceFile));
+			$this->touch($targetFile, filemtime($sourceFile));
 			$numCopied++;
 		}
 		
@@ -926,7 +1071,7 @@ class FileCompiler extends Wire {
 			// maintenance already run today
 			return false;
 		}
-		touch($lastRunFile);
+		$this->touch($lastRunFile);
 		$this->chmod($lastRunFile);
 		clearstatcache();
 
@@ -976,14 +1121,14 @@ class FileCompiler extends Wire {
 
 			if(!file_exists($sourceFile)) {
 				// source file has been deleted
-				unlink($targetFile);
+				$this->wire('files')->unlink($targetFile, true);
 				if($useLog) $this->log("Maintenance/Remove target file: $targetURL$basename");
 				
-			} else if(filemtime($sourceFile) != filemtime($targetFile)) {
+			} else if(filemtime($sourceFile) > filemtime($targetFile)) {
 				// source file has changed
 				copy($sourceFile, $targetFile);
 				$this->chmod($targetFile);
-				touch($targetFile, filemtime($sourceFile));
+				$this->touch($targetFile, filemtime($sourceFile));
 				if($useLog) $this->log("Maintenance/Copy new version of source file to target file: $sourceURL$basename => $targetURL$basename");
 			}
 		}
@@ -1028,5 +1173,29 @@ class FileCompiler extends Wire {
 		$this->exclusions[] = $pathname;
 	}
 
+	/**
+	 * Same as PHP touch() but with fallbacks for cases where touch() does not work
+	 * 
+	 * @param string $filename
+	 * @param null|int $time
+	 * @return bool
+	 * 
+	 */
+	protected function touch($filename, $time = null) {
+		if($time === null) {
+			$result = @touch($filename); 
+		} else {
+			$result = @touch($filename, $time);
+			// try again, but without time
+			if(!$result) $result = @touch($filename); 
+		}
+		if(!$result) {
+			// lastly try alternative method which should have same affect as touch without $time
+			$fp = fopen($filename, 'a');
+			$result = $fp !== false ? fclose($fp) : false;
+		}
+		return $result;
+	}
+
 }
 

wire/core/FileLog.php

@@ -11,15 +11,73 @@
  */
 
 class FileLog extends Wire {
-	
-	const defaultChunkSize = 12288; 
-	const debug = false; 
 
-	protected $logFilename = false; 
-	protected $itemsLogged = array(); 
+	/**
+	 * Default size of chunks used for reading from logs
+	 * 
+	 */
+	const defaultChunkSize = 12288;
+
+	/**
+	 * Debug mode used during development of this class
+	 * 
+	 */
+	const debug = false;
+
+	/**
+	 * Chunk size used when reading from logs and not overridden
+	 * 
+	 * @var int
+	 * 
+	 */
+	protected $chunkSize = self::defaultChunkSize;
+
+	/**
+	 * Full path to log file or false when not yet set
+	 * 
+	 * @var bool|string
+	 * 
+	 */
+	protected $logFilename = false;
+
+	/**
+	 * Log items saved during this request where array keys are md5 hash of log entries and values ignored
+	 * 
+	 * @var array
+	 * 
+	 */
+	protected $itemsLogged = array();
+
+	/**
+	 * Delimiter used in log entries
+	 * 
+	 * @var string
+	 * 
+	 */
 	protected $delimeter = "\t";
+
+	/**
+	 * Maximum allowed line length for a single log line
+	 * 
+	 * @var int
+	 * 
+	 */
 	protected $maxLineLength = 8192;
+
+	/**
+	 * File extension used for log files
+	 * 
+	 * @var string
+	 * 
+	 */
 	protected $fileExtension = 'txt';
+
+	/**
+	 * Path where log files are stored
+	 * 
+	 * @var string
+	 * 
+	 */
 	protected $path = '';
 	
 	/**
@@ -58,52 +116,159 @@ class FileLog extends Wire {
 	protected function cleanStr($str) {
 		$str = str_replace(array("\r\n", "\r", "\n"), ' ', trim($str)); 
 		if(strlen($str) > $this->maxLineLength) $str = substr($str, 0, $this->maxLineLength); 
+		if(strpos($str, ' ^+') !== false) $str = str_replace(' ^=', ' ^ +', $str); // disallowed sequence
 		return $str; 	
 	}
 
 	/**
 	 * Save the given log entry string
 	 * 
-	 * @param $str
-	 * @return bool Success state
+	 * @param string $str
+	 * @param array $options options to modify behavior (Added 3.0.143)
+	 *  - `allowDups` (bool): Allow duplicating same log entry in same runtime/request? (default=true) 
+	 *  - `mergeDups` (int): Merge previous duplicate entries that also appear near end of file?
+	 *     To enable, specify int for quantity of bytes to consider from EOF, value of 1024 or higher (default=0, disabled) 
+	 *  - `maxTries` (int): If log entry fails to save, maximum times to re-try (default=20) 
+	 *  - `maxTriesDelay` (int): Micro seconds (millionths of a second) to delay between re-tries (default=2000)
+	 * @return bool Success state: true if log written, false if not. 
 	 * 
 	 */
-	public function save($str) {
-
-		if(!$this->logFilename) return false; 
+	public function save($str, array $options = array()) {
+		
+		$defaults = array(
+			'mergeDups' => 0,
+			'allowDups' => true, 
+			'maxTries' => 20, 
+			'maxTriesDelay' => 2000, 
+		);
 
+		if(!$this->logFilename) return false;
+		
+		$options = array_merge($defaults, $options);
 		$hash = md5($str); 
-
-		// if we've already logged this during this instance, then don't do it again
-		if(in_array($hash, $this->itemsLogged)) return true; 
-
 		$ts = date("Y-m-d H:i:s"); 
 		$str = $this->cleanStr($str);
-		$fp = fopen($this->logFilename, "a");
+		$line = $this->delimeter . $str; // log entry, excluding timestamp
+		$hasLock = false; // becomes true when lock obtained
+		$fp = false; // becomes resource when file is open
 		
-		if($fp) {
-			$trys = 0; 
-			$stop = false;
+		// if we've already logged this during this instance, then don't do it again
+		if(!$options['allowDups'] && isset($this->itemsLogged[$hash])) return true;
 
-			while(!$stop) {
-				if(flock($fp, LOCK_EX)) {
-					fwrite($fp, "$ts{$this->delimeter}$str\n"); 
-					flock($fp, LOCK_UN); 
-					$this->itemsLogged[] = $hash; 
-					$stop = true; 
-				} else {
-					usleep(2000);
-					if($trys++ > 20) $stop = true; 
-				}
-			}
+		// determine write mode		
+		$mode = file_exists($this->logFilename) ? 'a' : 'w';
+		if($mode === 'a' && $options['mergeDups']) $mode = 'r+';
 
-			fclose($fp); 
-			$this->wire('files')->chmod($this->logFilename);
-			return true; 
-		} else {
+		// open the log file
+		for($tries = 0; $tries <= $options['maxTries']; $tries++) {
+			$fp = fopen($this->logFilename, $mode);
+			if($fp) break;
+			// if unable to open for reading/writing, see if we can open for append instead
+			if($mode === 'r+' && $tries > ($options['maxTries'] / 2)) $mode = 'a';
+			usleep($options['maxTriesDelay']);
+		}
+
+		// if unable to open, exit now
+		if(!$fp) return false;
+
+		// obtain a lock
+		for($tries = 0; $tries <= $options['maxTries']; $tries++) {
+			$hasLock = flock($fp, LOCK_EX);
+			if($hasLock) break;
+			usleep($options['maxTriesDelay']);
+		}
+	
+		// if unable to obtain a lock, we cannot write to the log
+		if(!$hasLock) {
+			fclose($fp);
 			return false;
 		}
 
+		// if opened for reading and writing, merge duplicates of $line
+		if($mode === 'r+' && $options['mergeDups']) {
+			// do not repeat the same log entry in the same chunk
+			$chunkSize = (int) $options['mergeDups']; 
+			if($chunkSize < 1024) $chunkSize = 1024;
+			fseek($fp, -1 * $chunkSize, SEEK_END);
+			$chunk = fread($fp, $chunkSize); 
+			// check if our log line already appears in the immediate earlier chunk
+			if(strpos($chunk, $line) !== false) {
+				// this log entry already appears 1+ times within the last chunk of the file
+				// remove the duplicates and replace the chunk
+				$chunkLength = strlen($chunk);
+				$this->removeLineFromChunk($line, $chunk, $chunkSize);
+				fseek($fp, 0, SEEK_END);
+				$oldLength = ftell($fp);
+				$newLength = $chunkLength > $oldLength ? $oldLength - $chunkLength : 0;
+				ftruncate($fp, $newLength); 
+				fseek($fp, 0, SEEK_END);
+				fwrite($fp, $chunk);
+			}	
+		} else {
+			// already at EOF because we are appending or creating
+		}
+		
+		// add the log line
+		$result = fwrite($fp, "$ts$line\n");
+		
+		// release the lock and close the file
+		flock($fp, LOCK_UN);
+		fclose($fp);
+		
+		if($result && !$options['allowDups']) $this->itemsLogged[$hash] = true;
+		
+		// if we were creating the file, make sure it has the right permission
+		if($mode === 'w') {
+			$files = $this->wire('files'); /** @var WireFileTools $files */
+			$files->chmod($this->logFilename);
+		}
+		
+		return (int) $result > 0; 
+	}
+
+	/**
+	 * Remove given $line from $chunk and add counter to end of $line indicating quantity that was removed
+	 * 
+	 * @param string $line
+	 * @param string $chunk
+	 * @param int $chunkSize
+	 * @since 3.0.143
+	 * 
+	 */
+	protected function removeLineFromChunk(&$line, &$chunk, $chunkSize) {
+		
+		$qty = 0;
+		$chunkLines = explode("\n", $chunk);
+		
+		foreach($chunkLines as $key => $chunkLine) {
+
+			$x = 1;
+			if($key === 0 && strlen($chunk) >= $chunkSize) continue; // skip first line since it’s likely a partial line
+
+			// check if line appears in this chunk line
+			if(strpos($chunkLine, $line) === false) continue;
+			
+			// check if line also indicates a previous quantity that we should add to our quantity
+			if(strpos($chunkLine, ' ^+') !== false) {
+				list($chunkLine, $n) = explode(' ^+', $chunkLine, 2); 
+				if(ctype_digit($n)) $x += (int) $n;
+			}
+			
+			// verify that these are the same line
+			if(strpos(trim($chunkLine) . "\n", trim($line) . "\n") === false) continue; 
+			
+			// remove the line
+			unset($chunkLines[$key]);
+		
+			// update the quantity
+			$qty += $x;
+		}
+		
+		if($qty) {
+			// append quantity to line, i.e. “^+2” indicating 2 more indentical lines were above
+			$chunk = implode("\n", array_values($chunkLines));
+			$line .= " ^+$qty";
+		}
 	}
 
 	public function size() {
@@ -145,7 +310,7 @@ class FileLog extends Wire {
 	 *
 	 */
 	protected function getChunkArray($chunkNum = 1, $chunkSize = 0, $reverse = true) {
-		if($chunkSize < 1) $chunkSize = self::defaultChunkSize;
+		if($chunkSize < 1) $chunkSize = $this->chunkSize;
 		$lines = explode("\n", $this->getChunk($chunkNum, $chunkSize, $reverse));
 		foreach($lines as $key => $line) {
 			$line = trim($line); 
@@ -165,15 +330,16 @@ class FileLog extends Wire {
 	 * Returned string is automatically adjusted at the beginning and 
 	 * ending to contain only full log lines. 
 	 *
-	 * @param int $chunkNum Current pagination number (default=1)
-	 * @param int $chunkSize Number of bytes to retrieve (default=12288)
+	 * @param int $chunkNum Current chunk/pagination number (default=1, first)
+	 * @param int $chunkSize Number of bytes to retrieve (default=0, which assigns default chunk size of 12288)
 	 * @param bool $reverse True=pull from end of file, false=pull from beginning (default=true)
+	 * @param bool $clean Get a clean chunk that starts at the beginning of a line? (default=true)
 	 * @return string
 	 * 
 	 */
-	protected function getChunk($chunkNum = 1, $chunkSize = 0, $reverse = true) {
+	protected function getChunk($chunkNum = 1, $chunkSize = 0, $reverse = true, $clean = true) {
 
-		if($chunkSize < 1) $chunkSize = self::defaultChunkSize;
+		if($chunkSize < 1) $chunkSize = $this->chunkSize;
 	
 		if($reverse) {
 			$offset = -1 * ($chunkSize * $chunkNum);
@@ -181,7 +347,9 @@ class FileLog extends Wire {
 			$offset = $chunkSize * ($chunkNum-1);
 		}
 		
-		if(self::debug) $this->message("chunkNum=$chunkNum, chunkSize=$chunkSize, offset=$offset, filesize=" . filesize($this->logFilename)); 
+		if(self::debug) {
+			$this->message("chunkNum=$chunkNum, chunkSize=$chunkSize, offset=$offset, filesize=" . filesize($this->logFilename));
+		}
 		
 		$data = '';
 		$totalChunks = $this->getTotalChunks($chunkSize); 
@@ -190,23 +358,27 @@ class FileLog extends Wire {
 		if(!$fp = fopen($this->logFilename, "r")) return $data;
 		
 		fseek($fp, $offset, ($reverse ? SEEK_END : SEEK_SET));
-	
-		// make chunk include up to beginning of first line
-		fseek($fp, -1, SEEK_CUR);
-		while(ftell($fp) > 0) {
-			$chr = fread($fp, 1);
-			if($chr == "\n") break;
-			fseek($fp, -2, SEEK_CUR);
-			$data = $chr . $data;
+
+		if($clean) {
+			// make chunk include up to beginning of first line
+			fseek($fp, -1, SEEK_CUR);
+			while(ftell($fp) > 0) {
+				$chr = fread($fp, 1);
+				if($chr == "\n") break;
+				fseek($fp, -2, SEEK_CUR);
+				$data = $chr . $data;
+			}
+			fseek($fp, $offset, ($reverse ? SEEK_END : SEEK_SET));
 		}
 		
 		// get the big part of the chunk
-		fseek($fp, $offset, ($reverse ? SEEK_END : SEEK_SET));
 		$data .= fread($fp, $chunkSize);
-	
-		// remove last partial line
-		$pos = strrpos($data, "\n"); 
-		if($pos) $data = substr($data, 0, $pos); 
+
+		if($clean) {
+			// remove last partial line
+			$pos = strrpos($data, "\n");
+			if($pos) $data = substr($data, 0, $pos);
+		}
 
 		fclose($fp); 
 		
@@ -221,9 +393,9 @@ class FileLog extends Wire {
 	 * 
 	 */
 	protected function getTotalChunks($chunkSize = 0) {
-		if($chunkSize < 1) $chunkSize = self::defaultChunkSize;
+		if($chunkSize < 1) $chunkSize = $this->chunkSize;
 		$filesize = filesize($this->logFilename); 
-		return ceil($filesize / $chunkSize);
+		return $filesize > 0 ? ceil($filesize / $chunkSize) : 0;
 	}
 
 	/**
@@ -233,8 +405,10 @@ class FileLog extends Wire {
 	 * 
 	 */
 	public function getTotalLines() {
+
+		if(!is_readable($this->logFilename)) return 0;
 		
-		if(filesize($this->logFilename) < self::defaultChunkSize) {
+		if(filesize($this->logFilename) < $this->chunkSize) {
 			$data = file($this->logFilename); 
 			return count($data); 
 		}
@@ -243,7 +417,7 @@ class FileLog extends Wire {
 		$totalLines = 0;
 
 		while(!feof($fp)) { 
-			$data = fread($fp, self::defaultChunkSize);
+			$data = fread($fp, $this->chunkSize);
 			$totalLines += substr_count($data, "\n"); 
 		}
 		
@@ -323,7 +497,7 @@ class FileLog extends Wire {
 		$cnt = 0; // number that will be written or returned by this
 		$n = 0; // number total
 		$chunkNum = 0;
-		$totalChunks = $this->getTotalChunks(self::defaultChunkSize); 
+		$totalChunks = $this->getTotalChunks($this->chunkSize); 
 		$stopNow = false;
 		$chunkLineHashes = array();
 		
@@ -451,11 +625,11 @@ class FileLog extends Wire {
 		fclose($fpr); 
 
 		if($cnt) {
-			unlink($filename); 
-			rename("$filename.new", $filename);
+			$this->wire('files')->unlink($filename, true);
+			$this->wire('files')->rename("$filename.new", $filename, true);
 			$this->wire('files')->chmod($filename); 
 		} else {
-			@unlink("$filename.new"); 
+			$this->wire('files')->unlink("$filename.new", true);
 		}
 	
 		return $cnt;	
@@ -477,8 +651,8 @@ class FileLog extends Wire {
 			'dateTo' => time(),
 		));
 		if(file_exists($toFile)) {
-			unlink($this->logFilename); 
-			rename($toFile, $this->logFilename); 
+			$this->wire('files')->unlink($this->logFilename, true);
+			$this->wire('files')->rename($toFile, $this->logFilename, true);
 			return $qty; 
 		}
 		return 0;
@@ -491,7 +665,7 @@ class FileLog extends Wire {
 	 * 
 	 */
 	public function delete() {
-		return @unlink($this->logFilename); 
+		return $this->wire('files')->unlink($this->logFilename, true);
 	}
 
 	public function __toString() {
@@ -517,6 +691,19 @@ class FileLog extends Wire {
 	public function setFileExtension($ext) {
 		$this->fileExtension = $ext; 
 	}
+
+	/**
+	 * Get or set the default chunk size used when reading from logs and not overridden by method argument
+	 * 
+	 * @param int $chunkSize Specify chunk size to set, or omit to get
+	 * @return int
+	 * @since 3.0.143
+	 * 
+	 */
+	public function chunkSize($chunkSize = 0) {
+		if($chunkSize > 0) $this->chunkSize = (int) $chunkSize;
+		return $this->chunkSize;
+	}
 }
 
 

wire/core/FileValidatorModule.php

@@ -10,7 +10,7 @@
  * 3. Copy the getModuleInfo() method out of this class and update as appropriate.
  * 4. Implement an isValidFile($filename) method, and you are done. 
  * 
- * EXAMPLE: /site/modules/FileValidatorSVG.module
+ * EXAMPLE: /site/modules/FileValidatorHTML.module
  * 
  * class FileValidatorHTML extends FileValidatorModule {
  *     public static function getModuleInfo() {
@@ -94,7 +94,7 @@ abstract class FileValidatorModule extends WireData implements Module {
 	protected $_pagefile = null;
 
 	/**
-	 * Is the given file valid? (this is the method mdoules should implement)
+	 * Is the given file valid? (this is the method modules should implement)
 	 * 
 	 * This method should return:
 	 * 	- boolean TRUE if file is valid
@@ -118,7 +118,7 @@ abstract class FileValidatorModule extends WireData implements Module {
 	 * FileValidator modules should not implement this method, as it only serves as a front-end to isValid()
 	 * for logging purposes. 
 	 * 
-	 * @param $filename
+	 * @param string $filename
 	 * @return bool|int Returns TRUE if valid, FALSE if not, or integer 1 if valid as a result of sanitization.
 	 * 
 	 */

wire/core/FilenameArray.php

@@ -106,8 +106,8 @@ class FilenameArray implements \IteratorAggregate, \Countable {
 	 * 
 	 */
 	public function remove($filename) {
-		$key = array_search($filename, $this->data); 
-		if($key !== false) unset($this->data[$key]); 
+		$key = $this->getKey($filename); 
+		unset($this->data[$key]); 
 		return $this; 
 	}
 

wire/core/Fuel.php

@@ -10,7 +10,7 @@
  * This file is licensed under the MIT license
  * https://processwire.com/about/license/mit/
  * 
- * ProcessWire 3.x, Copyright 2016 by Ryan Cramer
+ * ProcessWire 3.x, Copyright 2020 by Ryan Cramer
  * https://processwire.com
  * 
  * @property ProcessWire $wire
@@ -36,6 +36,10 @@
  * @property Languages $languages If LanguageSupport installed
  * @property Config $config
  * @property Fuel $fuel
+ * @property WireProfilerInterface $profiler 
+ * @property WireFileTools $files
+ * @property WireMailTools $mail
+ * @property WireDateTime $datetime
  *
  */
 class Fuel implements \IteratorAggregate {
@@ -56,6 +60,28 @@ class Fuel implements \IteratorAggregate {
 	 */
 	protected $lock = array();
 
+	/**
+	 * API vars that require specific interfaces
+	 * 
+	 * @var array
+	 * 
+	 */
+	protected $requiredInterfaces = array(
+		'profiler' => 'WireProfilerInterface'
+	);
+
+	/**
+	 * The most common API variable names, those likely to be called multiple times in any request
+	 * 
+	 * @var array
+	 * 
+	 */
+	static protected $commonNames = array(
+		'page' => 1, 'pages' => 1, 'session' => 1, 'input' => 1, 'sanitizer' => 1, 
+		'config' => 1, 'user' => 1, 'users' => 1, 'fields' => 1, 'templates' => 1, 
+		'database' => 1, 'modules' => 1, 'hooks' => 1,
+	);
+	
 	/**
 	 * @param string $key API variable name to set - should be valid PHP variable name.
 	 * @param object|mixed $value Value for the API variable.
@@ -68,6 +94,13 @@ class Fuel implements \IteratorAggregate {
 		if(isset($this->lock[$key]) && $value !== $this->data[$key]) {
 			throw new WireException("API variable '$key' is locked and may not be set again"); 
 		}
+		if(isset($this->requiredInterfaces[$key])) {
+			$requiredInterface = $this->requiredInterfaces[$key];
+			$hasInterfaces = wireClassImplements($value, false);
+			if(!isset($hasInterfaces[$requiredInterface]) && !in_array($requiredInterface, $hasInterfaces)) {
+				throw new WireException("API variable '$key' must implement interface: $requiredInterface"); 
+			}
+		}
 		$this->data[$key] = $value; 
 		if($lock) $this->lock[$key] = true;
 		return $this;
@@ -92,6 +125,10 @@ class Fuel implements \IteratorAggregate {
 	public function __get($key) {
 		return isset($this->data[$key]) ? $this->data[$key] : null;
 	}
+	
+	public function get($key) {
+		return isset($this->data[$key]) ? $this->data[$key] : null;
+	}
 
 	public function getIterator() {
 		return new \ArrayObject($this->data); 
@@ -101,4 +138,7 @@ class Fuel implements \IteratorAggregate {
 		return $this->data; 
 	}
 	
+	public static function isCommon($name) {
+		return isset(self::$commonNames[$name]); 
+	}
 }