satanasov / phpbbgallery

core/migrations/release_1_2_0_add_bbcode.php

Braces +2 added lines, -4 removed lines

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

core/migrations/release_1_2_0.php

Braces +1 added lines, -2 removed lines

@@ -118,8 +118,7 @@
 			if (isset(self::$is_dynamic[$name]))
 			{
 				$config->set('phpbb_gallery_' . $name, $value, true);
-			}
-			else
+			} else
 			{
 				$config->set('phpbb_gallery_' . $name, $value);
 			}

core/migrations/release_1_2_0_create_filesystem.php

Braces +1 added lines, -2 removed lines

@@ -89,8 +89,7 @@
 			if (is_dir($file))
 			{
 				$this->recursiveRemoveDirectory($file);
-			}
-			else
+			} else
 			{
 				unlink($file);
 			}

core/ext.php

Indentation +19 added lines, -19 removed lines

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

Braces +1 added lines, -2 removed lines

@@ -111,8 +111,7 @@
 					$phpbb_notifications->purge_notifications('phpbbgallery.core.notification.new_image');
 					$phpbb_notifications->purge_notifications('phpbbgallery.core.notification.new_comment');
 					$phpbb_notifications->purge_notifications('phpbbgallery.core.notification.new_report');
-				}
-				catch (\phpbb\notification\exception $e)
+				} catch (\phpbb\notification\exception $e)
 				{
 					// continue
 				}

core/moderate.php

Indentation +5 added lines, -5 removed lines

@@ -59,11 +59,11 @@
 	}
 
 	/**
-	* Helper function building queues
-	* @param	int		$album	album we build queue for
-	* @param	int		$page	This queue builder should return objects for MCP queues, so page?
-	* @param	int		$per_page	We need how many elements per page
-	*/
+	 * Helper function building queues
+	 * @param	int		$album	album we build queue for
+	 * @param	int		$page	This queue builder should return objects for MCP queues, so page?
+	 * @param	int		$per_page	We need how many elements per page
+	 */
 	public function build_list($album, $page = 1, $per_page = 0)
 	{
 		// So if we are not forcing par page get it from config

Spacing +7 added lines, -7 removed lines

@@ -142,7 +142,7 @@ 
 				'IMAGE_ALBUM_ID'	=> $VAR['image_album_id'],
 			));
 			unset($album_tmp);
-			$waiting_images ++;
+			$waiting_images++;
 		}
 		$this->template->assign_vars(array(
 			'TOTAL_IMAGES_WAITING' => $this->lang->lang('WAITING_UNAPPROVED_IMAGE', (int) $count),
@@ -212,21 +212,21 @@ 
 		{
 			$status[] = 0;
 			$status[] = 2;
-			$actions['approve']	= 'QUEUES_A_APPROVE';
-			$actions['unapprove']	= 'QUEUES_A_UNAPPROVE';
-			$actions['lock']	= 'QUEUES_A_LOCK';
+			$actions['approve'] = 'QUEUES_A_APPROVE';
+			$actions['unapprove'] = 'QUEUES_A_UNAPPROVE';
+			$actions['lock'] = 'QUEUES_A_LOCK';
 		}
 		if ($this->gallery_auth->acl_check('m_delete', $album['album_id'], $album['album_user_id']))
 		{
-			$actions['delete']	= 'QUEUES_A_DELETE';
+			$actions['delete'] = 'QUEUES_A_DELETE';
 		}
 		if ($this->gallery_auth->acl_check('m_move', $album['album_id'], $album['album_user_id']))
 		{
-			$actions['move']	= 'QUEUES_A_MOVE';
+			$actions['move'] = 'QUEUES_A_MOVE';
 		}
 		if ($this->gallery_auth->acl_check('m_report', $album['album_id'], $album['album_user_id']))
 		{
-			$actions['report']	= 'REPORT_A_CLOSE';
+			$actions['report'] = 'REPORT_A_CLOSE';
 		}
 		$sql = 'SELECT COUNT(DISTINCT image_id) AS count FROM ' . $this->images_table . ' WHERE ' . $this->db->sql_in_set('image_status', $status) . ' AND image_album_id = ' . (int) $album_id;
 		$result = $this->db->sql_query($sql);

Braces +2 added lines, -4 removed lines

@@ -83,8 +83,7 @@ 
 			{
 				$mod_array[] = 0;
 			}
-		}
-		else
+		} else
 		{
 			$mod_array = array($album);
 		}
@@ -161,8 +160,7 @@ 
 			$this->template->assign_vars(array(
 				'TOTAL_PAGES'				=> $this->lang->lang('PAGE_TITLE_NUMBER', $page + 1),
 			));
-		}
-		else
+		} else
 		{
 			$this->pagination->generate_template_pagination(array(
 				'routes' => array(

core/config.php

Braces +2 added lines, -4 removed lines

@@ -147,8 +147,7 @@ 
 			if (isset($this->config['phpbb_gallery_' . $option]))
 			{
 				$config_ary[$option] = $this->config['phpbb_gallery_' . $option];
-			}
-			else
+			} else
 			{
 				$config_ary[$option] = $default;
 			}
@@ -161,8 +160,7 @@ 
 		if (isset($this->config['phpbb_gallery_' . $key]))
 		{
 			return $this->config['phpbb_gallery_' . $key];
-		}
-		else
+		} else
 		{
 			return $this->configs_array[$key];
 		}

core/album/album.php

Indentation +25 added lines, -25 removed lines

@@ -14,40 +14,40 @@ 
 
 class album
 {
-    /** @var \phpbb\db\driver\driver_interface  */
-    protected $db;
+	/** @var \phpbb\db\driver\driver_interface  */
+	protected $db;
 
-    /** @var \phpbb\user  */
-    protected $user;
+	/** @var \phpbb\user  */
+	protected $user;
 
-    /** @var language  */
-    protected $language;
+	/** @var language  */
+	protected $language;
 
-    /** @var \phpbb\profilefields\manager  */
-    protected $user_cpf;
+	/** @var \phpbb\profilefields\manager  */
+	protected $user_cpf;
 
-    /** @var \phpbbgallery\core\auth\auth  */
-    protected $gallery_auth;
+	/** @var \phpbbgallery\core\auth\auth  */
+	protected $gallery_auth;
 
-    /** @var \phpbbgallery\core\cache  */
-    protected $gallery_cache;
+	/** @var \phpbbgallery\core\cache  */
+	protected $gallery_cache;
 
-    /** @var \phpbbgallery\core\block  */
-    protected $block;
+	/** @var \phpbbgallery\core\block  */
+	protected $block;
 
-    /** @var \phpbbgallery\core\config  */
-    protected $gallery_config;
+	/** @var \phpbbgallery\core\config  */
+	protected $gallery_config;
 
-    /** @var  */
-    protected $images_table;
+	/** @var  */
+	protected $images_table;
 
-    /** @var  */
-    protected $watch_table;
+	/** @var  */
+	protected $watch_table;
 
-    /** @var  */
-    protected $contest_table;
+	/** @var  */
+	protected $contest_table;
 
-    /** @var  */
+	/** @var  */
 	protected $albums_table;
 
 	/**
@@ -463,8 +463,8 @@ 
 	}
 
 	/**
-	* Create array of album IDs that are public
-	*/
+	 * Create array of album IDs that are public
+	 */
 	public function get_public_albums()
 	{
 		$sql = 'SELECT album_id

Spacing +7 added lines, -7 removed lines

@@ -126,7 +126,7 @@ 
 			throw new \phpbb\exception\http_exception(404, 'ALBUM_NOT_EXIST');
 		}
 
-		if ($extended_info  && !isset($row['contest_id']))
+		if ($extended_info && !isset($row['contest_id']))
 		{
 			$row['contest_id'] = 0;
 			$row['contest_rates_start'] = 0;
@@ -339,7 +339,7 @@ 
 
 		// Get the album_user_id, so we can keep the user_colour
 		$sql = 'SELECT album_user_id
-			FROM ' . $this->albums_table .'
+			FROM ' . $this->albums_table . '
 			WHERE album_id = ' . (int) $album_id;
 		$result = $this->db->sql_query($sql);
 		$album_user_id = $this->db->sql_fetchfield('album_user_id');
@@ -347,7 +347,7 @@ 
 
 		// Number of not unapproved images
 		$sql = 'SELECT COUNT(image_id) images
-			FROM ' . $this->images_table .' 
+			FROM ' . $this->images_table . ' 
 			WHERE image_status <> ' . (int) $this->block->get_image_status_unapproved() . '
 				AND image_status <> ' . (int) $this->block->get_image_status_orphan() . '
 				AND image_album_id = ' . (int) $album_id;
@@ -357,7 +357,7 @@ 
 
 		// Number of total images
 		$sql = 'SELECT COUNT(image_id) images_real
-			FROM ' . $this->images_table .'
+			FROM ' . $this->images_table . '
 			WHERE image_status <> ' . (int) $this->block->get_image_status_orphan() . '
 				AND image_album_id = ' . (int) $album_id;
 		$result = $this->db->sql_query($sql);
@@ -366,7 +366,7 @@ 
 
 		// Data of the last not unapproved image
 		$sql = 'SELECT image_id, image_time, image_name, image_username, image_user_colour, image_user_id
-			FROM ' . $this->images_table .'
+			FROM ' . $this->images_table . '
 			WHERE image_status <> ' . (int) $this->block->get_image_status_unapproved() . '
 				AND image_status <> ' . (int) $this->block->get_image_status_orphan() . '
 				AND image_album_id = ' . (int) $album_id . '
@@ -405,7 +405,7 @@ 
 		}
 		$this->db->sql_freeresult($result);
 
-		$sql = 'UPDATE ' . $this->albums_table .' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+		$sql = 'UPDATE ' . $this->albums_table . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
 			WHERE album_id = ' . (int) $album_id;
 		$this->db->sql_query($sql);
 
@@ -435,7 +435,7 @@ 
 			'album_last_username'			=> '',
 			'album_last_user_colour'		=> $user_colour,
 		);
-		$this->db->sql_query('INSERT INTO ' . $this->albums_table. ' ' . $this->db->sql_build_array('INSERT', $album_data));
+		$this->db->sql_query('INSERT INTO ' . $this->albums_table . ' ' . $this->db->sql_build_array('INSERT', $album_data));
 		$personal_album_id = $this->db->sql_nextid();
 
 		$gallery_user->update_data(array(

Braces +9 added lines, -18 removed lines

@@ -219,8 +219,7 @@ 
 			{
 				$padding .= '   ';
 				$padding_store[$row['parent_id']] = $padding;
-			}
-			else if ($row['left_id'] > $right + 1)
+			} else if ($row['left_id'] > $right + 1)
 			{
 				$padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : '';
 			}
@@ -246,15 +245,13 @@ 
 			if (($select_id == $this->gallery_auth->get_setting_permissions()) && !$row['album_user_id'])
 			{
 				$list = true;
-			}
-			else if (!$row['album_user_id'])
+			} else if (!$row['album_user_id'])
 			{
 				if ($this->gallery_auth->acl_check('a_list', $row['album_id'], $row['album_user_id']) || defined('IN_ADMIN'))
 				{
 					$list = true;
 				}
-			}
-			else if (!$ignore_personals)
+			} else if (!$ignore_personals)
 			{
 				if ($row['album_user_id'] == $this->user->data['user_id'])
 				{
@@ -265,16 +262,14 @@ 
 						if ($requested_permission)
 						{
 							$requested_own = !$this->gallery_auth->acl_check($requested_permission, $this->gallery_auth->get_own_album());
-						}
-						else
+						} else
 						{
 							$requested_own = false; // We need the negated version of true here
 						}
 					}
 					$list = (!$list) ? $access_own : $list;
 					$disabled = (!$disabled) ? $requested_own : $disabled;
-				}
-				else if ($row['album_user_id'])
+				} else if ($row['album_user_id'])
 				{
 					if (!$c_access_personal)
 					{
@@ -283,8 +278,7 @@ 
 						if ($requested_permission)
 						{
 							$requested_personal = !$this->gallery_auth->acl_check($requested_permission, $this->gallery_auth->get_personal_album());
-						}
-						else
+						} else
 						{
 							$requested_personal = false; // We need the negated version of true here
 						}
@@ -296,8 +290,7 @@ 
 			if (($album_user_id != \phpbbgallery\core\block::PUBLIC_ALBUM) && ($album_user_id != $row['album_user_id']))
 			{
 				$list = false;
-			}
-			else if (($album_user_id != \phpbbgallery\core\block::PUBLIC_ALBUM) && ($row['parent_id'] == 0))
+			} else if (($album_user_id != \phpbbgallery\core\block::PUBLIC_ALBUM) && ($row['parent_id'] == 0))
 			{
 				$disabled = true;
 			}
@@ -315,8 +308,7 @@ 
 			$gallery_albumbox = "<select name='$select_name' id='$select_name'>";
 			$gallery_albumbox .= $album_list;
 			$gallery_albumbox .= '</select>';
-		}
-		else
+		} else
 		{
 			$gallery_albumbox = $album_list;
 		}
@@ -384,8 +376,7 @@ 
 				'album_last_user_colour'	=> $row['image_user_colour'],
 				'album_last_user_id'		=> $row['image_user_id'],
 			);
-		}
-		else
+		} else
 		{
 			// No approved image, so we clear the columns
 			$sql_ary = array(

core/album/display.php

Braces +15 added lines, -25 removed lines

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

Spacing +7 added lines, -7 removed lines

@@ -34,7 +34,7 @@ 
 	public $album_mode;
 
 	public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\controller\helper $helper,
-								\phpbb\db\driver\driver_interface $db, 	\phpbb\pagination $pagination,
+								\phpbb\db\driver\driver_interface $db, \phpbb\pagination $pagination,
 								\phpbb\request\request $request, \phpbb\template\template $template,
 								\phpbb\user $user, \phpbb\language\language $language, \phpbbgallery\core\auth\auth $gallery_auth,
 								\phpbbgallery\core\user $gallery_user, \phpbbgallery\core\misc $misc,
@@ -94,7 +94,7 @@ 
 
 		$sql = 'SELECT a2.*
 			FROM ' . $this->table_albums . ' a1
-			LEFT JOIN ' . $this->table_albums . ' a2 ON (' . $condition .') AND a2.album_user_id = ' . (int) $branch_user_id .'
+			LEFT JOIN ' . $this->table_albums . ' a2 ON (' . $condition . ') AND a2.album_user_id = ' . (int) $branch_user_id . '
 			WHERE a1.album_id = ' . (int) $album_id . '
 				AND a1.album_user_id = ' . (int) $branch_user_id . '
 			ORDER BY a2.left_id ' . (($order == 'descending') ? 'ASC' : 'DESC');
@@ -177,9 +177,9 @@ 
 			'ALBUM_ID' 		=> $album_data['album_id'],
 			'ALBUM_NAME'	=> $album_data['album_name'],
 			'ALBUM_DESC'	=> generate_text_for_display($album_data['album_desc'], $album_data['album_desc_uid'], $album_data['album_desc_bitfield'], $album_data['album_desc_options']),
-			'ALBUM_CONTEST_START'	=> ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_START' . ((($album_data['contest_start']) < time())? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start']), false, true)) : '',
-			'ALBUM_CONTEST_RATING'	=> ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_RATING_START' . ((($album_data['contest_start'] + $album_data['contest_rating']) < time())? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_rating']), false, true)) : '',
-			'ALBUM_CONTEST_END'		=> ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_END' . ((($album_data['contest_start'] + $album_data['contest_end']) < time())? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_end']), false, true)) : '',
+			'ALBUM_CONTEST_START'	=> ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_START' . ((($album_data['contest_start']) < time()) ? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start']), false, true)) : '',
+			'ALBUM_CONTEST_RATING'	=> ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_RATING_START' . ((($album_data['contest_start'] + $album_data['contest_rating']) < time()) ? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_rating']), false, true)) : '',
+			'ALBUM_CONTEST_END'		=> ($album_data['album_type'] == \phpbbgallery\core\block::TYPE_CONTEST) ? $this->language->lang('CONTEST_END' . ((($album_data['contest_start'] + $album_data['contest_end']) < time()) ? 'ED' : 'S'), $this->user->format_date(($album_data['contest_start'] + $album_data['contest_end']), false, true)) : '',
 			'U_VIEW_ALBUM'	=> $this->helper->route('phpbbgallery_core_album', array('album_id' => (int) $album_data['album_id'])),
 		));
 
@@ -691,9 +691,9 @@ 
 				// phpbb_ext_gallery_core_image::generate_link('thumbnail', $phpbb_ext_gallery->config->get('link_thumbnail'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 				$lastimage_uc_thumbnail = $row['album_image'] ? generate_board_url() . '/' . $row['album_image'] : $this->helper->route('phpbbgallery_core_image_file_mini', array('image_id' => $row['album_last_image_id']));
 				// phpbb_ext_gallery_core_image::generate_link('image_name', $phpbb_ext_gallery->config->get('link_image_name'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
-				$lastimage_uc_name = '';//@todo phpbb_ext_gallery_core_image::generate_link('image_name', $phpbb_ext_gallery->config->get('link_image_name'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
+				$lastimage_uc_name = ''; //@todo phpbb_ext_gallery_core_image::generate_link('image_name', $phpbb_ext_gallery->config->get('link_image_name'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 				// phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
-				$lastimage_uc_icon = '';//@todo phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
+				$lastimage_uc_icon = ''; //@todo phpbb_ext_gallery_core_image::generate_link('lastimage_icon', $phpbb_ext_gallery->config->get('link_image_icon'), $lastimage_image_id, $lastimage_name, $lastimage_album_id);
 			}
 			else
 			{

core/album/loader.php

Indentation +13 added lines, -13 removed lines

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