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

Completed

Push — 3.2.x ( 00ef00...2ad852 )

by Erwan

created 2017-10-04 11:15 UTC

Status

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

@@ -87,19 +87,19 @@  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\captcha\factory $captcha_factory, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link, $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->captcha_factory 	= $captcha_factory;
+		$this->captcha_factory = $captcha_factory;
 		$this->categorie		= $categorie;
 		$this->link				= $link;
 		$this->root_path		= $root_path;
-		$this->php_ext			= $php_ext;
+		$this->php_ext = $php_ext;
 
 		$language->add_lang('directory', 'ernadoo/phpbbdirectory');
 
@@ -119,12 +119,12 @@  discard block
 block discarded – undo
 	{
 		if ($this->request->is_set_post('cancel'))
 		{
-			$redirect = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id);
+			$redirect = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id);
 			redirect($redirect);
 		}
 
 		$sql = 'SELECT link_user_id
-			FROM ' . $this->links_table . '
+			FROM ' . $this->links_table.'
 			WHERE link_id = ' . (int) $link_id;
 		$result = $this->db->sql_query($sql);
 		$link_data = $this->db->sql_fetchrow($result);
@@ -145,9 +145,9 @@  discard block
 block discarded – undo
 		{
 			$this->link->del($cat_id, $link_id);
 
-			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id);
+			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id);
 			meta_refresh(3, $meta_info);
-			$message = $this->language->lang('DIR_DELETE_OK') . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_DIR', '<a href="' . $this->helper->route('ernadoo_phpbbdirectory_base_controller') . '">', '</a>') . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="' . $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id) . '">', '</a>');
+			$message = $this->language->lang('DIR_DELETE_OK').'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_DIR', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_base_controller').'">', '</a>').'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id).'">', '</a>');
 			return $this->helper->message($message);
 		}
 		else
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
 	public function edit_link($cat_id, $link_id)
 	{
 		$sql = 'SELECT link_id, link_uid, link_user_id, link_flags, link_bitfield, link_cat, link_url, link_description, link_guest_email, link_name, link_rss, link_back, link_banner, link_flag, link_cat, link_time
-			FROM ' . $this->links_table . '
+			FROM ' . $this->links_table.'
 			WHERE link_id = ' . (int) $link_id;
 		$result = $this->db->sql_query($sql);
 		$link_data = $this->db->sql_fetchrow($result);
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
 		$cat_id		= $this->request->variable('id', $cat_id);
 		$submit		= $this->request->is_set_post('submit') ? true : false;
 		$refresh	= $this->request->is_set_post('refresh_vc') ? true : false;
-		$title		= $this->language->lang('DIR_EDIT_SITE');
+		$title = $this->language->lang('DIR_EDIT_SITE');
 
 		$this->template->assign_block_vars('dir_navlinks', array(
 			'FORUM_NAME'	=> $title,
@@ -211,15 +211,15 @@  discard block
 block discarded – undo
 				'old_banner'	=> $link_data['link_banner'],
 			);
 
-			$site_description			= generate_text_for_edit($link_data['link_description'], $link_data['link_uid'], $link_data['link_flags']);
-			$link_data['link_banner'] 	= (preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $link_data['link_banner'])) ? $link_data['link_banner'] : '';
+			$site_description = generate_text_for_edit($link_data['link_description'], $link_data['link_uid'], $link_data['link_flags']);
+			$link_data['link_banner'] = (preg_match('/^(http:\/\/|https:\/\/|ftp:\/\/|ftps:\/\/|www\.).+/si', $link_data['link_banner'])) ? $link_data['link_banner'] : '';
 
-			$this->url			= $link_data['link_url'];
-			$this->site_name	= $link_data['link_name'];
+			$this->url = $link_data['link_url'];
+			$this->site_name = $link_data['link_name'];
 			$this->description	= $site_description['text'];
 			$this->guest_email	= $link_data['link_guest_email'];
-			$this->rss			= $link_data['link_rss'];
-			$this->banner 		= $link_data['link_banner'];
+			$this->rss = $link_data['link_rss'];
+			$this->banner = $link_data['link_banner'];
 			$this->back			= $link_data['link_back'];
 			$this->flag 		= $link_data['link_flag'];
 		}
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
 		$cat_id		= $this->request->variable('id', $cat_id);
 		$submit		= $this->request->is_set_post('submit') ? true : false;
 		$refresh	= $this->request->is_set_post('refresh_vc') ? true : false;
-		$title		= $this->language->lang('DIR_NEW_SITE');
+		$title = $this->language->lang('DIR_NEW_SITE');
 
 		$this->template->assign_block_vars('dir_navlinks', array(
 			'FORUM_NAME'	=> $title,
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
 
 		// We check if user had already vot for this website.
 		$sql = 'SELECT vote_link_id
-			FROM ' . $this->votes_table . '
+			FROM ' . $this->votes_table.'
 			WHERE ' . $this->db->sql_build_array('SELECT', $data);
 		$result = $this->db->sql_query($sql);
 		$data = $this->db->sql_fetchrow($result);
@@ -322,9 +322,9 @@  discard block
 block discarded – undo
 
 		$this->link->add_vote($link_id);
 
-		$meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id);
+		$meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id);
 		meta_refresh(3, $meta_info);
-		$message = $this->language->lang('DIR_VOTE_OK') . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="' . $meta_info . '">', '</a>');
+		$message = $this->language->lang('DIR_VOTE_OK').'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$meta_info.'">', '</a>');
 		return $this->helper->message($message);
 	}
 
@@ -349,18 +349,18 @@  discard block
 block discarded – undo
 			return $this->helper->message('FORM_INVALID');
 		}
 
-		$this->url			= $this->request->variable('url', '');
-		$this->site_name	= $this->request->variable('site_name', '', true);
+		$this->url = $this->request->variable('url', '');
+		$this->site_name = $this->request->variable('site_name', '', true);
 		$this->description	= $this->request->variable('description', '', true);
 		$this->guest_email	= $this->request->variable('guest_email', '');
-		$this->rss			= $this->request->variable('rss', '');
-		$this->banner 		= $this->request->variable('banner', '');
+		$this->rss = $this->request->variable('rss', '');
+		$this->banner = $this->request->variable('banner', '');
 		$this->back			= $this->request->variable('back', '');
 		$this->flag 		= $this->request->variable('flag', '');
 
 		if (!function_exists('validate_data'))
 		{
-			include($this->root_path . 'includes/functions_user.' . $this->php_ext);
+			include($this->root_path.'includes/functions_user.'.$this->php_ext);
 		}
 
 		// We define variables to check
@@ -383,17 +383,17 @@  discard block
 block discarded – undo
 			'site_name' =>			array(
 				array('string', false, 1, 100)),
 			'website'		=>		array(
-				array('string',	false, 12, 255),
-				array('match',	true, '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')),
+				array('string', false, 12, 255),
+				array('match', true, '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')),
 			'description'	=>		array(
 				array('string', !$this->categorie->data['cat_must_describe'], 1, $this->config['dir_length_describe'])),
 			'rss'			=>		array(
 				array('string', true, 12, 255),
-				array('match',	empty($this->rss), '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')),
+				array('match', empty($this->rss), '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')),
 			'banner'		=>		array(
 				array('string', true, 5, 255)),
 			'back'			=>		array(
-				array('string',	!$this->categorie->data['cat_link_back'], 12, 255),
+				array('string', !$this->categorie->data['cat_link_back'], 12, 255),
 				array(array($this->link, 'link_back'), true)),
 			'cat'			=>		array(
 				array('num', '', 1))
@@ -439,8 +439,8 @@  discard block
 block discarded – undo
 		// Still no errors?? So let's go!
 		if (!$error)
 		{
-			$this->banner	= (!$this->banner && !$this->request->is_set_post('delete_banner')) ? $this->request->variable('old_banner', '') : $this->banner;
-			$this->url		= $this->link->clean_url($this->url);
+			$this->banner = (!$this->banner && !$this->request->is_set_post('delete_banner')) ? $this->request->variable('old_banner', '') : $this->banner;
+			$this->url = $this->link->clean_url($this->url);
 
 			$data_edit = array(
 				'link_user_id'		=> $this->link_user_id,
@@ -485,10 +485,10 @@  discard block
 block discarded – undo
 				$this->link->add($data_add, $need_approval);
 			}
 
-			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id);
+			$meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id);
 			meta_refresh(3, $meta_info);
 			$message	= ($need_approval) ? $this->language->lang('DIR_'.strtoupper($mode).'_SITE_ACTIVE') : $this->language->lang('DIR_'.strtoupper($mode).'_SITE_OK');
-			$message	= $message . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_DIR', '<a href="' . $this->helper->route('ernadoo_phpbbdirectory_base_controller') . '">', '</a>') . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="' . $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id) . '">', '</a>');
+			$message	= $message.'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_DIR', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_base_controller').'">', '</a>').'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id).'">', '</a>');
 			return $this->helper->message($message);
 		}
 		else
@@ -517,7 +517,7 @@  discard block
 block discarded – undo
 	{
 		if (!function_exists('file_gc'))
 		{
-			include($this->root_path . 'includes/functions_download.' . $this->php_ext);
+			include($this->root_path.'includes/functions_download.'.$this->php_ext);
 		}
 
 		$file_path = $this->get_banner_path($banner_img);
@@ -572,7 +572,7 @@  discard block
 block discarded – undo
 
 		if (!function_exists('display_custom_bbcodes'))
 		{
-			include($this->root_path . 'includes/functions_display.' . $this->php_ext);
+			include($this->root_path.'includes/functions_display.'.$this->php_ext);
 		}
 		display_custom_bbcodes();
 		add_form_key('dir_form');
@@ -581,17 +581,17 @@  discard block
 block discarded – undo
 		$flag_path = $ext_path.'images/flags/';
 
 		$s_guest	= (!$this->user->data['is_registered'] || !empty($this->guest_email));
-		$s_rss		= $this->config['dir_activ_rss'];
-		$s_banner	= $this->config['dir_activ_banner'];
+		$s_rss = $this->config['dir_activ_rss'];
+		$s_banner = $this->config['dir_activ_banner'];
 		$s_back		= $this->categorie->data['cat_link_back'];
 		$s_flag		= $this->config['dir_activ_flag'];
 
 		$this->template->assign_vars(array(
-			'BBCODE_STATUS'			=> ($this->config['allow_bbcode']) 	? $this->language->lang('BBCODE_IS_ON', '<a href="' . append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode') . '">', '</a>') : $this->language->lang('BBCODE_IS_OFF', '<a href="' . append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode') . '">', '</a>'),
-			'IMG_STATUS'			=> ($this->config['allow_bbcode'])	? $this->language->lang('IMAGES_ARE_ON') : $this->language->lang('IMAGES_ARE_OFF'),
+			'BBCODE_STATUS'			=> ($this->config['allow_bbcode']) ? $this->language->lang('BBCODE_IS_ON', '<a href="'.append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode').'">', '</a>') : $this->language->lang('BBCODE_IS_OFF', '<a href="'.append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode').'">', '</a>'),
+			'IMG_STATUS'			=> ($this->config['allow_bbcode']) ? $this->language->lang('IMAGES_ARE_ON') : $this->language->lang('IMAGES_ARE_OFF'),
 			'SMILIES_STATUS'		=> ($this->config['allow_smilies']) ? $this->language->lang('SMILIES_ARE_ON') : $this->language->lang('SMILIES_ARE_OFF'),
 			'URL_STATUS'			=> ($this->config['allow_post_links']) ? $this->language->lang('URL_IS_ON') : $this->language->lang('URL_IS_OFF'),
-			'FLASH_STATUS'			=> ($this->config['allow_bbcode'] && $this->config['allow_post_flash'])	? $this->language->lang('FLASH_IS_ON') : $this->language->lang('FLASH_IS_OFF'),
+			'FLASH_STATUS'			=> ($this->config['allow_bbcode'] && $this->config['allow_post_flash']) ? $this->language->lang('FLASH_IS_ON') : $this->language->lang('FLASH_IS_OFF'),
 
 			'L_TITLE'				=> $title,
 			'L_DIR_DESCRIPTION_EXP'	=> $this->language->lang('DIR_DESCRIPTION_EXP', $this->config['dir_length_describe']),

Please login to merge, or discard this patch.

		@@ -87,19 +87,19 @@ discard block
		block discarded – undo
87	87	*/
88	88	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\captcha\factory $captcha_factory, \ernadoo\phpbbdirectory\core\categorie $categorie, \ernadoo\phpbbdirectory\core\link $link, $root_path, $php_ext)
89	89	{
90		- $this->db = $db;
91		- $this->config = $config;
	90	+ $this->db = $db;
	91	+ $this->config = $config;
92	92	$this->language = $language;
93	93	$this->template = $template;
94	94	$this->user = $user;
95		- $this->helper = $helper;
96		- $this->request = $request;
	95	+ $this->helper = $helper;
	96	+ $this->request = $request;
97	97	$this->auth = $auth;
98		- $this->captcha_factory = $captcha_factory;
	98	+ $this->captcha_factory = $captcha_factory;
99	99	$this->categorie = $categorie;
100	100	$this->link = $link;
101	101	$this->root_path = $root_path;
102		- $this->php_ext = $php_ext;
	102	+ $this->php_ext = $php_ext;
103	103
104	104	$language->add_lang('directory', 'ernadoo/phpbbdirectory');
105	105
		@@ -119,12 +119,12 @@ discard block
		block discarded – undo
119	119	{
120	120	if ($this->request->is_set_post('cancel'))
121	121	{
122		- $redirect = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id);
	122	+ $redirect = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id);
123	123	redirect($redirect);
124	124	}
125	125
126	126	$sql = 'SELECT link_user_id
127		- FROM ' . $this->links_table . '
	127	+ FROM ' . $this->links_table.'
128	128	WHERE link_id = ' . (int) $link_id;
129	129	$result = $this->db->sql_query($sql);
130	130	$link_data = $this->db->sql_fetchrow($result);
		@@ -145,9 +145,9 @@ discard block
		block discarded – undo
145	145	{
146	146	$this->link->del($cat_id, $link_id);
147	147
148		- $meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id);
	148	+ $meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id);
149	149	meta_refresh(3, $meta_info);
150		- $message = $this->language->lang('DIR_DELETE_OK') . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_DIR', '<a href="' . $this->helper->route('ernadoo_phpbbdirectory_base_controller') . '">', '</a>') . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="' . $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id) . '">', '</a>');
	150	+ $message = $this->language->lang('DIR_DELETE_OK').'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_DIR', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_base_controller').'">', '</a>').'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id).'">', '</a>');
151	151	return $this->helper->message($message);
152	152	}
153	153	else
		@@ -167,7 +167,7 @@ discard block
		block discarded – undo
167	167	public function edit_link($cat_id, $link_id)
168	168	{
169	169	$sql = 'SELECT link_id, link_uid, link_user_id, link_flags, link_bitfield, link_cat, link_url, link_description, link_guest_email, link_name, link_rss, link_back, link_banner, link_flag, link_cat, link_time
170		- FROM ' . $this->links_table . '
	170	+ FROM ' . $this->links_table.'
171	171	WHERE link_id = ' . (int) $link_id;
172	172	$result = $this->db->sql_query($sql);
173	173	$link_data = $this->db->sql_fetchrow($result);
		@@ -187,7 +187,7 @@ discard block
		block discarded – undo
187	187	$cat_id = $this->request->variable('id', $cat_id);
188	188	$submit = $this->request->is_set_post('submit') ? true : false;
189	189	$refresh = $this->request->is_set_post('refresh_vc') ? true : false;
190		- $title = $this->language->lang('DIR_EDIT_SITE');
	190	+ $title = $this->language->lang('DIR_EDIT_SITE');
191	191
192	192	$this->template->assign_block_vars('dir_navlinks', array(
193	193	'FORUM_NAME' => $title,
		@@ -211,15 +211,15 @@ discard block
		block discarded – undo
211	211	'old_banner' => $link_data['link_banner'],
212	212	);
213	213
214		- $site_description = generate_text_for_edit($link_data['link_description'], $link_data['link_uid'], $link_data['link_flags']);
215		- $link_data['link_banner'] = (preg_match('/^(http:\/\/\|https:\/\/\|ftp:\/\/\|ftps:\/\/\|www\.).+/si', $link_data['link_banner'])) ? $link_data['link_banner'] : '';
	214	+ $site_description = generate_text_for_edit($link_data['link_description'], $link_data['link_uid'], $link_data['link_flags']);
	215	+ $link_data['link_banner'] = (preg_match('/^(http:\/\/\|https:\/\/\|ftp:\/\/\|ftps:\/\/\|www\.).+/si', $link_data['link_banner'])) ? $link_data['link_banner'] : '';
216	216
217		- $this->url = $link_data['link_url'];
218		- $this->site_name = $link_data['link_name'];
	217	+ $this->url = $link_data['link_url'];
	218	+ $this->site_name = $link_data['link_name'];
219	219	$this->description = $site_description['text'];
220	220	$this->guest_email = $link_data['link_guest_email'];
221		- $this->rss = $link_data['link_rss'];
222		- $this->banner = $link_data['link_banner'];
	221	+ $this->rss = $link_data['link_rss'];
	222	+ $this->banner = $link_data['link_banner'];
223	223	$this->back = $link_data['link_back'];
224	224	$this->flag = $link_data['link_flag'];
225	225	}
		@@ -246,7 +246,7 @@ discard block
		block discarded – undo
246	246	$cat_id = $this->request->variable('id', $cat_id);
247	247	$submit = $this->request->is_set_post('submit') ? true : false;
248	248	$refresh = $this->request->is_set_post('refresh_vc') ? true : false;
249		- $title = $this->language->lang('DIR_NEW_SITE');
	249	+ $title = $this->language->lang('DIR_NEW_SITE');
250	250
251	251	$this->template->assign_block_vars('dir_navlinks', array(
252	252	'FORUM_NAME' => $title,
		@@ -310,7 +310,7 @@ discard block
		block discarded – undo
310	310
311	311	// We check if user had already vot for this website.
312	312	$sql = 'SELECT vote_link_id
313		- FROM ' . $this->votes_table . '
	313	+ FROM ' . $this->votes_table.'
314	314	WHERE ' . $this->db->sql_build_array('SELECT', $data);
315	315	$result = $this->db->sql_query($sql);
316	316	$data = $this->db->sql_fetchrow($result);
		@@ -322,9 +322,9 @@ discard block
		block discarded – undo
322	322
323	323	$this->link->add_vote($link_id);
324	324
325		- $meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id);
	325	+ $meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id);
326	326	meta_refresh(3, $meta_info);
327		- $message = $this->language->lang('DIR_VOTE_OK') . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="' . $meta_info . '">', '</a>');
	327	+ $message = $this->language->lang('DIR_VOTE_OK').'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$meta_info.'">', '</a>');
328	328	return $this->helper->message($message);
329	329	}
330	330
		@@ -349,18 +349,18 @@ discard block
		block discarded – undo
349	349	return $this->helper->message('FORM_INVALID');
350	350	}
351	351
352		- $this->url = $this->request->variable('url', '');
353		- $this->site_name = $this->request->variable('site_name', '', true);
	352	+ $this->url = $this->request->variable('url', '');
	353	+ $this->site_name = $this->request->variable('site_name', '', true);
354	354	$this->description = $this->request->variable('description', '', true);
355	355	$this->guest_email = $this->request->variable('guest_email', '');
356		- $this->rss = $this->request->variable('rss', '');
357		- $this->banner = $this->request->variable('banner', '');
	356	+ $this->rss = $this->request->variable('rss', '');
	357	+ $this->banner = $this->request->variable('banner', '');
358	358	$this->back = $this->request->variable('back', '');
359	359	$this->flag = $this->request->variable('flag', '');
360	360
361	361	if (!function_exists('validate_data'))
362	362	{
363		- include($this->root_path . 'includes/functions_user.' . $this->php_ext);
	363	+ include($this->root_path.'includes/functions_user.'.$this->php_ext);
364	364	}
365	365
366	366	// We define variables to check
		@@ -383,17 +383,17 @@ discard block
		block discarded – undo
383	383	'site_name' => array(
384	384	array('string', false, 1, 100)),
385	385	'website' => array(
386		- array('string', false, 12, 255),
387		- array('match', true, '#^http[s]?://(.?\.)?[a-z0-9\-]+\.[a-z]{2,4}#i')),
	386	+ array('string', false, 12, 255),
	387	+ array('match', true, '#^http[s]?://(.?\.)?[a-z0-9\-]+\.[a-z]{2,4}#i')),
388	388	'description' => array(
389	389	array('string', !$this->categorie->data['cat_must_describe'], 1, $this->config['dir_length_describe'])),
390	390	'rss' => array(
391	391	array('string', true, 12, 255),
392		- array('match', empty($this->rss), '#^http[s]?://(.?\.)?[a-z0-9\-]+\.[a-z]{2,4}#i')),
	392	+ array('match', empty($this->rss), '#^http[s]?://(.?\.)?[a-z0-9\-]+\.[a-z]{2,4}#i')),
393	393	'banner' => array(
394	394	array('string', true, 5, 255)),
395	395	'back' => array(
396		- array('string', !$this->categorie->data['cat_link_back'], 12, 255),
	396	+ array('string', !$this->categorie->data['cat_link_back'], 12, 255),
397	397	array(array($this->link, 'link_back'), true)),
398	398	'cat' => array(
399	399	array('num', '', 1))
		@@ -439,8 +439,8 @@ discard block
		block discarded – undo
439	439	// Still no errors?? So let's go!
440	440	if (!$error)
441	441	{
442		- $this->banner = (!$this->banner && !$this->request->is_set_post('delete_banner')) ? $this->request->variable('old_banner', '') : $this->banner;
443		- $this->url = $this->link->clean_url($this->url);
	442	+ $this->banner = (!$this->banner && !$this->request->is_set_post('delete_banner')) ? $this->request->variable('old_banner', '') : $this->banner;
	443	+ $this->url = $this->link->clean_url($this->url);
444	444
445	445	$data_edit = array(
446	446	'link_user_id' => $this->link_user_id,
		@@ -485,10 +485,10 @@ discard block
		block discarded – undo
485	485	$this->link->add($data_add, $need_approval);
486	486	}
487	487
488		- $meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id);
	488	+ $meta_info = $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id);
489	489	meta_refresh(3, $meta_info);
490	490	$message = ($need_approval) ? $this->language->lang('DIR_'.strtoupper($mode).'_SITE_ACTIVE') : $this->language->lang('DIR_'.strtoupper($mode).'_SITE_OK');
491		- $message = $message . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_DIR', '<a href="' . $this->helper->route('ernadoo_phpbbdirectory_base_controller') . '">', '</a>') . '<br /><br />' . $this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="' . $this->helper->route('ernadoo_phpbbdirectory_dynamic_route_' . $cat_id) . '">', '</a>');
	491	+ $message = $message.'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_DIR', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_base_controller').'">', '</a>').'<br /><br />'.$this->language->lang('DIR_CLICK_RETURN_CAT', '<a href="'.$this->helper->route('ernadoo_phpbbdirectory_dynamic_route_'.$cat_id).'">', '</a>');
492	492	return $this->helper->message($message);
493	493	}
494	494	else
		@@ -517,7 +517,7 @@ discard block
		block discarded – undo
517	517	{
518	518	if (!function_exists('file_gc'))
519	519	{
520		- include($this->root_path . 'includes/functions_download.' . $this->php_ext);
	520	+ include($this->root_path.'includes/functions_download.'.$this->php_ext);
521	521	}
522	522
523	523	$file_path = $this->get_banner_path($banner_img);
		@@ -572,7 +572,7 @@ discard block
		block discarded – undo
572	572
573	573	if (!function_exists('display_custom_bbcodes'))
574	574	{
575		- include($this->root_path . 'includes/functions_display.' . $this->php_ext);
	575	+ include($this->root_path.'includes/functions_display.'.$this->php_ext);
576	576	}
577	577	display_custom_bbcodes();
578	578	add_form_key('dir_form');
		@@ -581,17 +581,17 @@ discard block
		block discarded – undo
581	581	$flag_path = $ext_path.'images/flags/';
582	582
583	583	$s_guest = (!$this->user->data['is_registered'] \|\| !empty($this->guest_email));
584		- $s_rss = $this->config['dir_activ_rss'];
585		- $s_banner = $this->config['dir_activ_banner'];
	584	+ $s_rss = $this->config['dir_activ_rss'];
	585	+ $s_banner = $this->config['dir_activ_banner'];
586	586	$s_back = $this->categorie->data['cat_link_back'];
587	587	$s_flag = $this->config['dir_activ_flag'];
588	588
589	589	$this->template->assign_vars(array(
590		- 'BBCODE_STATUS' => ($this->config['allow_bbcode']) ? $this->language->lang('BBCODE_IS_ON', '<a href="' . append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode') . '">', '</a>') : $this->language->lang('BBCODE_IS_OFF', '<a href="' . append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode') . '">', '</a>'),
591		- 'IMG_STATUS' => ($this->config['allow_bbcode']) ? $this->language->lang('IMAGES_ARE_ON') : $this->language->lang('IMAGES_ARE_OFF'),
	590	+ 'BBCODE_STATUS' => ($this->config['allow_bbcode']) ? $this->language->lang('BBCODE_IS_ON', '<a href="'.append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode').'">', '</a>') : $this->language->lang('BBCODE_IS_OFF', '<a href="'.append_sid($this->root_path."faq.$this->php_ext", 'mode=bbcode').'">', '</a>'),
	591	+ 'IMG_STATUS' => ($this->config['allow_bbcode']) ? $this->language->lang('IMAGES_ARE_ON') : $this->language->lang('IMAGES_ARE_OFF'),
592	592	'SMILIES_STATUS' => ($this->config['allow_smilies']) ? $this->language->lang('SMILIES_ARE_ON') : $this->language->lang('SMILIES_ARE_OFF'),
593	593	'URL_STATUS' => ($this->config['allow_post_links']) ? $this->language->lang('URL_IS_ON') : $this->language->lang('URL_IS_OFF'),
594		- 'FLASH_STATUS' => ($this->config['allow_bbcode'] && $this->config['allow_post_flash']) ? $this->language->lang('FLASH_IS_ON') : $this->language->lang('FLASH_IS_OFF'),
	594	+ 'FLASH_STATUS' => ($this->config['allow_bbcode'] && $this->config['allow_post_flash']) ? $this->language->lang('FLASH_IS_ON') : $this->language->lang('FLASH_IS_OFF'),
595	595
596	596	'L_TITLE' => $title,
597	597	'L_DIR_DESCRIPTION_EXP' => $this->language->lang('DIR_DESCRIPTION_EXP', $this->config['dir_length_describe']),

ErnadoO / ext-phpbb-directory

Push — 3.2.x ( 00ef00...2ad852 )

Status

Category

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