@@ -69,8 +69,7 @@ |
||
69 | 69 | if (is_dir($file)) |
70 | 70 | { |
71 | 71 | recursiveRemoveDirectory($file); |
72 | - } |
|
73 | - else |
|
72 | + } else |
|
74 | 73 | { |
75 | 74 | unlink($file); |
76 | 75 | } |
@@ -47,8 +47,7 @@ discard block |
||
47 | 47 | // Replace the md5 with the ' again and remove the space at the end to prevent \' troubles |
48 | 48 | $user_data['username'] = utf8_substr(str_replace("{{$import_schema}}", "'", $user_data['username']), 0, -1); |
49 | 49 | $image_name = utf8_substr(str_replace("{{$import_schema}}", "'", $image_name), 0, -1); |
50 | - } |
|
51 | - else |
|
50 | + } else |
|
52 | 51 | { |
53 | 52 | global $phpEx; |
54 | 53 | trigger_error($user->lang('MISSING_IMPORT_SCHEMA', ($import_schema . '.' . $phpEx)), E_USER_WARNING); |
@@ -198,8 +197,7 @@ discard block |
||
198 | 197 | if ($filename || ($image_name == '')) |
199 | 198 | { |
200 | 199 | $sql_ary['image_name'] = str_replace("_", " ", utf8_substr($image_src, 0, utf8_strrpos($image_src, '.'))); |
201 | - } |
|
202 | - else |
|
200 | + } else |
|
203 | 201 | { |
204 | 202 | $sql_ary['image_name'] = str_replace('{NUM}', $num_offset + $done_images, $image_name); |
205 | 203 | } |
@@ -239,14 +237,12 @@ discard block |
||
239 | 237 | if (!$errors) |
240 | 238 | { |
241 | 239 | trigger_error(sprintf($user->lang['IMPORT_FINISHED'], $done_images) . adm_back_link($this->u_action)); |
242 | - } |
|
243 | - else |
|
240 | + } else |
|
244 | 241 | { |
245 | 242 | $errors = explode("\n", $errors); |
246 | 243 | trigger_error(sprintf($user->lang['IMPORT_FINISHED_ERRORS'], $done_images - sizeof($errors)) . implode('<br />', $errors) . adm_back_link($this->u_action), E_USER_WARNING); |
247 | 244 | } |
248 | - } |
|
249 | - else |
|
245 | + } else |
|
250 | 246 | { |
251 | 247 | // Write the new list |
252 | 248 | $this->create_import_schema($import_schema, $album_id, $user_data, $start_time, $num_offset, $done_images, $todo_images, $image_name, $filename, $images); |
@@ -256,8 +252,7 @@ discard block |
||
256 | 252 | meta_refresh(1, $forward_url); |
257 | 253 | trigger_error(sprintf($user->lang['IMPORT_DEBUG_MES'], $done_images, $todo_images)); |
258 | 254 | } |
259 | - } |
|
260 | - else if ($submit) |
|
255 | + } else if ($submit) |
|
261 | 256 | { |
262 | 257 | if (!check_form_key('acp_gallery')) |
263 | 258 | { |
@@ -313,8 +308,7 @@ discard block |
||
313 | 308 | $album_id = $gallery_album->generate_personal_album($user_row['username'], $user_row['user_id'], $user_row['user_colour'], $image_user); |
314 | 309 | } |
315 | 310 | unset($image_user); |
316 | - } |
|
317 | - else |
|
311 | + } else |
|
318 | 312 | { |
319 | 313 | $album_id = $image_user->get_data('personal_album_id'); |
320 | 314 | if (!$album_id) |
@@ -196,8 +196,7 @@ discard block |
||
196 | 196 | if (isset($user_image_count[(int) $row['image_user_id']])) |
197 | 197 | { |
198 | 198 | $user_image_count[(int) $row['image_user_id']]++; |
199 | - } |
|
200 | - else |
|
199 | + } else |
|
201 | 200 | { |
202 | 201 | $user_image_count[(int) $row['image_user_id']] = 1; |
203 | 202 | } |
@@ -246,8 +245,7 @@ discard block |
||
246 | 245 | $this->gallery_config->set('newest_pega_username', $newest_pega['username']); |
247 | 246 | $this->gallery_config->set('newest_pega_user_colour', $newest_pega['user_colour']); |
248 | 247 | $this->gallery_config->set('newest_pega_album_id', $newest_pega['album_id']); |
249 | - } |
|
250 | - else |
|
248 | + } else |
|
251 | 249 | { |
252 | 250 | $this->gallery_config->set('newest_pega_user_id', 0); |
253 | 251 | $this->gallery_config->set('newest_pega_username', ''); |
@@ -223,14 +223,12 @@ discard block |
||
223 | 223 | } |
224 | 224 | |
225 | 225 | trigger_error($message_string . adm_back_link($this->u_action)); |
226 | - } |
|
227 | - else if ($delete || $prune || (isset($_POST['cancel']))) |
|
226 | + } else if ($delete || $prune || (isset($_POST['cancel']))) |
|
228 | 227 | { |
229 | 228 | if (isset($_POST['cancel'])) |
230 | 229 | { |
231 | 230 | trigger_error($user->lang['CLEAN_GALLERY_ABORT'] . adm_back_link($this->u_action), E_USER_WARNING); |
232 | - } |
|
233 | - else |
|
231 | + } else |
|
234 | 232 | { |
235 | 233 | $user->lang['CLEAN_GALLERY_CONFIRM'] = $user->lang['CONFIRM_CLEAN']; |
236 | 234 | if ($missing_sources) |
@@ -261,8 +259,7 @@ discard block |
||
261 | 259 | if (in_array($row['album_user_id'], $personals_bad)) |
262 | 260 | { |
263 | 261 | $personals_bad_names[] = $row['album_name']; |
264 | - } |
|
265 | - else |
|
262 | + } else |
|
266 | 263 | { |
267 | 264 | $missing_personals_names[] = $row['album_name']; |
268 | 265 | } |
@@ -280,8 +277,7 @@ discard block |
||
280 | 277 | if ($prune && empty($prune_pattern)) |
281 | 278 | { |
282 | 279 | trigger_error($user->lang['CLEAN_PRUNE_NO_PATTERN'] . adm_back_link($this->u_action), E_USER_WARNING); |
283 | - } |
|
284 | - else if ($prune && $prune_pattern) |
|
280 | + } else if ($prune && $prune_pattern) |
|
285 | 281 | { |
286 | 282 | $user->lang['CLEAN_GALLERY_CONFIRM'] = $user->lang('CONFIRM_PRUNE', $core_cleanup->lang_prune_pattern($prune_pattern)) . '<br />' . $user->lang['CLEAN_GALLERY_CONFIRM']; |
287 | 283 | } |
@@ -244,8 +244,7 @@ |
||
244 | 244 | if (is_array($ids)) |
245 | 245 | { |
246 | 246 | return array_map('intval', $ids); |
247 | - } |
|
248 | - else |
|
247 | + } else |
|
249 | 248 | { |
250 | 249 | return array((int) $ids); |
251 | 250 | } |
@@ -244,8 +244,7 @@ |
||
244 | 244 | if (is_array($ids)) |
245 | 245 | { |
246 | 246 | return array_map('intval', $ids); |
247 | - } |
|
248 | - else |
|
247 | + } else |
|
249 | 248 | { |
250 | 249 | return array((int) $ids); |
251 | 250 | } |