← All changes | classes/controllers/FrmSMTPController.php +16 -9 6.27 → trunk View file →

		@@ -147,8 +147,9 @@
147	147	'width' => 90,
148	148	);
149	149
150	150	// Heading section.
	151	+ // phpcs:disable Generic.WhiteSpace.ScopeIndent
151	152	?>
152	153	<section class="top">
153	154	<div class="frm-smtp-logos">
154	155	<?php
		@@ -167,8 +168,9 @@
167	168	<h1><?php esc_html_e( 'Making Email Deliverability Easy for WordPress', 'formidable' ); ?></h1>
168	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 ?>
169	170	</section>
170	171	<?php
	172	+ // phpcs:enable Generic.WhiteSpace.ScopeIndent
171	173	}
172	174
173	175	/**
174	176	* Generate and output screenshot section HTML.
		@@ -380,11 +382,10 @@
380	382	if ( ! $this->is_smtp_activated() ) {
381	383	return false;
382	384	}
383	385
384		- $phpmailer = $this->get_phpmailer();
385	386	$mailer = WPMailSMTP\Options::init()->get( 'mail', 'mailer' );
386		- $is_mailer_complete = wp_mail_smtp()->get_providers()->get_mailer( $mailer, $phpmailer )->is_mailer_complete();
	387	+ $is_mailer_complete = wp_mail_smtp()->get_providers()->get_mailer( $mailer, $this->get_phpmailer() )->is_mailer_complete();
387	388
388	389	return 'mail' !== $mailer && $is_mailer_complete;
389	390	}
390	391
		@@ -408,17 +409,19 @@
408	409	*/
409	410	protected function get_phpmailer() {
410	411	global $phpmailer;
411	412
412		- if ( ! is_object( $phpmailer ) || ! is_a( $phpmailer, 'PHPMailer' ) ) {
413		- if ( is_callable( array( wp_mail_smtp(), 'generate_mail_catcher' ) ) ) {
414		- $phpmailer = wp_mail_smtp()->generate_mail_catcher( true ); // phpcs:ignore
415		- } else {
416		- require_once ABSPATH . WPINC . '/class-phpmailer.php';
417		- $phpmailer = new PHPMailer( true ); // phpcs:ignore
418		- }
	413	+ if ( is_object( $phpmailer ) && is_a( $phpmailer, 'PHPMailer' ) ) {
	414	+ return $phpmailer;
419	415	}
420	416
	417	+ if ( is_callable( array( wp_mail_smtp(), 'generate_mail_catcher' ) ) ) {
	418	+ $phpmailer = wp_mail_smtp()->generate_mail_catcher( true ); // phpcs:ignore
	419	+ } else {
	420	+ require_once ABSPATH . WPINC . '/class-phpmailer.php';
	421	+ $phpmailer = new PHPMailer( true ); // phpcs:ignore
	422	+ }
	423	+
421	424	return $phpmailer;
422	425	}
423	426
424	427	/**
		@@ -438,11 +441,13 @@
438	441	/**
439	442	* @return void
440	443	*/
441	444	private function stmp_logo() {
	445	+ // phpcs:disable Generic.WhiteSpace.ScopeIndent
442	446	?>
443	447	<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	448	<?php
	449	+ // phpcs:enable Generic.WhiteSpace.ScopeIndent
445	450	}
446	451
447	452	/**
448	453	* @return void
		@@ -447,8 +452,9 @@
447	452	/**
448	453	* @return void
449	454	*/
450	455	private function css() {
	456	+ // phpcs:disable Generic.WhiteSpace.ScopeIndent
451	457	?>
452	458	<style>
453	459	#frm-admin-smtp *, #frm-admin-smtp *::before, #frm-admin-smtpp *::after {
454	460	box-sizing: border-box;
		@@ -556,6 +562,7 @@
556	562	cursor: default;
557	563	}
558	564	</style>
559	565	<?php
	566	+ // phpcs:enable Generic.WhiteSpace.ScopeIndent
560	567	}
561	568	}