satanasov / phpbbgallery

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/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
 				}

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/album/display.php

Braces +15 added lines, -25 removed lines

@@ -222,8 +222,7 @@ 
 					SET album_parents = '" . $this->db->sql_escape($album_data['album_parents']) . "'
 					WHERE parent_id = " . (int) $album_data['parent_id'];
 				$this->db->sql_query($sql);
-			}
-			else
+			} else
 			{
 				$album_parents = unserialize($album_data['album_parents']);
 			}
@@ -291,16 +290,14 @@ 
 			if (!empty($row['user_id']))
 			{
 				$album_moderators[$a_id][] = get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']);
-			}
-			else
+			} else
 			{
 				$group_name = (($row['group_type'] == GROUP_SPECIAL) ? $this->language->lang('G_' . $row['group_name']) : $row['group_name']);
 
 				if ($this->user->data['user_id'] != ANONYMOUS && !$this->auth->acl_get('u_viewprofile'))
 				{
 					$album_moderators[$a_id][] = '<span' . (($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . ';"' : '') . '>' . $group_name . '</span>';
-				}
-				else
+				} else
 				{
 					$album_moderators[$a_id][] = '<a' . (($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . ';"' : '') . ' href="' . append_sid($this->root_path . 'memberlist.' . $this->php_ext, 'mode=group&amp;g=' . $row['group_id']) . '">' . $group_name . '</a>';
 				}
@@ -344,8 +341,7 @@ 
 			}
 			$root_data = array('album_id' => \phpbbgallery\core\block::PUBLIC_ALBUM);
 			$sql_where = 'a.album_user_id = ' . \phpbbgallery\core\block::PUBLIC_ALBUM;
-		}
-		else if ($root_data == 'personal')
+		} else if ($root_data == 'personal')
 		{
 			if ($mark_read == 'albums')
 			{
@@ -362,8 +358,7 @@ 
 				{
 					$sql_where .= ' AND u.username_clean NOT ' . $this->db->sql_like_expression(chr($i) . $this->db->any_char);
 				}
-			}
-			else if ($first_char)
+			} else if ($first_char)
 			{
 				$sql_where .= ' AND u.username_clean ' . $this->db->sql_like_expression(substr($first_char, 0, 1) . $this->db->any_char);
 			}
@@ -407,8 +402,7 @@ 
 					'phpbbgallery_core_search_recent_page',),
 					'params' => array()), 'pagination', 'page', $num_pegas, $limit, $start
 			);*/
-		}
-		else
+		} else
 		{
 			$sql_where = 'a.left_id > ' . $root_data['left_id'] . ' AND a.left_id < ' . $root_data['right_id'] . ' AND a.album_user_id = ' . $root_data['album_user_id'];
 		}
@@ -496,10 +490,12 @@ 
 				continue;
 			}
 
-			if (false)//@todo !$this->gallery_auth->acl_check('a_list', $album_id, $row['album_user_id']))
+			if (false) {
+				//@todo !$this->gallery_auth->acl_check('a_list', $album_id, $row['album_user_id']))
 			{
 				// if the user does not have permissions to list this album, skip everything until next branch
 				$right_id = $row['right_id'];
+			}
 				continue;
 			}
 
@@ -524,8 +520,7 @@ 
 				$album_rows[$parent_id]['album_type_last_image'] = $row['album_type'];
 				$album_rows[$parent_id]['album_contest_marked'] = $row['contest_marked'];
 				$album_rows[$parent_id]['orig_album_last_image_time'] = $row['album_last_image_time'];
-			}
-			else if ($row['album_type'])
+			} else if ($row['album_type'])
 			{
 				$subalbums[$parent_id][$album_id]['display'] = ($row['display_on_index']) ? true : false;
 				$subalbums[$parent_id][$album_id]['name'] = $row['album_name'];
@@ -567,16 +562,14 @@ 
 				{
 					$this->misc->markread('all');
 					$message = $this->language->lang('RETURN_INDEX', '<a href="' . $redirect . '">', '</a>');
-				}
-				else
+				} else
 				{
 					$this->misc->markread('albums', $album_ids);
 					$message = $this->language->lang('RETURN_ALBUM', '<a href="' . $redirect . '">', '</a>');
 				}
 				meta_refresh(3, $redirect);
 				trigger_error($this->language->lang('ALBUMS_MARKED') . '<br /><br />' . $message);
-			}
-			else
+			} else
 			{
 				$message = $this->language->lang('RETURN_PAGE', '<a href="' . $redirect . '">', '</a>');
 				meta_refresh(3, $redirect);
@@ -654,8 +647,7 @@ 
 							'name'		=> $subalbum_row['name'],
 							'unread'	=> $subalbum_unread,
 						);
-					}
-					else
+					} else
 					{
 						unset($subalbums[$album_id][$subalbum_id]);
 					}
@@ -668,8 +660,7 @@ 
 
 				$l_subalbums = (sizeof($subalbums[$album_id]) == 1) ? $this->language->lang('SUBALBUM') : $this->language->lang('SUBALBUMS');
 				$folder_image = ($album_unread) ? 'forum_unread_subforum' : 'forum_read_subforum';
-			}
-			else
+			} else
 			{
 				$folder_alt = ($album_unread) ? 'NEW_IMAGES' : 'NO_NEW_IMAGES';
 				$folder_image = ($album_unread) ? 'forum_unread' : 'forum_read';
@@ -694,8 +685,7 @@ 
 				$lastimage_uc_name = '';//@todo phpbb_ext_gallery_core_image::generate_link('image_name', $phpbb_ext_gallery->config->get('link_image_name'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 				// phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 				$lastimage_uc_icon = '';//@todo phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
-			}
-			else
+			} else
 			{
 				$lastimage_time = $lastimage_album_type = $lastimage_contest_marked = 0;
 				$lastimage_uc_fake_thumbnail = $lastimage_uc_thumbnail = $lastimage_uc_name = $lastimage_uc_icon = '';

core/album/manage.php

Braces +26 added lines, -52 removed lines

@@ -150,8 +150,7 @@ 
 			if ($this->user->data['user_timezone'] == '')
 			{
 				$timezone = 'UTC';
-			}
-			else
+			} else
 			{
 				$timezone = $this->user->data['user_timezone'];
 			}
@@ -163,8 +162,7 @@ 
 			{
 				$errors[] = sprintf($this->language->lang('CONTEST_START_INVALID'), $contest_data['contest_start']);
 				$start_date_error = true;
-			}
-			else
+			} else
 			{
 				$contest_data['contest_start'] = gmmktime((int) $m[4], (int) $m[5], 0, (int) $m[2], (int) $m[3], (int) $m[1]) - $time->getOffset();// - $offset;
 			}
@@ -172,8 +170,7 @@ 
 			{
 				$errors[] = sprintf($this->language->lang('CONTEST_RATING_INVALID'), $contest_data['contest_rating']);
 				$date_error = true;
-			}
-			else if (!$start_date_error)
+			} else if (!$start_date_error)
 			{
 				$contest_data['contest_rating'] = gmmktime($m[4], $m[5], 0, $m[2], $m[3], $m[1]) - $contest_data['contest_start'] - $time->getOffset();//- $offset;
 			}
@@ -181,8 +178,7 @@ 
 			{
 				$errors[] = sprintf($this->language->lang('CONTEST_END_INVALID'), $contest_data['contest_end']);
 				$date_error = true;
-			}
-			else if (!$start_date_error)
+			} else if (!$start_date_error)
 			{
 				$contest_data['contest_end'] = gmmktime($m[4], $m[5], 0, $m[2], $m[3], $m[1]) - $contest_data['contest_start'] - $time->getOffset();//- $offset;
 			}
@@ -270,8 +266,7 @@ 
 
 					$album_data_sql['left_id'] = $row['right_id'];
 					$album_data_sql['right_id'] = $row['right_id'] + 1;
-				}
-				else
+				} else
 				{
 					$sql = 'UPDATE ' . $this->albums_table . ' 
 						SET left_id = left_id + 2, right_id = right_id + 2
@@ -288,8 +283,7 @@ 
 					$album_data_sql['left_id'] = $row['left_id'] + 1;
 					$album_data_sql['right_id'] = $row['left_id'] + 2;
 				}
-			}
-			else
+			} else
 			{
 				if (!$add_on_top)
 				{
@@ -302,8 +296,7 @@ 
 
 					$album_data_sql['left_id'] = $row['right_id'] + 1;
 					$album_data_sql['right_id'] = $row['right_id'] + 2;
-				}
-				else
+				} else
 				{
 					$sql = 'UPDATE ' . $this->albums_table . ' 
 						SET left_id = left_id + 2, right_id = right_id + 2
@@ -336,8 +329,7 @@ 
 				$this->db->sql_query($sql);
 			}
 			$this->gallery_log->add_log('admin', 'add', $album_data['album_id'], 0, array('LOG_ALBUM_ADD', $album_data['album_name']));
-		}
-		else
+		} else
 		{
 			$row = $this->gallery_album->get_info($album_data_sql['album_id']);
 			$reset_marked_images = false;
@@ -348,22 +340,19 @@ 
 				// Changing a contest to category? No!
 				$errors[] = $this->language->lang('ALBUM_WITH_CONTEST_NO_TYPE_CHANGE');
 				return $errors;
-			}
-			else if ($row['album_type'] != \phpbbgallery\core\block::TYPE_CONTEST && $album_data_sql['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST)
+			} else if ($row['album_type'] != \phpbbgallery\core\block::TYPE_CONTEST && $album_data_sql['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST)
 			{
 				// Changing a album to contest? No!
 				// Changing a category to contest? No!
 				$errors[] = $this->language->lang('ALBUM_NO_TYPE_CHANGE_TO_CONTEST');
 				return $errors;
-			}
-			else if ($row['album_type'] == \phpbbgallery\core\block::TYPE_CAT && $album_data_sql['album_type'] == \phpbbgallery\core\block::TYPE_UPLOAD)
+			} else if ($row['album_type'] == \phpbbgallery\core\block::TYPE_CAT && $album_data_sql['album_type'] == \phpbbgallery\core\block::TYPE_UPLOAD)
 			{
 				// Changing a category to a album? Yes!
 				// Reset the data (you couldn't upload directly in a cat, you must use a album)
 				$album_data_sql['album_images'] = $album_data_sql['album_images_real'] = $album_data_sql['album_last_image_id'] = $album_data_sql['album_last_user_id'] = $album_data_sql['album_last_image_time'] = $album_data_sql['album_contest'] = 0;
 				$album_data_sql['album_last_username'] = $album_data_sql['album_last_user_colour'] = $album_data_sql['album_last_image_name'] = '';
-			}
-			else if ($row['album_type'] == \phpbbgallery\core\block::TYPE_UPLOAD && $album_data_sql['album_type'] == \phpbbgallery\core\block::TYPE_CAT)
+			} else if ($row['album_type'] == \phpbbgallery\core\block::TYPE_UPLOAD && $album_data_sql['album_type'] == \phpbbgallery\core\block::TYPE_CAT)
 			{
 				// Changing a album to a category? Yes!
 				// we're turning a uploadable album into a non-uploadable album
@@ -374,22 +363,18 @@ 
 					if ($to_album_id)
 					{
 						$errors = $this->move_album_content($album_data_sql['album_id'], $to_album_id);
-					}
-					else
+					} else
 					{
 						return array($this->language->lang('NO_DESTINATION_ALBUM'));
 					}
-				}
-				else if ($album_data_sql['type_action'] == 'delete')
+				} else if ($album_data_sql['type_action'] == 'delete')
 				{
 					$errors = $this->delete_album_content($album_data_sql['album_id']);
-				}
-				else
+				} else
 				{
 					return array($this->language->lang('NO_ALBUM_ACTION'));
 				}
-			}
-			else if ($row['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST && $album_data_sql['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST)
+			} else if ($row['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST && $album_data_sql['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST)
 			{
 				// Changing a contest to contest? Yes!
 				// We need to check for the contest_data
@@ -417,8 +402,7 @@ 
 				if ($row['album_id'] != $album_data_sql['parent_id'])
 				{
 					$errors = $this->move_album($album_data_sql['album_id'], $album_data_sql['parent_id']);
-				}
-				else
+				} else
 				{
 					$album_data_sql['parent_id'] = $row['parent_id'];
 				}
@@ -561,13 +545,11 @@ 
 			if ($to_data['right_id'] > $from_data['right_id'])
 			{
 				$diff = '+ ' . ($to_data['right_id'] - $from_data['right_id'] - 1);
-			}
-			else
+			} else
 			{
 				$diff = '- ' . abs($to_data['right_id'] - $from_data['right_id'] - 1);
 			}
-		}
-		else
+		} else
 		{
 			$sql = 'SELECT MAX(right_id) AS right_id
 				FROM ' . $this->albums_table . ' 
@@ -613,14 +595,12 @@ 
 		{
 			$log_action_images = 'IMAGES';
 			$errors = array_merge($errors, $this->delete_album_content($album_id));
-		}
-		else if ($action_images == 'move')
+		} else if ($action_images == 'move')
 		{
 			if (!$images_to_id)
 			{
 				$errors[] = $this->language->lang('NO_DESTINATION_ALBUM');
-			}
-			else
+			} else
 			{
 				$log_action_images = 'MOVE_IMAGES';
 
@@ -634,8 +614,7 @@ 
 				if (!$row)
 				{
 					$errors[] = $this->language->lang('NO_ALBUM');
-				}
-				else
+				} else
 				{
 					$images_to_name = $row['album_name'];
 					$errors = array_merge($errors, $this->move_album_content($album_id, $images_to_id));
@@ -669,14 +648,12 @@ 
 			$sql = 'DELETE FROM ' . $this->albums_table . ' 
 				WHERE ' . $this->db->sql_in_set('album_id', $album_ids);
 			$this->db->sql_query($sql);
-		}
-		else if ($action_subalbums == 'move')
+		} else if ($action_subalbums == 'move')
 		{
 			if (!$subalbums_to_id)
 			{
 				$errors[] = $this->language->lang('NO_DESTINATION_ALBUM');
-			}
-			else
+			} else
 			{
 				$log_action_albums = 'MOVE_ALBUMS';
 
@@ -690,8 +667,7 @@ 
 				if (!$row)
 				{
 					$errors[] = $this->language->lang('NO_ALBUM');
-				}
-				else
+				} else
 				{
 					$subalbums_to_name = $row['album_name'];
 
@@ -726,8 +702,7 @@ 
 			{
 				return $errors;
 			}
-		}
-		else
+		} else
 		{
 			$diff = 2;
 			$sql = 'DELETE FROM ' . $this->albums_table . '  
@@ -1021,8 +996,7 @@ 
 
 			$move_up_left = $album_row['left_id'];
 			$move_up_right = $album_row['right_id'];
-		}
-		else
+		} else
 		{
 			$left_id = $album_row['left_id'];
 			$right_id = $target['right_id'];