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' => $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/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>';
 			}

core/controller/comment.php

Braces +11 added lines, -22 removed lines

@@ -213,8 +213,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;
 		}
@@ -338,14 +337,12 @@ 
 				$this->notification_helper->notify('new_comment', $data);
 				//$phpbb_gallery_notification->send_notification('image', $image_id, $image_data['image_name']);
 				$message .= $this->language->lang('COMMENT_STORED') . '<br />';
-			}
-			else if ($this->misc->display_captcha('comment'))
+			} else if ($this->misc->display_captcha('comment'))
 			{
 				$s_captcha_hidden_fields = ($captcha->is_solved()) ? build_hidden_fields($captcha->get_hidden_fields()) : '';
 			}
 			$sig_checked = ($this->auth->acl_get('u_sig') && isset($_POST['attach_sig']));
-		}
-		else
+		} else
 		{
 			if ($comment_id != 0)
 			{
@@ -439,8 +436,7 @@ 
 			$comment_data = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);
 			$image_id = (int) $comment_data['comment_image_id'];
-		}
-		else
+		} else
 		{
 			$this->misc->not_authorised($image_backlink, $image_loginlink);
 		}
@@ -451,8 +447,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else if (($comment_data['comment_user_id'] != $this->user->data['user_id']) && !$this->gallery_auth->acl_check('m_comments', $album_id, $album_data['album_user_id']))
+		} else if (($comment_data['comment_user_id'] != $this->user->data['user_id']) && !$this->gallery_auth->acl_check('m_comments', $album_id, $album_data['album_user_id']))
 		{
 			$this->misc->not_authorised($image_backlink, $image_loginlink);
 		}
@@ -485,8 +480,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;
 		}
@@ -578,8 +572,7 @@ 
 					$this->gallery_log->add_log('moderator', 'c_edit', $image_data['image_album_id'], $image_data['image_id'], array('LOG_GALLERY_COMMENT_EDITED', $image_data['image_name']));
 				}
 			}
-		}
-		else
+		} else
 		{
 			$sig_checked = (bool) $comment_data['comment_signature'];
 
@@ -653,8 +646,7 @@ 
 			$comment_data = $this->db->sql_fetchrow($result);
 			$this->db->sql_freeresult($result);
 			$image_id = (int) $comment_data['comment_image_id'];
-		}
-		else
+		} else
 		{
 			$this->misc->not_authorised($image_backlink, $image_loginlink);
 		}
@@ -665,8 +657,7 @@ 
 			{
 				$this->misc->not_authorised($album_backlink, $album_loginlink, 'LOGIN_EXPLAIN_UPLOAD');
 			}
-		}
-		else if (($comment_data['comment_user_id'] != $this->user->data['user_id']) && !$this->gallery_auth->acl_check('m_comments', $album_id, $album_data['album_user_id']))
+		} else if (($comment_data['comment_user_id'] != $this->user->data['user_id']) && !$this->gallery_auth->acl_check('m_comments', $album_id, $album_data['album_user_id']))
 		{
 			$this->misc->not_authorised($image_backlink, $image_loginlink);
 		}
@@ -731,15 +722,13 @@ 
 
 			$message = $this->language->lang('DELETED_COMMENT') . '<br />';
 			$submit = true;
-		}
-		else
+		} else
 		{
 			if (isset($_POST['cancel']))
 			{
 				$message = $this->language->lang('DELETED_COMMENT_NOT') . '<br />';
 				$submit = true;
-			}
-			else
+			} else
 			{
 				confirm_box(false, 'DELETE_COMMENT2', $s_hidden_fields);
 			}

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;
 			}
@@ -579,8 +576,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);
 		}
@@ -770,8 +766,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);
                         }
@@ -899,8 +894,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');
 				}
@@ -921,8 +915,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()))
@@ -1090,8 +1083,7 @@ 
 			$this->notification_helper->read('approval', $album_id);
 			$this->url->meta_refresh(3, $album_backlink);
 			trigger_error($message);
-		}
-		else
+		} else
 		{
 			if (isset($_POST['cancel']))
 			{
@@ -1099,8 +1091,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);
 			}
@@ -1204,8 +1195,7 @@ 
 			{
 				// @todo Add "redirect after login" url
 				login_box();
-			}
-			else
+			} else
 			{
 				//return $this->error('NOT_AUTHORISED', 403);
 				redirect('/gallery/album/' . $album_id);

core/migrations/release_1_2_0_add_bbcode.php

Braces +2 added lines, -4 removed lines

@@ -53,8 +53,7 @@ 
 				{
 					$bbcode_id = NUM_CORE_BBCODES + 1;
 				}
-			}
-			else
+			} else
 			{
 				$bbcode_id = NUM_CORE_BBCODES + 1;
 			}
@@ -63,8 +62,7 @@ 
 			if ($this->config['enable_mod_rewrite'])
 			{
 				$url .= 'gallery/image/';
-			}
-			else
+			} else
 			{
 				$url .= 'app.php/gallery/image/';
 			}

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
 				}