@@ -147,8 +147,7 @@ discard block |
||
| 147 | 147 | if (isset($this->config['phpbb_gallery_' . $option])) |
| 148 | 148 | { |
| 149 | 149 | $config_ary[$option] = $this->config['phpbb_gallery_' . $option]; |
| 150 | - } |
|
| 151 | - else |
|
| 150 | + } else |
|
| 152 | 151 | { |
| 153 | 152 | $config_ary[$option] = $default; |
| 154 | 153 | } |
@@ -161,8 +160,7 @@ discard block |
||
| 161 | 160 | if (isset($this->config['phpbb_gallery_' . $key])) |
| 162 | 161 | { |
| 163 | 162 | return $this->config['phpbb_gallery_' . $key]; |
| 164 | - } |
|
| 165 | - else |
|
| 163 | + } else |
|
| 166 | 164 | { |
| 167 | 165 | return $this->configs_array[$key]; |
| 168 | 166 | } |
@@ -219,8 +219,7 @@ discard block |
||
| 219 | 219 | { |
| 220 | 220 | $padding .= ' '; |
| 221 | 221 | $padding_store[$row['parent_id']] = $padding; |
| 222 | - } |
|
| 223 | - else if ($row['left_id'] > $right + 1) |
|
| 222 | + } else if ($row['left_id'] > $right + 1) |
|
| 224 | 223 | { |
| 225 | 224 | $padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : ''; |
| 226 | 225 | } |
@@ -246,15 +245,13 @@ discard block |
||
| 246 | 245 | if (($select_id == $this->gallery_auth->get_setting_permissions()) && !$row['album_user_id']) |
| 247 | 246 | { |
| 248 | 247 | $list = true; |
| 249 | - } |
|
| 250 | - else if (!$row['album_user_id']) |
|
| 248 | + } else if (!$row['album_user_id']) |
|
| 251 | 249 | { |
| 252 | 250 | if ($this->gallery_auth->acl_check('a_list', $row['album_id'], $row['album_user_id']) || defined('IN_ADMIN')) |
| 253 | 251 | { |
| 254 | 252 | $list = true; |
| 255 | 253 | } |
| 256 | - } |
|
| 257 | - else if (!$ignore_personals) |
|
| 254 | + } else if (!$ignore_personals) |
|
| 258 | 255 | { |
| 259 | 256 | if ($row['album_user_id'] == $this->user->data['user_id']) |
| 260 | 257 | { |
@@ -265,16 +262,14 @@ discard block |
||
| 265 | 262 | if ($requested_permission) |
| 266 | 263 | { |
| 267 | 264 | $requested_own = !$this->gallery_auth->acl_check($requested_permission, $this->gallery_auth->get_own_album()); |
| 268 | - } |
|
| 269 | - else |
|
| 265 | + } else |
|
| 270 | 266 | { |
| 271 | 267 | $requested_own = false; // We need the negated version of true here |
| 272 | 268 | } |
| 273 | 269 | } |
| 274 | 270 | $list = (!$list) ? $access_own : $list; |
| 275 | 271 | $disabled = (!$disabled) ? $requested_own : $disabled; |
| 276 | - } |
|
| 277 | - else if ($row['album_user_id']) |
|
| 272 | + } else if ($row['album_user_id']) |
|
| 278 | 273 | { |
| 279 | 274 | if (!$c_access_personal) |
| 280 | 275 | { |
@@ -283,8 +278,7 @@ discard block |
||
| 283 | 278 | if ($requested_permission) |
| 284 | 279 | { |
| 285 | 280 | $requested_personal = !$this->gallery_auth->acl_check($requested_permission, $this->gallery_auth->get_personal_album()); |
| 286 | - } |
|
| 287 | - else |
|
| 281 | + } else |
|
| 288 | 282 | { |
| 289 | 283 | $requested_personal = false; // We need the negated version of true here |
| 290 | 284 | } |
@@ -296,8 +290,7 @@ discard block |
||
| 296 | 290 | if (($album_user_id != \phpbbgallery\core\block::PUBLIC_ALBUM) && ($album_user_id != $row['album_user_id'])) |
| 297 | 291 | { |
| 298 | 292 | $list = false; |
| 299 | - } |
|
| 300 | - else if (($album_user_id != \phpbbgallery\core\block::PUBLIC_ALBUM) && ($row['parent_id'] == 0)) |
|
| 293 | + } else if (($album_user_id != \phpbbgallery\core\block::PUBLIC_ALBUM) && ($row['parent_id'] == 0)) |
|
| 301 | 294 | { |
| 302 | 295 | $disabled = true; |
| 303 | 296 | } |
@@ -315,8 +308,7 @@ discard block |
||
| 315 | 308 | $gallery_albumbox = "<select name='$select_name' id='$select_name'>"; |
| 316 | 309 | $gallery_albumbox .= $album_list; |
| 317 | 310 | $gallery_albumbox .= '</select>'; |
| 318 | - } |
|
| 319 | - else |
|
| 311 | + } else |
|
| 320 | 312 | { |
| 321 | 313 | $gallery_albumbox = $album_list; |
| 322 | 314 | } |
@@ -384,8 +376,7 @@ discard block |
||
| 384 | 376 | 'album_last_user_colour' => $row['image_user_colour'], |
| 385 | 377 | 'album_last_user_id' => $row['image_user_id'], |
| 386 | 378 | ); |
| 387 | - } |
|
| 388 | - else |
|
| 379 | + } else |
|
| 389 | 380 | { |
| 390 | 381 | // No approved image, so we clear the columns |
| 391 | 382 | $sql_ary = array( |
@@ -222,8 +222,7 @@ discard block |
||
| 222 | 222 | SET album_parents = '" . $this->db->sql_escape($album_data['album_parents']) . "' |
| 223 | 223 | WHERE parent_id = " . (int) $album_data['parent_id']; |
| 224 | 224 | $this->db->sql_query($sql); |
| 225 | - } |
|
| 226 | - else |
|
| 225 | + } else |
|
| 227 | 226 | { |
| 228 | 227 | $album_parents = unserialize($album_data['album_parents']); |
| 229 | 228 | } |
@@ -291,16 +290,14 @@ discard block |
||
| 291 | 290 | if (!empty($row['user_id'])) |
| 292 | 291 | { |
| 293 | 292 | $album_moderators[$a_id][] = get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']); |
| 294 | - } |
|
| 295 | - else |
|
| 293 | + } else |
|
| 296 | 294 | { |
| 297 | 295 | $group_name = (($row['group_type'] == GROUP_SPECIAL) ? $this->language->lang('G_' . $row['group_name']) : $row['group_name']); |
| 298 | 296 | |
| 299 | 297 | if ($this->user->data['user_id'] != ANONYMOUS && !$this->auth->acl_get('u_viewprofile')) |
| 300 | 298 | { |
| 301 | 299 | $album_moderators[$a_id][] = '<span' . (($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . ';"' : '') . '>' . $group_name . '</span>'; |
| 302 | - } |
|
| 303 | - else |
|
| 300 | + } else |
|
| 304 | 301 | { |
| 305 | 302 | $album_moderators[$a_id][] = '<a' . (($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . ';"' : '') . ' href="' . append_sid($this->root_path . 'memberlist.' . $this->php_ext, 'mode=group&g=' . $row['group_id']) . '">' . $group_name . '</a>'; |
| 306 | 303 | } |
@@ -344,8 +341,7 @@ discard block |
||
| 344 | 341 | } |
| 345 | 342 | $root_data = array('album_id' => \phpbbgallery\core\block::PUBLIC_ALBUM); |
| 346 | 343 | $sql_where = 'a.album_user_id = ' . \phpbbgallery\core\block::PUBLIC_ALBUM; |
| 347 | - } |
|
| 348 | - else if ($root_data == 'personal') |
|
| 344 | + } else if ($root_data == 'personal') |
|
| 349 | 345 | { |
| 350 | 346 | if ($mark_read == 'albums') |
| 351 | 347 | { |
@@ -362,8 +358,7 @@ discard block |
||
| 362 | 358 | { |
| 363 | 359 | $sql_where .= ' AND u.username_clean NOT ' . $this->db->sql_like_expression(chr($i) . $this->db->any_char); |
| 364 | 360 | } |
| 365 | - } |
|
| 366 | - else if ($first_char) |
|
| 361 | + } else if ($first_char) |
|
| 367 | 362 | { |
| 368 | 363 | $sql_where .= ' AND u.username_clean ' . $this->db->sql_like_expression(substr($first_char, 0, 1) . $this->db->any_char); |
| 369 | 364 | } |
@@ -407,8 +402,7 @@ discard block |
||
| 407 | 402 | 'phpbbgallery_core_search_recent_page',), |
| 408 | 403 | 'params' => array()), 'pagination', 'page', $num_pegas, $limit, $start |
| 409 | 404 | );*/ |
| 410 | - } |
|
| 411 | - else |
|
| 405 | + } else |
|
| 412 | 406 | { |
| 413 | 407 | $sql_where = 'a.left_id > ' . $root_data['left_id'] . ' AND a.left_id < ' . $root_data['right_id'] . ' AND a.album_user_id = ' . $root_data['album_user_id']; |
| 414 | 408 | } |
@@ -496,10 +490,12 @@ discard block |
||
| 496 | 490 | continue; |
| 497 | 491 | } |
| 498 | 492 | |
| 499 | - if (false)//@todo !$this->gallery_auth->acl_check('a_list', $album_id, $row['album_user_id'])) |
|
| 493 | + if (false) { |
|
| 494 | + //@todo !$this->gallery_auth->acl_check('a_list', $album_id, $row['album_user_id'])) |
|
| 500 | 495 | { |
| 501 | 496 | // if the user does not have permissions to list this album, skip everything until next branch |
| 502 | 497 | $right_id = $row['right_id']; |
| 498 | + } |
|
| 503 | 499 | continue; |
| 504 | 500 | } |
| 505 | 501 | |
@@ -524,8 +520,7 @@ discard block |
||
| 524 | 520 | $album_rows[$parent_id]['album_type_last_image'] = $row['album_type']; |
| 525 | 521 | $album_rows[$parent_id]['album_contest_marked'] = $row['contest_marked']; |
| 526 | 522 | $album_rows[$parent_id]['orig_album_last_image_time'] = $row['album_last_image_time']; |
| 527 | - } |
|
| 528 | - else if ($row['album_type']) |
|
| 523 | + } else if ($row['album_type']) |
|
| 529 | 524 | { |
| 530 | 525 | $subalbums[$parent_id][$album_id]['display'] = ($row['display_on_index']) ? true : false; |
| 531 | 526 | $subalbums[$parent_id][$album_id]['name'] = $row['album_name']; |
@@ -567,16 +562,14 @@ discard block |
||
| 567 | 562 | { |
| 568 | 563 | $this->misc->markread('all'); |
| 569 | 564 | $message = $this->language->lang('RETURN_INDEX', '<a href="' . $redirect . '">', '</a>'); |
| 570 | - } |
|
| 571 | - else |
|
| 565 | + } else |
|
| 572 | 566 | { |
| 573 | 567 | $this->misc->markread('albums', $album_ids); |
| 574 | 568 | $message = $this->language->lang('RETURN_ALBUM', '<a href="' . $redirect . '">', '</a>'); |
| 575 | 569 | } |
| 576 | 570 | meta_refresh(3, $redirect); |
| 577 | 571 | trigger_error($this->language->lang('ALBUMS_MARKED') . '<br /><br />' . $message); |
| 578 | - } |
|
| 579 | - else |
|
| 572 | + } else |
|
| 580 | 573 | { |
| 581 | 574 | $message = $this->language->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>'); |
| 582 | 575 | meta_refresh(3, $redirect); |
@@ -654,8 +647,7 @@ discard block |
||
| 654 | 647 | 'name' => $subalbum_row['name'], |
| 655 | 648 | 'unread' => $subalbum_unread, |
| 656 | 649 | ); |
| 657 | - } |
|
| 658 | - else |
|
| 650 | + } else |
|
| 659 | 651 | { |
| 660 | 652 | unset($subalbums[$album_id][$subalbum_id]); |
| 661 | 653 | } |
@@ -668,8 +660,7 @@ discard block |
||
| 668 | 660 | |
| 669 | 661 | $l_subalbums = (sizeof($subalbums[$album_id]) == 1) ? $this->language->lang('SUBALBUM') : $this->language->lang('SUBALBUMS'); |
| 670 | 662 | $folder_image = ($album_unread) ? 'forum_unread_subforum' : 'forum_read_subforum'; |
| 671 | - } |
|
| 672 | - else |
|
| 663 | + } else |
|
| 673 | 664 | { |
| 674 | 665 | $folder_alt = ($album_unread) ? 'NEW_IMAGES' : 'NO_NEW_IMAGES'; |
| 675 | 666 | $folder_image = ($album_unread) ? 'forum_unread' : 'forum_read'; |
@@ -694,8 +685,7 @@ discard block |
||
| 694 | 685 | $lastimage_uc_name = '';//@todo phpbb_ext_gallery_core_image::generate_link('image_name', $phpbb_ext_gallery->config->get('link_image_name'), $lastimage_image_id, $lastimage_name, $lastimage_album_id); |
| 695 | 686 | // phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id); |
| 696 | 687 | $lastimage_uc_icon = '';//@todo phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id); |
| 697 | - } |
|
| 698 | - else |
|
| 688 | + } else |
|
| 699 | 689 | { |
| 700 | 690 | $lastimage_time = $lastimage_album_type = $lastimage_contest_marked = 0; |
| 701 | 691 | $lastimage_uc_fake_thumbnail = $lastimage_uc_thumbnail = $lastimage_uc_name = $lastimage_uc_icon = ''; |
@@ -150,8 +150,7 @@ discard block |
||
| 150 | 150 | if ($this->user->data['user_timezone'] == '') |
| 151 | 151 | { |
| 152 | 152 | $timezone = 'UTC'; |
| 153 | - } |
|
| 154 | - else |
|
| 153 | + } else |
|
| 155 | 154 | { |
| 156 | 155 | $timezone = $this->user->data['user_timezone']; |
| 157 | 156 | } |
@@ -163,8 +162,7 @@ discard block |
||
| 163 | 162 | { |
| 164 | 163 | $errors[] = sprintf($this->language->lang('CONTEST_START_INVALID'), $contest_data['contest_start']); |
| 165 | 164 | $start_date_error = true; |
| 166 | - } |
|
| 167 | - else |
|
| 165 | + } else |
|
| 168 | 166 | { |
| 169 | 167 | $contest_data['contest_start'] = gmmktime((int) $m[4], (int) $m[5], 0, (int) $m[2], (int) $m[3], (int) $m[1]) - $time->getOffset();// - $offset; |
| 170 | 168 | } |
@@ -172,8 +170,7 @@ discard block |
||
| 172 | 170 | { |
| 173 | 171 | $errors[] = sprintf($this->language->lang('CONTEST_RATING_INVALID'), $contest_data['contest_rating']); |
| 174 | 172 | $date_error = true; |
| 175 | - } |
|
| 176 | - else if (!$start_date_error) |
|
| 173 | + } else if (!$start_date_error) |
|
| 177 | 174 | { |
| 178 | 175 | $contest_data['contest_rating'] = gmmktime($m[4], $m[5], 0, $m[2], $m[3], $m[1]) - $contest_data['contest_start'] - $time->getOffset();//- $offset; |
| 179 | 176 | } |
@@ -181,8 +178,7 @@ discard block |
||
| 181 | 178 | { |
| 182 | 179 | $errors[] = sprintf($this->language->lang('CONTEST_END_INVALID'), $contest_data['contest_end']); |
| 183 | 180 | $date_error = true; |
| 184 | - } |
|
| 185 | - else if (!$start_date_error) |
|
| 181 | + } else if (!$start_date_error) |
|
| 186 | 182 | { |
| 187 | 183 | $contest_data['contest_end'] = gmmktime($m[4], $m[5], 0, $m[2], $m[3], $m[1]) - $contest_data['contest_start'] - $time->getOffset();//- $offset; |
| 188 | 184 | } |
@@ -270,8 +266,7 @@ discard block |
||
| 270 | 266 | |
| 271 | 267 | $album_data_sql['left_id'] = $row['right_id']; |
| 272 | 268 | $album_data_sql['right_id'] = $row['right_id'] + 1; |
| 273 | - } |
|
| 274 | - else |
|
| 269 | + } else |
|
| 275 | 270 | { |
| 276 | 271 | $sql = 'UPDATE ' . $this->albums_table . ' |
| 277 | 272 | SET left_id = left_id + 2, right_id = right_id + 2 |
@@ -288,8 +283,7 @@ discard block |
||
| 288 | 283 | $album_data_sql['left_id'] = $row['left_id'] + 1; |
| 289 | 284 | $album_data_sql['right_id'] = $row['left_id'] + 2; |
| 290 | 285 | } |
| 291 | - } |
|
| 292 | - else |
|
| 286 | + } else |
|
| 293 | 287 | { |
| 294 | 288 | if (!$add_on_top) |
| 295 | 289 | { |
@@ -302,8 +296,7 @@ discard block |
||
| 302 | 296 | |
| 303 | 297 | $album_data_sql['left_id'] = $row['right_id'] + 1; |
| 304 | 298 | $album_data_sql['right_id'] = $row['right_id'] + 2; |
| 305 | - } |
|
| 306 | - else |
|
| 299 | + } else |
|
| 307 | 300 | { |
| 308 | 301 | $sql = 'UPDATE ' . $this->albums_table . ' |
| 309 | 302 | SET left_id = left_id + 2, right_id = right_id + 2 |
@@ -336,8 +329,7 @@ discard block |
||
| 336 | 329 | $this->db->sql_query($sql); |
| 337 | 330 | } |
| 338 | 331 | $this->gallery_log->add_log('admin', 'add', $album_data['album_id'], 0, array('LOG_ALBUM_ADD', $album_data['album_name'])); |
| 339 | - } |
|
| 340 | - else |
|
| 332 | + } else |
|
| 341 | 333 | { |
| 342 | 334 | $row = $this->gallery_album->get_info($album_data_sql['album_id']); |
| 343 | 335 | $reset_marked_images = false; |
@@ -348,22 +340,19 @@ discard block |
||
| 348 | 340 | // Changing a contest to category? No! |
| 349 | 341 | $errors[] = $this->language->lang('ALBUM_WITH_CONTEST_NO_TYPE_CHANGE'); |
| 350 | 342 | return $errors; |
| 351 | - } |
|
| 352 | - else if ($row['album_type'] != \phpbbgallery\core\block::TYPE_CONTEST && $album_data_sql['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) |
|
| 343 | + } else if ($row['album_type'] != \phpbbgallery\core\block::TYPE_CONTEST && $album_data_sql['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) |
|
| 353 | 344 | { |
| 354 | 345 | // Changing a album to contest? No! |
| 355 | 346 | // Changing a category to contest? No! |
| 356 | 347 | $errors[] = $this->language->lang('ALBUM_NO_TYPE_CHANGE_TO_CONTEST'); |
| 357 | 348 | return $errors; |
| 358 | - } |
|
| 359 | - else if ($row['album_type'] == \phpbbgallery\core\block::TYPE_CAT && $album_data_sql['album_type'] == \phpbbgallery\core\block::TYPE_UPLOAD) |
|
| 349 | + } else if ($row['album_type'] == \phpbbgallery\core\block::TYPE_CAT && $album_data_sql['album_type'] == \phpbbgallery\core\block::TYPE_UPLOAD) |
|
| 360 | 350 | { |
| 361 | 351 | // Changing a category to a album? Yes! |
| 362 | 352 | // Reset the data (you couldn't upload directly in a cat, you must use a album) |
| 363 | 353 | $album_data_sql['album_images'] = $album_data_sql['album_images_real'] = $album_data_sql['album_last_image_id'] = $album_data_sql['album_last_user_id'] = $album_data_sql['album_last_image_time'] = $album_data_sql['album_contest'] = 0; |
| 364 | 354 | $album_data_sql['album_last_username'] = $album_data_sql['album_last_user_colour'] = $album_data_sql['album_last_image_name'] = ''; |
| 365 | - } |
|
| 366 | - else if ($row['album_type'] == \phpbbgallery\core\block::TYPE_UPLOAD && $album_data_sql['album_type'] == \phpbbgallery\core\block::TYPE_CAT) |
|
| 355 | + } else if ($row['album_type'] == \phpbbgallery\core\block::TYPE_UPLOAD && $album_data_sql['album_type'] == \phpbbgallery\core\block::TYPE_CAT) |
|
| 367 | 356 | { |
| 368 | 357 | // Changing a album to a category? Yes! |
| 369 | 358 | // we're turning a uploadable album into a non-uploadable album |
@@ -374,22 +363,18 @@ discard block |
||
| 374 | 363 | if ($to_album_id) |
| 375 | 364 | { |
| 376 | 365 | $errors = $this->move_album_content($album_data_sql['album_id'], $to_album_id); |
| 377 | - } |
|
| 378 | - else |
|
| 366 | + } else |
|
| 379 | 367 | { |
| 380 | 368 | return array($this->language->lang('NO_DESTINATION_ALBUM')); |
| 381 | 369 | } |
| 382 | - } |
|
| 383 | - else if ($album_data_sql['type_action'] == 'delete') |
|
| 370 | + } else if ($album_data_sql['type_action'] == 'delete') |
|
| 384 | 371 | { |
| 385 | 372 | $errors = $this->delete_album_content($album_data_sql['album_id']); |
| 386 | - } |
|
| 387 | - else |
|
| 373 | + } else |
|
| 388 | 374 | { |
| 389 | 375 | return array($this->language->lang('NO_ALBUM_ACTION')); |
| 390 | 376 | } |
| 391 | - } |
|
| 392 | - else if ($row['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST && $album_data_sql['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) |
|
| 377 | + } else if ($row['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST && $album_data_sql['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) |
|
| 393 | 378 | { |
| 394 | 379 | // Changing a contest to contest? Yes! |
| 395 | 380 | // We need to check for the contest_data |
@@ -417,8 +402,7 @@ discard block |
||
| 417 | 402 | if ($row['album_id'] != $album_data_sql['parent_id']) |
| 418 | 403 | { |
| 419 | 404 | $errors = $this->move_album($album_data_sql['album_id'], $album_data_sql['parent_id']); |
| 420 | - } |
|
| 421 | - else |
|
| 405 | + } else |
|
| 422 | 406 | { |
| 423 | 407 | $album_data_sql['parent_id'] = $row['parent_id']; |
| 424 | 408 | } |
@@ -561,13 +545,11 @@ discard block |
||
| 561 | 545 | if ($to_data['right_id'] > $from_data['right_id']) |
| 562 | 546 | { |
| 563 | 547 | $diff = '+ ' . ($to_data['right_id'] - $from_data['right_id'] - 1); |
| 564 | - } |
|
| 565 | - else |
|
| 548 | + } else |
|
| 566 | 549 | { |
| 567 | 550 | $diff = '- ' . abs($to_data['right_id'] - $from_data['right_id'] - 1); |
| 568 | 551 | } |
| 569 | - } |
|
| 570 | - else |
|
| 552 | + } else |
|
| 571 | 553 | { |
| 572 | 554 | $sql = 'SELECT MAX(right_id) AS right_id |
| 573 | 555 | FROM ' . $this->albums_table . ' |
@@ -613,14 +595,12 @@ discard block |
||
| 613 | 595 | { |
| 614 | 596 | $log_action_images = 'IMAGES'; |
| 615 | 597 | $errors = array_merge($errors, $this->delete_album_content($album_id)); |
| 616 | - } |
|
| 617 | - else if ($action_images == 'move') |
|
| 598 | + } else if ($action_images == 'move') |
|
| 618 | 599 | { |
| 619 | 600 | if (!$images_to_id) |
| 620 | 601 | { |
| 621 | 602 | $errors[] = $this->language->lang('NO_DESTINATION_ALBUM'); |
| 622 | - } |
|
| 623 | - else |
|
| 603 | + } else |
|
| 624 | 604 | { |
| 625 | 605 | $log_action_images = 'MOVE_IMAGES'; |
| 626 | 606 | |
@@ -634,8 +614,7 @@ discard block |
||
| 634 | 614 | if (!$row) |
| 635 | 615 | { |
| 636 | 616 | $errors[] = $this->language->lang('NO_ALBUM'); |
| 637 | - } |
|
| 638 | - else |
|
| 617 | + } else |
|
| 639 | 618 | { |
| 640 | 619 | $images_to_name = $row['album_name']; |
| 641 | 620 | $errors = array_merge($errors, $this->move_album_content($album_id, $images_to_id)); |
@@ -669,14 +648,12 @@ discard block |
||
| 669 | 648 | $sql = 'DELETE FROM ' . $this->albums_table . ' |
| 670 | 649 | WHERE ' . $this->db->sql_in_set('album_id', $album_ids); |
| 671 | 650 | $this->db->sql_query($sql); |
| 672 | - } |
|
| 673 | - else if ($action_subalbums == 'move') |
|
| 651 | + } else if ($action_subalbums == 'move') |
|
| 674 | 652 | { |
| 675 | 653 | if (!$subalbums_to_id) |
| 676 | 654 | { |
| 677 | 655 | $errors[] = $this->language->lang('NO_DESTINATION_ALBUM'); |
| 678 | - } |
|
| 679 | - else |
|
| 656 | + } else |
|
| 680 | 657 | { |
| 681 | 658 | $log_action_albums = 'MOVE_ALBUMS'; |
| 682 | 659 | |
@@ -690,8 +667,7 @@ discard block |
||
| 690 | 667 | if (!$row) |
| 691 | 668 | { |
| 692 | 669 | $errors[] = $this->language->lang('NO_ALBUM'); |
| 693 | - } |
|
| 694 | - else |
|
| 670 | + } else |
|
| 695 | 671 | { |
| 696 | 672 | $subalbums_to_name = $row['album_name']; |
| 697 | 673 | |
@@ -726,8 +702,7 @@ discard block |
||
| 726 | 702 | { |
| 727 | 703 | return $errors; |
| 728 | 704 | } |
| 729 | - } |
|
| 730 | - else |
|
| 705 | + } else |
|
| 731 | 706 | { |
| 732 | 707 | $diff = 2; |
| 733 | 708 | $sql = 'DELETE FROM ' . $this->albums_table . ' |
@@ -1021,8 +996,7 @@ discard block |
||
| 1021 | 996 | |
| 1022 | 997 | $move_up_left = $album_row['left_id']; |
| 1023 | 998 | $move_up_right = $album_row['right_id']; |
| 1024 | - } |
|
| 1025 | - else |
|
| 999 | + } else |
|
| 1026 | 1000 | { |
| 1027 | 1001 | $left_id = $album_row['left_id']; |
| 1028 | 1002 | $right_id = $target['right_id']; |
@@ -149,8 +149,7 @@ discard block |
||
| 149 | 149 | if (!$sql_limit) |
| 150 | 150 | { |
| 151 | 151 | $result = $this->db->sql_query($sql); |
| 152 | - } |
|
| 153 | - else |
|
| 152 | + } else |
|
| 154 | 153 | { |
| 155 | 154 | $result = $this->db->sql_query_limit($sql, $sql_limit); |
| 156 | 155 | } |
@@ -446,8 +445,7 @@ discard block |
||
| 446 | 445 | 'BLOCK_NAME' => $block_name ? $block_name : '' , |
| 447 | 446 | 'U_BLOCK' => $u_block ? $u_block : $this->helper->route('phpbbgallery_core_search_egosearch'), |
| 448 | 447 | )); |
| 449 | - } |
|
| 450 | - else |
|
| 448 | + } else |
|
| 451 | 449 | { |
| 452 | 450 | $this->template->assign_block_vars('imageblock', array( |
| 453 | 451 | 'BLOCK_NAME' => $block_name ? $block_name : $this->language->lang('RECENT_IMAGES'), |
@@ -505,8 +503,7 @@ discard block |
||
| 505 | 503 | 'phpbbgallery_core_search_egosearch_page',), |
| 506 | 504 | 'params' => array()), 'pagination', 'page', $count, $limit, $start |
| 507 | 505 | ); |
| 508 | - } |
|
| 509 | - else |
|
| 506 | + } else |
|
| 510 | 507 | { |
| 511 | 508 | $this->template->assign_vars(array( |
| 512 | 509 | 'TOTAL_IMAGES' => $this->language->lang('VIEW_ALBUM_IMAGES', $count), |
@@ -157,8 +157,7 @@ discard block |
||
| 157 | 157 | if (isset($this->data[$key])) |
| 158 | 158 | { |
| 159 | 159 | return $this->data[$key]; |
| 160 | - } |
|
| 161 | - else if ($default && $this->get_default_value($key) !== null) |
|
| 160 | + } else if ($default && $this->get_default_value($key) !== null) |
|
| 162 | 161 | { |
| 163 | 162 | return $this->get_default_value($key); |
| 164 | 163 | } |
@@ -354,12 +353,10 @@ discard block |
||
| 354 | 353 | if (is_array($user_ids) && !empty($user_ids)) |
| 355 | 354 | { |
| 356 | 355 | $sql_where = 'WHERE ' . $this->db->sql_in_set('user_id', array_map('intval', $user_ids)); |
| 357 | - } |
|
| 358 | - else if ($user_ids == 'all') |
|
| 356 | + } else if ($user_ids == 'all') |
|
| 359 | 357 | { |
| 360 | 358 | $sql_where = ''; |
| 361 | - } |
|
| 362 | - else |
|
| 359 | + } else |
|
| 363 | 360 | { |
| 364 | 361 | $sql_where = 'WHERE user_id = ' . (int) $user_ids; |
| 365 | 362 | } |
@@ -390,8 +387,7 @@ discard block |
||
| 390 | 387 | { |
| 391 | 388 | // While incrementing, the iamges might be lower than 0. |
| 392 | 389 | $validated_data[$name] = (int) $value; |
| 393 | - } |
|
| 394 | - else |
|
| 390 | + } else |
|
| 395 | 391 | { |
| 396 | 392 | $validated_data[$name] = max(0, (int) $value); |
| 397 | 393 | } |
@@ -579,8 +575,7 @@ discard block |
||
| 579 | 575 | if ((!empty($row['user_allow_viewemail']) && $this->auth->acl_get('u_sendemail')) || $this->auth->acl_get('a_email')) |
| 580 | 576 | { |
| 581 | 577 | $user_cache[$user_id]['email'] = ($this->config['board_email_form'] && $this->config['email_enable']) ? append_sid("{$this->root_path}memberlist.$this->php_ext", "mode=email&u=$user_id") : (($this->config['board_hide_emails'] && !$this->auth->acl_get('a_email')) ? '' : 'mailto:' . $row['user_email']); |
| 582 | - } |
|
| 583 | - else |
|
| 578 | + } else |
|
| 584 | 579 | { |
| 585 | 580 | $user_cache[$user_id]['email'] = ''; |
| 586 | 581 | } |
@@ -593,8 +588,7 @@ discard block |
||
| 593 | 588 | if ($diff == 0) |
| 594 | 589 | { |
| 595 | 590 | $diff = ($now['mday'] - $bday_day < 0) ? 1 : 0; |
| 596 | - } |
|
| 597 | - else |
|
| 591 | + } else |
|
| 598 | 592 | { |
| 599 | 593 | $diff = ($diff < 0) ? 1 : 0; |
| 600 | 594 | } |
@@ -161,8 +161,7 @@ discard block |
||
| 161 | 161 | if (isset($this->image_size['file'])) |
| 162 | 162 | { |
| 163 | 163 | $file_size = $this->image_size['file']; |
| 164 | - } |
|
| 165 | - else if ($force_filesize) |
|
| 164 | + } else if ($force_filesize) |
|
| 166 | 165 | { |
| 167 | 166 | $file_size = @filesize($this->image_source); |
| 168 | 167 | } |
@@ -296,8 +295,7 @@ discard block |
||
| 296 | 295 | { |
| 297 | 296 | $this->thumb_height = $max_height; |
| 298 | 297 | $this->thumb_width = round($max_width * (($this->image_size['width'] / $max_width) / ($this->image_size['height'] / $max_height))); |
| 299 | - } |
|
| 300 | - else |
|
| 298 | + } else |
|
| 301 | 299 | { |
| 302 | 300 | $this->thumb_height = round($max_height * (($this->image_size['height'] / $max_height) / ($this->image_size['width'] / $max_width))); |
| 303 | 301 | $this->thumb_width = $max_width; |
@@ -407,8 +405,7 @@ discard block |
||
| 407 | 405 | { |
| 408 | 406 | $this->image_source = $get_wm_name; |
| 409 | 407 | $this->read_image(); |
| 410 | - } |
|
| 411 | - else |
|
| 408 | + } else |
|
| 412 | 409 | { |
| 413 | 410 | $this->watermark_size = getimagesize($this->watermark_source); |
| 414 | 411 | switch ($this->watermark_size['mime']) |
@@ -437,16 +434,14 @@ discard block |
||
| 437 | 434 | if ($watermark_position & $phpbb_gallery_constants::WATERMARK_LEFT) |
| 438 | 435 | { |
| 439 | 436 | $dst_x = 5; |
| 440 | - } |
|
| 441 | - else if ($watermark_position & $phpbb_gallery_constants::WATERMARK_RIGHT) |
|
| 437 | + } else if ($watermark_position & $phpbb_gallery_constants::WATERMARK_RIGHT) |
|
| 442 | 438 | { |
| 443 | 439 | $dst_x = ($this->image_size['width'] - $this->watermark_size[0] - 5); |
| 444 | 440 | } |
| 445 | 441 | if ($watermark_position & $phpbb_gallery_constants::WATERMARK_TOP) |
| 446 | 442 | { |
| 447 | 443 | $dst_y = 5; |
| 448 | - } |
|
| 449 | - else if ($watermark_position & $phpbb_gallery_constants::WATERMARK_MIDDLE) |
|
| 444 | + } else if ($watermark_position & $phpbb_gallery_constants::WATERMARK_MIDDLE) |
|
| 450 | 445 | { |
| 451 | 446 | $dst_y = (($this->image_size['height'] * 0.5) - ($this->watermark_size[1] * 0.5)); |
| 452 | 447 | } |
@@ -146,8 +146,7 @@ |
||
| 146 | 146 | 'U_GALLERY_IMAGES_ALLOW' => true, |
| 147 | 147 | 'U_GALLERY_IMAGES' => $user_info['user_images'], |
| 148 | 148 | )); |
| 149 | - } |
|
| 150 | - else |
|
| 149 | + } else |
|
| 151 | 150 | { |
| 152 | 151 | $this->template->assign_vars(array( |
| 153 | 152 | 'U_GALLERY_IMAGES_ALLOW' => true, |
@@ -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 | } |