satanasov / phpbbgallery

core/moderate.php

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

core/album/album.php

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(

core/album/display.php

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' => $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/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

core/search.php

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

core/user.php

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(

core/file/file.php

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

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);
 		}

core/language/de/gallery_acp.php

Spacing +1 added lines, -1 removed lines

@@ -159,7 +159,7 @@
 	'GALLERY_RESYNC_ALBUMS_TO_CPF_EXPAIN'	=> 'Diese Aktion wird alle persönlichen Alben auf dem Toplevel als kontaktbasierte selbsterstellt Profilfelder resynchronisieren . <br> WARNUNG! Dies kann beim Vorhandensein sehr vieler solcher Alben sehr lange dauern!',
 	'GALLERY_RESYNC_ALBUMS_TO_CPF_CONFIRM'	=> 'Bist Du sicher, dass Du den Resync aller persönlichen Alben auf dem Toplevel als kontaktbasierte selbsterstellte Profilfelder durchführen willst?',
 	'GALLERY_STATS'					=> 'Galerie Statistik',
-	'GALLERY_VERSION'				=> 'Version der phpBB Gallery',//ja mit ll und y, da es sich um den MOD-Namen handelt
+	'GALLERY_VERSION'				=> 'Version der phpBB Gallery', //ja mit ll und y, da es sich um den MOD-Namen handelt
 	'GD_VERSION'					=> 'GD Version optimieren',
 	'GENERAL_ALBUM_SETTINGS'		=> 'Allgemeine Albumseinstellungen',
 	'GIF_ALLOWED'					=> 'Es ist erlaubt GIF-Dateien hochzuladen',