satanasov / phpbbgallery

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(

core/user.php

Braces +7 added lines, -14 removed lines

@@ -160,8 +160,7 @@ 
 		if (isset($this->data[$key]))
 		{
 			return $this->data[$key];
-		}
-		else if ($default && $this->get_default_value($key) !== null)
+		} else if ($default && $this->get_default_value($key) !== null)
 		{
 			return $this->get_default_value($key);
 		}
@@ -359,12 +358,10 @@ 
 		if (is_array($user_ids) && !empty($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;
 		}
@@ -395,8 +392,7 @@ 
 					{
 						// While incrementing, the iamges might be lower than 0.
 						$validated_data[$name] = (int) $value;
-					}
-					else
+					} else
 					{
 						$validated_data[$name] = max(0, (int) $value);
 					}
@@ -542,8 +538,7 @@ 
 					'warnings'            => 0,
 					'allow_pm'            => 0,
 				);
-			}
-			else
+			} else
 			{
 				$user_sig = '';
 				// We add the signature to every posters entry because enable_sig is post dependent
@@ -589,8 +584,7 @@ 
 				if ((!empty($row['user_allow_viewemail']) && $this->auth->acl_get('u_sendemail')) || $this->auth->acl_get('a_email'))
 				{
 					$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']);
-				}
-				else
+				} else
 				{
 					$user_cache[$user_id]['email'] = '';
 				}
@@ -603,8 +597,7 @@ 
 						if ($diff == 0)
 						{
 							$diff = ($now['mday'] - $bday_day < 0) ? 1 : 0;
-						}
-						else
+						} else
 						{
 							$diff = ($diff < 0) ? 1 : 0;
 						}

core/controller/image.php

Braces +10 added lines, -20 removed lines

@@ -245,8 +245,7 @@ 
 			}
 
 			$this->loader->load($this->data['image_album_id']);
-		}
-		catch (\Exception $e)
+		} catch (\Exception $e)
 		{
 			throw new \phpbb\exception\http_exception(404, 'INVALID_IMAGE');
 		}
@@ -306,8 +305,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');
 		}
@@ -532,8 +530,7 @@ 
 			if (isset($album_data['contest_start']))
 			{
 				$s_hide_comment_input = (time() < ($album_data['contest_start'] + $album_data['contest_end'])) ? true : false;
-			}
-			else
+			} else
 			{
 				$s_hide_comment_input = false;
 			}
@@ -580,8 +577,7 @@ 
 				//$this->template->assign_var('S_COMMENT_ACTION', append_sid($this->url->path('full') . 'comment/' . $image_id . '/add/0'));
 				$this->template->assign_var('S_COMMENT_ACTION', $this->helper->route('phpbbgallery_core_comment_add', array('image_id' => $image_id, 'comment_id' => 0)));
 			}
-		}
-		else if ($this->gallery_config->get('comment_user_control') && !$image_data['image_allow_comments'])
+		} else if ($this->gallery_config->get('comment_user_control') && !$image_data['image_allow_comments'])
 		{
 			$this->template->assign_var('S_COMMENTS_DISABLED', true);
 		}
@@ -772,8 +768,7 @@ 
 								'NAME'      => $field_data['PROFILE_FIELD_NAME'],
 								'U_CONTACT' => $field_data['PROFILE_FIELD_CONTACT'],
 							));
-						}
-						else
+						} else
 						{
 							$this->template->assign_block_vars('commentrow.custom_fields', $field_data);
 						}
@@ -901,8 +896,7 @@ 
 					{
 						$change_image_count = true;
 					}
-				}
-				else if ($this->request->variable('change_author', '', true))
+				} else if ($this->request->variable('change_author', '', true))
 				{
 					$errors[] = $this->language->lang('INVALID_USERNAME');
 				}
@@ -923,8 +917,7 @@ 
 					{
 						$personal_album_id = $this->album->generate_personal_album($image_data['image_username'], $image_data['image_user_id'], $image_data['image_user_colour'], $image_user);
 					}
-				}
-				else
+				} else
 				{
 					$personal_album_id = $this->gallery_user->get_data('personal_album_id');
 					if (!$personal_album_id && $this->gallery_auth->acl_check('i_upload', $this->gallery_auth->get_own_album()))
@@ -1092,8 +1085,7 @@ 
 			$this->notification_helper->read('approval', $album_id);
 			$this->url->meta_refresh(3, $album_backlink);
 			trigger_error($message);
-		}
-		else
+		} else
 		{
 			if (isset($_POST['cancel']))
 			{
@@ -1101,8 +1093,7 @@ 
 				$message .= '<br />' . sprintf($this->language->lang('CLICK_RETURN_IMAGE'), '<a href="' . $image_backlink . '">', '</a>');
 				$this->url->meta_refresh(3, $image_backlink);
 				trigger_error($message);
-			}
-			else
+			} else
 			{
 				confirm_box(false, 'DELETE_IMAGE2', $s_hidden_fields);
 			}
@@ -1207,8 +1198,7 @@ 
 			{
 				// @todo Add "redirect after login" url
 				login_box();
-			}
-			else
+			} else
 			{
 				//return $this->error('NOT_AUTHORISED', 403);
 				redirect('/gallery/album/' . $album_id);

core/album/album.php

Braces +9 added lines, -18 removed lines

@@ -222,8 +222,7 @@ 
 			{
 				$padding .= '   ';
 				$padding_store[$row['parent_id']] = $padding;
-			}
-			else if ($row['left_id'] > $right + 1)
+			} else if ($row['left_id'] > $right + 1)
 			{
 				$padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : '';
 			}
@@ -249,15 +248,13 @@ 
 			if (($select_id == $this->gallery_auth->get_setting_permissions()) && !$row['album_user_id'])
 			{
 				$list = true;
-			}
-			else if (!$row['album_user_id'])
+			} else if (!$row['album_user_id'])
 			{
 				if ($this->gallery_auth->acl_check('a_list', $row['album_id'], $row['album_user_id']) || defined('IN_ADMIN'))
 				{
 					$list = true;
 				}
-			}
-			else if (!$ignore_personals)
+			} else if (!$ignore_personals)
 			{
 				if ($row['album_user_id'] == $this->user->data['user_id'])
 				{
@@ -268,16 +265,14 @@ 
 						if ($requested_permission)
 						{
 							$requested_own = !$this->gallery_auth->acl_check($requested_permission, $this->gallery_auth->get_own_album());
-						}
-						else
+						} else
 						{
 							$requested_own = false; // We need the negated version of true here
 						}
 					}
 					$list = (!$list) ? $access_own : $list;
 					$disabled = (!$disabled) ? $requested_own : $disabled;
-				}
-				else if ($row['album_user_id'])
+				} else if ($row['album_user_id'])
 				{
 					if (!$c_access_personal)
 					{
@@ -286,8 +281,7 @@ 
 						if ($requested_permission)
 						{
 							$requested_personal = !$this->gallery_auth->acl_check($requested_permission, $this->gallery_auth->get_personal_album());
-						}
-						else
+						} else
 						{
 							$requested_personal = false; // We need the negated version of true here
 						}
@@ -299,8 +293,7 @@ 
 			if (($album_user_id != \phpbbgallery\core\block::PUBLIC_ALBUM) && ($album_user_id != $row['album_user_id']))
 			{
 				$list = false;
-			}
-			else if (($album_user_id != \phpbbgallery\core\block::PUBLIC_ALBUM) && ($row['parent_id'] == 0))
+			} else if (($album_user_id != \phpbbgallery\core\block::PUBLIC_ALBUM) && ($row['parent_id'] == 0))
 			{
 				$disabled = true;
 			}
@@ -318,8 +311,7 @@ 
 			$gallery_albumbox = "<select name='$select_name' id='$select_name'>";
 			$gallery_albumbox .= $album_list;
 			$gallery_albumbox .= '</select>';
-		}
-		else
+		} else
 		{
 			$gallery_albumbox = $album_list;
 		}
@@ -388,8 +380,7 @@ 
 				'album_last_user_colour' => $row['image_user_colour'],
 				'album_last_user_id'     => $row['image_user_id'],
 			);
-		}
-		else
+		} else
 		{
 			// No approved image, so we clear the columns
 			$sql_ary = array(

core/log.php

Braces +4 added lines, -8 removed lines

@@ -204,8 +204,7 @@ 
 					$sql_array['GROUP_BY'] = 'l.description, l.log_id, i.image_id';
 				break;
 			}
-		}
-		else
+		} else
 		{
 			$sql_array['ORDER_BY'] = 'l.log_time ' . (isset($additional['sort_dir']) ? 'ASC' : 'DESC');
 			$sql_array['GROUP_BY'] = 'l.log_time, l.log_id, i.image_id';
@@ -219,8 +218,7 @@ 
 		if ($row)
 		{
 			$count = $row['count'];
-		}
-		else
+		} else
 		{
 			$count = 0;
 		}
@@ -281,8 +279,7 @@ 
 				'params' => array(
 				),
 			), 'pagination', 'page', $count, $limit, ($page-1) * $limit);
-		}
-		else if ($album == -1)
+		} else if ($album == -1)
 		{
 			$url_array = array(
 				'i' => '-phpbbgallery-core-acp-gallery_logs_module',
@@ -303,8 +300,7 @@ 
 			$url = http_build_query($url_array,'','&');
 
 			$this->pagination->generate_template_pagination(append_sid('index.php?' . $url), 'pagination', 'page', $count, $limit, ($page-1) * $limit);
-		}
-		else
+		} else
 		{
 			$this->pagination->generate_template_pagination(array(
 				'routes' => array(