@@ -44,7 +44,7 @@ |
||
| 44 | 44 | * @param string $phpbb_root_path Path to the phpbb includes directory. |
| 45 | 45 | * @param string $relative_admin_path Relative admin root path |
| 46 | 46 | * @param string $php_ext php file extension |
| 47 | - */ |
|
| 47 | + */ |
|
| 48 | 48 | public function __construct(\phpbb\controller\helper $helper, \phpbb\language\language $language, \phpbb\template\template $template, \blitze\content\services\types $content_types, $phpbb_root_path, $relative_admin_path, $php_ext) |
| 49 | 49 | { |
| 50 | 50 | $this->helper = $helper; |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | * @param \blitze\content\model\mapper_factory $mapper_factory Mapper factory object |
| 63 | 63 | * @param string $phpbb_admin_path Relative admin root path |
| 64 | 64 | * @param string $php_ext php file extension |
| 65 | - */ |
|
| 65 | + */ |
|
| 66 | 66 | public function __construct(\phpbb\auth\auth $auth, \phpbb\cache\service $cache, \phpbb\config\db $config, \phpbb\db\driver\driver_interface $db, \phpbb\language\language $language, \phpbb\request\request_interface $request, \phpbb\template\template $template, \blitze\content\services\types $content_types, \blitze\sitemaker\services\forum\manager $forum, \blitze\content\model\mapper_factory $mapper_factory, $phpbb_admin_path, $php_ext) |
| 67 | 67 | { |
| 68 | 68 | $this->auth = $auth; |
@@ -108,7 +108,7 @@ |
||
| 108 | 108 | * @param \blitze\content\model\entity\type $unsaved_entity |
| 109 | 109 | * @return void |
| 110 | 110 | */ |
| 111 | - protected function handle_content_type($type, \blitze\content\model\entity\type &$unsaved_entity) |
|
| 111 | + protected function handle_content_type($type, \blitze\content\model\entity\type & $unsaved_entity) |
|
| 112 | 112 | { |
| 113 | 113 | $forum_perm_from = $this->request->variable('copy_forum_perm', 0); |
| 114 | 114 | |
@@ -121,8 +121,7 @@ discard block |
||
| 121 | 121 | $unsaved_entity->set_content_id($entity->get_content_id()); |
| 122 | 122 | $this->handle_langname_change($forum_id, $entity->get_content_langname(), $unsaved_entity->get_content_langname()); |
| 123 | 123 | $this->copy_forum_permissions($forum_id, $forum_perm_from); |
| 124 | - } |
|
| 125 | - else |
|
| 124 | + } else |
|
| 126 | 125 | { |
| 127 | 126 | $forum_id = $this->create_content_forum($unsaved_entity->get_content_langname(), $forum_perm_from); |
| 128 | 127 | $unsaved_entity->set_forum_id($forum_id); |
@@ -189,8 +188,7 @@ discard block |
||
| 189 | 188 | { |
| 190 | 189 | $u_set_permission = append_sid("{$this->phpbb_admin_path}index.$this->php_ext", 'i=permissions&mode=setting_forum_local&forum_id[]=' . $forum_id, true); |
| 191 | 190 | $message = $this->language->lang('CONTENT_TYPE_CREATED', '<a href="' . $u_set_permission . '">', '</a>'); |
| 192 | - } |
|
| 193 | - else |
|
| 191 | + } else |
|
| 194 | 192 | { |
| 195 | 193 | meta_refresh(3, $u_action); |
| 196 | 194 | $message = $this->language->lang('CONTENT_TYPE_UPDATED'); |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | * @param \blitze\content\services\form\fields_factory $fields_factory Fields factory object |
| 33 | 33 | * @param \blitze\content\model\mapper_factory $mapper_factory Mapper factory object |
| 34 | 34 | * @param \blitze\content\services\views\views_factory $views_factory Views factory object |
| 35 | - */ |
|
| 35 | + */ |
|
| 36 | 36 | public function __construct(\phpbb\auth\auth $auth, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \blitze\sitemaker\services\auto_lang $auto_lang, \blitze\content\services\types $content_types, \blitze\content\services\form\fields_factory $fields_factory, \blitze\content\model\mapper_factory $mapper_factory, \blitze\content\services\views\views_factory $views_factory) |
| 37 | 37 | { |
| 38 | 38 | parent::__construct($language, $template, $user, $auto_lang, $fields_factory, $views_factory); |
@@ -206,7 +206,7 @@ |
||
| 206 | 206 | */ |
| 207 | 207 | protected function init_ucp_mode(array $content_types, array &$sql_where_array) |
| 208 | 208 | { |
| 209 | - $sql_where_array[] = 't.topic_poster = ' . (int) $this->user->data['user_id']; |
|
| 209 | + $sql_where_array[] = 't.topic_poster = ' . (int) $this->user->data['user_id']; |
|
| 210 | 210 | |
| 211 | 211 | // list all content types that the user can post in |
| 212 | 212 | $postable_forums = array_intersect_key($this->content_forums, $this->auth->acl_getf('f_post', true)); |
@@ -272,16 +272,13 @@ |
||
| 272 | 272 | if ($topic_deleted) |
| 273 | 273 | { |
| 274 | 274 | $topic_status = 'deleted'; |
| 275 | - } |
|
| 276 | - else if ($topic_unapproved) |
|
| 275 | + } else if ($topic_unapproved) |
|
| 277 | 276 | { |
| 278 | 277 | $topic_status = 'unapproved'; |
| 279 | - } |
|
| 280 | - else if ($row['topic_time'] > time()) |
|
| 278 | + } else if ($row['topic_time'] > time()) |
|
| 281 | 279 | { |
| 282 | 280 | $topic_status = 'scheduled'; |
| 283 | - } |
|
| 284 | - else |
|
| 281 | + } else |
|
| 285 | 282 | { |
| 286 | 283 | $topic_status = $this->filter_topic_types_ary[$row['topic_type']]; |
| 287 | 284 | } |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | * @param \blitze\content\services\helper $helper Content helper object |
| 47 | 47 | * @param string $phpbb_root_path Path to the phpbb includes directory. |
| 48 | 48 | * @param string $php_ext php file extension |
| 49 | - */ |
|
| 49 | + */ |
|
| 50 | 50 | public function __construct(\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, $phpbb_root_path, $php_ext) |
| 51 | 51 | { |
| 52 | 52 | $this->language = $language; |
@@ -121,9 +121,9 @@ |
||
| 121 | 121 | |
| 122 | 122 | for ($i = 0, $size = sizeof($topics_data); $i < $size; $i++) |
| 123 | 123 | { |
| 124 | - $topic_data = $topics_data[$i]; |
|
| 124 | + $topic_data = $topics_data[$i]; |
|
| 125 | 125 | $topic_id = $topic_data['topic_id']; |
| 126 | - $post_data = array_shift($posts_data[$topic_id]); |
|
| 126 | + $post_data = array_shift($posts_data[$topic_id]); |
|
| 127 | 127 | |
| 128 | 128 | $tpl_data = array_merge( |
| 129 | 129 | $this->fields->show($content_type, $topic_data, $post_data, $users_cache, $attachments, $update_count, $topic_tracking_info), |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | * @param \blitze\content\services\helper $helper Content helper object |
| 27 | 27 | * @param string $phpbb_root_path Path to the phpbb includes directory. |
| 28 | 28 | * @param string $php_ext php file extension |
| 29 | - */ |
|
| 29 | + */ |
|
| 30 | 30 | public function __construct(\phpbb\language\language $language, \phpbb\pagination $pagination, \phpbb\request\request_interface $request, \phpbb\template\template $template, \blitze\content\services\fields $fields, \blitze\sitemaker\services\forum\data $forum, \blitze\content\services\helper $helper, $phpbb_root_path, $php_ext) |
| 31 | 31 | { |
| 32 | 32 | parent::__construct($language, $pagination, $template, $fields, $forum, $helper, $phpbb_root_path, $php_ext); |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | { |
| 24 | 24 | return !$this->db_tools->sql_table_exists($this->table_prefix . 'content_types'); |
| 25 | 25 | } |
| 26 | - */ |
|
| 26 | + */ |
|
| 27 | 27 | |
| 28 | 28 | /** |
| 29 | 29 | * @inheritdoc |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | { |
| 75 | 75 | $forum_id = (int) $row['forum_id']; |
| 76 | 76 | $topic_id = (int) $row['topic_id']; |
| 77 | - $post_id = (int) $row['post_id']; |
|
| 77 | + $post_id = (int) $row['post_id']; |
|
| 78 | 78 | |
| 79 | 79 | // Convert bbcodes back to their normal form |
| 80 | 80 | if ($row['enable_bbcode']) |
@@ -89,8 +89,7 @@ discard block |
||
| 89 | 89 | $bitfield = $message_parser->bbcode_bitfield; |
| 90 | 90 | |
| 91 | 91 | $this->db->sql_query('UPDATE ' . POSTS_TABLE . " SET bbcode_bitfield = '" . $this->db->sql_escape($bitfield) . "' WHERE post_id = " . $post_id); |
| 92 | - } |
|
| 93 | - else |
|
| 92 | + } else |
|
| 94 | 93 | { |
| 95 | 94 | $this->db->sql_query('UPDATE ' . POSTS_TABLE . " SET bbcode_bitfield = '' WHERE post_id = " . $post_id); |
| 96 | 95 | } |
@@ -161,8 +160,7 @@ discard block |
||
| 161 | 160 | 'size' => 'large', |
| 162 | 161 | 'editor' => true, |
| 163 | 162 | )); |
| 164 | - } |
|
| 165 | - else if ($field_type == 'summary') |
|
| 163 | + } else if ($field_type == 'summary') |
|
| 166 | 164 | { |
| 167 | 165 | $field_type = 'textarea'; |
| 168 | 166 | $field_settings = serialize(array( |
@@ -133,8 +133,7 @@ |
||
| 133 | 133 | if (isset($current_bbcodes[$sql_ary['bbcode_tag']])) |
| 134 | 134 | { |
| 135 | 135 | $this->db->sql_query('UPDATE ' . BBCODES_TABLE . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE bbcode_id = ' . (int) $current_bbcodes[$sql_ary['bbcode_tag']]); |
| 136 | - } |
|
| 137 | - else |
|
| 136 | + } else |
|
| 138 | 137 | { |
| 139 | 138 | $sql_ary['bbcode_id'] = ++$max_bbcode_id; |
| 140 | 139 | |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | * @param \blitze\content\services\fields $fields Content fields object |
| 45 | 45 | * @param string $phpbb_root_path Path to the phpbb includes directory. |
| 46 | 46 | * @param string $php_ext php file extension |
| 47 | - */ |
|
| 47 | + */ |
|
| 48 | 48 | public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $helper, \phpbb\language\language $language, \blitze\content\services\types $content_types, \blitze\content\services\fields $fields, $phpbb_root_path, $php_ext) |
| 49 | 49 | { |
| 50 | 50 | $this->db = $db; |