@@ -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 | |
@@ -75,16 +75,16 @@ discard block |
||
| 75 | 75 | 'L_FORUM_PERMS' => $this->language->lang('EDIT_FORUM_PERMISSIONS', $langname), |
| 76 | 76 | 'S_ENABLED' => $entity->get_content_enabled(), |
| 77 | 77 | |
| 78 | - 'U_DELETE' => $u_action . '&do=pre_delete&type=' . $type, |
|
| 79 | - 'U_EDIT' => $u_action . '&do=edit&type=' . $type, |
|
| 80 | - 'U_STATUS' => $u_action . '&do=toggle_status&type=' . $type, |
|
| 78 | + 'U_DELETE' => $u_action.'&do=pre_delete&type='.$type, |
|
| 79 | + 'U_EDIT' => $u_action.'&do=edit&type='.$type, |
|
| 80 | + 'U_STATUS' => $u_action.'&do=toggle_status&type='.$type, |
|
| 81 | 81 | 'U_VIEW' => $this->controller_helper->route('blitze_content_index', array('type' => $type)), |
| 82 | - 'U_POST' => append_sid("{$this->phpbb_root_path}ucp." . $this->php_ext, "i=-blitze-content-ucp-content_module&mode=content&action=post&type={$type}"), |
|
| 83 | - 'U_GROUP_PERMS' => append_sid("{$this->phpbb_admin_path}index." . $this->php_ext, "i=acp_permissions&mode=setting_group_global"), |
|
| 84 | - 'U_FORUM_PERMS' => append_sid("{$this->phpbb_admin_path}index." . $this->php_ext, "i=acp_permissions&mode=setting_forum_local&forum_id[]=$forum_id"), |
|
| 82 | + 'U_POST' => append_sid("{$this->phpbb_root_path}ucp.".$this->php_ext, "i=-blitze-content-ucp-content_module&mode=content&action=post&type={$type}"), |
|
| 83 | + 'U_GROUP_PERMS' => append_sid("{$this->phpbb_admin_path}index.".$this->php_ext, "i=acp_permissions&mode=setting_group_global"), |
|
| 84 | + 'U_FORUM_PERMS' => append_sid("{$this->phpbb_admin_path}index.".$this->php_ext, "i=acp_permissions&mode=setting_forum_local&forum_id[]=$forum_id"), |
|
| 85 | 85 | )); |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | - $this->template->assign_var('U_ADD_TYPE', $u_action . "&do=add"); |
|
| 88 | + $this->template->assign_var('U_ADD_TYPE', $u_action."&do=add"); |
|
| 89 | 89 | } |
| 90 | 90 | } |