blitze / phpBB-ext-sitemaker_content

services/form/field/image.php

Spacing +7 added lines, -7 removed lines

@@ -52,7 +52,7 @@ 
 		$value = $this->request->variable($data['field_name'], $data['field_value']);
 		$value = $this->get_image_src($value);
 
-		return ($value) ? '[img]' . $value . '[/img]' : '';
+		return ($value) ? '[img]'.$value.'[/img]' : '';
 	}
 
 	/**
@@ -77,7 +77,7 @@ 
 
 		$this->set_filemanager($data);
 		$this->ptemplate->assign_vars($data);
-		$field = $this->ptemplate->render_view('blitze/content', "fields/image.html", $field . '_field');
+		$field = $this->ptemplate->render_view('blitze/content', "fields/image.html", $field.'_field');
 
 		$data['field_value'] = $bbcode_value;
 
@@ -137,14 +137,14 @@ 
 	 */
 	private function get_image_html($image, $mode, $title, array $field_props)
 	{
-		$image = $image ?: '<img src="' . $field_props['default'] . '" class="postimage" alt="' . $title . '" />';
+		$image = $image ?: '<img src="'.$field_props['default'].'" class="postimage" alt="'.$title.'" />';
 
-		$html = '<figure class="img-ui">' . $image . '</figure>';
+		$html = '<figure class="img-ui">'.$image.'</figure>';
 		if ($mode !== 'block')
 		{
-			$view_props = array_fill_keys(array($mode . '_size', $mode . '_align'), '');
+			$view_props = array_fill_keys(array($mode.'_size', $mode.'_align'), '');
 			$image_props = array_filter(array_intersect_key($field_props, $view_props));
-			$html = '<div class="' . join(' ', $image_props) . '">' . $html . '</div>';
+			$html = '<div class="'.join(' ', $image_props).'">'.$html.'</div>';
 		}
 		return $html;
 	}
@@ -159,7 +159,7 @@ 
 		{
 			$data['filemanager_path'] = append_sid("{$this->phpbb_root_path}ResponsiveFilemanager/filemanager/dialog.$this->php_ext", array(
 				'type'			=> 1,
-				'field_id'		=> 'smc-' . $data['field_name'],
+				'field_id'		=> 'smc-'.$data['field_name'],
 				'akey'			=> $this->filemanager->get_access_key(),
 			));
 		}

services/form/field/share.php

Spacing +9 added lines, -9 removed lines

@@ -58,22 +58,22 @@
 				'@blitze_content/assets/fields/display.min.js',
 			),
 			'css'	=> array(
-				'@blitze_content/assets/fields/share/' . $props['theme'] . '.min.css',
+				'@blitze_content/assets/fields/share/'.$props['theme'].'.min.css',
 			)
 		));
 
 		$classes = ['social-share', $props['corners'], $props['placement']];
 		$attributes = [
-			'class="' . join(' ', array_filter($classes)) . '"',
-			'data-show-label="' . $props['show_label'] . '"',
-			'data-show-count="' . $props['show_count'] . '"',
-			'data-share-in="' . $props['sharein'] . '"',
-			'data-shares="' . join(',', $props['defaults']) . '"',
-			'data-url="' . $topic_data['PERMA_LINK'] . '"',
-			'style="font-size: ' . $props['size'] . 'px"',
+			'class="'.join(' ', array_filter($classes)).'"',
+			'data-show-label="'.$props['show_label'].'"',
+			'data-show-count="'.$props['show_count'].'"',
+			'data-share-in="'.$props['sharein'].'"',
+			'data-shares="'.join(',', $props['defaults']).'"',
+			'data-url="'.$topic_data['PERMA_LINK'].'"',
+			'style="font-size: '.$props['size'].'px"',
 		];
 
-		return '<div ' . join(' ', $attributes) . '></div>';
+		return '<div '.join(' ', $attributes).'></div>';
 	}
 
 	/**

services/form/field/telephone.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 	 */
 	public function display_field(array $data, array $topic_data, $view_mode)
 	{
-		return $data['field_value'] ? '<a href="tel:' . $data['field_value'] . '">' . preg_replace("/^1?(\d{3})(\d{3})(\d{4})$/", "$1-$2-$3", $data['field_value']) . '</a>' : '';
+		return $data['field_value'] ? '<a href="tel:'.$data['field_value'].'">'.preg_replace("/^1?(\d{3})(\d{3})(\d{4})$/", "$1-$2-$3", $data['field_value']).'</a>' : '';
 	}
 
 	/**

blocks/swiper.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 				'pagination'		=> array('lang' => 'SWIPER_PAGINATION', 'validate' => 'string', 'type' => 'select', 'options' => $pagination_options, 'default' => 1),
 				'effect'			=> array('lang' => 'SWIPER_EFFECT', 'validate' => 'string', 'type' => 'select', 'options' => $effect_options, 'default' => 'slide'),
 				'parallax'			=> array('lang' => 'SWIPER_PARALLAX_IMAGE_URL', 'validate' => 'string', 'type' => 'text', 'default' => ''),
-				'direction'			=> array('lang' => 'SWIPER_DIRECTION', 'validate' => 'string', 'type' => 'select:1:0:direction', 'options' => $direction_options, 'default' => 'horizontal', 'append' => '<div id="direction-vertical" class="error small">' . $this->language->lang('SWIPER_HEIGHT_REQUIRED') . '</div>'),
+				'direction'			=> array('lang' => 'SWIPER_DIRECTION', 'validate' => 'string', 'type' => 'select:1:0:direction', 'options' => $direction_options, 'default' => 'horizontal', 'append' => '<div id="direction-vertical" class="error small">'.$this->language->lang('SWIPER_HEIGHT_REQUIRED').'</div>'),
 				'height'			=> array('lang' => 'SWIPER_HEIGHT', 'validate' => 'int:0', 'type' => 'number:0', 'default' => 0, 'append' => 'PIXEL'),
 				'thumbs'			=> array('lang' => 'SWIPER_THUMBNAILS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'default' => 0),
 				'loop'				=> array('lang' => 'SWIPER_LOOP', 'validate' => 'bool', 'type' => 'radio:yes_no', 'default' => 1),

blocks/recent.php

Spacing +5 added lines, -5 removed lines

@@ -171,17 +171,17 @@ 
 			$topic_tracking_info = $this->forum->get_topic_tracking_info($forum_id);
 			$block_fields = $this->get_block_fields($entity->get_field_types());
 
-			$this->fields->prepare_to_show($entity, array_keys($topics_data), $block_fields, $this->settings['block_tpl'], 'block', $block_id . '_block');
+			$this->fields->prepare_to_show($entity, array_keys($topics_data), $block_fields, $this->settings['block_tpl'], 'block', $block_id.'_block');
 
 			$update_count = array();
 			foreach ($topics_data as $topic_id => $topic_data)
 			{
-				$post_data	= array_shift($posts_data[$topic_id]);
+				$post_data = array_shift($posts_data[$topic_id]);
 				$this->ptemplate->assign_block_vars('topicrow', $this->fields->show($type, $topic_data, $post_data, $users_cache, $attachments, $update_count, $topic_tracking_info));
 			}
 			unset($topics_data, $posts_data, $users_cache, $attachments, $topic_tracking_info);
 
-			$content = $this->ptemplate->render_view('blitze/content', "blocks/{$this->tpl_name}.html", $this->tpl_name . '_block');
+			$content = $this->ptemplate->render_view('blitze/content', "blocks/{$this->tpl_name}.html", $this->tpl_name.'_block');
 		}
 
 		return array(
@@ -202,7 +202,7 @@ 
 			POST_STICKY		=> 'CONTENT_STICKY_POSTS',
 		);
 
-		return $this->language->lang((isset($topic_types[$this->settings['topic_type']])) ? $topic_types[$this->settings['topic_type']] : 'CONTENT_' . $this->sort_options[$this->settings['sort_key']], $content_langname);
+		return $this->language->lang((isset($topic_types[$this->settings['topic_type']])) ? $topic_types[$this->settings['topic_type']] : 'CONTENT_'.$this->sort_options[$this->settings['sort_key']], $content_langname);
 	}
 
 	/**
@@ -269,7 +269,7 @@ 
 		foreach ($content_types as $value => $title)
 		{
 			$selected = ($type == $value) ? ' selected="selected"' : '';
-			$html .= '<option value="' . $value . '"' . $selected . ' data-toggle-setting="#fields-col-' . $value . '">' . $title . '</option>';
+			$html .= '<option value="'.$value.'"'.$selected.' data-toggle-setting="#fields-col-'.$value.'">'.$title.'</option>';
 		}
 
 		return $html;

event/listener.php

Indentation +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 	 * @param \phpbb\language\language				$language			Language object
 	 * @param \blitze\content\services\types		$content_types		Content types object
 	 * @param string								$php_ext			php file extension
-	*/
+	 */
 	public function __construct(\phpbb\controller\helper $helper, \phpbb\language\language $language, \blitze\content\services\types $content_types, $php_ext)
 	{
 		$this->helper = $helper;
@@ -130,8 +130,8 @@ 
 
 		foreach ($list as $type => $entity)
 		{
-            /** @var \blitze\content\model\entity\type $entity */
-            $text .= "\t" . $entity->get_content_langname() . '|';
+			/** @var \blitze\content\model\entity\type $entity */
+			$text .= "\t" . $entity->get_content_langname() . '|';
 			$text .= $this->helper->route('blitze_content_type', array('type' => $type), false, '', UrlGeneratorInterface::RELATIVE_PATH) . "\n";
 		}
 

Spacing +4 added lines, -4 removed lines

@@ -86,7 +86,7 @@ 
 	 */
 	public function add_viewonline_location(\phpbb\event\data $event)
 	{
-		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/content/') === 0)
+		if ($event['on_page'][1] == 'app' && strrpos($event['row']['session_page'], 'app.'.$this->php_ext.'/content/') === 0)
 		{
 			$types = join('|', $this->content_types->get_forum_types());
 			preg_match("/\/content\/($types)(\/[0-9]\/.*)?/is", $event['row']['session_page'], $match);
@@ -126,13 +126,13 @@ 
 	{
 		$list = $this->content_types->get_all_types();
 
-		$text = $this->language->lang('CONTENT_TYPES') . '|' . $this->helper->route('blitze_content_types', array(), false, '', UrlGeneratorInterface::RELATIVE_PATH) . "\n";
+		$text = $this->language->lang('CONTENT_TYPES').'|'.$this->helper->route('blitze_content_types', array(), false, '', UrlGeneratorInterface::RELATIVE_PATH)."\n";
 
 		foreach ($list as $type => $entity)
 		{
             /** @var \blitze\content\model\entity\type $entity */
-            $text .= "\t" . $entity->get_content_langname() . '|';
-			$text .= $this->helper->route('blitze_content_type', array('type' => $type), false, '', UrlGeneratorInterface::RELATIVE_PATH) . "\n";
+            $text .= "\t".$entity->get_content_langname().'|';
+			$text .= $this->helper->route('blitze_content_type', array('type' => $type), false, '', UrlGeneratorInterface::RELATIVE_PATH)."\n";
 		}
 
 		return trim($text);

services/views/driver/views_interface.php

Indentation +3 added lines, -3 removed lines

@@ -48,10 +48,10 @@ 
 	 * @param \blitze\content\model\entity\type $entity
 	 * @param int $page
 	 * @param array $filters
-     * @param array $topic_data_overwrite
+	 * @param array $topic_data_overwrite
 	 * @return int
 	 */
-    public function render_index(\blitze\content\model\entity\type $entity, $page, array $filters, array $topic_data_overwrite = array());
+	public function render_index(\blitze\content\model\entity\type $entity, $page, array $filters, array $topic_data_overwrite = array());
 
 	/**
 	 * Show topic details
@@ -59,7 +59,7 @@ 
 	 * @param \blitze\content\model\entity\type $entity
 	 * @param int $topic_id
 	 * @param array $update_count
-     * @param array $topic_data_overwrite
+	 * @param array $topic_data_overwrite
 	 * @return array
 	 */
 	public function render_detail(\blitze\content\model\entity\type $entity, $topic_id, array &$update_count, array $topic_data_overwrite = array());

services/views/driver/base_view.php

Indentation +384 added lines, -384 removed lines

@@ -11,388 +11,388 @@
 
 abstract class base_view implements views_interface
 {
-    /** @var \phpbb\event\dispatcher_interface */
-    protected $phpbb_dispatcher;
-
-    /** @var\phpbb\language\language */
-    protected $language;
-
-    /** @var \phpbb\pagination */
-    protected $pagination;
-
-    /** @var \phpbb\template\template */
-    protected $template;
-
-    /* @var \blitze\content\services\fields */
-    protected $fields;
-
-    /** @var \blitze\sitemaker\services\forum\data */
-    protected $forum;
-
-    /* @var \blitze\content\services\helper */
-    protected $helper;
-
-    /* @var \blitze\content\services\quickmod */
-    protected $quickmod;
-
-    /** @var \blitze\content\services\topic\blocks_factory */
-    protected $topic_blocks_factory;
-
-    /**
-     * Constructor
-     *
-     * @param \phpbb\event\dispatcher_interface					$phpbb_dispatcher		Event dispatcher object
-     * @param \phpbb\language\language							$language				Language Object
-     * @param \phpbb\pagination									$pagination				Pagination object
-     * @param \phpbb\template\template							$template				Template object
-     * @param \blitze\content\services\fields					$fields					Content fields object
-     * @param \blitze\sitemaker\services\forum\data				$forum					Forum Data object
-     * @param \blitze\content\services\helper					$helper					Content helper object
-     * @param \blitze\content\services\quickmod					$quickmod				Quick moderator tools
-     * @param \blitze\content\services\topic\blocks_factory		$topic_blocks_factory	Topic blocks factory object
-     */
-    public function __construct(\phpbb\event\dispatcher_interface $phpbb_dispatcher, \phpbb\language\language $language, \phpbb\pagination $pagination, \phpbb\template\template $template, \blitze\content\services\fields $fields, \blitze\sitemaker\services\forum\data $forum, \blitze\content\services\helper $helper, \blitze\content\services\quickmod $quickmod, \blitze\content\services\topic\blocks_factory $topic_blocks_factory)
-    {
-        $this->phpbb_dispatcher = $phpbb_dispatcher;
-        $this->language = $language;
-        $this->pagination = $pagination;
-        $this->template = $template;
-        $this->fields = $fields;
-        $this->forum = $forum;
-        $this->helper = $helper;
-        $this->quickmod = $quickmod;
-        $this->topic_blocks_factory = $topic_blocks_factory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get_detail_template()
-    {
-        return 'views/content_detail.html';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function build_index_query(array $filters, \blitze\content\model\entity\type $entity = null)
-    {
-        $forum_id = $entity ? $entity->get_forum_id() : 0;
-        $sql_array = $this->get_filter_sql($filters, $forum_id);
-
-        $this->forum->query()
-            ->fetch_forum($forum_id)
-            ->fetch_custom($sql_array)
-            ->set_sorting('t.topic_time')
-            ->build(true, false, false);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function render_index(\blitze\content\model\entity\type $entity, $page, array $filters, array $topic_data_overwrite = array())
-    {
-        $content_type = $entity->get_content_name();
-        $items_per_page = $entity->get_items_per_page();
-        $start = ($page - 1) * $items_per_page;
-
-        $this->build_index_query($filters, $entity);
-        $this->set_mcp_url($entity->get_forum_id());
-
-        if ($entity->get_show_pagination())
-        {
-            $filter_type = key($filters);
-            $filter_value = (array) current($filter_value);
-
-            $total_topics = $this->forum->get_topics_count();
-            $this->generate_pagination('summary', $total_topics, $start, $items_per_page, array(
-                'type'			=> $content_type,
-                'filter_type'	=> $filter_type,
-                'filter_value'	=> current($filter_value),
-            ));
-        }
-
-        return $this->display_topics($entity, $items_per_page, $start, $topic_data_overwrite);
-    }
-
-    /**
-     * @param \blitze\content\model\entity\type $entity
-     * @param int $items_per_page
-     * @param int $start
-     * @param array $topic_data_overwrite
-     * @return int
-     */
-    protected function display_topics(\blitze\content\model\entity\type $entity, $items_per_page = 1, $start = 0, array $topic_data_overwrite = array())
-    {
-        $content_type = $entity->get_content_name();
-        $topics_data = $this->forum->get_topic_data($items_per_page, $start);
-        $posts_data = $this->forum->get_post_data('first');
-        $topic_tracking_info = $this->forum->get_topic_tracking_info($entity->get_forum_id());
-        $users_cache = $this->forum->get_posters_info();
-        $attachments = $this->forum->get_attachments($entity->get_forum_id());
-
-        $this->fields->prepare_to_show($entity, array_keys($topics_data), $entity->get_summary_fields(), $entity->get_summary_tpl(), 'summary');
-
-        $update_count = array();
-        $max_update_time = 0;
-
-        foreach ($posts_data as $topic_id => $posts)
-        {
-            $post_data	= array_shift($posts);
-            $topic_data	= $topics_data[$topic_id];
-            $topic_data = array_merge(
-                $this->fields->show($content_type, $topic_data, $post_data, $users_cache, $attachments, $update_count, $topic_tracking_info),
-                $topic_data_overwrite
-            );
-
-            $this->template->assign_block_vars('topicrow', $topic_data);
-            $max_update_time = max($max_update_time, $topic_data['UPDATED']);
-        }
-        unset($topics_data, $posts_data, $users_cache, $attachments, $topic_tracking_info);
-
-        return $max_update_time;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function render_detail(\blitze\content\model\entity\type $entity, $topic_id, array &$update_count, array $topic_data_overwrite = array())
-    {
-        $this->language->add_lang('viewtopic');
-        $this->language->add_lang('content', 'blitze/content');
-        $this->set_mcp_url($entity->get_forum_id(), $topic_id);
-
-        $this->forum->query()
-            ->fetch_topic($topic_id)
-            ->fetch_watch_status()
-            ->fetch_bookmark_status()
-            ->build(true, true, false);
-
-        return $this->display_topic($topic_id, $entity, $update_count, $topic_data_overwrite);
-    }
-
-    /**
-     * @param int $topic_id
-     * @param \blitze\content\model\entity\type $entity
-     * @param array $update_count
-     * @param array $topic_data_overwrite
-     * @return array
-     * @throws \Exception
-     */
-    protected function display_topic($topic_id, \blitze\content\model\entity\type $entity, array &$update_count, array $topic_data_overwrite)
-    {
-        $forum_id = $entity->get_forum_id();
-        $content_type = $entity->get_content_name();
-
-        $topics_data = $this->forum->get_topic_data();
-        $post_data = $this->forum->get_post_data('first');
-        $topic_tracking_info = $this->forum->get_topic_tracking_info($forum_id);
-        $users_cache = $this->forum->get_posters_info();
-        $attachments = $this->forum->get_attachments($forum_id);
-
-        if (!sizeof($post_data))
-        {
-            throw new \Exception($this->language->lang('CONTENT_NO_EXIST'));
-        }
-
-        $this->fields->prepare_to_show($entity, array_keys($topics_data), $entity->get_detail_fields(), $entity->get_detail_tpl(), 'detail');
-
-        $topic_data = array_shift($topics_data);
-        $post_data = array_shift($post_data[$topic_id]);
-        $tpl_data = array_merge($topic_data,
-            $this->fields->show($content_type, $topic_data, $post_data, $users_cache, $attachments, $update_count, $topic_tracking_info, $topic_data_overwrite),
-            $this->fields->get_topic_tools_data($topic_data)
-        );
-
-        $this->template->assign_vars(array_change_key_case($tpl_data, CASE_UPPER));
-        $this->fields->show_attachments($attachments, $post_data['post_id']);
-        $this->show_topic_blocks($entity, $topic_data, $post_data, array_shift($users_cache));
-        $this->quickmod->show_tools($topic_data);
-        $this->set_meta_tags($entity->get_detail_fields(), $tpl_data);
-
-        return array_merge($topic_data, array(
-            'topic_title'		=> $tpl_data['TOPIC_TITLE'],
-            'total_comments'	=> $tpl_data['TOPIC_COMMENTS'],
-            'topic_url'			=> $tpl_data['TOPIC_URL'],
-        ));
-    }
-
-    /**
-     * @param array $attachments
-     * @param int $post_id
-     * @return void
-     */
-    protected function show_attachments(array $attachments, $post_id)
-    {
-        if (!empty($attachments[$post_id]))
-        {
-            foreach ($attachments[$post_id] as $attachment)
-            {
-                $this->template->assign_block_vars('attachment', array(
-                        'DISPLAY_ATTACHMENT'	=> $attachment)
-                );
-            }
-        }
-    }
-
-    /**
-     * @param string $view_mode
-     * @param int $total_topics
-     * @param int $start
-     * @param int $items_per_page
-     * @param array $params
-     */
-    protected function generate_pagination($view_mode, $total_topics, &$start, $items_per_page, array $params)
-    {
-        $params = array_filter($params);
-        $route_type = $this->get_route_type($view_mode, $params);
-        $start = $this->pagination->validate_start($start, $items_per_page, $total_topics);
-        $this->pagination->generate_template_pagination(
-            array(
-                'routes' => array(
-                    'blitze_content_' . $route_type,
-                    'blitze_content_' . $route_type . '_page',
-                ),
-                'params' => $params,
-            ),
-            'pagination', 'page', $total_topics, $items_per_page, $start
-        );
-    }
-
-    /**
-     * @param string $view_mode
-     * @param array $params
-     * @return string
-     */
-    protected function get_route_type($view_mode, array $params)
-    {
-        $types = array(
-            'show'		=> 'show',
-            'summary'	=> join('_', array_filter(array(
-                (!empty($params['type'])) ? 'type' : '',
-                (!empty($params['filters'])) ? 'multi' : '',
-                (!empty($params['filter_type'])) ? 'filter' : '',
-            ))),
-        );
-
-        return $types[$view_mode];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function get_filter_sql(array $filters, $forum_id)
-    {
-        $sql_array = array();
-
-        /**
-         * Event to filter topics by field value e.g category/food
-         *
-         * @event blitze.content.view.filter
-         * @var mixed								forum_id		Forum id, if available
-         * @var array								filters			Filters
-         * @var array								sql_array		Array to modify sql query to get topics
-         */
-        $vars = array('forum_id', 'filters', 'sql_array');
-        extract($this->phpbb_dispatcher->trigger_event('blitze.content.view.filter', compact($vars)));
-
-        return $sql_array;
-    }
-
-    /**
-     * @param \blitze\content\model\entity\type $entity
-     * @param array $topic_data
-     * @param array $post_data
-     * @param array $user_cache
-     * @return void
-     */
-    protected function show_topic_blocks(\blitze\content\model\entity\type $entity, array $topic_data, array $post_data, array $user_cache)
-    {
-        $topic_blocks = $entity->get_topic_blocks();
-        foreach ($topic_blocks as $service_name)
-        {
-            /** @var \blitze\content\services\topic\driver\block_interface $block */
-            if ($block = $this->topic_blocks_factory->get($service_name))
-            {
-                $block->show_block($entity, $topic_data, $post_data, $user_cache);
-            }
-        }
-    }
-
-    /**
-     * @param int $forum_id
-     * @param int $topic_id
-     * @return void
-     */
-    protected function set_mcp_url($forum_id, $topic_id = 0)
-    {
-        $this->template->assign_var('U_MCP', $this->helper->get_mcp_url($forum_id, $topic_id));
-    }
-
-    /**
-     * @param array $field_types
-     * @param array $topic_data
-     * @return void
-     */
-    protected function set_meta_tags(array $field_types, array $topic_data)
-    {
-        $image_url = $this->get_topic_image_url($field_types, $topic_data['FIELDS']['all']);
-        $description = $this->get_topic_description($field_types, $topic_data['FIELDS']['all']);
-
-        $meta = "<meta name=\"description\" content=\"$description\" />\n";
-        $meta .= "<meta name=\"twitter:card\" value=\"summary\">\n";
-        $meta .= "<meta property=\"og:title\" content=\"{$topic_data['TOPIC_TITLE']}\" />\n";
-        $meta .= "<meta property=\"og:type\" content=\"article\" />\n";
-        $meta .= "<meta property=\"og:url\" content=\"{$topic_data['PERMA_LINK']}\" />\n";
-        $meta .= "<meta property=\"og:image\" content=\"$image_url\" />\n";
-        $meta .= "<meta property=\"og:description\" content=\"$description\" />";
-
-        $this->template->assign_var('META', $meta);
-    }
-
-    /**
-     * @param array $field_types
-     * @param array $fields_data
-     * @return string
-     */
-    protected function get_topic_image_url(array $field_types, array $fields_data)
-    {
-        $image_url = '';
-
-        $image_field = $this->get_field_name($field_types, 'image');
-        if (null !== ($figure = $fields_data[$image_field]) && preg_match('/src="(.*?)"/i', $figure, $matches))
-        {
-            $image_url = $matches[1];
-        }
-
-        return $image_url;
-    }
-
-    /**
-     * @param array $field_types
-     * @param array $fields_data
-     * @return string
-     */
-    protected function get_topic_description(array $field_types, array $fields_data)
-    {
-        $desc_field = $this->get_field_name($field_types, 'textarea');
-
-        if (null !== ($description = $fields_data[$desc_field]))
-        {
-            $description = implode(' ', array_slice(explode(' ', strip_tags($description)), 1, 20));
-        }
-
-        return $description;
-    }
-
-    /**
-     * @param array $field_types
-     * @param string $search_field
-     * @return string
-     */
-    protected function get_field_name(array $field_types, $search_field)
-    {
-        $results = array_keys($field_types, $search_field);
-        return array_shift($results);
-    }
+	/** @var \phpbb\event\dispatcher_interface */
+	protected $phpbb_dispatcher;
+
+	/** @var\phpbb\language\language */
+	protected $language;
+
+	/** @var \phpbb\pagination */
+	protected $pagination;
+
+	/** @var \phpbb\template\template */
+	protected $template;
+
+	/* @var \blitze\content\services\fields */
+	protected $fields;
+
+	/** @var \blitze\sitemaker\services\forum\data */
+	protected $forum;
+
+	/* @var \blitze\content\services\helper */
+	protected $helper;
+
+	/* @var \blitze\content\services\quickmod */
+	protected $quickmod;
+
+	/** @var \blitze\content\services\topic\blocks_factory */
+	protected $topic_blocks_factory;
+
+	/**
+	 * Constructor
+	 *
+	 * @param \phpbb\event\dispatcher_interface					$phpbb_dispatcher		Event dispatcher object
+	 * @param \phpbb\language\language							$language				Language Object
+	 * @param \phpbb\pagination									$pagination				Pagination object
+	 * @param \phpbb\template\template							$template				Template object
+	 * @param \blitze\content\services\fields					$fields					Content fields object
+	 * @param \blitze\sitemaker\services\forum\data				$forum					Forum Data object
+	 * @param \blitze\content\services\helper					$helper					Content helper object
+	 * @param \blitze\content\services\quickmod					$quickmod				Quick moderator tools
+	 * @param \blitze\content\services\topic\blocks_factory		$topic_blocks_factory	Topic blocks factory object
+	 */
+	public function __construct(\phpbb\event\dispatcher_interface $phpbb_dispatcher, \phpbb\language\language $language, \phpbb\pagination $pagination, \phpbb\template\template $template, \blitze\content\services\fields $fields, \blitze\sitemaker\services\forum\data $forum, \blitze\content\services\helper $helper, \blitze\content\services\quickmod $quickmod, \blitze\content\services\topic\blocks_factory $topic_blocks_factory)
+	{
+		$this->phpbb_dispatcher = $phpbb_dispatcher;
+		$this->language = $language;
+		$this->pagination = $pagination;
+		$this->template = $template;
+		$this->fields = $fields;
+		$this->forum = $forum;
+		$this->helper = $helper;
+		$this->quickmod = $quickmod;
+		$this->topic_blocks_factory = $topic_blocks_factory;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function get_detail_template()
+	{
+		return 'views/content_detail.html';
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function build_index_query(array $filters, \blitze\content\model\entity\type $entity = null)
+	{
+		$forum_id = $entity ? $entity->get_forum_id() : 0;
+		$sql_array = $this->get_filter_sql($filters, $forum_id);
+
+		$this->forum->query()
+			->fetch_forum($forum_id)
+			->fetch_custom($sql_array)
+			->set_sorting('t.topic_time')
+			->build(true, false, false);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function render_index(\blitze\content\model\entity\type $entity, $page, array $filters, array $topic_data_overwrite = array())
+	{
+		$content_type = $entity->get_content_name();
+		$items_per_page = $entity->get_items_per_page();
+		$start = ($page - 1) * $items_per_page;
+
+		$this->build_index_query($filters, $entity);
+		$this->set_mcp_url($entity->get_forum_id());
+
+		if ($entity->get_show_pagination())
+		{
+			$filter_type = key($filters);
+			$filter_value = (array) current($filter_value);
+
+			$total_topics = $this->forum->get_topics_count();
+			$this->generate_pagination('summary', $total_topics, $start, $items_per_page, array(
+				'type'			=> $content_type,
+				'filter_type'	=> $filter_type,
+				'filter_value'	=> current($filter_value),
+			));
+		}
+
+		return $this->display_topics($entity, $items_per_page, $start, $topic_data_overwrite);
+	}
+
+	/**
+	 * @param \blitze\content\model\entity\type $entity
+	 * @param int $items_per_page
+	 * @param int $start
+	 * @param array $topic_data_overwrite
+	 * @return int
+	 */
+	protected function display_topics(\blitze\content\model\entity\type $entity, $items_per_page = 1, $start = 0, array $topic_data_overwrite = array())
+	{
+		$content_type = $entity->get_content_name();
+		$topics_data = $this->forum->get_topic_data($items_per_page, $start);
+		$posts_data = $this->forum->get_post_data('first');
+		$topic_tracking_info = $this->forum->get_topic_tracking_info($entity->get_forum_id());
+		$users_cache = $this->forum->get_posters_info();
+		$attachments = $this->forum->get_attachments($entity->get_forum_id());
+
+		$this->fields->prepare_to_show($entity, array_keys($topics_data), $entity->get_summary_fields(), $entity->get_summary_tpl(), 'summary');
+
+		$update_count = array();
+		$max_update_time = 0;
+
+		foreach ($posts_data as $topic_id => $posts)
+		{
+			$post_data	= array_shift($posts);
+			$topic_data	= $topics_data[$topic_id];
+			$topic_data = array_merge(
+				$this->fields->show($content_type, $topic_data, $post_data, $users_cache, $attachments, $update_count, $topic_tracking_info),
+				$topic_data_overwrite
+			);
+
+			$this->template->assign_block_vars('topicrow', $topic_data);
+			$max_update_time = max($max_update_time, $topic_data['UPDATED']);
+		}
+		unset($topics_data, $posts_data, $users_cache, $attachments, $topic_tracking_info);
+
+		return $max_update_time;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function render_detail(\blitze\content\model\entity\type $entity, $topic_id, array &$update_count, array $topic_data_overwrite = array())
+	{
+		$this->language->add_lang('viewtopic');
+		$this->language->add_lang('content', 'blitze/content');
+		$this->set_mcp_url($entity->get_forum_id(), $topic_id);
+
+		$this->forum->query()
+			->fetch_topic($topic_id)
+			->fetch_watch_status()
+			->fetch_bookmark_status()
+			->build(true, true, false);
+
+		return $this->display_topic($topic_id, $entity, $update_count, $topic_data_overwrite);
+	}
+
+	/**
+	 * @param int $topic_id
+	 * @param \blitze\content\model\entity\type $entity
+	 * @param array $update_count
+	 * @param array $topic_data_overwrite
+	 * @return array
+	 * @throws \Exception
+	 */
+	protected function display_topic($topic_id, \blitze\content\model\entity\type $entity, array &$update_count, array $topic_data_overwrite)
+	{
+		$forum_id = $entity->get_forum_id();
+		$content_type = $entity->get_content_name();
+
+		$topics_data = $this->forum->get_topic_data();
+		$post_data = $this->forum->get_post_data('first');
+		$topic_tracking_info = $this->forum->get_topic_tracking_info($forum_id);
+		$users_cache = $this->forum->get_posters_info();
+		$attachments = $this->forum->get_attachments($forum_id);
+
+		if (!sizeof($post_data))
+		{
+			throw new \Exception($this->language->lang('CONTENT_NO_EXIST'));
+		}
+
+		$this->fields->prepare_to_show($entity, array_keys($topics_data), $entity->get_detail_fields(), $entity->get_detail_tpl(), 'detail');
+
+		$topic_data = array_shift($topics_data);
+		$post_data = array_shift($post_data[$topic_id]);
+		$tpl_data = array_merge($topic_data,
+			$this->fields->show($content_type, $topic_data, $post_data, $users_cache, $attachments, $update_count, $topic_tracking_info, $topic_data_overwrite),
+			$this->fields->get_topic_tools_data($topic_data)
+		);
+
+		$this->template->assign_vars(array_change_key_case($tpl_data, CASE_UPPER));
+		$this->fields->show_attachments($attachments, $post_data['post_id']);
+		$this->show_topic_blocks($entity, $topic_data, $post_data, array_shift($users_cache));
+		$this->quickmod->show_tools($topic_data);
+		$this->set_meta_tags($entity->get_detail_fields(), $tpl_data);
+
+		return array_merge($topic_data, array(
+			'topic_title'		=> $tpl_data['TOPIC_TITLE'],
+			'total_comments'	=> $tpl_data['TOPIC_COMMENTS'],
+			'topic_url'			=> $tpl_data['TOPIC_URL'],
+		));
+	}
+
+	/**
+	 * @param array $attachments
+	 * @param int $post_id
+	 * @return void
+	 */
+	protected function show_attachments(array $attachments, $post_id)
+	{
+		if (!empty($attachments[$post_id]))
+		{
+			foreach ($attachments[$post_id] as $attachment)
+			{
+				$this->template->assign_block_vars('attachment', array(
+						'DISPLAY_ATTACHMENT'	=> $attachment)
+				);
+			}
+		}
+	}
+
+	/**
+	 * @param string $view_mode
+	 * @param int $total_topics
+	 * @param int $start
+	 * @param int $items_per_page
+	 * @param array $params
+	 */
+	protected function generate_pagination($view_mode, $total_topics, &$start, $items_per_page, array $params)
+	{
+		$params = array_filter($params);
+		$route_type = $this->get_route_type($view_mode, $params);
+		$start = $this->pagination->validate_start($start, $items_per_page, $total_topics);
+		$this->pagination->generate_template_pagination(
+			array(
+				'routes' => array(
+					'blitze_content_' . $route_type,
+					'blitze_content_' . $route_type . '_page',
+				),
+				'params' => $params,
+			),
+			'pagination', 'page', $total_topics, $items_per_page, $start
+		);
+	}
+
+	/**
+	 * @param string $view_mode
+	 * @param array $params
+	 * @return string
+	 */
+	protected function get_route_type($view_mode, array $params)
+	{
+		$types = array(
+			'show'		=> 'show',
+			'summary'	=> join('_', array_filter(array(
+				(!empty($params['type'])) ? 'type' : '',
+				(!empty($params['filters'])) ? 'multi' : '',
+				(!empty($params['filter_type'])) ? 'filter' : '',
+			))),
+		);
+
+		return $types[$view_mode];
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function get_filter_sql(array $filters, $forum_id)
+	{
+		$sql_array = array();
+
+		/**
+		 * Event to filter topics by field value e.g category/food
+		 *
+		 * @event blitze.content.view.filter
+		 * @var mixed								forum_id		Forum id, if available
+		 * @var array								filters			Filters
+		 * @var array								sql_array		Array to modify sql query to get topics
+		 */
+		$vars = array('forum_id', 'filters', 'sql_array');
+		extract($this->phpbb_dispatcher->trigger_event('blitze.content.view.filter', compact($vars)));
+
+		return $sql_array;
+	}
+
+	/**
+	 * @param \blitze\content\model\entity\type $entity
+	 * @param array $topic_data
+	 * @param array $post_data
+	 * @param array $user_cache
+	 * @return void
+	 */
+	protected function show_topic_blocks(\blitze\content\model\entity\type $entity, array $topic_data, array $post_data, array $user_cache)
+	{
+		$topic_blocks = $entity->get_topic_blocks();
+		foreach ($topic_blocks as $service_name)
+		{
+			/** @var \blitze\content\services\topic\driver\block_interface $block */
+			if ($block = $this->topic_blocks_factory->get($service_name))
+			{
+				$block->show_block($entity, $topic_data, $post_data, $user_cache);
+			}
+		}
+	}
+
+	/**
+	 * @param int $forum_id
+	 * @param int $topic_id
+	 * @return void
+	 */
+	protected function set_mcp_url($forum_id, $topic_id = 0)
+	{
+		$this->template->assign_var('U_MCP', $this->helper->get_mcp_url($forum_id, $topic_id));
+	}
+
+	/**
+	 * @param array $field_types
+	 * @param array $topic_data
+	 * @return void
+	 */
+	protected function set_meta_tags(array $field_types, array $topic_data)
+	{
+		$image_url = $this->get_topic_image_url($field_types, $topic_data['FIELDS']['all']);
+		$description = $this->get_topic_description($field_types, $topic_data['FIELDS']['all']);
+
+		$meta = "<meta name=\"description\" content=\"$description\" />\n";
+		$meta .= "<meta name=\"twitter:card\" value=\"summary\">\n";
+		$meta .= "<meta property=\"og:title\" content=\"{$topic_data['TOPIC_TITLE']}\" />\n";
+		$meta .= "<meta property=\"og:type\" content=\"article\" />\n";
+		$meta .= "<meta property=\"og:url\" content=\"{$topic_data['PERMA_LINK']}\" />\n";
+		$meta .= "<meta property=\"og:image\" content=\"$image_url\" />\n";
+		$meta .= "<meta property=\"og:description\" content=\"$description\" />";
+
+		$this->template->assign_var('META', $meta);
+	}
+
+	/**
+	 * @param array $field_types
+	 * @param array $fields_data
+	 * @return string
+	 */
+	protected function get_topic_image_url(array $field_types, array $fields_data)
+	{
+		$image_url = '';
+
+		$image_field = $this->get_field_name($field_types, 'image');
+		if (null !== ($figure = $fields_data[$image_field]) && preg_match('/src="(.*?)"/i', $figure, $matches))
+		{
+			$image_url = $matches[1];
+		}
+
+		return $image_url;
+	}
+
+	/**
+	 * @param array $field_types
+	 * @param array $fields_data
+	 * @return string
+	 */
+	protected function get_topic_description(array $field_types, array $fields_data)
+	{
+		$desc_field = $this->get_field_name($field_types, 'textarea');
+
+		if (null !== ($description = $fields_data[$desc_field]))
+		{
+			$description = implode(' ', array_slice(explode(' ', strip_tags($description)), 1, 20));
+		}
+
+		return $description;
+	}
+
+	/**
+	 * @param array $field_types
+	 * @param string $search_field
+	 * @return string
+	 */
+	protected function get_field_name(array $field_types, $search_field)
+	{
+		$results = array_keys($field_types, $search_field);
+		return array_shift($results);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -138,7 +138,7 @@ 
 
         foreach ($posts_data as $topic_id => $posts)
         {
-            $post_data	= array_shift($posts);
+            $post_data = array_shift($posts);
             $topic_data	= $topics_data[$topic_id];
             $topic_data = array_merge(
                 $this->fields->show($content_type, $topic_data, $post_data, $users_cache, $attachments, $update_count, $topic_tracking_info),
@@ -250,8 +250,8 @@ 
         $this->pagination->generate_template_pagination(
             array(
                 'routes' => array(
-                    'blitze_content_' . $route_type,
-                    'blitze_content_' . $route_type . '_page',
+                    'blitze_content_'.$route_type,
+                    'blitze_content_'.$route_type.'_page',
                 ),
                 'params' => $params,
             ),

services/views/driver/tiles.php

Indentation +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 	 * @param \blitze\content\services\quickmod					$quickmod				Quick moderator tools
 	 * @param \blitze\content\services\topic\blocks_factory		$topic_blocks_factory	Topic blocks factory object
 	 * @param \phpbb\request\request_interface					$request				Request object
-	*/
+	 */
 	public function __construct(\phpbb\event\dispatcher_interface $phpbb_dispatcher, \phpbb\language\language $language, \phpbb\pagination $pagination, \phpbb\template\template $template, \blitze\content\services\fields $fields, \blitze\sitemaker\services\forum\data $forum, \blitze\content\services\helper $helper, \blitze\content\services\quickmod $quickmod, \blitze\content\services\topic\blocks_factory $topic_blocks_factory, \phpbb\request\request_interface $request)
 	{
 		parent::__construct($phpbb_dispatcher, $language, $pagination, $template, $fields, $forum, $helper, $quickmod, $topic_blocks_factory);
@@ -62,7 +62,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-    public function render_index(\blitze\content\model\entity\type $entity, $page, array $filters, array $topic_data_overwrite = array())
+	public function render_index(\blitze\content\model\entity\type $entity, $page, array $filters, array $topic_data_overwrite = array())
 	{
 		parent::render_index($entity, $page, $filters);