@@ -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 | } |
@@ -206,14 +206,12 @@ |
||
206 | 206 | if (!empty($field_value)) |
207 | 207 | { |
208 | 208 | $this->errors[] = $obj->validate_field($row); |
209 | - } |
|
210 | - else if ($row['field_required']) |
|
209 | + } else if ($row['field_required']) |
|
211 | 210 | { |
212 | 211 | if (!$row['field_mod_only'] || $cp_class === 'mcp') |
213 | 212 | { |
214 | 213 | $this->errors[] = $this->language->lang_array('FIELD_REQUIRED', array($row['field_label'])); |
215 | - } |
|
216 | - else |
|
214 | + } else |
|
217 | 215 | { |
218 | 216 | $req_mod_input = true; |
219 | 217 | } |
@@ -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'; |
@@ -238,8 +238,7 @@ |
||
238 | 238 | if ($row['post_delete_reason']) |
239 | 239 | { |
240 | 240 | $l_deleted_message = $this->language->lang('POST_DELETED_BY_REASON', $display_postername, $display_username, $this->user->format_date($row['post_delete_time'], false, true), $row['post_delete_reason']); |
241 | - } |
|
242 | - else |
|
241 | + } else |
|
243 | 242 | { |
244 | 243 | $l_deleted_message = $this->language->lang('POST_DELETED_BY', $display_postername, $display_username, $this->user->format_date($row['post_delete_time'], false, true)); |
245 | 244 | } |
@@ -122,8 +122,7 @@ |
||
122 | 122 | )), CASE_UPPER)); |
123 | 123 | $this->template->set_filenames(array('content' => $this->tpl_name)); |
124 | 124 | $tpl_data['CUSTOM_DISPLAY'] = $this->template->assign_display('content'); |
125 | - } |
|
126 | - else |
|
125 | + } else |
|
127 | 126 | { |
128 | 127 | $tpl_data['SEQ_DISPLAY'] = join('<br />', $fields_data); |
129 | 128 | } |
@@ -223,8 +223,7 @@ discard block |
||
223 | 223 | if (!$field_data['field_mod_only'] || $this->mode === 'mcp') |
224 | 224 | { |
225 | 225 | $this->form->add($field, $field_data['field_type'], $field_data, $topic_id); |
226 | - } |
|
227 | - else if (!empty($field_data['field_value'])) |
|
226 | + } else if (!empty($field_data['field_value'])) |
|
228 | 227 | { |
229 | 228 | $this->form->add($field, 'hidden', $field_data, $topic_id); |
230 | 229 | } |
@@ -271,8 +270,7 @@ discard block |
||
271 | 270 | { |
272 | 271 | $data['force_approved_state'] = $force_status; |
273 | 272 | } |
274 | - } |
|
275 | - else |
|
273 | + } else |
|
276 | 274 | { |
277 | 275 | if ($this->force_state()) |
278 | 276 | { |
@@ -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 | } |