@@ -77,8 +77,7 @@ |
||
| 77 | 77 | $return_data = $command->execute($style_id); |
| 78 | 78 | |
| 79 | 79 | $this->action_handler->clear_cache(); |
| 80 | - } |
|
| 81 | - catch (\blitze\sitemaker\exception\base $e) |
|
| 80 | + } catch (\blitze\sitemaker\exception\base $e) |
|
| 82 | 81 | { |
| 83 | 82 | $json_data['message'] = $e->get_message($this->user); |
| 84 | 83 | } |
@@ -58,12 +58,10 @@ |
||
| 58 | 58 | $return_data = $command->execute(); |
| 59 | 59 | |
| 60 | 60 | $this->action_handler->clear_cache(); |
| 61 | - } |
|
| 62 | - catch (\blitze\sitemaker\exception\base $e) |
|
| 61 | + } catch (\blitze\sitemaker\exception\base $e) |
|
| 63 | 62 | { |
| 64 | 63 | $return_data['message'] = $e->get_message($this->user); |
| 65 | - } |
|
| 66 | - catch (\Exception $e) |
|
| 64 | + } catch (\Exception $e) |
|
| 67 | 65 | { |
| 68 | 66 | $return_data['message'] = $this->user->lang($e->getMessage()); |
| 69 | 67 | } |
@@ -69,8 +69,7 @@ |
||
| 69 | 69 | $l_online_users = $data['.'][0]['TOTAL_USERS_ONLINE']; |
| 70 | 70 | $online_userlist = $data['.'][0]['LOGGED_IN_USER_LIST']; |
| 71 | 71 | $l_online_record = $data['.'][0]['RECORD_USERS']; |
| 72 | - } |
|
| 73 | - else |
|
| 72 | + } else |
|
| 74 | 73 | { |
| 75 | 74 | $item_id = 0; |
| 76 | 75 | $item = 'forum'; |
@@ -150,8 +150,7 @@ discard block |
||
| 150 | 150 | if (is_callable(array($this, $method))) |
| 151 | 151 | { |
| 152 | 152 | call_user_func_array(array($this, $method), array(&$sql, $change_user)); |
| 153 | - } |
|
| 154 | - else |
|
| 153 | + } else |
|
| 155 | 154 | { |
| 156 | 155 | $sql .= 'ORDER BY RAND()'; |
| 157 | 156 | } |
@@ -210,8 +209,7 @@ discard block |
||
| 210 | 209 | { |
| 211 | 210 | $this->settings['last_changed'] = time(); |
| 212 | 211 | return true; |
| 213 | - } |
|
| 214 | - else |
|
| 212 | + } else |
|
| 215 | 213 | { |
| 216 | 214 | return false; |
| 217 | 215 | } |
@@ -93,8 +93,7 @@ |
||
| 93 | 93 | { |
| 94 | 94 | $sorting = 't.topic_last_post_time'; |
| 95 | 95 | $sql_array = $this->_get_topics_sql(); |
| 96 | - } |
|
| 97 | - else |
|
| 96 | + } else |
|
| 98 | 97 | { |
| 99 | 98 | $sorting = 'p.post_time'; |
| 100 | 99 | $sql_array = $this->_get_posts_sql(); |
@@ -303,8 +303,7 @@ |
||
| 303 | 303 | $cur_voted_id[] = $row['poll_option_id']; |
| 304 | 304 | } |
| 305 | 305 | $this->db->sql_freeresult($result); |
| 306 | - } |
|
| 307 | - else |
|
| 306 | + } else |
|
| 308 | 307 | { |
| 309 | 308 | // Cookie based guest tracking ... I don't like this but hum ho |
| 310 | 309 | // it's oft requested. This relies on "nice" users who don't feel |
@@ -336,8 +336,7 @@ discard block |
||
| 336 | 336 | if ($this->settings['display_preview']) |
| 337 | 337 | { |
| 338 | 338 | $post_data = $this->forum->get_post_data($this->settings['display_preview']); |
| 339 | - } |
|
| 340 | - else |
|
| 339 | + } else |
|
| 341 | 340 | { |
| 342 | 341 | $post_data = array_fill_keys(array_keys($topic_data), array(array('post_text' => '', 'bbcode_uid' => '', 'bbcode_bitfield' => ''))); |
| 343 | 342 | } |
@@ -360,8 +359,7 @@ discard block |
||
| 360 | 359 | $this->fields['user_colour'] = 'topic_last_poster_colour'; |
| 361 | 360 | |
| 362 | 361 | $this->ptemplate->assign_var('L_POST_BY_AUTHOR', $this->user->lang('LAST_POST_BY_AUTHOR')); |
| 363 | - } |
|
| 364 | - else |
|
| 362 | + } else |
|
| 365 | 363 | { |
| 366 | 364 | $this->fields['time'] = 'topic_time'; |
| 367 | 365 | $this->fields['user_id'] = 'topic_poster'; |
@@ -101,8 +101,7 @@ |
||
| 101 | 101 | { |
| 102 | 102 | $cblock = $cblock[$bdata['bid']]; |
| 103 | 103 | $content = $this->parse($cblock); |
| 104 | - } |
|
| 105 | - else |
|
| 104 | + } else |
|
| 106 | 105 | { |
| 107 | 106 | $cblock = array( |
| 108 | 107 | 'block_id' => $bdata['bid'], |
@@ -79,8 +79,7 @@ |
||
| 79 | 79 | 'title' => 'LOGIN', |
| 80 | 80 | 'content' => $this->ptemplate->render_view('blitze/sitemaker', 'blocks/login.html', 'login_block') |
| 81 | 81 | ); |
| 82 | - } |
|
| 83 | - else if ($settings['show_member_menu']) |
|
| 82 | + } else if ($settings['show_member_menu']) |
|
| 84 | 83 | { |
| 85 | 84 | $block = $this->phpbb_container->get('blitze.sitemaker.block.member_menu'); |
| 86 | 85 | $block->set_template($this->ptemplate); |