Merge pull request #614 from ExpressionEngine/7.dev

7.dev into 7.x

Author: TomJaeger

docs/advanced-usage/env-support.md

@@ -8,7 +8,11 @@
 -->
 # ENV File Support
 
-Config files can also be configured using [PHP Environment variables ($_ENV)](https://www.php.net/manual/en/reserved.variables.environment.php). To utilize this, create a file named `.env.php` in the root of your ExpressionEngine install. Add variables to your `.env.php` file as illustrated below:
+Config files can also be configured using [PHP Environment variables ($_ENV)](https://www.php.net/manual/en/reserved.variables.environment.php). To utilize this, create a file named `.env.php` in the root of your ExpressionEngine install. 
+
+NOTE: The `.env.php` file must be placed in same directory as the `system` directory. If you move the `system` directory above the webroot you must also move `.env.php`.
+
+Add variables to your `.env.php` file as illustrated below:
 
 ```
 DB_HOSTNAME=localhost

docs/comment/form.md

@@ -35,6 +35,10 @@ The comment submission form is created very similar to a standard web form, only
 
       <input type="submit" name="submit" value="Submit" />
       <input type="submit" name="preview" value="Preview" />
+      
+      {!-- required to prevent EE from outputting form if commenting is disabled or expired --}
+	  {if comments_disabled}Comments on this entry are currently disabled.{/if}
+      {if comments_expired}Commenting on this entry has expired.{/if}
 
     {/exp:comment:form}
 

docs/contributors.md

@@ -25,6 +25,7 @@ This is a list of all who have contributed content or source code to the Express
 <li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/13821249?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">JCOGS Design</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine-User-Guide/commits?author=jcogs-design" target="_BLANK">@jcogs-design</a></p></div></div></div></li>
 <li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/2160089?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Jace Richardson</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine-User-Guide/commits?author=obfuscode" target="_BLANK">@obfuscode</a></p></div></div></div></li>
 <li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/44739?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Jack McDade</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine-User-Guide/commits?author=jackmcdade" target="_BLANK">@jackmcdade</a></p></div></div></div></li>
+<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/21958491?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Jared Chesebro</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine-User-Guide/commits?author=jaredchesebro" target="_BLANK">@jaredchesebro</a></p></div></div></div></li>
 <li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/6988096?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Jason</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine-User-Guide/commits?author=jsnm-repo" target="_BLANK">@jsnm-repo</a></p></div></div></div></li>
 <li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/3662114?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Jeradsdesign</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine-User-Guide/commits?author=jeradsdesign" target="_BLANK">@jeradsdesign</a></p></div></div></div></li>
 <li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/18269476?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Jordan Ellis</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine-User-Guide/commits?author=Jordan-Ellis" target="_BLANK">@Jordan-Ellis</a></p></div></div></div></li>

docs/control-panel/settings/email.md

@@ -49,6 +49,14 @@ The username used to log in to your SMTP server. Not all SMTP servers require yo
 
 The password used to log in to your SMTP server. Not all SMTP servers require you to _authenticate_, but many of them do. In those cases you will need to specify the username (above) and password.
 
+### Connection type
+
+Cryptographic protocol for SMTP. Can be set to Unencrypted (not recommended), SSL or TLS
+
+### TLS version
+
+When using TLS, provide the version that you can find in the instructions from your SMTP provider. Version 1.2 is the most commonly used
+
 ### Mail format
 
 When you send email via the Communicate section of your Control Panel, you are able to send HTML formatted emails. This preference sets whether the Communicate section has "Plain text" or "HTML" selected by default.

docs/development/cypress-tests.md

@@ -15,7 +15,7 @@ lang: ee
 
 ExpressionEngine is utilizing [Cypress](https://www.cypress.io/) for integration tests.
 
-The tests are ogranized to check the functionality of ExpressionEngine itself, but can also be extended for add-on testing.
+The tests are organized to check the functionality of ExpressionEngine itself, but can also be extended for add-on testing.
 
 NOTE: In order to get access to Cypress testing, ExpressionEngine need to be [installed from repository](https://github.com/ExpressionEngine/ExpressionEngine/blob/6.dev/README.md#if-youre-installing-from-the-repository). You also need to have [Node.js and NPM](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm) installed.
 

docs/development/services/cp-form.md

@@ -13,7 +13,6 @@
 
 The CP/Form Service allows for the creation of Shared Form View data using an object oriented interface. 
 
-TIP: Note this requires PHP >= 7.1
 
 ## Usage
 

docs/development/shared-form-view.md

@@ -13,10 +13,14 @@ lang: php
 
 # Shared Form View
 
+TIP: Note. You can also build out control panel views [with objects using the CP form service](development/services/cp-form.md)
+
 [TOC]
 
 ExpressionEngine's control panel markup is very modular and consistent. Because of that, we were able to abstract out the creation of most form views to a single view file to save repeating ourselves and keeping our form markup maintainable. This view is also available to add-on developers and is recommended for built-in support for form validation.
 
+
+
 ## Getting started
 
 The concept is quite familiar. In an ExpressionEngine controller file, we will create a variable and pass it to a view. The variable will be a specifically-structured array that will describe the layout and contents of our form.

docs/general/system-configuration-overrides.md

@@ -3062,6 +3062,22 @@ Example Usage:
 
 **Also found in CP:** `Settings --> Access Throttling`: [Time Interval](control-panel/settings/throttling.md#time-interval)
 
+### `tls_crypto_method`
+
+Stream encryption method, when using TLS for sending emails over SMTP.
+
+| Value                                      | Behavior                   |
+| ------------------------------------------ | -------------------------- |
+| STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT        | TLS v1.0                   |
+| STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT        | TLS v1.1                   |
+| STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT        | TLS v1.2 (default)         |
+| STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT        | TLS v1.3 (as of PHP 7.4.0) |
+
+ 
+Example Usage:
+
+    $config['tls_crypto_method'] = STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT;
+
 ### `un_min_len`
 
 Set the minimum number of characters allowed for member usernames.

docs/installation/changelog.md

@@ -8,6 +8,38 @@
 -->
 # ExpressionEngine v7 Change Log
 
+## Version 7.2.13
+(Release: April 4, 2023)
+
+- **Contributors** 🙌
+<div class="max-w-7xl mx-autotext-center">
+<div class="space-y-8 sm:space-y-12">
+    <ul role="list" class="mx-auto grid grid-cols-2 gap-x-4 gap-y-1 sm:grid-cols-4 md:gap-x-6 lg:max-w-5xl lg:gap-x-8 lg:gap-y-1 xl:grid-cols-5">
+<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/11818941?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Matt Johnson</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=matthewjohns0n" target="_BLANK">@matthewjohns0n</a></p></div></div></div></li>
+<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/422821?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Tom Jaeger</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=TomJaeger" target="_BLANK">@TomJaeger</a></p></div></div></div></li>
+<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/23382425?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Yulya Lebed</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=Yulyaswan" target="_BLANK">@Yulyaswan</a></p></div></div></div></li>
+<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/752126?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Yuri Salimovskiy</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=intoeetive" target="_BLANK">@intoeetive</a></p></div></div></div></li>
+<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/1181219?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">robinsowell</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=robinsowell" target="_BLANK">@robinsowell</a></p></div></div></div></li>
+    </ul>
+</div>
+</div>
+
+**Bug Fixes** 💃🐛
+
+- Resolved issue where Live Preview did not work with Fluid fields
+- Resolved [#3129](https://github.com/ExpressionEngine/ExpressionEngine/issues/3129) where "extension missing" messages could be visible to guests even when the site is offline
+- Resolved [#2752](https://github.com/ExpressionEngine/ExpressionEngine/issues/2752) where cross-domain multi-site login was not working
+- Fixed [#3130](https://github.com/ExpressionEngine/ExpressionEngine/issues/3130) where the filter control to add/delete columns doesn't do anything on File modal on publish
+- Resolved [#3127](https://github.com/ExpressionEngine/ExpressionEngine/issues/3127) where PHP error was shown when creating shortcut from Pro Search log
+- Fixed [#3120](https://github.com/ExpressionEngine/ExpressionEngine/issues/3120) where duplicate status options with large number of statuses in cp
+- Resolved [#3126](https://github.com/ExpressionEngine/ExpressionEngine/issues/3126) where Mass Notification Export utility did not work properly
+- Resolved [#3135](https://github.com/ExpressionEngine/ExpressionEngine/issues/3135), [#3047](https://github.com/ExpressionEngine/ExpressionEngine/issues/3135) where the columns in Entry Manager did not dynamically update if some column is not available
+- Resolved issue with sidebar member links
+
+- **Enhancements** 🚀
+  - Added new needed_fields_only paramater to channel entries loop
+
+
 ## Version 7.2.12
 (Release: March 20, 2023)
 
@@ -40,7 +72,7 @@
 
 **Developers** 💻
 
-- Resolved [#3069](https://github.com/ExpressionEngine/ExpressionEngine/issues/) where `ChannelField` model could not be saved without `field_order` property
+- Resolved [#3069](https://github.com/ExpressionEngine/ExpressionEngine/issues/3069) where `ChannelField` model could not be saved without `field_order` property
 
 ## Version 7.2.11
 (Release: March 6, 2023)

docs/installation/requirements.md

@@ -22,13 +22,13 @@
 
 If you're not sure whether your server meets the minimum requirements, the server wizard will run some tests and give you an answer.
 
-- [Download](https://expressionengine.com/asset/file/ee_server_wizard.zip) and unzip the archive.
+- [Download](https://github.com/ExpressionEngine/ExpressionEngine-Server-Wizard/archive/refs/heads/master.zip) and unzip the archive.
 - Upload the folder to your server.
 - Point your web browser to the folder. For example: `https://example.com/ee_wizard`
 
 ## The Bare Minimums
 
-If you are stuck in an older environment, ExpressionEngine _can_ run on PHP 7.2.5+ with 32M of memory, and MySQL 5.5.3+. PHP-FPM is also optional, but [tends to handily outperform mod_php](https://www.cloudways.com/blog/php-fpm-on-cloud/). That said,running older versions not only hurts performance—increasing the cost of your website—but also puts your site **at risk of security vulnerabilities**. The PHP Group stopped providing support for PHP 5.6 [on December 31, 2018](https://php.net/supported-versions.php). Oracle also ceased providing support for MySQL 5.5 at the same time.
+If you are stuck in an older environment, ExpressionEngine _can_ run on PHP 7.2.5+ with 32M of memory, and MySQL 5.6.4+. PHP-FPM is also optional, but [tends to handily outperform mod_php](https://www.cloudways.com/blog/php-fpm-on-cloud/). That said, running older versions not only hurts performance—increasing the cost of your website—but also puts your site **at risk of security vulnerabilities**. The PHP Group stopped providing support for PHP 5.6 [on December 31, 2018](https://php.net/supported-versions.php). Oracle also ceased providing support for MySQL 5.5 at the same time.
 
 Why not save yourself the worry and hassle, enjoy a faster and more secure site that costs less to maintain, and upgrade now? Here's an email you can send to your host if they need a little nudge: