@@ -28,7 +28,7 @@ |
||
| 28 | 28 | * @param \phpbb\language\language $language Language Object |
| 29 | 29 | * @param \phpbb\template\template $template Template object |
| 30 | 30 | * @param \blitze\content\services\types $content_types Content types object |
| 31 | - */ |
|
| 31 | + */ |
|
| 32 | 32 | public function __construct(\phpbb\language\language $language, \phpbb\template\template $template, \blitze\content\services\types $content_types) |
| 33 | 33 | { |
| 34 | 34 | $this->language = $language; |
@@ -30,7 +30,7 @@ |
||
| 30 | 30 | * @param \blitze\content\services\types $content_types Content types object |
| 31 | 31 | * @param \blitze\content\model\mapper_factory $mapper_factory Mapper factory object |
| 32 | 32 | * @param boolean $redirect Used for testing |
| 33 | - */ |
|
| 33 | + */ |
|
| 34 | 34 | public function __construct(\phpbb\cache\driver\driver_interface $cache, \blitze\content\services\types $content_types, \blitze\content\model\mapper_factory $mapper_factory, $redirect = true) |
| 35 | 35 | { |
| 36 | 36 | $this->cache = $cache; |
@@ -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 $controller_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->controller_helper = $controller_helper; |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | $this->template = $template; |
| 53 | 53 | $this->content_types = $content_types; |
| 54 | 54 | $this->phpbb_root_path = $phpbb_root_path; |
| 55 | - $this->phpbb_admin_path = $this->phpbb_root_path . $relative_admin_path; |
|
| 55 | + $this->phpbb_admin_path = $this->phpbb_root_path.$relative_admin_path; |
|
| 56 | 56 | $this->php_ext = $php_ext; |
| 57 | 57 | } |
| 58 | 58 | |
@@ -76,19 +76,19 @@ discard block |
||
| 76 | 76 | |
| 77 | 77 | 'S_ENABLED' => $entity->get_content_enabled(), |
| 78 | 78 | |
| 79 | - 'U_DELETE' => $u_action . '&do=pre_delete&type=' . $type, |
|
| 80 | - 'U_EDIT' => $u_action . '&do=edit&type=' . $type, |
|
| 81 | - 'U_STATUS' => $u_action . '&do=toggle_status&type=' . $type, |
|
| 79 | + 'U_DELETE' => $u_action.'&do=pre_delete&type='.$type, |
|
| 80 | + 'U_EDIT' => $u_action.'&do=edit&type='.$type, |
|
| 81 | + 'U_STATUS' => $u_action.'&do=toggle_status&type='.$type, |
|
| 82 | 82 | 'U_VIEW' => $this->controller_helper->route('blitze_content_index', array('type' => $type)), |
| 83 | - 'U_POST' => append_sid("{$this->phpbb_root_path}ucp." . $this->php_ext, "i=-blitze-content-ucp-content_module&mode=content&action=post&type={$type}"), |
|
| 84 | - 'U_GROUP_PERMS' => append_sid("{$this->phpbb_admin_path}index." . $this->php_ext, "i=acp_permissions&mode=setting_group_global"), |
|
| 85 | - 'U_FORUM_PERMS' => append_sid("{$this->phpbb_admin_path}index." . $this->php_ext, "i=acp_permissions&mode=setting_forum_local&forum_id[]=$forum_id"), |
|
| 83 | + 'U_POST' => append_sid("{$this->phpbb_root_path}ucp.".$this->php_ext, "i=-blitze-content-ucp-content_module&mode=content&action=post&type={$type}"), |
|
| 84 | + 'U_GROUP_PERMS' => append_sid("{$this->phpbb_admin_path}index.".$this->php_ext, "i=acp_permissions&mode=setting_group_global"), |
|
| 85 | + 'U_FORUM_PERMS' => append_sid("{$this->phpbb_admin_path}index.".$this->php_ext, "i=acp_permissions&mode=setting_forum_local&forum_id[]=$forum_id"), |
|
| 86 | 86 | ); |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | $this->template->assign_vars(array( |
| 90 | 90 | 'TYPES' => $types_list, |
| 91 | - 'U_ADD_TYPE' => $u_action . "&do=add", |
|
| 91 | + 'U_ADD_TYPE' => $u_action."&do=add", |
|
| 92 | 92 | )); |
| 93 | 93 | } |
| 94 | 94 | } |
@@ -62,7 +62,7 @@ |
||
| 62 | 62 | * @param string $phpbb_admin_path Relative admin root path |
| 63 | 63 | * @param string $php_ext php file extension |
| 64 | 64 | * @param boolean $auto_refresh Used for testing |
| 65 | - */ |
|
| 65 | + */ |
|
| 66 | 66 | public function __construct(\phpbb\auth\auth $auth, \phpbb\cache\driver\driver_interface $cache, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\language\language $language, \phpbb\request\request_interface $request, \blitze\content\services\types $content_types, \blitze\sitemaker\services\forum\manager $forum_manager, \blitze\content\model\mapper_factory $mapper_factory, $phpbb_admin_path, $php_ext, $auto_refresh = true) |
| 67 | 67 | { |
| 68 | 68 | $this->auth = $auth; |
@@ -108,7 +108,7 @@ discard block |
||
| 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 | |
@@ -187,8 +187,8 @@ discard block |
||
| 187 | 187 | { |
| 188 | 188 | if (!$type) |
| 189 | 189 | { |
| 190 | - $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 | - $message = $this->language->lang('CONTENT_TYPE_CREATED', '<a href="' . $u_set_permission . '">', '</a>'); |
|
| 190 | + $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 | + $message = $this->language->lang('CONTENT_TYPE_CREATED', '<a href="'.$u_set_permission.'">', '</a>'); |
|
| 192 | 192 | } |
| 193 | 193 | else |
| 194 | 194 | { |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | if ($old_langname !== $new_langname) |
| 238 | 238 | { |
| 239 | 239 | $forum_name = $this->language->lang($new_langname); |
| 240 | - $sql = 'UPDATE ' . FORUMS_TABLE . " SET forum_name = '" . $this->db->sql_escape($forum_name) . "' WHERE forum_id = " . (int) $forum_id; |
|
| 240 | + $sql = 'UPDATE '.FORUMS_TABLE." SET forum_name = '".$this->db->sql_escape($forum_name)."' WHERE forum_id = ".(int) $forum_id; |
|
| 241 | 241 | $this->db->sql_query($sql); |
| 242 | 242 | } |
| 243 | 243 | } |
@@ -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 | $this->meta_refresh(3, $u_action); |
| 196 | 194 | $message = $this->language->lang('CONTENT_TYPE_UPDATED'); |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | * @param \phpbb\request\request_interface $request Request object |
| 30 | 30 | * @param \phpbb\template\template $template Template object |
| 31 | 31 | * @param \blitze\content\services\form\fields_factory $fields_factory Fields factory object |
| 32 | - * @param string $admin_path Admin path |
|
| 32 | + * @param \blitze\content\services\form\fields_factory $admin_path Admin path |
|
| 33 | 33 | */ |
| 34 | 34 | public function __construct(\phpbb\request\request_interface $request, \phpbb\template\template $template, \blitze\content\services\form\fields_factory $fields_factory, $admin_path) |
| 35 | 35 | { |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | /** |
| 96 | - * @param string $values |
|
| 96 | + * @param string $value |
|
| 97 | 97 | * @return array |
| 98 | 98 | */ |
| 99 | 99 | protected function get_range($value) |
@@ -122,7 +122,6 @@ discard block |
||
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | /** |
| 125 | - * @param array $data |
|
| 126 | 125 | * @return array |
| 127 | 126 | */ |
| 128 | 127 | protected function set_prepost(&$item, $key, array $props) |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | ), |
| 69 | 69 | 'css' => array( |
| 70 | 70 | '@blitze_content/vendor/ion.rangeSlider/css/ion.rangeSlider.min.css', |
| 71 | - '@blitze_content/vendor/ion.rangeSlider/css/ion.rangeSlider.' . $data['field_props']['theme'] . '.min.css', |
|
| 71 | + '@blitze_content/vendor/ion.rangeSlider/css/ion.rangeSlider.'.$data['field_props']['theme'].'.min.css', |
|
| 72 | 72 | ) |
| 73 | 73 | )); |
| 74 | 74 | |
@@ -127,6 +127,6 @@ discard block |
||
| 127 | 127 | */ |
| 128 | 128 | protected function set_prepost(&$item, $key, array $props) |
| 129 | 129 | { |
| 130 | - $item = $props['prefix'] . $item . $props['postfix']; |
|
| 130 | + $item = $props['prefix'].$item.$props['postfix']; |
|
| 131 | 131 | } |
| 132 | 132 | } |
@@ -96,8 +96,6 @@ discard block |
||
| 96 | 96 | /** |
| 97 | 97 | * Display content field |
| 98 | 98 | * |
| 99 | - * @param string $field_value |
|
| 100 | - * @param array $field_data |
|
| 101 | 99 | * @param string $view_mode |
| 102 | 100 | * @param array $topic_data |
| 103 | 101 | * @return mixed |
@@ -172,7 +170,7 @@ discard block |
||
| 172 | 170 | * @param string $value |
| 173 | 171 | * @param string $topic_url |
| 174 | 172 | * @param string $view_mode |
| 175 | - * @return void |
|
| 173 | + * @return string |
|
| 176 | 174 | */ |
| 177 | 175 | protected function generate_field_pages($field_name, $value, $topic_url, $view_mode) |
| 178 | 176 | { |
@@ -202,8 +200,8 @@ discard block |
||
| 202 | 200 | /** |
| 203 | 201 | * Generate pagination for topic subpages |
| 204 | 202 | * |
| 205 | - * @param array $pages |
|
| 206 | - * @param array $page_titles |
|
| 203 | + * @param string[] $pages |
|
| 204 | + * @param string[] $page_titles |
|
| 207 | 205 | * @param int $start |
| 208 | 206 | * @param string $topic_url |
| 209 | 207 | * @param string $view_mode |
@@ -225,6 +223,7 @@ discard block |
||
| 225 | 223 | * |
| 226 | 224 | * @param int $start |
| 227 | 225 | * @param $page_titles |
| 226 | + * @param string $topic_url |
|
| 228 | 227 | * @return void |
| 229 | 228 | */ |
| 230 | 229 | protected function generate_toc($start, $page_titles, $topic_url) |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | $asset_path = $this->util->get_web_path(); |
| 126 | 126 | $this->util->add_assets(array( |
| 127 | 127 | 'js' => array( |
| 128 | - $asset_path . 'assets/javascript/editor.js', |
|
| 128 | + $asset_path.'assets/javascript/editor.js', |
|
| 129 | 129 | '@blitze_content/assets/form/textarea.min.js' |
| 130 | 130 | ) |
| 131 | 131 | )); |
@@ -145,12 +145,12 @@ discard block |
||
| 145 | 145 | // Assigning custom bbcodes |
| 146 | 146 | if (!function_exists('display_custom_bbcodes')) |
| 147 | 147 | { |
| 148 | - include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext); |
|
| 148 | + include($this->phpbb_root_path.'includes/functions_display.'.$this->php_ext); |
|
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | display_custom_bbcodes(); |
| 152 | 152 | |
| 153 | - $bbcode_status = ($this->config['allow_bbcode'] && $this->auth->acl_get('f_bbcode', $forum_id)) ? true : false; |
|
| 153 | + $bbcode_status = ($this->config['allow_bbcode'] && $this->auth->acl_get('f_bbcode', $forum_id)) ? true : false; |
|
| 154 | 154 | |
| 155 | 155 | $dataref = $this->template_context->get_data_ref(); |
| 156 | 156 | $this->ptemplate->assign_block_vars_array('custom_tags', (isset($dataref['custom_tags'])) ? $dataref['custom_tags'] : array()); |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | $this->template->assign_block_vars('toc', array( |
| 236 | 236 | 'TITLE' => $title, |
| 237 | 237 | 'S_PAGE' => ($page === $start), |
| 238 | - 'U_VIEW' => append_sid($topic_url, 'page=' . $page), |
|
| 238 | + 'U_VIEW' => append_sid($topic_url, 'page='.$page), |
|
| 239 | 239 | )); |
| 240 | 240 | } |
| 241 | 241 | } |
@@ -111,7 +111,7 @@ |
||
| 111 | 111 | */ |
| 112 | 112 | protected function set_prop($prop, array &$data) |
| 113 | 113 | { |
| 114 | - $field_prop = $this->request->variable('field_' . $prop, array('' => array(0 => '')), true); |
|
| 114 | + $field_prop = $this->request->variable('field_'.$prop, array('' => array(0 => '')), true); |
|
| 115 | 115 | |
| 116 | 116 | if (null !== ($array = array_pop($field_prop))) |
| 117 | 117 | { |
@@ -168,8 +168,7 @@ discard block |
||
| 168 | 168 | { |
| 169 | 169 | $data = generate_text_for_edit($this->field_explain, $this->field_exp_uid, $this->field_exp_options); |
| 170 | 170 | return $data['text']; |
| 171 | - } |
|
| 172 | - else |
|
| 171 | + } else |
|
| 173 | 172 | { |
| 174 | 173 | $parse_flags = ($this->field_exp_bitfield ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES; |
| 175 | 174 | return generate_text_for_display($this->field_explain, $this->field_exp_uid, $this->field_exp_bitfield, $parse_flags); |
@@ -186,8 +185,7 @@ discard block |
||
| 186 | 185 | if (!is_array($props)) |
| 187 | 186 | { |
| 188 | 187 | $this->field_props = $props; |
| 189 | - } |
|
| 190 | - else if (sizeof($props)) |
|
| 188 | + } else if (sizeof($props)) |
|
| 191 | 189 | { |
| 192 | 190 | $this->field_props = json_encode($props); |
| 193 | 191 | } |