@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | // @codeCoverageIgnoreStart |
| 23 | 23 | if (!function_exists('make_forum_select')) |
| 24 | 24 | { |
| 25 | - include($phpbb_root_path . 'includes/functions_admin.' . $php_ext); |
|
| 25 | + include($phpbb_root_path.'includes/functions_admin.'.$php_ext); |
|
| 26 | 26 | } |
| 27 | 27 | // @codeCoverageIgnoreEnd |
| 28 | 28 | } |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | $forum_options = array('' => 'ALL_FORUMS'); |
| 44 | 44 | foreach ($forumlist as $row) |
| 45 | 45 | { |
| 46 | - $forum_options[$row['forum_id']] = $row['padding'] . $row['forum_name']; |
|
| 46 | + $forum_options[$row['forum_id']] = $row['padding'].$row['forum_name']; |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | return $forum_options; |
@@ -89,7 +89,7 @@ |
||
| 89 | 89 | $this->store['topic'][$row['topic_id']] = $row; |
| 90 | 90 | |
| 91 | 91 | $this->store['tracking'][$row['forum_id']]['topic_list'][] = $row['topic_id']; |
| 92 | - $this->store['tracking'][$row['forum_id']]['mark_time'] =& $row['forum_mark_time']; |
|
| 92 | + $this->store['tracking'][$row['forum_id']]['mark_time'] = & $row['forum_mark_time']; |
|
| 93 | 93 | $this->store['post_ids']['first'][] = $row['topic_first_post_id']; |
| 94 | 94 | $this->store['post_ids']['last'][] = $row['topic_last_post_id']; |
| 95 | 95 | $this->store['poster_ids'][] = $row['topic_poster']; |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | { |
| 65 | 65 | if (!class_exists('acp_forums')) |
| 66 | 66 | { |
| 67 | - include($this->phpbb_root_path . 'includes/acp/acp_forums.' . $this->php_ext); |
|
| 67 | + include($this->phpbb_root_path.'includes/acp/acp_forums.'.$this->php_ext); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | $this->translator->add_lang('acp/forums'); |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | |
| 21 | 21 | /** @type \blitze\sitemaker\model\entity\menu $entity */ |
| 22 | 22 | $entity = $menu_mapper->create_entity(array( |
| 23 | - 'menu_name' => $this->translator->lang('MENU') . '-' . mt_rand(1000, 9999), |
|
| 23 | + 'menu_name' => $this->translator->lang('MENU').'-'.mt_rand(1000, 9999), |
|
| 24 | 24 | )); |
| 25 | 25 | |
| 26 | 26 | $entity = $menu_mapper->save($entity); |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | |
| 103 | 103 | $this->ptemplate->assign_block_vars('topicrow', array( |
| 104 | 104 | 'TOPIC_TITLE' => censor_text($row['topic_title']), |
| 105 | - 'U_VIEWTOPIC' => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id"), |
|
| 105 | + 'U_VIEWTOPIC' => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id"), |
|
| 106 | 106 | )); |
| 107 | 107 | unset($topic_data[$i]); |
| 108 | 108 | } |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | BOOKMARKS_TABLE => 'b', |
| 121 | 121 | ), |
| 122 | 122 | 'WHERE' => array( |
| 123 | - 'b.user_id = ' . (int) $this->user->data['user_id'], |
|
| 123 | + 'b.user_id = '.(int) $this->user->data['user_id'], |
|
| 124 | 124 | 'b.topic_id = t.topic_id', |
| 125 | 125 | ), |
| 126 | 126 | ); |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | |
| 95 | 95 | $this->ptemplate->assign_block_vars('topicrow', array( |
| 96 | 96 | 'TOPIC_TITLE' => censor_text($row['topic_title']), |
| 97 | - 'U_VIEWTOPIC' => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id"), |
|
| 97 | + 'U_VIEWTOPIC' => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id"), |
|
| 98 | 98 | )); |
| 99 | 99 | unset($topic_data[$i]); |
| 100 | 100 | } |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | { |
| 136 | 136 | return array( |
| 137 | 137 | 'WHERE' => array( |
| 138 | - 't.topic_last_post_time > ' . (int) $this->user->data['user_lastvisit'], |
|
| 138 | + 't.topic_last_post_time > '.(int) $this->user->data['user_lastvisit'], |
|
| 139 | 139 | 't.topic_moved_id = 0', |
| 140 | 140 | ), |
| 141 | 141 | ); |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | POSTS_TABLE => 'p', |
| 152 | 152 | ), |
| 153 | 153 | 'WHERE' => array( |
| 154 | - 't.topic_id = p.topic_id AND p.post_time > ' . $this->user->data['user_lastvisit'], |
|
| 154 | + 't.topic_id = p.topic_id AND p.post_time > '.$this->user->data['user_lastvisit'], |
|
| 155 | 155 | ), |
| 156 | 156 | ); |
| 157 | 157 | } |
@@ -68,11 +68,11 @@ discard block |
||
| 68 | 68 | 'USER_POSTS' => $this->user->data['user_posts'], |
| 69 | 69 | 'NEW_POSTS' => $this->get_new_posts_count(), |
| 70 | 70 | |
| 71 | - 'U_PROFILE' => append_sid($this->phpbb_root_path . 'memberlist.' . $this->php_ext, 'mode=viewprofile&u=' . $this->user->data['user_id']), |
|
| 72 | - 'U_SEARCH_NEW' => append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, 'search_id=newposts'), |
|
| 73 | - 'U_SEARCH_SELF' => append_sid($this->phpbb_root_path . 'search.' . $this->php_ext, 'search_id=egosearch'), |
|
| 74 | - 'U_PRIVATE_MSG' => append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, 'i=pm&folder=inbox'), |
|
| 75 | - 'U_LOGOUT' => append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, 'mode=logout', true, $this->user->session_id), |
|
| 71 | + 'U_PROFILE' => append_sid($this->phpbb_root_path.'memberlist.'.$this->php_ext, 'mode=viewprofile&u='.$this->user->data['user_id']), |
|
| 72 | + 'U_SEARCH_NEW' => append_sid($this->phpbb_root_path.'search.'.$this->php_ext, 'search_id=newposts'), |
|
| 73 | + 'U_SEARCH_SELF' => append_sid($this->phpbb_root_path.'search.'.$this->php_ext, 'search_id=egosearch'), |
|
| 74 | + 'U_PRIVATE_MSG' => append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, 'i=pm&folder=inbox'), |
|
| 75 | + 'U_LOGOUT' => append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, 'mode=logout', true, $this->user->session_id), |
|
| 76 | 76 | 'U_MCP' => $this->get_mcp_url(), |
| 77 | 77 | 'U_ACP' => $this->get_acp_url(), |
| 78 | 78 | )); |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | */ |
| 100 | 100 | protected function get_mcp_url() |
| 101 | 101 | { |
| 102 | - return ($this->auth->acl_get('m_')) ? append_sid($this->phpbb_root_path . 'mcp.' . $this->php_ext, false, true, $this->user->session_id) : ''; |
|
| 102 | + return ($this->auth->acl_get('m_')) ? append_sid($this->phpbb_root_path.'mcp.'.$this->php_ext, false, true, $this->user->session_id) : ''; |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | /** |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | */ |
| 108 | 108 | protected function get_acp_url() |
| 109 | 109 | { |
| 110 | - return ($this->auth->acl_get('a_')) ? append_sid($this->phpbb_root_path . 'adm/index.' . $this->php_ext, 'i=-blitze-sitemaker-acp-menu_module', true, $this->user->session_id) : ''; |
|
| 110 | + return ($this->auth->acl_get('a_')) ? append_sid($this->phpbb_root_path.'adm/index.'.$this->php_ext, 'i=-blitze-sitemaker-acp-menu_module', true, $this->user->session_id) : ''; |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | /** |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | POSTS_TABLE => 'p', |
| 121 | 121 | ), |
| 122 | 122 | 'WHERE' => array( |
| 123 | - 't.topic_id = p.topic_id AND p.post_time > ' . (int) $this->user->data['user_lastvisit'], |
|
| 123 | + 't.topic_id = p.topic_id AND p.post_time > '.(int) $this->user->data['user_lastvisit'], |
|
| 124 | 124 | ), |
| 125 | 125 | ); |
| 126 | 126 | |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | * @param array $topic_data |
| 69 | 69 | * @param \phpbb\template\twig\twig $template |
| 70 | 70 | */ |
| 71 | - public function build(array $topic_data, \phpbb\template\twig\twig &$template) |
|
| 71 | + public function build(array $topic_data, \phpbb\template\twig\twig & $template) |
|
| 72 | 72 | { |
| 73 | 73 | $this->translator->add_lang('viewtopic'); |
| 74 | 74 | |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | 'S_POLL_ACTION' => $viewtopic_url, |
| 101 | 101 | 'S_FORM_TOKEN' => $this->sitemaker->get_form_key('posting'), |
| 102 | 102 | |
| 103 | - 'U_VIEW_RESULTS' => $viewtopic_url . '&view=viewpoll', |
|
| 103 | + 'U_VIEW_RESULTS' => $viewtopic_url.'&view=viewpoll', |
|
| 104 | 104 | )); |
| 105 | 105 | } |
| 106 | 106 | |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | $post_id = (int) $topic_data['topic_first_post_id']; |
| 172 | 172 | |
| 173 | 173 | $sql = 'SELECT o.*, p.bbcode_bitfield, p.bbcode_uid |
| 174 | - FROM ' . POLL_OPTIONS_TABLE . ' o, ' . POSTS_TABLE . " p |
|
| 174 | + FROM ' . POLL_OPTIONS_TABLE.' o, '.POSTS_TABLE." p |
|
| 175 | 175 | WHERE o.topic_id = $topic_id |
| 176 | 176 | AND p.post_id = $post_id |
| 177 | 177 | AND p.topic_id = o.topic_id |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | * @param int $poll_most |
| 217 | 217 | * @param \phpbb\template\twig\twig $template |
| 218 | 218 | */ |
| 219 | - private function build_poll_options(array $cur_voted_id, array $poll_info, $poll_total, $poll_most, \phpbb\template\twig\twig &$template) |
|
| 219 | + private function build_poll_options(array $cur_voted_id, array $poll_info, $poll_total, $poll_most, \phpbb\template\twig\twig & $template) |
|
| 220 | 220 | { |
| 221 | 221 | foreach ($poll_info as $poll_option) |
| 222 | 222 | { |
@@ -247,8 +247,8 @@ discard block |
||
| 247 | 247 | if ($this->user->data['is_registered']) |
| 248 | 248 | { |
| 249 | 249 | $sql = 'SELECT poll_option_id |
| 250 | - FROM ' . POLL_VOTES_TABLE . ' |
|
| 251 | - WHERE topic_id = ' . (int) $topic_id . ' |
|
| 250 | + FROM ' . POLL_VOTES_TABLE.' |
|
| 251 | + WHERE topic_id = ' . (int) $topic_id.' |
|
| 252 | 252 | AND vote_user_id = ' . (int) $this->user->data['user_id']; |
| 253 | 253 | $result = $this->db->sql_query($sql); |
| 254 | 254 | |
@@ -263,9 +263,9 @@ discard block |
||
| 263 | 263 | // Cookie based guest tracking ... I don't like this but hum ho |
| 264 | 264 | // it's oft requested. This relies on "nice" users who don't feel |
| 265 | 265 | // the need to delete cookies to mess with results. |
| 266 | - if ($this->request->is_set($this->config['cookie_name'] . '_poll_' . $topic_id, \phpbb\request\request_interface::COOKIE)) |
|
| 266 | + if ($this->request->is_set($this->config['cookie_name'].'_poll_'.$topic_id, \phpbb\request\request_interface::COOKIE)) |
|
| 267 | 267 | { |
| 268 | - $cur_voted_id = explode(',', $this->request->variable($this->config['cookie_name'] . '_poll_' . $topic_id, '', true, \phpbb\request\request_interface::COOKIE)); |
|
| 268 | + $cur_voted_id = explode(',', $this->request->variable($this->config['cookie_name'].'_poll_'.$topic_id, '', true, \phpbb\request\request_interface::COOKIE)); |
|
| 269 | 269 | $cur_voted_id = array_map('intval', $cur_voted_id); |
| 270 | 270 | } |
| 271 | 271 | } |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | $content = $this->request->variable('content', '', true); |
| 86 | 86 | $cblocks = $this->get_custom_blocks(); |
| 87 | 87 | |
| 88 | - $sql_data = $this->get_default_fields($block_id); |
|
| 88 | + $sql_data = $this->get_default_fields($block_id); |
|
| 89 | 89 | $sql_data['block_content'] = $content; |
| 90 | 90 | |
| 91 | 91 | generate_text_for_storage($sql_data['block_content'], $sql_data['bbcode_uid'], $sql_data['bbcode_bitfield'], $sql_data['bbcode_options'], true, false, true); |
@@ -149,11 +149,11 @@ discard block |
||
| 149 | 149 | { |
| 150 | 150 | if (!$block_exists) |
| 151 | 151 | { |
| 152 | - $sql = 'INSERT INTO ' . $this->cblocks_table . ' ' . $this->db->sql_build_array('INSERT', $sql_data); |
|
| 152 | + $sql = 'INSERT INTO '.$this->cblocks_table.' '.$this->db->sql_build_array('INSERT', $sql_data); |
|
| 153 | 153 | } |
| 154 | 154 | else |
| 155 | 155 | { |
| 156 | - $sql = 'UPDATE ' . $this->cblocks_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_data) . ' WHERE block_id = ' . (int) $sql_data['block_id']; |
|
| 156 | + $sql = 'UPDATE '.$this->cblocks_table.' SET '.$this->db->sql_build_array('UPDATE', $sql_data).' WHERE block_id = '.(int) $sql_data['block_id']; |
|
| 157 | 157 | } |
| 158 | 158 | $this->db->sql_query($sql); |
| 159 | 159 | $this->cache->destroy('sm_cblocks'); |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | |
| 174 | 174 | $block_is_active = $status; |
| 175 | 175 | $status = ($content && $status) ? true : false; |
| 176 | - $content = '<div id="block-editor-' . $cblock['block_id'] . '" class="editable editable-block" data-service="blitze.sitemaker.block.custom" data-method="edit" data-raw="' . $cblock['block_content'] . '" data-active="' . $block_is_active . '">' . $content . '</div>'; |
|
| 176 | + $content = '<div id="block-editor-'.$cblock['block_id'].'" class="editable editable-block" data-service="blitze.sitemaker.block.custom" data-method="edit" data-raw="'.$cblock['block_content'].'" data-active="'.$block_is_active.'">'.$content.'</div>'; |
|
| 177 | 177 | } |
| 178 | 178 | } |
| 179 | 179 | |