pryley / site-reviews

plugin/Modules/Email.php

Indentation +201 added lines, -201 removed lines

@@ -9,205 +9,205 @@
 
 class Email
 {
-    /**
-     * @var array
-     */
-    public $attachments;
-
-    /**
-     * @var array
-     */
-    public $email;
-
-    /**
-     * @var array
-     */
-    public $headers;
-
-    /**
-     * @var string
-     */
-    public $message;
-
-    /**
-     * @var string
-     */
-    public $subject;
-
-    /**
-     * @var string|array
-     */
-    public $to;
-
-    /**
-     * @return Email
-     */
-    public function compose(array $email)
-    {
-        $this->normalize($email);
-        $this->attachments = $this->email['attachments'];
-        $this->headers = $this->buildHeaders();
-        $this->message = $this->buildHtmlMessage();
-        $this->subject = $this->email['subject'];
-        $this->to = $this->email['to'];
-        add_action('phpmailer_init', [$this, 'buildPlainTextMessage']);
-        return $this;
-    }
-
-    /**
-     * @param string $format
-     * @return string|null
-     */
-    public function read($format = '')
-    {
-        if ('plaintext' == $format) {
-            $message = $this->stripHtmlTags($this->message);
-            return apply_filters('site-reviews/email/message', $message, 'text', $this);
-        }
-        return $this->message;
-    }
-
-    /**
-     * @return void|bool
-     */
-    public function send()
-    {
-        if (!$this->message || !$this->subject || !$this->to) {
-            return;
-        }
-        add_action('wp_mail_failed', [$this, 'logMailError']);
-        $sent = wp_mail(
-            $this->to,
-            $this->subject,
-            $this->message,
-            $this->headers,
-            $this->attachments
-        );
-        remove_action('wp_mail_failed', [$this, 'logMailError']);
-        $this->reset();
-        return $sent;
-    }
-
-    /**
-     * @return void
-     * @action phpmailer_init
-     */
-    public function buildPlainTextMessage(PHPMailer $phpmailer)
-    {
-        if (empty($this->email)) {
-            return;
-        }
-        if ('text/plain' === $phpmailer->ContentType || !empty($phpmailer->AltBody)) {
-            return;
-        }
-        $message = $this->stripHtmlTags($phpmailer->Body);
-        $phpmailer->AltBody = apply_filters('site-reviews/email/message', $message, 'text', $this);
-    }
-
-    /**
-     * @return array
-     */
-    protected function buildHeaders()
-    {
-        $allowed = [
-            'bcc', 'cc', 'from', 'reply-to',
-        ];
-        $headers = array_intersect_key($this->email, array_flip($allowed));
-        $headers = array_filter($headers);
-        foreach ($headers as $key => $value) {
-            unset($headers[$key]);
-            $headers[] = $key.': '.$value;
-        }
-        $headers[] = 'Content-Type: text/html';
-        return apply_filters('site-reviews/email/headers', $headers, $this);
-    }
-
-    /**
-     * @return string
-     */
-    protected function buildHtmlMessage()
-    {
-        $template = trim(glsr(OptionManager::class)->get('settings.general.notification_message'));
-        if (!empty($template)) {
-            $message = glsr(Template::class)->interpolate(
-                $template, 
-                ['context' => $this->email['template-tags']], 
-                $this->email['template']
-            );
-        } elseif ($this->email['template']) {
-            $message = glsr(Template::class)->build('templates/'.$this->email['template'], [
-                'context' => $this->email['template-tags'],
-            ]);
-        }
-        if (!isset($message)) {
-            $message = $this->email['message'];
-        }
-        $message = $this->email['before'].$message.$this->email['after'];
-        $message = strip_shortcodes($message);
-        $message = wptexturize($message);
-        $message = wpautop($message);
-        $message = str_replace('<> ', '', $message);
-        $message = str_replace(']]>', ']]>', $message);
-        $message = glsr(Template::class)->build('partials/email/index', [
-            'context' => ['message' => $message],
-        ]);
-        return apply_filters('site-reviews/email/message', stripslashes($message), 'html', $this);
-    }
-
-    /**
-     * @param \WP_Error $error
-     * @return void
-     */
-    protected function logMailError($error)
-    {
-        glsr_log()->error('Email was not sent (wp_mail failed)')
-            ->debug($this)
-            ->debug($error);
-    }
-
-    /**
-     * @return void
-     */
-    protected function normalize(array $email = [])
-    {
-        $email = shortcode_atts(glsr(EmailDefaults::class)->defaults(), $email);
-        if (empty($email['reply-to'])) {
-            $email['reply-to'] = $email['from'];
-        }
-        $this->email = apply_filters('site-reviews/email/compose', $email, $this);
-    }
-
-    /**
-     * @return void
-     */
-    protected function reset()
-    {
-        $this->attachments = [];
-        $this->email = [];
-        $this->headers = [];
-        $this->message = null;
-        $this->subject = null;
-        $this->to = null;
-    }
-
-    /**
-     * @return string
-     */
-    protected function stripHtmlTags($string)
-    {
-        // remove invisible elements
-        $string = preg_replace('@<(embed|head|noembed|noscript|object|script|style)[^>]*?>.*?</\\1>@siu', '', $string);
-        // replace certain elements with a line-break
-        $string = preg_replace('@</(div|h[1-9]|p|pre|tr)@iu', "\r\n\$0", $string);
-        // replace other elements with a space
-        $string = preg_replace('@</(td|th)@iu', ' $0', $string);
-        // add a placeholder for plain-text bullets to list elements
-        $string = preg_replace('@<(li)[^>]*?>@siu', '$0-o-^-o-', $string);
-        // strip all remaining HTML tags
-        $string = wp_strip_all_tags($string);
-        $string = wp_specialchars_decode($string, ENT_QUOTES);
-        $string = preg_replace('/\v(?:[\v\h]+){2,}/', "\r\n\r\n", $string);
-        $string = str_replace('-o-^-o-', ' - ', $string);
-        return html_entity_decode($string, ENT_QUOTES, 'UTF-8');
-    }
+	/**
+	 * @var array
+	 */
+	public $attachments;
+
+	/**
+	 * @var array
+	 */
+	public $email;
+
+	/**
+	 * @var array
+	 */
+	public $headers;
+
+	/**
+	 * @var string
+	 */
+	public $message;
+
+	/**
+	 * @var string
+	 */
+	public $subject;
+
+	/**
+	 * @var string|array
+	 */
+	public $to;
+
+	/**
+	 * @return Email
+	 */
+	public function compose(array $email)
+	{
+		$this->normalize($email);
+		$this->attachments = $this->email['attachments'];
+		$this->headers = $this->buildHeaders();
+		$this->message = $this->buildHtmlMessage();
+		$this->subject = $this->email['subject'];
+		$this->to = $this->email['to'];
+		add_action('phpmailer_init', [$this, 'buildPlainTextMessage']);
+		return $this;
+	}
+
+	/**
+	 * @param string $format
+	 * @return string|null
+	 */
+	public function read($format = '')
+	{
+		if ('plaintext' == $format) {
+			$message = $this->stripHtmlTags($this->message);
+			return apply_filters('site-reviews/email/message', $message, 'text', $this);
+		}
+		return $this->message;
+	}
+
+	/**
+	 * @return void|bool
+	 */
+	public function send()
+	{
+		if (!$this->message || !$this->subject || !$this->to) {
+			return;
+		}
+		add_action('wp_mail_failed', [$this, 'logMailError']);
+		$sent = wp_mail(
+			$this->to,
+			$this->subject,
+			$this->message,
+			$this->headers,
+			$this->attachments
+		);
+		remove_action('wp_mail_failed', [$this, 'logMailError']);
+		$this->reset();
+		return $sent;
+	}
+
+	/**
+	 * @return void
+	 * @action phpmailer_init
+	 */
+	public function buildPlainTextMessage(PHPMailer $phpmailer)
+	{
+		if (empty($this->email)) {
+			return;
+		}
+		if ('text/plain' === $phpmailer->ContentType || !empty($phpmailer->AltBody)) {
+			return;
+		}
+		$message = $this->stripHtmlTags($phpmailer->Body);
+		$phpmailer->AltBody = apply_filters('site-reviews/email/message', $message, 'text', $this);
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function buildHeaders()
+	{
+		$allowed = [
+			'bcc', 'cc', 'from', 'reply-to',
+		];
+		$headers = array_intersect_key($this->email, array_flip($allowed));
+		$headers = array_filter($headers);
+		foreach ($headers as $key => $value) {
+			unset($headers[$key]);
+			$headers[] = $key.': '.$value;
+		}
+		$headers[] = 'Content-Type: text/html';
+		return apply_filters('site-reviews/email/headers', $headers, $this);
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function buildHtmlMessage()
+	{
+		$template = trim(glsr(OptionManager::class)->get('settings.general.notification_message'));
+		if (!empty($template)) {
+			$message = glsr(Template::class)->interpolate(
+				$template, 
+				['context' => $this->email['template-tags']], 
+				$this->email['template']
+			);
+		} elseif ($this->email['template']) {
+			$message = glsr(Template::class)->build('templates/'.$this->email['template'], [
+				'context' => $this->email['template-tags'],
+			]);
+		}
+		if (!isset($message)) {
+			$message = $this->email['message'];
+		}
+		$message = $this->email['before'].$message.$this->email['after'];
+		$message = strip_shortcodes($message);
+		$message = wptexturize($message);
+		$message = wpautop($message);
+		$message = str_replace('&lt;&gt; ', '', $message);
+		$message = str_replace(']]>', ']]&gt;', $message);
+		$message = glsr(Template::class)->build('partials/email/index', [
+			'context' => ['message' => $message],
+		]);
+		return apply_filters('site-reviews/email/message', stripslashes($message), 'html', $this);
+	}
+
+	/**
+	 * @param \WP_Error $error
+	 * @return void
+	 */
+	protected function logMailError($error)
+	{
+		glsr_log()->error('Email was not sent (wp_mail failed)')
+			->debug($this)
+			->debug($error);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function normalize(array $email = [])
+	{
+		$email = shortcode_atts(glsr(EmailDefaults::class)->defaults(), $email);
+		if (empty($email['reply-to'])) {
+			$email['reply-to'] = $email['from'];
+		}
+		$this->email = apply_filters('site-reviews/email/compose', $email, $this);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function reset()
+	{
+		$this->attachments = [];
+		$this->email = [];
+		$this->headers = [];
+		$this->message = null;
+		$this->subject = null;
+		$this->to = null;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function stripHtmlTags($string)
+	{
+		// remove invisible elements
+		$string = preg_replace('@<(embed|head|noembed|noscript|object|script|style)[^>]*?>.*?</\\1>@siu', '', $string);
+		// replace certain elements with a line-break
+		$string = preg_replace('@</(div|h[1-9]|p|pre|tr)@iu', "\r\n\$0", $string);
+		// replace other elements with a space
+		$string = preg_replace('@</(td|th)@iu', ' $0', $string);
+		// add a placeholder for plain-text bullets to list elements
+		$string = preg_replace('@<(li)[^>]*?>@siu', '$0-o-^-o-', $string);
+		// strip all remaining HTML tags
+		$string = wp_strip_all_tags($string);
+		$string = wp_specialchars_decode($string, ENT_QUOTES);
+		$string = preg_replace('/\v(?:[\v\h]+){2,}/', "\r\n\r\n", $string);
+		$string = str_replace('-o-^-o-', ' - ', $string);
+		return html_entity_decode($string, ENT_QUOTES, 'UTF-8');
+	}
 }

Spacing +52 added lines, -52 removed lines

@@ -42,15 +42,15 @@ 
     /**
      * @return Email
      */
-    public function compose(array $email)
+    public function compose( array $email )
     {
-        $this->normalize($email);
+        $this->normalize( $email );
         $this->attachments = $this->email['attachments'];
         $this->headers = $this->buildHeaders();
         $this->message = $this->buildHtmlMessage();
         $this->subject = $this->email['subject'];
         $this->to = $this->email['to'];
-        add_action('phpmailer_init', [$this, 'buildPlainTextMessage']);
+        add_action( 'phpmailer_init', [$this, 'buildPlainTextMessage'] );
         return $this;
     }
 
@@ -58,11 +58,11 @@ 
      * @param string $format
      * @return string|null
      */
-    public function read($format = '')
+    public function read( $format = '' )
     {
-        if ('plaintext' == $format) {
-            $message = $this->stripHtmlTags($this->message);
-            return apply_filters('site-reviews/email/message', $message, 'text', $this);
+        if( 'plaintext' == $format ) {
+            $message = $this->stripHtmlTags( $this->message );
+            return apply_filters( 'site-reviews/email/message', $message, 'text', $this );
         }
         return $this->message;
     }
@@ -72,10 +72,10 @@ 
      */
     public function send()
     {
-        if (!$this->message || !$this->subject || !$this->to) {
+        if( !$this->message || !$this->subject || !$this->to ) {
             return;
         }
-        add_action('wp_mail_failed', [$this, 'logMailError']);
+        add_action( 'wp_mail_failed', [$this, 'logMailError'] );
         $sent = wp_mail(
             $this->to,
             $this->subject,
@@ -83,7 +83,7 @@ 
             $this->headers,
             $this->attachments
         );
-        remove_action('wp_mail_failed', [$this, 'logMailError']);
+        remove_action( 'wp_mail_failed', [$this, 'logMailError'] );
         $this->reset();
         return $sent;
     }
@@ -92,16 +92,16 @@ 
      * @return void
      * @action phpmailer_init
      */
-    public function buildPlainTextMessage(PHPMailer $phpmailer)
+    public function buildPlainTextMessage( PHPMailer $phpmailer )
     {
-        if (empty($this->email)) {
+        if( empty($this->email) ) {
             return;
         }
-        if ('text/plain' === $phpmailer->ContentType || !empty($phpmailer->AltBody)) {
+        if( 'text/plain' === $phpmailer->ContentType || !empty($phpmailer->AltBody) ) {
             return;
         }
-        $message = $this->stripHtmlTags($phpmailer->Body);
-        $phpmailer->AltBody = apply_filters('site-reviews/email/message', $message, 'text', $this);
+        $message = $this->stripHtmlTags( $phpmailer->Body );
+        $phpmailer->AltBody = apply_filters( 'site-reviews/email/message', $message, 'text', $this );
     }
 
     /**
@@ -112,14 +112,14 @@ 
         $allowed = [
             'bcc', 'cc', 'from', 'reply-to',
         ];
-        $headers = array_intersect_key($this->email, array_flip($allowed));
-        $headers = array_filter($headers);
-        foreach ($headers as $key => $value) {
+        $headers = array_intersect_key( $this->email, array_flip( $allowed ) );
+        $headers = array_filter( $headers );
+        foreach( $headers as $key => $value ) {
             unset($headers[$key]);
             $headers[] = $key.': '.$value;
         }
         $headers[] = 'Content-Type: text/html';
-        return apply_filters('site-reviews/email/headers', $headers, $this);
+        return apply_filters( 'site-reviews/email/headers', $headers, $this );
     }
 
     /**
@@ -127,54 +127,54 @@ 
      */
     protected function buildHtmlMessage()
     {
-        $template = trim(glsr(OptionManager::class)->get('settings.general.notification_message'));
-        if (!empty($template)) {
-            $message = glsr(Template::class)->interpolate(
+        $template = trim( glsr( OptionManager::class )->get( 'settings.general.notification_message' ) );
+        if( !empty($template) ) {
+            $message = glsr( Template::class )->interpolate(
                 $template, 
                 ['context' => $this->email['template-tags']], 
                 $this->email['template']
             );
-        } elseif ($this->email['template']) {
-            $message = glsr(Template::class)->build('templates/'.$this->email['template'], [
+        } elseif( $this->email['template'] ) {
+            $message = glsr( Template::class )->build( 'templates/'.$this->email['template'], [
                 'context' => $this->email['template-tags'],
-            ]);
+            ] );
         }
-        if (!isset($message)) {
+        if( !isset($message) ) {
             $message = $this->email['message'];
         }
         $message = $this->email['before'].$message.$this->email['after'];
-        $message = strip_shortcodes($message);
-        $message = wptexturize($message);
-        $message = wpautop($message);
-        $message = str_replace('<> ', '', $message);
-        $message = str_replace(']]>', ']]>', $message);
-        $message = glsr(Template::class)->build('partials/email/index', [
+        $message = strip_shortcodes( $message );
+        $message = wptexturize( $message );
+        $message = wpautop( $message );
+        $message = str_replace( '<> ', '', $message );
+        $message = str_replace( ']]>', ']]>', $message );
+        $message = glsr( Template::class )->build( 'partials/email/index', [
             'context' => ['message' => $message],
-        ]);
-        return apply_filters('site-reviews/email/message', stripslashes($message), 'html', $this);
+        ] );
+        return apply_filters( 'site-reviews/email/message', stripslashes( $message ), 'html', $this );
     }
 
     /**
      * @param \WP_Error $error
      * @return void
      */
-    protected function logMailError($error)
+    protected function logMailError( $error )
     {
-        glsr_log()->error('Email was not sent (wp_mail failed)')
-            ->debug($this)
-            ->debug($error);
+        glsr_log()->error( 'Email was not sent (wp_mail failed)' )
+            ->debug( $this )
+            ->debug( $error );
     }
 
     /**
      * @return void
      */
-    protected function normalize(array $email = [])
+    protected function normalize( array $email = [] )
     {
-        $email = shortcode_atts(glsr(EmailDefaults::class)->defaults(), $email);
-        if (empty($email['reply-to'])) {
+        $email = shortcode_atts( glsr( EmailDefaults::class )->defaults(), $email );
+        if( empty($email['reply-to']) ) {
             $email['reply-to'] = $email['from'];
         }
-        $this->email = apply_filters('site-reviews/email/compose', $email, $this);
+        $this->email = apply_filters( 'site-reviews/email/compose', $email, $this );
     }
 
     /**
@@ -193,21 +193,21 @@ 
     /**
      * @return string
      */
-    protected function stripHtmlTags($string)
+    protected function stripHtmlTags( $string )
     {
         // remove invisible elements
-        $string = preg_replace('@<(embed|head|noembed|noscript|object|script|style)[^>]*?>.*?</\\1>@siu', '', $string);
+        $string = preg_replace( '@<(embed|head|noembed|noscript|object|script|style)[^>]*?>.*?</\\1>@siu', '', $string );
         // replace certain elements with a line-break
-        $string = preg_replace('@</(div|h[1-9]|p|pre|tr)@iu', "\r\n\$0", $string);
+        $string = preg_replace( '@</(div|h[1-9]|p|pre|tr)@iu', "\r\n\$0", $string );
         // replace other elements with a space
-        $string = preg_replace('@</(td|th)@iu', ' $0', $string);
+        $string = preg_replace( '@</(td|th)@iu', ' $0', $string );
         // add a placeholder for plain-text bullets to list elements
-        $string = preg_replace('@<(li)[^>]*?>@siu', '$0-o-^-o-', $string);
+        $string = preg_replace( '@<(li)[^>]*?>@siu', '$0-o-^-o-', $string );
         // strip all remaining HTML tags
-        $string = wp_strip_all_tags($string);
-        $string = wp_specialchars_decode($string, ENT_QUOTES);
-        $string = preg_replace('/\v(?:[\v\h]+){2,}/', "\r\n\r\n", $string);
-        $string = str_replace('-o-^-o-', ' - ', $string);
-        return html_entity_decode($string, ENT_QUOTES, 'UTF-8');
+        $string = wp_strip_all_tags( $string );
+        $string = wp_specialchars_decode( $string, ENT_QUOTES );
+        $string = preg_replace( '/\v(?:[\v\h]+){2,}/', "\r\n\r\n", $string );
+        $string = str_replace( '-o-^-o-', ' - ', $string );
+        return html_entity_decode( $string, ENT_QUOTES, 'UTF-8' );
     }
 }

Braces +2 added lines, -1 removed lines

@@ -134,7 +134,8 @@
                 ['context' => $this->email['template-tags']], 
                 $this->email['template']
             );
-        } elseif ($this->email['template']) {
+        }
+        elseif ($this->email['template']) {
             $message = glsr(Template::class)->build('templates/'.$this->email['template'], [
                 'context' => $this->email['template-tags'],
             ]);