Inspection of "Update tests" - ErnadoO/ext-phpbb-directory - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — 3.2.x ( 46ca38...dcf539 )

by Erwan

created 2017-10-27 13:56 UTC

Status

Spacing +42 added lines, -42 removed lines patch added patch discarded remove patch

@@ -76,20 +76,20 @@  discard block
 block discarded – undo
 	*/
 	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\upload $files_upload, $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->filesystem = $filesystem;
 		$this->imagesize		= $imagesize;
 		$this->files_upload 	= $files_upload;
 		$this->root_path		= $root_path;
-		$this->php_ext			= $php_ext;
+		$this->php_ext = $php_ext;
 	}
 
 	/**
@@ -105,13 +105,13 @@  discard block
 block discarded – undo
 
 		$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 @@  discard block
 block discarded – undo
 
 			$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 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 		);
 
 		$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);
 
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
 		{
 			if ($row['link_banner'] && !preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $row['link_banner']))
 			{
-				$banner_img = $this->root_path . $this->get_banner_path(basename($row['link_banner']));
+				$banner_img = $this->root_path.$this->get_banner_path(basename($row['link_banner']));
 
 				if (file_exists($banner_img))
 				{
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 			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 @@  discard block
 block discarded – undo
 		if ($details['scheme'] == 'https')
 		{
 			$default_port = 443;
-			$hostname = 'tls://' . $details['host'];
+			$hostname = 'tls://'.$details['host'];
 		}
 
 		if (!isset($details['path']))
@@ -381,7 +381,7 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 			{
 				$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 @@  discard block
 block discarded – undo
 				$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 '';
 	}
@@ -531,12 +531,12 @@  discard block
 block discarded – undo
 
 		$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);
 
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
 
 		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);
 
@@ -578,8 +578,8 @@  discard block
 block discarded – undo
 
 		$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']))
 		{
@@ -619,7 +619,7 @@  discard block
 block discarded – undo
 	{
 		$old_banner = $this->request->variable('old_banner', '');
 
-		$destination = $this->root_path . $this->get_banner_path();
+		$destination = $this->root_path.$this->get_banner_path();
 
 		// Can we upload?
 		$can_upload = ($this->config['dir_storage_banner'] && $this->filesystem->exists($destination) && $this->filesystem->is_writable($destination) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
@@ -668,7 +668,7 @@  discard block
 block discarded – undo
 
 		$file = $upload->handle_upload('files.types.remote', $banner);
 
-		$prefix = unique_id() . '_';
+		$prefix = unique_id().'_';
 		$file->clean_filename('real', $prefix);
 
 		if (sizeof($file->error))
@@ -699,7 +699,7 @@  discard block
 block discarded – undo
 	{
 		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))
 		{
@@ -730,8 +730,8 @@  discard block
 block discarded – undo
 		}
 
 		// 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'))
@@ -809,7 +809,7 @@  discard block
 block discarded – undo
 	*/
 	private function _banner_delete($file)
 	{
-		$old_banner = $this->root_path  . $this->get_banner_path($file);
+		$old_banner = $this->root_path.$this->get_banner_path($file);
 
 		if (file_exists($old_banner))
 		{
@@ -853,7 +853,7 @@  discard block
 block discarded – undo
 
 			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>';
 			}
 		}
 
@@ -869,8 +869,8 @@  discard block
 block discarded – undo
 	{
 		if ($this->config['dir_recent_block'])
 		{
-			$limit_sql		= $this->config['dir_recent_rows'] * $this->config['dir_recent_columns'];
-			$exclude_array	= array_filter(explode(',', str_replace(' ', '', $this->config['dir_recent_exclude'])));
+			$limit_sql = $this->config['dir_recent_rows'] * $this->config['dir_recent_columns'];
+			$exclude_array = array_filter(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',
@@ -886,7 +886,7 @@  discard block
 block discarded – undo
 							'ON'	=> 'l.link_cat = c.cat_id'
 						)
 				),
-				'WHERE'		=> 'l.link_active = 1' . (sizeof($exclude_array) ? ' AND ' . $this->db->sql_in_set('l.link_cat', $exclude_array, true) : ''),
+				'WHERE'		=> 'l.link_active = 1'.(sizeof($exclude_array) ? ' AND '.$this->db->sql_in_set('l.link_cat', $exclude_array, true) : ''),
 				'ORDER_BY'	=> 'l.link_time DESC, l.link_id DESC');
 
 			$sql = $this->db->sql_build_query('SELECT', $sql_array);
@@ -903,7 +903,7 @@  discard block
 block discarded – undo
 			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)
@@ -922,7 +922,7 @@  discard block
 block discarded – undo
 						'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']),

Please login to merge, or discard this patch.

core/cron.php 1 patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -52,14 +52,14 @@  discard block
 block discarded – undo
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\log\log $phpbb_log, \phpbb\user $user, \phpbb\notification\manager $notification, \ernadoo\phpbbdirectory\core\link $link, $root_path, $php_ext)
 	{
-		$this->db				= $db;
-		$this->config			= $config;
-		$this->phpbb_log		= $phpbb_log;
+		$this->db = $db;
+		$this->config = $config;
+		$this->phpbb_log = $phpbb_log;
 		$this->user				= $user;
-		$this->notification		= $notification;
+		$this->notification = $notification;
 		$this->link				= $link;
-		$this->root_path		= $root_path;
-		$this->php_ext			= $php_ext;
+		$this->root_path = $root_path;
+		$this->php_ext = $php_ext;
 	}
 
 	/**
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
 	public function auto_check($cat_data)
 	{
 		$sql = 'SELECT cat_name
-			FROM ' . $this->categories_table . '
+			FROM ' . $this->categories_table.'
 			WHERE cat_id = ' . (int) $cat_data['cat_id'];
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
@@ -83,9 +83,9 @@  discard block
 block discarded – undo
 
 			$this->_check($cat_data['cat_id'], $cat_data['cat_cron_nb_check'], $next_prune);
 
-			$sql = 'UPDATE ' . $this->categories_table . "
+			$sql = 'UPDATE '.$this->categories_table."
 			SET cat_cron_next = $next_prune
-			WHERE cat_id = " . (int) $cat_data['cat_id'];
+			WHERE cat_id = ".(int) $cat_data['cat_id'];
 			$this->db->sql_query($sql);
 
 			$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_AUTO_PRUNE', time(), array($row['cat_name']));
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
 	public function get_cat($cat_id)
 	{
 		$sql = 'SELECT cat_id, cat_cron_enable, cat_cron_next, cat_cron_freq, cat_cron_nb_check
-				FROM ' . $this->categories_table . '
+				FROM ' . $this->categories_table.'
 					WHERE cat_id = ' . (int) $cat_id;
 		$result = $this->db->sql_query($sql);
 		$row = $this->db->sql_fetchrow($result);
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
 					'ON'	=> 'l.link_user_id = u.user_id'
 				)
 			),
-			'WHERE'		=> "l.link_back <> '' AND l.link_active = 1 AND l.link_cat = "  . (int) $cat_id);
+			'WHERE'		=> "l.link_back <> '' AND l.link_active = 1 AND l.link_cat = ".(int) $cat_id);
 
 			$sql = $this->db->sql_build_query('SELECT', $sql_array);
 			$result = $this->db->sql_query($sql);
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
 			{
 				if ($this->link->validate_link_back($row['link_back'], false, true) !== false)
 				{
-					if (!$nb_check || ($row['link_nb_check']+1) >= $nb_check)
+					if (!$nb_check || ($row['link_nb_check'] + 1) >= $nb_check)
 					{
 						$del_array[] = $row['link_id'];
 					}
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
 	{
 		if (!class_exists('messenger'))
 		{
-			include($this->root_path . 'includes/functions_messenger.' . $this->php_ext);
+			include($this->root_path.'includes/functions_messenger.'.$this->php_ext);
 		}
 
 		$messenger = new \messenger(false);
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
 		// We need to define it, because we use user->format_date below
 		$this->user->timezone = new \DateTimeZone($this->config['board_timezone']);
 
-		$sql = 'UPDATE ' . $this->links_table . '
+		$sql = 'UPDATE '.$this->links_table.'
 			SET link_nb_check = link_nb_check + 1
 			WHERE ' . $this->db->sql_in_set('link_id', array_keys($u_array));
 		$this->db->sql_query($sql);

Please login to merge, or discard this patch.

		@@ -76,20 +76,20 @@ discard block
		block discarded – undo
76	76	*/
77	77	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\upload $files_upload, $root_path, $php_ext)
78	78	{
79		- $this->db = $db;
80		- $this->config = $config;
	79	+ $this->db = $db;
	80	+ $this->config = $config;
81	81	$this->language = $language;
82	82	$this->template = $template;
83	83	$this->user = $user;
84		- $this->helper = $helper;
85		- $this->request = $request;
	84	+ $this->helper = $helper;
	85	+ $this->request = $request;
86	86	$this->auth = $auth;
87	87	$this->notification = $notification;
88		- $this->filesystem = $filesystem;
	88	+ $this->filesystem = $filesystem;
89	89	$this->imagesize = $imagesize;
90	90	$this->files_upload = $files_upload;
91	91	$this->root_path = $root_path;
92		- $this->php_ext = $php_ext;
	92	+ $this->php_ext = $php_ext;
93	93	}
94	94
95	95	/**
		@@ -105,13 +105,13 @@ discard block
		block discarded – undo
105	105
106	106	$this->db->sql_transaction('begin');
107	107
108		- $sql = 'INSERT INTO ' . $this->links_table . ' ' . $this->db->sql_build_array('INSERT', $data);
	108	+ $sql = 'INSERT INTO '.$this->links_table.' '.$this->db->sql_build_array('INSERT', $data);
109	109	$this->db->sql_query($sql);
110	110	$notification_data['link_id'] = $this->db->sql_nextid();
111	111
112	112	if (!$need_approval \|\| $this->auth->acl_get('a_') \|\| $this->auth->acl_get('m_'))
113	113	{
114		- $sql = 'UPDATE ' . $this->categories_table . '
	114	+ $sql = 'UPDATE '.$this->categories_table.'
115	115	SET cat_links = cat_links + 1
116	116	WHERE cat_id = ' . (int) $data['link_cat'];
117	117	$this->db->sql_query($sql);
		@@ -169,14 +169,14 @@ discard block
		block discarded – undo
169	169
170	170	$this->db->sql_transaction('begin');
171	171
172		- $sql = 'UPDATE ' . $this->categories_table . '
	172	+ $sql = 'UPDATE '.$this->categories_table.'
173	173	SET cat_links = cat_links - 1
174	174	WHERE cat_id = ' . (int) $old_cat;
175	175	$this->db->sql_query($sql);
176	176
177	177	if (!$need_approval)
178	178	{
179		- $sql = 'UPDATE ' . $this->categories_table . '
	179	+ $sql = 'UPDATE '.$this->categories_table.'
180	180	SET cat_links = cat_links + 1
181	181	WHERE cat_id = ' . (int) $data['link_cat'];
182	182	$this->db->sql_query($sql);
		@@ -194,8 +194,8 @@ discard block
		block discarded – undo
194	194	$this->notification->add_notifications($notification_type, $notification_data);
195	195	}
196	196
197		- $sql = 'UPDATE ' . $this->links_table . '
198		- SET ' . $this->db->sql_build_array('UPDATE', $data) . '
	197	+ $sql = 'UPDATE '.$this->links_table.'
	198	+ SET ' . $this->db->sql_build_array('UPDATE', $data).'
199	199	WHERE link_id = ' . (int) $link_id;
200	200	$this->db->sql_query($sql);
201	201	}
		@@ -221,7 +221,7 @@ discard block
		block discarded – undo
221	221	);
222	222
223	223	$sql = 'SELECT link_banner
224		- FROM ' . $this->links_table . '
	224	+ FROM ' . $this->links_table.'
225	225	WHERE '. $this->db->sql_in_set('link_id', $url_array);
226	226	$result = $this->db->sql_query($sql);
227	227
		@@ -229,7 +229,7 @@ discard block
		block discarded – undo
229	229	{
230	230	if ($row['link_banner'] && !preg_match('/^(http:\/\/\|https:\/\/\|ftp:\/\/\|ftps:\/\/\|www\.).+/si', $row['link_banner']))
231	231	{
232		- $banner_img = $this->root_path . $this->get_banner_path(basename($row['link_banner']));
	232	+ $banner_img = $this->root_path.$this->get_banner_path(basename($row['link_banner']));
233	233
234	234	if (file_exists($banner_img))
235	235	{
		@@ -243,7 +243,7 @@ discard block
		block discarded – undo
243	243	$this->db->sql_query("DELETE FROM $table WHERE ".$this->db->sql_in_set($field, $url_array));
244	244	}
245	245
246		- $sql = 'UPDATE ' . $this->categories_table . '
	246	+ $sql = 'UPDATE '.$this->categories_table.'
247	247	SET cat_links = cat_links - '.sizeof($url_array).'
248	248	WHERE cat_id = ' . (int) $cat_id;
249	249	$this->db->sql_query($sql);
		@@ -261,7 +261,7 @@ discard block
		block discarded – undo
261	261	if ($this->request->is_ajax())
262	262	{
263	263	$sql = 'SELECT cat_links
264		- FROM ' . $this->categories_table . '
	264	+ FROM ' . $this->categories_table.'
265	265	WHERE cat_id = ' . (int) $cat_id;
266	266	$result = $this->db->sql_query($sql);
267	267	$data = $this->db->sql_fetchrow($result);
		@@ -288,7 +288,7 @@ discard block
		block discarded – undo
288	288	public function view($link_id)
289	289	{
290	290	$sql = 'SELECT link_id, link_url
291		- FROM ' . $this->links_table . '
	291	+ FROM ' . $this->links_table.'
292	292	WHERE link_id = ' . (int) $link_id;
293	293	$result = $this->db->sql_query($sql);
294	294	$data = $this->db->sql_fetchrow($result);
		@@ -298,7 +298,7 @@ discard block
		block discarded – undo
298	298	throw new \phpbb\exception\http_exception(404, 'DIR_ERROR_NO_LINKS');
299	299	}
300	300
301		- $sql = 'UPDATE ' . $this->links_table . '
	301	+ $sql = 'UPDATE '.$this->links_table.'
302	302	SET link_view = link_view + 1
303	303	WHERE link_id = ' . (int) $link_id;
304	304	$this->db->sql_query($sql);
		@@ -323,7 +323,7 @@ discard block
		block discarded – undo
323	323	if ($details['scheme'] == 'https')
324	324	{
325	325	$default_port = 443;
326		- $hostname = 'tls://' . $details['host'];
	326	+ $hostname = 'tls://'.$details['host'];
327	327	}
328	328
329	329	if (!isset($details['path']))
		@@ -381,7 +381,7 @@ discard block
		block discarded – undo
381	381	$flag_path = $ext_path.'images/flags/';
382	382	$img_flag = 'no_flag.png';
383	383
384		- if ($this->config['dir_activ_flag'] && !empty($data['link_flag']) && file_exists($flag_path . $data['link_flag']))
	384	+ if ($this->config['dir_activ_flag'] && !empty($data['link_flag']) && file_exists($flag_path.$data['link_flag']))
385	385	{
386	386	$img_flag = $data['link_flag'];
387	387	}
		@@ -423,7 +423,7 @@ discard block
		block discarded – undo
423	423	$list = '<select name="vote">';
424	424	for ($i = 0; $i <= 10; $i++)
425	425	{
426		- $list .= '<option value="' . $i . '"' . (($i == 5) ? ' selected="selected"' : '') . '>' . $i . '</option>';
	426	+ $list .= '<option value="'.$i.'"'.(($i == 5) ? ' selected="selected"' : '').'>'.$i.'</option>';
427	427	}
428	428	$list .= '</select>';
429	429
		@@ -461,8 +461,8 @@ discard block
		block discarded – undo
461	461	{
462	462	$thumb = $this->thumb_process($data['link_url']);
463	463
464		- $sql = 'UPDATE ' . $this->links_table . "
465		- SET link_thumb = '" . $this->db->sql_escape($thumb) . "'
	464	+ $sql = 'UPDATE '.$this->links_table."
	465	+ SET link_thumb = '" . $this->db->sql_escape($thumb)."'
466	466	WHERE link_id = " . (int) $data['link_id'];
467	467	$this->db->sql_query($sql);
468	468
		@@ -509,7 +509,7 @@ discard block
		block discarded – undo
509	509	$height /= $coef_max;
510	510	}
511	511
512		- return '<img src="' . $img_src . '" width="' . $width . '" height="' . $height . '" alt="'.$data['link_name'].'" title="'.$data['link_name'].'" />';
	512	+ return '<img src="'.$img_src.'" width="'.$width.'" height="'.$height.'" alt="'.$data['link_name'].'" title="'.$data['link_name'].'" />';
513	513	}
514	514	return '';
515	515	}
		@@ -531,12 +531,12 @@ discard block
		block discarded – undo
531	531
532	532	$this->db->sql_transaction('begin');
533	533
534		- $sql = 'INSERT INTO ' . $this->votes_table . ' ' . $this->db->sql_build_array('INSERT', $data);
	534	+ $sql = 'INSERT INTO '.$this->votes_table.' '.$this->db->sql_build_array('INSERT', $data);
535	535	$this->db->sql_query($sql);
536	536
537		- $sql = 'UPDATE ' . $this->links_table . '
	537	+ $sql = 'UPDATE '.$this->links_table.'
538	538	SET link_vote = link_vote + 1,
539		- link_note = link_note + ' . (int) $data['vote_note'] . '
	539	+ link_note = link_note + ' . (int) $data['vote_note'].'
540	540	WHERE link_id = ' . (int) $link_id;
541	541	$this->db->sql_query($sql);
542	542
		@@ -544,7 +544,7 @@ discard block
		block discarded – undo
544	544
545	545	if ($this->request->is_ajax())
546	546	{
547		- $sql= 'SELECT link_vote, link_note FROM ' . $this->links_table . ' WHERE link_id = ' . (int) $link_id;
	547	+ $sql = 'SELECT link_vote, link_note FROM '.$this->links_table.' WHERE link_id = '.(int) $link_id;
548	548	$result = $this->db->sql_query($sql);
549	549	$data = $this->db->sql_fetchrow($result);
550	550
		@@ -578,8 +578,8 @@ discard block
		block discarded – undo
578	578
579	579	$details = parse_url($url);
580	580
581		- $root_url = $details['scheme'].'://'.$details['host'];
582		- $absolute_url = isset($details['path']) ? $root_url.$details['path'] : $root_url;
	581	+ $root_url = $details['scheme'].'://'.$details['host'];
	582	+ $absolute_url = isset($details['path']) ? $root_url.$details['path'] : $root_url;
583	583
584	584	if ($this->config['dir_activ_thumb_remote'] && $this->_ascreen_exist($details['scheme'], $details['host']))
585	585	{
		@@ -619,7 +619,7 @@ discard block
		block discarded – undo
619	619	{
620	620	$old_banner = $this->request->variable('old_banner', '');
621	621
622		- $destination = $this->root_path . $this->get_banner_path();
	622	+ $destination = $this->root_path.$this->get_banner_path();
623	623
624	624	// Can we upload?
625	625	$can_upload = ($this->config['dir_storage_banner'] && $this->filesystem->exists($destination) && $this->filesystem->is_writable($destination) && (@ini_get('file_uploads') \|\| strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
		@@ -668,7 +668,7 @@ discard block
		block discarded – undo
668	668
669	669	$file = $upload->handle_upload('files.types.remote', $banner);
670	670
671		- $prefix = unique_id() . '_';
	671	+ $prefix = unique_id().'_';
672	672	$file->clean_filename('real', $prefix);
673	673
674	674	if (sizeof($file->error))
		@@ -699,7 +699,7 @@ discard block
		block discarded – undo
699	699	{
700	700	if (!preg_match('#^(http\|https\|ftp)://#i', $banner))
701	701	{
702		- $banner = 'http://' . $banner;
	702	+ $banner = 'http://'.$banner;
703	703	}
704	704	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))
705	705	{
		@@ -730,8 +730,8 @@ discard block
		block discarded – undo
730	730	}
731	731
732	732	// Check image type
733		- $types = \phpbb\files\upload::image_types();
734		- $extension = strtolower(\phpbb\files\filespec::get_extension($banner));
	733	+ $types = \phpbb\files\upload::image_types();
	734	+ $extension = strtolower(\phpbb\files\filespec::get_extension($banner));
735	735
736	736	// Check if this is actually an image
737	737	if ($file_stream = @fopen($banner, 'r'))
		@@ -809,7 +809,7 @@ discard block
		block discarded – undo
809	809	*/
810	810	private function _banner_delete($file)
811	811	{
812		- $old_banner = $this->root_path . $this->get_banner_path($file);
	812	+ $old_banner = $this->root_path.$this->get_banner_path($file);
813	813
814	814	if (file_exists($old_banner))
815	815	{
		@@ -853,7 +853,7 @@ discard block
		block discarded – undo
853	853
854	854	if (file_exists($flag_path.$img_file))
855	855	{
856		- $list .= '<option value="' . $img_file . '" ' . (($img_file == $value) ? 'selected="selected"' : '') . '>' . $name . '</option>';
	856	+ $list .= '<option value="'.$img_file.'" '.(($img_file == $value) ? 'selected="selected"' : '').'>'.$name.'</option>';
857	857	}
858	858	}
859	859
		@@ -869,8 +869,8 @@ discard block
		block discarded – undo
869	869	{
870	870	if ($this->config['dir_recent_block'])
871	871	{
872		- $limit_sql = $this->config['dir_recent_rows'] * $this->config['dir_recent_columns'];
873		- $exclude_array = array_filter(explode(',', str_replace(' ', '', $this->config['dir_recent_exclude'])));
	872	+ $limit_sql = $this->config['dir_recent_rows'] * $this->config['dir_recent_columns'];
	873	+ $exclude_array = array_filter(explode(',', str_replace(' ', '', $this->config['dir_recent_exclude'])));
874	874
875	875	$sql_array = array(
876	876	'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',
		@@ -886,7 +886,7 @@ discard block
		block discarded – undo
886	886	'ON' => 'l.link_cat = c.cat_id'
887	887	)
888	888	),
889		- 'WHERE' => 'l.link_active = 1' . (sizeof($exclude_array) ? ' AND ' . $this->db->sql_in_set('l.link_cat', $exclude_array, true) : ''),
	889	+ 'WHERE' => 'l.link_active = 1'.(sizeof($exclude_array) ? ' AND '.$this->db->sql_in_set('l.link_cat', $exclude_array, true) : ''),
890	890	'ORDER_BY' => 'l.link_time DESC, l.link_id DESC');
891	891
892	892	$sql = $this->db->sql_build_query('SELECT', $sql_array);
		@@ -903,7 +903,7 @@ discard block
		block discarded – undo
903	903	if (sizeof($rowset))
904	904	{
905	905	$this->template->assign_block_vars('block', array(
906		- 'S_COL_WIDTH' => (100 / $this->config['dir_recent_columns']) . '%',
	906	+ 'S_COL_WIDTH' => (100 / $this->config['dir_recent_columns']).'%',
907	907	));
908	908
909	909	foreach ($rowset as $row)
		@@ -922,7 +922,7 @@ discard block
		block discarded – undo
922	922	'COUNT' => $row['link_view'],
923	923	'COMMENT' => $row['link_comment'],
924	924
925		- 'U_CAT' => $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $row['link_cat']),
	925	+ 'U_CAT' => $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$row['link_cat']),
926	926	'U_COMMENT' => $this->helper->route('ernadoo_phpbbdirectory_comment_view_controller', array('link_id' => (int) $row['link_id'])),
927	927
928	928	'L_DIR_SEARCH_NB_CLICKS' => $this->language->lang('DIR_SEARCH_NB_CLICKS', (int) $row['link_view']),

		@@ -52,14 +52,14 @@ discard block
		block discarded – undo
52	52	*/
53	53	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\log\log $phpbb_log, \phpbb\user $user, \phpbb\notification\manager $notification, \ernadoo\phpbbdirectory\core\link $link, $root_path, $php_ext)
54	54	{
55		- $this->db = $db;
56		- $this->config = $config;
57		- $this->phpbb_log = $phpbb_log;
	55	+ $this->db = $db;
	56	+ $this->config = $config;
	57	+ $this->phpbb_log = $phpbb_log;
58	58	$this->user = $user;
59		- $this->notification = $notification;
	59	+ $this->notification = $notification;
60	60	$this->link = $link;
61		- $this->root_path = $root_path;
62		- $this->php_ext = $php_ext;
	61	+ $this->root_path = $root_path;
	62	+ $this->php_ext = $php_ext;
63	63	}
64	64
65	65	/**
		@@ -71,7 +71,7 @@ discard block
		block discarded – undo
71	71	public function auto_check($cat_data)
72	72	{
73	73	$sql = 'SELECT cat_name
74		- FROM ' . $this->categories_table . '
	74	+ FROM ' . $this->categories_table.'
75	75	WHERE cat_id = ' . (int) $cat_data['cat_id'];
76	76	$result = $this->db->sql_query($sql);
77	77	$row = $this->db->sql_fetchrow($result);
		@@ -83,9 +83,9 @@ discard block
		block discarded – undo
83	83
84	84	$this->_check($cat_data['cat_id'], $cat_data['cat_cron_nb_check'], $next_prune);
85	85
86		- $sql = 'UPDATE ' . $this->categories_table . "
	86	+ $sql = 'UPDATE '.$this->categories_table."
87	87	SET cat_cron_next = $next_prune
88		- WHERE cat_id = " . (int) $cat_data['cat_id'];
	88	+ WHERE cat_id = ".(int) $cat_data['cat_id'];
89	89	$this->db->sql_query($sql);
90	90
91	91	$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DIR_AUTO_PRUNE', time(), array($row['cat_name']));
		@@ -103,7 +103,7 @@ discard block
		block discarded – undo
103	103	public function get_cat($cat_id)
104	104	{
105	105	$sql = 'SELECT cat_id, cat_cron_enable, cat_cron_next, cat_cron_freq, cat_cron_nb_check
106		- FROM ' . $this->categories_table . '
	106	+ FROM ' . $this->categories_table.'
107	107	WHERE cat_id = ' . (int) $cat_id;
108	108	$result = $this->db->sql_query($sql);
109	109	$row = $this->db->sql_fetchrow($result);
		@@ -138,7 +138,7 @@ discard block
		block discarded – undo
138	138	'ON' => 'l.link_user_id = u.user_id'
139	139	)
140	140	),
141		- 'WHERE' => "l.link_back <> '' AND l.link_active = 1 AND l.link_cat = " . (int) $cat_id);
	141	+ 'WHERE' => "l.link_back <> '' AND l.link_active = 1 AND l.link_cat = ".(int) $cat_id);
142	142
143	143	$sql = $this->db->sql_build_query('SELECT', $sql_array);
144	144	$result = $this->db->sql_query($sql);
		@@ -147,7 +147,7 @@ discard block
		block discarded – undo
147	147	{
148	148	if ($this->link->validate_link_back($row['link_back'], false, true) !== false)
149	149	{
150		- if (!$nb_check \|\| ($row['link_nb_check']+1) >= $nb_check)
	150	+ if (!$nb_check \|\| ($row['link_nb_check'] + 1) >= $nb_check)
151	151	{
152	152	$del_array[] = $row['link_id'];
153	153	}
		@@ -181,7 +181,7 @@ discard block
		block discarded – undo
181	181	{
182	182	if (!class_exists('messenger'))
183	183	{
184		- include($this->root_path . 'includes/functions_messenger.' . $this->php_ext);
	184	+ include($this->root_path.'includes/functions_messenger.'.$this->php_ext);
185	185	}
186	186
187	187	$messenger = new \messenger(false);
		@@ -190,7 +190,7 @@ discard block
		block discarded – undo
190	190	// We need to define it, because we use user->format_date below
191	191	$this->user->timezone = new \DateTimeZone($this->config['board_timezone']);
192	192
193		- $sql = 'UPDATE ' . $this->links_table . '
	193	+ $sql = 'UPDATE '.$this->links_table.'
194	194	SET link_nb_check = link_nb_check + 1
195	195	WHERE ' . $this->db->sql_in_set('link_id', array_keys($u_array));
196	196	$this->db->sql_query($sql);

ErnadoO / ext-phpbb-directory

Push — 3.2.x ( 46ca38...dcf539 )

Status

Category

Spacing +42 added lines, -42 removed lines patch added patch discarded remove patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch