Bump version to 2.7. Update license. Update README and related files.

ryancramerdesign · Nov 12, 2015 · a25a8c1 · a25a8c1
1 parent 390ba27
commit a25a8c1
Show file tree

Hide file tree

Showing 254 changed files with 1,101 additions and 3,468 deletions.
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
@@ -1,19 +1,10 @@
 ProcessWire is Copyright 2015 by Ryan Cramer / Ryan Cramer Design, LLC
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program as the file LICENSE.txt; if not, please see
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-ProcessWire includes works under other copyright notices and distributed
-according to the terms of the GNU General Public License or a compatible
-license.
+Licensed under Mozilla Public License v2.0 
+http://mozilla.org/MPL/2.0/
+
+Some files in ProcessWire use different licenses, such as the MIT license
+for example. See individual files for details or look for LICENSE.* files
+in a given directory. If a non-minified file indicates no license and 
+copyright is not someone other than Ryan Cramer, the MPL 2.0 license may
+be assumed. 
 
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-# Welcome to ProcessWire 2.6
+# Welcome to ProcessWire 2.7
 
 This document is in Markdown. An HTML formatted version of this document 
-can be read at: http://processwire.com/download/readme
+can be read at: https://processwire.com/download/readme
 
 ## Table of Contents
 
@@ -21,6 +21,7 @@ can be read at: http://processwire.com/download/readme
        - [Replacing the /index.php file](#replacing-the-indexphp-file)
        - [Replacing the .htaccess file](#replacing-the-htaccess-file)
        - [Additional upgrade notes](#additional-upgrade-notes)
+   - [Upgrading from ProcessWire 2.6](#upgrading-from-processwire-26)
    - [Upgrading from ProcessWire 2.5](#upgrading-from-processwire-25)
    - [Upgrading from ProcessWire 2.4](#upgrading-from-processwire-24)
    - [Upgrading from ProcessWire 2.2 or 2.3](#upgrading-from-processwire-22-or-23)
@@ -40,13 +41,15 @@ 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.
 
-* [Learn more about ProcessWire](http://processwire.com)
-* [Download the latest ProcessWire](http://processwire.com/download/)
-* [Get support for ProcessWire](http://processwire.com/talk/)
+* [Learn more about ProcessWire](https://processwire.com)
+* [Download the latest ProcessWire](https://processwire.com/download/)
+* [Get support for ProcessWire](https://processwire.com/talk/)
 * [Browse and install ProcessWire modules/plugins](http://modules.processwire.com)
 * [Follow @ProcessWire on Twitter](http://twitter.com/processwire/)
-* [Contact ProcessWire](http://processwire.com/contact/)
-
+* [Contact ProcessWire](https://processwire.com/contact/)
+* [API Cheatsheet](http://cheatsheet.processwire.com/)
+* [Sites running ProcessWire](https://processwire.com/about/sites/)
+* [Read the ProcessWire Blog](https://processwire.com/blog/)
 
 ## Installation
 
@@ -145,12 +148,12 @@ error, please post in the [ProcessWire forums](http://processwire.com/talk).
    re-install them after upgrading. If uninstalling is 
    inconvenient, just be sure you have the ability to revert if for 
    some reason one of your modules does not like the upgrade.
-   Modules that are compatible with ProcessWire 2.4-2.5 are generally
-   going to also be compatible with 2.6. 
+   Modules that are compatible with ProcessWire 2.4-2.6 are generally
+   going to also be compatible with 2.7. 
 
 If you prefer an automatic/web-based upgrade, an
 [upgrade module](https://github.com/ryancramerdesign/ProcessWireUpgrade)
-is available for upgrading to 2.6. This upgrade utility can also help with
+is available for upgrading to 2.7. This upgrade utility can also help with
 upgrading other modules as well. 
 
 
@@ -251,14 +254,26 @@ logging in to your admin and going to Setup > ProCache.
 
 - If using Form Builder make sure you have the latest version,
   as past versions did not support ProcessWire 2.4+. With ProcessWire
-  2.6 we recommend FormBuilder 0.2.4 or 0.2.5+. 
+  2.7 we recommend FormBuilder 0.2.4 or 0.2.5+. 
 
-- If using ProCache you will need to go to the ProCache
-  settings after the upgrade to have it update your .htaccess file
-  again (since it was presumably replaced during the upgrade). 
+- 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, than the ProCache settings page own't mention it.
+
+- If using ListerPro, we recommend using version 1.0.9+ with 
+  ProcessWire 2.7.
 
-- If using ListerPro, we recommend using version 1.0.2+ with 
-  ProcessWire 2.6.
+### Upgrading from ProcessWire 2.6
+
+The general upgrade process may be followed to perform this upgrade.
+It is not necessary to replace your .htaccess file. You should replace
+these directories/files:
+
+- /wire/
+- /index.php
+- /COPYRIGHT.txt (if present)
+- /LICENSE.txt (if present)
 
 ### Upgrading from ProcessWire 2.5
 
@@ -291,7 +306,7 @@ In addition, please note the following:
 
 - **TinyMCE rich text editor was replaced with CKEditor**    
   2.5 dropped TinyMCE as the rich text editor and replaced it with 
-  CKEditor. After installation of 2.6, you will see an error message
+  CKEditor. After installation of 2.7, you will see an error message
   on any pages that use TinyMCE. From this point, you may either 
   [install TinyMCE](mods.pw/7H) or switch your fields using TinyMCE
   to CKEditor. To switch to CKEditor, go to Setup > Fields > [field] > Details,
@@ -300,7 +315,7 @@ In addition, please note the following:
 
 - **Already have CKEditor or HTML Purifier installed?**   
   A couple of modules that were previously 3rd party (site) modules 
-  are now core (wire) modules in ProcessWire 2.6. If you have either
+  are now core (wire) modules in ProcessWire 2.7. If you have either
   the *InputfieldCKEditor* or *MarkupHTMLPurifier* modules installed,
   you will get warnings about that after upgrading. The warnings will 
   tell you to remove the dirs/files for those modules that you have in 
@@ -362,7 +377,7 @@ hit "reload" in your browser until the error messages disappear. It
 may take up to 5 reloads for ProcessWire to apply all updates. 
 
 If using Form Builder, make sure you have version 0.2.3 or newer, as older
-versions did not support ProcessWire 2.4+. For ProcessWire 2.6 we recommend
+versions did not support ProcessWire 2.4+. For ProcessWire 2.7 we recommend
 using FormBuilder 0.2.4 or newer. 
 
 If your site still doesn't work, remove the /wire/ directory completely. 
@@ -408,5 +423,5 @@ Get support in the ProcessWire forum at:
 
 ------
 
-ProcessWire, Copyright 2015 by Ryan Cramer Design, LLC
+Copyright 2015 by Ryan Cramer / Ryan Cramer Design, LLC
 
diff --git a/index.php b/index.php
@@ -12,21 +12,15 @@
  * 
  * ProcessWire 2.x 
  * Copyright (C) 2015 by Ryan Cramer 
- * Licensed under GNU/GPL v2, see LICENSE.TXT
+ * Licensed under Mozilla Public License v2.0 http://mozilla.org/MPL/2.0/
  * 
- * http://processwire.com
+ * https://processwire.com
  *
- * @version 2.5
- *
- * Index Versions
- * ==============
- * 252 Extract all fuel to local API vars when in external or cli mode.
- * 251 Add $config->debugIf option.
- * 250 PW 2.5 support.
+ * @version 2.7
  *
  */
 
-define("PROCESSWIRE", 251); // index version
+define("PROCESSWIRE", 270); // index version
 
 /**
  * Build the ProcessWire configuration

diff --git a/install.php b/install.php
@@ -13,13 +13,13 @@
  * 
  * ProcessWire 2.x 
  * Copyright (C) 2015 by Ryan Cramer 
- * Licensed under GNU/GPL v2, see LICENSE.TXT
+ * This file licensed under Mozilla Public License v2.0 http://mozilla.org/MPL/2.0/
  * 
- * http://processwire.com
+ * https://processwire.com
  * 
  */
 
-define("PROCESSWIRE_INSTALL", 2.6); 
+define("PROCESSWIRE_INSTALL", 2.7); 
 
 /**
  * class Installer
@@ -126,7 +126,7 @@ public function execute() {
 	 */
 	protected function welcome() {
 		$this->h("Welcome. This tool will guide you through the installation process."); 
-		$this->p("Thanks for choosing ProcessWire! If you downloaded this copy of ProcessWire from somewhere other than <a href='http://processwire.com/'>processwire.com</a> or <a href='https://github.com/ryancramerdesign/ProcessWire' target='_blank'>our GitHub page</a>, please download a fresh copy before installing. If you need help or have questions during installation, please stop by our <a href='http://processwire.com/talk/' target='_blank'>support board</a> and we'll be glad to help.");
+		$this->p("Thanks for choosing ProcessWire! If you downloaded this copy of ProcessWire from somewhere other than <a href='https://processwire.com/'>processwire.com</a> or <a href='https://github.com/ryancramerdesign/ProcessWire' target='_blank'>our GitHub page</a>, please download a fresh copy before installing. If you need help or have questions during installation, please stop by our <a href='https://processwire.com/talk/' target='_blank'>support board</a> and we'll be glad to help.");
 		$this->btn("Get Started", 0, 'sign-in'); 
 	}
 
@@ -367,7 +367,7 @@ protected function compatibilityCheck() {
 		}
 
 		if($this->numErrors) {
-			$this->p("One or more errors were found above. We recommend you correct these issues before proceeding or <a href='http://processwire.com/talk/'>contact ProcessWire support</a> if you have questions or think the error is incorrect. But if you want to proceed anyway, click Continue below.");
+			$this->p("One or more errors were found above. We recommend you correct these issues before proceeding or <a href='https://processwire.com/talk/'>contact ProcessWire support</a> if you have questions or think the error is incorrect. But if you want to proceed anyway, click Continue below.");
 			$this->btn("Check Again", 1, 'refresh', false, true); 
 			$this->btn("Continue to Next Step", 2, 'angle-right', true); 
 		} else {

diff --git a/site-beginner/config.php b/site-beginner/config.php
@@ -16,9 +16,9 @@
  *
  * ProcessWire 2.x 
  * Copyright (C) 2015 by Ryan Cramer 
- * Licensed under GNU/GPL v2, see LICENSE.TXT
+ * This file licensed under Mozilla Public License v2.0 (http://mozilla.org/MPL/2.0/)
  * 
- * http://processwire.com
+ * https://processwire.com
  *
  */
 

diff --git a/site-beginner/templates/_foot.php b/site-beginner/templates/_foot.php
@@ -5,7 +5,7 @@
 	<!-- footer -->
 	<footer id='footer'>
 		<p>
-		Powered by <a href='http://processwire.com'>ProcessWire CMS</a>  &nbsp; / &nbsp; 
+		Powered by <a href='https://processwire.com'>ProcessWire CMS</a>  &nbsp; / &nbsp; 
 		<?php 
 		if($user->isLoggedin()) {
 			// if user is logged in, show a logout link

diff --git a/site-blank/config.php b/site-blank/config.php
@@ -16,9 +16,9 @@
  *
  * ProcessWire 2.x
  * Copyright (C) 2015 by Ryan Cramer
- * Licensed under GNU/GPL v2, see LICENSE.TXT
+ * This file licensed under Mozilla Public License v2.0 (http://mozilla.org/MPL/2.0/)
  *
- * http://processwire.com
+ * https://processwire.com
  *
  */
 

diff --git a/site-classic/config.php b/site-classic/config.php
@@ -16,9 +16,9 @@
  *
  * ProcessWire 2.x
  * Copyright (C) 2015 by Ryan Cramer
- * Licensed under GNU/GPL v2, see LICENSE.TXT
+ * This file licensed under Mozilla Public License v2.0 (http://mozilla.org/MPL/2.0/)
  *
- * http://processwire.com
+ * https://processwire.com
  *
  */
 

diff --git a/site-classic/templates/head.inc b/site-classic/templates/head.inc
@@ -33,8 +33,6 @@
 
 	<!--
 	This website is powered by ProcessWire CMF/CMS.
-	ProcessWire is a free open source content management framework licensed under the GNU GPL.
-	ProcessWire is Copyright 2012 by Ryan Cramer / Ryan Cramer Design, LLC.
 	Learn more about ProcessWire at: http://processwire.com
 	-->
 

diff --git a/site-default/config.php b/site-default/config.php
@@ -16,9 +16,9 @@
  *
  * ProcessWire 2.x 
  * Copyright (C) 2015 by Ryan Cramer 
- * Licensed under GNU/GPL v2, see LICENSE.TXT
+ * This file licensed under Mozilla Public License v2.0 (http://mozilla.org/MPL/2.0/)
  * 
- * http://processwire.com
+ * https://processwire.com
  *
  */
 

diff --git a/site-default/modules/Helloworld.module b/site-default/modules/Helloworld.module
@@ -8,10 +8,10 @@
  * See README file for further links regarding module development.
  * 
  * ProcessWire 2.x 
- * Copyright (C) 2014 by Ryan Cramer 
- * Licensed under GNU/GPL v2, see LICENSE.TXT
+ * Copyright (C) 2015 by Ryan Cramer 
+ * This file licensed under Mozilla Public License v2.0 http://mozilla.org/MPL/2.0/
  * 
- * http://processwire.com
+ * https://processwire.com
  *
  */
 
@@ -37,7 +37,7 @@ class Helloworld extends WireData implements Module {
 			'summary' => 'An example module used for demonstration purposes. See the /site/modules/Helloworld.module file for details.',
 
 			// 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. 

diff --git a/site-default/templates/_main.php b/site-default/templates/_main.php
@@ -93,7 +93,7 @@
 	<!-- footer -->
 	<footer id='footer'>
 		<p>
-		Powered by <a href='http://processwire.com'>ProcessWire CMS</a>  &nbsp; / &nbsp; 
+		Powered by <a href='https://processwire.com'>ProcessWire CMS</a>  &nbsp; / &nbsp; 
 		<?php 
 		if($user->isLoggedin()) {
 			// if user is logged in, show a logout link

diff --git a/site-languages/config.php b/site-languages/config.php
@@ -16,9 +16,9 @@
  *
  * ProcessWire 2.x
  * Copyright (C) 2015 by Ryan Cramer
- * Licensed under GNU/GPL v2, see LICENSE.TXT
+ * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * http://processwire.com
+ * https://processwire.com
  *
  */
 

diff --git a/site-languages/templates/_main.php b/site-languages/templates/_main.php
@@ -134,7 +134,7 @@
 	<!-- footer -->
 	<footer id='footer'>
 		<p>
-		<a href='http://processwire.com'><?php echo __('Powered by ProcessWire CMS'); ?></a> &nbsp; / &nbsp; 
+		<a href='https://processwire.com'><?php echo __('Powered by ProcessWire CMS'); ?></a> &nbsp; / &nbsp; 
 		<?php
 		if($user->isLoggedin()) {
 			// if user is logged in, show a logout link

diff --git a/wire/config.php b/wire/config.php
@@ -14,7 +14,7 @@
  * 
  * ProcessWire 2.x 
  * Copyright (C) 2015 by Ryan Cramer 
- * Licensed under GNU/GPL v2, see LICENSE.TXT
+ * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
  * 
  * https://processwire.com
  *

diff --git a/wire/core/AdminTheme.php b/wire/core/AdminTheme.php
@@ -8,10 +8,10 @@
  * See the Module interface (Module.php) for details about each method. 
  * 
  * ProcessWire 2.x 
- * Copyright (C) 2014 by Ryan Cramer 
- * Licensed under GNU/GPL v2, see LICENSE.TXT
+ * Copyright (C) 2015 by Ryan Cramer 
+ * This file licensed under Mozilla Public License v2.0 http://mozilla.org/MPL/2.0/
  * 
- * http://processwire.com
+ * https://processwire.com
  * 
  * @property int|string $version Current admin theme version
  *

diff --git a/wire/core/Breadcrumbs.php b/wire/core/Breadcrumbs.php
@@ -6,11 +6,11 @@
  * Provides basic breadcrumb capability 
  * 
  * ProcessWire 2.x 
- * Copyright (C) 2010 by Ryan Cramer 
- * Licensed under GNU/GPL v2, see LICENSE.TXT
+ * Copyright (C) 2015 by Ryan Cramer 
+ * This file licensed under Mozilla Public License v2.0 http://mozilla.org/MPL/2.0/
+ * 
+ * https://processwire.com
  * 
- * http://www.processwire.com
- * http://www.ryancramer.com
  *
  */
 

diff --git a/wire/core/CacheFile.php b/wire/core/CacheFile.php
@@ -11,7 +11,7 @@
  *
  * ProcessWire 2.x 
  * Copyright (C) 2015 by Ryan Cramer 
- * Licensed under GNU/GPL v2, see LICENSE.TXT
+ * This file licensed under Mozilla Public License v2.0 http://mozilla.org/MPL/2.0/
  * 
  * https://processwire.com
  *

diff --git a/wire/core/Config.php b/wire/core/Config.php
@@ -7,9 +7,9 @@
  * 
  * ProcessWire 2.x 
  * Copyright (C) 2015 by Ryan Cramer 
- * Licensed under GNU/GPL v2, see LICENSE.TXT
+ * This file licensed under Mozilla Public License v2.0 (http://mozilla.org/MPL/2.0/)
  * 
- * http://processwire.com
+ * https://processwire.com
  *
  *
  * @see /wire/config.php for more detailed descriptions of all config properties. 

diff --git a/wire/core/ConfigurableModule.php b/wire/core/ConfigurableModule.php
@@ -7,7 +7,7 @@
  *
  * ProcessWire 2.x
  * Copyright (C) 2015 by Ryan Cramer
- * Licensed under GNU/GPL v2, see LICENSE.TXT
+ * This file licensed under Mozilla Public License v2.0 http://mozilla.org/MPL/2.0/
  *
  * https://processwire.com
  *