satanasov / phpbbgallery

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

Indentation +169 added lines, -169 removed lines

@@ -103,8 +103,8 @@ 
 	}
 
 	/**
-	* Load the users data from the database and cast it...
-	*/
+	 * Load the users data from the database and cast it...
+	 */
 	public function load_data()
 	{
 		$this->entry_exists	= false;
@@ -134,9 +134,9 @@ 
 	}
 
 	/**
-	* Some functions need the data to be loaded or at least checked.
-	* So here we loaded if it is not laoded yet and we need it ;)
-	*/
+	 * Some functions need the data to be loaded or at least checked.
+	 * So here we loaded if it is not laoded yet and we need it ;)
+	 */
 	public function force_load()
 	{
 		if (is_null($this->entry_exists))
@@ -146,12 +146,12 @@ 
 	}
 
 	/**
-	* Get user-setting, if the user does not have his own settings we fall back to default.
-	*
-	* @param	string	$key		Column name from the users-table
-	* @param	bool	$default	Load default value, if user has no entry
-	* @return	mixed			Returns the value of the column, it it does not exist it returns false.
-	*/
+	 * Get user-setting, if the user does not have his own settings we fall back to default.
+	 *
+	 * @param	string	$key		Column name from the users-table
+	 * @param	bool	$default	Load default value, if user has no entry
+	 * @return	mixed			Returns the value of the column, it it does not exist it returns false.
+	 */
 	public function get_data($key, $default = true)
 	{
 		if (isset($this->data[$key]))
@@ -217,11 +217,11 @@ 
 	}
 
 	/**
-	* Updates the users table with the new data.
-	*
-	* @param	array	$data	Array of data we want to add/update.
-	* @return	bool			Returns true if the columns were updated successfully
-	*/
+	 * Updates the users table with the new data.
+	 *
+	 * @param	array	$data	Array of data we want to add/update.
+	 * @return	bool			Returns true if the columns were updated successfully
+	 */
 	private function update($data)
 	{
 		$sql_ary = array_merge($this->validate_data($data), array(
@@ -240,11 +240,11 @@ 
 	}
 
 	/**
-	* Updates the users table by increasing the values.
-	*
-	* @param	int		$num	Number of images to add to the counter
-	* @return	bool			Returns true if the columns were updated successfully, else false
-	*/
+	 * Updates the users table by increasing the values.
+	 *
+	 * @param	int		$num	Number of images to add to the counter
+	 * @return	bool			Returns true if the columns were updated successfully, else false
+	 */
 	protected function update_image_count($num)
 	{
 		$sql = 'UPDATE ' . $this->gallery_users_table . '
@@ -267,11 +267,11 @@ 
 	}
 
 	/**
-	* Updates the users table with the new data.
-	*
-	* @param	array	$data	Array of data we want to insert
-	* @return	bool			Returns true if the data was inserted successfully
-	*/
+	 * Updates the users table with the new data.
+	 *
+	 * @param	array	$data	Array of data we want to insert
+	 * @return	bool			Returns true if the data was inserted successfully
+	 */
 	private function insert($data)
 	{
 		$sql_ary = array_merge(self::get_default_values(), $this->validate_data($data), array(
@@ -295,8 +295,8 @@ 
 	}
 
 	/**
-	* Delete the user from the table.
-	*/
+	 * Delete the user from the table.
+	 */
 	public function delete()
 	{
 		$sql = 'DELETE FROM ' . $this->gallery_users_table . '
@@ -305,10 +305,10 @@ 
 	}
 
 	/**
-	* Delete the user from the table.
-	*
-	* @param	mixed	$user_ids	Can either be an array of IDs, one ID or the string 'all' to delete all users.
-	*/
+	 * Delete the user from the table.
+	 *
+	 * @param	mixed	$user_ids	Can either be an array of IDs, one ID or the string 'all' to delete all users.
+	 */
 	public function delete_users($user_ids)
 	{
 
@@ -320,12 +320,12 @@ 
 	}
 
 	/**
-	* Updates the users table with new data.
-	*
-	* @param	mixed	$user_ids	Can either be an array of IDs, one ID or the string 'all' to update all users.
-	* @param	array	$data		Array of data we want to add/update.
-	* @return	bool				Returns true if the columns were updated successfully
-	*/
+	 * Updates the users table with new data.
+	 *
+	 * @param	mixed	$user_ids	Can either be an array of IDs, one ID or the string 'all' to update all users.
+	 * @param	array	$data		Array of data we want to add/update.
+	 * @return	bool				Returns true if the columns were updated successfully
+	 */
 	public function update_users($user_ids, $data)
 	{
 		$sql_ary = array_merge($this->validate_data($data), array(
@@ -344,11 +344,11 @@ 
 	}
 
 	/**
-	* Builds a valid WHERE-sql-statement, with casted integers, or empty to allow handling all users.
-	*
-	* @param	mixed	$user_ids	Can either be an array of IDs, one ID or the string 'all' to update all users.
-	* @return	string				The WHERE statement with "WHERE " if needed.
-	*/
+	 * Builds a valid WHERE-sql-statement, with casted integers, or empty to allow handling all users.
+	 *
+	 * @param	mixed	$user_ids	Can either be an array of IDs, one ID or the string 'all' to update all users.
+	 * @return	string				The WHERE statement with "WHERE " if needed.
+	 */
 	public function sql_build_where($user_ids)
 	{
 		if (is_array($user_ids) && !empty($user_ids))
@@ -368,12 +368,12 @@ 
 	}
 
 	/**
-	* Validate user data.
-	*
-	* @param	array	$data	Array of data we need to validate
-	* @param	bool	$inc	Are we incrementing the value
-	* @return	array			Array with all allowed keys and their casted and selected values
-	*/
+	 * Validate user data.
+	 *
+	 * @param	array	$data	Array of data we need to validate
+	 * @param	bool	$inc	Are we incrementing the value
+	 * @return	array			Array with all allowed keys and their casted and selected values
+	 */
 	public function validate_data($data, $inc = false)
 	{
 		$validated_data = array();
@@ -412,14 +412,14 @@ 
 					$is_validated = false;
 
 					/**
-					* Event user validat data
-					*
-					* @event phpbbgallery.core.user.validate_data
-					* @var	bool	is_validated	is value validated
-					* @var	string	name			value name
-					* @var	mixed	value			value of the value
-					* @since 1.2.0
-					*/
+					 * Event user validat data
+					 *
+					 * @event phpbbgallery.core.user.validate_data
+					 * @var	bool	is_validated	is value validated
+					 * @var	string	name			value name
+					 * @var	mixed	value			value of the value
+					 * @since 1.2.0
+					 */
 					$vars = array('is_validated', 'name', 'value');
 					extract($this->dispatcher->trigger_event('phpbbgallery.core.user.validate_data', compact($vars)));
 
@@ -457,12 +457,12 @@ 
 		$default_values = self::$default_values;
 
 		/**
-		* Event user validat data
-		*
-		* @event phpbbgallery.core.user.get_default_values
-		* @var	array	default_values	the default values array
-		* @since 1.2.0
-		*/
+		 * Event user validat data
+		 *
+		 * @event phpbbgallery.core.user.get_default_values
+		 * @var	array	default_values	the default values array
+		 * @since 1.2.0
+		 */
 		$vars = array('default_values');
 		extract($this->dispatcher->trigger_event('phpbbgallery.core.user.get_default_values', compact($vars)));
 
@@ -470,8 +470,8 @@ 
 	}
 
 	/**
-	* Default values for new users.
-	*/
+	 * Default values for new users.
+	 */
 	static protected $default_values = array(
 		'user_images'		=> 0,
 		'personal_album_id'	=> 0,
@@ -505,111 +505,111 @@ 
 			include($this->root_path . 'includes/functions_display.' . $this->php_ext);
 		}
 
-        $now = $this->user->create_datetime();
-        $now = phpbb_gmgetdate($now->getTimestamp() + $now->getOffset());
-
-        // Cache various user specific data ... so we don't have to recompute
-        // this each time the same user appears on this page
-        if (!isset($user_cache[$user_id])) {
-            if ($user_id == ANONYMOUS) {
-                $user_cache_data = array(
-                    'user_type' => USER_IGNORE,
-                    'joined' => '',
-                    'posts' => '',
-                    'sig' => '',
-                    'sig_bbcode_uid' => '',
-                    'sig_bbcode_bitfield' => '',
-                    'online' => false,
-                    'avatar' => ($this->user->optionget('viewavatars')) ? phpbb_get_user_avatar($row) : '',
-                    'rank_title' => '',
-                    'rank_image' => '',
-                    'rank_image_src' => '',
-                    'pm' => '',
-                    'email' => '',
-                    'jabber' => '',
-                    'search' => '',
-                    'age' => '',
-                    'username' => $row['username'],
-                    'user_colour' => $row['user_colour'],
-                    'contact_user' => '',
-                    'warnings' => 0,
-                    'allow_pm' => 0,
-                );
-            } else {
-                $user_sig = '';
-                // We add the signature to every posters entry because enable_sig is post dependent
-                if ($row['user_sig'] && $this->config['allow_sig'] && $this->user->optionget('viewsigs')) {
-                    $user_sig = $row['user_sig'];
-                }
-                $user_cache_data = array(
-                    'user_type' => $row['user_type'],
-                    'user_inactive_reason' => $row['user_inactive_reason'],
-                    'joined' => $this->user->format_date($row['user_regdate']),
-                    'posts' => $row['user_posts'],
-                    'warnings' => (isset($row['user_warnings'])) ? $row['user_warnings'] : 0,
-                    'sig' => $user_sig,
-                    'sig_bbcode_uid' => (!empty($row['user_sig_bbcode_uid'])) ? $row['user_sig_bbcode_uid'] : '',
-                    'sig_bbcode_bitfield' => (!empty($row['user_sig_bbcode_bitfield'])) ? $row['user_sig_bbcode_bitfield'] : '',
-                    'viewonline' => $row['user_allow_viewonline'],
-                    'allow_pm' => $row['user_allow_pm'],
-                    'avatar' => ($this->user->optionget('viewavatars')) ? phpbb_get_user_avatar($row) : '',
-                    'age' => '',
-                    'rank_title' => '',
-                    'rank_image' => '',
-                    'rank_image_src' => '',
-                    'username' => $row['username'],
-                    'user_colour' => $row['user_colour'],
-                    'contact_user' => $this->user->lang('CONTACT_USER', get_username_string('username', $user_id, $row['username'], $row['user_colour'], $row['username'])),
-                    'online' => false,
-                    'jabber' => ($this->config['jab_enable'] && $row['user_jabber'] && $this->auth->acl_get('u_sendim')) ? append_sid("{$this->root_path}memberlist.$this->php_ext", "mode=contact&action=jabber&u=$user_id") : '',
-                    'search' => ($this->config['load_search'] && $this->auth->acl_get('u_search')) ? append_sid("{$this->root_path}search.$this->php_ext", "author_id=$user_id&sr=posts") : '',
-                    'author_full' => get_username_string('full', $user_id, $row['username'], $row['user_colour']),
-                    'author_colour' => get_username_string('colour', $user_id, $row['username'], $row['user_colour']),
-                    'author_username' => get_username_string('username', $user_id, $row['username'], $row['user_colour']),
-                    'author_profile' => get_username_string('profile', $user_id, $row['username'], $row['user_colour']),
-                );
-
-                $user_cache[$user_id] = $user_cache_data;
-
-                $user_rank_data = phpbb_get_user_rank($row, $row['user_posts']);
-                $user_cache[$user_id]['rank_title'] = $user_rank_data['title'];
-                $user_cache[$user_id]['rank_image'] = $user_rank_data['img'];
-                $user_cache[$user_id]['rank_image_src'] = $user_rank_data['img_src'];
-
-                if ((!empty($row['user_allow_viewemail']) && $this->auth->acl_get('u_sendemail')) || $this->auth->acl_get('a_email'))
-                {
-                    $user_cache[$user_id]['email'] = ($this->config['board_email_form'] && $this->config['email_enable']) ? append_sid("{$this->root_path}memberlist.$this->php_ext", "mode=email&u=$user_id") : (($this->config['board_hide_emails'] && !$this->auth->acl_get('a_email')) ? '' : 'mailto:' . $row['user_email']);
-                }
-                else
-                {
-                    $user_cache[$user_id]['email'] = '';
-                }
-                if ($this->config['allow_birthdays'] && !empty($row['user_birthday']))
-                {
-                    list($bday_day, $bday_month, $bday_year) = array_map('intval', explode('-', $row['user_birthday']));
-                    if ($bday_year)
-                    {
-                        $diff = $now['mon'] - $bday_month;
-                        if ($diff == 0)
-                        {
-                            $diff = ($now['mday'] - $bday_day < 0) ? 1 : 0;
-                        }
-                        else
-                        {
-                            $diff = ($diff < 0) ? 1 : 0;
-                        }
-                        $user_cache[$user_id]['age'] = (int) ($now['year'] - $bday_year - $diff);
-                    }
-                }
-            }
-        }
+		$now = $this->user->create_datetime();
+		$now = phpbb_gmgetdate($now->getTimestamp() + $now->getOffset());
+
+		// Cache various user specific data ... so we don't have to recompute
+		// this each time the same user appears on this page
+		if (!isset($user_cache[$user_id])) {
+			if ($user_id == ANONYMOUS) {
+				$user_cache_data = array(
+					'user_type' => USER_IGNORE,
+					'joined' => '',
+					'posts' => '',
+					'sig' => '',
+					'sig_bbcode_uid' => '',
+					'sig_bbcode_bitfield' => '',
+					'online' => false,
+					'avatar' => ($this->user->optionget('viewavatars')) ? phpbb_get_user_avatar($row) : '',
+					'rank_title' => '',
+					'rank_image' => '',
+					'rank_image_src' => '',
+					'pm' => '',
+					'email' => '',
+					'jabber' => '',
+					'search' => '',
+					'age' => '',
+					'username' => $row['username'],
+					'user_colour' => $row['user_colour'],
+					'contact_user' => '',
+					'warnings' => 0,
+					'allow_pm' => 0,
+				);
+			} else {
+				$user_sig = '';
+				// We add the signature to every posters entry because enable_sig is post dependent
+				if ($row['user_sig'] && $this->config['allow_sig'] && $this->user->optionget('viewsigs')) {
+					$user_sig = $row['user_sig'];
+				}
+				$user_cache_data = array(
+					'user_type' => $row['user_type'],
+					'user_inactive_reason' => $row['user_inactive_reason'],
+					'joined' => $this->user->format_date($row['user_regdate']),
+					'posts' => $row['user_posts'],
+					'warnings' => (isset($row['user_warnings'])) ? $row['user_warnings'] : 0,
+					'sig' => $user_sig,
+					'sig_bbcode_uid' => (!empty($row['user_sig_bbcode_uid'])) ? $row['user_sig_bbcode_uid'] : '',
+					'sig_bbcode_bitfield' => (!empty($row['user_sig_bbcode_bitfield'])) ? $row['user_sig_bbcode_bitfield'] : '',
+					'viewonline' => $row['user_allow_viewonline'],
+					'allow_pm' => $row['user_allow_pm'],
+					'avatar' => ($this->user->optionget('viewavatars')) ? phpbb_get_user_avatar($row) : '',
+					'age' => '',
+					'rank_title' => '',
+					'rank_image' => '',
+					'rank_image_src' => '',
+					'username' => $row['username'],
+					'user_colour' => $row['user_colour'],
+					'contact_user' => $this->user->lang('CONTACT_USER', get_username_string('username', $user_id, $row['username'], $row['user_colour'], $row['username'])),
+					'online' => false,
+					'jabber' => ($this->config['jab_enable'] && $row['user_jabber'] && $this->auth->acl_get('u_sendim')) ? append_sid("{$this->root_path}memberlist.$this->php_ext", "mode=contact&amp;action=jabber&amp;u=$user_id") : '',
+					'search' => ($this->config['load_search'] && $this->auth->acl_get('u_search')) ? append_sid("{$this->root_path}search.$this->php_ext", "author_id=$user_id&amp;sr=posts") : '',
+					'author_full' => get_username_string('full', $user_id, $row['username'], $row['user_colour']),
+					'author_colour' => get_username_string('colour', $user_id, $row['username'], $row['user_colour']),
+					'author_username' => get_username_string('username', $user_id, $row['username'], $row['user_colour']),
+					'author_profile' => get_username_string('profile', $user_id, $row['username'], $row['user_colour']),
+				);
+
+				$user_cache[$user_id] = $user_cache_data;
+
+				$user_rank_data = phpbb_get_user_rank($row, $row['user_posts']);
+				$user_cache[$user_id]['rank_title'] = $user_rank_data['title'];
+				$user_cache[$user_id]['rank_image'] = $user_rank_data['img'];
+				$user_cache[$user_id]['rank_image_src'] = $user_rank_data['img_src'];
+
+				if ((!empty($row['user_allow_viewemail']) && $this->auth->acl_get('u_sendemail')) || $this->auth->acl_get('a_email'))
+				{
+					$user_cache[$user_id]['email'] = ($this->config['board_email_form'] && $this->config['email_enable']) ? append_sid("{$this->root_path}memberlist.$this->php_ext", "mode=email&amp;u=$user_id") : (($this->config['board_hide_emails'] && !$this->auth->acl_get('a_email')) ? '' : 'mailto:' . $row['user_email']);
+				}
+				else
+				{
+					$user_cache[$user_id]['email'] = '';
+				}
+				if ($this->config['allow_birthdays'] && !empty($row['user_birthday']))
+				{
+					list($bday_day, $bday_month, $bday_year) = array_map('intval', explode('-', $row['user_birthday']));
+					if ($bday_year)
+					{
+						$diff = $now['mon'] - $bday_month;
+						if ($diff == 0)
+						{
+							$diff = ($now['mday'] - $bday_day < 0) ? 1 : 0;
+						}
+						else
+						{
+							$diff = ($diff < 0) ? 1 : 0;
+						}
+						$user_cache[$user_id]['age'] = (int) ($now['year'] - $bday_year - $diff);
+					}
+				}
+			}
+		}
 	}
 
 	/**
-	* Get user personal album
-	* Checks and returns users personal album
-	* returns (int) $album_id or 0
-	*/
+	 * Get user personal album
+	 * Checks and returns users personal album
+	 * returns (int) $album_id or 0
+	 */
 	public function get_own_root_album()
 	{
 		$sql = 'SELECT personal_album_id FROM ' . $this->gallery_users_table . ' WHERE user_id = ' . (int) $this->user_id;
@@ -619,8 +619,8 @@ 
 	}
 
 	/**
-	* Destroy user data and set this class to empty
-	*/
+	 * Destroy user data and set this class to empty
+	 */
 	public function destroy()
 	{
 		$this->user_id = null;

Spacing +9 added lines, -9 removed lines

@@ -62,16 +62,16 @@ 
 	 * @param                                                           $php_ext
 	 */
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\event\dispatcher $dispatcher, \phpbb\user $user,
-		\phpbb\profilefields\manager $user_cpf,	\phpbb\config\config $config,	\phpbb\auth\auth $auth,
+		\phpbb\profilefields\manager $user_cpf, \phpbb\config\config $config, \phpbb\auth\auth $auth,
 		$table_name, $root_path, $php_ext)
 	{
 		$this->db			= $db;
-		$this->dispatcher	= $dispatcher;
+		$this->dispatcher = $dispatcher;
 		$this->user = $user;
 		$this->user_cpf = $user_cpf;
 		$this->config = $config;
 		$this->auth = $auth;
-		$this->gallery_users_table	= $table_name;
+		$this->gallery_users_table = $table_name;
 		$this->root_path = $root_path;
 		$this->php_ext = $php_ext;
 	}
@@ -84,7 +84,7 @@ 
 	 */
 	public function set_user_id($user_id, $load = true)
 	{
-		$this->user_id		= (int) $user_id;
+		$this->user_id = (int) $user_id;
 		if ($load)
 		{
 			$this->load_data();
@@ -107,15 +107,15 @@ 
 	*/
 	public function load_data()
 	{
-		$this->entry_exists	= false;
+		$this->entry_exists = false;
 		$sql = 'SELECT *
 			FROM ' . $this->gallery_users_table . '
 			WHERE user_id = ' . (int) $this->user_id;
 		$result = $this->db->sql_query($sql, 30);
 		if ($row = $this->db->sql_fetchrow($result))
 		{
-			$this->data			= $this->validate_data($row);
-			$this->entry_exists	= true;
+			$this->data = $this->validate_data($row);
+			$this->entry_exists = true;
 		}
 		$this->db->sql_freeresult($result);
 
@@ -646,7 +646,7 @@ 
 		while ($row = $this->db->sql_fetchrow($result))
 		{
 			//var_dump($row);
-			if($row['personal_album_id'] > 0)
+			if ($row['personal_album_id'] > 0)
 			{
 				$set_array[$row['user_id']] = $row['personal_album_id'];
 			}
@@ -655,7 +655,7 @@ 
 		$updated_rows = 0;
 		if (count($set_array) > 0)
 		{
-			foreach($set_array as $uid => $album_id)
+			foreach ($set_array as $uid => $album_id)
 			{
 				// Fill album CPF.
 				$cpf_vars = array(

Braces +6 added lines, -12 removed lines

@@ -157,8 +157,7 @@ 
 		if (isset($this->data[$key]))
 		{
 			return $this->data[$key];
-		}
-		else if ($default && $this->get_default_value($key) !== null)
+		} else if ($default && $this->get_default_value($key) !== null)
 		{
 			return $this->get_default_value($key);
 		}
@@ -354,12 +353,10 @@ 
 		if (is_array($user_ids) && !empty($user_ids))
 		{
 			$sql_where = 'WHERE ' . $this->db->sql_in_set('user_id', array_map('intval', $user_ids));
-		}
-		else if ($user_ids == 'all')
+		} else if ($user_ids == 'all')
 		{
 			$sql_where = '';
-		}
-		else
+		} else
 		{
 			$sql_where = 'WHERE user_id = ' . (int) $user_ids;
 		}
@@ -390,8 +387,7 @@ 
 					{
 						// While incrementing, the iamges might be lower than 0.
 						$validated_data[$name] = (int) $value;
-					}
-					else
+					} else
 					{
 						$validated_data[$name] = max(0, (int) $value);
 					}
@@ -579,8 +575,7 @@ 
                 if ((!empty($row['user_allow_viewemail']) && $this->auth->acl_get('u_sendemail')) || $this->auth->acl_get('a_email'))
                 {
                     $user_cache[$user_id]['email'] = ($this->config['board_email_form'] && $this->config['email_enable']) ? append_sid("{$this->root_path}memberlist.$this->php_ext", "mode=email&u=$user_id") : (($this->config['board_hide_emails'] && !$this->auth->acl_get('a_email')) ? '' : 'mailto:' . $row['user_email']);
-                }
-                else
+                } else
                 {
                     $user_cache[$user_id]['email'] = '';
                 }
@@ -593,8 +588,7 @@ 
                         if ($diff == 0)
                         {
                             $diff = ($now['mday'] - $bday_day < 0) ? 1 : 0;
-                        }
-                        else
+                        } else
                         {
                             $diff = ($diff < 0) ? 1 : 0;
                         }

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

Indentation +18 added lines, -18 removed lines

@@ -51,24 +51,24 @@ 
 	protected $target = 0;
 	protected $albums = array();
 
-    /**
-     * Constructor
-     *
-     * @param \phpbb\controller\helper $helper Newspage helper object
-     * @param \phpbb\template\template $template Template object
-     * @param \phpbb\user $user User object
-     * @param \phpbb\language\language $lang
-     * @param \phpbbgallery\core\search $gallery_search
-     * @param \phpbbgallery\core\config $gallery_config
-     * @param \phpbb\db\driver\driver_interface $db
-     * @param $albums_table
-     * @param $users_table
-     * @param string $php_ext phpEx
-     */
+	/**
+	 * Constructor
+	 *
+	 * @param \phpbb\controller\helper $helper Newspage helper object
+	 * @param \phpbb\template\template $template Template object
+	 * @param \phpbb\user $user User object
+	 * @param \phpbb\language\language $lang
+	 * @param \phpbbgallery\core\search $gallery_search
+	 * @param \phpbbgallery\core\config $gallery_config
+	 * @param \phpbb\db\driver\driver_interface $db
+	 * @param $albums_table
+	 * @param $users_table
+	 * @param string $php_ext phpEx
+	 */
 	public function __construct(\phpbb\controller\helper $helper, \phpbb\template\template $template, \phpbb\user $user,
-                                \phpbb\language\language $lang, \phpbbgallery\core\search $gallery_search,
-	                            \phpbbgallery\core\config $gallery_config, \phpbb\db\driver\driver_interface $db,
-	                            $albums_table, $users_table, $php_ext)
+								\phpbb\language\language $lang, \phpbbgallery\core\search $gallery_search,
+								\phpbbgallery\core\config $gallery_config, \phpbb\db\driver\driver_interface $db,
+								$albums_table, $users_table, $php_ext)
 	{
 		$this->helper = $helper;
 		$this->template = $template;
@@ -107,7 +107,7 @@ 
 	}
 	public function user_profile_galleries($event)
 	{
-	    $this->language->add_lang(array('gallery'), 'phpbbgallery/core');
+		$this->language->add_lang(array('gallery'), 'phpbbgallery/core');
 		$this->language->add_lang('search');
 		$random = $recent = false;
 		$show_parts = $this->gallery_config->get('rrc_profile_mode');

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/language/en/gallery_acp.php

Indentation +6 added lines, -6 removed lines

@@ -27,12 +27,12 @@
 	'ACP_GALLERY_OVERVIEW'			=> 'phpBB Gallery',
 	'ACP_GALLERY_OVERVIEW_EXPLAIN'	=> 'Here are some statistics about your gallery.',
 
-    // File dirs states
-    'ACP_FILES_DIR_STATE'           => '<strong>./files/</strong> state',
-    'ACP_CORE_DIR_STATE'    => '<strong>./files/phpbbgallery/core/</strong> state',
-    'ACP_SOURCE_DIR_STATE'    => '<strong>./files/phpbbgallery/core/source/</strong> state',
-    'ACP_MEDIUM_DIR_STATE'    => '<strong>./files/phpbbgallery/core/meduim/</strong> state',
-    'ACP_MINI_DIR_STATE'    => '<strong>./files/phpbbgallery/core/mini/</strong> state',
+	// File dirs states
+	'ACP_FILES_DIR_STATE'           => '<strong>./files/</strong> state',
+	'ACP_CORE_DIR_STATE'    => '<strong>./files/phpbbgallery/core/</strong> state',
+	'ACP_SOURCE_DIR_STATE'    => '<strong>./files/phpbbgallery/core/source/</strong> state',
+	'ACP_MEDIUM_DIR_STATE'    => '<strong>./files/phpbbgallery/core/meduim/</strong> state',
+	'ACP_MINI_DIR_STATE'    => '<strong>./files/phpbbgallery/core/mini/</strong> state',
 
 	'ADD_ALBUM_ON_TOP'				=> 'Add album at the top',
 	'ADD_PERMISSIONS'				=> 'Add Permissions',

core/language/en/info_acp_gallery.php

Indentation +3 added lines, -3 removed lines

@@ -39,10 +39,10 @@
 	'GALLERY_POPUP'						=> 'Gallery',
 	'GALLERY_POPUP_HELPLINE'			=> 'Open a popup where you can select your recent images and upload new images.',
 
-    // Please do not change the copyright.
-    'GALLERY_COPYRIGHT'	=> 'Powered by <a href="http://www.anavaro.com/">phpBB Gallery</a> &copy; 2016 <a href="http://www.anavaro.com/">Lucifer</a>',
+	// Please do not change the copyright.
+	'GALLERY_COPYRIGHT'	=> 'Powered by <a href="http://www.anavaro.com/">phpBB Gallery</a> &copy; 2016 <a href="http://www.anavaro.com/">Lucifer</a>',
 
-    // A little line where you can give yourself some credits on the translation.
+	// A little line where you can give yourself some credits on the translation.
 	//'GALLERY_TRANSLATION_INFO'			=> 'English “phpBB Gallery“-Translation by <a href="http://www.flying-bits.org/">nickvergessen</a>',
 	'GALLERY_TRANSLATION_INFO'			=> '',
 

core/language/en/gallery.php

Indentation +49 added lines, -49 removed lines

@@ -24,56 +24,56 @@ 
 }
 
 $lang = array_merge($lang, array(
-    'ADD_UPLOAD_FIELD'				=> 'Add more upload fields',
-    'ALBUM'							=> 'Album',
-    'ALBUM_IS_CATEGORY'				=> 'The album you cheated to, is a category-album.<br />You can’t upload to categories.',
-    'ALBUM_LOCKED'					=> 'Locked',
-    'ALBUM_NAME'					=> 'Album name',
-    'ALBUM_NOT_EXIST'				=> 'This album does not exist',
-    'ALBUM_PERMISSIONS'				=> 'Album Permissions',
-    'ALBUM_REACHED_QUOTA'			=> 'This album has reached the quota of images. You cannot upload images anymore.<br />Please contact the administrator for more information.',
-    'ALBUM_UPLOAD_NEED_APPROVAL'		=> 'Your images have been uploaded successfully.<br /><br />But your image must be approved by a administrator or a moderator before they are public visible.',
-    'ALBUM_UPLOAD_NEED_APPROVAL_ERROR'	=> 'Some of your images have been uploaded successfully.<br /><br />But your images must be approved by a administrator or a moderator before they are public visible.<br /><br /><p class="error">%s</p>',
-    'ALBUM_UPLOAD_SUCCESSFUL'		=> 'Your images have been uploaded successfully.',
-    'ALBUM_UPLOAD_SUCCESSFUL_ERROR'	=> 'Some of your images have been uploaded successfully.<br /><br /><span class="error">%s</span>',
-    'ALBUMS_MARKED'					=> 'All albums have been marked read.',
-    'ALL'							=> 'All',
-    'ALL_IMAGES'					=> 'All image',
-    'ALLOW_COMMENTS'				=> 'Allow comments for this image.',
-    'ALLOW_COMMENTS_ARY'			=> array(
-        0	=> 'Allow comments for this image.',
-        2	=> 'Allow comments for these images.',
-    ),
-    'ALLOWED_FILETYPES'				=> 'Allowed filetypes',
-    'APPROVE'						=> 'Approve',
-    'DISAPPROVE'					=> 'Dissaprove',
-    'APPROVE_IMAGE'					=> 'Approve image',
+	'ADD_UPLOAD_FIELD'				=> 'Add more upload fields',
+	'ALBUM'							=> 'Album',
+	'ALBUM_IS_CATEGORY'				=> 'The album you cheated to, is a category-album.<br />You can’t upload to categories.',
+	'ALBUM_LOCKED'					=> 'Locked',
+	'ALBUM_NAME'					=> 'Album name',
+	'ALBUM_NOT_EXIST'				=> 'This album does not exist',
+	'ALBUM_PERMISSIONS'				=> 'Album Permissions',
+	'ALBUM_REACHED_QUOTA'			=> 'This album has reached the quota of images. You cannot upload images anymore.<br />Please contact the administrator for more information.',
+	'ALBUM_UPLOAD_NEED_APPROVAL'		=> 'Your images have been uploaded successfully.<br /><br />But your image must be approved by a administrator or a moderator before they are public visible.',
+	'ALBUM_UPLOAD_NEED_APPROVAL_ERROR'	=> 'Some of your images have been uploaded successfully.<br /><br />But your images must be approved by a administrator or a moderator before they are public visible.<br /><br /><p class="error">%s</p>',
+	'ALBUM_UPLOAD_SUCCESSFUL'		=> 'Your images have been uploaded successfully.',
+	'ALBUM_UPLOAD_SUCCESSFUL_ERROR'	=> 'Some of your images have been uploaded successfully.<br /><br /><span class="error">%s</span>',
+	'ALBUMS_MARKED'					=> 'All albums have been marked read.',
+	'ALL'							=> 'All',
+	'ALL_IMAGES'					=> 'All image',
+	'ALLOW_COMMENTS'				=> 'Allow comments for this image.',
+	'ALLOW_COMMENTS_ARY'			=> array(
+		0	=> 'Allow comments for this image.',
+		2	=> 'Allow comments for these images.',
+	),
+	'ALLOWED_FILETYPES'				=> 'Allowed filetypes',
+	'APPROVE'						=> 'Approve',
+	'DISAPPROVE'					=> 'Dissaprove',
+	'APPROVE_IMAGE'					=> 'Approve image',
 
-    //@todo
-    'ALBUM_COMMENT_CAN'			=> 'You <strong>can</strong> post comments to images in this album',
-    'ALBUM_COMMENT_CANNOT'		=> 'You <strong>cannot</strong> post comments to images in this album',
-    'ALBUM_DELETE_CAN'			=> 'You <strong>can</strong> delete your images in this album',
-    'ALBUM_DELETE_CANNOT'		=> 'You <strong>cannot</strong> delete your images in this album',
-    'ALBUM_EDIT_CAN'			=> 'You <strong>can</strong> edit your images in this album',
-    'ALBUM_EDIT_CANNOT'			=> 'You <strong>cannot</strong> edit your images in this album',
-    'ALBUM_RATE_CAN'			=> 'You <strong>can</strong> rate images in this album',
-    'ALBUM_RATE_CANNOT'			=> 'You <strong>cannot</strong> rate images in this album',
-    'ALBUM_UPLOAD_CAN'			=> 'You <strong>can</strong> upload new images in this album',
-    'ALBUM_UPLOAD_CANNOT'		=> 'You <strong>cannot</strong> upload new images in this album',
-    'ALBUM_VIEW_CAN'			=> 'You <strong>can</strong> view images in this album',
-    'ALBUM_VIEW_CANNOT'			=> 'You <strong>cannot</strong> view images in this album',
+	//@todo
+	'ALBUM_COMMENT_CAN'			=> 'You <strong>can</strong> post comments to images in this album',
+	'ALBUM_COMMENT_CANNOT'		=> 'You <strong>cannot</strong> post comments to images in this album',
+	'ALBUM_DELETE_CAN'			=> 'You <strong>can</strong> delete your images in this album',
+	'ALBUM_DELETE_CANNOT'		=> 'You <strong>cannot</strong> delete your images in this album',
+	'ALBUM_EDIT_CAN'			=> 'You <strong>can</strong> edit your images in this album',
+	'ALBUM_EDIT_CANNOT'			=> 'You <strong>cannot</strong> edit your images in this album',
+	'ALBUM_RATE_CAN'			=> 'You <strong>can</strong> rate images in this album',
+	'ALBUM_RATE_CANNOT'			=> 'You <strong>cannot</strong> rate images in this album',
+	'ALBUM_UPLOAD_CAN'			=> 'You <strong>can</strong> upload new images in this album',
+	'ALBUM_UPLOAD_CANNOT'		=> 'You <strong>cannot</strong> upload new images in this album',
+	'ALBUM_VIEW_CAN'			=> 'You <strong>can</strong> view images in this album',
+	'ALBUM_VIEW_CANNOT'			=> 'You <strong>cannot</strong> view images in this album',
 
-    'BAD_UPLOAD_FILE_SIZE'			=> 'Your uploaded file is too large',
-    'BBCODES'						=> 'BBCodes',
-    'BROWSING_ALBUM'				=> 'Users browsing this album: %1$s',
-    'BROWSING_ALBUM_GUEST'			=> 'Users browsing this album: %1$s and %2$d guest',
-    'BROWSING_ALBUM_GUESTS'			=> 'Users browsing this album: %1$s and %2$d guests',
+	'BAD_UPLOAD_FILE_SIZE'			=> 'Your uploaded file is too large',
+	'BBCODES'						=> 'BBCodes',
+	'BROWSING_ALBUM'				=> 'Users browsing this album: %1$s',
+	'BROWSING_ALBUM_GUEST'			=> 'Users browsing this album: %1$s and %2$d guest',
+	'BROWSING_ALBUM_GUESTS'			=> 'Users browsing this album: %1$s and %2$d guests',
 
-    'CHANGE_AUTHOR'					=> 'Change author',
-    'CHANGE_IMAGE_STATUS'			=> 'Change image-status',
-    'CLICK_RETURN_ALBUM'			=> 'Click %shere%s to return to the album',
-    'CLICK_RETURN_IMAGE'			=> 'Click %shere%s to return to the image',
-    'CLICK_RETURN_INDEX'			=> 'Click %shere%s to return to the index',
+	'CHANGE_AUTHOR'					=> 'Change author',
+	'CHANGE_IMAGE_STATUS'			=> 'Change image-status',
+	'CLICK_RETURN_ALBUM'			=> 'Click %shere%s to return to the album',
+	'CLICK_RETURN_IMAGE'			=> 'Click %shere%s to return to the image',
+	'CLICK_RETURN_INDEX'			=> 'Click %shere%s to return to the index',
 	'COMMENT'						=> 'Comment',
 	'COMMENT_IMAGE'					=> 'Posting a comment on an image in album %s',
 	'COMMENT_LENGTH'				=> 'Enter your comment here, it may contain no more than <strong>%d</strong> characters.',
@@ -362,8 +362,8 @@ 
 
 	'QUICK_MOD'	=> 'Select moderator action',
 	'WRONG_FILESIZE'	=> 'Image is bigger then the limit!',
-    'UNREAD_IMAGES'		=> 'Unviewed images',
-    'NO_UNREAD_IMAGES'	=> 'No unviewed images',
+	'UNREAD_IMAGES'		=> 'Unviewed images',
+	'NO_UNREAD_IMAGES'	=> 'No unviewed images',
 
 	// Versions 1.2.1 additions
 	'GALLERY_DROP'		=> 'Drop your images here',

core/language/ru/gallery_acp.php

Indentation +7 added lines, -7 removed lines

@@ -28,14 +28,14 @@
 	'ACP_GALLERY_OVERVIEW'			=> 'Обзор',
 	'ACP_GALLERY_OVERVIEW_EXPLAIN'	=> '',
 
-    // File dirs states
-    'ACP_FILES_DIR_STATE'           => '<strong>./files/</strong> state',
-    'ACP_CORE_DIR_STATE'    => '<strong>./files/phpbbgallery/core/</strong> state',
-    'ACP_SOURCE_DIR_STATE'    => '<strong>./files/phpbbgallery/core/source/</strong> state',
-    'ACP_MEDIUM_DIR_STATE'    => '<strong>./files/phpbbgallery/core/meduim/</strong> state',
-    'ACP_MINI_DIR_STATE'    => '<strong>./files/phpbbgallery/core/mini/</strong> state',
+	// File dirs states
+	'ACP_FILES_DIR_STATE'           => '<strong>./files/</strong> state',
+	'ACP_CORE_DIR_STATE'    => '<strong>./files/phpbbgallery/core/</strong> state',
+	'ACP_SOURCE_DIR_STATE'    => '<strong>./files/phpbbgallery/core/source/</strong> state',
+	'ACP_MEDIUM_DIR_STATE'    => '<strong>./files/phpbbgallery/core/meduim/</strong> state',
+	'ACP_MINI_DIR_STATE'    => '<strong>./files/phpbbgallery/core/mini/</strong> state',
 
-    'ADD_ALBUM_ON_TOP'				=> 'Сделать альбом первым в списке',
+	'ADD_ALBUM_ON_TOP'				=> 'Сделать альбом первым в списке',
 	'ADD_PERMISSIONS'				=> 'Добавить права доступа',
 	'ALBUM_ADMIN'					=> 'Администрирование альбомов',
 	'ALBUM_ADMIN_EXPLAIN'			=> 'Каждый альбом может содержать неограниченное количество вложенных альбомов. Здесь можно добавлять, редактировать, удалять, закрывать и открывать альбомы, а также управлять их дополнительными свойствами. Также, если тебуется, можно произвести ресинхронизацию альбома. Чтобы вновь созданный альбом стал виден, необходимо установить или скопировать соответствующие права доступа.',