@@ -85,11 +85,11 @@ |
||
85 | 85 | generate_smilies('inline', 0); |
86 | 86 | |
87 | 87 | // BBCode, Smilies, Images URL, and Flash statuses |
88 | - $bbcode_status = (bool) $this->config['allow_bbcode'] && $this->auth->acl_get('f_bbcode', $this->config['ideas_forum_id']); |
|
89 | - $smilies_status = (bool) $this->config['allow_smilies'] && $this->auth->acl_get('f_smilies', $this->config['ideas_forum_id']); |
|
88 | + $bbcode_status = (bool) $this->config['allow_bbcode'] && $this->auth->acl_get('f_bbcode', $this->config['ideas_forum_id']); |
|
89 | + $smilies_status = (bool) $this->config['allow_smilies'] && $this->auth->acl_get('f_smilies', $this->config['ideas_forum_id']); |
|
90 | 90 | $img_status = (bool) $bbcode_status && $this->auth->acl_get('f_img', $this->config['ideas_forum_id']); |
91 | 91 | $url_status = (bool) $this->config['allow_post_links']; |
92 | - $flash_status = (bool) $bbcode_status && $this->auth->acl_get('f_flash', $this->config['ideas_forum_id']) && $this->config['allow_post_flash']; |
|
92 | + $flash_status = (bool) $bbcode_status && $this->auth->acl_get('f_flash', $this->config['ideas_forum_id']) && $this->config['allow_post_flash']; |
|
93 | 93 | |
94 | 94 | $this->template->assign_vars(array( |
95 | 95 | 'TITLE' => $title, |
@@ -58,13 +58,11 @@ |
||
58 | 58 | 'ERROR' => implode('<br />', $submit), |
59 | 59 | 'MESSAGE' => $message, |
60 | 60 | )); |
61 | - } |
|
62 | - else if (!$this->auth->acl_get('f_noapprove', $this->config['ideas_forum_id'])) |
|
61 | + } else if (!$this->auth->acl_get('f_noapprove', $this->config['ideas_forum_id'])) |
|
63 | 62 | { |
64 | 63 | // Show users who's posts need approval a special message |
65 | 64 | throw new http_exception(200, 'IDEA_STORED_MOD', array($this->helper->route('phpbb_ideas_index_controller'))); |
66 | - } |
|
67 | - else |
|
65 | + } else |
|
68 | 66 | { |
69 | 67 | return new RedirectResponse($this->helper->route('phpbb_ideas_idea_controller', array('idea_id' => $submit))); |
70 | 68 | } |
@@ -203,8 +203,7 @@ |
||
203 | 203 | |
204 | 204 | $this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'ACP_PHPBB_IDEAS_FORUM_SETUP_LOG'); |
205 | 205 | trigger_error($this->language->lang('ACP_IDEAS_FORUM_SETUP_UPDATED') . adm_back_link($this->u_action)); |
206 | - } |
|
207 | - else |
|
206 | + } else |
|
208 | 207 | { |
209 | 208 | confirm_box(false, $this->language->lang('ACP_IDEAS_FORUM_SETUP_CONFIRM'), build_hidden_fields(array( |
210 | 209 | 'ideas_forum_setup' => $this->request->is_set_post('ideas_forum_setup'), |
@@ -85,8 +85,7 @@ discard block |
||
85 | 85 | $message = $this->language->lang('IDEA_DELETED') . '<br /><br />' . $this->language->lang('RETURN_IDEAS', '<a href="' . $redirect . '">', '</a>'); |
86 | 86 | meta_refresh(3, $redirect); |
87 | 87 | trigger_error($message); // trigger error needed for data-ajax |
88 | - } |
|
89 | - else |
|
88 | + } else |
|
90 | 89 | { |
91 | 90 | confirm_box( |
92 | 91 | false, |
@@ -140,8 +139,7 @@ discard block |
||
140 | 139 | if ($this->auth->acl_get('f_vote', (int) $this->config['ideas_forum_id'])) |
141 | 140 | { |
142 | 141 | $result = $this->ideas->remove_vote($this->data, $this->user->data['user_id']); |
143 | - } |
|
144 | - else |
|
142 | + } else |
|
145 | 143 | { |
146 | 144 | $result = $this->language->lang('NO_AUTH_OPERATION'); |
147 | 145 | } |
@@ -254,8 +252,7 @@ discard block |
||
254 | 252 | if ($this->auth->acl_get('f_vote', (int) $this->config['ideas_forum_id'])) |
255 | 253 | { |
256 | 254 | $result = $this->ideas->vote($this->data, $this->user->data['user_id'], $vote); |
257 | - } |
|
258 | - else |
|
255 | + } else |
|
259 | 256 | { |
260 | 257 | $result = $this->language->lang('NO_AUTH_OPERATION'); |
261 | 258 | } |
@@ -187,8 +187,7 @@ discard block |
||
187 | 187 | ON i.topic_id = t.topic_id |
188 | 188 | WHERE $where |
189 | 189 | ORDER BY " . $this->db->sql_escape($sortby); |
190 | - } |
|
191 | - else |
|
190 | + } else |
|
192 | 191 | { |
193 | 192 | // YEEEEEEEEAAAAAAAAAAAAAHHHHHHH |
194 | 193 | // From http://evanmiller.org/how-not-to-sort-by-average-rating.html |
@@ -501,8 +500,7 @@ discard block |
||
501 | 500 | // Change to upvote |
502 | 501 | $idea['idea_votes_up']++; |
503 | 502 | $idea['idea_votes_down']--; |
504 | - } |
|
505 | - else |
|
503 | + } else |
|
506 | 504 | { |
507 | 505 | // Change to downvote |
508 | 506 | $idea['idea_votes_up']--; |
@@ -312,14 +312,12 @@ |
||
312 | 312 | { |
313 | 313 | $event['location'] = $this->language->lang('POSTING_NEW_IDEA'); |
314 | 314 | $event['location_url'] = $this->helper->route('phpbb_ideas_index_controller'); |
315 | - } |
|
316 | - else if (strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/ideas') === 0) |
|
315 | + } else if (strrpos($event['row']['session_page'], 'app.' . $this->php_ext . '/ideas') === 0) |
|
317 | 316 | { |
318 | 317 | $event['location'] = $this->language->lang('VIEWING_IDEAS'); |
319 | 318 | $event['location_url'] = $this->helper->route('phpbb_ideas_index_controller'); |
320 | 319 | } |
321 | - } |
|
322 | - else if ($event['on_page'][1] === 'viewtopic' && $event['row']['session_forum_id'] == $this->config['ideas_forum_id']) |
|
320 | + } else if ($event['on_page'][1] === 'viewtopic' && $event['row']['session_forum_id'] == $this->config['ideas_forum_id']) |
|
323 | 321 | { |
324 | 322 | $event['location'] = $this->language->lang('VIEWING_IDEAS'); |
325 | 323 | $event['location_url'] = $this->helper->route('phpbb_ideas_index_controller'); |