ErnadoO / ext-phpbb-directory

acp/phpbbdirectory_info.php

Spacing +5 added lines, -5 removed lines

@@ -18,11 +18,11 @@
 			'filename'		=> '\ernadoo\phpbbdirectory\acp\phpbbdirectory_module',
 			'title'			=> 'ACP_DIRECTORY',
 			'modes'			=> array(
-				''				=> array('title' => 'ACP_DIRECTORY',			'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('')),
-				'main'			=> array('title' => 'ACP_DIRECTORY_MAIN',		'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
-				'settings'		=> array('title' => 'ACP_DIRECTORY_SETTINGS',	'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
-				'cat'			=> array('title' => 'ACP_DIRECTORY_CATS',		'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
-				'val'			=> array('title' => 'ACP_DIRECTORY_VAL',		'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
+				''				=> array('title' => 'ACP_DIRECTORY', 'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('')),
+				'main'			=> array('title' => 'ACP_DIRECTORY_MAIN', 'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
+				'settings'		=> array('title' => 'ACP_DIRECTORY_SETTINGS', 'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
+				'cat'			=> array('title' => 'ACP_DIRECTORY_CATS', 'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
+				'val'			=> array('title' => 'ACP_DIRECTORY_VAL', 'auth'	=> 'ext_ernadoo/phpbbdirectory', 'cat' => array('ACP_DIRECTORY')),
 			),
 		);
 	}

migrations/v10x/v1_0_0.php

Spacing +14 added lines, -14 removed lines

@@ -23,7 +23,7 @@ 
 	{
 		return array(
 			'add_tables' => array(
-				$this->table_prefix . 'directory_cats' => array(
+				$this->table_prefix.'directory_cats' => array(
 					'COLUMNS' => array(
 						'cat_id'				=> array('UINT', null, 'auto_increment'),
 						'parent_id'				=> array('UINT', 0),
@@ -57,7 +57,7 @@ 
 					),
 				),
 
-				$this->table_prefix . 'directory_comments' => array(
+				$this->table_prefix.'directory_comments' => array(
 					'COLUMNS' => array(
 						'comment_id' 		=> array('UINT', null, 'auto_increment'),
 						'comment_date' 		=> array('TIMESTAMP', 0),
@@ -73,7 +73,7 @@ 
 					'PRIMARY_KEY'	=> array('comment_id'),
 				),
 
-				$this->table_prefix . 'directory_links' => array(
+				$this->table_prefix.'directory_links' => array(
 					'COLUMNS' => array(
 						'link_id'			=> array('UINT', null, 'auto_increment'),
 						'link_time' 		=> array('TIMESTAMP', 0),
@@ -110,7 +110,7 @@ 
 					),
 				),
 
-				$this->table_prefix . 'directory_watch' => array(
+				$this->table_prefix.'directory_watch' => array(
 					'COLUMNS' => array(
 						'cat_id'		=> array('UINT', 0),
 						'user_id'		=> array('UINT', 0),
@@ -125,7 +125,7 @@ 
 
 				),
 
-				$this->table_prefix . 'directory_votes' => array(
+				$this->table_prefix.'directory_votes' => array(
 					'COLUMNS' => array(
 						'vote_id'			=> array('UINT', null, 'auto_increment'),
 						'vote_link_id'		=> array('UINT', 0),
@@ -148,11 +148,11 @@ 
 	{
 		return array(
 			'drop_tables'	=> array(
-				$this->table_prefix . 'directory_cats',
-				$this->table_prefix . 'directory_comments',
-				$this->table_prefix . 'directory_links',
-				$this->table_prefix . 'directory_votes',
-				$this->table_prefix . 'directory_watch',
+				$this->table_prefix.'directory_cats',
+				$this->table_prefix.'directory_comments',
+				$this->table_prefix.'directory_links',
+				$this->table_prefix.'directory_votes',
+				$this->table_prefix.'directory_watch',
 			),
 		);
 	}
@@ -272,10 +272,10 @@ 
 
 		foreach ($directories as $dir)
 		{
-			if (!file_exists($this->phpbb_root_path . $dir))
+			if (!file_exists($this->phpbb_root_path.$dir))
 			{
-				@mkdir($this->phpbb_root_path . $dir, 0777, true);
-				phpbb_chmod($this->phpbb_root_path . $dir, CHMOD_READ | CHMOD_WRITE);
+				@mkdir($this->phpbb_root_path.$dir, 0777, true);
+				phpbb_chmod($this->phpbb_root_path.$dir, CHMOD_READ | CHMOD_WRITE);
 			}
 		}
 	}
@@ -287,7 +287,7 @@ 
 	*/
 	public function remove_directories()
 	{
-		$dir = $this->phpbb_root_path . 'files/ext/ernadoo/phpbbdirectory/';
+		$dir = $this->phpbb_root_path.'files/ext/ernadoo/phpbbdirectory/';
 
 		$this->_recursive_rmdir($dir);
 	}

migrations/converter/convert_notifications.php

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
 	*/
 	public function effectively_installed()
 	{
-		return !$this->db_tools->sql_table_exists($this->table_prefix . 'directory_notifications');
+		return !$this->db_tools->sql_table_exists($this->table_prefix.'directory_notifications');
 	}
 
 	static public function depends_on()
@@ -54,7 +54,7 @@ 
 	public function copy_from_notifications()
 	{
 		$sql = 'SELECT n_user_id, n_cat_id
-			FROM ' . $this->table_prefix . 'directory_notifications';
+			FROM ' . $this->table_prefix.'directory_notifications';
 		$result = $this->db->sql_query($sql);
 
 		while ($row = $this->db->sql_fetchrow($result))
@@ -65,7 +65,7 @@ 
 				'notify_status'	=> 1,
 			);
 
-			$sql = 'INSERT INTO ' . $this->table_prefix . 'directory_watch ' . $this->db->sql_build_array('INSERT', $data);
+			$sql = 'INSERT INTO '.$this->table_prefix.'directory_watch '.$this->db->sql_build_array('INSERT', $data);
 			$this->db->sql_query($sql);
 		}
 		$this->db->sql_freeresult($result);

acp/phpbbdirectory_module.php

Spacing +3 added lines, -3 removed lines

@@ -204,7 +204,7 @@ 
 		{
 			$selected = ($url == $url_selected) ? 'selected="selected"' : '';
 
-			$select_options .= '<option value="' . $url . '" ' . $selected . '>' . parse_url($url, PHP_URL_HOST) . '</option>';
+			$select_options .= '<option value="'.$url.'" '.$selected.'>'.parse_url($url, PHP_URL_HOST).'</option>';
 		}
 
 		return $select_options;
@@ -237,7 +237,7 @@ 
 		{
 			$selected = ($i == $order_selected) ? 'selected="selected"' : '';
 			$order_substr = trim(str_replace(' ', '_', $i));
-			$tpl .= '<option value="' . $i . '" ' . $selected . '>' . $user->lang['DIR_ORDER_' . strtoupper($order_substr)] . '</option>';
+			$tpl .= '<option value="'.$i.'" '.$selected.'>'.$user->lang['DIR_ORDER_'.strtoupper($order_substr)].'</option>';
 		}
 
 		return ($tpl);
@@ -254,6 +254,6 @@ 
 		$value = $filesize['value'];
 
 		// size and maxlength must not be specified for input of type number
-		return '<input type="number" id="' . $key . '" min="0" max="999999999999999" step="any" name="config[' . $key . ']" value="' . $value . '" /> <select name="' . $key . '">' . size_select_options($size_var) . '</select>';
+		return '<input type="number" id="'.$key.'" min="0" max="999999999999999" step="any" name="config['.$key.']" value="'.$value.'" /> <select name="'.$key.'">'.size_select_options($size_var).'</select>';
 	}
 }

migrations/v20x/v2_0_0.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
 		{
 			$default_reparser = new $fast_reparsers[0][0](
 				$this->db,
-				$this->container->getParameter('core.table_prefix') . $fast_reparsers[0][1]);
+				$this->container->getParameter('core.table_prefix').$fast_reparsers[0][1]);
 
 			$resume_data = array(
 				'reparser'	=> 0,
@@ -60,7 +60,7 @@ 
 		{
 			$reparser = new $fast_reparsers[$resume_data['reparser']][0](
 				$this->db,
-				$this->container->getParameter('core.table_prefix') . $fast_reparsers[$resume_data['reparser']][1]
+				$this->container->getParameter('core.table_prefix').$fast_reparsers[$resume_data['reparser']][1]
 				);
 
 			// New reparser

controller/acp/validation.php

Spacing +21 added lines, -21 removed lines

@@ -84,21 +84,21 @@ 
 	*/
 	public function __construct(\phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\pagination $pagination, \phpbb\language\language $language, \phpbb\log\log $log, \phpbb\notification\manager $notification, \phpbb\request\request $request, \phpbb\template\template $template, \phpbb\user $user, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link, $root_path, $php_ext)
 	{
-		$this->config		= $config;
-		$this->db			= $db;
-		$this->pagination	= $pagination;
+		$this->config = $config;
+		$this->db = $db;
+		$this->pagination = $pagination;
 		$this->language		= $language;
 		$this->phpbb_log	= $log;
-		$this->notification	= $notification;
-		$this->request		= $request;
+		$this->notification = $notification;
+		$this->request = $request;
 		$this->template		= $template;
 		$this->user			= $user;
 		$this->categorie	= $categorie;
 		$this->link			= $link;
 		$this->root_path	= $root_path;
-		$this->php_ext		= $php_ext;
+		$this->php_ext = $php_ext;
 
-		$this->action		= $this->request->variable('action', '');
+		$this->action = $this->request->variable('action', '');
 	}
 
 	/**
@@ -127,14 +127,14 @@ 
 		global $phpbb_admin_path;
 
 		// Sort keys
-		$sort_days	= $this->request->variable('st', 0);
+		$sort_days = $this->request->variable('st', 0);
 		$sort_key	= $this->request->variable('sk', 't');
 		$sort_dir	= $this->request->variable('sd', 'd');
 
 		// Number of entries to display
 		$per_page = $this->request->variable('links_per_page', (int) $this->config['dir_show']);
 
-		$start	= $this->request->variable('start', 0);
+		$start = $this->request->variable('start', 0);
 
 		// Categorie ordering options
 		$limit_days		= array(0 => $this->language->lang('SEE_ALL'), 1 => $this->language->lang('1_DAY'), 7 => $this->language->lang('7_DAYS'), 14 => $this->language->lang('2_WEEKS'), 30 => $this->language->lang('1_MONTH'), 90 => $this->language->lang('3_MONTHS'), 180 => $this->language->lang('6_MONTHS'), 365 => $this->language->lang('1_YEAR'));
@@ -150,15 +150,15 @@ 
 
 		if (is_array($sort_by_sql[$sort_key]))
 		{
-			$sql_sort_order = implode(' ' . $direction . ', ', $sort_by_sql[$sort_key]) . ' ' . $direction;
+			$sql_sort_order = implode(' '.$direction.', ', $sort_by_sql[$sort_key]).' '.$direction;
 		}
 		else
 		{
-			$sql_sort_order = $sort_by_sql[$sort_key] . ' ' . $direction;
+			$sql_sort_order = $sort_by_sql[$sort_key].' '.$direction;
 		}
 
 		$sql = 'SELECT COUNT(1) AS total_links
-			FROM ' . $this->links_table . '
+			FROM ' . $this->links_table.'
 			WHERE link_active = 0' .
 				(($sql_where) ? " AND link_time >= $sql_where" : '');
 		$result = $this->db->sql_query($sql);
@@ -182,7 +182,7 @@ 
 					'ON'	=> 'u.user_id = l.link_user_id'
 				)
 			),
-			'WHERE'		=> 'l.link_active = 0' . (($sql_where) ? " AND l.link_time >= $sql_where" : ''),
+			'WHERE'		=> 'l.link_active = 0'.(($sql_where) ? " AND l.link_time >= $sql_where" : ''),
 			'ORDER_BY'	=> $sql_sort_order);
 
 		$sql = $this->db->sql_build_query('SELECT', $sql_array);
@@ -209,7 +209,7 @@ 
 
 		$option_ary = array('approved' => 'DIR_LINK_ACTIVATE', 'disapproved' => 'DIR_LINK_DELETE');
 
-		$base_url = $this->u_action . "&$u_sort_param&links_per_page=$per_page";
+		$base_url = $this->u_action."&$u_sort_param&links_per_page=$per_page";
 		$this->pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_links, $per_page, $start);
 
 		$this->template->assign_vars(array(
@@ -220,7 +220,7 @@ 
 			'S_SORT_DIR'		=> $s_sort_dir,
 			'LINKS_PER_PAGE'	=> $per_page,
 
-			'U_ACTION'			=> $this->u_action . "&$u_sort_param&links_per_page=$per_page&start=$start",
+			'U_ACTION'			=> $this->u_action."&$u_sort_param&links_per_page=$per_page&start=$start",
 		));
 	}
 
@@ -248,7 +248,7 @@ 
 				return;
 		}
 
-		$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_LINK_' . strtoupper($this->action), time(), array(implode(', ', $this->affected_link_name)));
+		$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_LINK_'.strtoupper($this->action), time(), array(implode(', ', $this->affected_link_name)));
 	}
 
 	/**
@@ -260,7 +260,7 @@ 
 	{
 		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);
 
@@ -327,15 +327,15 @@ 
 				'link_cat'		=> (int) $row['link_cat'],
 			);
 
-			$sql = 'UPDATE ' . $this->links_table . '
-							SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
+			$sql = 'UPDATE '.$this->links_table.'
+							SET ' . $this->db->sql_build_array('UPDATE', $sql_ary).'
 							WHERE link_id = ' . (int) $row['link_id'];
 			$this->db->sql_query($sql);
 		}
 
 		foreach ($this->cat_data as $cat_id => $count)
 		{
-			$sql = 'UPDATE ' . $this->categories_table . '
+			$sql = 'UPDATE '.$this->categories_table.'
 							SET cat_links = cat_links + '.$count.'
 							WHERE cat_id = ' . (int) $cat_id;
 			$this->db->sql_query($sql);
@@ -361,7 +361,7 @@ 
 				}
 			}
 
-			$sql = 'DELETE FROM ' . $this->links_table . ' WHERE link_id = ' . (int) $row['link_id'];
+			$sql = 'DELETE FROM '.$this->links_table.' WHERE link_id = '.(int) $row['link_id'];
 			$this->db->sql_query($sql);
 		}
 	}

core/comment.php

Spacing +9 added lines, -9 removed lines

@@ -28,8 +28,8 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\language\language $language)
 	{
-		$this->db		= $db;
-		$this->language	= $language;
+		$this->db = $db;
+		$this->language = $language;
 	}
 
 	/**
@@ -42,10 +42,10 @@ 
 	{
 		$this->db->sql_transaction('begin');
 
-		$sql = 'INSERT INTO ' . $this->comments_table . ' ' . $this->db->sql_build_array('INSERT', $data);
+		$sql = 'INSERT INTO '.$this->comments_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_comment = link_comment + 1
 			WHERE link_id = ' . (int) $data['comment_link_id'];
 		$this->db->sql_query($sql);
@@ -62,8 +62,8 @@ 
 	*/
 	public function edit($data, $comment_id)
 	{
-		$sql = 'UPDATE ' . $this->comments_table . '
-			SET ' . $this->db->sql_build_array('UPDATE', $data) . '
+		$sql = 'UPDATE '.$this->comments_table.'
+			SET ' . $this->db->sql_build_array('UPDATE', $data).'
 			WHERE comment_id = ' . (int) $comment_id;
 		$this->db->sql_query($sql);
 	}
@@ -81,10 +81,10 @@ 
 
 		$this->db->sql_transaction('begin');
 
-		$sql = 'DELETE FROM ' . $this->comments_table . ' WHERE comment_id = ' . (int) $comment_id;
+		$sql = 'DELETE FROM '.$this->comments_table.' WHERE comment_id = '.(int) $comment_id;
 		$this->db->sql_query($sql);
 
-		$sql = 'UPDATE ' . $this->links_table . '
+		$sql = 'UPDATE '.$this->links_table.'
 			SET link_comment = link_comment - 1
 			WHERE link_id = ' . (int) $link_id;
 		$this->db->sql_query($sql);
@@ -94,7 +94,7 @@ 
 		if ($request->is_ajax())
 		{
 			$sql = 'SELECT COUNT(comment_id) AS nb_comments
-				FROM ' . $this->comments_table . '
+				FROM ' . $this->comments_table.'
 				WHERE comment_link_id = ' . (int) $link_id;
 			$result = $this->db->sql_query($sql);
 			$nb_comments = (int) $this->db->sql_fetchfield('nb_comments');

search/fulltext_directory.php

Spacing +9 added lines, -9 removed lines

@@ -69,20 +69,20 @@ 
 			$match_search_query = '';
 			foreach ($matches as $match)
 			{
-				$match_search_query .= (($match_search_query) ? ' OR ' : '') . 'LOWER('. $match . ') ';
-				$match_search_query .= $this->db->sql_like_expression(str_replace('*', $this->db->get_any_char(), $this->db->get_any_char() . strtolower($word) . $this->db->get_any_char()));
+				$match_search_query .= (($match_search_query) ? ' OR ' : '').'LOWER('.$match.') ';
+				$match_search_query .= $this->db->sql_like_expression(str_replace('*', $this->db->get_any_char(), $this->db->get_any_char().strtolower($word).$this->db->get_any_char()));
 			}
-			$search_query .= ((!$search_query) ? '' : (($terms == 'all') ? ' AND ' : ' OR ')) . '(' . $match_search_query . ')';
+			$search_query .= ((!$search_query) ? '' : (($terms == 'all') ? ' AND ' : ' OR ')).'('.$match_search_query.')';
 		}
 		$direction = (($sort_dir == 'd') ? 'DESC' : 'ASC');
 
 		if (is_array($sort_by_sql[$sort_key]))
 		{
-			$sql_sort_order = implode(' ' . $direction . ', ', $sort_by_sql[$sort_key]) . ' ' . $direction;
+			$sql_sort_order = implode(' '.$direction.', ', $sort_by_sql[$sort_key]).' '.$direction;
 		}
 		else
 		{
-			$sql_sort_order = $sort_by_sql[$sort_key] . ' ' . $direction;
+			$sql_sort_order = $sort_by_sql[$sort_key].' '.$direction;
 		}
 
 		$sql_array = array(
@@ -90,10 +90,10 @@ 
 			'FROM'		=> array(
 					$this->links_table	=> 'l'),
 			'WHERE'		=> 'l.link_active = 1
-				' . (($search_query) ? 'AND (' . $search_query . ')' : '') . '
-				' . (sizeof($ex_cid_ary) ? ' AND ' . $this->db->sql_in_set('l.link_cat', $ex_cid_ary, true) : '') . '
-				' . (($cat_id) ? ' AND ' . $this->db->sql_in_set('l.link_cat', $cat_id) : '') . '
-				' . (($sort_days) ? ' AND l.link_time >= ' . (time() - ($sort_days * 86400)) : ''),
+				' . (($search_query) ? 'AND ('.$search_query.')' : '').'
+				' . (sizeof($ex_cid_ary) ? ' AND '.$this->db->sql_in_set('l.link_cat', $ex_cid_ary, true) : '').'
+				' . (($cat_id) ? ' AND '.$this->db->sql_in_set('l.link_cat', $cat_id) : '').'
+				' . (($sort_days) ? ' AND l.link_time >= '.(time() - ($sort_days * 86400)) : ''),
 			'ORDER_BY'	=> $sql_sort_order
 		);
 

core/helper.php

Spacing +6 added lines, -6 removed lines

@@ -44,7 +44,7 @@ 
 	*/
 	public function set_extension_manager(\phpbb\extension\manager $phpbb_extension_manager)
 	{
-		$this->extension_manager	= $phpbb_extension_manager;
+		$this->extension_manager = $phpbb_extension_manager;
 	}
 
 	/**
@@ -70,11 +70,11 @@ 
 	*/
 	public function set_tables($categories_table, $comments_table, $links_table, $votes_table, $watch_table)
 	{
-		$this->comments_table		= $comments_table;
+		$this->comments_table = $comments_table;
 		$this->links_table			= $links_table;
 		$this->votes_table			= $votes_table;
 		$this->watch_table			= $watch_table;
-		$this->categories_table		= $categories_table;
+		$this->categories_table = $categories_table;
 	}
 	/**
 	* Return ext name
@@ -84,7 +84,7 @@ 
 	*/
 	public function get_ext_name($web_root_path = false)
 	{
-		return (($web_root_path) ? $this->path_helper->get_web_root_path() : '') . $this->extension_manager->get_extension_path($this->ext_name);
+		return (($web_root_path) ? $this->path_helper->get_web_root_path() : '').$this->extension_manager->get_extension_path($this->ext_name);
 	}
 
 	/**
@@ -96,7 +96,7 @@ 
 	*/
 	public function get_img_path($type, $image = '')
 	{
-		return $this->get_ext_name(true) . 'images/' . $type . '/' . $image;
+		return $this->get_ext_name(true).'images/'.$type.'/'.$image;
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	*/
 	public function get_banner_path($banner = '')
 	{
-		return 'files/' . $this->get_ext_name() . 'banners/' . $banner;
+		return 'files/'.$this->get_ext_name().'banners/'.$banner;
 	}
 
 	/**