Changeset 2443010

Timestamp:

12/19/2020 06:36:43 PM (4 years ago)

Author:

husobj

Message:

Version 2.0

Location:

wp-mailfrom-ii/trunk

Files:

• CHANGELOG.md (modified) (2 diffs)
• README.md (modified) (1 diff)
• admin/class-wp-mailfrom-ii-admin.php (modified) (2 diffs)
• public/class-wp-mailfrom-ii.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)
• wp-mailfrom-ii.php (modified) (1 diff)

wp-mailfrom-ii/trunk/CHANGELOG.md

@@ -2 +2 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
+
+
+
+
+
+
+
+
 
 ## [1.2] - 2020-12-14
@@ -54 +62 @@
 - Fork of original [WP Mail From](https://wordpress.org/plugins/wp-mailfrom/) plugin
 
-[Unreleased]: https://github.com/benhuson/wp-mailfrom/compare/1.2...HEAD
+[Unreleased]: https://github.com/benhuson/wp-mailfrom/compare/2.0...HEAD
+[2.0]: https://github.com/benhuson/wp-mailfrom/compare/1.2...2.0
 [1.2]: https://github.com/benhuson/wp-mailfrom/compare/1.1.1...1.2
 [1.1.1]: https://github.com/benhuson/wp-mailfrom/compare/1.1...1.1.1

wp-mailfrom-ii/trunk/README.md

@@ -56 +56 @@
 --------------
 
+
+
+
 ### 1.2
 Makes admin field labels clickable and removes deprecated `screen_icon()`.

wp-mailfrom-ii/trunk/admin/class-wp-mailfrom-ii-admin.php

@@ -196 +196 @@
     public function wp_mailfrom_ii_name_field() {
 
-        echo '<input name="wp_mailfrom_ii_name" type="text" id="wp_mailfrom_ii_name" value="' . esc_attr( get_option( 'wp_mailfrom_ii_name', '' ) ) . '" class="regular-text" />';
+        $wp_mailfrom_ii = \WP_MailFrom_II::get_instance();
+
+        echo '<input name="wp_mailfrom_ii_name" type="text" id="wp_mailfrom_ii_name" value="' . esc_attr( get_option( 'wp_mailfrom_ii_name', '' ) ) . '" class="regular-text" placeholder="' . esc_attr( $wp_mailfrom_ii->get_default_from_name() ) . '" />';
 
     }
@@ -207 +209 @@
     public function wp_mailfrom_ii_email_field() {
 
-        echo '<input name="wp_mailfrom_ii_email" type="text" id="wp_mailfrom_ii_email" value="' . esc_attr( get_option( 'wp_mailfrom_ii_email', '' ) ) . '" class="regular-text" />';
+        $wp_mailfrom_ii = \WP_MailFrom_II::get_instance();
+
+        echo '<input name="wp_mailfrom_ii_email" type="text" id="wp_mailfrom_ii_email" value="' . esc_attr( get_option( 'wp_mailfrom_ii_email', '' ) ) . '" class="regular-text" placeholder="' . esc_attr( $wp_mailfrom_ii->get_default_from() ) . '" />';
 
     }

wp-mailfrom-ii/trunk/public/class-wp-mailfrom-ii.php

@@ -156 +156 @@
      * Is Default From Name
      *
-     * Checks to see if the name is the default name assigned by WordPress.
-     * This is defined in wp_mail() in wp-includes/pluggable.php
-     *
      * @since   1.1
      *
@@ -166 +163 @@
     public function is_default_from_name( $name ) {
 
-        return 'WordPress' == $name;
+        return $this->get_default_from_name() == $name;
+
+    }
+
+    /**
+     * Get Default From Name
+     *
+     * Get the default name assigned by WordPress.
+     * This is defined in wp_mail() in wp-includes/pluggable.php
+     *
+     * @since   2.0
+     *
+     * @return  string  Default name.
+     */
+    public function get_default_from_name() {
+
+        return 'WordPress';
 
     }
@@ -202 +215 @@
     public function get_default_from() {
 
-        $sitename = strtolower( $_SERVER['SERVER_NAME'] );
-
-        if ( substr( $sitename, 0, 4 ) == 'www.' ) {
+        global $wp_version;
+
+        /**
+         * New method of getting sitename in WordPress 5.5+
+         *
+         * @see  https://core.trac.wordpress.org/ticket/25239#comment:114
+         * @see  https://core.trac.wordpress.org/changeset/48601
+         */
+        if ( version_compare( $wp_version, '5.5' ) >= 0 ) {
+            $sitename = wp_parse_url( network_home_url(), PHP_URL_HOST );
+        } else {
+            $sitename = strtolower( $_SERVER['SERVER_NAME'] );
+        }
+
+        if ( 'www.' === substr( $sitename, 0, 4 ) ) {
             $sitename = substr( $sitename, 4 );
         }

wp-mailfrom-ii/trunk/readme.txt

@@ -4 +4 @@
 Tags: mail from, from email, email from, from address, mail, email, smtp, from address, email address, from header
 Requires at least: 4.3
-Tested up to: 5.4.4
-Stable tag: 1.2
+Tested up to: 5.
+Stable tag: 
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -68 +68 @@
 == Changelog ==
 
+
+
+
+
 = 1.2 =
 * Make admin field labels clickable. Props [Viktor Szépe](https://github.com/szepeviktor).

wp-mailfrom-ii/trunk/wp-mailfrom-ii.php

@@ -5 +5 @@
  * Plugin URI:         https://wordpress.org/plugins/wp-mailfrom-ii/
  * Description:        Allows you to configure the default email address and name used for emails sent by WordPress.
- * Version:            1.2
+ * Version:            
  * Author:             Ben Huson
  * Author URI:         https://github.com/benhuson/
  * Minimum WordPress Version Required: 4.3
- * Tested up to:       5.4.4
+ * Tested up to:       5.
  * Text Domain:        wp-mailfrom-ii
  * Domain Path:        /languages