satanasov / phpbbgallery

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

Indentation +19 added lines, -19 removed lines

@@ -14,11 +14,11 @@ 
 		'phpbbgallery/acpcleanup',
 	);
 	/**
-	* Single enable step that installs any included migrations
-	*
-	* @param mixed $old_state State returned by previous call of this method
-	* @return mixed Returns false after last step, otherwise temporary state
-	*/
+	 * Single enable step that installs any included migrations
+	 *
+	 * @param mixed $old_state State returned by previous call of this method
+	 * @return mixed Returns false after last step, otherwise temporary state
+	 */
 	function enable_step($old_state)
 	{
 		switch ($old_state)
@@ -52,11 +52,11 @@ 
 	}
 
 	/**
-	* Single disable step that does nothing
-	*
-	* @param mixed $old_state State returned by previous call of this method
-	* @return mixed Returns false after last step, otherwise temporary state
-	*/
+	 * Single disable step that does nothing
+	 *
+	 * @param mixed $old_state State returned by previous call of this method
+	 * @return mixed Returns false after last step, otherwise temporary state
+	 */
 	function disable_step($old_state)
 	{
 		switch ($old_state)
@@ -87,21 +87,21 @@ 
 	}
 
 	/**
-	* Single purge step that reverts any included and installed migrations
-	*
-	* @param mixed $old_state State returned by previous call of this method
-	* @return mixed Returns false after last step, otherwise temporary state
-	*/
+	 * Single purge step that reverts any included and installed migrations
+	 *
+	 * @param mixed $old_state State returned by previous call of this method
+	 * @return mixed Returns false after last step, otherwise temporary state
+	 */
 	function purge_step($old_state)
 	{
 		switch ($old_state)
 		{
 			case '': // Empty means nothing has run yet
 				/**
-				* @todo Remove this try/catch condition once purge_notifications is fixed
-				* in the core to work with disabled extensions without fatal errors.
-				* https://tracker.phpbb.com/browse/PHPBB3-12435
-				*/
+				 * @todo Remove this try/catch condition once purge_notifications is fixed
+				 * in the core to work with disabled extensions without fatal errors.
+				 * https://tracker.phpbb.com/browse/PHPBB3-12435
+				 */
 				try
 				{
 					// Purge board rules notifications

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 = '';

Spacing +6 added lines, -6 removed lines

@@ -94,7 +94,7 @@ 
 
 		$sql = 'SELECT a2.*
 			FROM ' . $this->table_albums . ' a1
-			LEFT JOIN ' . $this->table_albums . ' a2 ON (' . $condition .') AND a2.album_user_id = ' . (int) $branch_user_id .'
+			LEFT JOIN ' . $this->table_albums . ' a2 ON (' . $condition . ') AND a2.album_user_id = ' . (int) $branch_user_id . '
 			WHERE a1.album_id = ' . (int) $album_id . '
 				AND a1.album_user_id = ' . (int) $branch_user_id . '
 			ORDER BY a2.left_id ' . (($order == 'descending') ? 'ASC' : 'DESC');
@@ -177,9 +177,9 @@ 
 			'ALBUM_ID' 		=> $album_data['album_id'],
 			'ALBUM_NAME'	=> $album_data['album_name'],
 			'ALBUM_DESC'	=> generate_text_for_display($album_data['album_desc'], $album_data['album_desc_uid'], $album_data['album_desc_bitfield'], $album_data['album_desc_options']),
-			'ALBUM_CONTEST_START'	=> ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_START' . ((($album_data['contest_start']) < time())? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start']), false, true)) : '',
-			'ALBUM_CONTEST_RATING'	=> ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_RATING_START' . ((($album_data['contest_start'] + $album_data['contest_rating']) < time())? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_rating']), false, true)) : '',
-			'ALBUM_CONTEST_END'		=> ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_END' . ((($album_data['contest_start'] + $album_data['contest_end']) < time())? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_end']), false, true)) : '',
+			'ALBUM_CONTEST_START'	=> ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_START' . ((($album_data['contest_start']) < time()) ? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start']), false, true)) : '',
+			'ALBUM_CONTEST_RATING'	=> ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_RATING_START' . ((($album_data['contest_start'] + $album_data['contest_rating']) < time()) ? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_rating']), false, true)) : '',
+			'ALBUM_CONTEST_END'		=> ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_END' . ((($album_data['contest_start'] + $album_data['contest_end']) < time()) ? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_end']), false, true)) : '',
 			'U_VIEW_ALBUM'	=> $this->helper->route('phpbbgallery_core_album', array('album_id' => (int) $album_data['album_id'])),
 		));
 
@@ -691,9 +691,9 @@ 
 				// phpbb_ext_gallery_core_image::generate_link('thumbnail', $phpbb_ext_gallery->config->get('link_thumbnail'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 				$lastimage_uc_thumbnail = $row['album_image'] ? generate_board_url() . '/' . $row['album_image'] : $this->helper->route('phpbbgallery_core_image_file_mini', array('image_id' => $row['album_last_image_id']));
 				// 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);
-				$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);
+				$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);
+				$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
 			{

core/album/loader.php

Indentation +13 added lines, -13 removed lines

@@ -40,12 +40,12 @@ 
 	}
 
 	/**
-	* Load the data of an album
-	*
-	* @param	int		$album_id
-	* @return	bool	True if the album was loaded
-	* @throws	\OutOfBoundsException	if the album does not exist
-	*/
+	 * Load the data of an album
+	 *
+	 * @param	int		$album_id
+	 * @return	bool	True if the album was loaded
+	 * @throws	\OutOfBoundsException	if the album does not exist
+	 */
 	public function load($album_id)
 	{
 		$sql_array = array(
@@ -107,13 +107,13 @@ 
 	}
 
 	/**
-	* Check whether the album_user is the user who wants to do something
-	*
-	* @param	int		$album_id
-	* @param	mixed	$user_id	If false the current user will be compared
-	* @return	bool	True if the user is the owner of the album
-	* @throws	\DomainException	if the user is not the owner of the album
-	*/
+	 * Check whether the album_user is the user who wants to do something
+	 *
+	 * @param	int		$album_id
+	 * @param	mixed	$user_id	If false the current user will be compared
+	 * @return	bool	True if the user is the owner of the album
+	 * @throws	\DomainException	if the user is not the owner of the album
+	 */
 	public function validate_owner($album_id, $user_id = false)
 	{
 		$album_id = (int) $album_id;

core/album/manage.php

Indentation +27 added lines, -27 removed lines

@@ -751,8 +751,8 @@ 
 		$log_action = implode('_', array($log_action_images, $log_action_albums));
 
 		/**
-		* Log what we did
-		*/
+		 * Log what we did
+		 */
 		switch ($log_action)
 		{
 			case 'MOVE_IMAGES_MOVE_ALBUMS':
@@ -842,14 +842,14 @@ 
 		$this->gallery_notification->delete_albums($from_id);
 
 		/**
-		* Event related to moving album content
-		*
-		* @event phpbbgallery.core.album.manage.move_album_content
-		* @var	int	from_id		Album we are moving from
-		* @var	int	to_id		Album we are moving to
-		* @var	bool	sync	Should we sync the albums data
-		* @since 1.2.0
-		*/
+		 * Event related to moving album content
+		 *
+		 * @event phpbbgallery.core.album.manage.move_album_content
+		 * @var	int	from_id		Album we are moving from
+		 * @var	int	to_id		Album we are moving to
+		 * @var	bool	sync	Should we sync the albums data
+		 * @since 1.2.0
+		 */
 		$vars = array('from_id', 'to_id', 'sync');
 		extract($this->dispatcher->trigger_event('phpbbgallery.core.album.manage.move_album_content', compact($vars)));
 
@@ -951,12 +951,12 @@ 
 		$this->gallery_config->set('num_comments', $row['num_comments']);
 
 		/**
-		* Event delete album content
-		*
-		* @event phpbbgallery.core.album.manage.delete_album_content
-		* @var	int	album_id		Album we are deleting
-		* @since 1.2.0
-		*/
+		 * Event delete album content
+		 *
+		 * @event phpbbgallery.core.album.manage.delete_album_content
+		 * @var	int	album_id		Album we are deleting
+		 * @since 1.2.0
+		 */
 		$vars = array('album_id');
 		extract($this->dispatcher->trigger_event('phpbbgallery.core.album.manage.delete_album_content', compact($vars)));
 
@@ -979,11 +979,11 @@ 
 	public function move_album_by($album_row, $action = 'move_up', $steps = 1)
 	{
 		/**
-		* Fetch all the siblings between the module's current spot
-		* and where we want to move it to. If there are less than $steps
-		* siblings between the current spot and the target then the
-		* module will move as far as possible
-		*/
+		 * Fetch all the siblings between the module's current spot
+		 * and where we want to move it to. If there are less than $steps
+		 * siblings between the current spot and the target then the
+		 * module will move as far as possible
+		 */
 		$sql = 'SELECT album_id, album_name, left_id, right_id
 			FROM ' . $this->albums_table . ' 
 			WHERE parent_id = ' . (int) $album_row['parent_id'] . '
@@ -1005,12 +1005,12 @@ 
 		}
 
 		/**
-		* $left_id and $right_id define the scope of the nodes that are affected by the move.
-		* $diff_up and $diff_down are the values to substract or add to each node's left_id
-		* and right_id in order to move them up or down.
-		* $move_up_left and $move_up_right define the scope of the nodes that are moving
-		* up. Other nodes in the scope of ($left_id, $right_id) are considered to move down.
-		*/
+		 * $left_id and $right_id define the scope of the nodes that are affected by the move.
+		 * $diff_up and $diff_down are the values to substract or add to each node's left_id
+		 * and right_id in order to move them up or down.
+		 * $move_up_left and $move_up_right define the scope of the nodes that are moving
+		 * up. Other nodes in the scope of ($left_id, $right_id) are considered to move down.
+		 */
 		if ($action == 'move_up')
 		{
 			$left_id = $target['left_id'];

Spacing +7 added lines, -7 removed lines

@@ -166,7 +166,7 @@ 
 			}
 			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;
+				$contest_data['contest_start'] = gmmktime((int) $m[4], (int) $m[5], 0, (int) $m[2], (int) $m[3], (int) $m[1]) - $time->getOffset(); // - $offset;
 			}
 			if (!preg_match('#(\\d{4})-(\\d{1,2})-(\\d{1,2}) (\\d{1,2}):(\\d{2})#', $contest_data['contest_rating'], $m))
 			{
@@ -175,7 +175,7 @@ 
 			}
 			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;
+				$contest_data['contest_rating'] = gmmktime($m[4], $m[5], 0, $m[2], $m[3], $m[1]) - $contest_data['contest_start'] - $time->getOffset(); //- $offset;
 			}
 			if (!preg_match('#(\\d{4})-(\\d{1,2})-(\\d{1,2}) (\\d{1,2}):(\\d{2})#', $contest_data['contest_end'], $m))
 			{
@@ -184,7 +184,7 @@ 
 			}
 			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;
+				$contest_data['contest_end'] = gmmktime($m[4], $m[5], 0, $m[2], $m[3], $m[1]) - $contest_data['contest_start'] - $time->getOffset(); //- $offset;
 			}
 			if (!$start_date_error && !$date_error)
 			{
@@ -710,7 +710,7 @@ 
 					$album_data = $this->gallery_album->get_info($album_id);
 
 					$sql = 'UPDATE ' . $this->albums_table . ' 
-						SET parent_id = ' . (int) $subalbums_to_id .'
+						SET parent_id = ' . (int) $subalbums_to_id . '
 						WHERE parent_id = ' . (int) $album_id . '
 							AND album_user_id = ' . (int) $this->user_id;
 					$this->db->sql_query($sql);
@@ -738,13 +738,13 @@ 
 		// Resync tree
 		$sql = 'UPDATE ' . $this->albums_table . '  
 			SET right_id = right_id - ' . (int) $diff . '
-			WHERE left_id < ' . (int) $album_data['right_id'] . ' AND right_id > ' . (int) $album_data['right_id']. '
+			WHERE left_id < ' . (int) $album_data['right_id'] . ' AND right_id > ' . (int) $album_data['right_id'] . '
 				AND album_user_id = ' . (int) $this->user_id;
 		$this->db->sql_query($sql);
 
 		$sql = 'UPDATE ' . $this->albums_table . ' 
 			SET left_id = left_id - ' . (int) $diff . ', right_id = right_id - ' . (int) $diff . '
-			WHERE left_id > ' . (int) $album_data['right_id']. '
+			WHERE left_id > ' . (int) $album_data['right_id'] . '
 				AND album_user_id = ' . (int) $this->user_id;
 		$this->db->sql_query($sql);
 
@@ -1037,7 +1037,7 @@ 
 		// Now do the dirty job
 		$sql = 'UPDATE ' . $this->albums_table . ' 
 			SET left_id = left_id + CASE
-				WHEN left_id BETWEEN ' . (int) $move_up_left . ' AND ' . (int) $move_up_right . ' THEN -' .(int) $diff_up . '
+				WHEN left_id BETWEEN ' . (int) $move_up_left . ' AND ' . (int) $move_up_right . ' THEN -' . (int) $diff_up . '
 				ELSE ' .(int) $diff_down . '
 			END,
 			right_id = right_id + CASE

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'];

core/search.php

Indentation +3 added lines, -3 removed lines

@@ -213,9 +213,9 @@
 	}
 
 	/**
-	* Get all recent images the user has access to
-	* return (int) $images_count
-	*/
+	 * Get all recent images the user has access to
+	 * return (int) $images_count
+	 */
 	public function recent_count()
 	{
 		$this->gallery_auth->load_user_premissions($this->user->data['user_id']);

Spacing +3 added lines, -3 removed lines

@@ -310,7 +310,7 @@ 
 			$this->template->assign_block_vars('commentrow', array(
 				'COMMENT_ID'	=> (int) $var['comment_id'],
 				'U_DELETE'	=> ($this->gallery_auth->acl_check('m_comments', $album_tmp['album_id'], $album_tmp['album_user_id']) || ($this->gallery_auth->acl_check('c_delete', $album_tmp['album_id'], $album_tmp['album_user_id']) && ($var['comment_user_id'] == $this->user->data['user_id']) && $this->user->data['is_registered'])) ? $this->helper->route('phpbbgallery_core_comment_delete', array('image_id' => $var['comment_image_id'], 'comment_id' => $var['comment_id'])) : false,
-				'U_EDIT'	=> $this->gallery_auth->acl_check('c_edit', $album_tmp['album_id'], $album_tmp['album_user_id'])? $this->helper->route('phpbbgallery_core_comment_edit', array('image_id'	=> $var['comment_image_id'], 'comment_id'	=> $var['comment_id'])) : false,
+				'U_EDIT'	=> $this->gallery_auth->acl_check('c_edit', $album_tmp['album_id'], $album_tmp['album_user_id']) ? $this->helper->route('phpbbgallery_core_comment_edit', array('image_id'	=> $var['comment_image_id'], 'comment_id'	=> $var['comment_id'])) : false,
 				'U_QUOTE'	=> ($this->gallery_auth->acl_check('c_post', $album_tmp['album_id'], $album_tmp['album_user_id'])) ? $this->helper->route('phpbbgallery_core_comment_add', array('image_id'	=> $var['comment_image_id'], 'comment_id'	=> $var['comment_id'])) : false,
 				'U_COMMENT'	=> $this->helper->route('phpbbgallery_core_image', array('image_id' => $var['comment_image_id'])) . '#comment_' . $var['comment_id'],
 				'POST_AUTHOR_FULL'	=> $this->user_loader->get_username($var['comment_user_id'], 'full'),
@@ -443,7 +443,7 @@ 
 		if ($user > 0)
 		{
 			$this->template->assign_block_vars('imageblock', array(
-				'BLOCK_NAME'	=> $block_name ? $block_name : '' ,
+				'BLOCK_NAME'	=> $block_name ? $block_name : '',
 				'U_BLOCK'	=> $u_block ? $u_block : $this->helper->route('phpbbgallery_core_search_egosearch'),
 			));
 		}
@@ -543,7 +543,7 @@ 
 		$this->db->sql_freeresult($result);
 		$count = $row['count'];
 		$sql_array['SELECT'] = '* , a.album_name, a.album_status, a.album_user_id, a.album_id';
-		$sql_array['LEFT_JOIN']	= array(
+		$sql_array['LEFT_JOIN'] = array(
 			array(
 				'FROM'		=> array($this->albums_table => 'a'),
 				'ON'		=> 'a.album_id = i.image_album_id',

Braces +3 added lines, -6 removed lines

@@ -149,8 +149,7 @@ 
 		if (!$sql_limit)
 		{
 			$result = $this->db->sql_query($sql);
-		}
-		else
+		} else
 		{
 			$result = $this->db->sql_query_limit($sql, $sql_limit);
 		}
@@ -446,8 +445,7 @@ 
 				'BLOCK_NAME'	=> $block_name ? $block_name : '' ,
 				'U_BLOCK'	=> $u_block ? $u_block : $this->helper->route('phpbbgallery_core_search_egosearch'),
 			));
-		}
-		else
+		} else
 		{
 			$this->template->assign_block_vars('imageblock', array(
 				'BLOCK_NAME'	=>  $block_name ? $block_name : $this->language->lang('RECENT_IMAGES'),
@@ -505,8 +503,7 @@ 
 					'phpbbgallery_core_search_egosearch_page',),
 					'params' => array()), 'pagination', 'page', $count, $limit, $start
 			);
-		}
-		else
+		} else
 		{
 			$this->template->assign_vars(array(
 				'TOTAL_IMAGES'				=> $this->language->lang('VIEW_ALBUM_IMAGES', $count),

core/file/file.php

Indentation +9 added lines, -9 removed lines

@@ -231,9 +231,9 @@ 
 	}
 
 	/**
-	* We need to disable the "last-modified" caching for guests and in cases of image-errors,
-	* so that they can view them, if they logged in or the error was fixed.
-	*/
+	 * We need to disable the "last-modified" caching for guests and in cases of image-errors,
+	 * so that they can view them, if they logged in or the error was fixed.
+	 */
 	public function disable_browser_cache()
 	{
 		$this->browser_cache = false;
@@ -460,12 +460,12 @@ 
 	}
 
 	/**
-	* Delete file from disc.
-	*
-	* @param	mixed		$files		String with filename or an array of filenames
-	*									Array-Format: $image_id => $filename
-	* @param	array		$locations	Array of valid url::path()s where the image should be deleted from
-	*/
+	 * Delete file from disc.
+	 *
+	 * @param	mixed		$files		String with filename or an array of filenames
+	 *									Array-Format: $image_id => $filename
+	 * @param	array		$locations	Array of valid url::path()s where the image should be deleted from
+	 */
 	public function delete($files, $locations = array('thumbnail', 'medium', 'upload'))
 	{
 		if (!is_array($files))

Spacing +4 added lines, -4 removed lines

@@ -294,13 +294,13 @@
 
 		if (($this->image_size['height'] / $max_height) > ($this->image_size['width'] / $max_width))
 		{
-			$this->thumb_height	= $max_height;
-			$this->thumb_width	= round($max_width * (($this->image_size['width'] / $max_width) / ($this->image_size['height'] / $max_height)));
+			$this->thumb_height = $max_height;
+			$this->thumb_width = round($max_width * (($this->image_size['width'] / $max_width) / ($this->image_size['height'] / $max_height)));
 		}
 		else
 		{
-			$this->thumb_height	= round($max_height * (($this->image_size['height'] / $max_height) / ($this->image_size['width'] / $max_width)));
-			$this->thumb_width	= $max_width;
+			$this->thumb_height = round($max_height * (($this->image_size['height'] / $max_height) / ($this->image_size['width'] / $max_width)));
+			$this->thumb_width = $max_width;
 		}
 
 		$image_copy = (($this->gd_version == self::GDLIB1) ? @imagecreate($this->thumb_width, $this->thumb_height + $additional_height) : @imagecreatetruecolor($this->thumb_width, $this->thumb_height + $additional_height));

Braces +5 added lines, -10 removed lines

@@ -161,8 +161,7 @@ 
 		if (isset($this->image_size['file']))
 		{
 			$file_size = $this->image_size['file'];
-		}
-		else if ($force_filesize)
+		} else if ($force_filesize)
 		{
 			$file_size = @filesize($this->image_source);
 		}
@@ -296,8 +295,7 @@ 
 		{
 			$this->thumb_height	= $max_height;
 			$this->thumb_width	= round($max_width * (($this->image_size['width'] / $max_width) / ($this->image_size['height'] / $max_height)));
-		}
-		else
+		} else
 		{
 			$this->thumb_height	= round($max_height * (($this->image_size['height'] / $max_height) / ($this->image_size['width'] / $max_width)));
 			$this->thumb_width	= $max_width;
@@ -407,8 +405,7 @@ 
 		{
 			$this->image_source = $get_wm_name;
 			$this->read_image();
-		}
-		else
+		} else
 		{
 			$this->watermark_size = getimagesize($this->watermark_source);
 			switch ($this->watermark_size['mime'])
@@ -437,16 +434,14 @@ 
 			if ($watermark_position & $phpbb_gallery_constants::WATERMARK_LEFT)
 			{
 				$dst_x = 5;
-			}
-			else if ($watermark_position & $phpbb_gallery_constants::WATERMARK_RIGHT)
+			} else if ($watermark_position & $phpbb_gallery_constants::WATERMARK_RIGHT)
 			{
 				$dst_x = ($this->image_size['width'] - $this->watermark_size[0] - 5);
 			}
 			if ($watermark_position & $phpbb_gallery_constants::WATERMARK_TOP)
 			{
 				$dst_y = 5;
-			}
-			else if ($watermark_position & $phpbb_gallery_constants::WATERMARK_MIDDLE)
+			} else if ($watermark_position & $phpbb_gallery_constants::WATERMARK_MIDDLE)
 			{
 				$dst_y = (($this->image_size['height'] * 0.5) - ($this->watermark_size[1] * 0.5));
 			}

core/event/main_listener.php

Spacing +2 added lines, -2 removed lines

@@ -122,13 +122,13 @@
 		}
 		if ($recent)
 		{
-			$block_name	= $this->language->lang('RECENT_IMAGES');
+			$block_name = $this->language->lang('RECENT_IMAGES');
 			$u_block = ' ';
 			$this->gallery_search->recent($this->gallery_config->get('rrc_profile_items'), -1, $event['member']['user_id'], 'rrc_profile_display', $block_name, $u_block);
 		}
 		if ($random)
 		{
-			$block_name	= $this->language->lang('RANDOM_IMAGES');
+			$block_name = $this->language->lang('RANDOM_IMAGES');
 			$u_block = ' ';
 			$this->gallery_search->random($this->gallery_config->get('rrc_profile_items'), $event['member']['user_id'], 'rrc_profile_display', $block_name, $u_block);
 		}

Braces +1 added lines, -2 removed lines

@@ -146,8 +146,7 @@
 					'U_GALLERY_IMAGES_ALLOW'	=> true,
 					'U_GALLERY_IMAGES'	=> $user_info['user_images'],
 				));
-			}
-			else
+			} else
 			{
 				$this->template->assign_vars(array(
 					'U_GALLERY_IMAGES_ALLOW'	=> true,