eventespresso / event-espresso-core

core/services/assets/BlockAssetManager.php

Doc Comments +4 added lines, -4 removed lines

@@ -142,7 +142,7 @@ 
 
 
     /**
-     * @param       $handle
+     * @param       string $handle
      * @param array $dependencies
      * @since $VID:$
      * @return JavascriptAsset
@@ -168,7 +168,7 @@ 
 
 
     /**
-     * @param        $handle
+     * @param        string $handle
      * @param array  $dependencies
      * @since $VID:$
      * @return StylesheetAsset
@@ -193,7 +193,7 @@ 
 
 
     /**
-     * @param       $handle
+     * @param       string $handle
      * @param array $dependencies
      * @since $VID:$
      * @return JavascriptAsset
@@ -219,7 +219,7 @@ 
 
 
     /**
-     * @param        $handle
+     * @param        string $handle
      * @param array  $dependencies
      * @since $VID:$
      * @return StylesheetAsset

Indentation +304 added lines, -304 removed lines

@@ -22,309 +22,309 @@
 abstract class BlockAssetManager extends AssetManager implements BlockAssetManagerInterface
 {
 
-    /**
-     * @var string $editor_script_handle
-     */
-    private $editor_script_handle;
-
-    /**
-     * @var string $editor_style_handle
-     */
-    private $editor_style_handle;
-
-    /**
-     * @var string $script_handle
-     */
-    private $script_handle;
-
-    /**
-     * @var string $style_handle
-     */
-    private $style_handle;
-
-
-    /**
-     * @return string
-     */
-    public function getEditorScriptHandle()
-    {
-        return $this->editor_script_handle;
-    }
-
-
-    /**
-     * @param string $editor_script_handle
-     */
-    public function setEditorScriptHandle($editor_script_handle)
-    {
-        if(strpos($editor_script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $editor_script_handle = BlockInterface::NAME_SPACE . '-' . $editor_script_handle;
-        }
-        $this->editor_script_handle = $editor_script_handle;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getEditorStyleHandle()
-    {
-        return $this->editor_style_handle;
-    }
-
-
-    /**
-     * @param string $editor_style_handle
-     */
-    public function setEditorStyleHandle($editor_style_handle)
-    {
-        if (strpos($editor_style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $editor_style_handle = BlockInterface::NAME_SPACE . '-' . $editor_style_handle;
-        }
-        $this->editor_style_handle = $editor_style_handle;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getScriptHandle()
-    {
-        return $this->script_handle;
-    }
-
-
-    /**
-     * @param string $script_handle
-     */
-    public function setScriptHandle($script_handle)
-    {
-        if (strpos($script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $script_handle = BlockInterface::NAME_SPACE . '-' . $script_handle;
-        }
-        $this->script_handle = $script_handle;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getStyleHandle()
-    {
-        return $this->style_handle;
-    }
-
-
-    /**
-     * @param string $style_handle
-     */
-    public function setStyleHandle($style_handle)
-    {
-        if (strpos($style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $style_handle = BlockInterface::NAME_SPACE . '-' . $style_handle;
-        }
-        $this->style_handle = $style_handle;
-    }
-
-    /**
-     * @since $VID:$
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addAssets()
-    {
-        $this->addEditorScript($this->getEditorScriptHandle());
-        $this->addEditorStyle($this->getEditorStyleHandle());
-        $this->addScript($this->getScriptHandle());
-        $this->addStyle($this->getStyleHandle());
-    }
-
-
-    /**
-     * @param       $handle
-     * @param array $dependencies
-     * @since $VID:$
-     * @return JavascriptAsset
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addEditorScript($handle, array $dependencies = array())
-    {
-        if($this->assets->hasJavascriptAsset($handle)){
-            return $this->assets->getJavascriptAsset($handle);
-        }
-        return parent::addJavascript(
-            $handle,
-            $this->registry->getJsUrl(
-                $this->domain->assetNamespace(),
-                $handle
-            ),
-            $this->addDefaultBlockScriptDependencies($dependencies)
-        )
-        ->setRequiresTranslation();
-    }
-
-
-    /**
-     * @param        $handle
-     * @param array  $dependencies
-     * @since $VID:$
-     * @return StylesheetAsset
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addEditorStyle($handle, array $dependencies = array())
-    {
-        if ($this->assets->hasStylesheetAsset($handle)) {
-            return $this->assets->getStylesheetAsset($handle);
-        }
-        return parent::addStylesheet(
-            $handle,
-            $this->registry->getCssUrl(
-                $this->domain->assetNamespace(),
-                $handle
-            ),
-            $this->addDefaultBlockStyleDependencies($dependencies)
-        );
-    }
-
-
-    /**
-     * @param       $handle
-     * @param array $dependencies
-     * @since $VID:$
-     * @return JavascriptAsset
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addScript($handle, array $dependencies = array())
-    {
-        if ($this->assets->hasJavascriptAsset($handle)) {
-            return $this->assets->getJavascriptAsset($handle);
-        }
-        return parent::addJavascript(
-            $handle,
-            $this->registry->getJsUrl(
-                $this->domain->assetNamespace(),
-                $handle
-            ),
-            $dependencies + array( CoreAssetManager::JS_HANDLE_EE_COMPONENTS )
-        )
-        ->setRequiresTranslation();
-    }
-
-
-    /**
-     * @param        $handle
-     * @param array  $dependencies
-     * @since $VID:$
-     * @return StylesheetAsset
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addStyle($handle, array $dependencies = array())
-    {
-        if ($this->assets->hasStylesheetAsset($handle)) {
-            return $this->assets->getStylesheetAsset($handle);
-        }
-        return parent::addStylesheet(
-            $handle,
-            $this->registry->getCssUrl(
-                $this->domain->assetNamespace(),
-                $handle
-            ),
-            $dependencies + array( CoreAssetManager::CSS_HANDLE_EE_COMPONENTS )
-        );
-    }
-
-
-    /**
-     * @param array $dependencies
-     * @return array
-     */
-    protected function addDefaultBlockScriptDependencies(array $dependencies)
-    {
-        $dependencies += array(
-                'wp-blocks',    // Provides useful functions and components for extending the editor
-                'wp-i18n',      // Provides localization functions
-                'wp-element',   // Provides React.Component
-                'wp-components', // Provides many prebuilt components and controls
-                $this->getScriptHandle(),
-            );
-        return $dependencies;
-    }
-
-
-    /**
-     * @param array $dependencies
-     * @return array
-     */
-    protected function addDefaultBlockStyleDependencies(array $dependencies)
-    {
-        $dependencies += array(
-            $this->getStyleHandle()
-        );
-        return $dependencies;
-    }
-
-
-    /**
-     * @return JavascriptAsset|null
-     */
-    public function getEditorScript()
-    {
-        return $this->assets->getJavascriptAsset($this->editor_script_handle);
-    }
-
-
-    /**
-     * @return StylesheetAsset|null
-     */
-    public function getEditorStyle()
-    {
-        return $this->assets->getStylesheetAsset($this->editor_style_handle);
-    }
-
-
-    /**
-     * @return JavascriptAsset|null
-     */
-    public function getScript()
-    {
-        return $this->assets->getJavascriptAsset($this->script_handle);
-    }
-
-
-    /**
-     * @return StylesheetAsset|null
-     */
-    public function getStyle()
-    {
-        return $this->assets->getStylesheetAsset($this->style_handle);
-    }
-
-
-    /**
-     * @return  void
-     */
-    public function enqueueAssets()
-    {
-        $assets = array(
-            $this->getEditorScript(),
-            $this->getEditorStyle(),
-            $this->getScript(),
-            $this->getStyle(),
-        );
-        foreach ($assets as $asset) {
-            if ($asset instanceof BrowserAsset && $asset->isRegistered()) {
-                $asset->enqueueAsset();
-            }
-        }
-    }
+	/**
+	 * @var string $editor_script_handle
+	 */
+	private $editor_script_handle;
+
+	/**
+	 * @var string $editor_style_handle
+	 */
+	private $editor_style_handle;
+
+	/**
+	 * @var string $script_handle
+	 */
+	private $script_handle;
+
+	/**
+	 * @var string $style_handle
+	 */
+	private $style_handle;
+
+
+	/**
+	 * @return string
+	 */
+	public function getEditorScriptHandle()
+	{
+		return $this->editor_script_handle;
+	}
+
+
+	/**
+	 * @param string $editor_script_handle
+	 */
+	public function setEditorScriptHandle($editor_script_handle)
+	{
+		if(strpos($editor_script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
+			$editor_script_handle = BlockInterface::NAME_SPACE . '-' . $editor_script_handle;
+		}
+		$this->editor_script_handle = $editor_script_handle;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getEditorStyleHandle()
+	{
+		return $this->editor_style_handle;
+	}
+
+
+	/**
+	 * @param string $editor_style_handle
+	 */
+	public function setEditorStyleHandle($editor_style_handle)
+	{
+		if (strpos($editor_style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
+			$editor_style_handle = BlockInterface::NAME_SPACE . '-' . $editor_style_handle;
+		}
+		$this->editor_style_handle = $editor_style_handle;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getScriptHandle()
+	{
+		return $this->script_handle;
+	}
+
+
+	/**
+	 * @param string $script_handle
+	 */
+	public function setScriptHandle($script_handle)
+	{
+		if (strpos($script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
+			$script_handle = BlockInterface::NAME_SPACE . '-' . $script_handle;
+		}
+		$this->script_handle = $script_handle;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getStyleHandle()
+	{
+		return $this->style_handle;
+	}
+
+
+	/**
+	 * @param string $style_handle
+	 */
+	public function setStyleHandle($style_handle)
+	{
+		if (strpos($style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
+			$style_handle = BlockInterface::NAME_SPACE . '-' . $style_handle;
+		}
+		$this->style_handle = $style_handle;
+	}
+
+	/**
+	 * @since $VID:$
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addAssets()
+	{
+		$this->addEditorScript($this->getEditorScriptHandle());
+		$this->addEditorStyle($this->getEditorStyleHandle());
+		$this->addScript($this->getScriptHandle());
+		$this->addStyle($this->getStyleHandle());
+	}
+
+
+	/**
+	 * @param       $handle
+	 * @param array $dependencies
+	 * @since $VID:$
+	 * @return JavascriptAsset
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addEditorScript($handle, array $dependencies = array())
+	{
+		if($this->assets->hasJavascriptAsset($handle)){
+			return $this->assets->getJavascriptAsset($handle);
+		}
+		return parent::addJavascript(
+			$handle,
+			$this->registry->getJsUrl(
+				$this->domain->assetNamespace(),
+				$handle
+			),
+			$this->addDefaultBlockScriptDependencies($dependencies)
+		)
+		->setRequiresTranslation();
+	}
+
+
+	/**
+	 * @param        $handle
+	 * @param array  $dependencies
+	 * @since $VID:$
+	 * @return StylesheetAsset
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addEditorStyle($handle, array $dependencies = array())
+	{
+		if ($this->assets->hasStylesheetAsset($handle)) {
+			return $this->assets->getStylesheetAsset($handle);
+		}
+		return parent::addStylesheet(
+			$handle,
+			$this->registry->getCssUrl(
+				$this->domain->assetNamespace(),
+				$handle
+			),
+			$this->addDefaultBlockStyleDependencies($dependencies)
+		);
+	}
+
+
+	/**
+	 * @param       $handle
+	 * @param array $dependencies
+	 * @since $VID:$
+	 * @return JavascriptAsset
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addScript($handle, array $dependencies = array())
+	{
+		if ($this->assets->hasJavascriptAsset($handle)) {
+			return $this->assets->getJavascriptAsset($handle);
+		}
+		return parent::addJavascript(
+			$handle,
+			$this->registry->getJsUrl(
+				$this->domain->assetNamespace(),
+				$handle
+			),
+			$dependencies + array( CoreAssetManager::JS_HANDLE_EE_COMPONENTS )
+		)
+		->setRequiresTranslation();
+	}
+
+
+	/**
+	 * @param        $handle
+	 * @param array  $dependencies
+	 * @since $VID:$
+	 * @return StylesheetAsset
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addStyle($handle, array $dependencies = array())
+	{
+		if ($this->assets->hasStylesheetAsset($handle)) {
+			return $this->assets->getStylesheetAsset($handle);
+		}
+		return parent::addStylesheet(
+			$handle,
+			$this->registry->getCssUrl(
+				$this->domain->assetNamespace(),
+				$handle
+			),
+			$dependencies + array( CoreAssetManager::CSS_HANDLE_EE_COMPONENTS )
+		);
+	}
+
+
+	/**
+	 * @param array $dependencies
+	 * @return array
+	 */
+	protected function addDefaultBlockScriptDependencies(array $dependencies)
+	{
+		$dependencies += array(
+				'wp-blocks',    // Provides useful functions and components for extending the editor
+				'wp-i18n',      // Provides localization functions
+				'wp-element',   // Provides React.Component
+				'wp-components', // Provides many prebuilt components and controls
+				$this->getScriptHandle(),
+			);
+		return $dependencies;
+	}
+
+
+	/**
+	 * @param array $dependencies
+	 * @return array
+	 */
+	protected function addDefaultBlockStyleDependencies(array $dependencies)
+	{
+		$dependencies += array(
+			$this->getStyleHandle()
+		);
+		return $dependencies;
+	}
+
+
+	/**
+	 * @return JavascriptAsset|null
+	 */
+	public function getEditorScript()
+	{
+		return $this->assets->getJavascriptAsset($this->editor_script_handle);
+	}
+
+
+	/**
+	 * @return StylesheetAsset|null
+	 */
+	public function getEditorStyle()
+	{
+		return $this->assets->getStylesheetAsset($this->editor_style_handle);
+	}
+
+
+	/**
+	 * @return JavascriptAsset|null
+	 */
+	public function getScript()
+	{
+		return $this->assets->getJavascriptAsset($this->script_handle);
+	}
+
+
+	/**
+	 * @return StylesheetAsset|null
+	 */
+	public function getStyle()
+	{
+		return $this->assets->getStylesheetAsset($this->style_handle);
+	}
+
+
+	/**
+	 * @return  void
+	 */
+	public function enqueueAssets()
+	{
+		$assets = array(
+			$this->getEditorScript(),
+			$this->getEditorStyle(),
+			$this->getScript(),
+			$this->getStyle(),
+		);
+		foreach ($assets as $asset) {
+			if ($asset instanceof BrowserAsset && $asset->isRegistered()) {
+				$asset->enqueueAsset();
+			}
+		}
+	}
 
 }

Spacing +14 added lines, -14 removed lines

@@ -57,8 +57,8 @@ 
      */
     public function setEditorScriptHandle($editor_script_handle)
     {
-        if(strpos($editor_script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $editor_script_handle = BlockInterface::NAME_SPACE . '-' . $editor_script_handle;
+        if (strpos($editor_script_handle, BlockInterface::NAME_SPACE.'-') !== 0) {
+            $editor_script_handle = BlockInterface::NAME_SPACE.'-'.$editor_script_handle;
         }
         $this->editor_script_handle = $editor_script_handle;
     }
@@ -78,8 +78,8 @@ 
      */
     public function setEditorStyleHandle($editor_style_handle)
     {
-        if (strpos($editor_style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $editor_style_handle = BlockInterface::NAME_SPACE . '-' . $editor_style_handle;
+        if (strpos($editor_style_handle, BlockInterface::NAME_SPACE.'-') !== 0) {
+            $editor_style_handle = BlockInterface::NAME_SPACE.'-'.$editor_style_handle;
         }
         $this->editor_style_handle = $editor_style_handle;
     }
@@ -99,8 +99,8 @@ 
      */
     public function setScriptHandle($script_handle)
     {
-        if (strpos($script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $script_handle = BlockInterface::NAME_SPACE . '-' . $script_handle;
+        if (strpos($script_handle, BlockInterface::NAME_SPACE.'-') !== 0) {
+            $script_handle = BlockInterface::NAME_SPACE.'-'.$script_handle;
         }
         $this->script_handle = $script_handle;
     }
@@ -120,8 +120,8 @@ 
      */
     public function setStyleHandle($style_handle)
     {
-        if (strpos($style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $style_handle = BlockInterface::NAME_SPACE . '-' . $style_handle;
+        if (strpos($style_handle, BlockInterface::NAME_SPACE.'-') !== 0) {
+            $style_handle = BlockInterface::NAME_SPACE.'-'.$style_handle;
         }
         $this->style_handle = $style_handle;
     }
@@ -152,7 +152,7 @@ 
      */
     public function addEditorScript($handle, array $dependencies = array())
     {
-        if($this->assets->hasJavascriptAsset($handle)){
+        if ($this->assets->hasJavascriptAsset($handle)) {
             return $this->assets->getJavascriptAsset($handle);
         }
         return parent::addJavascript(
@@ -212,7 +212,7 @@ 
                 $this->domain->assetNamespace(),
                 $handle
             ),
-            $dependencies + array( CoreAssetManager::JS_HANDLE_EE_COMPONENTS )
+            $dependencies + array(CoreAssetManager::JS_HANDLE_EE_COMPONENTS)
         )
         ->setRequiresTranslation();
     }
@@ -238,7 +238,7 @@ 
                 $this->domain->assetNamespace(),
                 $handle
             ),
-            $dependencies + array( CoreAssetManager::CSS_HANDLE_EE_COMPONENTS )
+            $dependencies + array(CoreAssetManager::CSS_HANDLE_EE_COMPONENTS)
         );
     }
 
@@ -250,9 +250,9 @@ 
     protected function addDefaultBlockScriptDependencies(array $dependencies)
     {
         $dependencies += array(
-                'wp-blocks',    // Provides useful functions and components for extending the editor
-                'wp-i18n',      // Provides localization functions
-                'wp-element',   // Provides React.Component
+                'wp-blocks', // Provides useful functions and components for extending the editor
+                'wp-i18n', // Provides localization functions
+                'wp-element', // Provides React.Component
                 'wp-components', // Provides many prebuilt components and controls
                 $this->getScriptHandle(),
             );

core/domain/entities/editor/blocks/EventAttendees.php

Spacing +7 added lines, -7 removed lines

@@ -42,7 +42,7 @@ 
         EventAttendeesBlockRenderer $renderer
     ) {
         parent::__construct($block_asset_manager, $request);
-        $this->renderer= $renderer;
+        $this->renderer = $renderer;
     }
 
 
@@ -154,19 +154,19 @@ 
         $sanitized_attributes = array();
         foreach ($attributes as $attribute => $value) {
             $convert = $this->getAttributesMap();
-            if (isset($convert[ $attribute ])) {
-                $sanitize = $convert[ $attribute ];
+            if (isset($convert[$attribute])) {
+                $sanitize = $convert[$attribute];
                 if ($sanitize === 'bool') {
-                    $sanitized_attributes[ $attribute ] = filter_var(
+                    $sanitized_attributes[$attribute] = filter_var(
                         $value,
                         FILTER_VALIDATE_BOOLEAN
                     );
                 } else {
-                    $sanitized_attributes[ $attribute ] = $sanitize($value);
+                    $sanitized_attributes[$attribute] = $sanitize($value);
                 }
                 // don't pass along attributes with a 0 value
-                if ($sanitized_attributes[ $attribute ] === 0) {
-                    unset($sanitized_attributes[ $attribute ]);
+                if ($sanitized_attributes[$attribute] === 0) {
+                    unset($sanitized_attributes[$attribute]);
                 }
             }
         }

Indentation +157 added lines, -157 removed lines

@@ -21,172 +21,172 @@
 class EventAttendees extends Block
 {
 
-    const BLOCK_TYPE = 'event-attendees';
+	const BLOCK_TYPE = 'event-attendees';
 
-    /**
-     * @var EventAttendeesBlockRenderer $renderer
-     */
-    protected $renderer;
+	/**
+	 * @var EventAttendeesBlockRenderer $renderer
+	 */
+	protected $renderer;
 
 
-    /**
-     * EventAttendees constructor.
-     *
-     * @param CoreBlocksAssetManager      $block_asset_manager
-     * @param RequestInterface            $request
-     * @param EventAttendeesBlockRenderer $renderer
-     */
-    public function __construct(
-        CoreBlocksAssetManager $block_asset_manager,
-        RequestInterface $request,
-        EventAttendeesBlockRenderer $renderer
-    ) {
-        parent::__construct($block_asset_manager, $request);
-        $this->renderer= $renderer;
-    }
+	/**
+	 * EventAttendees constructor.
+	 *
+	 * @param CoreBlocksAssetManager      $block_asset_manager
+	 * @param RequestInterface            $request
+	 * @param EventAttendeesBlockRenderer $renderer
+	 */
+	public function __construct(
+		CoreBlocksAssetManager $block_asset_manager,
+		RequestInterface $request,
+		EventAttendeesBlockRenderer $renderer
+	) {
+		parent::__construct($block_asset_manager, $request);
+		$this->renderer= $renderer;
+	}
 
 
-    /**
-     * Perform any early setup required by the block
-     * including setting the block type and supported post types
-     *
-     * @return void
-     */
-    public function initialize()
-    {
-        $this->setBlockType(self::BLOCK_TYPE);
-        $this->setSupportedRoutes(
-            array(
-                'EventEspresso\core\domain\entities\route_match\specifications\admin\EspressoStandardPostTypeEditor',
-                'EventEspresso\core\domain\entities\route_match\specifications\admin\WordPressPostTypeEditor',
-                'EventEspresso\core\domain\entities\route_match\specifications\frontend\EspressoBlockRenderer',
-                'EventEspresso\core\domain\entities\route_match\specifications\frontend\AnyFrontendRequest'
-            )
-        );
-        $EVT_ID = $this->request->getRequestParam('page') === 'espresso_events'
-            ? $this->request->getRequestParam('post', 0)
-            : 0;
-        $this->setAttributes(
-            array(
-                'eventId'           => array(
-                    'type'    => 'number',
-                    'default' => $EVT_ID,
-                ),
-                'datetimeId'        => array(
-                    'type'    => 'number',
-                    'default' => 0,
-                ),
-                'ticketId'          => array(
-                    'type'    => 'number',
-                    'default' => 0,
-                ),
-                'status'            => array(
-                    'type'    => 'string',
-                    'default' => EEM_Registration::status_id_approved,
-                ),
-                'limit'             => array(
-                    'type'    => 'number',
-                    'default' => 10,
-                ),
-                'order' => array(
-                    'type' => 'string',
-                    'default' => 'ASC'
-                ),
-                'orderBy' => array(
-                    'type' => 'string',
-                    'default' => 'lastThenFirstName',
-                ),
-                'showGravatar'      => array(
-                    'type'    => 'boolean',
-                    'default' => false,
-                ),
-                'avatarClass' => array(
-                    'type' => 'string',
-                    'default' => 'contact',
-                ),
-                'avatarSize' => array(
-                    'type' => 'number',
-                    'default' => 24,
-                ),
-                'displayOnArchives' => array(
-                    'type'    => 'boolean',
-                    'default' => false,
-                ),
-            )
-        );
-        $this->setDynamic();
-    }
+	/**
+	 * Perform any early setup required by the block
+	 * including setting the block type and supported post types
+	 *
+	 * @return void
+	 */
+	public function initialize()
+	{
+		$this->setBlockType(self::BLOCK_TYPE);
+		$this->setSupportedRoutes(
+			array(
+				'EventEspresso\core\domain\entities\route_match\specifications\admin\EspressoStandardPostTypeEditor',
+				'EventEspresso\core\domain\entities\route_match\specifications\admin\WordPressPostTypeEditor',
+				'EventEspresso\core\domain\entities\route_match\specifications\frontend\EspressoBlockRenderer',
+				'EventEspresso\core\domain\entities\route_match\specifications\frontend\AnyFrontendRequest'
+			)
+		);
+		$EVT_ID = $this->request->getRequestParam('page') === 'espresso_events'
+			? $this->request->getRequestParam('post', 0)
+			: 0;
+		$this->setAttributes(
+			array(
+				'eventId'           => array(
+					'type'    => 'number',
+					'default' => $EVT_ID,
+				),
+				'datetimeId'        => array(
+					'type'    => 'number',
+					'default' => 0,
+				),
+				'ticketId'          => array(
+					'type'    => 'number',
+					'default' => 0,
+				),
+				'status'            => array(
+					'type'    => 'string',
+					'default' => EEM_Registration::status_id_approved,
+				),
+				'limit'             => array(
+					'type'    => 'number',
+					'default' => 10,
+				),
+				'order' => array(
+					'type' => 'string',
+					'default' => 'ASC'
+				),
+				'orderBy' => array(
+					'type' => 'string',
+					'default' => 'lastThenFirstName',
+				),
+				'showGravatar'      => array(
+					'type'    => 'boolean',
+					'default' => false,
+				),
+				'avatarClass' => array(
+					'type' => 'string',
+					'default' => 'contact',
+				),
+				'avatarSize' => array(
+					'type' => 'number',
+					'default' => 24,
+				),
+				'displayOnArchives' => array(
+					'type'    => 'boolean',
+					'default' => false,
+				),
+			)
+		);
+		$this->setDynamic();
+	}
 
 
-    /**
-     * Returns an array where the key corresponds to the incoming attribute name from the WP block
-     * and the value corresponds to the attribute name for the existing EspressoEventAttendees shortcode
-     *
-     * @since $VID:$
-     * @return array
-     */
-    private function getAttributesMap()
-    {
-        return array(
-            'eventId'           => 'absint',
-            'datetimeId'        => 'absint',
-            'ticketId'          => 'absint',
-            'status'            => 'sanitize_text_field',
-            'limit'             => 'intval',
-            'showGravatar'      => 'bool',
-            'avatarClass'       => 'sanitize_text_field',
-            'avatarSize'        => 'absint',
-            'displayOnArchives' => 'bool',
-            'order' => 'sanitize_text_field',
-            'orderBy' => 'sanitize_text_field',
-        );
-    }
+	/**
+	 * Returns an array where the key corresponds to the incoming attribute name from the WP block
+	 * and the value corresponds to the attribute name for the existing EspressoEventAttendees shortcode
+	 *
+	 * @since $VID:$
+	 * @return array
+	 */
+	private function getAttributesMap()
+	{
+		return array(
+			'eventId'           => 'absint',
+			'datetimeId'        => 'absint',
+			'ticketId'          => 'absint',
+			'status'            => 'sanitize_text_field',
+			'limit'             => 'intval',
+			'showGravatar'      => 'bool',
+			'avatarClass'       => 'sanitize_text_field',
+			'avatarSize'        => 'absint',
+			'displayOnArchives' => 'bool',
+			'order' => 'sanitize_text_field',
+			'orderBy' => 'sanitize_text_field',
+		);
+	}
 
 
-    /**
-     * Sanitizes attributes.
-     *
-     * @param array $attributes
-     * @return array
-     */
-    private function sanitizeAttributes(array $attributes)
-    {
-        $sanitized_attributes = array();
-        foreach ($attributes as $attribute => $value) {
-            $convert = $this->getAttributesMap();
-            if (isset($convert[ $attribute ])) {
-                $sanitize = $convert[ $attribute ];
-                if ($sanitize === 'bool') {
-                    $sanitized_attributes[ $attribute ] = filter_var(
-                        $value,
-                        FILTER_VALIDATE_BOOLEAN
-                    );
-                } else {
-                    $sanitized_attributes[ $attribute ] = $sanitize($value);
-                }
-                // don't pass along attributes with a 0 value
-                if ($sanitized_attributes[ $attribute ] === 0) {
-                    unset($sanitized_attributes[ $attribute ]);
-                }
-            }
-        }
-        return $attributes;
-    }
+	/**
+	 * Sanitizes attributes.
+	 *
+	 * @param array $attributes
+	 * @return array
+	 */
+	private function sanitizeAttributes(array $attributes)
+	{
+		$sanitized_attributes = array();
+		foreach ($attributes as $attribute => $value) {
+			$convert = $this->getAttributesMap();
+			if (isset($convert[ $attribute ])) {
+				$sanitize = $convert[ $attribute ];
+				if ($sanitize === 'bool') {
+					$sanitized_attributes[ $attribute ] = filter_var(
+						$value,
+						FILTER_VALIDATE_BOOLEAN
+					);
+				} else {
+					$sanitized_attributes[ $attribute ] = $sanitize($value);
+				}
+				// don't pass along attributes with a 0 value
+				if ($sanitized_attributes[ $attribute ] === 0) {
+					unset($sanitized_attributes[ $attribute ]);
+				}
+			}
+		}
+		return $attributes;
+	}
 
 
-    /**
-     * Returns the rendered HTML for the block
-     *
-     * @param array $attributes
-     * @return string
-     * @throws DomainException
-     * @throws EE_Error
-     */
-    public function renderBlock(array $attributes = array())
-    {
-        $attributes = $this->sanitizeAttributes($attributes);
-        return (is_archive() || is_front_page() || is_home()) && ! $attributes['displayOnArchives']
-            ? ''
-            : $this->renderer->render($attributes);
-    }
+	/**
+	 * Returns the rendered HTML for the block
+	 *
+	 * @param array $attributes
+	 * @return string
+	 * @throws DomainException
+	 * @throws EE_Error
+	 */
+	public function renderBlock(array $attributes = array())
+	{
+		$attributes = $this->sanitizeAttributes($attributes);
+		return (is_archive() || is_front_page() || is_home()) && ! $attributes['displayOnArchives']
+			? ''
+			: $this->renderer->render($attributes);
+	}
 }

core/domain/services/blocks/EventAttendeesBlockRenderer.php

Indentation +91 added lines, -91 removed lines

@@ -20,104 +20,104 @@
 class EventAttendeesBlockRenderer extends BlockRenderer
 {
 
-    /**
-     * @var EEM_Attendee
-     */
-    private $attendee_model;
+	/**
+	 * @var EEM_Attendee
+	 */
+	private $attendee_model;
 
-    public function __construct(DomainInterface $domain, EEM_Attendee $attendee_model)
-    {
-        $this->attendee_model = $attendee_model;
-        parent::__construct($domain);
-    }
+	public function __construct(DomainInterface $domain, EEM_Attendee $attendee_model)
+	{
+		$this->attendee_model = $attendee_model;
+		parent::__construct($domain);
+	}
 
 
-    /**
-     * Renders the block.
-     *
-     * @param array $attributes  Expect already validated and sanitized array of attributes for use in generating the
-     *                           query and the template output.
-     * @return string
-     * @throws DomainException
-     * @throws EE_Error
-     */
-    public function render(array $attributes)
-    {
-        $template_args['attributes'] = $attributes;
-        $template_args['attendees'] = $this->attendee_model->get_all($this->getQueryParams($attributes));
-        return EEH_Template::display_template(
-            $this->templateRootPath() . 'event-attendees.php',
-            $template_args,
-            true
-        );
-    }
+	/**
+	 * Renders the block.
+	 *
+	 * @param array $attributes  Expect already validated and sanitized array of attributes for use in generating the
+	 *                           query and the template output.
+	 * @return string
+	 * @throws DomainException
+	 * @throws EE_Error
+	 */
+	public function render(array $attributes)
+	{
+		$template_args['attributes'] = $attributes;
+		$template_args['attendees'] = $this->attendee_model->get_all($this->getQueryParams($attributes));
+		return EEH_Template::display_template(
+			$this->templateRootPath() . 'event-attendees.php',
+			$template_args,
+			true
+		);
+	}
 
 
-    /**
-     * Get query parameters for model query.
-     *
-     * @param array $attributes
-     * @return array
-     */
-    private function getQueryParams(array $attributes)
-    {
-        return array(
-            0 => $this->getWhereQueryPart($attributes),
-            'default_where_conditions' => 'this_model_only',
-            'limit' => $attributes['limit'],
-            'group_by' => array('ATT_ID'),
-            'order_by' => $this->getOrderByQueryPart($attributes)
-        );
-    }
+	/**
+	 * Get query parameters for model query.
+	 *
+	 * @param array $attributes
+	 * @return array
+	 */
+	private function getQueryParams(array $attributes)
+	{
+		return array(
+			0 => $this->getWhereQueryPart($attributes),
+			'default_where_conditions' => 'this_model_only',
+			'limit' => $attributes['limit'],
+			'group_by' => array('ATT_ID'),
+			'order_by' => $this->getOrderByQueryPart($attributes)
+		);
+	}
 
 
-    /**
-     * Get where query part for query parameters for model query.
-     *
-     * @param array $attributes
-     * @return array
-     */
-    private function getWhereQueryPart(array $attributes)
-    {
-        $where = array();
-        if ($attributes['ticketId'] > 0) {
-            $where['Registration.TKT_ID'] = $attributes['ticketId'];
-        } elseif ($attributes['datetimeId'] > 0) {
-            $where['Registration.Ticket.Datetime.DTT_ID'] = $attributes['datetimeId'];
-        } else {
-            $where['Registration.EVT_ID'] = $attributes['eventId'];
-        }
-        $where['Registration.STS_ID'] = $attributes['status'];
-        return $where;
-    }
+	/**
+	 * Get where query part for query parameters for model query.
+	 *
+	 * @param array $attributes
+	 * @return array
+	 */
+	private function getWhereQueryPart(array $attributes)
+	{
+		$where = array();
+		if ($attributes['ticketId'] > 0) {
+			$where['Registration.TKT_ID'] = $attributes['ticketId'];
+		} elseif ($attributes['datetimeId'] > 0) {
+			$where['Registration.Ticket.Datetime.DTT_ID'] = $attributes['datetimeId'];
+		} else {
+			$where['Registration.EVT_ID'] = $attributes['eventId'];
+		}
+		$where['Registration.STS_ID'] = $attributes['status'];
+		return $where;
+	}
 
 
-    /**
-     * Get order by query part for query parameters for model query.
-     *
-     * @param array $attributes
-     * @return array
-     */
-    private function getOrderByQueryPart(array $attributes)
-    {
-        $order = $attributes['order'];
-        switch ($attributes['orderBy']) {
-            case 'id':
-                $order_by = array('ATT_ID' => $order);
-                break;
-            case 'lastNameOnly':
-                $order_by = array('ATT_lname' => $order);
-                break;
-            case 'firstNameOnly':
-                $order_by = array('ATT_fname' => $order);
-                break;
-            case 'firstThenLastName':
-                $order_by = array('ATT_fname' => $order, 'ATT_lname' => $order);
-                break;
-            default:
-                $order_by = array('ATT_lname' => $order, 'ATT_fname' => $order);
-                break;
-        }
-        return $order_by;
-    }
+	/**
+	 * Get order by query part for query parameters for model query.
+	 *
+	 * @param array $attributes
+	 * @return array
+	 */
+	private function getOrderByQueryPart(array $attributes)
+	{
+		$order = $attributes['order'];
+		switch ($attributes['orderBy']) {
+			case 'id':
+				$order_by = array('ATT_ID' => $order);
+				break;
+			case 'lastNameOnly':
+				$order_by = array('ATT_lname' => $order);
+				break;
+			case 'firstNameOnly':
+				$order_by = array('ATT_fname' => $order);
+				break;
+			case 'firstThenLastName':
+				$order_by = array('ATT_fname' => $order, 'ATT_lname' => $order);
+				break;
+			default:
+				$order_by = array('ATT_lname' => $order, 'ATT_fname' => $order);
+				break;
+		}
+		return $order_by;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
         $template_args['attributes'] = $attributes;
         $template_args['attendees'] = $this->attendee_model->get_all($this->getQueryParams($attributes));
         return EEH_Template::display_template(
-            $this->templateRootPath() . 'event-attendees.php',
+            $this->templateRootPath().'event-attendees.php',
             $template_args,
             true
         );

core/services/blocks/BlockRendererInterface.php

Indentation +7 added lines, -7 removed lines

@@ -14,11 +14,11 @@
 interface BlockRendererInterface
 {
 
-    /**
-     * This receives an array of attributes and returns rendered content for the block using those attributes.
-     *
-     * @param array $attributes
-     * @return string Rendered Content
-     */
-    public function render(array $attributes);
+	/**
+	 * This receives an array of attributes and returns rendered content for the block using those attributes.
+	 *
+	 * @param array $attributes
+	 * @return string Rendered Content
+	 */
+	public function render(array $attributes);
 }

core/domain/entities/route_match/specifications/admin/WordPressPostTypeEditor.php

Indentation +11 added lines, -11 removed lines

@@ -15,15 +15,15 @@
  */
 class WordPressPostTypeEditor extends RouteMatchSpecification
 {
-    /**
-     * returns true if current request matches specification
-     *
-     * @since $VID:$
-     * @return boolean
-     */
-    public function isMatchingRoute()
-    {
-        return strpos($this->request->requestUri(), 'wp-admin/post.php') !== false
-            || strpos($this->request->requestUri(), 'wp-admin/post-new.php') !== false;
-    }
+	/**
+	 * returns true if current request matches specification
+	 *
+	 * @since $VID:$
+	 * @return boolean
+	 */
+	public function isMatchingRoute()
+	{
+		return strpos($this->request->requestUri(), 'wp-admin/post.php') !== false
+			|| strpos($this->request->requestUri(), 'wp-admin/post-new.php') !== false;
+	}
 }

core/libraries/messages/messenger/EE_Pdf_messenger.class.php

Indentation +344 added lines, -344 removed lines

@@ -15,349 +15,349 @@
 {
 
 
-    /**
-     * The following are the properties that this messenger requires for generating pdf
-     */
-
-    /**
-     * This is the pdf body generated by the template via the message type.
-     *
-     * @var string
-     */
-    protected $_content;
-
-
-    /**
-     * This is for the page title that gets displayed.  This will end up being the filename for the generated pdf.
-     *
-     * @var string
-     */
-    protected $_subject;
-
-
-    /**
-     * @return EE_Pdf_messenger
-     */
-    public function __construct()
-    {
-        // set properties
-        $this->name = 'pdf';
-        $this->description = __('This messenger is used for generating a pdf version of the message.', 'event_espresso');
-        $this->label = array(
-            'singular' => __('PDF', 'event_espresso'),
-            'plural' => __('PDFs', 'event_espresso')
-        );
-        $this->activate_on_install = true;
-
-        parent::__construct();
-    }
-
-
-    /**
-     * PDF Messenger desires execution immediately.
-     * @see  parent::send_now() for documentation.
-     * @since  4.9.0
-     * @return bool
-     */
-    public function send_now()
-    {
-        return true;
-    }
-
-
-    /**
-     * HTML Messenger allows an empty to field.
-     * @see parent::allow_empty_to_field() for documentation
-     * @since  4.9.0
-     * @return bool
-     */
-    public function allow_empty_to_field()
-    {
-        return true;
-    }
-
-
-    /**
-     * @see abstract declaration in EE_messenger for details.
-     */
-    protected function _set_admin_pages()
-    {
-        $this->admin_registered_pages = array('events_edit' => false);
-    }
-
-
-    /**
-     * @see abstract declaration in EE_messenger for details.
-     */
-    protected function _set_valid_shortcodes()
-    {
-        $this->_valid_shortcodes = array();
-    }
-
-
-    /**
-     * @see abstract declaration in EE_messenger for details.
-     */
-    protected function _set_validator_config()
-    {
-        $this->_validator_config = array(
-            'subject' => array(
-                'shortcodes' => array('recipient_details', 'organization', 'event', 'ticket', 'venue', 'primary_registration_details', 'event_author', 'email', 'event_meta', 'recipient_list', 'transaction', 'datetime_list', 'datetime')
-            ),
-            'content' => array(
-                'shortcodes' => array('recipient_details', 'organization', 'event', 'ticket', 'venue', 'primary_registration_details', 'event_author', 'email', 'event_meta', 'recipient_list', 'transaction', 'datetime_list', 'datetime')
-            ),
-            'attendee_list' => array(
-                'shortcodes' => array('attendee', 'event_list', 'ticket_list'),
-                'required' => array('[ATTENDEE_LIST]')
-            ),
-            'event_list' => array(
-                'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'venue', 'datetime_list', 'attendee', 'primary_registration_details', 'primary_registration_list', 'event_author', 'recipient_details', 'recipient_list'),
-                'required' => array('[EVENT_LIST]')
-            ),
-            'ticket_list' => array(
-                'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'primary_registration_details', 'recipient_details'),
-                'required' => array('[TICKET_LIST]')
-            ),
-            'datetime_list' => array(
-                'shortcodes' => array('datetime'),
-                'required' => array('[DATETIME_LIST]')
-            ),
-        );
-    }
-
-
-    /**
-     * Takes care of enqueuing any necessary scripts or styles for the page.  A do_action() so message types using this messenger can add their own js.
-     *
-     * @return void.
-     */
-    public function enqueue_scripts_styles()
-    {
-        parent::enqueue_scripts_styles();
-        do_action('AHEE__EE_Pdf_messenger__enqueue_scripts_styles');
-    }
-
-
-    /**
-     * _set_template_fields
-     * This sets up the fields that a messenger requires for the message to go out.
-     *
-     * @access  protected
-     * @return void
-     */
-    protected function _set_template_fields()
-    {
-        // any extra template fields that are NOT used by the messenger but will get used by a messenger field for shortcode replacement get added to the 'extra' key in an associated array indexed by the messenger field they relate to.  This is important for the Messages_admin to know what fields to display to the user.  Also, notice that the "values" are equal to the field type that messages admin will use to know what kind of field to display. The values ALSO have one index labeled "shortcode".  the values in that array indicate which ACTUAL SHORTCODE (i.e. [SHORTCODE]) is required in order for this extra field to be displayed.  If the required shortcode isn't part of the shortcodes array then the field is not needed and will not be displayed/parsed.
-        $this->_template_fields = array(
-            'subject' => array(
-                'input' => 'text',
-                'label' => __('Page Title', 'event_espresso'),
-                'type' => 'string',
-                'required' => true,
-                'validation' => true,
-                'css_class' => 'large-text',
-                'format' => '%s'
-            ),
-            'content' => '', // left empty b/c it is in the "extra array" but messenger still needs needs to know this is a field.
-            'extra' => array(
-                'content' => array(
-                    'main' => array(
-                        'input' => 'wp_editor',
-                        'label' => __('Main Content', 'event_espresso'),
-                        'type' => 'string',
-                        'required' => true,
-                        'validation' => true,
-                        'format' => '%s',
-                        'rows' => '15'
-                    ),
-                    'event_list' => array(
-                        'input' => 'wp_editor',
-                        'label' => '[EVENT_LIST]',
-                        'type' => 'string',
-                        'required' => true,
-                        'validation' => true,
-                        'format' => '%s',
-                        'rows' => '15',
-                        'shortcodes_required' => array('[EVENT_LIST]')
-                    ),
-                    'attendee_list' => array(
-                        'input' => 'textarea',
-                        'label' => '[ATTENDEE_LIST]',
-                        'type' => 'string',
-                        'required' => true,
-                        'validation' => true,
-                        'format' => '%s',
-                        'css_class' => 'large-text',
-                        'rows' => '5',
-                        'shortcodes_required' => array('[ATTENDEE_LIST]')
-                    ),
-                    'ticket_list' => array(
-                        'input' => 'textarea',
-                        'label' => '[TICKET_LIST]',
-                        'type' => 'string',
-                        'required' => true,
-                        'validation' => true,
-                        'format' => '%s',
-                        'css_class' => 'large-text',
-                        'rows' => '10',
-                        'shortcodes_required' => array('[TICKET_LIST]')
-                    ),
-                    'datetime_list' => array(
-                        'input' => 'textarea',
-                        'label' => '[DATETIME_LIST]',
-                        'type' => 'string',
-                        'required' => true,
-                        'validation' => true,
-                        'format' => '%s',
-                        'css_class' => 'large-text',
-                        'rows' => '10',
-                        'shortcodes_required' => array('[DATETIME_LIST]')
-                    )
-                )
-            )
-        );
-    }
-
-
-    /**
-     * @see definition of this method in parent
-     *
-     * @since 4.5.0
-     *
-     */
-    protected function _set_default_message_types()
-    {
-        // note currently PDF is only a secondary messenger so it never has any associated message types.
-        $this->_default_message_types = array();
-    }
-
-
-    /**
-     * @see definition of this method in parent
-     *
-     * @since 4.5.0
-     */
-    protected function _set_valid_message_types()
-    {
-        $this->_valid_message_types = array();
-    }
-
-
-    /**
-     * Generates html version of the message content and then sends it to the pdf generator.
-     *
-     *
-     * @since 4.5.0
-     *
-     * @return string.
-     */
-    protected function _send_message()
-    {
-        $this->_template_args = array(
-            'page_title' => $this->_subject,
-            'base_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, true, 'base', $this->_variation),
-            'print_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, true, 'print', $this->_variation),
-            'main_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, true, 'main', $this->_variation),
-            'extra_css' => EE_LIBRARIES_URL . 'messages/defaults/default/variations/pdf_base_default.css',
-            'main_body' => apply_filters('FHEE__EE_Pdf_messenger___send_message__main_body', wpautop($this->_content), $this->_content)
-        );
-        $this->_deregister_wp_hooks();
-        add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts_styles'));
-        $content = $this->_get_main_template();
+	/**
+	 * The following are the properties that this messenger requires for generating pdf
+	 */
+
+	/**
+	 * This is the pdf body generated by the template via the message type.
+	 *
+	 * @var string
+	 */
+	protected $_content;
+
+
+	/**
+	 * This is for the page title that gets displayed.  This will end up being the filename for the generated pdf.
+	 *
+	 * @var string
+	 */
+	protected $_subject;
+
+
+	/**
+	 * @return EE_Pdf_messenger
+	 */
+	public function __construct()
+	{
+		// set properties
+		$this->name = 'pdf';
+		$this->description = __('This messenger is used for generating a pdf version of the message.', 'event_espresso');
+		$this->label = array(
+			'singular' => __('PDF', 'event_espresso'),
+			'plural' => __('PDFs', 'event_espresso')
+		);
+		$this->activate_on_install = true;
+
+		parent::__construct();
+	}
+
+
+	/**
+	 * PDF Messenger desires execution immediately.
+	 * @see  parent::send_now() for documentation.
+	 * @since  4.9.0
+	 * @return bool
+	 */
+	public function send_now()
+	{
+		return true;
+	}
+
+
+	/**
+	 * HTML Messenger allows an empty to field.
+	 * @see parent::allow_empty_to_field() for documentation
+	 * @since  4.9.0
+	 * @return bool
+	 */
+	public function allow_empty_to_field()
+	{
+		return true;
+	}
+
+
+	/**
+	 * @see abstract declaration in EE_messenger for details.
+	 */
+	protected function _set_admin_pages()
+	{
+		$this->admin_registered_pages = array('events_edit' => false);
+	}
+
+
+	/**
+	 * @see abstract declaration in EE_messenger for details.
+	 */
+	protected function _set_valid_shortcodes()
+	{
+		$this->_valid_shortcodes = array();
+	}
+
+
+	/**
+	 * @see abstract declaration in EE_messenger for details.
+	 */
+	protected function _set_validator_config()
+	{
+		$this->_validator_config = array(
+			'subject' => array(
+				'shortcodes' => array('recipient_details', 'organization', 'event', 'ticket', 'venue', 'primary_registration_details', 'event_author', 'email', 'event_meta', 'recipient_list', 'transaction', 'datetime_list', 'datetime')
+			),
+			'content' => array(
+				'shortcodes' => array('recipient_details', 'organization', 'event', 'ticket', 'venue', 'primary_registration_details', 'event_author', 'email', 'event_meta', 'recipient_list', 'transaction', 'datetime_list', 'datetime')
+			),
+			'attendee_list' => array(
+				'shortcodes' => array('attendee', 'event_list', 'ticket_list'),
+				'required' => array('[ATTENDEE_LIST]')
+			),
+			'event_list' => array(
+				'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'venue', 'datetime_list', 'attendee', 'primary_registration_details', 'primary_registration_list', 'event_author', 'recipient_details', 'recipient_list'),
+				'required' => array('[EVENT_LIST]')
+			),
+			'ticket_list' => array(
+				'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'primary_registration_details', 'recipient_details'),
+				'required' => array('[TICKET_LIST]')
+			),
+			'datetime_list' => array(
+				'shortcodes' => array('datetime'),
+				'required' => array('[DATETIME_LIST]')
+			),
+		);
+	}
+
+
+	/**
+	 * Takes care of enqueuing any necessary scripts or styles for the page.  A do_action() so message types using this messenger can add their own js.
+	 *
+	 * @return void.
+	 */
+	public function enqueue_scripts_styles()
+	{
+		parent::enqueue_scripts_styles();
+		do_action('AHEE__EE_Pdf_messenger__enqueue_scripts_styles');
+	}
+
+
+	/**
+	 * _set_template_fields
+	 * This sets up the fields that a messenger requires for the message to go out.
+	 *
+	 * @access  protected
+	 * @return void
+	 */
+	protected function _set_template_fields()
+	{
+		// any extra template fields that are NOT used by the messenger but will get used by a messenger field for shortcode replacement get added to the 'extra' key in an associated array indexed by the messenger field they relate to.  This is important for the Messages_admin to know what fields to display to the user.  Also, notice that the "values" are equal to the field type that messages admin will use to know what kind of field to display. The values ALSO have one index labeled "shortcode".  the values in that array indicate which ACTUAL SHORTCODE (i.e. [SHORTCODE]) is required in order for this extra field to be displayed.  If the required shortcode isn't part of the shortcodes array then the field is not needed and will not be displayed/parsed.
+		$this->_template_fields = array(
+			'subject' => array(
+				'input' => 'text',
+				'label' => __('Page Title', 'event_espresso'),
+				'type' => 'string',
+				'required' => true,
+				'validation' => true,
+				'css_class' => 'large-text',
+				'format' => '%s'
+			),
+			'content' => '', // left empty b/c it is in the "extra array" but messenger still needs needs to know this is a field.
+			'extra' => array(
+				'content' => array(
+					'main' => array(
+						'input' => 'wp_editor',
+						'label' => __('Main Content', 'event_espresso'),
+						'type' => 'string',
+						'required' => true,
+						'validation' => true,
+						'format' => '%s',
+						'rows' => '15'
+					),
+					'event_list' => array(
+						'input' => 'wp_editor',
+						'label' => '[EVENT_LIST]',
+						'type' => 'string',
+						'required' => true,
+						'validation' => true,
+						'format' => '%s',
+						'rows' => '15',
+						'shortcodes_required' => array('[EVENT_LIST]')
+					),
+					'attendee_list' => array(
+						'input' => 'textarea',
+						'label' => '[ATTENDEE_LIST]',
+						'type' => 'string',
+						'required' => true,
+						'validation' => true,
+						'format' => '%s',
+						'css_class' => 'large-text',
+						'rows' => '5',
+						'shortcodes_required' => array('[ATTENDEE_LIST]')
+					),
+					'ticket_list' => array(
+						'input' => 'textarea',
+						'label' => '[TICKET_LIST]',
+						'type' => 'string',
+						'required' => true,
+						'validation' => true,
+						'format' => '%s',
+						'css_class' => 'large-text',
+						'rows' => '10',
+						'shortcodes_required' => array('[TICKET_LIST]')
+					),
+					'datetime_list' => array(
+						'input' => 'textarea',
+						'label' => '[DATETIME_LIST]',
+						'type' => 'string',
+						'required' => true,
+						'validation' => true,
+						'format' => '%s',
+						'css_class' => 'large-text',
+						'rows' => '10',
+						'shortcodes_required' => array('[DATETIME_LIST]')
+					)
+				)
+			)
+		);
+	}
+
+
+	/**
+	 * @see definition of this method in parent
+	 *
+	 * @since 4.5.0
+	 *
+	 */
+	protected function _set_default_message_types()
+	{
+		// note currently PDF is only a secondary messenger so it never has any associated message types.
+		$this->_default_message_types = array();
+	}
+
+
+	/**
+	 * @see definition of this method in parent
+	 *
+	 * @since 4.5.0
+	 */
+	protected function _set_valid_message_types()
+	{
+		$this->_valid_message_types = array();
+	}
+
+
+	/**
+	 * Generates html version of the message content and then sends it to the pdf generator.
+	 *
+	 *
+	 * @since 4.5.0
+	 *
+	 * @return string.
+	 */
+	protected function _send_message()
+	{
+		$this->_template_args = array(
+			'page_title' => $this->_subject,
+			'base_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, true, 'base', $this->_variation),
+			'print_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, true, 'print', $this->_variation),
+			'main_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, true, 'main', $this->_variation),
+			'extra_css' => EE_LIBRARIES_URL . 'messages/defaults/default/variations/pdf_base_default.css',
+			'main_body' => apply_filters('FHEE__EE_Pdf_messenger___send_message__main_body', wpautop($this->_content), $this->_content)
+		);
+		$this->_deregister_wp_hooks();
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts_styles'));
+		$content = $this->_get_main_template();
 //      die( $content );
-        $this->_do_pdf($content);
-        exit(0);
-    }
-
-
-    /**
-     * The purpose of this function is to de register all actions hooked into wp_head and wp_footer so that it doesn't interfere with our templates.  If users want to add any custom styles or scripts they must use the AHEE__EE_Pdf_messenger__enqueue_scripts_styles hook.
-     *
-     * @since 4.5.0
-     *
-     * @return void
-     */
-    protected function _deregister_wp_hooks()
-    {
-        remove_all_actions('wp_head');
-        remove_all_actions('wp_footer');
-        remove_all_actions('wp_print_footer_scripts');
-        remove_all_actions('wp_enqueue_scripts');
-        global $wp_scripts, $wp_styles;
-        $wp_scripts = $wp_styles = array();
-
-        // just add back in wp_enqueue_scripts and wp_print_footer_scripts cause that's all we want to load.
-        add_action('wp_head', 'wp_enqueue_scripts');
-        add_action('wp_footer', 'wp_print_footer_scripts');
-        add_action('wp_print_footer_scripts', '_wp_footer_scripts');
-    }
-
-
-    /**
-     * Overwrite parent _get_main_template for pdf purposes.
-     *
-     * @since  4.5.0
-     *
-     * @param bool $preview
-     * @return string
-     */
-    protected function _get_main_template($preview = false)
-    {
-        $wrapper_template = $this->_tmp_pack->get_wrapper('html', 'main');
-        // add message type to template_args
-        $this->_template_args['message_type'] = $this->_incoming_message_type;
-        return EEH_Template::display_template($wrapper_template, $this->_template_args, true);
-    }
-
-
-    /**
-     * This takes care of loading the dompdf library and generating the actual pdf
-     *
-     * @param string $content This is the generated html content being converted into a pdf.
-     *
-     * @return void
-     */
-    protected function _do_pdf($content = '')
-    {
-        $invoice_name = $this->_subject;
-
-        // only load dompdf if nobody else has yet...
-        if (! class_exists('Dompdf\Dompdf')) {
-            require_once(EE_THIRD_PARTY . 'dompdf/src/Autoloader.php');
-            Dompdf\Autoloader::register();
-        }
-        $options = new Dompdf\Options();
-        $options->set('isRemoteEnabled', true);
-        $options->set('isJavascriptEnabled', false);
-        if (defined('DOMPDF_FONT_DIR')) {
-            $options->setFontDir(DOMPDF_FONT_DIR);
-            $options->setFontCache(DOMPDF_FONT_DIR);
-        }
-        // Allow changing the paper size.
-        if (defined('DOMPDF_DEFAULT_PAPER_SIZE')) {
-            $options->set('defaultPaperSize', DOMPDF_DEFAULT_PAPER_SIZE);
-        }
-        $dompdf = new Dompdf\Dompdf($options);
-        // Remove all spaces between HTML tags
-        $content = preg_replace('/>\s+</', '><', $content);
-        $dompdf->loadHtml($content);
-        $dompdf->render();
-        // forcing the browser to open a download dialog.
-        $dompdf->stream($invoice_name . ".pdf", array('Attachment' => true));
-    }
-
-
-    /**
-     * @return string
-     */
-    protected function _preview()
-    {
-        return $this->_send_message();
-    }
-
-
-    protected function _set_admin_settings_fields()
-    {
-    }
+		$this->_do_pdf($content);
+		exit(0);
+	}
+
+
+	/**
+	 * The purpose of this function is to de register all actions hooked into wp_head and wp_footer so that it doesn't interfere with our templates.  If users want to add any custom styles or scripts they must use the AHEE__EE_Pdf_messenger__enqueue_scripts_styles hook.
+	 *
+	 * @since 4.5.0
+	 *
+	 * @return void
+	 */
+	protected function _deregister_wp_hooks()
+	{
+		remove_all_actions('wp_head');
+		remove_all_actions('wp_footer');
+		remove_all_actions('wp_print_footer_scripts');
+		remove_all_actions('wp_enqueue_scripts');
+		global $wp_scripts, $wp_styles;
+		$wp_scripts = $wp_styles = array();
+
+		// just add back in wp_enqueue_scripts and wp_print_footer_scripts cause that's all we want to load.
+		add_action('wp_head', 'wp_enqueue_scripts');
+		add_action('wp_footer', 'wp_print_footer_scripts');
+		add_action('wp_print_footer_scripts', '_wp_footer_scripts');
+	}
+
+
+	/**
+	 * Overwrite parent _get_main_template for pdf purposes.
+	 *
+	 * @since  4.5.0
+	 *
+	 * @param bool $preview
+	 * @return string
+	 */
+	protected function _get_main_template($preview = false)
+	{
+		$wrapper_template = $this->_tmp_pack->get_wrapper('html', 'main');
+		// add message type to template_args
+		$this->_template_args['message_type'] = $this->_incoming_message_type;
+		return EEH_Template::display_template($wrapper_template, $this->_template_args, true);
+	}
+
+
+	/**
+	 * This takes care of loading the dompdf library and generating the actual pdf
+	 *
+	 * @param string $content This is the generated html content being converted into a pdf.
+	 *
+	 * @return void
+	 */
+	protected function _do_pdf($content = '')
+	{
+		$invoice_name = $this->_subject;
+
+		// only load dompdf if nobody else has yet...
+		if (! class_exists('Dompdf\Dompdf')) {
+			require_once(EE_THIRD_PARTY . 'dompdf/src/Autoloader.php');
+			Dompdf\Autoloader::register();
+		}
+		$options = new Dompdf\Options();
+		$options->set('isRemoteEnabled', true);
+		$options->set('isJavascriptEnabled', false);
+		if (defined('DOMPDF_FONT_DIR')) {
+			$options->setFontDir(DOMPDF_FONT_DIR);
+			$options->setFontCache(DOMPDF_FONT_DIR);
+		}
+		// Allow changing the paper size.
+		if (defined('DOMPDF_DEFAULT_PAPER_SIZE')) {
+			$options->set('defaultPaperSize', DOMPDF_DEFAULT_PAPER_SIZE);
+		}
+		$dompdf = new Dompdf\Dompdf($options);
+		// Remove all spaces between HTML tags
+		$content = preg_replace('/>\s+</', '><', $content);
+		$dompdf->loadHtml($content);
+		$dompdf->render();
+		// forcing the browser to open a download dialog.
+		$dompdf->stream($invoice_name . ".pdf", array('Attachment' => true));
+	}
+
+
+	/**
+	 * @return string
+	 */
+	protected function _preview()
+	{
+		return $this->_send_message();
+	}
+
+
+	protected function _set_admin_settings_fields()
+	{
+	}
 }

espresso.php

Indentation +80 added lines, -80 removed lines

@@ -38,103 +38,103 @@
  * @since           4.0
  */
 if (function_exists('espresso_version')) {
-    if (! function_exists('espresso_duplicate_plugin_error')) {
-        /**
-         *    espresso_duplicate_plugin_error
-         *    displays if more than one version of EE is activated at the same time
-         */
-        function espresso_duplicate_plugin_error()
-        {
-            ?>
+	if (! function_exists('espresso_duplicate_plugin_error')) {
+		/**
+		 *    espresso_duplicate_plugin_error
+		 *    displays if more than one version of EE is activated at the same time
+		 */
+		function espresso_duplicate_plugin_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    echo esc_html__(
-                        'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
-                        'event_espresso'
-                    ); ?>
+					echo esc_html__(
+						'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
+						'event_espresso'
+					); ?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
-    }
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
+	}
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 } else {
-    define('EE_MIN_PHP_VER_REQUIRED', '5.4.0');
-    if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
-        /**
-         * espresso_minimum_php_version_error
-         *
-         * @return void
-         */
-        function espresso_minimum_php_version_error()
-        {
-            ?>
+	define('EE_MIN_PHP_VER_REQUIRED', '5.4.0');
+	if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
+		/**
+		 * espresso_minimum_php_version_error
+		 *
+		 * @return void
+		 */
+		function espresso_minimum_php_version_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    printf(
-                        esc_html__(
-                            'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                            'event_espresso'
-                        ),
-                        EE_MIN_PHP_VER_REQUIRED,
-                        PHP_VERSION,
-                        '<br/>',
-                        '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
-                    );
-                    ?>
+					printf(
+						esc_html__(
+							'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+							'event_espresso'
+						),
+						EE_MIN_PHP_VER_REQUIRED,
+						PHP_VERSION,
+						'<br/>',
+						'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
+					);
+					?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
 
-        add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
-    } else {
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
-        /**
-         * espresso_version
-         * Returns the plugin version
-         *
-         * @return string
-         */
-        function espresso_version()
-        {
-            return apply_filters('FHEE__espresso__espresso_version', '4.9.70.rc.015');
-        }
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
+	} else {
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
+		/**
+		 * espresso_version
+		 * Returns the plugin version
+		 *
+		 * @return string
+		 */
+		function espresso_version()
+		{
+			return apply_filters('FHEE__espresso__espresso_version', '4.9.70.rc.015');
+		}
 
-        /**
-         * espresso_plugin_activation
-         * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
-         */
-        function espresso_plugin_activation()
-        {
-            update_option('ee_espresso_activation', true);
-        }
+		/**
+		 * espresso_plugin_activation
+		 * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
+		 */
+		function espresso_plugin_activation()
+		{
+			update_option('ee_espresso_activation', true);
+		}
 
-        register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
 
-        require_once __DIR__ . '/core/bootstrap_espresso.php';
-        bootstrap_espresso();
-    }
+		require_once __DIR__ . '/core/bootstrap_espresso.php';
+		bootstrap_espresso();
+	}
 }
 if (! function_exists('espresso_deactivate_plugin')) {
-    /**
-     *    deactivate_plugin
-     * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
-     *
-     * @access public
-     * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
-     * @return    void
-     */
-    function espresso_deactivate_plugin($plugin_basename = '')
-    {
-        if (! function_exists('deactivate_plugins')) {
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
-        }
-        unset($_GET['activate'], $_REQUEST['activate']);
-        deactivate_plugins($plugin_basename);
-    }
+	/**
+	 *    deactivate_plugin
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
+	 *
+	 * @access public
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
+	 * @return    void
+	 */
+	function espresso_deactivate_plugin($plugin_basename = '')
+	{
+		if (! function_exists('deactivate_plugins')) {
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
+	}
 }

core/services/blocks/BlockRenderer.php

Indentation +40 added lines, -40 removed lines

@@ -14,44 +14,44 @@
 abstract class BlockRenderer implements BlockRendererInterface
 {
 
-    /**
-     * @var DomainInterface
-     */
-    protected $domain;
-
-    /**
-     * @var string
-     */
-    private $template_root_path;
-
-
-    /**
-     * BlockRenderer constructor.
-     *
-     * @param DomainInterface $domain
-     */
-    public function __construct(DomainInterface $domain)
-    {
-        $this->domain = $domain;
-        $this->setTemplateRootPath();
-    }
-
-
-    /**
-     * Sets the root path to the main block template.
-     */
-    private function setTemplateRootPath()
-    {
-        $this->template_root_path = $this->domain->pluginPath() . 'ui/blocks/';
-    }
-
-
-    /**
-     * Exposes the root path for the main block template.
-     * @return string
-     */
-    public function templateRootPath()
-    {
-        return $this->template_root_path;
-    }
+	/**
+	 * @var DomainInterface
+	 */
+	protected $domain;
+
+	/**
+	 * @var string
+	 */
+	private $template_root_path;
+
+
+	/**
+	 * BlockRenderer constructor.
+	 *
+	 * @param DomainInterface $domain
+	 */
+	public function __construct(DomainInterface $domain)
+	{
+		$this->domain = $domain;
+		$this->setTemplateRootPath();
+	}
+
+
+	/**
+	 * Sets the root path to the main block template.
+	 */
+	private function setTemplateRootPath()
+	{
+		$this->template_root_path = $this->domain->pluginPath() . 'ui/blocks/';
+	}
+
+
+	/**
+	 * Exposes the root path for the main block template.
+	 * @return string
+	 */
+	public function templateRootPath()
+	{
+		return $this->template_root_path;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      */
     private function setTemplateRootPath()
     {
-        $this->template_root_path = $this->domain->pluginPath() . 'ui/blocks/';
+        $this->template_root_path = $this->domain->pluginPath().'ui/blocks/';
     }
 
 

ui/blocks/event-attendees.php

Indentation +25 added lines, -25 removed lines

@@ -11,30 +11,30 @@
 <div id="ee-block-event-attendees" class="ee-core-blocks event-espresso-blocks event-attendees">
     <ul>
         <?php
-        foreach ($attendees as $attendee) {
-            $gravatar = $attributes['showGravatar']
-                ? get_avatar_url(
-                    $attendee->email(),
-                    array(
-                        'default' => 'mm',
-                        'width'   => $attributes['avatarSize'],
-                        'height'  => $attributes['avatarSize']
-                    )
-                )
-                : '';
-            $gravatar_class = $attributes['avatarClass']
-                ? $attributes['avatarClass'] . ' contact-avatar-img avatar'
-                : 'contact-avatar-img avatar';
-            $gravatar = $gravatar !== ''
-                ? '<div class="contact-image-wrap-div">'
-                    . '<img class="' . $gravatar_class . '"'
-                    . ' width="' . $attributes['avatarSize'] . '"'
-                    . ' height="' . $attributes['avatarSize'] . '"'
-                    . ' src="' . $gravatar . '" alt="contact avatar">'
-                    . '</div>'
-                : '';
-            echo "<li>{$gravatar}<span>{$attendee->full_name()}</span>";
-        }
-        ?>
+		foreach ($attendees as $attendee) {
+			$gravatar = $attributes['showGravatar']
+				? get_avatar_url(
+					$attendee->email(),
+					array(
+						'default' => 'mm',
+						'width'   => $attributes['avatarSize'],
+						'height'  => $attributes['avatarSize']
+					)
+				)
+				: '';
+			$gravatar_class = $attributes['avatarClass']
+				? $attributes['avatarClass'] . ' contact-avatar-img avatar'
+				: 'contact-avatar-img avatar';
+			$gravatar = $gravatar !== ''
+				? '<div class="contact-image-wrap-div">'
+					. '<img class="' . $gravatar_class . '"'
+					. ' width="' . $attributes['avatarSize'] . '"'
+					. ' height="' . $attributes['avatarSize'] . '"'
+					. ' src="' . $gravatar . '" alt="contact avatar">'
+					. '</div>'
+				: '';
+			echo "<li>{$gravatar}<span>{$attendee->full_name()}</span>";
+		}
+		?>
     </ul>
 </div>

Spacing +5 added lines, -5 removed lines

@@ -23,14 +23,14 @@
                 )
                 : '';
             $gravatar_class = $attributes['avatarClass']
-                ? $attributes['avatarClass'] . ' contact-avatar-img avatar'
+                ? $attributes['avatarClass'].' contact-avatar-img avatar'
                 : 'contact-avatar-img avatar';
             $gravatar = $gravatar !== ''
                 ? '<div class="contact-image-wrap-div">'
-                    . '<img class="' . $gravatar_class . '"'
-                    . ' width="' . $attributes['avatarSize'] . '"'
-                    . ' height="' . $attributes['avatarSize'] . '"'
-                    . ' src="' . $gravatar . '" alt="contact avatar">'
+                    . '<img class="'.$gravatar_class.'"'
+                    . ' width="'.$attributes['avatarSize'].'"'
+                    . ' height="'.$attributes['avatarSize'].'"'
+                    . ' src="'.$gravatar.'" alt="contact avatar">'
                     . '</div>'
                 : '';
             echo "<li>{$gravatar}<span>{$attendee->full_name()}</span>";