← All changes | classes/controllers/FrmSMTPController.php +24 -31 6.28 → 6.19 View file →

		@@ -47,12 +47,12 @@
47	47	*
48	48	* @return void
49	49	*/
50	50	public static function load_hooks() {
	51	+
51	52	add_filter( 'wp_mail_smtp_is_white_labeled', '__return_true' );
52	53
53	54	$self = new self();
54		-
55	55	if ( wp_doing_ajax() ) {
56	56	add_action( 'wp_ajax_frm_smtp_page_check_plugin_status', array( $self, 'ajax_check_plugin_status' ) );
57	57	}
58	58
		@@ -73,15 +73,14 @@
73	73
74	74	/**
75	75	* Customize the upgrade link.
76	76	*
77		- * @param string $link
78		- *
79	77	* @return string
80	78	*/
81	79	public function link( $link ) {
82	80	$new_link = 'formidableforms.com/go-wp-mail-smtp/?urllink=wpmailsmtp%2Ecom%2Flite%2Dupgrade&';
83		- return str_replace( 'wpmailsmtp.com/lite-upgrade/?', $new_link, $link );
	81	+ $link = str_replace( 'wpmailsmtp.com/lite-upgrade/?', $new_link, $link );
	82	+ return $link;
84	83	}
85	84
86	85	/**
87	86	* Don't nag people to install WPForms
		@@ -86,17 +85,13 @@
86	85	/**
87	86	* Don't nag people to install WPForms
88	87	*
89	88	* @since 4.04.04
90		- *
91		- * @param array $upsell
92		- *
93		- * @return array
94	89	*/
95	90	public static function remove_wpforms_nag( $upsell ) {
96	91	if ( is_array( $upsell ) ) {
97	92	foreach ( $upsell as $k => $plugin ) {
98		- if ( str_contains( $plugin['slug'], 'wpforms' ) ) {
	93	+ if ( strpos( $plugin['slug'], 'wpforms' ) !== false ) {
99	94	unset( $upsell[ $k ] );
100	95	}
101	96	}
102	97	}
		@@ -147,9 +142,8 @@
147	142	'width' => 90,
148	143	);
149	144
150	145	// Heading section.
151		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
152	146	?>
153	147	<section class="top">
154	148	<div class="frm-smtp-logos">
155	149	<?php
		@@ -165,12 +159,11 @@
165	159	$this->stmp_logo();
166	160	?>
167	161	</div>
168	162	<h1><?php esc_html_e( 'Making Email Deliverability Easy for WordPress', 'formidable' ); ?></h1>
169		- <p><?php esc_html_e( 'WP Mail SMTP allows you to easily set up WordPress to use a trusted provider to reliably send emails, including form notifications.', 'formidable' ); ?></p><?php // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong ?>
	163	+ <p><?php esc_html_e( 'WP Mail SMTP allows you to easily set up WordPress to use a trusted provider to reliably send emails, including form notifications.', 'formidable' ); ?></p>
170	164	</section>
171	165	<?php
172		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
173	166	}
174	167
175	168	/**
176	169	* Generate and output screenshot section HTML.
		@@ -179,8 +172,9 @@
179	172	*
180	173	* @return void
181	174	*/
182	175	protected function output_section_screenshot() {
	176	+
183	177	printf(
184	178	'<section class="screenshot">
185	179	<div class="cont">
186	180	<img src="%1$s" alt="%2$s"/>
		@@ -193,9 +187,9 @@
193	187	</ul>
194	188	</section>',
195	189	esc_url( FrmAppHelper::plugin_url() . '/images/smtp-screenshot-tnail.png' ),
196	190	esc_attr__( 'WP Mail SMTP screenshot', 'formidable' ),
197		- '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 492 492" width="14" height="14"><path d="M484 227L306 49a27 27 0 00-38 0l-16 16a27 27 0 000 38l104 105H27c-15 0-27 11-27 26v23c0 15 12 27 27 27h330L252 389a27 27 0 000 38l16 16a27 27 0 0038 0l178-178a27 27 0 000-38z" fill="#5bbfa5"/></svg> &nbsp;', // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
	191	+ '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 492 492" width="14" height="14"><path d="M484 227L306 49a27 27 0 00-38 0l-16 16a27 27 0 000 38l104 105H27c-15 0-27 11-27 26v23c0 15 12 27 27 27h330L252 389a27 27 0 000 38l16 16a27 27 0 0038 0l178-178a27 27 0 000-38z" fill="#5bbfa5"/></svg> &nbsp;',
198	192	esc_html__( 'Over 1,000,000 websites use WP Mail SMTP.', 'formidable' ),
199	193	esc_html__( 'Send emails authenticated via trusted parties.', 'formidable' ),
200	194	esc_html__( 'Transactional Mailers: Pepipost, SendinBlue, Mailgun, SendGrid, Amazon SES.', 'formidable' ),
201	195	esc_html__( 'Web Mailers: Gmail, G Suite, Office 365, Outlook.com.', 'formidable' )
		@@ -209,11 +203,12 @@
209	203	*
210	204	* @return void
211	205	*/
212	206	protected function output_section_step_install() {
	207	+
213	208	$step = $this->get_data_step_install();
214	209
215		- if ( ! $step ) {
	210	+ if ( empty( $step ) ) {
216	211	return;
217	212	}
218	213
219	214	$icon = FrmAppHelper::icon_by_class(
		@@ -257,11 +252,12 @@
257	252	*
258	253	* @return void
259	254	*/
260	255	protected function output_section_step_setup() {
	256	+
261	257	$step = $this->get_data_step_setup();
262	258
263		- if ( ! $step ) {
	259	+ if ( empty( $step ) ) {
264	260	return;
265	261	}
266	262
267	263	$icon = FrmAppHelper::icon_by_class(
		@@ -302,8 +298,9 @@
302	298	*
303	299	* @return array Step data.
304	300	*/
305	301	protected function get_data_step_install() {
	302	+
306	303	$lite_plugin = new FrmInstallPlugin( array( 'plugin_file' => $this->config['lite_plugin'] ) );
307	304	$pro_plugin = new FrmInstallPlugin( array( 'plugin_file' => $this->config['pro_plugin'] ) );
308	305
309	306	$this->output_data['plugin_installed'] = $lite_plugin->is_installed();
		@@ -316,9 +313,8 @@
316	313	'button_action' => '',
317	314	);
318	315
319	316	$is_installed = $this->output_data['plugin_installed'] || $this->output_data['pro_plugin_installed'];
320		-
321	317	if ( ! $is_installed ) {
322	318	// Return the download url.
323	319	$step['button_text'] = __( 'Install WP Mail SMTP', 'formidable' );
324	320	$step['button_class'] = 'frm-install-addon';
		@@ -352,8 +348,9 @@
352	348	*
353	349	* @return array Step data.
354	350	*/
355	351	protected function get_data_step_setup() {
	352	+
356	353	$step = array();
357	354
358	355	$step['icon'] = 'frm_step2_icon';
359	356	$step['section_class'] = $this->output_data['plugin_activated'] ? '' : 'grey';
		@@ -378,13 +375,15 @@
378	375	*
379	376	* @return bool True if some mailer is selected and configured properly.
380	377	*/
381	378	protected function is_smtp_configured() {
	379	+
382	380	if ( ! $this->is_smtp_activated() ) {
383	381	return false;
384	382	}
385	383
386		- $phpmailer = $this->get_phpmailer();
	384	+ $phpmailer = $this->get_phpmailer();
	385	+
387	386	$mailer = WPMailSMTP\Options::init()->get( 'mail', 'mailer' );
388	387	$is_mailer_complete = wp_mail_smtp()->get_providers()->get_mailer( $mailer, $phpmailer )->is_mailer_complete();
389	388
390	389	return 'mail' !== $mailer && $is_mailer_complete;
		@@ -410,19 +409,17 @@
410	409	*/
411	410	protected function get_phpmailer() {
412	411	global $phpmailer;
413	412
414		- if ( is_object( $phpmailer ) && is_a( $phpmailer, 'PHPMailer' ) ) {
415		- return $phpmailer;
	413	+ if ( ! is_object( $phpmailer ) || ! is_a( $phpmailer, 'PHPMailer' ) ) {
	414	+ if ( is_callable( array( wp_mail_smtp(), 'generate_mail_catcher' ) ) ) {
	415	+ $phpmailer = wp_mail_smtp()->generate_mail_catcher( true ); // phpcs:ignore
	416	+ } else {
	417	+ require_once ABSPATH . WPINC . '/class-phpmailer.php';
	418	+ $phpmailer = new PHPMailer( true ); // phpcs:ignore
	419	+ }
416	420	}
417	421
418		- if ( is_callable( array( wp_mail_smtp(), 'generate_mail_catcher' ) ) ) {
419		- $phpmailer = wp_mail_smtp()->generate_mail_catcher( true ); // phpcs:ignore
420		- } else {
421		- require_once ABSPATH . WPINC . '/class-phpmailer.php';
422		- $phpmailer = new PHPMailer( true ); // phpcs:ignore
423		- }
424		-
425	422	return $phpmailer;
426	423	}
427	424
428	425	/**
		@@ -442,13 +439,11 @@
442	439	/**
443	440	* @return void
444	441	*/
445	442	private function stmp_logo() {
446		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
447	443	?>
448		- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60" height="90" width="90"><defs><style>.cls-11,.cls-12{fill-rule:evenodd}.cls-4{fill:none}.cls-11{fill:#86a196}.cls-12{fill:#fff}</style></defs><path class="cls-4" d="M-6.3 0h60v60h-60z"/><path d="M16.7 8.1a15.4 15.4 0 00-8 10.2 23.5 23.5 0 1030 0 15.4 15.4 0 00-9.3-10.8 3.4 3.4 0 00-2.1-2.7A4.6 4.6 0 0018.4 3a24.4 24.4 0 00-1.7 5z" fill="#395360" fill-rule="evenodd"/><path fill="#fbaa6f" d="M18 26h12v14H18z"/><path d="M25.9 33.2l-.1-.1a1.4 1.4 0 111.6-2.3 1.9 1.9 0 00-1.2.8 1.9 1.9 0 00-.3 1.6zm-4.5 0a1.8 1.8 0 00-.4-1.6 2 2 0 00-1.2-.8 1.4 1.4 0 011.6 2.3zm7.2-3.2h.5l-1 4.8-2.2 6.5h-4.3l-3.2-5.4 1.1-3.2 2.1 2.7c.6.5 2.7.5 3.8-.6a26.2 26.2 0 003.2-4.8z" fill="#dc7f3c" fill-rule="evenodd"/><path d="M9.7 29H15v-9h-4a13 13 0 017.4-10q1.2-5 2.8-6.8l.1-.1.1-.1a2.3 2.3 0 011.1-.5 2.3 2.3 0 012.2 3.8 1.6 1.6 0 01-.4.3A15 15 0 0023 8a5 5 0 013-1.5 1.4 1.4 0 01.7.2 1.3 1.3 0 01.5 1.8 1.3 1.3 0 01-.6.6 13 13 0 0110.1 11l.1.8H33v8h4.8l1.8 13.4q-6.3 4-15.8 4T8 42.4zM25 38.4q3.8-6.4 3.8-7.6c0-2.2-3.2-4-4.8-4s-4.9 1.7-4.9 4q0 1.2 3.8 7.6a1.2 1.2 0 001 .6 1 1 0 001-.6z" fill="#bdcfc8" fill-rule="evenodd"/><path class="cls-4" d="M19 31h9.6L27 47.2h-6.4l-1.6-16z"/><path d="M39.8 48.8a20 20 0 01-32 0l.8-6a2.7 2.7 0 001 .1 2.8 2.8 0 002.8-2.4v1.2a2.8 2.8 0 005.6 0v1.6a2.9 2.9 0 005.7 0 2.8 2.8 0 005.7 0v-1.6a2.8 2.8 0 105.7 0v-1.2A2.8 2.8 0 0038 43a2.9 2.9 0 001-.2l.8 6z" fill="#809eb0" fill-rule="evenodd"/><path d="M8.3 44.6l.3-1.8a2.7 2.7 0 001 .2 2.8 2.8 0 002.8-2.5v1.2a2.8 2.8 0 005.7 0v1.7a2.9 2.9 0 005.6 0 2.8 2.8 0 005.7 0v-1.7a2.8 2.8 0 105.7 0v-1.2A2.8 2.8 0 0038 43a2.9 2.9 0 001-.2l.3 2a2.9 2.9 0 01-4.1-2.2v1.2a2.8 2.8 0 11-5.7 0v1.6a2.8 2.8 0 01-5.7 0 2.9 2.9 0 01-5.7 0v-1.7a2.8 2.8 0 01-5.7 0v-1.2A2.8 2.8 0 019.6 45a2.9 2.9 0 01-1.3-.3z" fill="#738e9e" fill-rule="evenodd"/><path class="cls-11" d="M37.8 22.4c-1-2.9-3-4.7-4.7-4.5-2.2.2-2.8 3.7-2.3 8s1.7 7.5 3.9 7.3 4-3.9 3.6-8c0 1.2-.5 2.3-1.3 2.4-1.2 0-1.5-1.2-1.6-2.9s-.2-3 1-3a1.5 1.5 0 011.4.7z"/><path class="cls-12" d="M37 21.8c-.6-1.3-1.5-2-2.4-1.9-1.5.1-1.9 2.6-1.6 5.5s1.2 5.1 2.7 5c1.1-.2 2-1.5 2.2-3.4a1.2 1.2 0 01-1 .6c-1 0-1.4-1.2-1.5-2.9s-.1-3 1-3a1.6 1.6 0 01.6 0z"/><path class="cls-11" d="M9.6 22.4c1-2.9 3-4.7 4.7-4.5 2.2.2 2.8 3.7 2.3 8s-1.7 7.5-3.9 7.3-4-3.9-3.7-8c.1 1.2.5 2.3 1.4 2.4 1.1 0 1.5-1.2 1.6-2.9s.1-3-1-3a1.5 1.5 0 00-1.4.7z"/><path class="cls-12" d="M10.4 21.8c.6-1.3 1.5-2 2.4-1.9 1.5.1 1.8 2.6 1.5 5.5s-1.1 5.1-2.6 5c-1.1-.2-2-1.5-2.2-3.4a1.2 1.2 0 00.9.6c1.1 0 1.4-1.2 1.6-2.9s.1-3-1-3a1.7 1.7 0 00-.7 0z"/><path d="M19 28.6a5.3 5.3 0 010-.7c0-2.4 1.2-5.2 4.9-5.2s4.8 2.8 4.8 5.2a4.4 4.4 0 010 1c-.9-1.3-2.4-2.1-4.9-2.1-2.4 0-3.9.7-4.8 1.8z" fill="#f4f8ff" fill-rule="evenodd"/><path class="cls-11" d="M26.5 9.2L23.3 9l4-1.2a1.4 1.4 0 01-.8 1.4zm-3.5-1l-1.3 1a16.8 16.8 0 002-3.8 6.6 6.6 0 00.3-2.7A2.4 2.4 0 0125.2 5a2.4 2.4 0 01-.7 1.5A15 15 0 0023 8.1z"/></svg><?php // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong ?>
	444	+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60" height="90" width="90"><defs><style>.cls-11,.cls-12{fill-rule:evenodd}.cls-4{fill:none}.cls-11{fill:#86a196}.cls-12{fill:#fff}</style></defs><path class="cls-4" d="M-6.3 0h60v60h-60z"/><path d="M16.7 8.1a15.4 15.4 0 00-8 10.2 23.5 23.5 0 1030 0 15.4 15.4 0 00-9.3-10.8 3.4 3.4 0 00-2.1-2.7A4.6 4.6 0 0018.4 3a24.4 24.4 0 00-1.7 5z" fill="#395360" fill-rule="evenodd"/><path fill="#fbaa6f" d="M18 26h12v14H18z"/><path d="M25.9 33.2l-.1-.1a1.4 1.4 0 111.6-2.3 1.9 1.9 0 00-1.2.8 1.9 1.9 0 00-.3 1.6zm-4.5 0a1.8 1.8 0 00-.4-1.6 2 2 0 00-1.2-.8 1.4 1.4 0 011.6 2.3zm7.2-3.2h.5l-1 4.8-2.2 6.5h-4.3l-3.2-5.4 1.1-3.2 2.1 2.7c.6.5 2.7.5 3.8-.6a26.2 26.2 0 003.2-4.8z" fill="#dc7f3c" fill-rule="evenodd"/><path d="M9.7 29H15v-9h-4a13 13 0 017.4-10q1.2-5 2.8-6.8l.1-.1.1-.1a2.3 2.3 0 011.1-.5 2.3 2.3 0 012.2 3.8 1.6 1.6 0 01-.4.3A15 15 0 0023 8a5 5 0 013-1.5 1.4 1.4 0 01.7.2 1.3 1.3 0 01.5 1.8 1.3 1.3 0 01-.6.6 13 13 0 0110.1 11l.1.8H33v8h4.8l1.8 13.4q-6.3 4-15.8 4T8 42.4zM25 38.4q3.8-6.4 3.8-7.6c0-2.2-3.2-4-4.8-4s-4.9 1.7-4.9 4q0 1.2 3.8 7.6a1.2 1.2 0 001 .6 1 1 0 001-.6z" fill="#bdcfc8" fill-rule="evenodd"/><path class="cls-4" d="M19 31h9.6L27 47.2h-6.4l-1.6-16z"/><path d="M39.8 48.8a20 20 0 01-32 0l.8-6a2.7 2.7 0 001 .1 2.8 2.8 0 002.8-2.4v1.2a2.8 2.8 0 005.6 0v1.6a2.9 2.9 0 005.7 0 2.8 2.8 0 005.7 0v-1.6a2.8 2.8 0 105.7 0v-1.2A2.8 2.8 0 0038 43a2.9 2.9 0 001-.2l.8 6z" fill="#809eb0" fill-rule="evenodd"/><path d="M8.3 44.6l.3-1.8a2.7 2.7 0 001 .2 2.8 2.8 0 002.8-2.5v1.2a2.8 2.8 0 005.7 0v1.7a2.9 2.9 0 005.6 0 2.8 2.8 0 005.7 0v-1.7a2.8 2.8 0 105.7 0v-1.2A2.8 2.8 0 0038 43a2.9 2.9 0 001-.2l.3 2a2.9 2.9 0 01-4.1-2.2v1.2a2.8 2.8 0 11-5.7 0v1.6a2.8 2.8 0 01-5.7 0 2.9 2.9 0 01-5.7 0v-1.7a2.8 2.8 0 01-5.7 0v-1.2A2.8 2.8 0 019.6 45a2.9 2.9 0 01-1.3-.3z" fill="#738e9e" fill-rule="evenodd"/><path class="cls-11" d="M37.8 22.4c-1-2.9-3-4.7-4.7-4.5-2.2.2-2.8 3.7-2.3 8s1.7 7.5 3.9 7.3 4-3.9 3.6-8c0 1.2-.5 2.3-1.3 2.4-1.2 0-1.5-1.2-1.6-2.9s-.2-3 1-3a1.5 1.5 0 011.4.7z"/><path class="cls-12" d="M37 21.8c-.6-1.3-1.5-2-2.4-1.9-1.5.1-1.9 2.6-1.6 5.5s1.2 5.1 2.7 5c1.1-.2 2-1.5 2.2-3.4a1.2 1.2 0 01-1 .6c-1 0-1.4-1.2-1.5-2.9s-.1-3 1-3a1.6 1.6 0 01.6 0z"/><path class="cls-11" d="M9.6 22.4c1-2.9 3-4.7 4.7-4.5 2.2.2 2.8 3.7 2.3 8s-1.7 7.5-3.9 7.3-4-3.9-3.7-8c.1 1.2.5 2.3 1.4 2.4 1.1 0 1.5-1.2 1.6-2.9s.1-3-1-3a1.5 1.5 0 00-1.4.7z"/><path class="cls-12" d="M10.4 21.8c.6-1.3 1.5-2 2.4-1.9 1.5.1 1.8 2.6 1.5 5.5s-1.1 5.1-2.6 5c-1.1-.2-2-1.5-2.2-3.4a1.2 1.2 0 00.9.6c1.1 0 1.4-1.2 1.6-2.9s.1-3-1-3a1.7 1.7 0 00-.7 0z"/><path d="M19 28.6a5.3 5.3 0 010-.7c0-2.4 1.2-5.2 4.9-5.2s4.8 2.8 4.8 5.2a4.4 4.4 0 010 1c-.9-1.3-2.4-2.1-4.9-2.1-2.4 0-3.9.7-4.8 1.8z" fill="#f4f8ff" fill-rule="evenodd"/><path class="cls-11" d="M26.5 9.2L23.3 9l4-1.2a1.4 1.4 0 01-.8 1.4zm-3.5-1l-1.3 1a16.8 16.8 0 002-3.8 6.6 6.6 0 00.3-2.7A2.4 2.4 0 0125.2 5a2.4 2.4 0 01-.7 1.5A15 15 0 0023 8.1z"/></svg>
449	445	<?php
450		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
451	446	}
452	447
453	448	/**
454	449	* @return void
		@@ -453,9 +448,8 @@
453	448	/**
454	449	* @return void
455	450	*/
456	451	private function css() {
457		- // phpcs:disable Generic.WhiteSpace.ScopeIndent
458	452	?>
459	453	<style>
460	454	#frm-admin-smtp *, #frm-admin-smtp *::before, #frm-admin-smtpp *::after {
461	455	box-sizing: border-box;
		@@ -563,7 +557,6 @@
563	557	cursor: default;
564	558	}
565	559	</style>
566	560	<?php
567		- // phpcs:enable Generic.WhiteSpace.ScopeIndent
568	561	}
569	562	}