satanasov / phpbbgallery

exif/exif.php

Braces +5 added lines, -10 removed lines

@@ -105,8 +105,7 @@ 
 		if ($this->status == self::DBSAVED)
 		{
 			$this->data = unserialize($data);
-		}
-		else if (($this->status == self::AVAILABLE) || ($this->status == self::UNKNOWN))
+		} else if (($this->status == self::AVAILABLE) || ($this->status == self::UNKNOWN))
 		{
 			$this->read();
 		}
@@ -132,8 +131,7 @@ 
 				if (!in_array($key, self::$allowed_groups))
 				{
 					unset($this->data[$key]);
-				}
-				else
+				} else
 				{
 					foreach ($this->data[$key] as $subkey => $array)
 					{
@@ -147,8 +145,7 @@ 
 
 			$this->serialized = serialize($this->data);
 			$this->status = self::DBSAVED;
-		}
-		else
+		} else
 		{
 			$this->status = self::UNAVAILABLE;
 		}
@@ -198,8 +195,7 @@ 
 			if (($num > $den) && $den)
 			{
 				$exif_exposure = $num / $den;
-			}
-			else if ($num)
+			} else if ($num)
 			{
 				$exif_exposure = ' 1/' . $den / $num ;
 			}
@@ -250,8 +246,7 @@ 
 				if (($num / $den) == 0)
 				{
 					$exif_exposure_bias = 0;
-				}
-				else
+				} else
 				{
 					$exif_exposure_bias = $this->data["EXIF"]["ExposureBiasValue"];
 				}

exif/event/exif_listener.php

Braces +1 added lines, -2 removed lines

@@ -146,8 +146,7 @@
 
 			$event['additional_sql_data'] = $additional_sql_data;
 			unset($exif);
-		}
-		else
+		} else
 		{
 			$additional_sql_data = $event['additional_sql_data'];
 			$additional_sql_data['image_exif_data'] = '';

core/report.php

Braces +3 added lines, -6 removed lines

@@ -249,8 +249,7 @@ 
 			{
 				$mod_array[] = 0;
 			}
-		}
-		else
+		} else
 		{
 			$mod_array = array($album);
 		}
@@ -340,8 +339,7 @@ 
 			$this->template->assign_vars(array(
 				'TOTAL_PAGES'				=> $this->language->lang('PAGE_TITLE_NUMBER', $page + 1),
 			));
-		}
-		else
+		} else
 		{
 			$this->pagination->generate_template_pagination(array(
 				'routes' => array(
@@ -396,8 +394,7 @@ 
 		if (is_array($ids))
 		{
 			return array_map('intval', $ids);
-		}
-		else
+		} else
 		{
 			return array((int) $ids);
 		}

core/upload.php

Braces +7 added lines, -14 removed lines

@@ -144,8 +144,7 @@ 
 			{
 				$this->zip_file = $this->file;
 				$this->upload_zip();
-			}
-			else
+			} else
 			{
 				$image_id = $this->prepare_file();
 				if ($image_id)
@@ -210,8 +209,7 @@ 
 			if (is_dir($current_dir . $file))
 			{
 				$this->read_zip_folder($current_dir . $file . '/');
-			}
-			else if (in_array(utf8_substr(strtolower($file), utf8_strrpos($file, '.') + 1), self::get_allowed_types(false, true)))
+			} else if (in_array(utf8_substr(strtolower($file), utf8_strrpos($file, '.') + 1), self::get_allowed_types(false, true)))
 			{
 				if (!$this->file_limit || ($this->uploaded_files < $this->file_limit))
 				{
@@ -231,23 +229,20 @@ 
 					{
 						$this->uploaded_files++;
 						$this->images[] = (int) $image_id;
-					}
-					else
+					} else
 					{
 						if ($this->file->error)
 						{
 							$this->new_error($this->language->lang('UPLOAD_ERROR', $this->file->get('uploadname'), implode('<br />&raquo; ', $this->file->error)));
 						}
 					}
-				}
-				else
+				} else
 				{
 					$this->quota_error();
 					@unlink($current_dir . $file);
 				}
 
-			}
-			else
+			} else
 			{
 				@unlink($current_dir . $file);
 			}
@@ -356,8 +351,7 @@ 
 		{
 			$this->file->clean_filename('unique_ext');
 			$this->file->move_file(substr($this->gallery_url->path('upload'), 0, -1), false, false, CHMOD_ALL);
-		}
-		else
+		} else
 		{
 			// Okay, this looks hacky, but what we do here is, we store the directory name in the filename.
 			// However phpBB strips directories form the filename, when moving, so we need to specify that again.
@@ -411,8 +405,7 @@ 
 					//$this->file->height = $this->tools->image_size['height'];
 					//$this->file->width = $this->tools->image_size['width'];
 				}
-			}
-			else
+			} else
 			{
 				$this->file->remove();
 				$this->new_error($this->language->lang('UPLOAD_ERROR', $this->file->get('uploadname'), $this->language->lang('UPLOAD_IMAGE_SIZE_TOO_BIG')));

core/contest.php

Braces +1 added lines, -2 removed lines

@@ -165,8 +165,7 @@
 			{
 				$this->resync($album_id);
 			}
-		}
-		else
+		} else
 		{
 			$this->resync((int) $album_ids);
 		}

core/rating.php

Braces +3 added lines, -6 removed lines

@@ -216,8 +216,7 @@ 
 						return $this->language->lang('CONTEST_RATING_HIDDEN');
 					}
 					return $this->language->lang('CONTEST_RESULT_HIDDEN', $this->user->format_date(($this->album_data('contest_start') + $this->album_data('contest_end')), false, true));
-				}
-				else
+				} else
 				{
 					if ($user_rating)
 					{
@@ -364,8 +363,7 @@ 
 		if (is_array($image_ids))
 		{
 			$image_ids = array_map('intval', $image_ids);
-		}
-		else
+		} else
 		{
 			$image_ids = (int) $image_ids;
 		}
@@ -399,8 +397,7 @@ 
 		if (is_array($image_ids))
 		{
 			$image_ids = array_map('intval', $image_ids);
-		}
-		else
+		} else
 		{
 			$image_ids = (int) $image_ids;
 		}

core/controller/upload.php

Braces +6 added lines, -12 removed lines

@@ -249,8 +249,7 @@ 
 					'last_image'	=> end($process->images),
 				);
 				$this->notification_helper->new_image($data);
-			}
-			else
+			} else
 			{
 				$target = array(
 					'album_id'	=>	$album_id,
@@ -355,8 +354,7 @@ 
 					{
 						$this->language->add_lang('ucp');
 						$error_array[] = $this->language->lang($result . '_USERNAME');
-					}
-					else
+					} else
 					{
 						$process->set_username($username);
 					}
@@ -375,8 +373,7 @@ 
 				if (!$process->uploaded_files)
 				{
 					$process->new_error($this->language->lang('UPLOAD_NO_FILE'));
-				}
-				else
+				} else
 				{
 					$mode = 'upload_edit';
 					// Remove submit, so we get the first screen of step 2.
@@ -422,8 +419,7 @@ 
 						if ($VAR == 'zip')
 						{
 							continue;
-						}
-						else
+						} else
 						{
 							$filetypes[] = $VAR;
 						}
@@ -523,8 +519,7 @@ 
 						'last_image'	=> end($process->images),
 					);
 					$this->notification_helper->new_image($data);
-				}
-				else
+				} else
 				{
 					$target = array(
 						'album_id'	=>	(int) $album_id,
@@ -591,8 +586,7 @@ 
 		if (file_exists($phpbbgallery_core_file) && is_writable($phpbbgallery_core_file) && file_exists($phpbbgallery_core_file_source) && is_writable($phpbbgallery_core_file_source) && file_exists($phpbbgallery_core_file_medium) && is_writable($phpbbgallery_core_file_medium) && file_exists($phpbbgallery_core_file_mini) && is_writable($phpbbgallery_core_file_mini))
 		{
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}

core/controller/search.php

Braces +2 added lines, -4 removed lines

@@ -232,8 +232,7 @@ 
 				if ($search_terms == 'all')
 				{
 					$keywords .= ' ' . $add_keywords;
-				}
-				else
+				} else
 				{
 					$search_terms = 'all';
 					$keywords = preg_replace('#\s+#u', ' |', $keywords) . ' ' .$add_keywords;
@@ -271,8 +270,7 @@ 
 			if (empty($search_album))
 			{
 				$sql_where[] = $this->db->sql_in_set('i.image_album_id', $this->gallery_auth->acl_album_ids('i_view'));
-			}
-			else
+			} else
 			{
 				$sql_where[] = $this->db->sql_in_set('i.image_album_id', $search_album);
 			}

core/controller/index.php

Braces +3 added lines, -6 removed lines

@@ -131,8 +131,7 @@ 
 		if ($this->gallery_config->get('pegas_index_album'))
 		{
 			$this->display->display_albums('personal', $this->config['load_moderators']);
-		}
-		else
+		} else
 		{
 			$last_image = $this->image->get_last_image();
 			if (empty($last_image))
@@ -347,8 +346,7 @@ 
 				FROM ' . GROUPS_TABLE . '
 				WHERE group_legend > 0
 				ORDER BY ' . $order_legend . ' ASC';
-		}
-		else
+		} else
 		{
 			$sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_type, g.group_legend
 				FROM ' . GROUPS_TABLE . ' g
@@ -373,8 +371,7 @@ 
 			if ($row['group_name'] == 'BOTS' || ($this->user->data['user_id'] != ANONYMOUS && !$this->auth->acl_get('u_viewprofile')))
 			{
 				$legend[] = '<span' . $colour_text . '>' . $group_name . '</span>';
-			}
-			else
+			} else
 			{
 				$legend[] = '<a' . $colour_text . ' href="' . append_sid($this->root_path . 'memberlist.' . $this->php_ext, 'mode=group&amp;g=' . $row['group_id']) . '">' . $group_name . '</a>';
 			}