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_module.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
 	public function effectively_installed()
 	{
 		$sql = 'SELECT module_id
-			FROM ' . $this->table_prefix . "modules
+			FROM ' . $this->table_prefix."modules
 			WHERE module_class = 'acp'
 				AND module_basename = 'acp_directory'
 				AND module_mode = 'main'";
@@ -56,8 +56,8 @@ 
 			'module_auth'		=> 'ext_ernadoo/phpbbdirectory'
 		);
 
-		$sql = 'UPDATE '  . $this->table_prefix . 'modules
-			SET ' . $this->db->sql_build_array('UPDATE', $module_data) . "
+		$sql = 'UPDATE '.$this->table_prefix.'modules
+			SET ' . $this->db->sql_build_array('UPDATE', $module_data)."
 			WHERE module_basename = 'acp_directory'
 				AND module_mode IN ('main', 'settings', 'cat', 'val')";
 		$this->db->sql_query($sql);

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

core/helper.php

Spacing +5 added lines, -5 removed lines

@@ -29,8 +29,8 @@ 
 	*/
 	public function __construct(\phpbb\extension\manager $phpbb_extension_manager, \phpbb\path_helper $path_helper)
 	{
-		$this->extension_manager	= $phpbb_extension_manager;
-		$this->path_helper			= $path_helper;
+		$this->extension_manager = $phpbb_extension_manager;
+		$this->path_helper = $path_helper;
 	}
 
 	/**
@@ -41,7 +41,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);
 	}
 
 	/**
@@ -53,7 +53,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;
 	}
 
 	/**
@@ -64,7 +64,7 @@ 
 	*/
 	public function get_banner_path($banner = '')
 	{
-		return 'files/' . $this->get_ext_name() . 'banners/' . $banner;
+		return 'files/'.$this->get_ext_name().'banners/'.$banner;
 	}
 
 	/**

cron/task/core/prune_categorie.php

Spacing +3 added lines, -3 removed lines

@@ -37,8 +37,8 @@ 
 	*/
 	public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \ernadoo\phpbbdirectory\core\link $directory_cron, $php_ext)
 	{
-		$this->db 				= $db;
-		$this->config 			= $config;
+		$this->db = $db;
+		$this->config = $config;
 		$this->dir_cron 		= $directory_cron;
 		$this->php_ext 			= $php_ext;
 	}
@@ -113,7 +113,7 @@ 
 			$cat_id = $request->variable('c', 0);
 
 			$sql = 'SELECT cat_id, cat_cron_enable, cat_cron_next, cat_cron_freq, cat_cron_nb_check
-				FROM ' . DIR_CAT_TABLE . "
+				FROM ' . DIR_CAT_TABLE."
 				WHERE cat_id = $cat_id";
 			$result = $this->db->sql_query($sql);
 			$row = $this->db->sql_fetchrow($result);

ext.php

Spacing +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
 
 		foreach ($notification_types as $notification_type)
 		{
-			call_user_func(array($phpbb_notifications, $step . '_notifications'), $notification_type);
+			call_user_func(array($phpbb_notifications, $step.'_notifications'), $notification_type);
 		}
 
 		return 'notifications';

search/fulltext_directory.php

Spacing +9 added lines, -9 removed lines

@@ -67,20 +67,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(
@@ -88,10 +88,10 @@ 
 			'FROM'		=> array(
 					DIR_LINK_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
 		);
 

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