@@ -84,8 +84,7 @@ |
||
84 | 84 | if ($trigger_error) |
85 | 85 | { |
86 | 86 | throw new \blitze\sitemaker\exception\out_of_bounds($type); |
87 | - } |
|
88 | - else |
|
87 | + } else |
|
89 | 88 | { |
90 | 89 | return false; |
91 | 90 | } |
@@ -134,12 +134,10 @@ |
||
134 | 134 | if ($this->is_too_short($data, $length)) |
135 | 135 | { |
136 | 136 | return $this->language->lang('FIELD_TOO_SHORT', $data['field_label'], $data['field_minlength']); |
137 | - } |
|
138 | - else if ($this->is_too_long($data, $length)) |
|
137 | + } else if ($this->is_too_long($data, $length)) |
|
139 | 138 | { |
140 | 139 | return $this->language->lang('FIELD_TOO_LONG', $data['field_label'], $data['field_maxlength']); |
141 | - } |
|
142 | - else |
|
140 | + } else |
|
143 | 141 | { |
144 | 142 | return $this->language->lang('FIELD_INVALID', $data['field_label']); |
145 | 143 | } |
@@ -127,8 +127,7 @@ |
||
127 | 127 | { |
128 | 128 | $data = $this->blocks_data[$id]; |
129 | 129 | $column_name = 'block_tpl'; |
130 | - } |
|
131 | - else |
|
130 | + } else |
|
132 | 131 | { |
133 | 132 | $data = $this->content_types[$id]; |
134 | 133 | $column_name = $view . '_tpl'; |
@@ -70,8 +70,7 @@ discard block |
||
70 | 70 | { |
71 | 71 | $forum_ids = $this->get_selected_forum_ids($topic_ids); |
72 | 72 | $this->{$action}($topic_ids, $forum_ids); |
73 | - } |
|
74 | - else |
|
73 | + } else |
|
75 | 74 | { |
76 | 75 | $message = $this->language->lang('INVALID_REQUEST', $action); |
77 | 76 | trigger_error($message . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $u_action . '">', '</a>')); |
@@ -113,8 +112,7 @@ discard block |
||
113 | 112 | { |
114 | 113 | $this->approve($topic_ids, $forum_ids, false); |
115 | 114 | \mcp_queue::disapprove_posts($post_id_list, '-blitze-content-mcp-content_module', 'content'); |
116 | - } |
|
117 | - else |
|
115 | + } else |
|
118 | 116 | { |
119 | 117 | trigger_error('NO_POST_SELECTED'); |
120 | 118 | } |
@@ -272,16 +272,13 @@ |
||
272 | 272 | if ($topic_deleted) |
273 | 273 | { |
274 | 274 | $topic_status = 'deleted'; |
275 | - } |
|
276 | - else if ($topic_unapproved) |
|
275 | + } else if ($topic_unapproved) |
|
277 | 276 | { |
278 | 277 | $topic_status = 'unapproved'; |
279 | - } |
|
280 | - else if ($row['topic_time'] > time()) |
|
278 | + } else if ($row['topic_time'] > time()) |
|
281 | 279 | { |
282 | 280 | $topic_status = 'scheduled'; |
283 | - } |
|
284 | - else |
|
281 | + } else |
|
285 | 282 | { |
286 | 283 | $topic_status = $this->filter_topic_types_ary[$row['topic_type']]; |
287 | 284 | } |
@@ -42,8 +42,7 @@ |
||
42 | 42 | { |
43 | 43 | $command = $this->action_handler->create('topic', $action); |
44 | 44 | $command->execute($base_url, 'ucp'); |
45 | - } |
|
46 | - catch (\blitze\sitemaker\exception\base $e) |
|
45 | + } catch (\blitze\sitemaker\exception\base $e) |
|
47 | 46 | { |
48 | 47 | $message = $e->get_message($this->language); |
49 | 48 | trigger_error($message . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $base_url . '">', '</a>')); |
@@ -42,8 +42,7 @@ |
||
42 | 42 | { |
43 | 43 | $command = $this->action_handler->create('topic', $action); |
44 | 44 | $command->execute($base_url, 'mcp'); |
45 | - } |
|
46 | - catch (\blitze\sitemaker\exception\base $e) |
|
45 | + } catch (\blitze\sitemaker\exception\base $e) |
|
47 | 46 | { |
48 | 47 | $message = $e->get_message($this->language); |
49 | 48 | trigger_error($message . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $base_url . '">', '</a>')); |
@@ -43,8 +43,7 @@ |
||
43 | 43 | { |
44 | 44 | $command = $this->action_handler->create('type', $action); |
45 | 45 | $command->execute($base_url, $type); |
46 | - } |
|
47 | - catch (\blitze\sitemaker\exception\base $e) |
|
46 | + } catch (\blitze\sitemaker\exception\base $e) |
|
48 | 47 | { |
49 | 48 | $message = $e->get_message($this->language); |
50 | 49 | trigger_error($this->language->lang($message) . adm_back_link($base_url), E_USER_WARNING); |
@@ -232,8 +232,7 @@ discard block |
||
232 | 232 | { |
233 | 233 | $data = generate_text_for_edit($this->content_desc, $this->content_desc_uid, $this->content_desc_options); |
234 | 234 | return $data['text']; |
235 | - } |
|
236 | - else |
|
235 | + } else |
|
237 | 236 | { |
238 | 237 | $parse_flags = ($this->content_desc_bitfield ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES; |
239 | 238 | return generate_text_for_display($this->content_desc, $this->content_desc_uid, $this->content_desc_bitfield, $parse_flags); |
@@ -251,8 +250,7 @@ discard block |
||
251 | 250 | if (!is_array($settings)) |
252 | 251 | { |
253 | 252 | $this->content_view_settings = $settings; |
254 | - } |
|
255 | - else if (sizeof($settings)) |
|
253 | + } else if (sizeof($settings)) |
|
256 | 254 | { |
257 | 255 | $this->content_view_settings = json_encode($settings); |
258 | 256 | } |