ErnadoO / ext-phpbb-directory

core/link.php

Spacing +41 added lines, -41 removed lines

@@ -76,20 +76,20 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\language\language $language, \phpbb\template\template $template, \phpbb\user $user, \phpbb\controller\helper $helper, \phpbb\request\request $request, \phpbb\auth\auth $auth, \phpbb\notification\manager $notification, \phpbb\filesystem\filesystem_interface $filesystem, \FastImageSize\FastImageSize $imagesize, \phpbb\files\factory $files_factory, $root_path, $php_ext)
 	{
-		$this->db				= $db;
-		$this->config			= $config;
+		$this->db = $db;
+		$this->config = $config;
 		$this->language			= $language;
 		$this->template			= $template;
 		$this->user				= $user;
-		$this->helper			= $helper;
-		$this->request			= $request;
+		$this->helper = $helper;
+		$this->request = $request;
 		$this->auth				= $auth;
-		$this->notification		= $notification;
-		$this->filesystem		= $filesystem;
+		$this->notification = $notification;
+		$this->filesystem = $filesystem;
 		$this->imagesize		= $imagesize;
-		$this->files_factory 	= $files_factory;
+		$this->files_factory = $files_factory;
 		$this->root_path		= $root_path;
-		$this->php_ext			= $php_ext;
+		$this->php_ext = $php_ext;
 	}
 
 	/**
@@ -105,13 +105,13 @@ 
 
 		$this->db->sql_transaction('begin');
 
-		$sql = 'INSERT INTO ' . $this->links_table . ' ' . $this->db->sql_build_array('INSERT', $data);
+		$sql = 'INSERT INTO '.$this->links_table.' '.$this->db->sql_build_array('INSERT', $data);
 		$this->db->sql_query($sql);
 		$notification_data['link_id'] = $this->db->sql_nextid();
 
 		if (!$need_approval || $this->auth->acl_get('a_') || $this->auth->acl_get('m_'))
 		{
-			$sql = 'UPDATE ' . $this->categories_table . '
+			$sql = 'UPDATE '.$this->categories_table.'
 				SET cat_links = cat_links + 1
 				WHERE cat_id = ' . (int) $data['link_cat'];
 			$this->db->sql_query($sql);
@@ -169,14 +169,14 @@ 
 
 			$this->db->sql_transaction('begin');
 
-			$sql = 'UPDATE ' . $this->categories_table . '
+			$sql = 'UPDATE '.$this->categories_table.'
 				SET cat_links = cat_links - 1
 				WHERE cat_id = ' . (int) $old_cat;
 			$this->db->sql_query($sql);
 
 			if (!$need_approval)
 			{
-				$sql = 'UPDATE ' . $this->categories_table . '
+				$sql = 'UPDATE '.$this->categories_table.'
 					SET cat_links = cat_links + 1
 					WHERE cat_id = ' . (int) $data['link_cat'];
 				$this->db->sql_query($sql);
@@ -194,8 +194,8 @@ 
 			$this->notification->add_notifications($notification_type, $notification_data);
 		}
 
-		$sql = 'UPDATE ' . $this->links_table . '
-			SET ' . $this->db->sql_build_array('UPDATE', $data) . '
+		$sql = 'UPDATE '.$this->links_table.'
+			SET ' . $this->db->sql_build_array('UPDATE', $data).'
 			WHERE link_id = ' . (int) $link_id;
 		$this->db->sql_query($sql);
 	}
@@ -221,7 +221,7 @@ 
 		);
 
 		$sql = 'SELECT link_banner
-			FROM ' . $this->links_table . '
+			FROM ' . $this->links_table.'
 			WHERE '. $this->db->sql_in_set('link_id', $url_array);
 		$result = $this->db->sql_query($sql);
 
@@ -243,7 +243,7 @@ 
 			$this->db->sql_query("DELETE FROM $table WHERE ".$this->db->sql_in_set($field, $url_array));
 		}
 
-		$sql = 'UPDATE ' . $this->categories_table . '
+		$sql = 'UPDATE '.$this->categories_table.'
 			SET cat_links = cat_links - '.sizeof($url_array).'
 			WHERE cat_id = ' . (int) $cat_id;
 		$this->db->sql_query($sql);
@@ -261,7 +261,7 @@ 
 		if ($this->request->is_ajax())
 		{
 			$sql = 'SELECT cat_links
-				FROM ' . $this->categories_table . '
+				FROM ' . $this->categories_table.'
 				WHERE cat_id = ' . (int) $cat_id;
 			$result = $this->db->sql_query($sql);
 			$data = $this->db->sql_fetchrow($result);
@@ -288,7 +288,7 @@ 
 	public function view($link_id)
 	{
 		$sql = 'SELECT link_id, link_url
-			FROM ' . $this->links_table . '
+			FROM ' . $this->links_table.'
 			WHERE link_id = ' . (int) $link_id;
 		$result = $this->db->sql_query($sql);
 		$data = $this->db->sql_fetchrow($result);
@@ -298,7 +298,7 @@ 
 			throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_LINKS');
 		}
 
-		$sql = 'UPDATE ' . $this->links_table . '
+		$sql = 'UPDATE '.$this->links_table.'
 			SET link_view = link_view + 1
 			WHERE link_id = ' . (int) $link_id;
 		$this->db->sql_query($sql);
@@ -323,7 +323,7 @@ 
 		if ($details['scheme'] == 'https')
 		{
 			$default_port = 443;
-			$hostname = 'tls://' . $details['host'];
+			$hostname = 'tls://'.$details['host'];
 		}
 
 		if (!isset($details['path']))
@@ -381,7 +381,7 @@ 
 		$flag_path = $ext_path.'images/flags/';
 		$img_flag = 'no_flag.png';
 
-		if ($this->config['dir_activ_flag'] && !empty($data['link_flag']) && file_exists($flag_path . $data['link_flag']))
+		if ($this->config['dir_activ_flag'] && !empty($data['link_flag']) && file_exists($flag_path.$data['link_flag']))
 		{
 			$img_flag = $data['link_flag'];
 		}
@@ -423,7 +423,7 @@ 
 			$list = '<select name="vote">';
 			for ($i = 0; $i <= 10; $i++)
 			{
-				$list .= '<option value="' . $i . '"' . (($i == 5) ? ' selected="selected"' : '') . '>' . $i . '</option>';
+				$list .= '<option value="'.$i.'"'.(($i == 5) ? ' selected="selected"' : '').'>'.$i.'</option>';
 			}
 			$list .= '</select>';
 
@@ -461,8 +461,8 @@ 
 			{
 				$thumb = $this->thumb_process($data['link_url']);
 
-				$sql = 'UPDATE ' . $this->links_table . '
-					SET link_thumb = "' . $this->db->sql_escape($thumb) . '"
+				$sql = 'UPDATE '.$this->links_table.'
+					SET link_thumb = "' . $this->db->sql_escape($thumb).'"
 					WHERE link_id = ' . (int) $data['link_id'];
 				$this->db->sql_query($sql);
 
@@ -509,7 +509,7 @@ 
 				$height /= $coef_max;
 			}
 
-			return '<img src="' . $img_src . '" width="' . $width . '" height="' . $height . '" alt="'.$data['link_name'].'" title="'.$data['link_name'].'" />';
+			return '<img src="'.$img_src.'" width="'.$width.'" height="'.$height.'" alt="'.$data['link_name'].'" title="'.$data['link_name'].'" />';
 		}
 		return '';
 	}
@@ -530,12 +530,12 @@ 
 
 		$this->db->sql_transaction('begin');
 
-		$sql = 'INSERT INTO ' . $this->votes_table . ' ' . $this->db->sql_build_array('INSERT', $data);
+		$sql = 'INSERT INTO '.$this->votes_table.' '.$this->db->sql_build_array('INSERT', $data);
 		$this->db->sql_query($sql);
 
-		$sql = 'UPDATE ' . $this->links_table . '
+		$sql = 'UPDATE '.$this->links_table.'
 			SET link_vote = link_vote + 1,
-			link_note = link_note + ' . (int) $data['vote_note'] . '
+			link_note = link_note + ' . (int) $data['vote_note'].'
 		WHERE link_id = ' . (int) $link_id;
 		$this->db->sql_query($sql);
 
@@ -543,7 +543,7 @@ 
 
 		if ($this->request->is_ajax())
 		{
-			$sql= 'SELECT link_vote, link_note FROM ' . $this->links_table . ' WHERE link_id = ' . (int) $link_id;
+			$sql = 'SELECT link_vote, link_note FROM '.$this->links_table.' WHERE link_id = '.(int) $link_id;
 			$result = $this->db->sql_query($sql);
 			$data = $this->db->sql_fetchrow($result);
 
@@ -577,8 +577,8 @@ 
 
 		$details = parse_url($url);
 
-		$root_url		= $details['scheme'].'://'.$details['host'];
-		$absolute_url	= isset($details['path']) ? $root_url.$details['path'] : $root_url;
+		$root_url = $details['scheme'].'://'.$details['host'];
+		$absolute_url = isset($details['path']) ? $root_url.$details['path'] : $root_url;
 
 		if ($this->config['dir_activ_thumb_remote'] && $this->_ascreen_exist($details['scheme'], $details['host']))
 		{
@@ -621,7 +621,7 @@ 
 		$destination = $this->get_banner_path();
 
 		// Can we upload?
-		$can_upload = ($this->config['dir_storage_banner'] && $this->filesystem->exists($this->root_path . $destination) && $this->filesystem->is_writable($this->root_path . $destination) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
+		$can_upload = ($this->config['dir_storage_banner'] && $this->filesystem->exists($this->root_path.$destination) && $this->filesystem->is_writable($this->root_path.$destination) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
 
 		if ($banner && $can_upload)
 		{
@@ -667,7 +667,7 @@ 
 
 		$file = $upload->handle_upload('files.types.remote', $banner);
 
-		$prefix = unique_id() . '_';
+		$prefix = unique_id().'_';
 		$file->clean_filename('real', $prefix);
 
 		if (sizeof($file->error))
@@ -698,7 +698,7 @@ 
 	{
 		if (!preg_match('#^(http|https|ftp)://#i', $banner))
 		{
-			$banner = 'http://' . $banner;
+			$banner = 'http://'.$banner;
 		}
 		if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#i', $banner))
 		{
@@ -729,8 +729,8 @@ 
 		}
 
 		// Check image type
-		$types		= \phpbb\files\upload::image_types();
-		$extension	= strtolower(\phpbb\files\filespec::get_extension($banner));
+		$types = \phpbb\files\upload::image_types();
+		$extension = strtolower(\phpbb\files\filespec::get_extension($banner));
 
 		// Check if this is actually an image
 		if ($file_stream = @fopen($banner, 'r'))
@@ -850,7 +850,7 @@ 
 
 			if (file_exists($flag_path.$img_file))
 			{
-				$list .= '<option value="' . $img_file . '" ' . (($img_file == $value) ? 'selected="selected"' : '') . '>' . $name . '</option>';
+				$list .= '<option value="'.$img_file.'" '.(($img_file == $value) ? 'selected="selected"' : '').'>'.$name.'</option>';
 			}
 		}
 
@@ -866,8 +866,8 @@ 
 	{
 		if ($this->config['dir_recent_block'])
 		{
-			$limit_sql		= $this->config['dir_recent_rows'] * $this->config['dir_recent_columns'];
-			$exclude_array	= explode(',', str_replace(' ', '', $this->config['dir_recent_exclude']));
+			$limit_sql = $this->config['dir_recent_rows'] * $this->config['dir_recent_columns'];
+			$exclude_array = explode(',', str_replace(' ', '', $this->config['dir_recent_exclude']));
 
 			$sql_array = array(
 				'SELECT'	=> 'l.link_id, l.link_cat, l.link_url, l.link_user_id, l.link_comment, l. link_description, l.link_vote, l.link_note, l.link_view, l.link_time, l.link_name, l.link_thumb, u.user_id, u.username, u.user_colour, c.cat_name',
@@ -900,7 +900,7 @@ 
 			if (sizeof($rowset))
 			{
 				$this->template->assign_block_vars('block', array(
-					'S_COL_WIDTH'			=> (100 / $this->config['dir_recent_columns']) . '%',
+					'S_COL_WIDTH'			=> (100 / $this->config['dir_recent_columns']).'%',
 				));
 
 				foreach ($rowset as $row)
@@ -919,7 +919,7 @@ 
 						'COUNT'					  => $row['link_view'],
 						'COMMENT'                 => $row['link_comment'],
 
-						'U_CAT'                   => $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $row['link_cat']),
+						'U_CAT'                   => $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$row['link_cat']),
 						'U_COMMENT'               => $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', array('link_id' => (int) $row['link_id'])),
 
 						'L_DIR_SEARCH_NB_CLICKS'	=> $this->language->lang('DIR_SEARCH_NB_CLICKS', (int) $row['link_view']),