@@ -53,8 +53,7 @@ discard block |
||
53 | 53 | { |
54 | 54 | $bbcode_id = NUM_CORE_BBCODES + 1; |
55 | 55 | } |
56 | - } |
|
57 | - else |
|
56 | + } else |
|
58 | 57 | { |
59 | 58 | $bbcode_id = NUM_CORE_BBCODES + 1; |
60 | 59 | } |
@@ -63,8 +62,7 @@ discard block |
||
63 | 62 | if ($this->config['enable_mod_rewrite']) |
64 | 63 | { |
65 | 64 | $url .= 'gallery/image/'; |
66 | - } |
|
67 | - else |
|
65 | + } else |
|
68 | 66 | { |
69 | 67 | $url .= 'app.php/gallery/image/'; |
70 | 68 | } |
@@ -118,8 +118,7 @@ |
||
118 | 118 | if (isset(self::$is_dynamic[$name])) |
119 | 119 | { |
120 | 120 | $config->set('phpbb_gallery_' . $name, $value, true); |
121 | - } |
|
122 | - else |
|
121 | + } else |
|
123 | 122 | { |
124 | 123 | $config->set('phpbb_gallery_' . $name, $value); |
125 | 124 | } |
@@ -89,8 +89,7 @@ |
||
89 | 89 | if (is_dir($file)) |
90 | 90 | { |
91 | 91 | $this->recursiveRemoveDirectory($file); |
92 | - } |
|
93 | - else |
|
92 | + } else |
|
94 | 93 | { |
95 | 94 | unlink($file); |
96 | 95 | } |
@@ -111,8 +111,7 @@ |
||
111 | 111 | $phpbb_notifications->purge_notifications('phpbbgallery.core.notification.new_image'); |
112 | 112 | $phpbb_notifications->purge_notifications('phpbbgallery.core.notification.new_comment'); |
113 | 113 | $phpbb_notifications->purge_notifications('phpbbgallery.core.notification.new_report'); |
114 | - } |
|
115 | - catch (\phpbb\notification\exception $e) |
|
114 | + } catch (\phpbb\notification\exception $e) |
|
116 | 115 | { |
117 | 116 | // continue |
118 | 117 | } |
@@ -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 | } |
@@ -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), |
@@ -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 | } |