satanasov / phpbbgallery

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

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

Indentation +27 added lines, -27 removed lines

@@ -817,8 +817,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':
@@ -908,14 +908,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)));
 
@@ -1017,12 +1017,12 @@ 
 		$this->gallery_config->set('num_comments', (int) $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)));
 
@@ -1045,11 +1045,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'] . '
@@ -1071,12 +1071,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 subtract 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 subtract 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'];

Braces +26 added lines, -52 removed lines

@@ -216,8 +216,7 @@ 
 			if ($this->user->data['user_timezone'] == '')
 			{
 				$timezone = 'UTC';
-			}
-			else
+			} else
 			{
 				$timezone = $this->user->data['user_timezone'];
 			}
@@ -229,8 +228,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;
 			}
@@ -238,8 +236,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;
 			}
@@ -247,8 +244,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;
 			}
@@ -336,8 +332,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
@@ -354,8 +349,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)
 				{
@@ -368,8 +362,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
@@ -402,8 +395,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;
@@ -414,22 +406,19 @@ 
 				// Changing a contest to category? No!
 				$errors[] = $this->language->lang('ALBUM_WITH_CONTEST_NO_TYPE_CHANGE');
 				return $errors;
-			}
-			else if ($row['album_type'] != (int) \phpbbgallery\core\block::TYPE_CONTEST && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST)
+			} else if ($row['album_type'] != (int) \phpbbgallery\core\block::TYPE_CONTEST && $album_data_sql['album_type'] == (int) \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'] == (int) \phpbbgallery\core\block::TYPE_CAT && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_UPLOAD)
+			} else if ($row['album_type'] == (int) \phpbbgallery\core\block::TYPE_CAT && $album_data_sql['album_type'] == (int) \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'] == (int) \phpbbgallery\core\block::TYPE_UPLOAD && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_CAT)
+			} else if ($row['album_type'] == (int) \phpbbgallery\core\block::TYPE_UPLOAD && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_CAT)
 			{
 				// Changing a album to a category? Yes!
 				// we're turning a uploadable album into a non-uploadable album
@@ -440,22 +429,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'] == (int) \phpbbgallery\core\block::TYPE_CONTEST && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST)
+			} else if ($row['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST && $album_data_sql['album_type'] == (int) \phpbbgallery\core\block::TYPE_CONTEST)
 			{
 				// Changing a contest to contest? Yes!
 				// We need to check for the contest_data
@@ -483,8 +468,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'];
 				}
@@ -627,13 +611,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 . ' 
@@ -679,14 +661,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';
 
@@ -700,8 +680,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));
@@ -735,14 +714,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';
 
@@ -756,8 +733,7 @@ 
 				if (!$row)
 				{
 					$errors[] = $this->language->lang('NO_ALBUM');
-				}
-				else
+				} else
 				{
 					$subalbums_to_name = $row['album_name'];
 
@@ -792,8 +768,7 @@ 
 			{
 				return $errors;
 			}
-		}
-		else
+		} else
 		{
 			$diff = 2;
 			$sql = 'DELETE FROM ' . $this->albums_table . '  
@@ -1087,8 +1062,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

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),

Spacing +3 added lines, -3 removed lines

@@ -314,7 +314,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'	=> (string) $this->user_loader->get_username($var['comment_user_id'], 'full'),
@@ -447,7 +447,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'),
 			));
 		}
@@ -547,7 +547,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',

Indentation +3 added lines, -3 removed lines

@@ -243,9 +243,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_permissions($this->user->data['user_id']);

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,

core/comment.php

Indentation +9 added lines, -9 removed lines

@@ -183,10 +183,10 @@ 
 	}
 
 	/**
-	* Delete comments
-	*
-	* @param	mixed	$comment_ids	Array or integer with comment_id we delete.
-	*/
+	 * Delete comments
+	 *
+	 * @param	mixed	$comment_ids	Array or integer with comment_id we delete.
+	 */
 	public function delete_comments($comment_ids)
 	{
 		$comment_ids = $this->cast_mixed_int2array($comment_ids);
@@ -216,11 +216,11 @@ 
 	}
 
 	/**
-	* Delete comments for given image_ids
-	*
-	* @param	mixed	$image_ids		Array or integer with image_id where we delete the comments.
-	* @param	bool	$reset_stats	Shall we also reset the statistics? We can save that query, when the images are deleted anyway.
-	*/
+	 * Delete comments for given image_ids
+	 *
+	 * @param	mixed	$image_ids		Array or integer with image_id where we delete the comments.
+	 * @param	bool	$reset_stats	Shall we also reset the statistics? We can save that query, when the images are deleted anyway.
+	 */
 	public function delete_images($image_ids, $reset_stats = false)
 	{
 		$image_ids = $this->cast_mixed_int2array($image_ids);

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 			'comment_time'			=> time(),
 		);
 
-		$this->db->sql_query('INSERT INTO ' .$this->comments_table .' ' . $this->db->sql_build_array('INSERT', $data));
+		$this->db->sql_query('INSERT INTO ' . $this->comments_table . ' ' . $this->db->sql_build_array('INSERT', $data));
 		$newest_comment_id = (int) $this->db->sql_nextid();
 		$this->config->inc('num_comments', 1);
 

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.php

Indentation +18 added lines, -18 removed lines

@@ -95,11 +95,11 @@ 
 	}
 
 	/**
-	* Remove images from watch-list
-	*
-	* @param	mixed	$image_ids		Array or integer with image_id where we delete from the watch-list.
-	* @param	mixed	$user_ids		If not set, it uses the currents user_id
-	*/
+	 * Remove images from watch-list
+	 *
+	 * @param	mixed	$image_ids		Array or integer with image_id where we delete from the watch-list.
+	 * @param	mixed	$user_ids		If not set, it uses the currents user_id
+	 */
 	public function remove($image_ids, $user_ids = false)
 	{
 		$image_ids = self::cast_mixed_int2array($image_ids);
@@ -112,11 +112,11 @@ 
 	}
 
 	/**
-	* Remove albums from watch-list
-	*
-	* @param	mixed	$album_ids		Array or integer with album_id where we delete from the watch-list.
-	* @param	mixed	$user_ids		If not set, it uses the currents user_id
-	*/
+	 * Remove albums from watch-list
+	 *
+	 * @param	mixed	$album_ids		Array or integer with album_id where we delete from the watch-list.
+	 * @param	mixed	$user_ids		If not set, it uses the currents user_id
+	 */
 	public function remove_albums($album_ids, $user_ids = false)
 	{
 		$album_ids = self::cast_mixed_int2array($album_ids);
@@ -129,10 +129,10 @@ 
 	}
 
 	/**
-	* Delete given image_ids from watch-list
-	*
-	* @param	mixed	$image_ids		Array or integer with image_id where we delete from watch-list.
-	*/
+	 * Delete given image_ids from watch-list
+	 *
+	 * @param	mixed	$image_ids		Array or integer with image_id where we delete from watch-list.
+	 */
 	public function delete_images($image_ids)
 	{
 		$image_ids = self::cast_mixed_int2array($image_ids);
@@ -144,10 +144,10 @@ 
 
 
 	/**
-	* Delete given album_ids from watch-list
-	*
-	* @param	mixed	$album_ids		Array or integer with album_id where we delete from watch-list.
-	*/
+	 * Delete given album_ids from watch-list
+	 *
+	 * @param	mixed	$album_ids		Array or integer with album_id where we delete from watch-list.
+	 */
 	public function delete_albums($album_ids)
 	{
 		$album_ids = self::cast_mixed_int2array($album_ids);

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/auth/level.php

Indentation +23 added lines, -23 removed lines

@@ -14,27 +14,27 @@ 
 {
 
 	/**
-	* Gallery Auth Object
-	* @var \phpbbgallery\core\auth\auth
-	*/
+	 * Gallery Auth Object
+	 * @var \phpbbgallery\core\auth\auth
+	 */
 	protected $auth;
 
 	/**
-	* Config Object
-	* @var \phpbb\config\config
-	*/
+	 * Config Object
+	 * @var \phpbb\config\config
+	 */
 	protected $config;
 
 	/**
-	* Template Object
-	* @var \phpbb\template\template
-	*/
+	 * Template Object
+	 * @var \phpbb\template\template
+	 */
 	protected $template;
 
 	/**
-	* User Object
-	* @var \phpbb\user
-	*/
+	 * User Object
+	 * @var \phpbb\user
+	 */
 	protected $user;
 
 	/**
@@ -62,17 +62,17 @@ 
 	}
 
 	/**
-	* User authorisation levels output
-	*
-	* @param	int		$album_id		The current album the user is in.
-	* @param	int		$album_status	The albums status bit.
-	* @param	int		$album_user_id	The user-id of the album owner. Saves us a call to the cache if it is set.
-	* @return		null
-	*
-	* borrowed from phpBB3
-	* @author: phpBB Group
-	* @function: gen_forum_auth_level
-	*/
+	 * User authorisation levels output
+	 *
+	 * @param	int		$album_id		The current album the user is in.
+	 * @param	int		$album_status	The albums status bit.
+	 * @param	int		$album_user_id	The user-id of the album owner. Saves us a call to the cache if it is set.
+	 * @return		null
+	 *
+	 * borrowed from phpBB3
+	 * @author: phpBB Group
+	 * @function: gen_forum_auth_level
+	 */
 	public function display($album_id, $album_status, $album_user_id = -1)
 	{
 		$locked = ($album_status == ITEM_LOCKED && !$this->auth->acl_check('m_', $album_id, $album_user_id)) ? true : false;

core/auth/auth.php

Spacing +15 added lines, -15 removed lines

@@ -12,21 +12,21 @@ 
 
 class auth
 {
-	const SETTING_PERMISSIONS	= -39839;
-	const PERSONAL_ALBUM		= -3;
+	const SETTING_PERMISSIONS = -39839;
+	const PERSONAL_ALBUM = -3;
 	const OWN_ALBUM				= -2;
-	const PUBLIC_ALBUM			= 0;
+	const PUBLIC_ALBUM = 0;
 
 	const ACCESS_ALL			= 0;
-	const ACCESS_REGISTERED		= 1;
-	const ACCESS_NOT_FOES		= 2;
-	const ACCESS_FRIENDS		= 3;
-	const ACCESS_SPECIAL_FRIENDS	= 4;
+	const ACCESS_REGISTERED = 1;
+	const ACCESS_NOT_FOES = 2;
+	const ACCESS_FRIENDS = 3;
+	const ACCESS_SPECIAL_FRIENDS = 4;
 
 	// ACL - slightly different
-	const ACL_NO		= 0;
-	const ACL_YES		= 1;
-	const ACL_NEVER		= 2;
+	const ACL_NO = 0;
+	const ACL_YES = 1;
+	const ACL_NEVER = 2;
 
 	static protected $_permission_i = array('i_view', 'i_watermark', 'i_upload', 'i_approve', 'i_edit', 'i_delete', 'i_report', 'i_rate');
 	static protected $_permission_c = array('c_read', 'c_post', 'c_edit', 'c_delete');
@@ -167,17 +167,17 @@ 
 			$sql_select .= " MAX($permission) as $permission,";
 		}
 
-		$this->_auth_data[self::OWN_ALBUM]				= new \phpbbgallery\core\auth\set();
+		$this->_auth_data[self::OWN_ALBUM] = new \phpbbgallery\core\auth\set();
 		$this->_auth_data_never[self::OWN_ALBUM]		= new \phpbbgallery\core\auth\set();
 		$this->_auth_data[self::PERSONAL_ALBUM]			= new \phpbbgallery\core\auth\set();
-		$this->_auth_data_never[self::PERSONAL_ALBUM]	= new \phpbbgallery\core\auth\set();
+		$this->_auth_data_never[self::PERSONAL_ALBUM] = new \phpbbgallery\core\auth\set();
 
 		foreach ($albums as $album)
 		{
 			if ($album['album_user_id'] == self::PUBLIC_ALBUM)
 			{
-				$this->_auth_data[$album['album_id']]		= new \phpbbgallery\core\auth\set();
-				$this->_auth_data_never[$album['album_id']]	= new \phpbbgallery\core\auth\set();
+				$this->_auth_data[$album['album_id']] = new \phpbbgallery\core\auth\set();
+				$this->_auth_data_never[$album['album_id']] = new \phpbbgallery\core\auth\set();
 			}
 		}
 
@@ -355,7 +355,7 @@ 
 
 		$zebra = null;
 
-		$albums = array();//@todo $this->cache->obtain_album_list();
+		$albums = array(); //@todo $this->cache->obtain_album_list();
 		foreach ($albums as $album)
 		{
 			if (!$album['album_auth_access'] || ($album['album_user_id'] == self::PUBLIC_ALBUM))# || ($album['album_user_id'] == $user_id))

Braces +22 added lines, -41 removed lines

@@ -130,9 +130,7 @@ 
 		{
 			$this->unserialize_auth_data($cached_permissions);
 			return;
-		}
-
-		else if ($user_id != $this->user->user_id)
+		} else if ($user_id != $this->user->user_id)
 		{
 			$this->user->set_user_id($user_id);
 			$cached_permissions = $this->user->get_data('user_permissions');
@@ -252,8 +250,7 @@ 
 			if (!isset($acl_array[$key]))
 			{
 				$acl_array[$key] = $key . '::' . $a_id;
-			}
-			else
+			} else
 			{
 				$acl_array[$key] .= ':' . $a_id;
 			}
@@ -302,8 +299,7 @@ 
 				if ($data[$permission] == self::ACL_NEVER)
 				{
 					$this->_auth_data_never[$album_id]->set_bit(self::$_permissions_flipped[$permission], true);
-				}
-				else if ($data[$permission] == self::ACL_YES)
+				} else if ($data[$permission] == self::ACL_YES)
 				{
 					$this->_auth_data[$album_id]->set_bit(self::$_permissions_flipped[$permission], true);
 					if (substr($permission, 0, 2) == 'm_')
@@ -311,8 +307,7 @@ 
 						$this->_auth_data[$album_id]->set_bit(self::$_permissions_flipped['m_'], true);
 					}
 				}
-			}
-			else
+			} else
 			{
 				$this->_auth_data[$album_id]->set_count($permission, $data[$permission]);
 			}
@@ -358,17 +353,17 @@ 
 		$albums = array();//@todo $this->cache->obtain_album_list();
 		foreach ($albums as $album)
 		{
-			if (!$album['album_auth_access'] || ($album['album_user_id'] == self::PUBLIC_ALBUM))# || ($album['album_user_id'] == $user_id))
+			if (!$album['album_auth_access'] || ($album['album_user_id'] == self::PUBLIC_ALBUM)) {
+				# || ($album['album_user_id'] == $user_id))
 			{
 				continue;
 			}
-			else if ($user_id == ANONYMOUS)
+			} else if ($user_id == ANONYMOUS)
 			{
 				// Level 1: No guests
 				$this->_auth_data[$album['album_id']] = new \phpbbgallery\core\auth\set();
 				continue;
-			}
-			else if ($album['album_auth_access'] == self::ACCESS_NOT_FOES)
+			} else if ($album['album_auth_access'] == self::ACCESS_NOT_FOES)
 			{
 				if ($zebra == null)
 				{
@@ -380,8 +375,7 @@ 
 					$this->_auth_data[$album['album_id']] = new \phpbbgallery\core\auth\set();
 					continue;
 				}
-			}
-			else if ($album['album_auth_access'] == self::ACCESS_SPECIAL_FRIENDS)
+			} else if ($album['album_auth_access'] == self::ACCESS_SPECIAL_FRIENDS)
 			{
 				if ($zebra == null)
 				{
@@ -393,8 +387,7 @@ 
 					$this->_auth_data[$album['album_id']] = new \phpbbgallery\core\auth\set();
 					continue;
 				}
-			}
-			else if ($album['album_auth_access'] == self::ACCESS_FRIENDS)
+			} else if ($album['album_auth_access'] == self::ACCESS_FRIENDS)
 			{
 				if ($zebra == null)
 				{
@@ -428,21 +421,18 @@ 
 			if ($row['foe'])
 			{
 				$zebra['foe'][] = (int) $row['user_id'];
-			}
-			else
+			} else
 			{
 				if (isset($row['bff']))
 				{
 					if ($row['bff'])
 					{
 						$zebra['bff'][] = (int) $row['user_id'];
-					}
-					else
+					} else
 					{
 						$zebra['friend'][] = (int) $row['user_id'];
 					}
-				}
-				else
+				} else
 				{
 					$zebra['friend'][] = (int) $row['user_id'];
 				}
@@ -487,16 +477,13 @@ 
 			if (in_array($album_author, $zebra_array['foe']))
 			{
 				$state = 1;
-			}
-			else if (in_array($album_author, $zebra_array['friend']))
+			} else if (in_array($album_author, $zebra_array['friend']))
 			{
 				$state = 3;
-			}
-			else if (in_array($album_author, $zebra_array['bff']))
+			} else if (in_array($album_author, $zebra_array['bff']))
 			{
 				$state = 4;
-			}
-			else
+			} else
 			{
 				$state = 2;
 			}
@@ -543,12 +530,10 @@ 
 		if (is_array($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;
 		}
@@ -617,8 +602,7 @@ 
 			if ($this->user->is_user($u_id))
 			{
 				$p_id = self::OWN_ALBUM;
-			}
-			else
+			} else
 			{
 				if (!isset($this->_auth_data[$a_id]))
 				{
@@ -700,12 +684,10 @@ 
 			if ($this->user->is_user($album['album_user_id']))
 			{
 				$a_id = self::OWN_ALBUM;
-			}
-			else if ($album['album_user_id'] > self::PUBLIC_ALBUM)
+			} else if ($album['album_user_id'] > self::PUBLIC_ALBUM)
 			{
 				$a_id = self::PERSONAL_ALBUM;
-			}
-			else
+			} else
 			{
 				$a_id = $album['album_id'];
 			}
@@ -755,8 +737,7 @@ 
 		if ($album_data['album_user_id'] != 0)
 		{
 			$sql = 'SELECT * FROM ' . $this->table_permissions . ' WHERE ' . $this->db->sql_in_set('perm_system', array(-2, -3));
-		}
-		else
+		} else
 		{
 			$sql = 'SELECT * FROM ' . $this->table_permissions . ' WHERE perm_album_id = ' . (int) $album_id;
 		}

Indentation +53 added lines, -53 removed lines

@@ -41,57 +41,57 @@ 
 	protected $acl_cache = array();
 
 	/**
-	* Cache object
-	* @var \phpbbgallery\core\cache
-	*/
+	 * Cache object
+	 * @var \phpbbgallery\core\cache
+	 */
 	protected $cache;
 
 	/**
-	* Database object
-	* @var \phpbb\db\driver\driver
-	*/
+	 * Database object
+	 * @var \phpbb\db\driver\driver
+	 */
 	protected $db;
 
 	/**
-	* Gallery user object
-	* @var \phpbbgallery\core\user
-	*/
+	 * Gallery user object
+	 * @var \phpbbgallery\core\user
+	 */
 	protected $user;
 
 	/**
-	* phpBB user object
-	* @var \phpbb\user
-	*/
+	 * phpBB user object
+	 * @var \phpbb\user
+	 */
 	protected $phpbb_user;
 
 	/**
-	* phpBB auth object
-	* @var \phpbb\auth\auth
-	*/
+	 * phpBB auth object
+	 * @var \phpbb\auth\auth
+	 */
 	protected $auth;
 
 	/**
-	* Gallery permissions table
-	* @var string
-	*/
+	 * Gallery permissions table
+	 * @var string
+	 */
 	protected $table_permissions;
 
 	/**
-	* Gallery permission roles table
-	* @var string
-	*/
+	 * Gallery permission roles table
+	 * @var string
+	 */
 	protected $table_roles;
 
 	/**
-	* Gallery users table
-	* @var string
-	*/
+	 * Gallery users table
+	 * @var string
+	 */
 	protected $table_users;
 
 	/**
-	* Gallery albums table
-	* @var string
-	*/
+	 * Gallery albums table
+	 * @var string
+	 */
 	protected $table_albums;
 
 	/**
@@ -339,8 +339,8 @@ 
 	}
 
 	/**
-	* Merge the NEVER-options into the YES-options by removing the YES, if it is set.
-	*/
+	 * Merge the NEVER-options into the YES-options by removing the YES, if it is set.
+	 */
 	protected function merge_acl_row()
 	{
 		foreach ($this->_auth_data as $album_id => $obj)
@@ -585,14 +585,14 @@ 
 	}
 
 	/**
-	* Get permission
-	*
-	* @param	string	$acl	One of the permissions, Exp: i_view
-	* @param	int		$a_id	The album_id, from which we want to have the permissions
-	* @param	int		$u_id	The user_id from the album-owner. If not specified we need to get it from the cache.
-	*
-	* @return	bool			Is the user allowed to do the $acl?
-	*/
+	 * Get permission
+	 *
+	 * @param	string	$acl	One of the permissions, Exp: i_view
+	 * @param	int		$a_id	The album_id, from which we want to have the permissions
+	 * @param	int		$u_id	The user_id from the album-owner. If not specified we need to get it from the cache.
+	 *
+	 * @return	bool			Is the user allowed to do the $acl?
+	 */
 	public function acl_check($acl, $a_id, $u_id = -1)
 	{
 		$bit = self::$_permissions_flipped[$acl];
@@ -655,12 +655,12 @@ 
 	}
 
 	/**
-	* Does the user have the permission for any album?
-	*
-	* @param	string	$acl			One of the permissions, Exp: i_view; *_count permissions are not allowed!
-	*
-	* @return	bool			Is the user allowed to do the $acl?
-	*/
+	 * Does the user have the permission for any album?
+	 *
+	 * @param	string	$acl			One of the permissions, Exp: i_view; *_count permissions are not allowed!
+	 *
+	 * @return	bool			Is the user allowed to do the $acl?
+	 */
 	public function acl_check_global($acl)
 	{
 		$bit = self::$_permissions_flipped[$acl];
@@ -692,16 +692,16 @@ 
 	}
 
 	/**
-	* Get albums by permission
-	*
-	* @param	string	$acl			One of the permissions, Exp: i_view; *_count permissions are not allowed!
-	* @param	string	$return			Type of the return value. array returns an array, else it's a string.
-	*									bool means it only checks whether the user has the permission anywhere.
-	* @param	bool	$display_in_rrc	Only return albums, that have the display_in_rrc-flag set.
-	* @param	bool	$display_pegas	Include personal galleries in the list.
-	*
-	* @return	mixed					$album_ids, either as list or array.
-	*/
+	 * Get albums by permission
+	 *
+	 * @param	string	$acl			One of the permissions, Exp: i_view; *_count permissions are not allowed!
+	 * @param	string	$return			Type of the return value. array returns an array, else it's a string.
+	 *									bool means it only checks whether the user has the permission anywhere.
+	 * @param	bool	$display_in_rrc	Only return albums, that have the display_in_rrc-flag set.
+	 * @param	bool	$display_pegas	Include personal galleries in the list.
+	 *
+	 * @return	mixed					$album_ids, either as list or array.
+	 */
 	public function acl_album_ids($acl, $return = 'array', $display_in_rrc = false, $display_pegas = true)
 	{
 		$bit = self::$_permissions_flipped[$acl];