pryley / site-reviews

plugin/Modules/Session.php

Spacing +13 added lines, -13 removed lines

@@ -36,8 +36,8 @@ 
 
 	public function __construct()
 	{
-		if( $cookieId = filter_input( INPUT_COOKIE, static::SESSION_COOKIE )) {
-			$cookie = explode( static::DELIMITER, stripslashes( $cookieId ));
+		if( $cookieId = filter_input( INPUT_COOKIE, static::SESSION_COOKIE ) ) {
+			$cookie = explode( static::DELIMITER, stripslashes( $cookieId ) );
 			$this->sessionId = preg_replace( '/[^A-Za-z0-9_]/', '', $cookie[0] );
 			$this->expiryTimestamp = absint( $cookie[1] );
 			$this->expiryTimestampReset = absint( $cookie[2] );
@@ -76,7 +76,7 @@ 
 	 */
 	public function deleteExpiredSessions( $limit = 1000 )
 	{
-		if( $expiredSessions = implode( "','", $this->getExpiredSessions( $limit ))) {
+		if( $expiredSessions = implode( "','", $this->getExpiredSessions( $limit ) ) ) {
 			glsr( SqlQueries::class )->deleteExpiredSessions( $expiredSessions );
 		}
 	}
@@ -90,11 +90,11 @@ 
 	public function get( $key, $fallback = '', $unset = false )
 	{
 		$key = sanitize_key( $key );
-		$value = isset( $this->sessionData[$key] )
+		$value = isset($this->sessionData[$key])
 			? maybe_unserialize( $this->sessionData[$key] )
 			: $fallback;
-		if( isset( $this->sessionData[$key] ) && $unset ) {
-			unset( $this->sessionData[$key] );
+		if( isset($this->sessionData[$key]) && $unset ) {
+			unset($this->sessionData[$key]);
 			$this->updateSession();
 		}
 		return $value;
@@ -128,7 +128,7 @@ 
 	protected function deleteSession()
 	{
 		delete_option( $this->getSessionId() );
-		delete_option( $this->getSessionId( 'expires' ));
+		delete_option( $this->getSessionId( 'expires' ) );
 	}
 
 	/**
@@ -136,7 +136,7 @@ 
 	 */
 	protected function generateSessionId()
 	{
-		return md5(( new PasswordHash( 8, false ))->get_random_bytes( 32 ));
+		return md5( (new PasswordHash( 8, false ))->get_random_bytes( 32 ) );
 	}
 
 	/**
@@ -146,8 +146,8 @@ 
 	protected function getExpiredSessions( $limit )
 	{
 		$expiredSessions = [];
-		$sessions = glsr( SqlQueries::class )->getExpiredSessions( static::SESSION_COOKIE, absint( $limit ));
-		if( !empty( $sessions )) {
+		$sessions = glsr( SqlQueries::class )->getExpiredSessions( static::SESSION_COOKIE, absint( $limit ) );
+		if( !empty($sessions) ) {
 			$now = time();
 			foreach( $sessions as $session ) {
 				if( $now <= $session->expiration )continue;
@@ -164,7 +164,7 @@ 
 	 */
 	protected function getSessionId( $separator = '' )
 	{
-		return implode( '_', array_filter( [static::SESSION_COOKIE, $separator, $this->sessionId] ));
+		return implode( '_', array_filter( [static::SESSION_COOKIE, $separator, $this->sessionId] ) );
 	}
 
 	/**
@@ -195,7 +195,7 @@ 
 	{
 		if( headers_sent() )return;
 		$cookie = $this->sessionId.static::DELIMITER.$this->expiryTimestamp.static::DELIMITER.$this->expiryTimestampReset;
-		$cookiePath = preg_replace( '|https?://[^/]+|i', '', trailingslashit( (string)get_option( 'home' )));
+		$cookiePath = preg_replace( '|https?://[^/]+|i', '', trailingslashit( (string)get_option( 'home' ) ) );
 		setcookie( static::SESSION_COOKIE, $cookie, $this->expiryTimestamp, $cookiePath );
 	}
 
@@ -213,7 +213,7 @@ 
 	 */
 	protected function updateSession()
 	{
-		if( false === get_option( $this->getSessionId() )) {
+		if( false === get_option( $this->getSessionId() ) ) {
 			return $this->createSession();
 		}
 		update_option( $this->getSessionId(), $this->sessionData, false );

Braces +6 added lines, -2 removed lines

@@ -150,7 +150,9 @@ 
 		if( !empty( $sessions )) {
 			$now = time();
 			foreach( $sessions as $session ) {
-				if( $now <= $session->expiration )continue;
+				if( $now <= $session->expiration ) {
+					continue;
+				}
 				$expiredSessions[] = $session->name;
 				$expiredSessions[] = str_replace( '_expires_', '_', $session->name );
 			}
@@ -193,7 +195,9 @@ 
 	 */
 	protected function setCookie()
 	{
-		if( headers_sent() )return;
+		if( headers_sent() ) {
+			return;
+		}
 		$cookie = $this->sessionId.static::DELIMITER.$this->expiryTimestamp.static::DELIMITER.$this->expiryTimestampReset;
 		$cookiePath = preg_replace( '|https?://[^/]+|i', '', trailingslashit( (string)get_option( 'home' )));
 		setcookie( static::SESSION_COOKIE, $cookie, $this->expiryTimestamp, $cookiePath );

plugin/Modules/Notification.php

Spacing +16 added lines, -16 removed lines

@@ -33,7 +33,7 @@ 
 	public function __construct()
 	{
 		$types = glsr( OptionManager::class )->get( 'settings.general.notifications', [] );
-		$this->email = count( array_intersect( ['admin', 'custom'], $types )) > 0;
+		$this->email = count( array_intersect( ['admin', 'custom'], $types ) ) > 0;
 		$this->slack = in_array( 'slack', $types );
 		$this->types = $types;
 	}
@@ -43,7 +43,7 @@ 
 	 */
 	public function send( Review $review )
 	{
-		if( empty( $this->types ))return;
+		if( empty($this->types) )return;
 		$this->review = $review;
 		$args = [
 			'link' => $this->getLink(),
@@ -58,7 +58,7 @@ 
 	 */
 	protected function buildEmail( array $args )
 	{
-		return glsr( Email::class )->compose([
+		return glsr( Email::class )->compose( [
 			'to' => $this->getEmailAddresses(),
 			'subject' => $args['title'],
 			'template' => 'email-notification',
@@ -71,7 +71,7 @@ 
 				'review_rating' => $this->review->rating,
 				'review_title' => $this->review->title,
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 			'button_url' => $args['link'],
 			'fallback' => $this->buildEmail( $args )->read( 'plaintext' ),
 			'pretext' => $args['title'],
-		]);
+		] );
 	}
 
 	/**
@@ -92,23 +92,23 @@ 
 	protected function getEmailAddresses()
 	{
 		$emails = [];
-		if( in_array( 'admin', $this->types )) {
+		if( in_array( 'admin', $this->types ) ) {
 			$emails[] = get_option( 'admin_email' );
 		}
-		if( in_array( 'author', $this->types )) {
-			$assignedPost = get_post( intval( $this->review->assigned_to ));
+		if( in_array( 'author', $this->types ) ) {
+			$assignedPost = get_post( intval( $this->review->assigned_to ) );
 			if( $assignedPost instanceof WP_Post ) {
 				$this->email = true;
-				$emails[] = get_the_author_meta( 'user_email', intval( $assignedPost->post_author ));
+				$emails[] = get_the_author_meta( 'user_email', intval( $assignedPost->post_author ) );
 			}
 		}
-		if( in_array( 'custom', $this->types )) {
+		if( in_array( 'custom', $this->types ) ) {
 			$customEmails = glsr( OptionManager::class )->get( 'settings.general.notification_email' );
 			$customEmails = str_replace( [' ', ',', ';'], ',', $customEmails );
 			$customEmails = explode( ',', $customEmails );
 			$emails = array_merge( $emails, $customEmails );
 		}
-		$emails = array_filter( array_keys( array_flip( $emails )));
+		$emails = array_filter( array_keys( array_flip( $emails ) ) );
 		return apply_filters( 'site-reviews/notification/emails', $emails, $this->review );
 	}
 
@@ -125,16 +125,16 @@ 
 	 */
 	protected function getTitle()
 	{
-		$assignedTitle = get_the_title( intval( $this->review->assigned_to ));
+		$assignedTitle = get_the_title( intval( $this->review->assigned_to ) );
 		$title = _nx(
 			'New %s-star review',
 			'New %s-star review of: %s',
-			intval( empty( $assignedTitle )),
+			intval( empty($assignedTitle) ),
 			'This string differs depending on whether or not the review has been assigned to a post.',
 			'site-reviews'
 		);
 		$title = sprintf( '[%s] %s',
-			wp_specialchars_decode( strval( get_option( 'blogname' )), ENT_QUOTES ),
+			wp_specialchars_decode( strval( get_option( 'blogname' ) ), ENT_QUOTES ),
 			sprintf( $title, $this->review->rating, $assignedTitle )
 		);
 		return apply_filters( 'site-reviews/notification/title', $title, $this->review );
@@ -147,7 +147,7 @@ 
 	{
 		$email = $this->buildEmail( $args );
 		if( !$this->email )return;
-		if( empty( $email->to )) {
+		if( empty($email->to) ) {
 			glsr_log()->error( 'Email notification was not sent (missing email address)' );
 			return;
 		}
@@ -164,7 +164,7 @@ 
 		if( !$this->slack )return;
 		$notification = $this->buildSlackNotification( $args );
 		$result = $notification->send();
-		if( is_wp_error( $result )) {
+		if( is_wp_error( $result ) ) {
 			$notification->review = null;
 			glsr_log()->error( $result->get_error_message() )->debug( $notification );
 		}

Braces +9 added lines, -3 removed lines

@@ -43,7 +43,9 @@ 
 	 */
 	public function send( Review $review )
 	{
-		if( empty( $this->types ))return;
+		if( empty( $this->types )) {
+			return;
+		}
 		$this->review = $review;
 		$args = [
 			'link' => $this->getLink(),
@@ -146,7 +148,9 @@ 
 	protected function sendToEmail( array $args )
 	{
 		$email = $this->buildEmail( $args );
-		if( !$this->email )return;
+		if( !$this->email ) {
+			return;
+		}
 		if( empty( $email->to )) {
 			glsr_log()->error( 'Email notification was not sent (missing email address)' );
 			return;
@@ -161,7 +165,9 @@ 
 	 */
 	protected function sendToSlack( array $args )
 	{
-		if( !$this->slack )return;
+		if( !$this->slack ) {
+			return;
+		}
 		$notification = $this->buildSlackNotification( $args );
 		$result = $notification->send();
 		if( is_wp_error( $result )) {