From e44df3c59ac8c96c03f5daa085b6fff90435893b Mon Sep 17 00:00:00 2001 From: s3rgiosan Date: Fri, 16 Oct 2015 18:09:10 +0100 Subject: [PATCH 01/11] Added support to HTML messages (sended by wpMandrill, for instance) --- wp-email-debug.php | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/wp-email-debug.php b/wp-email-debug.php index ad2bf47..34ace0b 100644 --- a/wp-email-debug.php +++ b/wp-email-debug.php @@ -85,13 +85,40 @@ public static function contextualSwitch() public static function filterEmail( $args ) { - $to_address = get_option('WPMDBUG_email', get_bloginfo('admin_email')); - $original = $args['to']; + $isHtml = isset( $args['html'] ); + $prefix = ''; + $message = $isHtml ? $args['html'] : $args['message']; - if (self::contextualSwitch()) { - $args['to'] = $to_address; - $args['subject'] = '[DEBUG] ' . $args['subject']; - $args['message'] = "Originally intended to be sent to " . $original . "\n" . $args['message']; + if ( self::contextualSwitch() ) { + + // Prefix message + $prefix = sprintf( + __( 'Originally intended to be sent to %s', 'wp-email-debug' ), + $args['to'] + ); + + if ( ! empty( $prefix ) ) { + $prefix = $prefix . ( $isHtml ? '
' : '\n' ); + } + + // Update email to address + $args['to'] = get_option( 'WPMDBUG_email', get_bloginfo( 'admin_email' ) ); + + // Update email subject + $args['subject'] = sprintf( + __( '[DEBUG] %s', 'wp-email-debug' ), + $args['subject'] + ); + + } + + $message = $prefix . $message; + + if ( $isHtml ) { + $args['html'] = $message; + } + else { + $args['message'] = $message; } return $args; From 2e6b423d022119f13ba572b745aee79c1bc4b830 Mon Sep 17 00:00:00 2001 From: s3rgiosan Date: Fri, 16 Oct 2015 18:32:33 +0100 Subject: [PATCH 02/11] Added composer.json file --- composer.json | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 composer.json diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..b7a0e06 --- /dev/null +++ b/composer.json @@ -0,0 +1,23 @@ +{ + "name": "GForceWeb/WP-Email-Debug", + "type": "wordpress-plugin", + "license": "GPL", + "description": "Never accidentally send users emails from your testing sites again!", + "homepage": "https://wordpress.org/plugins/wp-email-debug", + "authors": [ + { + "name": "Grant Derepas", + "homepage": "https://www.g-force.net" + } + ], + "keywords": [ + "wordpress" + ], + "support": { + "issues": "https://github.com/GForceWeb/WP-Email-Debug/issues" + }, + "require": { + "php": ">=5.3", + "composer/installers": "~1.0" + } +} From eae37b34e53c28ce3d0031acba45e80b48e1c179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Santos?= Date: Fri, 16 Oct 2015 18:39:32 +0100 Subject: [PATCH 03/11] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b7a0e06..04d51e3 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "GForceWeb/WP-Email-Debug", + "name": "gforceweb/wp-email-debug", "type": "wordpress-plugin", "license": "GPL", "description": "Never accidentally send users emails from your testing sites again!", From 25fd1ded46d3fa6081edfad226b2c8382ed35f07 Mon Sep 17 00:00:00 2001 From: s3rgiosan Date: Wed, 20 Jan 2016 02:03:50 +0000 Subject: [PATCH 04/11] Dotfiles --- .editorconfig | 16 ++++++++++++++++ .gitattributes | 22 ---------------------- .gitignore | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 22 deletions(-) create mode 100644 .editorconfig delete mode 100644 .gitattributes create mode 100644 .gitignore diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..9aa5f8d --- /dev/null +++ b/.editorconfig @@ -0,0 +1,16 @@ +root = true + +[*] +end_of_line = lf +indent_style = space +indent_size = 2 +insert_final_newline = true +trim_trailing_whitespace = true + +[*.php] +indent_style = tab +indent_size = 4 + +[*.{markdown,md,mdown,txt}] +indent_size = 4 +trim_trailing_whitespace = false diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 412eeda..0000000 --- a/.gitattributes +++ /dev/null @@ -1,22 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto - -# Custom for Visual Studio -*.cs diff=csharp -*.sln merge=union -*.csproj merge=union -*.vbproj merge=union -*.fsproj merge=union -*.dbproj merge=union - -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5930a39 --- /dev/null +++ b/.gitignore @@ -0,0 +1,43 @@ +# Numerous always-ignore extensions +*.diff +*.err +*.orig +*.log +*.rej +*.swo +*.swp +*.vi +*~ +*.sass-cache + +# OS or Editor folders +.DS_Store +Thumbs.db +.cache +.project +.settings +.tmproj +*.esproj +nbproject +*.sublime-project +*.sublime-workspace + +# Dreamweaver added files +_notes +dwsync.xml + +# Komodo +*.komodoproject +.komodotools + +# Package management +node_modules/ +vendor/ + +# Folders to ignore +.hg +.svn +.CVS +intermediate +.idea +cache From 16e31f5e61bf432b0363df5475e9956c1ee9b664 Mon Sep 17 00:00:00 2001 From: s3rgiosan Date: Wed, 20 Jan 2016 02:07:48 +0000 Subject: [PATCH 05/11] Code review --- hooks.php | 169 ++++++++++++++++--------------- settings.php | 148 +++++++++++++-------------- wp-email-debug.php | 247 ++++++++++++++++++++++----------------------- 3 files changed, 286 insertions(+), 278 deletions(-) diff --git a/hooks.php b/hooks.php index f0ebe60..663a735 100644 --- a/hooks.php +++ b/hooks.php @@ -1,121 +1,130 @@ - - + + 'WPMDBUG-toolbar', - 'title' => 'Email Debug ON', - 'href' => get_admin_url(NULL, 'options-general.php?page=wpmdbug') - ); - $wp_admin_bar->add_node( $args ); - } + */ +function WPMDBUG_toolbar_link( $wp_admin_bar ) { + if ( WPMailDebugger::doEnforce() ) { + $args = array( + 'id' => 'WPMDBUG-toolbar', + 'title' => 'Email Debug ON', + 'href' => get_admin_url(NULL, 'options-general.php?page=wpmdbug' ) + ); + $wp_admin_bar->add_node( $args ); + } } /** * Add the WP Email Debug settings page to the options menu. + * * @since 1.0.0 * @return void - **/ -function WPMDBUG_settings_menu() -{ - add_options_page('E-Mail Debugger', 'E-Mail Debugger', 'manage_options', 'wpmdbug', 'WPMDBUG_settings_page'); + */ +function WPMDBUG_settings_menu() { + add_options_page( + 'E-Mail Debugger', + 'E-Mail Debugger', + 'manage_options', + 'wpmdbug', + 'WPMDBUG_settings_page' + ); } /** * Show the settings page. + * * @since 1.0.0 * @return void - **/ -function WPMDBUG_settings_page() -{ - require_once WPMDBUG_PATH . 'settings.php'; + */ +function WPMDBUG_settings_page() { + require_once WPMDBUG_PATH . 'settings.php'; } /** * Process posted data from the settings page. + * * @since 1.0.0 * @return void - **/ -function WPMDBUG_handle_settings() -{ - global $WPMDBUGerror; - if (isset($_POST['wpmdbug_submit'])) { - - if (isset($_POST['wpmdbug_enabled'])) { - update_option('WPMDBUG_enabled', TRUE); - } else { - update_option('WPMDBUG_enabled', FALSE); - } - - $newEmail = $_POST['wpmdbug_sendto']; - $newEmail = filter_var($newEmail, FILTER_VALIDATE_EMAIL); - - if ($newEmail === FALSE) { - $WPMDBUGerror = "Invalid Email Address"; - } else { - update_option('WPMDBUG_email', $newEmail); - } - - $debug_scope = $_POST['wpmdbug_scope']; - - if ($debug_scope == 2) { - if (isset($_POST['targetplugins']) && is_array($_POST['targetplugins']) && count($_POST['targetplugins']) > 0) { - update_option('WPMDBUG_plugins', $_POST['targetplugins']); - } else { - $WPMDBUGerror = 'You need to select at least one plugin for the plugin-specific redirect'; - } - } else { - update_option('WPMDBUG_plugins', array()); - } - - } + */ +function WPMDBUG_handle_settings() { + global $WPMDBUGerror; + + if ( isset( $_POST[ 'wpmdbug_submit' ] ) ) { + + if ( isset( $_POST[ 'wpmdbug_enabled' ] ) ) { + update_option( 'WPMDBUG_enabled', true ); + } else { + update_option( 'WPMDBUG_enabled', false ); + } + + $newEmail = $_POST[ 'wpmdbug_sendto' ]; + $newEmail = filter_var( $newEmail, FILTER_VALIDATE_EMAIL ); + + if ( $newEmail === false ) { + $WPMDBUGerror = 'Invalid Email Address'; + } else { + update_option( 'WPMDBUG_email', $newEmail); + } + + $debug_scope = $_POST[ 'wpmdbug_scope' ]; + + if ($debug_scope == 2) { + if ( isset($_POST[ 'targetplugins' ] ) && is_array( $_POST[ 'targetplugins' ] ) && count( $_POST[ 'targetplugins' ] ) > 0 ) { + update_option( 'WPMDBUG_plugins', $_POST[ 'targetplugins' ] ); + } else { + $WPMDBUGerror = 'You need to select at least one plugin for the plugin-specific redirect'; + } + } else { + update_option( 'WPMDBUG_plugins', array() ); + } + + } } /** * Add error messages to admin notices. + * * @since 1.0.0 * @return void - **/ -function WPMDBUG_admin_notices() -{ - global $WPMDBUGerror; - if (!empty($WPMDBUGerror)) { - ?> -
-

-
-

%s

', + $WPMDBUGerror + ); + } + } diff --git a/settings.php b/settings.php index b3704dc..cbe7c2c 100644 --- a/settings.php +++ b/settings.php @@ -1,85 +1,85 @@ 0); +$scopes = get_option( 'WPMDBUG_plugins', array() ); +$scope = ( is_array( $scopes ) && count( $scopes ) > 0 ); -if (!function_exists('get_plugins')) { +if ( ! function_exists( 'get_plugins' ) ) { require_once ABSPATH . 'wp-admin/includes/plugin.php'; } $plugins = get_plugins(); ?>
-

E-Mail Debugger Settings

-
- - - - - - - - - - - - - - - - - - - -
Enable E-Mail Debugging - -
Redirect E-Mails To - -
  - -
- -
Select Plugins - - - - - - $pdata): if (stripos($plugin, 'wp-mail-debugger.php') !== FALSE) {continue;} ?> - - - - - - -
- /> Select All -
/>
-
-

-
+

E-Mail Debugger Settings

+
+ + + + + + + + + + + + + + + + + + + +
Enable E-Mail Debugging + +
Redirect E-Mails To + +
  + +
+ +
Select Plugins + + + + + + $pdata): if ( stripos( $plugin, 'wp-mail-debugger.php' ) !== FALSE ) { continue; } ?> + + + + + + +
+ /> Select All +
/>
+
+

+
diff --git a/wp-email-debug.php b/wp-email-debug.php index 34ace0b..478f345 100644 --- a/wp-email-debug.php +++ b/wp-email-debug.php @@ -8,129 +8,128 @@ * Author URI: https://www.g-force.net */ -if (!defined('ABSPATH')) { - exit(); +if ( ! defined( 'ABSPATH' ) ) { + exit(); } -if (!class_exists('WPMailDebugger')): - - final class WPMailDebugger - { - - private static $instance; - - public static function instantiate() - { - if (!isset(self::$instance) && !self::$instance instanceof WPMailDebugger) { - self::$instance = new WPMailDebugger; - self::$instance->includes(); - } - return self::$instance; - } - - public function includes() - { - - if (!defined('WPMDBUG_PATH')) { - define( 'WPMDBUG_PATH', plugin_dir_path( __FILE__ ) ); - } - - require_once WPMDBUG_PATH . 'hooks.php'; - } - - /** - * Returns true if the debugger is enabled in the plugin's settings. - * @since 1.0.0 - * @return boolean - */ - public static function doEnforce() - { - $enforce = get_option('WPMDBUG_enabled', FALSE); - if ($enforce) { - return TRUE; - } else { - return FALSE; - } - } - - /** - *Returns true if a switch of the email address should be performed, else false. - *@since 1.0.0 - *@return boolean - */ - public static function contextualSwitch() - { - $scope = get_option("WPMDBUG_plugins", array()); - - if (is_array($scope) && count($scope) > 0) { - // A switch depends on selected plugins - $trace = debug_backtrace(); - - foreach ($scope as $sco) { - $plugin_filename = str_replace('\\', '/', WP_PLUGIN_DIR . '/' . $sco); - - foreach ($trace as $call) { - if (isset($call['file'])) { - if ($plugin_filename == str_replace('\\', '/', $call['file']) || stripos($call['file'], dirname($plugin_filename)) !== FALSE) { - return TRUE; - } - } - } - } - return FALSE; - } else { - return TRUE; - } - } - - public static function filterEmail( $args ) - { - $isHtml = isset( $args['html'] ); - $prefix = ''; - $message = $isHtml ? $args['html'] : $args['message']; - - if ( self::contextualSwitch() ) { - - // Prefix message - $prefix = sprintf( - __( 'Originally intended to be sent to %s', 'wp-email-debug' ), - $args['to'] - ); - - if ( ! empty( $prefix ) ) { - $prefix = $prefix . ( $isHtml ? '
' : '\n' ); - } - - // Update email to address - $args['to'] = get_option( 'WPMDBUG_email', get_bloginfo( 'admin_email' ) ); - - // Update email subject - $args['subject'] = sprintf( - __( '[DEBUG] %s', 'wp-email-debug' ), - $args['subject'] - ); - - } - - $message = $prefix . $message; - - if ( $isHtml ) { - $args['html'] = $message; - } - else { - $args['message'] = $message; - } - - return $args; - } - - } - - function WPMDBUG_start() - { - return WPMailDebugger::instantiate(); - } - - WPMDBUG_start(); - -endif; +if ( ! class_exists( 'WPMailDebugger' ) ) { + + final class WPMailDebugger { + + private static $instance; + + public static function instantiate() { + if ( ! isset( self::$instance ) && ! self::$instance instanceof WPMailDebugger ) { + self::$instance = new WPMailDebugger; + self::$instance->includes(); + } + return self::$instance; + } + + public function includes() { + + if ( ! defined( 'WPMDBUG_PATH' ) ) { + define( 'WPMDBUG_PATH', plugin_dir_path( __FILE__ ) ); + } + + require_once WPMDBUG_PATH . 'hooks.php'; + } + + /** + * Returns true if the debugger is enabled in the plugin's settings. + * + * @since 1.0.0 + * @return boolean + */ + public static function doEnforce() { + $enforce = get_option( 'WPMDBUG_enabled', false ); + + if ( $enforce ) { + return true; + } + + return false; + } + + /** + * Returns true if a switch of the email address should be performed, else false. + * + * @since 1.0.0 + * @return boolean + */ + public static function contextualSwitch() { + + $scope = get_option( 'WPMDBUG_plugins', array() ); + + if ( is_array( $scope ) && count( $scope ) > 0 ) { + + // A switch depends on selected plugins + $trace = debug_backtrace(); + + foreach ( $scope as $sco ) { + $plugin_filename = str_replace( '\\', '/', WP_PLUGIN_DIR . '/' . $sco ); + + foreach ( $trace as $call ) { + if ( isset( $call[ 'file' ] ) ) { + if ( $plugin_filename == str_replace( '\\', '/', $call[ 'file' ] ) || stripos( $call[ 'file' ], dirname( $plugin_filename ) ) !== false ) { + return true; + } + } + } + } + + return false; + } + + return true; + } + + public static function filterEmail( $args ) { + $isHtml = isset( $args[ 'html' ] ); + $prefix = ''; + $message = $isHtml ? $args[ 'html' ] : $args[ 'message' ]; + + if ( self::contextualSwitch() ) { + + // Prefix message + $prefix = sprintf( + __( 'Originally intended to be sent to %s', 'wp-email-debug' ), + $args[ 'to' ] + ); + + if ( ! empty( $prefix ) ) { + $prefix = $prefix . ( $isHtml ? '
' : '\n' ); + } + + // Update email to address + $args[ 'to' ] = get_option( 'WPMDBUG_email', get_bloginfo( 'admin_email' ) ); + + // Update email subject + $args[ 'subject' ] = sprintf( + __( '[DEBUG] %s', 'wp-email-debug' ), + $args[ 'subject' ] + ); + + } + + $message = $prefix . $message; + + if ( $isHtml ) { + $args[ 'html' ] = $message; + } + else { + $args[ 'message' ] = $message; + } + + return $args; + } + + } + + function WPMDBUG_start() { + return WPMailDebugger::instantiate(); + } + + WPMDBUG_start(); + +} From 1abd0f4a518d1122660b89e4b957c4260cd9d3b4 Mon Sep 17 00:00:00 2001 From: s3rgiosan Date: Wed, 20 Jan 2016 02:28:43 +0000 Subject: [PATCH 06/11] Check WP_DEBUG env variable for forcing email debug --- hooks.php | 45 +++++++++++++++++++++++---------------------- wp-email-debug.php | 10 ++-------- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/hooks.php b/hooks.php index 663a735..18d7ada 100644 --- a/hooks.php +++ b/hooks.php @@ -79,36 +79,37 @@ function WPMDBUG_settings_page() { function WPMDBUG_handle_settings() { global $WPMDBUGerror; - if ( isset( $_POST[ 'wpmdbug_submit' ] ) ) { + if ( ! isset( $_POST[ 'wpmdbug_submit' ] ) ) { + return; + } - if ( isset( $_POST[ 'wpmdbug_enabled' ] ) ) { - update_option( 'WPMDBUG_enabled', true ); - } else { - update_option( 'WPMDBUG_enabled', false ); - } + if ( isset( $_POST[ 'wpmdbug_enabled' ] ) ) { + update_option( 'WPMDBUG_enabled', true ); + } else { + update_option( 'WPMDBUG_enabled', false ); + } - $newEmail = $_POST[ 'wpmdbug_sendto' ]; - $newEmail = filter_var( $newEmail, FILTER_VALIDATE_EMAIL ); + $newEmail = $_POST[ 'wpmdbug_sendto' ]; + $newEmail = filter_var( $newEmail, FILTER_VALIDATE_EMAIL ); - if ( $newEmail === false ) { - $WPMDBUGerror = 'Invalid Email Address'; - } else { - update_option( 'WPMDBUG_email', $newEmail); - } + if ( $newEmail === false ) { + $WPMDBUGerror = 'Invalid Email Address'; + } else { + update_option( 'WPMDBUG_email', $newEmail); + } - $debug_scope = $_POST[ 'wpmdbug_scope' ]; + $debug_scope = $_POST[ 'wpmdbug_scope' ]; - if ($debug_scope == 2) { - if ( isset($_POST[ 'targetplugins' ] ) && is_array( $_POST[ 'targetplugins' ] ) && count( $_POST[ 'targetplugins' ] ) > 0 ) { - update_option( 'WPMDBUG_plugins', $_POST[ 'targetplugins' ] ); - } else { - $WPMDBUGerror = 'You need to select at least one plugin for the plugin-specific redirect'; - } + if ( $debug_scope === 2 ) { + if ( isset( $_POST[ 'targetplugins' ] ) && is_array( $_POST[ 'targetplugins' ] ) && count( $_POST[ 'targetplugins' ] ) > 0 ) { + update_option( 'WPMDBUG_plugins', $_POST[ 'targetplugins' ] ); } else { - update_option( 'WPMDBUG_plugins', array() ); + $WPMDBUGerror = 'You need to select at least one plugin for the plugin-specific redirect'; } - + } else { + update_option( 'WPMDBUG_plugins', array() ); } + } /** diff --git a/wp-email-debug.php b/wp-email-debug.php index 478f345..db9b0de 100644 --- a/wp-email-debug.php +++ b/wp-email-debug.php @@ -3,7 +3,7 @@ * Plugin Name: WP E-Mail Debug * Plugin URI: https://wordpress.org/plugins/wp-email-debug * Description: Never accidentally send users emails from your testing sites again! - * Version: 1.1.0 + * Version: 1.2.0 * Author: Grant Derepas * Author URI: https://www.g-force.net */ @@ -42,13 +42,7 @@ public function includes() { * @return boolean */ public static function doEnforce() { - $enforce = get_option( 'WPMDBUG_enabled', false ); - - if ( $enforce ) { - return true; - } - - return false; + return apply_filters( 'wp_email_debug_enabled', get_option( 'WPMDBUG_enabled', false ) ); } /** From c66ce606439e7a76eba1e5ddf2c13b8445fb1ca1 Mon Sep 17 00:00:00 2001 From: s3rgiosan Date: Wed, 20 Jan 2016 09:46:36 +0000 Subject: [PATCH 07/11] Revert commit --- .gitattributes | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..0b6acf1 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,22 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# Custom for Visual Studio +*.cs diff=csharp +*.sln merge=union +*.csproj merge=union +*.vbproj merge=union +*.fsproj merge=union +*.dbproj merge=union + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain From cf9cdce3a0fc432d164dc602db83af5f7cef9920 Mon Sep 17 00:00:00 2001 From: s3rgiosan Date: Thu, 21 Jan 2016 18:01:34 +0000 Subject: [PATCH 08/11] Composer update --- composer.json | 3 + composer.lock | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+) create mode 100644 composer.lock diff --git a/composer.json b/composer.json index 04d51e3..83b295c 100644 --- a/composer.json +++ b/composer.json @@ -19,5 +19,8 @@ "require": { "php": ">=5.3", "composer/installers": "~1.0" + }, + "require-dev": { + "dangoodman/composer-for-wordpress": "^1.0" } } diff --git a/composer.lock b/composer.lock new file mode 100644 index 0000000..9d23765 --- /dev/null +++ b/composer.lock @@ -0,0 +1,149 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" + ], + "hash": "56f67fd59652d05b1dc2ab268363b338", + "content-hash": "5c71390b538ba6fa24427b3e25d952ba", + "packages": [ + { + "name": "composer/installers", + "version": "v1.0.22", + "source": { + "type": "git", + "url": "https://github.com/composer/installers.git", + "reference": "bd9b14f094c89c8b5804a4e41edeb7853bb85046" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/installers/zipball/bd9b14f094c89c8b5804a4e41edeb7853bb85046", + "reference": "bd9b14f094c89c8b5804a4e41edeb7853bb85046", + "shasum": "" + }, + "require": { + "composer-plugin-api": "1.0.0" + }, + "replace": { + "roundcube/plugin-installer": "*", + "shama/baton": "*" + }, + "require-dev": { + "composer/composer": "1.0.*@dev", + "phpunit/phpunit": "4.1.*" + }, + "type": "composer-plugin", + "extra": { + "class": "Composer\\Installers\\Plugin", + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "Composer\\Installers\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kyle Robinson Young", + "email": "kyle@dontkry.com", + "homepage": "https://github.com/shama" + } + ], + "description": "A multi-framework Composer library installer", + "homepage": "http://composer.github.com/installers/", + "keywords": [ + "Craft", + "Dolibarr", + "Hurad", + "MODX Evo", + "OXID", + "SMF", + "Thelia", + "WolfCMS", + "agl", + "aimeos", + "annotatecms", + "bitrix", + "cakephp", + "chef", + "codeigniter", + "concrete5", + "croogo", + "dokuwiki", + "drupal", + "elgg", + "fuelphp", + "grav", + "installer", + "joomla", + "kohana", + "laravel", + "lithium", + "magento", + "mako", + "mediawiki", + "modulework", + "moodle", + "phpbb", + "piwik", + "ppi", + "puppet", + "roundcube", + "shopware", + "silverstripe", + "symfony", + "typo3", + "wordpress", + "zend", + "zikula" + ], + "time": "2015-10-29 23:28:48" + } + ], + "packages-dev": [ + { + "name": "dangoodman/composer-for-wordpress", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/dangoodman/composer-for-wordpress.git", + "reference": "f7137989fd4b1be4b004dfd7d7bdec8e8d4c6a79" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dangoodman/composer-for-wordpress/zipball/f7137989fd4b1be4b004dfd7d7bdec8e8d4c6a79", + "reference": "f7137989fd4b1be4b004dfd7d7bdec8e8d4c6a79", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0" + }, + "type": "composer-plugin", + "extra": { + "class": "Dangoodman\\ComposerForWordpress\\ComposerForWordpress" + }, + "autoload": { + "psr-4": { + "Dangoodman\\ComposerForWordpress\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "time": "2016-01-20 15:04:55" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": ">=5.3" + }, + "platform-dev": [] +} From 3e8198c9af2ab31ad368fe051b70a4a61f38d869 Mon Sep 17 00:00:00 2001 From: s3rgiosan Date: Fri, 22 Jan 2016 00:02:21 +0000 Subject: [PATCH 09/11] Composer update --- composer.json | 4 -- composer.lock | 109 ++------------------------------------------------ 2 files changed, 4 insertions(+), 109 deletions(-) diff --git a/composer.json b/composer.json index 83b295c..1b9a1eb 100644 --- a/composer.json +++ b/composer.json @@ -16,10 +16,6 @@ "support": { "issues": "https://github.com/GForceWeb/WP-Email-Debug/issues" }, - "require": { - "php": ">=5.3", - "composer/installers": "~1.0" - }, "require-dev": { "dangoodman/composer-for-wordpress": "^1.0" } diff --git a/composer.lock b/composer.lock index 9d23765..82a67d6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,108 +4,9 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "56f67fd59652d05b1dc2ab268363b338", - "content-hash": "5c71390b538ba6fa24427b3e25d952ba", - "packages": [ - { - "name": "composer/installers", - "version": "v1.0.22", - "source": { - "type": "git", - "url": "https://github.com/composer/installers.git", - "reference": "bd9b14f094c89c8b5804a4e41edeb7853bb85046" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/bd9b14f094c89c8b5804a4e41edeb7853bb85046", - "reference": "bd9b14f094c89c8b5804a4e41edeb7853bb85046", - "shasum": "" - }, - "require": { - "composer-plugin-api": "1.0.0" - }, - "replace": { - "roundcube/plugin-installer": "*", - "shama/baton": "*" - }, - "require-dev": { - "composer/composer": "1.0.*@dev", - "phpunit/phpunit": "4.1.*" - }, - "type": "composer-plugin", - "extra": { - "class": "Composer\\Installers\\Plugin", - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-0": { - "Composer\\Installers\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kyle Robinson Young", - "email": "kyle@dontkry.com", - "homepage": "https://github.com/shama" - } - ], - "description": "A multi-framework Composer library installer", - "homepage": "http://composer.github.com/installers/", - "keywords": [ - "Craft", - "Dolibarr", - "Hurad", - "MODX Evo", - "OXID", - "SMF", - "Thelia", - "WolfCMS", - "agl", - "aimeos", - "annotatecms", - "bitrix", - "cakephp", - "chef", - "codeigniter", - "concrete5", - "croogo", - "dokuwiki", - "drupal", - "elgg", - "fuelphp", - "grav", - "installer", - "joomla", - "kohana", - "laravel", - "lithium", - "magento", - "mako", - "mediawiki", - "modulework", - "moodle", - "phpbb", - "piwik", - "ppi", - "puppet", - "roundcube", - "shopware", - "silverstripe", - "symfony", - "typo3", - "wordpress", - "zend", - "zikula" - ], - "time": "2015-10-29 23:28:48" - } - ], + "hash": "a1a311ed33bc88c0d1a42a7fd466fcda", + "content-hash": "21f0d421b8975c98c259c00548a0a290", + "packages": [], "packages-dev": [ { "name": "dangoodman/composer-for-wordpress", @@ -142,8 +43,6 @@ "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, - "platform": { - "php": ">=5.3" - }, + "platform": [], "platform-dev": [] } From a78abf69433d2af43e51b59ad0b17dc9775e7104 Mon Sep 17 00:00:00 2001 From: s3rgiosan Date: Sat, 19 Mar 2016 16:19:22 +0000 Subject: [PATCH 10/11] Updated gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 5930a39..38f381e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +# Builds +/build +/docs + # Numerous always-ignore extensions *.diff *.err From 1ead010487b1d74423853d290881f842cd457d6c Mon Sep 17 00:00:00 2001 From: s3rgiosan Date: Sat, 19 Mar 2016 16:21:10 +0000 Subject: [PATCH 11/11] Rollback to official plugin version --- wp-email-debug.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-email-debug.php b/wp-email-debug.php index db9b0de..61f3acb 100644 --- a/wp-email-debug.php +++ b/wp-email-debug.php @@ -3,7 +3,7 @@ * Plugin Name: WP E-Mail Debug * Plugin URI: https://wordpress.org/plugins/wp-email-debug * Description: Never accidentally send users emails from your testing sites again! - * Version: 1.2.0 + * Version: 1.1.0 * Author: Grant Derepas * Author URI: https://www.g-force.net */