satanasov / phpbbgallery

core/url.php

Braces +5 added lines, -10 removed lines

@@ -121,8 +121,7 @@ 
 		{
 			$mode = array_shift($args);
 			$args[0] = $this->path($mode) . $this->phpEx_file($args[0]);
-		}
-		else
+		} else
 		{
 			$args[0] = $this->path() . $this->phpEx_file($args[0]);
 		}
@@ -197,8 +196,7 @@ 
 		if (!is_array($file))
 		{
 			include($this->path($path) . $sub_directory . $this->phpEx_file($file));
-		}
-		else
+		} else
 		{
 			foreach ($file as $real_file)
 			{
@@ -244,8 +242,7 @@ 
 			if (strpos($path, 'https:/') === 0)
 			{
 				$path = 'https://' . substr($path, 7);
-			}
-			else if (strpos($path, 'http:/') === 0)
+			} else if (strpos($path, 'http:/') === 0)
 			{
 				$path = 'http://' . substr($path, 6);
 			}
@@ -300,15 +297,13 @@ 
 		if ($this->config['force_server_vars'] == 1)
 		{
 			$url = $this->config['server_protocol'] . $url;
-		}
-		else
+		} else
 		{
 			$is_secure = $this->request->server('HTTPS', '');
 			if ($is_secure == 'on')
 			{
 				$url = 'https://' . $url;
-			}
-			else
+			} else
 			{
 				$url = 'http://' . $url;
 			}

acpimport/migrations/m1_init.php

Braces +1 added lines, -2 removed lines

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

acpimport/acp/main_module.php

Braces +6 added lines, -12 removed lines

@@ -47,8 +47,7 @@ 
 				// Replace the md5 with the ' again and remove the space at the end to prevent \' troubles
 				$user_data['username'] = utf8_substr(str_replace("{{$import_schema}}", "'", $user_data['username']), 0, -1);
 				$image_name = utf8_substr(str_replace("{{$import_schema}}", "'", $image_name), 0, -1);
-			}
-			else
+			} else
 			{
 				global $phpEx;
 				trigger_error($user->lang('MISSING_IMPORT_SCHEMA', ($import_schema . '.' . $phpEx)), E_USER_WARNING);
@@ -198,8 +197,7 @@ 
 						if ($filename || ($image_name == ''))
 						{
 							$sql_ary['image_name'] = str_replace("_", " ", utf8_substr($image_src, 0, utf8_strrpos($image_src, '.')));
-						}
-						else
+						} else
 						{
 							$sql_ary['image_name'] = str_replace('{NUM}', $num_offset + $done_images, $image_name);
 						}
@@ -239,14 +237,12 @@ 
 				if (!$errors)
 				{
 					trigger_error(sprintf($user->lang['IMPORT_FINISHED'], $done_images) . adm_back_link($this->u_action));
-				}
-				else
+				} else
 				{
 					$errors = explode("\n", $errors);
 					trigger_error(sprintf($user->lang['IMPORT_FINISHED_ERRORS'], $done_images - sizeof($errors)) . implode('<br />', $errors) . adm_back_link($this->u_action), E_USER_WARNING);
 				}
-			}
-			else
+			} else
 			{
 				// Write the new list
 				$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 @@ 
 				meta_refresh(1, $forward_url);
 				trigger_error(sprintf($user->lang['IMPORT_DEBUG_MES'], $done_images, $todo_images));
 			}
-		}
-		else if ($submit)
+		} else if ($submit)
 		{
 			if (!check_form_key('acp_gallery'))
 			{
@@ -313,8 +308,7 @@ 
 						$album_id = $gallery_album->generate_personal_album($user_row['username'], $user_row['user_id'], $user_row['user_colour'], $image_user);
 					}
 					unset($image_user);
-				}
-				else
+				} else
 				{
 					$album_id = $image_user->get_data('personal_album_id');
 					if (!$album_id)

acpcleanup/cleanup.php

Braces +2 added lines, -4 removed lines

@@ -196,8 +196,7 @@ 
 			if (isset($user_image_count[(int) $row['image_user_id']]))
 			{
 				$user_image_count[(int) $row['image_user_id']]++;
-			}
-			else
+			} else
 			{
 				$user_image_count[(int) $row['image_user_id']] = 1;
 			}
@@ -246,8 +245,7 @@ 
 				$this->gallery_config->set('newest_pega_username', $newest_pega['username']);
 				$this->gallery_config->set('newest_pega_user_colour', $newest_pega['user_colour']);
 				$this->gallery_config->set('newest_pega_album_id', $newest_pega['album_id']);
-			}
-			else
+			} else
 			{
 				$this->gallery_config->set('newest_pega_user_id', 0);
 				$this->gallery_config->set('newest_pega_username', '');

acpcleanup/acp/main_module.php

Braces +4 added lines, -8 removed lines

@@ -223,14 +223,12 @@ 
 			}
 
 			trigger_error($message_string . adm_back_link($this->u_action));
-		}
-		else if ($delete || $prune || (isset($_POST['cancel'])))
+		} else if ($delete || $prune || (isset($_POST['cancel'])))
 		{
 			if (isset($_POST['cancel']))
 			{
 				trigger_error($user->lang['CLEAN_GALLERY_ABORT'] . adm_back_link($this->u_action), E_USER_WARNING);
-			}
-			else
+			} else
 			{
 				$user->lang['CLEAN_GALLERY_CONFIRM'] = $user->lang['CONFIRM_CLEAN'];
 				if ($missing_sources)
@@ -261,8 +259,7 @@ 
 						if (in_array($row['album_user_id'], $personals_bad))
 						{
 							$personals_bad_names[] = $row['album_name'];
-						}
-						else
+						} else
 						{
 							$missing_personals_names[] = $row['album_name'];
 						}
@@ -280,8 +277,7 @@ 
 				if ($prune && empty($prune_pattern))
 				{
 					trigger_error($user->lang['CLEAN_PRUNE_NO_PATTERN'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-				else if ($prune && $prune_pattern)
+				} else if ($prune && $prune_pattern)
 				{
 					$user->lang['CLEAN_GALLERY_CONFIRM'] = $user->lang('CONFIRM_PRUNE', $core_cleanup->lang_prune_pattern($prune_pattern)) . '<br />' . $user->lang['CLEAN_GALLERY_CONFIRM'];
 				}

core/notification.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/notification/helper.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/controller/album.php

Braces +7 added lines, -14 removed lines

@@ -117,8 +117,7 @@ 
 		try
 		{
 			$this->loader->load($album_id);
-		}
-		catch (\Exception $e)
+		} catch (\Exception $e)
 		{
 			throw new \phpbb\exception\http_exception(404, 'ALBUM_NOT_EXIST');
 		}
@@ -178,8 +177,7 @@ 
 					'phpbbgallery_core_album_upload',
 					array('album_id' => (int) $album_id)
 				));
-			}
-			else
+			} else
 			{
 				if ($album_data['contest_start'] + $album_data['contest_rating'] > time())
 				{
@@ -236,8 +234,7 @@ 
 		if (in_array($sort_key, array('r', 'ra')))
 		{
 			$sql_help_sort = ', image_id ' . (($sort_dir == 'd') ? 'ASC' : 'DESC');
-		}
-		else
+		} else
 		{
 			$sql_help_sort = ', image_id ' . (($sort_dir == 'd') ? 'DESC' : 'ASC');
 		}
@@ -460,8 +457,7 @@ 
 				));
 				$this->url->meta_refresh(3, $back_link);
 				return $this->helper->render('gallery/message.html', $this->language->lang('GALLERY'));
-			}
-			else
+			} else
 			{
 				$this->notifications_helper->add_albums($album_id);
 				$this->template->assign_vars(array(
@@ -470,14 +466,12 @@ 
 				$this->url->meta_refresh(3, $back_link);
 				return $this->helper->render('gallery/message.html', $this->language->lang('GALLERY'));
 			}
-		}
-		else
+		} else
 		{
 			if ($this->notifications_helper->get_watched_album($album_id) == 1)
 			{
 				$lang = $this->language->lang('UNWATCH_ALBUM');
-			}
-			else
+			} else
 			{
 				$lang = $this->language->lang('WATCH_ALBUM');
 			}
@@ -509,8 +503,7 @@ 
 			if (!$this->user->data['is_registered'])
 			{
 				login_box();
-			}
-			else
+			} else
 			{
 				//return $this->error('NOT_AUTHORISED', 403);
 				trigger_error($this->language->lang('NOT_AUTHORISED'));

core/moderate.php

Braces +2 added lines, -4 removed lines

@@ -85,8 +85,7 @@ 
 			{
 				$mod_array[] = 0;
 			}
-		}
-		else
+		} else
 		{
 			$mod_array = array($album);
 		}
@@ -162,8 +161,7 @@ 
 			$this->template->assign_vars(array(
 				'TOTAL_PAGES' => $this->lang->lang('PAGE_TITLE_NUMBER', $page + 1),
 			));
-		}
-		else
+		} else
 		{
 			$this->pagination->generate_template_pagination(array(
 				'routes' => array(