satanasov / phpbbgallery

core/migrations/release_1_2_0.php

Braces +1 added lines, -2 removed lines

@@ -118,8 +118,7 @@
 			if (isset(self::$is_dynamic[$name]))
 			{
 				$config->set('phpbb_gallery_' . $name, $value, true);
-			}
-			else
+			} else
 			{
 				$config->set('phpbb_gallery_' . $name, $value);
 			}

core/migrations/release_1_2_0_create_filesystem.php

Braces +1 added lines, -2 removed lines

@@ -89,8 +89,7 @@
 			if (is_dir($file))
 			{
 				$this->recursiveRemoveDirectory($file);
-			}
-			else
+			} else
 			{
 				unlink($file);
 			}

core/ext.php

Braces +1 added lines, -2 removed lines

@@ -111,8 +111,7 @@
 					$phpbb_notifications->purge_notifications('phpbbgallery.core.notification.new_image');
 					$phpbb_notifications->purge_notifications('phpbbgallery.core.notification.new_comment');
 					$phpbb_notifications->purge_notifications('phpbbgallery.core.notification.new_report');
-				}
-				catch (\phpbb\notification\exception $e)
+				} catch (\phpbb\notification\exception $e)
 				{
 					// continue
 				}

core/config.php

Braces +2 added lines, -4 removed lines

@@ -147,8 +147,7 @@ 
 			if (isset($this->config['phpbb_gallery_' . $option]))
 			{
 				$config_ary[$option] = $this->config['phpbb_gallery_' . $option];
-			}
-			else
+			} else
 			{
 				$config_ary[$option] = $default;
 			}
@@ -161,8 +160,7 @@ 
 		if (isset($this->config['phpbb_gallery_' . $key]))
 		{
 			return $this->config['phpbb_gallery_' . $key];
-		}
-		else
+		} else
 		{
 			return $this->configs_array[$key];
 		}

core/search.php

Braces +3 added lines, -6 removed lines

@@ -149,8 +149,7 @@ 
 		if (!$sql_limit)
 		{
 			$result = $this->db->sql_query($sql);
-		}
-		else
+		} else
 		{
 			$result = $this->db->sql_query_limit($sql, $sql_limit);
 		}
@@ -446,8 +445,7 @@ 
 				'BLOCK_NAME'	=> $block_name ? $block_name : '' ,
 				'U_BLOCK'	=> $u_block ? $u_block : $this->helper->route('phpbbgallery_core_search_egosearch'),
 			));
-		}
-		else
+		} else
 		{
 			$this->template->assign_block_vars('imageblock', array(
 				'BLOCK_NAME'	=>  $block_name ? $block_name : $this->language->lang('RECENT_IMAGES'),
@@ -505,8 +503,7 @@ 
 					'phpbbgallery_core_search_egosearch_page',),
 					'params' => array()), 'pagination', 'page', $count, $limit, $start
 			);
-		}
-		else
+		} else
 		{
 			$this->template->assign_vars(array(
 				'TOTAL_IMAGES'				=> $this->language->lang('VIEW_ALBUM_IMAGES', $count),

core/file/file.php

Braces +5 added lines, -10 removed lines

@@ -161,8 +161,7 @@ 
 		if (isset($this->image_size['file']))
 		{
 			$file_size = $this->image_size['file'];
-		}
-		else if ($force_filesize)
+		} else if ($force_filesize)
 		{
 			$file_size = @filesize($this->image_source);
 		}
@@ -296,8 +295,7 @@ 
 		{
 			$this->thumb_height	= $max_height;
 			$this->thumb_width	= round($max_width * (($this->image_size['width'] / $max_width) / ($this->image_size['height'] / $max_height)));
-		}
-		else
+		} else
 		{
 			$this->thumb_height	= round($max_height * (($this->image_size['height'] / $max_height) / ($this->image_size['width'] / $max_width)));
 			$this->thumb_width	= $max_width;
@@ -407,8 +405,7 @@ 
 		{
 			$this->image_source = $get_wm_name;
 			$this->read_image();
-		}
-		else
+		} else
 		{
 			$this->watermark_size = getimagesize($this->watermark_source);
 			switch ($this->watermark_size['mime'])
@@ -437,16 +434,14 @@ 
 			if ($watermark_position & $phpbb_gallery_constants::WATERMARK_LEFT)
 			{
 				$dst_x = 5;
-			}
-			else if ($watermark_position & $phpbb_gallery_constants::WATERMARK_RIGHT)
+			} else if ($watermark_position & $phpbb_gallery_constants::WATERMARK_RIGHT)
 			{
 				$dst_x = ($this->image_size['width'] - $this->watermark_size[0] - 5);
 			}
 			if ($watermark_position & $phpbb_gallery_constants::WATERMARK_TOP)
 			{
 				$dst_y = 5;
-			}
-			else if ($watermark_position & $phpbb_gallery_constants::WATERMARK_MIDDLE)
+			} else if ($watermark_position & $phpbb_gallery_constants::WATERMARK_MIDDLE)
 			{
 				$dst_y = (($this->image_size['height'] * 0.5) - ($this->watermark_size[1] * 0.5));
 			}

core/event/main_listener.php

Braces +1 added lines, -2 removed lines

@@ -146,8 +146,7 @@
 					'U_GALLERY_IMAGES_ALLOW'	=> true,
 					'U_GALLERY_IMAGES'	=> $user_info['user_images'],
 				));
-			}
-			else
+			} else
 			{
 				$this->template->assign_vars(array(
 					'U_GALLERY_IMAGES_ALLOW'	=> true,

core/comment.php

Braces +1 added lines, -2 removed lines

@@ -244,8 +244,7 @@
 		if (is_array($ids))
 		{
 			return array_map('intval', $ids);
-		}
-		else
+		} else
 		{
 			return array((int) $ids);
 		}

core/auth/auth.php

Braces +22 added lines, -41 removed lines

@@ -130,9 +130,7 @@ 
 		{
 			$this->unserialize_auth_data($cached_permissions);
 			return;
-		}
-
-		else if ($user_id != $this->user->user_id)
+		} else if ($user_id != $this->user->user_id)
 		{
 			$this->user->set_user_id($user_id);
 			$cached_permissions = $this->user->get_data('user_permissions');
@@ -252,8 +250,7 @@ 
 			if (!isset($acl_array[$key]))
 			{
 				$acl_array[$key] = $key . '::' . $a_id;
-			}
-			else
+			} else
 			{
 				$acl_array[$key] .= ':' . $a_id;
 			}
@@ -302,8 +299,7 @@ 
 				if ($data[$permission] == self::ACL_NEVER)
 				{
 					$this->_auth_data_never[$album_id]->set_bit(self::$_permissions_flipped[$permission], true);
-				}
-				else if ($data[$permission] == self::ACL_YES)
+				} else if ($data[$permission] == self::ACL_YES)
 				{
 					$this->_auth_data[$album_id]->set_bit(self::$_permissions_flipped[$permission], true);
 					if (substr($permission, 0, 2) == 'm_')
@@ -311,8 +307,7 @@ 
 						$this->_auth_data[$album_id]->set_bit(self::$_permissions_flipped['m_'], true);
 					}
 				}
-			}
-			else
+			} else
 			{
 				$this->_auth_data[$album_id]->set_count($permission, $data[$permission]);
 			}
@@ -358,17 +353,17 @@ 
 		$albums = array();//@todo $this->cache->obtain_album_list();
 		foreach ($albums as $album)
 		{
-			if (!$album['album_auth_access'] || ($album['album_user_id'] == self::PUBLIC_ALBUM))# || ($album['album_user_id'] == $user_id))
+			if (!$album['album_auth_access'] || ($album['album_user_id'] == self::PUBLIC_ALBUM)) {
+				# || ($album['album_user_id'] == $user_id))
 			{
 				continue;
 			}
-			else if ($user_id == ANONYMOUS)
+			} else if ($user_id == ANONYMOUS)
 			{
 				// Level 1: No guests
 				$this->_auth_data[$album['album_id']] = new \phpbbgallery\core\auth\set();
 				continue;
-			}
-			else if ($album['album_auth_access'] == self::ACCESS_NOT_FOES)
+			} else if ($album['album_auth_access'] == self::ACCESS_NOT_FOES)
 			{
 				if ($zebra == null)
 				{
@@ -380,8 +375,7 @@ 
 					$this->_auth_data[$album['album_id']] = new \phpbbgallery\core\auth\set();
 					continue;
 				}
-			}
-			else if ($album['album_auth_access'] == self::ACCESS_SPECIAL_FRIENDS)
+			} else if ($album['album_auth_access'] == self::ACCESS_SPECIAL_FRIENDS)
 			{
 				if ($zebra == null)
 				{
@@ -393,8 +387,7 @@ 
 					$this->_auth_data[$album['album_id']] = new \phpbbgallery\core\auth\set();
 					continue;
 				}
-			}
-			else if ($album['album_auth_access'] == self::ACCESS_FRIENDS)
+			} else if ($album['album_auth_access'] == self::ACCESS_FRIENDS)
 			{
 				if ($zebra == null)
 				{
@@ -428,21 +421,18 @@ 
 			if ($row['foe'])
 			{
 				$zebra['foe'][] = (int) $row['user_id'];
-			}
-			else
+			} else
 			{
 				if (isset($row['bff']))
 				{
 					if ($row['bff'])
 					{
 						$zebra['bff'][] = (int) $row['user_id'];
-					}
-					else
+					} else
 					{
 						$zebra['friend'][] = (int) $row['user_id'];
 					}
-				}
-				else
+				} else
 				{
 					$zebra['friend'][] = (int) $row['user_id'];
 				}
@@ -487,16 +477,13 @@ 
 			if (in_array($album_author, $zebra_array['foe']))
 			{
 				$state = 1;
-			}
-			else if (in_array($album_author, $zebra_array['friend']))
+			} else if (in_array($album_author, $zebra_array['friend']))
 			{
 				$state = 3;
-			}
-			else if (in_array($album_author, $zebra_array['bff']))
+			} else if (in_array($album_author, $zebra_array['bff']))
 			{
 				$state = 4;
-			}
-			else
+			} else
 			{
 				$state = 2;
 			}
@@ -543,12 +530,10 @@ 
 		if (is_array($user_ids))
 		{
 			$sql_where = 'WHERE ' . $this->db->sql_in_set('user_id', array_map('intval', $user_ids));
-		}
-		else if ($user_ids == 'all')
+		} else if ($user_ids == 'all')
 		{
 			$sql_where = '';
-		}
-		else
+		} else
 		{
 			$sql_where = 'WHERE user_id = ' . (int) $user_ids;
 		}
@@ -617,8 +602,7 @@ 
 			if ($this->user->is_user($u_id))
 			{
 				$p_id = self::OWN_ALBUM;
-			}
-			else
+			} else
 			{
 				if (!isset($this->_auth_data[$a_id]))
 				{
@@ -700,12 +684,10 @@ 
 			if ($this->user->is_user($album['album_user_id']))
 			{
 				$a_id = self::OWN_ALBUM;
-			}
-			else if ($album['album_user_id'] > self::PUBLIC_ALBUM)
+			} else if ($album['album_user_id'] > self::PUBLIC_ALBUM)
 			{
 				$a_id = self::PERSONAL_ALBUM;
-			}
-			else
+			} else
 			{
 				$a_id = $album['album_id'];
 			}
@@ -755,8 +737,7 @@ 
 		if ($album_data['album_user_id'] != 0)
 		{
 			$sql = 'SELECT * FROM ' . $this->table_permissions . ' WHERE ' . $this->db->sql_in_set('perm_system', array(-2, -3));
-		}
-		else
+		} else
 		{
 			$sql = 'SELECT * FROM ' . $this->table_permissions . ' WHERE perm_album_id = ' . (int) $album_id;
 		}