@@ -141,7 +141,7 @@ |
||
141 | 141 | */ |
142 | 142 | public function set_class($class) |
143 | 143 | { |
144 | - $this->class = ($class) ? ' ' . trim($class) : ''; |
|
144 | + $this->class = ($class) ? ' '.trim($class) : ''; |
|
145 | 145 | return $this; |
146 | 146 | } |
147 | 147 |
@@ -39,8 +39,8 @@ |
||
39 | 39 | */ |
40 | 40 | public function create($type) |
41 | 41 | { |
42 | - $mapper_class = 'blitze\\sitemaker\\model\\mapper\\' . $type; |
|
43 | - $collection = 'blitze\\sitemaker\\model\\collections\\' . $type; |
|
42 | + $mapper_class = 'blitze\\sitemaker\\model\\mapper\\'.$type; |
|
43 | + $collection = 'blitze\\sitemaker\\model\\collections\\'.$type; |
|
44 | 44 | |
45 | 45 | return new $mapper_class($this->db, new $collection, $this, $this->mapper_tables[$type], $this->config); |
46 | 46 | } |
@@ -25,8 +25,8 @@ discard block |
||
25 | 25 | */ |
26 | 26 | protected function find_sql(array $sql_where) |
27 | 27 | { |
28 | - return 'SELECT * FROM ' . $this->entity_table . |
|
29 | - ((sizeof($sql_where)) ? ' WHERE ' . join(' AND ', $sql_where) : '') . ' |
|
28 | + return 'SELECT * FROM '.$this->entity_table. |
|
29 | + ((sizeof($sql_where)) ? ' WHERE '.join(' AND ', $sql_where) : '').' |
|
30 | 30 | ORDER BY position, weight ASC'; |
31 | 31 | } |
32 | 32 | |
@@ -40,12 +40,12 @@ discard block |
||
40 | 40 | // move blocks up for position |
41 | 41 | if ($condition instanceof $this->entity_class) |
42 | 42 | { |
43 | - $this->db->sql_query('UPDATE ' . $this->entity_table . ' |
|
43 | + $this->db->sql_query('UPDATE '.$this->entity_table.' |
|
44 | 44 | SET weight = weight - 1 |
45 | - WHERE weight > ' . (int) $condition->get_weight() . ' |
|
46 | - AND style = ' . (int) $condition->get_style() . ' |
|
47 | - AND route_id = ' . (int) $condition->get_route_id() . " |
|
48 | - AND position = '" . $this->db->sql_escape($condition->get_position()) . "'"); |
|
45 | + WHERE weight > ' . (int) $condition->get_weight().' |
|
46 | + AND style = ' . (int) $condition->get_style().' |
|
47 | + AND route_id = ' . (int) $condition->get_route_id()." |
|
48 | + AND position = '" . $this->db->sql_escape($condition->get_position())."'"); |
|
49 | 49 | } |
50 | 50 | } |
51 | 51 | |
@@ -65,10 +65,10 @@ discard block |
||
65 | 65 | protected function move_blocks_down(\blitze\sitemaker\model\entity_interface $entity) |
66 | 66 | { |
67 | 67 | /** @type \blitze\sitemaker\model\entity\block $entity */ |
68 | - $sql = 'UPDATE ' . $this->entity_table . ' |
|
68 | + $sql = 'UPDATE '.$this->entity_table.' |
|
69 | 69 | SET weight = weight + 1 |
70 | - WHERE weight >= ' . (int) $entity->get_weight() . ' |
|
71 | - AND route_id = ' . (int) $entity->get_route_id() . ' |
|
70 | + WHERE weight >= ' . (int) $entity->get_weight().' |
|
71 | + AND route_id = ' . (int) $entity->get_route_id().' |
|
72 | 72 | AND style = ' . (int) $entity->get_style(); |
73 | 73 | $this->db->sql_query($sql); |
74 | 74 | } |
@@ -88,8 +88,7 @@ |
||
88 | 88 | $return_data = $command->execute($style_id); |
89 | 89 | |
90 | 90 | $this->action_handler->clear_cache(); |
91 | - } |
|
92 | - catch (\blitze\sitemaker\exception\base $e) |
|
91 | + } catch (\blitze\sitemaker\exception\base $e) |
|
93 | 92 | { |
94 | 93 | $json_data['message'] = $e->get_message($this->translator); |
95 | 94 | } |
@@ -63,12 +63,10 @@ |
||
63 | 63 | $return_data = $command->execute(); |
64 | 64 | |
65 | 65 | $this->action_handler->clear_cache(); |
66 | - } |
|
67 | - catch (\blitze\sitemaker\exception\base $e) |
|
66 | + } catch (\blitze\sitemaker\exception\base $e) |
|
68 | 67 | { |
69 | 68 | $return_data['message'] = $e->get_message($this->translator); |
70 | - } |
|
71 | - catch (\Exception $e) |
|
69 | + } catch (\Exception $e) |
|
72 | 70 | { |
73 | 71 | $return_data['message'] = $this->translator->lang($e->getMessage()); |
74 | 72 | } |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | { |
109 | 109 | $this->set_display_fields(); |
110 | 110 | |
111 | - $view = 'S_' . strtoupper($this->settings['template']); |
|
111 | + $view = 'S_'.strtoupper($this->settings['template']); |
|
112 | 112 | $post_data = $this->get_post_data($topic_data); |
113 | 113 | $topic_data = array_values($topic_data); |
114 | 114 | |
@@ -156,10 +156,10 @@ discard block |
||
156 | 156 | 'VIEWS' => (int) $row['topic_views'], |
157 | 157 | 'S_UNREAD_TOPIC' => $this->is_unread_topic($forum_id, $topic_id, $row['topic_last_post_time']), |
158 | 158 | |
159 | - 'U_VIEWTOPIC' => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id"), |
|
160 | - 'U_VIEWFORUM' => append_sid($this->phpbb_root_path . 'viewforum.' . $this->php_ext, "f=$forum_id"), |
|
161 | - 'U_NEW_POST' => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id&view=unread") . '#unread', |
|
162 | - 'U_LAST_POST' => append_sid($this->phpbb_root_path . 'viewtopic.' . $this->php_ext, "f=$forum_id&t=$topic_id&p=" . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'], |
|
159 | + 'U_VIEWTOPIC' => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id"), |
|
160 | + 'U_VIEWFORUM' => append_sid($this->phpbb_root_path.'viewforum.'.$this->php_ext, "f=$forum_id"), |
|
161 | + 'U_NEW_POST' => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id&view=unread").'#unread', |
|
162 | + 'U_LAST_POST' => append_sid($this->phpbb_root_path.'viewtopic.'.$this->php_ext, "f=$forum_id&t=$topic_id&p=".$row['topic_last_post_id']).'#p'.$row['topic_last_post_id'], |
|
163 | 163 | )); |
164 | 164 | unset($topic_data[$i], $post_data[$topic_id]); |
165 | 165 | } |
@@ -257,8 +257,7 @@ discard block |
||
257 | 257 | if ($this->settings['context'] && $this->settings['preview_chars']) |
258 | 258 | { |
259 | 259 | $post_data = $this->forum_data->get_post_data($this->settings['context']); |
260 | - } |
|
261 | - else |
|
260 | + } else |
|
262 | 261 | { |
263 | 262 | $post_data = array_fill_keys(array_keys($topic_data), array(array('post_text' => '', 'bbcode_uid' => '', 'bbcode_bitfield' => ''))); |
264 | 263 | } |
@@ -277,8 +276,7 @@ discard block |
||
277 | 276 | $this->fields['user_id'] = 'topic_last_poster_id'; |
278 | 277 | |
279 | 278 | $this->ptemplate->assign_var('L_POST_BY_AUTHOR', $this->translator->lang('LAST_POST_BY_AUTHOR')); |
280 | - } |
|
281 | - else |
|
279 | + } else |
|
282 | 280 | { |
283 | 281 | $this->fields['time'] = 'topic_time'; |
284 | 282 | $this->fields['user_id'] = 'topic_poster'; |
@@ -45,9 +45,9 @@ |
||
45 | 45 | public function display(array $settings, $edit_mode = false) |
46 | 46 | { |
47 | 47 | $content = ''; |
48 | - $content .= $this->translator->lang('TOTAL_POSTS_COUNT', (int) $this->config['num_posts']) . '<br />'; |
|
49 | - $content .= $this->translator->lang('TOTAL_TOPICS', (int) $this->config['num_topics']) . '<br />'; |
|
50 | - $content .= $this->translator->lang('TOTAL_USERS', (int) $this->config['num_users']) . '<br />'; |
|
48 | + $content .= $this->translator->lang('TOTAL_POSTS_COUNT', (int) $this->config['num_posts']).'<br />'; |
|
49 | + $content .= $this->translator->lang('TOTAL_TOPICS', (int) $this->config['num_topics']).'<br />'; |
|
50 | + $content .= $this->translator->lang('TOTAL_USERS', (int) $this->config['num_users']).'<br />'; |
|
51 | 51 | $content .= $this->translator->lang('NEWEST_USER', get_username_string('full', $this->config['newest_user_id'], $this->config['newest_username'], $this->config['newest_user_colour'])); |
52 | 52 | |
53 | 53 | $this->template->assign_var('NEWEST_USER', false); |
@@ -96,10 +96,10 @@ |
||
96 | 96 | foreach ($this->message_full as &$message) |
97 | 97 | { |
98 | 98 | // Attempt to translate each portion |
99 | - $translated_message = $translator->lang('EXCEPTION_' . $message); |
|
99 | + $translated_message = $translator->lang('EXCEPTION_'.$message); |
|
100 | 100 | |
101 | 101 | // Check if translating did anything |
102 | - if ($translated_message !== 'EXCEPTION_' . $message) |
|
102 | + if ($translated_message !== 'EXCEPTION_'.$message) |
|
103 | 103 | { |
104 | 104 | // It did, so replace message with the translated version |
105 | 105 | $message = $translated_message; |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | public function get_users_groups() |
41 | 41 | { |
42 | 42 | $sql = 'SELECT group_id |
43 | - FROM ' . USER_GROUP_TABLE . ' |
|
43 | + FROM ' . USER_GROUP_TABLE.' |
|
44 | 44 | WHERE user_id = ' . (int) $this->user->data['user_id']; |
45 | 45 | $result = $this->db->sql_query($sql); |
46 | 46 | |
@@ -83,13 +83,13 @@ discard block |
||
83 | 83 | $sql = $this->_get_group_sql($mode); |
84 | 84 | $result = $this->db->sql_query($sql); |
85 | 85 | |
86 | - $options = '<option value="0">' . $this->translator->lang('ALL_GROUPS') . '</option>'; |
|
86 | + $options = '<option value="0">'.$this->translator->lang('ALL_GROUPS').'</option>'; |
|
87 | 87 | while ($row = $this->db->sql_fetchrow($result)) |
88 | 88 | { |
89 | 89 | $group_name = $this->_get_group_name($row); |
90 | 90 | $group_class = $this->_get_group_class($row['group_type']); |
91 | 91 | $selected_option = $this->_get_selected_option($row['group_id'], $selected); |
92 | - $options .= '<option' . $group_class . ' value="' . $row['group_id'] . '"' . $selected_option . '>' . $group_name . '</option>'; |
|
92 | + $options .= '<option'.$group_class.' value="'.$row['group_id'].'"'.$selected_option.'>'.$group_name.'</option>'; |
|
93 | 93 | } |
94 | 94 | $this->db->sql_freeresult($result); |
95 | 95 | |
@@ -103,8 +103,8 @@ discard block |
||
103 | 103 | private function _get_group_sql($mode) |
104 | 104 | { |
105 | 105 | return 'SELECT group_id, group_name, group_type |
106 | - FROM ' . GROUPS_TABLE . |
|
107 | - (($mode === 'special') ? ' WHERE group_type = ' . GROUP_SPECIAL : '') . ' |
|
106 | + FROM ' . GROUPS_TABLE. |
|
107 | + (($mode === 'special') ? ' WHERE group_type = '.GROUP_SPECIAL : '').' |
|
108 | 108 | ORDER BY group_type DESC, group_name ASC'; |
109 | 109 | } |
110 | 110 | |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | */ |
115 | 115 | private function _get_group_name(array $row) |
116 | 116 | { |
117 | - return ($row['group_type'] == GROUP_SPECIAL) ? $this->translator->lang('G_' . $row['group_name']) : ucfirst($row['group_name']); |
|
117 | + return ($row['group_type'] == GROUP_SPECIAL) ? $this->translator->lang('G_'.$row['group_name']) : ucfirst($row['group_name']); |
|
118 | 118 | } |
119 | 119 | |
120 | 120 | /** |